chore: add transaction logs

reown-com · Oct 7, 2024 · 0bdf26c · 0bdf26c
1 parent 1707c43
commit 0bdf26c
Showing 1 changed file with 24 additions and 13 deletions.
diff --git a/crates/yttrium/src/bundler/models/user_operation_receipt.rs b/crates/yttrium/src/bundler/models/user_operation_receipt.rs
@@ -1,17 +1,19 @@
-use alloy::primitives::{b256, Address, B256, U8};
+use alloy::primitives::{
+    b256, Address, BlockHash, Bytes, TxHash, B256, U128, U64, U8
+};
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UserOperationReceiptReceipt {
-    pub transaction_hash: String,
+pub struct TransactionReceipt {
+    pub transaction_hash: TxHash,
     pub transaction_index: String,
-    pub block_hash: String,
-    pub block_number: String,
+    pub block_hash: BlockHash,
+    pub block_number: U64,
     pub from: Address,
     pub to: Address,
     pub cumulative_gas_used: String,
-    pub gas_used: String,
+    pub gas_used: U128,
     pub contract_address: Option<String>,
     pub status: U8,
     pub logs_bloom: String,
@@ -32,8 +34,16 @@ pub struct UserOperationReceipt {
     pub actual_gas_used: String,
     pub success: bool,
     // pub reason: String,
-    pub receipt: UserOperationReceiptReceipt,
-    // TODO: add `logs` property
+    pub receipt: TransactionReceipt,
+    pub logs: Vec<TransactionLog>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct TransactionLog {
+    pub address: Address,
+    pub topics: Vec<B256>,
+    pub data: Bytes,
 }
 
 impl UserOperationReceipt {
@@ -50,21 +60,22 @@ impl UserOperationReceipt {
             actual_gas_used: "0x20725".to_string(),
             success: true,
             // reason: "".to_string(),
-            receipt: UserOperationReceiptReceipt {
-                transaction_hash: "0x68b5465c1efe05e5a29f8551c3808e5fd3b0a46e7abb007e11c586632cf46c23".to_string(),
+            receipt: TransactionReceipt {
+                transaction_hash: b256!("68b5465c1efe05e5a29f8551c3808e5fd3b0a46e7abb007e11c586632cf46c23"),
                 transaction_index: "0x85".to_string(),
-                block_hash: "0x0b95eb450c36397458e77e38420b89f0b6336b7c61b7bbb9898e0318da0f4cd0".to_string(),
-                block_number: "0x113fc81".to_string(),
+                block_hash: b256!("0b95eb450c36397458e77e38420b89f0b6336b7c61b7bbb9898e0318da0f4cd0"),
+                block_number: "0x113fc81".parse().unwrap(),
                 from: "0x374a2c4dcb38ecbb606117ae1bfe402a52176ec1".parse().unwrap(),
                 to: "0x5ff137d4b0fdcd49dca30c7cf57e578a026d2789".parse().unwrap(),
                 cumulative_gas_used: "0x12bafe6".to_string(),
-                gas_used: "0x20d07".to_string(),
+                gas_used: "0x20d07".parse().unwrap(),
                 contract_address: None,
                 status: U8::from(1),
                 logs_bloom: "0x04400000000040002000000000000000000000000000000000000000000000000008000000000000000200010000000000100000000000000000020000000000000000000000000000000008000000000100000000000000000000000000000000000000080000000008000000000000000000000000000000000010000000000000000000040040100088000000000000000000000000000000000000000000000000000000000100400000000008000000000000000000000002000000000000000002000000100001000000000000000000002000000000000040000000000000000000000000200000000000000000000000000000000000000000000010".to_string(),
                 // r#type: "0x2".to_string(),
                 effective_gas_price: "0x86cb70a28".to_string(),
             },
+            logs: vec![],
         }
     }
 }