Fix web.rs upgrade_wallet call. Order mnemonic first to make it easier to recover in the future.

Author: cryptoquick

src/structs.rs

@@ -51,9 +51,9 @@ pub struct PublicWalletData {
 #[derive(Serialize, Deserialize, Clone, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct EncryptedWalletData {
+    pub mnemonic: String,
     pub private: PrivateWalletData,
     pub public: PublicWalletData,
-    pub mnemonic: String,
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug)]

src/web.rs

@@ -111,11 +111,17 @@ pub mod bitcoin {
     }
 
     #[wasm_bindgen]
-    pub fn upgrade_wallet(password: String, encrypted_descriptors: String) -> Promise {
+    pub fn upgrade_wallet(
+        password: String,
+        encrypted_descriptors: String,
+        seed_password: String,
+    ) -> Promise {
         set_panic_hook();
 
         future_to_promise(async move {
-            match crate::bitcoin::upgrade_wallet(&password, &encrypted_descriptors) {
+            match crate::bitcoin::upgrade_wallet(&password, &encrypted_descriptors, &seed_password)
+                .await
+            {
                 Ok(result) => Ok(JsValue::from_string(
                     serde_json::to_string(&result).unwrap(),
                 )),