gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
obscuren
2015-04-28 11:10:44 +02:00
parent 182d484aa7 9e03c48d43
commit 46f63ef04f
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
eth/backend.go
View File

@@ -343,6 +343,7 @@ func (s *Ethereum) Etherbase() (eb common.Address, err error) {
func (s *Ethereum) StopMining() { s.miner.Stop() } func (s *Ethereum) StopMining() { s.miner.Stop() }
func (s *Ethereum) IsMining() bool { return s.miner.Mining() } func (s *Ethereum) IsMining() bool { return s.miner.Mining() }
func (s *Ethereum) HashRate() int64 { return s.miner.HashRate() }
func (s *Ethereum) Miner() *miner.Miner { return s.miner } func (s *Ethereum) Miner() *miner.Miner { return s.miner }
// func (s *Ethereum) Logger() logger.LogSystem { return s.logger } // func (s *Ethereum) Logger() logger.LogSystem { return s.logger }

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 "ext_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.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())
} }