Implement version specific types for blockchain - methods

Author: GideonBature

client/src/client_sync/v17/blockchain.rs

@@ -321,10 +321,10 @@ macro_rules! impl_client_v17__savemempool {
     () => {
         impl Client {
             // Dumps the mempool to disk (v17 - v22)
-            pub fn save_mempool(&self) -> Result<()> {
+            pub fn save_mempool(&self) -> Result<SaveMempool> {
                 match self.call("savemempool", &[]) {
-                    Ok(serde_json::Value::Null) => Ok(()),
-                    Ok(_) => Ok(()),
+                    Ok(serde_json::Value::Null) => Ok(SaveMempool),
+                    Ok(_) => Ok(SaveMempool),
                     Err(e) => Err(e.into()),
                 }
             }
@@ -339,7 +339,7 @@ macro_rules! impl_client_v17__verifychain {
         impl Client {
             /// Verifies blockchain database using default checklevel and nblocks.
             /// Returns true if verification finised successfully.
-            pub fn verify_chain_default(&self) -> Result<bool> {
+            pub fn verify_chain_default(&self) -> Result<VerifyChain> {
                 // Core returns a boolean directly
                 self.call("verifychain", &[])
             }
@@ -355,7 +355,7 @@ macro_rules! impl_client_v17__verifychain {
                 &self,
                 checklevel: Option<u32>,
                 nblocks: Option<u32>,
-            ) -> Result<bool> {
+            ) -> Result<VerifyChain> {
                 // Construct params carefully for optional args
                 // Bitcoin Core often uses positional nulls for omitted optional args
                 let params = match (checklevel, nblocks) {

integration_test/tests/blockchain.rs

@@ -351,15 +351,18 @@ fn blockchain__verify_chain() {
 
     // Test with default parameters
     let result_default = node.client.verify_chain_default().expect("veifychain with defaults failed");
-    assert!(result_default, "verifychain with defaults should return true on a clean chain");
+    let result_default_value = result_default.0;
+    assert!(result_default_value, "verifychain with defaults should return true on a clean chain");
 
     // Test with specific parameters (e.g., check first 2 blocks thoroughly)
     let checklevel = Some(4u32);
     let nblocks = Some(2u32);
     let result_specific = node.client.verify_chain(checklevel, nblocks).expect("verifychain with specific args failed");
-    assert!(result_specific, "verifychain with specific args should return true on a clean chain");
+    let result_specific_value = result_specific.0;
+    assert!(result_specific_value, "verifychain with specific args should return true on a clean chain");
 
     // Test with only nblocks (requires null for checklevel)
     let result_nblocks_only = node.client.verify_chain(None, Some(1)).expect("verifychain with nblocks only failed");
-    assert!(result_nblocks_only, "verifychain with nblocks only should return true");
+    let result_nblocks_only_value = result_nblocks_only.0;
+    assert!(result_nblocks_only_value, "verifychain with nblocks only should return true");
 }

types/src/lib.rs

@@ -33,6 +33,8 @@ pub mod model;
 
 use core::fmt;
 
+use serde::{Deserialize, Serialize};
+
 use bitcoin::amount::ParseAmountError;
 use bitcoin::{Amount, FeeRate};
 

types/src/v17/blockchain/mod.rs

@@ -660,6 +660,7 @@ pub struct GetTxOutSetInfo {
 /// > Verifies that a proof points to a transaction in a block, returning the transaction it commits to
 /// > and throwing an RPC error if the block is not in our best chain
 /// >
+/// > Returns null (json null)
 /// > Arguments:
 /// > 1. "proof"    (string, required) The hex-encoded proof generated by gettxoutproof
 ///
@@ -678,4 +679,33 @@ pub struct VerifyTxOutProof(pub Vec<String>);
 pub struct PruneBlockchain(
     /// The height of the last block pruned.
     pub i64
-);
+);
+
+/// Result of JSON-RPC method `savemempool`.
+///
+/// > savemempool
+/// >
+/// > Arguments:
+/// > 1. "height"       (numeric, required) The block height to prune up to. May be set to a discrete height, or a unix timestamp
+/// >                   to prune blocks whose block time is at least 2 hours older than the provided timestamp.
+/// > Returns null (json null)
+#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
+pub struct SaveMempool;
+
+/// Result of JSON-RPC method `verifychain`.
+///
+/// > verifychain
+/// >
+/// > Arguments:
+/// > 1. checklevel (numeric, optional, default=3, range=0-4) How thorough the block verification is:
+/// - level 0 reads the blocks from disk
+/// - level 1 verifies block validity
+/// - level 2 verifies undo data
+/// - level 3 checks disconnection of tip blocks
+/// - level 4 tries to reconnect the blocks
+/// - each level includes the checks of the previous levels
+/// > 2. nblocks (numeric, optional, default=6, 0=all) The number of blocks to check.
+/// >
+/// > Returns true|false (boolean) Verification finished successfully. If false, check debug.log for reason.
+#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
+pub struct VerifyChain(pub bool);

types/src/v17/mod.rs

@@ -235,7 +235,7 @@ pub use self::{
         GetRawMempool, GetRawMempoolVerbose, GetTxOut, GetTxOutError, GetTxOutSetInfo,
         GetTxOutSetInfoError, MapMempoolEntryError, MempoolEntry, MempoolEntryError,
         MempoolEntryFees, MempoolEntryFeesError, ScriptPubkey, Softfork, SoftforkReject,
-        VerifyTxOutProof, PruneBlockchain
+        VerifyTxOutProof, PruneBlockchain, SaveMempool, VerifyChain,
     },
     control::{GetMemoryInfoStats, Locked, Logging},
     generating::{Generate, GenerateToAddress},

types/src/v18/mod.rs

@@ -260,5 +260,5 @@ pub use crate::v17::{
     SendRawTransaction, SendToAddress, SignErrorData, SignErrorDataError, SignMessage,
     SignRawTransactionWithWallet, SignRawTransactionWithWalletError, Softfork, SoftforkReject,
     TransactionCategory, UploadTarget, VerifyTxOutProof, WalletCreateFundedPsbt,
-    WalletCreateFundedPsbtError, WalletProcessPsbt, SetNetworkActive,
+    WalletCreateFundedPsbtError, WalletProcessPsbt, SetNetworkActive, SaveMempool, VerifyChain,
 };

types/src/v19/mod.rs

@@ -263,7 +263,7 @@ pub use crate::v17::{
     RescanBlockchain, ScriptPubkey, SendMany, SendRawTransaction, SendToAddress, SignErrorData,
     SignErrorDataError, SignMessage, SignRawTransactionWithWallet,
     SignRawTransactionWithWalletError, SoftforkReject, TransactionCategory, UploadTarget,
-    VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, SetNetworkActive,
+    VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, SetNetworkActive, SaveMempool, VerifyChain,
 };
 #[doc(inline)]
 pub use crate::v18::{ActiveCommand, GetRpcInfo};

types/src/v20/mod.rs

@@ -254,7 +254,7 @@ pub use crate::{
         PeerInfo, RescanBlockchain, ScriptPubkey, SendMany, SendRawTransaction, SendToAddress,
         SignErrorData, SignMessage, SignRawTransactionWithWallet, SoftforkReject,
         TransactionCategory, UploadTarget, VerifyTxOutProof, WalletCreateFundedPsbt,
-        WalletProcessPsbt,
+        WalletProcessPsbt, SaveMempool, VerifyChain,
     },
     v18::{ActiveCommand, GetRpcInfo},
     v19::{

types/src/v21/mod.rs

@@ -259,7 +259,7 @@ pub use crate::{
         PeerInfo, RescanBlockchain, ScriptPubkey, SendMany, SendRawTransaction, SendToAddress,
         SignErrorData, SignMessage, SignRawTransactionWithWallet, SoftforkReject,
         TransactionCategory, UploadTarget, VerifyTxOutProof, WalletCreateFundedPsbt,
-        WalletProcessPsbt,
+        WalletProcessPsbt, SaveMempool, VerifyChain,
     },
     v18::{ActiveCommand, GetRpcInfo},
     v19::{

types/src/v22/mod.rs

@@ -273,7 +273,7 @@ pub use crate::{
         ListUnspentItem, ListWallets, LoadWallet, Locked, PeerInfo, RescanBlockchain, SendMany,
         SendRawTransaction, SendToAddress, SignErrorData, SignMessage,
         SignRawTransactionWithWallet, SoftforkReject, TransactionCategory, UploadTarget,
-        VerifyTxOutProof, WalletCreateFundedPsbt, WalletProcessPsbt,
+        VerifyTxOutProof, WalletCreateFundedPsbt, WalletProcessPsbt, SaveMempool, VerifyChain,
     },
     v18::{ActiveCommand, GetRpcInfo},
     v19::{