Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SHIP-2006 Consolidate All FinalityDepth Settings to default TOML files #1151

Open
wants to merge 22 commits into
base: ccip-develop
Choose a base branch
from
Open

SHIP-2006 Consolidate All FinalityDepth Settings to default TOML files #1151

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d99e6cc
Updated FinalityDepth setting values.
adityavadhavkar1215 Jul 1, 2024
c03253d
Updated the changeset tag to internal.
adityavadhavkar1215 Jul 8, 2024
d6a1873
Merge branch 'ccip-develop' into SHIP-1754-Consolidate-all-FinalityDe…
adityavadhavkar1215 Jul 8, 2024
03c1f14
Updated config-docs using make config-docs
adityavadhavkar1215 Jul 8, 2024
f5998dd
Merge branch 'SHIP-1754-Consolidate-all-FinalityDepth-settings' of gi…
adityavadhavkar1215 Jul 8, 2024
c25d427
Updated FinalityDepth setting values.
adityavadhavkar1215 Jul 1, 2024
6bed494
Updated the changeset tag to internal.
adityavadhavkar1215 Jul 8, 2024
313f321
Updated config-docs using make config-docs
adityavadhavkar1215 Jul 8, 2024
717db27
Merge branch 'SHIP-1754-Consolidate-all-FinalityDepth-settings' of gi…
adityavadhavkar1215 Jul 8, 2024
ebbbc28
Addressed PR comments
adityavadhavkar1215 Jul 10, 2024
566f982
Updated Metis and Mantle after confirmation
adityavadhavkar1215 Jul 10, 2024
bcc6d52
Merge branch 'ccip-develop' into SHIP-1754-Consolidate-all-FinalityDe…
adityavadhavkar1215 Jul 10, 2024
ef21609
Addressed PR comments
adityavadhavkar1215 Jul 11, 2024
39c0e79
Merge branch 'ccip-develop' into SHIP-1754-Consolidate-all-FinalityDe…
adityavadhavkar1215 Jul 11, 2024
3ba3596
Fixed merge conflicts.
adityavadhavkar1215 Jul 16, 2024
f5a867a
Merge branch 'ccip-develop' into SHIP-1754-Consolidate-all-FinalityDe…
adityavadhavkar1215 Jul 17, 2024
7d09726
Merge branch 'ccip-develop' into SHIP-1754-Consolidate-all-FinalityDe…
Madalosso Sep 30, 2024
039ef32
generate docs updates
Madalosso Sep 30, 2024
ed5c919
Revision ccip FInalityDepth. Update testnet value with infra-k8s prod…
Madalosso Sep 30, 2024
de76e3e
Set mainnet FinalityDepth values based on CCIP Node Setup Guide values
Madalosso Sep 30, 2024
b146eb8
Add missing docs update
Madalosso Sep 30, 2024
cdfee72
Remove outdated configs
Madalosso Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/old-bees-kiss.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"ccip": patch
---

Consolidated FinalityDepth setting #internal
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/Celo_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ChainID = '42220'
ChainType = 'celo'
FinalityDepth = 10
adityavadhavkar1215 marked this conversation as resolved.
Show resolved Hide resolved
FinalityTagEnabled = true
LogPollInterval = '5s'
MinIncomingConfirmations = 1
NoNewHeadsThreshold = '1m'
Expand Down
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/Celo_Testnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ChainID = '44787'
ChainType = 'celo'
FinalityDepth = 10
FinalityTagEnabled = true
LogPollInterval = '5s'
MinIncomingConfirmations = 1
NoNewHeadsThreshold = '1m'
Expand Down
2 changes: 1 addition & 1 deletion core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ChainID = '255'
ChainType = 'kroma' # Kroma is based on the Optimism Bedrock architechture
FinalityDepth = 400
adityavadhavkar1215 marked this conversation as resolved.
Show resolved Hide resolved
FinalityDepth = 700
FinalityTagEnabled = true
LogPollInterval = '2s'
NoNewHeadsThreshold = '40s'
Expand Down
2 changes: 1 addition & 1 deletion core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion core/chains/evm/config/toml/defaults/Linea_Sepolia.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ChainID = '59141'
FinalityDepth = 900
FinalityDepth = 1200
NoNewHeadsThreshold = '0'

