diff --git a/client/src/client_sync/v17/mod.rs b/client/src/client_sync/v17/mod.rs index 65a5f9ce..8aadc0b5 100644 --- 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 index 1185d737..0b24601e 100644 --- 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 { 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 index 18190fd4..07059684 100644 --- 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 index ca81b161..f72bb5ab 100644 --- 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 index c62d5b1d..914428a2 100644 --- 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 index fee01d18..27e3803f 100644 --- 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 index 9bf7b429..6a22f1c4 100644 --- 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 index f88db690..3f876847 100644 --- 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 index fbfc2bd7..7309e208 100644 --- 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 index 0e6128f7..a7045355 100644 --- 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 index 8940c6f7..d51e9e6e 100644 --- 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 index 2b10a44c..549cb50f 100644 --- 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 index 41eae07c..ed70623b 100644 --- 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 index 47afdfdf..ac270963 100644 --- 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 index d7e7057a..31826575 100644 --- 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 index d0739209..eae0b0ed 100644 --- 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 index cd70fefd..bc46bcea 100644 --- 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 index c32946d3..b3dca4b3 100644 --- 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 index 7ee3a727..549d1608 100644 --- 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 index 39767db6..78e3bfef 100644 --- 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, diff --git a/types/src/v21/mod.rs b/types/src/v21/mod.rs index 41ce7be6..6538531d 100644 --- a/types/src/v21/mod.rs +++ b/types/src/v21/mod.rs @@ -161,7 +161,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 | | @@ -239,7 +239,7 @@ pub use self::wallet::UnloadWallet; #[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, diff --git a/types/src/v22/mod.rs b/types/src/v22/mod.rs index 0756d834..e63f4d95 100644 --- a/types/src/v22/mod.rs +++ b/types/src/v22/mod.rs @@ -170,7 +170,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 | | @@ -250,7 +250,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, diff --git a/types/src/v23/mod.rs b/types/src/v23/mod.rs index cde0c71f..ced2ae9f 100644 --- a/types/src/v23/mod.rs +++ b/types/src/v23/mod.rs @@ -161,7 +161,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 | | @@ -249,7 +249,7 @@ pub use self::{ #[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, DecodeRawTransaction, diff --git a/types/src/v24/mod.rs b/types/src/v24/mod.rs index d8632ea6..6a202253 100644 --- a/types/src/v24/mod.rs +++ b/types/src/v24/mod.rs @@ -162,7 +162,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 | | @@ -250,7 +250,7 @@ pub use self::raw_transactions::{ #[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, DecodeRawTransaction, diff --git a/types/src/v25/mod.rs b/types/src/v25/mod.rs index 2b048299..f18604fe 100644 --- a/types/src/v25/mod.rs +++ b/types/src/v25/mod.rs @@ -163,7 +163,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 | | @@ -247,7 +247,7 @@ pub use self::wallet::{CreateWallet, LoadWallet, UnloadWallet}; #[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, DecodeRawTransaction, DecodeScript, diff --git a/types/src/v26/mod.rs b/types/src/v26/mod.rs index c49a2650..229c3da0 100644 --- a/types/src/v26/mod.rs +++ b/types/src/v26/mod.rs @@ -171,7 +171,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 | | @@ -267,7 +267,7 @@ pub use self::{ #[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, DecodeRawTransaction, DecodeScript, diff --git a/types/src/v27/mod.rs b/types/src/v27/mod.rs index c69ae55c..abf24f2d 100644 --- a/types/src/v27/mod.rs +++ b/types/src/v27/mod.rs @@ -171,7 +171,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 | | @@ -251,7 +251,7 @@ #[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, DecodeRawTransaction, DecodeScript, diff --git a/types/src/v28/mod.rs b/types/src/v28/mod.rs index dab6f2d8..c5a2fd9e 100644 --- a/types/src/v28/mod.rs +++ b/types/src/v28/mod.rs @@ -171,7 +171,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 | | @@ -259,7 +259,7 @@ pub use self::{blockchain::GetBlockchainInfo, mining::GetMiningInfo, network::Ge #[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, DecodeRawTransaction, DecodeScript, diff --git a/types/src/v29/mod.rs b/types/src/v29/mod.rs index 7f1bb0f8..fc3b566c 100644 --- a/types/src/v29/mod.rs +++ b/types/src/v29/mod.rs @@ -172,7 +172,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 | | @@ -274,7 +274,7 @@ pub use self::{ #[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, DecodeRawTransaction, DecodeScript, diff --git a/verify/src/method/v17.rs b/verify/src/method/v17.rs index acf6aca4..77bb3c6f 100644 --- a/verify/src/method/v17.rs +++ b/verify/src/method/v17.rs @@ -87,7 +87,7 @@ pub const METHODS: &[Method] = &[ Method::new_no_model("verifymessage", "VerifyMessage", "verify_message"), // wallet Method::new_nothing("abandontransaction", "abandon_transaction"), - Method::new_nothing("abortrescan", "abort_rescan"), + Method::new_no_model("abortrescan", "AbortRescan", "abort_rescan"), Method::new_modelled("addmultisigaddress", "AddMultisigAddress", "add_multisig_address"), Method::new_nothing("backupwallet", "backup_wallet"), Method::new_modelled("bumpfee", "BumpFee", "bump_fee"), diff --git a/verify/src/method/v18.rs b/verify/src/method/v18.rs index e9e4d3d6..1516b9b8 100644 --- a/verify/src/method/v18.rs +++ b/verify/src/method/v18.rs @@ -94,7 +94,7 @@ pub const METHODS: &[Method] = &[ Method::new_bool("verifymessage", "verify_message"), // wallet Method::new_nothing("abandontransaction", "abandon_transaction"), - Method::new_nothing("abortrescan", "abort_rescan"), + Method::new_no_model("abortrescan", "AbortRescan", "abort_rescan"), Method::new_modelled("addmultisigaddress", "AddMultisigAddress", "add_multisig_address"), Method::new_nothing("backupwallet", "backup_wallet"), Method::new_modelled("bumpfee", "BumpFee", "bump_fee"), diff --git a/verify/src/method/v19.rs b/verify/src/method/v19.rs index 1494ab48..b46a31dd 100644 --- a/verify/src/method/v19.rs +++ b/verify/src/method/v19.rs @@ -94,7 +94,7 @@ pub const METHODS: &[Method] = &[ Method::new_bool("verifymessage", "verify_message"), // wallet Method::new_nothing("abandontransaction", "abandon_transaction"), - Method::new_nothing("abortrescan", "abort_rescan"), + Method::new_no_model("abortrescan", "AbortRescan", "abort_rescan"), Method::new_modelled("addmultisigaddress", "AddMultisigAddress", "add_multisig_address"), Method::new_nothing("backupwallet", "backup_wallet"), Method::new_modelled("bumpfee", "BumpFee", "bump_fee"), diff --git a/verify/src/method/v20.rs b/verify/src/method/v20.rs index b753cb80..99e4f07f 100644 --- a/verify/src/method/v20.rs +++ b/verify/src/method/v20.rs @@ -95,7 +95,7 @@ pub const METHODS: &[Method] = &[ Method::new_bool("verifymessage", "verify_message"), // wallet Method::new_nothing("abandontransaction", "abandon_transaction"), - Method::new_nothing("abortrescan", "abort_rescan"), + Method::new_no_model("abortrescan", "AbortRescan", "abort_rescan"), Method::new_modelled("addmultisigaddress", "AddMultisigAddress", "add_multisig_address"), Method::new_nothing("backupwallet", "backup_wallet"), Method::new_modelled("bumpfee", "BumpFee", "bump_fee"), diff --git a/verify/src/method/v21.rs b/verify/src/method/v21.rs index 5adf3724..c377c272 100644 --- a/verify/src/method/v21.rs +++ b/verify/src/method/v21.rs @@ -97,7 +97,7 @@ pub const METHODS: &[Method] = &[ Method::new_bool("verifymessage", "verify_message"), // wallet Method::new_nothing("abandontransaction", "abandon_transaction"), - Method::new_nothing("abortrescan", "abort_rescan"), + Method::new_no_model("abortrescan", "AbortRescan", "abort_rescan"), Method::new_modelled("addmultisigaddress", "AddMultisigAddress", "add_multisig_address"), Method::new_nothing("backupwallet", "backup_wallet"), Method::new_modelled("bumpfee", "BumpFee", "bump_fee"), diff --git a/verify/src/method/v22.rs b/verify/src/method/v22.rs index d7781935..22d3466f 100644 --- a/verify/src/method/v22.rs +++ b/verify/src/method/v22.rs @@ -99,7 +99,7 @@ pub const METHODS: &[Method] = &[ Method::new_bool("verifymessage", "verify_message"), // wallet Method::new_nothing("abandontransaction", "abandon_transaction"), - Method::new_nothing("abortrescan", "abort_rescan"), + Method::new_no_model("abortrescan", "AbortRescan", "abort_rescan"), Method::new_modelled("addmultisigaddress", "AddMultisigAddress", "add_multisig_address"), Method::new_nothing("backupwallet", "backup_wallet"), Method::new_modelled("bumpfee", "BumpFee", "bump_fee"), diff --git a/verify/src/method/v23.rs b/verify/src/method/v23.rs index abdaa1b4..49a3bfee 100644 --- a/verify/src/method/v23.rs +++ b/verify/src/method/v23.rs @@ -95,7 +95,7 @@ pub const METHODS: &[Method] = &[ Method::new_bool("verifymessage", "verify_message"), // wallet Method::new_nothing("abandontransaction", "abandon_transaction"), - Method::new_nothing("abortrescan", "abort_rescan"), + Method::new_no_model("abortrescan", "AbortRescan", "abort_rescan"), Method::new_modelled("addmultisigaddress", "AddMultisigAddress", "add_multisig_address"), Method::new_nothing("backupwallet", "backup_wallet"), Method::new_modelled("bumpfee", "BumpFee", "bump_fee"), diff --git a/verify/src/method/v24.rs b/verify/src/method/v24.rs index 7bb0fa4d..9d87ed2d 100644 --- a/verify/src/method/v24.rs +++ b/verify/src/method/v24.rs @@ -96,7 +96,7 @@ pub const METHODS: &[Method] = &[ Method::new_bool("verifymessage", "verify_message"), // wallet Method::new_nothing("abandontransaction", "abandon_transaction"), - Method::new_nothing("abortrescan", "abort_rescan"), + Method::new_no_model("abortrescan", "AbortRescan", "abort_rescan"), Method::new_modelled("addmultisigaddress", "AddMultisigAddress", "add_multisig_address"), Method::new_nothing("backupwallet", "backup_wallet"), Method::new_modelled("bumpfee", "BumpFee", "bump_fee"), diff --git a/verify/src/method/v25.rs b/verify/src/method/v25.rs index d9451a6c..4c0c8519 100644 --- a/verify/src/method/v25.rs +++ b/verify/src/method/v25.rs @@ -97,7 +97,7 @@ pub const METHODS: &[Method] = &[ Method::new_bool("verifymessage", "verify_message"), Method::new_nothing("abandontransaction", "abandon_transaction"), // wallet - Method::new_nothing("abortrescan", "abort_rescan"), + Method::new_no_model("abortrescan", "AbortRescan", "abort_rescan"), Method::new_modelled("addmultisigaddress", "AddMultisigAddress", "add_multisig_address"), Method::new_nothing("backupwallet", "backup_wallet"), Method::new_modelled("bumpfee", "BumpFee", "bump_fee"), diff --git a/verify/src/method/v26.rs b/verify/src/method/v26.rs index e61f2e93..09a30aa4 100644 --- a/verify/src/method/v26.rs +++ b/verify/src/method/v26.rs @@ -104,7 +104,7 @@ pub const METHODS: &[Method] = &[ Method::new_bool("verifymessage", "verify_message"), // wallet Method::new_nothing("abandontransaction", "abandon_transaction"), - Method::new_nothing("abortrescan", "abort_rescan"), + Method::new_no_model("abortrescan", "AbortRescan", "abort_rescan"), Method::new_modelled("addmultisigaddress", "AddMultisigAddress", "add_multisig_address"), Method::new_nothing("backupwallet", "backup_wallet"), Method::new_modelled("bumpfee", "BumpFee", "bump_fee"), diff --git a/verify/src/method/v27.rs b/verify/src/method/v27.rs index 296ba611..03a7a2ca 100644 --- a/verify/src/method/v27.rs +++ b/verify/src/method/v27.rs @@ -107,7 +107,7 @@ pub const METHODS: &[Method] = &[ Method::new_bool("verifymessage", "verify_message"), // wallet Method::new_nothing("abandontransaction", "abandon_transaction"), - Method::new_nothing("abortrescan", "abort_rescan"), + Method::new_no_model("abortrescan", "AbortRescan", "abort_rescan"), Method::new_modelled("addmultisigaddress", "AddMultisigAddress", "add_multisig_address"), Method::new_nothing("backupwallet", "backup_wallet"), Method::new_modelled("bumpfee", "BumpFee", "bump_fee"), diff --git a/verify/src/method/v28.rs b/verify/src/method/v28.rs index dd97f9a0..ba90a572 100644 --- a/verify/src/method/v28.rs +++ b/verify/src/method/v28.rs @@ -107,7 +107,7 @@ pub const METHODS: &[Method] = &[ Method::new_bool("verifymessage", "verify_message"), // wallet Method::new_nothing("abandontransaction", "abandon_transaction"), - Method::new_nothing("abortrescan", "abort_rescan"), + Method::new_no_model("abortrescan", "AbortRescan", "abort_rescan"), Method::new_modelled("addmultisigaddress", "AddMultisigAddress", "add_multisig_address"), Method::new_nothing("backupwallet", "backup_wallet"), Method::new_modelled("bumpfee", "BumpFee", "bump_fee"), diff --git a/verify/src/method/v29.rs b/verify/src/method/v29.rs index 795f169f..90c61ad4 100644 --- a/verify/src/method/v29.rs +++ b/verify/src/method/v29.rs @@ -108,7 +108,7 @@ pub const METHODS: &[Method] = &[ Method::new_bool("verifymessage", "verify_message"), // wallet Method::new_nothing("abandontransaction", "abandon_transaction"), - Method::new_nothing("abortrescan", "abort_rescan"), + Method::new_no_model("abortrescan", "AbortRescan", "abort_rescan"), Method::new_modelled("addmultisigaddress", "AddMultisigAddress", "add_multisig_address"), Method::new_nothing("backupwallet", "backup_wallet"), Method::new_modelled("bumpfee", "BumpFee", "bump_fee"),