Merge branch 'kobigurk-develop' into develop

rpc/api.go

@@ -465,6 +465,8 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
 			return err
 		}
 		*reply = api.xeth().Whisper().Messages(args.Id)
+	case "eth_hashrate":
+		*reply = newHexNum(api.xeth().HashRate())
 
 	// case "eth_register":
 	// 	// Placeholder for actual type

xeth/xeth.go

@@ -280,6 +280,10 @@ func (self *XEth) IsMining() bool {
 	return self.backend.IsMining()
 }
 
+func (self *XEth) HashRate() int64 {
+	return self.backend.Miner().HashRate()
+}
+
 func (self *XEth) EthVersion() string {
 	return fmt.Sprintf("%d", self.backend.EthVersion())
 }