aboutsummaryrefslogtreecommitdiffstats
path: root/miner
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-05-27 19:16:36 +0800
committerobscuren <geffobscura@gmail.com>2015-05-27 19:33:52 +0800
commit912ae80350c72a9cbefe60969fc9c88b1db302f3 (patch)
tree29539a16203be227cb51ab5dfa8405c371769c7b /miner
parent12650e16d3aa453a65417a79d79af5ce98cc4b01 (diff)
downloadgo-tangerine-912ae80350c72a9cbefe60969fc9c88b1db302f3.tar
go-tangerine-912ae80350c72a9cbefe60969fc9c88b1db302f3.tar.gz
go-tangerine-912ae80350c72a9cbefe60969fc9c88b1db302f3.tar.bz2
go-tangerine-912ae80350c72a9cbefe60969fc9c88b1db302f3.tar.lz
go-tangerine-912ae80350c72a9cbefe60969fc9c88b1db302f3.tar.xz
go-tangerine-912ae80350c72a9cbefe60969fc9c88b1db302f3.tar.zst
go-tangerine-912ae80350c72a9cbefe60969fc9c88b1db302f3.zip
miner: Added 5 blocks wait in prep for #1067
Diffstat (limited to 'miner')
-rw-r--r--miner/worker.go9
1 files changed, 5 insertions, 4 deletions
diff --git a/miner/worker.go b/miner/worker.go
index 182b99398..bc6955169 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -219,7 +219,7 @@ out:
func newLocalMinedBlock(blockNumber uint64, prevMinedBlocks *uint64RingBuffer) (minedBlocks *uint64RingBuffer) {
if prevMinedBlocks == nil {
- minedBlocks = &uint64RingBuffer{next: 0, ints: make([]uint64, miningLogAtDepth + 1)}
+ minedBlocks = &uint64RingBuffer{next: 0, ints: make([]uint64, miningLogAtDepth+1)}
} else {
minedBlocks = prevMinedBlocks
}
@@ -244,15 +244,16 @@ func (self *worker) wait() {
}
self.mux.Post(core.NewMinedBlockEvent{block})
- var stale string
+ var stale, confirm string
canonBlock := self.chain.GetBlockByNumber(block.NumberU64())
if canonBlock != nil && canonBlock.Hash() != block.Hash() {
- stale = "stale-"
+ stale = "stale "
} else {
+ confirm = "Wait 5 blocks for confirmation"
self.current.localMinedBlocks = newLocalMinedBlock(block.Number().Uint64(), self.current.localMinedBlocks)
}
- glog.V(logger.Info).Infof("🔨 Mined %sblock #%v (%x)", stale, block.Number(), block.Hash().Bytes()[:4])
+ glog.V(logger.Info).Infof("🔨 Mined %sblock (#%v / %x). %s", stale, block.Number(), block.Hash().Bytes()[:4], confirm)
jsonlogger.LogJson(&logger.EthMinerNewBlock{
BlockHash: block.Hash().Hex(),