update defaults for NoNewFinalizedHeadsThreshold

smartcontractkit · Jul 21, 2024 · 84d4767 · 84d4767
1 parent 3b0d090
commit 84d4767
Show file tree

Hide file tree

Showing 27 changed files with 94 additions and 77 deletions.
diff --git a/core/chains/evm/config/toml/defaults/Avalanche_Fuji.toml b/core/chains/evm/config/toml/defaults/Avalanche_Fuji.toml
@@ -6,6 +6,7 @@ MinIncomingConfirmations = 1
 NoNewHeadsThreshold = '30s'
 OCR.ContractConfirmations = 1
 RPCBlockQueryDelay = 2
+NoNewFinalizedHeadsThreshold = '1m'
 
 [GasEstimator]
 PriceDefault = '25 gwei'

diff --git a/core/chains/evm/config/toml/defaults/Avalanche_Mainnet.toml b/core/chains/evm/config/toml/defaults/Avalanche_Mainnet.toml
@@ -6,6 +6,7 @@ MinIncomingConfirmations = 1
 NoNewHeadsThreshold = '30s'
 OCR.ContractConfirmations = 1
 RPCBlockQueryDelay = 2
+NoNewFinalizedHeadsThreshold = '1m'
 
 [GasEstimator]
 PriceDefault = '25 gwei'

diff --git a/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml b/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml
@@ -6,6 +6,7 @@ LinkContractAddress = '0x404460C6A5EdE2D891e8297795264fDe62ADBB75'
 LogPollInterval = '3s'
 NoNewHeadsThreshold = '30s'
 RPCBlockQueryDelay = 2
+NoNewFinalizedHeadsThreshold = '45s'
 
 [GasEstimator]
 PriceDefault = '5 gwei'

diff --git a/core/chains/evm/config/toml/defaults/BSC_Testnet.toml b/core/chains/evm/config/toml/defaults/BSC_Testnet.toml
@@ -6,6 +6,7 @@ LinkContractAddress = '0x84b9B910527Ad5C03A9Ca831909E21e236EA7b06'
 LogPollInterval = '3s'
 NoNewHeadsThreshold = '30s'
 RPCBlockQueryDelay = 2
+NoNewFinalizedHeadsThreshold = '40s'
 
 [GasEstimator]
 PriceDefault = '5 gwei'

diff --git a/core/chains/evm/config/toml/defaults/Base_Mainnet.toml b/core/chains/evm/config/toml/defaults/Base_Mainnet.toml
@@ -4,6 +4,7 @@ FinalityDepth = 200
 LogPollInterval = '2s'
 NoNewHeadsThreshold = '40s'
 MinIncomingConfirmations = 1
+NoNewFinalizedHeadsThreshold = '15m'
 
 [GasEstimator]
 EIP1559DynamicFees = true

diff --git a/core/chains/evm/config/toml/defaults/Base_Sepolia.toml b/core/chains/evm/config/toml/defaults/Base_Sepolia.toml
@@ -4,6 +4,7 @@ FinalityDepth = 200
 LogPollInterval = '2s'
 NoNewHeadsThreshold = '40s'
 MinIncomingConfirmations = 1
+NoNewFinalizedHeadsThreshold = '12m'
 
 [GasEstimator]
 EIP1559DynamicFees = true

diff --git a/core/chains/evm/config/toml/defaults/Celo_Mainnet.toml b/core/chains/evm/config/toml/defaults/Celo_Mainnet.toml
@@ -5,6 +5,7 @@ LogPollInterval = '5s'
 MinIncomingConfirmations = 1
 NoNewHeadsThreshold = '1m'
 OCR.ContractConfirmations = 1
+NoNewFinalizedHeadsThreshold = '1m'
 
 [GasEstimator]
 PriceDefault = '5 gwei'

diff --git a/core/chains/evm/config/toml/defaults/Celo_Testnet.toml b/core/chains/evm/config/toml/defaults/Celo_Testnet.toml
@@ -5,6 +5,7 @@ LogPollInterval = '5s'
 MinIncomingConfirmations = 1
 NoNewHeadsThreshold = '1m'
 OCR.ContractConfirmations = 1
+NoNewFinalizedHeadsThreshold = '1m'
 
 [GasEstimator]
 PriceDefault = '5 gwei'

diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml b/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml
@@ -2,6 +2,7 @@ ChainID = '1'
 LinkContractAddress = '0x514910771AF9Ca656af840dff83E8264EcF986CA'
 MinContractPayment = '0.1 link'
 OperatorFactoryAddress = '0x3E64Cd889482443324F91bFA9c84fE72A511f48A'
