Skip to content

Commit

Permalink
Merge branch 'ccip-develop' into batch1_2024
Browse files Browse the repository at this point in the history
  • Loading branch information
fernandezlautaro authored Nov 6, 2024
2 parents 6f3236a + 96ed6ec commit ee50ac0
Show file tree
Hide file tree
Showing 17 changed files with 100 additions and 286 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
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
4 changes: 4 additions & 0 deletions core/chains/evm/config/toml/defaults/Celo_Testnet.toml
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
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
2 changes: 1 addition & 1 deletion core/chains/evm/config/toml/defaults/XLayer_Mainnet.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ChainID = '196'
ChainType = 'xlayer'
FinalityDepth = 500
FinalityDepth = 1000
NoNewHeadsThreshold = '6m'
MinIncomingConfirmations = 1
LogPollInterval = '30s'
Expand Down
14 changes: 0 additions & 14 deletions core/chains/evm/config/toml/defaults/zkSync_Goerli.toml

This file was deleted.

10 changes: 5 additions & 5 deletions core/chains/evm/config/toml/defaults/zkSync_Sepolia.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
ChainID = '300'
ChainType = 'zksync'
# 200block ~ 20min concurrent with the l1_committed tag
FinalityDepth = 200
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'

[GasEstimator]
# 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
# 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'
PriceMin = '25 mwei'

[GasEstimator.BlockHistory]
# increasing this to smooth out gas estimation
Expand Down
Loading

0 comments on commit ee50ac0

Please sign in to comment.