diff options
| author | obscuren <geffobscura@gmail.com> | 2015-06-10 03:12:25 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-06-10 03:12:25 +0800 |
| commit | bac9a94ddf20dc530966cbf6cd384aaf94aedc77 (patch) | |
| tree | 0ced967e60315698cc5056a984d7678c417bc1ce /miner | |
| parent | 0e703d92ac9df61e2ededa8c895c70ded101a607 (diff) | |
| parent | 14994fa21bf6f05554ff370d41005d06b68d20a5 (diff) | |
| download | dexon-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar dexon-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar.gz dexon-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar.bz2 dexon-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar.lz dexon-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar.xz dexon-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar.zst dexon-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.zip | |
Merge branch 'release/0.9.28'
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/worker.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/miner/worker.go b/miner/worker.go index 58efd61db..611445529 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -352,7 +352,7 @@ func (self *worker) isBlockLocallyMined(deepBlockNum uint64) bool { //Does the block at {deepBlockNum} send earnings to my coinbase? var block = self.chain.GetBlockByNumber(deepBlockNum) - return block.Header().Coinbase == self.coinbase + return block != nil && block.Header().Coinbase == self.coinbase } func (self *worker) logLocalMinedBlocks(previous *environment) { @@ -494,10 +494,6 @@ func (self *worker) commitTransactions(transactions types.Transactions) { err := self.commitTransaction(tx) switch { case core.IsNonceErr(err) || core.IsInvalidTxErr(err): - // Remove invalid transactions - from, _ := tx.From() - - self.chain.TxState().RemoveNonce(from, tx.Nonce()) current.remove.Add(tx.Hash()) if glog.V(logger.Detail) { |