SHIP-2006 Consolidate All FinalityDepth Settings to default TOML files

.changeset/old-bees-kiss.md

@@ -0,0 +1,5 @@
+---
+"ccip": patch
+---
+
+Consolidated FinalityDepth setting #internal

core/chains/evm/config/toml/defaults/Celo_Mainnet.toml

@@ -1,6 +1,7 @@
 ChainID = '42220'
 ChainType = 'celo'
 FinalityDepth = 10
+FinalityTagEnabled = true
 LogPollInterval = '5s'
 MinIncomingConfirmations = 1
 NoNewHeadsThreshold = '1m'

core/chains/evm/config/toml/defaults/Celo_Testnet.toml

@@ -1,6 +1,7 @@
 ChainID = '44787'
 ChainType = 'celo'
 FinalityDepth = 10
+FinalityTagEnabled = true
 LogPollInterval = '5s'
 MinIncomingConfirmations = 1
 NoNewHeadsThreshold = '1m'

core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml

@@ -1,6 +1,6 @@
 ChainID = '255'
 ChainType = 'kroma' # Kroma is based on the Optimism Bedrock architechture
-FinalityDepth = 400
+FinalityDepth = 700
 FinalityTagEnabled = true
 LogPollInterval = '2s'
 NoNewHeadsThreshold = '40s'

core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml

@@ -1,6 +1,6 @@
 ChainID = '2358'
 ChainType = 'kroma' # Kroma is based on the Optimism Bedrock architechture
-FinalityDepth = 400
+FinalityDepth = 700
 FinalityTagEnabled = true
 LogPollInterval = '2s'
 NoNewHeadsThreshold = '40s'

core/chains/evm/config/toml/defaults/Linea_Mainnet.toml

@@ -1,6 +1,6 @@
 ChainID = '59144'
-# Block time 12s, finality < 60m
-FinalityDepth = 300
+#3s block time ~ 20m finality based on committee decision
+FinalityDepth = 600
 # Blocks are only emitted when a transaction happens / no empty blocks
 NoNewHeadsThreshold = '0'
 

core/chains/evm/config/toml/defaults/Linea_Sepolia.toml

@@ -1,5 +1,5 @@
 ChainID = '59141'
-FinalityDepth = 900
+FinalityDepth = 200
 NoNewHeadsThreshold = '0'
 
 [GasEstimator]

core/chains/evm/config/toml/defaults/Mantle_Sepolia.toml

@@ -1,14 +1,15 @@
 ChainID = '5003'
 ChainType = 'optimismBedrock'
-FinalityDepth = 500
+FinalityDepth = 1200
+FinalityTagEnabled = true
 LogPollInterval = '2s'
 NoNewHeadsThreshold = '0'
 MinIncomingConfirmations = 1
 
 [HeadTracker]
 HistoryDepth = 600
 
-[GasEstimator]     
+[GasEstimator]
 Mode = 'L2Suggested'
 PriceMax = '200 gwei'
 LimitDefault = 100000000

core/chains/evm/config/toml/defaults/Metis_Mainnet.toml

@@ -2,7 +2,7 @@
 ChainID = '1088'
 ChainType = 'metis'
 # Sequencer offers absolute finality
-FinalityDepth = 10
+FinalityDepth = 500
 FinalityTagEnabled = true
 MinIncomingConfirmations = 1
 NoNewHeadsThreshold = '0'

core/chains/evm/config/toml/defaults/Metis_Rinkeby.toml

@@ -1,6 +1,6 @@
 ChainID = '588'
 ChainType = 'metis'
-FinalityDepth = 10
+FinalityDepth = 3000
 MinIncomingConfirmations = 1
 NoNewHeadsThreshold = '0'
 OCR.ContractConfirmations = 1

core/chains/evm/config/toml/defaults/Metis_Sepolia.toml

@@ -1,6 +1,6 @@
 ChainID = '59902'
+FinalityDepth = 3000
 ChainType = 'optimismBedrock'
-FinalityDepth = 10
 FinalityTagEnabled = true
 MinIncomingConfirmations = 1
 NoNewHeadsThreshold = '0'

core/chains/evm/config/toml/defaults/Polygon_Zkevm_Mainnet.toml

@@ -1,6 +1,6 @@
 ChainID = '1101'
 ChainType = 'zkevm'
-FinalityDepth = 500
+FinalityDepth = 1000
 NoNewHeadsThreshold = '6m'
 MinIncomingConfirmations = 1
 LogPollInterval = '30s'

core/chains/evm/config/toml/defaults/XLayer_Mainnet.toml

@@ -1,6 +1,6 @@
 ChainID = '196'
 ChainType = 'xlayer'
-FinalityDepth = 500
+FinalityDepth = 1000
 NoNewHeadsThreshold = '6m'
 MinIncomingConfirmations = 1
 LogPollInterval = '30s'

core/chains/evm/config/toml/defaults/zkSync_Goerli.toml

@@ -1,6 +1,6 @@
 ChainID = '280'
 ChainType = 'zksync'
-FinalityDepth = 10
+FinalityDepth = 300
 LogPollInterval = '5s'
 MinIncomingConfirmations = 1
 NoNewHeadsThreshold = '1m'

core/chains/evm/config/toml/defaults/zkSync_Sepolia.toml

@@ -1,23 +1,23 @@
 ChainID = '300'
 ChainType = 'zksync'
 # 200block ~ 20min concurrent with the l1_committed tag
-FinalityDepth = 200  
+FinalityDepth = 200
 # block rate is ~2-5sec, so this ensures blocks are polled correctly
 LogPollInterval = '5s'
 # sufficient time for RPC to be labelled out of sync, since blockRate is pretty fast
 NoNewHeadsThreshold = '1m'
 
 [GasEstimator]
