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.

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

feat: enable mainnet Canyon upgrade #257

Merged
merged 1 commit into from
Feb 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,4 @@ require (

replace github.com/ethereum-optimism/optimism v1.2.0 => ./

replace github.com/ethereum/go-ethereum v1.13.1 => github.com/kroma-network/go-ethereum v0.4.2
replace github.com/ethereum/go-ethereum v1.13.1 => github.com/kroma-network/go-ethereum v0.4.3
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,8 @@ github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kroma-network/go-ethereum v0.4.2 h1:LqH/SHNv2VDbcnkzngnUF4ETbk28y6Vp8YG45ihqxjM=
github.com/kroma-network/go-ethereum v0.4.2/go.mod h1:SsK2EAbCigQsKUmhnHSe9KXrUEg2RKJcKFT2+/f2Q+M=
github.com/kroma-network/go-ethereum v0.4.3 h1:/6m/4XK9kc/OcCegx1FrvNfkcb62b+UGPYdUFnEfhr0=
github.com/kroma-network/go-ethereum v0.4.3/go.mod h1:SsK2EAbCigQsKUmhnHSe9KXrUEg2RKJcKFT2+/f2Q+M=
github.com/kroma-network/zktrie v0.5.1-0.20230420142222-950ce7a8ce84 h1:VpLCQx+tFV6Nk0hbs3Noyxma/q9wIDdyacKpGQWUMI8=
github.com/kroma-network/zktrie v0.5.1-0.20230420142222-950ce7a8ce84/go.mod h1:w54LrYo5rJEV503BgMPRNONsLTOEQv5V87q+uYaw9sM=
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
Expand Down
2 changes: 1 addition & 1 deletion op-node/chaincfg/chains.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ var Mainnet = &rollup.Config{
DepositContractAddress: common.HexToAddress("0x31f648572b67e60ec6eb8e197e1848cc5f5558de"),
L1SystemConfigAddress: common.HexToAddress("0x3971eb866aa9b2b8afea8a7c816f3b7e8b195a35"),
RegolithTime: u64Ptr(0),
CanyonTime: nil,
CanyonTime: u64Ptr(1708502400),
}

var Sepolia = &rollup.Config{
Expand Down
2 changes: 1 addition & 1 deletion op-node/chaincfg/chains_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ var mainnetCfg = rollup.Config{
DepositContractAddress: common.HexToAddress("0x31f648572b67e60ec6eb8e197e1848cc5f5558de"),
L1SystemConfigAddress: common.HexToAddress("0x3971eb866aa9b2b8afea8a7c816f3b7e8b195a35"),
RegolithTime: u64Ptr(0),
CanyonTime: nil,
CanyonTime: u64Ptr(1708502400),
}

var sepoliaCfg = rollup.Config{
Expand Down
Loading