rpc: Properly deserialize txs with witness before signing

MarcoFalke · fanquake · commit 731502a18385 · 2020-10-16T12:06:53.000+08:00
Github-Pull: #19836 Rebased-From: cccc752
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -642,7 +642,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));
         }
     }
@@ -764,7 +764,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
@@ -3309,7 +3309,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
`@@ -642,7 +642,7 @@ static UniValue combinerawtransaction(const JSONRPCRequest& request)`
`642`	`642`	`std::vector<CMutableTransaction> txVariants(txs.size());`
`643`	`643`
`644`	`644`	`for (unsigned int idx = 0; idx < txs.size(); idx++) {`
`645`		`- if (!DecodeHexTx(txVariants[idx], txs[idx].get_str(), true)) {`
	`645`	`+ if (!DecodeHexTx(txVariants[idx], txs[idx].get_str())) {`
`646`	`646`	`throw JSONRPCError(RPC_DESERIALIZATION_ERROR, strprintf("TX decode failed for tx %d", idx));`
`647`	`647`	`}`
`648`	`648`	`}`
`@@ -764,7 +764,7 @@ static UniValue signrawtransactionwithkey(const JSONRPCRequest& request)`
`764`	`764`	`RPCTypeCheck(request.params, {UniValue::VSTR, UniValue::VARR, UniValue::VARR, UniValue::VSTR}, true);`
`765`	`765`
`766`	`766`	`CMutableTransaction mtx;`
`767`		`- if (!DecodeHexTx(mtx, request.params[0].get_str(), true)) {`
	`767`	`+ if (!DecodeHexTx(mtx, request.params[0].get_str())) {`
`768`	`768`	`throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");`
`769`	`769`	`}`
`770`	`770`
Original file line number	Diff line number	Diff line change
`@@ -3309,7 +3309,7 @@ UniValue signrawtransactionwithwallet(const JSONRPCRequest& request)`
`3309`	`3309`	`RPCTypeCheck(request.params, {UniValue::VSTR, UniValue::VARR, UniValue::VSTR}, true);`
`3310`	`3310`
`3311`	`3311`	`CMutableTransaction mtx;`
`3312`		`- if (!DecodeHexTx(mtx, request.params[0].get_str(), true)) {`
	`3312`	`+ if (!DecodeHexTx(mtx, request.params[0].get_str())) {`
`3313`	`3313`	`throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");`
`3314`	`3314`	`}`
`3315`	`3315`