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

clients: add 'glacier' forks in mapper #941

Merged
merged 6 commits into from
Nov 8, 2023
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
cmd/hivechain: put back difficulty-only forks
This reverts commit f01b2d3.
fjl committed Nov 8, 2023
commit 280e51051de1188d0e5c84b94ce06c6dc79e0e0f
8 changes: 6 additions & 2 deletions cmd/hivechain/genesis.go
Original file line number Diff line number Diff line change
@@ -41,8 +41,8 @@ var (
"muirglacier",
"berlin",
"london",
// "arrowglacier", "grayglacier" forks were difficulty bomb changes. They are not
// available here because hive doesn't support configuring them on clients.
"arrowglacier",
"grayglacier",
"merge",
}

@@ -98,6 +98,10 @@ func (cfg *generatorConfig) createChainConfig() *params.ChainConfig {
chaincfg.BerlinBlock = new(big.Int).SetUint64(b)
case "london":
chaincfg.LondonBlock = new(big.Int).SetUint64(b)
case "arrowglacier":
chaincfg.ArrowGlacierBlock = new(big.Int).SetUint64(b)
case "grayglacier":
chaincfg.GrayGlacierBlock = new(big.Int).SetUint64(b)
case "merge":
chaincfg.MergeNetsplitBlock = new(big.Int).SetUint64(b)
chaincfg.TerminalTotalDifficultyPassed = true
2 changes: 2 additions & 0 deletions cmd/hivechain/output_forkenv.go
Original file line number Diff line number Diff line change
@@ -38,6 +38,8 @@ func (g *generator) writeForkEnv() error {
setNum("HIVE_FORK_PETERSBURG", cfg.PetersburgBlock)
setNum("HIVE_FORK_ISTANBUL", cfg.IstanbulBlock)
setNum("HIVE_FORK_MUIR_GLACIER", cfg.MuirGlacierBlock)
setNum("HIVE_FORK_ARROW_GLACIER", cfg.ArrowGlacierBlock)
setNum("HIVE_FORK_GRAY_GLACIER", cfg.GrayGlacierBlock)
setNum("HIVE_FORK_BERLIN", cfg.BerlinBlock)
setNum("HIVE_FORK_LONDON", cfg.LondonBlock)
setNum("HIVE_MERGE_BLOCK_ID", cfg.MergeNetsplitBlock)