diff options
author | zelig <viktor.tron@gmail.com> | 2015-03-27 05:49:22 +0800 |
---|---|---|
committer | zelig <viktor.tron@gmail.com> | 2015-03-27 05:52:22 +0800 |
commit | b375bbee5fa0b04867cdecdc28e66078a2e32280 (patch) | |
tree | 574aecb617218dc7fe9f7d1c0b0a8b32a195f3fa /cmd/geth/main.go | |
parent | b0b0939879b9fb8453ec1c8fa2ceb522e56df3bc (diff) | |
download | dexon-b375bbee5fa0b04867cdecdc28e66078a2e32280.tar.gz dexon-b375bbee5fa0b04867cdecdc28e66078a2e32280.tar.zst dexon-b375bbee5fa0b04867cdecdc28e66078a2e32280.zip |
settable etherbase
- etherbase flag for block reward destination
- coinbase => etherbase
- CLI- eth Config -> eth, xeth -> RPC / Miner
- use primary instead of coinbase as the unlock magic wildcard
- accounts: firstAddr/Coinbase -> Primary
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) } } } |