2 files changed, 87 insertions, 2 deletions
diff --git a/miner/miner.go b/miner/miner.go
index ccc19c754..d46fabc1e 100644
--- a/miner/miner.go
+++ b/miner/miner.go
@@ -26,7 +26,7 @@ type Miner struct {
 func New(eth core.Backend, pow pow.PoW, minerThreads int) *Miner {
 	// note: minerThreads is currently ignored because
 	// ethash is not thread safe.
-	return &Miner{eth: eth, pow: pow}
+	return &Miner{eth: eth, pow: pow, worker: newWorker(common.Address{}, eth)}
 }
 
 func (self *Miner) Mining() bool {
@@ -35,7 +35,7 @@ func (self *Miner) Mining() bool {
 
 func (self *Miner) Start(coinbase common.Address) {
 	self.mining = true
-	self.worker = newWorker(coinbase, self.eth)
+	self.worker.coinbase = coinbase
 	self.worker.register(NewCpuMiner(0, self.pow))
 
 	self.pow.(*ethash.Ethash).UpdateDAG()
@@ -44,6 +44,10 @@ func (self *Miner) Start(coinbase common.Address) {
 	self.worker.commitNewWork()
 }
 
+func (self *Miner) Register(agent Agent) {
+	self.worker.register(agent)
+}
+
 func (self *Miner) Stop() {
 	self.mining = false
 	self.worker.stop()
diff --git a/miner/remote_agent.go b/miner/remote_agent.go
new file mode 100644
index 000000000..8ea164f34
--- /dev/null
+++ b/miner/remote_agent.go
@@ -0,0 +1,81 @@
+package miner
+
+import (
+	"github.com/ethereum/ethash"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+)
+
+type RemoteAgent struct {
+	work        *types.Block
+	currentWork *types.Block
+
+	quit     chan struct{}
+	workCh   chan *types.Block
+	returnCh chan<- Work
+}
+
+func NewRemoteAgent() *RemoteAgent {
+	agent := &RemoteAgent{}
+	go agent.run()
+
+	return agent
+}
+
+func (a *RemoteAgent) Work() chan<- *types.Block {
+	return a.workCh
+}
+
+func (a *RemoteAgent) SetWorkCh(returnCh chan<- Work) {
+	a.returnCh = returnCh
+}
+
+func (a *RemoteAgent) Start() {
+	a.quit = make(chan struct{})
+	a.workCh = make(chan *types.Block, 1)
+}
+
+func (a *RemoteAgent) Stop() {
+	close(a.quit)
+	close(a.workCh)
+}
+
+func (a *RemoteAgent) GetHashRate() int64 { return 0 }
+
+func (a *RemoteAgent) run() {
+out:
+	for {
+		select {
+		case <-a.quit:
+			break out
+		case work := <-a.workCh:
+			a.work = work
+		}
+	}
+}
+
+func (a *RemoteAgent) GetWork() [3]string {
+	var res [3]string
+
+	// XXX Wait here until work != nil ?
+	if a.work != nil {
+		res[0] = a.work.HashNoNonce().Hex()
+		seedHash, _ := ethash.GetSeedHash(a.currentWork.NumberU64())
+		res[1] = common.Bytes2Hex(seedHash)
+		res[2] = common.Bytes2Hex(a.work.Difficulty().Bytes())
+	}
+
+	return res
+}
+
+func (a *RemoteAgent) SubmitWork(nonce uint64, mixDigest, seedHash common.Hash) bool {
+	// Return true or false, but does not indicate if the PoW was correct
+
+	// Make sure the external miner was working on the right hash
+	if a.currentWork != nil && a.work != nil && a.currentWork.Hash() == a.work.Hash() {
+		a.returnCh <- Work{a.currentWork.Number().Uint64(), nonce, mixDigest.Bytes(), seedHash.Bytes()}
+		return true
+	}
+
+	return false
+}