added bech32m address type and create wallet w/ descriptors

added import descriptors feature

fixing tests

updates

added tests properly

Author: sandipndev

client/src/client.rs

@@ -276,20 +276,46 @@ pub trait RpcApi: Sized {
         blank: Option<bool>,
         passphrase: Option<&str>,
         avoid_reuse: Option<bool>,
+        descriptors: Option<bool>,
     ) -> Result<json::LoadWalletResult> {
         let mut args = [
             wallet.into(),
             opt_into_json(disable_private_keys)?,
             opt_into_json(blank)?,
             opt_into_json(passphrase)?,
             opt_into_json(avoid_reuse)?,
+            opt_into_json(descriptors)?,
         ];
         self.call(
             "createwallet",
-            handle_defaults(&mut args, &[false.into(), false.into(), into_json("")?, false.into()]),
+            handle_defaults(
+                &mut args,
+                &[false.into(), false.into(), into_json("")?, false.into(), false.into()],
+            ),
         )
     }
 
+    fn import_descriptors(&self, descriptor: &str, change_descriptor: &str) -> Result<bool> {
+        let ex_descriptor = json::DescriptorFormat {
+            descriptor: descriptor.to_string(),
+            timestamp: "now".to_string(),
+            active: true,
+            range: [0, 100],
+            internal: false,
+        };
+
+        let in_descriptor = json::DescriptorFormat {
+            descriptor: change_descriptor.to_string(),
+            timestamp: "now".to_string(),
+            active: true,
+            range: [0, 999],
+            internal: true,
+        };
+
+        let args = [into_json(ex_descriptor)?, into_json(in_descriptor)?];
+        self.call("importdescriptors", &args)
+    }
+
     fn list_wallets(&self) -> Result<Vec<String>> {
         self.call("listwallets", &[])
     }

integration_test/run.sh

@@ -22,25 +22,28 @@ BLOCKFILTERARG=""
 if bitcoind -version | grep -q "v0\.\(19\|2\)"; then
     BLOCKFILTERARG="-blockfilterindex=1"
 fi
+BLOCKFILTERARG="-blockfilterindex=1"
 
 FALLBACKFEEARG=""
 if bitcoind -version | grep -q "v0\.2"; then
     FALLBACKFEEARG="-fallbackfee=0.00001000"
 fi
+FALLBACKFEEARG="-fallbackfee=0.00001000"
 
 bitcoind -regtest $BLOCKFILTERARG $FALLBACKFEEARG \
     -datadir=${TESTDIR}/2 \
     -connect=127.0.0.1:12348 \
-    -rpcport=12349 \
+    -rpcport=18443 \
     -server=1 \
     -printtoconsole=0 &
 PID2=$!
 
 # Let it connect to the other node.
 sleep 5
 
-RPC_URL=http://localhost:12349 \
+RPC_URL=http://localhost:18443 \
     RPC_COOKIE=${TESTDIR}/2/regtest/.cookie \
+    RUST_LOG=debug \
     cargo run
 
 RESULT=$?

integration_test/src/main.rs

@@ -32,9 +32,7 @@ use bitcoin::{
     Address, Amount, Network, OutPoint, PrivateKey, Script, SigHashType, SignedAmount, Transaction,
     TxIn, TxOut, Txid,
 };