[GasEstimator]
Expand Down
3 changes: 2 additions & 1 deletion core/chains/evm/config/toml/defaults/Mantle_Sepolia.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ChainID = '5003'
ChainType = 'optimismBedrock'
FinalityDepth = 500
FinalityDepth = 200
FinalityTagEnabled = true
adityavadhavkar1215 marked this conversation as resolved.
Show resolved Hide resolved
LogPollInterval = '2s'
NoNewHeadsThreshold = '0'
MinIncomingConfirmations = 1
Expand Down
2 changes: 1 addition & 1 deletion core/chains/evm/config/toml/defaults/Metis_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
ChainID = '1088'
ChainType = 'metis'
# Sequencer offers absolute finality
FinalityDepth = 10
FinalityDepth = 312
adityavadhavkar1215 marked this conversation as resolved.
Show resolved Hide resolved
FinalityTagEnabled = true
MinIncomingConfirmations = 1
NoNewHeadsThreshold = '0'
Expand Down
2 changes: 1 addition & 1 deletion core/chains/evm/config/toml/defaults/Metis_Sepolia.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ChainID = '59902'
ChainType = 'metis'
FinalityDepth = 10
FinalityDepth = 312
FinalityTagEnabled = true
MinIncomingConfirmations = 1
NoNewHeadsThreshold = '0'
Expand Down
2 changes: 1 addition & 1 deletion core/chains/evm/config/toml/defaults/zkSync_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ChainID = '324'
ChainType = 'zksync'
FinalityDepth = 10
FinalityDepth = 2400
LogPollInterval = '5s'
MinIncomingConfirmations = 1
NoNewHeadsThreshold = '1m'
Expand Down
2 changes: 1 addition & 1 deletion core/chains/evm/config/toml/defaults/zkSync_Sepolia.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ChainID = '300'
ChainType = 'zksync'
FinalityDepth = 10
FinalityDepth = 200
adityavadhavkar1215 marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isnt it 1200?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unless the block timing is different between mainnet & testnet, can you please also give a pass on all the mainnet configs ?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am getting these values from infra-k8s prod-testnet overrides.
Do you think there's a chance that those values are also wrong?
https://github.com/smartcontractkit/infra-k8s/blob/a7e46c641e13a3ae32b62f598f7c49dc913bd0ad/projects/chainlink/files/chainlink-clusters/cl-ccip-testnets-prod/config.yaml#L662

[[EVM]]
      ChainID = '300'
      ChainType = 'zksync'
      FinalityTagEnabled = false
      # 200block ~ 20min concurrent with the l1_committed tag
      FinalityDepth = 200
      # block rate is ~2-5sec, so this ensures blocks are polled correctly
      LogPollInterval = '5s'
      # sufficient time for RPC to be labelled out of sync, since blockRate is pretty fast
      NoNewHeadsThreshold = '1m'

      [EVM.GasEstimator]
      # no EIP1559 to ensure our estimator does not 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'

      [EVM.GasEstimator.BlockHistory]
      # increasing this to smooth out gas estimation
      BlockHistorySize = 200

      [EVM.HeadTracker]
      # tracks top N blocks to keep in heads database table. Should store atleast the same # of blocks as finalityDepth
      HistoryDepth = 250

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The finality committee only really signed off on mainnets, but IMO we should set the same values for testnets as well

LogPollInterval = '5s'
MinIncomingConfirmations = 1
NoNewHeadsThreshold = '1m'
Expand Down
22 changes: 11 additions & 11 deletions docs/CONFIG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3391,7 +3391,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'kroma'
FinalityDepth = 400
FinalityDepth = 700
FinalityTagEnabled = true
LogBackfillBatchSize = 1000
LogPollInterval = '2s'
Expand Down Expand Up @@ -3571,7 +3571,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'zksync'
FinalityDepth = 10
FinalityDepth = 200
FinalityTagEnabled = false
LogBackfillBatchSize = 1000
LogPollInterval = '5s'
Expand Down Expand Up @@ -3661,7 +3661,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'zksync'
FinalityDepth = 10
FinalityDepth = 2400
FinalityTagEnabled = false
LogBackfillBatchSize = 1000
LogPollInterval = '5s'
Expand Down Expand Up @@ -4112,7 +4112,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'metis'
FinalityDepth = 10
FinalityDepth = 312
FinalityTagEnabled = true
LogBackfillBatchSize = 1000
LogPollInterval = '15s'
Expand Down Expand Up @@ -4651,7 +4651,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'kroma'
FinalityDepth = 400
FinalityDepth = 700
FinalityTagEnabled = true
LogBackfillBatchSize = 1000
LogPollInterval = '2s'
Expand Down Expand Up @@ -4921,8 +4921,8 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'optimismBedrock'
FinalityDepth = 500
FinalityTagEnabled = false
FinalityDepth = 200
adityavadhavkar1215 marked this conversation as resolved.
Show resolved Hide resolved
FinalityTagEnabled = true
LogBackfillBatchSize = 1000
LogPollInterval = '2s'
LogKeepBlocksDepth = 100000
Expand Down Expand Up @@ -5464,7 +5464,7 @@ BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'celo'
FinalityDepth = 10
FinalityTagEnabled = false
FinalityTagEnabled = true
LogBackfillBatchSize = 1000
LogPollInterval = '5s'
LogKeepBlocksDepth = 100000
Expand Down Expand Up @@ -5734,7 +5734,7 @@ BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'celo'
FinalityDepth = 10
FinalityTagEnabled = false
FinalityTagEnabled = true
LogBackfillBatchSize = 1000
LogPollInterval = '5s'
LogKeepBlocksDepth = 100000
Expand Down Expand Up @@ -5911,7 +5911,7 @@ GasLimit = 5400000
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
FinalityDepth = 900
FinalityDepth = 1200
FinalityTagEnabled = false
LogBackfillBatchSize = 1000
LogPollInterval = '15s'
Expand Down Expand Up @@ -6090,7 +6090,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'metis'
FinalityDepth = 10
FinalityDepth = 312
FinalityTagEnabled = true
LogBackfillBatchSize = 1000
LogPollInterval = '15s'
Expand Down
Loading
Loading