Add createwalletdescriptor method and test

Nothing to model returned.

Add the struct and test.

Add the reexports and update the types table. Verify is already
`new_no_model`.

Author: jamillambert

client/src/client_sync/v28/mod.rs

@@ -142,6 +142,7 @@ crate::impl_client_v17__add_multisig_address!();
 crate::impl_client_v17__backup_wallet!();
 crate::impl_client_v17__bump_fee!();
 crate::impl_client_v23__create_wallet!();
+crate::impl_client_v28__create_wallet_descriptor!();
 crate::impl_client_v17__dump_priv_key!();
 crate::impl_client_v17__dump_wallet!();
 crate::impl_client_v17__encrypt_wallet!();

client/src/client_sync/v28/wallet.rs

@@ -18,3 +18,16 @@ macro_rules! impl_client_v28__get_hd_keys {
         }
     };
 }
+
+/// Implements Bitcoin Core JSON-RPC API method `createwalletdescriptor`.
+#[macro_export]
+macro_rules! impl_client_v28__create_wallet_descriptor {
+    () => {
+        impl Client {
+            pub fn create_wallet_descriptor(&self, address_type: &str, hdkey: &str) -> Result<CreateWalletDescriptor> {
+                let hdkey = serde_json::json!({ "hdkey": hdkey });
+                self.call("createwalletdescriptor", &[address_type.into(), hdkey.into()])
+            }
+        }
+    };
+}

client/src/client_sync/v29/mod.rs

@@ -142,6 +142,7 @@ crate::impl_client_v17__add_multisig_address!();
 crate::impl_client_v17__backup_wallet!();
 crate::impl_client_v17__bump_fee!();
 crate::impl_client_v23__create_wallet!();
+crate::impl_client_v28__create_wallet_descriptor!();
 crate::impl_client_v17__dump_priv_key!();
 crate::impl_client_v17__dump_wallet!();
 crate::impl_client_v17__encrypt_wallet!();

integration_test/tests/wallet.rs

@@ -6,6 +6,7 @@
 #![allow(unused_imports)] // Some imports are only used in specific versions.
 
 use bitcoin::address::{Address, KnownHrp, NetworkChecked};
+use bitcoin::bip32::{Xpriv, Xpub};
 use bitcoin::{secp256k1, Amount, CompressedPublicKey, FeeRate, Network, PrivateKey, PublicKey};
 use integration_test::{Node, NodeExt as _, Wallet};
 use node::{mtype, AddressType, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp};
@@ -118,6 +119,40 @@ fn wallet__create_wallet__modelled() {
     let _ = Node::with_wallet(Wallet::Default, &[]);
 }
 
