Merge branch 'develop' of https://github.com/kobigurk/go-ethereum into kobigurk-develop

2015-04-28 11:10:44 +02:00
parent 182d484aa7 9e03c48d43
commit 46f63ef04f
3 changed files with 7 additions and 0 deletions
--- a/rpc/api.go
+++ b/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 "ext_hashrate":
+		*reply = newHexNum(api.xeth().HashRate())

 	// case "eth_register":
 	// 	// Placeholder for actual type