diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2019-02-06 22:11:41 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-06 22:11:41 +0800 |
| commit | c57166caa371d5b67db39f6f6851856023f8423c (patch) | |
| tree | 74a4faeba36bb9b61d2ce5bd188faeec148c5f16 | |
| parent | 3eff652a7b606f25d43bef6ccb998b8e306f8a75 (diff) | |
| parent | 9747df295e7356964d96b45fa9e0d3f93cc27788 (diff) | |
| download | go-tangerine-c57166caa371d5b67db39f6f6851856023f8423c.tar go-tangerine-c57166caa371d5b67db39f6f6851856023f8423c.tar.gz go-tangerine-c57166caa371d5b67db39f6f6851856023f8423c.tar.bz2 go-tangerine-c57166caa371d5b67db39f6f6851856023f8423c.tar.lz go-tangerine-c57166caa371d5b67db39f6f6851856023f8423c.tar.xz go-tangerine-c57166caa371d5b67db39f6f6851856023f8423c.tar.zst go-tangerine-c57166caa371d5b67db39f6f6851856023f8423c.zip | |
Merge pull request #19005 from karalabe/puppeth-fix-petersburg
cmd/puppeth: handle pre-set Petersburg number, save changed fork rules
| -rw-r--r-- | cmd/puppeth/wizard_genesis.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cmd/puppeth/wizard_genesis.go b/cmd/puppeth/wizard_genesis.go index 8abfe7c41..6aed09f14 100644 --- a/cmd/puppeth/wizard_genesis.go +++ b/cmd/puppeth/wizard_genesis.go @@ -222,14 +222,18 @@ func (w *wizard) manageGenesis() { fmt.Println() fmt.Printf("Which block should Constantinople come into effect? (default = %v)\n", w.conf.Genesis.Config.ConstantinopleBlock) w.conf.Genesis.Config.ConstantinopleBlock = w.readDefaultBigInt(w.conf.Genesis.Config.ConstantinopleBlock) - + if w.conf.Genesis.Config.PetersburgBlock == nil { + w.conf.Genesis.Config.PetersburgBlock = w.conf.Genesis.Config.ConstantinopleBlock + } fmt.Println() - fmt.Printf("Which block should Constantinople-Fix (remove EIP-1283) come into effect? (default = %v)\n", w.conf.Genesis.Config.ConstantinopleBlock) - w.conf.Genesis.Config.PetersburgBlock = w.readDefaultBigInt(w.conf.Genesis.Config.ConstantinopleBlock) + fmt.Printf("Which block should Constantinople-Fix (remove EIP-1283) come into effect? (default = %v)\n", w.conf.Genesis.Config.PetersburgBlock) + w.conf.Genesis.Config.PetersburgBlock = w.readDefaultBigInt(w.conf.Genesis.Config.PetersburgBlock) out, _ := json.MarshalIndent(w.conf.Genesis.Config, "", " ") fmt.Printf("Chain configuration updated:\n\n%s\n", out) + w.conf.flush() + case "2": // Save whatever genesis configuration we currently have fmt.Println() |