diff --git a/go-ethereum b/go-ethereum index 78b17f183..31e742a5d 160000 --- a/go-ethereum +++ b/go-ethereum @@ -1 +1 @@ -Subproject commit 78b17f183b84e4a5718376b47eb5c1165fcddf08 +Subproject commit 31e742a5deaabde52beb8518a345f1dff01424b2 diff --git a/ops/l2-genesis/deploy-config/devnet-deploy-config.json b/ops/l2-genesis/deploy-config/devnet-deploy-config.json index 0b3b411c8..46923a4b4 100644 --- a/ops/l2-genesis/deploy-config/devnet-deploy-config.json +++ b/ops/l2-genesis/deploy-config/devnet-deploy-config.json @@ -27,6 +27,7 @@ "morphTokenDailyInflationRate": 1, "morph203Time": 0, "viridianTime": 0, + "emeraldTime": 0, "l2StakingSequencerMaxSize": 4, "l2StakingUnDelegatedLockEpochs": 2, "l2StakingRewardStartTime": 1728000000, diff --git a/ops/l2-genesis/deploy-config/qanet-deploy-config.json b/ops/l2-genesis/deploy-config/qanet-deploy-config.json index 5c7adb096..530a442b7 100644 --- a/ops/l2-genesis/deploy-config/qanet-deploy-config.json +++ b/ops/l2-genesis/deploy-config/qanet-deploy-config.json @@ -25,6 +25,7 @@ "recordNextBatchSubmissionIndex": 1, "morph203Time": 0, "viridianTime": 0, + "emeraldTime": 0, "morphTokenName": "Morph Token", "morphTokenSymbol": "Morph", "morphTokenOwner": "0x716173f5BBE0b4B51AaDF5A5840fA9A79D01636E", diff --git a/ops/l2-genesis/morph-chain-ops/genesis/config.go b/ops/l2-genesis/morph-chain-ops/genesis/config.go index 17d371a86..b76a24d33 100644 --- a/ops/l2-genesis/morph-chain-ops/genesis/config.go +++ b/ops/l2-genesis/morph-chain-ops/genesis/config.go @@ -129,6 +129,7 @@ type DeployConfig struct { // Upgrade configs Morph203Time *uint64 `json:"morph203Time,omitempty"` ViridianTime *uint64 `json:"viridianTime,omitempty"` + EmeraldTime *uint64 `json:"viridianTime,omitempty"` } // GetDeployedAddresses will get the deployed addresses of deployed L1 contracts diff --git a/ops/l2-genesis/morph-chain-ops/genesis/genesis.go b/ops/l2-genesis/morph-chain-ops/genesis/genesis.go index 7dd10ae82..7aae9cd7d 100644 --- a/ops/l2-genesis/morph-chain-ops/genesis/genesis.go +++ b/ops/l2-genesis/morph-chain-ops/genesis/genesis.go @@ -45,6 +45,11 @@ func NewL2Genesis(config *DeployConfig, block *types.Block) (*core.Genesis, erro viridianTime = config.ViridianTime } + var emeraldTime *uint64 + if config.EmeraldTime != nil { + emeraldTime = config.EmeraldTime + } + morphChainConfig := params.ChainConfig{ ChainID: new(big.Int).SetUint64(config.L2ChainID), HomesteadBlock: big.NewInt(0), @@ -67,6 +72,7 @@ func NewL2Genesis(config *DeployConfig, block *types.Block) (*core.Genesis, erro CurieBlock: big.NewInt(0), Morph203Time: morph203Time, ViridianTime: viridianTime, + EmeraldTime: emeraldTime, TerminalTotalDifficulty: big.NewInt(0), Morph: params.MorphConfig{ UseZktrie: true,