serialise vault errors better

Author: d4mr

Cargo.lock

@@ -203,6 +203,7 @@ pub enum EngineError {
 
     #[schema(title = "Engine Vault KMS Error")]
     #[error("Error interaction with vault: {message}")]
+    #[serde(rename_all = "camelCase")]
     VaultError { message: String },
 
     #[schema(title = "RPC Configuration Error")]
@@ -211,6 +212,7 @@ pub enum EngineError {
 
     #[schema(title = "EVM Contract Interaction Error")]
     #[error("Contract interaction error: {message}")]
+    #[serde(rename_all = "camelCase")]
     ContractInteractionError {
         /// Contract address
         #[schema(value_type = Option<AddressDef>)]
@@ -236,6 +238,27 @@ pub enum EngineError {
     InternalError { message: String },
 }
 
+impl From<vault_sdk::error::VaultError> for EngineError {
+    fn from(err: vault_sdk::error::VaultError) -> Self {
+        let message = match &err {
+            vault_sdk::error::VaultError::EnclaveError {
+                code,
+                message,
+                details,
+            } => match details {
+                Some(details) => format!(
+                    "Enclave error: {} - {} - details: {}",
+                    code, message, details
+                ),
+                None => format!("Enclave error: {} - {}", code, message),
+            },
+            _ => err.to_string(),
+        };
+
+        EngineError::VaultError { message }
+    }
+}
+
 impl From<InvalidHeaderValue> for EngineError {
     fn from(err: InvalidHeaderValue) -> Self {
         EngineError::ValidationError {

core/src/error.rs

@@ -197,9 +197,7 @@ impl AccountSigner for EoaSigner {
                     .await
                     .map_err(|e| {
                         tracing::error!("Error signing message with EOA: {:?}", e);
-                        EngineError::VaultError {
-                            message: e.to_string(),
-                        }
+                        e
                     })?;
 
                 Ok(vault_result.signature)
@@ -221,9 +219,7 @@ impl AccountSigner for EoaSigner {
                     .await
                     .map_err(|e| {
                         tracing::error!("Error signing typed data with EOA: {:?}", e);
-                        EngineError::VaultError {
-                            message: e.to_string(),
-                        }
+                        e
                     })?;
 
                 Ok(vault_result.signature)

core/src/signer.rs

@@ -94,9 +94,7 @@ impl UserOpSigner {
                     .await
                     .map_err(|e| {
                         tracing::error!("Error signing userop: {:?}", e);
-                        EngineError::VaultError {
-                            message: e.to_string(),
-                        }
+                        e
                     })?;
 
                 Ok(Bytes::from_hex(vault_result.signature).map_err(|_| {