Merge pull request #79 from tnull/2025-03-expose-get-block-count

Expose remaining `v17` `blockchain` APIs for `v19`+

client/src/client_sync/v19/blockchain.rs

@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: CC0-1.0
+
+//! Macros for implementing JSON-RPC methods on a client.
+//!
+//! Specifically this is methods found under the `== Blockchain ==` section of the
+//! API docs of Bitcoin Core `v0.19`.
+//!
+//! 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 `getmempoolancestors`
+#[macro_export]
+macro_rules! impl_client_v19__getmempoolancestors {
+    () => {
+        impl Client {
+            pub fn get_mempool_ancestors(&self, txid: Txid) -> Result<GetMempoolAncestors> {
+                // Equivalent to self.call("getmempoolancestors", &[into_json(txid)?, into_json(false)?])
+                self.call("getmempoolancestors", &[into_json(txid)?])
+            }
+
+            pub fn get_mempool_ancestors_verbose(
+                &self,
+                txid: Txid,
+            ) -> Result<GetMempoolAncestorsVerbose> {
+                self.call("getmempoolancestors", &[into_json(txid)?, into_json(true)?])
+            }
+        }
+    };
+}
+
+/// Implements Bitcoin Core JSON-RPC API method `getmempooldescendants`
+#[macro_export]
+macro_rules! impl_client_v19__getmempooldescendants {
+    () => {
+        impl Client {
+            pub fn get_mempool_descendants(&self, txid: Txid) -> Result<GetMempoolDescendants> {
+                // Equivalent to self.call("getmempooldescendants", &[into_json(txid)?, into_json(false)?])
+                self.call("getmempooldescendants", &[into_json(txid)?])
+            }
+
+            pub fn get_mempool_descendants_verbose(
+                &self,
+                txid: Txid,
+            ) -> Result<GetMempoolDescendantsVerbose> {
+                self.call("getmempooldescendants", &[into_json(txid)?, into_json(true)?])
+            }
+        }
+    };
+}
+
+/// Implements Bitcoin Core JSON-RPC API method `getmempoolentry`
+#[macro_export]
+macro_rules! impl_client_v19__getmempoolentry {
+    () => {
+        impl Client {
+            pub fn get_mempool_entry(&self, txid: Txid) -> Result<GetMempoolEntry> {
+                self.call("getmempoolentry", &[into_json(txid)?])
+            }
+        }
+    };
+}

client/src/client_sync/v19/mod.rs

@@ -4,7 +4,8 @@
 //!
 //! We ignore option arguments unless they effect the shape of the returned JSON data.
 
-mod wallet;
+pub mod blockchain;
+pub mod wallet;
 
 use bitcoin::address::{Address, NetworkChecked};
 use bitcoin::{Amount, Block, BlockHash, Txid};
@@ -15,10 +16,25 @@ use crate::types::v19::*;
 crate::define_jsonrpc_minreq_client!("v19");
 
 // == Blockchain ==
-crate::impl_client_v17__getblockchaininfo!();
 crate::impl_client_v17__getbestblockhash!();
 crate::impl_client_v17__getblock!();
+crate::impl_client_v17__getblockchaininfo!();
+crate::impl_client_v17__getblockcount!();
+crate::impl_client_v17__getblockhash!();
+crate::impl_client_v17__getblockheader!();
+crate::impl_client_v17__getblockstats!();
+crate::impl_client_v17__getchaintips!();
+crate::impl_client_v17__getchaintxstats!();
+crate::impl_client_v17__getdifficulty!();
+crate::impl_client_v19__getmempoolancestors!();
+crate::impl_client_v19__getmempooldescendants!();
+crate::impl_client_v19__getmempoolentry!();
+crate::impl_client_v17__getmempoolinfo!();
+crate::impl_client_v17__getrawmempool!();
 crate::impl_client_v17__gettxout!();
+crate::impl_client_v17__gettxoutproof!();
+crate::impl_client_v17__gettxoutsetinfo!();
+crate::impl_client_v17__verifytxoutproof!();
 
 // == Control ==
 crate::impl_client_v17__stop!();

client/src/client_sync/v20.rs

@@ -16,10 +16,25 @@ pub use crate::client_sync::v17::AddressType;
 crate::define_jsonrpc_minreq_client!("v20");
 
 // == Blockchain ==
