diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-04-23 17:59:56 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-04-23 17:59:56 +0800 |
| commit | 2f8809df404b83824ffadd61ff766cbf9e4c5419 (patch) | |
| tree | d3c168060e3efffb945079be1d221d14b4ec79d1 /miner/worker.go | |
| parent | 2fe54ab233c0cd1bf09b49085477c961dcc1980f (diff) | |
| parent | 7f14fbd57936cf74627572da4a06585d35161ea9 (diff) | |
| download | dexon-2f8809df404b83824ffadd61ff766cbf9e4c5419.tar dexon-2f8809df404b83824ffadd61ff766cbf9e4c5419.tar.gz dexon-2f8809df404b83824ffadd61ff766cbf9e4c5419.tar.bz2 dexon-2f8809df404b83824ffadd61ff766cbf9e4c5419.tar.lz dexon-2f8809df404b83824ffadd61ff766cbf9e4c5419.tar.xz dexon-2f8809df404b83824ffadd61ff766cbf9e4c5419.tar.zst dexon-2f8809df404b83824ffadd61ff766cbf9e4c5419.zip | |
Merge pull request #769 from obscuren/develop
core: transaction queue
Diffstat (limited to 'miner/worker.go')
| -rw-r--r-- | miner/worker.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/miner/worker.go b/miner/worker.go index dc1f04d87..19ede3c93 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -258,7 +258,7 @@ func (self *worker) commitNewWork() { tcount = 0 ignoredTransactors = set.New() ) - //gasLimit: + for _, tx := range transactions { // We can skip err. It has already been validated in the tx pool from, _ := tx.From() @@ -290,13 +290,12 @@ func (self *worker) commitNewWork() { // ignore the transactor so no nonce errors will be thrown for this account // next time the worker is run, they'll be picked up again. ignoredTransactors.Add(from) - //glog.V(logger.Debug).Infof("Gas limit reached for block. %d TXs included in this block\n", i) - //break gasLimit + + glog.V(logger.Detail).Infof("Gas limit reached for (%x) in this block. Continue to try smaller txs\n", from[:4]) default: tcount++ } } - //self.eth.TxPool().InvalidateSet(remove) var ( uncles []*types.Header |