diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-12-01 19:21:25 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-12-01 19:21:25 +0800 |
| commit | 23031b1554a05817ac23f2ef0d4780e16f065663 (patch) | |
| tree | 9e0d6402eb5274c9e54a5d02aeadeecf8230b012 /cmd/geth | |
| parent | f801ec78cef4e3338c4e4ad19253ede2a0dd0dcb (diff) | |
| parent | d648e96b3d2c52074b6085ceb26e5f2755257791 (diff) | |
| download | go-tangerine-23031b1554a05817ac23f2ef0d4780e16f065663.tar go-tangerine-23031b1554a05817ac23f2ef0d4780e16f065663.tar.gz go-tangerine-23031b1554a05817ac23f2ef0d4780e16f065663.tar.bz2 go-tangerine-23031b1554a05817ac23f2ef0d4780e16f065663.tar.lz go-tangerine-23031b1554a05817ac23f2ef0d4780e16f065663.tar.xz go-tangerine-23031b1554a05817ac23f2ef0d4780e16f065663.tar.zst go-tangerine-23031b1554a05817ac23f2ef0d4780e16f065663.zip | |
Merge pull request #2021 from fjl/fix-etherbase-no-accounts
cmd/utils: restore starting geth without any accounts and etherbase
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/main.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 3a5471845..6ec30cebc 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -464,9 +464,12 @@ func execScripts(ctx *cli.Context) { node.Stop() } +// tries unlocking the specified account a few times. func unlockAccount(ctx *cli.Context, accman *accounts.Manager, address string, i int, passwords []string) (common.Address, string) { - // Try to unlock the specified account a few times - account := utils.MakeAddress(accman, address) + account, err := utils.MakeAddress(accman, address) + if err != nil { + utils.Fatalf("Unlock error: %v", err) + } for trials := 0; trials < 3; trials++ { prompt := fmt.Sprintf("Unlocking account %s | Attempt %d/%d", address, trials+1, 3) |