deserialize all transactions in the block info too

Author: edg-l

rpc_state_reader_sn_api/src/lib.rs

@@ -120,6 +120,7 @@ pub struct RpcBlockInfo {
     pub block_timestamp: BlockTimestamp,
     /// The sequencer address of this block.
     pub sequencer_address: ContractAddress,
+    pub transactions: Vec<Transaction>,
 }
 
 type RpcResponse = ureq::Response;
@@ -314,7 +315,7 @@ impl RpcState {
     pub fn get_block_info(&self) -> RpcBlockInfo {
         let get_block_info_params = ureq::json!({
             "jsonrpc": "2.0",
-            "method": "starknet_getBlockWithTxHashes",
+            "method": "starknet_getBlockWithTxs",
             "params": [self.block.to_value()],
             "id": 1
         });
@@ -323,6 +324,24 @@ impl RpcState {
         let sequencer_address: StarkFelt =
             serde_json::from_value(block_info["result"]["sequencer_address"].clone()).unwrap();
 
+        let transactions: Vec<_> = block_info["result"]["transactions"]
+            .as_array()
+            .unwrap()
+            .iter()
+            .filter_map(|result| match dbg!(&result)["type"].as_str().unwrap() {
+                "INVOKE" => match result["version"].as_str().unwrap() {
+                    "0x0" => Some(Transaction::Invoke(InvokeTransaction::V0(
+                        serde_json::from_value(result.clone()).unwrap(),
+                    ))),
+                    "0x1" => Some(Transaction::Invoke(InvokeTransaction::V1(
+                        serde_json::from_value(result.clone()).unwrap(),
+                    ))),
+                    _ => None,
+                },
+                _ => None,
+            })
+            .collect();
+
         RpcBlockInfo {
             block_number: BlockNumber(
                 block_info["result"]["block_number"]
@@ -337,6 +356,7 @@ impl RpcState {
                     .unwrap(),
             ),
             sequencer_address: ContractAddress(sequencer_address.try_into().unwrap()),
+            transactions,
         }
     }
 
@@ -859,6 +879,7 @@ mod blockifier_transaction_tests {
             block_number,
             block_timestamp,
             sequencer_address,
+            ..
         } = rpc_reader.0.get_block_info();
 
         // Get transaction before giving ownership of the reader