Feat/wait for user operation receipt

crates/ffi/src/account_client.rs

@@ -1,4 +1,5 @@
 use super::ffi;
+use yttrium::bundler::models::user_operation_receipt::UserOperationReceipt;
 use super::ffi::{FFIAccountClientConfig, FFIError};
 use yttrium::{
     account_client::{AccountClient, SignerType},
@@ -127,6 +128,19 @@ impl FFIAccountClient {
             .sign_message_with_mnemonic(message, mnemonic)
             .map_err(|e| FFIError::Unknown(e.to_string()))
     }
+
+    pub async fn wait_for_user_operation_receipt(
+        &self,
+        user_operation_hash: String
+    ) -> Result<String, FFIError> {
+        self.account_client
+        .wait_for_user_operation_receipt(user_operation_hash)
+        .await
+        .map_err(|e: eyre::Error| FFIError::Unknown(e.to_string()))
+        .iter()
+        .flat_map(|receipt|{serde_json::to_string(&receipt)?.into_iter()})
+        .collect::<String>()
+    }
 }
 
 impl From<ffi::FFITransaction> for Transaction {

crates/ffi/src/lib.rs

@@ -79,6 +79,11 @@ mod ffi {
             message: String,
             mnemonic: String,
         ) -> Result<String, FFIError>;
+
+        pub async fn wait_for_user_operation_receipt(
+            &self,
+            user_operation_hash: String
+        ) -> Result<String, FFIError>;
     }
 
     extern "Rust" {

crates/yttrium/src/account_client.rs

@@ -3,10 +3,16 @@ use crate::private_key_service::PrivateKeyService;
 use crate::sign_service::SignService;
 use crate::transaction::send::safe_test;
 use crate::transaction::{send::send_transaction, Transaction};
+use crate::user_operation::user_operation_hash;
 use alloy::primitives::Address;
 use alloy::signers::local::PrivateKeySigner;
 use std::sync::Arc;
 use tokio::sync::Mutex;
+use crate::bundler::models::user_operation_receipt::UserOperationReceipt;
+use crate::
+    bundler::{
+        client::BundlerClient, config::BundlerConfig
+};
 
 #[derive(Clone)]
 pub enum SignerType {
@@ -161,8 +167,34 @@ impl AccountClient {
 
         Ok(signature)
     }
+
+    pub async fn wait_for_user_operation_receipt(
+        &self,
+        user_operation_hash: String
+    ) -> eyre::Result<UserOperationReceipt> {
+
+        println!("Querying for receipts...");
+
+        let bundler_base_url = self.config.clone().endpoints.bundler.base_url;
+
+        let bundler_client =
+            BundlerClient::new(BundlerConfig::new(bundler_base_url.clone()));
+        let receipt = bundler_client
+            .wait_for_user_operation_receipt(user_operation_hash.clone())
+            .await?;
+
+        println!("Received User Operation receipt: {:?}", receipt);
+
+        let tx_hash = receipt.clone().receipt.transaction_hash;
+        println!(
+            "UserOperation included: https://sepolia.etherscan.io/tx/{}",
+            tx_hash
+        );
+        Ok(receipt)
+    }
 }
 
+
 impl AccountClient {
     pub fn mock() -> Self {
         AccountClient {

crates/yttrium/src/bundler/models/user_operation_receipt.rs

@@ -1,7 +1,7 @@
 use alloy::primitives::Address;
 use serde::{Deserialize, Serialize};
 
-#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct UserOperationReceiptReceipt {
     pub transaction_hash: String,
@@ -19,7 +19,7 @@ pub struct UserOperationReceiptReceipt {
     pub effective_gas_price: String,
 }
 
-#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize,)]
 #[serde(rename_all = "camelCase")]
 pub struct UserOperationReceipt {
     pub user_op_hash: String,

crates/yttrium/src/transaction/send.rs

@@ -349,24 +349,6 @@ mod tests {
 
         println!("Received User Operation hash: {:?}", user_operation_hash);
 
-        // let receipt = bundler_client
-        //     .get_user_operation_receipt(user_operation_hash.clone())
-        //     .await?;
-
-        // println!("Received User Operation receipt: {:?}", receipt);
-
-        // println!("Querying for receipts...");
-
-        // let receipt = bundler_client
-        //     .wait_for_user_operation_receipt(user_operation_hash.clone())
-        //     .await?;
-
-        // let tx_hash = receipt.receipt.transaction_hash;
-        // println!(
-        //     "UserOperation included: https://sepolia.etherscan.io/tx/{}",
-        //     tx_hash
-        // );
-
         Ok(user_operation_hash)
     }
 

crates/yttrium/src/transaction/send/safe_test.rs

@@ -406,18 +406,6 @@ pub async fn send_transaction(
 
     println!("Received User Operation hash: {:?}", user_operation_hash);
 
-    println!("Querying for receipts...");
-
-    let receipt = bundler_client
-        .wait_for_user_operation_receipt(user_operation_hash.clone())
-        .await?;
-
-    let tx_hash = receipt.receipt.transaction_hash;
-    println!(
-        "SAFE UserOperation included: https://sepolia.etherscan.io/tx/{}",
-        tx_hash
-    );
-
     // Some extra calls to wait for/get the actual transaction. But these
     // aren't required since eth_getUserOperationReceipt already waits
     // let tx_hash = FixedBytes::from_slice(

crates/yttrium/src/transaction/send/simple_account_test.rs

@@ -252,28 +252,6 @@ pub async fn send_transaction_with_signer(
 
     println!("Received User Operation hash: {:?}", user_operation_hash);
 
-    // TODO convert to polling
-    use std::time::Duration;
-    tokio::time::sleep(Duration::from_secs(2)).await;
-
-    let receipt = bundler_client
-        .get_user_operation_receipt(user_operation_hash.clone())
-        .await?;
-
-    println!("Received User Operation receipt: {:?}", receipt);
-
-    println!("Querying for receipts...");
-
-    let receipt = bundler_client
-        .wait_for_user_operation_receipt(user_operation_hash.clone())
-        .await?;
-
-    let tx_hash = receipt.receipt.transaction_hash;
-    println!(
-        "UserOperation included: https://sepolia.etherscan.io/tx/{}",
-        tx_hash
-    );
-
     Ok(user_operation_hash)
 }
 
@@ -479,20 +457,6 @@ mod tests {
             )
             .await?;
 
-        println!("Querying for receipts...");
-
-        let receipt = bundler_client
-            .wait_for_user_operation_receipt(user_operation_hash.clone())
-            .await?;
-
-        println!("Received User Operation receipt: {:?}", receipt);
-
-        let tx_hash = receipt.receipt.transaction_hash;
-        println!(
-            "UserOperation included: https://sepolia.etherscan.io/tx/{}",
-            tx_hash
-        );
-
         Ok(user_operation_hash)
     }
 

platforms/swift/Sources/Yttrium/AccountClient.swift

@@ -131,6 +131,15 @@ public final class AccountClient: AccountClientProtocol {
         )
         .toString()
     }
+
+    public func waitForUserOperationReceipt(
+        userOperationHash: String
+        ) async throws -> String {
+            try await coreAccountClient.wait_for_user_operation_receipt(
+                userOperationHash.intoRustString()
+            )
+            .toString()
+        }
 }
 
 extension Transaction {