Fix panic on importing own invalid transaction (#3550)

openethereum · Nov 25, 2016 · 1c45c91 · 1c45c91
1 parent d6df25e
commit 1c45c91
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs
@@ -470,14 +470,17 @@ impl Miner {
 
 		let best_block_header: Header = ::util::rlp::decode(&chain.best_block_header());
 		transactions.into_iter()
-			.filter(|tx| match self.engine.verify_transaction_basic(tx, &best_block_header) {
-				Ok(()) => true,
-				Err(e) => {
-					debug!(target: "miner", "Rejected tx {:?} with invalid signature: {:?}", tx.hash(), e);
-					false
+			.map(|tx| {
+				match self.engine.verify_transaction_basic(&tx, &best_block_header) {
+					Err(e) => {
+						debug!(target: "miner", "Rejected tx {:?} with invalid signature: {:?}", tx.hash(), e);
+						Err(e)
+					},
+					Ok(()) => {
+						transaction_queue.add(tx, &fetch_account, origin)
+					},
 				}
 			})
-			.map(|tx| transaction_queue.add(tx, &fetch_account, origin))
 			.collect()
 	}