Skip to content

Commit

Permalink
Bump Chain Selector + Add toml config (#16209) (#16231)
Browse files Browse the repository at this point in the history
* bump cs

* add changeset

* added toml config

* added berachain config

Co-authored-by: Sishir Giri <[email protected]>
  • Loading branch information
simsonraj and stackman27 authored Feb 5, 2025
1 parent 53a2e2e commit 901f0b4
Show file tree
Hide file tree
Showing 24 changed files with 701 additions and 40 deletions.
5 changes: 5 additions & 0 deletions .changeset/clever-bears-lay.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

#nops bump chain selector
10 changes: 10 additions & 0 deletions ccip/config/evm/Berachain_Mainnet.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ChainID = '80094'

[GasEstimator]
EIP1559DynamicFees = true
Mode = 'FeeHistory'

[GasEstimator.FeeHistory]
# block_time was: 5s, per recommendation skip 1-2 blocks
CacheTimeout = '10s'

14 changes: 14 additions & 0 deletions ccip/config/evm/Fraxtal_Mainnet.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
ChainID = '252'

[GasEstimator]
EIP1559DynamicFees = true

[GasEstimator.BlockHistory]
# Default is 4!?, which leads to bumpy gas prices. In CCIP
# we want to smooth out the gas prices, so we increase the sample size.
BlockHistorySize = 200
# The formula for FeeCap is (current block base fee * (1.125 ^ EIP1559FeeCapBufferBlocks) + tipcap)
# where tipcap is managed by the block history estimators. In the context of CCIP,
# the gas price is relayed to other changes for quotes so we want accurate/avg not pessimistic values.
# So we set this to zero so FeeCap = baseFee + tipcap.
EIP1559FeeCapBufferBlocks = 0
14 changes: 14 additions & 0 deletions ccip/config/evm/Fraxtal_Testnet.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
ChainID = '2522'

[GasEstimator]
EIP1559DynamicFees = true

[GasEstimator.BlockHistory]
# Default is 4!?, which leads to bumpy gas prices. In CCIP
# we want to smooth out the gas prices, so we increase the sample size.
BlockHistorySize = 200
# The formula for FeeCap is (current block base fee * (1.125 ^ EIP1559FeeCapBufferBlocks) + tipcap)
# where tipcap is managed by the block history estimators. In the context of CCIP,
# the gas price is relayed to other changes for quotes so we want accurate/avg not pessimistic values.
# So we set this to zero so FeeCap = baseFee + tipcap.
EIP1559FeeCapBufferBlocks = 0
10 changes: 10 additions & 0 deletions ccip/config/evm/Merlin_Mainnet.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ChainID = 4200

[GasEstimator]
BumpPercent = 40
Mode = "FeeHistory"
# The FeeHistory estimator does not enforce PriceMin, setting it to 0 to not place any limits on the price
PriceMin = "0"

[GasEstimator.FeeHistory]
CacheTimeout = "4s"
10 changes: 10 additions & 0 deletions ccip/config/evm/Merlin_Testnet.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ChainID = 686868

[GasEstimator]
BumpPercent = 40
Mode = "FeeHistory"
# The FeeHistory estimator does not enforce PriceMin, setting it to 0 to not place any limits on the price
PriceMin = "0"

[GasEstimator.FeeHistory]
CacheTimeout = "4s"
12 changes: 12 additions & 0 deletions core/chains/evm/config/toml/defaults/Berachain_Mainnet.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ChainID = '80094'
# finality_depth: instant
FinalityDepth = 10
LinkContractAddress = '0x52CEEed7d3f8c6618e4aaD6c6e555320d0D83271'
# block_time: 5s, adding 1 second buffer
LogPollInterval = '6s'

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

[GasEstimator.BlockHistory]
BlockHistorySize = 100
3 changes: 3 additions & 0 deletions core/chains/evm/config/toml/defaults/Fraxtal_Mainnet.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ChainID = '252'
FinalityTagEnabled = true
LogPollInterval = "2s" #2s block rate
3 changes: 3 additions & 0 deletions core/chains/evm/config/toml/defaults/Fraxtal_Testnet.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ChainID = '2522'
FinalityTagEnabled = true
LogPollInterval = "2s" #2s block rate
20 changes: 20 additions & 0 deletions core/chains/evm/config/toml/defaults/Merlin_Mainnet.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
ChainID = 4200
ChainType = "zkevm"
FinalityDepth = 1000
FinalityTagEnabled = false
LogPollInterval = "4s" # blockrate is 3s; adding a 1s buffer
MinIncomingConfirmations = 1
RPCDefaultBatchSize = 100

[HeadTracker]
HistoryDepth = 2000

[OCR]
ContractConfirmations = 1

[Transactions]
ResendAfterThreshold = "3m"

[Transactions.AutoPurge]
Enabled = true
MinAttempts = 3
20 changes: 20 additions & 0 deletions core/chains/evm/config/toml/defaults/Merlin_Testnet.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
ChainID = 686868
ChainType = "zkevm"
FinalityDepth = 1000
FinalityTagEnabled = false
LogPollInterval = "4s" # blockrate is 3s; adding a 1s buffer
MinIncomingConfirmations = 1
RPCDefaultBatchSize = 100

[HeadTracker]
HistoryDepth = 2000

[OCR]
ContractConfirmations = 1

[Transactions]
ResendAfterThreshold = "3m"

[Transactions.AutoPurge]
Enabled = true
MinAttempts = 3
2 changes: 1 addition & 1 deletion core/scripts/ccip/manual-execution/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.20
require (
github.com/ethereum/go-ethereum v1.11.3
github.com/pkg/errors v0.9.1
github.com/smartcontractkit/chain-selectors v1.0.35
github.com/smartcontractkit/chain-selectors v1.0.40
go.uber.org/multierr v1.1.0
golang.org/x/crypto v0.1.0
)
Expand Down
4 changes: 2 additions & 2 deletions core/scripts/ccip/manual-execution/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU=
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
github.com/smartcontractkit/chain-selectors v1.0.35 h1:k7iJqChFbH10WFpahjDtDJoYyDz4qRNq6ReIB41M8Tg=
github.com/smartcontractkit/chain-selectors v1.0.35/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
github.com/smartcontractkit/chain-selectors v1.0.40 h1:iLvvoZeehVq6/7F+zzolQLF0DF25d3mh+vsYeZQiSCE=
github.com/smartcontractkit/chain-selectors v1.0.40/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
Expand Down
2 changes: 1 addition & 1 deletion core/scripts/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ require (
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
github.com/shirou/gopsutil/v3 v3.24.3 // indirect
github.com/smartcontractkit/ccip-owner-contracts v0.0.0-salt-fix // indirect
github.com/smartcontractkit/chain-selectors v1.0.37 // indirect
github.com/smartcontractkit/chain-selectors v1.0.40 // indirect
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250120130359-cc025272bbff // indirect
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250103152858-8973fd0c912b // indirect
github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241202195413-82468150ac1e // indirect
Expand Down
4 changes: 2 additions & 2 deletions core/scripts/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1164,8 +1164,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/smartcontractkit/ccip-owner-contracts v0.0.0-salt-fix h1:DPJD++yKLSx0EfT+U14P8vLVxjXFmoIETiCO9lVwQo8=
github.com/smartcontractkit/ccip-owner-contracts v0.0.0-salt-fix/go.mod h1:NnT6w4Kj42OFFXhSx99LvJZWPpMjmo4+CpDEWfw61xY=
github.com/smartcontractkit/chain-selectors v1.0.37 h1:EKVl8wayhOVfnlqfVmEyZ8rXOsnihthONvOPfEOfvbI=
github.com/smartcontractkit/chain-selectors v1.0.37/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
github.com/smartcontractkit/chain-selectors v1.0.40 h1:iLvvoZeehVq6/7F+zzolQLF0DF25d3mh+vsYeZQiSCE=
github.com/smartcontractkit/chain-selectors v1.0.40/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgBc2xpDKBco/Q4h4ydl6+UUU=
github.com/smartcontractkit/chainlink-automation v0.8.1/go.mod h1:Iij36PvWZ6blrdC5A/nrQUBuf3MH3JvsBB9sSyc9W08=
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250120130359-cc025272bbff h1:ZEOlcleVdT0/y9V5yjgFJF0j7MpvdrFmKis/xmFNIgE=
Expand Down
2 changes: 1 addition & 1 deletion deployment/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ require (
github.com/rs/zerolog v1.33.0
github.com/sethvargo/go-retry v0.2.4
github.com/smartcontractkit/ccip-owner-contracts v0.0.0-salt-fix
github.com/smartcontractkit/chain-selectors v1.0.37
github.com/smartcontractkit/chain-selectors v1.0.40
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250120130359-cc025272bbff
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250103152858-8973fd0c912b
github.com/smartcontractkit/chainlink-common v0.4.2-0.20250121141917-62443f4b3c30
Expand Down
4 changes: 2 additions & 2 deletions deployment/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1390,8 +1390,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/smartcontractkit/ccip-owner-contracts v0.0.0-salt-fix h1:DPJD++yKLSx0EfT+U14P8vLVxjXFmoIETiCO9lVwQo8=
github.com/smartcontractkit/ccip-owner-contracts v0.0.0-salt-fix/go.mod h1:NnT6w4Kj42OFFXhSx99LvJZWPpMjmo4+CpDEWfw61xY=
github.com/smartcontractkit/chain-selectors v1.0.37 h1:EKVl8wayhOVfnlqfVmEyZ8rXOsnihthONvOPfEOfvbI=
github.com/smartcontractkit/chain-selectors v1.0.37/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
github.com/smartcontractkit/chain-selectors v1.0.40 h1:iLvvoZeehVq6/7F+zzolQLF0DF25d3mh+vsYeZQiSCE=
github.com/smartcontractkit/chain-selectors v1.0.40/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgBc2xpDKBco/Q4h4ydl6+UUU=
github.com/smartcontractkit/chainlink-automation v0.8.1/go.mod h1:Iij36PvWZ6blrdC5A/nrQUBuf3MH3JvsBB9sSyc9W08=
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250120130359-cc025272bbff h1:ZEOlcleVdT0/y9V5yjgFJF0j7MpvdrFmKis/xmFNIgE=
Expand Down
Loading

0 comments on commit 901f0b4

Please sign in to comment.