don't unconditionally set block number in RPC transactions

openethereum · Oct 24, 2017 · 50c7142 · 50c7142
1 parent 4673d4b
commit 50c7142
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/rpc/src/v1/helpers/light_fetch.rs b/rpc/src/v1/helpers/light_fetch.rs
@@ -68,6 +68,7 @@ pub fn extract_transaction_at_index(block: encoded::Block, index: usize, eip86_t
 		.and_then(|tx| SignedTransaction::new(tx).ok())
 		.map(|tx| Transaction::from_signed(tx, block.number(), eip86_transition))
 		.map(|mut tx| {
+			tx.block_number = Some(block.number().into);
 			tx.block_hash = Some(block.hash().into());
 			tx.transaction_index = Some(index.into());
 			tx

diff --git a/rpc/src/v1/types/transaction.rs b/rpc/src/v1/types/transaction.rs
@@ -213,7 +213,7 @@ impl Transaction {
 			hash: t.hash().into(),
 			nonce: t.nonce.into(),
 			block_hash: None,
-			block_number: Some(block_number.into()),
+			block_number: None,
 			transaction_index: None,
 			from: t.sender().into(),
 			to: match t.action {