+NoNewFinalizedHeadsThreshold = '9m'
 
 [GasEstimator]
 EIP1559DynamicFees = true

diff --git a/core/chains/evm/config/toml/defaults/Gnosis_Chiado.toml b/core/chains/evm/config/toml/defaults/Gnosis_Chiado.toml
@@ -3,6 +3,7 @@ ChainID = '10200'
 FinalityDepth = 100
 ChainType = 'gnosis'
 LogPollInterval = '5s'
+NoNewFinalizedHeadsThreshold = '2m'
 
 [GasEstimator]
 EIP1559DynamicFees = true

diff --git a/core/chains/evm/config/toml/defaults/Gnosis_Mainnet.toml b/core/chains/evm/config/toml/defaults/Gnosis_Mainnet.toml
@@ -9,6 +9,7 @@ ChainID = '100'
 ChainType = 'gnosis'
 LinkContractAddress = '0xE2e73A1c69ecF83F464EFCE6A5be353a37cA09b2'
 LogPollInterval = '5s'
+NoNewFinalizedHeadsThreshold = '2m'
 
 [GasEstimator]
 PriceDefault = '1 gwei'

diff --git a/core/chains/evm/config/toml/defaults/Optimism_Mainnet.toml b/core/chains/evm/config/toml/defaults/Optimism_Mainnet.toml
@@ -5,6 +5,7 @@ LinkContractAddress = '0x350a791Bfc2C21F9Ed5d10980Dad2e2638ffa7f6'
 LogPollInterval = '2s'
 NoNewHeadsThreshold = '40s'
 MinIncomingConfirmations = 1
+NoNewFinalizedHeadsThreshold = '13m'
 
 [GasEstimator]
 EIP1559DynamicFees = true

diff --git a/core/chains/evm/config/toml/defaults/Optimism_Sepolia.toml b/core/chains/evm/config/toml/defaults/Optimism_Sepolia.toml
@@ -4,6 +4,7 @@ FinalityDepth = 200
 LogPollInterval = '2s'
 NoNewHeadsThreshold = '40s'
 MinIncomingConfirmations = 1
+NoNewFinalizedHeadsThreshold = '15m'
 
 [GasEstimator]
 EIP1559DynamicFees = true

diff --git a/core/chains/evm/config/toml/defaults/Polygon_Amoy.toml b/core/chains/evm/config/toml/defaults/Polygon_Amoy.toml
@@ -5,6 +5,7 @@ MinIncomingConfirmations = 5
 NoNewHeadsThreshold = '30s'
 RPCBlockQueryDelay = 10
 RPCDefaultBatchSize = 100
+NoNewFinalizedHeadsThreshold = '12m'
 
 [Transactions]
 MaxQueued = 5000

diff --git a/core/chains/evm/config/toml/defaults/Polygon_Mainnet.toml b/core/chains/evm/config/toml/defaults/Polygon_Mainnet.toml
@@ -9,6 +9,7 @@ NoNewHeadsThreshold = '30s'
 # Must be set to something large here because Polygon has so many re-orgs that otherwise we are constantly refetching
 RPCBlockQueryDelay = 10
 RPCDefaultBatchSize = 100
+NoNewFinalizedHeadsThreshold = '6m'
 
 [Transactions]
 # Matic nodes under high mempool pressure are liable to drop txes, we need to ensure we keep sending them

diff --git a/core/chains/evm/config/toml/defaults/WeMix_Mainnet.toml b/core/chains/evm/config/toml/defaults/WeMix_Mainnet.toml
@@ -5,6 +5,7 @@ MinIncomingConfirmations = 1
 # WeMix emits a block every 1 second, regardless of transactions
 LogPollInterval = '3s'
 NoNewHeadsThreshold = '30s'
+NoNewFinalizedHeadsThreshold = '40s'
 
 [OCR]
 ContractConfirmations = 1

diff --git a/core/chains/evm/config/toml/defaults/WeMix_Testnet.toml b/core/chains/evm/config/toml/defaults/WeMix_Testnet.toml
@@ -5,6 +5,7 @@ MinIncomingConfirmations = 1
 # WeMix emits a block every 1 second, regardless of transactions
 LogPollInterval = '3s'
 NoNewHeadsThreshold = '30s'
+NoNewFinalizedHeadsThreshold = '40s'
 
 [OCR]
 ContractConfirmations = 1

