Skip to content

Commit faeba98

Browse files
author
MarcoFalke
committed
rpc: Missing doc updates for bumpfee psbt update
Adds updates that have been missed in commit ea0a7ec: * RPC help doc update * Release notes update * Remove "mutable" keyword from lambda
1 parent 1c7be9a commit faeba98

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

doc/release-notes.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ Wallet
110110
The RPC returns public versions of all imported descriptors, including their timestamp and flags.
111111
For ranged descriptors, it also returns the range boundaries and the next index to generate addresses from. (#20226)
112112

113+
- The `bumpfee` RPC is not available with wallets that have private keys
114+
disabled. `psbtbumpfee` can be used instead. (#20891)
115+
113116
GUI changes
114117
-----------
115118

src/wallet/rpcwallet.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3379,7 +3379,7 @@ RPCHelpMan signrawtransactionwithwallet()
33793379

33803380
static RPCHelpMan bumpfee_helper(std::string method_name)
33813381
{
3382-
bool want_psbt = method_name == "psbtbumpfee";
3382+
const bool want_psbt = method_name == "psbtbumpfee";
33833383
const std::string incremental_fee{CFeeRate(DEFAULT_INCREMENTAL_RELAY_FEE).ToString(FeeEstimateMode::SAT_VB)};
33843384

33853385
return RPCHelpMan{method_name,
@@ -3413,14 +3413,14 @@ static RPCHelpMan bumpfee_helper(std::string method_name)
34133413
"still be replaceable in practice, for example if it has unconfirmed ancestors which\n"
34143414
"are replaceable).\n"},
34153415
{"estimate_mode", RPCArg::Type::STR, /* default */ "unset", std::string() + "The fee estimate mode, must be one of (case insensitive):\n"
3416-
" \"" + FeeModes("\"\n\"") + "\""},
3416+
"\"" + FeeModes("\"\n\"") + "\""},
34173417
},
34183418
"options"},
34193419
},
34203420
RPCResult{
34213421
RPCResult::Type::OBJ, "", "", Cat(Cat<std::vector<RPCResult>>(
34223422
{
3423-
{RPCResult::Type::STR, "psbt", "The base64-encoded unsigned PSBT of the new transaction." + std::string(want_psbt ? "" : " Only returned when wallet private keys are disabled. (DEPRECATED)")},
3423+
{RPCResult::Type::STR, "psbt", "The base64-encoded unsigned PSBT of the new transaction."},
34243424
},
34253425
want_psbt ? std::vector<RPCResult>{} : std::vector<RPCResult>{{RPCResult::Type::STR_HEX, "txid", "The id of the new transaction. Only returned when wallet private keys are enabled."}}
34263426
),
@@ -3437,7 +3437,7 @@ static RPCHelpMan bumpfee_helper(std::string method_name)
34373437
"\nBump the fee, get the new transaction\'s" + std::string(want_psbt ? "psbt" : "txid") + "\n" +
34383438
HelpExampleCli(method_name, "<txid>")
34393439
},
3440-
[want_psbt](const RPCHelpMan& self, const JSONRPCRequest& request) mutable -> UniValue
3440+
[want_psbt](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
34413441
{
34423442
std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
34433443
if (!pwallet) return NullUniValue;

0 commit comments

Comments
 (0)