From c279cbb4ab57436b9c59c9321492e25f0aa30e80 Mon Sep 17 00:00:00 2001 From: Aleksandr Bukata <96521086+bukata-sa@users.noreply.github.com> Date: Tue, 17 Dec 2024 18:19:05 +0000 Subject: [PATCH] Revert "set FinalityTagBypass=false for chains with FinalityDepth<1k" (#1580) Reverts smartcontractkit/ccip#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/chainlink-common@v0.2.3-0.20240925085218-aded1b263ecc/pkg/services/service.go:61"}` --- ccip/config/evm/Astar_Mainnet.toml | 7 +- ccip/config/evm/Astar_Shibuya.toml | 7 +- ccip/config/evm/Avalanche_ANZ_testnet.toml | 5 - ccip/config/evm/Avalanche_Mainnet.toml | 5 - ccip/config/evm/BSC_Mainnet.toml | 5 - ccip/config/evm/Base_Mainnet.toml | 3 - ccip/config/evm/Base_Sepolia.toml | 3 - ccip/config/evm/Blast_Mainnet.toml | 3 - ccip/config/evm/Blast_Sepolia.toml | 3 - ccip/config/evm/Celo_Mainnet.toml | 3 - ccip/config/evm/Gnosis_Chiado.toml | 5 - ccip/config/evm/Kroma_Mainnet.toml | 3 - ccip/config/evm/Kroma_Sepolia.toml | 3 - ccip/config/evm/L3X_Mainnet.toml | 5 - ccip/config/evm/L3X_Sepolia.toml | 5 - ccip/config/evm/Linea_Mainnet.toml | 3 - ccip/config/evm/Linea_Sepolia.toml | 5 +- ccip/config/evm/Mantle_Sepolia.toml | 5 +- ccip/config/evm/Metis_Mainnet.toml | 5 - ccip/config/evm/Metis_Sepolia.toml | 5 - ccip/config/evm/Mode_Mainnet.toml | 3 - ccip/config/evm/Mode_Sepolia.toml | 3 - ccip/config/evm/Optimism_Mainnet.toml | 3 - ccip/config/evm/Optimism_Sepolia.toml | 3 - ccip/config/evm/Polygon_Amoy.toml | 3 - ccip/config/evm/Polygon_Mainnet.toml | 3 - ccip/config/evm/Polygon_Zkevm_Mainnet.toml | 3 - ccip/config/evm/Scroll_Mainnet.toml | 3 - ccip/config/evm/Scroll_Sepolia.toml | 3 - ccip/config/evm/Simulated.toml | 3 - ccip/config/evm/WeMix_Mainnet.toml | 5 - ccip/config/evm/WeMix_Testnet.toml | 2 - ccip/config/evm/XLayer_Mainnet.toml | 3 - ccip/config/evm/XLayer_Sepolia.toml | 3 - .../config/toml/defaults/Astar_Mainnet.toml | 7 +- .../config/toml/defaults/Astar_Shibuya.toml | 7 +- .../toml/defaults/Avalanche_ANZ_testnet.toml | 5 - .../config/toml/defaults/Avalanche_Fuji.toml | 2 - .../toml/defaults/Avalanche_Mainnet.toml | 5 - .../evm/config/toml/defaults/BOB_Mainnet.toml | 5 - .../evm/config/toml/defaults/BOB_Testnet.toml | 9 +- .../evm/config/toml/defaults/BSC_Mainnet.toml | 5 - .../evm/config/toml/defaults/BSC_Testnet.toml | 2 - .../evm/config/toml/defaults/Base_Goerli.toml | 3 - .../config/toml/defaults/Base_Mainnet.toml | 3 - .../config/toml/defaults/Base_Sepolia.toml | 3 - .../toml/defaults/Berachain_Testnet.toml | 5 - .../toml/defaults/Bitlayer_Mainnet.toml | 7 +- .../toml/defaults/Bitlayer_Testnet.toml | 7 +- .../config/toml/defaults/Blast_Mainnet.toml | 5 +- .../config/toml/defaults/Blast_Sepolia.toml | 5 +- .../config/toml/defaults/Celo_Mainnet.toml | 3 - .../toml/defaults/Ethereum_Mainnet.toml | 5 - .../toml/defaults/Ethereum_Sepolia.toml | 2 - .../config/toml/defaults/Fantom_Mainnet.toml | 7 +- .../config/toml/defaults/Fantom_Testnet.toml | 7 +- .../config/toml/defaults/Gnosis_Chiado.toml | 5 - .../config/toml/defaults/Gnosis_Mainnet.toml | 5 - .../config/toml/defaults/Harmony_Mainnet.toml | 5 - .../config/toml/defaults/Harmony_Testnet.toml | 5 - .../config/toml/defaults/Heco_Mainnet.toml | 5 - .../config/toml/defaults/Hedera_Mainnet.toml | 10 +- .../config/toml/defaults/Hedera_Testnet.toml | 10 +- .../config/toml/defaults/Klaytn_Mainnet.toml | 5 - .../config/toml/defaults/Klaytn_Testnet.toml | 5 - .../config/toml/defaults/Kroma_Mainnet.toml | 3 - .../config/toml/defaults/Kroma_Sepolia.toml | 3 - .../evm/config/toml/defaults/L3X_Mainnet.toml | 5 - .../evm/config/toml/defaults/L3X_Sepolia.toml | 5 - .../config/toml/defaults/Linea_Goerli.toml | 5 - .../config/toml/defaults/Linea_Mainnet.toml | 3 - .../config/toml/defaults/Linea_Sepolia.toml | 3 - .../config/toml/defaults/Metis_Mainnet.toml | 5 - .../config/toml/defaults/Mode_Mainnet.toml | 3 - .../config/toml/defaults/Mode_Sepolia.toml | 3 - .../config/toml/defaults/Optimism_Goerli.toml | 3 - .../toml/defaults/Optimism_Mainnet.toml | 3 - .../toml/defaults/Optimism_Sepolia.toml | 3 - .../config/toml/defaults/Polygon_Amoy.toml | 3 - .../config/toml/defaults/Polygon_Mainnet.toml | 3 - .../config/toml/defaults/Polygon_Mumbai.toml | 3 - .../toml/defaults/Polygon_Zkevm_Cardona.toml | 3 - .../config/toml/defaults/Ronin_Mainnet.toml | 5 - .../config/toml/defaults/Ronin_Saigon.toml | 5 - .../config/toml/defaults/Scroll_Mainnet.toml | 3 - .../config/toml/defaults/Scroll_Sepolia.toml | 3 - .../evm/config/toml/defaults/Simulated.toml | 3 - .../config/toml/defaults/Soneium_Sepolia.toml | 3 - .../config/toml/defaults/WeMix_Mainnet.toml | 5 - .../config/toml/defaults/WeMix_Testnet.toml | 2 - .../config/toml/defaults/XLayer_Sepolia.toml | 3 - .../config/toml/defaults/zkSync_Mainnet.toml | 2 +- .../config/toml/defaults/zkSync_Sepolia.toml | 5 +- .../config-multi-chain-effective.toml | 4 +- .../config-multi-chain-effective.toml | 4 +- docs/CONFIG.md | 108 +++++++++--------- .../disk-based-logging-disabled.txtar | 2 +- .../validate/disk-based-logging-no-dir.txtar | 2 +- .../node/validate/disk-based-logging.txtar | 2 +- testdata/scripts/node/validate/invalid.txtar | 2 +- testdata/scripts/node/validate/valid.txtar | 2 +- 101 files changed, 85 insertions(+), 434 deletions(-) diff --git a/ccip/config/evm/Astar_Mainnet.toml b/ccip/config/evm/Astar_Mainnet.toml index ac84c2b07e..87808001eb 100644 --- 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 \ No newline at end of file +LimitDefault = 8000000 \ No newline at end of file diff --git a/ccip/config/evm/Astar_Shibuya.toml b/ccip/config/evm/Astar_Shibuya.toml index cf45a67391..5a5df06f6f 100644 --- 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 \ No newline at end of file diff --git a/ccip/config/evm/Avalanche_ANZ_testnet.toml b/ccip/config/evm/Avalanche_ANZ_testnet.toml index 936a82d509..4833881bf4 100644 --- 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 index ac73a7b98f..0d96561bcc 100644 --- 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 index c2cf25d796..10f4c570be 100644 --- 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 index 0f895e1bc6..da38182b19 100644 --- 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 index 202c544fb4..92f7717b27 100644 --- 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 index 12278f846e..f8b501723f 100644 --- 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 index b7dc88d384..96dc5c6787 100644 --- 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 index 720a223e23..a494862037 100644 --- 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 index 320aa08720..379377a226 100644 --- 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 index 4dfded30bb..3a48aa8ae1 100644 --- 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 index 56adcdbeac..9609a09e07 100644 --- 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 index 73f368b371..1fbda42fd2 100644 --- 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 \ No newline at end of file diff --git a/ccip/config/evm/L3X_Sepolia.toml b/ccip/config/evm/L3X_Sepolia.toml index 9f51669e56..ee515bb72b 100644 --- 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 \ No newline at end of file diff --git a/ccip/config/evm/Linea_Mainnet.toml b/ccip/config/evm/Linea_Mainnet.toml index 34dac36a1b..94d8bedc44 100644 --- 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 \ No newline at end of file diff --git a/ccip/config/evm/Linea_Sepolia.toml b/ccip/config/evm/Linea_Sepolia.toml index 252ae16565..ac5e18a09b 100644 --- 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 \ No newline at end of file +HistoryDepth = 1000 \ No newline at end of file diff --git a/ccip/config/evm/Mantle_Sepolia.toml b/ccip/config/evm/Mantle_Sepolia.toml index 126358febd..ee994a7182 100644 --- 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 index 02cd8dab60..f057400d01 100644 --- 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 index f52ba9db3d..4ff4056c75 100644 --- 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 \ No newline at end of file diff --git a/ccip/config/evm/Mode_Mainnet.toml b/ccip/config/evm/Mode_Mainnet.toml index b586cdacc7..69a8e93fec 100644 --- 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 index d621010b4e..f7398869be 100644 --- 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 index e139877549..b0f56a49d9 100644 --- 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 index 2590feec51..1c71aa5dd8 100644 --- 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 index 1e31c483ad..b05b3053a8 100644 --- 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 index 555dbfff81..bf605cab3c 100644 --- 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 index 40d73f44fa..79e0cb0fce 100644 --- 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 index 2ed53b3268..4a887b504d 100644 --- 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 index cf5bf743df..b2e1cfbd73 100644 --- 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 index 4ec8d962b2..52e78c94ed 100644 --- 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 index a4e742d730..7d3fcc6bc2 100644 --- 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 index bfb75f158e..5775097967 100644 --- 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 index 0f6cb83636..4096a4db24 100644 --- 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 index 67df0e5246..62e2c1e8ad 100644 --- 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 index 5405a67d56..d1697d137a 100644 --- 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 \ No newline at end of file diff --git a/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml b/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml index cfcd7c31c7..5a5df06f6f 100644 --- 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 \ No newline at end of file +LimitDefault = 8000000 \ No newline at end of file diff --git a/core/chains/evm/config/toml/defaults/Avalanche_ANZ_testnet.toml b/core/chains/evm/config/toml/defaults/Avalanche_ANZ_testnet.toml index 936a82d509..4833881bf4 100644 --- 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 index 4340b6b861..03f67180b9 100644 --- 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 index ac73a7b98f..0d96561bcc 100644 --- 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 index 70cc2fb8ba..9644c69198 100644 --- 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 diff --git a/core/chains/evm/config/toml/defaults/BOB_Testnet.toml b/core/chains/evm/config/toml/defaults/BOB_Testnet.toml index bd8505c4e4..f0d20f8c96 100644 --- 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' # FinalityDepth in mainnet showed more than 3k FinalityDepth = 3150 -# block_time was: 2s, adding 1 second buffer -LogPollInterval = '3s' +# block_time was: 2s, adding 1 second buffer +LogPollInterval = '3s' # finality_depth * block_time / 60 secs = ~105 min (finality time) NoNewFinalizedHeadsThreshold = '110m' @@ -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 diff --git a/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml b/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml index df140e6397..e95f0af1eb 100644 --- a/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml @@ -28,8 +28,3 @@ ObservationGracePeriod = '500ms' [NodePool] SyncThreshold = 10 - -[HeadTracker] -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false diff --git a/core/chains/evm/config/toml/defaults/BSC_Testnet.toml b/core/chains/evm/config/toml/defaults/BSC_Testnet.toml index 9c528f816e..b27a877812 100644 --- a/core/chains/evm/config/toml/defaults/BSC_Testnet.toml +++ b/core/chains/evm/config/toml/defaults/BSC_Testnet.toml @@ -22,8 +22,6 @@ BlockHistorySize = 24 [HeadTracker] HistoryDepth = 100 SamplingInterval = '1s' -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 FinalityTagBypass = false [OCR] diff --git a/core/chains/evm/config/toml/defaults/Base_Goerli.toml b/core/chains/evm/config/toml/defaults/Base_Goerli.toml index f1bc1399fd..f9b2e29e9e 100644 --- a/core/chains/evm/config/toml/defaults/Base_Goerli.toml +++ b/core/chains/evm/config/toml/defaults/Base_Goerli.toml @@ -19,9 +19,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/core/chains/evm/config/toml/defaults/Base_Mainnet.toml b/core/chains/evm/config/toml/defaults/Base_Mainnet.toml index 0f895e1bc6..da38182b19 100644 --- a/core/chains/evm/config/toml/defaults/Base_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/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/core/chains/evm/config/toml/defaults/Base_Sepolia.toml b/core/chains/evm/config/toml/defaults/Base_Sepolia.toml index 202c544fb4..92f7717b27 100644 --- a/core/chains/evm/config/toml/defaults/Base_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/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/core/chains/evm/config/toml/defaults/Berachain_Testnet.toml b/core/chains/evm/config/toml/defaults/Berachain_Testnet.toml index 9fc810e890..7024d12a99 100644 --- a/core/chains/evm/config/toml/defaults/Berachain_Testnet.toml +++ b/core/chains/evm/config/toml/defaults/Berachain_Testnet.toml @@ -17,8 +17,3 @@ CacheTimeout = '10s' [GasEstimator.BlockHistory] BlockHistorySize = 100 - -[HeadTracker] -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false diff --git a/core/chains/evm/config/toml/defaults/Bitlayer_Mainnet.toml b/core/chains/evm/config/toml/defaults/Bitlayer_Mainnet.toml index f6d669d4f7..9c68d1d932 100644 --- a/core/chains/evm/config/toml/defaults/Bitlayer_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Bitlayer_Mainnet.toml @@ -8,9 +8,4 @@ EIP1559DynamicFees = false PriceMax = '1 gwei' # DS&A recommended value PriceMin = '40 mwei' # During testing, we saw minimum gas prices ~50 mwei PriceDefault = '1 gwei' # As we set PriceMax to '1 gwei' and PriceDefault must be less than or equal to PriceMax -FeeCapDefault = '1 gwei' # As we set PriceMax to '1 gwei' and FeeCapDefault must be less than or equal to PriceMax - -[HeadTracker] -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false +FeeCapDefault = '1 gwei' # As we set PriceMax to '1 gwei' and FeeCapDefault must be less than or equal to PriceMax \ No newline at end of file diff --git a/core/chains/evm/config/toml/defaults/Bitlayer_Testnet.toml b/core/chains/evm/config/toml/defaults/Bitlayer_Testnet.toml index 7107527ce2..0abba07420 100644 --- a/core/chains/evm/config/toml/defaults/Bitlayer_Testnet.toml +++ b/core/chains/evm/config/toml/defaults/Bitlayer_Testnet.toml @@ -8,9 +8,4 @@ EIP1559DynamicFees = false PriceMax = '1 gwei' # DS&A recommended value PriceMin = '40 mwei' # During testing, we saw minimum gas prices ~50 mwei PriceDefault = '1 gwei' # As we set PriceMax to '1 gwei' and PriceDefault must be less than or equal to PriceMax -FeeCapDefault = '1 gwei' # As we set PriceMax to '1 gwei' and FeeCapDefault must be less than or equal to PriceMax - -[HeadTracker] -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false +FeeCapDefault = '1 gwei' # As we set PriceMax to '1 gwei' and FeeCapDefault must be less than or equal to PriceMax \ No newline at end of file diff --git a/core/chains/evm/config/toml/defaults/Blast_Mainnet.toml b/core/chains/evm/config/toml/defaults/Blast_Mainnet.toml index 26ecddeec5..f8b501723f 100644 --- a/core/chains/evm/config/toml/defaults/Blast_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Blast_Mainnet.toml @@ -26,12 +26,9 @@ 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 PollFailureThreshold = 4 # polls every 4sec to check if there is a block produced, since blockRate is ~3sec -PollInterval = '4s' +PollInterval = '4s' \ No newline at end of file diff --git a/core/chains/evm/config/toml/defaults/Blast_Sepolia.toml b/core/chains/evm/config/toml/defaults/Blast_Sepolia.toml index 55f2356ad3..96dc5c6787 100644 --- a/core/chains/evm/config/toml/defaults/Blast_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/Blast_Sepolia.toml @@ -26,12 +26,9 @@ 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 PollFailureThreshold = 4 # polls every 4sec to check if there is a block produced, since blockRate is ~3sec -PollInterval = '4s' +PollInterval = '4s' \ No newline at end of file diff --git a/core/chains/evm/config/toml/defaults/Celo_Mainnet.toml b/core/chains/evm/config/toml/defaults/Celo_Mainnet.toml index 9da7d632d0..e33f97750b 100644 --- a/core/chains/evm/config/toml/defaults/Celo_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Celo_Mainnet.toml @@ -22,6 +22,3 @@ BlockHistorySize = 12 [HeadTracker] HistoryDepth = 50 -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml b/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml index ec3a78156e..0bcaf35c64 100644 --- a/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml @@ -15,8 +15,3 @@ TransactionPercentile = 50 [OCR2.Automation] GasLimit = 10500000 - -[HeadTracker] -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml index 966f091f89..24a0e68f77 100644 --- a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml @@ -14,6 +14,4 @@ TransactionPercentile = 50 GasLimit = 10500000 [HeadTracker] -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 FinalityTagBypass = false diff --git a/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml b/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml index 2af504796e..7e76d94278 100644 --- a/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml @@ -9,9 +9,4 @@ RPCBlockQueryDelay = 2 Mode = 'SuggestedPrice' [OCR2.Automation] -GasLimit = 3800000 - -[HeadTracker] -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false +GasLimit = 3800000 \ No newline at end of file diff --git a/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml b/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml index b361a8d14d..5f24a76c2e 100644 --- a/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml +++ b/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml @@ -9,9 +9,4 @@ RPCBlockQueryDelay = 2 Mode = 'SuggestedPrice' [OCR2.Automation] -GasLimit = 3800000 - -[HeadTracker] -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false +GasLimit = 3800000 \ No newline at end of file diff --git a/core/chains/evm/config/toml/defaults/Gnosis_Chiado.toml b/core/chains/evm/config/toml/defaults/Gnosis_Chiado.toml index 320aa08720..379377a226 100644 --- a/core/chains/evm/config/toml/defaults/Gnosis_Chiado.toml +++ b/core/chains/evm/config/toml/defaults/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/core/chains/evm/config/toml/defaults/Gnosis_Mainnet.toml b/core/chains/evm/config/toml/defaults/Gnosis_Mainnet.toml index ec8ac227f7..628646364f 100644 --- a/core/chains/evm/config/toml/defaults/Gnosis_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Gnosis_Mainnet.toml @@ -16,8 +16,3 @@ PriceDefault = '1 gwei' PriceMax = '500 gwei' # 1 Gwei is the minimum accepted by the validators (unless whitelisted) PriceMin = '1 gwei' - -[HeadTracker] -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false diff --git a/core/chains/evm/config/toml/defaults/Harmony_Mainnet.toml b/core/chains/evm/config/toml/defaults/Harmony_Mainnet.toml index 1cee98e77c..e90d2ff7b4 100644 --- a/core/chains/evm/config/toml/defaults/Harmony_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Harmony_Mainnet.toml @@ -6,8 +6,3 @@ NoNewHeadsThreshold = '30s' [GasEstimator] PriceDefault = '5 gwei' - -[HeadTracker] -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false diff --git a/core/chains/evm/config/toml/defaults/Harmony_Testnet.toml b/core/chains/evm/config/toml/defaults/Harmony_Testnet.toml index 8b7c85b9c2..382e3b215d 100644 --- a/core/chains/evm/config/toml/defaults/Harmony_Testnet.toml +++ b/core/chains/evm/config/toml/defaults/Harmony_Testnet.toml @@ -6,8 +6,3 @@ NoNewHeadsThreshold = '30s' [GasEstimator] PriceDefault = '5 gwei' - -[HeadTracker] -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false diff --git a/core/chains/evm/config/toml/defaults/Heco_Mainnet.toml b/core/chains/evm/config/toml/defaults/Heco_Mainnet.toml index a39e405be3..b3d4074dba 100644 --- a/core/chains/evm/config/toml/defaults/Heco_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Heco_Mainnet.toml @@ -19,8 +19,3 @@ ObservationGracePeriod = '500ms' [NodePool] SyncThreshold = 10 - -[HeadTracker] -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false diff --git a/core/chains/evm/config/toml/defaults/Hedera_Mainnet.toml b/core/chains/evm/config/toml/defaults/Hedera_Mainnet.toml index fdd6528e0a..4d5e48816f 100644 --- a/core/chains/evm/config/toml/defaults/Hedera_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Hedera_Mainnet.toml @@ -3,7 +3,7 @@ ChainType = 'hedera' # Considering the 3-5 (6 including a buffer) seconds of finality and 2 seconds block production # We set the depth to 6/2 = 3 blocks, setting to 10 for safety FinalityDepth = 10 -# Hedera has high TPS, so polling less often +# Hedera has high TPS, so polling less often LogPollInterval = '10s' MinIncomingConfirmations = 1 @@ -26,10 +26,6 @@ BumpPercent = 20 # Accounting for Node syncs & avoid re-sending txns before fetching the receipt, setting to 2m ResendAfterThreshold = '2m' -[NodePool] -SyncThreshold = 10 -[HeadTracker] -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false +[NodePool] +SyncThreshold = 10 \ No newline at end of file diff --git a/core/chains/evm/config/toml/defaults/Hedera_Testnet.toml b/core/chains/evm/config/toml/defaults/Hedera_Testnet.toml index 7e9ec3fe2c..6086a43af2 100644 --- a/core/chains/evm/config/toml/defaults/Hedera_Testnet.toml +++ b/core/chains/evm/config/toml/defaults/Hedera_Testnet.toml @@ -3,7 +3,7 @@ ChainType = 'hedera' # Considering the 3-5 (6 including a buffer) seconds of finality and 2 seconds block production # We set the depth to 6/2 = 3 blocks, setting to 10 for safety FinalityDepth = 10 -# Hedera has high TPS, so polling less often +# Hedera has high TPS, so polling less often LogPollInterval = '10s' MinIncomingConfirmations = 1 @@ -26,10 +26,6 @@ BumpPercent = 20 # Accounting for Node syncs & avoid re-sending txns before fetching the receipt, setting to 2m ResendAfterThreshold = '2m' -[NodePool] -SyncThreshold = 10 -[HeadTracker] -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false +[NodePool] +SyncThreshold = 10 \ No newline at end of file diff --git a/core/chains/evm/config/toml/defaults/Klaytn_Mainnet.toml b/core/chains/evm/config/toml/defaults/Klaytn_Mainnet.toml index ff8b97de97..7cf7c2d62e 100644 --- a/core/chains/evm/config/toml/defaults/Klaytn_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Klaytn_Mainnet.toml @@ -8,8 +8,3 @@ OCR.ContractConfirmations = 1 Mode = 'SuggestedPrice' PriceDefault = '750 gwei' # gwei = ston BumpThreshold = 5 - -[HeadTracker] -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false diff --git a/core/chains/evm/config/toml/defaults/Klaytn_Testnet.toml b/core/chains/evm/config/toml/defaults/Klaytn_Testnet.toml index 599b604f08..a938d46c5c 100644 --- a/core/chains/evm/config/toml/defaults/Klaytn_Testnet.toml +++ b/core/chains/evm/config/toml/defaults/Klaytn_Testnet.toml @@ -8,8 +8,3 @@ OCR.ContractConfirmations = 1 Mode = 'SuggestedPrice' PriceDefault = '750 gwei' # gwei = ston BumpThreshold = 5 - -[HeadTracker] -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false diff --git a/core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml b/core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml index 21bbe7c357..38af765684 100644 --- a/core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml @@ -22,9 +22,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/core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml b/core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml index 120737df47..b1e505df22 100644 --- a/core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml @@ -22,9 +22,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/core/chains/evm/config/toml/defaults/L3X_Mainnet.toml b/core/chains/evm/config/toml/defaults/L3X_Mainnet.toml index 5f14e5e8e8..1fbda42fd2 100644 --- a/core/chains/evm/config/toml/defaults/L3X_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/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/core/chains/evm/config/toml/defaults/L3X_Sepolia.toml b/core/chains/evm/config/toml/defaults/L3X_Sepolia.toml index ca21bc13d6..ee515bb72b 100644 --- a/core/chains/evm/config/toml/defaults/L3X_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/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/core/chains/evm/config/toml/defaults/Linea_Goerli.toml b/core/chains/evm/config/toml/defaults/Linea_Goerli.toml index 2c85f9cbc0..915727267d 100644 --- a/core/chains/evm/config/toml/defaults/Linea_Goerli.toml +++ b/core/chains/evm/config/toml/defaults/Linea_Goerli.toml @@ -10,8 +10,3 @@ BumpPercent = 40 [Transactions] # increase resend time to align with finality ResendAfterThreshold = '3m' - -[HeadTracker] -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false diff --git a/core/chains/evm/config/toml/defaults/Linea_Mainnet.toml b/core/chains/evm/config/toml/defaults/Linea_Mainnet.toml index 6614fef9d4..54fedca215 100644 --- a/core/chains/evm/config/toml/defaults/Linea_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Linea_Mainnet.toml @@ -15,9 +15,6 @@ ResendAfterThreshold = '3m' # set greater than finality depth [HeadTracker] HistoryDepth = 350 -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false [Transactions.AutoPurge] Enabled = true diff --git a/core/chains/evm/config/toml/defaults/Linea_Sepolia.toml b/core/chains/evm/config/toml/defaults/Linea_Sepolia.toml index 2837c7ca60..4397b19c77 100644 --- a/core/chains/evm/config/toml/defaults/Linea_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/Linea_Sepolia.toml @@ -11,9 +11,6 @@ ResendAfterThreshold = '3m' [HeadTracker] HistoryDepth = 1000 -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false [Transactions.AutoPurge] Enabled = true diff --git a/core/chains/evm/config/toml/defaults/Metis_Mainnet.toml b/core/chains/evm/config/toml/defaults/Metis_Mainnet.toml index a95945e9f1..d6bfe2cd5a 100644 --- a/core/chains/evm/config/toml/defaults/Metis_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Metis_Mainnet.toml @@ -25,8 +25,3 @@ BlockHistorySize = 0 [NodePool] SyncThreshold = 10 - -[HeadTracker] -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false diff --git a/core/chains/evm/config/toml/defaults/Mode_Mainnet.toml b/core/chains/evm/config/toml/defaults/Mode_Mainnet.toml index b586cdacc7..69a8e93fec 100644 --- a/core/chains/evm/config/toml/defaults/Mode_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/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/core/chains/evm/config/toml/defaults/Mode_Sepolia.toml b/core/chains/evm/config/toml/defaults/Mode_Sepolia.toml index d621010b4e..f7398869be 100644 --- a/core/chains/evm/config/toml/defaults/Mode_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/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/core/chains/evm/config/toml/defaults/Optimism_Goerli.toml b/core/chains/evm/config/toml/defaults/Optimism_Goerli.toml index 69db0d31ad..c227a08cf2 100644 --- a/core/chains/evm/config/toml/defaults/Optimism_Goerli.toml +++ b/core/chains/evm/config/toml/defaults/Optimism_Goerli.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/core/chains/evm/config/toml/defaults/Optimism_Mainnet.toml b/core/chains/evm/config/toml/defaults/Optimism_Mainnet.toml index e139877549..b0f56a49d9 100644 --- a/core/chains/evm/config/toml/defaults/Optimism_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/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/core/chains/evm/config/toml/defaults/Optimism_Sepolia.toml b/core/chains/evm/config/toml/defaults/Optimism_Sepolia.toml index 2590feec51..1c71aa5dd8 100644 --- a/core/chains/evm/config/toml/defaults/Optimism_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/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/core/chains/evm/config/toml/defaults/Polygon_Amoy.toml b/core/chains/evm/config/toml/defaults/Polygon_Amoy.toml index eb75eab271..bca42d9b40 100644 --- a/core/chains/evm/config/toml/defaults/Polygon_Amoy.toml +++ b/core/chains/evm/config/toml/defaults/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/core/chains/evm/config/toml/defaults/Polygon_Mainnet.toml b/core/chains/evm/config/toml/defaults/Polygon_Mainnet.toml index 555dbfff81..bf605cab3c 100644 --- a/core/chains/evm/config/toml/defaults/Polygon_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/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/core/chains/evm/config/toml/defaults/Polygon_Mumbai.toml b/core/chains/evm/config/toml/defaults/Polygon_Mumbai.toml index 83f275a064..134a0822d0 100644 --- a/core/chains/evm/config/toml/defaults/Polygon_Mumbai.toml +++ b/core/chains/evm/config/toml/defaults/Polygon_Mumbai.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/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Cardona.toml b/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Cardona.toml index 146c23a802..5e5bc57370 100644 --- a/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Cardona.toml +++ b/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Cardona.toml @@ -24,9 +24,6 @@ CacheTimeout = '4s' [HeadTracker] HistoryDepth = 2000 -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false [Transactions.AutoPurge] Enabled = true diff --git a/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml b/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml index 14bb9d1e25..84831b9b4c 100644 --- a/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Ronin_Mainnet.toml @@ -9,8 +9,3 @@ NoNewHeadsThreshold = "3m" # Ronin uses default gas price of 20 gwei https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview Mode = 'FeeHistory' PriceMax = "1000 gwei" - -[HeadTracker] -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false diff --git a/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml b/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml index b775f8f062..bf08485242 100644 --- a/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml +++ b/core/chains/evm/config/toml/defaults/Ronin_Saigon.toml @@ -9,8 +9,3 @@ NoNewHeadsThreshold = "3m" # Ronin uses default gas price of 20 gwei https://docs.skymavis.com/mavis/mpc/guides/estimate-gas#overview Mode = 'FeeHistory' PriceMax = "1000 gwei" - -[HeadTracker] -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false diff --git a/core/chains/evm/config/toml/defaults/Scroll_Mainnet.toml b/core/chains/evm/config/toml/defaults/Scroll_Mainnet.toml index f0449ef12b..b8e7bd09e8 100644 --- a/core/chains/evm/config/toml/defaults/Scroll_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/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/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml b/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml index aca06ae18d..baee2080d9 100644 --- a/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/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/core/chains/evm/config/toml/defaults/Simulated.toml b/core/chains/evm/config/toml/defaults/Simulated.toml index 4ec8d962b2..52e78c94ed 100644 --- a/core/chains/evm/config/toml/defaults/Simulated.toml +++ b/core/chains/evm/config/toml/defaults/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/core/chains/evm/config/toml/defaults/Soneium_Sepolia.toml b/core/chains/evm/config/toml/defaults/Soneium_Sepolia.toml index e0ea59ca22..9f4772dd9a 100755 --- a/core/chains/evm/config/toml/defaults/Soneium_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/Soneium_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/core/chains/evm/config/toml/defaults/WeMix_Mainnet.toml b/core/chains/evm/config/toml/defaults/WeMix_Mainnet.toml index a4e742d730..7d3fcc6bc2 100644 --- a/core/chains/evm/config/toml/defaults/WeMix_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/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/core/chains/evm/config/toml/defaults/WeMix_Testnet.toml b/core/chains/evm/config/toml/defaults/WeMix_Testnet.toml index bfb75f158e..5775097967 100644 --- a/core/chains/evm/config/toml/defaults/WeMix_Testnet.toml +++ b/core/chains/evm/config/toml/defaults/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/core/chains/evm/config/toml/defaults/XLayer_Sepolia.toml b/core/chains/evm/config/toml/defaults/XLayer_Sepolia.toml index 163d909542..2aa6e58469 100644 --- a/core/chains/evm/config/toml/defaults/XLayer_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/XLayer_Sepolia.toml @@ -23,9 +23,6 @@ BlockHistorySize = 12 [HeadTracker] HistoryDepth = 2000 -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false [Transactions.AutoPurge] Enabled = true diff --git a/core/chains/evm/config/toml/defaults/zkSync_Mainnet.toml b/core/chains/evm/config/toml/defaults/zkSync_Mainnet.toml index 64ab770758..a434cd3815 100644 --- a/core/chains/evm/config/toml/defaults/zkSync_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/zkSync_Mainnet.toml @@ -25,4 +25,4 @@ BlockHistorySize = 200 [HeadTracker] # tracks top N blocks to keep in heads database table. Should store atleast the same # of blocks as finalityDepth -HistoryDepth = 1500 +HistoryDepth = 1500 \ No newline at end of file diff --git a/core/chains/evm/config/toml/defaults/zkSync_Sepolia.toml b/core/chains/evm/config/toml/defaults/zkSync_Sepolia.toml index 5eaa4b9680..6c36ac0ebb 100644 --- a/core/chains/evm/config/toml/defaults/zkSync_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/zkSync_Sepolia.toml @@ -25,7 +25,4 @@ BlockHistorySize = 200 [HeadTracker] # tracks top N blocks to keep in heads database table. Should store atleast the same # of blocks as finalityDepth -HistoryDepth = 250 -# FinalityDepth < 1k => FinalityTagBypass = false -# https://smartcontract-it.atlassian.net/browse/SHIP-4078 -FinalityTagBypass = false +HistoryDepth = 250 \ No newline at end of file diff --git a/core/services/chainlink/testdata/config-multi-chain-effective.toml b/core/services/chainlink/testdata/config-multi-chain-effective.toml index a79f3fcc5e..096d5b1092 100644 --- a/core/services/chainlink/testdata/config-multi-chain-effective.toml +++ b/core/services/chainlink/testdata/config-multi-chain-effective.toml @@ -358,7 +358,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [EVM.NodePool] PollFailureThreshold = 5 @@ -570,7 +570,7 @@ HistoryDepth = 2000 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [EVM.NodePool] PollFailureThreshold = 5 diff --git a/core/web/resolver/testdata/config-multi-chain-effective.toml b/core/web/resolver/testdata/config-multi-chain-effective.toml index 851662b35f..7f29dc9704 100644 --- a/core/web/resolver/testdata/config-multi-chain-effective.toml +++ b/core/web/resolver/testdata/config-multi-chain-effective.toml @@ -358,7 +358,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [EVM.NodePool] PollFailureThreshold = 5 @@ -570,7 +570,7 @@ HistoryDepth = 2000 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [EVM.NodePool] PollFailureThreshold = 5 diff --git a/docs/CONFIG.md b/docs/CONFIG.md index 71180ee30b..97744f2557 100644 --- a/docs/CONFIG.md +++ b/docs/CONFIG.md @@ -2030,7 +2030,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -2443,7 +2443,7 @@ HistoryDepth = 300 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -2856,7 +2856,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -3162,7 +3162,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -3369,7 +3369,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -3472,7 +3472,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -3575,7 +3575,7 @@ HistoryDepth = 2000 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -3679,7 +3679,7 @@ HistoryDepth = 2000 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -3989,7 +3989,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -4092,7 +4092,7 @@ HistoryDepth = 400 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -4195,7 +4195,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -4298,7 +4298,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -4401,7 +4401,7 @@ HistoryDepth = 250 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -4608,7 +4608,7 @@ HistoryDepth = 300 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -4814,7 +4814,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -4918,7 +4918,7 @@ HistoryDepth = 300 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 2 @@ -5020,7 +5020,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -5123,7 +5123,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -5330,7 +5330,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -5741,7 +5741,7 @@ HistoryDepth = 10 MaxBufferSize = 100 SamplingInterval = '0s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -5845,7 +5845,7 @@ HistoryDepth = 300 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -5948,7 +5948,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -6051,7 +6051,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -6154,7 +6154,7 @@ HistoryDepth = 400 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -6258,7 +6258,7 @@ HistoryDepth = 2000 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -6361,7 +6361,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -6774,7 +6774,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -6877,7 +6877,7 @@ HistoryDepth = 300 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -6980,7 +6980,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -7084,7 +7084,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -7188,7 +7188,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -7292,7 +7292,7 @@ HistoryDepth = 300 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 2 @@ -7499,7 +7499,7 @@ HistoryDepth = 50 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -7705,7 +7705,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -8122,7 +8122,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -8226,7 +8226,7 @@ HistoryDepth = 1000 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -8330,7 +8330,7 @@ HistoryDepth = 350 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -8536,7 +8536,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -8639,7 +8639,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -8742,7 +8742,7 @@ HistoryDepth = 2000 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -8844,7 +8844,7 @@ HistoryDepth = 2000 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -8946,7 +8946,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -9050,7 +9050,7 @@ HistoryDepth = 300 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 4 @@ -9153,7 +9153,7 @@ HistoryDepth = 300 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -9257,7 +9257,7 @@ HistoryDepth = 300 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -9359,7 +9359,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -9461,7 +9461,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -9877,7 +9877,7 @@ HistoryDepth = 50 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -9981,7 +9981,7 @@ HistoryDepth = 50 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -10084,7 +10084,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -10290,7 +10290,7 @@ HistoryDepth = 300 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -10394,7 +10394,7 @@ HistoryDepth = 300 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 4 @@ -10497,7 +10497,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 @@ -10600,7 +10600,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [NodePool] PollFailureThreshold = 5 diff --git a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar index 5b451e42b7..2dd96b540c 100644 --- a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar +++ b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar @@ -414,7 +414,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [EVM.NodePool] PollFailureThreshold = 5 diff --git a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar index 031867ef40..bc097abbea 100644 --- a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar +++ b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar @@ -414,7 +414,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [EVM.NodePool] PollFailureThreshold = 5 diff --git a/testdata/scripts/node/validate/disk-based-logging.txtar b/testdata/scripts/node/validate/disk-based-logging.txtar index 6dbfe6b170..81872443b4 100644 --- a/testdata/scripts/node/validate/disk-based-logging.txtar +++ b/testdata/scripts/node/validate/disk-based-logging.txtar @@ -414,7 +414,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [EVM.NodePool] PollFailureThreshold = 5 diff --git a/testdata/scripts/node/validate/invalid.txtar b/testdata/scripts/node/validate/invalid.txtar index 06b7007477..1ff74c2bd7 100644 --- a/testdata/scripts/node/validate/invalid.txtar +++ b/testdata/scripts/node/validate/invalid.txtar @@ -404,7 +404,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [EVM.NodePool] PollFailureThreshold = 5 diff --git a/testdata/scripts/node/validate/valid.txtar b/testdata/scripts/node/validate/valid.txtar index 16ecb681d9..7ff9c4abc8 100644 --- a/testdata/scripts/node/validate/valid.txtar +++ b/testdata/scripts/node/validate/valid.txtar @@ -411,7 +411,7 @@ HistoryDepth = 100 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 -FinalityTagBypass = false +FinalityTagBypass = true [EVM.NodePool] PollFailureThreshold = 5