From 2d469bfd479a6797df624c506aaad069ce2515cf Mon Sep 17 00:00:00 2001 From: GideonBature Date: Mon, 16 Jun 2025 06:39:09 +0100 Subject: [PATCH 1/2] Implement encryptwallet method and test --- client/src/client_sync/v17/mod.rs | 1 + client/src/client_sync/v17/wallet.rs | 13 +++++++++++++ client/src/client_sync/v18/mod.rs | 1 + client/src/client_sync/v19/mod.rs | 1 + client/src/client_sync/v20/mod.rs | 1 + client/src/client_sync/v21/mod.rs | 1 + client/src/client_sync/v22/mod.rs | 1 + client/src/client_sync/v23/mod.rs | 1 + client/src/client_sync/v24/mod.rs | 1 + client/src/client_sync/v25/mod.rs | 1 + client/src/client_sync/v26/mod.rs | 1 + client/src/client_sync/v27/mod.rs | 1 + client/src/client_sync/v28/mod.rs | 1 + client/src/client_sync/v29/mod.rs | 1 + integration_test/tests/wallet.rs | 7 +++++++ types/src/v17/mod.rs | 4 ++-- types/src/v17/wallet/mod.rs | 15 +++++++++++++++ types/src/v18/mod.rs | 4 ++-- types/src/v19/mod.rs | 4 ++-- types/src/v20/mod.rs | 4 ++-- types/src/v21/mod.rs | 4 ++-- types/src/v22/mod.rs | 4 ++-- types/src/v23/mod.rs | 4 ++-- types/src/v24/mod.rs | 4 ++-- types/src/v25/mod.rs | 4 ++-- types/src/v26/mod.rs | 4 ++-- types/src/v27/mod.rs | 4 ++-- types/src/v28/mod.rs | 4 ++-- types/src/v29/mod.rs | 4 ++-- verify/src/method/v17.rs | 2 +- verify/src/method/v18.rs | 2 +- verify/src/method/v19.rs | 2 +- verify/src/method/v20.rs | 2 +- verify/src/method/v21.rs | 2 +- verify/src/method/v22.rs | 2 +- verify/src/method/v23.rs | 2 +- verify/src/method/v24.rs | 2 +- verify/src/method/v25.rs | 2 +- verify/src/method/v26.rs | 2 +- verify/src/method/v27.rs | 2 +- verify/src/method/v28.rs | 2 +- verify/src/method/v29.rs | 2 +- 42 files changed, 87 insertions(+), 39 deletions(-) diff --git a/client/src/client_sync/v17/mod.rs b/client/src/client_sync/v17/mod.rs index 30e4830b..8eaf4f0f 100644 --- a/client/src/client_sync/v17/mod.rs +++ b/client/src/client_sync/v17/mod.rs @@ -117,6 +117,7 @@ crate::impl_client_v17__bump_fee!(); crate::impl_client_v17__create_wallet!(); crate::impl_client_v17__dump_priv_key!(); crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__encrypt_wallet!(); crate::impl_client_v17__get_addresses_by_label!(); crate::impl_client_v17__get_address_info!(); crate::impl_client_v17__get_balance!(); diff --git a/client/src/client_sync/v17/wallet.rs b/client/src/client_sync/v17/wallet.rs index 87f4d1ea..20498145 100644 --- a/client/src/client_sync/v17/wallet.rs +++ b/client/src/client_sync/v17/wallet.rs @@ -124,6 +124,19 @@ macro_rules! impl_client_v17__dump_wallet { }; } +/// Implements Bitcoin Core JSON-RPC API method `encryptwallet`. +#[macro_export] +macro_rules! impl_client_v17__encrypt_wallet { + () => { + impl Client { + // filename is either absolute or relative to bitcoind. + pub fn encrypt_wallet(&self, passphrase: &str) -> Result { + self.call("encryptwallet", &[into_json(passphrase)?]) + } + } + }; +} + /// Implements Bitcoin Core JSON-RPC API method `getaddressesbylabel`. #[macro_export] macro_rules! impl_client_v17__get_addresses_by_label { diff --git a/client/src/client_sync/v18/mod.rs b/client/src/client_sync/v18/mod.rs index f618f13f..94f8407c 100644 --- a/client/src/client_sync/v18/mod.rs +++ b/client/src/client_sync/v18/mod.rs @@ -131,6 +131,7 @@ crate::impl_client_v17__bump_fee!(); crate::impl_client_v17__create_wallet!(); crate::impl_client_v17__dump_priv_key!(); crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__encrypt_wallet!(); crate::impl_client_v17__get_addresses_by_label!(); crate::impl_client_v17__get_address_info!(); crate::impl_client_v17__get_balance!(); diff --git a/client/src/client_sync/v19/mod.rs b/client/src/client_sync/v19/mod.rs index 0d1b6cc6..bf1d5fa9 100644 --- a/client/src/client_sync/v19/mod.rs +++ b/client/src/client_sync/v19/mod.rs @@ -126,6 +126,7 @@ crate::impl_client_v17__bump_fee!(); crate::impl_client_v17__create_wallet!(); crate::impl_client_v17__dump_priv_key!(); crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__encrypt_wallet!(); crate::impl_client_v17__get_addresses_by_label!(); crate::impl_client_v17__get_address_info!(); crate::impl_client_v17__get_balance!(); diff --git a/client/src/client_sync/v20/mod.rs b/client/src/client_sync/v20/mod.rs index 267f087f..47c26e03 100644 --- a/client/src/client_sync/v20/mod.rs +++ b/client/src/client_sync/v20/mod.rs @@ -123,6 +123,7 @@ crate::impl_client_v17__bump_fee!(); crate::impl_client_v17__create_wallet!(); crate::impl_client_v17__dump_priv_key!(); crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__encrypt_wallet!(); crate::impl_client_v17__get_addresses_by_label!(); crate::impl_client_v17__get_address_info!(); crate::impl_client_v17__get_balance!(); diff --git a/client/src/client_sync/v21/mod.rs b/client/src/client_sync/v21/mod.rs index 6bc67669..aa6bef05 100644 --- a/client/src/client_sync/v21/mod.rs +++ b/client/src/client_sync/v21/mod.rs @@ -125,6 +125,7 @@ crate::impl_client_v17__bump_fee!(); crate::impl_client_v17__create_wallet!(); crate::impl_client_v17__dump_priv_key!(); crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__encrypt_wallet!(); crate::impl_client_v18__get_received_by_label!(); crate::impl_client_v17__get_addresses_by_label!(); crate::impl_client_v17__get_address_info!(); diff --git a/client/src/client_sync/v22/mod.rs b/client/src/client_sync/v22/mod.rs index 7e2bdc5c..07f5f6a9 100644 --- a/client/src/client_sync/v22/mod.rs +++ b/client/src/client_sync/v22/mod.rs @@ -125,6 +125,7 @@ crate::impl_client_v17__bump_fee!(); crate::impl_client_v17__create_wallet!(); crate::impl_client_v17__dump_priv_key!(); crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__encrypt_wallet!(); crate::impl_client_v18__get_received_by_label!(); crate::impl_client_v17__get_addresses_by_label!(); crate::impl_client_v17__get_address_info!(); diff --git a/client/src/client_sync/v23/mod.rs b/client/src/client_sync/v23/mod.rs index 1692c433..394cf291 100644 --- a/client/src/client_sync/v23/mod.rs +++ b/client/src/client_sync/v23/mod.rs @@ -127,6 +127,7 @@ crate::impl_client_v17__bump_fee!(); crate::impl_client_v23__create_wallet!(); crate::impl_client_v17__dump_priv_key!(); crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__encrypt_wallet!(); crate::impl_client_v17__get_addresses_by_label!(); crate::impl_client_v17__get_address_info!(); crate::impl_client_v17__get_balance!(); diff --git a/client/src/client_sync/v24/mod.rs b/client/src/client_sync/v24/mod.rs index 825c2cda..a841a34e 100644 --- a/client/src/client_sync/v24/mod.rs +++ b/client/src/client_sync/v24/mod.rs @@ -124,6 +124,7 @@ crate::impl_client_v17__bump_fee!(); crate::impl_client_v23__create_wallet!(); crate::impl_client_v17__dump_priv_key!(); crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__encrypt_wallet!(); crate::impl_client_v17__get_addresses_by_label!(); crate::impl_client_v17__get_address_info!(); crate::impl_client_v17__get_balance!(); diff --git a/client/src/client_sync/v25/mod.rs b/client/src/client_sync/v25/mod.rs index 7602fbe0..41b82d5c 100644 --- a/client/src/client_sync/v25/mod.rs +++ b/client/src/client_sync/v25/mod.rs @@ -124,6 +124,7 @@ crate::impl_client_v17__bump_fee!(); crate::impl_client_v23__create_wallet!(); crate::impl_client_v17__dump_priv_key!(); crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__encrypt_wallet!(); crate::impl_client_v17__get_addresses_by_label!(); crate::impl_client_v17__get_address_info!(); crate::impl_client_v17__get_balance!(); diff --git a/client/src/client_sync/v26/mod.rs b/client/src/client_sync/v26/mod.rs index b29c83cc..163efeee 100644 --- a/client/src/client_sync/v26/mod.rs +++ b/client/src/client_sync/v26/mod.rs @@ -130,6 +130,7 @@ crate::impl_client_v17__bump_fee!(); crate::impl_client_v23__create_wallet!(); crate::impl_client_v17__dump_priv_key!(); crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__encrypt_wallet!(); crate::impl_client_v17__get_addresses_by_label!(); crate::impl_client_v17__get_address_info!(); crate::impl_client_v17__get_balance!(); diff --git a/client/src/client_sync/v27/mod.rs b/client/src/client_sync/v27/mod.rs index 8910b1d8..4c459454 100644 --- a/client/src/client_sync/v27/mod.rs +++ b/client/src/client_sync/v27/mod.rs @@ -126,6 +126,7 @@ crate::impl_client_v17__bump_fee!(); crate::impl_client_v23__create_wallet!(); crate::impl_client_v17__dump_priv_key!(); crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__encrypt_wallet!(); crate::impl_client_v17__get_addresses_by_label!(); crate::impl_client_v17__get_address_info!(); crate::impl_client_v17__get_balance!(); diff --git a/client/src/client_sync/v28/mod.rs b/client/src/client_sync/v28/mod.rs index f240e34d..56aa3f11 100644 --- a/client/src/client_sync/v28/mod.rs +++ b/client/src/client_sync/v28/mod.rs @@ -128,6 +128,7 @@ crate::impl_client_v17__bump_fee!(); crate::impl_client_v23__create_wallet!(); crate::impl_client_v17__dump_priv_key!(); crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__encrypt_wallet!(); crate::impl_client_v17__get_addresses_by_label!(); crate::impl_client_v17__get_address_info!(); crate::impl_client_v17__get_balance!(); diff --git a/client/src/client_sync/v29/mod.rs b/client/src/client_sync/v29/mod.rs index 855a39bf..e0027c55 100644 --- a/client/src/client_sync/v29/mod.rs +++ b/client/src/client_sync/v29/mod.rs @@ -128,6 +128,7 @@ crate::impl_client_v17__bump_fee!(); crate::impl_client_v23__create_wallet!(); crate::impl_client_v17__dump_priv_key!(); crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__encrypt_wallet!(); crate::impl_client_v17__get_addresses_by_label!(); crate::impl_client_v17__get_address_info!(); crate::impl_client_v17__get_balance!(); diff --git a/integration_test/tests/wallet.rs b/integration_test/tests/wallet.rs index 0a88f6da..1aecb6b8 100644 --- a/integration_test/tests/wallet.rs +++ b/integration_test/tests/wallet.rs @@ -151,6 +151,13 @@ fn wallet__dump_wallet() { } } +#[test] +fn wallet__encrypt_wallet() { + let node = Node::with_wallet(Wallet::Default, &[]); + + let _: EncryptWallet = node.client.encrypt_wallet("test-passphrase").expect("encryptwallet"); +} + #[test] fn wallet__get_addresses_by_label__modelled() { let node = Node::with_wallet(Wallet::Default, &[]); diff --git a/types/src/v17/mod.rs b/types/src/v17/mod.rs index 738b16e4..97eea8cc 100644 --- a/types/src/v17/mod.rs +++ b/types/src/v17/mod.rs @@ -158,7 +158,7 @@ //! | createwallet | version + model | | //! | dumpprivkey | version + model | | //! | dumpwallet | version + model | | -//! | encryptwallet | returns nothing | | +//! | encryptwallet | version | | //! | getaccount | returns nothing | | //! | getaccountaddress | returns nothing | | //! | getaddressbyaccount | returns nothing | | @@ -284,7 +284,7 @@ pub use self::{ ListTransactionsItem, ListTransactionsItemError, ListUnspent, ListUnspentItem, ListUnspentItemError, ListWallets, LoadWallet, RescanBlockchain, SendMany, SendToAddress, SignMessage, TransactionCategory, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, + WalletProcessPsbt, EncryptWallet, }, zmq::GetZmqNotifications, }; diff --git a/types/src/v17/wallet/mod.rs b/types/src/v17/wallet/mod.rs index 2f0380b2..a098854d 100644 --- a/types/src/v17/wallet/mod.rs +++ b/types/src/v17/wallet/mod.rs @@ -181,6 +181,21 @@ pub struct DumpWallet { pub file_name: String, } +/// Result of the JSON-RPC method `encryptwallet`. +/// +/// > encryptwallet "passphrase" +/// > +/// > Encrypts the wallet with 'passphrase'. This is for first time encryption. +/// > After this, any calls that interact with private keys such as sending or signing +/// > will require the passphrase to be set prior the making these calls. +/// > Use the walletpassphrase call for this, and then walletlock call. +/// > If the wallet is already encrypted, use the walletpassphrasechange call. +/// > +/// > Arguments: +/// > 1. passphrase (string, required) The pass phrase to encrypt the wallet with. It must be at least 1 character, but should be long. +#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] +pub struct EncryptWallet (pub String); + /// Result of the JSON-RPC method `getaddressesbylabel`. /// /// > getaddressesbylabel "label" diff --git a/types/src/v18/mod.rs b/types/src/v18/mod.rs index d9bd069d..c9196235 100644 --- a/types/src/v18/mod.rs +++ b/types/src/v18/mod.rs @@ -165,7 +165,7 @@ //! | createwallet | version + model | | //! | dumpprivkey | version + model | | //! | dumpwallet | version + model | | -//! | encryptwallet | returns nothing | | +//! | encryptwallet | version | | //! | getaddressesbylabel | version + model | | //! | getaddressinfo | version + model | UNTESTED | //! | getbalance | version + model | | @@ -281,5 +281,5 @@ pub use crate::v17::{ SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, Softfork, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, - WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, + WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, EncryptWallet, }; diff --git a/types/src/v19/mod.rs b/types/src/v19/mod.rs index 335367c0..c34c398c 100644 --- a/types/src/v19/mod.rs +++ b/types/src/v19/mod.rs @@ -165,7 +165,7 @@ //! | createwallet | version + model | | //! | dumpprivkey | version + model | | //! | dumpwallet | version + model | | -//! | encryptwallet | returns nothing | | +//! | encryptwallet | version | | //! | getaddressesbylabel | version + model | | //! | getaddressinfo | version + model | UNTESTED | //! | getbalance | version + model | | @@ -272,7 +272,7 @@ pub use crate::v17::{ SendToAddress, SetNetworkActive, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, - WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, + WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, EncryptWallet, }; #[doc(inline)] pub use crate::v18::{ diff --git a/types/src/v20/mod.rs b/types/src/v20/mod.rs index 4cb451f9..b417c4dd 100644 --- a/types/src/v20/mod.rs +++ b/types/src/v20/mod.rs @@ -166,7 +166,7 @@ //! | createwallet | version + model | | //! | dumpprivkey | version + model | | //! | dumpwallet | version + model | | -//! | encryptwallet | returns nothing | | +//! | encryptwallet | version | | //! | getaddressesbylabel | version + model | | //! | getaddressinfo | version + model | UNTESTED | //! | getbalance | version + model | | @@ -268,7 +268,7 @@ pub use crate::{ SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, - WitnessUtxo, + WitnessUtxo, EncryptWallet, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v21/mod.rs b/types/src/v21/mod.rs index f1b0950d..4f921f06 100644 --- a/types/src/v21/mod.rs +++ b/types/src/v21/mod.rs @@ -168,7 +168,7 @@ //! | createwallet | version + model | | //! | dumpprivkey | version + model | | //! | dumpwallet | version + model | | -//! | encryptwallet | returns nothing | | +//! | encryptwallet | version | | //! | getaddressesbylabel | version + model | | //! | getaddressinfo | version + model | UNTESTED | //! | getbalance | version + model | | @@ -270,7 +270,7 @@ pub use crate::{ SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, - WitnessUtxo, + WitnessUtxo, EncryptWallet, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v22/mod.rs b/types/src/v22/mod.rs index 6db6ffd3..cfbde170 100644 --- a/types/src/v22/mod.rs +++ b/types/src/v22/mod.rs @@ -177,7 +177,7 @@ //! | createwallet | version + model | | //! | dumpprivkey | version + model | | //! | dumpwallet | version + model | | -//! | encryptwallet | returns nothing | | +//! | encryptwallet | version | | //! | getaddressesbylabel | version + model | | //! | getaddressinfo | version + model | UNTESTED | //! | getbalance | version + model | | @@ -285,7 +285,7 @@ pub use crate::{ SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, - WitnessUtxo, + WitnessUtxo, EncryptWallet, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v23/mod.rs b/types/src/v23/mod.rs index 19676a62..fdcf9a9e 100644 --- a/types/src/v23/mod.rs +++ b/types/src/v23/mod.rs @@ -168,7 +168,7 @@ //! | createwallet | version + model | | //! | dumpprivkey | version + model | | //! | dumpwallet | version + model | | -//! | encryptwallet | returns nothing | | +//! | encryptwallet | version | | //! | getaddressesbylabel | version + model | | //! | getaddressinfo | version + model | UNTESTED | //! | getbalance | version + model | | @@ -280,7 +280,7 @@ pub use crate::{ SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, - WitnessUtxo, + WitnessUtxo, EncryptWallet, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v24/mod.rs b/types/src/v24/mod.rs index 5c00e13a..c918e53a 100644 --- a/types/src/v24/mod.rs +++ b/types/src/v24/mod.rs @@ -169,7 +169,7 @@ //! | createwallet | version + model | | //! | dumpprivkey | version + model | | //! | dumpwallet | version + model | | -//! | encryptwallet | returns nothing | | +//! | encryptwallet | version | | //! | getaddressesbylabel | version + model | | //! | getaddressinfo | version + model | UNTESTED | //! | getbalance | version + model | | @@ -281,7 +281,7 @@ pub use crate::{ SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, - WitnessUtxo, + WitnessUtxo, EncryptWallet, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v25/mod.rs b/types/src/v25/mod.rs index 4b04b535..be65d8c5 100644 --- a/types/src/v25/mod.rs +++ b/types/src/v25/mod.rs @@ -170,7 +170,7 @@ //! | createwallet | version + model | | //! | dumpprivkey | version + model | | //! | dumpwallet | version + model | | -//! | encryptwallet | returns nothing | | +//! | encryptwallet | version | | //! | getaddressesbylabel | version + model | | //! | getaddressinfo | version + model | UNTESTED | //! | getbalance | version + model | | @@ -276,7 +276,7 @@ pub use crate::{ SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, - WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, + WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, EncryptWallet, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v26/mod.rs b/types/src/v26/mod.rs index d529ef5e..cda684c3 100644 --- a/types/src/v26/mod.rs +++ b/types/src/v26/mod.rs @@ -178,7 +178,7 @@ //! | createwallet | version + model | | //! | dumpprivkey | version + model | | //! | dumpwallet | version + model | | -//! | encryptwallet | returns nothing | | +//! | encryptwallet | version | | //! | getaddressesbylabel | version + model | | //! | getaddressinfo | version + model | UNTESTED | //! | getbalance | version + model | | @@ -296,7 +296,7 @@ pub use crate::{ SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, + WalletProcessPsbt, WitnessUtxo, EncryptWallet, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v27/mod.rs b/types/src/v27/mod.rs index 163f2f31..b636168a 100644 --- a/types/src/v27/mod.rs +++ b/types/src/v27/mod.rs @@ -178,7 +178,7 @@ //! | createwallet | version + model | | //! | dumpprivkey | version + model | | //! | dumpwallet | version + model | | -//! | encryptwallet | returns nothing | | +//! | encryptwallet | version | | //! | getaddressesbylabel | version + model | | //! | getaddressinfo | version + model | UNTESTED | //! | getbalance | version + model | | @@ -280,7 +280,7 @@ pub use crate::{ SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, + WalletProcessPsbt, WitnessUtxo, EncryptWallet, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v28/mod.rs b/types/src/v28/mod.rs index 0470bc08..14b3ba73 100644 --- a/types/src/v28/mod.rs +++ b/types/src/v28/mod.rs @@ -179,7 +179,7 @@ //! | createwalletdescriptor | version + model | TODO | //! | dumpprivkey | version + model | | //! | dumpwallet | version + model | | -//! | encryptwallet | returns nothing | | +//! | encryptwallet | version | | //! | getaddressesbylabel | version + model | | //! | getaddressinfo | version + model | UNTESTED | //! | getbalance | version + model | | @@ -288,7 +288,7 @@ pub use crate::{ SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, + WalletProcessPsbt, WitnessUtxo, EncryptWallet, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v29/mod.rs b/types/src/v29/mod.rs index 4f7ed18e..285f3dcd 100644 --- a/types/src/v29/mod.rs +++ b/types/src/v29/mod.rs @@ -180,7 +180,7 @@ //! | createwalletdescriptor | version + model | TODO | //! | dumpprivkey | version + model | | //! | dumpwallet | version + model | | -//! | encryptwallet | returns nothing | | +//! | encryptwallet | version | | //! | getaddressesbylabel | version + model | | //! | getaddressinfo | version + model | UNTESTED | //! | getbalance | version + model | | @@ -301,7 +301,7 @@ pub use crate::{ SignRawTransaction, SignRawTransactionError, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, - WitnessUtxo, + WitnessUtxo, EncryptWallet, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/verify/src/method/v17.rs b/verify/src/method/v17.rs index 4ccdc3d6..810fdeb8 100644 --- a/verify/src/method/v17.rs +++ b/verify/src/method/v17.rs @@ -94,7 +94,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("createwallet", "CreateWallet", "create_wallet"), Method::new_modelled("dumpprivkey", "DumpPrivKey", "dump_priv_key"), Method::new_no_model("dumpwallet", "DumpWallet", "dump_wallet"), - Method::new_nothing("encryptwallet", "encrypt_wallet"), + Method::new_no_model("encryptwallet", "EncryptWallet", "encrypt_wallet"), Method::new_nothing("getaccount", "get_account"), // Deprecated Method::new_nothing("getaccountaddress", "get_account_address"), // Deprecated Method::new_nothing("getaddressbyaccount", "get_address_by_account"), // Deprecated diff --git a/verify/src/method/v18.rs b/verify/src/method/v18.rs index d7922b93..d763d884 100644 --- a/verify/src/method/v18.rs +++ b/verify/src/method/v18.rs @@ -101,7 +101,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("createwallet", "CreateWallet", "create_wallet"), Method::new_modelled("dumpprivkey", "DumpPrivKey", "dump_priv_key"), Method::new_no_model("dumpwallet", "DumpWallet", "dump_wallet"), - Method::new_nothing("encryptwallet", "encrypt_wallet"), + Method::new_no_model("encryptwallet", "EncryptWallet", "encrypt_wallet"), Method::new_modelled("getaddressesbylabel", "GetAddressesByLabel", "get_addresses_by_label"), Method::new_modelled("getaddressinfo", "GetAddressInfo", "get_address_info"), Method::new_modelled("getbalance", "GetBalance", "get_balance"), diff --git a/verify/src/method/v19.rs b/verify/src/method/v19.rs index f10fd9fc..dc5e5f4a 100644 --- a/verify/src/method/v19.rs +++ b/verify/src/method/v19.rs @@ -101,7 +101,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("createwallet", "CreateWallet", "create_wallet"), Method::new_modelled("dumpprivkey", "DumpPrivKey", "dump_priv_key"), Method::new_no_model("dumpwallet", "DumpWallet", "dump_wallet"), - Method::new_nothing("encryptwallet", "encrypt_wallet"), + Method::new_no_model("encryptwallet", "EncryptWallet", "encrypt_wallet"), Method::new_modelled("getaddressesbylabel", "GetAddressesByLabel", "get_addresses_by_label"), Method::new_modelled("getaddressinfo", "GetAddressInfo", "get_address_info"), Method::new_modelled("getbalance", "GetBalance", "get_balance"), diff --git a/verify/src/method/v20.rs b/verify/src/method/v20.rs index c25dbfbe..ecfa408f 100644 --- a/verify/src/method/v20.rs +++ b/verify/src/method/v20.rs @@ -102,7 +102,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("createwallet", "CreateWallet", "create_wallet"), Method::new_modelled("dumpprivkey", "DumpPrivKey", "dump_priv_key"), Method::new_no_model("dumpwallet", "DumpWallet", "dump_wallet"), - Method::new_nothing("encryptwallet", "encrypt_wallet"), + Method::new_no_model("encryptwallet", "EncryptWallet", "encrypt_wallet"), Method::new_modelled("getaddressesbylabel", "GetAddressesByLabel", "get_addresses_by_label"), Method::new_modelled("getaddressinfo", "GetAddressInfo", "get_address_info"), Method::new_modelled("getbalance", "GetBalance", "get_balance"), diff --git a/verify/src/method/v21.rs b/verify/src/method/v21.rs index 840b8305..b8a848ac 100644 --- a/verify/src/method/v21.rs +++ b/verify/src/method/v21.rs @@ -104,7 +104,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("createwallet", "CreateWallet", "create_wallet"), Method::new_modelled("dumpprivkey", "DumpPrivKey", "dump_priv_key"), Method::new_no_model("dumpwallet", "DumpWallet", "dump_wallet"), - Method::new_nothing("encryptwallet", "encrypt_wallet"), + Method::new_no_model("encryptwallet", "EncryptWallet", "encrypt_wallet"), Method::new_modelled("getaddressesbylabel", "GetAddressesByLabel", "get_addresses_by_label"), Method::new_modelled("getaddressinfo", "GetAddressInfo", "get_address_info"), Method::new_modelled("getbalance", "GetBalance", "get_balance"), diff --git a/verify/src/method/v22.rs b/verify/src/method/v22.rs index bcde9f77..7b196786 100644 --- a/verify/src/method/v22.rs +++ b/verify/src/method/v22.rs @@ -106,7 +106,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("createwallet", "CreateWallet", "create_wallet"), Method::new_modelled("dumpprivkey", "DumpPrivKey", "dump_priv_key"), Method::new_no_model("dumpwallet", "DumpWallet", "dump_wallet"), - Method::new_nothing("encryptwallet", "encrypt_wallet"), + Method::new_no_model("encryptwallet", "EncryptWallet", "encrypt_wallet"), Method::new_modelled("getaddressesbylabel", "GetAddressesByLabel", "get_addresses_by_label"), Method::new_modelled("getaddressinfo", "GetAddressInfo", "get_address_info"), Method::new_modelled("getbalance", "GetBalance", "get_balance"), diff --git a/verify/src/method/v23.rs b/verify/src/method/v23.rs index 9c3cbd5f..5da40e87 100644 --- a/verify/src/method/v23.rs +++ b/verify/src/method/v23.rs @@ -102,7 +102,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("createwallet", "CreateWallet", "create_wallet"), Method::new_modelled("dumpprivkey", "DumpPrivKey", "dump_priv_key"), Method::new_no_model("dumpwallet", "DumpWallet", "dump_wallet"), - Method::new_nothing("encryptwallet", "encrypt_wallet"), + Method::new_no_model("encryptwallet", "EncryptWallet", "encrypt_wallet"), Method::new_modelled("getaddressesbylabel", "GetAddressesByLabel", "get_addresses_by_label"), Method::new_modelled("getaddressinfo", "GetAddressInfo", "get_address_info"), Method::new_modelled("getbalance", "GetBalance", "get_balance"), diff --git a/verify/src/method/v24.rs b/verify/src/method/v24.rs index 22bd7805..97a75c9e 100644 --- a/verify/src/method/v24.rs +++ b/verify/src/method/v24.rs @@ -103,7 +103,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("createwallet", "CreateWallet", "create_wallet"), Method::new_modelled("dumpprivkey", "DumpPrivKey", "dump_priv_key"), Method::new_no_model("dumpwallet", "DumpWallet", "dump_wallet"), - Method::new_nothing("encryptwallet", "encrypt_wallet"), + Method::new_no_model("encryptwallet", "EncryptWallet", "encrypt_wallet"), Method::new_modelled("getaddressesbylabel", "GetAddressesByLabel", "get_addresses_by_label"), Method::new_modelled("getaddressinfo", "GetAddressInfo", "get_address_info"), Method::new_modelled("getbalance", "GetBalance", "get_balance"), diff --git a/verify/src/method/v25.rs b/verify/src/method/v25.rs index 22cd48ec..a7b6c73f 100644 --- a/verify/src/method/v25.rs +++ b/verify/src/method/v25.rs @@ -104,7 +104,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("createwallet", "CreateWallet", "create_wallet"), Method::new_modelled("dumpprivkey", "DumpPrivKey", "dump_priv_key"), Method::new_no_model("dumpwallet", "DumpWallet", "dump_wallet"), - Method::new_nothing("encryptwallet", "encrypt_wallet"), + Method::new_no_model("encryptwallet", "EncryptWallet", "encrypt_wallet"), Method::new_modelled("getaddressesbylabel", "GetAddressesByLabel", "get_addresses_by_label"), Method::new_modelled("getaddressinfo", "GetAddressInfo", "get_address_info"), Method::new_modelled("getbalance", "GetBalance", "get_balance"), diff --git a/verify/src/method/v26.rs b/verify/src/method/v26.rs index 86de174a..8a3f86fd 100644 --- a/verify/src/method/v26.rs +++ b/verify/src/method/v26.rs @@ -111,7 +111,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("createwallet", "CreateWallet", "create_wallet"), Method::new_modelled("dumpprivkey", "DumpPrivKey", "dump_priv_key"), Method::new_no_model("dumpwallet", "DumpWallet", "dump_wallet"), - Method::new_nothing("encryptwallet", "encrypt_wallet"), + Method::new_no_model("encryptwallet", "EncryptWallet", "encrypt_wallet"), Method::new_modelled("getaddressesbylabel", "GetAddressesByLabel", "get_addresses_by_label"), Method::new_modelled("getaddressinfo", "GetAddressInfo", "get_address_info"), Method::new_modelled("getbalance", "GetBalance", "get_balance"), diff --git a/verify/src/method/v27.rs b/verify/src/method/v27.rs index 1b7b374f..befb3012 100644 --- a/verify/src/method/v27.rs +++ b/verify/src/method/v27.rs @@ -114,7 +114,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("createwallet", "CreateWallet", "create_wallet"), Method::new_modelled("dumpprivkey", "DumpPrivKey", "dump_priv_key"), Method::new_no_model("dumpwallet", "DumpWallet", "dump_wallet"), - Method::new_nothing("encryptwallet", "encrypt_wallet"), + Method::new_no_model("encryptwallet", "EncryptWallet", "encrypt_wallet"), Method::new_modelled("getaddressesbylabel", "GetAddressesByLabel", "get_addresses_by_label"), Method::new_modelled("getaddressinfo", "GetAddressInfo", "get_address_info"), Method::new_modelled("getbalance", "GetBalance", "get_balance"), diff --git a/verify/src/method/v28.rs b/verify/src/method/v28.rs index 4a3ece6d..f9c1a9af 100644 --- a/verify/src/method/v28.rs +++ b/verify/src/method/v28.rs @@ -115,7 +115,7 @@ pub const METHODS: &[Method] = &[ Method::new_no_model("createwalletdescriptor", "CreateWalletDescriptor", "create_wallet_descriptor"), Method::new_modelled("dumpprivkey", "DumpPrivKey", "dump_priv_key"), Method::new_no_model("dumpwallet", "DumpWallet", "dump_wallet"), - Method::new_nothing("encryptwallet", "encrypt_wallet"), + Method::new_no_model("encryptwallet", "EncryptWallet", "encrypt_wallet"), Method::new_modelled("getaddressesbylabel", "GetAddressesByLabel", "get_addresses_by_label"), Method::new_modelled("getaddressinfo", "GetAddressInfo", "get_address_info"), Method::new_modelled("getbalance", "GetBalance", "get_balance"), diff --git a/verify/src/method/v29.rs b/verify/src/method/v29.rs index 4eb5ccd2..75972b0b 100644 --- a/verify/src/method/v29.rs +++ b/verify/src/method/v29.rs @@ -116,7 +116,7 @@ pub const METHODS: &[Method] = &[ Method::new_no_model("createwalletdescriptor", "CreateWalletDescriptor", "create_wallet_descriptor"), Method::new_modelled("dumpprivkey", "DumpPrivKey", "dump_priv_key"), Method::new_no_model("dumpwallet", "DumpWallet", "dump_wallet"), - Method::new_nothing("encryptwallet", "encrypt_wallet"), + Method::new_no_model("encryptwallet", "EncryptWallet", "encrypt_wallet"), Method::new_modelled("getaddressesbylabel", "GetAddressesByLabel", "get_addresses_by_label"), Method::new_modelled("getaddressinfo", "GetAddressInfo", "get_address_info"), Method::new_modelled("getbalance", "GetBalance", "get_balance"), From e513cbe112096cd1dcfd7230dac6c420c614d1bb Mon Sep 17 00:00:00 2001 From: GideonBature Date: Mon, 16 Jun 2025 06:45:26 +0100 Subject: [PATCH 2/2] Format code changes --- types/src/v17/mod.rs | 4 ++-- types/src/v17/wallet/mod.rs | 2 +- types/src/v18/mod.rs | 12 ++++++------ types/src/v19/mod.rs | 4 ++-- types/src/v20/mod.rs | 4 ++-- types/src/v21/mod.rs | 4 ++-- types/src/v22/mod.rs | 4 ++-- types/src/v23/mod.rs | 4 ++-- types/src/v24/mod.rs | 4 ++-- types/src/v25/mod.rs | 4 ++-- types/src/v26/mod.rs | 4 ++-- types/src/v27/mod.rs | 4 ++-- types/src/v28/mod.rs | 4 ++-- types/src/v29/mod.rs | 4 ++-- 14 files changed, 31 insertions(+), 31 deletions(-) diff --git a/types/src/v17/mod.rs b/types/src/v17/mod.rs index 97eea8cc..ff9b89ae 100644 --- a/types/src/v17/mod.rs +++ b/types/src/v17/mod.rs @@ -272,7 +272,7 @@ pub use self::{ }, wallet::{ AbortRescan, AddMultisigAddress, AddMultisigAddressError, AddressInformation, BumpFee, - BumpFeeError, CreateWallet, DumpPrivKey, DumpWallet, GetAddressInfo, + BumpFeeError, CreateWallet, DumpPrivKey, DumpWallet, EncryptWallet, GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetNewAddress, GetRawChangeAddress, GetReceivedByAddress, GetTransaction, GetTransactionDetail, GetTransactionDetailError, @@ -284,7 +284,7 @@ pub use self::{ ListTransactionsItem, ListTransactionsItemError, ListUnspent, ListUnspentItem, ListUnspentItemError, ListWallets, LoadWallet, RescanBlockchain, SendMany, SendToAddress, SignMessage, TransactionCategory, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, EncryptWallet, + WalletProcessPsbt, }, zmq::GetZmqNotifications, }; diff --git a/types/src/v17/wallet/mod.rs b/types/src/v17/wallet/mod.rs index a098854d..bda0c483 100644 --- a/types/src/v17/wallet/mod.rs +++ b/types/src/v17/wallet/mod.rs @@ -194,7 +194,7 @@ pub struct DumpWallet { /// > Arguments: /// > 1. passphrase (string, required) The pass phrase to encrypt the wallet with. It must be at least 1 character, but should be long. #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] -pub struct EncryptWallet (pub String); +pub struct EncryptWallet(pub String); /// Result of the JSON-RPC method `getaddressesbylabel`. /// diff --git a/types/src/v18/mod.rs b/types/src/v18/mod.rs index c9196235..c484e625 100644 --- a/types/src/v18/mod.rs +++ b/types/src/v18/mod.rs @@ -252,11 +252,11 @@ pub use crate::v17::{ 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, + DecodeScriptError, DumpPrivKey, DumpWallet, EncryptWallet, 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, @@ -281,5 +281,5 @@ pub use crate::v17::{ SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, Softfork, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, - WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, EncryptWallet, + WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, }; diff --git a/types/src/v19/mod.rs b/types/src/v19/mod.rs index c34c398c..4218bc93 100644 --- a/types/src/v19/mod.rs +++ b/types/src/v19/mod.rs @@ -247,7 +247,7 @@ pub use crate::v17::{ AddressInformation, Banned, BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus, CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisig, CreateMultisigError, CreatePsbt, CreateRawTransaction, CreateWallet, DecodePsbt, DecodePsbtError, - DecodeRawTransaction, DecodeScript, DecodeScriptError, DumpPrivKey, DumpWallet, + DecodeRawTransaction, DecodeScript, DecodeScriptError, DumpPrivKey, DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo, GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, @@ -272,7 +272,7 @@ pub use crate::v17::{ SendToAddress, SetNetworkActive, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, - WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, EncryptWallet, + WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, }; #[doc(inline)] pub use crate::v18::{ diff --git a/types/src/v20/mod.rs b/types/src/v20/mod.rs index b417c4dd..fd455ba1 100644 --- a/types/src/v20/mod.rs +++ b/types/src/v20/mod.rs @@ -242,7 +242,7 @@ pub use crate::{ CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisig, CreateMultisigError, CreatePsbt, CreateRawTransaction, CreateWallet, DecodePsbt, DecodePsbtError, DecodeRawTransaction, DecodeScript, DecodeScriptError, DumpPrivKey, DumpWallet, - EstimateSmartFee, FinalizePsbt, FinalizePsbtError, FundRawTransaction, + EncryptWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo, GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetBestBlockHash, GetBlockCount, @@ -268,7 +268,7 @@ pub use crate::{ SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, - WitnessUtxo, EncryptWallet, + WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v21/mod.rs b/types/src/v21/mod.rs index 4f921f06..5182c385 100644 --- a/types/src/v21/mod.rs +++ b/types/src/v21/mod.rs @@ -244,7 +244,7 @@ pub use crate::{ CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisig, CreateMultisigError, CreatePsbt, CreateRawTransaction, CreateWallet, DecodePsbt, DecodePsbtError, DecodeRawTransaction, DecodeScript, DecodeScriptError, DumpPrivKey, DumpWallet, - EstimateSmartFee, FinalizePsbt, FinalizePsbtError, FundRawTransaction, + EncryptWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo, GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetBestBlockHash, GetBlockCount, @@ -270,7 +270,7 @@ pub use crate::{ SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, - WitnessUtxo, EncryptWallet, + WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v22/mod.rs b/types/src/v22/mod.rs index cfbde170..cd5fa460 100644 --- a/types/src/v22/mod.rs +++ b/types/src/v22/mod.rs @@ -259,7 +259,7 @@ pub use crate::{ CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisig, CreateMultisigError, CreatePsbt, CreateRawTransaction, CreateWallet, DecodePsbt, DecodePsbtError, DecodeRawTransaction, DecodeScript, DecodeScriptError, DumpPrivKey, DumpWallet, - EstimateSmartFee, FinalizePsbt, FinalizePsbtError, FundRawTransaction, + EncryptWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo, GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetBestBlockHash, GetBlockCount, @@ -285,7 +285,7 @@ pub use crate::{ SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, - WitnessUtxo, EncryptWallet, + WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v23/mod.rs b/types/src/v23/mod.rs index fdcf9a9e..9d0ee766 100644 --- a/types/src/v23/mod.rs +++ b/types/src/v23/mod.rs @@ -253,7 +253,7 @@ pub use crate::{ AddressInformation, BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus, CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisig, CreateMultisigError, CreatePsbt, CreateRawTransaction, CreateWallet, DecodeRawTransaction, DecodeScript, - DecodeScriptError, DumpPrivKey, DumpWallet, EstimateSmartFee, FinalizePsbt, + DecodeScriptError, DumpPrivKey, DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo, GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, @@ -280,7 +280,7 @@ pub use crate::{ SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, - WitnessUtxo, EncryptWallet, + WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v24/mod.rs b/types/src/v24/mod.rs index c918e53a..4912c36d 100644 --- a/types/src/v24/mod.rs +++ b/types/src/v24/mod.rs @@ -254,7 +254,7 @@ pub use crate::{ AddressInformation, BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus, CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisig, CreateMultisigError, CreatePsbt, CreateRawTransaction, CreateWallet, DecodeRawTransaction, DecodeScript, - DecodeScriptError, DumpPrivKey, DumpWallet, EstimateSmartFee, FinalizePsbt, + DecodeScriptError, DumpPrivKey, DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo, GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, @@ -281,7 +281,7 @@ pub use crate::{ SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, - WitnessUtxo, EncryptWallet, + WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v25/mod.rs b/types/src/v25/mod.rs index be65d8c5..05ed3505 100644 --- a/types/src/v25/mod.rs +++ b/types/src/v25/mod.rs @@ -251,7 +251,7 @@ pub use crate::{ AddressInformation, BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus, CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisig, CreateMultisigError, CreatePsbt, CreateRawTransaction, DecodeRawTransaction, DecodeScript, DecodeScriptError, - DumpPrivKey, DumpWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, + DumpPrivKey, DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo, GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetBestBlockHash, GetBlockCount, @@ -276,7 +276,7 @@ pub use crate::{ SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, - WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, EncryptWallet, + WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v26/mod.rs b/types/src/v26/mod.rs index cda684c3..02767a8f 100644 --- a/types/src/v26/mod.rs +++ b/types/src/v26/mod.rs @@ -271,7 +271,7 @@ pub use crate::{ AddressInformation, BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus, CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisig, CreateMultisigError, CreatePsbt, CreateRawTransaction, DecodeRawTransaction, DecodeScript, DecodeScriptError, - DumpPrivKey, DumpWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, + DumpPrivKey, DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo, GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetBestBlockHash, GetBlockCount, @@ -296,7 +296,7 @@ pub use crate::{ SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, EncryptWallet, + WalletProcessPsbt, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v27/mod.rs b/types/src/v27/mod.rs index b636168a..5276e1e0 100644 --- a/types/src/v27/mod.rs +++ b/types/src/v27/mod.rs @@ -255,7 +255,7 @@ pub use crate::{ AddressInformation, BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus, CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisig, CreateMultisigError, CreatePsbt, CreateRawTransaction, DecodeRawTransaction, DecodeScript, DecodeScriptError, - DumpPrivKey, DumpWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, + DumpPrivKey, DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo, GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetBestBlockHash, GetBlockCount, @@ -280,7 +280,7 @@ pub use crate::{ SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, EncryptWallet, + WalletProcessPsbt, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v28/mod.rs b/types/src/v28/mod.rs index 14b3ba73..f3b35194 100644 --- a/types/src/v28/mod.rs +++ b/types/src/v28/mod.rs @@ -263,7 +263,7 @@ pub use crate::{ AddressInformation, BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus, CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisig, CreateMultisigError, CreatePsbt, CreateRawTransaction, DecodeRawTransaction, DecodeScript, DecodeScriptError, - DumpPrivKey, DumpWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, + DumpPrivKey, DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo, GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetBestBlockHash, GetBlockCount, @@ -288,7 +288,7 @@ pub use crate::{ SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, - WalletProcessPsbt, WitnessUtxo, EncryptWallet, + WalletProcessPsbt, WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing, diff --git a/types/src/v29/mod.rs b/types/src/v29/mod.rs index 285f3dcd..2f48087f 100644 --- a/types/src/v29/mod.rs +++ b/types/src/v29/mod.rs @@ -278,7 +278,7 @@ pub use crate::{ AddressInformation, BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus, CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisig, CreateMultisigError, CreatePsbt, CreateRawTransaction, DecodeRawTransaction, DecodeScript, DecodeScriptError, - DumpPrivKey, DumpWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, + DumpPrivKey, DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo, GetAddressInfo, GetAddressInfoEmbedded, GetAddressInfoEmbeddedError, GetAddressInfoError, GetAddressInfoLabel, GetAddressesByLabel, GetBalance, GetBestBlockHash, GetBlockCount, @@ -301,7 +301,7 @@ pub use crate::{ SignRawTransaction, SignRawTransactionError, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, - WitnessUtxo, EncryptWallet, + WitnessUtxo, }, v18::{ ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing,