From efaef855654768622532b70dc19897c51c0dc52a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Fri, 23 Sep 2016 17:26:36 +0200
Subject: [PATCH] Avoid penalizing legit transactions

---
 ethcore/src/miner/miner.rs             | 10 +++++++---
 ethcore/src/miner/transaction_queue.rs |  4 ++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs
index 03508a2f0..182234280 100644
--- a/ethcore/src/miner/miner.rs
+++ b/ethcore/src/miner/miner.rs
@@ -292,7 +292,7 @@ impl Miner {
 		};
 
 		let mut invalid_transactions = HashSet::new();
-		let mut too_big_transactions = HashSet::new();
+		let mut transactions_to_penalize = HashSet::new();
 		let block_number = open_block.block().fields().header.number();
 		// TODO: push new uncles, too.
 		for tx in transactions {
@@ -300,7 +300,11 @@ impl Miner {
 			match open_block.push_transaction(tx, None) {
 				Err(Error::Execution(ExecutionError::BlockGasLimitReached { gas_limit, gas_used, gas })) => {
 					debug!(target: "miner", "Skipping adding transaction to block because of gas limit: {:?} (limit: {:?}, used: {:?}, gas: {:?})", hash, gas_limit, gas_used, gas);
-					too_big_transactions.insert(hash);
+
+					// Penalize transaction if it's above current gas limit
+					if gas > gas_limit {
+						transactions_to_penalize.insert(hash);
+					}
 
 					// Exit early if gas left is smaller then min_tx_gas
 					let min_tx_gas: U256 = 21000.into();	// TODO: figure this out properly.
@@ -337,7 +341,7 @@ impl Miner {
 			for hash in invalid_transactions.into_iter() {
 				queue.remove_invalid(&hash, &fetch_account);
 			}
-			for hash in too_big_transactions {
+			for hash in transactions_to_penalize {
 				queue.penalize(&hash);
 			}
 		}
diff --git a/ethcore/src/miner/transaction_queue.rs b/ethcore/src/miner/transaction_queue.rs
index 401ef178c..a1b04822c 100644
--- a/ethcore/src/miner/transaction_queue.rs
+++ b/ethcore/src/miner/transaction_queue.rs
@@ -610,6 +610,10 @@ impl TransactionQueue {
 
 	/// Penalize transactions from sender of transaction with given hash.
 	/// I.e. it should change the priority of the transaction in the queue.
+	///
+	/// NOTE: We need to penalize all transactions from particular sender
+	/// to avoid breaking invariants in queue (ordered by nonces).
+	/// Consecutive transactions from this sender would fail otherwise (because of invalid nonce).
 	pub fn penalize(&mut self, transaction_hash: &H256) {
 		let transaction = self.by_hash.get(transaction_hash);
 		if transaction.is_none() {