roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge branch 'kobigurk-develop' into develop

Browse Source
This commit is contained in:
obscuren 2015-04-28 11:16:22 +02:00
commit bac455c011
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpc/api.go
View File

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

4
xeth/xeth.go
View File

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