diff options
| author | Matt Corallo <git@bluematt.me> | 2017-06-28 17:53:06 -0400 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2017-07-05 18:11:22 -0400 |
| commit | fb915d5b183adb915c72bb11c6f3b418841e3512 (patch) | |
| tree | 1cfcb69e58ce25c66355efcbd3b55ddab10f356e /src/wallet/rpcwallet.cpp | |
| parent | 928c6811f22fa857958782a994089523104d89d1 (diff) | |
| download | bitcoin-fb915d5b183adb915c72bb11c6f3b418841e3512.tar.xz | |
Use "replaceable" instead of "optIntoRbf" in fundrawtransaction.
To be consistent with other RPCs
Diffstat (limited to 'src/wallet/rpcwallet.cpp')
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 5bbb5088e2..ebbde59972 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2655,7 +2655,8 @@ UniValue fundrawtransaction(const JSONRPCRequest& request) " 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" " [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" " for backward compatibility: passing in a true instead of an object will result in {\"includeWatching\":true}\n" "\nResult:\n" @@ -2707,7 +2708,7 @@ UniValue fundrawtransaction(const JSONRPCRequest& request) {"reserveChangeKey", UniValueType(UniValue::VBOOL)}, {"feeRate", UniValueType()}, // will be checked below {"subtractFeeFromOutputs", UniValueType(UniValue::VARR)}, - {"optIntoRbf", UniValueType(UniValue::VBOOL)}, + {"replaceable", UniValueType(UniValue::VBOOL)}, }, true, true); @@ -2741,8 +2742,8 @@ UniValue fundrawtransaction(const JSONRPCRequest& request) if (options.exists("subtractFeeFromOutputs")) subtractFeeFromOutputs = options["subtractFeeFromOutputs"].get_array(); - if (options.exists("optIntoRbf")) { - coinControl.signalRbf = options["optIntoRbf"].get_bool(); + if (options.exists("replaceable")) { + coinControl.signalRbf = options["replaceable"].get_bool(); } } } |