From f27d6618a6231d530fa3415c3755972d01b3a2c7 Mon Sep 17 00:00:00 2001
From: amaechiokolobi <168412367+amaechiokolobi@users.noreply.github.com>
Date: Fri, 1 Nov 2024 09:03:30 +0300
Subject: [PATCH 1/8] added Ronin configs

---
 ccip/config/evm/Ronin_Mainnet.toml            |  10 +
 ccip/config/evm/Ronin_Saigon.toml             |  10 +
 .../config/toml/defaults/Ronin_Mainnet.toml   |  10 +
 .../config/toml/defaults/Ronin_Saigon.toml    |  10 +
 docs/CONFIG.md                                | 206 ++++++++++++++++++
 5 files changed, 246 insertions(+)
 create mode 100644 ccip/config/evm/Ronin_Mainnet.toml
 create mode 100644 ccip/config/evm/Ronin_Saigon.toml
 create mode 100644 core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
 create mode 100644 core/chains/evm/config/toml/defaults/Ronin_Saigon.toml

diff --git a/ccip/config/evm/Ronin_Mainnet.toml b/ccip/config/evm/Ronin_Mainnet.toml
new file mode 100644
index 0000000000..13551fd5c6
--- /dev/null
+++ b/ccip/config/evm/Ronin_Mainnet.toml
@@ -0,0 +1,10 @@
+ChainID = "2020"
+FinalityTagEnabled = true
+LinkContractAddress = "0x3902228D6A3d2Dc44731fD9d45FeE6a61c722D0b"
+LogPollInterval = "6s"
+NoNewHeadsThreshold = "10m"
+
+[GasEstimator]
+PriceMax = "100000 gwei"
+PriceDefault = "21 gwei"
+PriceMin = "20 gwei"
diff --git a/ccip/config/evm/Ronin_Saigon.toml b/ccip/config/evm/Ronin_Saigon.toml
new file mode 100644
index 0000000000..3a9c46f077
--- /dev/null
+++ b/ccip/config/evm/Ronin_Saigon.toml
@@ -0,0 +1,10 @@
+ChainID = "2021"
+FinalityTagEnabled = true
+LinkContractAddress = "0x5bB50A6888ee6a67E22afFDFD9513be7740F1c15"
+LogPollInterval = "6s"
+NoNewHeadsThreshold = "10m"
+
+[GasEstimator]
+PriceMax = "100000 gwei"
+PriceDefault = "21 gwei"
+PriceMin = "20 gwei"
diff --git a/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml b/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
new file mode 100644
index 0000000000..13551fd5c6
--- /dev/null
+++ b/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
@@ -0,0 +1,10 @@
+ChainID = "2020"
+FinalityTagEnabled = true
+LinkContractAddress = "0x3902228D6A3d2Dc44731fD9d45FeE6a61c722D0b"
+LogPollInterval = "6s"
+NoNewHeadsThreshold = "10m"
+
+[GasEstimator]
+PriceMax = "100000 gwei"
+PriceDefault = "21 gwei"
+PriceMin = "20 gwei"
diff --git a/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml b/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
new file mode 100644
index 0000000000..3a9c46f077
--- /dev/null
+++ b/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
@@ -0,0 +1,10 @@
+ChainID = "2021"
+FinalityTagEnabled = true
+LinkContractAddress = "0x5bB50A6888ee6a67E22afFDFD9513be7740F1c15"
+LogPollInterval = "6s"
+NoNewHeadsThreshold = "10m"
+
+[GasEstimator]
+PriceMax = "100000 gwei"
+PriceDefault = "21 gwei"
+PriceMin = "20 gwei"
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index 059a0e3002..75fa4c4ac5 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -5668,6 +5668,212 @@ GasLimitDefault = 400000
 
 </p></details>
 
