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

Update superchain-registry to enable HoloceneTime hardfork #280

Merged
merged 2 commits into from
Nov 22, 2024
Merged

Update superchain-registry to enable HoloceneTime hardfork #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d674254
Update superchain-registry
boyuan-chen Nov 20, 2024
4225dda
Add boba devnet hardfork
boyuan-chen Nov 21, 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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-20241121182544-13bbb7af7f91

// This release keeps breaking Go builds. Stop that.
exclude (
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-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=
Expand Down
65 changes: 33 additions & 32 deletions op-node/chaincfg/chains_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
}

Expand All @@ -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"),
}

Expand Down Expand Up @@ -290,6 +290,7 @@ var bobaDev0Cfg = rollup.Config{
EcotoneTime: u64Ptr(1724692141),
FjordTime: u64Ptr(1724692150),
GraniteTime: u64Ptr(1724914800),
HoloceneTime: u64Ptr(1732435200),
ProtocolVersionsAddress: common.HexToAddress("0x252CbE9517F731C618961D890D534183822dcC8d"),
}

Expand Down
1 change: 1 addition & 0 deletions op-node/rollup/superchain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down