grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove count limit for local transactions (#2634)

Browse Source
This commit is contained in:
Arkadiy Paronyan 2016-10-15 12:29:27 +02:00 committed by GitHub
parent d66bd3c83a
commit 18062f11dc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ethcore/src/miner/transaction_queue.rs
View File

@ -310,9 +310,9 @@ impl TransactionSet {
let r = gas.overflowing_add(order.gas); let r = gas.overflowing_add(order.gas);
if r.1 { return false } if r.1 { return false }
gas = r.0; gas = r.0;
// Own and retracted transactions are allowed to go above the gas limit, bot not above the count limit. // Own and retracted transactions are allowed to go above all limits.
(gas > self.gas_limit && order.origin != TransactionOrigin::Local && order.origin != TransactionOrigin::RetractedBlock) || order.origin != TransactionOrigin::Local && order.origin != TransactionOrigin::RetractedBlock &&
count > self.limit (gas > self.gas_limit || count > self.limit)
}) })
.map(|order| by_hash.get(&order.hash) .map(|order| by_hash.get(&order.hash)
.expect("All transactions in `self.by_priority` and `self.by_address` are kept in sync with `by_hash`.")) .expect("All transactions in `self.by_priority` and `self.by_address` are kept in sync with `by_hash`."))