Merge branch 'ccip-develop' into kashif/bump-chainselectors

smartcontractkit · Nov 15, 2024 · d51e48a · d51e48a
2 parents 95ea9a9 + 9ee54f9
commit d51e48a
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 51 deletions.
diff --git a/core/chains/evm/config/toml/defaults/BOB_Mainnet.toml b/core/chains/evm/config/toml/defaults/BOB_Mainnet.toml
@@ -3,8 +3,8 @@ ChainID = '60808'
 ChainType = 'optimismBedrock'
 # finality_depth was: ~850
 FinalityDepth = 900
-# block_time was:  2s
-LogPollInterval = '5s'
+# block_time was:  2s, adding 1 second buffer 
+LogPollInterval = '3s'
 
 # finality_depth * block_time / 60 secs = ~30  min (finality time)
 NoNewFinalizedHeadsThreshold = '35m'
@@ -16,8 +16,8 @@ EIP1559DynamicFees = true
 Mode = 'FeeHistory'
 
 [GasEstimator.FeeHistory]
-# block_time was: 2s
-CacheTimeout = '2s'
+# block_time was: 2s, per recommendation skip 1-2 blocks
+CacheTimeout = '4s'
 
 [GasEstimator.BlockHistory]
 BlockHistorySize = 100
diff --git a/core/chains/evm/config/toml/defaults/BOB_Testnet.toml b/core/chains/evm/config/toml/defaults/BOB_Testnet.toml
@@ -3,8 +3,8 @@ ChainID = '808813'
 ChainType = 'optimismBedrock'
 # finality_depth was: ~850
 FinalityDepth = 900
-# block_time was:  2s
-LogPollInterval = '5s'  
+# block_time was:  2s, adding 1 second buffer 
+LogPollInterval = '3s'  
 
 # finality_depth * block_time / 60 secs = ~30  min (finality time)
 NoNewFinalizedHeadsThreshold = '35m'
@@ -16,8 +16,8 @@ EIP1559DynamicFees = true
 Mode = 'FeeHistory'
 
 [GasEstimator.FeeHistory]
-# block_time was: 2s
-CacheTimeout = '2s'
+# block_time was: 2s, per recommendation skip 1-2 blocks
+CacheTimeout = '4s'
 
 [GasEstimator.BlockHistory]
 BlockHistorySize = 100
diff --git a/core/chains/evm/config/toml/defaults/Berachain_Testnet.toml b/core/chains/evm/config/toml/defaults/Berachain_Testnet.toml
@@ -1,8 +1,8 @@
 ChainID = '80084'
 # finality_depth: instant
 FinalityDepth = 10 
-# block_time: 5s 
-LogPollInterval = '10s' 
+# block_time: 5s, adding 1 second buffer 
+LogPollInterval = '6s' 
 
 # finality_depth * block_time / 60 secs = ~0.8  min (finality time)
 NoNewFinalizedHeadsThreshold = '5m'
@@ -12,8 +12,8 @@ EIP1559DynamicFees = true
 Mode = 'FeeHistory'
 
 [GasEstimator.FeeHistory]
-# block_time was: 5s
-CacheTimeout = '5s'
+# block_time was: 5s, per recommendation skip 1-2 blocks
+CacheTimeout = '10s'
 
 [GasEstimator.BlockHistory]
 BlockHistorySize = 100
diff --git a/core/chains/evm/config/toml/defaults/Bsquared_Mainnet.toml b/core/chains/evm/config/toml/defaults/Bsquared_Mainnet.toml
@@ -3,8 +3,8 @@ ChainID = '223'
 ChainType = 'optimismBedrock'
 # finality_depth was: ~1900
 FinalityDepth = 2000
-# block_time:  ~2s 
-LogPollInterval = '5s' 
+# block_time:  ~2s, adding 1 second buffer 
+LogPollInterval = '3s' 
 
 # finality_depth * block_time / 60 secs = ~66  min (finality time)
 NoNewFinalizedHeadsThreshold = '70m' 
@@ -16,8 +16,8 @@ EIP1559DynamicFees = true
 Mode = 'FeeHistory'
 
 [GasEstimator.FeeHistory]
-# block_time was: 2s
-CacheTimeout = '2s'
+# block_time was: 2s, per recommendation skip 1-2 blocks
+CacheTimeout = '4s'
 
 [GasEstimator.BlockHistory]
 BlockHistorySize = 100
diff --git a/core/chains/evm/config/toml/defaults/Bsquared_Testnet.toml b/core/chains/evm/config/toml/defaults/Bsquared_Testnet.toml
@@ -3,8 +3,8 @@ ChainID = '1123'
 ChainType = 'optimismBedrock'
 # finality_depth was: ~1900
 FinalityDepth = 2000
-# block_time:  ~2s 
-LogPollInterval = '5s'
+# block_time:  ~2s, adding 1 second buffer  
+LogPollInterval = '3s'
 
 # finality_depth * block_time / 60 secs = ~66  min (finality time)
 NoNewFinalizedHeadsThreshold = '70m'
