diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-28 17:16:22 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-28 17:16:22 +0800 |
| commit | bac455c0117f7095ee9c60ac75a249ddd66c2660 (patch) | |
| tree | 89a6632020c96d1908bbd57ee0df1fb99b2eeee2 | |
| parent | 182d484aa70bcd5b22117f02333b1fd3b1535dcb (diff) | |
| parent | 459d8987050e85fcae23d169453fc4d7f185eefc (diff) | |
| download | go-tangerine-bac455c0117f7095ee9c60ac75a249ddd66c2660.tar.gz go-tangerine-bac455c0117f7095ee9c60ac75a249ddd66c2660.tar.zst go-tangerine-bac455c0117f7095ee9c60ac75a249ddd66c2660.zip | |
Merge branch 'kobigurk-develop' into develop
| -rw-r--r-- | rpc/api.go | 2 | ||||
| -rw-r--r-- | xeth/xeth.go | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/rpc/api.go b/rpc/api.go index 5930a4c7b..6f7a81474 100644 --- 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 "eth_hashrate": + *reply = newHexNum(api.xeth().HashRate()) // case "eth_register": // // Placeholder for actual type diff --git a/xeth/xeth.go b/xeth/xeth.go index 693acb910..710fec5c5 100644 --- a/xeth/xeth.go +++ b/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()) } |