-use bitcoincore_rpc_json::{
-    GetBlockTemplateModes, GetBlockTemplateRules, ScanTxOutRequest,
-};
+use bitcoincore_rpc_json::{GetBlockTemplateModes, GetBlockTemplateRules, ScanTxOutRequest};
 
 lazy_static! {
     static ref SECP: secp256k1::Secp256k1<secp256k1::All> = secp256k1::Secp256k1::new();
@@ -135,7 +133,9 @@ fn main() {
     unsafe { VERSION = cl.version().unwrap() };
     println!("Version: {}", version());
 
-    cl.create_wallet("testwallet", None, None, None, None).unwrap();
+    test_import_descriptors(&cl);
+
+    cl.create_wallet("testwallet", None, None, None, None, None).unwrap();
 
     test_get_mining_info(&cl);
     test_get_blockchain_info(&cl);
@@ -907,6 +907,7 @@ fn test_create_wallet(cl: &Client) {
         blank: Option<bool>,
         passphrase: Option<&'a str>,
         avoid_reuse: Option<bool>,
+        descriptors: Option<bool>,
     }
 
     let mut wallet_params = vec![
@@ -916,20 +917,23 @@ fn test_create_wallet(cl: &Client) {
             blank: None,
             passphrase: None,
             avoid_reuse: None,
+            descriptors: None,
         },
         WalletParams {
             name: wallet_names[1],
             disable_private_keys: Some(true),
             blank: None,
             passphrase: None,
             avoid_reuse: None,
+            descriptors: None,
         },
         WalletParams {
             name: wallet_names[2],
             disable_private_keys: None,
             blank: Some(true),
             passphrase: None,
             avoid_reuse: None,
+            descriptors: None,
         },
     ];
 
@@ -940,13 +944,15 @@ fn test_create_wallet(cl: &Client) {
             blank: None,
             passphrase: Some("pass"),
             avoid_reuse: None,
+            descriptors: None,
         });
         wallet_params.push(WalletParams {
             name: wallet_names[4],
             disable_private_keys: None,
             blank: None,
             passphrase: None,
             avoid_reuse: Some(true),
+            descriptors: None,
         });
     }
 
@@ -958,6 +964,7 @@ fn test_create_wallet(cl: &Client) {
                 wallet_param.blank,
                 wallet_param.passphrase,
                 wallet_param.avoid_reuse,
+                wallet_param.descriptors,
             )
             .unwrap();
 
@@ -1000,6 +1007,17 @@ fn test_create_wallet(cl: &Client) {
     assert!(wallet_list.iter().zip(wallet_names).all(|(a, b)| a == b));
 }
 
+fn test_import_descriptors(cl: &Client) {
+    cl.create_wallet("testwallet", Some(false), Some(true), Some(""), Some(false), Some(true))
+        .unwrap();
+
+    let descriptor = "wpkh(tprv8ZgxMBicQKsPeTNzU5evMToRhHA9h3UCxbpzrzjUWUd6TQktkhmY82dQx5f6QaFpSWMzZxKz16xQFGeW7ykPjYuTetU6ep9aFTpAt7jKhPU/44'/0'/0'/0/*)#w2lyh4jx";
+    let x = cl.import_descriptors(descriptor, descriptor);
+    x.unwrap();
+    cl.get_new_address(None, Some(json::AddressType::Bech32m)).unwrap();
+    cl.unload_wallet(Some("testwallet")).unwrap();
+}
+
 fn test_get_tx_out_set_info(cl: &Client) {
     cl.get_tx_out_set_info().unwrap();
 }

json/src/lib.rs

@@ -1071,6 +1071,8 @@ pub enum GetPeerInfoResultNetwork {
     Ipv4,
     Ipv6,
     Onion,
+    I2p,
+    NotPubliclyRoutable,
     // this is undocumented upstream
     Unroutable,
 }
@@ -1607,6 +1609,7 @@ pub enum AddressType {
     Legacy,
     P2shSegwit,
     Bech32,
+    Bech32m,
 }
 
 /// Used to represent arguments that can either be an address or a public key.
@@ -1686,3 +1689,15 @@ where
     }
     Ok(Some(res))
 }
+
+/// Descriptor Format
+#[derive(Serialize, Clone, PartialEq, Eq, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct DescriptorFormat {
+    #[serde(rename = "desc")]
+    pub descriptor: String,
+    pub active: bool,
+    pub range: [i64; 2],
+    pub timestamp: String,
+    pub internal: bool,
+}