From ba4b904cf8c5ddf0371612499f35bffb99ca3dab Mon Sep 17 00:00:00 2001 From: Nguyen Sy Thanh Son Date: Sun, 6 Jan 2019 20:21:21 +0700 Subject: [PATCH 1/2] rollback fix duplicate count reward --- miner/worker.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/miner/worker.go b/miner/worker.go index a5d5167fb4..9baefbce40 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -612,12 +612,12 @@ func (self *worker) commitNewWork() { 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 { - // 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))) self.unconfirmed.Shift(work.Block.NumberU64() - 1) self.lastParentBlockCommit = parent.Hash().Hex() From 8bbd8eddc932c1dbe62888644b0521bb7ec4e6f8 Mon Sep 17 00:00:00 2001 From: Nguyen Sy Thanh Son Date: Tue, 8 Jan 2019 12:29:57 +0700 Subject: [PATCH 2/2] Update posv.go --- consensus/posv/posv.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/consensus/posv/posv.go b/consensus/posv/posv.go index a6f0613954..f4d09ecd48 100644 --- a/consensus/posv/posv.go +++ b/consensus/posv/posv.go @@ -930,8 +930,7 @@ func (c *Posv) Seal(chain consensus.ChainReader, block *types.Block, stop <-chan if limit := uint64(2); number < limit || seen > number-limit { // Only take into account the non-epoch blocks if number%c.config.Epoch != 0 { - log.Info("len(masternodes)", len(masternodes), "number", number, "limit", limit, "seen", seen, "recent", recent.String(), "snap.Recents", snap.Recents) - log.Info("Signed recently, must wait for others") + log.Info("Signed recently, must wait for others ", "len(masternodes)", len(masternodes), "number", number, "limit", limit, "seen", seen, "recent", recent.String(), "snap.Recents", snap.Recents) <-stop return nil, nil }