miner: don't break loop when encountering gas limit reach err
Processing transactions should continue when a transaction throws a gas limit reached error. Other transactions may actually succeed.
This commit is contained in:
parent
d423305f07
commit
4f3c169b4e
|
@ -172,7 +172,7 @@ out:
|
||||||
case <-self.quit:
|
case <-self.quit:
|
||||||
break out
|
break out
|
||||||
case <-timer.C:
|
case <-timer.C:
|
||||||
if glog.V(logger.Debug) {
|
if glog.V(logger.Detail) && atomic.LoadInt64(&self.mining) == 1 {
|
||||||
glog.Infoln("Hash rate:", self.HashRate(), "Khash")
|
glog.Infoln("Hash rate:", self.HashRate(), "Khash")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -264,8 +264,8 @@ func (self *worker) commitNewWork() {
|
||||||
remove = set.New()
|
remove = set.New()
|
||||||
tcount = 0
|
tcount = 0
|
||||||
)
|
)
|
||||||
gasLimit:
|
//gasLimit:
|
||||||
for i, tx := range transactions {
|
for _, tx := range transactions {
|
||||||
self.current.state.StartRecord(tx.Hash(), common.Hash{}, 0)
|
self.current.state.StartRecord(tx.Hash(), common.Hash{}, 0)
|
||||||
|
|
||||||
err := self.commitTransaction(tx)
|
err := self.commitTransaction(tx)
|
||||||
|
@ -276,14 +276,13 @@ gasLimit:
|
||||||
self.chain.TxState().RemoveNonce(from, tx.Nonce())
|
self.chain.TxState().RemoveNonce(from, tx.Nonce())
|
||||||
remove.Add(tx.Hash())
|
remove.Add(tx.Hash())
|
||||||
|
|
||||||
if glog.V(logger.Debug) {
|
if glog.V(logger.Detail) {
|
||||||
glog.Infof("TX (%x) failed, will be removed: %v\n", tx.Hash().Bytes()[:4], err)
|
glog.Infof("TX (%x) failed, will be removed: %v\n", tx.Hash().Bytes()[:4], err)
|
||||||
glog.Infoln(tx)
|
//glog.Infoln(tx)
|
||||||
}
|
}
|
||||||
case state.IsGasLimitErr(err):
|
case state.IsGasLimitErr(err):
|
||||||
glog.V(logger.Debug).Infof("Gas limit reached for block. %d TXs included in this block\n", i)
|
//glog.V(logger.Debug).Infof("Gas limit reached for block. %d TXs included in this block\n", i)
|
||||||
// Break on gas limit
|
//break gasLimit
|
||||||
break gasLimit
|
|
||||||
default:
|
default:
|
||||||
tcount++
|
tcount++
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue