From d6742540a0d167feefc39a9ec16cdc904548a7b4 Mon Sep 17 00:00:00 2001 From: cby3149 Date: Wed, 20 Nov 2024 10:55:14 -0800 Subject: [PATCH 1/2] Update superchain-registry --- go.mod | 2 +- go.sum | 4 +-- op-node/chaincfg/chains_test.go | 64 ++++++++++++++++----------------- op-node/rollup/superchain.go | 1 + 4 files changed, 36 insertions(+), 35 deletions(-) diff --git a/go.mod b/go.mod index d13ee6fdf030..889cc8b19c9f 100644 --- a/go.mod +++ b/go.mod @@ -266,7 +266,7 @@ replace github.com/ethereum/go-ethereum v1.14.11 => github.com/ethereum-optimism //replace github.com/ethereum/go-ethereum => ../go-ethereum -replace github.com/ethereum-optimism/superchain-registry/superchain => github.com/bobanetwork/superchain-registry/superchain v0.0.0-20240926214052-4aa1ce20dfa5 +replace github.com/ethereum-optimism/superchain-registry/superchain => github.com/bobanetwork/superchain-registry/superchain v0.0.0-20241120184037-a6acc10cc403 // This release keeps breaking Go builds. Stop that. exclude ( diff --git a/go.sum b/go.sum index a2f958f37f7e..253a5644780d 100644 --- a/go.sum +++ b/go.sum @@ -101,8 +101,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE= github.com/bits-and-blooms/bitset v1.13.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= -github.com/bobanetwork/superchain-registry/superchain v0.0.0-20240926214052-4aa1ce20dfa5 h1:XvIdo6TKf6KHy0ItEBCF5LHCforqyp2UELpMp1VZlws= -github.com/bobanetwork/superchain-registry/superchain v0.0.0-20240926214052-4aa1ce20dfa5/go.mod h1:XaVXL9jg8BcyOeugECgIUGa9Y3DjYJj71RHmb5qon6M= +github.com/bobanetwork/superchain-registry/superchain v0.0.0-20241120184037-a6acc10cc403 h1:oON1sae55IY7vLFKMhwp/Pcq4oRkdD/nltoPhsDb3eo= +github.com/bobanetwork/superchain-registry/superchain v0.0.0-20241120184037-a6acc10cc403/go.mod h1:9feO8jcL5OZ1tvRjEfNAHz4Aggvd6373l+ZxmZZAyZs= github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= diff --git a/op-node/chaincfg/chains_test.go b/op-node/chaincfg/chains_test.go index 3fd0caa4644f..7ee30fbf0723 100644 --- a/op-node/chaincfg/chains_test.go +++ b/op-node/chaincfg/chains_test.go @@ -93,22 +93,22 @@ var sepoliaCfg = rollup.Config{ GasLimit: 30000000, }, }, - BlockTime: 2, - MaxSequencerDrift: 600, - SeqWindowSize: 3600, - ChannelTimeoutBedrock: 300, - L1ChainID: big.NewInt(11155111), - L2ChainID: big.NewInt(11155420), - BatchInboxAddress: common.HexToAddress("0xff00000000000000000000000000000011155420"), - DepositContractAddress: common.HexToAddress("0x16fc5058f25648194471939df75cf27a2fdc48bc"), - L1SystemConfigAddress: common.HexToAddress("0x034edd2a225f7f429a63e0f1d2084b9e0a93b538"), - RegolithTime: u64Ptr(0), - CanyonTime: u64Ptr(1699981200), - DeltaTime: u64Ptr(1703203200), - EcotoneTime: u64Ptr(1708534800), - FjordTime: u64Ptr(1716998400), - GraniteTime: u64Ptr(1723478400), - // HoloceneTime: TBD + BlockTime: 2, + MaxSequencerDrift: 600, + SeqWindowSize: 3600, + ChannelTimeoutBedrock: 300, + L1ChainID: big.NewInt(11155111), + L2ChainID: big.NewInt(11155420), + BatchInboxAddress: common.HexToAddress("0xff00000000000000000000000000000011155420"), + DepositContractAddress: common.HexToAddress("0x16fc5058f25648194471939df75cf27a2fdc48bc"), + L1SystemConfigAddress: common.HexToAddress("0x034edd2a225f7f429a63e0f1d2084b9e0a93b538"), + RegolithTime: u64Ptr(0), + CanyonTime: u64Ptr(1699981200), + DeltaTime: u64Ptr(1703203200), + EcotoneTime: u64Ptr(1708534800), + FjordTime: u64Ptr(1716998400), + GraniteTime: u64Ptr(1723478400), + HoloceneTime: u64Ptr(1732633200), ProtocolVersionsAddress: common.HexToAddress("0x79ADD5713B383DAa0a138d3C4780C7A1804a8090"), } @@ -130,22 +130,22 @@ var sepoliaDev0Cfg = rollup.Config{ GasLimit: 30000000, }, }, - BlockTime: 2, - MaxSequencerDrift: 600, - SeqWindowSize: 3600, - ChannelTimeoutBedrock: 300, - L1ChainID: big.NewInt(11155111), - L2ChainID: big.NewInt(11155421), - BatchInboxAddress: common.HexToAddress("0xff00000000000000000000000000000011155421"), - DepositContractAddress: common.HexToAddress("0x76114bd29dFcC7a9892240D317E6c7C2A281Ffc6"), - L1SystemConfigAddress: common.HexToAddress("0xa6b72407e2dc9EBF84b839B69A24C88929cf20F7"), - RegolithTime: u64Ptr(0), - CanyonTime: u64Ptr(0), - DeltaTime: u64Ptr(0), - EcotoneTime: u64Ptr(1706634000), - FjordTime: u64Ptr(1715961600), - GraniteTime: u64Ptr(1723046400), - // HoloceneTime: TBD + BlockTime: 2, + MaxSequencerDrift: 600, + SeqWindowSize: 3600, + ChannelTimeoutBedrock: 300, + L1ChainID: big.NewInt(11155111), + L2ChainID: big.NewInt(11155421), + BatchInboxAddress: common.HexToAddress("0xff00000000000000000000000000000011155421"), + DepositContractAddress: common.HexToAddress("0x76114bd29dFcC7a9892240D317E6c7C2A281Ffc6"), + L1SystemConfigAddress: common.HexToAddress("0xa6b72407e2dc9EBF84b839B69A24C88929cf20F7"), + RegolithTime: u64Ptr(0), + CanyonTime: u64Ptr(0), + DeltaTime: u64Ptr(0), + EcotoneTime: u64Ptr(1706634000), + FjordTime: u64Ptr(1715961600), + GraniteTime: u64Ptr(1723046400), + HoloceneTime: u64Ptr(1731682800), ProtocolVersionsAddress: common.HexToAddress("0x252CbE9517F731C618961D890D534183822dcC8d"), } diff --git a/op-node/rollup/superchain.go b/op-node/rollup/superchain.go index 9ce31306e692..844a79745335 100644 --- a/op-node/rollup/superchain.go +++ b/op-node/rollup/superchain.go @@ -108,6 +108,7 @@ func LoadOPStackRollupConfig(chainID uint64) (*Config, error) { EcotoneTime: chConfig.EcotoneTime, FjordTime: chConfig.FjordTime, GraniteTime: chConfig.GraniteTime, + HoloceneTime: chConfig.HoloceneTime, BatchInboxAddress: common.Address(chConfig.BatchInboxAddr), DepositContractAddress: common.Address(addrs.OptimismPortalProxy), L1SystemConfigAddress: common.Address(addrs.SystemConfigProxy), From 4225dda4b4aad223dca4c4cc735cb2c7c41b1867 Mon Sep 17 00:00:00 2001 From: cby3149 Date: Thu, 21 Nov 2024 11:23:54 -0800 Subject: [PATCH 2/2] Add boba devnet hardfork --- go.mod | 2 +- go.sum | 4 ++-- op-node/chaincfg/chains_test.go | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 889cc8b19c9f..f6a5fa2aaeba 100644 --- a/go.mod +++ b/go.mod @@ -266,7 +266,7 @@ replace github.com/ethereum/go-ethereum v1.14.11 => github.com/ethereum-optimism //replace github.com/ethereum/go-ethereum => ../go-ethereum -replace github.com/ethereum-optimism/superchain-registry/superchain => github.com/bobanetwork/superchain-registry/superchain v0.0.0-20241120184037-a6acc10cc403 +replace github.com/ethereum-optimism/superchain-registry/superchain => github.com/bobanetwork/superchain-registry/superchain v0.0.0-20241121182544-13bbb7af7f91 // This release keeps breaking Go builds. Stop that. exclude ( diff --git a/go.sum b/go.sum index 253a5644780d..d4aaf1df3292 100644 --- a/go.sum +++ b/go.sum @@ -101,8 +101,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE= github.com/bits-and-blooms/bitset v1.13.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= -github.com/bobanetwork/superchain-registry/superchain v0.0.0-20241120184037-a6acc10cc403 h1:oON1sae55IY7vLFKMhwp/Pcq4oRkdD/nltoPhsDb3eo= -github.com/bobanetwork/superchain-registry/superchain v0.0.0-20241120184037-a6acc10cc403/go.mod h1:9feO8jcL5OZ1tvRjEfNAHz4Aggvd6373l+ZxmZZAyZs= +github.com/bobanetwork/superchain-registry/superchain v0.0.0-20241121182544-13bbb7af7f91 h1:QUNryKnl1WzPPOumH9c0P5nmsvr/j+LtUx95p5h0uyU= +github.com/bobanetwork/superchain-registry/superchain v0.0.0-20241121182544-13bbb7af7f91/go.mod h1:9feO8jcL5OZ1tvRjEfNAHz4Aggvd6373l+ZxmZZAyZs= github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= diff --git a/op-node/chaincfg/chains_test.go b/op-node/chaincfg/chains_test.go index 7ee30fbf0723..8ad1adf39559 100644 --- a/op-node/chaincfg/chains_test.go +++ b/op-node/chaincfg/chains_test.go @@ -290,6 +290,7 @@ var bobaDev0Cfg = rollup.Config{ EcotoneTime: u64Ptr(1724692141), FjordTime: u64Ptr(1724692150), GraniteTime: u64Ptr(1724914800), + HoloceneTime: u64Ptr(1732435200), ProtocolVersionsAddress: common.HexToAddress("0x252CbE9517F731C618961D890D534183822dcC8d"), }