@@ -16,8 +16,8 @@ EIP1559DynamicFees = true
 Mode = 'FeeHistory'
 
 [GasEstimator.FeeHistory]
-# block_time was: 2s
-CacheTimeout = '2s'
+# block_time was: 2s, per recommendation skip 1-2 blocks
+CacheTimeout = '4s'
 
 [GasEstimator.BlockHistory]
 BlockHistorySize = 100
diff --git a/core/chains/evm/config/toml/defaults/Unichain_Testnet.toml b/core/chains/evm/config/toml/defaults/Unichain_Testnet.toml
@@ -3,12 +3,13 @@ ChainID = '1301'
 ChainType = 'optimismBedrock'
 # finality_depth was: ~1900
 FinalityDepth = 2000
-# block_time was:  ~1s 
-LogPollInterval = '5s'
+# block_time was:  ~1s, adding 1 second buffer 
+LogPollInterval = '2s'
 
 # batching_size_finalization_percentage = 30% according to the explorer batching view
-# ( batching_size_finalization_percentage * finality_depth) * block_time / 60 secs = ~33  min (finality time)
-NoNewFinalizedHeadsThreshold = '10m'
+# ( batching_size_finalization_percentage * finality_depth) * block_time / 60 secs = ~10  min (finality time)
+# After running soak tests using 10m threw issues as there are batchs that take 35m, so we are bumping it to 45m to be sure 
+NoNewFinalizedHeadsThreshold = '45m'
 
 FinalityTagEnabled = true
 
@@ -17,8 +18,9 @@ EIP1559DynamicFees = true
 Mode = 'FeeHistory'
 
 [GasEstimator.FeeHistory]
-# block_time was: 1s
-CacheTimeout = '1s'
+# block_time was: 1s, per recommendation skip 1-2 blocks
+CacheTimeout = '2s'
 
 [GasEstimator.BlockHistory]
+# As we see blocks containing between ~[8-12]tx, to get about ~1000 tx to check we would need to rougly go 100 tx back
 BlockHistorySize = 100
diff --git a/core/chains/evm/config/toml/defaults/Worldchain_Mainnet.toml b/core/chains/evm/config/toml/defaults/Worldchain_Mainnet.toml
@@ -3,8 +3,8 @@ ChainID = '480'
 ChainType = 'optimismBedrock'
 # finality_depth was: ~2400
 FinalityDepth = 2500
-# block_time was:  2s 
-LogPollInterval = '5s'
+# block_time was:  2s, adding 1 second buffer   
+LogPollInterval = '3s'
 
 # finality_depth * block_time / 60 secs = ~83  min (finality time)
 NoNewFinalizedHeadsThreshold = '90m'
@@ -16,8 +16,8 @@ EIP1559DynamicFees = true
 Mode = 'FeeHistory'
 
 [GasEstimator.FeeHistory]
-# block_time was: 2s
-CacheTimeout = '2s'
+# block_time was: 2s, per recommendation skip 1-2 blocks
+CacheTimeout = '4s'
 
 [GasEstimator.BlockHistory]
 BlockHistorySize = 100
diff --git a/core/chains/evm/config/toml/defaults/Worldchain_Testnet.toml b/core/chains/evm/config/toml/defaults/Worldchain_Testnet.toml
@@ -3,8 +3,8 @@ ChainID = '4801'
 ChainType = 'optimismBedrock'
 # finality_depth was: ~2400
 FinalityDepth = 2500
-# block_time was:  2s 
-LogPollInterval = '5s'
+# block_time was:  2s, adding 1 second buffer  
+LogPollInterval = '3s'
 
 # finality_depth * block_time / 60 secs = ~83  min (finality time)
 NoNewFinalizedHeadsThreshold = '90m'
@@ -16,8 +16,8 @@ EIP1559DynamicFees = true
 Mode = 'FeeHistory'
 
 [GasEstimator.FeeHistory]
-# block_time was: 2s
-CacheTimeout = '2s'
+# block_time was: 2s, per recommendation skip 1-2 blocks
+CacheTimeout = '4s'
 
 [GasEstimator.BlockHistory]
 BlockHistorySize = 100
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
@@ -3823,7 +3823,7 @@ ChainType = 'optimismBedrock'
 FinalityDepth = 2000
 FinalityTagEnabled = true
 LogBackfillBatchSize = 1000
-LogPollInterval = '5s'
+LogPollInterval = '3s'
 LogKeepBlocksDepth = 100000
 LogPrunePageSize = 10000
 BackupLogPollerBlockDelay = 100
@@ -3877,7 +3877,7 @@ CheckInclusionPercentile = 90
 TransactionPercentile = 60
 
 [GasEstimator.FeeHistory]
-CacheTimeout = '2s'
+CacheTimeout = '4s'
 
 [HeadTracker]
 HistoryDepth = 100
@@ -4648,7 +4648,7 @@ ChainType = 'optimismBedrock'
 FinalityDepth = 2500
 FinalityTagEnabled = true
 LogBackfillBatchSize = 1000
