From 7abf968d6fbc5955fedac6f3aba27afdca02176f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Thu, 26 Oct 2017 12:22:06 +0300
Subject: [PATCH] cmd/puppeth: skip genesis custom extra-data
---
cmd/puppeth/wizard_genesis.go | 11 -----------
cmd/puppeth/wizard_intro.go | 2 +-
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/cmd/puppeth/wizard_genesis.go b/cmd/puppeth/wizard_genesis.go
index a9817d1ed..e98b9a81d 100644
--- a/cmd/puppeth/wizard_genesis.go
+++ b/cmd/puppeth/wizard_genesis.go
@@ -118,22 +118,11 @@ func (w *wizard) makeGenesis() {
for i := int64(0); i < 256; i++ {
genesis.Alloc[common.BigToAddress(big.NewInt(i))] = core.GenesisAccount{Balance: big.NewInt(1)}
}
- fmt.Println()
-
// Query the user for some custom extras
fmt.Println()
fmt.Println("Specify your chain/network ID if you want an explicit one (default = random)")
genesis.Config.ChainId = new(big.Int).SetUint64(uint64(w.readDefaultInt(rand.Intn(65536))))
- fmt.Println()
- fmt.Println("Anything fun to embed into the genesis block? (max 32 bytes)")
-
- extra := w.read()
- if len(extra) > 32 {
- extra = extra[:32]
- }
- genesis.ExtraData = append([]byte(extra), genesis.ExtraData[len(extra):]...)
-
// All done, store the genesis and flush to disk
w.conf.genesis = genesis
}
diff --git a/cmd/puppeth/wizard_intro.go b/cmd/puppeth/wizard_intro.go
index 005ee47a5..10d8db75d 100644
--- a/cmd/puppeth/wizard_intro.go
+++ b/cmd/puppeth/wizard_intro.go
@@ -64,7 +64,7 @@ func (w *wizard) run() {
for {
w.network = w.readString()
if !strings.Contains(w.network, " ") {
- fmt.Printf("Sweet, you can set this via --network=%s next time!\n\n", w.network)
+ fmt.Printf("\nSweet, you can set this via --network=%s next time!\n\n", w.network)
break
}
log.Error("I also like to live dangerously, still no spaces")
--
GitLab