Merge pull request #1596 from obscuren/submit-hashrate

miner, rpc: added submit hashrate for remote agents

1 files changed, 9 insertions, 2 deletions

diff --git a/miner/miner.go b/miner/miner.go
index bf6a48802..508778579 100644
--- a/miner/miner.go
+++ b/miner/miner.go
@@ -139,8 +139,15 @@ func (self *Miner) Mining() bool {
 	return atomic.LoadInt32(&self.mining) > 0
 }
 
-func (self *Miner) HashRate() int64 {
-	return self.pow.GetHashrate()
+func (self *Miner) HashRate() (tot int64) {
+	tot += self.pow.GetHashrate()
+	// do we care this might race? is it worth we're rewriting some
+	// aspects of the worker/locking up agents so we can get an accurate
+	// hashrate?
+	for _, agent := range self.worker.agents {
+		tot += agent.GetHashRate()
+	}
+	return
 }
 
 func (self *Miner) SetExtra(extra []byte) {