aboutsummaryrefslogtreecommitdiffstats
path: root/miner
diff options
context:
space:
mode:
authorGustav Simonsson <gustav.simonsson@gmail.com>2015-05-05 14:24:15 +0800
committerGustav Simonsson <gustav.simonsson@gmail.com>2015-05-05 14:24:15 +0800
commitb1cc9cdc7424d452687e2e168027d591ed332f3f (patch)
tree85f9860c5348f7cce620349977e4dac5ab5140f8 /miner
parent50659f4b480fb9446cfb40955331a7a044353ff8 (diff)
downloaddexon-b1cc9cdc7424d452687e2e168027d591ed332f3f.tar.gz
dexon-b1cc9cdc7424d452687e2e168027d591ed332f3f.tar.zst
dexon-b1cc9cdc7424d452687e2e168027d591ed332f3f.zip
Integrate new ethash API and change geth makedag cmd
Diffstat (limited to 'miner')
-rw-r--r--miner/agent.go2
-rw-r--r--miner/miner.go7
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()
}