diff --git a/client/src/client_sync/v17/mod.rs b/client/src/client_sync/v17/mod.rs index b07a7bf8..33020dc9 100644 --- a/client/src/client_sync/v17/mod.rs +++ b/client/src/client_sync/v17/mod.rs @@ -143,6 +143,7 @@ crate::impl_client_v17__list_transactions!(); crate::impl_client_v17__list_unspent!(); crate::impl_client_v17__list_wallets!(); crate::impl_client_v17__load_wallet!(); +crate::impl_client_v17__lock_unspent!(); crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); diff --git a/client/src/client_sync/v17/wallet.rs b/client/src/client_sync/v17/wallet.rs index fe2c37c0..df65c0fb 100644 --- a/client/src/client_sync/v17/wallet.rs +++ b/client/src/client_sync/v17/wallet.rs @@ -499,6 +499,22 @@ macro_rules! impl_client_v17__load_wallet { }; } +/// Implements Bitcoin Core JSON-RPC API method `loadwallet`. +#[macro_export] +macro_rules! impl_client_v17__lock_unspent { + () => { + impl Client { + pub fn lock_unspent(&self) -> Result { + self.call("lockunspent", &[into_json(false)?]) + } + + pub fn unlock_unspent(&self) -> Result { + self.call("lockunspent", &[into_json(true)?]) + } + } + }; +} + /// Implements Bitcoin Core JSON-RPC API method `rescanblockchain`. #[macro_export] macro_rules! impl_client_v17__rescan_blockchain { diff --git a/client/src/client_sync/v18/mod.rs b/client/src/client_sync/v18/mod.rs index 2d24b6db..d3360b65 100644 --- a/client/src/client_sync/v18/mod.rs +++ b/client/src/client_sync/v18/mod.rs @@ -160,6 +160,7 @@ crate::impl_client_v17__list_unspent!(); crate::impl_client_v17__list_wallets!(); crate::impl_client_v18__list_wallet_dir!(); crate::impl_client_v17__load_wallet!(); +crate::impl_client_v17__lock_unspent!(); crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); diff --git a/client/src/client_sync/v19/mod.rs b/client/src/client_sync/v19/mod.rs index 0b5be833..0428e18a 100644 --- a/client/src/client_sync/v19/mod.rs +++ b/client/src/client_sync/v19/mod.rs @@ -156,6 +156,7 @@ crate::impl_client_v17__list_unspent!(); crate::impl_client_v18__list_wallet_dir!(); crate::impl_client_v17__list_wallets!(); crate::impl_client_v17__load_wallet!(); +crate::impl_client_v17__lock_unspent!(); crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); diff --git a/client/src/client_sync/v20/mod.rs b/client/src/client_sync/v20/mod.rs index a5c08e47..959f5bef 100644 --- a/client/src/client_sync/v20/mod.rs +++ b/client/src/client_sync/v20/mod.rs @@ -153,6 +153,7 @@ crate::impl_client_v17__list_unspent!(); crate::impl_client_v18__list_wallet_dir!(); crate::impl_client_v17__list_wallets!(); crate::impl_client_v17__load_wallet!(); +crate::impl_client_v17__lock_unspent!(); crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); diff --git a/client/src/client_sync/v21/mod.rs b/client/src/client_sync/v21/mod.rs index 253a286c..6e1b4a40 100644 --- a/client/src/client_sync/v21/mod.rs +++ b/client/src/client_sync/v21/mod.rs @@ -155,6 +155,7 @@ crate::impl_client_v17__list_unspent!(); crate::impl_client_v18__list_wallet_dir!(); crate::impl_client_v17__list_wallets!(); crate::impl_client_v17__load_wallet!(); +crate::impl_client_v17__lock_unspent!(); crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); diff --git a/client/src/client_sync/v22/mod.rs b/client/src/client_sync/v22/mod.rs index f1beab58..6bedbe86 100644 --- a/client/src/client_sync/v22/mod.rs +++ b/client/src/client_sync/v22/mod.rs @@ -155,6 +155,7 @@ crate::impl_client_v17__list_unspent!(); crate::impl_client_v18__list_wallet_dir!(); crate::impl_client_v17__list_wallets!(); crate::impl_client_v17__load_wallet!(); +crate::impl_client_v17__lock_unspent!(); crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); diff --git a/client/src/client_sync/v23/mod.rs b/client/src/client_sync/v23/mod.rs index 02d6486c..8def26fe 100644 --- a/client/src/client_sync/v23/mod.rs +++ b/client/src/client_sync/v23/mod.rs @@ -157,6 +157,7 @@ crate::impl_client_v17__list_unspent!(); crate::impl_client_v18__list_wallet_dir!(); crate::impl_client_v17__list_wallets!(); crate::impl_client_v22__load_wallet!(); +crate::impl_client_v17__lock_unspent!(); crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); diff --git a/client/src/client_sync/v24/mod.rs b/client/src/client_sync/v24/mod.rs index 9e4b4a45..935e450c 100644 --- a/client/src/client_sync/v24/mod.rs +++ b/client/src/client_sync/v24/mod.rs @@ -154,6 +154,7 @@ crate::impl_client_v17__list_unspent!(); crate::impl_client_v18__list_wallet_dir!(); crate::impl_client_v17__list_wallets!(); crate::impl_client_v22__load_wallet!(); +crate::impl_client_v17__lock_unspent!(); crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); diff --git a/client/src/client_sync/v25/mod.rs b/client/src/client_sync/v25/mod.rs index 6008a8ab..cbd04598 100644 --- a/client/src/client_sync/v25/mod.rs +++ b/client/src/client_sync/v25/mod.rs @@ -154,6 +154,7 @@ crate::impl_client_v17__list_unspent!(); crate::impl_client_v18__list_wallet_dir!(); crate::impl_client_v17__list_wallets!(); crate::impl_client_v22__load_wallet!(); +crate::impl_client_v17__lock_unspent!(); crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); diff --git a/client/src/client_sync/v26/mod.rs b/client/src/client_sync/v26/mod.rs index bc322390..ec06c55d 100644 --- a/client/src/client_sync/v26/mod.rs +++ b/client/src/client_sync/v26/mod.rs @@ -160,6 +160,7 @@ crate::impl_client_v17__list_unspent!(); crate::impl_client_v18__list_wallet_dir!(); crate::impl_client_v17__list_wallets!(); crate::impl_client_v22__load_wallet!(); +crate::impl_client_v17__lock_unspent!(); crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); diff --git a/client/src/client_sync/v27/mod.rs b/client/src/client_sync/v27/mod.rs index 2d06c89e..1d67076f 100644 --- a/client/src/client_sync/v27/mod.rs +++ b/client/src/client_sync/v27/mod.rs @@ -156,6 +156,7 @@ crate::impl_client_v17__list_unspent!(); crate::impl_client_v18__list_wallet_dir!(); crate::impl_client_v17__list_wallets!(); crate::impl_client_v22__load_wallet!(); +crate::impl_client_v17__lock_unspent!(); crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); diff --git a/client/src/client_sync/v28/mod.rs b/client/src/client_sync/v28/mod.rs index 81cb230e..94a48db1 100644 --- a/client/src/client_sync/v28/mod.rs +++ b/client/src/client_sync/v28/mod.rs @@ -158,6 +158,7 @@ crate::impl_client_v17__list_unspent!(); crate::impl_client_v18__list_wallet_dir!(); crate::impl_client_v17__list_wallets!(); crate::impl_client_v22__load_wallet!(); +crate::impl_client_v17__lock_unspent!(); crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); diff --git a/client/src/client_sync/v29/mod.rs b/client/src/client_sync/v29/mod.rs index 537329ad..141e5b68 100644 --- a/client/src/client_sync/v29/mod.rs +++ b/client/src/client_sync/v29/mod.rs @@ -158,6 +158,7 @@ crate::impl_client_v17__list_unspent!(); crate::impl_client_v18__list_wallet_dir!(); crate::impl_client_v17__list_wallets!(); crate::impl_client_v22__load_wallet!(); +crate::impl_client_v17__lock_unspent!(); crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); diff --git a/integration_test/tests/wallet.rs b/integration_test/tests/wallet.rs index c8a97a5d..d309c4ff 100644 --- a/integration_test/tests/wallet.rs +++ b/integration_test/tests/wallet.rs @@ -509,6 +509,18 @@ fn wallet__load_wallet__modelled() { create_load_unload_wallet(); } +#[test] +fn wallet__lock_unspent() { + let node = Node::with_wallet(Wallet::Default, &[]); + node.fund_wallet(); + + let json: LockUnspent = node.client.lock_unspent().expect("lockunspent"); + assert!(json.0); + + let json: LockUnspent = node.client.unlock_unspent().expect("unlockunspent"); + assert!(json.0); +} + // This is tested in raw_transactions.rs `create_sign_send()`. #[test] fn wallet__sign_raw_transaction_with_wallet__modelled() {} diff --git a/types/src/v17/mod.rs b/types/src/v17/mod.rs index cb783703..bbdf9448 100644 --- a/types/src/v17/mod.rs +++ b/types/src/v17/mod.rs @@ -190,7 +190,7 @@ //! | listunspent | version + model | | //! | listwallets | version + model | UNTESTED | //! | loadwallet | version + model | | -//! | lockunspent | returns boolean | | +//! | lockunspent | version | | //! | move | returns boolean | | //! | removeprunedfunds | returns nothing | | //! | rescanblockchain | version + model | UNTESTED | @@ -283,9 +283,9 @@ pub use self::{ ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspent, ListUnspentItem, - ListUnspentItemError, ListWallets, LoadWallet, RescanBlockchain, SendMany, SendToAddress, - SignMessage, TransactionCategory, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, + ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, RescanBlockchain, SendMany, + SendToAddress, SignMessage, TransactionCategory, WalletCreateFundedPsbt, + WalletCreateFundedPsbtError, WalletProcessPsbt, }, zmq::GetZmqNotifications, }; diff --git a/types/src/v17/wallet/mod.rs b/types/src/v17/wallet/mod.rs index 21cb2c30..3561795f 100644 --- a/types/src/v17/wallet/mod.rs +++ b/types/src/v17/wallet/mod.rs @@ -928,6 +928,15 @@ impl LoadWallet { pub fn name(self) -> String { self.into_model().name } } +/// Result of JSON-RPC method `lockunspent`. +/// +/// > lockunspent +/// > +/// > Arguments: +/// > 1. unlock (boolean, required) Whether to unlock (true) or lock (false) the specified transactions. +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +pub struct LockUnspent(pub bool); + /// Result of the JSON-RPC method `rescanblockchain`. /// /// > rescanblockchain ("start_height") ("stop_height") diff --git a/types/src/v18/mod.rs b/types/src/v18/mod.rs index 5fc9ab18..888a9242 100644 --- a/types/src/v18/mod.rs +++ b/types/src/v18/mod.rs @@ -194,7 +194,7 @@ //! | listwalletdir | version | | //! | listwallets | version + model | UNTESTED | //! | loadwallet | version + model | | -//! | lockunspent | returns boolean | | +//! | lockunspent | version | | //! | removeprunedfunds | returns nothing | | //! | rescanblockchain | version + model | UNTESTED | //! | sendmany | version + model | UNTESTED | @@ -273,8 +273,8 @@ pub use crate::v17::{ ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, - ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, Locked, Logging, - MapMempoolEntryError, MempoolAcceptance, MempoolEntryError, MempoolEntryFees, + ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, Locked, + Logging, MapMempoolEntryError, MempoolAcceptance, MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, PruneBlockchain, PsbtInput, PsbtOutput, PsbtScript, RawTransaction, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SignFail, SignFailError, SignMessage, diff --git a/types/src/v19/mod.rs b/types/src/v19/mod.rs index 9456e240..36604d41 100644 --- a/types/src/v19/mod.rs +++ b/types/src/v19/mod.rs @@ -195,7 +195,7 @@ //! | listwalletdir | version | | //! | listwallets | version + model | UNTESTED | //! | loadwallet | version + model | | -//! | lockunspent | returns boolean | | +//! | lockunspent | version | | //! | removeprunedfunds | returns nothing | | //! | rescanblockchain | version + model | UNTESTED | //! | sendmany | version + model | UNTESTED | @@ -274,7 +274,7 @@ pub use crate::v17::{ ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, - Locked, Logging, PruneBlockchain, RawTransactionError, RawTransactionInput, + LockUnspent, Locked, Logging, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, diff --git a/types/src/v20/mod.rs b/types/src/v20/mod.rs index 054c1369..240cc042 100644 --- a/types/src/v20/mod.rs +++ b/types/src/v20/mod.rs @@ -196,7 +196,7 @@ //! | listwalletdir | version | | //! | listwallets | version + model | UNTESTED | //! | loadwallet | version + model | | -//! | lockunspent | returns boolean | | +//! | lockunspent | version | | //! | removeprunedfunds | returns nothing | | //! | rescanblockchain | version + model | UNTESTED | //! | sendmany | version + model | UNTESTED | @@ -265,7 +265,7 @@ pub use crate::{ ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, - LoadWallet, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, + LoadWallet, LockUnspent, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, diff --git a/types/src/v21/mod.rs b/types/src/v21/mod.rs index 2f6bee5a..702ff3d7 100644 --- a/types/src/v21/mod.rs +++ b/types/src/v21/mod.rs @@ -200,7 +200,7 @@ //! | listwalletdir | version | | //! | listwallets | version + model | UNTESTED | //! | loadwallet | version + model | | -//! | lockunspent | returns boolean | | +//! | lockunspent | version | | //! | removeprunedfunds | returns nothing | | //! | rescanblockchain | version + model | UNTESTED | //! | send | version + model | TODO | @@ -271,8 +271,8 @@ pub use crate::{ ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, - ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, Locked, - PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, + ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, + Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, diff --git a/types/src/v22/mod.rs b/types/src/v22/mod.rs index 7eb7f5ba..cfbd9f07 100644 --- a/types/src/v22/mod.rs +++ b/types/src/v22/mod.rs @@ -210,7 +210,7 @@ //! | listwalletdir | version | | //! | listwallets | version + model | UNTESTED | //! | loadwallet | version + model | | -//! | lockunspent | returns boolean | | +//! | lockunspent | version | | //! | removeprunedfunds | returns nothing | | //! | rescanblockchain | version + model | UNTESTED | //! | send | version + model | TODO | @@ -281,7 +281,7 @@ pub use crate::{ ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, - LoadWallet, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, + LoadWallet, LockUnspent, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, diff --git a/types/src/v23/mod.rs b/types/src/v23/mod.rs index 1acdee03..6775daa7 100644 --- a/types/src/v23/mod.rs +++ b/types/src/v23/mod.rs @@ -202,7 +202,7 @@ //! | listwalletdir | version | | //! | listwallets | version + model | UNTESTED | //! | loadwallet | version + model | | -//! | lockunspent | returns boolean | | +//! | lockunspent | version | | //! | removeprunedfunds | returns nothing | | //! | rescanblockchain | version + model | UNTESTED | //! | restorewallet | version + model | TODO | @@ -280,8 +280,8 @@ pub use crate::{ ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, - ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, Locked, - PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, + ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, + Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, diff --git a/types/src/v24/mod.rs b/types/src/v24/mod.rs index 248b48c0..104db0e1 100644 --- a/types/src/v24/mod.rs +++ b/types/src/v24/mod.rs @@ -204,7 +204,7 @@ //! | listwalletdir | version | | //! | listwallets | version + model | UNTESTED | //! | loadwallet | version + model | | -//! | lockunspent | returns boolean | | +//! | lockunspent | version | | //! | removeprunedfunds | returns nothing | | //! | rescanblockchain | version + model | UNTESTED | //! | restorewallet | version + model | TODO | @@ -282,8 +282,8 @@ pub use crate::{ ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, - ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, Locked, - PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, + ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, + Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, diff --git a/types/src/v25/mod.rs b/types/src/v25/mod.rs index 59beb831..fce747b7 100644 --- a/types/src/v25/mod.rs +++ b/types/src/v25/mod.rs @@ -205,7 +205,7 @@ //! | listwalletdir | version | | //! | listwallets | version + model | UNTESTED | //! | loadwallet | version + model | | -//! | lockunspent | returns boolean | | +//! | lockunspent | version | | //! | removeprunedfunds | returns nothing | | //! | rescanblockchain | version + model | UNTESTED | //! | restorewallet | version + model | TODO | @@ -275,13 +275,13 @@ pub use crate::{ ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, - ListTransactionsItemError, ListUnspentItemError, ListWallets, Locked, PruneBlockchain, - RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, - SendRawTransaction, SendToAddress, SetNetworkActive, SignMessage, SignMessageWithPrivKey, - SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, - TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, - VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, + ListTransactionsItemError, ListUnspentItemError, ListWallets, LockUnspent, Locked, + PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, + RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, + SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, + SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, + ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, + WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v26/mod.rs b/types/src/v26/mod.rs index 096d9676..5d71f8be 100644 --- a/types/src/v26/mod.rs +++ b/types/src/v26/mod.rs @@ -213,7 +213,7 @@ //! | listwalletdir | version | | //! | listwallets | version + model | UNTESTED | //! | loadwallet | version + model | | -//! | lockunspent | returns boolean | | +//! | lockunspent | version | | //! | removeprunedfunds | returns nothing | | //! | rescanblockchain | version + model | UNTESTED | //! | restorewallet | version + model | TODO | @@ -296,13 +296,13 @@ pub use crate::{ ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, - ListTransactionsItemError, ListUnspentItemError, ListWallets, Locked, PruneBlockchain, - RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, - SendRawTransaction, SendToAddress, SetNetworkActive, SignMessage, SignMessageWithPrivKey, - SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, - TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, - VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, + ListTransactionsItemError, ListUnspentItemError, ListWallets, LockUnspent, Locked, + PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, + RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, + SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, + SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, + ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, + WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v27/mod.rs b/types/src/v27/mod.rs index e1b33499..e5fb87d0 100644 --- a/types/src/v27/mod.rs +++ b/types/src/v27/mod.rs @@ -213,7 +213,7 @@ //! | listwalletdir | version | | //! | listwallets | version + model | UNTESTED | //! | loadwallet | version + model | | -//! | lockunspent | returns boolean | | +//! | lockunspent | version | | //! | removeprunedfunds | returns nothing | | //! | rescanblockchain | version + model | UNTESTED | //! | restorewallet | version + model | TODO | @@ -273,13 +273,13 @@ pub use crate::{ ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, - ListTransactionsItemError, ListUnspentItemError, ListWallets, Locked, PruneBlockchain, - RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, - SendRawTransaction, SendToAddress, SetNetworkActive, SignMessage, SignMessageWithPrivKey, - SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, - TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, - VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, + ListTransactionsItemError, ListUnspentItemError, ListWallets, LockUnspent, Locked, + PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, + RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, + SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, + SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, + ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, + WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v28/mod.rs b/types/src/v28/mod.rs index 9fa32960..c169318c 100644 --- a/types/src/v28/mod.rs +++ b/types/src/v28/mod.rs @@ -215,7 +215,7 @@ //! | listwalletdir | version | | //! | listwallets | version + model | UNTESTED | //! | loadwallet | version + model | | -//! | lockunspent | returns boolean | | +//! | lockunspent | version | | //! | removeprunedfunds | returns nothing | | //! | rescanblockchain | version + model | UNTESTED | //! | restorewallet | version + model | TODO | @@ -294,13 +294,13 @@ pub use crate::{ ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, - ListTransactionsItemError, ListUnspentItemError, ListWallets, Locked, PruneBlockchain, - RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, - SendRawTransaction, SendToAddress, SetNetworkActive, SignMessage, SignMessageWithPrivKey, - SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, - TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, - VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, + ListTransactionsItemError, ListUnspentItemError, ListWallets, LockUnspent, Locked, + PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, + RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, + SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, + SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, + ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, + WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v29/mod.rs b/types/src/v29/mod.rs index 7638cf52..3d0aee7b 100644 --- a/types/src/v29/mod.rs +++ b/types/src/v29/mod.rs @@ -216,7 +216,7 @@ //! | listwalletdir | version | | //! | listwallets | version + model | UNTESTED | //! | loadwallet | version + model | | -//! | lockunspent | returns boolean | | +//! | lockunspent | version | | //! | removeprunedfunds | returns nothing | | //! | rescanblockchain | version + model | UNTESTED | //! | restorewallet | version + model | TODO | @@ -292,13 +292,13 @@ pub use crate::{ ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, - ListTransactionsItemError, ListUnspentItemError, ListWallets, Locked, PruneBlockchain, - RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, - SendRawTransaction, SendToAddress, SetNetworkActive, SignMessage, SignMessageWithPrivKey, - SignRawTransaction, SignRawTransactionError, TestMempoolAccept, TransactionCategory, - UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, - VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, - WitnessUtxo, + ListTransactionsItemError, ListUnspentItemError, ListWallets, LockUnspent, Locked, + PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, + RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, + SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, + TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, + ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, + WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/verify/src/method/v17.rs b/verify/src/method/v17.rs index b915dc4e..0cbe6e77 100644 --- a/verify/src/method/v17.rs +++ b/verify/src/method/v17.rs @@ -134,7 +134,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("listunspent", "ListUnspent", "list_unspent"), Method::new_modelled("listwallets", "ListWallets", "list_wallets"), Method::new_modelled("loadwallet", "LoadWallet", "load_wallet"), - Method::new_bool("lockunspent", "lock_unspent"), + Method::new_no_model("lockunspent", "LockUnspent", "lock_unspent"), Method::new_bool("move", "move"), Method::new_nothing("removeprunedfunds", "remove_pruned_funds"), Method::new_modelled("rescanblockchain", "RescanBlockchain", "rescan_blockchain"), diff --git a/verify/src/method/v18.rs b/verify/src/method/v18.rs index 04fb2d65..b589e45f 100644 --- a/verify/src/method/v18.rs +++ b/verify/src/method/v18.rs @@ -138,7 +138,7 @@ pub const METHODS: &[Method] = &[ Method::new_no_model("listwalletdir", "ListWalletDir", "list_wallet_dir"), Method::new_modelled("listwallets", "ListWallets", "list_wallets"), Method::new_modelled("loadwallet", "LoadWallet", "load_wallet"), - Method::new_bool("lockunspent", "lock_unspent"), + Method::new_no_model("lockunspent", "LockUnspent", "lock_unspent"), Method::new_nothing("removeprunedfunds", "remove_pruned_funds"), Method::new_modelled("rescanblockchain", "RescanBlockchain", "rescan_blockchain"), Method::new_modelled("sendmany", "SendMany", "send_many"), diff --git a/verify/src/method/v19.rs b/verify/src/method/v19.rs index f6b2d266..be3b97cb 100644 --- a/verify/src/method/v19.rs +++ b/verify/src/method/v19.rs @@ -139,7 +139,7 @@ pub const METHODS: &[Method] = &[ Method::new_no_model("listwalletdir", "ListWalletDir", "list_wallet_dir"), Method::new_modelled("listwallets", "ListWallets", "list_wallets"), Method::new_modelled("loadwallet", "LoadWallet", "load_wallet"), - Method::new_bool("lockunspent", "lock_unspent"), + Method::new_no_model("lockunspent", "LockUnspent", "lock_unspent"), Method::new_nothing("removeprunedfunds", "remove_pruned_funds"), Method::new_modelled("rescanblockchain", "RescanBlockchain", "rescan_blockchain"), Method::new_modelled("sendmany", "SendMany", "send_many"), diff --git a/verify/src/method/v20.rs b/verify/src/method/v20.rs index a37aa350..e51aa1d1 100644 --- a/verify/src/method/v20.rs +++ b/verify/src/method/v20.rs @@ -140,7 +140,7 @@ pub const METHODS: &[Method] = &[ Method::new_no_model("listwalletdir", "ListWalletDir", "list_wallet_dir"), Method::new_modelled("listwallets", "ListWallets", "list_wallets"), Method::new_modelled("loadwallet", "LoadWallet", "load_wallet"), - Method::new_bool("lockunspent", "lock_unspent"), + Method::new_no_model("lockunspent", "LockUnspent", "lock_unspent"), Method::new_nothing("removeprunedfunds", "remove_pruned_funds"), Method::new_modelled("rescanblockchain", "RescanBlockchain", "rescan_blockchain"), Method::new_modelled("sendmany", "SendMany", "send_many"), diff --git a/verify/src/method/v21.rs b/verify/src/method/v21.rs index 8f530539..c3b8f010 100644 --- a/verify/src/method/v21.rs +++ b/verify/src/method/v21.rs @@ -144,7 +144,7 @@ pub const METHODS: &[Method] = &[ Method::new_no_model("listwalletdir", "ListWalletDir", "list_wallet_dir"), Method::new_modelled("listwallets", "ListWallets", "list_wallets"), Method::new_modelled("loadwallet", "LoadWallet", "load_wallet"), - Method::new_bool("lockunspent", "lock_unspent"), + Method::new_no_model("lockunspent", "LockUnspent", "lock_unspent"), Method::new_nothing("removeprunedfunds", "remove_pruned_funds"), Method::new_modelled("rescanblockchain", "RescanBlockchain", "rescan_blockchain"), Method::new_modelled("send", "Send", "send"), diff --git a/verify/src/method/v22.rs b/verify/src/method/v22.rs index da9217b6..8f6609fc 100644 --- a/verify/src/method/v22.rs +++ b/verify/src/method/v22.rs @@ -147,7 +147,7 @@ pub const METHODS: &[Method] = &[ Method::new_no_model("listwalletdir", "ListWalletDir", "list_wallet_dir"), Method::new_modelled("listwallets", "ListWallets", "list_wallets"), Method::new_modelled("loadwallet", "LoadWallet", "load_wallet"), - Method::new_bool("lockunspent", "lock_unspent"), + Method::new_no_model("lockunspent", "LockUnspent", "lock_unspent"), Method::new_nothing("removeprunedfunds", "remove_pruned_funds"), Method::new_modelled("rescanblockchain", "RescanBlockchain", "rescan_blockchain"), Method::new_modelled("send", "Send", "send"), diff --git a/verify/src/method/v23.rs b/verify/src/method/v23.rs index 752ffa98..3264c1b3 100644 --- a/verify/src/method/v23.rs +++ b/verify/src/method/v23.rs @@ -144,7 +144,7 @@ pub const METHODS: &[Method] = &[ Method::new_no_model("listwalletdir", "ListWalletDir", "list_wallet_dir"), Method::new_modelled("listwallets", "ListWallets", "list_wallets"), Method::new_modelled("loadwallet", "LoadWallet", "load_wallet"), - Method::new_bool("lockunspent", "lock_unspent"), + Method::new_no_model("lockunspent", "LockUnspent", "lock_unspent"), Method::new_nothing("removeprunedfunds", "remove_pruned_funds"), Method::new_modelled("rescanblockchain", "RescanBlockchain", "rescan_blockchain"), Method::new_modelled("restorewallet", "RestoreWallet", "restore_wallet"), diff --git a/verify/src/method/v24.rs b/verify/src/method/v24.rs index 9c1fdcb7..f01ada56 100644 --- a/verify/src/method/v24.rs +++ b/verify/src/method/v24.rs @@ -146,7 +146,7 @@ pub const METHODS: &[Method] = &[ Method::new_no_model("listwalletdir", "ListWalletDir", "list_wallet_dir"), Method::new_modelled("listwallets", "ListWallets", "list_wallets"), Method::new_modelled("loadwallet", "LoadWallet", "load_wallet"), - Method::new_bool("lockunspent", "lock_unspent"), + Method::new_no_model("lockunspent", "LockUnspent", "lock_unspent"), Method::new_nothing("removeprunedfunds", "remove_pruned_funds"), Method::new_modelled("rescanblockchain", "RescanBlockchain", "rescan_blockchain"), Method::new_modelled("restorewallet", "RestoreWallet", "restore_wallet"), diff --git a/verify/src/method/v25.rs b/verify/src/method/v25.rs index a7fdd1aa..e7060e32 100644 --- a/verify/src/method/v25.rs +++ b/verify/src/method/v25.rs @@ -147,7 +147,7 @@ pub const METHODS: &[Method] = &[ Method::new_no_model("listwalletdir", "ListWalletDir", "list_wallet_dir"), Method::new_modelled("listwallets", "ListWallets", "list_wallets"), Method::new_modelled("loadwallet", "LoadWallet", "load_wallet"), - Method::new_bool("lockunspent", "lock_unspent"), + Method::new_no_model("lockunspent", "LockUnspent", "lock_unspent"), Method::new_nothing("removeprunedfunds", "remove_pruned_funds"), Method::new_modelled("rescanblockchain", "RescanBlockchain", "rescan_blockchain"), Method::new_modelled("restorewallet", "RestoreWallet", "restore_wallet"), diff --git a/verify/src/method/v26.rs b/verify/src/method/v26.rs index 3ed7d971..983af284 100644 --- a/verify/src/method/v26.rs +++ b/verify/src/method/v26.rs @@ -154,7 +154,7 @@ pub const METHODS: &[Method] = &[ Method::new_no_model("listwalletdir", "ListWalletDir", "list_wallet_dir"), Method::new_modelled("listwallets", "ListWallets", "list_wallets"), Method::new_modelled("loadwallet", "LoadWallet", "load_wallet"), - Method::new_bool("lockunspent", "lock_unspent"), + Method::new_no_model("lockunspent", "LockUnspent", "lock_unspent"), Method::new_nothing("removeprunedfunds", "remove_pruned_funds"), Method::new_modelled("rescanblockchain", "RescanBlockchain", "rescan_blockchain"), Method::new_modelled("restorewallet", "RestoreWallet", "restore_wallet"), diff --git a/verify/src/method/v27.rs b/verify/src/method/v27.rs index 7143a1ad..0b5a0634 100644 --- a/verify/src/method/v27.rs +++ b/verify/src/method/v27.rs @@ -157,7 +157,7 @@ pub const METHODS: &[Method] = &[ Method::new_no_model("listwalletdir", "ListWalletDir", "list_wallet_dir"), Method::new_modelled("listwallets", "ListWallets", "list_wallets"), Method::new_modelled("loadwallet", "LoadWallet", "load_wallet"), - Method::new_bool("lockunspent", "lock_unspent"), + Method::new_no_model("lockunspent", "LockUnspent", "lock_unspent"), Method::new_nothing("removeprunedfunds", "remove_pruned_funds"), Method::new_modelled("rescanblockchain", "RescanBlockchain", "rescan_blockchain"), Method::new_modelled("restorewallet", "RestoreWallet", "restore_wallet"), diff --git a/verify/src/method/v28.rs b/verify/src/method/v28.rs index ab2efb98..57644376 100644 --- a/verify/src/method/v28.rs +++ b/verify/src/method/v28.rs @@ -159,7 +159,7 @@ pub const METHODS: &[Method] = &[ Method::new_no_model("listwalletdir", "ListWalletDir", "list_wallet_dir"), Method::new_modelled("listwallets", "ListWallets", "list_wallets"), Method::new_modelled("loadwallet", "LoadWallet", "load_wallet"), - Method::new_bool("lockunspent", "lock_unspent"), + Method::new_no_model("lockunspent", "LockUnspent", "lock_unspent"), Method::new_nothing("removeprunedfunds", "remove_pruned_funds"), Method::new_modelled("rescanblockchain", "RescanBlockchain", "rescan_blockchain"), Method::new_modelled("restorewallet", "RestoreWallet", "restore_wallet"), diff --git a/verify/src/method/v29.rs b/verify/src/method/v29.rs index 921f10e6..fbe3bb50 100644 --- a/verify/src/method/v29.rs +++ b/verify/src/method/v29.rs @@ -160,7 +160,7 @@ pub const METHODS: &[Method] = &[ Method::new_no_model("listwalletdir", "ListWalletDir", "list_wallet_dir"), Method::new_modelled("listwallets", "ListWallets", "list_wallets"), Method::new_modelled("loadwallet", "LoadWallet", "load_wallet"), - Method::new_bool("lockunspent", "lock_unspent"), + Method::new_no_model("lockunspent", "LockUnspent", "lock_unspent"), Method::new_nothing("removeprunedfunds", "remove_pruned_funds"), Method::new_modelled("rescanblockchain", "RescanBlockchain", "rescan_blockchain"), Method::new_modelled("restorewallet", "RestoreWallet", "restore_wallet"),