fix: pending RPC transaction

NomicFoundation · Aug 16, 2024 · 4db9378 · 4db9378
1 parent 9703bce
commit 4db9378
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/crates/edr_evm/src/block/transaction.rs b/crates/edr_evm/src/block/transaction.rs
@@ -42,8 +42,13 @@ impl RpcTypeFrom<TransactionAndBlock<L1ChainSpec>> for edr_rpc_eth::TransactionW
             )
             .unzip();
 
-        let transaction =
-            edr_rpc_eth::Transaction::new(&value.transaction, header, transaction_index, hardfork);
+        let transaction = edr_rpc_eth::Transaction::new(
+            &value.transaction,
+            header,
+            transaction_index,
+            value.is_pending,
+            hardfork,
+        );
         let signature = value.transaction.signature();
 
         edr_rpc_eth::TransactionWithSignature::new(

diff --git a/crates/edr_optimism/src/rpc/transaction.rs b/crates/edr_optimism/src/rpc/transaction.rs
@@ -144,6 +144,7 @@ impl RpcTypeFrom<TransactionAndBlock<OptimismChainSpec>> for Transaction {
             &value.transaction,
             header,
             transaction_index,
+            value.is_pending,
             hardfork.into(),
         );
 

diff --git a/crates/edr_rpc_eth/src/transaction.rs b/crates/edr_rpc_eth/src/transaction.rs
@@ -87,6 +87,7 @@ impl Transaction {
               + IsLegacy),
         header: Option<&block::Header>,
         transaction_index: Option<u64>,
+        is_pending: bool,
         hardfork: SpecId,
     ) -> Self {
         let base_fee = header.and_then(|header| header.base_fee_per_gas);
@@ -118,8 +119,13 @@ impl Transaction {
             None
         };
 
-        let (block_hash, block_number) =
-            header.map(|header| (header.hash(), header.number)).unzip();
+        let (block_hash, block_number) = if is_pending {
+            (None, None)
+        } else {
+            header.map(|header| (header.hash(), header.number)).unzip()
+        };
+
+        let transaction_index = if is_pending { None } else { transaction_index };
 
         let access_list = if transaction.has_access_list() {
             Some(transaction.access_list().to_vec())