|
|
@ -2655,7 +2655,8 @@ UniValue fundrawtransaction(const JSONRPCRequest& request) |
|
|
|
" Those recipients will receive less bitcoins than you enter in their corresponding amount field.\n" |
|
|
|
" Those recipients will receive less bitcoins than you enter in their corresponding amount field.\n" |
|
|
|
" If no outputs are specified here, the sender pays the fee.\n" |
|
|
|
" If no outputs are specified here, the sender pays the fee.\n" |
|
|
|
" [vout_index,...]\n" |
|
|
|
" [vout_index,...]\n" |
|
|
|
" \"optIntoRbf\" (boolean, optional) Allow this transaction to be replaced by a transaction with higher fees\n" |
|
|
|
" \"replaceable\" (boolean, optional) Marks this transaction as BIP125 replaceable.\n" |
|
|
|
|
|
|
|
" Allows this transaction to be replaced by a transaction with higher fees\n" |
|
|
|
" }\n" |
|
|
|
" }\n" |
|
|
|
" for backward compatibility: passing in a true instead of an object will result in {\"includeWatching\":true}\n" |
|
|
|
" for backward compatibility: passing in a true instead of an object will result in {\"includeWatching\":true}\n" |
|
|
|
"\nResult:\n" |
|
|
|
"\nResult:\n" |
|
|
@ -2707,7 +2708,7 @@ UniValue fundrawtransaction(const JSONRPCRequest& request) |
|
|
|
{"reserveChangeKey", UniValueType(UniValue::VBOOL)}, |
|
|
|
{"reserveChangeKey", UniValueType(UniValue::VBOOL)}, |
|
|
|
{"feeRate", UniValueType()}, // will be checked below
|
|
|
|
{"feeRate", UniValueType()}, // will be checked below
|
|
|
|
{"subtractFeeFromOutputs", UniValueType(UniValue::VARR)}, |
|
|
|
{"subtractFeeFromOutputs", UniValueType(UniValue::VARR)}, |
|
|
|
{"optIntoRbf", UniValueType(UniValue::VBOOL)}, |
|
|
|
{"replaceable", UniValueType(UniValue::VBOOL)}, |
|
|
|
}, |
|
|
|
}, |
|
|
|
true, true); |
|
|
|
true, true); |
|
|
|
|
|
|
|
|
|
|
@ -2741,8 +2742,8 @@ UniValue fundrawtransaction(const JSONRPCRequest& request) |
|
|
|
if (options.exists("subtractFeeFromOutputs")) |
|
|
|
if (options.exists("subtractFeeFromOutputs")) |
|
|
|
subtractFeeFromOutputs = options["subtractFeeFromOutputs"].get_array(); |
|
|
|
subtractFeeFromOutputs = options["subtractFeeFromOutputs"].get_array(); |
|
|
|
|
|
|
|
|
|
|
|
if (options.exists("optIntoRbf")) { |
|
|
|
if (options.exists("replaceable")) { |
|
|
|
coinControl.signalRbf = options["optIntoRbf"].get_bool(); |
|
|
|
coinControl.signalRbf = options["replaceable"].get_bool(); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|