aboutsummaryrefslogtreecommitdiff
path: root/src/rpc/client.cpp
diff options
context:
space:
mode:
authorAndrew Chow <achow101-github@achow101.com>2017-06-09 22:38:06 -0700
committerAndrew Chow <achow101-github@achow101.com>2017-07-18 10:59:06 -0700
commit6b4f231f5f0f88690488c4da20ea1c180dbc4b19 (patch)
treeed832262304d91d4c0c2941d53cf410a58d2da67 /src/rpc/client.cpp
parent0b019357ff09e7a522307fc271d6b60562a7b890 (diff)
downloadbitcoin-6b4f231f5f0f88690488c4da20ea1c180dbc4b19.tar.xz
Move transaction combining from signrawtransaction to new RPC
Create a combinerawtransaction RPC which accepts a json array of hex raw transactions to combine them into one transaction. Signrawtransaction is changed to no longer combine transactions and only accept one transaction at a time.
Diffstat (limited to 'src/rpc/client.cpp')
-rw-r--r--src/rpc/client.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 775ad4b6c9..d82e85f825 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -95,6 +95,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
{ "signrawtransaction", 1, "prevtxs" },
{ "signrawtransaction", 2, "privkeys" },
{ "sendrawtransaction", 1, "allowhighfees" },
+ { "combinerawtransaction", 0, "txs" },
{ "fundrawtransaction", 1, "options" },
{ "gettxout", 1, "n" },
{ "gettxout", 2, "include_mempool" },