fix github private repo access

Author: d4mr

.github/workflows/ci-twmq.yaml

@@ -30,6 +30,11 @@ jobs:
           --health-retries 5
 
     steps:
+      - name: Give GitHub Actions access to @thirdweb-dev/vault
+        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd #@v0.9.1
+        with:
+          ssh-private-key: ${{ secrets.VAULT_REPO_DEPLOY_KEY }}
+
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #checkout@v4
 
       - name: Install CI dependencies

.github/workflows/coverage-twmq.yaml

@@ -30,6 +30,11 @@ jobs:
           --health-retries 5
 
     steps:
+      - name: Give GitHub Actions access to @thirdweb-dev/vault
+        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd #@v0.9.1
+        with:
+          ssh-private-key: ${{ secrets.VAULT_REPO_DEPLOY_KEY }}
+
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #checkout@v4
 
       - name: Install CI dependencies

core/src/error.rs

@@ -11,7 +11,7 @@ use twmq::error::TwmqError;
 
 use crate::chain::Chain;
 
-#[derive(Debug, Error, Serialize, Deserialize)]
+#[derive(Debug, Error, Clone, Serialize, Deserialize)]
 pub enum RpcErrorKind {
     /// Server returned an error response.
     #[error("server returned an error response: {0}")]
@@ -56,7 +56,7 @@ pub enum RpcErrorKind {
     OtherTransportError(String),
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct RpcErrorResponse {
     /// The error code.
     pub code: i64,
@@ -97,7 +97,7 @@ pub struct RpcErrorInfo {
 }
 
 /// A serializable contract interaction error type
-#[derive(Debug, Error, Serialize, Deserialize)]
+#[derive(Debug, Error, Serialize, Deserialize, Clone)]
 pub enum ContractInteractionErrorKind {
     /// Unknown function referenced.
     #[error("unknown function: function {0} does not exist")]
@@ -137,7 +137,7 @@ pub enum ContractInteractionErrorKind {
     PendingTransactionError(String),
 }
 
-#[derive(Error, Debug, Serialize, Deserialize)]
+#[derive(Error, Debug, Serialize, Clone, Deserialize)]
 pub enum EngineError {
     #[error("RPC error on chain {chain_id} at {rpc_url}: {message}")]
     RpcError {

executors/src/external_bundler/confirm.rs

@@ -1,7 +1,7 @@
 use alloy::primitives::{Address, Bytes, U256};
 use engine_core::{
     chain::{Chain, ChainService, RpcCredentials},
-    error::AlloyRpcErrorToEngineError,
+    error::{AlloyRpcErrorToEngineError, EngineError},
     execution_options::WebhookOptions,
     rpc_clients::UserOperationReceipt,
 };
@@ -62,8 +62,7 @@ pub enum UserOpConfirmationError {
     ReceiptQueryFailed {
         user_op_hash: Bytes,
         message: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        inner_error: Option<serde_json::Value>,
+        inner_error: Option<EngineError>,
     },
 
     #[error("Internal error: {message}")]
@@ -155,7 +154,7 @@ where
             .map_err(|e| UserOpConfirmationError::ReceiptQueryFailed {
                 user_op_hash: job_data.user_op_hash.clone(),
                 message: e.to_string(),
-                inner_error: serde_json::to_value(&e.to_engine_bundler_error(&chain)).ok(),
+                inner_error: Some(e.to_engine_bundler_error(&chain)),
             })
             .map_err_nack(Some(self.confirmation_retry_delay), RequeuePosition::Last)?;
 

executors/src/external_bundler/send.rs

@@ -85,8 +85,7 @@ pub enum ExternalBundlerSendError {
         factory_address: Address,
         account_salt: String,
         message: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        inner_error: Option<serde_json::Value>,
+        inner_error: Option<EngineError>,
     },
 
     #[error("Deployment lock for account {account_address} could not be acquired: {message}")]
@@ -102,8 +101,7 @@ pub enum ExternalBundlerSendError {
         had_deployment_lock: bool,
         stage: String,
         message: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        inner_error: Option<serde_json::Value>,
+        inner_error: Option<EngineError>,
     },
 
     #[error("Failed to send UserOperation to bundler: {message}")]
@@ -113,8 +111,7 @@ pub enum ExternalBundlerSendError {
         had_deployment_lock: bool,
         user_op: UserOpVersion,
         message: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        inner_error: Option<serde_json::Value>,
+        inner_error: Option<EngineError>,
     },
 
     #[error("Invalid RPC Credentials: {message}")]
@@ -288,7 +285,7 @@ where
                     .factory_address,
                 account_salt: job_data.execution_options.account_salt.clone(),
                 message: e.to_string(),
-                inner_error: serde_json::to_value(&e).ok(),
+                inner_error: Some(e),
             })
             .map_err_fail()?,
         };
@@ -561,7 +558,7 @@ fn map_build_error(
         nonce_used: nonce,
         stage,
         message: engine_error.to_string(),
-        inner_error: serde_json::to_value(&engine_error).ok(),
+        inner_error: Some(engine_error.clone()),
         had_deployment_lock: had_lock,
     }
 }
@@ -581,7 +578,7 @@ fn map_bundler_error(
         nonce_used: nonce,
         user_op: signed_user_op.clone(),
         message: engine_error.to_string(),
-        inner_error: serde_json::to_value(&engine_error).ok(),
+        inner_error: Some(engine_error),
         had_deployment_lock: had_lock,
     }
 }
@@ -597,6 +594,7 @@ fn is_build_error_retryable(e: &EngineError) -> bool {
         }
         EngineError::PaymasterError { kind, .. } | EngineError::BundlerError { kind, .. } => {
             !is_http_error_code(kind, 400)
+                && !is_http_error_code(kind, 401)
                 && !matches!(
                     kind,
                     engine_core::error::RpcErrorKind::ErrorResp(r)