Add listdescriptors struct and test

Add the struct, client macro, test and reexports.

Redefine the struct in v25 for added return field.

Change to no_model since there is nothing to model.

Author: jamillambert

client/src/client_sync/v22/mod.rs

@@ -155,6 +155,7 @@ crate::impl_client_v17__import_pubkey!();
 crate::impl_client_v17__import_wallet!();
 crate::impl_client_v17__key_pool_refill!();
 crate::impl_client_v17__list_address_groupings!();
+crate::impl_client_v22__list_descriptors!();
 crate::impl_client_v18__list_received_by_label!();
 crate::impl_client_v17__list_labels!();
 crate::impl_client_v17__list_lock_unspent!();

client/src/client_sync/v22/wallet.rs

@@ -9,6 +9,18 @@
 //!
 //! See or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
 
+/// Implements Bitcoin Core JSON-RPC API method `listdescriptors`
+#[macro_export]
+macro_rules! impl_client_v22__list_descriptors {
+    () => {
+        impl Client {
+            pub fn list_descriptors(&self) -> Result<ListDescriptors> {
+                self.call("listdescriptors", &[])
+            }
+        }
+    };
+}
+
 /// Implements Bitcoin Core JSON-RPC API method `loadwallet`
 #[macro_export]
 macro_rules! impl_client_v22__load_wallet {

client/src/client_sync/v23/mod.rs

@@ -156,6 +156,7 @@ crate::impl_client_v17__import_pubkey!();
 crate::impl_client_v17__import_wallet!();
 crate::impl_client_v17__key_pool_refill!();
 crate::impl_client_v17__list_address_groupings!();
+crate::impl_client_v22__list_descriptors!();
 crate::impl_client_v18__list_received_by_label!();
 crate::impl_client_v17__list_labels!();
 crate::impl_client_v17__list_lock_unspent!();

client/src/client_sync/v24/mod.rs

@@ -153,6 +153,7 @@ crate::impl_client_v17__import_pubkey!();
 crate::impl_client_v17__import_wallet!();
 crate::impl_client_v17__key_pool_refill!();
 crate::impl_client_v17__list_address_groupings!();
+crate::impl_client_v22__list_descriptors!();
 crate::impl_client_v18__list_received_by_label!();
 crate::impl_client_v17__list_labels!();
 crate::impl_client_v17__list_lock_unspent!();

client/src/client_sync/v25/mod.rs

@@ -155,6 +155,7 @@ crate::impl_client_v17__import_pubkey!();
 crate::impl_client_v17__import_wallet!();
 crate::impl_client_v17__key_pool_refill!();
 crate::impl_client_v17__list_address_groupings!();
+crate::impl_client_v22__list_descriptors!();
 crate::impl_client_v18__list_received_by_label!();
 crate::impl_client_v17__list_labels!();
 crate::impl_client_v17__list_lock_unspent!();

client/src/client_sync/v26/mod.rs

@@ -159,6 +159,7 @@ crate::impl_client_v17__import_pubkey!();
 crate::impl_client_v17__import_wallet!();
 crate::impl_client_v17__key_pool_refill!();
 crate::impl_client_v17__list_address_groupings!();
+crate::impl_client_v22__list_descriptors!();
 crate::impl_client_v17__list_labels!();
 crate::impl_client_v18__list_received_by_label!();
 crate::impl_client_v17__list_lock_unspent!();

client/src/client_sync/v27/mod.rs

@@ -155,6 +155,7 @@ crate::impl_client_v17__import_pubkey!();
 crate::impl_client_v17__import_wallet!();
 crate::impl_client_v17__key_pool_refill!();
 crate::impl_client_v17__list_address_groupings!();
+crate::impl_client_v22__list_descriptors!();
 crate::impl_client_v18__list_received_by_label!();
 crate::impl_client_v17__list_labels!();
 crate::impl_client_v17__list_lock_unspent!();

client/src/client_sync/v28/mod.rs

@@ -157,6 +157,7 @@ crate::impl_client_v17__import_pubkey!();
 crate::impl_client_v17__import_wallet!();
 crate::impl_client_v17__key_pool_refill!();
 crate::impl_client_v17__list_address_groupings!();
+crate::impl_client_v22__list_descriptors!();
 crate::impl_client_v18__list_received_by_label!();
 crate::impl_client_v17__list_labels!();
 crate::impl_client_v17__list_lock_unspent!();

client/src/client_sync/v29/mod.rs

@@ -157,6 +157,7 @@ crate::impl_client_v17__import_pubkey!();
 crate::impl_client_v17__import_wallet!();
 crate::impl_client_v17__key_pool_refill!();
 crate::impl_client_v17__list_address_groupings!();
+crate::impl_client_v22__list_descriptors!();
 crate::impl_client_v18__list_received_by_label!();
 crate::impl_client_v17__list_labels!();
 crate::impl_client_v17__list_lock_unspent!();

integration_test/tests/wallet.rs

@@ -495,6 +495,25 @@ fn wallet__import_pubkey() {
     let _: () = node.client.import_pubkey(&pubkey).expect("importpubkey");
 }
 
+#[test]
+#[cfg(not(feature = "v21_and_below"))]
+fn wallet__list_descriptors() {
+    let node = Node::with_wallet(Wallet::None, &[]);
+    let wallet_name = "desc_wallet";
+
+    #[cfg(feature = "v22_and_below")]
+    node.client.create_wallet_with_descriptors(wallet_name).expect("create descriptor wallet");
+
+    // v23 onwards uses descriptor wallets by default.
+    #[cfg(not(feature = "v22_and_below"))]
+    node.client.create_wallet(wallet_name).expect("create wallet");
+
+    let json: ListDescriptors = node.client.list_descriptors().expect("listdescriptors");
+
+    let has_descriptor = json.descriptors.iter().any(|desc_info| desc_info.descriptor.starts_with("wpkh(") || desc_info.descriptor.starts_with("pkh("));
+    assert!(has_descriptor, "No standard descriptors found in listdescriptors result");
+}
+
 #[test]
 fn wallet__list_unspent__modelled() {
     let node = match () {