From 37c1a8f69de44827a60296342189b6719a49dbc3 Mon Sep 17 00:00:00 2001
From: Jeffrey Wilcke <geffobscura@gmail.com>
Date: Tue, 7 Jul 2015 10:58:47 +0200
Subject: [PATCH] eth,miner,rpc: set coinbase

---
 eth/backend.go   | 1 +
 miner/miner.go   | 5 +++++
 miner/worker.go  | 6 ++++++
 rpc/api/miner.go | 2 +-
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/eth/backend.go b/eth/backend.go
index 2c6f5b80ca..e5466bbc27 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -472,6 +472,7 @@ func (s *Ethereum) Etherbase() (eb common.Address, err error) {
 // set in js console via admin interface or wrapper from cli flags
 func (self *Ethereum) SetEtherbase(etherbase common.Address) {
 	self.etherbase = etherbase
+	self.miner.SetEtherbase(etherbase)
 }
 
 func (s *Ethereum) StopMining()         { s.miner.Stop() }
diff --git a/miner/miner.go b/miner/miner.go
index 7f73f3ee87..83f7c45030 100644
--- a/miner/miner.go
+++ b/miner/miner.go
@@ -137,3 +137,8 @@ func (self *Miner) PendingState() *state.StateDB {
 func (self *Miner) PendingBlock() *types.Block {
 	return self.worker.pendingBlock()
 }
+
+func (self *Miner) SetEtherbase(addr common.Address) {
+	self.coinbase = addr
+	self.worker.setEtherbase(addr)
+}
diff --git a/miner/worker.go b/miner/worker.go
index 840609721a..7be41118c7 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -124,6 +124,12 @@ func newWorker(coinbase common.Address, eth core.Backend) *worker {
 	return worker
 }
 
+func (self *worker) setEtherbase(addr common.Address) {
+	self.mu.Lock()
+	defer self.mu.Unlock()
+	self.coinbase = addr
+}
+
 func (self *worker) pendingState() *state.StateDB {
 	self.currentMu.Lock()
 	defer self.currentMu.Unlock()
diff --git a/rpc/api/miner.go b/rpc/api/miner.go
index 4e237751a0..8d4646a5c3 100644
--- a/rpc/api/miner.go
+++ b/rpc/api/miner.go
@@ -19,7 +19,7 @@ var (
 		"miner_makeDAG":      (*minerApi).MakeDAG,
 		"miner_setExtra":     (*minerApi).SetExtra,
 		"miner_setGasPrice":  (*minerApi).SetGasPrice,
-		"admin_setEtherbase": (*minerApi).SetEtherbase,
+		"miner_setEtherbase": (*minerApi).SetEtherbase,
 		"miner_startAutoDAG": (*minerApi).StartAutoDAG,
 		"miner_start":        (*minerApi).StartMiner,
 		"miner_stopAutoDAG":  (*minerApi).StopAutoDAG,