Skip to content

Commit f01b2d3

Browse files
committed
cmd/hivechain: disable difficulty-bomb-only forks
1 parent b57cae8 commit f01b2d3

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

cmd/hivechain/genesis.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ var (
4141
"muirglacier",
4242
"berlin",
4343
"london",
44-
"arrowglacier",
45-
"grayglacier",
44+
// "arrowglacier", "grayglacier" forks were difficulty bomb changes. They are not
45+
// available here because hive doesn't support configuring them on clients.
4646
"merge",
4747
}
4848

@@ -98,10 +98,6 @@ func (cfg *generatorConfig) createChainConfig() *params.ChainConfig {
9898
chaincfg.BerlinBlock = new(big.Int).SetUint64(b)
9999
case "london":
100100
chaincfg.LondonBlock = new(big.Int).SetUint64(b)
101-
case "arrowglacier":
102-
chaincfg.ArrowGlacierBlock = new(big.Int).SetUint64(b)
103-
case "grayglacier":
104-
chaincfg.GrayGlacierBlock = new(big.Int).SetUint64(b)
105101
case "merge":
106102
chaincfg.MergeNetsplitBlock = new(big.Int).SetUint64(b)
107103
chaincfg.TerminalTotalDifficultyPassed = true

cmd/hivechain/output_forkenv.go

-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ func (g *generator) writeForkEnv() error {
4040
setNum("HIVE_FORK_PETERSBURG", cfg.PetersburgBlock)
4141
setNum("HIVE_FORK_ISTANBUL", cfg.IstanbulBlock)
4242
setNum("HIVE_FORK_MUIR_GLACIER", cfg.MuirGlacierBlock)
43-
setNum("HIVE_FORK_ARROW_GLACIER", cfg.ArrowGlacierBlock)
44-
setNum("HIVE_FORK_GRAY_GLACIER", cfg.GrayGlacierBlock)
4543
setNum("HIVE_FORK_BERLIN", cfg.BerlinBlock)
4644
setNum("HIVE_FORK_LONDON", cfg.LondonBlock)
4745
setNum("HIVE_MERGE_BLOCK_ID", cfg.MergeNetsplitBlock)

0 commit comments

Comments
 (0)