Skip to content

Commit

Permalink
Merge branch 'ccip-develop' into ronin-config
Browse files Browse the repository at this point in the history
  • Loading branch information
amaechiokolobi authored Nov 8, 2024
2 parents 3f53638 + e019b14 commit ac60a34
Show file tree
Hide file tree
Showing 26 changed files with 1,185 additions and 345 deletions.
5 changes: 5 additions & 0 deletions .changeset/old-bees-kiss.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"ccip": patch
---

Consolidated FinalityDepth setting #internal
32 changes: 21 additions & 11 deletions ccip/config/evm/Celo_Testnet.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,30 @@
ChainID = '44787'
ChainType = 'celo'
FinalityDepth = 10
LogPollInterval = '5s'
MinIncomingConfirmations = 1
FinalityTagEnabled = true
FinalityDepth = 2750 # mean finality time of ~37 minutes + 500 block buffer
LogPollInterval = '1s' # 1 sec block rate
NoNewHeadsThreshold = '1m'
OCR.ContractConfirmations = 1
NoNewFinalizedHeadsThreshold = '1m'
MinIncomingConfirmations = 1
NoNewFinalizedHeadsThreshold = '45m' # Set slightly higher than mean finality time

[GasEstimator]
PriceDefault = '5 gwei'
PriceMax = '500 gwei'
PriceMin = '5 gwei'
BumpMin = '2 gwei'
EIP1559DynamicFees = true
PriceMin = '5 gwei' # Mean gas price around 5 gwei and celo txns are extremely cheap at ~0.00088 CELO per txn ($0.000058)
PriceMax = '1000 gwei' # DS&A recommendation

[GasEstimator.BlockHistory]
BlockHistorySize = 24
# Default is 8, which leads to bumpy gas prices. In CCIP
# we want to smooth out the gas prices, so we increase the sample size.
BlockHistorySize = 200

[Transactions]
ResendAfterThreshold = '30s'

[HeadTracker]
HistoryDepth = 50
HistoryDepth = 300

[NodePool]
SyncThreshold = 10 # recommended for OP stack chains

[OCR]
ContractConfirmations = 1 # recommended for OP stack chains
23 changes: 23 additions & 0 deletions core/chains/evm/config/toml/defaults/BOB_Mainnet.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
ChainID = '60808'
# OP stack https://docs.gobob.xyz/learn/introduction/stack-overview#rollup-layer
ChainType = 'optimismBedrock'
# finality_depth was: ~850
FinalityDepth = 900
# block_time was: 2s
LogPollInterval = '5s'

# finality_depth * block_time / 60 secs = ~30 min (finality time)
NoNewFinalizedHeadsThreshold = '35m'

FinalityTagEnabled = true

[GasEstimator]
EIP1559DynamicFees = true
Mode = 'FeeHistory'

[GasEstimator.FeeHistory]
# block_time was: 2s
CacheTimeout = '2s'

[GasEstimator.BlockHistory]
BlockHistorySize = 100
23 changes: 23 additions & 0 deletions core/chains/evm/config/toml/defaults/BOB_Testnet.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
ChainID = '808813'
# OP stack https://docs.gobob.xyz/learn/introduction/stack-overview#rollup-layer
ChainType = 'optimismBedrock'
# finality_depth was: ~850
FinalityDepth = 900
# block_time was: 2s
LogPollInterval = '5s'

# finality_depth * block_time / 60 secs = ~30 min (finality time)
NoNewFinalizedHeadsThreshold = '35m'

FinalityTagEnabled = true

[GasEstimator]
EIP1559DynamicFees = true
Mode = 'FeeHistory'

[GasEstimator.FeeHistory]
# block_time was: 2s
CacheTimeout = '2s'

[GasEstimator.BlockHistory]
BlockHistorySize = 100
22 changes: 22 additions & 0 deletions core/chains/evm/config/toml/defaults/Berachain_Testnet.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
ChainID = '80084'
# finality_depth: instant
FinalityDepth = 10
# block_time: 5s
LogPollInterval = '10s'

