Skip to content

Commit

Permalink
Merge pull request ethereum#83 from dapperscene6/dapper/schedule-base…
Browse files Browse the repository at this point in the history
…-goerli-regolith

Schedule Regolith on Base Goerli at 1682614800
  • Loading branch information
ajsutton authored Apr 17, 2023
2 parents 1ab789f + 54b5903 commit 18dff23
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
4 changes: 4 additions & 0 deletions core/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,10 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, triedb *trie.Database, gen
if config.IsOptimism() && config.ChainID != nil && config.ChainID.Cmp(params.OptimismGoerliChainId) == 0 {
// Apply Optimism Goerli regolith time
config.RegolithTime = &params.OptimismGoerliRegolithTime
}
if config.IsOptimism() && config.ChainID != nil && config.ChainID.Cmp(params.BaseGoerliChainId) == 0 {
// Apply Base Goerli regolith time
config.RegolithTime = &params.BaseGoerliRegolithTime
}
if overrides != nil && overrides.OverrideShanghai != nil {
config.ShanghaiTime = overrides.OverrideShanghai
Expand Down
5 changes: 4 additions & 1 deletion params/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,14 @@ var (
GoerliGenesisHash = common.HexToHash("0xbf7e331f7f7c1dd2e05159666b3bf8bc7a8a3a9eb1d518969eab529dd9b88c1a")
)

// Optimism chain config
// OP Stack chain config
var (
OptimismGoerliChainId = big.NewInt(420)
// March 17, 2023 @ 7:00:00 pm UTC
OptimismGoerliRegolithTime = uint64(1679079600)
BaseGoerliChainId = big.NewInt(84531)
// April 27, 2023 @ 5:00:00 pm UTC
BaseGoerliRegolithTime = uint64(1682614800)
)

// TrustedCheckpoints associates each known checkpoint with the genesis hash of
Expand Down

0 comments on commit 18dff23

Please sign in to comment.