rpc: Properly deserialize txs with witness before signing

MarcoFalke · fanquake · commit a7bdf5c3ac36 · 2020-10-16T12:31:13.000+08:00
Github-Pull: #19836 Rebased-From: cccc752
diff --git 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
@@ -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");
     }
 

Original file line number	Diff line number	Diff line change
`@@ -619,7 +619,7 @@ static UniValue combinerawtransaction(const JSONRPCRequest& request)`
`619`	`619`	`std::vector<CMutableTransaction> txVariants(txs.size());`
`620`	`620`
`621`	`621`	`for (unsigned int idx = 0; idx < txs.size(); idx++) {`
`622`		`- if (!DecodeHexTx(txVariants[idx], txs[idx].get_str(), true)) {`
	`622`	`+ if (!DecodeHexTx(txVariants[idx], txs[idx].get_str())) {`
`623`	`623`	`throw JSONRPCError(RPC_DESERIALIZATION_ERROR, strprintf("TX decode failed for tx %d", idx));`
`624`	`624`	`}`
`625`	`625`	`}`
`@@ -738,7 +738,7 @@ static UniValue signrawtransactionwithkey(const JSONRPCRequest& request)`
`738`	`738`	`RPCTypeCheck(request.params, {UniValue::VSTR, UniValue::VARR, UniValue::VARR, UniValue::VSTR}, true);`
`739`	`739`
`740`	`740`	`CMutableTransaction mtx;`
`741`		`- if (!DecodeHexTx(mtx, request.params[0].get_str(), true)) {`
	`741`	`+ if (!DecodeHexTx(mtx, request.params[0].get_str())) {`
`742`	`742`	`throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");`
`743`	`743`	`}`
`744`	`744`
Original file line number	Diff line number	Diff line change
`@@ -3269,7 +3269,7 @@ UniValue signrawtransactionwithwallet(const JSONRPCRequest& request)`
`3269`	`3269`	`RPCTypeCheck(request.params, {UniValue::VSTR, UniValue::VARR, UniValue::VSTR}, true);`
`3270`	`3270`
`3271`	`3271`	`CMutableTransaction mtx;`
`3272`		`- if (!DecodeHexTx(mtx, request.params[0].get_str(), true)) {`
	`3272`	`+ if (!DecodeHexTx(mtx, request.params[0].get_str())) {`
`3273`	`3273`	`throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");`
`3274`	`3274`	`}`
`3275`	`3275`