diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-10 08:22:38 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-10 08:22:38 +0800 |
| commit | 0db4a0e898d09ffa7b6b1289e9a334edc0001cfa (patch) | |
| tree | a0b5c8381ab482550ef4800a06d4db086d76a983 /miner/miner.go | |
| parent | 94e543bc398efbb5c712b6e4cb48d8a57eb3400d (diff) | |
| parent | 0d64163fea3a266ceb71cb4c4ee5682052c9ca6c (diff) | |
| download | go-tangerine-0db4a0e898d09ffa7b6b1289e9a334edc0001cfa.tar go-tangerine-0db4a0e898d09ffa7b6b1289e9a334edc0001cfa.tar.gz go-tangerine-0db4a0e898d09ffa7b6b1289e9a334edc0001cfa.tar.bz2 go-tangerine-0db4a0e898d09ffa7b6b1289e9a334edc0001cfa.tar.lz go-tangerine-0db4a0e898d09ffa7b6b1289e9a334edc0001cfa.tar.xz go-tangerine-0db4a0e898d09ffa7b6b1289e9a334edc0001cfa.tar.zst go-tangerine-0db4a0e898d09ffa7b6b1289e9a334edc0001cfa.zip | |
Merge branch 'poc-9' into develop
Diffstat (limited to 'miner/miner.go')
| -rw-r--r-- | miner/miner.go | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/miner/miner.go b/miner/miner.go index 6b416be8e..d3b1f578a 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -3,9 +3,10 @@ package miner import ( "math/big" + "github.com/ethereum/ethash" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/pow/ezp" + "github.com/ethereum/go-ethereum/pow" ) var minerlogger = logger.NewLogger("MINER") @@ -18,16 +19,20 @@ type Miner struct { Coinbase []byte mining bool + + pow pow.PoW } -func New(coinbase []byte, eth core.Backend, minerThreads int) *Miner { +func New(coinbase []byte, eth core.Backend, pow pow.PoW, minerThreads int) *Miner { miner := &Miner{ Coinbase: coinbase, worker: newWorker(coinbase, eth), + pow: pow, } + minerThreads = 1 for i := 0; i < minerThreads; i++ { - miner.worker.register(NewCpuMiner(i, ezp.New())) + miner.worker.register(NewCpuMiner(i, miner.pow)) } return miner @@ -40,6 +45,8 @@ func (self *Miner) Mining() bool { func (self *Miner) Start() { self.mining = true + self.pow.(*ethash.Ethash).UpdateDAG() + self.worker.start() self.worker.commitNewWork() @@ -49,6 +56,8 @@ func (self *Miner) Stop() { self.mining = false self.worker.stop() + + //self.pow.(*ethash.Ethash).Stop() } func (self *Miner) HashRate() int64 { |