Merge branch 'ccip-develop' into ronin-config

smartcontractkit · Nov 8, 2024 · c2f115f · c2f115f
2 parents ac60a34 + b6f48ec
commit c2f115f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/core/chains/evm/config/toml/defaults/Berachain_Testnet.toml b/core/chains/evm/config/toml/defaults/Berachain_Testnet.toml
@@ -7,9 +7,6 @@ LogPollInterval = '10s'
 # finality_depth * block_time / 60 secs = ~0.8  min (finality time)
 NoNewFinalizedHeadsThreshold = '5m'
 
-
-FinalityTagEnabled = true
-
 [GasEstimator]
 EIP1559DynamicFees = true
 Mode = 'FeeHistory'

diff --git a/docs/CONFIG.md b/docs/CONFIG.md
@@ -8771,7 +8771,7 @@ AutoCreateKey = true
 BlockBackfillDepth = 10
 BlockBackfillSkip = false
 FinalityDepth = 10
-FinalityTagEnabled = true
+FinalityTagEnabled = false
 LogBackfillBatchSize = 1000
 LogPollInterval = '10s'
 LogKeepBlocksDepth = 100000