Merge pull request #16 from mwcproject/5.3.100

Handle http node client without urls. Report unlock errors with details.
mwcproject · Sep 20, 2024 · f07b562 · f07b562
2 parents 10906eb + e772226
commit f07b562
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 40 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/common/error.rs b/src/common/error.rs
@@ -36,8 +36,8 @@ pub enum Error {
     InvalidNumOutputs(String),
     #[error("invalid slate version given: `{0}`")]
     InvalidSlateVersion(String),
-    #[error("could not unlock wallet! are you using the correct passphrase?")]
-    WalletUnlockFailed,
+    #[error("could not unlock wallet! {0}")]
+    WalletUnlockFailed(String),
     #[error("Zero-conf Transactions are not allowed. Must have at least 1 confirmation.")]
     ZeroConfNotAllowed,
     #[error("The wallet is locked. Please use `unlock` first.")]

diff --git a/src/wallet/wallet.rs b/src/wallet/wallet.rs
@@ -81,7 +81,12 @@ impl Wallet {
         self.create_wallet_instance(config, account, passphrase)
             .map_err(|e| {
                 warn!("Unable to unlock wallet, {}", e);
-                Error::WalletUnlockFailed
+                let mut err_str = format!("{}", e);
+                if err_str.contains("check password?") {
+                    err_str = "are you using the correct passphrase?".to_string(); // magic phrase that is expected by QT wallet
+                }
+
+                Error::WalletUnlockFailed( err_str )
             })?;
         Ok(())
     }