-crate::impl_client_v17__getblockchaininfo!();
 crate::impl_client_v17__getbestblockhash!();
 crate::impl_client_v17__getblock!();
+crate::impl_client_v17__getblockchaininfo!();
+crate::impl_client_v17__getblockcount!();
+crate::impl_client_v17__getblockhash!();
+crate::impl_client_v17__getblockheader!();
+crate::impl_client_v17__getblockstats!();
+crate::impl_client_v17__getchaintips!();
+crate::impl_client_v17__getchaintxstats!();
+crate::impl_client_v17__getdifficulty!();
+crate::impl_client_v19__getmempoolancestors!();
+crate::impl_client_v19__getmempooldescendants!();
+crate::impl_client_v19__getmempoolentry!();
+crate::impl_client_v17__getmempoolinfo!();
+crate::impl_client_v17__getrawmempool!();
 crate::impl_client_v17__gettxout!();
+crate::impl_client_v17__gettxoutproof!();
+crate::impl_client_v17__gettxoutsetinfo!();
+crate::impl_client_v17__verifytxoutproof!();
 
 // == Control ==
 crate::impl_client_v17__stop!();

client/src/client_sync/v21.rs

@@ -16,9 +16,25 @@ pub use crate::client_sync::v17::AddressType;
 crate::define_jsonrpc_minreq_client!("v21");
 
 // == Blockchain ==
-crate::impl_client_v17__getblockchaininfo!();
 crate::impl_client_v17__getbestblockhash!();
 crate::impl_client_v17__getblock!();
+crate::impl_client_v17__getblockchaininfo!();
+crate::impl_client_v17__getblockcount!();
+crate::impl_client_v17__getblockhash!();
+crate::impl_client_v17__getblockheader!();
+crate::impl_client_v17__getblockstats!();
+crate::impl_client_v17__getchaintips!();
+crate::impl_client_v17__getchaintxstats!();
+crate::impl_client_v17__getdifficulty!();
+crate::impl_client_v19__getmempoolancestors!();
+crate::impl_client_v19__getmempooldescendants!();
+crate::impl_client_v19__getmempoolentry!();
+crate::impl_client_v17__getmempoolinfo!();
+crate::impl_client_v17__getrawmempool!();
+crate::impl_client_v17__gettxout!();
+crate::impl_client_v17__gettxoutproof!();
+crate::impl_client_v17__gettxoutsetinfo!();
+crate::impl_client_v17__verifytxoutproof!();
 
 // == Control ==
 crate::impl_client_v17__stop!();

client/src/client_sync/v22/blockchain.rs

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: CC0-1.0
+
+//! Macros for implementing JSON-RPC methods on a client.
+//!
+//! Specifically this is methods found under the `== Blockchain ==` section of the
+//! API docs of Bitcoin Core `v22`.
+//!
+//! 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 `gettxout`
+#[macro_export]
+macro_rules! impl_client_v22__gettxout {
+    () => {
+        impl Client {
+            pub fn get_tx_out(&self, txid: Txid, vout: u64) -> Result<GetTxOut> {
+                self.call("gettxout", &[into_json(txid)?, into_json(vout)?])
+            }
+        }
+    };
+}

client/src/client_sync/v22/mod.rs

@@ -4,6 +4,7 @@
 //!
 //! We ignore option arguments unless they effect the shape of the returned JSON data.
 
+mod blockchain;
 mod wallet;
 
 use bitcoin::address::{Address, NetworkChecked};
@@ -15,10 +16,25 @@ use crate::types::v22::*;
 crate::define_jsonrpc_minreq_client!("v22");
 
 // == Blockchain ==
-crate::impl_client_v17__getblockchaininfo!();
 crate::impl_client_v17__getbestblockhash!();
 crate::impl_client_v17__getblock!();
