[DO NOT MERGE] CCIP Release branch 2.20-ccip1.5 (#16028)

* Fix Metis chainType in core config (#16024) * metis ct * fixed mainnet too * added chainset * Bumping chain-selectors to the recent version (#16026) --------- Co-authored-by: Sishir Giri <[email protected]>
smartcontractkit · Jan 22, 2025 · ad97894 · ad97894
1 parent b45f212
commit ad97894
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 9 deletions.
diff --git a/.changeset/mean-pianos-train.md b/.changeset/mean-pianos-train.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#nops change chainType from metis to optimismBedrock
diff --git a/ccip/config/evm/Metis_Mainnet.toml b/ccip/config/evm/Metis_Mainnet.toml
@@ -1,6 +1,5 @@
 # Metis is an L2 chain based on Optimism.
 ChainID = '1088'
-ChainType = 'optimismBedrock'
 # Sequencer offers absolute finality
 # High variation on finality depth triggered a commitee to investigate
 # and set 500 as a secure finality depth.

diff --git a/ccip/config/evm/Metis_Sepolia.toml b/ccip/config/evm/Metis_Sepolia.toml
@@ -1,5 +1,4 @@
 ChainID = '59902'
-ChainType = 'optimismBedrock'
 # 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

diff --git a/core/chains/evm/config/toml/defaults/Metis_Mainnet.toml b/core/chains/evm/config/toml/defaults/Metis_Mainnet.toml
@@ -1,6 +1,6 @@
 # Metis is an L2 chain based on Optimism.
 ChainID = '1088'
-ChainType = 'metis'
+ChainType = 'optimismBedrock'
 # Sequencer offers absolute finality
 FinalityDepth = 10
 FinalityTagEnabled = true

diff --git a/core/chains/evm/config/toml/defaults/Metis_Sepolia.toml b/core/chains/evm/config/toml/defaults/Metis_Sepolia.toml
@@ -1,5 +1,5 @@
 ChainID = '59902'
-ChainType = 'metis'
+ChainType = 'optimismBedrock'
 FinalityDepth = 10
 FinalityTagEnabled = true
 MinIncomingConfirmations = 1

diff --git a/docs/CONFIG.md b/docs/CONFIG.md
@@ -6064,7 +6064,7 @@ GasLimitDefault = 400000
 AutoCreateKey = true
 BlockBackfillDepth = 10
 BlockBackfillSkip = false
-ChainType = 'metis'
+ChainType = 'optimismBedrock'
 FinalityDepth = 10
 FinalityTagEnabled = true
 LogBackfillBatchSize = 1000
@@ -10457,7 +10457,7 @@ GasLimitDefault = 400000
 AutoCreateKey = true
 BlockBackfillDepth = 10
 BlockBackfillSkip = false
-ChainType = 'metis'
+ChainType = 'optimismBedrock'
 FinalityDepth = 10
 FinalityTagEnabled = true
 LogBackfillBatchSize = 1000

diff --git a/go.mod b/go.mod
@@ -76,7 +76,7 @@ require (
 	github.com/scylladb/go-reflectx v1.0.1
 	github.com/shirou/gopsutil/v3 v3.24.3
 	github.com/shopspring/decimal v1.4.0
-	github.com/smartcontractkit/chain-selectors v1.0.34
+	github.com/smartcontractkit/chain-selectors v1.0.36
 	github.com/smartcontractkit/chainlink-automation v0.8.1
 	github.com/smartcontractkit/chainlink-ccip v0.0.0-20250120130359-cc025272bbff
 	github.com/smartcontractkit/chainlink-common v0.4.2-0.20250121141917-62443f4b3c30

diff --git a/go.sum b/go.sum
@@ -1148,8 +1148,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/smartcontractkit/chain-selectors v1.0.34 h1:MJ17OGu8+jjl426pcKrJkCf3fePb3eCreuAnUA3RBj4=
-github.com/smartcontractkit/chain-selectors v1.0.34/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
+github.com/smartcontractkit/chain-selectors v1.0.36 h1:KSpO8I+JOiuyN4FuXsV471sPorGF//PAqwq2Cm4gRK0=
+github.com/smartcontractkit/chain-selectors v1.0.36/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=