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.

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

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

Merged
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
30 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
d71eaa8
Merge branch 'ccip-develop' into SHIP-1754-Consolidate-all-FinalityDe…
Madalosso Oct 28, 2024
254a0fd
Add docs
Madalosso Oct 28, 2024
17b993c
Merge branch 'ccip-develop' into SHIP-1754-Consolidate-all-FinalityDe…
Madalosso Oct 28, 2024
92f8ffe
Revert metis mainnet finalityDepth change
Madalosso Oct 29, 2024
8e3b2ff
Re-introduce Finality Depth for Metis mainnet with explanation
Madalosso Oct 29, 2024
0969f32
Add comment explaining both FT and FD values on applicable chains
Madalosso Oct 29, 2024
5418f5e
Merge branch 'ccip-develop' into SHIP-1754-Consolidate-all-FinalityDe…
Madalosso Nov 1, 2024
4ebba91
Merge branch 'ccip-develop' into SHIP-1754-Consolidate-all-FinalityDe…
Madalosso Nov 5, 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
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
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
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
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
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
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
Madalosso marked this conversation as resolved.
Show resolved Hide resolved
NoNewHeadsThreshold = '0'

[GasEstimator]
Expand Down
5 changes: 3 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,15 @@
ChainID = '5003'
ChainType = 'optimismBedrock'
FinalityDepth = 500
FinalityDepth = 1200
FinalityTagEnabled = true
adityavadhavkar1215 marked this conversation as resolved.
Show resolved Hide resolved
LogPollInterval = '2s'
NoNewHeadsThreshold = '0'
MinIncomingConfirmations = 1

[HeadTracker]
HistoryDepth = 600

[GasEstimator]
[GasEstimator]
Mode = 'L2Suggested'
PriceMax = '200 gwei'
LimitDefault = 100000000
Expand Down
5 changes: 4 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,10 @@
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
Madalosso marked this conversation as resolved.
Show resolved Hide resolved
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.

2 changes: 1 addition & 1 deletion core/chains/evm/config/toml/defaults/Metis_Sepolia.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ChainID = '59902'
FinalityDepth = 3000
ChainType = 'optimismBedrock'
FinalityDepth = 10
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
adityavadhavkar1215 marked this conversation as resolved.
Show resolved Hide resolved
friedemannf marked this conversation as resolved.
Show resolved Hide resolved
# 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
Loading