-crate::impl_client_v17__gettxout!();
+crate::impl_client_v17__getblockchaininfo!();
+crate::impl_client_v17__getblockcount!();
+crate::impl_client_v17__getblockhash!();
+crate::impl_client_v17__getblockheader!();
+crate::impl_client_v17__getblockstats!();
+crate::impl_client_v17__getchaintips!();
+crate::impl_client_v17__getchaintxstats!();
+crate::impl_client_v17__getdifficulty!();
+crate::impl_client_v19__getmempoolancestors!();
+crate::impl_client_v19__getmempooldescendants!();
+crate::impl_client_v19__getmempoolentry!();
+crate::impl_client_v17__getmempoolinfo!();
+crate::impl_client_v17__getrawmempool!();
+crate::impl_client_v22__gettxout!();
+crate::impl_client_v17__gettxoutproof!();
+crate::impl_client_v17__gettxoutsetinfo!();
+crate::impl_client_v17__verifytxoutproof!();
 
 // == Control ==
 crate::impl_client_v17__stop!();

client/src/client_sync/v23.rs

@@ -14,10 +14,25 @@ use crate::types::v23::*;
 crate::define_jsonrpc_minreq_client!("v23");
 
 // == Blockchain ==
-crate::impl_client_v17__getblockchaininfo!();
 crate::impl_client_v17__getbestblockhash!();
 crate::impl_client_v17__getblock!();
-crate::impl_client_v17__gettxout!();
+crate::impl_client_v17__getblockchaininfo!();
+crate::impl_client_v17__getblockcount!();
+crate::impl_client_v17__getblockhash!();
+crate::impl_client_v17__getblockheader!();
+crate::impl_client_v17__getblockstats!();
+crate::impl_client_v17__getchaintips!();
+crate::impl_client_v17__getchaintxstats!();
+crate::impl_client_v17__getdifficulty!();
+crate::impl_client_v19__getmempoolancestors!();
+crate::impl_client_v19__getmempooldescendants!();
+crate::impl_client_v19__getmempoolentry!();
+crate::impl_client_v17__getmempoolinfo!();
+crate::impl_client_v17__getrawmempool!();
+crate::impl_client_v22__gettxout!();
+crate::impl_client_v17__gettxoutproof!();
+crate::impl_client_v17__gettxoutsetinfo!();
+crate::impl_client_v17__verifytxoutproof!();
 
 // == Control ==
 crate::impl_client_v17__stop!();

client/src/client_sync/v24.rs

@@ -16,10 +16,25 @@ pub use crate::client_sync::v23::AddressType;
 crate::define_jsonrpc_minreq_client!("v24");
 
 // == Blockchain ==
-crate::impl_client_v17__getblockchaininfo!();
 crate::impl_client_v17__getbestblockhash!();
 crate::impl_client_v17__getblock!();
-crate::impl_client_v17__gettxout!();
+crate::impl_client_v17__getblockchaininfo!();
+crate::impl_client_v17__getblockcount!();
+crate::impl_client_v17__getblockhash!();
+crate::impl_client_v17__getblockheader!();
+crate::impl_client_v17__getblockstats!();
+crate::impl_client_v17__getchaintips!();
+crate::impl_client_v17__getchaintxstats!();
+crate::impl_client_v17__getdifficulty!();
+crate::impl_client_v19__getmempoolancestors!();
+crate::impl_client_v19__getmempooldescendants!();
+crate::impl_client_v19__getmempoolentry!();
+crate::impl_client_v17__getmempoolinfo!();
+crate::impl_client_v17__getrawmempool!();
+crate::impl_client_v22__gettxout!();
+crate::impl_client_v17__gettxoutproof!();
+crate::impl_client_v17__gettxoutsetinfo!();
+crate::impl_client_v17__verifytxoutproof!();
 
 // == Control ==
 crate::impl_client_v17__stop!();

client/src/client_sync/v25.rs

@@ -16,10 +16,25 @@ pub use crate::client_sync::v23::AddressType;
 crate::define_jsonrpc_minreq_client!("v25");
 
 // == Blockchain ==
-crate::impl_client_v17__getblockchaininfo!();
 crate::impl_client_v17__getbestblockhash!();
 crate::impl_client_v17__getblock!();
-crate::impl_client_v17__gettxout!();
+crate::impl_client_v17__getblockchaininfo!();
+crate::impl_client_v17__getblockcount!();
+crate::impl_client_v17__getblockhash!();
+crate::impl_client_v17__getblockheader!();
+crate::impl_client_v17__getblockstats!();
+crate::impl_client_v17__getchaintips!();
+crate::impl_client_v17__getchaintxstats!();
+crate::impl_client_v17__getdifficulty!();
+crate::impl_client_v19__getmempoolancestors!();
+crate::impl_client_v19__getmempooldescendants!();
+crate::impl_client_v19__getmempoolentry!();
+crate::impl_client_v17__getmempoolinfo!();
+crate::impl_client_v17__getrawmempool!();
+crate::impl_client_v22__gettxout!();
+crate::impl_client_v17__gettxoutproof!();
+crate::impl_client_v17__gettxoutsetinfo!();
+crate::impl_client_v17__verifytxoutproof!();
 
 // == Control ==
 crate::impl_client_v17__stop!();

