Merge pull request #78 from utxostack/fix-vss-error

fix: handle FailedParsingVssValue when wait device lock syncing

Author: duanyytop

Diff for: Cargo.lock

@@ -176,6 +176,8 @@ pub enum MutinyError {
     /// Failed to authenticate using JWT
     #[error("Failed to authenticate using JWT.")]
     JwtAuthFailure,
+    #[error("Failed to parse VSS value from getObject response.")]
+    FailedParsingVssValue,
     #[error(transparent)]
     Other(anyhow::Error),
 }

Diff for: mutiny-core/src/error.rs

@@ -840,19 +840,36 @@ impl<S: MutinyStorage> MutinyWalletBuilder<S> {
             let device_id = self.storage.get_device_id()?;
             let max_retries = 10;
             let mut retries = 0;
-            while !self
-                .storage
-                .fetch_device_lock()
-                .await?
-                .is_some_and(|lock| lock.is_last_locker(&device_id))
-            {
+            while retries <= max_retries {
                 log_info!(logger, "Waiting device lock syncing... {retries}");
+
+                match self.storage.fetch_device_lock().await {
+                    Ok(lock_option) => {
+                        if let Some(lock) = lock_option {
+                            if lock.is_last_locker(&device_id) {
+                                break;
+                            }
+                        }
+                    }
+                    Err(MutinyError::FailedParsingVssValue) => {
+                        log_info!(logger, "Failed to parse VSS value, retrying... {retries}");
+                    }
+                    Err(e) => {
+                        log_error!(logger, "Error fetching device lock: {:?}", e);
+                        return Err(e);
+                    }
+                }
+
                 retries += 1;
+
                 if retries > max_retries {
-                    log_error!(logger, "Can't syncing device lock to VSS");
+                    log_error!(
+                        logger,
+                        "Can't sync device lock to VSS after {max_retries} attempts"
+                    );
                     return Err(MutinyError::AlreadyRunning);
                 }
-                sleep(300).await
+                sleep(300).await;
             }
         }
         log_debug!(logger, "finished checking device lock");

Diff for: mutiny-core/src/lib.rs

@@ -168,7 +168,7 @@ impl MutinyVssClient {
             .await
             .map_err(|e| {
                 log_error!(self.logger, "Error parsing get objects response: {e}");
-                MutinyError::Other(anyhow!("Error parsing get objects response: {e}"))
+                MutinyError::FailedParsingVssValue
             })?;
 
         result.decrypt(&self.encryption_key)

Diff for: mutiny-core/src/vss.rs

@@ -2,7 +2,7 @@ cargo-features = ["per-package-target"]
 
 [package]
 name = "mutiny-wasm"
-version = "1.10.25"
+version = "1.10.26"
 edition = "2021"
 authors = ["utxostack"]
 forced-target = "wasm32-unknown-unknown"

Diff for: mutiny-wasm/Cargo.toml

@@ -186,6 +186,8 @@ pub enum MutinyJsError {
     InvalidHex,
     #[error("JWT Auth Failure")]
     JwtAuthFailure,
+    #[error("Failed to parse VSS value from getObject response.")]
+    FailedParsingVssValue,
     /// Unknown error.
     #[error("Unknown Error")]
     UnknownError,
@@ -252,6 +254,7 @@ impl From<MutinyError> for MutinyJsError {
             MutinyError::InvalidPsbt => MutinyJsError::InvalidPsbt,
             MutinyError::InvalidHex => MutinyJsError::InvalidHex,
             MutinyError::JwtAuthFailure => MutinyJsError::JwtAuthFailure,
+            MutinyError::FailedParsingVssValue => MutinyJsError::FailedParsingVssValue,
         }
     }
 }