diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-12-06 15:18:16 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-12-06 15:18:39 +0100 |
commit | 8b8b3a9a5fd9d65d8ed0933352fad808327e0bf3 (patch) | |
tree | f96ce79eb55ba17b6ea01e035fd6bd679d3ac064 /src/rpc/rawtransaction.cpp | |
parent | 6042dfe008e7ad2c3495d1e9c484c7f2e256f04c (diff) | |
parent | 7a590d8390ef2158509c4fc08b84dac71f59e1fb (diff) | |
download | bitcoin-8b8b3a9a5fd9d65d8ed0933352fad808327e0bf3.tar.xz |
Merge #14878: 0.17: Further backports
7a590d8390ef2158509c4fc08b84dac71f59e1fb fix converttopsbt permitsigdata arg, add basic test (Gregory Sanders)
Pull request description:
Ooff, we missed some backports that were tagged.
Checked:
* In 7a590d8 (clean cherry-pick): The test changes fail without the code changes
Tree-SHA512: 9996886113dfcd8efa91f5436bc0f3507c81579861543611367bc3403868019fb1e45832c3f994f12278edb1c0c850e21f2f88e46a6981f45a11c4d61dcedaf9
Diffstat (limited to 'src/rpc/rawtransaction.cpp')
-rw-r--r-- | src/rpc/rawtransaction.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 7de3638f4e..0925b1c0cf 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -1778,7 +1778,7 @@ UniValue converttopsbt(const JSONRPCRequest& request) // Remove all scriptSigs and scriptWitnesses from inputs for (CTxIn& input : tx.vin) { - if ((!input.scriptSig.empty() || !input.scriptWitness.IsNull()) && (request.params[1].isNull() || (!request.params[1].isNull() && request.params[1].get_bool()))) { + if ((!input.scriptSig.empty() || !input.scriptWitness.IsNull()) && !permitsigdata) { throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Inputs must not have scriptSigs and scriptWitnesses"); } input.scriptSig.clear(); |