diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-07-20 16:32:47 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-07-20 16:42:27 +0200 |
| commit | adf170daf90f2f3221bccf69c6cf201bd9a0e3ae (patch) | |
| tree | c03c00f06feea8b10ec6217f776c09665be9e052 /src/rpc/client.cpp | |
| parent | bf3b742e2852260f7e388ed3b9a5314351b7e31f (diff) | |
| parent | 6b4f231f5f0f88690488c4da20ea1c180dbc4b19 (diff) | |
| download | bitcoin-adf170daf90f2f3221bccf69c6cf201bd9a0e3ae.tar.xz | |
Merge #10571: [RPC]Move transaction combining from signrawtransaction to new RPC
6b4f231 Move transaction combining from signrawtransaction to new RPC (Andrew Chow)
Pull request description:
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.
The tests have been updated to test this. Tests for the signrawtransaction merge have also been removed.
This is part of #10570
Tree-SHA512: 035aebbd6537c1c017d5c8e06d309228b4c23fe52d5b31ffde19741c81a11a6346ddbbdc582b77b02a47f4c22b1952b69d3c2ee1109c29b3f0f1b612d8de53ed
Diffstat (limited to 'src/rpc/client.cpp')
| -rw-r--r-- | src/rpc/client.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp index 1ab1956124..7c75586d03 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" }, |