+<details><summary>Ronin Mainnet (2020)</summary><p>
+
+```toml
+AutoCreateKey = true
+BlockBackfillDepth = 10
+BlockBackfillSkip = false
+FinalityDepth = 50
+FinalityTagEnabled = true
+LinkContractAddress = '0x3902228D6A3d2Dc44731fD9d45FeE6a61c722D0b'
+LogBackfillBatchSize = 1000
+LogPollInterval = '6s'
+LogKeepBlocksDepth = 100000
+LogPrunePageSize = 10000
+BackupLogPollerBlockDelay = 100
+MinIncomingConfirmations = 3
+MinContractPayment = '0.00001 link'
+NonceAutoSync = true
+NoNewHeadsThreshold = '10m0s'
+LogBroadcasterEnabled = true
+RPCDefaultBatchSize = 250
+RPCBlockQueryDelay = 1
+FinalizedBlockOffset = 0
+NoNewFinalizedHeadsThreshold = '0s'
+
+[Transactions]
+ForwardersEnabled = false
+MaxInFlight = 16
+MaxQueued = 250
+ReaperInterval = '1h0m0s'
+ReaperThreshold = '168h0m0s'
+ResendAfterThreshold = '1m0s'
+
+[Transactions.AutoPurge]
+Enabled = false
+
+[BalanceMonitor]
+Enabled = true
+
+[GasEstimator]
+Mode = 'BlockHistory'
+PriceDefault = '21 gwei'
+PriceMax = '100 micro'
+PriceMin = '20 gwei'
+LimitDefault = 8000000
+LimitMax = 8000000
+LimitMultiplier = '1'
+LimitTransfer = 21000
+EstimateLimit = false
+BumpMin = '5 gwei'
+BumpPercent = 20
+BumpThreshold = 3
+EIP1559DynamicFees = false
+FeeCapDefault = '100 gwei'
+TipCapDefault = '1 wei'
+TipCapMin = '1 wei'
+
+[GasEstimator.BlockHistory]
+BatchSize = 25
+BlockHistorySize = 8
+CheckInclusionBlocks = 12
+CheckInclusionPercentile = 90
+TransactionPercentile = 60
+
+[GasEstimator.FeeHistory]
+CacheTimeout = '10s'
+
+[HeadTracker]
+HistoryDepth = 100
+MaxBufferSize = 3
+SamplingInterval = '1s'
+MaxAllowedFinalityDepth = 10000
+FinalityTagBypass = true
+
+[NodePool]
+PollFailureThreshold = 5
+PollInterval = '10s'
+SelectionMode = 'HighestHead'
+SyncThreshold = 5
+LeaseDuration = '0s'
+NodeIsSyncingEnabled = false
+FinalizedBlockPollInterval = '5s'
+EnforceRepeatableRead = false
+DeathDeclarationDelay = '10s'
+NewHeadsPollInterval = '0s'
+
+[OCR]
+ContractConfirmations = 4
+ContractTransmitterTransmitTimeout = '10s'
+DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
+ObservationGracePeriod = '1s'
+
+[OCR2]
+[OCR2.Automation]
+GasLimit = 5400000
+
+[Workflow]
+GasLimitDefault = 400000
+```
+
+</p></details>
+
+<details><summary>Ronin Saigon (2021)</summary><p>
+
+```toml
+AutoCreateKey = true
+BlockBackfillDepth = 10
+BlockBackfillSkip = false
+FinalityDepth = 50
+FinalityTagEnabled = true
+LinkContractAddress = '0x5bB50A6888ee6a67E22afFDFD9513be7740F1c15'
+LogBackfillBatchSize = 1000
+LogPollInterval = '6s'
+LogKeepBlocksDepth = 100000
+LogPrunePageSize = 10000
+BackupLogPollerBlockDelay = 100
+MinIncomingConfirmations = 3
+MinContractPayment = '0.00001 link'
+NonceAutoSync = true
+NoNewHeadsThreshold = '10m0s'
+LogBroadcasterEnabled = true
+RPCDefaultBatchSize = 250
+RPCBlockQueryDelay = 1
+FinalizedBlockOffset = 0
+NoNewFinalizedHeadsThreshold = '0s'
+
+[Transactions]
+ForwardersEnabled = false
+MaxInFlight = 16
+MaxQueued = 250
+ReaperInterval = '1h0m0s'
+ReaperThreshold = '168h0m0s'
+ResendAfterThreshold = '1m0s'
+
+[Transactions.AutoPurge]
+Enabled = false
+
+[BalanceMonitor]
+Enabled = true
+
+[GasEstimator]
+Mode = 'BlockHistory'
+PriceDefault = '21 gwei'
+PriceMax = '100 micro'
+PriceMin = '20 gwei'
+LimitDefault = 8000000
+LimitMax = 8000000
+LimitMultiplier = '1'
+LimitTransfer = 21000
+EstimateLimit = false
+BumpMin = '5 gwei'
+BumpPercent = 20
+BumpThreshold = 3
+EIP1559DynamicFees = false
+FeeCapDefault = '100 gwei'
+TipCapDefault = '1 wei'
+TipCapMin = '1 wei'
+
+[GasEstimator.BlockHistory]
+BatchSize = 25
+BlockHistorySize = 8
+CheckInclusionBlocks = 12
+CheckInclusionPercentile = 90
+TransactionPercentile = 60
+
+[GasEstimator.FeeHistory]
+CacheTimeout = '10s'
+
+[HeadTracker]
+HistoryDepth = 100
+MaxBufferSize = 3
+SamplingInterval = '1s'
+MaxAllowedFinalityDepth = 10000
+FinalityTagBypass = true
+
+[NodePool]
+PollFailureThreshold = 5
+PollInterval = '10s'
+SelectionMode = 'HighestHead'
+SyncThreshold = 5
+LeaseDuration = '0s'
+NodeIsSyncingEnabled = false
+FinalizedBlockPollInterval = '5s'
+EnforceRepeatableRead = false
+DeathDeclarationDelay = '10s'
+NewHeadsPollInterval = '0s'
+
+[OCR]
+ContractConfirmations = 4
+ContractTransmitterTransmitTimeout = '10s'
+DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
+ObservationGracePeriod = '1s'
+
+[OCR2]
+[OCR2.Automation]
+GasLimit = 5400000
+
+[Workflow]
+GasLimitDefault = 400000
+```
+
+</p></details>
+
 <details><summary>Kroma Sepolia (2358)</summary><p>
 
 ```toml

From b7c8be44c14c564990af248f34a0bbd65d6eedb9 Mon Sep 17 00:00:00 2001
From: amaechiokolobi <168412367+amaechiokolobi@users.noreply.github.com>
Date: Mon, 4 Nov 2024 12:18:59 +0300
Subject: [PATCH 2/8] updated PriceMax

---
 ccip/config/evm/Ronin_Saigon.toml                      | 1 -
 core/chains/evm/config/toml/defaults/Ronin_Saigon.toml | 1 -
 docs/CONFIG.md                                         | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/ccip/config/evm/Ronin_Saigon.toml b/ccip/config/evm/Ronin_Saigon.toml
index 3a9c46f077..9031f8dc63 100644
--- a/ccip/config/evm/Ronin_Saigon.toml
+++ b/ccip/config/evm/Ronin_Saigon.toml
@@ -5,6 +5,5 @@ LogPollInterval = "6s"
 NoNewHeadsThreshold = "10m"
 
 [GasEstimator]
-PriceMax = "100000 gwei"
 PriceDefault = "21 gwei"
 PriceMin = "20 gwei"
diff --git a/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml b/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
index 3a9c46f077..9031f8dc63 100644
--- a/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
+++ b/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
@@ -5,6 +5,5 @@ LogPollInterval = "6s"
 NoNewHeadsThreshold = "10m"
 
 [GasEstimator]
-PriceMax = "100000 gwei"
 PriceDefault = "21 gwei"
 PriceMin = "20 gwei"
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index 75fa4c4ac5..b0278cc66c 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -5812,7 +5812,7 @@ Enabled = true
 [GasEstimator]
 Mode = 'BlockHistory'
 PriceDefault = '21 gwei'
-PriceMax = '100 micro'
+PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
 PriceMin = '20 gwei'
 LimitDefault = 8000000
 LimitMax = 8000000

From 07acdd9514969ad288795fea08be6889b078238c Mon Sep 17 00:00:00 2001
From: amaechiokolobi <168412367+amaechiokolobi@users.noreply.github.com>
Date: Mon, 4 Nov 2024 19:11:47 +0300
Subject: [PATCH 3/8] updated PriceMax

---
 ccip/config/evm/Ronin_Saigon.toml                      | 1 +
 core/chains/evm/config/toml/defaults/Ronin_Saigon.toml | 1 +
 docs/CONFIG.md                                         | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ccip/config/evm/Ronin_Saigon.toml b/ccip/config/evm/Ronin_Saigon.toml
index 9031f8dc63..3a9c46f077 100644
--- a/ccip/config/evm/Ronin_Saigon.toml
+++ b/ccip/config/evm/Ronin_Saigon.toml
@@ -5,5 +5,6 @@ LogPollInterval = "6s"
 NoNewHeadsThreshold = "10m"
 
 [GasEstimator]
+PriceMax = "100000 gwei"
 PriceDefault = "21 gwei"
 PriceMin = "20 gwei"
diff --git a/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml b/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
index 9031f8dc63..3a9c46f077 100644
--- a/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
+++ b/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
@@ -5,5 +5,6 @@ LogPollInterval = "6s"
 NoNewHeadsThreshold = "10m"
 
 [GasEstimator]
+PriceMax = "100000 gwei"
 PriceDefault = "21 gwei"
 PriceMin = "20 gwei"
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index b0278cc66c..75fa4c4ac5 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -5812,7 +5812,7 @@ Enabled = true
 [GasEstimator]
 Mode = 'BlockHistory'
 PriceDefault = '21 gwei'
-PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
+PriceMax = '100 micro'
 PriceMin = '20 gwei'
 LimitDefault = 8000000
 LimitMax = 8000000

From 691c87d47b62e0bd438abcdca40242786d3fc02d Mon Sep 17 00:00:00 2001
From: amaechiokolobi <168412367+amaechiokolobi@users.noreply.github.com>
Date: Mon, 4 Nov 2024 20:08:37 +0300
Subject: [PATCH 4/8] update PriceMax

---
 ccip/config/evm/Ronin_Mainnet.toml                      | 2 +-
 ccip/config/evm/Ronin_Saigon.toml                       | 2 +-
 core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml | 2 +-
 core/chains/evm/config/toml/defaults/Ronin_Saigon.toml  | 2 +-
 docs/CONFIG.md                                          | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ccip/config/evm/Ronin_Mainnet.toml b/ccip/config/evm/Ronin_Mainnet.toml
index 13551fd5c6..a3998a0f45 100644
--- a/ccip/config/evm/Ronin_Mainnet.toml
+++ b/ccip/config/evm/Ronin_Mainnet.toml
@@ -5,6 +5,6 @@ LogPollInterval = "6s"
 NoNewHeadsThreshold = "10m"
 
 [GasEstimator]
-PriceMax = "100000 gwei"
+PriceMax = "1000 gwei"
 PriceDefault = "21 gwei"
 PriceMin = "20 gwei"
diff --git a/ccip/config/evm/Ronin_Saigon.toml b/ccip/config/evm/Ronin_Saigon.toml
index 3a9c46f077..1d419ac6f0 100644
--- a/ccip/config/evm/Ronin_Saigon.toml
+++ b/ccip/config/evm/Ronin_Saigon.toml
@@ -5,6 +5,6 @@ LogPollInterval = "6s"
 NoNewHeadsThreshold = "10m"
 
 [GasEstimator]
-PriceMax = "100000 gwei"
+PriceMax = "1000 gwei"
 PriceDefault = "21 gwei"
 PriceMin = "20 gwei"
diff --git a/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml b/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
index 13551fd5c6..a3998a0f45 100644
--- a/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
@@ -5,6 +5,6 @@ LogPollInterval = "6s"
 NoNewHeadsThreshold = "10m"
 
 [GasEstimator]
-PriceMax = "100000 gwei"
+PriceMax = "1000 gwei"
 PriceDefault = "21 gwei"
 PriceMin = "20 gwei"
diff --git a/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml b/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
index 3a9c46f077..1d419ac6f0 100644
--- a/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
+++ b/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
@@ -5,6 +5,6 @@ LogPollInterval = "6s"
 NoNewHeadsThreshold = "10m"
 
 [GasEstimator]
-PriceMax = "100000 gwei"
+PriceMax = "1000 gwei"
 PriceDefault = "21 gwei"
 PriceMin = "20 gwei"
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index 75fa4c4ac5..cdfde03871 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -5709,7 +5709,7 @@ Enabled = true
 [GasEstimator]
 Mode = 'BlockHistory'
 PriceDefault = '21 gwei'
-PriceMax = '100 micro'
+PriceMax = '1 micro'
 PriceMin = '20 gwei'
 LimitDefault = 8000000
 LimitMax = 8000000
@@ -5812,7 +5812,7 @@ Enabled = true
 [GasEstimator]
 Mode = 'BlockHistory'
 PriceDefault = '21 gwei'
-PriceMax = '100 micro'
+PriceMax = '1 micro'
 PriceMin = '20 gwei'
 LimitDefault = 8000000
 LimitMax = 8000000

From 7421db747de328be5cc5fc97b5e8b817bc2cc021 Mon Sep 17 00:00:00 2001
From: amaechiokolobi <168412367+amaechiokolobi@users.noreply.github.com>
Date: Mon, 4 Nov 2024 21:20:59 +0300
Subject: [PATCH 5/8] changed mode to FeeHistory

---
 ccip/config/evm/Ronin_Mainnet.toml                      | 2 ++
 ccip/config/evm/Ronin_Saigon.toml                       | 2 ++
 core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml | 2 ++
 core/chains/evm/config/toml/defaults/Ronin_Saigon.toml  | 2 ++
 docs/CONFIG.md                                          | 4 ++--
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ccip/config/evm/Ronin_Mainnet.toml b/ccip/config/evm/Ronin_Mainnet.toml
index a3998a0f45..923dc6c1de 100644
--- a/ccip/config/evm/Ronin_Mainnet.toml
+++ b/ccip/config/evm/Ronin_Mainnet.toml
@@ -5,6 +5,8 @@ LogPollInterval = "6s"
 NoNewHeadsThreshold = "10m"
 
 [GasEstimator]
+Mode = 'FeeHistory'
 PriceMax = "1000 gwei"
+# Ronin gas price is 20gwei by default but setting to 21gwei due to some issues faced during local testing https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview.
 PriceDefault = "21 gwei"
 PriceMin = "20 gwei"
diff --git a/ccip/config/evm/Ronin_Saigon.toml b/ccip/config/evm/Ronin_Saigon.toml
index 1d419ac6f0..4669f13e1a 100644
--- a/ccip/config/evm/Ronin_Saigon.toml
+++ b/ccip/config/evm/Ronin_Saigon.toml
@@ -5,6 +5,8 @@ LogPollInterval = "6s"
 NoNewHeadsThreshold = "10m"
 
 [GasEstimator]
+Mode = 'FeeHistory'
 PriceMax = "1000 gwei"
+# Ronin gas price is 20gwei by default but setting to 21gwei due to some issues faced during local testing https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview.
 PriceDefault = "21 gwei"
 PriceMin = "20 gwei"
diff --git a/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml b/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
index a3998a0f45..923dc6c1de 100644
--- a/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
@@ -5,6 +5,8 @@ LogPollInterval = "6s"
 NoNewHeadsThreshold = "10m"
 
 [GasEstimator]
+Mode = 'FeeHistory'
 PriceMax = "1000 gwei"
+# Ronin gas price is 20gwei by default but setting to 21gwei due to some issues faced during local testing https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview.
 PriceDefault = "21 gwei"
 PriceMin = "20 gwei"
diff --git a/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml b/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
index 1d419ac6f0..4669f13e1a 100644
--- a/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
+++ b/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
@@ -5,6 +5,8 @@ LogPollInterval = "6s"
 NoNewHeadsThreshold = "10m"
 
 [GasEstimator]
+Mode = 'FeeHistory'
 PriceMax = "1000 gwei"
+# Ronin gas price is 20gwei by default but setting to 21gwei due to some issues faced during local testing https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview.
 PriceDefault = "21 gwei"
 PriceMin = "20 gwei"
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index cdfde03871..c46c7158fe 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -5707,7 +5707,7 @@ Enabled = false
 Enabled = true
 
 [GasEstimator]
-Mode = 'BlockHistory'
+Mode = 'FeeHistory'
 PriceDefault = '21 gwei'
 PriceMax = '1 micro'
 PriceMin = '20 gwei'
@@ -5810,7 +5810,7 @@ Enabled = false
 Enabled = true
 
 [GasEstimator]
-Mode = 'BlockHistory'
+Mode = 'FeeHistory'
 PriceDefault = '21 gwei'
 PriceMax = '1 micro'
 PriceMin = '20 gwei'

From dda63ceb404107fb417243eeaab86f0584a9c52a Mon Sep 17 00:00:00 2001
From: amaechiokolobi <168412367+amaechiokolobi@users.noreply.github.com>
Date: Tue, 5 Nov 2024 12:08:57 +0300
Subject: [PATCH 6/8] removed PriceDefault & PriceMin

---
 ccip/config/evm/Ronin_Mainnet.toml                      | 3 ---
 ccip/config/evm/Ronin_Saigon.toml                       | 3 ---
 core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml | 3 ---
 core/chains/evm/config/toml/defaults/Ronin_Saigon.toml  | 3 ---
 docs/CONFIG.md                                          | 8 ++++----
 5 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/ccip/config/evm/Ronin_Mainnet.toml b/ccip/config/evm/Ronin_Mainnet.toml
index 923dc6c1de..498b5fb04d 100644
--- a/ccip/config/evm/Ronin_Mainnet.toml
+++ b/ccip/config/evm/Ronin_Mainnet.toml
@@ -7,6 +7,3 @@ NoNewHeadsThreshold = "10m"
 [GasEstimator]
 Mode = 'FeeHistory'
 PriceMax = "1000 gwei"
-# Ronin gas price is 20gwei by default but setting to 21gwei due to some issues faced during local testing https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview.
-PriceDefault = "21 gwei"
-PriceMin = "20 gwei"
diff --git a/ccip/config/evm/Ronin_Saigon.toml b/ccip/config/evm/Ronin_Saigon.toml
index 4669f13e1a..186aa6a15a 100644
--- a/ccip/config/evm/Ronin_Saigon.toml
+++ b/ccip/config/evm/Ronin_Saigon.toml
@@ -7,6 +7,3 @@ NoNewHeadsThreshold = "10m"
 [GasEstimator]
 Mode = 'FeeHistory'
 PriceMax = "1000 gwei"
-# Ronin gas price is 20gwei by default but setting to 21gwei due to some issues faced during local testing https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview.
-PriceDefault = "21 gwei"
-PriceMin = "20 gwei"
diff --git a/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml b/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
index 923dc6c1de..498b5fb04d 100644
--- a/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
@@ -7,6 +7,3 @@ NoNewHeadsThreshold = "10m"
 [GasEstimator]
 Mode = 'FeeHistory'
 PriceMax = "1000 gwei"
-# Ronin gas price is 20gwei by default but setting to 21gwei due to some issues faced during local testing https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview.
-PriceDefault = "21 gwei"
-PriceMin = "20 gwei"
diff --git a/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml b/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
index 4669f13e1a..186aa6a15a 100644
--- a/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
+++ b/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
@@ -7,6 +7,3 @@ NoNewHeadsThreshold = "10m"
 [GasEstimator]
 Mode = 'FeeHistory'
 PriceMax = "1000 gwei"
-# Ronin gas price is 20gwei by default but setting to 21gwei due to some issues faced during local testing https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview.
-PriceDefault = "21 gwei"
-PriceMin = "20 gwei"
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index c46c7158fe..09feedf166 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -5708,9 +5708,9 @@ Enabled = true
 
 [GasEstimator]
 Mode = 'FeeHistory'
-PriceDefault = '21 gwei'
+PriceDefault = '20 gwei'
 PriceMax = '1 micro'
-PriceMin = '20 gwei'
+PriceMin = '1 gwei'
 LimitDefault = 8000000
 LimitMax = 8000000
 LimitMultiplier = '1'
@@ -5811,9 +5811,9 @@ Enabled = true
 
 [GasEstimator]
 Mode = 'FeeHistory'
-PriceDefault = '21 gwei'
+PriceDefault = '20 gwei'
 PriceMax = '1 micro'
-PriceMin = '20 gwei'
+PriceMin = '1 gwei'
 LimitDefault = 8000000
 LimitMax = 8000000
 LimitMultiplier = '1'

From 8478f337083b5cf49c0835a85d504fd2ce511279 Mon Sep 17 00:00:00 2001
From: amaechiokolobi <168412367+amaechiokolobi@users.noreply.github.com>
Date: Tue, 5 Nov 2024 12:29:15 +0300
Subject: [PATCH 7/8] added comments

---
 ccip/config/evm/Ronin_Mainnet.toml                      | 1 +
 ccip/config/evm/Ronin_Saigon.toml                       | 1 +
 core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml | 1 +
 core/chains/evm/config/toml/defaults/Ronin_Saigon.toml  | 1 +
 4 files changed, 4 insertions(+)

diff --git a/ccip/config/evm/Ronin_Mainnet.toml b/ccip/config/evm/Ronin_Mainnet.toml
index 498b5fb04d..0772ab6786 100644
--- a/ccip/config/evm/Ronin_Mainnet.toml
+++ b/ccip/config/evm/Ronin_Mainnet.toml
@@ -5,5 +5,6 @@ LogPollInterval = "6s"
 NoNewHeadsThreshold = "10m"
 
 [GasEstimator]
+# Ronin uses default gas price of 20 gwei https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview
 Mode = 'FeeHistory'
 PriceMax = "1000 gwei"
diff --git a/ccip/config/evm/Ronin_Saigon.toml b/ccip/config/evm/Ronin_Saigon.toml
index 186aa6a15a..c10592ff9a 100644
--- a/ccip/config/evm/Ronin_Saigon.toml
+++ b/ccip/config/evm/Ronin_Saigon.toml
@@ -5,5 +5,6 @@ LogPollInterval = "6s"
 NoNewHeadsThreshold = "10m"
 
 [GasEstimator]
+# Ronin uses default gas price of 20 gwei https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview
 Mode = 'FeeHistory'
 PriceMax = "1000 gwei"
diff --git a/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml b/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
index 498b5fb04d..0772ab6786 100644
--- a/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
@@ -5,5 +5,6 @@ LogPollInterval = "6s"
 NoNewHeadsThreshold = "10m"
 
 [GasEstimator]
+# Ronin uses default gas price of 20 gwei https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview
 Mode = 'FeeHistory'
 PriceMax = "1000 gwei"
diff --git a/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml b/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
index 186aa6a15a..c10592ff9a 100644
--- a/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
+++ b/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
@@ -5,5 +5,6 @@ LogPollInterval = "6s"
 NoNewHeadsThreshold = "10m"
 
 [GasEstimator]
+# Ronin uses default gas price of 20 gwei https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview
 Mode = 'FeeHistory'
 PriceMax = "1000 gwei"

From 3f536384d77e28cb0a6ad67372abbffc32854749 Mon Sep 17 00:00:00 2001
From: amaechiokolobi <168412367+amaechiokolobi@users.noreply.github.com>
Date: Fri, 8 Nov 2024 09:48:05 +0000
Subject: [PATCH 8/8] update config

---
 ccip/config/evm/Ronin_Mainnet.toml                      | 5 +++--
 ccip/config/evm/Ronin_Saigon.toml                       | 5 +++--
 core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml | 5 +++--
 core/chains/evm/config/toml/defaults/Ronin_Saigon.toml  | 5 +++--
 docs/CONFIG.md                                          | 8 ++++----
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/ccip/config/evm/Ronin_Mainnet.toml b/ccip/config/evm/Ronin_Mainnet.toml
index 0772ab6786..84831b9b4c 100644
--- a/ccip/config/evm/Ronin_Mainnet.toml
+++ b/ccip/config/evm/Ronin_Mainnet.toml
@@ -1,8 +1,9 @@
 ChainID = "2020"
 FinalityTagEnabled = true
 LinkContractAddress = "0x3902228D6A3d2Dc44731fD9d45FeE6a61c722D0b"
-LogPollInterval = "6s"
-NoNewHeadsThreshold = "10m"
+# Ronin produces blocks every 3 seconds
+LogPollInterval = "3s"
+NoNewHeadsThreshold = "3m"
 
 [GasEstimator]
 # Ronin uses default gas price of 20 gwei https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview
diff --git a/ccip/config/evm/Ronin_Saigon.toml b/ccip/config/evm/Ronin_Saigon.toml
index c10592ff9a..bf08485242 100644
--- a/ccip/config/evm/Ronin_Saigon.toml
+++ b/ccip/config/evm/Ronin_Saigon.toml
@@ -1,8 +1,9 @@
 ChainID = "2021"
 FinalityTagEnabled = true
 LinkContractAddress = "0x5bB50A6888ee6a67E22afFDFD9513be7740F1c15"
-LogPollInterval = "6s"
-NoNewHeadsThreshold = "10m"
+# Ronin produces blocks every 3 seconds
+LogPollInterval = "3s"
+NoNewHeadsThreshold = "3m"
 
 [GasEstimator]
 # Ronin uses default gas price of 20 gwei https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview
diff --git a/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml b/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
index 0772ab6786..84831b9b4c 100644
--- a/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml
@@ -1,8 +1,9 @@
 ChainID = "2020"
 FinalityTagEnabled = true
 LinkContractAddress = "0x3902228D6A3d2Dc44731fD9d45FeE6a61c722D0b"
-LogPollInterval = "6s"
-NoNewHeadsThreshold = "10m"
+# Ronin produces blocks every 3 seconds
+LogPollInterval = "3s"
+NoNewHeadsThreshold = "3m"
 
 [GasEstimator]
 # Ronin uses default gas price of 20 gwei https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview
diff --git a/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml b/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
index c10592ff9a..bf08485242 100644
--- a/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
+++ b/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml
@@ -1,8 +1,9 @@
 ChainID = "2021"
 FinalityTagEnabled = true
 LinkContractAddress = "0x5bB50A6888ee6a67E22afFDFD9513be7740F1c15"
-LogPollInterval = "6s"
-NoNewHeadsThreshold = "10m"
+# Ronin produces blocks every 3 seconds
+LogPollInterval = "3s"
+NoNewHeadsThreshold = "3m"
 
 [GasEstimator]
 # Ronin uses default gas price of 20 gwei https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index 09feedf166..17b05ee8ca 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -5678,14 +5678,14 @@ FinalityDepth = 50
 FinalityTagEnabled = true
 LinkContractAddress = '0x3902228D6A3d2Dc44731fD9d45FeE6a61c722D0b'
 LogBackfillBatchSize = 1000
-LogPollInterval = '6s'
+LogPollInterval = '3s'
 LogKeepBlocksDepth = 100000
 LogPrunePageSize = 10000
 BackupLogPollerBlockDelay = 100
 MinIncomingConfirmations = 3
 MinContractPayment = '0.00001 link'
 NonceAutoSync = true
-NoNewHeadsThreshold = '10m0s'
+NoNewHeadsThreshold = '3m0s'
 LogBroadcasterEnabled = true
 RPCDefaultBatchSize = 250
 RPCBlockQueryDelay = 1
@@ -5781,14 +5781,14 @@ FinalityDepth = 50
 FinalityTagEnabled = true
 LinkContractAddress = '0x5bB50A6888ee6a67E22afFDFD9513be7740F1c15'
 LogBackfillBatchSize = 1000
-LogPollInterval = '6s'
+LogPollInterval = '3s'
 LogKeepBlocksDepth = 100000
 LogPrunePageSize = 10000
 BackupLogPollerBlockDelay = 100
 MinIncomingConfirmations = 3
 MinContractPayment = '0.00001 link'
 NonceAutoSync = true
-NoNewHeadsThreshold = '10m0s'
+NoNewHeadsThreshold = '3m0s'
 LogBroadcasterEnabled = true
 RPCDefaultBatchSize = 250
 RPCBlockQueryDelay = 1