# finality_depth * block_time / 60 secs = ~0.8 min (finality time)
NoNewFinalizedHeadsThreshold = '5m'


FinalityTagEnabled = true

[GasEstimator]
EIP1559DynamicFees = true
Mode = 'FeeHistory'

[GasEstimator.FeeHistory]
# block_time was: 5s
CacheTimeout = '5s'

[GasEstimator.BlockHistory]
BlockHistorySize = 100
23 changes: 23 additions & 0 deletions core/chains/evm/config/toml/defaults/Bsquared_Mainnet.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
ChainID = '223'
# OP stack from questionnaire https://docs.google.com/spreadsheets/d/1l8dx1GzxEnjgwH5x3vB60FUr5iFALzPcs6W_wOAiuDs/edit?gid=625078687#gid=625078687
ChainType = 'optimismBedrock'
# finality_depth was: ~1900
FinalityDepth = 2000
# block_time: ~2s
LogPollInterval = '5s'

# finality_depth * block_time / 60 secs = ~66 min (finality time)
NoNewFinalizedHeadsThreshold = '70m'

FinalityTagEnabled = true

[GasEstimator]
EIP1559DynamicFees = true
Mode = 'FeeHistory'

[GasEstimator.FeeHistory]
# block_time was: 2s
CacheTimeout = '2s'

[GasEstimator.BlockHistory]
BlockHistorySize = 100
23 changes: 23 additions & 0 deletions core/chains/evm/config/toml/defaults/Bsquared_Testnet.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
ChainID = '1123'
# OP stack from questionnaire https://docs.google.com/spreadsheets/d/1l8dx1GzxEnjgwH5x3vB60FUr5iFALzPcs6W_wOAiuDs/edit?gid=625078687#gid=625078687
ChainType = 'optimismBedrock'
# finality_depth was: ~1900
FinalityDepth = 2000
# block_time: ~2s
LogPollInterval = '5s'

# finality_depth * block_time / 60 secs = ~66 min (finality time)
NoNewFinalizedHeadsThreshold = '70m'

FinalityTagEnabled = true

[GasEstimator]
EIP1559DynamicFees = true
Mode = 'FeeHistory'

[GasEstimator.FeeHistory]
# block_time was: 2s
CacheTimeout = '2s'

[GasEstimator.BlockHistory]
BlockHistorySize = 100
4 changes: 4 additions & 0 deletions core/chains/evm/config/toml/defaults/Celo_Mainnet.toml
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
35 changes: 24 additions & 11 deletions core/chains/evm/config/toml/defaults/Celo_Testnet.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,33 @@
ChainID = '44787'
ChainType = 'celo'
FinalityDepth = 10
LogPollInterval = '5s'
MinIncomingConfirmations = 1
# 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
FinalityDepth = 2750 # mean finality time of ~37 minutes + 500 block buffer
LogPollInterval = '1s' # 1 sec block rate
NoNewHeadsThreshold = '1m'
OCR.ContractConfirmations = 1
NoNewFinalizedHeadsThreshold = '1m'
MinIncomingConfirmations = 1
NoNewFinalizedHeadsThreshold = '45m' # Set slightly higher than mean finality time

[GasEstimator]
PriceDefault = '5 gwei'
PriceMax = '500 gwei'
PriceMin = '5 gwei'
BumpMin = '2 gwei'
EIP1559DynamicFees = true
PriceMin = '5 gwei' # Mean gas price around 5 gwei and celo txns are extremely cheap at ~0.00088 CELO per txn ($0.000058)
PriceMax = '1000 gwei' # DS&A recommendation

[GasEstimator.BlockHistory]
BlockHistorySize = 24
# Default is 8, which leads to bumpy gas prices. In CCIP
# we want to smooth out the gas prices, so we increase the sample size.
BlockHistorySize = 200

[Transactions]
ResendAfterThreshold = '30s'

[HeadTracker]
HistoryDepth = 50
HistoryDepth = 300

[NodePool]
SyncThreshold = 10 # recommended for OP stack chains

