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

SHIP-1754 Consolidate FinalityDepth config #13702

Open
wants to merge 31 commits into
base: develop
Choose a base branch
from
Open

SHIP-1754 Consolidate FinalityDepth config #13702

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
fbaf4ea
Added missing FinalityDepth config in default toml files.
adityavadhavkar1215 Jun 26, 2024
5f1ede3
Merge branch 'develop' into SHIP-1754-Consolidate-all-FinalityDepth-s…
adityavadhavkar1215 Jun 27, 2024
926e1f0
added changeset to the PR.
adityavadhavkar1215 Jun 27, 2024
5f2b8c8
Merge branch 'develop' into SHIP-1754-Consolidate-all-FinalityDepth-s…
adityavadhavkar1215 Jun 27, 2024
dc4fb58
Updated docs/CONFIG.md
adityavadhavkar1215 Jun 27, 2024
7ff582c
Merge branch 'develop' into SHIP-1754-Consolidate-all-FinalityDepth-s…
adityavadhavkar1215 Jun 27, 2024
1f32b48
Merge branch 'develop' into SHIP-1754-Consolidate-all-FinalityDepth-s…
adityavadhavkar1215 Jun 28, 2024
703c28a
Updated test config to resolve test failure.
adityavadhavkar1215 Jun 28, 2024
d69c25b
Merge branch 'develop' into SHIP-1754-Consolidate-all-FinalityDepth-s…
adityavadhavkar1215 Jun 28, 2024
74457d1
Updated the changeset tag to internal.
adityavadhavkar1215 Jul 5, 2024
b967bc7
Merge branch 'develop' into SHIP-1754-Consolidate-all-FinalityDepth-s…
adityavadhavkar1215 Jul 5, 2024
ea5dc96
Addressed PR comments
adityavadhavkar1215 Jul 10, 2024
5ef0011
Merge branch 'SHIP-1754-Consolidate-all-FinalityDepth-settings' of gi…
adityavadhavkar1215 Jul 10, 2024
9cc0296
Merge branch 'develop' into SHIP-1754-Consolidate-all-FinalityDepth-s…
adityavadhavkar1215 Jul 10, 2024
e384dcd
Updated test values.
adityavadhavkar1215 Jul 10, 2024
7ee2841
Merge branch 'SHIP-1754-Consolidate-all-FinalityDepth-settings' of gi…
adityavadhavkar1215 Jul 10, 2024
39b39d6
Updated default config for Ethereum testnets
adityavadhavkar1215 Jul 10, 2024
963a389
Updated values for chains that did not have default value
adityavadhavkar1215 Jul 11, 2024
d7a75bc
Merge branch 'develop' into SHIP-1754-Consolidate-all-FinalityDepth-s…
adityavadhavkar1215 Jul 11, 2024
38d8b58
Merge branch 'develop' into SHIP-1754-Consolidate-all-FinalityDepth-s…
Madalosso Sep 30, 2024
864bc54
Revision: Testnet value from infra-k8s prod-testnet, mainnet from Nod…
Madalosso Sep 30, 2024
cfc08ec
save WIP
Madalosso Nov 6, 2024
77ade09
Update chain defaults using ccip repo as source of truth
Madalosso Nov 6, 2024
31c567b
gen docs
Madalosso Nov 6, 2024
6c262e6
Merge branch 'develop' into SHIP-1754-Consolidate-all-FinalityDepth-s…
Madalosso Nov 6, 2024
e569490
revert artbitrum finalityDepth values
Madalosso Nov 6, 2024
e6865e1
Undo comment deletion
Madalosso Nov 6, 2024
e3f41f6
fixes
Madalosso Nov 6, 2024
49c5f16
Merge branch 'develop' into SHIP-1754-Consolidate-all-FinalityDepth-s…
Madalosso Nov 7, 2024
9132246
FinalityTagBypass setup for chains with FinalityDepth<1000
Madalosso Nov 8, 2024
660f3ce
Merge branch 'develop' into SHIP-1754-Consolidate-all-FinalityDepth-s…
Madalosso Nov 8, 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/wild-ducks-bake.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

