working state

Author: joaquim-verges

executors/src/external_bundler/confirm.rs

@@ -202,6 +202,7 @@ where
         tracing::info!(
             transaction_id = %job_data.transaction_id,
             user_op_hash = ?job_data.user_op_hash,
+            transaction_hash = ?receipt.receipt.transaction_hash,
             success = %receipt.success,
             "User operation confirmed on-chain"
         );

executors/src/external_bundler/send.rs

@@ -1,6 +1,6 @@
 use alloy::{
     hex::FromHex,
-    primitives::{Address, Bytes, U256},
+    primitives::{Address, Bytes, U256}, transports::RpcError,
 };
 use engine_aa_core::{
     account_factory::{AccountFactory, get_account_factory},
@@ -441,16 +441,20 @@ where
                     needs_init_code,
                 );
 
-                // if is_bundler_error_retryable(&e) {
-                if job.job.attempts < 100 {
-                    mapped_error.nack(Some(Duration::from_secs(10)), RequeuePosition::Last)
+                tracing::warn!(
+                    error = serde_json::to_string(&mapped_error).unwrap(),
+                    "error"
+                );
+
+                if is_bundler_error_retryable(mapped_error.to_owned().to_string()) {
+                    if job.job.attempts < 100 {
+                        mapped_error.nack(Some(Duration::from_secs(10)), RequeuePosition::Last)
+                    } else {
+                        mapped_error.fail()
+                    }
                 } else {
                     mapped_error.fail()
                 }
-
-                // } else {
-                //     mapped_error.fail()
-                // }
             })?;
 
         tracing::debug!(userop_hash = ?user_op_hash, "User operation sent to bundler");
@@ -680,3 +684,12 @@ fn is_non_retryable_rpc_code(code: i64) -> bool {
         _ => false,
     }
 }
+
+fn is_bundler_error_retryable(e: String) -> bool {
+    // TODO proper error parsing / handling
+    if e.contains("AA24") {
+        return false;
+    }
+
+    return true;
+}

thirdweb-core/src/iaw/mod.rs

@@ -417,16 +417,11 @@ impl IAWClient {
                 "message": userop_hash,
                 "isRaw": true,
                 "chainId": chain_id,
-                "originalMessage": userop,
+                "originalMessage": serde_json::to_string(&userop).unwrap(),
             }
         });
 
-        tracing::warn!(
-            payload = serde_json::to_string(&payload).unwrap(),
-            "Payload"
-        );
-
-        // Make the request to IAW service
+        // Make the request to IAW service with explicit timeout
         let url = format!("{}/api/v1/enclave-wallet/sign-message", self._base_url);
         let response = self._http_client
             .post(&url)