Implement version specific types for importwallet

GideonBature · GideonBature · commit c062c9191dbd · 2025-04-15T02:39:44.000+01:00
diff --git a/client/src/client_sync/v17/mod.rs b/client/src/client_sync/v17/mod.rs
@@ -132,6 +132,7 @@ crate::impl_client_v17__importaddress!();
 crate::impl_client_v17__importprivkey!();
 crate::impl_client_v17__importprunedfunds!();
 crate::impl_client_v17__importpubkey!();
+crate::impl_client_v17__importwallet!();
 
 /// Argument to the `Client::get_new_address_with_type` function.
 ///
diff --git a/client/src/client_sync/v17/wallet.rs b/client/src/client_sync/v17/wallet.rs
@@ -631,3 +631,21 @@ macro_rules! impl_client_v17__importpubkey {
         }
     };
 }
+
+/// Implements Bitcoin Core JSON-RPC API method `importwallet`
+#[macro_export]
+macro_rules! impl_client_v17__importwallet {
+    () => {
+        impl Client {
+            pub fn import_wallet(&self, filename: &Path) -> Result<()> {
+                let filename_str = filename.to_string_lossy();
+                match self.call("importwallet", &[filename_str.as_ref().into()]) {
+                    Ok(serde_json::Value::Null) => Ok(()),
+                    Ok(ref val) if val.is_null() => Ok(()),
+                    Ok(other) => Err(crate::client_sync::Error::Returned(format!("importwallet expected null, got: {}", other))),
+                    Err(e) => Err(e.into()),
+                }
+            }
+        }
+    };
+}
diff --git a/client/src/client_sync/v18/mod.rs b/client/src/client_sync/v18/mod.rs
@@ -125,3 +125,4 @@ crate::impl_client_v17__importaddress!();
 crate::impl_client_v17__importprivkey!();
 crate::impl_client_v17__importprunedfunds!();
 crate::impl_client_v17__importpubkey!();
+crate::impl_client_v17__importwallet!();
diff --git a/client/src/client_sync/v19/mod.rs b/client/src/client_sync/v19/mod.rs
@@ -127,3 +127,4 @@ crate::impl_client_v17__importaddress!();
 crate::impl_client_v17__importprivkey!();
 crate::impl_client_v17__importprunedfunds!();
 crate::impl_client_v17__importpubkey!();
+crate::impl_client_v17__importwallet!();
diff --git a/client/src/client_sync/v20/mod.rs b/client/src/client_sync/v20/mod.rs
@@ -126,3 +126,4 @@ crate::impl_client_v17__importaddress!();
 crate::impl_client_v17__importprivkey!();
 crate::impl_client_v17__importprunedfunds!();
 crate::impl_client_v17__importpubkey!();
+crate::impl_client_v17__importwallet!();
diff --git a/client/src/client_sync/v21/mod.rs b/client/src/client_sync/v21/mod.rs
@@ -126,3 +126,4 @@ crate::impl_client_v17__importaddress!();
 crate::impl_client_v17__importprivkey!();
 crate::impl_client_v17__importprunedfunds!();
 crate::impl_client_v17__importpubkey!();
+crate::impl_client_v17__importwallet!();
diff --git a/client/src/client_sync/v22/mod.rs b/client/src/client_sync/v22/mod.rs
@@ -127,3 +127,4 @@ crate::impl_client_v17__importaddress!();
 crate::impl_client_v17__importprivkey!();
 crate::impl_client_v17__importprunedfunds!();
 crate::impl_client_v17__importpubkey!();
+crate::impl_client_v17__importwallet!();
diff --git a/client/src/client_sync/v23/mod.rs b/client/src/client_sync/v23/mod.rs
@@ -128,6 +128,7 @@ crate::impl_client_v17__importaddress!();
 crate::impl_client_v17__importprivkey!();
 crate::impl_client_v17__importprunedfunds!();
 crate::impl_client_v17__importpubkey!();
+crate::impl_client_v17__importwallet!();
 
 /// Argument to the `Client::get_new_address_with_type` function.
 ///
diff --git a/client/src/client_sync/v24.rs b/client/src/client_sync/v24.rs
@@ -124,3 +124,4 @@ crate::impl_client_v17__importaddress!();
 crate::impl_client_v17__importprivkey!();
 crate::impl_client_v17__importprunedfunds!();
 crate::impl_client_v17__importpubkey!();
+crate::impl_client_v17__importwallet!();
diff --git a/client/src/client_sync/v25.rs b/client/src/client_sync/v25.rs
@@ -124,3 +124,4 @@ crate::impl_client_v17__importaddress!();
 crate::impl_client_v17__importprivkey!();
 crate::impl_client_v17__importprunedfunds!();
 crate::impl_client_v17__importpubkey!();