-# no EIP1559 to ensure our estimator doesnot estimate gas with MaxPriorityFee which will break minFunding requirement 
-EIP1559DynamicFees = false 
-# high LimitDefault for worst case pubdata bytes with BatchGasLimit reduced to 4M in OCR2Config  
+# no EIP1559 to ensure our estimator doesnot estimate gas with MaxPriorityFee which will break minFunding requirement
+EIP1559DynamicFees = false
+# high LimitDefault for worst case pubdata bytes with BatchGasLimit reduced to 4M in OCR2Config
 LimitDefault = 2_500_000_000
 FeeCapDefault = '500 mwei'
 PriceDefault = '25 mwei'
 # p999 value for gasPrice based on historical data
 PriceMax = '500 mwei'
 # avg gasPrices are at 0.025 gwei
-PriceMin = '25 mwei' 
+PriceMin = '25 mwei'
 
 [GasEstimator.BlockHistory]
 # increasing this to smooth out gas estimation

docs/CONFIG.md

@@ -3445,7 +3445,7 @@ AutoCreateKey = true
 BlockBackfillDepth = 10
 BlockBackfillSkip = false
 ChainType = 'xlayer'
-FinalityDepth = 500
+FinalityDepth = 1000
 FinalityTagEnabled = false
 LogBackfillBatchSize = 1000
 LogPollInterval = '30s'
@@ -3641,7 +3641,7 @@ AutoCreateKey = true
 BlockBackfillDepth = 10
 BlockBackfillSkip = false
 ChainType = 'kroma'
-FinalityDepth = 400
+FinalityDepth = 700
 FinalityTagEnabled = true
 LogBackfillBatchSize = 1000
 LogPollInterval = '2s'
@@ -3739,7 +3739,7 @@ AutoCreateKey = true
 BlockBackfillDepth = 10
 BlockBackfillSkip = false
 ChainType = 'zksync'
-FinalityDepth = 10
+FinalityDepth = 300
 FinalityTagEnabled = false
 LogBackfillBatchSize = 1000
 LogPollInterval = '5s'
@@ -4132,7 +4132,7 @@ AutoCreateKey = true
 BlockBackfillDepth = 10
 BlockBackfillSkip = false
 ChainType = 'metis'
-FinalityDepth = 10
+FinalityDepth = 3000
 FinalityTagEnabled = false
 LogBackfillBatchSize = 1000
 LogPollInterval = '15s'
@@ -4524,7 +4524,7 @@ AutoCreateKey = true
 BlockBackfillDepth = 10
 BlockBackfillSkip = false
 ChainType = 'metis'
-FinalityDepth = 10
+FinalityDepth = 500
 FinalityTagEnabled = true
 LogBackfillBatchSize = 1000
 LogPollInterval = '15s'
@@ -4622,7 +4622,7 @@ AutoCreateKey = true
 BlockBackfillDepth = 10
 BlockBackfillSkip = false
 ChainType = 'zkevm'
-FinalityDepth = 500
+FinalityDepth = 1000
 FinalityTagEnabled = false
 LogBackfillBatchSize = 1000
 LogPollInterval = '30s'
@@ -5013,7 +5013,7 @@ AutoCreateKey = true
 BlockBackfillDepth = 10
 BlockBackfillSkip = false
 ChainType = 'kroma'
-FinalityDepth = 400
+FinalityDepth = 700
 FinalityTagEnabled = true
 LogBackfillBatchSize = 1000
 LogPollInterval = '2s'
@@ -5307,8 +5307,8 @@ AutoCreateKey = true
 BlockBackfillDepth = 10
 BlockBackfillSkip = false
 ChainType = 'optimismBedrock'
-FinalityDepth = 500
-FinalityTagEnabled = false
+FinalityDepth = 1200
+FinalityTagEnabled = true
 LogBackfillBatchSize = 1000
 LogPollInterval = '2s'
 LogKeepBlocksDepth = 100000
@@ -6096,7 +6096,7 @@ BlockBackfillDepth = 10
 BlockBackfillSkip = false
 ChainType = 'celo'
 FinalityDepth = 10
-FinalityTagEnabled = false
+FinalityTagEnabled = true
 LogBackfillBatchSize = 1000
 LogPollInterval = '5s'
 LogKeepBlocksDepth = 100000
@@ -6390,7 +6390,7 @@ BlockBackfillDepth = 10
 BlockBackfillSkip = false
 ChainType = 'celo'
 FinalityDepth = 10
-FinalityTagEnabled = false
+FinalityTagEnabled = true
 LogBackfillBatchSize = 1000
 LogPollInterval = '5s'
 LogKeepBlocksDepth = 100000
@@ -6785,7 +6785,7 @@ GasLimit = 5400000
 AutoCreateKey = true
 BlockBackfillDepth = 10
 BlockBackfillSkip = false
-FinalityDepth = 900
+FinalityDepth = 200
 FinalityTagEnabled = false
 LogBackfillBatchSize = 1000
 LogPollInterval = '15s'
@@ -6882,7 +6882,7 @@ GasLimit = 5400000
 AutoCreateKey = true
 BlockBackfillDepth = 10
 BlockBackfillSkip = false
-FinalityDepth = 300
+FinalityDepth = 600
 FinalityTagEnabled = false
 LogBackfillBatchSize = 1000
 LogPollInterval = '15s'
@@ -6980,7 +6980,7 @@ AutoCreateKey = true
 BlockBackfillDepth = 10
 BlockBackfillSkip = false
 ChainType = 'optimismBedrock'
-FinalityDepth = 10
+FinalityDepth = 3000
 FinalityTagEnabled = true
 LogBackfillBatchSize = 1000
 LogPollInterval = '15s'