Merge #234: Add missing v18 util methods

b6dbf1a Run the formatter (Jamil Lambert, PhD)
eb50e30 Add missing v18 util methods (Jamil Lambert, PhD)

Pull request description:

  Add `deriveaddresses` and `getdescriptorinfo` methods and tests.

  Include `getdescriptorinfo` return shape changes in v19 and v29.

  `deriveaddresses` return shape change in v29 TODO

ACKs for top commit:
  tcharding:
    ACK b6dbf1a

Tree-SHA512: 789ff7fe0d3f9f4ce5a2e70298c041d69084896208f0ce90ff9235f201fb40d5128dc15c86f579548269b1e7fd1289cd606c2595b32758a9edfcea087d6247f7

Author: tcharding

client/src/client_sync/v18/mod.rs

@@ -7,6 +7,7 @@
 pub mod control;
 pub mod network;
 pub mod raw_transactions;
+pub mod util;
 
 use std::collections::BTreeMap;
 use std::path::Path;
@@ -110,7 +111,9 @@ crate::impl_client_v18__utxo_update_psbt!();
 
 // == Util ==
 crate::impl_client_v17__create_multisig!();
+crate::impl_client_v18__derive_addresses!();
 crate::impl_client_v17__estimate_smart_fee!();
+crate::impl_client_v18__get_descriptor_info!();
 crate::impl_client_v17__sign_message_with_priv_key!();
 crate::impl_client_v17__validate_address!();
 crate::impl_client_v17__verify_message!();

client/src/client_sync/v18/util.rs

@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: CC0-1.0
+
+//! Macros for implementing JSON-RPC methods on a client.
+//!
+//! Specifically this is methods found under the `== Util ==` section of the
+//! API docs of Bitcoin Core `v0.18`.
+//!
+//! All macros require `Client` to be in scope.
+//!
+//! See or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
+
+/// Implements Bitcoin Core JSON-RPC API method `deriveaddresses`
+#[macro_export]
+macro_rules! impl_client_v18__derive_addresses {
+    () => {
+        impl Client {
+            pub fn derive_addresses(&self, descriptor: &str) -> Result<DeriveAddresses> {
+                self.call("deriveaddresses", &[descriptor.into()])
+            }
+        }
+    };
+}
+
+/// Implements Bitcoin Core JSON-RPC API method `getdescriptorinfo`
+#[macro_export]
+macro_rules! impl_client_v18__get_descriptor_info {
+    () => {
+        impl Client {
+            pub fn get_descriptor_info(&self, descriptor: &str) -> Result<GetDescriptorInfo> {
+                self.call("getdescriptorinfo", &[descriptor.into()])
+            }
+        }
+    };
+}

client/src/client_sync/v19/mod.rs

@@ -108,7 +108,9 @@ crate::impl_client_v18__utxo_update_psbt!();
 
 // == Util ==
 crate::impl_client_v17__create_multisig!();
+crate::impl_client_v18__derive_addresses!();
 crate::impl_client_v17__estimate_smart_fee!();
+crate::impl_client_v18__get_descriptor_info!();
 crate::impl_client_v17__sign_message_with_priv_key!();
 crate::impl_client_v17__validate_address!();
 crate::impl_client_v17__verify_message!();

client/src/client_sync/v20/mod.rs

@@ -105,7 +105,9 @@ crate::impl_client_v18__utxo_update_psbt!();
 
 // == Util ==
 crate::impl_client_v17__create_multisig!();
+crate::impl_client_v18__derive_addresses!();
 crate::impl_client_v17__estimate_smart_fee!();
+crate::impl_client_v18__get_descriptor_info!();
 crate::impl_client_v17__sign_message_with_priv_key!();
 crate::impl_client_v17__validate_address!();
 crate::impl_client_v17__verify_message!();

client/src/client_sync/v21/mod.rs

@@ -107,7 +107,9 @@ crate::impl_client_v18__utxo_update_psbt!();
 
 // == Util ==
 crate::impl_client_v17__create_multisig!();
+crate::impl_client_v18__derive_addresses!();
 crate::impl_client_v17__estimate_smart_fee!();
+crate::impl_client_v18__get_descriptor_info!();
 crate::impl_client_v17__sign_message_with_priv_key!();
 crate::impl_client_v17__validate_address!();
 crate::impl_client_v17__verify_message!();

client/src/client_sync/v22/mod.rs

@@ -107,7 +107,9 @@ crate::impl_client_v18__utxo_update_psbt!();
 
 // == Util ==
 crate::impl_client_v17__create_multisig!();
+crate::impl_client_v18__derive_addresses!();
 crate::impl_client_v17__estimate_smart_fee!();
+crate::impl_client_v18__get_descriptor_info!();
 crate::impl_client_v17__sign_message_with_priv_key!();
 crate::impl_client_v17__validate_address!();
 crate::impl_client_v17__verify_message!();

client/src/client_sync/v23/mod.rs

@@ -109,7 +109,9 @@ crate::impl_client_v18__utxo_update_psbt!();
 
 // == Util ==
 crate::impl_client_v17__create_multisig!();
+crate::impl_client_v18__derive_addresses!();
 crate::impl_client_v17__estimate_smart_fee!();
+crate::impl_client_v18__get_descriptor_info!();
 crate::impl_client_v17__sign_message_with_priv_key!();
 crate::impl_client_v17__validate_address!();
 crate::impl_client_v17__verify_message!();

client/src/client_sync/v24/mod.rs

@@ -106,7 +106,9 @@ crate::impl_client_v18__utxo_update_psbt!();
 
 // == Util ==
 crate::impl_client_v17__create_multisig!();
+crate::impl_client_v18__derive_addresses!();
 crate::impl_client_v17__estimate_smart_fee!();
+crate::impl_client_v18__get_descriptor_info!();
 crate::impl_client_v17__sign_message_with_priv_key!();
 crate::impl_client_v17__validate_address!();
 crate::impl_client_v17__verify_message!();

client/src/client_sync/v25/mod.rs

@@ -106,7 +106,9 @@ crate::impl_client_v18__utxo_update_psbt!();
 
 // == Util ==
 crate::impl_client_v17__create_multisig!();
+crate::impl_client_v18__derive_addresses!();
 crate::impl_client_v17__estimate_smart_fee!();
+crate::impl_client_v18__get_descriptor_info!();
 crate::impl_client_v17__sign_message_with_priv_key!();
 crate::impl_client_v17__validate_address!();
 crate::impl_client_v17__verify_message!();

client/src/client_sync/v26/mod.rs

@@ -112,7 +112,9 @@ crate::impl_client_v18__utxo_update_psbt!();
 
 // == Util ==
 crate::impl_client_v17__create_multisig!();
+crate::impl_client_v18__derive_addresses!();
 crate::impl_client_v17__estimate_smart_fee!();
+crate::impl_client_v18__get_descriptor_info!();
 crate::impl_client_v17__sign_message_with_priv_key!();
 crate::impl_client_v17__validate_address!();
 crate::impl_client_v17__verify_message!();