#internal Added FinalityDepth config where it was missing
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/Arbitrum_Goerli.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ChainID = '421613'
FinalityDepth = 4350
ChainType = 'arbitrum'
NoNewHeadsThreshold = '0'
OCR.ContractConfirmations = 1
Expand Down
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/Arbitrum_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Arbitrum is an L2 chain. Pending proper L2 support, for now we rely on their sequencer
ChainID = '42161'
ChainType = 'arbitrum'
FinalityDepth = 4350
LinkContractAddress = "0xf97f4df75117a78c1A5a0DBb814Af92458539FB4"
LogPollInterval = '1s'
# Arbitrum only emits blocks when a new tx is received, so this method of liveness detection is not useful
Expand Down
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/Arbitrum_Rinkeby.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ChainID = '421611'
FinalityDepth = 4350
ChainType = 'arbitrum'
LinkContractAddress = "0x615fBe6372676474d9e6933d310469c9b68e9726"
LogPollInterval = '1s'
Expand Down
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ChainID = '421614'
FinalityDepth = 4350
ChainType = 'arbitrum'
NoNewHeadsThreshold = '0'
OCR.ContractConfirmations = 1
Expand Down
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/BSC_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Clique offers finality within (N/2)+1 blocks where N is number of signers
# There are 21 BSC validators so theoretically finality should occur after 21/2+1 = 11 blocks
ChainID = '56'
FinalityDepth = 50
LinkContractAddress = '0x404460C6A5EdE2D891e8297795264fDe62ADBB75'
LogPollInterval = '3s'
NoNewHeadsThreshold = '30s'
Expand Down
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/BSC_Testnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Clique offers finality within (N/2)+1 blocks where N is number of signers
# There are 21 BSC validators so theoretically finality should occur after 21/2+1 = 11 blocks
ChainID = '97'
FinalityDepth = 50
LinkContractAddress = '0x84b9B910527Ad5C03A9Ca831909E21e236EA7b06'
LogPollInterval = '3s'
NoNewHeadsThreshold = '30s'
Expand Down
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/Ethereum_Goerli.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ChainID = '5'
FinalityDepth = 50
LinkContractAddress = '0x326C977E6efc84E512bB9C30f76E30c160eD06FB'
MinContractPayment = '0.1 link'

Expand Down
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/Ethereum_Kovan.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ChainID = '42'
FinalityDepth = 50
LinkContractAddress = '0xa36085F69e2889c224210F603D836748e7dC0088'
MinContractPayment = '0.1 link'
OperatorFactoryAddress = '0x8007e24251b1D2Fc518Eb843A701d9cD21fe0aA3'
Expand Down
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ChainID = '1'
LinkContractAddress = '0x514910771AF9Ca656af840dff83E8264EcF986CA'
FinalityDepth = 50
MinContractPayment = '0.1 link'
OperatorFactoryAddress = '0x3E64Cd889482443324F91bFA9c84fE72A511f48A'

Expand Down
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/Ethereum_Rinkeby.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ChainID = '4'
FinalityDepth = 50
LinkContractAddress = '0x01BE23585060835E02B77ef475b0Cc51aA1e0709'
MinContractPayment = '0.1 link'

Expand Down
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/Ethereum_Ropsten.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ChainID = '3'
FinalityDepth = 50
LinkContractAddress = '0x20fE562d797A42Dcb3399062AE9546cd06f63280'
MinContractPayment = '0.1 link'

Expand Down
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ChainID = '11155111'
FinalityDepth = 50
LinkContractAddress = '0x779877A7B0D9E8603169DdbD7836e478b4624789'
MinContractPayment = '0.1 link'

Expand Down
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ChainID = '250'
FinalityDepth = 50
LinkContractAddress = '0x6F43FF82CCA38001B6699a8AC47A2d0E66939407'
LogPollInterval = '1s'
NoNewHeadsThreshold = '30s'
Expand Down
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/Fantom_Testnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ChainID = '4002'
FinalityDepth = 50
LinkContractAddress = '0xfaFedb041c0DD4fA2Dc0d87a6B0979Ee6FA7af5F'
LogPollInterval = '1s'
# Fantom testnet only emits blocks when a new tx is received, so this method of liveness detection is not useful
Expand Down
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/Gnosis_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# With xDai's current maximum of 19 validators then 40 blocks is the maximum possible re-org)
# The mainnet default of 50 blocks is ok here
ChainID = '100'
FinalityDepth = 50
ChainType = 'gnosis'
LinkContractAddress = '0xE2e73A1c69ecF83F464EFCE6A5be353a37cA09b2'
LogPollInterval = '5s'
Expand Down
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/Harmony_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ChainID = '1666600000'
FinalityDepth = 50
LinkContractAddress = '0x218532a12a389a4a92fC0C5Fb22901D1c19198aA'
LogPollInterval = '2s'
MinIncomingConfirmations = 1
Expand Down
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/Harmony_Testnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ChainID = '1666700000'
FinalityDepth = 50
LinkContractAddress = '0x8b12Ac23BFe11cAb03a634C1F117D64a7f2cFD3e'
LogPollInterval = '2s'
MinIncomingConfirmations = 1
Expand Down
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/Heco_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Heco uses BSC's settings.
ChainID = '128'
FinalityDepth = 50
LinkContractAddress = '0x404460C6A5EdE2D891e8297795264fDe62ADBB75'
LogPollInterval = '3s'
NoNewHeadsThreshold = '30s'
Expand Down
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/OKX_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
ChainID = '66'
FinalityDepth = 50
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/OKX_Testnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
ChainID = '65'
FinalityDepth = 50
Copy link
Contributor

