diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-07-11 11:57:24 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-07-11 11:58:02 +0200 |
| commit | 104f5f21dc2413254dc9ae3651e10a5c0730c951 (patch) | |
| tree | b0d3c7fccbf83db686143c351acd75b6fcf480d0 /src/rpc | |
| parent | 379aed0e53a6cb09d560cc9a159d29cfe0668f67 (diff) | |
| parent | f135923ee2cf1a1a9a436626dc5b9219f8ad97da (diff) | |
| download | bitcoin-104f5f21dc2413254dc9ae3651e10a5c0730c951.tar.xz | |
Merge #10589: More economical fee estimates for RBF and RPC options to control
f135923 Add RPC options for RBF, confirmation target, and conservative fee estimation. (Alex Morcos)
f0bf33d Change default fee estimation mode. (Alex Morcos)
e0738e3 remove default argument from estimateSmartFee (Alex Morcos)
d507c30 Introduce a fee estimate mode. (Alex Morcos)
cfaef69 remove default argument from GetMinimumFee (Alex Morcos)
Tree-SHA512: 49c3a49a6893790a7e8b4e93a48f123dd5307af26c2017800683b76b4df8fc904ba73402917878676242c7440e3e04288d0c1ff3c2c907418724efc03cedab50
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/client.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp index 8fac8af3ec..278c4ecc2d 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" }, |