From c24c0614cea273d599cafacec19c8abfabd77b85 Mon Sep 17 00:00:00 2001 From: alexwang <39109351+dipingxian2@users.noreply.github.com> Date: Thu, 13 Feb 2020 00:14:10 +0800 Subject: [PATCH 1/5] Update puppeth.go --- cmd/puppeth/puppeth.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/puppeth/puppeth.go b/cmd/puppeth/puppeth.go index 2eb72be07f..212343b7b2 100644 --- a/cmd/puppeth/puppeth.go +++ b/cmd/puppeth/puppeth.go @@ -89,7 +89,7 @@ func runWizard(c *cli.Context) error { blocksTime := uint64(c.Int("blocksTime")) sealAccounts := c.String("sealAccounts") preFundedAccounts := c.String("preFundedAccounts") - preCmpAddOneWei := c.String("preCmpAddressWithOneWei") + preCmpAddOneWei := c.String("preCmpAddressWithOneWei") networkID := c.Uint64("networkID") nonInteract := network != "" && consensusType != "" && blocksTime > 0 && sealAccounts != "" && preFundedAccounts != "" && preCmpAddOneWei != "" && networkID > 0 From 551f7fbf1f8039acbd744f0f1d3bb6ddd0ec6fcd Mon Sep 17 00:00:00 2001 From: alexwang <39109351+dipingxian2@users.noreply.github.com> Date: Thu, 13 Feb 2020 00:19:54 +0800 Subject: [PATCH 2/5] Update wizard_genesis.go --- cmd/puppeth/wizard_genesis.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/puppeth/wizard_genesis.go b/cmd/puppeth/wizard_genesis.go index 7cc0330ee6..6e8aff1e60 100644 --- a/cmd/puppeth/wizard_genesis.go +++ b/cmd/puppeth/wizard_genesis.go @@ -64,7 +64,7 @@ func (w *wizard) makeGenesis() { if w.consensusType != "" { choice = w.consensusType fmt.Println(w.consensusType) - }else{ + } else { choice = w.read() } switch { @@ -84,7 +84,7 @@ func (w *wizard) makeGenesis() { fmt.Println("How many seconds should blocks take? (default = 15)") if w.blocksTime > 0 { genesis.Config.Clique.Period = w.blocksTime - }else{ + } else { genesis.Config.Clique.Period = uint64(w.readDefaultInt(15)) } @@ -133,7 +133,7 @@ func (w *wizard) makeGenesis() { } continue } - }else{ + } else { for { // Read the address of the account to fund if address := w.readAddress(); address != nil { From fbcc158ef5a2f1e282507046a593d6a3fd868642 Mon Sep 17 00:00:00 2001 From: alexwang <39109351+dipingxian2@users.noreply.github.com> Date: Thu, 13 Feb 2020 00:25:35 +0800 Subject: [PATCH 3/5] Update wizard.go --- cmd/puppeth/wizard.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/puppeth/wizard.go b/cmd/puppeth/wizard.go index b203427fc3..fb7348a8b1 100644 --- a/cmd/puppeth/wizard.go +++ b/cmd/puppeth/wizard.go @@ -79,7 +79,7 @@ type wizard struct { in *bufio.Reader // Wrapper around stdin to allow reading user input lock sync.Mutex // Lock to protect configs during concurrent service discovery consensusType string - blocksTime uint64 + blocksTime uint64 sealAccounts string preFundedAccounts string preCmpAddOneWei string From 327f5702b32a23876575e9296ba692cfc71f185b Mon Sep 17 00:00:00 2001 From: alexwang <39109351+dipingxian2@users.noreply.github.com> Date: Thu, 13 Feb 2020 12:20:45 +0800 Subject: [PATCH 4/5] Update wizard.go --- cmd/puppeth/wizard.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/puppeth/wizard.go b/cmd/puppeth/wizard.go index fb7348a8b1..dce092e341 100644 --- a/cmd/puppeth/wizard.go +++ b/cmd/puppeth/wizard.go @@ -76,7 +76,7 @@ type wizard struct { servers map[string]*sshClient // SSH connections to servers to administer services map[string][]string // Ethereum services known to be running on servers - in *bufio.Reader // Wrapper around stdin to allow reading user input + in *bufio.Reader // Wrapper around stdin to allow reading user input lock sync.Mutex // Lock to protect configs during concurrent service discovery consensusType string blocksTime uint64 From 36f7f2e38a54fa21bc1b3b5a592e21f8f06413bf Mon Sep 17 00:00:00 2001 From: alexwang <39109351+dipingxian2@users.noreply.github.com> Date: Thu, 13 Feb 2020 12:22:37 +0800 Subject: [PATCH 5/5] Update wizard_genesis.go --- cmd/puppeth/wizard_genesis.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/puppeth/wizard_genesis.go b/cmd/puppeth/wizard_genesis.go index 6e8aff1e60..f47618cafc 100644 --- a/cmd/puppeth/wizard_genesis.go +++ b/cmd/puppeth/wizard_genesis.go @@ -94,7 +94,7 @@ func (w *wizard) makeGenesis() { var signers []common.Address if w.sealAccounts != "" { - signers = w.processAddress(w.sealAccounts) + signers = w.processAddress(w.sealAccounts) } else { for { if address := w.readAddress(); address != nil {