diff --git a/client/src/client_sync/v17/mod.rs b/client/src/client_sync/v17/mod.rs index 84617b49..daa9a7dd 100644 --- a/client/src/client_sync/v17/mod.rs +++ b/client/src/client_sync/v17/mod.rs @@ -149,6 +149,7 @@ crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); crate::impl_client_v17__set_hd_seed!(); +crate::impl_client_v17__set_tx_fee!(); crate::impl_client_v17__sign_message!(); crate::impl_client_v17__sign_raw_transaction_with_wallet!(); crate::impl_client_v17__unload_wallet!(); diff --git a/client/src/client_sync/v17/wallet.rs b/client/src/client_sync/v17/wallet.rs index f0cadac4..03c37554 100644 --- a/client/src/client_sync/v17/wallet.rs +++ b/client/src/client_sync/v17/wallet.rs @@ -608,6 +608,19 @@ macro_rules! impl_client_v17__set_hd_seed { }; } +/// Implements Bitcoin Core JSON-RPC API method `settxfee` +#[macro_export] +macro_rules! impl_client_v17__set_tx_fee { + () => { + impl Client { + pub fn set_tx_fee(&self, fee_rate: bitcoin::FeeRate) -> Result { + let fee_rate_btc_kvb = fee_rate.to_sat_per_vb_floor() as f64 / 100_000.0; + self.call("settxfee", &[fee_rate_btc_kvb.into()]) + } + } + }; +} + /// Implements Bitcoin Core JSON-RPC API method `signmessage`. #[macro_export] macro_rules! impl_client_v17__sign_message { diff --git a/client/src/client_sync/v18/mod.rs b/client/src/client_sync/v18/mod.rs index 67e87e86..d3ff9c88 100644 --- a/client/src/client_sync/v18/mod.rs +++ b/client/src/client_sync/v18/mod.rs @@ -166,6 +166,7 @@ crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); crate::impl_client_v17__set_hd_seed!(); +crate::impl_client_v17__set_tx_fee!(); crate::impl_client_v17__sign_message!(); crate::impl_client_v17__sign_raw_transaction_with_wallet!(); crate::impl_client_v17__unload_wallet!(); diff --git a/client/src/client_sync/v19/mod.rs b/client/src/client_sync/v19/mod.rs index d27d9d87..078e9929 100644 --- a/client/src/client_sync/v19/mod.rs +++ b/client/src/client_sync/v19/mod.rs @@ -162,6 +162,7 @@ crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); crate::impl_client_v17__set_hd_seed!(); +crate::impl_client_v17__set_tx_fee!(); crate::impl_client_v19__set_wallet_flag!(); crate::impl_client_v17__sign_message!(); crate::impl_client_v17__sign_raw_transaction_with_wallet!(); diff --git a/client/src/client_sync/v20/mod.rs b/client/src/client_sync/v20/mod.rs index df8a46bb..b275a2ba 100644 --- a/client/src/client_sync/v20/mod.rs +++ b/client/src/client_sync/v20/mod.rs @@ -162,6 +162,7 @@ crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); crate::impl_client_v17__set_hd_seed!(); +crate::impl_client_v17__set_tx_fee!(); crate::impl_client_v19__set_wallet_flag!(); crate::impl_client_v17__sign_message!(); crate::impl_client_v17__sign_raw_transaction_with_wallet!(); diff --git a/client/src/client_sync/v21/mod.rs b/client/src/client_sync/v21/mod.rs index 011e3142..cd76cf94 100644 --- a/client/src/client_sync/v21/mod.rs +++ b/client/src/client_sync/v21/mod.rs @@ -162,6 +162,7 @@ crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); crate::impl_client_v17__set_hd_seed!(); +crate::impl_client_v17__set_tx_fee!(); crate::impl_client_v19__set_wallet_flag!(); crate::impl_client_v17__sign_message!(); crate::impl_client_v17__sign_raw_transaction_with_wallet!(); diff --git a/client/src/client_sync/v22/mod.rs b/client/src/client_sync/v22/mod.rs index 57fe9b25..d4eb4dcf 100644 --- a/client/src/client_sync/v22/mod.rs +++ b/client/src/client_sync/v22/mod.rs @@ -162,6 +162,7 @@ crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); crate::impl_client_v17__set_hd_seed!(); +crate::impl_client_v17__set_tx_fee!(); crate::impl_client_v19__set_wallet_flag!(); crate::impl_client_v17__sign_message!(); crate::impl_client_v17__sign_raw_transaction_with_wallet!(); diff --git a/client/src/client_sync/v23/mod.rs b/client/src/client_sync/v23/mod.rs index 1dcee366..07f138cc 100644 --- a/client/src/client_sync/v23/mod.rs +++ b/client/src/client_sync/v23/mod.rs @@ -164,6 +164,7 @@ crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); crate::impl_client_v17__set_hd_seed!(); +crate::impl_client_v17__set_tx_fee!(); crate::impl_client_v19__set_wallet_flag!(); crate::impl_client_v17__sign_message!(); crate::impl_client_v17__sign_raw_transaction_with_wallet!(); diff --git a/client/src/client_sync/v24/mod.rs b/client/src/client_sync/v24/mod.rs index 6df99d65..8f29ac5a 100644 --- a/client/src/client_sync/v24/mod.rs +++ b/client/src/client_sync/v24/mod.rs @@ -161,6 +161,7 @@ crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); crate::impl_client_v17__set_hd_seed!(); +crate::impl_client_v17__set_tx_fee!(); crate::impl_client_v19__set_wallet_flag!(); crate::impl_client_v17__sign_message!(); crate::impl_client_v17__sign_raw_transaction_with_wallet!(); diff --git a/client/src/client_sync/v25/mod.rs b/client/src/client_sync/v25/mod.rs index 4b7c310c..d3371c24 100644 --- a/client/src/client_sync/v25/mod.rs +++ b/client/src/client_sync/v25/mod.rs @@ -161,6 +161,7 @@ crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); crate::impl_client_v17__set_hd_seed!(); +crate::impl_client_v17__set_tx_fee!(); crate::impl_client_v19__set_wallet_flag!(); crate::impl_client_v17__sign_message!(); crate::impl_client_v17__sign_raw_transaction_with_wallet!(); diff --git a/client/src/client_sync/v26/mod.rs b/client/src/client_sync/v26/mod.rs index 47b08f28..889638cc 100644 --- a/client/src/client_sync/v26/mod.rs +++ b/client/src/client_sync/v26/mod.rs @@ -167,6 +167,7 @@ crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); crate::impl_client_v17__set_hd_seed!(); +crate::impl_client_v17__set_tx_fee!(); crate::impl_client_v19__set_wallet_flag!(); crate::impl_client_v17__sign_message!(); crate::impl_client_v17__sign_raw_transaction_with_wallet!(); diff --git a/client/src/client_sync/v27/mod.rs b/client/src/client_sync/v27/mod.rs index 59685ca1..9612a338 100644 --- a/client/src/client_sync/v27/mod.rs +++ b/client/src/client_sync/v27/mod.rs @@ -163,6 +163,7 @@ crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); crate::impl_client_v17__set_hd_seed!(); +crate::impl_client_v17__set_tx_fee!(); crate::impl_client_v19__set_wallet_flag!(); crate::impl_client_v17__sign_message!(); crate::impl_client_v17__sign_raw_transaction_with_wallet!(); diff --git a/client/src/client_sync/v28/mod.rs b/client/src/client_sync/v28/mod.rs index e059f3bb..5245c47d 100644 --- a/client/src/client_sync/v28/mod.rs +++ b/client/src/client_sync/v28/mod.rs @@ -165,6 +165,7 @@ crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); crate::impl_client_v17__set_hd_seed!(); +crate::impl_client_v17__set_tx_fee!(); crate::impl_client_v19__set_wallet_flag!(); crate::impl_client_v17__sign_message!(); crate::impl_client_v17__sign_raw_transaction_with_wallet!(); diff --git a/client/src/client_sync/v29/mod.rs b/client/src/client_sync/v29/mod.rs index f1d6648d..cb463d68 100644 --- a/client/src/client_sync/v29/mod.rs +++ b/client/src/client_sync/v29/mod.rs @@ -165,6 +165,7 @@ crate::impl_client_v17__rescan_blockchain!(); crate::impl_client_v17__send_many!(); crate::impl_client_v17__send_to_address!(); crate::impl_client_v17__set_hd_seed!(); +crate::impl_client_v17__set_tx_fee!(); crate::impl_client_v19__set_wallet_flag!(); crate::impl_client_v17__sign_message!(); crate::impl_client_v17__sign_raw_transaction_with_wallet!(); diff --git a/integration_test/tests/wallet.rs b/integration_test/tests/wallet.rs index 5dc3bef1..89a0887d 100644 --- a/integration_test/tests/wallet.rs +++ b/integration_test/tests/wallet.rs @@ -6,7 +6,7 @@ #[cfg(feature = "TODO")] use bitcoin::address::{Address, NetworkChecked}; -use bitcoin::{Amount, PrivateKey, PublicKey}; +use bitcoin::{Amount, FeeRate, PrivateKey, PublicKey}; use integration_test::{Node, NodeExt as _, Wallet}; use node::{mtype, AddressType, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp}; use node::vtype::*; // All the version specific types. @@ -558,6 +558,15 @@ fn wallet__send_to_address__modelled() { model.unwrap(); } +#[test] +fn wallet__set_tx_fee() { + let node = Node::with_wallet(Wallet::Default, &[]); + let fee_rate = FeeRate::from_sat_per_vb(2).expect("2 sat/vb is valid"); + + let json: SetTxFee = node.client.set_tx_fee(fee_rate).expect("settxfee"); + assert!(json.0); +} + #[cfg(not(feature = "v18_and_below"))] #[test] fn wallet__set_wallet_flag() { diff --git a/types/src/v17/mod.rs b/types/src/v17/mod.rs index bbdf9448..7dd2293b 100644 --- a/types/src/v17/mod.rs +++ b/types/src/v17/mod.rs @@ -199,7 +199,7 @@ //! | sendtoaddress | version + model | | //! | setaccount | returns nothing | | //! | sethdseed | returns nothing | | -//! | settxfee | returns boolean | | +//! | settxfee | version | | //! | signmessage | version + model | | //! | signrawtransactionwithwallet | version + model | | //! | unloadwallet | returns nothing | | @@ -284,7 +284,7 @@ pub use self::{ ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspent, ListUnspentItem, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, RescanBlockchain, SendMany, - SendToAddress, SignMessage, TransactionCategory, WalletCreateFundedPsbt, + SendToAddress, SetTxFee, SignMessage, TransactionCategory, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, }, zmq::GetZmqNotifications, diff --git a/types/src/v17/wallet/mod.rs b/types/src/v17/wallet/mod.rs index 3561795f..68d7c84c 100644 --- a/types/src/v17/wallet/mod.rs +++ b/types/src/v17/wallet/mod.rs @@ -994,6 +994,15 @@ impl SendToAddress { pub fn txid(self) -> Result { Ok(self.into_model()?.txid) } } +/// Result of JSON-RPC method `settxfee`. +/// +/// > settxfee +/// > +/// > Arguments: +/// > 1. amount (numeric or string, required) The transaction fee in BTC/kB +#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)] +pub struct SetTxFee(pub bool); + /// Result of the JSON-RPC method `signmessage`. /// /// > signmessage "address" "message" diff --git a/types/src/v18/mod.rs b/types/src/v18/mod.rs index 888a9242..441ffac0 100644 --- a/types/src/v18/mod.rs +++ b/types/src/v18/mod.rs @@ -201,7 +201,7 @@ //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | //! | setlabel | returns nothing | | -//! | settxfee | returns boolean | | +//! | settxfee | version | | //! | signmessage | version + model | | //! | signrawtransactionwithwallet | version + model | | //! | unloadwallet | returns nothing | | @@ -277,9 +277,9 @@ pub use crate::v17::{ Logging, MapMempoolEntryError, MempoolAcceptance, MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, PruneBlockchain, PsbtInput, PsbtOutput, PsbtScript, RawTransaction, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, - SendRawTransaction, SendToAddress, SetNetworkActive, SignFail, SignFailError, SignMessage, - SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, Softfork, SoftforkReject, - TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, - VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, + SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignFail, SignFailError, + SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, Softfork, + SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, + ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, }; diff --git a/types/src/v19/mod.rs b/types/src/v19/mod.rs index 896ca45b..376ced98 100644 --- a/types/src/v19/mod.rs +++ b/types/src/v19/mod.rs @@ -202,7 +202,7 @@ //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | //! | setlabel | returns nothing | | -//! | settxfee | returns boolean | | +//! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | //! | signrawtransactionwithwallet | version + model | | @@ -277,7 +277,7 @@ pub use crate::v17::{ ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, Locked, Logging, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, - SetNetworkActive, SignMessage, SignMessageWithPrivKey, SignRawTransaction, + SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, diff --git a/types/src/v20/mod.rs b/types/src/v20/mod.rs index fb3d7d2c..878c8b3b 100644 --- a/types/src/v20/mod.rs +++ b/types/src/v20/mod.rs @@ -203,7 +203,7 @@ //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | //! | setlabel | returns nothing | | -//! | settxfee | returns boolean | | +//! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | //! | signrawtransactionwithwallet | version + model | | @@ -269,7 +269,7 @@ pub use crate::{ ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, - SetNetworkActive, SignMessage, SignMessageWithPrivKey, SignRawTransaction, + SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, diff --git a/types/src/v21/mod.rs b/types/src/v21/mod.rs index 1e75781f..50af91c1 100644 --- a/types/src/v21/mod.rs +++ b/types/src/v21/mod.rs @@ -208,7 +208,7 @@ //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | //! | setlabel | returns nothing | | -//! | settxfee | returns boolean | | +//! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | //! | signrawtransactionwithwallet | version + model | | @@ -273,7 +273,7 @@ pub use crate::{ ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, - RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, + RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, diff --git a/types/src/v22/mod.rs b/types/src/v22/mod.rs index 3a2ca2c6..fc2a8fa1 100644 --- a/types/src/v22/mod.rs +++ b/types/src/v22/mod.rs @@ -218,7 +218,7 @@ //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | //! | setlabel | returns nothing | | -//! | settxfee | returns boolean | | +//! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | //! | signrawtransactionwithwallet | version + model | | @@ -283,7 +283,7 @@ pub use crate::{ ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, - SetNetworkActive, SignMessage, SignMessageWithPrivKey, SignRawTransaction, + SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, diff --git a/types/src/v23/mod.rs b/types/src/v23/mod.rs index 0bd11e1e..ee5fbbdd 100644 --- a/types/src/v23/mod.rs +++ b/types/src/v23/mod.rs @@ -211,7 +211,7 @@ //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | //! | setlabel | returns nothing | | -//! | settxfee | returns boolean | | +//! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | //! | signrawtransactionwithwallet | version + model | | @@ -282,7 +282,7 @@ pub use crate::{ ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, - RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, + RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, diff --git a/types/src/v24/mod.rs b/types/src/v24/mod.rs index f6e1d736..60849168 100644 --- a/types/src/v24/mod.rs +++ b/types/src/v24/mod.rs @@ -214,7 +214,7 @@ //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | //! | setlabel | returns nothing | | -//! | settxfee | returns boolean | | +//! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | //! | signrawtransactionwithwallet | version + model | | @@ -284,7 +284,7 @@ pub use crate::{ ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, - RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, + RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, diff --git a/types/src/v25/mod.rs b/types/src/v25/mod.rs index b80500e9..4ddfb8fe 100644 --- a/types/src/v25/mod.rs +++ b/types/src/v25/mod.rs @@ -215,7 +215,7 @@ //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | //! | setlabel | returns nothing | | -//! | settxfee | returns boolean | | +//! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | //! | signrawtransactionwithwallet | version + model | | @@ -277,7 +277,7 @@ pub use crate::{ ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, LockUnspent, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, - RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, + RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, diff --git a/types/src/v26/mod.rs b/types/src/v26/mod.rs index 30b07bec..8b69d8d1 100644 --- a/types/src/v26/mod.rs +++ b/types/src/v26/mod.rs @@ -223,7 +223,7 @@ //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | //! | setlabel | returns nothing | | -//! | settxfee | returns boolean | | +//! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | //! | signrawtransactionwithwallet | version + model | | @@ -298,7 +298,7 @@ pub use crate::{ ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, LockUnspent, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, - RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, + RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, diff --git a/types/src/v27/mod.rs b/types/src/v27/mod.rs index 7966fadb..f5239ed7 100644 --- a/types/src/v27/mod.rs +++ b/types/src/v27/mod.rs @@ -223,7 +223,7 @@ //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | //! | setlabel | returns nothing | | -//! | settxfee | returns boolean | | +//! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | //! | signrawtransactionwithwallet | version + model | | @@ -275,7 +275,7 @@ pub use crate::{ ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, LockUnspent, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, - RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, + RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, diff --git a/types/src/v28/mod.rs b/types/src/v28/mod.rs index d1cb2845..47f7c1ac 100644 --- a/types/src/v28/mod.rs +++ b/types/src/v28/mod.rs @@ -225,7 +225,7 @@ //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | //! | setlabel | returns nothing | | -//! | settxfee | returns boolean | | +//! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | //! | signrawtransactionwithwallet | version + model | | @@ -296,7 +296,7 @@ pub use crate::{ ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, LockUnspent, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, - RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, + RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, diff --git a/types/src/v29/mod.rs b/types/src/v29/mod.rs index 300cbf2f..1c8c67bd 100644 --- a/types/src/v29/mod.rs +++ b/types/src/v29/mod.rs @@ -226,7 +226,7 @@ //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | //! | setlabel | returns nothing | | -//! | settxfee | returns boolean | | +//! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | //! | signrawtransactionwithwallet | version + model | | @@ -294,7 +294,7 @@ pub use crate::{ ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, LockUnspent, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput, - RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, + RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, diff --git a/verify/src/method/v17.rs b/verify/src/method/v17.rs index 0cbe6e77..20e695ce 100644 --- a/verify/src/method/v17.rs +++ b/verify/src/method/v17.rs @@ -143,7 +143,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("sendtoaddress", "SendToAddress", "send_to_address"), Method::new_nothing("setaccount", "set_account"), // Deprecated Method::new_nothing("sethdseed", "set_hd_seed"), - Method::new_bool("settxfee", "set_tx_fee"), + Method::new_no_model("settxfee", "SetTxFee", "set_tx_fee"), Method::new_modelled("signmessage", "SignMessage", "sign_message"), Method::new_modelled( "signrawtransactionwithwallet", diff --git a/verify/src/method/v18.rs b/verify/src/method/v18.rs index b589e45f..13fa3a27 100644 --- a/verify/src/method/v18.rs +++ b/verify/src/method/v18.rs @@ -145,7 +145,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("sendtoaddress", "SendToAddress", "send_to_address"), Method::new_nothing("sethdseed", "set_hd_seed"), Method::new_nothing("setlabel", "set_label"), - Method::new_bool("settxfee", "set_tx_fee"), + Method::new_no_model("settxfee", "SetTxFee", "set_tx_fee"), Method::new_modelled("signmessage", "SignMessage", "sign_message"), Method::new_modelled( "signrawtransactionwithwallet", diff --git a/verify/src/method/v19.rs b/verify/src/method/v19.rs index 7e290cfa..19b0ff4a 100644 --- a/verify/src/method/v19.rs +++ b/verify/src/method/v19.rs @@ -146,7 +146,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("sendtoaddress", "SendToAddress", "send_to_address"), Method::new_nothing("sethdseed", "set_hd_seed"), Method::new_nothing("setlabel", "set_label"), - Method::new_bool("settxfee", "set_tx_fee"), + Method::new_no_model("settxfee", "SetTxFee", "set_tx_fee"), Method::new_no_model("setwalletflag", "SetWalletFlag", "set_wallet_flag"), Method::new_modelled("signmessage", "SignMessage", "sign_message"), Method::new_modelled( diff --git a/verify/src/method/v20.rs b/verify/src/method/v20.rs index 5310f9f6..4c11b843 100644 --- a/verify/src/method/v20.rs +++ b/verify/src/method/v20.rs @@ -147,7 +147,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("sendtoaddress", "SendToAddress", "send_to_address"), Method::new_nothing("sethdseed", "set_hd_seed"), Method::new_nothing("setlabel", "set_label"), - Method::new_bool("settxfee", "set_tx_fee"), + Method::new_no_model("settxfee", "SetTxFee", "set_tx_fee"), Method::new_no_model("setwalletflag", "SetWalletFlag", "set_wallet_flag"), Method::new_modelled("signmessage", "SignMessage", "sign_message"), Method::new_modelled( diff --git a/verify/src/method/v21.rs b/verify/src/method/v21.rs index 3df60f19..1ec5652d 100644 --- a/verify/src/method/v21.rs +++ b/verify/src/method/v21.rs @@ -152,7 +152,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("sendtoaddress", "SendToAddress", "send_to_address"), Method::new_nothing("sethdseed", "set_hd_seed"), Method::new_nothing("setlabel", "set_label"), - Method::new_bool("settxfee", "set_tx_fee"), + Method::new_no_model("settxfee", "SetTxFee", "set_tx_fee"), Method::new_no_model("setwalletflag", "SetWalletFlag", "set_wallet_flag"), Method::new_modelled("signmessage", "SignMessage", "sign_message"), Method::new_modelled( diff --git a/verify/src/method/v22.rs b/verify/src/method/v22.rs index 5533f419..0372bfed 100644 --- a/verify/src/method/v22.rs +++ b/verify/src/method/v22.rs @@ -155,7 +155,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("sendtoaddress", "SendToAddress", "send_to_address"), Method::new_nothing("sethdseed", "set_hd_seed"), Method::new_nothing("setlabel", "set_label"), - Method::new_bool("settxfee", "set_tx_fee"), + Method::new_no_model("settxfee", "SetTxFee", "set_tx_fee"), Method::new_no_model("setwalletflag", "SetWalletFlag", "set_wallet_flag"), Method::new_modelled("signmessage", "SignMessage", "sign_message"), Method::new_modelled( diff --git a/verify/src/method/v23.rs b/verify/src/method/v23.rs index 6e81d76e..81a33c63 100644 --- a/verify/src/method/v23.rs +++ b/verify/src/method/v23.rs @@ -153,7 +153,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("sendtoaddress", "SendToAddress", "send_to_address"), Method::new_nothing("sethdseed", "set_hd_seed"), Method::new_nothing("setlabel", "set_label"), - Method::new_bool("settxfee", "set_tx_fee"), + Method::new_no_model("settxfee", "SetTxFee", "set_tx_fee"), Method::new_no_model("setwalletflag", "SetWalletFlag", "set_wallet_flag"), Method::new_modelled("signmessage", "SignMessage", "sign_message"), Method::new_modelled( diff --git a/verify/src/method/v24.rs b/verify/src/method/v24.rs index 1fb072cd..90801ea6 100644 --- a/verify/src/method/v24.rs +++ b/verify/src/method/v24.rs @@ -156,7 +156,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("sendtoaddress", "SendToAddress", "send_to_address"), Method::new_nothing("sethdseed", "set_hd_seed"), Method::new_nothing("setlabel", "set_label"), - Method::new_bool("settxfee", "set_tx_fee"), + Method::new_no_model("settxfee", "SetTxFee", "set_tx_fee"), Method::new_no_model("setwalletflag", "SetWalletFlag", "set_wallet_flag"), Method::new_modelled("signmessage", "SignMessage", "sign_message"), Method::new_modelled( diff --git a/verify/src/method/v25.rs b/verify/src/method/v25.rs index 59cc98a5..1956d3a4 100644 --- a/verify/src/method/v25.rs +++ b/verify/src/method/v25.rs @@ -157,7 +157,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("sendtoaddress", "SendToAddress", "send_to_address"), Method::new_nothing("sethdseed", "set_hd_seed"), Method::new_nothing("setlabel", "set_label"), - Method::new_bool("settxfee", "set_tx_fee"), + Method::new_no_model("settxfee", "SetTxFee", "set_tx_fee"), Method::new_no_model("setwalletflag", "SetWalletFlag", "set_wallet_flag"), Method::new_modelled("signmessage", "SignMessage", "sign_message"), Method::new_modelled( diff --git a/verify/src/method/v26.rs b/verify/src/method/v26.rs index 0085a44d..1b72bf77 100644 --- a/verify/src/method/v26.rs +++ b/verify/src/method/v26.rs @@ -164,7 +164,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("sendtoaddress", "SendToAddress", "send_to_address"), Method::new_nothing("sethdseed", "set_hd_seed"), Method::new_nothing("setlabel", "set_label"), - Method::new_bool("settxfee", "set_tx_fee"), + Method::new_no_model("settxfee", "SetTxFee", "set_tx_fee"), Method::new_no_model("setwalletflag", "SetWalletFlag", "set_wallet_flag"), Method::new_modelled("signmessage", "SignMessage", "sign_message"), Method::new_modelled( diff --git a/verify/src/method/v27.rs b/verify/src/method/v27.rs index 5af22f92..ca7e18ac 100644 --- a/verify/src/method/v27.rs +++ b/verify/src/method/v27.rs @@ -167,7 +167,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("sendtoaddress", "SendToAddress", "send_to_address"), Method::new_nothing("sethdseed", "set_hd_seed"), Method::new_nothing("setlabel", "set_label"), - Method::new_bool("settxfee", "set_tx_fee"), + Method::new_no_model("settxfee", "SetTxFee", "set_tx_fee"), Method::new_no_model("setwalletflag", "SetWalletFlag", "set_wallet_flag"), Method::new_modelled("signmessage", "SignMessage", "sign_message"), Method::new_modelled( diff --git a/verify/src/method/v28.rs b/verify/src/method/v28.rs index 47b60e65..0e6a08fa 100644 --- a/verify/src/method/v28.rs +++ b/verify/src/method/v28.rs @@ -169,7 +169,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("sendtoaddress", "SendToAddress", "send_to_address"), Method::new_nothing("sethdseed", "set_hd_seed"), Method::new_nothing("setlabel", "set_label"), - Method::new_bool("settxfee", "set_tx_fee"), + Method::new_no_model("settxfee", "SetTxFee", "set_tx_fee"), Method::new_no_model("setwalletflag", "SetWalletFlag", "set_wallet_flag"), Method::new_modelled("signmessage", "SignMessage", "sign_message"), Method::new_modelled( diff --git a/verify/src/method/v29.rs b/verify/src/method/v29.rs index 4162f3af..dc834e09 100644 --- a/verify/src/method/v29.rs +++ b/verify/src/method/v29.rs @@ -170,7 +170,7 @@ pub const METHODS: &[Method] = &[ Method::new_modelled("sendtoaddress", "SendToAddress", "send_to_address"), Method::new_nothing("sethdseed", "set_hd_seed"), Method::new_nothing("setlabel", "set_label"), - Method::new_bool("settxfee", "set_tx_fee"), + Method::new_no_model("settxfee", "SetTxFee", "set_tx_fee"), Method::new_no_model("setwalletflag", "SetWalletFlag", "set_wallet_flag"), Method::new_modelled("signmessage", "SignMessage", "sign_message"), Method::new_modelled(