diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-07 02:20:54 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-07 02:20:54 +0800 |
| commit | 1f26a1b86319f9468395e0772b5ae8f02cce8ec8 (patch) | |
| tree | 3aa5255e7d82f4161b26bc60425fa0b026516007 /miner | |
| parent | aa884c052ddf7c5e8f673972b34681982de1cd52 (diff) | |
| parent | 054947def77bc2352f90f79206146c93dd5422d0 (diff) | |
| download | dexon-1f26a1b86319f9468395e0772b5ae8f02cce8ec8.tar dexon-1f26a1b86319f9468395e0772b5ae8f02cce8ec8.tar.gz dexon-1f26a1b86319f9468395e0772b5ae8f02cce8ec8.tar.bz2 dexon-1f26a1b86319f9468395e0772b5ae8f02cce8ec8.tar.lz dexon-1f26a1b86319f9468395e0772b5ae8f02cce8ec8.tar.xz dexon-1f26a1b86319f9468395e0772b5ae8f02cce8ec8.tar.zst dexon-1f26a1b86319f9468395e0772b5ae8f02cce8ec8.zip | |
Merge pull request #859 from Gustav-Simonsson/ethash_reloaded
Ethash reloaded
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/agent.go | 2 | ||||
| -rw-r--r-- | miner/miner.go | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/miner/agent.go b/miner/agent.go index 547fdfbef..b2f89aaab 100644 --- a/miner/agent.go +++ b/miner/agent.go @@ -85,7 +85,7 @@ func (self *CpuMiner) mine(block *types.Block) { self.chMu.Unlock() // Mine - nonce, mixDigest, _ := self.pow.Search(block, self.quitCurrentOp) + nonce, mixDigest := self.pow.Search(block, self.quitCurrentOp) if nonce != 0 { block.SetNonce(nonce) block.Header().MixDigest = common.BytesToHash(mixDigest) diff --git a/miner/miner.go b/miner/miner.go index 883956370..bff0026dc 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -3,7 +3,6 @@ package miner import ( "math/big" - "github.com/ethereum/ethash" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/state" @@ -41,13 +40,7 @@ func (self *Miner) Mining() bool { func (self *Miner) Start(coinbase common.Address) { self.mining = true self.worker.coinbase = coinbase - - if self.threads > 0 { - self.pow.(*ethash.Ethash).UpdateDAG() - } - self.worker.start() - self.worker.commitNewWork() } |