+crate::impl_client_v17__importwallet!();
diff --git a/client/src/client_sync/v26/mod.rs b/client/src/client_sync/v26/mod.rs
@@ -129,3 +129,4 @@ crate::impl_client_v17__importaddress!();
 crate::impl_client_v17__importprivkey!();
 crate::impl_client_v17__importprunedfunds!();
 crate::impl_client_v17__importpubkey!();
+crate::impl_client_v17__importwallet!();
diff --git a/client/src/client_sync/v27.rs b/client/src/client_sync/v27.rs
@@ -125,3 +125,4 @@ crate::impl_client_v17__importaddress!();
 crate::impl_client_v17__importprivkey!();
 crate::impl_client_v17__importprunedfunds!();
 crate::impl_client_v17__importpubkey!();
+crate::impl_client_v17__importwallet!();
diff --git a/client/src/client_sync/v28/mod.rs b/client/src/client_sync/v28/mod.rs
@@ -129,3 +129,4 @@ crate::impl_client_v17__importaddress!();
 crate::impl_client_v17__importprivkey!();
 crate::impl_client_v17__importprunedfunds!();
 crate::impl_client_v17__importpubkey!();
+crate::impl_client_v17__importwallet!();
diff --git a/integration_test/tests/wallet.rs b/integration_test/tests/wallet.rs
@@ -513,3 +513,36 @@ fn wallet__import_pubkey() {
     let label = "imported_pubkey";
     node.client.import_pubkey(&pub_key, Some(label), Some(false)).expect("importpubkey failed");
 }
+
+#[test]
+fn wallet__import_wallet() {
+    let node = {
+        #[cfg(any(
+            feature = "v17",
+            feature = "v18",
+            feature = "v19",
+        ))] {
+            Node::with_wallet(Wallet::Default, &[])
+        }
+
+        #[cfg(not(any(
+            feature = "v17",
+            feature = "v18",
+            feature = "v19",
+        )))] {
+            let node = Node::with_wallet(Wallet::None, &["-deprecatedrpc=create_bdb"]);
+            let wallet_name = format!("legacy_source_dump_{}", rand::random::<u32>());
+            node.client.create_legacy_wallet(&wallet_name).expect("Failed to create  legacy source wallet");
+            node
+        }
+    };
+
+    node.client.new_address().expect("Failed to generate address before dump");
+
+    let dump_file_path = integration_test::random_tmp_file();
+
+    node.client.dump_wallet(&dump_file_path).expect("dump_wallet failed");
+    assert!(dump_file_path.exists(), "Dump file should exist after dumpwallet");
+
+    node.client.import_wallet(&dump_file_path).expect("importwallet RPC call failed");
+}
diff --git a/verify/src/method/v17.rs b/verify/src/method/v17.rs
@@ -150,6 +150,7 @@ pub const METHODS: &[Method] = &[
         "sign_raw_transaction_with_wallet",
     ),
     Method::new_nothing("unloadwallet", "unload_wallet"),