+#[test]
+#[cfg(not(feature = "v27_and_below"))]
+fn wallet__create_wallet_descriptor() {
+    let node = Node::with_wallet(Wallet::Default, &[]);
+
+    // BIP32 HD xprv/xpub for the creation of a descriptor with a private key that is in the wallet.
+    let secp = secp256k1::Secp256k1::new();
+    let seed = [0u8; 32];
+    let xprv = Xpriv::new_master(Network::Regtest, &seed).unwrap();
+    let xpub = Xpub::from_priv(&secp, &xprv);
+    let hdkey = xpub.to_string();
+
+    // Import the private key into the wallet.
+    let privkey = bitcoin::PrivateKey {
+        compressed: true,
+        network: Network::Regtest.into(),
+        inner: xprv.private_key,
+    };
+    let wif = privkey.to_wif();
+    let raw_descriptor = format!("wpkh({})", wif);
+    let info = node.client.get_descriptor_info(&raw_descriptor).expect("get_descriptor_info");
+    let descriptor = format!("{}#{}", raw_descriptor, info.checksum);
+
+    let import_req = ImportDescriptorsRequest::new(descriptor, 0);
+    node.client.import_descriptors(&[import_req]).expect("importdescriptors");
+
+    let json = node.client.create_wallet_descriptor("bech32", &hdkey)
+        .expect("createwalletdescriptor");
+
+    // Check that a SigWit descriptor was created.
+    let prefix = &json.descriptors[0][0..4];
+    assert_eq!(prefix, "wpkh");
+}
+
 #[test]
 fn wallet__dump_priv_key__modelled() {
     // As of Core v23 the default wallet is an native descriptor wallet which does not

types/src/v28/mod.rs

@@ -176,7 +176,7 @@
 //! | backupwallet                       | returns nothing |                                        |
 //! | bumpfee                            | version + model |                                        |
 //! | createwallet                       | version + model |                                        |
-//! | createwalletdescriptor             | version + model | TODO                                   |
+//! | createwalletdescriptor             | version         |                                        |
 //! | dumpprivkey                        | version + model |                                        |
 //! | dumpwallet                         | version + model |                                        |
 //! | encryptwallet                      | version         |                                        |
@@ -267,7 +267,7 @@ pub use self::{
         SubmitPackage, SubmitPackageError, SubmitPackageTxResult, SubmitPackageTxResultError,
         SubmitPackageTxResultFees, SubmitPackageTxResultFeesError,
     },
-    wallet::{GetAddressInfo, GetAddressInfoEmbedded, GetHdKeys, HdKey, HdKeyDescriptor, GetHdKeysError, GetTransaction},
+    wallet::{GetAddressInfo, GetAddressInfoEmbedded, CreateWalletDescriptor, GetHdKeys, HdKey, HdKeyDescriptor, GetHdKeysError, GetTransaction},
 };
 #[doc(inline)]
 pub use crate::{

types/src/v28/wallet/mod.rs

@@ -146,6 +146,23 @@ pub struct GetAddressInfoEmbedded {
     pub labels: Option<Vec<String>>,
 }
 
+/// Result of the JSON-RPC method `createwalletdescriptor`.
+///
+/// > createwalletdescriptor "type" ( {"internal":bool,"hdkey":"str",...} )
+/// >
+/// > Creates the wallet's descriptor for the given address type. The address type must be one that the wallet does not already have a descriptor for.
+/// > Requires wallet passphrase to be set with walletpassphrase call if wallet is encrypted.
+/// >
+/// > Arguments:
+/// > 1. type       (string, required) The address type the descriptor will produce. Options are "legacy", "p2sh-segwit", "bech32", and "bech32m".
+#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
+#[serde(deny_unknown_fields)]
+pub struct CreateWalletDescriptor {
+    /// The public descriptors that were added to the wallet.
+    #[serde(rename = "descs")]
+    pub descriptors: Vec<String>,
+}
+
 /// Result of the JSON-RPC method `gethdkeys`.
 ///
 /// > gethdkeys ( {"active_only":bool,"private":bool,...} )

types/src/v29/mod.rs

@@ -177,7 +177,7 @@
 //! | backupwallet                       | returns nothing |                                        |
 //! | bumpfee                            | version + model |                                        |
 //! | createwallet                       | version + model |                                        |
-//! | createwalletdescriptor             | version + model | TODO                                   |
+//! | createwalletdescriptor             | version         |                                        |
 //! | dumpprivkey                        | version + model |                                        |
 //! | dumpwallet                         | version + model |                                        |
 //! | encryptwallet                      | version         |                                        |
@@ -345,6 +345,6 @@ pub use crate::{
     v28::{
         GetAddressInfo, GetAddressInfoEmbedded, GetNetworkInfo, GetTransaction, Logging,
         SubmitPackage, SubmitPackageError, SubmitPackageTxResult, SubmitPackageTxResultError,
-        SubmitPackageTxResultFees, SubmitPackageTxResultFeesError, GetHdKeys, HdKey, HdKeyDescriptor, GetHdKeysError,
+        SubmitPackageTxResultFees, SubmitPackageTxResultFeesError, GetHdKeys, HdKey, HdKeyDescriptor, GetHdKeysError, CreateWalletDescriptor,
     },
 };