diff --git a/core/chains/evm/config/toml/defaults/fallback.toml b/core/chains/evm/config/toml/defaults/fallback.toml
@@ -15,7 +15,7 @@ NoNewHeadsThreshold = '3m'
 RPCDefaultBatchSize = 250
 RPCBlockQueryDelay = 1
 FinalizedBlockOffset = 0
-NoNewFinalizedHeadsThreshold = '15m'
+NoNewFinalizedHeadsThreshold = '0'
 
 [Transactions]
 ForwardersEnabled = false

diff --git a/core/config/docs/chains-evm.toml b/core/config/docs/chains-evm.toml
@@ -97,11 +97,11 @@ RPCBlockQueryDelay = 1 # Default
 # Block 64 will be treated as finalized by CL Node only when chain's latest finalized block is 65. As chain finalizes blocks in batches of 32,
 # CL Node has to wait for a whole new batch to be finalized to treat block 64 as finalized.
 FinalizedBlockOffset = 0 # Default
-# NoNewFinalizedHeadsThreshold controls how long to wait after receiving no new finalized blocks before `NodePool` marks rpc endpoints as
-# finalized-block-out-of-sync
+# NoNewFinalizedHeadsThreshold controls how long to wait for new finalized block before `NodePool` marks rpc endpoints as
+# out-of-sync. Only applicable if `FinalityTagEnabled=true`
 #
-# Set to zero to disable time-based finalized-block-out-of-sync checking.
-NoNewFinalizedHeadsThreshold = '15m' # Default
+# Set to zero to disable.
+NoNewFinalizedHeadsThreshold = '0' # Default
 
 [EVM.Transactions]
 # ForwardersEnabled enables or disables sending transactions through forwarder contracts.

diff --git a/core/services/chainlink/testdata/config-multi-chain-effective.toml b/core/services/chainlink/testdata/config-multi-chain-effective.toml
@@ -277,7 +277,7 @@ OperatorFactoryAddress = '0x3E64Cd889482443324F91bFA9c84fE72A511f48A'
 RPCDefaultBatchSize = 250
 RPCBlockQueryDelay = 1
 FinalizedBlockOffset = 12
-NoNewFinalizedHeadsThreshold = '15m0s'
+NoNewFinalizedHeadsThreshold = '9m0s'
 
 [EVM.Transactions]
 ForwardersEnabled = false
@@ -377,7 +377,7 @@ OperatorFactoryAddress = '0x8007e24251b1D2Fc518Eb843A701d9cD21fe0aA3'
 RPCDefaultBatchSize = 250
 RPCBlockQueryDelay = 1
 FinalizedBlockOffset = 0
-NoNewFinalizedHeadsThreshold = '15m0s'
+NoNewFinalizedHeadsThreshold = '0s'
 
 [EVM.Transactions]
 ForwardersEnabled = false
@@ -471,7 +471,7 @@ NoNewHeadsThreshold = '30s'
 RPCDefaultBatchSize = 100
 RPCBlockQueryDelay = 10
 FinalizedBlockOffset = 0
-NoNewFinalizedHeadsThreshold = '15m0s'
+NoNewFinalizedHeadsThreshold = '6m0s'
 
 [EVM.Transactions]
 ForwardersEnabled = false

diff --git a/core/web/resolver/testdata/config-multi-chain-effective.toml b/core/web/resolver/testdata/config-multi-chain-effective.toml
@@ -277,7 +277,7 @@ OperatorFactoryAddress = '0x3E64Cd889482443324F91bFA9c84fE72A511f48A'
 RPCDefaultBatchSize = 250
 RPCBlockQueryDelay = 1
 FinalizedBlockOffset = 0
-NoNewFinalizedHeadsThreshold = '15m0s'
+NoNewFinalizedHeadsThreshold = '9m0s'
 
 [EVM.Transactions]
 ForwardersEnabled = false
@@ -377,7 +377,7 @@ OperatorFactoryAddress = '0x8007e24251b1D2Fc518Eb843A701d9cD21fe0aA3'
 RPCDefaultBatchSize = 250
 RPCBlockQueryDelay = 1
 FinalizedBlockOffset = 0
-NoNewFinalizedHeadsThreshold = '15m0s'
+NoNewFinalizedHeadsThreshold = '0s'
 
 [EVM.Transactions]
 ForwardersEnabled = false
@@ -471,7 +471,7 @@ NoNewHeadsThreshold = '30s'
 RPCDefaultBatchSize = 100
 RPCBlockQueryDelay = 10
 FinalizedBlockOffset = 0
-NoNewFinalizedHeadsThreshold = '15m0s'
+NoNewFinalizedHeadsThreshold = '6m0s'
 
 [EVM.Transactions]
 ForwardersEnabled = false