From 01c0ba22ae597a43be4e06e590175cf6c4dacde1 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Mon, 23 Mar 2015 11:09:48 +0100 Subject: Add DAG seed hash and difficulty to GetWork --- xeth/miner_agent.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'xeth') diff --git a/xeth/miner_agent.go b/xeth/miner_agent.go index 181ab950a..b2e877ed2 100644 --- a/xeth/miner_agent.go +++ b/xeth/miner_agent.go @@ -1,6 +1,7 @@ package xeth import ( + "github.com/ethereum/ethash" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/miner" @@ -55,14 +56,14 @@ out: } func (a *Agent) GetWork() [3]string { - // TODO return HashNoNonce, DAGSeedHash, Difficulty var res [3]string - // XXX Wait here untill work != nil ?. + // XXX Wait here until work != nil ? if a.work != nil { - res[0] = a.work.HashNoNonce().Hex() // Header Hash No Nonce - res[1] = common.Hash{}.Hex() // DAG Seed - res[2] = common.Hash{}.Hex() // Difficulty + res[0] = a.work.HashNoNonce().Hex() + seedHash, _ := ethash.GetSeedHash(a.currentWork.NumberU64()) + res[1] = common.Bytes2Hex(seedHash) + res[2] = common.Bytes2Hex(a.work.Difficulty().Bytes()) } return res -- cgit v1.2.3 From 439481d177aa6d19ef0254e4e4e0d5a39a8ff09a Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Mon, 23 Mar 2015 11:14:42 +0100 Subject: Rename Agent to RemoteAgent --- xeth/miner_agent.go | 22 +++++++++++----------- xeth/xeth.go | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'xeth') diff --git a/xeth/miner_agent.go b/xeth/miner_agent.go index b2e877ed2..b00439ed4 100644 --- a/xeth/miner_agent.go +++ b/xeth/miner_agent.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/miner" ) -type Agent struct { +type RemoteAgent struct { work *types.Block currentWork *types.Block @@ -16,34 +16,34 @@ type Agent struct { returnCh chan<- miner.Work } -func NewAgent() *Agent { - agent := &Agent{} +func NewRemoteAgent() *RemoteAgent { + agent := &RemoteAgent{} go agent.run() return agent } -func (a *Agent) Work() chan<- *types.Block { +func (a *RemoteAgent) Work() chan<- *types.Block { return a.workCh } -func (a *Agent) SetWorkCh(returnCh chan<- miner.Work) { +func (a *RemoteAgent) SetWorkCh(returnCh chan<- miner.Work) { a.returnCh = returnCh } -func (a *Agent) Start() { +func (a *RemoteAgent) Start() { a.quit = make(chan struct{}) a.workCh = make(chan *types.Block, 1) } -func (a *Agent) Stop() { +func (a *RemoteAgent) Stop() { close(a.quit) close(a.workCh) } -func (a *Agent) GetHashRate() int64 { return 0 } +func (a *RemoteAgent) GetHashRate() int64 { return 0 } -func (a *Agent) run() { +func (a *RemoteAgent) run() { out: for { select { @@ -55,7 +55,7 @@ out: } } -func (a *Agent) GetWork() [3]string { +func (a *RemoteAgent) GetWork() [3]string { var res [3]string // XXX Wait here until work != nil ? @@ -69,7 +69,7 @@ func (a *Agent) GetWork() [3]string { return res } -func (a *Agent) SubmitWork(nonce uint64, mixDigest, seedHash common.Hash) bool { +func (a *RemoteAgent) SubmitWork(nonce uint64, mixDigest, seedHash common.Hash) bool { // Return true or false, but does not indicate if the PoW was correct // Make sure the external miner was working on the right hash diff --git a/xeth/xeth.go b/xeth/xeth.go index fba61230f..5faeeb766 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -102,7 +102,7 @@ type XEth struct { // register map[string][]*interface{} // TODO improve return type // Miner agent - agent *Agent + agent *RemoteAgent } // New creates an XEth that uses the given frontend. @@ -120,7 +120,7 @@ func New(eth Backend, frontend Frontend) *XEth { frontend: frontend, logs: make(map[int]*logFilter), messages: make(map[int]*whisperFilter), - agent: NewAgent(), + agent: NewRemoteAgent(), } eth.Miner().Register(xeth.agent) @@ -170,7 +170,7 @@ func (self *XEth) stop() { func (self *XEth) DefaultGas() *big.Int { return defaultGas } func (self *XEth) DefaultGasPrice() *big.Int { return defaultGasPrice } -func (self *XEth) RemoteMining() *Agent { return self.agent } +func (self *XEth) RemoteMining() *RemoteAgent { return self.agent } func (self *XEth) AtStateNum(num int64) *XEth { chain := self.Backend().ChainManager() -- cgit v1.2.3 From 91a2275ad359b2f72565b926dac7dcd77b14a241 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Mon, 23 Mar 2015 11:21:41 +0100 Subject: Move RemoteAgent to miner pkg --- xeth/miner_agent.go | 82 ----------------------------------------------------- xeth/xeth.go | 6 ++-- 2 files changed, 3 insertions(+), 85 deletions(-) delete mode 100644 xeth/miner_agent.go (limited to 'xeth') diff --git a/xeth/miner_agent.go b/xeth/miner_agent.go deleted file mode 100644 index b00439ed4..000000000 --- a/xeth/miner_agent.go +++ /dev/null @@ -1,82 +0,0 @@ -package xeth - -import ( - "github.com/ethereum/ethash" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/miner" -) - -type RemoteAgent struct { - work *types.Block - currentWork *types.Block - - quit chan struct{} - workCh chan *types.Block - returnCh chan<- miner.Work -} - -func NewRemoteAgent() *RemoteAgent { - agent := &RemoteAgent{} - go agent.run() - - return agent -} - -func (a *RemoteAgent) Work() chan<- *types.Block { - return a.workCh -} - -func (a *RemoteAgent) SetWorkCh(returnCh chan<- miner.Work) { - a.returnCh = returnCh -} - -func (a *RemoteAgent) Start() { - a.quit = make(chan struct{}) - a.workCh = make(chan *types.Block, 1) -} - -func (a *RemoteAgent) Stop() { - close(a.quit) - close(a.workCh) -} - -func (a *RemoteAgent) GetHashRate() int64 { return 0 } - -func (a *RemoteAgent) run() { -out: - for { - select { - case <-a.quit: - break out - case work := <-a.workCh: - a.work = work - } - } -} - -func (a *RemoteAgent) GetWork() [3]string { - var res [3]string - - // XXX Wait here until work != nil ? - if a.work != nil { - res[0] = a.work.HashNoNonce().Hex() - seedHash, _ := ethash.GetSeedHash(a.currentWork.NumberU64()) - res[1] = common.Bytes2Hex(seedHash) - res[2] = common.Bytes2Hex(a.work.Difficulty().Bytes()) - } - - return res -} - -func (a *RemoteAgent) SubmitWork(nonce uint64, mixDigest, seedHash common.Hash) bool { - // Return true or false, but does not indicate if the PoW was correct - - // Make sure the external miner was working on the right hash - if a.currentWork != nil && a.work != nil && a.currentWork.Hash() == a.work.Hash() { - a.returnCh <- miner.Work{a.currentWork.Number().Uint64(), nonce, mixDigest.Bytes(), seedHash.Bytes()} - return true - } - - return false -} diff --git a/xeth/xeth.go b/xeth/xeth.go index 5faeeb766..23e523980 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -102,7 +102,7 @@ type XEth struct { // register map[string][]*interface{} // TODO improve return type // Miner agent - agent *RemoteAgent + agent *miner.RemoteAgent } // New creates an XEth that uses the given frontend. @@ -120,7 +120,7 @@ func New(eth Backend, frontend Frontend) *XEth { frontend: frontend, logs: make(map[int]*logFilter), messages: make(map[int]*whisperFilter), - agent: NewRemoteAgent(), + agent: miner.NewRemoteAgent(), } eth.Miner().Register(xeth.agent) @@ -170,7 +170,7 @@ func (self *XEth) stop() { func (self *XEth) DefaultGas() *big.Int { return defaultGas } func (self *XEth) DefaultGasPrice() *big.Int { return defaultGasPrice } -func (self *XEth) RemoteMining() *RemoteAgent { return self.agent } +func (self *XEth) RemoteMining() *miner.RemoteAgent { return self.agent } func (self *XEth) AtStateNum(num int64) *XEth { chain := self.Backend().ChainManager() -- cgit v1.2.3