[OCR]
ContractConfirmations = 1 # recommended for OP stack chains
5 changes: 4 additions & 1 deletion core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
ChainID = '255'
ChainType = 'kroma' # Kroma is based on the Optimism Bedrock architechture
FinalityDepth = 400
# 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'
NoNewHeadsThreshold = '40s'
Expand Down
5 changes: 4 additions & 1 deletion core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
ChainID = '2358'
ChainType = 'kroma' # Kroma is based on the Optimism Bedrock architechture
FinalityDepth = 400
# 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'
NoNewHeadsThreshold = '40s'
Expand Down
4 changes: 2 additions & 2 deletions core/chains/evm/config/toml/defaults/Linea_Mainnet.toml
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion core/chains/evm/config/toml/defaults/Linea_Sepolia.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ChainID = '59141'
FinalityDepth = 900
FinalityDepth = 200
NoNewHeadsThreshold = '0'

[GasEstimator]
Expand Down
8 changes: 6 additions & 2 deletions core/chains/evm/config/toml/defaults/Mantle_Sepolia.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
ChainID = '5003'
ChainType = 'optimismBedrock'
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
FinalityDepth = 1200
FinalityTagEnabled = true
LogPollInterval = '2s'
NoNewHeadsThreshold = '0'
MinIncomingConfirmations = 1

[HeadTracker]
HistoryDepth = 600

[GasEstimator]
[GasEstimator]
Mode = 'L2Suggested'
PriceMax = '200 gwei'
LimitDefault = 100000000
Expand Down
8 changes: 7 additions & 1 deletion core/chains/evm/config/toml/defaults/Metis_Mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@
ChainID = '1088'
ChainType = 'optimismBedrock'
# 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'
Expand Down
16 changes: 0 additions & 16 deletions core/chains/evm/config/toml/defaults/Metis_Rinkeby.toml

This file was deleted.

5 changes: 4 additions & 1 deletion core/chains/evm/config/toml/defaults/Metis_Sepolia.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
ChainID = '59902'
ChainType = 'optimismBedrock'
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'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ChainID = '1101'
ChainType = 'zkevm'
FinalityDepth = 500
FinalityDepth = 1000
NoNewHeadsThreshold = '6m'
MinIncomingConfirmations = 1
LogPollInterval = '30s'
Expand Down
24 changes: 24 additions & 0 deletions core/chains/evm/config/toml/defaults/Unichain_Testnet.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
ChainID = '1301'
# OP stack: https://docs.unichain.org/docs/getting-started/set-up-a-node#overview
ChainType = 'optimismBedrock'
# finality_depth was: ~1900
FinalityDepth = 2000
# block_time was: ~1s
LogPollInterval = '5s'

# batching_size_finalization_percentage = 30% according to the explorer batching view
# ( batching_size_finalization_percentage * finality_depth) * block_time / 60 secs = ~33 min (finality time)
NoNewFinalizedHeadsThreshold = '10m'

FinalityTagEnabled = true

[GasEstimator]
EIP1559DynamicFees = true
Mode = 'FeeHistory'

[GasEstimator.FeeHistory]
# block_time was: 1s
CacheTimeout = '1s'

[GasEstimator.BlockHistory]
BlockHistorySize = 100
23 changes: 23 additions & 0 deletions core/chains/evm/config/toml/defaults/Worldchain_Mainnet.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
ChainID = '480'
# OP stack: https://worldcoin.notion.site/World-Chain-Developer-Preview-Guide-23c94a67683f4e71986e5303ab88c9f3
ChainType = 'optimismBedrock'
# finality_depth was: ~2400
FinalityDepth = 2500
# block_time was: 2s
LogPollInterval = '5s'

# finality_depth * block_time / 60 secs = ~83 min (finality time)
NoNewFinalizedHeadsThreshold = '90m'

FinalityTagEnabled = true

[GasEstimator]
EIP1559DynamicFees = true
Mode = 'FeeHistory'

[GasEstimator.FeeHistory]
# block_time was: 2s
CacheTimeout = '2s'

[GasEstimator.BlockHistory]
BlockHistorySize = 100
Loading

0 comments on commit ac60a34

Please sign in to comment.