Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-12 19:20:42 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 29175 via origin-pull/29175/head

Browse Source
This commit is contained in:
Luke Dashjr 2025-03-05 03:27:08 +00:00
commit 5f08e7fee5
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/wallet/rpc/spend.cpp
View File

@ -12,6 +12,7 @@
#include <rpc/util.h>
#include <script/script.h>
#include <util/rbf.h>
#include <util/strencodings.h>
#include <util/translation.h>
#include <util/vector.h>
#include <wallet/coincontrol.h>
@ -59,9 +60,13 @@ static void InterpretFeeEstimationInstructions(const UniValue& conf_target, cons
} else {
options.pushKV("fee_rate", fee_rate);
}
if (!options["conf_target"].isNull() && (options["estimate_mode"].isNull() || (options["estimate_mode"].get_str() == "unset"))) {
auto estimate_mode_set = !options["estimate_mode"].isNull() && (ToLower(options["estimate_mode"].get_str()) != "unset");
if (!options["conf_target"].isNull() && !estimate_mode_set) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "Specify estimate_mode");
}
if (options["conf_target"].isNull() && estimate_mode_set) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "estimate_mode should be passed with conf_target");
}
}
std::set<int> InterpretSubtractFeeFromOutputInstructions(const UniValue& sffo_instructions, const std::vector<std::string>& destinations)
@ -222,7 +227,7 @@ static void SetFeeEstimateMode(const CWallet& wallet, CCoinControl& cc, const Un
if (!conf_target.isNull()) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot specify both conf_target and fee_rate. Please provide either a confirmation target in blocks for automatic fee estimation, or an explicit fee rate.");
}
if (!estimate_mode.isNull() && estimate_mode.get_str() != "unset") {
if (!estimate_mode.isNull() && ToLower(estimate_mode.get_str()) != "unset") {
throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot specify both estimate_mode and fee_rate");
}
// Fee rates in sat/vB cannot represent more than 3 significant digits.

34
test/functional/wallet_send.py
View File

@ -310,6 +310,40 @@ class WalletSendTest(BitcoinTestFramework):
res = w2.walletprocesspsbt(res["psbt"])
assert res["complete"]
# verify that fee estimation modes parse case insensitively
self.log.info("Testing case insensitive fee estimation mode parse")
for mode in ["ecoNOMICAL", "economical", "ECONOMICAL"]:
res = self.test_send(from_wallet=w0, to_wallet=w1, amount=1,
estimate_mode=mode, conf_target=1, add_to_wallet=False
)
assert_equal(res["complete"], True)
res = self.test_send(from_wallet=w0, to_wallet=w1, amount=1,
arg_estimate_mode=mode, arg_conf_target=1, add_to_wallet=False
)
assert_equal(res["complete"], True)
# Verify that different variations of 'unset' still counts as
# not setting the estimation mode
for mode in ["unSET", "unset", "UNSET"]:
self.test_send(from_wallet=w0, to_wallet=w1, amount=1,
arg_estimate_mode=mode, arg_conf_target=1, add_to_wallet=False, expect_error = (-8, 'Specify estimate_mode')
)
self.test_send(from_wallet=w0, to_wallet=w1, amount=1,
estimate_mode=mode, conf_target=1, add_to_wallet=False, expect_error = (-8, 'Specify estimate_mode')
)
# Verify that 'estimate_mode' requires a confirmation target
for mode in ["ecoNOMICAL", "economical", "ECONOMICAL"]:
self.test_send(from_wallet=w0, to_wallet=w1, amount=1,
estimate_mode=mode, conf_target=None, add_to_wallet=False, expect_error = (-8, 'estimate_mode should be passed with conf_target')
)
self.test_send(from_wallet=w0, to_wallet=w1, amount=1,
arg_estimate_mode=mode, arg_conf_target=None, add_to_wallet=False, expect_error = (-8, 'estimate_mode should be passed with conf_target')
)
if not self.options.descriptors:
# Descriptor wallets do not allow mixed watch-only and non-watch-only things in the same wallet.
# This is specifically testing that w4 ignores its own private keys and creates a psbt with send