diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -410,6 +410,7 @@
 	primitives/block.cpp
 	protocol.cpp
 	psbt.cpp
+	rpc/rawtransaction_util.cpp
 	rpc/util.cpp
 	scheduler.cpp
 	versionbitsinfo.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -202,7 +202,7 @@
   rpc/jsonrpcrequest.h \
   rpc/mining.h \
   rpc/protocol.h \
-  rpc/rawtransaction.h \
+  rpc/rawtransaction_util.h \
   rpc/server.h \
   rpc/register.h \
   rpc/util.h \
@@ -491,6 +491,7 @@
   policy/policy.cpp \
   protocol.cpp \
   psbt.cpp \
+  rpc/rawtransaction_util.cpp \
   rpc/util.cpp \
   scheduler.cpp \
   script/descriptor.cpp \
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -20,7 +20,7 @@
 #include <policy/policy.h>
 #include <primitives/transaction.h>
 #include <psbt.h>
-#include <rpc/rawtransaction.h>
+#include <rpc/rawtransaction_util.h>
 #include <rpc/server.h>
 #include <rpc/util.h>
 #include <script/script.h>
@@ -444,130 +444,6 @@
     return res;
 }
 
-CMutableTransaction ConstructTransaction(const CChainParams &params,
-                                         const UniValue &inputs_in,
-                                         const UniValue &outputs_in,
-                                         const UniValue &locktime) {
-    if (inputs_in.isNull() || outputs_in.isNull()) {
-        throw JSONRPCError(
-            RPC_INVALID_PARAMETER,
-            "Invalid parameter, arguments 1 and 2 must be non-null");
-    }
-
-    UniValue inputs = inputs_in.get_array();
-    const bool outputs_is_obj = outputs_in.isObject();
-    UniValue outputs =
-        outputs_is_obj ? outputs_in.get_obj() : outputs_in.get_array();
-
-    CMutableTransaction rawTx;
-
-    if (!locktime.isNull()) {
-        int64_t nLockTime = locktime.get_int64();
-        if (nLockTime < 0 || nLockTime > std::numeric_limits<uint32_t>::max()) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER,
-                               "Invalid parameter, locktime out of range");
-        }
-
-        rawTx.nLockTime = nLockTime;
-    }
-
-    for (size_t idx = 0; idx < inputs.size(); idx++) {
-        const UniValue &input = inputs[idx];
-        const UniValue &o = input.get_obj();
-
-        TxId txid(ParseHashO(o, "txid"));
-
-        const UniValue &vout_v = find_value(o, "vout");
-        if (vout_v.isNull()) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER,
-                               "Invalid parameter, missing vout key");
-        }
-
-        if (!vout_v.isNum()) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER,
-                               "Invalid parameter, vout must be a number");
-        }
-
-        int nOutput = vout_v.get_int();
-        if (nOutput < 0) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER,
-                               "Invalid parameter, vout must be positive");
-        }
-
-        uint32_t nSequence =
-            (rawTx.nLockTime ? std::numeric_limits<uint32_t>::max() - 1
-                             : std::numeric_limits<uint32_t>::max());
-
-        // Set the sequence number if passed in the parameters object.
-        const UniValue &sequenceObj = find_value(o, "sequence");
-        if (sequenceObj.isNum()) {
-            int64_t seqNr64 = sequenceObj.get_int64();
-            if (seqNr64 < 0 || seqNr64 > std::numeric_limits<uint32_t>::max()) {
-                throw JSONRPCError(
-                    RPC_INVALID_PARAMETER,
-                    "Invalid parameter, sequence number is out of range");
-            }
-
-            nSequence = uint32_t(seqNr64);
-        }
-
-        CTxIn in(COutPoint(txid, nOutput), CScript(), nSequence);
-        rawTx.vin.push_back(in);
-    }
-
-    std::set<CTxDestination> destinations;
-    if (!outputs_is_obj) {
-        // Translate array of key-value pairs into dict
-        UniValue outputs_dict = UniValue(UniValue::VOBJ);
-        for (size_t i = 0; i < outputs.size(); ++i) {
-            const UniValue &output = outputs[i];
-            if (!output.isObject()) {
-                throw JSONRPCError(RPC_INVALID_PARAMETER,
-                                   "Invalid parameter, key-value pair not an "
-                                   "object as expected");
-            }
-            if (output.size() != 1) {
-                throw JSONRPCError(RPC_INVALID_PARAMETER,
-                                   "Invalid parameter, key-value pair must "
-                                   "contain exactly one key");
-            }
-            outputs_dict.pushKVs(output);
-        }
-        outputs = std::move(outputs_dict);
-    }
-    for (const std::string &name_ : outputs.getKeys()) {
-        if (name_ == "data") {
-            std::vector<uint8_t> data =
-                ParseHexV(outputs[name_].getValStr(), "Data");
-
-            CTxOut out(Amount::zero(), CScript() << OP_RETURN << data);
-            rawTx.vout.push_back(out);
-        } else {
-            CTxDestination destination = DecodeDestination(name_, params);
-            if (!IsValidDestination(destination)) {
-                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
-                                   std::string("Invalid Bitcoin address: ") +
-                                       name_);
-            }
-
-            if (!destinations.insert(destination).second) {
-                throw JSONRPCError(
-                    RPC_INVALID_PARAMETER,
-                    std::string("Invalid parameter, duplicated address: ") +
-                        name_);
-            }
-
-            CScript scriptPubKey = GetScriptForDestination(destination);
-            Amount nAmount = AmountFromValue(outputs[name_]);
-
-            CTxOut out(nAmount, scriptPubKey);
-            rawTx.vout.push_back(out);
-        }
-    }
-
-    return rawTx;
-}
-
 static UniValue createrawtransaction(const Config &config,
                                      const JSONRPCRequest &request) {
     if (request.fHelp || request.params.size() < 2 ||
@@ -819,21 +695,6 @@
     return r;
 }
 
-/**
- * Pushes a JSON object for script verification or signing errors to vErrorsRet.
- */
-static void TxInErrorToJSON(const CTxIn &txin, UniValue &vErrorsRet,
-                            const std::string &strMessage) {
-    UniValue entry(UniValue::VOBJ);
-    entry.pushKV("txid", txin.prevout.GetTxId().ToString());
-    entry.pushKV("vout", uint64_t(txin.prevout.GetN()));
-    entry.pushKV("scriptSig",
-                 HexStr(txin.scriptSig.begin(), txin.scriptSig.end()));
-    entry.pushKV("sequence", uint64_t(txin.nSequence));
-    entry.pushKV("error", strMessage);
-    vErrorsRet.push_back(entry);
-}
-
 static UniValue combinerawtransaction(const Config &config,
                                       const JSONRPCRequest &request) {
     if (request.fHelp || request.params.size() != 1) {
@@ -937,174 +798,6 @@
     return EncodeHexTx(CTransaction(mergedTx));
 }
 
-// TODO(https://github.com/bitcoin/bitcoin/pull/10973#discussion_r267084237):
-// This function is called from both wallet and node rpcs
-// (signrawtransactionwithwallet and signrawtransactionwithkey). It should be
-// moved to a util file so wallet code doesn't need to link against node code.
-// Also the dependency on interfaces::Chain should be removed, so
-// signrawtransactionwithkey doesn't need access to a Chain instance.
-UniValue SignTransaction(interfaces::Chain &chain, CMutableTransaction &mtx,
-                         const UniValue &prevTxsUnival,
-                         CBasicKeyStore *keystore, bool is_temp_keystore,
-                         const UniValue &hashType) {
-    // Fetch previous transactions (inputs):
-    std::map<COutPoint, Coin> coins;
-    for (const CTxIn &txin : mtx.vin) {
-        // Create empty map entry keyed by prevout.
-        coins[txin.prevout];
-    }
-    chain.findCoins(coins);
-
-    // Add previous txouts given in the RPC call:
-    if (!prevTxsUnival.isNull()) {
-        UniValue prevTxs = prevTxsUnival.get_array();
-        for (size_t idx = 0; idx < prevTxs.size(); ++idx) {
-            const UniValue &p = prevTxs[idx];
-            if (!p.isObject()) {
-                throw JSONRPCError(RPC_DESERIALIZATION_ERROR,
-                                   "expected object with "
-                                   "{\"txid'\",\"vout\",\"scriptPubKey\"}");
-            }
-
-            UniValue prevOut = p.get_obj();
-
-            RPCTypeCheckObj(prevOut,
-                            {
-                                {"txid", UniValueType(UniValue::VSTR)},
-                                {"vout", UniValueType(UniValue::VNUM)},
-                                {"scriptPubKey", UniValueType(UniValue::VSTR)},
-                                // "amount" is also required but check is done
-                                // below due to UniValue::VNUM erroneously
-                                // not accepting quoted numerics
-                                // (which are valid JSON)
-                            });
-
-            TxId txid(ParseHashO(prevOut, "txid"));
-
-            int nOut = find_value(prevOut, "vout").get_int();
-            if (nOut < 0) {
-                throw JSONRPCError(RPC_DESERIALIZATION_ERROR,
-                                   "vout must be positive");
-            }
-
-            COutPoint out(txid, nOut);
-            std::vector<uint8_t> pkData(ParseHexO(prevOut, "scriptPubKey"));
-            CScript scriptPubKey(pkData.begin(), pkData.end());
-
-            {
-                auto coin = coins.find(out);
-                if (coin != coins.end() && !coin->second.IsSpent() &&
-                    coin->second.GetTxOut().scriptPubKey != scriptPubKey) {
-                    std::string err("Previous output scriptPubKey mismatch:\n");
-                    err = err +
-                          ScriptToAsmStr(coin->second.GetTxOut().scriptPubKey) +
-                          "\nvs:\n" + ScriptToAsmStr(scriptPubKey);
-                    throw JSONRPCError(RPC_DESERIALIZATION_ERROR, err);
-                }
-
-                CTxOut txout;
-                txout.scriptPubKey = scriptPubKey;
-                txout.nValue = Amount::zero();
-                if (prevOut.exists("amount")) {
-                    txout.nValue =
-                        AmountFromValue(find_value(prevOut, "amount"));
-                } else {
-                    // amount param is required in replay-protected txs.
-                    // Note that we must check for its presence here rather
-                    // than use RPCTypeCheckObj() above, since UniValue::VNUM
-                    // parser incorrectly parses numerics with quotes, eg
-                    // "3.12" as a string when JSON allows it to also parse
-                    // as numeric. And we have to accept numerics with quotes
-                    // because our own dogfood (our rpc results) always
-                    // produces decimal numbers that are quoted
-                    // eg getbalance returns "3.14152" rather than 3.14152
-                    throw JSONRPCError(RPC_INVALID_PARAMETER, "Missing amount");
-                }
-                coins[out] = Coin(txout, 1, false);
-            }
-
-            // If redeemScript and private keys were given, add redeemScript to
-            // the keystore so it can be signed
-            if (is_temp_keystore && scriptPubKey.IsPayToScriptHash()) {
-                RPCTypeCheckObj(
-                    prevOut, {
-                                 {"redeemScript", UniValueType(UniValue::VSTR)},
-                             });
-                UniValue v = find_value(prevOut, "redeemScript");
-                if (!v.isNull()) {
-                    std::vector<uint8_t> rsData(ParseHexV(v, "redeemScript"));
-                    CScript redeemScript(rsData.begin(), rsData.end());
-                    keystore->AddCScript(redeemScript);
-                }
-            }
-        }
-    }
-
-    SigHashType sigHashType = ParseSighashString(hashType);
-    if (!sigHashType.hasForkId()) {
-        throw JSONRPCError(RPC_INVALID_PARAMETER,
-                           "Signature must use SIGHASH_FORKID");
-    }
-
-    // Script verification errors.
-    UniValue vErrors(UniValue::VARR);
-
-    // Use CTransaction for the constant parts of the transaction to avoid
-    // rehashing.
-    const CTransaction txConst(mtx);
-    // Sign what we can:
-    for (size_t i = 0; i < mtx.vin.size(); i++) {
-        CTxIn &txin = mtx.vin[i];
-        auto coin = coins.find(txin.prevout);
-        if (coin == coins.end() || coin->second.IsSpent()) {
-            TxInErrorToJSON(txin, vErrors, "Input not found or already spent");
-            continue;
-        }
-
-        const CScript &prevPubKey = coin->second.GetTxOut().scriptPubKey;
-        const Amount amount = coin->second.GetTxOut().nValue;
-
-        SignatureData sigdata =
-            DataFromTransaction(mtx, i, coin->second.GetTxOut());
-        // Only sign SIGHASH_SINGLE if there's a corresponding output:
-        if ((sigHashType.getBaseType() != BaseSigHashType::SINGLE) ||
-            (i < mtx.vout.size())) {
-            ProduceSignature(*keystore,
-                             MutableTransactionSignatureCreator(&mtx, i, amount,
-                                                                sigHashType),
-                             prevPubKey, sigdata);
-        }
-
-        UpdateInput(txin, sigdata);
-
-        ScriptError serror = ScriptError::OK;
-        if (!VerifyScript(
-                txin.scriptSig, prevPubKey, STANDARD_SCRIPT_VERIFY_FLAGS,
-                TransactionSignatureChecker(&txConst, i, amount), &serror)) {
-            if (serror == ScriptError::INVALID_STACK_OPERATION) {
-                // Unable to sign input and verification failed (possible
-                // attempt to partially sign).
-                TxInErrorToJSON(txin, vErrors,
-                                "Unable to sign input, invalid stack size "
-                                "(possibly missing key)");
-            } else {
-                TxInErrorToJSON(txin, vErrors, ScriptErrorString(serror));
-            }
-        }
-    }
-
-    bool fComplete = vErrors.empty();
-
-    UniValue result(UniValue::VOBJ);
-    result.pushKV("hex", EncodeHexTx(CTransaction(mtx)));
-    result.pushKV("complete", fComplete);
-    if (!vErrors.empty()) {
-        result.pushKV("errors", vErrors);
-    }
-
-    return result;
-}
-
 static UniValue signrawtransactionwithkey(const Config &config,
                                           const JSONRPCRequest &request) {
     if (request.fHelp || request.params.size() < 2 ||
diff --git a/src/rpc/rawtransaction.h b/src/rpc/rawtransaction_util.h
rename from src/rpc/rawtransaction.h
rename to src/rpc/rawtransaction_util.h
--- a/src/rpc/rawtransaction.h
+++ b/src/rpc/rawtransaction_util.h
@@ -2,13 +2,14 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_RPC_RAWTRANSACTION_H
-#define BITCOIN_RPC_RAWTRANSACTION_H
+#ifndef BITCOIN_RPC_RAWTRANSACTION_UTIL_H
+#define BITCOIN_RPC_RAWTRANSACTION_UTIL_H
 
 class CBasicKeyStore;
 class CChainParams;
-class CMutableTransaction;
+
 class UniValue;
+struct CMutableTransaction;
 
 namespace interfaces {
 class Chain;
@@ -25,4 +26,4 @@
                                          const UniValue &outputs_in,
                                          const UniValue &locktime);
 
-#endif // BITCOIN_RPC_RAWTRANSACTION_H
+#endif // BITCOIN_RPC_RAWTRANSACTION_UTIL_H
diff --git a/src/rpc/rawtransaction_util.cpp b/src/rpc/rawtransaction_util.cpp
new file mode 100644
--- /dev/null
+++ b/src/rpc/rawtransaction_util.cpp
@@ -0,0 +1,326 @@
+// Copyright (c) 2010 Satoshi Nakamoto
+// Copyright (c) 2009-2019 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <rpc/rawtransaction_util.h>
+
+#include <coins.h>
+#include <core_io.h>
+#include <interfaces/chain.h>
+#include <key_io.h>
+#include <keystore.h>
+#include <policy/policy.h>
+#include <primitives/transaction.h>
+#include <rpc/protocol.h>
+#include <rpc/util.h>
+#include <tinyformat.h>
+#include <univalue.h>
+#include <util/strencodings.h>
+
+CMutableTransaction ConstructTransaction(const CChainParams &params,
+                                         const UniValue &inputs_in,
+                                         const UniValue &outputs_in,
+                                         const UniValue &locktime) {
+    if (inputs_in.isNull() || outputs_in.isNull()) {
+        throw JSONRPCError(
+            RPC_INVALID_PARAMETER,
+            "Invalid parameter, arguments 1 and 2 must be non-null");
+    }
+
+    UniValue inputs = inputs_in.get_array();
+    const bool outputs_is_obj = outputs_in.isObject();
+    UniValue outputs =
+        outputs_is_obj ? outputs_in.get_obj() : outputs_in.get_array();
+
+    CMutableTransaction rawTx;
+
+    if (!locktime.isNull()) {
+        int64_t nLockTime = locktime.get_int64();
+        if (nLockTime < 0 || nLockTime > std::numeric_limits<uint32_t>::max()) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER,
+                               "Invalid parameter, locktime out of range");
+        }
+
+        rawTx.nLockTime = nLockTime;
+    }
+
+    for (size_t idx = 0; idx < inputs.size(); idx++) {
+        const UniValue &input = inputs[idx];
+        const UniValue &o = input.get_obj();
+
+        TxId txid(ParseHashO(o, "txid"));
+
+        const UniValue &vout_v = find_value(o, "vout");
+        if (vout_v.isNull()) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER,
+                               "Invalid parameter, missing vout key");
+        }
+
+        if (!vout_v.isNum()) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER,
+                               "Invalid parameter, vout must be a number");
+        }
+
+        int nOutput = vout_v.get_int();
+        if (nOutput < 0) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER,
+                               "Invalid parameter, vout must be positive");
+        }
+
+        uint32_t nSequence =
+            (rawTx.nLockTime ? std::numeric_limits<uint32_t>::max() - 1
+                             : std::numeric_limits<uint32_t>::max());
+
+        // Set the sequence number if passed in the parameters object.
+        const UniValue &sequenceObj = find_value(o, "sequence");
+        if (sequenceObj.isNum()) {
+            int64_t seqNr64 = sequenceObj.get_int64();
+            if (seqNr64 < 0 || seqNr64 > std::numeric_limits<uint32_t>::max()) {
+                throw JSONRPCError(
+                    RPC_INVALID_PARAMETER,
+                    "Invalid parameter, sequence number is out of range");
+            }
+
+            nSequence = uint32_t(seqNr64);
+        }
+
+        CTxIn in(COutPoint(txid, nOutput), CScript(), nSequence);
+        rawTx.vin.push_back(in);
+    }
+
+    std::set<CTxDestination> destinations;
+    if (!outputs_is_obj) {
+        // Translate array of key-value pairs into dict
+        UniValue outputs_dict = UniValue(UniValue::VOBJ);
+        for (size_t i = 0; i < outputs.size(); ++i) {
+            const UniValue &output = outputs[i];
+            if (!output.isObject()) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER,
+                                   "Invalid parameter, key-value pair not an "
+                                   "object as expected");
+            }
+            if (output.size() != 1) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER,
+                                   "Invalid parameter, key-value pair must "
+                                   "contain exactly one key");
+            }
+            outputs_dict.pushKVs(output);
+        }
+        outputs = std::move(outputs_dict);
+    }
+    for (const std::string &name_ : outputs.getKeys()) {
+        if (name_ == "data") {
+            std::vector<uint8_t> data =
+                ParseHexV(outputs[name_].getValStr(), "Data");
+
+            CTxOut out(Amount::zero(), CScript() << OP_RETURN << data);
+            rawTx.vout.push_back(out);
+        } else {
+            CTxDestination destination = DecodeDestination(name_, params);
+            if (!IsValidDestination(destination)) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY,
+                                   std::string("Invalid Bitcoin address: ") +
+                                       name_);
+            }
+
+            if (!destinations.insert(destination).second) {
+                throw JSONRPCError(
+                    RPC_INVALID_PARAMETER,
+                    std::string("Invalid parameter, duplicated address: ") +
+                        name_);
+            }
+
+            CScript scriptPubKey = GetScriptForDestination(destination);
+            Amount nAmount = AmountFromValue(outputs[name_]);
+
+            CTxOut out(nAmount, scriptPubKey);
+            rawTx.vout.push_back(out);
+        }
+    }
+
+    return rawTx;
+}
+
+/**
+ * Pushes a JSON object for script verification or signing errors to vErrorsRet.
+ */
+static void TxInErrorToJSON(const CTxIn &txin, UniValue &vErrorsRet,
+                            const std::string &strMessage) {
+    UniValue entry(UniValue::VOBJ);
+    entry.pushKV("txid", txin.prevout.GetTxId().ToString());
+    entry.pushKV("vout", uint64_t(txin.prevout.GetN()));
+    entry.pushKV("scriptSig",
+                 HexStr(txin.scriptSig.begin(), txin.scriptSig.end()));
+    entry.pushKV("sequence", uint64_t(txin.nSequence));
+    entry.pushKV("error", strMessage);
+    vErrorsRet.push_back(entry);
+}
+
+// TODO(https://github.com/bitcoin/bitcoin/pull/10973#discussion_r267084237):
+// This function is called from both wallet and node rpcs
+// (signrawtransactionwithwallet and signrawtransactionwithkey). It should be
+// moved to a util file so wallet code doesn't need to link against node code.
+// Also the dependency on interfaces::Chain should be removed, so
+// signrawtransactionwithkey doesn't need access to a Chain instance.
+UniValue SignTransaction(interfaces::Chain &chain, CMutableTransaction &mtx,
+                         const UniValue &prevTxsUnival,
+                         CBasicKeyStore *keystore, bool is_temp_keystore,
+                         const UniValue &hashType) {
+    // Fetch previous transactions (inputs):
+    std::map<COutPoint, Coin> coins;
+    for (const CTxIn &txin : mtx.vin) {
+        // Create empty map entry keyed by prevout.
+        coins[txin.prevout];
+    }
+    chain.findCoins(coins);
+
+    // Add previous txouts given in the RPC call:
+    if (!prevTxsUnival.isNull()) {
+        UniValue prevTxs = prevTxsUnival.get_array();
+        for (size_t idx = 0; idx < prevTxs.size(); ++idx) {
+            const UniValue &p = prevTxs[idx];
+            if (!p.isObject()) {
+                throw JSONRPCError(RPC_DESERIALIZATION_ERROR,
+                                   "expected object with "
+                                   "{\"txid'\",\"vout\",\"scriptPubKey\"}");
+            }
+
+            UniValue prevOut = p.get_obj();
+
+            RPCTypeCheckObj(prevOut,
+                            {
+                                {"txid", UniValueType(UniValue::VSTR)},
+                                {"vout", UniValueType(UniValue::VNUM)},
+                                {"scriptPubKey", UniValueType(UniValue::VSTR)},
+                                // "amount" is also required but check is done
+                                // below due to UniValue::VNUM erroneously
+                                // not accepting quoted numerics
+                                // (which are valid JSON)
+                            });
+
+            TxId txid(ParseHashO(prevOut, "txid"));
+
+            int nOut = find_value(prevOut, "vout").get_int();
+            if (nOut < 0) {
+                throw JSONRPCError(RPC_DESERIALIZATION_ERROR,
+                                   "vout must be positive");
+            }
+
+            COutPoint out(txid, nOut);
+            std::vector<uint8_t> pkData(ParseHexO(prevOut, "scriptPubKey"));
+            CScript scriptPubKey(pkData.begin(), pkData.end());
+
+            {
+                auto coin = coins.find(out);
+                if (coin != coins.end() && !coin->second.IsSpent() &&
+                    coin->second.GetTxOut().scriptPubKey != scriptPubKey) {
+                    std::string err("Previous output scriptPubKey mismatch:\n");
+                    err = err +
+                          ScriptToAsmStr(coin->second.GetTxOut().scriptPubKey) +
+                          "\nvs:\n" + ScriptToAsmStr(scriptPubKey);
+                    throw JSONRPCError(RPC_DESERIALIZATION_ERROR, err);
+                }
+
+                CTxOut txout;
+                txout.scriptPubKey = scriptPubKey;
+                txout.nValue = Amount::zero();
+                if (prevOut.exists("amount")) {
+                    txout.nValue =
+                        AmountFromValue(find_value(prevOut, "amount"));
+                } else {
+                    // amount param is required in replay-protected txs.
+                    // Note that we must check for its presence here rather
+                    // than use RPCTypeCheckObj() above, since UniValue::VNUM
+                    // parser incorrectly parses numerics with quotes, eg
+                    // "3.12" as a string when JSON allows it to also parse
+                    // as numeric. And we have to accept numerics with quotes
+                    // because our own dogfood (our rpc results) always
+                    // produces decimal numbers that are quoted
+                    // eg getbalance returns "3.14152" rather than 3.14152
+                    throw JSONRPCError(RPC_INVALID_PARAMETER, "Missing amount");
+                }
+                coins[out] = Coin(txout, 1, false);
+            }
+
+            // If redeemScript and private keys were given, add redeemScript to
+            // the keystore so it can be signed
+            if (is_temp_keystore && scriptPubKey.IsPayToScriptHash()) {
+                RPCTypeCheckObj(
+                    prevOut, {
+                                 {"redeemScript", UniValueType(UniValue::VSTR)},
+                             });
+                UniValue v = find_value(prevOut, "redeemScript");
+                if (!v.isNull()) {
+                    std::vector<uint8_t> rsData(ParseHexV(v, "redeemScript"));
+                    CScript redeemScript(rsData.begin(), rsData.end());
+                    keystore->AddCScript(redeemScript);
+                }
+            }
+        }
+    }
+
+    SigHashType sigHashType = ParseSighashString(hashType);
+    if (!sigHashType.hasForkId()) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER,
+                           "Signature must use SIGHASH_FORKID");
+    }
+
+    // Script verification errors.
+    UniValue vErrors(UniValue::VARR);
+
+    // Use CTransaction for the constant parts of the transaction to avoid
+    // rehashing.
+    const CTransaction txConst(mtx);
+    // Sign what we can:
+    for (size_t i = 0; i < mtx.vin.size(); i++) {
+        CTxIn &txin = mtx.vin[i];
+        auto coin = coins.find(txin.prevout);
+        if (coin == coins.end() || coin->second.IsSpent()) {
+            TxInErrorToJSON(txin, vErrors, "Input not found or already spent");
+            continue;
+        }
+
+        const CScript &prevPubKey = coin->second.GetTxOut().scriptPubKey;
+        const Amount amount = coin->second.GetTxOut().nValue;
+
+        SignatureData sigdata =
+            DataFromTransaction(mtx, i, coin->second.GetTxOut());
+        // Only sign SIGHASH_SINGLE if there's a corresponding output:
+        if ((sigHashType.getBaseType() != BaseSigHashType::SINGLE) ||
+            (i < mtx.vout.size())) {
+            ProduceSignature(*keystore,
+                             MutableTransactionSignatureCreator(&mtx, i, amount,
+                                                                sigHashType),
+                             prevPubKey, sigdata);
+        }
+
+        UpdateInput(txin, sigdata);
+
+        ScriptError serror = ScriptError::OK;
+        if (!VerifyScript(
+                txin.scriptSig, prevPubKey, STANDARD_SCRIPT_VERIFY_FLAGS,
+                TransactionSignatureChecker(&txConst, i, amount), &serror)) {
+            if (serror == ScriptError::INVALID_STACK_OPERATION) {
+                // Unable to sign input and verification failed (possible
+                // attempt to partially sign).
+                TxInErrorToJSON(txin, vErrors,
+                                "Unable to sign input, invalid stack size "
+                                "(possibly missing key)");
+            } else {
+                TxInErrorToJSON(txin, vErrors, ScriptErrorString(serror));
+            }
+        }
+    }
+
+    bool fComplete = vErrors.empty();
+
+    UniValue result(UniValue::VOBJ);
+    result.pushKV("hex", EncodeHexTx(CTransaction(mtx)));
+    result.pushKV("complete", fComplete);
+    if (!vErrors.empty()) {
+        result.pushKV("errors", vErrors);
+    }
+
+    return result;
+}
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -18,7 +18,7 @@
 #include <policy/fees.h>
 #include <policy/policy.h>
 #include <rpc/mining.h>
-#include <rpc/rawtransaction.h>
+#include <rpc/rawtransaction_util.h>
 #include <rpc/server.h>
 #include <rpc/util.h>
 #include <shutdown.h>