Choose a reason for hiding this comment

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

@friedemannf is this right for OKX?

Copy link
Contributor

Choose a reason for hiding this comment

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

This value isn't defined at CCIP, can we get a check on this please?
@friedemannf

1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/RSK_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# RSK prices its txes in sats not wei
ChainID = '30'
FinalityDepth = 50
LinkContractAddress = '0x14AdaE34beF7ca957Ce2dDe5ADD97ea050123827'
LogPollInterval = '30s'
MinContractPayment = '0.001 link'
Expand Down
1 change: 1 addition & 0 deletions core/chains/evm/config/toml/defaults/RSK_Testnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ChainID = '31'
FinalityDepth = 50
LinkContractAddress = '0x8bBbd80981FE76d44854D8DF305e8985c19f0e78'
MinContractPayment = '0.001 link'
LogPollInterval = '30s'
Expand Down
2 changes: 1 addition & 1 deletion core/chains/evm/config/toml/defaults/fallback.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
FinalityDepth = 50
FinalityDepth = 10
FinalityTagEnabled = false
LogBackfillBatchSize = 1000
LogPollInterval = '15s'
Expand Down
3 changes: 3 additions & 0 deletions core/config/docs/docs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ func TestDoc(t *testing.T) {
docDefaults.Transactions.AutoPurge.Threshold = nil
docDefaults.Transactions.AutoPurge.MinAttempts = nil

// FinalityDepth has been updated to 10 in fallback and set to 50 in Ethereum_Mainnet
fallbackDefaults.FinalityDepth = docDefaults.FinalityDepth
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure I understand why this needs to be done? are the tests failing without these?

Copy link
Author

Choose a reason for hiding this comment

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

The test is setup in such a way that it wants the falback value to be reflected in the docDefaults, but since we updated the fallback and added a default for Ethereum chains this test fails without the new update.

Copy link
Contributor

Choose a reason for hiding this comment

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

I still dont think we should be doing this, dont have the full context.
falback value to be reflected in the docDefaults - yes & we arent doing anything different, we want the fallback value to reflect in the defaults if it doesnt have one, how was it working all this time?


assertTOML(t, fallbackDefaults, docDefaults)
})

Expand Down
8 changes: 4 additions & 4 deletions docs/CONFIG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5212,7 +5212,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'arbitrum'
FinalityDepth = 50
FinalityDepth = 4350
FinalityTagEnabled = false
LinkContractAddress = '0xf97f4df75117a78c1A5a0DBb814Af92458539FB4'
LogBackfillBatchSize = 1000
Expand Down Expand Up @@ -6418,7 +6418,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'arbitrum'
FinalityDepth = 50
FinalityDepth = 4350
FinalityTagEnabled = false
LinkContractAddress = '0x615fBe6372676474d9e6933d310469c9b68e9726'
LogBackfillBatchSize = 1000
Expand Down Expand Up @@ -6512,7 +6512,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'arbitrum'
FinalityDepth = 50
FinalityDepth = 4350
FinalityTagEnabled = false
LinkContractAddress = '0xd14838A68E8AFBAdE5efb411d5871ea0011AFd28'
LogBackfillBatchSize = 1000
Expand Down Expand Up @@ -6606,7 +6606,7 @@ AutoCreateKey = true
BlockBackfillDepth = 10
BlockBackfillSkip = false
ChainType = 'arbitrum'
FinalityDepth = 50
FinalityDepth = 4350
FinalityTagEnabled = false
LogBackfillBatchSize = 1000
LogPollInterval = '1s'
Expand Down
Loading