gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1022 from obscuren/parallel_nonce_checks

Browse Source 
Parallelise nonce checks
This commit is contained in:
Jeffrey Wilcke
2015-05-18 11:13:53 -07:00
parent d6adadc5e3 40717465bc
commit bd0c0a633b
9 changed files with 119 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
miner/worker.go
View File

@ -224,7 +224,13 @@ func (self *worker) wait() {
}
self.mux.Post(core.NewMinedBlockEvent{block})
glog.V(logger.Info).Infof("🔨 Mined block #%v", block.Number())
var stale string
canonBlock := self.chain.GetBlockByNumber(block.NumberU64())
if canonBlock != nil && canonBlock.Hash() != block.Hash() {
stale = "stale-"
}
glog.V(logger.Info).Infof("🔨 Mined %sblock #%v (%x)", stale, block.Number(), block.Hash().Bytes()[:4])
jsonlogger.LogJson(&logger.EthMinerNewBlock{
BlockHash: block.Hash().Hex(),