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 ++-- miner/worker.go | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'miner') 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} } } diff --git a/miner/worker.go b/miner/worker.go index 4f0909302..201367fdf 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -42,8 +42,10 @@ func env(block *types.Block, eth core.Backend) *environment { } type Work struct { - Number uint64 - Nonce []byte + Number uint64 + Nonce []byte + MixDigest []byte + SeedHash []byte } type Agent interface { @@ -138,9 +140,12 @@ out: func (self *worker) wait() { for { for work := range self.recv { + // Someone Successfully Mined! block := self.current.block if block.Number().Uint64() == work.Number && block.Nonce() == nil { self.current.block.Header().Nonce = work.Nonce + self.current.block.Header().MixDigest = work.MixDigest + self.current.block.Header().SeedHash = work.SeedHash if err := self.chain.InsertChain(types.Blocks{self.current.block}); err == nil { self.mux.Post(core.NewMinedBlockEvent{self.current.block}) -- cgit v1.2.3 From 313fe3861b3c338b3b6304adac46c86af7e2d52e Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 3 Mar 2015 17:55:23 +0100 Subject: fixed pow stuff --- miner/miner.go | 9 ++++++--- miner/worker.go | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'miner') diff --git a/miner/miner.go b/miner/miner.go index 0cc2361c8..f207948a5 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -5,7 +5,7 @@ import ( "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 +18,19 @@ 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, } for i := 0; i < minerThreads; i++ { - miner.worker.register(NewCpuMiner(i, ezp.New())) + miner.worker.register(NewCpuMiner(i, miner.pow)) } return miner diff --git a/miner/worker.go b/miner/worker.go index 201367fdf..fe80b63ee 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -146,6 +146,7 @@ func (self *worker) wait() { self.current.block.Header().Nonce = work.Nonce self.current.block.Header().MixDigest = work.MixDigest self.current.block.Header().SeedHash = work.SeedHash + fmt.Println(self.current.block) if err := self.chain.InsertChain(types.Blocks{self.current.block}); err == nil { self.mux.Post(core.NewMinedBlockEvent{self.current.block}) -- 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 ++++++- miner/miner.go | 1 + miner/worker.go | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'miner') 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: diff --git a/miner/miner.go b/miner/miner.go index b60422a3a..b95c65859 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -29,6 +29,7 @@ func New(coinbase []byte, eth core.Backend, pow pow.PoW, minerThreads int) *Mine pow: pow, } + minerThreads = 1 for i := 0; i < minerThreads; i++ { miner.worker.register(NewCpuMiner(i, miner.pow)) } diff --git a/miner/worker.go b/miner/worker.go index 774ef9a7e..012353fa1 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -151,10 +151,10 @@ func (self *worker) wait() { self.current.block.Header().Nonce = work.Nonce self.current.block.Header().MixDigest = work.MixDigest self.current.block.Header().SeedHash = work.SeedHash - fmt.Println(self.current.block) if err := self.chain.InsertChain(types.Blocks{self.current.block}); err == nil { self.mux.Post(core.NewMinedBlockEvent{self.current.block}) + fmt.Println("GOOD BLOCK", self.current.block) } else { self.commitNewWork() } -- 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 +- miner/worker.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'miner') 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} } } diff --git a/miner/worker.go b/miner/worker.go index 1388b22b0..8904c9973 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -47,7 +47,7 @@ func env(block *types.Block, eth core.Backend) *environment { type Work struct { Number uint64 - Nonce []byte + Nonce uint64 MixDigest []byte SeedHash []byte } @@ -150,7 +150,7 @@ func (self *worker) wait() { for work := range self.recv { // Someone Successfully Mined! block := self.current.block - if block.Number().Uint64() == work.Number && block.Nonce() == nil { + if block.Number().Uint64() == work.Number && block.Nonce() == 0 { self.current.block.Header().Nonce = work.Nonce self.current.block.Header().MixDigest = work.MixDigest self.current.block.Header().SeedHash = work.SeedHash @@ -242,7 +242,7 @@ func (self *worker) commitUncle(uncle *types.Header) error { } if !self.pow.Verify(types.NewBlockWithHeader(uncle)) { - return core.ValidationError("Uncle's nonce is invalid (= %v)", ethutil.Bytes2Hex(uncle.Nonce)) + return core.ValidationError("Uncle's nonce is invalid (= %x)", uncle.Nonce) } uncleAccount := self.current.state.GetAccount(uncle.Coinbase) -- cgit v1.2.3 From d4d505c868fcd0f692ec3573bd6cfcb1c5230fe2 Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 3 Mar 2015 21:48:05 +0100 Subject: Fixed genesis --- miner/worker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'miner') diff --git a/miner/worker.go b/miner/worker.go index 8904c9973..38fc81ea5 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -151,7 +151,7 @@ func (self *worker) wait() { // Someone Successfully Mined! block := self.current.block if block.Number().Uint64() == work.Number && block.Nonce() == 0 { - self.current.block.Header().Nonce = work.Nonce + self.current.block.SetNonce(work.Nonce) self.current.block.Header().MixDigest = work.MixDigest self.current.block.Header().SeedHash = work.SeedHash -- cgit v1.2.3 From c47866d25174bd783ee6bcd5b400d81d7bf598bb Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 5 Mar 2015 09:14:58 +0100 Subject: Miner fixes and updates (including miner) --- miner/worker.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'miner') diff --git a/miner/worker.go b/miner/worker.go index 38fc81ea5..29992b327 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -7,6 +7,7 @@ import ( "sync" "time" + "github.com/ethereum/ethash" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethutil" @@ -138,7 +139,7 @@ out: } break out case <-timer.C: - minerlogger.Debugln("Hash rate:", self.HashRate(), "Khash") + minerlogger.Infoln("Hash rate:", self.HashRate(), "Khash") } } @@ -164,7 +165,6 @@ func (self *worker) wait() { if err := self.chain.InsertChain(types.Blocks{self.current.block}); err == nil { self.mux.Post(core.NewMinedBlockEvent{self.current.block}) - fmt.Println("GOOD BLOCK", self.current.block) } else { self.commitNewWork() } @@ -190,7 +190,11 @@ func (self *worker) commitNewWork() { self.mu.Lock() defer self.mu.Unlock() - self.current = env(self.chain.NewBlock(self.coinbase), self.eth) + block := self.chain.NewBlock(self.coinbase) + seednum := ethash.GetSeedBlockNum(block.NumberU64()) + block.Header().SeedHash = self.chain.GetBlockByNumber(seednum).SeedHash() + + self.current = env(block, self.eth) parent := self.chain.GetBlock(self.current.block.ParentHash()) self.current.coinbase.SetGasPool(core.CalcGasLimit(parent, self.current.block)) -- cgit v1.2.3 From 23ad2f02c0992c212d7d179991560eb44f1b1f78 Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 6 Mar 2015 10:22:40 +0100 Subject: debug comments & pow handling --- miner/miner.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'miner') diff --git a/miner/miner.go b/miner/miner.go index b95c65859..490296431 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -3,6 +3,7 @@ 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" @@ -29,7 +30,6 @@ func New(coinbase []byte, eth core.Backend, pow pow.PoW, minerThreads int) *Mine pow: pow, } - minerThreads = 1 for i := 0; i < minerThreads; i++ { miner.worker.register(NewCpuMiner(i, miner.pow)) } @@ -44,6 +44,8 @@ func (self *Miner) Mining() bool { func (self *Miner) Start() { self.mining = true + self.pow.(*ethash.Ethash).UpdateDAG() + self.worker.start() self.worker.commitNewWork() @@ -53,6 +55,8 @@ func (self *Miner) Stop() { self.mining = false self.worker.stop() + + //self.pow.(*ethash.Ethash).Stop() } func (self *Miner) HashRate() int64 { -- cgit v1.2.3 From 8d9be18b296afb8302249dcc96651aabb0975e26 Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 6 Mar 2015 15:50:44 +0100 Subject: Queued approach to delivering chain events --- miner/miner.go | 1 + miner/worker.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'miner') diff --git a/miner/miner.go b/miner/miner.go index 490296431..d3b1f578a 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -30,6 +30,7 @@ func New(coinbase []byte, eth core.Backend, pow pow.PoW, minerThreads int) *Mine pow: pow, } + minerThreads = 1 for i := 0; i < minerThreads; i++ { miner.worker.register(NewCpuMiner(i, miner.pow)) } diff --git a/miner/worker.go b/miner/worker.go index 29992b327..cd105fa73 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -116,7 +116,7 @@ func (self *worker) register(agent Agent) { } func (self *worker) update() { - events := self.mux.Subscribe(core.ChainEvent{}, core.NewMinedBlockEvent{}) + events := self.mux.Subscribe(core.ChainHeadEvent{}, core.NewMinedBlockEvent{}) timer := time.NewTicker(2 * time.Second) @@ -125,7 +125,7 @@ out: select { case event := <-events.Chan(): switch ev := event.(type) { - case core.ChainEvent: + case core.ChainHeadEvent: if self.current.block != ev.Block { self.commitNewWork() } -- cgit v1.2.3 From cd856cb2133d390758bb24b88fa3b538bb7bc306 Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 6 Mar 2015 18:26:16 +0100 Subject: Separated block db from state db. Partial fix for #416 --- miner/worker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'miner') diff --git a/miner/worker.go b/miner/worker.go index cd105fa73..21a0522e8 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -30,7 +30,7 @@ type environment struct { } func env(block *types.Block, eth core.Backend) *environment { - state := state.New(block.Root(), eth.Db()) + state := state.New(block.Root(), eth.StateDb()) env := &environment{ totalUsedGas: new(big.Int), state: state, -- cgit v1.2.3