diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-08-30 10:28:42 +0200 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-10-16 12:31:13 +0800 |
| commit | a7bdf5c3ac360a918d398a775c2de21d1e2ed639 (patch) | |
| tree | c4b85fc3859b2f014cc17d907350a1436120d0a9 | |
| parent | 0b64310fb6f1816a4ceba99eadb532c30ba867d5 (diff) | |
| download | bitcoin-a7bdf5c3ac360a918d398a775c2de21d1e2ed639.tar.xz | |
rpc: Properly deserialize txs with witness before signing
Github-Pull: #19836
Rebased-From: cccc7525697e7b8d99b545e34f0f504c78ffdb94
| -rw-r--r-- | src/rpc/rawtransaction.cpp | 4 | ||||
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 3b202d6538..2155d4fb75 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -619,7 +619,7 @@ static UniValue combinerawtransaction(const JSONRPCRequest& request) std::vector<CMutableTransaction> txVariants(txs.size()); for (unsigned int idx = 0; idx < txs.size(); idx++) { - if (!DecodeHexTx(txVariants[idx], txs[idx].get_str(), true)) { + if (!DecodeHexTx(txVariants[idx], txs[idx].get_str())) { throw JSONRPCError(RPC_DESERIALIZATION_ERROR, strprintf("TX decode failed for tx %d", idx)); } } @@ -738,7 +738,7 @@ static UniValue signrawtransactionwithkey(const JSONRPCRequest& request) RPCTypeCheck(request.params, {UniValue::VSTR, UniValue::VARR, UniValue::VARR, UniValue::VSTR}, true); CMutableTransaction mtx; - if (!DecodeHexTx(mtx, request.params[0].get_str(), true)) { + if (!DecodeHexTx(mtx, request.params[0].get_str())) { throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed"); } diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index fe004a862d..88725a6b09 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -3269,7 +3269,7 @@ UniValue signrawtransactionwithwallet(const JSONRPCRequest& request) RPCTypeCheck(request.params, {UniValue::VSTR, UniValue::VARR, UniValue::VSTR}, true); CMutableTransaction mtx; - if (!DecodeHexTx(mtx, request.params[0].get_str(), true)) { + if (!DecodeHexTx(mtx, request.params[0].get_str())) { throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed"); } |