From 3db688201736e36bf39cb7569e618005ea6c31d0 Mon Sep 17 00:00:00 2001 From: ismaelsadeeq Date: Mon, 26 Feb 2024 20:45:40 +0100 Subject: [PATCH] scripted-diff: rename `m_default_max_tx_fee` to `m_max_tx_fee` -BEGIN VERIFY SCRIPT- git grep -l "m_default_max_tx_fee" src | xargs sed -i "s/m_default_max_tx_fee/m_max_tx_fee/g" -END VERIFY SCRIPT- - The value is not always the default but can be configured during startup so `m_max_tx_fee` is the right name not `m_default_max_tx_fee`. --- src/qt/walletmodel.cpp | 2 +- src/wallet/feebumper.cpp | 2 +- src/wallet/interfaces.cpp | 2 +- src/wallet/rpc/spend.cpp | 4 ++-- src/wallet/spend.cpp | 2 +- src/wallet/wallet.cpp | 4 ++-- src/wallet/wallet.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 0a01c0a45b1..96f3de52040 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -228,7 +228,7 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact // Reject absurdly high fee. (This can never happen because the // wallet never creates transactions with fee greater than - // m_default_max_tx_fee. This merely a belt-and-suspenders check). + // m_max_tx_fee. This merely a belt-and-suspenders check). if (nFeeRequired > m_wallet->getDefaultMaxTxFee()) { return AbsurdFee; } diff --git a/src/wallet/feebumper.cpp b/src/wallet/feebumper.cpp index b875461c9f2..cd9159e48c5 100644 --- a/src/wallet/feebumper.cpp +++ b/src/wallet/feebumper.cpp @@ -112,7 +112,7 @@ static feebumper::Result CheckFeeRate(const CWallet& wallet, const CMutableTrans } // Check that in all cases the new fee doesn't violate maxTxFee - const CAmount max_tx_fee = wallet.m_default_max_tx_fee; + const CAmount max_tx_fee = wallet.m_max_tx_fee; if (new_total_fee > max_tx_fee) { errors.push_back(Untranslated(strprintf("Specified or calculated fee %s is too high (cannot be higher than -maxtxfee %s)", FormatMoney(new_total_fee), FormatMoney(max_tx_fee)))); diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp index 21e8a0b3bd2..201f524e250 100644 --- a/src/wallet/interfaces.cpp +++ b/src/wallet/interfaces.cpp @@ -521,7 +521,7 @@ public: return spk_man != nullptr; } OutputType getDefaultAddressType() override { return m_wallet->m_default_address_type; } - CAmount getDefaultMaxTxFee() override { return m_wallet->m_default_max_tx_fee; } + CAmount getDefaultMaxTxFee() override { return m_wallet->m_max_tx_fee; } void remove() override { RemoveWallet(m_context, m_wallet, /*load_on_start=*/false); diff --git a/src/wallet/rpc/spend.cpp b/src/wallet/rpc/spend.cpp index bea9b2eec18..9499e1fbab5 100644 --- a/src/wallet/rpc/spend.cpp +++ b/src/wallet/rpc/spend.cpp @@ -439,7 +439,7 @@ RPCHelpMan settxfee() CAmount nAmount = AmountFromValue(request.params[0]); CFeeRate tx_fee_rate(nAmount, 1000); - CFeeRate max_tx_fee_rate(pwallet->m_default_max_tx_fee, 1000); + CFeeRate max_tx_fee_rate(pwallet->m_max_tx_fee, 1000); if (tx_fee_rate == CFeeRate(0)) { // automatic selection } else if (tx_fee_rate < pwallet->chain().relayMinFee()) { @@ -1504,7 +1504,7 @@ RPCHelpMan sendall() const std::optional total_bump_fees{pwallet->chain().calculateCombinedBumpFee(outpoints_spent, fee_rate)}; CAmount effective_value = total_input_value - fee_from_size - total_bump_fees.value_or(0); - if (fee_from_size > pwallet->m_default_max_tx_fee) { + if (fee_from_size > pwallet->m_max_tx_fee) { throw JSONRPCError(RPC_WALLET_ERROR, TransactionErrorString(TransactionError::MAX_FEE_EXCEEDED).original); } diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp index f45db1c16f3..1bb77e61131 100644 --- a/src/wallet/spend.cpp +++ b/src/wallet/spend.cpp @@ -1339,7 +1339,7 @@ static util::Result CreateTransactionInternal( return util::Error{_("Transaction too large")}; } - if (current_fee > wallet.m_default_max_tx_fee) { + if (current_fee > wallet.m_max_tx_fee) { return util::Error{TransactionErrorString(TransactionError::MAX_FEE_EXCEEDED)}; } diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index ea59f1a9d57..19ef038c7a6 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2053,7 +2053,7 @@ bool CWallet::SubmitTxMemoryPoolAndRelay(CWalletTx& wtx, std::string& err_string // If broadcast fails for any reason, trying to set wtx.m_state here would be incorrect. // If transaction was previously in the mempool, it should be updated when // TransactionRemovedFromMempool fires. - bool ret = chain().broadcastTransaction(wtx.tx, m_default_max_tx_fee, relay, err_string); + bool ret = chain().broadcastTransaction(wtx.tx, m_max_tx_fee, relay, err_string); if (ret) wtx.m_state = TxStateInMempool{}; return ret; } @@ -3200,7 +3200,7 @@ std::shared_ptr CWallet::Create(WalletContext& context, const std::stri return nullptr; } - walletInstance->m_default_max_tx_fee = max_fee.value(); + walletInstance->m_max_tx_fee = max_fee.value(); } if (args.IsArgSet("-consolidatefeerate")) { diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index f8b914dd8ff..70d0587ef02 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -728,7 +728,7 @@ public: */ std::optional m_default_change_type{}; /** Absolute maximum transaction fee (in satoshis) used by default for the wallet */ - CAmount m_default_max_tx_fee{DEFAULT_TRANSACTION_MAXFEE}; + CAmount m_max_tx_fee{DEFAULT_TRANSACTION_MAXFEE}; /** Number of pre-generated keys/scripts by each spkm (part of the look-ahead process, used to detect payments) */ int64_t m_keypool_size{DEFAULT_KEYPOOL_SIZE};