|
|
@@ -17,6 +17,7 @@ |
|
|
#include "policy/rbf.h"
|
|
|
#include "rpc/mining.h"
|
|
|
#include "rpc/server.h"
|
|
|
+#include "rpc/rawtransaction.h"
|
|
|
#include "script/sign.h"
|
|
|
#include "timedata.h"
|
|
|
#include "util.h"
|
|
|
@@ -2842,6 +2843,74 @@ UniValue fundrawtransaction(const JSONRPCRequest& request) |
|
|
return result;
|
|
|
}
|
|
|
|
|
|
+UniValue signrawtransactionwithwallet(const JSONRPCRequest& request)
|
|
|
+{
|
|
|
+ CWallet * const pwallet = GetWalletForJSONRPCRequest(request);
|
|
|
+ if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
|
|
|
+ return NullUniValue;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (request.fHelp || request.params.size() < 1 || request.params.size() > 3)
|
|
|
+ throw std::runtime_error(
|
|
|
+ "signrawtransactionwithwallet \"hexstring\" ( [{\"txid\":\"id\",\"vout\":n,\"scriptPubKey\":\"hex\",\"redeemScript\":\"hex\"},...] sighashtype )\n"
|
|
|
+ "\nSign inputs for raw transaction (serialized, hex-encoded).\n"
|
|
|
+ "The second optional argument (may be null) is an array of previous transaction outputs that\n"
|
|
|
+ "this transaction depends on but may not yet be in the block chain.\n"
|
|
|
+ + HelpRequiringPassphrase(pwallet) + "\n"
|
|
|
+
|
|
|
+ "\nArguments:\n"
|
|
|
+ "1. \"hexstring\" (string, required) The transaction hex string\n"
|
|
|
+ "2. \"prevtxs\" (string, optional) An json array of previous dependent transaction outputs\n"
|
|
|
+ " [ (json array of json objects, or 'null' if none provided)\n"
|
|
|
+ " {\n"
|
|
|
+ " \"txid\":\"id\", (string, required) The transaction id\n"
|
|
|
+ " \"vout\":n, (numeric, required) The output number\n"
|
|
|
+ " \"scriptPubKey\": \"hex\", (string, required) script key\n"
|
|
|
+ " \"redeemScript\": \"hex\", (string, required for P2SH or P2WSH) redeem script\n"
|
|
|
+ " \"amount\": value (numeric, required) The amount spent\n"
|
|
|
+ " }\n"
|
|
|
+ " ,...\n"
|
|
|
+ " ]\n"
|
|
|
+ "3. \"sighashtype\" (string, optional, default=ALL) The signature hash type. Must be one of\n"
|
|
|
+ " \"ALL\"\n"
|
|
|
+ " \"NONE\"\n"
|
|
|
+ " \"SINGLE\"\n"
|
|
|
+ " \"ALL|ANYONECANPAY\"\n"
|
|
|
+ " \"NONE|ANYONECANPAY\"\n"
|
|
|
+ " \"SINGLE|ANYONECANPAY\"\n"
|
|
|
+
|
|
|
+ "\nResult:\n"
|
|
|
+ "{\n"
|
|
|
+ " \"hex\" : \"value\", (string) The hex-encoded raw transaction with signature(s)\n"
|
|
|
+ " \"complete\" : true|false, (boolean) If the transaction has a complete set of signatures\n"
|
|
|
+ " \"errors\" : [ (json array of objects) Script verification errors (if there are any)\n"
|
|
|
+ " {\n"
|
|
|
+ " \"txid\" : \"hash\", (string) The hash of the referenced, previous transaction\n"
|
|
|
+ " \"vout\" : n, (numeric) The index of the output to spent and used as input\n"
|
|
|
+ " \"scriptSig\" : \"hex\", (string) The hex-encoded signature script\n"
|
|
|
+ " \"sequence\" : n, (numeric) Script sequence number\n"
|
|
|
+ " \"error\" : \"text\" (string) Verification or signing error related to the input\n"
|
|
|
+ " }\n"
|
|
|
+ " ,...\n"
|
|
|
+ " ]\n"
|
|
|
+ "}\n"
|
|
|
+
|
|
|
+ "\nExamples:\n"
|
|
|
+ + HelpExampleCli("signrawtransactionwithwallet", "\"myhex\"")
|
|
|
+ + HelpExampleRpc("signrawtransactionwithwallet", "\"myhex\"")
|
|
|
+ );
|
|
|
+
|
|
|
+ LOCK2(cs_main, pwallet->cs_wallet);
|
|
|
+ RPCTypeCheck(request.params, {UniValue::VSTR, UniValue::VARR, UniValue::VSTR}, true);
|
|
|
+
|
|
|
+ CMutableTransaction mtx;
|
|
|
+ if (!DecodeHexTx(mtx, request.params[0].get_str(), true))
|
|
|
+ throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
|
|
|
+
|
|
|
+ // Sign the transaction
|
|
|
+ return signtransaction(mtx, request.params[1], pwallet, false, request.params[2]);
|
|
|
+}
|
|
|
+
|
|
|
UniValue bumpfee(const JSONRPCRequest& request)
|
|
|
{
|
|
|
CWallet * const pwallet = GetWalletForJSONRPCRequest(request);
|
|
|
@@ -3042,6 +3111,7 @@ static const CRPCCommand commands[] = |
|
|
{ // category name actor (function) okSafeMode
|
|
|
// --------------------- ------------------------ ----------------------- ----------
|
|
|
{ "rawtransactions", "fundrawtransaction", &fundrawtransaction, false, {"hexstring","options"} },
|
|
|
+ { "rawtransactions", "signrawtransactionwithwallet", &signrawtransactionwithwallet, false, {"hexstring","prevtxs","sighashtype"} },
|
|
|
{ "hidden", "resendwallettransactions", &resendwallettransactions, true, {} },
|
|
|
{ "wallet", "abandontransaction", &abandontransaction, false, {"txid"} },
|
|
|
{ "wallet", "abortrescan", &abortrescan, false, {} },
|
|
|
|
