From fbaf4ea0c46903d2551c65ab5229f364d35c286c Mon Sep 17 00:00:00 2001
From: Aditya Vadhavkar
Date: Wed, 26 Jun 2024 16:28:27 -0400
Subject: [PATCH 01/17] Added missing FinalityDepth config in default toml
files.
---
core/chains/evm/config/toml/defaults/Arbitrum_Mainnet.toml | 1 +
core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml | 1 +
core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml | 1 +
core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml | 1 +
core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml | 1 +
core/chains/evm/config/toml/defaults/Fantom_Testnet.toml | 1 +
6 files changed, 6 insertions(+)
diff --git a/core/chains/evm/config/toml/defaults/Arbitrum_Mainnet.toml b/core/chains/evm/config/toml/defaults/Arbitrum_Mainnet.toml
index b297db1bc0f..91116cb9c6b 100644
--- a/core/chains/evm/config/toml/defaults/Arbitrum_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Arbitrum_Mainnet.toml
@@ -1,6 +1,7 @@
# Arbitrum is an L2 chain. Pending proper L2 support, for now we rely on their sequencer
ChainID = '42161'
ChainType = 'arbitrum'
+FinalityDepth = 10
LinkContractAddress = "0xf97f4df75117a78c1A5a0DBb814Af92458539FB4"
LogPollInterval = '1s'
# Arbitrum only emits blocks when a new tx is received, so this method of liveness detection is not useful
diff --git a/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml b/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml
index e6d660a2729..8842231b26a 100644
--- a/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml
@@ -1,5 +1,6 @@
ChainID = '421614'
ChainType = 'arbitrum'
+FinalityDepth = 10
NoNewHeadsThreshold = '0'
OCR.ContractConfirmations = 1
LogPollInterval = '1s'
diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml b/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml
index 2e65cce6330..f6bb717429f 100644
--- a/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml
@@ -1,5 +1,6 @@
ChainID = '1'
LinkContractAddress = '0x514910771AF9Ca656af840dff83E8264EcF986CA'
+FinalityDepth = 10
MinContractPayment = '0.1 link'
OperatorFactoryAddress = '0x3E64Cd889482443324F91bFA9c84fE72A511f48A'
diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml
index 1c46d4ca7cf..fe5ee93b079 100644
--- a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml
@@ -1,5 +1,6 @@
ChainID = '11155111'
LinkContractAddress = '0x779877A7B0D9E8603169DdbD7836e478b4624789'
+FinalityDepth = 10
MinContractPayment = '0.1 link'
[GasEstimator]
diff --git a/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml b/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml
index 7e76d94278d..e634edc6f0a 100644
--- a/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml
@@ -1,5 +1,6 @@
ChainID = '250'
LinkContractAddress = '0x6F43FF82CCA38001B6699a8AC47A2d0E66939407'
+FinalityDepth = 10
LogPollInterval = '1s'
NoNewHeadsThreshold = '30s'
RPCBlockQueryDelay = 2
diff --git a/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml b/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml
index 5f24a76c2e7..9e274a08c99 100644
--- a/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml
@@ -1,5 +1,6 @@
ChainID = '4002'
LinkContractAddress = '0xfaFedb041c0DD4fA2Dc0d87a6B0979Ee6FA7af5F'
+FinalityDepth = 10
LogPollInterval = '1s'
# Fantom testnet only emits blocks when a new tx is received, so this method of liveness detection is not useful
NoNewHeadsThreshold = '0'
From 926e1f0b596b5dac4437f7ba322751ce286738a2 Mon Sep 17 00:00:00 2001
From: Aditya Vadhavkar
Date: Thu, 27 Jun 2024 12:21:59 -0400
Subject: [PATCH 02/17] added changeset to the PR.
---
.changeset/wild-ducks-bake.md | 5 +++++
1 file changed, 5 insertions(+)
create mode 100644 .changeset/wild-ducks-bake.md
diff --git a/.changeset/wild-ducks-bake.md b/.changeset/wild-ducks-bake.md
new file mode 100644
index 00000000000..d080a2fbfd8
--- /dev/null
+++ b/.changeset/wild-ducks-bake.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#added FinalityDepth config where it was missing
From dc4fb584fda3d2a7da1f437f93df6ab98f68f983 Mon Sep 17 00:00:00 2001
From: Aditya Vadhavkar
Date: Thu, 27 Jun 2024 12:50:43 -0400
Subject: [PATCH 03/17] Updated docs/CONFIG.md
---
docs/CONFIG.md | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index 5f40d9fa69d..027bf610831 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -1761,7 +1761,7 @@ EVM defaults depend on ChainID:
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0x514910771AF9Ca656af840dff83E8264EcF986CA'
LogBackfillBatchSize = 1000
@@ -3293,7 +3293,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0x6F43FF82CCA38001B6699a8AC47A2d0E66939407'
LogBackfillBatchSize = 1000
@@ -4732,7 +4732,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0xfaFedb041c0DD4fA2Dc0d87a6B0979Ee6FA7af5F'
LogBackfillBatchSize = 1000
@@ -5092,7 +5092,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'arbitrum'
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0xf97f4df75117a78c1A5a0DBb814Af92458539FB4'
LogBackfillBatchSize = 1000
@@ -6441,7 +6441,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'arbitrum'
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LogBackfillBatchSize = 1000
LogPollInterval = '1s'
@@ -6710,7 +6710,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0x779877A7B0D9E8603169DdbD7836e478b4624789'
LogBackfillBatchSize = 1000
From 703c28a3250169dc261d8dc0bb275786c27d295b Mon Sep 17 00:00:00 2001
From: Aditya Vadhavkar
Date: Fri, 28 Jun 2024 09:34:43 -0400
Subject: [PATCH 04/17] Updated test config to resolve test failure.
---
.../scripts/node/validate/disk-based-logging-disabled.txtar | 2 +-
testdata/scripts/node/validate/disk-based-logging-no-dir.txtar | 2 +-
testdata/scripts/node/validate/disk-based-logging.txtar | 2 +-
testdata/scripts/node/validate/invalid.txtar | 2 +-
testdata/scripts/node/validate/valid.txtar | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
index 6e2a40beb7f..a330e400477 100644
--- a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
+++ b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
@@ -315,7 +315,7 @@ ChainID = '1'
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0x514910771AF9Ca656af840dff83E8264EcF986CA'
LogBackfillBatchSize = 1000
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 5db4e8527d3..01e9b41800e 100644
--- a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar
+++ b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar
@@ -315,7 +315,7 @@ ChainID = '1'
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0x514910771AF9Ca656af840dff83E8264EcF986CA'
LogBackfillBatchSize = 1000
diff --git a/testdata/scripts/node/validate/disk-based-logging.txtar b/testdata/scripts/node/validate/disk-based-logging.txtar
index bcf054cbca3..2a28017d1f3 100644
--- a/testdata/scripts/node/validate/disk-based-logging.txtar
+++ b/testdata/scripts/node/validate/disk-based-logging.txtar
@@ -315,7 +315,7 @@ ChainID = '1'
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0x514910771AF9Ca656af840dff83E8264EcF986CA'
LogBackfillBatchSize = 1000
diff --git a/testdata/scripts/node/validate/invalid.txtar b/testdata/scripts/node/validate/invalid.txtar
index 6b5932cfefd..bead5812eb8 100644
--- a/testdata/scripts/node/validate/invalid.txtar
+++ b/testdata/scripts/node/validate/invalid.txtar
@@ -305,7 +305,7 @@ ChainID = '1'
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0x514910771AF9Ca656af840dff83E8264EcF986CA'
LogBackfillBatchSize = 1000
diff --git a/testdata/scripts/node/validate/valid.txtar b/testdata/scripts/node/validate/valid.txtar
index 688829513e9..49a4339ecec 100644
--- a/testdata/scripts/node/validate/valid.txtar
+++ b/testdata/scripts/node/validate/valid.txtar
@@ -312,7 +312,7 @@ ChainID = '1'
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0x514910771AF9Ca656af840dff83E8264EcF986CA'
LogBackfillBatchSize = 1000
From 74457d1c870cf36fbd7199f457219b0cc4ebfa0b Mon Sep 17 00:00:00 2001
From: Aditya Vadhavkar
Date: Fri, 5 Jul 2024 10:13:15 -0400
Subject: [PATCH 05/17] Updated the changeset tag to internal.
---
.changeset/wild-ducks-bake.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.changeset/wild-ducks-bake.md b/.changeset/wild-ducks-bake.md
index d080a2fbfd8..cf34db81420 100644
--- a/.changeset/wild-ducks-bake.md
+++ b/.changeset/wild-ducks-bake.md
@@ -2,4 +2,4 @@
"chainlink": patch
---
-#added FinalityDepth config where it was missing
+#internal Added FinalityDepth config where it was missing
From ea5dc96c2907e2cf685c9bd4a15803e15e8be407 Mon Sep 17 00:00:00 2001
From: Aditya Vadhavkar
Date: Wed, 10 Jul 2024 14:09:24 -0400
Subject: [PATCH 06/17] Addressed PR comments
---
.../toml/defaults/Arbitrum_Mainnet.toml | 2 +-
.../toml/defaults/Arbitrum_Sepolia.toml | 1 -
.../toml/defaults/Ethereum_Mainnet.toml | 2 +-
.../toml/defaults/Ethereum_Sepolia.toml | 1 -
.../config/toml/defaults/Fantom_Mainnet.toml | 1 -
.../config/toml/defaults/Fantom_Testnet.toml | 1 -
.../evm/config/toml/defaults/fallback.toml | 2 +-
docs/CONFIG.md | 36 +++++++++----------
8 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/core/chains/evm/config/toml/defaults/Arbitrum_Mainnet.toml b/core/chains/evm/config/toml/defaults/Arbitrum_Mainnet.toml
index 91116cb9c6b..e19c06240a6 100644
--- a/core/chains/evm/config/toml/defaults/Arbitrum_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Arbitrum_Mainnet.toml
@@ -1,7 +1,7 @@
# Arbitrum is an L2 chain. Pending proper L2 support, for now we rely on their sequencer
ChainID = '42161'
ChainType = 'arbitrum'
-FinalityDepth = 10
+FinalityDepth = 4350
LinkContractAddress = "0xf97f4df75117a78c1A5a0DBb814Af92458539FB4"
LogPollInterval = '1s'
# Arbitrum only emits blocks when a new tx is received, so this method of liveness detection is not useful
diff --git a/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml b/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml
index 8842231b26a..e6d660a2729 100644
--- a/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml
@@ -1,6 +1,5 @@
ChainID = '421614'
ChainType = 'arbitrum'
-FinalityDepth = 10
NoNewHeadsThreshold = '0'
OCR.ContractConfirmations = 1
LogPollInterval = '1s'
diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml b/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml
index f6bb717429f..a9a359e6a97 100644
--- a/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml
@@ -1,6 +1,6 @@
ChainID = '1'
LinkContractAddress = '0x514910771AF9Ca656af840dff83E8264EcF986CA'
-FinalityDepth = 10
+FinalityDepth = 50
MinContractPayment = '0.1 link'
OperatorFactoryAddress = '0x3E64Cd889482443324F91bFA9c84fE72A511f48A'
diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml
index fe5ee93b079..1c46d4ca7cf 100644
--- a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml
@@ -1,6 +1,5 @@
ChainID = '11155111'
LinkContractAddress = '0x779877A7B0D9E8603169DdbD7836e478b4624789'
-FinalityDepth = 10
MinContractPayment = '0.1 link'
[GasEstimator]
diff --git a/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml b/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml
index e634edc6f0a..7e76d94278d 100644
--- a/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml
@@ -1,6 +1,5 @@
ChainID = '250'
LinkContractAddress = '0x6F43FF82CCA38001B6699a8AC47A2d0E66939407'
-FinalityDepth = 10
LogPollInterval = '1s'
NoNewHeadsThreshold = '30s'
RPCBlockQueryDelay = 2
diff --git a/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml b/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml
index 9e274a08c99..5f24a76c2e7 100644
--- a/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml
@@ -1,6 +1,5 @@
ChainID = '4002'
LinkContractAddress = '0xfaFedb041c0DD4fA2Dc0d87a6B0979Ee6FA7af5F'
-FinalityDepth = 10
LogPollInterval = '1s'
# Fantom testnet only emits blocks when a new tx is received, so this method of liveness detection is not useful
NoNewHeadsThreshold = '0'
diff --git a/core/chains/evm/config/toml/defaults/fallback.toml b/core/chains/evm/config/toml/defaults/fallback.toml
index 5a16aca091c..96a12e149d6 100644
--- a/core/chains/evm/config/toml/defaults/fallback.toml
+++ b/core/chains/evm/config/toml/defaults/fallback.toml
@@ -1,7 +1,7 @@
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LogBackfillBatchSize = 1000
LogPollInterval = '15s'
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index 027bf610831..eae86b4856a 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -1761,7 +1761,7 @@ EVM defaults depend on ChainID:
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0x514910771AF9Ca656af840dff83E8264EcF986CA'
LogBackfillBatchSize = 1000
@@ -1852,7 +1852,7 @@ GasLimit = 10500000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0x20fE562d797A42Dcb3399062AE9546cd06f63280'
LogBackfillBatchSize = 1000
@@ -1942,7 +1942,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0x01BE23585060835E02B77ef475b0Cc51aA1e0709'
LogBackfillBatchSize = 1000
@@ -2032,7 +2032,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0x326C977E6efc84E512bB9C30f76E30c160eD06FB'
LogBackfillBatchSize = 1000
@@ -2213,7 +2213,7 @@ GasLimit = 6500000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0x14AdaE34beF7ca957Ce2dDe5ADD97ea050123827'
LogBackfillBatchSize = 1000
@@ -2303,7 +2303,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0x8bBbd80981FE76d44854D8DF305e8985c19f0e78'
LogBackfillBatchSize = 1000
@@ -2393,7 +2393,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0xa36085F69e2889c224210F603D836748e7dC0088'
LogBackfillBatchSize = 1000
@@ -2484,7 +2484,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0x404460C6A5EdE2D891e8297795264fDe62ADBB75'
LogBackfillBatchSize = 1000
@@ -2574,7 +2574,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LogBackfillBatchSize = 1000
LogPollInterval = '15s'
@@ -2663,7 +2663,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LogBackfillBatchSize = 1000
LogPollInterval = '15s'
@@ -2752,7 +2752,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0x84b9B910527Ad5C03A9Ca831909E21e236EA7b06'
LogBackfillBatchSize = 1000
@@ -2843,7 +2843,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'gnosis'
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0xE2e73A1c69ecF83F464EFCE6A5be353a37cA09b2'
LogBackfillBatchSize = 1000
@@ -2933,7 +2933,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0x404460C6A5EdE2D891e8297795264fDe62ADBB75'
LogBackfillBatchSize = 1000
@@ -5092,7 +5092,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'arbitrum'
-FinalityDepth = 10
+FinalityDepth = 4350
FinalityTagEnabled = false
LinkContractAddress = '0xf97f4df75117a78c1A5a0DBb814Af92458539FB4'
LogBackfillBatchSize = 1000
@@ -6259,7 +6259,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'arbitrum'
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0x615fBe6372676474d9e6933d310469c9b68e9726'
LogBackfillBatchSize = 1000
@@ -6350,7 +6350,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'arbitrum'
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0xd14838A68E8AFBAdE5efb411d5871ea0011AFd28'
LogBackfillBatchSize = 1000
@@ -6890,7 +6890,7 @@ GasLimit = 6500000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0x218532a12a389a4a92fC0C5Fb22901D1c19198aA'
LogBackfillBatchSize = 1000
@@ -6980,7 +6980,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 50
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0x8b12Ac23BFe11cAb03a634C1F117D64a7f2cFD3e'
LogBackfillBatchSize = 1000
From e384dcd14c42cfbd36f4340d4880150039aed69a Mon Sep 17 00:00:00 2001
From: Aditya Vadhavkar
Date: Wed, 10 Jul 2024 16:31:04 -0400
Subject: [PATCH 07/17] Updated test values.
---
.../scripts/node/validate/disk-based-logging-disabled.txtar | 2 +-
testdata/scripts/node/validate/disk-based-logging-no-dir.txtar | 2 +-
testdata/scripts/node/validate/disk-based-logging.txtar | 2 +-
testdata/scripts/node/validate/invalid.txtar | 2 +-
testdata/scripts/node/validate/valid.txtar | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
index 05199f78c2f..e8e1046cef5 100644
--- a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
+++ b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
@@ -315,7 +315,7 @@ ChainID = '1'
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0x514910771AF9Ca656af840dff83E8264EcF986CA'
LogBackfillBatchSize = 1000
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 c73c9b1d3d9..c7b651e3aeb 100644
--- a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar
+++ b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar
@@ -315,7 +315,7 @@ ChainID = '1'
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0x514910771AF9Ca656af840dff83E8264EcF986CA'
LogBackfillBatchSize = 1000
diff --git a/testdata/scripts/node/validate/disk-based-logging.txtar b/testdata/scripts/node/validate/disk-based-logging.txtar
index addc072f70a..1eee9f595c3 100644
--- a/testdata/scripts/node/validate/disk-based-logging.txtar
+++ b/testdata/scripts/node/validate/disk-based-logging.txtar
@@ -315,7 +315,7 @@ ChainID = '1'
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0x514910771AF9Ca656af840dff83E8264EcF986CA'
LogBackfillBatchSize = 1000
diff --git a/testdata/scripts/node/validate/invalid.txtar b/testdata/scripts/node/validate/invalid.txtar
index 80cb23cad7f..73d557c0ae7 100644
--- a/testdata/scripts/node/validate/invalid.txtar
+++ b/testdata/scripts/node/validate/invalid.txtar
@@ -305,7 +305,7 @@ ChainID = '1'
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0x514910771AF9Ca656af840dff83E8264EcF986CA'
LogBackfillBatchSize = 1000
diff --git a/testdata/scripts/node/validate/valid.txtar b/testdata/scripts/node/validate/valid.txtar
index 7bb4e012aff..76a134b7761 100644
--- a/testdata/scripts/node/validate/valid.txtar
+++ b/testdata/scripts/node/validate/valid.txtar
@@ -312,7 +312,7 @@ ChainID = '1'
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0x514910771AF9Ca656af840dff83E8264EcF986CA'
LogBackfillBatchSize = 1000
From 39b39d65708cb7fb8fbe54e6bd99267fab6a6f28 Mon Sep 17 00:00:00 2001
From: Aditya Vadhavkar
Date: Wed, 10 Jul 2024 17:57:56 -0400
Subject: [PATCH 08/17] Updated default config for Ethereum testnets
---
.../evm/config/toml/defaults/Ethereum_Goerli.toml | 1 +
.../evm/config/toml/defaults/Ethereum_Kovan.toml | 1 +
.../evm/config/toml/defaults/Ethereum_Rinkeby.toml | 1 +
.../evm/config/toml/defaults/Ethereum_Ropsten.toml | 1 +
.../evm/config/toml/defaults/Ethereum_Sepolia.toml | 1 +
core/config/docs/docs_test.go | 3 +++
docs/CONFIG.md | 10 +++++-----
7 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Goerli.toml b/core/chains/evm/config/toml/defaults/Ethereum_Goerli.toml
index 66e0bba8ca0..f2e81aca268 100644
--- a/core/chains/evm/config/toml/defaults/Ethereum_Goerli.toml
+++ b/core/chains/evm/config/toml/defaults/Ethereum_Goerli.toml
@@ -1,4 +1,5 @@
ChainID = '5'
+FinalityDepth = 50
LinkContractAddress = '0x326C977E6efc84E512bB9C30f76E30c160eD06FB'
MinContractPayment = '0.1 link'
diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Kovan.toml b/core/chains/evm/config/toml/defaults/Ethereum_Kovan.toml
index 0a4a351ade9..e51b6a352c2 100644
--- a/core/chains/evm/config/toml/defaults/Ethereum_Kovan.toml
+++ b/core/chains/evm/config/toml/defaults/Ethereum_Kovan.toml
@@ -1,4 +1,5 @@
ChainID = '42'
+FinalityDepth = 50
LinkContractAddress = '0xa36085F69e2889c224210F603D836748e7dC0088'
MinContractPayment = '0.1 link'
OperatorFactoryAddress = '0x8007e24251b1D2Fc518Eb843A701d9cD21fe0aA3'
diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Rinkeby.toml b/core/chains/evm/config/toml/defaults/Ethereum_Rinkeby.toml
index 06dc2cb0f58..4820411a453 100644
--- a/core/chains/evm/config/toml/defaults/Ethereum_Rinkeby.toml
+++ b/core/chains/evm/config/toml/defaults/Ethereum_Rinkeby.toml
@@ -1,4 +1,5 @@
ChainID = '4'
+FinalityDepth = 50
LinkContractAddress = '0x01BE23585060835E02B77ef475b0Cc51aA1e0709'
MinContractPayment = '0.1 link'
diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Ropsten.toml b/core/chains/evm/config/toml/defaults/Ethereum_Ropsten.toml
index 7ce9b3e8273..4b0634241d5 100644
--- a/core/chains/evm/config/toml/defaults/Ethereum_Ropsten.toml
+++ b/core/chains/evm/config/toml/defaults/Ethereum_Ropsten.toml
@@ -1,4 +1,5 @@
ChainID = '3'
+FinalityDepth = 50
LinkContractAddress = '0x20fE562d797A42Dcb3399062AE9546cd06f63280'
MinContractPayment = '0.1 link'
diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml
index 1c46d4ca7cf..aef70b1506d 100644
--- a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml
@@ -1,4 +1,5 @@
ChainID = '11155111'
+FinalityDepth = 50
LinkContractAddress = '0x779877A7B0D9E8603169DdbD7836e478b4624789'
MinContractPayment = '0.1 link'
diff --git a/core/config/docs/docs_test.go b/core/config/docs/docs_test.go
index 8f46497cb5f..5d50149cbc6 100644
--- a/core/config/docs/docs_test.go
+++ b/core/config/docs/docs_test.go
@@ -92,6 +92,9 @@ func TestDoc(t *testing.T) {
docDefaults.Transactions.AutoPurge.Threshold = nil
docDefaults.Transactions.AutoPurge.MinAttempts = nil
+ // FinalityDepth has been updated to 10 in fallback and set to 50 in Ethereum_Mainnet
+ fallbackDefaults.FinalityDepth = docDefaults.FinalityDepth
+
assertTOML(t, fallbackDefaults, docDefaults)
})
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index bea320c098b..ff56a01d852 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -1864,7 +1864,7 @@ GasLimit = 10500000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0x20fE562d797A42Dcb3399062AE9546cd06f63280'
LogBackfillBatchSize = 1000
@@ -1957,7 +1957,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0x01BE23585060835E02B77ef475b0Cc51aA1e0709'
LogBackfillBatchSize = 1000
@@ -2050,7 +2050,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0x326C977E6efc84E512bB9C30f76E30c160eD06FB'
LogBackfillBatchSize = 1000
@@ -2423,7 +2423,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0xa36085F69e2889c224210F603D836748e7dC0088'
LogBackfillBatchSize = 1000
@@ -6884,7 +6884,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0x779877A7B0D9E8603169DdbD7836e478b4624789'
LogBackfillBatchSize = 1000
From 963a3899b84fe7ed1b49e64fdda93db11591f6ae Mon Sep 17 00:00:00 2001
From: Aditya Vadhavkar
Date: Thu, 11 Jul 2024 09:27:29 -0400
Subject: [PATCH 09/17] Updated values for chains that did not have default
value
---
.../config/toml/defaults/Arbitrum_Goerli.toml | 1 +
.../toml/defaults/Arbitrum_Rinkeby.toml | 1 +
.../toml/defaults/Arbitrum_Sepolia.toml | 1 +
.../evm/config/toml/defaults/BSC_Mainnet.toml | 1 +
.../evm/config/toml/defaults/BSC_Testnet.toml | 1 +
.../config/toml/defaults/Fantom_Mainnet.toml | 1 +
.../config/toml/defaults/Fantom_Testnet.toml | 1 +
.../config/toml/defaults/Gnosis_Mainnet.toml | 1 +
.../config/toml/defaults/Harmony_Mainnet.toml | 1 +
.../config/toml/defaults/Harmony_Testnet.toml | 1 +
.../config/toml/defaults/Heco_Mainnet.toml | 1 +
.../evm/config/toml/defaults/OKX_Mainnet.toml | 1 +
.../evm/config/toml/defaults/OKX_Testnet.toml | 1 +
.../evm/config/toml/defaults/RSK_Mainnet.toml | 1 +
.../evm/config/toml/defaults/RSK_Testnet.toml | 1 +
docs/CONFIG.md | 30 +++++++++----------
16 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/core/chains/evm/config/toml/defaults/Arbitrum_Goerli.toml b/core/chains/evm/config/toml/defaults/Arbitrum_Goerli.toml
index 42de6beb9ba..bfaf80e1c91 100644
--- a/core/chains/evm/config/toml/defaults/Arbitrum_Goerli.toml
+++ b/core/chains/evm/config/toml/defaults/Arbitrum_Goerli.toml
@@ -1,4 +1,5 @@
ChainID = '421613'
+FinalityDepth = 4350
ChainType = 'arbitrum'
NoNewHeadsThreshold = '0'
OCR.ContractConfirmations = 1
diff --git a/core/chains/evm/config/toml/defaults/Arbitrum_Rinkeby.toml b/core/chains/evm/config/toml/defaults/Arbitrum_Rinkeby.toml
index f9296adcb76..c6f57c2ed64 100644
--- a/core/chains/evm/config/toml/defaults/Arbitrum_Rinkeby.toml
+++ b/core/chains/evm/config/toml/defaults/Arbitrum_Rinkeby.toml
@@ -1,4 +1,5 @@
ChainID = '421611'
+FinalityDepth = 4350
ChainType = 'arbitrum'
LinkContractAddress = "0x615fBe6372676474d9e6933d310469c9b68e9726"
LogPollInterval = '1s'
diff --git a/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml b/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml
index e6d660a2729..951a7a8b8cd 100644
--- a/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml
@@ -1,4 +1,5 @@
ChainID = '421614'
+FinalityDepth = 4350
ChainType = 'arbitrum'
NoNewHeadsThreshold = '0'
OCR.ContractConfirmations = 1
diff --git a/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml b/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml
index 384a798e32a..18a56bdb6e5 100644
--- a/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml
@@ -2,6 +2,7 @@
# Clique offers finality within (N/2)+1 blocks where N is number of signers
# There are 21 BSC validators so theoretically finality should occur after 21/2+1 = 11 blocks
ChainID = '56'
+FinalityDepth = 50
LinkContractAddress = '0x404460C6A5EdE2D891e8297795264fDe62ADBB75'
LogPollInterval = '3s'
NoNewHeadsThreshold = '30s'
diff --git a/core/chains/evm/config/toml/defaults/BSC_Testnet.toml b/core/chains/evm/config/toml/defaults/BSC_Testnet.toml
index 364bae0c9f1..ce0ad174c0f 100644
--- a/core/chains/evm/config/toml/defaults/BSC_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/BSC_Testnet.toml
@@ -2,6 +2,7 @@
# Clique offers finality within (N/2)+1 blocks where N is number of signers
# There are 21 BSC validators so theoretically finality should occur after 21/2+1 = 11 blocks
ChainID = '97'
+FinalityDepth = 50
LinkContractAddress = '0x84b9B910527Ad5C03A9Ca831909E21e236EA7b06'
LogPollInterval = '3s'
NoNewHeadsThreshold = '30s'
diff --git a/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml b/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml
index 7e76d94278d..55786731931 100644
--- a/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml
@@ -1,4 +1,5 @@
ChainID = '250'
+FinalityDepth = 50
LinkContractAddress = '0x6F43FF82CCA38001B6699a8AC47A2d0E66939407'
LogPollInterval = '1s'
NoNewHeadsThreshold = '30s'
diff --git a/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml b/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml
index 5f24a76c2e7..8645c7cbc7c 100644
--- a/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml
@@ -1,4 +1,5 @@
ChainID = '4002'
+FinalityDepth = 50
LinkContractAddress = '0xfaFedb041c0DD4fA2Dc0d87a6B0979Ee6FA7af5F'
LogPollInterval = '1s'
# Fantom testnet only emits blocks when a new tx is received, so this method of liveness detection is not useful
diff --git a/core/chains/evm/config/toml/defaults/Gnosis_Mainnet.toml b/core/chains/evm/config/toml/defaults/Gnosis_Mainnet.toml
index 587f0083b70..bd9a2634623 100644
--- a/core/chains/evm/config/toml/defaults/Gnosis_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Gnosis_Mainnet.toml
@@ -6,6 +6,7 @@
# With xDai's current maximum of 19 validators then 40 blocks is the maximum possible re-org)
# The mainnet default of 50 blocks is ok here
ChainID = '100'
+FinalityDepth = 50
ChainType = 'gnosis'
LinkContractAddress = '0xE2e73A1c69ecF83F464EFCE6A5be353a37cA09b2'
LogPollInterval = '5s'
diff --git a/core/chains/evm/config/toml/defaults/Harmony_Mainnet.toml b/core/chains/evm/config/toml/defaults/Harmony_Mainnet.toml
index e90d2ff7b4f..98699b11e3b 100644
--- a/core/chains/evm/config/toml/defaults/Harmony_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Harmony_Mainnet.toml
@@ -1,4 +1,5 @@
ChainID = '1666600000'
+FinalityDepth = 50
LinkContractAddress = '0x218532a12a389a4a92fC0C5Fb22901D1c19198aA'
LogPollInterval = '2s'
MinIncomingConfirmations = 1
diff --git a/core/chains/evm/config/toml/defaults/Harmony_Testnet.toml b/core/chains/evm/config/toml/defaults/Harmony_Testnet.toml
index 382e3b215d9..4c0e86522e3 100644
--- a/core/chains/evm/config/toml/defaults/Harmony_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/Harmony_Testnet.toml
@@ -1,4 +1,5 @@
ChainID = '1666700000'
+FinalityDepth = 50
LinkContractAddress = '0x8b12Ac23BFe11cAb03a634C1F117D64a7f2cFD3e'
LogPollInterval = '2s'
MinIncomingConfirmations = 1
diff --git a/core/chains/evm/config/toml/defaults/Heco_Mainnet.toml b/core/chains/evm/config/toml/defaults/Heco_Mainnet.toml
index b3d4074dba4..6938a0371bb 100644
--- a/core/chains/evm/config/toml/defaults/Heco_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Heco_Mainnet.toml
@@ -1,5 +1,6 @@
# Heco uses BSC's settings.
ChainID = '128'
+FinalityDepth = 50
LinkContractAddress = '0x404460C6A5EdE2D891e8297795264fDe62ADBB75'
LogPollInterval = '3s'
NoNewHeadsThreshold = '30s'
diff --git a/core/chains/evm/config/toml/defaults/OKX_Mainnet.toml b/core/chains/evm/config/toml/defaults/OKX_Mainnet.toml
index d0b26ede2e3..74aef9dd37f 100644
--- a/core/chains/evm/config/toml/defaults/OKX_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/OKX_Mainnet.toml
@@ -1 +1,2 @@
ChainID = '66'
+FinalityDepth = 50
diff --git a/core/chains/evm/config/toml/defaults/OKX_Testnet.toml b/core/chains/evm/config/toml/defaults/OKX_Testnet.toml
index 2587f010b18..de27b9b8dc1 100644
--- a/core/chains/evm/config/toml/defaults/OKX_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/OKX_Testnet.toml
@@ -1 +1,2 @@
ChainID = '65'
+FinalityDepth = 50
diff --git a/core/chains/evm/config/toml/defaults/RSK_Mainnet.toml b/core/chains/evm/config/toml/defaults/RSK_Mainnet.toml
index 8290481a331..40c78c76d14 100644
--- a/core/chains/evm/config/toml/defaults/RSK_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/RSK_Mainnet.toml
@@ -1,5 +1,6 @@
# RSK prices its txes in sats not wei
ChainID = '30'
+FinalityDepth = 50
LinkContractAddress = '0x14AdaE34beF7ca957Ce2dDe5ADD97ea050123827'
LogPollInterval = '30s'
MinContractPayment = '0.001 link'
diff --git a/core/chains/evm/config/toml/defaults/RSK_Testnet.toml b/core/chains/evm/config/toml/defaults/RSK_Testnet.toml
index 2fde16aa7cc..666592da011 100644
--- a/core/chains/evm/config/toml/defaults/RSK_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/RSK_Testnet.toml
@@ -1,4 +1,5 @@
ChainID = '31'
+FinalityDepth = 50
LinkContractAddress = '0x8bBbd80981FE76d44854D8DF305e8985c19f0e78'
MinContractPayment = '0.001 link'
LogPollInterval = '30s'
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index ff56a01d852..4efbc70d0e8 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -2237,7 +2237,7 @@ GasLimit = 6500000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0x14AdaE34beF7ca957Ce2dDe5ADD97ea050123827'
LogBackfillBatchSize = 1000
@@ -2330,7 +2330,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0x8bBbd80981FE76d44854D8DF305e8985c19f0e78'
LogBackfillBatchSize = 1000
@@ -2517,7 +2517,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0x404460C6A5EdE2D891e8297795264fDe62ADBB75'
LogBackfillBatchSize = 1000
@@ -2610,7 +2610,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LogBackfillBatchSize = 1000
LogPollInterval = '15s'
@@ -2702,7 +2702,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LogBackfillBatchSize = 1000
LogPollInterval = '15s'
@@ -2794,7 +2794,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0x84b9B910527Ad5C03A9Ca831909E21e236EA7b06'
LogBackfillBatchSize = 1000
@@ -2888,7 +2888,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'gnosis'
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0xE2e73A1c69ecF83F464EFCE6A5be353a37cA09b2'
LogBackfillBatchSize = 1000
@@ -2981,7 +2981,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0x404460C6A5EdE2D891e8297795264fDe62ADBB75'
LogBackfillBatchSize = 1000
@@ -3353,7 +3353,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0x6F43FF82CCA38001B6699a8AC47A2d0E66939407'
LogBackfillBatchSize = 1000
@@ -4840,7 +4840,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0xfaFedb041c0DD4fA2Dc0d87a6B0979Ee6FA7af5F'
LogBackfillBatchSize = 1000
@@ -6418,7 +6418,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'arbitrum'
-FinalityDepth = 10
+FinalityDepth = 4350
FinalityTagEnabled = false
LinkContractAddress = '0x615fBe6372676474d9e6933d310469c9b68e9726'
LogBackfillBatchSize = 1000
@@ -6512,7 +6512,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'arbitrum'
-FinalityDepth = 10
+FinalityDepth = 4350
FinalityTagEnabled = false
LinkContractAddress = '0xd14838A68E8AFBAdE5efb411d5871ea0011AFd28'
LogBackfillBatchSize = 1000
@@ -6606,7 +6606,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'arbitrum'
-FinalityDepth = 10
+FinalityDepth = 4350
FinalityTagEnabled = false
LogBackfillBatchSize = 1000
LogPollInterval = '1s'
@@ -7070,7 +7070,7 @@ GasLimit = 6500000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0x218532a12a389a4a92fC0C5Fb22901D1c19198aA'
LogBackfillBatchSize = 1000
@@ -7163,7 +7163,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
+FinalityDepth = 50
FinalityTagEnabled = false
LinkContractAddress = '0x8b12Ac23BFe11cAb03a634C1F117D64a7f2cFD3e'
LogBackfillBatchSize = 1000
From 864bc54e6234ef4cf93bd6518e74e3686a40a6dd Mon Sep 17 00:00:00 2001
From: Otavio Madalosso
Date: Mon, 30 Sep 2024 15:47:14 -0300
Subject: [PATCH 10/17] Revision: Testnet value from infra-k8s prod-testnet,
mainnet from Node setup guide
---
ccip/config/evm/Kroma_Mainnet.toml | 2 +-
ccip/config/evm/Kroma_Sepolia.toml | 2 +-
ccip/config/evm/Linea_Mainnet.toml | 2 +-
ccip/config/evm/Linea_Sepolia.toml | 2 +-
ccip/config/evm/Mantle_Sepolia.toml | 4 ++--
ccip/config/evm/Polygon_Zkevm_Mainnet.toml | 2 +-
ccip/config/evm/XLayer_Mainnet.toml | 2 +-
.../evm/config/toml/defaults/Kroma_Mainnet.toml | 2 +-
.../evm/config/toml/defaults/Kroma_Sepolia.toml | 2 +-
.../evm/config/toml/defaults/Linea_Mainnet.toml | 4 ++--
.../evm/config/toml/defaults/Linea_Sepolia.toml | 2 +-
.../toml/defaults/Polygon_Zkevm_Mainnet.toml | 2 +-
.../config/toml/defaults/XLayer_Mainnet.toml | 2 +-
docs/CONFIG.md | 17 ++++++++---------
14 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/ccip/config/evm/Kroma_Mainnet.toml b/ccip/config/evm/Kroma_Mainnet.toml
index 3a48aa8ae1b..2111a426558 100644
--- a/ccip/config/evm/Kroma_Mainnet.toml
+++ b/ccip/config/evm/Kroma_Mainnet.toml
@@ -1,6 +1,6 @@
ChainID = '255'
ChainType = 'kroma' # Kroma is based on the Optimism Bedrock architechture
-FinalityDepth = 400
+FinalityDepth = 700
FinalityTagEnabled = true
LogPollInterval = '2s'
NoNewHeadsThreshold = '40s'
diff --git a/ccip/config/evm/Kroma_Sepolia.toml b/ccip/config/evm/Kroma_Sepolia.toml
index 9609a09e076..060b4c91682 100644
--- a/ccip/config/evm/Kroma_Sepolia.toml
+++ b/ccip/config/evm/Kroma_Sepolia.toml
@@ -1,6 +1,6 @@
ChainID = '2358'
ChainType = 'kroma' # Kroma is based on the Optimism Bedrock architechture
-FinalityDepth = 400
+FinalityDepth = 700
FinalityTagEnabled = true
LogPollInterval = '2s'
NoNewHeadsThreshold = '40s'
diff --git a/ccip/config/evm/Linea_Mainnet.toml b/ccip/config/evm/Linea_Mainnet.toml
index 94d8bedc44b..3be107a370a 100644
--- a/ccip/config/evm/Linea_Mainnet.toml
+++ b/ccip/config/evm/Linea_Mainnet.toml
@@ -1,6 +1,6 @@
ChainID = '59144'
# Block time 12s, finality < 60m
-FinalityDepth = 300
+FinalityDepth = 600
# Blocks are only emitted when a transaction happens / no empty blocks
NoNewHeadsThreshold = '0'
diff --git a/ccip/config/evm/Linea_Sepolia.toml b/ccip/config/evm/Linea_Sepolia.toml
index ac5e18a09b6..af70f7ceba1 100644
--- a/ccip/config/evm/Linea_Sepolia.toml
+++ b/ccip/config/evm/Linea_Sepolia.toml
@@ -1,5 +1,5 @@
ChainID = '59141'
-FinalityDepth = 900
+FinalityDepth = 200
NoNewHeadsThreshold = '0'
[GasEstimator]
diff --git a/ccip/config/evm/Mantle_Sepolia.toml b/ccip/config/evm/Mantle_Sepolia.toml
index ee994a71826..9d416ff4a26 100644
--- a/ccip/config/evm/Mantle_Sepolia.toml
+++ b/ccip/config/evm/Mantle_Sepolia.toml
@@ -1,6 +1,6 @@
ChainID = '5003'
ChainType = 'optimismBedrock'
-FinalityDepth = 500
+FinalityDepth = 1200
LogPollInterval = '2s'
NoNewHeadsThreshold = '0'
MinIncomingConfirmations = 1
@@ -8,7 +8,7 @@ MinIncomingConfirmations = 1
[HeadTracker]
HistoryDepth = 600
-[GasEstimator]
+[GasEstimator]
Mode = 'L2Suggested'
PriceMax = '200 gwei'
LimitDefault = 100000000
diff --git a/ccip/config/evm/Polygon_Zkevm_Mainnet.toml b/ccip/config/evm/Polygon_Zkevm_Mainnet.toml
index 79e0cb0fce5..37ce1e58707 100644
--- a/ccip/config/evm/Polygon_Zkevm_Mainnet.toml
+++ b/ccip/config/evm/Polygon_Zkevm_Mainnet.toml
@@ -1,6 +1,6 @@
ChainID = '1101'
ChainType = 'zkevm'
-FinalityDepth = 500
+FinalityDepth = 1000
NoNewHeadsThreshold = '6m'
MinIncomingConfirmations = 1
LogPollInterval = '30s'
diff --git a/ccip/config/evm/XLayer_Mainnet.toml b/ccip/config/evm/XLayer_Mainnet.toml
index 4096a4db244..426c0204e97 100644
--- a/ccip/config/evm/XLayer_Mainnet.toml
+++ b/ccip/config/evm/XLayer_Mainnet.toml
@@ -1,6 +1,6 @@
ChainID = '196'
ChainType = 'xlayer'
-FinalityDepth = 500
+FinalityDepth = 1000
NoNewHeadsThreshold = '6m'
MinIncomingConfirmations = 1
LogPollInterval = '30s'
diff --git a/core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml b/core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml
index 3a48aa8ae1b..2111a426558 100644
--- a/core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml
@@ -1,6 +1,6 @@
ChainID = '255'
ChainType = 'kroma' # Kroma is based on the Optimism Bedrock architechture
-FinalityDepth = 400
+FinalityDepth = 700
FinalityTagEnabled = true
LogPollInterval = '2s'
NoNewHeadsThreshold = '40s'
diff --git a/core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml b/core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml
index 9609a09e076..060b4c91682 100644
--- a/core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml
@@ -1,6 +1,6 @@
ChainID = '2358'
ChainType = 'kroma' # Kroma is based on the Optimism Bedrock architechture
-FinalityDepth = 400
+FinalityDepth = 700
FinalityTagEnabled = true
LogPollInterval = '2s'
NoNewHeadsThreshold = '40s'
diff --git a/core/chains/evm/config/toml/defaults/Linea_Mainnet.toml b/core/chains/evm/config/toml/defaults/Linea_Mainnet.toml
index 94d8bedc44b..97570a0d215 100644
--- a/core/chains/evm/config/toml/defaults/Linea_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Linea_Mainnet.toml
@@ -1,6 +1,6 @@
ChainID = '59144'
-# Block time 12s, finality < 60m
-FinalityDepth = 300
+#3s block time ~ 20m finality based on committee decision
+FinalityDepth = 600
# Blocks are only emitted when a transaction happens / no empty blocks
NoNewHeadsThreshold = '0'
diff --git a/core/chains/evm/config/toml/defaults/Linea_Sepolia.toml b/core/chains/evm/config/toml/defaults/Linea_Sepolia.toml
index ac5e18a09b6..af70f7ceba1 100644
--- a/core/chains/evm/config/toml/defaults/Linea_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Linea_Sepolia.toml
@@ -1,5 +1,5 @@
ChainID = '59141'
-FinalityDepth = 900
+FinalityDepth = 200
NoNewHeadsThreshold = '0'
[GasEstimator]
diff --git a/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Mainnet.toml b/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Mainnet.toml
index 2fef7874d17..7402d548357 100644
--- a/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Mainnet.toml
@@ -1,6 +1,6 @@
ChainID = '1101'
ChainType = 'zkevm'
-FinalityDepth = 500
+FinalityDepth = 1000
NoNewHeadsThreshold = '6m'
MinIncomingConfirmations = 1
LogPollInterval = '30s'
diff --git a/core/chains/evm/config/toml/defaults/XLayer_Mainnet.toml b/core/chains/evm/config/toml/defaults/XLayer_Mainnet.toml
index 4096a4db244..426c0204e97 100644
--- a/core/chains/evm/config/toml/defaults/XLayer_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/XLayer_Mainnet.toml
@@ -1,6 +1,6 @@
ChainID = '196'
ChainType = 'xlayer'
-FinalityDepth = 500
+FinalityDepth = 1000
NoNewHeadsThreshold = '6m'
MinIncomingConfirmations = 1
LogPollInterval = '30s'
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index b7bc07b34fa..a50027f52dd 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -3631,7 +3631,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'xlayer'
-FinalityDepth = 500
+FinalityDepth = 1000
FinalityTagEnabled = false
LogBackfillBatchSize = 1000
LogPollInterval = '30s'
@@ -3839,7 +3839,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'kroma'
-FinalityDepth = 400
+FinalityDepth = 700
FinalityTagEnabled = true
LogBackfillBatchSize = 1000
LogPollInterval = '2s'
@@ -4879,7 +4879,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'zkevm'
-FinalityDepth = 500
+FinalityDepth = 1000
FinalityTagEnabled = false
LogBackfillBatchSize = 1000
LogPollInterval = '30s'
@@ -5399,7 +5399,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'kroma'
-FinalityDepth = 400
+FinalityDepth = 700
FinalityTagEnabled = true
LogBackfillBatchSize = 1000
LogPollInterval = '2s'
@@ -6232,7 +6232,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'arbitrum'
-FinalityDepth = 50
+FinalityDepth = 4350
FinalityTagEnabled = true
LinkContractAddress = '0xf97f4df75117a78c1A5a0DBb814Af92458539FB4'
LogBackfillBatchSize = 1000
@@ -6440,8 +6440,7 @@ GasLimitDefault = 400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-ChainType = 'arbitrum'
-FinalityDepth = 4350
+FinalityDepth = 10
FinalityTagEnabled = true
LinkContractAddress = '0x0b9d5D9136855f6FEc3c0993feE6E9CE8a297846'
LogBackfillBatchSize = 1000
@@ -7070,7 +7069,7 @@ GasLimitDefault = 400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 900
+FinalityDepth = 200
FinalityTagEnabled = false
LogBackfillBatchSize = 1000
LogPollInterval = '15s'
@@ -7173,7 +7172,7 @@ GasLimitDefault = 400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 300
+FinalityDepth = 600
FinalityTagEnabled = false
LogBackfillBatchSize = 1000
LogPollInterval = '15s'
From cfc08ec6ef8a5701f9dd2af8c2191bfc4cc61709 Mon Sep 17 00:00:00 2001
From: Otavio Madalosso
Date: Wed, 6 Nov 2024 14:39:43 -0300
Subject: [PATCH 11/17] save WIP
---
core/chains/evm/config/toml/defaults/Arbitrum_Goerli.toml | 3 ++-
core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/core/chains/evm/config/toml/defaults/Arbitrum_Goerli.toml b/core/chains/evm/config/toml/defaults/Arbitrum_Goerli.toml
index bfaf80e1c91..6f51f2734a2 100644
--- a/core/chains/evm/config/toml/defaults/Arbitrum_Goerli.toml
+++ b/core/chains/evm/config/toml/defaults/Arbitrum_Goerli.toml
@@ -1,6 +1,7 @@
ChainID = '421613'
-FinalityDepth = 4350
ChainType = 'arbitrum'
+FinalityDepth = 4350
+FinalityTagEnabled = true
NoNewHeadsThreshold = '0'
OCR.ContractConfirmations = 1
LinkContractAddress = '0xd14838A68E8AFBAdE5efb411d5871ea0011AFd28'
diff --git a/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml b/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml
index 7254ca77cea..bc0c8839b9b 100644
--- a/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml
@@ -2,6 +2,8 @@ ChainID = '421614'
FinalityDepth = 4350
ChainType = 'arbitrum'
FinalityTagEnabled = true
+# Not sure why this is used or if it needs to be here (got it from https://github.com/smartcontractkit/ccip/commit/4c07f36580a6ad3efaece6147e2a2abf4bd63422)
+LinkContractAddress = '0xE4aB69C077896252FAFBD49EFD26B5D171A32410'
NoNewHeadsThreshold = '0'
OCR.ContractConfirmations = 1
LogPollInterval = '1s'
From 77ade0973cc14b7c26a3f886869e890591be6a1d Mon Sep 17 00:00:00 2001
From: Otavio Madalosso
Date: Wed, 6 Nov 2024 15:14:45 -0300
Subject: [PATCH 12/17] Update chain defaults using ccip repo as source of
truth
---
.../config/toml/defaults/Astar_Mainnet.toml | 10 ++++++
.../config/toml/defaults/Astar_Shibuya.toml | 9 +++++
.../toml/defaults/Avalanche_ANZ_testnet.toml | 19 +++++++++++
.../evm/config/toml/defaults/BSC_Mainnet.toml | 1 +
.../evm/config/toml/defaults/BSC_Testnet.toml | 1 +
.../evm/config/toml/defaults/Base_Goerli.toml | 1 +
.../config/toml/defaults/Base_Sepolia.toml | 2 ++
.../config/toml/defaults/Blast_Mainnet.toml | 34 +++++++++++++++++++
.../config/toml/defaults/Blast_Sepolia.toml | 34 +++++++++++++++++++
.../config/toml/defaults/Celo_Mainnet.toml | 4 +++
.../config/toml/defaults/Celo_Testnet.toml | 4 +++
.../config/toml/defaults/Kroma_Mainnet.toml | 3 ++
.../config/toml/defaults/Kroma_Sepolia.toml | 3 ++
.../config/toml/defaults/Mantle_Sepolia.toml | 23 +++++++++++++
.../config/toml/defaults/Metis_Mainnet.toml | 9 ++++-
.../config/toml/defaults/Metis_Sepolia.toml | 6 +++-
.../config/toml/defaults/Mode_Mainnet.toml | 30 ++++++++++++++++
.../config/toml/defaults/Mode_Sepolia.toml | 30 ++++++++++++++++
.../config/toml/defaults/Optimism_Goerli.toml | 1 +
.../config/toml/defaults/Polygon_Mumbai.toml | 1 +
.../config/toml/defaults/WeMix_Mainnet.toml | 2 +-
.../config/toml/defaults/WeMix_Testnet.toml | 2 +-
.../config/toml/defaults/zkSync_Mainnet.toml | 26 ++++++++++----
.../config/toml/defaults/zkSync_Sepolia.toml | 26 ++++++++++----
24 files changed, 265 insertions(+), 16 deletions(-)
create mode 100644 core/chains/evm/config/toml/defaults/Astar_Mainnet.toml
create mode 100644 core/chains/evm/config/toml/defaults/Astar_Shibuya.toml
create mode 100644 core/chains/evm/config/toml/defaults/Avalanche_ANZ_testnet.toml
create mode 100644 core/chains/evm/config/toml/defaults/Blast_Mainnet.toml
create mode 100644 core/chains/evm/config/toml/defaults/Blast_Sepolia.toml
create mode 100644 core/chains/evm/config/toml/defaults/Mantle_Sepolia.toml
create mode 100644 core/chains/evm/config/toml/defaults/Mode_Mainnet.toml
create mode 100644 core/chains/evm/config/toml/defaults/Mode_Sepolia.toml
diff --git a/core/chains/evm/config/toml/defaults/Astar_Mainnet.toml b/core/chains/evm/config/toml/defaults/Astar_Mainnet.toml
new file mode 100644
index 00000000000..d1697d137a3
--- /dev/null
+++ b/core/chains/evm/config/toml/defaults/Astar_Mainnet.toml
@@ -0,0 +1,10 @@
+ChainID = '592'
+ChainType = 'astar'
+FinalityTagEnabled = true
+FinalityDepth = 100
+LogPollInterval = '6s'
+
+[GasEstimator]
+EIP1559DynamicFees = false
+PriceMax = '100000 gwei'
+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
new file mode 100644
index 00000000000..5a5df06f6f0
--- /dev/null
+++ b/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml
@@ -0,0 +1,9 @@
+ChainID = '81'
+FinalityTagEnabled = true
+FinalityDepth = 100
+LogPollInterval = '6s'
+
+[GasEstimator]
+EIP1559DynamicFees = false
+PriceMax = '100000 gwei'
+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
new file mode 100644
index 00000000000..4833881bf48
--- /dev/null
+++ b/core/chains/evm/config/toml/defaults/Avalanche_ANZ_testnet.toml
@@ -0,0 +1,19 @@
+ChainID = '76578'
+FinalityDepth = 1
+FinalityTagEnabled = false
+LinkContractAddress = '0x779877A7B0D9E8603169DdbD7836e478b4624789'
+LogPollInterval = '3s'
+MinIncomingConfirmations = 1
+# Avax subnet only emits blocks when a new tx is received, so this method of liveness detection is not useful.
+NoNewHeadsThreshold = '0'
+OCR.ContractConfirmations = 1
+RPCBlockQueryDelay = 2
+
+[GasEstimator]
+Mode = 'BlockHistory'
+PriceDefault = '25 gwei'
+PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
+PriceMin = '25 gwei'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 24
diff --git a/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml b/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml
index ea7045b3d5e..e95f0af1eb7 100644
--- a/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml
@@ -2,6 +2,7 @@
# Clique offers finality within (N/2)+1 blocks where N is number of signers
# There are 21 BSC validators so theoretically finality should occur after 21/2+1 = 11 blocks
ChainID = '56'
+# Keeping this >> 11 because it's not expensive and gives us a safety margin
FinalityDepth = 50
FinalityTagEnabled = true
LinkContractAddress = '0x404460C6A5EdE2D891e8297795264fDe62ADBB75'
diff --git a/core/chains/evm/config/toml/defaults/BSC_Testnet.toml b/core/chains/evm/config/toml/defaults/BSC_Testnet.toml
index d9b1a27b7ef..b27a877812b 100644
--- a/core/chains/evm/config/toml/defaults/BSC_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/BSC_Testnet.toml
@@ -2,6 +2,7 @@
# Clique offers finality within (N/2)+1 blocks where N is number of signers
# There are 21 BSC validators so theoretically finality should occur after 21/2+1 = 11 blocks
ChainID = '97'
+# Keeping this >> 11 because it's not expensive and gives us a safety margin
FinalityDepth = 50
FinalityTagEnabled = true
LinkContractAddress = '0x84b9B910527Ad5C03A9Ca831909E21e236EA7b06'
diff --git a/core/chains/evm/config/toml/defaults/Base_Goerli.toml b/core/chains/evm/config/toml/defaults/Base_Goerli.toml
index 5ecfd036f46..f9b2e29e9ee 100644
--- a/core/chains/evm/config/toml/defaults/Base_Goerli.toml
+++ b/core/chains/evm/config/toml/defaults/Base_Goerli.toml
@@ -1,6 +1,7 @@
ChainID = '84531'
ChainType = 'optimismBedrock'
FinalityDepth = 200
+FinalityTagEnabled = true
LogPollInterval = '2s'
NoNewHeadsThreshold = '40s'
MinIncomingConfirmations = 1
diff --git a/core/chains/evm/config/toml/defaults/Base_Sepolia.toml b/core/chains/evm/config/toml/defaults/Base_Sepolia.toml
index b4a7eb680ab..a76ae3cdf58 100644
--- a/core/chains/evm/config/toml/defaults/Base_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Base_Sepolia.toml
@@ -2,6 +2,8 @@ ChainID = '84532'
ChainType = 'optimismBedrock'
FinalityDepth = 200
FinalityTagEnabled = true
+# TODO: Check! Not sure if necessary
+LinkContractAddress = '0xE4aB69C077896252FAFBD49EFD26B5D171A32410'
LogPollInterval = '2s'
NoNewHeadsThreshold = '40s'
MinIncomingConfirmations = 1
diff --git a/core/chains/evm/config/toml/defaults/Blast_Mainnet.toml b/core/chains/evm/config/toml/defaults/Blast_Mainnet.toml
new file mode 100644
index 00000000000..f8b501723ff
--- /dev/null
+++ b/core/chains/evm/config/toml/defaults/Blast_Mainnet.toml
@@ -0,0 +1,34 @@
+ChainID = '81457'
+FinalityDepth = 200
+FinalityTagEnabled = true
+ChainType = 'optimismBedrock'
+# block rate is ~2sec, so this ensures blocks are polled correctly
+LogPollInterval = '2s'
+
+[GasEstimator]
+EIP1559DynamicFees = true
+BumpThreshold = 60
+BumpPercent = 20
+BumpMin = '100 wei'
+PriceMax = '120 gwei'
+LimitDefault = 8000000
+FeeCapDefault = '120 gwei'
+
+[GasEstimator.BlockHistory]
+# Default is 24, which leads to bumpy gas prices. In CCIP
+# we want to smooth out the gas prices, so we increase the sample size.
+BlockHistorySize = 200
+# The formula for FeeCap is (current block base fee * (1.125 ^ EIP1559FeeCapBufferBlocks) + tipcap)
+# where tipcap is managed by the block history estimators. In the context of CCIP,
+# the gas price is relayed to other changes for quotes so we want accurate/avg not pessimistic values.
+# So we set this to zero so FeeCap = baseFee + tipcap.
+EIP1559FeeCapBufferBlocks = 0
+
+[HeadTracker]
+HistoryDepth = 300
+
+[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'
\ 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
new file mode 100644
index 00000000000..96dc5c67871
--- /dev/null
+++ b/core/chains/evm/config/toml/defaults/Blast_Sepolia.toml
@@ -0,0 +1,34 @@
+ChainID = '168587773'
+FinalityDepth = 200
+FinalityTagEnabled = true
+ChainType = 'optimismBedrock'
+# block rate is ~2sec, so this ensures blocks are polled correctly
+LogPollInterval = '2s'
+
+[GasEstimator]
+EIP1559DynamicFees = true
+BumpThreshold = 60
+BumpPercent = 20
+BumpMin = '100 wei'
+PriceMax = '120 gwei'
+LimitDefault = 8000000
+FeeCapDefault = '120 gwei'
+
+[GasEstimator.BlockHistory]
+# Default is 24, which leads to bumpy gas prices. In CCIP
+# we want to smooth out the gas prices, so we increase the sample size.
+BlockHistorySize = 200
+# The formula for FeeCap is (current block base fee * (1.125 ^ EIP1559FeeCapBufferBlocks) + tipcap)
+# where tipcap is managed by the block history estimators. In the context of CCIP,
+# the gas price is relayed to other changes for quotes so we want accurate/avg not pessimistic values.
+# So we set this to zero so FeeCap = baseFee + tipcap.
+EIP1559FeeCapBufferBlocks = 0
+
+[HeadTracker]
+HistoryDepth = 300
+
+[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'
\ 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 a4948620370..e33f97750b2 100644
--- a/core/chains/evm/config/toml/defaults/Celo_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Celo_Mainnet.toml
@@ -1,6 +1,10 @@
ChainID = '42220'
ChainType = 'celo'
+# FT and FD are both present here because the dev effort rely only on FinalityTagEnabled are still in progress.
+# We expect to be able to rely only on FinalityTagEnabled=true in the short future.
+# https://chainlink-core.slack.com/archives/C05CS33N08N/p1715102940763339?thread_ts=1715102478.537529&cid=C05CS33N08N
FinalityDepth = 10
+FinalityTagEnabled = true
LogPollInterval = '5s'
MinIncomingConfirmations = 1
NoNewHeadsThreshold = '1m'
diff --git a/core/chains/evm/config/toml/defaults/Celo_Testnet.toml b/core/chains/evm/config/toml/defaults/Celo_Testnet.toml
index eb43f080b7d..55ee9fa9302 100644
--- a/core/chains/evm/config/toml/defaults/Celo_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/Celo_Testnet.toml
@@ -1,6 +1,10 @@
ChainID = '44787'
ChainType = 'celo'
+# FT and FD are both present here because the dev effort rely only on FinalityTagEnabled are still in progress.
+# We expect to be able to rely only on FinalityTagEnabled=true in the short future.
+# https://chainlink-core.slack.com/archives/C05CS33N08N/p1715102940763339?thread_ts=1715102478.537529&cid=C05CS33N08N
FinalityDepth = 10
+FinalityTagEnabled = true
LogPollInterval = '5s'
MinIncomingConfirmations = 1
NoNewHeadsThreshold = '1m'
diff --git a/core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml b/core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml
index 2111a426558..38af7656848 100644
--- a/core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml
@@ -1,5 +1,8 @@
ChainID = '255'
ChainType = 'kroma' # Kroma is based on the Optimism Bedrock architechture
+# FT and FD are both present here because the dev effort rely only on FinalityTagEnabled are still in progress.
+# We expect to be able to rely only on FinalityTagEnabled=true in the short future.
+# https://chainlink-core.slack.com/archives/C05CS33N08N/p1715102940763339?thread_ts=1715102478.537529&cid=C05CS33N08N
FinalityDepth = 700
FinalityTagEnabled = true
LogPollInterval = '2s'
diff --git a/core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml b/core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml
index 060b4c91682..b1e505df224 100644
--- a/core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml
@@ -1,5 +1,8 @@
ChainID = '2358'
ChainType = 'kroma' # Kroma is based on the Optimism Bedrock architechture
+# FT and FD are both present here because the dev effort rely only on FinalityTagEnabled are still in progress.
+# We expect to be able to rely only on FinalityTagEnabled=true in the short future.
+# https://chainlink-core.slack.com/archives/C05CS33N08N/p1715102940763339?thread_ts=1715102478.537529&cid=C05CS33N08N
FinalityDepth = 700
FinalityTagEnabled = true
LogPollInterval = '2s'
diff --git a/core/chains/evm/config/toml/defaults/Mantle_Sepolia.toml b/core/chains/evm/config/toml/defaults/Mantle_Sepolia.toml
new file mode 100644
index 00000000000..45fbfc5e0d4
--- /dev/null
+++ b/core/chains/evm/config/toml/defaults/Mantle_Sepolia.toml
@@ -0,0 +1,23 @@
+ChainID = '5003'
+ChainType = 'optimismBedrock'
+# FT and FD are both present here because the dev effort rely only on FinalityTagEnabled are still in progress.
+# We expect to be able to rely only on FinalityTagEnabled=true in the short future.
+# https://chainlink-core.slack.com/archives/C05CS33N08N/p1715102940763339?thread_ts=1715102478.537529&cid=C05CS33N08N
+FinalityDepth = 1200
+FinalityTagEnabled = true
+LogPollInterval = '2s'
+NoNewHeadsThreshold = '0'
+MinIncomingConfirmations = 1
+
+[HeadTracker]
+HistoryDepth = 600
+
+[GasEstimator]
+Mode = 'L2Suggested'
+PriceMax = '200 gwei'
+LimitDefault = 100000000
+FeeCapDefault = '200 gwei'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 200
+EIP1559FeeCapBufferBlocks = 0
\ No newline at end of file
diff --git a/core/chains/evm/config/toml/defaults/Metis_Mainnet.toml b/core/chains/evm/config/toml/defaults/Metis_Mainnet.toml
index f057400d014..b21388b2b52 100644
--- a/core/chains/evm/config/toml/defaults/Metis_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Metis_Mainnet.toml
@@ -1,8 +1,15 @@
# Metis is an L2 chain based on Optimism.
ChainID = '1088'
+# TODO: Check type against https://github.com/smartcontractkit/ccip/pull/1485
ChainType = 'metis'
# Sequencer offers absolute finality
-FinalityDepth = 10
+# High variation on finality depth triggered a commitee to investigate
+# and set 500 as a secure finality depth.
+# https://chainlink-core.slack.com/archives/C0725LNLJLA/p1717118469587219
+FinalityDepth = 500
+# FT and FD are both present here because the dev effort rely only on FinalityTagEnabled are still in progress.
+# We expect to be able to rely only on FinalityTagEnabled=true in the short future.
+# https://chainlink-core.slack.com/archives/C05CS33N08N/p1715102940763339?thread_ts=1715102478.537529&cid=C05CS33N08N
FinalityTagEnabled = true
MinIncomingConfirmations = 1
NoNewHeadsThreshold = '0'
diff --git a/core/chains/evm/config/toml/defaults/Metis_Sepolia.toml b/core/chains/evm/config/toml/defaults/Metis_Sepolia.toml
index 286b888e1a8..ea7ce7abf8e 100644
--- a/core/chains/evm/config/toml/defaults/Metis_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Metis_Sepolia.toml
@@ -1,6 +1,10 @@
ChainID = '59902'
+# TODO: Check type against https://github.com/smartcontractkit/ccip/pull/1485
ChainType = 'metis'
-FinalityDepth = 10
+# FT and FD are both present here because the dev effort rely only on FinalityTagEnabled are still in progress.
+# We expect to be able to rely only on FinalityTagEnabled=true in the short future.
+# https://chainlink-core.slack.com/archives/C05CS33N08N/p1715102940763339?thread_ts=1715102478.537529&cid=C05CS33N08N
+FinalityDepth = 3000
FinalityTagEnabled = true
MinIncomingConfirmations = 1
NoNewHeadsThreshold = '0'
diff --git a/core/chains/evm/config/toml/defaults/Mode_Mainnet.toml b/core/chains/evm/config/toml/defaults/Mode_Mainnet.toml
new file mode 100644
index 00000000000..69a8e93fecd
--- /dev/null
+++ b/core/chains/evm/config/toml/defaults/Mode_Mainnet.toml
@@ -0,0 +1,30 @@
+ChainID = '34443'
+FinalityDepth = 200
+FinalityTagEnabled = true
+ChainType = 'optimismBedrock'
+
+[GasEstimator]
+EIP1559DynamicFees = true
+BumpThreshold = 60
+BumpPercent = 20
+BumpMin = '100 wei'
+PriceMax = '120 gwei'
+LimitDefault = 8000000
+FeeCapDefault = '120 gwei'
+
+[GasEstimator.BlockHistory]
+# Default is 24, which leads to bumpy gas prices. In CCIP
+# we want to smooth out the gas prices, so we increase the sample size.
+BlockHistorySize = 200
+# The formula for FeeCap is (current block base fee * (1.125 ^ EIP1559FeeCapBufferBlocks) + tipcap)
+# where tipcap is managed by the block history estimators. In the context of CCIP,
+# the gas price is relayed to other changes for quotes so we want accurate/avg not pessimistic values.
+# So we set this to zero so FeeCap = baseFee + tipcap.
+EIP1559FeeCapBufferBlocks = 0
+
+[HeadTracker]
+HistoryDepth = 300
+
+[NodePool]
+PollFailureThreshold = 2
+PollInterval = '3s'
diff --git a/core/chains/evm/config/toml/defaults/Mode_Sepolia.toml b/core/chains/evm/config/toml/defaults/Mode_Sepolia.toml
new file mode 100644
index 00000000000..f7398869beb
--- /dev/null
+++ b/core/chains/evm/config/toml/defaults/Mode_Sepolia.toml
@@ -0,0 +1,30 @@
+ChainID = '919'
+FinalityDepth = 200
+FinalityTagEnabled = true
+ChainType = 'optimismBedrock'
+
+[GasEstimator]
+EIP1559DynamicFees = true
+BumpThreshold = 60
+BumpPercent = 20
+BumpMin = '100 wei'
+PriceMax = '120 gwei'
+LimitDefault = 8000000
+FeeCapDefault = '120 gwei'
+
+[GasEstimator.BlockHistory]
+# Default is 24, which leads to bumpy gas prices. In CCIP
+# we want to smooth out the gas prices, so we increase the sample size.
+BlockHistorySize = 200
+# The formula for FeeCap is (current block base fee * (1.125 ^ EIP1559FeeCapBufferBlocks) + tipcap)
+# where tipcap is managed by the block history estimators. In the context of CCIP,
+# the gas price is relayed to other changes for quotes so we want accurate/avg not pessimistic values.
+# So we set this to zero so FeeCap = baseFee + tipcap.
+EIP1559FeeCapBufferBlocks = 0
+
+[HeadTracker]
+HistoryDepth = 300
+
+[NodePool]
+PollFailureThreshold = 2
+PollInterval = '3s'
diff --git a/core/chains/evm/config/toml/defaults/Optimism_Goerli.toml b/core/chains/evm/config/toml/defaults/Optimism_Goerli.toml
index 458b3b08123..c227a08cf25 100644
--- a/core/chains/evm/config/toml/defaults/Optimism_Goerli.toml
+++ b/core/chains/evm/config/toml/defaults/Optimism_Goerli.toml
@@ -1,6 +1,7 @@
ChainID = '420'
ChainType = 'optimismBedrock'
FinalityDepth = 200
+FinalityTagEnabled = true
LinkContractAddress = '0xdc2CC710e42857672E7907CF474a69B63B93089f'
LogPollInterval = '2s'
NoNewHeadsThreshold = '40s'
diff --git a/core/chains/evm/config/toml/defaults/Polygon_Mumbai.toml b/core/chains/evm/config/toml/defaults/Polygon_Mumbai.toml
index b9c993c6b23..134a0822d07 100644
--- a/core/chains/evm/config/toml/defaults/Polygon_Mumbai.toml
+++ b/core/chains/evm/config/toml/defaults/Polygon_Mumbai.toml
@@ -1,5 +1,6 @@
ChainID = '80001'
FinalityDepth = 500
+FinalityTagEnabled = true
LinkContractAddress = '0x326C977E6efc84E512bB9C30f76E30c160eD06FB'
LogPollInterval = '1s'
MinIncomingConfirmations = 5
diff --git a/core/chains/evm/config/toml/defaults/WeMix_Mainnet.toml b/core/chains/evm/config/toml/defaults/WeMix_Mainnet.toml
index 4a55450e47e..7d3fcc6bc2b 100644
--- a/core/chains/evm/config/toml/defaults/WeMix_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/WeMix_Mainnet.toml
@@ -1,6 +1,6 @@
ChainID = '1111'
ChainType = 'wemix'
-FinalityDepth = 10
+FinalityDepth = 1
FinalityTagEnabled = true
MinIncomingConfirmations = 1
# WeMix emits a block every 1 second, regardless of transactions
diff --git a/core/chains/evm/config/toml/defaults/WeMix_Testnet.toml b/core/chains/evm/config/toml/defaults/WeMix_Testnet.toml
index d4f829bcfd1..5775097967a 100644
--- a/core/chains/evm/config/toml/defaults/WeMix_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/WeMix_Testnet.toml
@@ -1,6 +1,6 @@
ChainID = '1112'
ChainType = 'wemix'
-FinalityDepth = 10
+FinalityDepth = 1
FinalityTagEnabled = true
MinIncomingConfirmations = 1
# WeMix emits a block every 1 second, regardless of transactions
diff --git a/core/chains/evm/config/toml/defaults/zkSync_Mainnet.toml b/core/chains/evm/config/toml/defaults/zkSync_Mainnet.toml
index 02ce2b0f18c..1e4c9ccd333 100644
--- a/core/chains/evm/config/toml/defaults/zkSync_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/zkSync_Mainnet.toml
@@ -1,14 +1,28 @@
ChainID = '324'
ChainType = 'zksync'
-FinalityDepth = 10
+# 1200block ~ 20min concurrent with the l1_committed tag
+FinalityDepth = 1200
+# block rate is ~2-5sec, so this ensures blocks are polled correctly
LogPollInterval = '5s'
-MinIncomingConfirmations = 1
+# sufficient time for RPC to be labelled out of sync, since blockRate is pretty fast
NoNewHeadsThreshold = '1m'
[GasEstimator]
-LimitDefault = 100_000_000
-PriceMax = 18446744073709551615
-PriceMin = 0
+# no EIP1559 to ensure our estimator doesnot estimate gas with MaxPriorityFee which will break minFunding requirement
+EIP1559DynamicFees = false
+# high LimitDefault for worst case pubdata bytes with BatchGasLimit reduced to 4M in OCR2Config
+LimitDefault = 2_500_000_000
+FeeCapDefault = '500 mwei'
+PriceDefault = '25 mwei'
+# p999 value for gasPrice based on historical data
+PriceMax = '500 mwei'
+# avg gasPrices are at 0.025 gwei
+PriceMin = '25 mwei'
+
+[GasEstimator.BlockHistory]
+# increasing this to smooth out gas estimation
+BlockHistorySize = 200
[HeadTracker]
-HistoryDepth = 50
+# tracks top N blocks to keep in heads database table. Should store atleast the same # of blocks as finalityDepth
+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 b4e957a6c99..6c36ac0ebbb 100644
--- a/core/chains/evm/config/toml/defaults/zkSync_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/zkSync_Sepolia.toml
@@ -1,14 +1,28 @@
ChainID = '300'
ChainType = 'zksync'
-FinalityDepth = 10
+# 200block ~ 20min concurrent with the l1_committed tag
+FinalityDepth = 200
+# block rate is ~2-5sec, so this ensures blocks are polled correctly
LogPollInterval = '5s'
-MinIncomingConfirmations = 1
+# sufficient time for RPC to be labelled out of sync, since blockRate is pretty fast
NoNewHeadsThreshold = '1m'
[GasEstimator]
-LimitDefault = 100_000_000
-PriceMax = 18446744073709551615
-PriceMin = 0
+# no EIP1559 to ensure our estimator doesnot estimate gas with MaxPriorityFee which will break minFunding requirement
+EIP1559DynamicFees = false
+# high LimitDefault for worst case pubdata bytes with BatchGasLimit reduced to 4M in OCR2Config
+LimitDefault = 2_500_000_000
+FeeCapDefault = '500 mwei'
+PriceDefault = '25 mwei'
+# p999 value for gasPrice based on historical data
+PriceMax = '500 mwei'
+# avg gasPrices are at 0.025 gwei
+PriceMin = '25 mwei'
+
+[GasEstimator.BlockHistory]
+# increasing this to smooth out gas estimation
+BlockHistorySize = 200
[HeadTracker]
-HistoryDepth = 50
+# tracks top N blocks to keep in heads database table. Should store atleast the same # of blocks as finalityDepth
+HistoryDepth = 250
\ No newline at end of file
From 31c567b810cd0280debfdc790ca58ce2c79b61db Mon Sep 17 00:00:00 2001
From: Otavio Madalosso
Date: Wed, 6 Nov 2024 15:42:19 -0300
Subject: [PATCH 13/17] gen docs
---
docs/CONFIG.md | 1250 ++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 1044 insertions(+), 206 deletions(-)
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index a50027f52dd..90cf2a1e4cb 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -3103,6 +3103,109 @@ GasLimitDefault = 400000
+Astar Shibuya (81)
+
+```toml
+AutoCreateKey = true
+BlockBackfillDepth = 10
+BlockBackfillSkip = false
+FinalityDepth = 100
+FinalityTagEnabled = true
+LogBackfillBatchSize = 1000
+LogPollInterval = '6s'
+LogKeepBlocksDepth = 100000
+LogPrunePageSize = 0
+BackupLogPollerBlockDelay = 100
+MinIncomingConfirmations = 3
+MinContractPayment = '0.00001 link'
+NonceAutoSync = true
+NoNewHeadsThreshold = '3m0s'
+LogBroadcasterEnabled = true
+RPCDefaultBatchSize = 250
+RPCBlockQueryDelay = 1
+FinalizedBlockOffset = 0
+NoNewFinalizedHeadsThreshold = '0s'
+
+[Transactions]
+ForwardersEnabled = false
+MaxInFlight = 16
+MaxQueued = 250
+ReaperInterval = '1h0m0s'
+ReaperThreshold = '168h0m0s'
+ResendAfterThreshold = '1m0s'
+
+[Transactions.AutoPurge]
+Enabled = false
+
+[BalanceMonitor]
+Enabled = true
+
+[GasEstimator]
+Mode = 'BlockHistory'
+PriceDefault = '20 gwei'
+PriceMax = '100 micro'
+PriceMin = '1 gwei'
+LimitDefault = 8000000
+LimitMax = 500000
+LimitMultiplier = '1'
+LimitTransfer = 21000
+EstimateLimit = false
+BumpMin = '5 gwei'
+BumpPercent = 20
+BumpThreshold = 3
+EIP1559DynamicFees = false
+FeeCapDefault = '100 gwei'
+TipCapDefault = '1 wei'
+TipCapMin = '1 wei'
+
+[GasEstimator.BlockHistory]
+BatchSize = 25
+BlockHistorySize = 8
+CheckInclusionBlocks = 12
+CheckInclusionPercentile = 90
+TransactionPercentile = 60
+
+[GasEstimator.FeeHistory]
+CacheTimeout = '10s'
+
+[HeadTracker]
+HistoryDepth = 100
+MaxBufferSize = 3
+SamplingInterval = '1s'
+MaxAllowedFinalityDepth = 10000
+FinalityTagBypass = true
+PersistenceEnabled = true
+
+[NodePool]
+PollFailureThreshold = 5
+PollInterval = '10s'
+SelectionMode = 'HighestHead'
+SyncThreshold = 5
+LeaseDuration = '0s'
+NodeIsSyncingEnabled = false
+FinalizedBlockPollInterval = '5s'
+EnforceRepeatableRead = false
+DeathDeclarationDelay = '10s'
+NewHeadsPollInterval = '0s'
+
+[OCR]
+ContractConfirmations = 4
+ContractTransmitterTransmitTimeout = '10s'
+DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
+ObservationGracePeriod = '1s'
+
+[OCR2]
+[OCR2.Automation]
+GasLimit = 5400000
+
+[Workflow]
+GasLimitDefault = 400000
+```
+
+
+
BSC Testnet (97)
```toml
@@ -4255,14 +4358,14 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'zksync'
-FinalityDepth = 10
+FinalityDepth = 200
FinalityTagEnabled = false
LogBackfillBatchSize = 1000
LogPollInterval = '5s'
LogKeepBlocksDepth = 100000
LogPrunePageSize = 0
BackupLogPollerBlockDelay = 100
-MinIncomingConfirmations = 1
+MinIncomingConfirmations = 3
MinContractPayment = '0.00001 link'
NonceAutoSync = true
NoNewHeadsThreshold = '1m0s'
@@ -4288,10 +4391,10 @@ Enabled = true
[GasEstimator]
Mode = 'BlockHistory'
-PriceDefault = '20 gwei'
-PriceMax = '18.446744073709551615 ether'
-PriceMin = '0'
-LimitDefault = 100000000
+PriceDefault = '25 mwei'
+PriceMax = '500 mwei'
+PriceMin = '25 mwei'
+LimitDefault = 2500000000
LimitMax = 500000
LimitMultiplier = '1'
LimitTransfer = 21000
@@ -4300,13 +4403,13 @@ BumpMin = '5 gwei'
BumpPercent = 20
BumpThreshold = 3
EIP1559DynamicFees = false
-FeeCapDefault = '100 gwei'
+FeeCapDefault = '500 mwei'
TipCapDefault = '1 wei'
TipCapMin = '1 wei'
[GasEstimator.BlockHistory]
BatchSize = 25
-BlockHistorySize = 8
+BlockHistorySize = 200
CheckInclusionBlocks = 12
CheckInclusionPercentile = 90
TransactionPercentile = 60
@@ -4315,7 +4418,7 @@ TransactionPercentile = 60
CacheTimeout = '10s'
[HeadTracker]
-HistoryDepth = 50
+HistoryDepth = 250
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
@@ -4359,14 +4462,14 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'zksync'
-FinalityDepth = 10
+FinalityDepth = 1200
FinalityTagEnabled = false
LogBackfillBatchSize = 1000
LogPollInterval = '5s'
LogKeepBlocksDepth = 100000
LogPrunePageSize = 0
BackupLogPollerBlockDelay = 100
-MinIncomingConfirmations = 1
+MinIncomingConfirmations = 3
MinContractPayment = '0.00001 link'
NonceAutoSync = true
NoNewHeadsThreshold = '1m0s'
@@ -4392,10 +4495,10 @@ Enabled = true
[GasEstimator]
Mode = 'BlockHistory'
-PriceDefault = '20 gwei'
-PriceMax = '18.446744073709551615 ether'
-PriceMin = '0'
-LimitDefault = 100000000
+PriceDefault = '25 mwei'
+PriceMax = '500 mwei'
+PriceMin = '25 mwei'
+LimitDefault = 2500000000
LimitMax = 500000
LimitMultiplier = '1'
LimitTransfer = 21000
@@ -4404,13 +4507,13 @@ BumpMin = '5 gwei'
BumpPercent = 20
BumpThreshold = 3
EIP1559DynamicFees = false
-FeeCapDefault = '100 gwei'
+FeeCapDefault = '500 mwei'
TipCapDefault = '1 wei'
TipCapMin = '1 wei'
[GasEstimator.BlockHistory]
BatchSize = 25
-BlockHistorySize = 8
+BlockHistorySize = 200
CheckInclusionBlocks = 12
CheckInclusionPercentile = 90
TransactionPercentile = 60
@@ -4419,7 +4522,7 @@ TransactionPercentile = 60
CacheTimeout = '10s'
[HeadTracker]
-HistoryDepth = 50
+HistoryDepth = 1500
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
@@ -4464,7 +4567,7 @@ BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'optimismBedrock'
FinalityDepth = 200
-FinalityTagEnabled = false
+FinalityTagEnabled = true
LinkContractAddress = '0xdc2CC710e42857672E7907CF474a69B63B93089f'
LogBackfillBatchSize = 1000
LogPollInterval = '2s'
@@ -4665,23 +4768,24 @@ GasLimitDefault = 400000
-Klaytn Testnet (1001)
+Astar Mainnet (592)
```toml
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 10
-FinalityTagEnabled = false
+ChainType = 'astar'
+FinalityDepth = 100
+FinalityTagEnabled = true
LogBackfillBatchSize = 1000
-LogPollInterval = '15s'
+LogPollInterval = '6s'
LogKeepBlocksDepth = 100000
LogPrunePageSize = 0
BackupLogPollerBlockDelay = 100
-MinIncomingConfirmations = 1
+MinIncomingConfirmations = 3
MinContractPayment = '0.00001 link'
NonceAutoSync = true
-NoNewHeadsThreshold = '30s'
+NoNewHeadsThreshold = '3m0s'
LogBroadcasterEnabled = true
RPCDefaultBatchSize = 250
RPCBlockQueryDelay = 1
@@ -4703,18 +4807,18 @@ Enabled = false
Enabled = true
[GasEstimator]
-Mode = 'SuggestedPrice'
-PriceDefault = '750 gwei'
-PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
+Mode = 'BlockHistory'
+PriceDefault = '20 gwei'
+PriceMax = '100 micro'
PriceMin = '1 gwei'
-LimitDefault = 500000
+LimitDefault = 8000000
LimitMax = 500000
LimitMultiplier = '1'
LimitTransfer = 21000
EstimateLimit = false
BumpMin = '5 gwei'
BumpPercent = 20
-BumpThreshold = 5
+BumpThreshold = 3
EIP1559DynamicFees = false
FeeCapDefault = '100 gwei'
TipCapDefault = '1 wei'
@@ -4751,7 +4855,7 @@ DeathDeclarationDelay = '10s'
NewHeadsPollInterval = '0s'
[OCR]
-ContractConfirmations = 1
+ContractConfirmations = 4
ContractTransmitterTransmitTimeout = '10s'
DatabaseTimeout = '10s'
DeltaCOverride = '168h0m0s'
@@ -4768,24 +4872,24 @@ GasLimitDefault = 400000
-Metis Mainnet (1088)
+Mode Sepolia (919)
```toml
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-ChainType = 'metis'
-FinalityDepth = 10
+ChainType = 'optimismBedrock'
+FinalityDepth = 200
FinalityTagEnabled = true
LogBackfillBatchSize = 1000
LogPollInterval = '15s'
LogKeepBlocksDepth = 100000
LogPrunePageSize = 0
BackupLogPollerBlockDelay = 100
-MinIncomingConfirmations = 1
+MinIncomingConfirmations = 3
MinContractPayment = '0.00001 link'
NonceAutoSync = true
-NoNewHeadsThreshold = '0s'
+NoNewHeadsThreshold = '3m0s'
LogBroadcasterEnabled = true
RPCDefaultBatchSize = 250
RPCBlockQueryDelay = 1
@@ -4807,35 +4911,36 @@ Enabled = false
Enabled = true
[GasEstimator]
-Mode = 'SuggestedPrice'
+Mode = 'BlockHistory'
PriceDefault = '20 gwei'
-PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
-PriceMin = '0'
-LimitDefault = 500000
+PriceMax = '120 gwei'
+PriceMin = '1 gwei'
+LimitDefault = 8000000
LimitMax = 500000
LimitMultiplier = '1'
LimitTransfer = 21000
EstimateLimit = false
-BumpMin = '5 gwei'
+BumpMin = '100 wei'
BumpPercent = 20
-BumpThreshold = 3
-EIP1559DynamicFees = false
-FeeCapDefault = '100 gwei'
+BumpThreshold = 60
+EIP1559DynamicFees = true
+FeeCapDefault = '120 gwei'
TipCapDefault = '1 wei'
TipCapMin = '1 wei'
[GasEstimator.BlockHistory]
BatchSize = 25
-BlockHistorySize = 0
+BlockHistorySize = 200
CheckInclusionBlocks = 12
CheckInclusionPercentile = 90
+EIP1559FeeCapBufferBlocks = 0
TransactionPercentile = 60
[GasEstimator.FeeHistory]
CacheTimeout = '10s'
[HeadTracker]
-HistoryDepth = 100
+HistoryDepth = 300
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
@@ -4843,10 +4948,10 @@ FinalityTagBypass = true
PersistenceEnabled = true
[NodePool]
-PollFailureThreshold = 5
-PollInterval = '10s'
+PollFailureThreshold = 2
+PollInterval = '3s'
SelectionMode = 'HighestHead'
-SyncThreshold = 10
+SyncThreshold = 5
LeaseDuration = '0s'
NodeIsSyncingEnabled = false
FinalizedBlockPollInterval = '5s'
@@ -4855,7 +4960,7 @@ DeathDeclarationDelay = '10s'
NewHeadsPollInterval = '0s'
[OCR]
-ContractConfirmations = 1
+ContractConfirmations = 4
ContractTransmitterTransmitTimeout = '10s'
DatabaseTimeout = '10s'
DeltaCOverride = '168h0m0s'
@@ -4872,27 +4977,26 @@ GasLimitDefault = 400000
-Polygon Zkevm Mainnet (1101)
+Klaytn Testnet (1001)
```toml
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-ChainType = 'zkevm'
-FinalityDepth = 1000
+FinalityDepth = 10
FinalityTagEnabled = false
LogBackfillBatchSize = 1000
-LogPollInterval = '30s'
+LogPollInterval = '15s'
LogKeepBlocksDepth = 100000
LogPrunePageSize = 0
BackupLogPollerBlockDelay = 100
MinIncomingConfirmations = 1
MinContractPayment = '0.00001 link'
NonceAutoSync = true
-NoNewHeadsThreshold = '6m0s'
+NoNewHeadsThreshold = '30s'
LogBroadcasterEnabled = true
-RPCDefaultBatchSize = 100
-RPCBlockQueryDelay = 15
+RPCDefaultBatchSize = 250
+RPCBlockQueryDelay = 1
FinalizedBlockOffset = 0
NoNewFinalizedHeadsThreshold = '0s'
@@ -4902,7 +5006,7 @@ MaxInFlight = 16
MaxQueued = 250
ReaperInterval = '1h0m0s'
ReaperThreshold = '168h0m0s'
-ResendAfterThreshold = '3m0s'
+ResendAfterThreshold = '1m0s'
[Transactions.AutoPurge]
Enabled = false
@@ -4911,18 +5015,18 @@ Enabled = false
Enabled = true
[GasEstimator]
-Mode = 'FeeHistory'
-PriceDefault = '20 gwei'
+Mode = 'SuggestedPrice'
+PriceDefault = '750 gwei'
PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
-PriceMin = '0'
+PriceMin = '1 gwei'
LimitDefault = 500000
LimitMax = 500000
LimitMultiplier = '1'
LimitTransfer = 21000
EstimateLimit = false
BumpMin = '5 gwei'
-BumpPercent = 40
-BumpThreshold = 3
+BumpPercent = 20
+BumpThreshold = 5
EIP1559DynamicFees = false
FeeCapDefault = '100 gwei'
TipCapDefault = '1 wei'
@@ -4936,10 +5040,10 @@ CheckInclusionPercentile = 90
TransactionPercentile = 60
[GasEstimator.FeeHistory]
-CacheTimeout = '4s'
+CacheTimeout = '10s'
[HeadTracker]
-HistoryDepth = 2000
+HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
@@ -4976,29 +5080,29 @@ GasLimitDefault = 400000
-WeMix Mainnet (1111)
+Metis Mainnet (1088)
```toml
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-ChainType = 'wemix'
-FinalityDepth = 10
+ChainType = 'metis'
+FinalityDepth = 500
FinalityTagEnabled = true
LogBackfillBatchSize = 1000
-LogPollInterval = '3s'
+LogPollInterval = '15s'
LogKeepBlocksDepth = 100000
LogPrunePageSize = 0
BackupLogPollerBlockDelay = 100
MinIncomingConfirmations = 1
MinContractPayment = '0.00001 link'
NonceAutoSync = true
-NoNewHeadsThreshold = '30s'
+NoNewHeadsThreshold = '0s'
LogBroadcasterEnabled = true
RPCDefaultBatchSize = 250
RPCBlockQueryDelay = 1
FinalizedBlockOffset = 0
-NoNewFinalizedHeadsThreshold = '40s'
+NoNewFinalizedHeadsThreshold = '0s'
[Transactions]
ForwardersEnabled = false
@@ -5015,10 +5119,10 @@ Enabled = false
Enabled = true
[GasEstimator]
-Mode = 'BlockHistory'
+Mode = 'SuggestedPrice'
PriceDefault = '20 gwei'
PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
-PriceMin = '1 gwei'
+PriceMin = '0'
LimitDefault = 500000
LimitMax = 500000
LimitMultiplier = '1'
@@ -5027,14 +5131,14 @@ EstimateLimit = false
BumpMin = '5 gwei'
BumpPercent = 20
BumpThreshold = 3
-EIP1559DynamicFees = true
+EIP1559DynamicFees = false
FeeCapDefault = '100 gwei'
-TipCapDefault = '100 gwei'
+TipCapDefault = '1 wei'
TipCapMin = '1 wei'
[GasEstimator.BlockHistory]
BatchSize = 25
-BlockHistorySize = 8
+BlockHistorySize = 0
CheckInclusionBlocks = 12
CheckInclusionPercentile = 90
TransactionPercentile = 60
@@ -5054,7 +5158,7 @@ PersistenceEnabled = true
PollFailureThreshold = 5
PollInterval = '10s'
SelectionMode = 'HighestHead'
-SyncThreshold = 5
+SyncThreshold = 10
LeaseDuration = '0s'
NodeIsSyncingEnabled = false
FinalizedBlockPollInterval = '5s'
@@ -5080,29 +5184,29 @@ GasLimitDefault = 400000
-WeMix Testnet (1112)
+Polygon Zkevm Mainnet (1101)
```toml
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-ChainType = 'wemix'
-FinalityDepth = 10
-FinalityTagEnabled = true
+ChainType = 'zkevm'
+FinalityDepth = 1000
+FinalityTagEnabled = false
LogBackfillBatchSize = 1000
-LogPollInterval = '3s'
+LogPollInterval = '30s'
LogKeepBlocksDepth = 100000
LogPrunePageSize = 0
BackupLogPollerBlockDelay = 100
MinIncomingConfirmations = 1
MinContractPayment = '0.00001 link'
NonceAutoSync = true
-NoNewHeadsThreshold = '30s'
+NoNewHeadsThreshold = '6m0s'
LogBroadcasterEnabled = true
-RPCDefaultBatchSize = 250
-RPCBlockQueryDelay = 1
+RPCDefaultBatchSize = 100
+RPCBlockQueryDelay = 15
FinalizedBlockOffset = 0
-NoNewFinalizedHeadsThreshold = '40s'
+NoNewFinalizedHeadsThreshold = '0s'
[Transactions]
ForwardersEnabled = false
@@ -5110,7 +5214,7 @@ MaxInFlight = 16
MaxQueued = 250
ReaperInterval = '1h0m0s'
ReaperThreshold = '168h0m0s'
-ResendAfterThreshold = '1m0s'
+ResendAfterThreshold = '3m0s'
[Transactions.AutoPurge]
Enabled = false
@@ -5119,21 +5223,229 @@ Enabled = false
Enabled = true
[GasEstimator]
-Mode = 'BlockHistory'
+Mode = 'FeeHistory'
PriceDefault = '20 gwei'
PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
-PriceMin = '1 gwei'
+PriceMin = '0'
LimitDefault = 500000
LimitMax = 500000
LimitMultiplier = '1'
LimitTransfer = 21000
EstimateLimit = false
BumpMin = '5 gwei'
-BumpPercent = 20
+BumpPercent = 40
BumpThreshold = 3
-EIP1559DynamicFees = true
+EIP1559DynamicFees = false
FeeCapDefault = '100 gwei'
-TipCapDefault = '100 gwei'
+TipCapDefault = '1 wei'
+TipCapMin = '1 wei'
+
+[GasEstimator.BlockHistory]
+BatchSize = 25
+BlockHistorySize = 8
+CheckInclusionBlocks = 12
+CheckInclusionPercentile = 90
+TransactionPercentile = 60
+
+[GasEstimator.FeeHistory]
+CacheTimeout = '4s'
+
+[HeadTracker]
+HistoryDepth = 2000
+MaxBufferSize = 3
+SamplingInterval = '1s'
+MaxAllowedFinalityDepth = 10000
+FinalityTagBypass = true
+PersistenceEnabled = true
+
+[NodePool]
+PollFailureThreshold = 5
+PollInterval = '10s'
+SelectionMode = 'HighestHead'
+SyncThreshold = 5
+LeaseDuration = '0s'
+NodeIsSyncingEnabled = false
+FinalizedBlockPollInterval = '5s'
+EnforceRepeatableRead = false
+DeathDeclarationDelay = '10s'
+NewHeadsPollInterval = '0s'
+
+[OCR]
+ContractConfirmations = 1
+ContractTransmitterTransmitTimeout = '10s'
+DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
+ObservationGracePeriod = '1s'
+
+[OCR2]
+[OCR2.Automation]
+GasLimit = 5400000
+
+[Workflow]
+GasLimitDefault = 400000
+```
+
+
+
+WeMix Mainnet (1111)
+
+```toml
+AutoCreateKey = true
+BlockBackfillDepth = 10
+BlockBackfillSkip = false
+ChainType = 'wemix'
+FinalityDepth = 1
+FinalityTagEnabled = true
+LogBackfillBatchSize = 1000
+LogPollInterval = '3s'
+LogKeepBlocksDepth = 100000
+LogPrunePageSize = 0
+BackupLogPollerBlockDelay = 100
+MinIncomingConfirmations = 1
+MinContractPayment = '0.00001 link'
+NonceAutoSync = true
+NoNewHeadsThreshold = '30s'
+LogBroadcasterEnabled = true
+RPCDefaultBatchSize = 250
+RPCBlockQueryDelay = 1
+FinalizedBlockOffset = 0
+NoNewFinalizedHeadsThreshold = '40s'
+
+[Transactions]
+ForwardersEnabled = false
+MaxInFlight = 16
+MaxQueued = 250
+ReaperInterval = '1h0m0s'
+ReaperThreshold = '168h0m0s'
+ResendAfterThreshold = '1m0s'
+
+[Transactions.AutoPurge]
+Enabled = false
+
+[BalanceMonitor]
+Enabled = true
+
+[GasEstimator]
+Mode = 'BlockHistory'
+PriceDefault = '20 gwei'
+PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
+PriceMin = '1 gwei'
+LimitDefault = 500000
+LimitMax = 500000
+LimitMultiplier = '1'
+LimitTransfer = 21000
+EstimateLimit = false
+BumpMin = '5 gwei'
+BumpPercent = 20
+BumpThreshold = 3
+EIP1559DynamicFees = true
+FeeCapDefault = '100 gwei'
+TipCapDefault = '100 gwei'
+TipCapMin = '1 wei'
+
+[GasEstimator.BlockHistory]
+BatchSize = 25
+BlockHistorySize = 8
+CheckInclusionBlocks = 12
+CheckInclusionPercentile = 90
+TransactionPercentile = 60
+
+[GasEstimator.FeeHistory]
+CacheTimeout = '10s'
+
+[HeadTracker]
+HistoryDepth = 100
+MaxBufferSize = 3
+SamplingInterval = '1s'
+MaxAllowedFinalityDepth = 10000
+FinalityTagBypass = true
+PersistenceEnabled = true
+
+[NodePool]
+PollFailureThreshold = 5
+PollInterval = '10s'
+SelectionMode = 'HighestHead'
+SyncThreshold = 5
+LeaseDuration = '0s'
+NodeIsSyncingEnabled = false
+FinalizedBlockPollInterval = '5s'
+EnforceRepeatableRead = false
+DeathDeclarationDelay = '10s'
+NewHeadsPollInterval = '0s'
+
+[OCR]
+ContractConfirmations = 1
+ContractTransmitterTransmitTimeout = '10s'
+DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
+ObservationGracePeriod = '1s'
+
+[OCR2]
+[OCR2.Automation]
+GasLimit = 5400000
+
+[Workflow]
+GasLimitDefault = 400000
+```
+
+
+
+WeMix Testnet (1112)
+
+```toml
+AutoCreateKey = true
+BlockBackfillDepth = 10
+BlockBackfillSkip = false
+ChainType = 'wemix'
+FinalityDepth = 1
+FinalityTagEnabled = true
+LogBackfillBatchSize = 1000
+LogPollInterval = '3s'
+LogKeepBlocksDepth = 100000
+LogPrunePageSize = 0
+BackupLogPollerBlockDelay = 100
+MinIncomingConfirmations = 1
+MinContractPayment = '0.00001 link'
+NonceAutoSync = true
+NoNewHeadsThreshold = '30s'
+LogBroadcasterEnabled = true
+RPCDefaultBatchSize = 250
+RPCBlockQueryDelay = 1
+FinalizedBlockOffset = 0
+NoNewFinalizedHeadsThreshold = '40s'
+
+[Transactions]
+ForwardersEnabled = false
+MaxInFlight = 16
+MaxQueued = 250
+ReaperInterval = '1h0m0s'
+ReaperThreshold = '168h0m0s'
+ResendAfterThreshold = '1m0s'
+
+[Transactions.AutoPurge]
+Enabled = false
+
+[BalanceMonitor]
+Enabled = true
+
+[GasEstimator]
+Mode = 'BlockHistory'
+PriceDefault = '20 gwei'
+PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
+PriceMin = '1 gwei'
+LimitDefault = 500000
+LimitMax = 500000
+LimitMultiplier = '1'
+LimitTransfer = 21000
+EstimateLimit = false
+BumpMin = '5 gwei'
+BumpPercent = 20
+BumpThreshold = 3
+EIP1559DynamicFees = true
+FeeCapDefault = '100 gwei'
+TipCapDefault = '100 gwei'
TipCapMin = '1 wei'
[GasEstimator.BlockHistory]
@@ -5704,6 +6016,111 @@ GasLimitDefault = 400000
+Mantle Sepolia (5003)
+
+```toml
+AutoCreateKey = true
+BlockBackfillDepth = 10
+BlockBackfillSkip = false
+ChainType = 'optimismBedrock'
+FinalityDepth = 1200
+FinalityTagEnabled = true
+LogBackfillBatchSize = 1000
+LogPollInterval = '2s'
+LogKeepBlocksDepth = 100000
+LogPrunePageSize = 0
+BackupLogPollerBlockDelay = 100
+MinIncomingConfirmations = 1
+MinContractPayment = '0.00001 link'
+NonceAutoSync = true
+NoNewHeadsThreshold = '0s'
+LogBroadcasterEnabled = true
+RPCDefaultBatchSize = 250
+RPCBlockQueryDelay = 1
+FinalizedBlockOffset = 0
+NoNewFinalizedHeadsThreshold = '0s'
+
+[Transactions]
+ForwardersEnabled = false
+MaxInFlight = 16
+MaxQueued = 250
+ReaperInterval = '1h0m0s'
+ReaperThreshold = '168h0m0s'
+ResendAfterThreshold = '1m0s'
+
+[Transactions.AutoPurge]
+Enabled = false
+
+[BalanceMonitor]
+Enabled = true
+
+[GasEstimator]
+Mode = 'L2Suggested'
+PriceDefault = '20 gwei'
+PriceMax = '200 gwei'
+PriceMin = '1 gwei'
+LimitDefault = 100000000
+LimitMax = 500000
+LimitMultiplier = '1'
+LimitTransfer = 21000
+EstimateLimit = false
+BumpMin = '5 gwei'
+BumpPercent = 20
+BumpThreshold = 3
+EIP1559DynamicFees = false
+FeeCapDefault = '200 gwei'
+TipCapDefault = '1 wei'
+TipCapMin = '1 wei'
+
+[GasEstimator.BlockHistory]
+BatchSize = 25
+BlockHistorySize = 200
+CheckInclusionBlocks = 12
+CheckInclusionPercentile = 90
+EIP1559FeeCapBufferBlocks = 0
+TransactionPercentile = 60
+
+[GasEstimator.FeeHistory]
+CacheTimeout = '10s'
+
+[HeadTracker]
+HistoryDepth = 600
+MaxBufferSize = 3
+SamplingInterval = '1s'
+MaxAllowedFinalityDepth = 10000
+FinalityTagBypass = true
+PersistenceEnabled = true
+
+[NodePool]
+PollFailureThreshold = 5
+PollInterval = '10s'
+SelectionMode = 'HighestHead'
+SyncThreshold = 5
+LeaseDuration = '0s'
+NodeIsSyncingEnabled = false
+FinalizedBlockPollInterval = '5s'
+EnforceRepeatableRead = false
+DeathDeclarationDelay = '10s'
+NewHeadsPollInterval = '0s'
+
+[OCR]
+ContractConfirmations = 4
+ContractTransmitterTransmitTimeout = '10s'
+DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
+ObservationGracePeriod = '1s'
+
+[OCR2]
+[OCR2.Automation]
+GasLimit = 5400000
+
+[Workflow]
+GasLimitDefault = 400000
+```
+
+
+
Klaytn Mainnet (8217)
```toml
@@ -5961,9 +6378,114 @@ LimitTransfer = 21000
EstimateLimit = false
BumpMin = '5 gwei'
BumpPercent = 20
-BumpThreshold = 3
-EIP1559DynamicFees = true
-FeeCapDefault = '100 gwei'
+BumpThreshold = 3
+EIP1559DynamicFees = true
+FeeCapDefault = '100 gwei'
+TipCapDefault = '1 wei'
+TipCapMin = '1 wei'
+
+[GasEstimator.BlockHistory]
+BatchSize = 25
+BlockHistorySize = 8
+CheckInclusionBlocks = 12
+CheckInclusionPercentile = 90
+TransactionPercentile = 60
+
+[GasEstimator.FeeHistory]
+CacheTimeout = '10s'
+
+[HeadTracker]
+HistoryDepth = 100
+MaxBufferSize = 3
+SamplingInterval = '1s'
+MaxAllowedFinalityDepth = 10000
+FinalityTagBypass = true
+PersistenceEnabled = true
+
+[NodePool]
+PollFailureThreshold = 5
+PollInterval = '10s'
+SelectionMode = 'HighestHead'
+SyncThreshold = 5
+LeaseDuration = '0s'
+NodeIsSyncingEnabled = false
+FinalizedBlockPollInterval = '5s'
+EnforceRepeatableRead = false
+DeathDeclarationDelay = '10s'
+NewHeadsPollInterval = '0s'
+
+[OCR]
+ContractConfirmations = 4
+ContractTransmitterTransmitTimeout = '10s'
+DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
+ObservationGracePeriod = '1s'
+
+[OCR2]
+[OCR2.Automation]
+GasLimit = 5400000
+
+[Workflow]
+GasLimitDefault = 400000
+```
+
+
+
+L3X Mainnet (12324)
+
+```toml
+AutoCreateKey = true
+BlockBackfillDepth = 10
+BlockBackfillSkip = false
+ChainType = 'arbitrum'
+FinalityDepth = 10
+FinalityTagEnabled = true
+LinkContractAddress = '0x79f531a3D07214304F259DC28c7191513223bcf3'
+LogBackfillBatchSize = 1000
+LogPollInterval = '10s'
+LogKeepBlocksDepth = 100000
+LogPrunePageSize = 0
+BackupLogPollerBlockDelay = 100
+MinIncomingConfirmations = 3
+MinContractPayment = '0.00001 link'
+NonceAutoSync = true
+NoNewHeadsThreshold = '0s'
+LogBroadcasterEnabled = true
+RPCDefaultBatchSize = 250
+RPCBlockQueryDelay = 1
+FinalizedBlockOffset = 0
+NoNewFinalizedHeadsThreshold = '0s'
+
+[Transactions]
+ForwardersEnabled = false
+MaxInFlight = 16
+MaxQueued = 250
+ReaperInterval = '1h0m0s'
+ReaperThreshold = '168h0m0s'
+ResendAfterThreshold = '1m0s'
+
+[Transactions.AutoPurge]
+Enabled = false
+
+[BalanceMonitor]
+Enabled = true
+
+[GasEstimator]
+Mode = 'Arbitrum'
+PriceDefault = '100 mwei'
+PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
+PriceMin = '0'
+LimitDefault = 500000
+LimitMax = 1000000000
+LimitMultiplier = '1'
+LimitTransfer = 21000
+EstimateLimit = false
+BumpMin = '5 gwei'
+BumpPercent = 20
+BumpThreshold = 5
+EIP1559DynamicFees = false
+FeeCapDefault = '1 micro'
TipCapDefault = '1 wei'
TipCapMin = '1 wei'
@@ -5998,7 +6520,7 @@ DeathDeclarationDelay = '10s'
NewHeadsPollInterval = '0s'
[OCR]
-ContractConfirmations = 4
+ContractConfirmations = 1
ContractTransmitterTransmitTimeout = '10s'
DatabaseTimeout = '10s'
DeltaCOverride = '168h0m0s'
@@ -6015,7 +6537,7 @@ GasLimitDefault = 400000
-L3X Mainnet (12324)
+L3X Sepolia (12325)
```toml
AutoCreateKey = true
@@ -6024,7 +6546,7 @@ BlockBackfillSkip = false
ChainType = 'arbitrum'
FinalityDepth = 10
FinalityTagEnabled = true
-LinkContractAddress = '0x79f531a3D07214304F259DC28c7191513223bcf3'
+LinkContractAddress = '0xa71848C99155DA0b245981E5ebD1C94C4be51c43'
LogBackfillBatchSize = 1000
LogPollInterval = '10s'
LogKeepBlocksDepth = 100000
@@ -6120,25 +6642,24 @@ GasLimitDefault = 400000
-L3X Sepolia (12325)
+Mode Mainnet (34443)
```toml
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-ChainType = 'arbitrum'
-FinalityDepth = 10
+ChainType = 'optimismBedrock'
+FinalityDepth = 200
FinalityTagEnabled = true
-LinkContractAddress = '0xa71848C99155DA0b245981E5ebD1C94C4be51c43'
LogBackfillBatchSize = 1000
-LogPollInterval = '10s'
+LogPollInterval = '15s'
LogKeepBlocksDepth = 100000
LogPrunePageSize = 0
BackupLogPollerBlockDelay = 100
MinIncomingConfirmations = 3
MinContractPayment = '0.00001 link'
NonceAutoSync = true
-NoNewHeadsThreshold = '0s'
+NoNewHeadsThreshold = '3m0s'
LogBroadcasterEnabled = true
RPCDefaultBatchSize = 250
RPCBlockQueryDelay = 1
@@ -6160,35 +6681,36 @@ Enabled = false
Enabled = true
[GasEstimator]
-Mode = 'Arbitrum'
-PriceDefault = '100 mwei'
-PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
-PriceMin = '0'
-LimitDefault = 500000
-LimitMax = 1000000000
+Mode = 'BlockHistory'
+PriceDefault = '20 gwei'
+PriceMax = '120 gwei'
+PriceMin = '1 gwei'
+LimitDefault = 8000000
+LimitMax = 500000
LimitMultiplier = '1'
LimitTransfer = 21000
EstimateLimit = false
-BumpMin = '5 gwei'
+BumpMin = '100 wei'
BumpPercent = 20
-BumpThreshold = 5
-EIP1559DynamicFees = false
-FeeCapDefault = '1 micro'
+BumpThreshold = 60
+EIP1559DynamicFees = true
+FeeCapDefault = '120 gwei'
TipCapDefault = '1 wei'
TipCapMin = '1 wei'
[GasEstimator.BlockHistory]
BatchSize = 25
-BlockHistorySize = 8
+BlockHistorySize = 200
CheckInclusionBlocks = 12
CheckInclusionPercentile = 90
+EIP1559FeeCapBufferBlocks = 0
TransactionPercentile = 60
[GasEstimator.FeeHistory]
CacheTimeout = '10s'
[HeadTracker]
-HistoryDepth = 100
+HistoryDepth = 300
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
@@ -6196,8 +6718,8 @@ FinalityTagBypass = true
PersistenceEnabled = true
[NodePool]
-PollFailureThreshold = 5
-PollInterval = '10s'
+PollFailureThreshold = 2
+PollInterval = '3s'
SelectionMode = 'HighestHead'
SyncThreshold = 5
LeaseDuration = '0s'
@@ -6208,7 +6730,7 @@ DeathDeclarationDelay = '10s'
NewHeadsPollInterval = '0s'
[OCR]
-ContractConfirmations = 1
+ContractConfirmations = 4
ContractTransmitterTransmitTimeout = '10s'
DatabaseTimeout = '10s'
DeltaCOverride = '168h0m0s'
@@ -6338,7 +6860,7 @@ BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'celo'
FinalityDepth = 10
-FinalityTagEnabled = false
+FinalityTagEnabled = true
LogBackfillBatchSize = 1000
LogPollInterval = '5s'
LogKeepBlocksDepth = 100000
@@ -6650,7 +7172,7 @@ BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'celo'
FinalityDepth = 10
-FinalityTagEnabled = false
+FinalityTagEnabled = true
LogBackfillBatchSize = 1000
LogPollInterval = '5s'
LogKeepBlocksDepth = 100000
@@ -6871,12 +7393,220 @@ BackupLogPollerBlockDelay = 100
MinIncomingConfirmations = 3
MinContractPayment = '0.00001 link'
NonceAutoSync = true
-NoNewHeadsThreshold = '40s'
+NoNewHeadsThreshold = '40s'
+LogBroadcasterEnabled = true
+RPCDefaultBatchSize = 250
+RPCBlockQueryDelay = 1
+FinalizedBlockOffset = 0
+NoNewFinalizedHeadsThreshold = '15m0s'
+
+[Transactions]
+ForwardersEnabled = false
+MaxInFlight = 16
+MaxQueued = 250
+ReaperInterval = '1h0m0s'
+ReaperThreshold = '168h0m0s'
+ResendAfterThreshold = '30s'
+
+[Transactions.AutoPurge]
+Enabled = true
+Threshold = 90
+MinAttempts = 3
+
+[BalanceMonitor]
+Enabled = true
+
+[GasEstimator]
+Mode = 'BlockHistory'
+PriceDefault = '20 gwei'
+PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
+PriceMin = '1 wei'
+LimitDefault = 500000
+LimitMax = 500000
+LimitMultiplier = '1'
+LimitTransfer = 21000
+EstimateLimit = false
+BumpMin = '100 wei'
+BumpPercent = 20
+BumpThreshold = 3
+EIP1559DynamicFees = true
+FeeCapDefault = '100 gwei'
+TipCapDefault = '1 wei'
+TipCapMin = '1 wei'
+
+[GasEstimator.BlockHistory]
+BatchSize = 25
+BlockHistorySize = 24
+CheckInclusionBlocks = 12
+CheckInclusionPercentile = 90
+TransactionPercentile = 60
+
+[GasEstimator.FeeHistory]
+CacheTimeout = '10s'
+
+[HeadTracker]
+HistoryDepth = 2000
+MaxBufferSize = 3
+SamplingInterval = '1s'
+MaxAllowedFinalityDepth = 10000
+FinalityTagBypass = true
+PersistenceEnabled = true
+
+[NodePool]
+PollFailureThreshold = 5
+PollInterval = '10s'
+SelectionMode = 'HighestHead'
+SyncThreshold = 10
+LeaseDuration = '0s'
+NodeIsSyncingEnabled = false
+FinalizedBlockPollInterval = '5s'
+EnforceRepeatableRead = false
+DeathDeclarationDelay = '10s'
+NewHeadsPollInterval = '0s'
+
+[OCR]
+ContractConfirmations = 1
+ContractTransmitterTransmitTimeout = '10s'
+DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
+ObservationGracePeriod = '1s'
+
+[OCR2]
+[OCR2.Automation]
+GasLimit = 6500000
+
+[Workflow]
+GasLimitDefault = 400000
+```
+
+
+
+Linea Goerli (59140)
+
+```toml
+AutoCreateKey = true
+BlockBackfillDepth = 10
+BlockBackfillSkip = false
+FinalityDepth = 15
+FinalityTagEnabled = false
+LogBackfillBatchSize = 1000
+LogPollInterval = '15s'
+LogKeepBlocksDepth = 100000
+LogPrunePageSize = 0
+BackupLogPollerBlockDelay = 100
+MinIncomingConfirmations = 3
+MinContractPayment = '0.00001 link'
+NonceAutoSync = true
+NoNewHeadsThreshold = '0s'
+LogBroadcasterEnabled = true
+RPCDefaultBatchSize = 250
+RPCBlockQueryDelay = 1
+FinalizedBlockOffset = 0
+NoNewFinalizedHeadsThreshold = '0s'
+
+[Transactions]
+ForwardersEnabled = false
+MaxInFlight = 16
+MaxQueued = 250
+ReaperInterval = '1h0m0s'
+ReaperThreshold = '168h0m0s'
+ResendAfterThreshold = '3m0s'
+
+[Transactions.AutoPurge]
+Enabled = false
+
+[BalanceMonitor]
+Enabled = true
+
+[GasEstimator]
+Mode = 'BlockHistory'
+PriceDefault = '20 gwei'
+PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
+PriceMin = '1 gwei'
+LimitDefault = 500000
+LimitMax = 500000
+LimitMultiplier = '1'
+LimitTransfer = 21000
+EstimateLimit = false
+BumpMin = '5 gwei'
+BumpPercent = 40
+BumpThreshold = 3
+EIP1559DynamicFees = false
+FeeCapDefault = '100 gwei'
+TipCapDefault = '1 wei'
+TipCapMin = '1 wei'
+
+[GasEstimator.BlockHistory]
+BatchSize = 25
+BlockHistorySize = 8
+CheckInclusionBlocks = 12
+CheckInclusionPercentile = 90
+TransactionPercentile = 60
+
+[GasEstimator.FeeHistory]
+CacheTimeout = '10s'
+
+[HeadTracker]
+HistoryDepth = 100
+MaxBufferSize = 3
+SamplingInterval = '1s'
+MaxAllowedFinalityDepth = 10000
+FinalityTagBypass = true
+PersistenceEnabled = true
+
+[NodePool]
+PollFailureThreshold = 5
+PollInterval = '10s'
+SelectionMode = 'HighestHead'
+SyncThreshold = 5
+LeaseDuration = '0s'
+NodeIsSyncingEnabled = false
+FinalizedBlockPollInterval = '5s'
+EnforceRepeatableRead = false
+DeathDeclarationDelay = '10s'
+NewHeadsPollInterval = '0s'
+
+[OCR]
+ContractConfirmations = 4
+ContractTransmitterTransmitTimeout = '10s'
+DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
+ObservationGracePeriod = '1s'
+
+[OCR2]
+[OCR2.Automation]
+GasLimit = 5400000
+
+[Workflow]
+GasLimitDefault = 400000
+```
+
+
+
+Linea Sepolia (59141)
+
+```toml
+AutoCreateKey = true
+BlockBackfillDepth = 10
+BlockBackfillSkip = false
+FinalityDepth = 200
+FinalityTagEnabled = false
+LogBackfillBatchSize = 1000
+LogPollInterval = '15s'
+LogKeepBlocksDepth = 100000
+LogPrunePageSize = 0
+BackupLogPollerBlockDelay = 100
+MinIncomingConfirmations = 3
+MinContractPayment = '0.00001 link'
+NonceAutoSync = true
+NoNewHeadsThreshold = '0s'
LogBroadcasterEnabled = true
RPCDefaultBatchSize = 250
RPCBlockQueryDelay = 1
FinalizedBlockOffset = 0
-NoNewFinalizedHeadsThreshold = '15m0s'
+NoNewFinalizedHeadsThreshold = '0s'
[Transactions]
ForwardersEnabled = false
@@ -6884,12 +7614,10 @@ MaxInFlight = 16
MaxQueued = 250
ReaperInterval = '1h0m0s'
ReaperThreshold = '168h0m0s'
-ResendAfterThreshold = '30s'
+ResendAfterThreshold = '3m0s'
[Transactions.AutoPurge]
-Enabled = true
-Threshold = 90
-MinAttempts = 3
+Enabled = false
[BalanceMonitor]
Enabled = true
@@ -6904,7 +7632,7 @@ LimitMax = 500000
LimitMultiplier = '1'
LimitTransfer = 21000
EstimateLimit = false
-BumpMin = '100 wei'
+BumpMin = '5 gwei'
BumpPercent = 20
BumpThreshold = 3
EIP1559DynamicFees = true
@@ -6914,7 +7642,7 @@ TipCapMin = '1 wei'
[GasEstimator.BlockHistory]
BatchSize = 25
-BlockHistorySize = 24
+BlockHistorySize = 8
CheckInclusionBlocks = 12
CheckInclusionPercentile = 90
TransactionPercentile = 60
@@ -6923,7 +7651,7 @@ TransactionPercentile = 60
CacheTimeout = '10s'
[HeadTracker]
-HistoryDepth = 2000
+HistoryDepth = 1000
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
@@ -6934,7 +7662,7 @@ PersistenceEnabled = true
PollFailureThreshold = 5
PollInterval = '10s'
SelectionMode = 'HighestHead'
-SyncThreshold = 10
+SyncThreshold = 5
LeaseDuration = '0s'
NodeIsSyncingEnabled = false
FinalizedBlockPollInterval = '5s'
@@ -6943,7 +7671,7 @@ DeathDeclarationDelay = '10s'
NewHeadsPollInterval = '0s'
[OCR]
-ContractConfirmations = 1
+ContractConfirmations = 4
ContractTransmitterTransmitTimeout = '10s'
DatabaseTimeout = '10s'
DeltaCOverride = '168h0m0s'
@@ -6952,7 +7680,7 @@ ObservationGracePeriod = '1s'
[OCR2]
[OCR2.Automation]
-GasLimit = 6500000
+GasLimit = 5400000
[Workflow]
GasLimitDefault = 400000
@@ -6960,13 +7688,13 @@ GasLimitDefault = 400000
-Linea Goerli (59140)
+Linea Mainnet (59144)
```toml
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 15
+FinalityDepth = 600
FinalityTagEnabled = false
LogBackfillBatchSize = 1000
LogPollInterval = '15s'
@@ -7001,7 +7729,7 @@ Enabled = true
Mode = 'BlockHistory'
PriceDefault = '20 gwei'
PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
-PriceMin = '1 gwei'
+PriceMin = '400 mwei'
LimitDefault = 500000
LimitMax = 500000
LimitMultiplier = '1'
@@ -7026,7 +7754,7 @@ TransactionPercentile = 60
CacheTimeout = '10s'
[HeadTracker]
-HistoryDepth = 100
+HistoryDepth = 350
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
@@ -7063,20 +7791,21 @@ GasLimitDefault = 400000
-Linea Sepolia (59141)
+Metis Sepolia (59902)
```toml
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 200
-FinalityTagEnabled = false
+ChainType = 'metis'
+FinalityDepth = 3000
+FinalityTagEnabled = true
LogBackfillBatchSize = 1000
LogPollInterval = '15s'
LogKeepBlocksDepth = 100000
LogPrunePageSize = 0
BackupLogPollerBlockDelay = 100
-MinIncomingConfirmations = 3
+MinIncomingConfirmations = 1
MinContractPayment = '0.00001 link'
NonceAutoSync = true
NoNewHeadsThreshold = '0s'
@@ -7092,7 +7821,7 @@ MaxInFlight = 16
MaxQueued = 250
ReaperInterval = '1h0m0s'
ReaperThreshold = '168h0m0s'
-ResendAfterThreshold = '3m0s'
+ResendAfterThreshold = '1m0s'
[Transactions.AutoPurge]
Enabled = false
@@ -7101,10 +7830,10 @@ Enabled = false
Enabled = true
[GasEstimator]
-Mode = 'BlockHistory'
+Mode = 'SuggestedPrice'
PriceDefault = '20 gwei'
PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
-PriceMin = '1 wei'
+PriceMin = '0'
LimitDefault = 500000
LimitMax = 500000
LimitMultiplier = '1'
@@ -7113,14 +7842,14 @@ EstimateLimit = false
BumpMin = '5 gwei'
BumpPercent = 20
BumpThreshold = 3
-EIP1559DynamicFees = true
+EIP1559DynamicFees = false
FeeCapDefault = '100 gwei'
TipCapDefault = '1 wei'
TipCapMin = '1 wei'
[GasEstimator.BlockHistory]
BatchSize = 25
-BlockHistorySize = 8
+BlockHistorySize = 0
CheckInclusionBlocks = 12
CheckInclusionPercentile = 90
TransactionPercentile = 60
@@ -7129,7 +7858,7 @@ TransactionPercentile = 60
CacheTimeout = '10s'
[HeadTracker]
-HistoryDepth = 1000
+HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
@@ -7140,7 +7869,7 @@ PersistenceEnabled = true
PollFailureThreshold = 5
PollInterval = '10s'
SelectionMode = 'HighestHead'
-SyncThreshold = 5
+SyncThreshold = 10
LeaseDuration = '0s'
NodeIsSyncingEnabled = false
FinalizedBlockPollInterval = '5s'
@@ -7149,7 +7878,7 @@ DeathDeclarationDelay = '10s'
NewHeadsPollInterval = '0s'
[OCR]
-ContractConfirmations = 4
+ContractConfirmations = 1
ContractTransmitterTransmitTimeout = '10s'
DatabaseTimeout = '10s'
DeltaCOverride = '168h0m0s'
@@ -7166,26 +7895,27 @@ GasLimitDefault = 400000
-Linea Mainnet (59144)
+Avalanche ANZ testnet (76578)
```toml
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 600
+FinalityDepth = 1
FinalityTagEnabled = false
+LinkContractAddress = '0x779877A7B0D9E8603169DdbD7836e478b4624789'
LogBackfillBatchSize = 1000
-LogPollInterval = '15s'
+LogPollInterval = '3s'
LogKeepBlocksDepth = 100000
LogPrunePageSize = 0
BackupLogPollerBlockDelay = 100
-MinIncomingConfirmations = 3
+MinIncomingConfirmations = 1
MinContractPayment = '0.00001 link'
NonceAutoSync = true
NoNewHeadsThreshold = '0s'
LogBroadcasterEnabled = true
RPCDefaultBatchSize = 250
-RPCBlockQueryDelay = 1
+RPCBlockQueryDelay = 2
FinalizedBlockOffset = 0
NoNewFinalizedHeadsThreshold = '0s'
@@ -7195,7 +7925,7 @@ MaxInFlight = 16
MaxQueued = 250
ReaperInterval = '1h0m0s'
ReaperThreshold = '168h0m0s'
-ResendAfterThreshold = '3m0s'
+ResendAfterThreshold = '1m0s'
[Transactions.AutoPurge]
Enabled = false
@@ -7205,16 +7935,16 @@ Enabled = true
[GasEstimator]
Mode = 'BlockHistory'
-PriceDefault = '20 gwei'
+PriceDefault = '25 gwei'
PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
-PriceMin = '400 mwei'
+PriceMin = '25 gwei'
LimitDefault = 500000
LimitMax = 500000
LimitMultiplier = '1'
LimitTransfer = 21000
EstimateLimit = false
BumpMin = '5 gwei'
-BumpPercent = 40
+BumpPercent = 20
BumpThreshold = 3
EIP1559DynamicFees = false
FeeCapDefault = '100 gwei'
@@ -7223,7 +7953,7 @@ TipCapMin = '1 wei'
[GasEstimator.BlockHistory]
BatchSize = 25
-BlockHistorySize = 8
+BlockHistorySize = 24
CheckInclusionBlocks = 12
CheckInclusionPercentile = 90
TransactionPercentile = 60
@@ -7232,7 +7962,7 @@ TransactionPercentile = 60
CacheTimeout = '10s'
[HeadTracker]
-HistoryDepth = 350
+HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
@@ -7252,7 +7982,7 @@ DeathDeclarationDelay = '10s'
NewHeadsPollInterval = '0s'
[OCR]
-ContractConfirmations = 4
+ContractConfirmations = 1
ContractTransmitterTransmitTimeout = '10s'
DatabaseTimeout = '10s'
DeltaCOverride = '168h0m0s'
@@ -7269,34 +7999,34 @@ GasLimitDefault = 400000
-Metis Sepolia (59902)
+Polygon Mumbai (80001)
```toml
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-ChainType = 'metis'
-FinalityDepth = 10
+FinalityDepth = 500
FinalityTagEnabled = true
+LinkContractAddress = '0x326C977E6efc84E512bB9C30f76E30c160eD06FB'
LogBackfillBatchSize = 1000
-LogPollInterval = '15s'
+LogPollInterval = '1s'
LogKeepBlocksDepth = 100000
LogPrunePageSize = 0
BackupLogPollerBlockDelay = 100
-MinIncomingConfirmations = 1
+MinIncomingConfirmations = 5
MinContractPayment = '0.00001 link'
NonceAutoSync = true
-NoNewHeadsThreshold = '0s'
+NoNewHeadsThreshold = '30s'
LogBroadcasterEnabled = true
-RPCDefaultBatchSize = 250
-RPCBlockQueryDelay = 1
+RPCDefaultBatchSize = 100
+RPCBlockQueryDelay = 10
FinalizedBlockOffset = 0
NoNewFinalizedHeadsThreshold = '0s'
[Transactions]
ForwardersEnabled = false
MaxInFlight = 16
-MaxQueued = 250
+MaxQueued = 5000
ReaperInterval = '1h0m0s'
ReaperThreshold = '168h0m0s'
ResendAfterThreshold = '1m0s'
@@ -7308,18 +8038,18 @@ Enabled = false
Enabled = true
[GasEstimator]
-Mode = 'SuggestedPrice'
-PriceDefault = '20 gwei'
+Mode = 'BlockHistory'
+PriceDefault = '25 gwei'
PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
-PriceMin = '0'
+PriceMin = '25 gwei'
LimitDefault = 500000
LimitMax = 500000
LimitMultiplier = '1'
LimitTransfer = 21000
EstimateLimit = false
-BumpMin = '5 gwei'
+BumpMin = '20 gwei'
BumpPercent = 20
-BumpThreshold = 3
+BumpThreshold = 5
EIP1559DynamicFees = false
FeeCapDefault = '100 gwei'
TipCapDefault = '1 wei'
@@ -7327,7 +8057,7 @@ TipCapMin = '1 wei'
[GasEstimator.BlockHistory]
BatchSize = 25
-BlockHistorySize = 0
+BlockHistorySize = 24
CheckInclusionBlocks = 12
CheckInclusionPercentile = 90
TransactionPercentile = 60
@@ -7336,7 +8066,7 @@ TransactionPercentile = 60
CacheTimeout = '10s'
[HeadTracker]
-HistoryDepth = 100
+HistoryDepth = 2000
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
@@ -7356,7 +8086,7 @@ DeathDeclarationDelay = '10s'
NewHeadsPollInterval = '0s'
[OCR]
-ContractConfirmations = 1
+ContractConfirmations = 4
ContractTransmitterTransmitTimeout = '10s'
DatabaseTimeout = '10s'
DeltaCOverride = '168h0m0s'
@@ -7373,7 +8103,7 @@ GasLimitDefault = 400000
-Polygon Mumbai (80001)
+Polygon Amoy (80002)
```toml
AutoCreateKey = true
@@ -7381,7 +8111,6 @@ BlockBackfillDepth = 10
BlockBackfillSkip = false
FinalityDepth = 500
FinalityTagEnabled = false
-LinkContractAddress = '0x326C977E6efc84E512bB9C30f76E30c160eD06FB'
LogBackfillBatchSize = 1000
LogPollInterval = '1s'
LogKeepBlocksDepth = 100000
@@ -7395,7 +8124,7 @@ LogBroadcasterEnabled = true
RPCDefaultBatchSize = 100
RPCBlockQueryDelay = 10
FinalizedBlockOffset = 0
-NoNewFinalizedHeadsThreshold = '0s'
+NoNewFinalizedHeadsThreshold = '12m0s'
[Transactions]
ForwardersEnabled = false
@@ -7424,7 +8153,7 @@ EstimateLimit = false
BumpMin = '20 gwei'
BumpPercent = 20
BumpThreshold = 5
-EIP1559DynamicFees = false
+EIP1559DynamicFees = true
FeeCapDefault = '100 gwei'
TipCapDefault = '1 wei'
TipCapMin = '1 wei'
@@ -7477,33 +8206,34 @@ GasLimitDefault = 400000
-Polygon Amoy (80002)
+Blast Mainnet (81457)
```toml
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
-FinalityDepth = 500
-FinalityTagEnabled = false
+ChainType = 'optimismBedrock'
+FinalityDepth = 200
+FinalityTagEnabled = true
LogBackfillBatchSize = 1000
-LogPollInterval = '1s'
+LogPollInterval = '2s'
LogKeepBlocksDepth = 100000
LogPrunePageSize = 0
BackupLogPollerBlockDelay = 100
-MinIncomingConfirmations = 5
+MinIncomingConfirmations = 3
MinContractPayment = '0.00001 link'
NonceAutoSync = true
-NoNewHeadsThreshold = '30s'
+NoNewHeadsThreshold = '3m0s'
LogBroadcasterEnabled = true
-RPCDefaultBatchSize = 100
-RPCBlockQueryDelay = 10
+RPCDefaultBatchSize = 250
+RPCBlockQueryDelay = 1
FinalizedBlockOffset = 0
-NoNewFinalizedHeadsThreshold = '12m0s'
+NoNewFinalizedHeadsThreshold = '0s'
[Transactions]
ForwardersEnabled = false
MaxInFlight = 16
-MaxQueued = 5000
+MaxQueued = 250
ReaperInterval = '1h0m0s'
ReaperThreshold = '168h0m0s'
ResendAfterThreshold = '1m0s'
@@ -7516,34 +8246,35 @@ Enabled = true
[GasEstimator]
Mode = 'BlockHistory'
-PriceDefault = '25 gwei'
-PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
-PriceMin = '25 gwei'
-LimitDefault = 500000
+PriceDefault = '20 gwei'
+PriceMax = '120 gwei'
+PriceMin = '1 gwei'
+LimitDefault = 8000000
LimitMax = 500000
LimitMultiplier = '1'
LimitTransfer = 21000
EstimateLimit = false
-BumpMin = '20 gwei'
+BumpMin = '100 wei'
BumpPercent = 20
-BumpThreshold = 5
+BumpThreshold = 60
EIP1559DynamicFees = true
-FeeCapDefault = '100 gwei'
+FeeCapDefault = '120 gwei'
TipCapDefault = '1 wei'
TipCapMin = '1 wei'
[GasEstimator.BlockHistory]
BatchSize = 25
-BlockHistorySize = 24
+BlockHistorySize = 200
CheckInclusionBlocks = 12
CheckInclusionPercentile = 90
+EIP1559FeeCapBufferBlocks = 0
TransactionPercentile = 60
[GasEstimator.FeeHistory]
CacheTimeout = '10s'
[HeadTracker]
-HistoryDepth = 2000
+HistoryDepth = 300
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
@@ -7551,10 +8282,10 @@ FinalityTagBypass = true
PersistenceEnabled = true
[NodePool]
-PollFailureThreshold = 5
-PollInterval = '10s'
+PollFailureThreshold = 4
+PollInterval = '4s'
SelectionMode = 'HighestHead'
-SyncThreshold = 10
+SyncThreshold = 5
LeaseDuration = '0s'
NodeIsSyncingEnabled = false
FinalizedBlockPollInterval = '5s'
@@ -7588,7 +8319,7 @@ BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'optimismBedrock'
FinalityDepth = 200
-FinalityTagEnabled = false
+FinalityTagEnabled = true
LogBackfillBatchSize = 1000
LogPollInterval = '2s'
LogKeepBlocksDepth = 100000
@@ -7693,6 +8424,7 @@ BlockBackfillSkip = false
ChainType = 'optimismBedrock'
FinalityDepth = 200
FinalityTagEnabled = true
+LinkContractAddress = '0xE4aB69C077896252FAFBD49EFD26B5D171A32410'
LogBackfillBatchSize = 1000
LogPollInterval = '2s'
LogKeepBlocksDepth = 100000
@@ -7901,7 +8633,7 @@ BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'arbitrum'
FinalityDepth = 4350
-FinalityTagEnabled = false
+FinalityTagEnabled = true
LinkContractAddress = '0xd14838A68E8AFBAdE5efb411d5871ea0011AFd28'
LogBackfillBatchSize = 1000
LogPollInterval = '1s'
@@ -8007,6 +8739,7 @@ BlockBackfillSkip = false
ChainType = 'arbitrum'
FinalityDepth = 4350
FinalityTagEnabled = true
+LinkContractAddress = '0xE4aB69C077896252FAFBD49EFD26B5D171A32410'
LogBackfillBatchSize = 1000
LogPollInterval = '1s'
LogKeepBlocksDepth = 100000
@@ -8518,6 +9251,111 @@ GasLimitDefault = 400000
+Blast Sepolia (168587773)
+
+```toml
+AutoCreateKey = true
+BlockBackfillDepth = 10
+BlockBackfillSkip = false
+ChainType = 'optimismBedrock'
+FinalityDepth = 200
+FinalityTagEnabled = true
+LogBackfillBatchSize = 1000
+LogPollInterval = '2s'
+LogKeepBlocksDepth = 100000
+LogPrunePageSize = 0
+BackupLogPollerBlockDelay = 100
+MinIncomingConfirmations = 3
+MinContractPayment = '0.00001 link'
+NonceAutoSync = true
+NoNewHeadsThreshold = '3m0s'
+LogBroadcasterEnabled = true
+RPCDefaultBatchSize = 250
+RPCBlockQueryDelay = 1
+FinalizedBlockOffset = 0
+NoNewFinalizedHeadsThreshold = '0s'
+
+[Transactions]
+ForwardersEnabled = false
+MaxInFlight = 16
+MaxQueued = 250
+ReaperInterval = '1h0m0s'
+ReaperThreshold = '168h0m0s'
+ResendAfterThreshold = '1m0s'
+
+[Transactions.AutoPurge]
+Enabled = false
+
+[BalanceMonitor]
+Enabled = true
+
+[GasEstimator]
+Mode = 'BlockHistory'
+PriceDefault = '20 gwei'
+PriceMax = '120 gwei'
+PriceMin = '1 gwei'
+LimitDefault = 8000000
+LimitMax = 500000
+LimitMultiplier = '1'
+LimitTransfer = 21000
+EstimateLimit = false
+BumpMin = '100 wei'
+BumpPercent = 20
+BumpThreshold = 60
+EIP1559DynamicFees = true
+FeeCapDefault = '120 gwei'
+TipCapDefault = '1 wei'
+TipCapMin = '1 wei'
+
+[GasEstimator.BlockHistory]
+BatchSize = 25
+BlockHistorySize = 200
+CheckInclusionBlocks = 12
+CheckInclusionPercentile = 90
+EIP1559FeeCapBufferBlocks = 0
+TransactionPercentile = 60
+
+[GasEstimator.FeeHistory]
+CacheTimeout = '10s'
+
+[HeadTracker]
+HistoryDepth = 300
+MaxBufferSize = 3
+SamplingInterval = '1s'
+MaxAllowedFinalityDepth = 10000
+FinalityTagBypass = true
+PersistenceEnabled = true
+
+[NodePool]
+PollFailureThreshold = 4
+PollInterval = '4s'
+SelectionMode = 'HighestHead'
+SyncThreshold = 5
+LeaseDuration = '0s'
+NodeIsSyncingEnabled = false
+FinalizedBlockPollInterval = '5s'
+EnforceRepeatableRead = false
+DeathDeclarationDelay = '10s'
+NewHeadsPollInterval = '0s'
+
+[OCR]
+ContractConfirmations = 4
+ContractTransmitterTransmitTimeout = '10s'
+DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
+ObservationGracePeriod = '1s'
+
+[OCR2]
+[OCR2.Automation]
+GasLimit = 5400000
+
+[Workflow]
+GasLimitDefault = 400000
+```
+
+
+
Harmony Mainnet (1666600000)
```toml
From e569490a5384db597c91eeb360f42591996011ef Mon Sep 17 00:00:00 2001
From: Otavio Madalosso
Date: Wed, 6 Nov 2024 15:58:44 -0300
Subject: [PATCH 14/17] revert artbitrum finalityDepth values
---
core/chains/evm/config/toml/defaults/Arbitrum_Goerli.toml | 4 ----
core/chains/evm/config/toml/defaults/Arbitrum_Mainnet.toml | 1 -
core/chains/evm/config/toml/defaults/Arbitrum_Rinkeby.toml | 1 -
core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml | 2 --
core/chains/evm/config/toml/defaults/Astar_Mainnet.toml | 2 +-
core/chains/evm/config/toml/defaults/Astar_Shibuya.toml | 2 +-
6 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/core/chains/evm/config/toml/defaults/Arbitrum_Goerli.toml b/core/chains/evm/config/toml/defaults/Arbitrum_Goerli.toml
index 5aeaef75768..2c1836ee84a 100644
--- a/core/chains/evm/config/toml/defaults/Arbitrum_Goerli.toml
+++ b/core/chains/evm/config/toml/defaults/Arbitrum_Goerli.toml
@@ -1,6 +1,5 @@
ChainID = '421613'
ChainType = 'arbitrum'
-FinalityDepth = 4350
FinalityTagEnabled = true
NoNewHeadsThreshold = '0'
OCR.ContractConfirmations = 1
@@ -21,9 +20,6 @@ BumpThreshold = 5
# Force an error if someone set GAS_UPDATER_ENABLED=true by accident; we never want to run the block history estimator on arbitrum
BlockHistorySize = 0
-[GasEstimator.DAOracle]
-OracleType = 'arbitrum'
-
[NodePool]
SyncThreshold = 10
diff --git a/core/chains/evm/config/toml/defaults/Arbitrum_Mainnet.toml b/core/chains/evm/config/toml/defaults/Arbitrum_Mainnet.toml
index 2d4f43b6103..b81d53731fb 100644
--- a/core/chains/evm/config/toml/defaults/Arbitrum_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Arbitrum_Mainnet.toml
@@ -1,7 +1,6 @@
# Arbitrum is an L2 chain. Pending proper L2 support, for now we rely on their sequencer
ChainID = '42161'
ChainType = 'arbitrum'
-FinalityDepth = 4350
FinalityTagEnabled = true
LinkContractAddress = "0xf97f4df75117a78c1A5a0DBb814Af92458539FB4"
LogPollInterval = '1s'
diff --git a/core/chains/evm/config/toml/defaults/Arbitrum_Rinkeby.toml b/core/chains/evm/config/toml/defaults/Arbitrum_Rinkeby.toml
index 829431397c7..68e28e7c5bc 100644
--- a/core/chains/evm/config/toml/defaults/Arbitrum_Rinkeby.toml
+++ b/core/chains/evm/config/toml/defaults/Arbitrum_Rinkeby.toml
@@ -1,5 +1,4 @@
ChainID = '421611'
-FinalityDepth = 4350
ChainType = 'arbitrum'
LinkContractAddress = "0x615fBe6372676474d9e6933d310469c9b68e9726"
LogPollInterval = '1s'
diff --git a/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml b/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml
index 7e96a4189e0..2599456c6c0 100644
--- a/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml
@@ -1,8 +1,6 @@
ChainID = '421614'
-FinalityDepth = 4350
ChainType = 'arbitrum'
FinalityTagEnabled = true
-# Not sure why this is used or if it needs to be here (got it from https://github.com/smartcontractkit/ccip/commit/4c07f36580a6ad3efaece6147e2a2abf4bd63422)
LinkContractAddress = '0xE4aB69C077896252FAFBD49EFD26B5D171A32410'
NoNewHeadsThreshold = '0'
OCR.ContractConfirmations = 1
diff --git a/core/chains/evm/config/toml/defaults/Astar_Mainnet.toml b/core/chains/evm/config/toml/defaults/Astar_Mainnet.toml
index d1697d137a3..abe42d05984 100644
--- a/core/chains/evm/config/toml/defaults/Astar_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Astar_Mainnet.toml
@@ -7,4 +7,4 @@ LogPollInterval = '6s'
[GasEstimator]
EIP1559DynamicFees = false
PriceMax = '100000 gwei'
-LimitDefault = 8000000
\ No newline at end of file
+LimitDefault = 8000000
diff --git a/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml b/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml
index 5a5df06f6f0..f96dffc6c66 100644
--- a/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml
+++ b/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml
@@ -6,4 +6,4 @@ LogPollInterval = '6s'
[GasEstimator]
EIP1559DynamicFees = false
PriceMax = '100000 gwei'
-LimitDefault = 8000000
\ No newline at end of file
+LimitDefault = 8000000
From e6865e1f5c00a38ff2aed816a3e84afb54db12ef Mon Sep 17 00:00:00 2001
From: Otavio Madalosso
Date: Wed, 6 Nov 2024 16:04:56 -0300
Subject: [PATCH 15/17] Undo comment deletion
---
core/config/docs/docs_test.go | 1 +
1 file changed, 1 insertion(+)
diff --git a/core/config/docs/docs_test.go b/core/config/docs/docs_test.go
index 0918887251a..9fca08ee99b 100644
--- a/core/config/docs/docs_test.go
+++ b/core/config/docs/docs_test.go
@@ -97,6 +97,7 @@ func TestDoc(t *testing.T) {
docDefaults.Transactions.AutoPurge.Threshold = nil
docDefaults.Transactions.AutoPurge.MinAttempts = nil
+ // Fallback DA oracle is not set
docDefaults.GasEstimator.DAOracle = evmcfg.DAOracle{}
assertTOML(t, fallbackDefaults, docDefaults)
From e3f41f6311f62d88715fc7de2474da6b9180cd56 Mon Sep 17 00:00:00 2001
From: Otavio Madalosso
Date: Wed, 6 Nov 2024 16:11:24 -0300
Subject: [PATCH 16/17] fixes
---
.../config/toml/defaults/Arbitrum_Goerli.toml | 3 ++
docs/CONFIG.md | 40 +++++++++----------
2 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/core/chains/evm/config/toml/defaults/Arbitrum_Goerli.toml b/core/chains/evm/config/toml/defaults/Arbitrum_Goerli.toml
index 2c1836ee84a..1106d123ce3 100644
--- a/core/chains/evm/config/toml/defaults/Arbitrum_Goerli.toml
+++ b/core/chains/evm/config/toml/defaults/Arbitrum_Goerli.toml
@@ -20,6 +20,9 @@ BumpThreshold = 5
# Force an error if someone set GAS_UPDATER_ENABLED=true by accident; we never want to run the block history estimator on arbitrum
BlockHistorySize = 0
+[GasEstimator.DAOracle]
+OracleType = 'arbitrum'
+
[NodePool]
SyncThreshold = 10
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index cc807405982..a33c646fb75 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -3188,8 +3188,8 @@ SyncThreshold = 5
LeaseDuration = '0s'
NodeIsSyncingEnabled = false
FinalizedBlockPollInterval = '5s'
-EnforceRepeatableRead = false
-DeathDeclarationDelay = '10s'
+EnforceRepeatableRead = true
+DeathDeclarationDelay = '1m0s'
NewHeadsPollInterval = '0s'
[OCR]
@@ -4871,8 +4871,8 @@ SyncThreshold = 5
LeaseDuration = '0s'
NodeIsSyncingEnabled = false
FinalizedBlockPollInterval = '5s'
-EnforceRepeatableRead = false
-DeathDeclarationDelay = '10s'
+EnforceRepeatableRead = true
+DeathDeclarationDelay = '1m0s'
NewHeadsPollInterval = '0s'
[OCR]
@@ -4976,8 +4976,8 @@ SyncThreshold = 5
LeaseDuration = '0s'
NodeIsSyncingEnabled = false
FinalizedBlockPollInterval = '5s'
-EnforceRepeatableRead = false
-DeathDeclarationDelay = '10s'
+EnforceRepeatableRead = true
+DeathDeclarationDelay = '1m0s'
NewHeadsPollInterval = '0s'
[OCR]
@@ -6128,8 +6128,8 @@ SyncThreshold = 5
LeaseDuration = '0s'
NodeIsSyncingEnabled = false
FinalizedBlockPollInterval = '5s'
-EnforceRepeatableRead = false
-DeathDeclarationDelay = '10s'
+EnforceRepeatableRead = true
+DeathDeclarationDelay = '1m0s'
NewHeadsPollInterval = '0s'
[OCR]
@@ -6764,8 +6764,8 @@ SyncThreshold = 5
LeaseDuration = '0s'
NodeIsSyncingEnabled = false
FinalizedBlockPollInterval = '5s'
-EnforceRepeatableRead = false
-DeathDeclarationDelay = '10s'
+EnforceRepeatableRead = true
+DeathDeclarationDelay = '1m0s'
NewHeadsPollInterval = '0s'
[OCR]
@@ -6793,7 +6793,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'arbitrum'
-FinalityDepth = 4350
+FinalityDepth = 10
FinalityTagEnabled = true
LinkContractAddress = '0xf97f4df75117a78c1A5a0DBb814Af92458539FB4'
LogBackfillBatchSize = 1000
@@ -8027,8 +8027,8 @@ SyncThreshold = 5
LeaseDuration = '0s'
NodeIsSyncingEnabled = false
FinalizedBlockPollInterval = '5s'
-EnforceRepeatableRead = false
-DeathDeclarationDelay = '10s'
+EnforceRepeatableRead = true
+DeathDeclarationDelay = '1m0s'
NewHeadsPollInterval = '0s'
[OCR]
@@ -8339,8 +8339,8 @@ SyncThreshold = 5
LeaseDuration = '0s'
NodeIsSyncingEnabled = false
FinalizedBlockPollInterval = '5s'
-EnforceRepeatableRead = false
-DeathDeclarationDelay = '10s'
+EnforceRepeatableRead = true
+DeathDeclarationDelay = '1m0s'
NewHeadsPollInterval = '0s'
[OCR]
@@ -8585,7 +8585,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'arbitrum'
-FinalityDepth = 4350
+FinalityDepth = 10
FinalityTagEnabled = false
LinkContractAddress = '0x615fBe6372676474d9e6933d310469c9b68e9726'
LogBackfillBatchSize = 1000
@@ -8693,7 +8693,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'arbitrum'
-FinalityDepth = 4350
+FinalityDepth = 10
FinalityTagEnabled = true
LinkContractAddress = '0xd14838A68E8AFBAdE5efb411d5871ea0011AFd28'
LogBackfillBatchSize = 1000
@@ -8801,7 +8801,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'arbitrum'
-FinalityDepth = 4350
+FinalityDepth = 10
FinalityTagEnabled = true
LinkContractAddress = '0xE4aB69C077896252FAFBD49EFD26B5D171A32410'
LogBackfillBatchSize = 1000
@@ -9413,8 +9413,8 @@ SyncThreshold = 5
LeaseDuration = '0s'
NodeIsSyncingEnabled = false
FinalizedBlockPollInterval = '5s'
-EnforceRepeatableRead = false
-DeathDeclarationDelay = '10s'
+EnforceRepeatableRead = true
+DeathDeclarationDelay = '1m0s'
NewHeadsPollInterval = '0s'
[OCR]
From 91322463ec9b781a43b5972cf8838bf443240cb9 Mon Sep 17 00:00:00 2001
From: Otavio Madalosso
Date: Fri, 8 Nov 2024 14:11:50 -0300
Subject: [PATCH 17/17] FinalityTagBypass setup for chains with
FinalityDepth<1000
---
ccip/config/evm/Astar_Mainnet.toml | 7 +-
ccip/config/evm/Astar_Shibuya.toml | 7 +-
ccip/config/evm/Avalanche_ANZ_testnet.toml | 3 +
ccip/config/evm/Avalanche_Fuji.toml | 4 +-
ccip/config/evm/Avalanche_Mainnet.toml | 3 +
ccip/config/evm/BSC_Mainnet.toml | 5 +
ccip/config/evm/BSC_Testnet.toml | 2 +
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/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_Cardona.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 | 3 +
ccip/config/evm/WeMix_Testnet.toml | 2 +
ccip/config/evm/XLayer_Sepolia.toml | 3 +
.../config/toml/defaults/Astar_Mainnet.toml | 5 +
.../config/toml/defaults/Astar_Shibuya.toml | 5 +
.../toml/defaults/Avalanche_ANZ_testnet.toml | 5 +
.../config/toml/defaults/Avalanche_Fuji.toml | 4 +-
.../toml/defaults/Avalanche_Mainnet.toml | 5 +
.../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 +
.../config/toml/defaults/Blast_Mainnet.toml | 3 +
.../config/toml/defaults/Blast_Sepolia.toml | 3 +
.../config/toml/defaults/Celo_Mainnet.toml | 3 +
.../config/toml/defaults/Ethereum_Goerli.toml | 5 +
.../config/toml/defaults/Ethereum_Kovan.toml | 7 +-
.../toml/defaults/Ethereum_Mainnet.toml | 5 +
.../toml/defaults/Ethereum_Rinkeby.toml | 5 +
.../toml/defaults/Ethereum_Ropsten.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 | 5 +-
.../config/toml/defaults/Metis_Mainnet.toml | 5 +
.../config/toml/defaults/Metis_Rinkeby.toml | 5 +
.../config/toml/defaults/Mode_Mainnet.toml | 3 +
.../config/toml/defaults/Mode_Sepolia.toml | 3 +
.../evm/config/toml/defaults/OKX_Mainnet.toml | 5 +
.../evm/config/toml/defaults/OKX_Testnet.toml | 5 +
.../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 +
.../evm/config/toml/defaults/RSK_Mainnet.toml | 5 +
.../evm/config/toml/defaults/RSK_Testnet.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 +
.../evm/config/toml/defaults/fallback.toml | 2 +
.../config/toml/defaults/zkSync_Goerli.toml | 3 +
.../config/toml/defaults/zkSync_Sepolia.toml | 5 +-
docs/CONFIG.md | 114 +++++++++---------
97 files changed, 429 insertions(+), 73 deletions(-)
diff --git a/ccip/config/evm/Astar_Mainnet.toml b/ccip/config/evm/Astar_Mainnet.toml
index 87808001eb7..ee2df8c1549 100644
--- a/ccip/config/evm/Astar_Mainnet.toml
+++ b/ccip/config/evm/Astar_Mainnet.toml
@@ -6,4 +6,9 @@ LogPollInterval = '6s'
[GasEstimator]
EIP1559DynamicFees = false
PriceMax = '100000 gwei'
-LimitDefault = 8000000
\ No newline at end of file
+LimitDefault = 8000000
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Astar_Shibuya.toml b/ccip/config/evm/Astar_Shibuya.toml
index 5a5df06f6f0..4a6299f50b2 100644
--- a/ccip/config/evm/Astar_Shibuya.toml
+++ b/ccip/config/evm/Astar_Shibuya.toml
@@ -6,4 +6,9 @@ LogPollInterval = '6s'
[GasEstimator]
EIP1559DynamicFees = false
PriceMax = '100000 gwei'
-LimitDefault = 8000000
\ No newline at end of file
+LimitDefault = 8000000
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Avalanche_ANZ_testnet.toml b/ccip/config/evm/Avalanche_ANZ_testnet.toml
index 1242e1ec06e..471584b6d2d 100644
--- a/ccip/config/evm/Avalanche_ANZ_testnet.toml
+++ b/ccip/config/evm/Avalanche_ANZ_testnet.toml
@@ -20,3 +20,6 @@ BlockHistorySize = 24
[HeadTracker]
PersistenceEnabled = false
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Avalanche_Fuji.toml b/ccip/config/evm/Avalanche_Fuji.toml
index 91b8bf6bab8..b12b2ae6b86 100644
--- a/ccip/config/evm/Avalanche_Fuji.toml
+++ b/ccip/config/evm/Avalanche_Fuji.toml
@@ -18,5 +18,7 @@ PriceMin = '25 gwei'
BlockHistorySize = 24
[HeadTracker]
-FinalityTagBypass = false
PersistenceEnabled = false
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Avalanche_Mainnet.toml b/ccip/config/evm/Avalanche_Mainnet.toml
index f51af60098d..54a0e42af79 100644
--- a/ccip/config/evm/Avalanche_Mainnet.toml
+++ b/ccip/config/evm/Avalanche_Mainnet.toml
@@ -20,3 +20,6 @@ BlockHistorySize = 24
[HeadTracker]
PersistenceEnabled = false
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/BSC_Mainnet.toml b/ccip/config/evm/BSC_Mainnet.toml
index 10f4c570bef..5d71b8d3fb4 100644
--- a/ccip/config/evm/BSC_Mainnet.toml
+++ b/ccip/config/evm/BSC_Mainnet.toml
@@ -26,3 +26,8 @@ ObservationGracePeriod = '500ms'
[NodePool]
SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/BSC_Testnet.toml b/ccip/config/evm/BSC_Testnet.toml
index bb13501f1a2..a445617895a 100644
--- a/ccip/config/evm/BSC_Testnet.toml
+++ b/ccip/config/evm/BSC_Testnet.toml
@@ -22,6 +22,8 @@ BlockHistorySize = 24
[HeadTracker]
HistoryDepth = 100
SamplingInterval = '1s'
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
FinalityTagBypass = false
PersistenceEnabled = false
diff --git a/ccip/config/evm/Base_Mainnet.toml b/ccip/config/evm/Base_Mainnet.toml
index da38182b194..cc7239de9ca 100644
--- a/ccip/config/evm/Base_Mainnet.toml
+++ b/ccip/config/evm/Base_Mainnet.toml
@@ -20,6 +20,9 @@ ResendAfterThreshold = '30s'
[HeadTracker]
HistoryDepth = 300
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
[NodePool]
SyncThreshold = 10
diff --git a/ccip/config/evm/Base_Sepolia.toml b/ccip/config/evm/Base_Sepolia.toml
index 92f7717b27d..2f0534902ab 100644
--- a/ccip/config/evm/Base_Sepolia.toml
+++ b/ccip/config/evm/Base_Sepolia.toml
@@ -21,6 +21,9 @@ ResendAfterThreshold = '30s'
[HeadTracker]
HistoryDepth = 300
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
[NodePool]
SyncThreshold = 10
diff --git a/ccip/config/evm/Blast_Mainnet.toml b/ccip/config/evm/Blast_Mainnet.toml
index f8b501723ff..a8af11810f6 100644
--- a/ccip/config/evm/Blast_Mainnet.toml
+++ b/ccip/config/evm/Blast_Mainnet.toml
@@ -26,6 +26,9 @@ EIP1559FeeCapBufferBlocks = 0
[HeadTracker]
HistoryDepth = 300
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 96dc5c67871..2d731631bbe 100644
--- a/ccip/config/evm/Blast_Sepolia.toml
+++ b/ccip/config/evm/Blast_Sepolia.toml
@@ -26,6 +26,9 @@ EIP1559FeeCapBufferBlocks = 0
[HeadTracker]
HistoryDepth = 300
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 0ed08986d32..0cc35a00196 100644
--- a/ccip/config/evm/Celo_Mainnet.toml
+++ b/ccip/config/evm/Celo_Mainnet.toml
@@ -19,3 +19,6 @@ BlockHistorySize = 12
[HeadTracker]
HistoryDepth = 50
PersistenceEnabled = false
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Gnosis_Chiado.toml b/ccip/config/evm/Gnosis_Chiado.toml
index 379377a2266..f6a68a5dbc6 100644
--- a/ccip/config/evm/Gnosis_Chiado.toml
+++ b/ccip/config/evm/Gnosis_Chiado.toml
@@ -8,3 +8,8 @@ NoNewFinalizedHeadsThreshold = '2m'
[GasEstimator]
EIP1559DynamicFees = true
PriceMax = '500 gwei'
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Kroma_Mainnet.toml b/ccip/config/evm/Kroma_Mainnet.toml
index 2111a426558..93687e407c3 100644
--- a/ccip/config/evm/Kroma_Mainnet.toml
+++ b/ccip/config/evm/Kroma_Mainnet.toml
@@ -19,6 +19,9 @@ ResendAfterThreshold = '30s'
[HeadTracker]
HistoryDepth = 400
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
[NodePool]
SyncThreshold = 10
diff --git a/ccip/config/evm/Kroma_Sepolia.toml b/ccip/config/evm/Kroma_Sepolia.toml
index 060b4c91682..68f03be93d9 100644
--- a/ccip/config/evm/Kroma_Sepolia.toml
+++ b/ccip/config/evm/Kroma_Sepolia.toml
@@ -19,6 +19,9 @@ ResendAfterThreshold = '30s'
[HeadTracker]
HistoryDepth = 400
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
[NodePool]
SyncThreshold = 10
diff --git a/ccip/config/evm/L3X_Mainnet.toml b/ccip/config/evm/L3X_Mainnet.toml
index 9dd33c9e15d..373c5517288 100644
--- a/ccip/config/evm/L3X_Mainnet.toml
+++ b/ccip/config/evm/L3X_Mainnet.toml
@@ -19,3 +19,8 @@ BumpThreshold = 5
[GasEstimator.DAOracle]
OracleType = 'arbitrum'
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/L3X_Sepolia.toml b/ccip/config/evm/L3X_Sepolia.toml
index c0f6a60e943..ecbb78e50e2 100644
--- a/ccip/config/evm/L3X_Sepolia.toml
+++ b/ccip/config/evm/L3X_Sepolia.toml
@@ -19,3 +19,8 @@ BumpThreshold = 5
[GasEstimator.DAOracle]
OracleType = 'arbitrum'
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Linea_Mainnet.toml b/ccip/config/evm/Linea_Mainnet.toml
index 3be107a370a..35c438825b5 100644
--- a/ccip/config/evm/Linea_Mainnet.toml
+++ b/ccip/config/evm/Linea_Mainnet.toml
@@ -15,3 +15,6 @@ ResendAfterThreshold = '3m'
# set greater than finality depth
[HeadTracker]
HistoryDepth = 350
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Linea_Sepolia.toml b/ccip/config/evm/Linea_Sepolia.toml
index af70f7ceba1..ae920340da8 100644
--- a/ccip/config/evm/Linea_Sepolia.toml
+++ b/ccip/config/evm/Linea_Sepolia.toml
@@ -10,4 +10,7 @@ PriceMin = '1 wei'
ResendAfterThreshold = '3m'
[HeadTracker]
-HistoryDepth = 1000
\ No newline at end of file
+HistoryDepth = 1000
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Metis_Mainnet.toml b/ccip/config/evm/Metis_Mainnet.toml
index f057400d014..7094478a291 100644
--- a/ccip/config/evm/Metis_Mainnet.toml
+++ b/ccip/config/evm/Metis_Mainnet.toml
@@ -19,3 +19,8 @@ BlockHistorySize = 0
[NodePool]
SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Metis_Sepolia.toml b/ccip/config/evm/Metis_Sepolia.toml
index 4ff4056c75d..90c83635543 100644
--- a/ccip/config/evm/Metis_Sepolia.toml
+++ b/ccip/config/evm/Metis_Sepolia.toml
@@ -15,3 +15,8 @@ BlockHistorySize = 0
[NodePool]
SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Mode_Mainnet.toml b/ccip/config/evm/Mode_Mainnet.toml
index 69a8e93fecd..b4ad88c479d 100644
--- a/ccip/config/evm/Mode_Mainnet.toml
+++ b/ccip/config/evm/Mode_Mainnet.toml
@@ -24,6 +24,9 @@ EIP1559FeeCapBufferBlocks = 0
[HeadTracker]
HistoryDepth = 300
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
[NodePool]
PollFailureThreshold = 2
diff --git a/ccip/config/evm/Mode_Sepolia.toml b/ccip/config/evm/Mode_Sepolia.toml
index f7398869beb..fbdd894f28d 100644
--- a/ccip/config/evm/Mode_Sepolia.toml
+++ b/ccip/config/evm/Mode_Sepolia.toml
@@ -24,6 +24,9 @@ EIP1559FeeCapBufferBlocks = 0
[HeadTracker]
HistoryDepth = 300
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
[NodePool]
PollFailureThreshold = 2
diff --git a/ccip/config/evm/Optimism_Mainnet.toml b/ccip/config/evm/Optimism_Mainnet.toml
index b0f56a49d90..8f0d759a4e8 100644
--- a/ccip/config/evm/Optimism_Mainnet.toml
+++ b/ccip/config/evm/Optimism_Mainnet.toml
@@ -21,6 +21,9 @@ ResendAfterThreshold = '30s'
[HeadTracker]
HistoryDepth = 300
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
[NodePool]
SyncThreshold = 10
diff --git a/ccip/config/evm/Optimism_Sepolia.toml b/ccip/config/evm/Optimism_Sepolia.toml
index 1c71aa5dd83..d63925ad1fb 100644
--- a/ccip/config/evm/Optimism_Sepolia.toml
+++ b/ccip/config/evm/Optimism_Sepolia.toml
@@ -20,6 +20,9 @@ ResendAfterThreshold = '30s'
[HeadTracker]
HistoryDepth = 300
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
[NodePool]
SyncThreshold = 10
diff --git a/ccip/config/evm/Polygon_Amoy.toml b/ccip/config/evm/Polygon_Amoy.toml
index b05b3053a8e..195dda2ad6a 100644
--- a/ccip/config/evm/Polygon_Amoy.toml
+++ b/ccip/config/evm/Polygon_Amoy.toml
@@ -23,6 +23,9 @@ BlockHistorySize = 24
[HeadTracker]
HistoryDepth = 2000
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
[NodePool]
SyncThreshold = 10
diff --git a/ccip/config/evm/Polygon_Mainnet.toml b/ccip/config/evm/Polygon_Mainnet.toml
index bf605cab3c6..523ae3f8e52 100644
--- a/ccip/config/evm/Polygon_Mainnet.toml
+++ b/ccip/config/evm/Polygon_Mainnet.toml
@@ -33,6 +33,9 @@ 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://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
[NodePool]
SyncThreshold = 10
diff --git a/ccip/config/evm/Polygon_Zkevm_Cardona.toml b/ccip/config/evm/Polygon_Zkevm_Cardona.toml
index cd91465dae6..efe08f4eff4 100644
--- a/ccip/config/evm/Polygon_Zkevm_Cardona.toml
+++ b/ccip/config/evm/Polygon_Zkevm_Cardona.toml
@@ -22,3 +22,6 @@ BlockHistorySize = 12
[HeadTracker]
HistoryDepth = 2000
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/Scroll_Mainnet.toml b/ccip/config/evm/Scroll_Mainnet.toml
index 4a887b504df..5d7e9bfa6af 100644
--- a/ccip/config/evm/Scroll_Mainnet.toml
+++ b/ccip/config/evm/Scroll_Mainnet.toml
@@ -17,6 +17,9 @@ BlockHistorySize = 24
[HeadTracker]
HistoryDepth = 50
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
[OCR]
ContractConfirmations = 1
diff --git a/ccip/config/evm/Scroll_Sepolia.toml b/ccip/config/evm/Scroll_Sepolia.toml
index b2e1cfbd733..032e5190d3d 100644
--- a/ccip/config/evm/Scroll_Sepolia.toml
+++ b/ccip/config/evm/Scroll_Sepolia.toml
@@ -17,6 +17,9 @@ BlockHistorySize = 24
[HeadTracker]
HistoryDepth = 50
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
[OCR]
ContractConfirmations = 1
diff --git a/ccip/config/evm/Simulated.toml b/ccip/config/evm/Simulated.toml
index e21dc0990f0..9bbef1d021d 100644
--- a/ccip/config/evm/Simulated.toml
+++ b/ccip/config/evm/Simulated.toml
@@ -20,6 +20,9 @@ HistoryDepth = 10
MaxBufferSize = 100
SamplingInterval = '0s'
PersistenceEnabled = false
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
[OCR]
ContractConfirmations = 1
diff --git a/ccip/config/evm/WeMix_Mainnet.toml b/ccip/config/evm/WeMix_Mainnet.toml
index be7c278f692..bee4d696f29 100644
--- a/ccip/config/evm/WeMix_Mainnet.toml
+++ b/ccip/config/evm/WeMix_Mainnet.toml
@@ -17,3 +17,6 @@ TipCapDefault = '100 gwei'
[HeadTracker]
PersistenceEnabled = false
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/ccip/config/evm/WeMix_Testnet.toml b/ccip/config/evm/WeMix_Testnet.toml
index 4591fc4c572..17b87272252 100644
--- a/ccip/config/evm/WeMix_Testnet.toml
+++ b/ccip/config/evm/WeMix_Testnet.toml
@@ -16,5 +16,7 @@ EIP1559DynamicFees = true
TipCapDefault = '100 gwei'
[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
FinalityTagBypass = false
PersistenceEnabled = false
diff --git a/ccip/config/evm/XLayer_Sepolia.toml b/ccip/config/evm/XLayer_Sepolia.toml
index 62e2c1e8ad0..08538f38ac2 100644
--- a/ccip/config/evm/XLayer_Sepolia.toml
+++ b/ccip/config/evm/XLayer_Sepolia.toml
@@ -23,3 +23,6 @@ BlockHistorySize = 12
[HeadTracker]
HistoryDepth = 2000
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 abe42d05984..3507da5f59d 100644
--- a/core/chains/evm/config/toml/defaults/Astar_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Astar_Mainnet.toml
@@ -8,3 +8,8 @@ LogPollInterval = '6s'
EIP1559DynamicFees = false
PriceMax = '100000 gwei'
LimitDefault = 8000000
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml b/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml
index f96dffc6c66..4a6299f50b2 100644
--- a/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml
+++ b/core/chains/evm/config/toml/defaults/Astar_Shibuya.toml
@@ -7,3 +7,8 @@ LogPollInterval = '6s'
EIP1559DynamicFees = false
PriceMax = '100000 gwei'
LimitDefault = 8000000
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
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 4833881bf48..9f61d1a07a5 100644
--- a/core/chains/evm/config/toml/defaults/Avalanche_ANZ_testnet.toml
+++ b/core/chains/evm/config/toml/defaults/Avalanche_ANZ_testnet.toml
@@ -17,3 +17,8 @@ PriceMin = '25 gwei'
[GasEstimator.BlockHistory]
BlockHistorySize = 24
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 fbcc8e6f058..f8e02efc0f0 100644
--- a/core/chains/evm/config/toml/defaults/Avalanche_Fuji.toml
+++ b/core/chains/evm/config/toml/defaults/Avalanche_Fuji.toml
@@ -19,4 +19,6 @@ PriceMin = '25 gwei'
BlockHistorySize = 24
[HeadTracker]
-FinalityTagBypass = false
\ No newline at end of file
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 309fdab1db9..02f58df1dbd 100644
--- a/core/chains/evm/config/toml/defaults/Avalanche_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Avalanche_Mainnet.toml
@@ -18,3 +18,8 @@ PriceMin = '25 gwei'
[GasEstimator.BlockHistory]
# Average block time of 2s
BlockHistorySize = 24
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 b7c3d69d5ec..bc6e1fa5a7d 100644
--- a/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml
@@ -29,3 +29,8 @@ ObservationGracePeriod = '500ms'
[NodePool]
SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 3b8fbb60203..8161ef3ad9f 100644
--- a/core/chains/evm/config/toml/defaults/BSC_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/BSC_Testnet.toml
@@ -23,6 +23,8 @@ BlockHistorySize = 24
[HeadTracker]
HistoryDepth = 100
SamplingInterval = '1s'
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
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 5bad5f2d6e9..931ba5b24a3 100644
--- a/core/chains/evm/config/toml/defaults/Base_Goerli.toml
+++ b/core/chains/evm/config/toml/defaults/Base_Goerli.toml
@@ -23,6 +23,9 @@ ResendAfterThreshold = '30s'
[HeadTracker]
HistoryDepth = 300
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 b683aff9840..fcdb5b56877 100644
--- a/core/chains/evm/config/toml/defaults/Base_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Base_Mainnet.toml
@@ -24,6 +24,9 @@ ResendAfterThreshold = '30s'
[HeadTracker]
HistoryDepth = 300
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 11c86c559d7..1f4a9a6f7bf 100644
--- a/core/chains/evm/config/toml/defaults/Base_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Base_Sepolia.toml
@@ -26,6 +26,9 @@ ResendAfterThreshold = '30s'
[HeadTracker]
HistoryDepth = 300
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
[NodePool]
SyncThreshold = 10
diff --git a/core/chains/evm/config/toml/defaults/Blast_Mainnet.toml b/core/chains/evm/config/toml/defaults/Blast_Mainnet.toml
index f8b501723ff..a8af11810f6 100644
--- a/core/chains/evm/config/toml/defaults/Blast_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Blast_Mainnet.toml
@@ -26,6 +26,9 @@ EIP1559FeeCapBufferBlocks = 0
[HeadTracker]
HistoryDepth = 300
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
[NodePool]
# 4 block sync time between nodes to ensure they aren't labelled unreachable too soon
diff --git a/core/chains/evm/config/toml/defaults/Blast_Sepolia.toml b/core/chains/evm/config/toml/defaults/Blast_Sepolia.toml
index 96dc5c67871..2d731631bbe 100644
--- a/core/chains/evm/config/toml/defaults/Blast_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Blast_Sepolia.toml
@@ -26,6 +26,9 @@ EIP1559FeeCapBufferBlocks = 0
[HeadTracker]
HistoryDepth = 300
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
[NodePool]
# 4 block sync time between nodes to ensure they aren't labelled unreachable too soon
diff --git a/core/chains/evm/config/toml/defaults/Celo_Mainnet.toml b/core/chains/evm/config/toml/defaults/Celo_Mainnet.toml
index e2ccf71701b..6941e0f0855 100644
--- a/core/chains/evm/config/toml/defaults/Celo_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Celo_Mainnet.toml
@@ -23,3 +23,6 @@ BlockHistorySize = 12
[HeadTracker]
HistoryDepth = 50
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Goerli.toml b/core/chains/evm/config/toml/defaults/Ethereum_Goerli.toml
index f2e81aca268..be13b7642ca 100644
--- a/core/chains/evm/config/toml/defaults/Ethereum_Goerli.toml
+++ b/core/chains/evm/config/toml/defaults/Ethereum_Goerli.toml
@@ -9,3 +9,8 @@ EIP1559DynamicFees = true
[GasEstimator.BlockHistory]
BlockHistorySize = 4
TransactionPercentile = 50
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Kovan.toml b/core/chains/evm/config/toml/defaults/Ethereum_Kovan.toml
index e51b6a352c2..11f60809891 100644
--- a/core/chains/evm/config/toml/defaults/Ethereum_Kovan.toml
+++ b/core/chains/evm/config/toml/defaults/Ethereum_Kovan.toml
@@ -11,4 +11,9 @@ EIP1559DynamicFees = false
[GasEstimator.BlockHistory]
BlockHistorySize = 4
-TransactionPercentile = 50
\ No newline at end of file
+TransactionPercentile = 50
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 8a3e12c2424..396cd5cc692 100644
--- a/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml
@@ -16,3 +16,8 @@ TransactionPercentile = 50
[OCR2.Automation]
GasLimit = 10500000
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Rinkeby.toml b/core/chains/evm/config/toml/defaults/Ethereum_Rinkeby.toml
index 4820411a453..0c65f0b4df2 100644
--- a/core/chains/evm/config/toml/defaults/Ethereum_Rinkeby.toml
+++ b/core/chains/evm/config/toml/defaults/Ethereum_Rinkeby.toml
@@ -11,3 +11,8 @@ EIP1559DynamicFees = false
[GasEstimator.BlockHistory]
BlockHistorySize = 4
TransactionPercentile = 50
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Ropsten.toml b/core/chains/evm/config/toml/defaults/Ethereum_Ropsten.toml
index 4b0634241d5..fb83e0d1cd2 100644
--- a/core/chains/evm/config/toml/defaults/Ethereum_Ropsten.toml
+++ b/core/chains/evm/config/toml/defaults/Ethereum_Ropsten.toml
@@ -9,3 +9,8 @@ EIP1559DynamicFees = true
[GasEstimator.BlockHistory]
BlockHistorySize = 4
TransactionPercentile = 50
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 f6789ec13a3..60bfc0c25dd 100644
--- a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml
@@ -15,4 +15,6 @@ TransactionPercentile = 50
GasLimit = 10500000
[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
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 55786731931..1a52b6c2a88 100644
--- a/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml
@@ -10,4 +10,9 @@ RPCBlockQueryDelay = 2
Mode = 'SuggestedPrice'
[OCR2.Automation]
-GasLimit = 3800000
\ No newline at end of file
+GasLimit = 3800000
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml b/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml
index 8645c7cbc7c..e6002291cc4 100644
--- a/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/Fantom_Testnet.toml
@@ -10,4 +10,9 @@ RPCBlockQueryDelay = 2
Mode = 'SuggestedPrice'
[OCR2.Automation]
-GasLimit = 3800000
\ No newline at end of file
+GasLimit = 3800000
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Gnosis_Chiado.toml b/core/chains/evm/config/toml/defaults/Gnosis_Chiado.toml
index 4e54210455f..9d66cc2d6ed 100644
--- a/core/chains/evm/config/toml/defaults/Gnosis_Chiado.toml
+++ b/core/chains/evm/config/toml/defaults/Gnosis_Chiado.toml
@@ -9,3 +9,8 @@ NoNewFinalizedHeadsThreshold = '2m'
[GasEstimator]
EIP1559DynamicFees = true
PriceMax = '500 gwei'
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 7df360c01ba..24097ab7a57 100644
--- a/core/chains/evm/config/toml/defaults/Gnosis_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Gnosis_Mainnet.toml
@@ -18,3 +18,8 @@ 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://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 98699b11e3b..cbc36449f61 100644
--- a/core/chains/evm/config/toml/defaults/Harmony_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Harmony_Mainnet.toml
@@ -7,3 +7,8 @@ NoNewHeadsThreshold = '30s'
[GasEstimator]
PriceDefault = '5 gwei'
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 4c0e86522e3..2687f4114aa 100644
--- a/core/chains/evm/config/toml/defaults/Harmony_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/Harmony_Testnet.toml
@@ -7,3 +7,8 @@ NoNewHeadsThreshold = '30s'
[GasEstimator]
PriceDefault = '5 gwei'
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 6938a0371bb..c191070ba7e 100644
--- a/core/chains/evm/config/toml/defaults/Heco_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Heco_Mainnet.toml
@@ -20,3 +20,8 @@ ObservationGracePeriod = '500ms'
[NodePool]
SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 591e486a8ec..3de7343c764 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
FinalizedBlockOffset = 2
@@ -29,6 +29,10 @@ EstimateLimit = true
# Accounting for Node syncs & avoid re-sending txns before fetching the receipt, setting to 2m
ResendAfterThreshold = '2m'
-
[NodePool]
-SyncThreshold = 10
\ No newline at end of file
+SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Hedera_Testnet.toml b/core/chains/evm/config/toml/defaults/Hedera_Testnet.toml
index 0e2f2c7cd2c..18f2b8b6abe 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
FinalizedBlockOffset = 2
@@ -29,6 +29,10 @@ EstimateLimit = true
# Accounting for Node syncs & avoid re-sending txns before fetching the receipt, setting to 2m
ResendAfterThreshold = '2m'
-
[NodePool]
-SyncThreshold = 10
\ No newline at end of file
+SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Klaytn_Mainnet.toml b/core/chains/evm/config/toml/defaults/Klaytn_Mainnet.toml
index 7cf7c2d62e3..357561422ca 100644
--- a/core/chains/evm/config/toml/defaults/Klaytn_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Klaytn_Mainnet.toml
@@ -8,3 +8,8 @@ OCR.ContractConfirmations = 1
Mode = 'SuggestedPrice'
PriceDefault = '750 gwei' # gwei = ston
BumpThreshold = 5
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 a938d46c5cd..693ac4f79d4 100644
--- a/core/chains/evm/config/toml/defaults/Klaytn_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/Klaytn_Testnet.toml
@@ -8,3 +8,8 @@ OCR.ContractConfirmations = 1
Mode = 'SuggestedPrice'
PriceDefault = '750 gwei' # gwei = ston
BumpThreshold = 5
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 93abddcad10..1945ddd17fa 100644
--- a/core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml
@@ -27,6 +27,9 @@ ResendAfterThreshold = '30s'
[HeadTracker]
HistoryDepth = 400
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 6b5fa54e1cf..f593d75da88 100644
--- a/core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml
@@ -27,6 +27,9 @@ ResendAfterThreshold = '30s'
[HeadTracker]
HistoryDepth = 400
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 9dd33c9e15d..373c5517288 100644
--- a/core/chains/evm/config/toml/defaults/L3X_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/L3X_Mainnet.toml
@@ -19,3 +19,8 @@ BumpThreshold = 5
[GasEstimator.DAOracle]
OracleType = 'arbitrum'
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 c0f6a60e943..ecbb78e50e2 100644
--- a/core/chains/evm/config/toml/defaults/L3X_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/L3X_Sepolia.toml
@@ -19,3 +19,8 @@ BumpThreshold = 5
[GasEstimator.DAOracle]
OracleType = 'arbitrum'
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 915727267d2..68893b6acc5 100644
--- a/core/chains/evm/config/toml/defaults/Linea_Goerli.toml
+++ b/core/chains/evm/config/toml/defaults/Linea_Goerli.toml
@@ -10,3 +10,8 @@ BumpPercent = 40
[Transactions]
# increase resend time to align with finality
ResendAfterThreshold = '3m'
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 97570a0d215..189b3082f31 100644
--- a/core/chains/evm/config/toml/defaults/Linea_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Linea_Mainnet.toml
@@ -15,3 +15,6 @@ ResendAfterThreshold = '3m'
# set greater than finality depth
[HeadTracker]
HistoryDepth = 350
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Linea_Sepolia.toml b/core/chains/evm/config/toml/defaults/Linea_Sepolia.toml
index af70f7ceba1..ae920340da8 100644
--- a/core/chains/evm/config/toml/defaults/Linea_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Linea_Sepolia.toml
@@ -10,4 +10,7 @@ PriceMin = '1 wei'
ResendAfterThreshold = '3m'
[HeadTracker]
-HistoryDepth = 1000
\ No newline at end of file
+HistoryDepth = 1000
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Metis_Mainnet.toml b/core/chains/evm/config/toml/defaults/Metis_Mainnet.toml
index b21388b2b52..4e89483111f 100644
--- a/core/chains/evm/config/toml/defaults/Metis_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Metis_Mainnet.toml
@@ -26,3 +26,8 @@ BlockHistorySize = 0
[NodePool]
SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Metis_Rinkeby.toml b/core/chains/evm/config/toml/defaults/Metis_Rinkeby.toml
index e481282abf1..07de383320b 100644
--- a/core/chains/evm/config/toml/defaults/Metis_Rinkeby.toml
+++ b/core/chains/evm/config/toml/defaults/Metis_Rinkeby.toml
@@ -14,3 +14,8 @@ BlockHistorySize = 0
[NodePool]
SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 69a8e93fecd..b4ad88c479d 100644
--- a/core/chains/evm/config/toml/defaults/Mode_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Mode_Mainnet.toml
@@ -24,6 +24,9 @@ EIP1559FeeCapBufferBlocks = 0
[HeadTracker]
HistoryDepth = 300
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 f7398869beb..fbdd894f28d 100644
--- a/core/chains/evm/config/toml/defaults/Mode_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Mode_Sepolia.toml
@@ -24,6 +24,9 @@ EIP1559FeeCapBufferBlocks = 0
[HeadTracker]
HistoryDepth = 300
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
[NodePool]
PollFailureThreshold = 2
diff --git a/core/chains/evm/config/toml/defaults/OKX_Mainnet.toml b/core/chains/evm/config/toml/defaults/OKX_Mainnet.toml
index 74aef9dd37f..ef22fc04e12 100644
--- a/core/chains/evm/config/toml/defaults/OKX_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/OKX_Mainnet.toml
@@ -1,2 +1,7 @@
ChainID = '66'
FinalityDepth = 50
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/OKX_Testnet.toml b/core/chains/evm/config/toml/defaults/OKX_Testnet.toml
index de27b9b8dc1..494cafffc80 100644
--- a/core/chains/evm/config/toml/defaults/OKX_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/OKX_Testnet.toml
@@ -1,2 +1,7 @@
ChainID = '65'
FinalityDepth = 50
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Optimism_Goerli.toml b/core/chains/evm/config/toml/defaults/Optimism_Goerli.toml
index 103a852c1b3..c403421758c 100644
--- a/core/chains/evm/config/toml/defaults/Optimism_Goerli.toml
+++ b/core/chains/evm/config/toml/defaults/Optimism_Goerli.toml
@@ -24,6 +24,9 @@ ResendAfterThreshold = '30s'
[HeadTracker]
HistoryDepth = 300
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 cd09ad4a60f..d1576203100 100644
--- a/core/chains/evm/config/toml/defaults/Optimism_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Optimism_Mainnet.toml
@@ -25,6 +25,9 @@ ResendAfterThreshold = '30s'
[HeadTracker]
HistoryDepth = 300
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 ff367df0feb..b2fd2e1a578 100644
--- a/core/chains/evm/config/toml/defaults/Optimism_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Optimism_Sepolia.toml
@@ -24,6 +24,9 @@ ResendAfterThreshold = '30s'
[HeadTracker]
HistoryDepth = 300
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 bca42d9b403..5cec7f84a42 100644
--- a/core/chains/evm/config/toml/defaults/Polygon_Amoy.toml
+++ b/core/chains/evm/config/toml/defaults/Polygon_Amoy.toml
@@ -23,6 +23,9 @@ BlockHistorySize = 24
[HeadTracker]
HistoryDepth = 2000
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 bf605cab3c6..523ae3f8e52 100644
--- a/core/chains/evm/config/toml/defaults/Polygon_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Polygon_Mainnet.toml
@@ -33,6 +33,9 @@ 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://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 134a0822d07..111dd9f1ae0 100644
--- a/core/chains/evm/config/toml/defaults/Polygon_Mumbai.toml
+++ b/core/chains/evm/config/toml/defaults/Polygon_Mumbai.toml
@@ -23,6 +23,9 @@ BlockHistorySize = 24
[HeadTracker]
HistoryDepth = 2000
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 46ce80e29fc..26a544b70cd 100644
--- a/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Cardona.toml
+++ b/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Cardona.toml
@@ -24,3 +24,6 @@ CacheTimeout = '4s'
[HeadTracker]
HistoryDepth = 2000
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/RSK_Mainnet.toml b/core/chains/evm/config/toml/defaults/RSK_Mainnet.toml
index 40c78c76d14..2f846077d4c 100644
--- a/core/chains/evm/config/toml/defaults/RSK_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/RSK_Mainnet.toml
@@ -12,3 +12,8 @@ PriceMax = '50 gwei'
PriceMin = '0'
# rsk does not yet support EIP-1559 but this allows validation to pass
FeeCapDefault = '100 mwei'
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/RSK_Testnet.toml b/core/chains/evm/config/toml/defaults/RSK_Testnet.toml
index 666592da011..3ea70822fea 100644
--- a/core/chains/evm/config/toml/defaults/RSK_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/RSK_Testnet.toml
@@ -9,3 +9,8 @@ PriceDefault = '50 mwei'
PriceMax = '50 gwei'
PriceMin = '0'
FeeCapDefault = '100 mwei'
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 5a5e0459512..3d3e7258629 100644
--- a/core/chains/evm/config/toml/defaults/Scroll_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Scroll_Mainnet.toml
@@ -21,6 +21,9 @@ OracleAddress = '0x5300000000000000000000000000000000000002'
[HeadTracker]
HistoryDepth = 50
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 a9c6a979e64..990695494b1 100644
--- a/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml
@@ -21,6 +21,9 @@ OracleAddress = '0x5300000000000000000000000000000000000002'
[HeadTracker]
HistoryDepth = 50
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 65e627a7abd..d320e315fb2 100644
--- a/core/chains/evm/config/toml/defaults/Simulated.toml
+++ b/core/chains/evm/config/toml/defaults/Simulated.toml
@@ -19,6 +19,9 @@ PriceMax = '100 micro'
HistoryDepth = 10
MaxBufferSize = 100
SamplingInterval = '0s'
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
[NodePool]
EnforceRepeatableRead = false # disable for simulation to prevent failure of tests with manual commit and reorgs
diff --git a/core/chains/evm/config/toml/defaults/Soneium_Sepolia.toml b/core/chains/evm/config/toml/defaults/Soneium_Sepolia.toml
index 7ab92f04e5b..214e3f2895b 100755
--- a/core/chains/evm/config/toml/defaults/Soneium_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Soneium_Sepolia.toml
@@ -25,6 +25,9 @@ ResendAfterThreshold = '30s'
[HeadTracker]
HistoryDepth = 300
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 31e8ea3a4a1..e618263c36f 100644
--- a/core/chains/evm/config/toml/defaults/WeMix_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/WeMix_Mainnet.toml
@@ -15,3 +15,8 @@ ContractConfirmations = 1
[GasEstimator]
EIP1559DynamicFees = true
TipCapDefault = '100 gwei'
+
+[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+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 a4090351066..6ea694e8cb1 100644
--- a/core/chains/evm/config/toml/defaults/WeMix_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/WeMix_Testnet.toml
@@ -17,4 +17,6 @@ EIP1559DynamicFees = true
TipCapDefault = '100 gwei'
[HeadTracker]
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
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 f39c9dab704..c0dd1348e1d 100644
--- a/core/chains/evm/config/toml/defaults/XLayer_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/XLayer_Sepolia.toml
@@ -24,3 +24,6 @@ BlockHistorySize = 12
[HeadTracker]
HistoryDepth = 2000
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/fallback.toml b/core/chains/evm/config/toml/defaults/fallback.toml
index 014a772289c..15690420cd9 100644
--- a/core/chains/evm/config/toml/defaults/fallback.toml
+++ b/core/chains/evm/config/toml/defaults/fallback.toml
@@ -64,6 +64,8 @@ CacheTimeout = '10s'
HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
FinalityTagBypass = true
MaxAllowedFinalityDepth = 10000
PersistenceEnabled = true
diff --git a/core/chains/evm/config/toml/defaults/zkSync_Goerli.toml b/core/chains/evm/config/toml/defaults/zkSync_Goerli.toml
index 035eec62d49..1f06789740f 100644
--- a/core/chains/evm/config/toml/defaults/zkSync_Goerli.toml
+++ b/core/chains/evm/config/toml/defaults/zkSync_Goerli.toml
@@ -15,3 +15,6 @@ OracleType = 'zksync'
[HeadTracker]
HistoryDepth = 50
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/zkSync_Sepolia.toml b/core/chains/evm/config/toml/defaults/zkSync_Sepolia.toml
index cf2f68d9568..d599af8450e 100644
--- a/core/chains/evm/config/toml/defaults/zkSync_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/zkSync_Sepolia.toml
@@ -29,4 +29,7 @@ OracleType = 'zksync'
[HeadTracker]
# tracks top N blocks to keep in heads database table. Should store atleast the same # of blocks as finalityDepth
-HistoryDepth = 250
\ No newline at end of file
+HistoryDepth = 250
+# FinalityDepth > 1k => FinalityTagBypass = false
+# https://chainlink-core.slack.com/archives/C07RA1B58CC/p1730983397689179?thread_ts=1730908333.814809&cid=C07RA1B58CC
+FinalityTagBypass = false
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index a0d2abe07e7..c286b5fbdcd 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -2030,7 +2030,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -2134,7 +2134,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -2238,7 +2238,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -2342,7 +2342,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -2451,7 +2451,7 @@ HistoryDepth = 300
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -2555,7 +2555,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -2659,7 +2659,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -2764,7 +2764,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -2868,7 +2868,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -2971,7 +2971,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -3074,7 +3074,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -3177,7 +3177,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -3386,7 +3386,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -3490,7 +3490,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -3594,7 +3594,7 @@ HistoryDepth = 2000
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -3698,7 +3698,7 @@ HistoryDepth = 2000
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -3906,7 +3906,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -4014,7 +4014,7 @@ HistoryDepth = 400
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -4121,7 +4121,7 @@ HistoryDepth = 50
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -4225,7 +4225,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -4329,7 +4329,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -4436,7 +4436,7 @@ HistoryDepth = 250
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -4652,7 +4652,7 @@ HistoryDepth = 300
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -4756,7 +4756,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -4860,7 +4860,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -4965,7 +4965,7 @@ HistoryDepth = 300
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -5068,7 +5068,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -5172,7 +5172,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -5380,7 +5380,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -5587,7 +5587,7 @@ HistoryDepth = 10
MaxBufferSize = 100
SamplingInterval = '0s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -5696,7 +5696,7 @@ HistoryDepth = 300
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -5804,7 +5804,7 @@ HistoryDepth = 400
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -5908,7 +5908,7 @@ HistoryDepth = 2000
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -6012,7 +6012,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -6220,7 +6220,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -6328,7 +6328,7 @@ HistoryDepth = 300
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -6432,7 +6432,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -6540,7 +6540,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -6648,7 +6648,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -6753,7 +6753,7 @@ HistoryDepth = 300
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -6965,7 +6965,7 @@ HistoryDepth = 50
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -7173,7 +7173,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -7602,7 +7602,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -7705,7 +7705,7 @@ HistoryDepth = 1000
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -7808,7 +7808,7 @@ HistoryDepth = 350
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -8016,7 +8016,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -8120,7 +8120,7 @@ HistoryDepth = 2000
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -8223,7 +8223,7 @@ HistoryDepth = 2000
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -8328,7 +8328,7 @@ HistoryDepth = 300
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -8436,7 +8436,7 @@ HistoryDepth = 300
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -8545,7 +8545,7 @@ HistoryDepth = 300
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -8977,7 +8977,7 @@ HistoryDepth = 50
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -9085,7 +9085,7 @@ HistoryDepth = 50
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -9297,7 +9297,7 @@ HistoryDepth = 300
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -9402,7 +9402,7 @@ HistoryDepth = 300
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -9506,7 +9506,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]
@@ -9610,7 +9610,7 @@ HistoryDepth = 100
MaxBufferSize = 3
SamplingInterval = '1s'
MaxAllowedFinalityDepth = 10000
-FinalityTagBypass = true
+FinalityTagBypass = false
PersistenceEnabled = true
[NodePool]