client/src/client_sync/v26/blockchain.rs

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: CC0-1.0
+
+//! Macros for implementing JSON-RPC methods on a client.
+//!
+//! Specifically this is methods found under the `== Blockchain ==` section of the
+//! API docs of Bitcoin Core `v0.26`.
+//!
+//! 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 `gettxoutsetinfo`
+#[macro_export]
+macro_rules! impl_client_v26__gettxoutsetinfo {
+    () => {
+        impl Client {
+            pub fn get_tx_out_set_info(&self) -> Result<GetTxOutSetInfo> {
+                self.call("gettxoutsetinfo", &[])
+            }
+        }
+    };
+}

client/src/client_sync/v26.rs → client/src/client_sync/v26/mod.rs

@@ -4,6 +4,8 @@
 //!
 //! We ignore option arguments unless they effect the shape of the returned JSON data.
 
+pub mod blockchain;
+
 use bitcoin::address::{Address, NetworkChecked};
 use bitcoin::{Amount, Block, BlockHash, Txid};
 
@@ -16,10 +18,25 @@ pub use crate::client_sync::v23::AddressType;
 crate::define_jsonrpc_minreq_client!("v26");
 
 // == Blockchain ==
-crate::impl_client_v17__getblockchaininfo!();
 crate::impl_client_v17__getbestblockhash!();
 crate::impl_client_v17__getblock!();
-crate::impl_client_v17__gettxout!();
+crate::impl_client_v17__getblockchaininfo!();
+crate::impl_client_v17__getblockcount!();
+crate::impl_client_v17__getblockhash!();
+crate::impl_client_v17__getblockheader!();
+crate::impl_client_v17__getblockstats!();
+crate::impl_client_v17__getchaintips!();
+crate::impl_client_v17__getchaintxstats!();
+crate::impl_client_v17__getdifficulty!();
+crate::impl_client_v19__getmempoolancestors!();
+crate::impl_client_v19__getmempooldescendants!();
+crate::impl_client_v19__getmempoolentry!();
+crate::impl_client_v17__getmempoolinfo!();
+crate::impl_client_v17__getrawmempool!();
+crate::impl_client_v22__gettxout!();
+crate::impl_client_v17__gettxoutproof!();
+crate::impl_client_v26__gettxoutsetinfo!();
+crate::impl_client_v17__verifytxoutproof!();
 
 // == Control ==
 crate::impl_client_v17__stop!();

client/src/client_sync/v27.rs

@@ -16,10 +16,25 @@ pub use crate::client_sync::v23::AddressType;
 crate::define_jsonrpc_minreq_client!("v27");
 
 // == Blockchain ==
-crate::impl_client_v17__getblockchaininfo!();
 crate::impl_client_v17__getbestblockhash!();
 crate::impl_client_v17__getblock!();
-crate::impl_client_v17__gettxout!();
+crate::impl_client_v17__getblockchaininfo!();
+crate::impl_client_v17__getblockcount!();
+crate::impl_client_v17__getblockhash!();
+crate::impl_client_v17__getblockheader!();
+crate::impl_client_v17__getblockstats!();
+crate::impl_client_v17__getchaintips!();
+crate::impl_client_v17__getchaintxstats!();
+crate::impl_client_v17__getdifficulty!();
+crate::impl_client_v19__getmempoolancestors!();
+crate::impl_client_v19__getmempooldescendants!();
+crate::impl_client_v19__getmempoolentry!();
+crate::impl_client_v17__getmempoolinfo!();
+crate::impl_client_v17__getrawmempool!();
+crate::impl_client_v22__gettxout!();
+crate::impl_client_v17__gettxoutproof!();
+crate::impl_client_v26__gettxoutsetinfo!();
+crate::impl_client_v17__verifytxoutproof!();
 
 // == Control ==
 crate::impl_client_v17__stop!();