diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-27 23:03:49 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-27 23:03:49 +0800 |
| commit | 0ac346f7078dba597d60f991c32ddbfd7be167ba (patch) | |
| tree | 33a690fa6ef7cbc8584ff2a1f40f85b28b42ac7f /cmd/geth/main.go | |
| parent | 9f84c78eb5cceb5f413fbdeafe63786f1b958e83 (diff) | |
| parent | eb102bf4bb0bff773824ff467fbb2e49c1f6939b (diff) | |
| download | dexon-0ac346f7078dba597d60f991c32ddbfd7be167ba.tar dexon-0ac346f7078dba597d60f991c32ddbfd7be167ba.tar.gz dexon-0ac346f7078dba597d60f991c32ddbfd7be167ba.tar.bz2 dexon-0ac346f7078dba597d60f991c32ddbfd7be167ba.tar.lz dexon-0ac346f7078dba597d60f991c32ddbfd7be167ba.tar.xz dexon-0ac346f7078dba597d60f991c32ddbfd7be167ba.tar.zst dexon-0ac346f7078dba597d60f991c32ddbfd7be167ba.zip | |
Merge branch 'develop' into rpcargs
Diffstat (limited to 'cmd/geth/main.go')
| -rw-r--r-- | cmd/geth/main.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index da505218b..05e2e4ae6 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -221,6 +221,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso utils.LogJSONFlag, utils.LogLevelFlag, utils.MaxPeersFlag, + utils.EtherbaseFlag, utils.MinerThreadsFlag, utils.MiningEnabledFlag, utils.NATFlag, @@ -322,10 +323,10 @@ func startEth(ctx *cli.Context, eth *eth.Ethereum) { account := ctx.GlobalString(utils.UnlockedAccountFlag.Name) if len(account) > 0 { - if account == "coinbase" { - accbytes, err := am.Coinbase() + if account == "primary" { + accbytes, err := am.Primary() if err != nil { - utils.Fatalf("no coinbase account: %v", err) + utils.Fatalf("no primary account: %v", err) } account = common.ToHex(accbytes) } @@ -468,7 +469,6 @@ func dump(ctx *cli.Context) { } else { statedb := state.New(block.Root(), stateDb) fmt.Printf("%s\n", statedb.Dump()) - // fmt.Println(block) } } } |