+    Method::new_nothing("importwallet", "import_wallet"),
     Method::new_modelled(
         "walletcreatefundedpsbt",
         "WalletCreateFundedPsbt",
diff --git a/verify/src/method/v18.rs b/verify/src/method/v18.rs
@@ -151,6 +151,7 @@ pub const METHODS: &[Method] = &[
         "wallet_create_funded_psbt",
     ),
     Method::new_nothing("walletlock", "wallet_lock"),
+    Method::new_nothing("importwallet", "import_wallet"),
     Method::new_nothing("walletpassphrase", "wallet_passphrase"),
     Method::new_nothing("walletpassphrasechange", "wallet_passphrase_change"),
     Method::new_modelled("walletprocesspsbt", "WalletProcessPsbt", "wallet_process_psbt"),
diff --git a/verify/src/method/v19.rs b/verify/src/method/v19.rs
@@ -152,6 +152,7 @@ pub const METHODS: &[Method] = &[
         "WalletCreateFundedPsbt",
         "wallet_create_funded_psbt",
     ),
+    Method::new_nothing("importwallet", "import_wallet"),
     Method::new_nothing("walletlock", "wallet_lock"),
     Method::new_nothing("walletpassphrase", "wallet_passphrase"),
     Method::new_nothing("walletpassphrasechange", "wallet_passphrase_change"),
diff --git a/verify/src/method/v20.rs b/verify/src/method/v20.rs
@@ -153,6 +153,7 @@ pub const METHODS: &[Method] = &[
         "WalletCreateFundedPsbt",
         "wallet_create_funded_psbt",
     ),
+    Method::new_nothing("importwallet", "import_wallet"),
     Method::new_nothing("walletlock", "wallet_lock"),
     Method::new_nothing("walletpassphrase", "wallet_passphrase"),
     Method::new_nothing("walletpassphrasechange", "wallet_passphrase_change"),
diff --git a/verify/src/method/v21.rs b/verify/src/method/v21.rs
@@ -152,6 +152,7 @@ pub const METHODS: &[Method] = &[
         "SignRawTransactionWithWallet",
         "sign_raw_transaction_with_wallet",
     ),
+    Method::new_nothing("importwallet", "import_wallet"),
     Method::new_nothing("unloadwallet", "unload_wallet"),
     Method::new_no_model("upgradewallet", "UpgradeWalled", "upgrade_wallet"),
     Method::new_modelled(
diff --git a/verify/src/method/v22.rs b/verify/src/method/v22.rs
@@ -154,6 +154,7 @@ pub const METHODS: &[Method] = &[
         "SignRawTransactionWithWallet",
         "sign_raw_transaction_with_wallet",
     ),
+    Method::new_nothing("importwallet", "import_wallet"),
     Method::new_nothing("unloadwallet", "unload_wallet"),
     Method::new_no_model("upgradewallet", "UpgradeWalled", "upgrade_wallet"),
     Method::new_modelled(
diff --git a/verify/src/method/v23.rs b/verify/src/method/v23.rs
@@ -154,6 +154,7 @@ pub const METHODS: &[Method] = &[
         "SignRawTransactionWithWallet",
         "sign_raw_transaction_with_wallet",
     ),
+    Method::new_nothing("importwallet", "import_wallet"),
     Method::new_nothing("unloadwallet", "unload_wallet"),
     Method::new_no_model("upgradewallet", "UpgradeWalled", "upgrade_wallet"),
     Method::new_modelled(
diff --git a/verify/src/method/v24.rs b/verify/src/method/v24.rs
@@ -152,6 +152,7 @@ pub const METHODS: &[Method] = &[
     Method::new_bool("settxfee", "set_tx_fee"),
     Method::new_modelled("setwalletflag", "SetWalletFlag", "set_wallet_flag"),
     Method::new_modelled("signmessage", "SignMessage", "sign_message"),
+    Method::new_nothing("importwallet", "import_wallet"),
     Method::new_modelled(
         "signrawtransactionwithwallet",
         "SignRawTransactionWithWallet",
diff --git a/verify/src/method/v25.rs b/verify/src/method/v25.rs
@@ -152,6 +152,7 @@ pub const METHODS: &[Method] = &[
     Method::new_nothing("setlabel", "set_label"),
     Method::new_bool("settxfee", "set_tx_fee"),
     Method::new_modelled("setwalletflag", "SetWalletFlag", "set_wallet_flag"),
+    Method::new_nothing("importwallet", "import_wallet"),
     Method::new_modelled("signmessage", "SignMessage", "sign_message"),
     Method::new_modelled(
         "signrawtransactionwithwallet",
diff --git a/verify/src/method/v26.rs b/verify/src/method/v26.rs
@@ -152,6 +152,7 @@ pub const METHODS: &[Method] = &[
     Method::new_nothing("removeprunedfunds", "remove_pruned_funds"),
     Method::new_modelled("rescanblockchain", "RescanBlockchain", "rescan_blockchain"),
     Method::new_modelled("restorewallet", "RestoreWallet", "restore_wallet"),
+    Method::new_nothing("importwallet", "import_wallet"),
     Method::new_modelled("send", "Send", "send"),
     Method::new_modelled("sendall", "SendAll", "send_all"),
     Method::new_modelled("sendmany", "SendMany", "send_many"),
diff --git a/verify/src/method/v27.rs b/verify/src/method/v27.rs
@@ -152,6 +152,7 @@ pub const METHODS: &[Method] = &[
     Method::new_modelled("loadwallet", "LoadWallet", "load_wallet"),
     Method::new_bool("lockunspent", "lock_unspent"),
     Method::new_nothing("removeprunedfunds", "remove_pruned_funds"),
+    Method::new_nothing("importwallet", "import_wallet"),
     Method::new_modelled("rescanblockchain", "RescanBlockchain", "rescan_blockchain"),
     Method::new_modelled("restorewallet", "RestoreWallet", "restore_wallet"),
     Method::new_modelled("send", "Send", "send"),
diff --git a/verify/src/method/v28.rs b/verify/src/method/v28.rs
@@ -152,6 +152,7 @@ pub const METHODS: &[Method] = &[
     Method::new_no_model("listwalletdir", "ListWalletDir", "list_wallet_dir"),
     Method::new_modelled("listwallets", "ListWallets", "list_wallets"),
     Method::new_modelled("loadwallet", "LoadWallet", "load_wallet"),
+    Method::new_nothing("importwallet", "import_wallet"),
     Method::new_bool("lockunspent", "lock_unspent"),
     Method::new_nothing("removeprunedfunds", "remove_pruned_funds"),
     Method::new_modelled("rescanblockchain", "RescanBlockchain", "rescan_blockchain"),
