update

Author: cody-wang-cb

crates/flashblocks-rpc/src/flashblocks.rs

@@ -344,10 +344,6 @@ fn get_and_set_txs_and_receipts(
         // check if exists, if not update
         let existing_tx = cache.get::<OpTransactionSigned>(&transaction.tx_hash().to_string());
         if existing_tx.is_none() {
-            println!(
-                "setting transaction in cache: {:?}",
-                transaction.tx_hash().to_string()
-            );
             if let Err(e) = cache.set(&transaction.tx_hash().to_string(), &transaction, Some(10)) {
                 error!("Failed to set transaction in cache: {}", e);
                 continue;
@@ -382,6 +378,15 @@ fn get_and_set_txs_and_receipts(
                 ) {
                     error!("Failed to set transaction sender in cache: {}", e);
                 }
+
+                // also keep track of the block number of each transaction
+                if let Err(e) = cache.set(
+                    &format!("tx_block_number:{}", transaction.tx_hash()),
+                    &block_number,
+                    Some(10),
+                ) {
+                    error!("Failed to set transaction sender in cache: {}", e);
+                }
             }
         }
 
@@ -602,6 +607,61 @@ mod tests {
             ))
             .unwrap();
         assert_eq!(tx2_receipt.cumulative_gas_used(), 42000);
+
+        // verify tx_sender, tx_block_number, tx_idx
+        let tx_sender = cache
+            .get::<Address>(&format!(
+                "tx_sender:{}",
+                "0x3cbbc9a6811ac5b2a2e5780bdb67baffc04246a59f39e398be048f1b2d05460c"
+            ))
+            .unwrap();
+        assert_eq!(
+            tx_sender,
+            Address::from_str("0xb63d5fd2e6c53fe06680c47736aba771211105e4").unwrap()
+        );
+
+        let tx_block_number = cache
+            .get::<u64>(&format!(
+                "tx_block_number:{}",
+                "0x3cbbc9a6811ac5b2a2e5780bdb67baffc04246a59f39e398be048f1b2d05460c"
+            ))
+            .unwrap();
+        assert_eq!(tx_block_number, 1);
+
+        let tx_idx = cache
+            .get::<u64>(&format!(
+                "tx_idx:{}",
+                "0x3cbbc9a6811ac5b2a2e5780bdb67baffc04246a59f39e398be048f1b2d05460c"
+            ))
+            .unwrap();
+        assert_eq!(tx_idx, 0);
+
+        let tx_sender2 = cache
+            .get::<Address>(&format!(
+                "tx_sender:{}",
+                "0xa6155b295085d3b87a3c86e342fe11c3b22f9952d0d85d9d34d223b7d6a17cd8"
+            ))
+            .unwrap();
+        assert_eq!(
+            tx_sender2,
+            Address::from_str("0x6e5e56b972374e4fde8390df0033397df931a49d").unwrap()
+        );
+
+        let tx_block_number2 = cache
+            .get::<u64>(&format!(
+                "tx_block_number:{}",
+                "0xa6155b295085d3b87a3c86e342fe11c3b22f9952d0d85d9d34d223b7d6a17cd8"
+            ))
+            .unwrap();
+        assert_eq!(tx_block_number2, 1);
+
+        let tx_idx2 = cache
+            .get::<u64>(&format!(
+                "tx_idx:{}",
+                "0xa6155b295085d3b87a3c86e342fe11c3b22f9952d0d85d9d34d223b7d6a17cd8"
+            ))
+            .unwrap();
+        assert_eq!(tx_idx2, 1);
     }
 
     #[test]

crates/flashblocks-rpc/src/integration/integration_test.rs

@@ -165,7 +165,7 @@ mod tests {
             .http_port(1238)
             .websocket_url("ws://localhost:1239");
 
-        framework.start("reth-flashblocks", &reth).await.unwrap();
+        framework.start("base-reth-node", &reth).await.unwrap();
 
         // Wait for some time to allow messages to be processed
         tokio::time::sleep(Duration::from_secs(3)).await;
@@ -224,6 +224,27 @@ mod tests {
         assert!(receipt.is_some());
         assert_eq!(receipt.unwrap().gas_used(), 24000); // 45000 - 21000
 
+        // check transaction by hash
+        let tx = provider
+            .get_transaction_by_hash(
+                B256::from_str(
+                    "0x2be2e6f8b01b03b87ae9f0ebca8bbd420f174bef0fbcc18c7802c5378b78f548",
+                )
+                .unwrap(),
+            )
+            .await?;
+        assert!(tx.is_some());
+
+        let tx = provider
+            .get_transaction_by_hash(
+                B256::from_str(
+                    "0xa6155b295085d3b87a3c86e342fe11c3b22f9952d0d85d9d34d223b7d6a17cd8",
+                )
+                .unwrap(),
+            )
+            .await?;
+        assert!(tx.is_some());
+
         // check balance
         // use curl command to get balance with pending tag, since alloy provider doesn't support pending tag
         let output = std::process::Command::new("curl")

crates/flashblocks-rpc/src/rpc.rs

@@ -100,7 +100,7 @@ impl<E> EthApiExt<E> {
                         block_hash: Some(block.header.hash_slow()),
                         block_number: Some(block.number),
                         index: Some(idx as u64),
-                        base_fee: None,
+                        base_fee: block.base_fee_per_gas,
                     };
                     self.transform_tx(signed_tx_ec_recovered, tx_info)
                 })
@@ -397,12 +397,24 @@ where
                     .cache
                     .get::<Address>(&format!("tx_sender:{}", tx_hash))
                     .unwrap();
+                let block_number = self
+                    .cache
+                    .get::<u64>(&format!("tx_block_number:{}", tx_hash))
+                    .unwrap();
+                let block = self
+                    .cache
+                    .get::<OpBlock>(&format!("block:{:?}", block_number))
+                    .unwrap();
+                let index = self
+                    .cache
+                    .get::<u64>(&format!("tx_idx:{}", &tx_hash.to_string()))
+                    .unwrap();
                 let tx_info = TransactionInfo {
                     hash: Some(tx.tx_hash()),
-                    index: None,
-                    block_hash: None,
-                    block_number: None,
-                    base_fee: None,
+                    block_hash: Some(block.header.hash_slow()),
+                    block_number: Some(block.number),
+                    index: Some(index),
+                    base_fee: block.base_fee_per_gas,
                 };
                 let tx = Recovered::new_unchecked(tx, sender);
                 Ok(Some(self.transform_tx(tx, tx_info)))