rust-bitcoin · tcharding · Jun 13, 2025 · Jun 13, 2025 · Jun 13, 2025
diff --git a/client/src/client_sync/v17/mod.rs b/client/src/client_sync/v17/mod.rs
@@ -109,6 +109,7 @@ crate::impl_client_v17__verify_message!();
 
 // == Wallet ==
 crate::impl_client_v17__abandon_transaction!();
+crate::impl_client_v17__abort_rescan!();
 crate::impl_client_v17__add_multisig_address!();
 crate::impl_client_v17__bump_fee!();
 crate::impl_client_v17__create_wallet!();

diff --git a/client/src/client_sync/v17/wallet.rs b/client/src/client_sync/v17/wallet.rs
@@ -25,6 +25,16 @@ macro_rules! impl_client_v17__abandon_transaction {
     };
 }
 
+/// Implements Bitcoin Core JSON-RPC API method `abortrescan`.
+#[macro_export]
+macro_rules! impl_client_v17__abort_rescan {
+    () => {
+        impl Client {
+            pub fn abort_rescan(&self) -> Result<AbortRescan> { self.call("abortrescan", &[]) }
+        }
+    };
+}
+
 /// Implements Bitcoin Core JSON-RPC API method `addmultisigaddress`.
 #[macro_export]
 macro_rules! impl_client_v17__add_multisig_address {

diff --git a/client/src/client_sync/v18/mod.rs b/client/src/client_sync/v18/mod.rs
@@ -122,6 +122,7 @@ crate::impl_client_v17__verify_message!();
 
 // == Wallet ==
 crate::impl_client_v17__abandon_transaction!();
+crate::impl_client_v17__abort_rescan!();
 crate::impl_client_v17__add_multisig_address!();
 crate::impl_client_v17__bump_fee!();
 crate::impl_client_v17__create_wallet!();

diff --git a/client/src/client_sync/v19/mod.rs b/client/src/client_sync/v19/mod.rs
@@ -118,6 +118,7 @@ crate::impl_client_v17__verify_message!();
 
 // == Wallet ==
 crate::impl_client_v17__abandon_transaction!();
+crate::impl_client_v17__abort_rescan!();
 crate::impl_client_v17__add_multisig_address!();
 crate::impl_client_v17__bump_fee!();
 crate::impl_client_v17__create_wallet!();

diff --git a/client/src/client_sync/v20/mod.rs b/client/src/client_sync/v20/mod.rs
@@ -115,6 +115,7 @@ crate::impl_client_v17__verify_message!();
 
 // == Wallet ==
 crate::impl_client_v17__abandon_transaction!();
+crate::impl_client_v17__abort_rescan!();
 crate::impl_client_v17__add_multisig_address!();
 crate::impl_client_v17__bump_fee!();
 crate::impl_client_v17__create_wallet!();

diff --git a/client/src/client_sync/v21/mod.rs b/client/src/client_sync/v21/mod.rs
@@ -117,6 +117,7 @@ crate::impl_client_v17__verify_message!();
 
 // == Wallet ==
 crate::impl_client_v17__abandon_transaction!();
+crate::impl_client_v17__abort_rescan!();
 crate::impl_client_v17__add_multisig_address!();
 crate::impl_client_v17__bump_fee!();
 crate::impl_client_v17__create_wallet!();

diff --git a/client/src/client_sync/v22/mod.rs b/client/src/client_sync/v22/mod.rs
@@ -117,6 +117,7 @@ crate::impl_client_v17__verify_message!();
 
 // == Wallet ==
 crate::impl_client_v17__abandon_transaction!();
+crate::impl_client_v17__abort_rescan!();
 crate::impl_client_v17__add_multisig_address!();
 crate::impl_client_v17__bump_fee!();
 crate::impl_client_v17__create_wallet!();

diff --git a/client/src/client_sync/v23/mod.rs b/client/src/client_sync/v23/mod.rs
@@ -119,6 +119,7 @@ crate::impl_client_v17__verify_message!();
 
 // == Wallet ==
 crate::impl_client_v17__abandon_transaction!();
+crate::impl_client_v17__abort_rescan!();
 crate::impl_client_v17__add_multisig_address!();
 crate::impl_client_v17__bump_fee!();
 crate::impl_client_v23__create_wallet!();

diff --git a/client/src/client_sync/v24/mod.rs b/client/src/client_sync/v24/mod.rs
@@ -116,6 +116,7 @@ crate::impl_client_v17__verify_message!();
 
 // == Wallet ==
 crate::impl_client_v17__abandon_transaction!();
+crate::impl_client_v17__abort_rescan!();
 crate::impl_client_v17__add_multisig_address!();
 crate::impl_client_v17__bump_fee!();
 crate::impl_client_v23__create_wallet!();

diff --git a/client/src/client_sync/v25/mod.rs b/client/src/client_sync/v25/mod.rs
@@ -116,6 +116,7 @@ crate::impl_client_v17__verify_message!();
 
 // == Wallet ==
 crate::impl_client_v17__abandon_transaction!();
+crate::impl_client_v17__abort_rescan!();
 crate::impl_client_v17__add_multisig_address!();
 crate::impl_client_v17__bump_fee!();
 crate::impl_client_v23__create_wallet!();

diff --git a/client/src/client_sync/v26/mod.rs b/client/src/client_sync/v26/mod.rs
@@ -122,6 +122,7 @@ crate::impl_client_v17__verify_message!();
 
 // == Wallet ==
 crate::impl_client_v17__abandon_transaction!();
+crate::impl_client_v17__abort_rescan!();
 crate::impl_client_v17__add_multisig_address!();
 crate::impl_client_v17__bump_fee!();
 crate::impl_client_v23__create_wallet!();

diff --git a/client/src/client_sync/v27/mod.rs b/client/src/client_sync/v27/mod.rs
@@ -118,6 +118,7 @@ crate::impl_client_v17__verify_message!();
 
 // == Wallet ==
 crate::impl_client_v17__abandon_transaction!();
+crate::impl_client_v17__abort_rescan!();
 crate::impl_client_v17__add_multisig_address!();
 crate::impl_client_v17__bump_fee!();
 crate::impl_client_v23__create_wallet!();

diff --git a/client/src/client_sync/v28/mod.rs b/client/src/client_sync/v28/mod.rs
@@ -120,6 +120,7 @@ crate::impl_client_v17__verify_message!();
 
 // == Wallet ==
 crate::impl_client_v17__abandon_transaction!();
+crate::impl_client_v17__abort_rescan!();
 crate::impl_client_v17__add_multisig_address!();
 crate::impl_client_v17__bump_fee!();
 crate::impl_client_v23__create_wallet!();

diff --git a/client/src/client_sync/v29/mod.rs b/client/src/client_sync/v29/mod.rs
@@ -120,6 +120,7 @@ crate::impl_client_v17__verify_message!();
 
 // == Wallet ==
 crate::impl_client_v17__abandon_transaction!();
+crate::impl_client_v17__abort_rescan!();
 crate::impl_client_v17__add_multisig_address!();
 crate::impl_client_v17__bump_fee!();
 crate::impl_client_v23__create_wallet!();

diff --git a/integration_test/tests/wallet.rs b/integration_test/tests/wallet.rs
@@ -36,6 +36,14 @@ fn wallet__abandon_transaction() {
     node.client.abandon_transaction(txid).expect("abandontransaction");
 }
 
+#[test]
+fn wallet__abort_rescan() {
+    let node = Node::with_wallet(Wallet::Default, &[]);
+
+    let json: AbortRescan = node.client.abort_rescan().expect("abortrescan");
+    assert!(!json.0); // No rescan running, abort should return false
+}
+
 #[test]
 #[cfg(feature = "TODO")]
 fn wallet__add_multisig_address__modelled() {

diff --git a/types/src/v17/mod.rs b/types/src/v17/mod.rs
@@ -151,7 +151,7 @@
 //! | JSON-RPC Method Name               | Returns         | Notes                                  |
 //! |:-----------------------------------|:---------------:|:--------------------------------------:|
 //! | abandontransaction                 | returns nothing |                                        |
-//! | abortrescan                        | returns nothing |                                        |
+//! | abortrescan                        | version         |                                        |
 //! | addmultisigaddress                 | version + model | UNTESTED                               |
 //! | backupwallet                       | returns nothing |                                        |
 //! | bumpfee                            | version + model |                                        |
@@ -271,14 +271,14 @@ pub use self::{
         ValidateAddress, ValidateAddressError, VerifyMessage,
     },
     wallet::{
-        AddMultisigAddress, AddMultisigAddressError, AddressInformation, BumpFee, BumpFeeError,
-        CreateWallet, DumpPrivKey, DumpWallet, GetAddressInfo, GetAddressInfoEmbedded,
-        GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel,
-        GetBalance, GetNewAddress, GetRawChangeAddress, GetReceivedByAddress, GetTransaction,
-        GetTransactionDetail, GetTransactionDetailError, GetTransactionError,
-        GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, ListAddressGroupings,
-        ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent,
-        ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress,
+        AbortRescan, AddMultisigAddress, AddMultisigAddressError, AddressInformation, BumpFee,
+        BumpFeeError, CreateWallet, DumpPrivKey, DumpWallet, GetAddressInfo,
+        GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError,
+        GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetNewAddress, GetRawChangeAddress,
+        GetReceivedByAddress, GetTransaction, GetTransactionDetail, GetTransactionDetailError,
+        GetTransactionError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError,
+        ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels,
+        ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddress,
         ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError,
         ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions,
         ListTransactionsItem, ListTransactionsItemError, ListUnspent, ListUnspentItem,

diff --git a/types/src/v17/wallet/mod.rs b/types/src/v17/wallet/mod.rs
@@ -62,6 +62,14 @@ pub enum Bip125Replaceable {
     Unknown,
 }
 
+/// Result of JSON-RPC method `abortrescan`.
+///
+/// > abortrescan
+/// >
+/// > Stops current wallet rescan triggered by an RPC call, e.g. by an importprivkey call.
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+pub struct AbortRescan(pub bool);
+
 /// Result of the JSON-RPC method `addmultisigaddress`.
 ///
 /// > addmultisigaddress nrequired ["key",...] ( "label" "address_type" )

diff --git a/types/src/v18/mod.rs b/types/src/v18/mod.rs
@@ -158,7 +158,7 @@
 //! | JSON-RPC Method Name               | Returns         | Notes                                  |
 //! |:-----------------------------------|:---------------:|:--------------------------------------:|
 //! | abandontransaction                 | returns nothing |                                        |
-//! | abortrescan                        | returns nothing |                                        |
+//! | abortrescan                        | version         |                                        |
 //! | addmultisigaddress                 | version + model | UNTESTED                               |
 //! | backupwallet                       | returns nothing |                                        |
 //! | bumpfee                            | version + model |                                        |
@@ -242,29 +242,30 @@ pub use self::{
 };
 #[doc(inline)]
 pub use crate::v17::{
-    AddMultisigAddress, AddMultisigAddressError, AddedNode, AddedNodeAddress, AddressInformation,
-    Banned, Bip32Deriv, Bip9Softfork, Bip9SoftforkStatus, BumpFee, BumpFeeError, ChainTips,
-    ChainTipsError, ChainTipsStatus, CombinePsbt, CombineRawTransaction, ConvertToPsbt,
-    CreateMultisig, CreateMultisigError, CreatePsbt, CreateRawTransaction, CreateWallet,
-    DecodePsbt, DecodePsbtError, DecodeRawTransaction, DecodeScript, DecodeScriptError,
-    DumpPrivKey, DumpWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, FundRawTransaction,
-    FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo, GetAddressInfo,
-    GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel,
-    GetAddressesByLabel, GetBalance, GetBestBlockHash, GetBlockCount, GetBlockHash, GetBlockHeader,
-    GetBlockHeaderError, GetBlockHeaderVerbose, GetBlockHeaderVerboseError, GetBlockStats,
-    GetBlockStatsError, GetBlockTemplate, GetBlockTemplateError, GetBlockVerboseOne,
-    GetBlockVerboseOneError, GetBlockVerboseZero, GetBlockchainInfo, GetBlockchainInfoError,
-    GetChainTips, GetChainTxStats, GetChainTxStatsError, GetConnectionCount, GetDifficulty,
-    GetMemoryInfoStats, GetMempoolAncestors, GetMempoolAncestorsVerbose, GetMempoolDescendants,
-    GetMempoolDescendantsVerbose, GetMempoolEntry, GetMempoolInfo, GetMempoolInfoError,
-    GetMiningInfo, GetNetTotals, GetNetworkInfo, GetNetworkInfoAddress, GetNetworkInfoError,
-    GetNetworkInfoNetwork, GetNewAddress, GetPeerInfo, GetRawChangeAddress, GetRawMempool,
-    GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose,
-    GetRawTransactionVerboseError, GetReceivedByAddress, GetTransaction, GetTransactionDetail,
-    GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo,
-    GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError,
-    GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem,
-    ListBanned, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError,
+    AbortRescan, AddMultisigAddress, AddMultisigAddressError, AddedNode, AddedNodeAddress,
+    AddressInformation, Banned, Bip32Deriv, Bip9Softfork, Bip9SoftforkStatus, BumpFee,
+    BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus, CombinePsbt, CombineRawTransaction,
+    ConvertToPsbt, CreateMultisig, CreateMultisigError, CreatePsbt, CreateRawTransaction,
+    CreateWallet, DecodePsbt, DecodePsbtError, DecodeRawTransaction, DecodeScript,
+    DecodeScriptError, DumpPrivKey, DumpWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError,
+    FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo,
+    GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError,
+    GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetBestBlockHash, GetBlockCount,
+    GetBlockHash, GetBlockHeader, GetBlockHeaderError, GetBlockHeaderVerbose,
+    GetBlockHeaderVerboseError, GetBlockStats, GetBlockStatsError, GetBlockTemplate,
+    GetBlockTemplateError, GetBlockVerboseOne, GetBlockVerboseOneError, GetBlockVerboseZero,
+    GetBlockchainInfo, GetBlockchainInfoError, GetChainTips, GetChainTxStats, GetChainTxStatsError,
+    GetConnectionCount, GetDifficulty, GetMemoryInfoStats, GetMempoolAncestors,
+    GetMempoolAncestorsVerbose, GetMempoolDescendants, GetMempoolDescendantsVerbose,
+    GetMempoolEntry, GetMempoolInfo, GetMempoolInfoError, GetMiningInfo, GetNetTotals,
+    GetNetworkInfo, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork,
+    GetNewAddress, GetPeerInfo, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose,
+    GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError,
+    GetReceivedByAddress, GetTransaction, GetTransactionDetail, GetTransactionDetailError,
+    GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError,
+    GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, GetZmqNotifications,
+    ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListBanned,
+    ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError,
     ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock,
     ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError,
     ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError,

diff --git a/types/src/v19/mod.rs b/types/src/v19/mod.rs
@@ -158,7 +158,7 @@
 //! | JSON-RPC Method Name               | Returns         | Notes                                  |
 //! |:-----------------------------------|:---------------:|:--------------------------------------:|
 //! | abandontransaction                 | returns nothing |                                        |
-//! | abortrescan                        | returns nothing |                                        |
+//! | abortrescan                        | version         |                                        |
 //! | addmultisigaddress                 | version + model | UNTESTED                               |
 //! | backupwallet                       | returns nothing |                                        |
 //! | bumpfee                            | version + model |                                        |
@@ -243,27 +243,27 @@ pub use self::{
 };
 #[doc(inline)]
 pub use crate::v17::{
-    AddMultisigAddress, AddMultisigAddressError, AddedNode, AddedNodeAddress, AddressInformation,
-    Banned, BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus, CombinePsbt,
-    CombineRawTransaction, ConvertToPsbt, CreateMultisig, CreateMultisigError, CreatePsbt,
-    CreateRawTransaction, CreateWallet, DecodePsbt, DecodePsbtError, DecodeRawTransaction,
-    DecodeScript, DecodeScriptError, DumpPrivKey, DumpWallet, EstimateSmartFee, FinalizePsbt,
-    FinalizePsbtError, FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress,
-    GetAddedNodeInfo, GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError,
-    GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetBestBlockHash,
-    GetBlockCount, GetBlockHash, GetBlockHeader, GetBlockHeaderError, GetBlockHeaderVerbose,
-    GetBlockHeaderVerboseError, GetBlockStats, GetBlockStatsError, GetBlockTemplate,
-    GetBlockTemplateError, GetBlockVerboseOne, GetBlockVerboseOneError, GetBlockVerboseZero,
-    GetChainTips, GetChainTxStats, GetChainTxStatsError, GetConnectionCount, GetDifficulty,
-    GetMemoryInfoStats, GetMempoolInfo, GetMempoolInfoError, GetMiningInfo, GetNetTotals,
-    GetNetworkInfo, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork,
-    GetNewAddress, GetPeerInfo, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose,
-    GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError,
-    GetReceivedByAddress, GetTransaction, GetTransactionDetail, GetTransactionDetailError,
-    GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError,
-    GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError, GetZmqNotifications,
-    ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem, ListBanned,
-    ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError,
+    AbortRescan, AddMultisigAddress, AddMultisigAddressError, AddedNode, AddedNodeAddress,
+    AddressInformation, Banned, BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus,
+    CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisig, CreateMultisigError,
+    CreatePsbt, CreateRawTransaction, CreateWallet, DecodePsbt, DecodePsbtError,
+    DecodeRawTransaction, DecodeScript, DecodeScriptError, DumpPrivKey, DumpWallet,
+    EstimateSmartFee, FinalizePsbt, FinalizePsbtError, FundRawTransaction, FundRawTransactionError,
+    Generate, GenerateToAddress, GetAddedNodeInfo, GetAddressInfo, GetAddressInfoEmbedded,
+    GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel,
+    GetBalance, GetBestBlockHash, GetBlockCount, GetBlockHash, GetBlockHeader, GetBlockHeaderError,
+    GetBlockHeaderVerbose, GetBlockHeaderVerboseError, GetBlockStats, GetBlockStatsError,
+    GetBlockTemplate, GetBlockTemplateError, GetBlockVerboseOne, GetBlockVerboseOneError,
+    GetBlockVerboseZero, GetChainTips, GetChainTxStats, GetChainTxStatsError, GetConnectionCount,
+    GetDifficulty, GetMemoryInfoStats, GetMempoolInfo, GetMempoolInfoError, GetMiningInfo,
+    GetNetTotals, GetNetworkInfo, GetNetworkInfoAddress, GetNetworkInfoError,
+    GetNetworkInfoNetwork, GetNewAddress, GetPeerInfo, GetRawChangeAddress, GetRawMempool,
+    GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose,
+    GetRawTransactionVerboseError, GetReceivedByAddress, GetTransaction, GetTransactionDetail,
+    GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo,
+    GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError,
+    GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem,
+    ListBanned, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError,
     ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock,
     ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError,
     ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError,

diff --git a/types/src/v20/mod.rs b/types/src/v20/mod.rs
@@ -159,7 +159,7 @@
 //! | JSON-RPC Method Name               | Returns         | Notes                                  |
 //! |:-----------------------------------|:---------------:|:--------------------------------------:|
 //! | abandontransaction                 | returns nothing |                                        |
-//! | abortrescan                        | returns nothing |                                        |
+//! | abortrescan                        | version         |                                        |
 //! | addmultisigaddress                 | version + model | UNTESTED                               |
 //! | backupwallet                       | returns nothing |                                        |
 //! | bumpfee                            | version + model |                                        |
@@ -233,7 +233,7 @@ pub use self::control::Logging;
 #[doc(inline)]
 pub use crate::{
     v17::{
-        AddMultisigAddress, AddMultisigAddressError, AddedNode, AddedNodeAddress,
+        AbortRescan, AddMultisigAddress, AddMultisigAddressError, AddedNode, AddedNodeAddress,
         AddressInformation, Banned, BumpFee, BumpFeeError, ChainTips, ChainTipsError,
         ChainTipsStatus, CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisig,
         CreateMultisigError, CreatePsbt, CreateRawTransaction, CreateWallet, DecodePsbt,