interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Event fixes for miner

This commit is contained in:
obscuren 2015-03-24 13:37:38 +01:00
parent 576df064e5
commit eab8f7355d
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
miner/worker.go
View File

@ -126,11 +126,9 @@ out:
case event := <-events.Chan(): case event := <-events.Chan():
switch ev := event.(type) { switch ev := event.(type) {
case core.ChainHeadEvent: case core.ChainHeadEvent:
if self.current.block != ev.Block {
self.commitNewWork()
}
case core.NewMinedBlockEvent:
self.commitNewWork() self.commitNewWork()
case core.NewMinedBlockEvent:
//self.commitNewWork()
case core.ChainSideEvent: case core.ChainSideEvent:
self.uncleMu.Lock() self.uncleMu.Lock()
self.possibleUncles[ev.Block.Hash()] = ev.Block self.possibleUncles[ev.Block.Hash()] = ev.Block
@ -261,7 +259,7 @@ gasLimit:
uncles = append(uncles, uncle.Header()) uncles = append(uncles, uncle.Header())
} }
} }
minerlogger.Infof("commit new work with %d txs & %d uncles\n", tcount, len(uncles)) minerlogger.Infof("commit new work on block %v with %d txs & %d uncles\n", self.current.block.Number(), tcount, len(uncles))
for _, hash := range badUncles { for _, hash := range badUncles {
delete(self.possibleUncles, hash) delete(self.possibleUncles, hash)
} }