Skip to content

Add emeraldTime #805

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

Merged
curryxbo merged 2 commits into from
Nov 7, 2025
Merged

Add emeraldTime #805

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
72c0d7c
add emeraldTime
curryxbo Nov 7, 2025
b8048ed
Merge remote-tracking branch 'origin/erc20_price' into addEmeraldTime
curryxbo Nov 7, 2025
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-ethereum
Open in desktop
Submodule go-ethereum updated 1083 files
1 change: 1 addition & 0 deletions ops/l2-genesis/deploy-config/devnet-deploy-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"morphTokenDailyInflationRate": 1,
"morph203Time": 0,
"viridianTime": 0,
"emeraldTime": 0,
"l2StakingSequencerMaxSize": 4,
"l2StakingUnDelegatedLockEpochs": 2,
"l2StakingRewardStartTime": 1728000000,
Expand Down
1 change: 1 addition & 0 deletions ops/l2-genesis/deploy-config/qanet-deploy-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"recordNextBatchSubmissionIndex": 1,
"morph203Time": 0,
"viridianTime": 0,
"emeraldTime": 0,
"morphTokenName": "Morph Token",
"morphTokenSymbol": "Morph",
"morphTokenOwner": "0x716173f5BBE0b4B51AaDF5A5840fA9A79D01636E",
Expand Down
1 change: 1 addition & 0 deletions ops/l2-genesis/morph-chain-ops/genesis/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions ops/l2-genesis/morph-chain-ops/genesis/genesis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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,
Expand Down
Loading