Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-18 14:10:44 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

rpc: validate conf_target is set alongside estimate_mode

Browse Source 
Github-Pull: #29175
Rebased-From: be8ae64b82
This commit is contained in:
Torkel Rogstad 2024-01-15 08:35:45 +01:00 committed by Luke Dashjr
parent b8e4d0a26a
commit cfd1c957a5
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,9 +72,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() || (ToLower(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");
}
}
static UniValue FinishTransaction(const std::shared_ptr<CWallet> pwallet, const UniValue& options, const CMutableTransaction& rawTx)

14
test/functional/wallet_send.py
View File

@ -304,12 +304,12 @@ class WalletSendTest(BitcoinTestFramework):
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, add_to_wallet=False
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, add_to_wallet=False
arg_estimate_mode=mode, arg_conf_target=1, add_to_wallet=False
)
assert_equal(res["complete"], True)
@ -324,6 +324,16 @@ class WalletSendTest(BitcoinTestFramework):
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