Merge branch 'ccip-develop' into feature/optional-ws-url-ccip-develop

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

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

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

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

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

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

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

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

core/scripts/ccip/manual-execution/go.mod

@@ -5,7 +5,7 @@ go 1.20
 require (
 	github.com/ethereum/go-ethereum v1.11.3
 	github.com/pkg/errors v0.9.1
-	github.com/smartcontractkit/chain-selectors v1.0.28
+	github.com/smartcontractkit/chain-selectors v1.0.30
 	go.uber.org/multierr v1.1.0
 	golang.org/x/crypto v0.1.0
 )

core/scripts/ccip/manual-execution/go.sum

@@ -72,8 +72,8 @@ github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU=
 github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/smartcontractkit/chain-selectors v1.0.28 h1:oY4/X4MJTUptVo0mG21xYYfni/78iqnqyS7LddQGeVo=
-github.com/smartcontractkit/chain-selectors v1.0.28/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
+github.com/smartcontractkit/chain-selectors v1.0.30 h1:jk+xVRocgQ/uvKLSd1JzeHJ/v+EKu1BjrreaSGqKzjo=
+github.com/smartcontractkit/chain-selectors v1.0.30/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
 github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=

core/scripts/go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.20.0
 	github.com/shopspring/decimal v1.4.0
-	github.com/smartcontractkit/chain-selectors v1.0.28
+	github.com/smartcontractkit/chain-selectors v1.0.30
 	github.com/smartcontractkit/chainlink-automation v1.0.4
 	github.com/smartcontractkit/chainlink-common v0.2.3-0.20240925085218-aded1b263ecc
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000

core/scripts/go.sum

@@ -1073,8 +1073,8 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/smartcontractkit/chain-selectors v1.0.28 h1:oY4/X4MJTUptVo0mG21xYYfni/78iqnqyS7LddQGeVo=
-github.com/smartcontractkit/chain-selectors v1.0.28/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
+github.com/smartcontractkit/chain-selectors v1.0.30 h1:jk+xVRocgQ/uvKLSd1JzeHJ/v+EKu1BjrreaSGqKzjo=
+github.com/smartcontractkit/chain-selectors v1.0.30/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
 github.com/smartcontractkit/chainlink-automation v1.0.4 h1:iyW181JjKHLNMnDleI8umfIfVVlwC7+n5izbLSFgjw8=
 github.com/smartcontractkit/chainlink-automation v1.0.4/go.mod h1:u4NbPZKJ5XiayfKHD/v3z3iflQWqvtdhj13jVZXj/cM=
 github.com/smartcontractkit/chainlink-common v0.2.3-0.20240925085218-aded1b263ecc h1:ALbyaoRzUSXQ2NhGFKVOyJqO22IB5yQjhjKWbIZGbrI=

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

go.mod

@@ -73,7 +73,7 @@ require (
 	github.com/scylladb/go-reflectx v1.0.1
 	github.com/shirou/gopsutil/v3 v3.24.3
 	github.com/shopspring/decimal v1.4.0
-	github.com/smartcontractkit/chain-selectors v1.0.28
+	github.com/smartcontractkit/chain-selectors v1.0.30
 	github.com/smartcontractkit/chainlink-automation v1.0.4
 	github.com/smartcontractkit/chainlink-common v0.2.3-0.20240925085218-aded1b263ecc
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240911175228-daf2600bb7b7

go.sum

@@ -1034,8 +1034,8 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/smartcontractkit/chain-selectors v1.0.28 h1:oY4/X4MJTUptVo0mG21xYYfni/78iqnqyS7LddQGeVo=
-github.com/smartcontractkit/chain-selectors v1.0.28/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
+github.com/smartcontractkit/chain-selectors v1.0.30 h1:jk+xVRocgQ/uvKLSd1JzeHJ/v+EKu1BjrreaSGqKzjo=
+github.com/smartcontractkit/chain-selectors v1.0.30/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
 github.com/smartcontractkit/chainlink-automation v1.0.4 h1:iyW181JjKHLNMnDleI8umfIfVVlwC7+n5izbLSFgjw8=
 github.com/smartcontractkit/chainlink-automation v1.0.4/go.mod h1:u4NbPZKJ5XiayfKHD/v3z3iflQWqvtdhj13jVZXj/cM=
 github.com/smartcontractkit/chainlink-common v0.2.3-0.20240925085218-aded1b263ecc h1:ALbyaoRzUSXQ2NhGFKVOyJqO22IB5yQjhjKWbIZGbrI=