aboutsummaryrefslogtreecommitdiff
path: root/src/rpc
diff options
context:
space:
mode:
authorAlex Morcos <morcos@chaincode.com>2017-06-14 15:15:40 -0400
committerAlex Morcos <morcos@chaincode.com>2017-07-10 12:40:02 -0400
commitf135923ee2cf1a1a9a436626dc5b9219f8ad97da (patch)
treeadde79ee8ba6dc1a97167c2b8686b7d59654f9e4 /src/rpc
parentf0bf33da8357bd6aff100bbe5b84a7f01937e379 (diff)
downloadbitcoin-f135923ee2cf1a1a9a436626dc5b9219f8ad97da.tar.xz
Add RPC options for RBF, confirmation target, and conservative fee estimation.
Add support for setting each of these attributes on a per RPC call basis to sendtoaddress, sendmany, fundrawtransaction (already had RBF), and bumpfee (already had RBF and conf target).
Diffstat (limited to 'src/rpc')
-rw-r--r--src/rpc/client.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index a3ea5390ee..81390d7e47 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -37,6 +37,8 @@ static const CRPCConvertParam vRPCConvertParams[] =
{ "getnetworkhashps", 1, "height" },
{ "sendtoaddress", 1, "amount" },
{ "sendtoaddress", 4, "subtractfeefromamount" },
+ { "sendtoaddress", 5 , "replaceable" },
+ { "sendtoaddress", 6 , "conf_target" },
{ "settxfee", 0, "amount" },
{ "getreceivedbyaddress", 1, "minconf" },
{ "getreceivedbyaccount", 1, "minconf" },
@@ -69,6 +71,8 @@ static const CRPCConvertParam vRPCConvertParams[] =
{ "sendmany", 1, "amounts" },
{ "sendmany", 2, "minconf" },
{ "sendmany", 4, "subtractfeefrom" },
+ { "sendmany", 5 , "replaceable" },
+ { "sendmany", 6 , "conf_target" },
{ "addmultisigaddress", 0, "nrequired" },
{ "addmultisigaddress", 1, "keys" },
{ "createmultisig", 0, "nrequired" },