mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-18 02:40:45 +00:00
rollback fix duplicate count reward
This commit is contained in:
parent
da52e3163e
commit
549b08d953
1 changed files with 6 additions and 6 deletions
|
|
@ -612,12 +612,12 @@ func (self *worker) commitNewWork() {
|
||||||
delete(self.possibleUncles, hash)
|
delete(self.possibleUncles, hash)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Create the new block to seal with the consensus engine
|
||||||
|
if work.Block, err = self.engine.Finalize(self.chain, header, work.state, work.txs, uncles, work.receipts); err != nil {
|
||||||
|
log.Error("Failed to finalize block for sealing", "err", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
if atomic.LoadInt32(&self.mining) == 1 {
|
if atomic.LoadInt32(&self.mining) == 1 {
|
||||||
// Create the new block to seal with the consensus engine
|
|
||||||
if work.Block, err = self.engine.Finalize(self.chain, header, work.state, work.txs, uncles, work.receipts); err != nil {
|
|
||||||
log.Error("Failed to finalize block for sealing", "err", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
log.Info("Committing new block", "number", work.Block.Number(), "txs", work.tcount, "special txs", len(specialTxs), "uncles", len(uncles), "elapsed", common.PrettyDuration(time.Since(tstart)))
|
log.Info("Committing new block", "number", work.Block.Number(), "txs", work.tcount, "special txs", len(specialTxs), "uncles", len(uncles), "elapsed", common.PrettyDuration(time.Since(tstart)))
|
||||||
self.unconfirmed.Shift(work.Block.NumberU64() - 1)
|
self.unconfirmed.Shift(work.Block.NumberU64() - 1)
|
||||||
self.lastParentBlockCommit = parent.Hash().Hex()
|
self.lastParentBlockCommit = parent.Hash().Hex()
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue