From b375bbee5fa0b04867cdecdc28e66078a2e32280 Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Thu, 26 Mar 2015 21:49:22 +0000
Subject: 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

---
 cmd/geth/main.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'cmd/geth/main.go')

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)
 		}
 	}
 }
-- 
cgit