From de9f79133faa1ff5dcd16fb4fd13d06b7799ded9 Mon Sep 17 00:00:00 2001 From: Matthew Wampler-Doty Date: Sat, 28 Feb 2015 14:58:37 -0500 Subject: Introducing ethash --- miner/agent.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'miner/agent.go') diff --git a/miner/agent.go b/miner/agent.go index 9046f5d5a..5b2bfdb06 100644 --- a/miner/agent.go +++ b/miner/agent.go @@ -69,8 +69,8 @@ done: func (self *CpuMiner) mine(block *types.Block) { minerlogger.Infof("(re)started agent[%d]. mining...\n", self.index) - nonce := self.pow.Search(block, self.quitCurrentOp) + nonce, mixDigest, seedHash := self.pow.Search(block, self.quitCurrentOp) if nonce != nil { - self.returnCh <- Work{block.Number().Uint64(), nonce} + self.returnCh <- Work{block.Number().Uint64(), nonce, mixDigest, seedHash} } } -- cgit v1.2.3 From 8e995b97ccc92098f5744dd7fc3d8e7e111ca09c Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 3 Mar 2015 20:13:11 +0100 Subject: Fixes and debug added --- miner/agent.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'miner/agent.go') diff --git a/miner/agent.go b/miner/agent.go index 5b2bfdb06..6c21d8015 100644 --- a/miner/agent.go +++ b/miner/agent.go @@ -42,11 +42,16 @@ func (self *CpuMiner) Start() { } func (self *CpuMiner) update() { + justStarted := true out: for { select { case block := <-self.c: - self.quitCurrentOp <- struct{}{} + if justStarted { + justStarted = true + } else { + self.quitCurrentOp <- struct{}{} + } go self.mine(block) case <-self.quit: -- cgit v1.2.3 From 26de12d9bf23bce7de26b3b6629601ec2e58ad5b Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 3 Mar 2015 21:04:31 +0100 Subject: Changed nonce to a uint64 --- miner/agent.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'miner/agent.go') diff --git a/miner/agent.go b/miner/agent.go index 6c21d8015..6865d5a08 100644 --- a/miner/agent.go +++ b/miner/agent.go @@ -75,7 +75,7 @@ done: func (self *CpuMiner) mine(block *types.Block) { minerlogger.Infof("(re)started agent[%d]. mining...\n", self.index) nonce, mixDigest, seedHash := self.pow.Search(block, self.quitCurrentOp) - if nonce != nil { + if nonce != 0 { self.returnCh <- Work{block.Number().Uint64(), nonce, mixDigest, seedHash} } } -- cgit v1.2.3