Skip to content

Commit 79d6332

Browse files
achow101achow101
committed
moveonly: Fix indentation in bumpfee RPC
Review this with -w to see that nothing actually changes.
1 parent 431071c commit 79d6332

File tree

1 file changed

+51
-51
lines changed

1 file changed

+51
-51
lines changed

‎src/wallet/rpcwallet.cpp

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -3247,59 +3247,59 @@ static UniValue bumpfee(const JSONRPCRequest& request)
32473247
{
32483248
bool want_psbt = request.strMethod == "psbtbumpfee";
32493249

3250-
RPCHelpMan{request.strMethod,
3251-
"\nBumps the fee of an opt-in-RBF transaction T, replacing it with a new transaction B.\n"
3252-
+ std::string(want_psbt ? "Returns a PSBT instead of creating and signing a new transaction.\n" : "") +
3253-
"An opt-in RBF transaction with the given txid must be in the wallet.\n"
3254-
"The command will pay the additional fee by reducing change outputs or adding inputs when necessary. It may add a new change output if one does not already exist.\n"
3255-
"All inputs in the original transaction will be included in the replacement transaction.\n"
3256-
"The command will fail if the wallet or mempool contains a transaction that spends one of T's outputs.\n"
3257-
"By default, the new fee will be calculated automatically using estimatesmartfee.\n"
3258-
"The user can specify a confirmation target for estimatesmartfee.\n"
3259-
"Alternatively, the user can specify a fee_rate (" + CURRENCY_UNIT + " per kB) for the new transaction.\n"
3260-
"At a minimum, the new fee rate must be high enough to pay an additional new relay fee (incrementalfee\n"
3261-
"returned by getnetworkinfo) to enter the node's mempool.\n",
3250+
RPCHelpMan{request.strMethod,
3251+
"\nBumps the fee of an opt-in-RBF transaction T, replacing it with a new transaction B.\n"
3252+
+ std::string(want_psbt ? "Returns a PSBT instead of creating and signing a new transaction.\n" : "") +
3253+
"An opt-in RBF transaction with the given txid must be in the wallet.\n"
3254+
"The command will pay the additional fee by reducing change outputs or adding inputs when necessary. It may add a new change output if one does not already exist.\n"
3255+
"All inputs in the original transaction will be included in the replacement transaction.\n"
3256+
"The command will fail if the wallet or mempool contains a transaction that spends one of T's outputs.\n"
3257+
"By default, the new fee will be calculated automatically using estimatesmartfee.\n"
3258+
"The user can specify a confirmation target for estimatesmartfee.\n"
3259+
"Alternatively, the user can specify a fee_rate (" + CURRENCY_UNIT + " per kB) for the new transaction.\n"
3260+
"At a minimum, the new fee rate must be high enough to pay an additional new relay fee (incrementalfee\n"
3261+
"returned by getnetworkinfo) to enter the node's mempool.\n",
3262+
{
3263+
{"txid", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The txid to be bumped"},
3264+
{"options", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED_NAMED_ARG, "",
32623265
{
3263-
{"txid", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The txid to be bumped"},
3264-
{"options", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED_NAMED_ARG, "",
3265-
{
3266-
{"conf_target", RPCArg::Type::NUM, /* default */ "wallet default", "Confirmation target (in blocks)"},
3267-
{"fee_rate", RPCArg::Type::NUM, /* default */ "fall back to 'conf_target'", "fee rate (NOT total fee) to pay, in " + CURRENCY_UNIT + " per kB\n"
3268-
" Specify a fee rate instead of relying on the built-in fee estimator.\n"
3269-
"Must be at least 0.0001 " + CURRENCY_UNIT + " per kB higher than the current transaction fee rate.\n"},
3270-
{"replaceable", RPCArg::Type::BOOL, /* default */ "true", "Whether the new transaction should still be\n"
3271-
" marked bip-125 replaceable. If true, the sequence numbers in the transaction will\n"
3272-
" be left unchanged from the original. If false, any input sequence numbers in the\n"
3273-
" original transaction that were less than 0xfffffffe will be increased to 0xfffffffe\n"
3274-
" so the new transaction will not be explicitly bip-125 replaceable (though it may\n"
3275-
" still be replaceable in practice, for example if it has unconfirmed ancestors which\n"
3276-
" are replaceable)."},
3277-
{"estimate_mode", RPCArg::Type::STR, /* default */ "unset", std::string() + "The fee estimate mode, must be one of (case insensitive):\n"
3278-
" \"" + FeeModes("\"\n\"") + "\""},
3279-
},
3280-
"options"},
3281-
},
3282-
RPCResult{
3283-
RPCResult::Type::OBJ, "", "", Cat(Cat<std::vector<RPCResult>>(
3284-
{
3285-
{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)")},
3286-
},
3287-
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."}}
3288-
),
3289-
{
3290-
{RPCResult::Type::STR_AMOUNT, "origfee", "The fee of the replaced transaction."},
3291-
{RPCResult::Type::STR_AMOUNT, "fee", "The fee of the new transaction."},
3292-
{RPCResult::Type::ARR, "errors", "Errors encountered during processing (may be empty).",
3293-
{
3294-
{RPCResult::Type::STR, "", ""},
3295-
}},
3296-
})
3297-
},
3298-
RPCExamples{
3299-
"\nBump the fee, get the new transaction\'s" + std::string(want_psbt ? "psbt" : "txid") + "\n" +
3300-
HelpExampleCli(request.strMethod, "<txid>")
3266+
{"conf_target", RPCArg::Type::NUM, /* default */ "wallet default", "Confirmation target (in blocks)"},
3267+
{"fee_rate", RPCArg::Type::NUM, /* default */ "fall back to 'conf_target'", "fee rate (NOT total fee) to pay, in " + CURRENCY_UNIT + " per kB\n"
3268+
" Specify a fee rate instead of relying on the built-in fee estimator.\n"
3269+
"Must be at least 0.0001 " + CURRENCY_UNIT + " per kB higher than the current transaction fee rate.\n"},
3270+
{"replaceable", RPCArg::Type::BOOL, /* default */ "true", "Whether the new transaction should still be\n"
3271+
" marked bip-125 replaceable. If true, the sequence numbers in the transaction will\n"
3272+
" be left unchanged from the original. If false, any input sequence numbers in the\n"
3273+
" original transaction that were less than 0xfffffffe will be increased to 0xfffffffe\n"
3274+
" so the new transaction will not be explicitly bip-125 replaceable (though it may\n"
3275+
" still be replaceable in practice, for example if it has unconfirmed ancestors which\n"
3276+
" are replaceable)."},
3277+
{"estimate_mode", RPCArg::Type::STR, /* default */ "unset", std::string() + "The fee estimate mode, must be one of (case insensitive):\n"
3278+
" \"" + FeeModes("\"\n\"") + "\""},
33013279
},
3302-
}.Check(request);
3280+
"options"},
3281+
},
3282+
RPCResult{
3283+
RPCResult::Type::OBJ, "", "", Cat(Cat<std::vector<RPCResult>>(
3284+
{
3285+
{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)")},
3286+
},
3287+
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."}}
3288+
),
3289+
{
3290+
{RPCResult::Type::STR_AMOUNT, "origfee", "The fee of the replaced transaction."},
3291+
{RPCResult::Type::STR_AMOUNT, "fee", "The fee of the new transaction."},
3292+
{RPCResult::Type::ARR, "errors", "Errors encountered during processing (may be empty).",
3293+
{
3294+
{RPCResult::Type::STR, "", ""},
3295+
}},
3296+
})
3297+
},
3298+
RPCExamples{
3299+
"\nBump the fee, get the new transaction\'s" + std::string(want_psbt ? "psbt" : "txid") + "\n" +
3300+
HelpExampleCli(request.strMethod, "<txid>")
3301+
},
3302+
}.Check(request);
33033303

33043304
std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
33053305
if (!wallet) return NullUniValue;

0 commit comments

Comments
 (0)