diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-03-27 19:12:05 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-03-27 19:12:05 +0800 |
| commit | 0b4b2b81f93d1b7762a9fda6a464bdee67d286de (patch) | |
| tree | 4cbf812f513daa35c72c7487e4b912d2ffe31324 /cmd | |
| parent | 54a14d5c9d7d1e5039753eac991cd057a5514fe8 (diff) | |
| parent | b375bbee5fa0b04867cdecdc28e66078a2e32280 (diff) | |
| download | go-tangerine-0b4b2b81f93d1b7762a9fda6a464bdee67d286de.tar go-tangerine-0b4b2b81f93d1b7762a9fda6a464bdee67d286de.tar.gz go-tangerine-0b4b2b81f93d1b7762a9fda6a464bdee67d286de.tar.bz2 go-tangerine-0b4b2b81f93d1b7762a9fda6a464bdee67d286de.tar.lz go-tangerine-0b4b2b81f93d1b7762a9fda6a464bdee67d286de.tar.xz go-tangerine-0b4b2b81f93d1b7762a9fda6a464bdee67d286de.tar.zst go-tangerine-0b4b2b81f93d1b7762a9fda6a464bdee67d286de.zip | |
Merge pull request #580 from ethersphere/frontier/cli-key
settable etherbase
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/geth/main.go | 8 | ||||
| -rw-r--r-- | cmd/utils/flags.go | 8 |
2 files changed, 11 insertions, 5 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) } } } diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index ea11cb158..12d4df923 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -96,10 +96,15 @@ var ( Name: "mine", Usage: "Enable mining", } + EtherbaseFlag = cli.StringFlag{ + Name: "Etherbase", + Usage: "public address for block mining rewards. By default the address of your primary account is used", + Value: "primary", + } UnlockedAccountFlag = cli.StringFlag{ Name: "unlock", - Usage: "unlock the account given until this program exits (prompts for password). '--unlock coinbase' unlocks the primary (coinbase) account", + Usage: "unlock the account given until this program exits (prompts for password). '--unlock primary' unlocks the primary account", Value: "", } PasswordFileFlag = cli.StringFlag{ @@ -215,6 +220,7 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config { LogFile: ctx.GlobalString(LogFileFlag.Name), LogLevel: ctx.GlobalInt(LogLevelFlag.Name), LogJSON: ctx.GlobalString(LogJSONFlag.Name), + Etherbase: ctx.GlobalString(EtherbaseFlag.Name), MinerThreads: ctx.GlobalInt(MinerThreadsFlag.Name), AccountManager: GetAccountManager(ctx), VmDebug: ctx.GlobalBool(VMDebugFlag.Name), |