-LogPollInterval = '5s'
+LogPollInterval = '3s'
 LogKeepBlocksDepth = 100000
 LogPrunePageSize = 10000
 BackupLogPollerBlockDelay = 100
@@ -4702,7 +4702,7 @@ CheckInclusionPercentile = 90
 TransactionPercentile = 60
 
 [GasEstimator.FeeHistory]
-CacheTimeout = '2s'
+CacheTimeout = '4s'
 
 [HeadTracker]
 HistoryDepth = 100
@@ -5472,7 +5472,7 @@ ChainType = 'optimismBedrock'
 FinalityDepth = 2000
 FinalityTagEnabled = true
 LogBackfillBatchSize = 1000
-LogPollInterval = '5s'
+LogPollInterval = '3s'
 LogKeepBlocksDepth = 100000
 LogPrunePageSize = 10000
 BackupLogPollerBlockDelay = 100
@@ -5526,7 +5526,7 @@ CheckInclusionPercentile = 90
 TransactionPercentile = 60
 
 [GasEstimator.FeeHistory]
-CacheTimeout = '2s'
+CacheTimeout = '4s'
 
 [HeadTracker]
 HistoryDepth = 100
@@ -5575,7 +5575,7 @@ ChainType = 'optimismBedrock'
 FinalityDepth = 2000
 FinalityTagEnabled = true
 LogBackfillBatchSize = 1000
-LogPollInterval = '5s'
+LogPollInterval = '2s'
 LogKeepBlocksDepth = 100000
 LogPrunePageSize = 10000
 BackupLogPollerBlockDelay = 100
@@ -5587,7 +5587,7 @@ LogBroadcasterEnabled = true
 RPCDefaultBatchSize = 250
 RPCBlockQueryDelay = 1
 FinalizedBlockOffset = 0
-NoNewFinalizedHeadsThreshold = '10m0s'
+NoNewFinalizedHeadsThreshold = '45m0s'
 
 [Transactions]
 ForwardersEnabled = false
@@ -5629,7 +5629,7 @@ CheckInclusionPercentile = 90
 TransactionPercentile = 60
 
 [GasEstimator.FeeHistory]
-CacheTimeout = '1s'
+CacheTimeout = '2s'
 
 [HeadTracker]
 HistoryDepth = 100
@@ -6399,7 +6399,7 @@ ChainType = 'optimismBedrock'
 FinalityDepth = 2500
 FinalityTagEnabled = true
 LogBackfillBatchSize = 1000
-LogPollInterval = '5s'
+LogPollInterval = '3s'
 LogKeepBlocksDepth = 100000
 LogPrunePageSize = 10000
 BackupLogPollerBlockDelay = 100
@@ -6453,7 +6453,7 @@ CheckInclusionPercentile = 90
 TransactionPercentile = 60
 
 [GasEstimator.FeeHistory]
-CacheTimeout = '2s'
+CacheTimeout = '4s'
 
 [HeadTracker]
 HistoryDepth = 100
@@ -8363,7 +8363,7 @@ ChainType = 'optimismBedrock'
 FinalityDepth = 900
 FinalityTagEnabled = true
 LogBackfillBatchSize = 1000
-LogPollInterval = '5s'
+LogPollInterval = '3s'
 LogKeepBlocksDepth = 100000
 LogPrunePageSize = 10000
 BackupLogPollerBlockDelay = 100
@@ -8417,7 +8417,7 @@ CheckInclusionPercentile = 90
 TransactionPercentile = 60
 
 [GasEstimator.FeeHistory]
-CacheTimeout = '2s'
+CacheTimeout = '4s'
 
 [HeadTracker]
 HistoryDepth = 100
@@ -8773,7 +8773,7 @@ BlockBackfillSkip = false
 FinalityDepth = 10
 FinalityTagEnabled = false
 LogBackfillBatchSize = 1000
-LogPollInterval = '10s'
+LogPollInterval = '6s'
 LogKeepBlocksDepth = 100000
 LogPrunePageSize = 10000
 BackupLogPollerBlockDelay = 100
@@ -8827,7 +8827,7 @@ CheckInclusionPercentile = 90
 TransactionPercentile = 60
 
 [GasEstimator.FeeHistory]
-CacheTimeout = '5s'
+CacheTimeout = '10s'
 
 [HeadTracker]
 HistoryDepth = 100
@@ -9705,7 +9705,7 @@ ChainType = 'optimismBedrock'
 FinalityDepth = 900
 FinalityTagEnabled = true
 LogBackfillBatchSize = 1000
-LogPollInterval = '5s'
+LogPollInterval = '3s'
 LogKeepBlocksDepth = 100000
 LogPrunePageSize = 10000
 BackupLogPollerBlockDelay = 100
@@ -9759,7 +9759,7 @@ CheckInclusionPercentile = 90
 TransactionPercentile = 60
 
 [GasEstimator.FeeHistory]
-CacheTimeout = '2s'
+CacheTimeout = '4s'
 
 [HeadTracker]
 HistoryDepth = 100