Revert "set FinalityTagBypass=false for chains with FinalityDepth<1k" (…

…#1580) Reverts #1526 During release we have noticed big amount of errors from head_tracker ` {"level":"crit","ts":"2024-12-17T16:45:40.464Z","logger":"EVM.43114.HeadTracker","caller":"headtracker/head_tracker.go:196","msg":"invariant violation: expected head of canonical chain to be ahead of the latestFinalized","version":"2.17.0-ccip1.5.14@a0e08e1","head_block_num":54475496,"latest_finalized_block_number":54475497,"sentryEventID":null,"stacktrace":"github.com/smartcontractkit/chainlink/v2/common/headtracker.(*headTracker[...]).Backfill\n\t/chainlink/common/headtracker/head_tracker.go:196\ngithub.com/smartcontractkit/chainlink/v2/common/headtracker.(*headTracker[...]).backfillLoop\n\t/chainlink/common/headtracker/head_tracker.go:307\ngithub.com/smartcontractkit/chainlink-common/pkg/services.(*Engine).Go.func1\n\t/go/pkg/mod/github.com/smartcontractkit/[email protected]/pkg/services/service.go:61"}`
smartcontractkit · Dec 17, 2024 · c279cbb · c279cbb
1 parent 654cc22
commit c279cbb
Show file tree

Hide file tree

Showing 101 changed files with 85 additions and 434 deletions.
diff --git a/ccip/config/evm/Astar_Mainnet.toml b/ccip/config/evm/Astar_Mainnet.toml
@@ -6,9 +6,4 @@ LogPollInterval = '6s'
 [GasEstimator]
 EIP1559DynamicFees = false
 PriceMax = '100000 gwei'
-LimitDefault = 8000000
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
+LimitDefault = 8000000
diff --git a/ccip/config/evm/Astar_Shibuya.toml b/ccip/config/evm/Astar_Shibuya.toml
@@ -6,9 +6,4 @@ LogPollInterval = '6s'
 [GasEstimator]
 EIP1559DynamicFees = false
 PriceMax = '100000 gwei'
-LimitDefault = 8000000
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
+LimitDefault = 8000000
diff --git a/ccip/config/evm/Avalanche_ANZ_testnet.toml b/ccip/config/evm/Avalanche_ANZ_testnet.toml
@@ -17,8 +17,3 @@ PriceMin = '25 gwei'
 
 [GasEstimator.BlockHistory]
 BlockHistorySize = 24
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/Avalanche_Mainnet.toml b/ccip/config/evm/Avalanche_Mainnet.toml
@@ -16,8 +16,3 @@ PriceDefault = '1 gwei'
 [GasEstimator.BlockHistory]
 # Average block time of 2s
 BlockHistorySize = 24
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/BSC_Mainnet.toml b/ccip/config/evm/BSC_Mainnet.toml
@@ -26,8 +26,3 @@ ObservationGracePeriod = '500ms'
 
 [NodePool]
 SyncThreshold = 10
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/Base_Mainnet.toml b/ccip/config/evm/Base_Mainnet.toml
@@ -20,9 +20,6 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 300
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10

diff --git a/ccip/config/evm/Base_Sepolia.toml b/ccip/config/evm/Base_Sepolia.toml
@@ -21,9 +21,6 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 300
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10

diff --git a/ccip/config/evm/Blast_Mainnet.toml b/ccip/config/evm/Blast_Mainnet.toml
@@ -26,9 +26,6 @@ EIP1559FeeCapBufferBlocks = 0
 
 [HeadTracker]
 HistoryDepth = 300
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
 
 [NodePool]
 # 4 block sync time between nodes to ensure they aren't labelled unreachable too soon

diff --git a/ccip/config/evm/Blast_Sepolia.toml b/ccip/config/evm/Blast_Sepolia.toml
@@ -26,9 +26,6 @@ EIP1559FeeCapBufferBlocks = 0
 
 [HeadTracker]
 HistoryDepth = 300
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
 
 [NodePool]
 # 4 block sync time between nodes to ensure they aren't labelled unreachable too soon

diff --git a/ccip/config/evm/Celo_Mainnet.toml b/ccip/config/evm/Celo_Mainnet.toml
@@ -18,6 +18,3 @@ BlockHistorySize = 12
 
 [HeadTracker]
 HistoryDepth = 50
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/Gnosis_Chiado.toml b/ccip/config/evm/Gnosis_Chiado.toml
@@ -8,8 +8,3 @@ NoNewFinalizedHeadsThreshold = '2m'
 [GasEstimator]
 EIP1559DynamicFees = true
 PriceMax = '500 gwei'
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/Kroma_Mainnet.toml b/ccip/config/evm/Kroma_Mainnet.toml
@@ -19,9 +19,6 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 400
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10

diff --git a/ccip/config/evm/Kroma_Sepolia.toml b/ccip/config/evm/Kroma_Sepolia.toml
@@ -19,9 +19,6 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 400
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10

diff --git a/ccip/config/evm/L3X_Mainnet.toml b/ccip/config/evm/L3X_Mainnet.toml
@@ -16,8 +16,3 @@ PriceMin = '0'
 PriceDefault = '0.1 gwei'
 FeeCapDefault = '1000 gwei'
 BumpThreshold = 5
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/L3X_Sepolia.toml b/ccip/config/evm/L3X_Sepolia.toml
@@ -16,8 +16,3 @@ PriceMin = '0'
 PriceDefault = '0.1 gwei'
 FeeCapDefault = '1000 gwei'
 BumpThreshold = 5
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/Linea_Mainnet.toml b/ccip/config/evm/Linea_Mainnet.toml
@@ -15,6 +15,3 @@ ResendAfterThreshold = '3m'
 # set greater than finality depth
 [HeadTracker]
 HistoryDepth = 350
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/Linea_Sepolia.toml b/ccip/config/evm/Linea_Sepolia.toml
@@ -10,7 +10,4 @@ PriceMin = '1 wei'
 ResendAfterThreshold = '3m'
 
 [HeadTracker]
-HistoryDepth = 1000
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
+HistoryDepth = 1000
diff --git a/ccip/config/evm/Mantle_Sepolia.toml b/ccip/config/evm/Mantle_Sepolia.toml
@@ -7,11 +7,8 @@ MinIncomingConfirmations = 1
 
 [HeadTracker]
 HistoryDepth = 600
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
 
-[GasEstimator]
+[GasEstimator]     
 Mode = 'L2Suggested'
 PriceMax = '200 gwei'
 LimitDefault = 100000000

diff --git a/ccip/config/evm/Metis_Mainnet.toml b/ccip/config/evm/Metis_Mainnet.toml
@@ -19,8 +19,3 @@ BlockHistorySize = 0
 
 [NodePool]
 SyncThreshold = 10
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/Metis_Sepolia.toml b/ccip/config/evm/Metis_Sepolia.toml
@@ -15,8 +15,3 @@ BlockHistorySize = 0
 
 [NodePool]
 SyncThreshold = 10
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/Mode_Mainnet.toml b/ccip/config/evm/Mode_Mainnet.toml
@@ -24,9 +24,6 @@ EIP1559FeeCapBufferBlocks = 0
 
 [HeadTracker]
 HistoryDepth = 300
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 2

diff --git a/ccip/config/evm/Mode_Sepolia.toml b/ccip/config/evm/Mode_Sepolia.toml
@@ -24,9 +24,6 @@ EIP1559FeeCapBufferBlocks = 0
 
 [HeadTracker]
 HistoryDepth = 300
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
 
 [NodePool]
 PollFailureThreshold = 2

diff --git a/ccip/config/evm/Optimism_Mainnet.toml b/ccip/config/evm/Optimism_Mainnet.toml
@@ -21,9 +21,6 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 300
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10

diff --git a/ccip/config/evm/Optimism_Sepolia.toml b/ccip/config/evm/Optimism_Sepolia.toml
@@ -20,9 +20,6 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 300
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10

diff --git a/ccip/config/evm/Polygon_Amoy.toml b/ccip/config/evm/Polygon_Amoy.toml
@@ -23,9 +23,6 @@ BlockHistorySize = 24
 
 [HeadTracker]
 HistoryDepth = 2000
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/ccip/config/evm/Polygon_Mainnet.toml b/ccip/config/evm/Polygon_Mainnet.toml
@@ -33,9 +33,6 @@ BlockHistorySize = 24
 [HeadTracker]
 # Polygon suffers from a tremendous number of re-orgs, we need to set this to something very large to be conservative enough
 HistoryDepth = 2000
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10
diff --git a/ccip/config/evm/Polygon_Zkevm_Mainnet.toml b/ccip/config/evm/Polygon_Zkevm_Mainnet.toml
@@ -24,6 +24,3 @@ BlockHistorySize = 12
 [HeadTracker]
 # Polygon suffers from a tremendous number of re-orgs, we need to set this to something very large to be conservative enough
 HistoryDepth = 2000
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/Scroll_Mainnet.toml b/ccip/config/evm/Scroll_Mainnet.toml
@@ -17,9 +17,6 @@ BlockHistorySize = 24
 
 [HeadTracker]
 HistoryDepth = 50
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
 
 [OCR]
 ContractConfirmations = 1
diff --git a/ccip/config/evm/Scroll_Sepolia.toml b/ccip/config/evm/Scroll_Sepolia.toml
@@ -17,9 +17,6 @@ BlockHistorySize = 24
 
 [HeadTracker]
 HistoryDepth = 50
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
 
 [OCR]
 ContractConfirmations = 1
diff --git a/ccip/config/evm/Simulated.toml b/ccip/config/evm/Simulated.toml
@@ -19,9 +19,6 @@ PriceMax = '100 micro'
 HistoryDepth = 10
 MaxBufferSize = 100
 SamplingInterval = '0s'
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
 
 [OCR]
 ContractConfirmations = 1
diff --git a/ccip/config/evm/WeMix_Mainnet.toml b/ccip/config/evm/WeMix_Mainnet.toml
@@ -14,8 +14,3 @@ ContractConfirmations = 1
 [GasEstimator]
 EIP1559DynamicFees = true
 TipCapDefault = '100 gwei'
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/WeMix_Testnet.toml b/ccip/config/evm/WeMix_Testnet.toml
@@ -16,6 +16,4 @@ EIP1559DynamicFees = true
 TipCapDefault = '100 gwei'
 
 [HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
 FinalityTagBypass = false
diff --git a/ccip/config/evm/XLayer_Mainnet.toml b/ccip/config/evm/XLayer_Mainnet.toml
@@ -23,6 +23,3 @@ BlockHistorySize = 12
 
 [HeadTracker]
 HistoryDepth = 2000
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/XLayer_Sepolia.toml b/ccip/config/evm/XLayer_Sepolia.toml
@@ -23,6 +23,3 @@ BlockHistorySize = 12
 
 [HeadTracker]
 HistoryDepth = 2000
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Astar_Mainnet.toml b/core/chains/evm/config/toml/defaults/Astar_Mainnet.toml
@@ -7,9 +7,4 @@ LogPollInterval = '6s'
 [GasEstimator]
 EIP1559DynamicFees = false
 PriceMax = '100000 gwei'
-LimitDefault = 8000000
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
+LimitDefault = 8000000
diff --git a/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml b/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml
@@ -6,9 +6,4 @@ LogPollInterval = '6s'
 [GasEstimator]
 EIP1559DynamicFees = false
 PriceMax = '100000 gwei'
-LimitDefault = 8000000
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
+LimitDefault = 8000000
diff --git a/core/chains/evm/config/toml/defaults/Avalanche_ANZ_testnet.toml b/core/chains/evm/config/toml/defaults/Avalanche_ANZ_testnet.toml
@@ -17,8 +17,3 @@ PriceMin = '25 gwei'
 
 [GasEstimator.BlockHistory]
 BlockHistorySize = 24
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Avalanche_Fuji.toml b/core/chains/evm/config/toml/defaults/Avalanche_Fuji.toml
@@ -17,6 +17,4 @@ PriceDefault = '1 gwei'
 BlockHistorySize = 24
 
 [HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
 FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Avalanche_Mainnet.toml b/core/chains/evm/config/toml/defaults/Avalanche_Mainnet.toml
@@ -16,8 +16,3 @@ PriceDefault = '1 gwei'
 [GasEstimator.BlockHistory]
 # Average block time of 2s
 BlockHistorySize = 24
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/BOB_Mainnet.toml b/core/chains/evm/config/toml/defaults/BOB_Mainnet.toml
@@ -21,8 +21,3 @@ CacheTimeout = '4s'
 
 [GasEstimator.BlockHistory]
 BlockHistorySize = 100
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false