Merge #10579: [RPC] Split signrawtransaction into wallet and non-wallet RPC command
d60234885b
Add test for signrawtransaction (Andrew Chow)eefff65a4b
scripted-diff: change signrawtransaction to signrawtransactionwithwallet in tests (Andrew Chow)1e79c055cd
Split signrawtransaction into wallet and non-wallet (Andrew Chow) Pull request description: This PR is part of #10570. It also builds on top of #10571. This PR splits `signrawtransaction` into two commands, `signrawtransactionwithkey` and `signrawtransactionwithwallet`. `signrawtransactionwithkey` requires private keys to be passed in and does not use the wallet for any signing. `signrawtransactionwithwallet` uses the wallet to sign a raw transaction and does not have any parameters to take private keys. The `signrawtransaction` RPC has been marked as deprecated and will call the appropriate RPC command based upon the parameters given. A test was added to check this behavior is still consistent with the original behavior. All tests that used `signrawtransaction` have been updated to use one of the two new RPCs. Most uses were changed to `signrawtransactionwithwallet`. These were changed via a scripted diff. Tree-SHA512: d0adf5b4cd7077639c504ec07bee262a3b94658d34db0a5c86a263b6393f7aa62f45129eafe29a7c861aa58440dd19348ee0c8b685e8a62d6f4adae8ec8f8cb3
This commit is contained in:
commit
ffc6e48b29
36 changed files with 518 additions and 342 deletions
|
@ -132,6 +132,7 @@ BITCOIN_CORE_H = \
|
||||||
rpc/protocol.h \
|
rpc/protocol.h \
|
||||||
rpc/safemode.h \
|
rpc/safemode.h \
|
||||||
rpc/server.h \
|
rpc/server.h \
|
||||||
|
rpc/rawtransaction.h \
|
||||||
rpc/register.h \
|
rpc/register.h \
|
||||||
rpc/util.h \
|
rpc/util.h \
|
||||||
scheduler.h \
|
scheduler.h \
|
||||||
|
|
|
@ -70,6 +70,7 @@ const QStringList historyFilter = QStringList()
|
||||||
<< "importmulti"
|
<< "importmulti"
|
||||||
<< "signmessagewithprivkey"
|
<< "signmessagewithprivkey"
|
||||||
<< "signrawtransaction"
|
<< "signrawtransaction"
|
||||||
|
<< "signrawtransactionwithkey"
|
||||||
<< "walletpassphrase"
|
<< "walletpassphrase"
|
||||||
<< "walletpassphrasechange"
|
<< "walletpassphrasechange"
|
||||||
<< "encryptwallet";
|
<< "encryptwallet";
|
||||||
|
|
|
@ -82,8 +82,8 @@ void RPCNestedTests::rpcNestedTests()
|
||||||
QVERIFY(filtered == "signmessagewithprivkey(…)");
|
QVERIFY(filtered == "signmessagewithprivkey(…)");
|
||||||
RPCConsole::RPCParseCommandLine(result, "signmessagewithprivkey abc,def", false, &filtered);
|
RPCConsole::RPCParseCommandLine(result, "signmessagewithprivkey abc,def", false, &filtered);
|
||||||
QVERIFY(filtered == "signmessagewithprivkey(…)");
|
QVERIFY(filtered == "signmessagewithprivkey(…)");
|
||||||
RPCConsole::RPCParseCommandLine(result, "signrawtransaction(abc)", false, &filtered);
|
RPCConsole::RPCParseCommandLine(result, "signrawtransactionwithkey(abc)", false, &filtered);
|
||||||
QVERIFY(filtered == "signrawtransaction(…)");
|
QVERIFY(filtered == "signrawtransactionwithkey(…)");
|
||||||
RPCConsole::RPCParseCommandLine(result, "walletpassphrase(help())", false, &filtered);
|
RPCConsole::RPCParseCommandLine(result, "walletpassphrase(help())", false, &filtered);
|
||||||
QVERIFY(filtered == "walletpassphrase(…)");
|
QVERIFY(filtered == "walletpassphrase(…)");
|
||||||
RPCConsole::RPCParseCommandLine(result, "walletpassphrasechange(help(walletpassphrasechange(abc)))", false, &filtered);
|
RPCConsole::RPCParseCommandLine(result, "walletpassphrasechange(help(walletpassphrasechange(abc)))", false, &filtered);
|
||||||
|
|
|
@ -94,6 +94,9 @@ static const CRPCConvertParam vRPCConvertParams[] =
|
||||||
{ "decoderawtransaction", 1, "iswitness" },
|
{ "decoderawtransaction", 1, "iswitness" },
|
||||||
{ "signrawtransaction", 1, "prevtxs" },
|
{ "signrawtransaction", 1, "prevtxs" },
|
||||||
{ "signrawtransaction", 2, "privkeys" },
|
{ "signrawtransaction", 2, "privkeys" },
|
||||||
|
{ "signrawtransactionwithkey", 1, "privkeys" },
|
||||||
|
{ "signrawtransactionwithkey", 2, "prevtxs" },
|
||||||
|
{ "signrawtransactionwithwallet", 1, "prevtxs" },
|
||||||
{ "sendrawtransaction", 1, "allowhighfees" },
|
{ "sendrawtransaction", 1, "allowhighfees" },
|
||||||
{ "combinerawtransaction", 0, "txs" },
|
{ "combinerawtransaction", 0, "txs" },
|
||||||
{ "fundrawtransaction", 1, "options" },
|
{ "fundrawtransaction", 1, "options" },
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
#include <policy/policy.h>
|
#include <policy/policy.h>
|
||||||
#include <policy/rbf.h>
|
#include <policy/rbf.h>
|
||||||
#include <primitives/transaction.h>
|
#include <primitives/transaction.h>
|
||||||
|
#include <rpc/rawtransaction.h>
|
||||||
#include <rpc/safemode.h>
|
#include <rpc/safemode.h>
|
||||||
#include <rpc/server.h>
|
#include <rpc/server.h>
|
||||||
#include <script/script.h>
|
#include <script/script.h>
|
||||||
|
@ -28,7 +29,6 @@
|
||||||
#include <utilstrencodings.h>
|
#include <utilstrencodings.h>
|
||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
#include <wallet/rpcwallet.h>
|
#include <wallet/rpcwallet.h>
|
||||||
#include <wallet/wallet.h>
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <future>
|
#include <future>
|
||||||
|
@ -672,6 +672,244 @@ UniValue combinerawtransaction(const JSONRPCRequest& request)
|
||||||
return EncodeHexTx(mergedTx);
|
return EncodeHexTx(mergedTx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
UniValue SignTransaction(CMutableTransaction& mtx, const UniValue& prevTxsUnival, CBasicKeyStore *keystore, bool is_temp_keystore, const UniValue& hashType)
|
||||||
|
{
|
||||||
|
// Fetch previous transactions (inputs):
|
||||||
|
CCoinsView viewDummy;
|
||||||
|
CCoinsViewCache view(&viewDummy);
|
||||||
|
{
|
||||||
|
LOCK2(cs_main, mempool.cs);
|
||||||
|
CCoinsViewCache &viewChain = *pcoinsTip;
|
||||||
|
CCoinsViewMemPool viewMempool(&viewChain, mempool);
|
||||||
|
view.SetBackend(viewMempool); // temporarily switch cache backend to db+mempool view
|
||||||
|
|
||||||
|
for (const CTxIn& txin : mtx.vin) {
|
||||||
|
view.AccessCoin(txin.prevout); // Load entries from viewChain into view; can fail.
|
||||||
|
}
|
||||||
|
|
||||||
|
view.SetBackend(viewDummy); // switch back to avoid locking mempool for too long
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add previous txouts given in the RPC call:
|
||||||
|
if (!prevTxsUnival.isNull()) {
|
||||||
|
UniValue prevTxs = prevTxsUnival.get_array();
|
||||||
|
for (unsigned int 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)},
|
||||||
|
});
|
||||||
|
|
||||||
|
uint256 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<unsigned char> pkData(ParseHexO(prevOut, "scriptPubKey"));
|
||||||
|
CScript scriptPubKey(pkData.begin(), pkData.end());
|
||||||
|
|
||||||
|
{
|
||||||
|
const Coin& coin = view.AccessCoin(out);
|
||||||
|
if (!coin.IsSpent() && coin.out.scriptPubKey != scriptPubKey) {
|
||||||
|
std::string err("Previous output scriptPubKey mismatch:\n");
|
||||||
|
err = err + ScriptToAsmStr(coin.out.scriptPubKey) + "\nvs:\n"+
|
||||||
|
ScriptToAsmStr(scriptPubKey);
|
||||||
|
throw JSONRPCError(RPC_DESERIALIZATION_ERROR, err);
|
||||||
|
}
|
||||||
|
Coin newcoin;
|
||||||
|
newcoin.out.scriptPubKey = scriptPubKey;
|
||||||
|
newcoin.out.nValue = 0;
|
||||||
|
if (prevOut.exists("amount")) {
|
||||||
|
newcoin.out.nValue = AmountFromValue(find_value(prevOut, "amount"));
|
||||||
|
}
|
||||||
|
newcoin.nHeight = 1;
|
||||||
|
view.AddCoin(out, std::move(newcoin), true);
|
||||||
|
}
|
||||||
|
|
||||||
|
// if redeemScript given and not using the local wallet (private keys
|
||||||
|
// given), add redeemScript to the keystore so it can be signed:
|
||||||
|
if (is_temp_keystore && (scriptPubKey.IsPayToScriptHash() || scriptPubKey.IsPayToWitnessScriptHash())) {
|
||||||
|
RPCTypeCheckObj(prevOut,
|
||||||
|
{
|
||||||
|
{"txid", UniValueType(UniValue::VSTR)},
|
||||||
|
{"vout", UniValueType(UniValue::VNUM)},
|
||||||
|
{"scriptPubKey", UniValueType(UniValue::VSTR)},
|
||||||
|
{"redeemScript", UniValueType(UniValue::VSTR)},
|
||||||
|
});
|
||||||
|
UniValue v = find_value(prevOut, "redeemScript");
|
||||||
|
if (!v.isNull()) {
|
||||||
|
std::vector<unsigned char> rsData(ParseHexV(v, "redeemScript"));
|
||||||
|
CScript redeemScript(rsData.begin(), rsData.end());
|
||||||
|
keystore->AddCScript(redeemScript);
|
||||||
|
// Automatically also add the P2WSH wrapped version of the script (to deal with P2SH-P2WSH).
|
||||||
|
keystore->AddCScript(GetScriptForWitness(redeemScript));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int nHashType = SIGHASH_ALL;
|
||||||
|
if (!hashType.isNull()) {
|
||||||
|
static std::map<std::string, int> mapSigHashValues = {
|
||||||
|
{std::string("ALL"), int(SIGHASH_ALL)},
|
||||||
|
{std::string("ALL|ANYONECANPAY"), int(SIGHASH_ALL|SIGHASH_ANYONECANPAY)},
|
||||||
|
{std::string("NONE"), int(SIGHASH_NONE)},
|
||||||
|
{std::string("NONE|ANYONECANPAY"), int(SIGHASH_NONE|SIGHASH_ANYONECANPAY)},
|
||||||
|
{std::string("SINGLE"), int(SIGHASH_SINGLE)},
|
||||||
|
{std::string("SINGLE|ANYONECANPAY"), int(SIGHASH_SINGLE|SIGHASH_ANYONECANPAY)},
|
||||||
|
};
|
||||||
|
std::string strHashType = hashType.get_str();
|
||||||
|
if (mapSigHashValues.count(strHashType)) {
|
||||||
|
nHashType = mapSigHashValues[strHashType];
|
||||||
|
} else {
|
||||||
|
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid sighash param");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool fHashSingle = ((nHashType & ~SIGHASH_ANYONECANPAY) == SIGHASH_SINGLE);
|
||||||
|
|
||||||
|
// 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 (unsigned int i = 0; i < mtx.vin.size(); i++) {
|
||||||
|
CTxIn& txin = mtx.vin[i];
|
||||||
|
const Coin& coin = view.AccessCoin(txin.prevout);
|
||||||
|
if (coin.IsSpent()) {
|
||||||
|
TxInErrorToJSON(txin, vErrors, "Input not found or already spent");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const CScript& prevPubKey = coin.out.scriptPubKey;
|
||||||
|
const CAmount& amount = coin.out.nValue;
|
||||||
|
|
||||||
|
SignatureData sigdata;
|
||||||
|
// Only sign SIGHASH_SINGLE if there's a corresponding output:
|
||||||
|
if (!fHashSingle || (i < mtx.vout.size())) {
|
||||||
|
ProduceSignature(MutableTransactionSignatureCreator(keystore, &mtx, i, amount, nHashType), prevPubKey, sigdata);
|
||||||
|
}
|
||||||
|
sigdata = CombineSignatures(prevPubKey, TransactionSignatureChecker(&txConst, i, amount), sigdata, DataFromTransaction(mtx, i));
|
||||||
|
|
||||||
|
UpdateTransaction(mtx, i, sigdata);
|
||||||
|
|
||||||
|
ScriptError serror = SCRIPT_ERR_OK;
|
||||||
|
if (!VerifyScript(txin.scriptSig, prevPubKey, &txin.scriptWitness, STANDARD_SCRIPT_VERIFY_FLAGS, TransactionSignatureChecker(&txConst, i, amount), &serror)) {
|
||||||
|
if (serror == SCRIPT_ERR_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(mtx));
|
||||||
|
result.pushKV("complete", fComplete);
|
||||||
|
if (!vErrors.empty()) {
|
||||||
|
result.pushKV("errors", vErrors);
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
UniValue signrawtransactionwithkey(const JSONRPCRequest& request)
|
||||||
|
{
|
||||||
|
if (request.fHelp || request.params.size() < 2 || request.params.size() > 4)
|
||||||
|
throw std::runtime_error(
|
||||||
|
"signrawtransactionwithkey \"hexstring\" [\"privatekey1\",...] ( [{\"txid\":\"id\",\"vout\":n,\"scriptPubKey\":\"hex\",\"redeemScript\":\"hex\"},...] sighashtype )\n"
|
||||||
|
"\nSign inputs for raw transaction (serialized, hex-encoded).\n"
|
||||||
|
"The second argument is an array of base58-encoded private\n"
|
||||||
|
"keys that will be the only keys used to sign the transaction.\n"
|
||||||
|
"The third 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"
|
||||||
|
|
||||||
|
"\nArguments:\n"
|
||||||
|
"1. \"hexstring\" (string, required) The transaction hex string\n"
|
||||||
|
"2. \"privkeys\" (string, required) A json array of base58-encoded private keys for signing\n"
|
||||||
|
" [ (json array of strings)\n"
|
||||||
|
" \"privatekey\" (string) private key in base58-encoding\n"
|
||||||
|
" ,...\n"
|
||||||
|
" ]\n"
|
||||||
|
"3. \"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"
|
||||||
|
"4. \"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("signrawtransactionwithkey", "\"myhex\"")
|
||||||
|
+ HelpExampleRpc("signrawtransactionwithkey", "\"myhex\"")
|
||||||
|
);
|
||||||
|
|
||||||
|
RPCTypeCheck(request.params, {UniValue::VSTR, UniValue::VARR, UniValue::VARR, UniValue::VSTR}, true);
|
||||||
|
|
||||||
|
CMutableTransaction mtx;
|
||||||
|
if (!DecodeHexTx(mtx, request.params[0].get_str(), true)) {
|
||||||
|
throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
|
||||||
|
}
|
||||||
|
|
||||||
|
CBasicKeyStore keystore;
|
||||||
|
const UniValue& keys = request.params[1].get_array();
|
||||||
|
for (unsigned int idx = 0; idx < keys.size(); ++idx) {
|
||||||
|
UniValue k = keys[idx];
|
||||||
|
CBitcoinSecret vchSecret;
|
||||||
|
if (!vchSecret.SetString(k.get_str())) {
|
||||||
|
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid private key");
|
||||||
|
}
|
||||||
|
CKey key = vchSecret.GetKey();
|
||||||
|
if (!key.IsValid()) {
|
||||||
|
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Private key outside allowed range");
|
||||||
|
}
|
||||||
|
keystore.AddKey(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
return SignTransaction(mtx, request.params[2], &keystore, true, request.params[3]);
|
||||||
|
}
|
||||||
|
|
||||||
UniValue signrawtransaction(const JSONRPCRequest& request)
|
UniValue signrawtransaction(const JSONRPCRequest& request)
|
||||||
{
|
{
|
||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
|
@ -681,7 +919,7 @@ UniValue signrawtransaction(const JSONRPCRequest& request)
|
||||||
if (request.fHelp || request.params.size() < 1 || request.params.size() > 4)
|
if (request.fHelp || request.params.size() < 1 || request.params.size() > 4)
|
||||||
throw std::runtime_error(
|
throw std::runtime_error(
|
||||||
"signrawtransaction \"hexstring\" ( [{\"txid\":\"id\",\"vout\":n,\"scriptPubKey\":\"hex\",\"redeemScript\":\"hex\"},...] [\"privatekey1\",...] sighashtype )\n"
|
"signrawtransaction \"hexstring\" ( [{\"txid\":\"id\",\"vout\":n,\"scriptPubKey\":\"hex\",\"redeemScript\":\"hex\"},...] [\"privatekey1\",...] sighashtype )\n"
|
||||||
"\nSign inputs for raw transaction (serialized, hex-encoded).\n"
|
"\nDEPRECATED. Sign inputs for raw transaction (serialized, hex-encoded).\n"
|
||||||
"The second optional argument (may be null) is an array of previous transaction outputs that\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"
|
"this transaction depends on but may not yet be in the block chain.\n"
|
||||||
"The third optional argument (may be null) is an array of base58-encoded private\n"
|
"The third optional argument (may be null) is an array of base58-encoded private\n"
|
||||||
|
@ -689,10 +927,9 @@ UniValue signrawtransaction(const JSONRPCRequest& request)
|
||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
+ HelpRequiringPassphrase(pwallet) + "\n"
|
+ HelpRequiringPassphrase(pwallet) + "\n"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
"\nArguments:\n"
|
"\nArguments:\n"
|
||||||
"1. \"hexstring\" (string, required) The transaction hex string\n"
|
"1. \"hexstring\" (string, required) The transaction hex string\n"
|
||||||
"2. \"prevtxs\" (string, optional) A json array of previous dependent transaction outputs\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"
|
" [ (json array of json objects, or 'null' if none provided)\n"
|
||||||
" {\n"
|
" {\n"
|
||||||
" \"txid\":\"id\", (string, required) The transaction id\n"
|
" \"txid\":\"id\", (string, required) The transaction id\n"
|
||||||
|
@ -737,194 +974,39 @@ UniValue signrawtransaction(const JSONRPCRequest& request)
|
||||||
+ HelpExampleRpc("signrawtransaction", "\"myhex\"")
|
+ HelpExampleRpc("signrawtransaction", "\"myhex\"")
|
||||||
);
|
);
|
||||||
|
|
||||||
ObserveSafeMode();
|
if (!IsDeprecatedRPCEnabled("signrawtransaction")) {
|
||||||
#ifdef ENABLE_WALLET
|
throw JSONRPCError(RPC_METHOD_DEPRECATED, "signrawtransaction is deprecated and will be fully removed in v0.18. "
|
||||||
LOCK2(cs_main, pwallet ? &pwallet->cs_wallet : nullptr);
|
"To use signrawtransaction in v0.17, restart bitcoind with -deprecatedrpc=signrawtransaction.\n"
|
||||||
#else
|
"Projects should transition to using signrawtransactionwithkey and signrawtransactionwithwallet before upgrading to v0.18");
|
||||||
LOCK(cs_main);
|
}
|
||||||
#endif
|
|
||||||
RPCTypeCheck(request.params, {UniValue::VSTR, UniValue::VARR, UniValue::VARR, UniValue::VSTR}, true);
|
RPCTypeCheck(request.params, {UniValue::VSTR, UniValue::VARR, UniValue::VARR, UniValue::VSTR}, true);
|
||||||
|
|
||||||
CMutableTransaction mtx;
|
// Make a JSONRPCRequest to pass on to the right signrawtransaction* command
|
||||||
if (!DecodeHexTx(mtx, request.params[0].get_str(), true))
|
JSONRPCRequest new_request;
|
||||||
throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
|
new_request.id = request.id;
|
||||||
|
new_request.params.setArray();
|
||||||
|
|
||||||
// Fetch previous transactions (inputs):
|
// For signing with private keys
|
||||||
CCoinsView viewDummy;
|
|
||||||
CCoinsViewCache view(&viewDummy);
|
|
||||||
{
|
|
||||||
LOCK(mempool.cs);
|
|
||||||
CCoinsViewCache &viewChain = *pcoinsTip;
|
|
||||||
CCoinsViewMemPool viewMempool(&viewChain, mempool);
|
|
||||||
view.SetBackend(viewMempool); // temporarily switch cache backend to db+mempool view
|
|
||||||
|
|
||||||
for (const CTxIn& txin : mtx.vin) {
|
|
||||||
view.AccessCoin(txin.prevout); // Load entries from viewChain into view; can fail.
|
|
||||||
}
|
|
||||||
|
|
||||||
view.SetBackend(viewDummy); // switch back to avoid locking mempool for too long
|
|
||||||
}
|
|
||||||
|
|
||||||
bool fGivenKeys = false;
|
|
||||||
CBasicKeyStore tempKeystore;
|
|
||||||
if (!request.params[2].isNull()) {
|
if (!request.params[2].isNull()) {
|
||||||
fGivenKeys = true;
|
new_request.params.push_back(request.params[0]);
|
||||||
UniValue keys = request.params[2].get_array();
|
// Note: the prevtxs and privkeys are reversed for signrawtransactionwithkey
|
||||||
for (unsigned int idx = 0; idx < keys.size(); idx++) {
|
new_request.params.push_back(request.params[2]);
|
||||||
UniValue k = keys[idx];
|
new_request.params.push_back(request.params[1]);
|
||||||
CBitcoinSecret vchSecret;
|
new_request.params.push_back(request.params[3]);
|
||||||
bool fGood = vchSecret.SetString(k.get_str());
|
return signrawtransactionwithkey(new_request);
|
||||||
if (!fGood)
|
|
||||||
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid private key");
|
|
||||||
CKey key = vchSecret.GetKey();
|
|
||||||
if (!key.IsValid())
|
|
||||||
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Private key outside allowed range");
|
|
||||||
tempKeystore.AddKey(key);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
// Otherwise sign with the wallet which does not take a privkeys parameter
|
||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
else if (pwallet) {
|
else {
|
||||||
EnsureWalletIsUnlocked(pwallet);
|
new_request.params.push_back(request.params[0]);
|
||||||
|
new_request.params.push_back(request.params[1]);
|
||||||
|
new_request.params.push_back(request.params[3]);
|
||||||
|
return signrawtransactionwithwallet(new_request);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
// If we have made it this far, then wallet is disabled and no private keys were given, so fail here.
|
||||||
// Add previous txouts given in the RPC call:
|
throw JSONRPCError(RPC_INVALID_PARAMETER, "No private keys available.");
|
||||||
if (!request.params[1].isNull()) {
|
|
||||||
UniValue prevTxs = request.params[1].get_array();
|
|
||||||
for (unsigned int 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)},
|
|
||||||
});
|
|
||||||
|
|
||||||
uint256 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<unsigned char> pkData(ParseHexO(prevOut, "scriptPubKey"));
|
|
||||||
CScript scriptPubKey(pkData.begin(), pkData.end());
|
|
||||||
|
|
||||||
{
|
|
||||||
const Coin& coin = view.AccessCoin(out);
|
|
||||||
if (!coin.IsSpent() && coin.out.scriptPubKey != scriptPubKey) {
|
|
||||||
std::string err("Previous output scriptPubKey mismatch:\n");
|
|
||||||
err = err + ScriptToAsmStr(coin.out.scriptPubKey) + "\nvs:\n"+
|
|
||||||
ScriptToAsmStr(scriptPubKey);
|
|
||||||
throw JSONRPCError(RPC_DESERIALIZATION_ERROR, err);
|
|
||||||
}
|
|
||||||
Coin newcoin;
|
|
||||||
newcoin.out.scriptPubKey = scriptPubKey;
|
|
||||||
newcoin.out.nValue = 0;
|
|
||||||
if (prevOut.exists("amount")) {
|
|
||||||
newcoin.out.nValue = AmountFromValue(find_value(prevOut, "amount"));
|
|
||||||
}
|
|
||||||
newcoin.nHeight = 1;
|
|
||||||
view.AddCoin(out, std::move(newcoin), true);
|
|
||||||
}
|
|
||||||
|
|
||||||
// if redeemScript given and not using the local wallet (private keys
|
|
||||||
// given), add redeemScript to the tempKeystore so it can be signed:
|
|
||||||
if (fGivenKeys && (scriptPubKey.IsPayToScriptHash() || scriptPubKey.IsPayToWitnessScriptHash())) {
|
|
||||||
RPCTypeCheckObj(prevOut,
|
|
||||||
{
|
|
||||||
{"txid", UniValueType(UniValue::VSTR)},
|
|
||||||
{"vout", UniValueType(UniValue::VNUM)},
|
|
||||||
{"scriptPubKey", UniValueType(UniValue::VSTR)},
|
|
||||||
{"redeemScript", UniValueType(UniValue::VSTR)},
|
|
||||||
});
|
|
||||||
UniValue v = find_value(prevOut, "redeemScript");
|
|
||||||
if (!v.isNull()) {
|
|
||||||
std::vector<unsigned char> rsData(ParseHexV(v, "redeemScript"));
|
|
||||||
CScript redeemScript(rsData.begin(), rsData.end());
|
|
||||||
tempKeystore.AddCScript(redeemScript);
|
|
||||||
// Automatically also add the P2WSH wrapped version of the script (to deal with P2SH-P2WSH).
|
|
||||||
tempKeystore.AddCScript(GetScriptForWitness(redeemScript));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef ENABLE_WALLET
|
|
||||||
const CKeyStore& keystore = ((fGivenKeys || !pwallet) ? tempKeystore : *pwallet);
|
|
||||||
#else
|
|
||||||
const CKeyStore& keystore = tempKeystore;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int nHashType = SIGHASH_ALL;
|
|
||||||
if (!request.params[3].isNull()) {
|
|
||||||
static std::map<std::string, int> mapSigHashValues = {
|
|
||||||
{std::string("ALL"), int(SIGHASH_ALL)},
|
|
||||||
{std::string("ALL|ANYONECANPAY"), int(SIGHASH_ALL|SIGHASH_ANYONECANPAY)},
|
|
||||||
{std::string("NONE"), int(SIGHASH_NONE)},
|
|
||||||
{std::string("NONE|ANYONECANPAY"), int(SIGHASH_NONE|SIGHASH_ANYONECANPAY)},
|
|
||||||
{std::string("SINGLE"), int(SIGHASH_SINGLE)},
|
|
||||||
{std::string("SINGLE|ANYONECANPAY"), int(SIGHASH_SINGLE|SIGHASH_ANYONECANPAY)},
|
|
||||||
};
|
|
||||||
std::string strHashType = request.params[3].get_str();
|
|
||||||
if (mapSigHashValues.count(strHashType))
|
|
||||||
nHashType = mapSigHashValues[strHashType];
|
|
||||||
else
|
|
||||||
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid sighash param");
|
|
||||||
}
|
|
||||||
|
|
||||||
bool fHashSingle = ((nHashType & ~SIGHASH_ANYONECANPAY) == SIGHASH_SINGLE);
|
|
||||||
|
|
||||||
// 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 (unsigned int i = 0; i < mtx.vin.size(); i++) {
|
|
||||||
CTxIn& txin = mtx.vin[i];
|
|
||||||
const Coin& coin = view.AccessCoin(txin.prevout);
|
|
||||||
if (coin.IsSpent()) {
|
|
||||||
TxInErrorToJSON(txin, vErrors, "Input not found or already spent");
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
const CScript& prevPubKey = coin.out.scriptPubKey;
|
|
||||||
const CAmount& amount = coin.out.nValue;
|
|
||||||
|
|
||||||
SignatureData sigdata;
|
|
||||||
// Only sign SIGHASH_SINGLE if there's a corresponding output:
|
|
||||||
if (!fHashSingle || (i < mtx.vout.size()))
|
|
||||||
ProduceSignature(MutableTransactionSignatureCreator(&keystore, &mtx, i, amount, nHashType), prevPubKey, sigdata);
|
|
||||||
sigdata = CombineSignatures(prevPubKey, TransactionSignatureChecker(&txConst, i, amount), sigdata, DataFromTransaction(mtx, i));
|
|
||||||
|
|
||||||
UpdateTransaction(mtx, i, sigdata);
|
|
||||||
|
|
||||||
ScriptError serror = SCRIPT_ERR_OK;
|
|
||||||
if (!VerifyScript(txin.scriptSig, prevPubKey, &txin.scriptWitness, STANDARD_SCRIPT_VERIFY_FLAGS, TransactionSignatureChecker(&txConst, i, amount), &serror)) {
|
|
||||||
if (serror == SCRIPT_ERR_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(mtx));
|
|
||||||
result.pushKV("complete", fComplete);
|
|
||||||
if (!vErrors.empty()) {
|
|
||||||
result.pushKV("errors", vErrors);
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
UniValue sendrawtransaction(const JSONRPCRequest& request)
|
UniValue sendrawtransaction(const JSONRPCRequest& request)
|
||||||
|
@ -1034,6 +1116,7 @@ static const CRPCCommand commands[] =
|
||||||
{ "rawtransactions", "sendrawtransaction", &sendrawtransaction, {"hexstring","allowhighfees"} },
|
{ "rawtransactions", "sendrawtransaction", &sendrawtransaction, {"hexstring","allowhighfees"} },
|
||||||
{ "rawtransactions", "combinerawtransaction", &combinerawtransaction, {"txs"} },
|
{ "rawtransactions", "combinerawtransaction", &combinerawtransaction, {"txs"} },
|
||||||
{ "rawtransactions", "signrawtransaction", &signrawtransaction, {"hexstring","prevtxs","privkeys","sighashtype"} }, /* uses wallet if enabled */
|
{ "rawtransactions", "signrawtransaction", &signrawtransaction, {"hexstring","prevtxs","privkeys","sighashtype"} }, /* uses wallet if enabled */
|
||||||
|
{ "rawtransactions", "signrawtransactionwithkey", &signrawtransactionwithkey, {"hexstring","privkeys","prevtxs","sighashtype"} },
|
||||||
|
|
||||||
{ "blockchain", "gettxoutproof", &gettxoutproof, {"txids", "blockhash"} },
|
{ "blockchain", "gettxoutproof", &gettxoutproof, {"txids", "blockhash"} },
|
||||||
{ "blockchain", "verifytxoutproof", &verifytxoutproof, {"proof"} },
|
{ "blockchain", "verifytxoutproof", &verifytxoutproof, {"proof"} },
|
||||||
|
|
15
src/rpc/rawtransaction.h
Normal file
15
src/rpc/rawtransaction.h
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
// Copyright (c) 2017 The Bitcoin Core developers
|
||||||
|
// 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
|
||||||
|
|
||||||
|
class CBasicKeyStore;
|
||||||
|
class CMutableTransaction;
|
||||||
|
class UniValue;
|
||||||
|
|
||||||
|
/** Sign a transaction with the given keystore and previous transactions */
|
||||||
|
UniValue SignTransaction(CMutableTransaction& mtx, const UniValue& prevTxs, CBasicKeyStore *keystore, bool tempKeystore, const UniValue& hashType);
|
||||||
|
|
||||||
|
#endif // BITCOIN_RPC_RAWTRANSACTION_H
|
|
@ -69,14 +69,6 @@ BOOST_AUTO_TEST_CASE(rpc_rawparams)
|
||||||
BOOST_CHECK_NO_THROW(r = CallRPC(std::string("decoderawtransaction ")+rawtx+" false"));
|
BOOST_CHECK_NO_THROW(r = CallRPC(std::string("decoderawtransaction ")+rawtx+" false"));
|
||||||
BOOST_CHECK_THROW(r = CallRPC(std::string("decoderawtransaction ")+rawtx+" false extra"), std::runtime_error);
|
BOOST_CHECK_THROW(r = CallRPC(std::string("decoderawtransaction ")+rawtx+" false extra"), std::runtime_error);
|
||||||
|
|
||||||
BOOST_CHECK_THROW(CallRPC("signrawtransaction"), std::runtime_error);
|
|
||||||
BOOST_CHECK_THROW(CallRPC("signrawtransaction null"), std::runtime_error);
|
|
||||||
BOOST_CHECK_THROW(CallRPC("signrawtransaction ff00"), std::runtime_error);
|
|
||||||
BOOST_CHECK_NO_THROW(CallRPC(std::string("signrawtransaction ")+rawtx));
|
|
||||||
BOOST_CHECK_NO_THROW(CallRPC(std::string("signrawtransaction ")+rawtx+" null null NONE|ANYONECANPAY"));
|
|
||||||
BOOST_CHECK_NO_THROW(CallRPC(std::string("signrawtransaction ")+rawtx+" [] [] NONE|ANYONECANPAY"));
|
|
||||||
BOOST_CHECK_THROW(CallRPC(std::string("signrawtransaction ")+rawtx+" null null badenum"), std::runtime_error);
|
|
||||||
|
|
||||||
// Only check failure cases for sendrawtransaction, there's no network to send to...
|
// Only check failure cases for sendrawtransaction, there's no network to send to...
|
||||||
BOOST_CHECK_THROW(CallRPC("sendrawtransaction"), std::runtime_error);
|
BOOST_CHECK_THROW(CallRPC("sendrawtransaction"), std::runtime_error);
|
||||||
BOOST_CHECK_THROW(CallRPC("sendrawtransaction null"), std::runtime_error);
|
BOOST_CHECK_THROW(CallRPC("sendrawtransaction null"), std::runtime_error);
|
||||||
|
@ -119,9 +111,9 @@ BOOST_AUTO_TEST_CASE(rpc_rawsign)
|
||||||
std::string notsigned = r.get_str();
|
std::string notsigned = r.get_str();
|
||||||
std::string privkey1 = "\"KzsXybp9jX64P5ekX1KUxRQ79Jht9uzW7LorgwE65i5rWACL6LQe\"";
|
std::string privkey1 = "\"KzsXybp9jX64P5ekX1KUxRQ79Jht9uzW7LorgwE65i5rWACL6LQe\"";
|
||||||
std::string privkey2 = "\"Kyhdf5LuKTRx4ge69ybABsiUAWjVRK4XGxAKk2FQLp2HjGMy87Z4\"";
|
std::string privkey2 = "\"Kyhdf5LuKTRx4ge69ybABsiUAWjVRK4XGxAKk2FQLp2HjGMy87Z4\"";
|
||||||
r = CallRPC(std::string("signrawtransaction ")+notsigned+" "+prevout+" "+"[]");
|
r = CallRPC(std::string("signrawtransactionwithkey ")+notsigned+" [] "+prevout);
|
||||||
BOOST_CHECK(find_value(r.get_obj(), "complete").get_bool() == false);
|
BOOST_CHECK(find_value(r.get_obj(), "complete").get_bool() == false);
|
||||||
r = CallRPC(std::string("signrawtransaction ")+notsigned+" "+prevout+" "+"["+privkey1+","+privkey2+"]");
|
r = CallRPC(std::string("signrawtransactionwithkey ")+notsigned+" ["+privkey1+","+privkey2+"] "+prevout);
|
||||||
BOOST_CHECK(find_value(r.get_obj(), "complete").get_bool() == true);
|
BOOST_CHECK(find_value(r.get_obj(), "complete").get_bool() == true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
#include <policy/policy.h>
|
#include <policy/policy.h>
|
||||||
#include <policy/rbf.h>
|
#include <policy/rbf.h>
|
||||||
#include <rpc/mining.h>
|
#include <rpc/mining.h>
|
||||||
|
#include <rpc/rawtransaction.h>
|
||||||
#include <rpc/safemode.h>
|
#include <rpc/safemode.h>
|
||||||
#include <rpc/server.h>
|
#include <rpc/server.h>
|
||||||
#include <rpc/util.h>
|
#include <rpc/util.h>
|
||||||
|
@ -3236,6 +3237,75 @@ UniValue fundrawtransaction(const JSONRPCRequest& request)
|
||||||
return result;
|
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\"")
|
||||||
|
);
|
||||||
|
|
||||||
|
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
|
||||||
|
LOCK2(cs_main, pwallet->cs_wallet);
|
||||||
|
return SignTransaction(mtx, request.params[1], pwallet, false, request.params[2]);
|
||||||
|
}
|
||||||
|
|
||||||
UniValue bumpfee(const JSONRPCRequest& request)
|
UniValue bumpfee(const JSONRPCRequest& request)
|
||||||
{
|
{
|
||||||
CWallet * const pwallet = GetWalletForJSONRPCRequest(request);
|
CWallet * const pwallet = GetWalletForJSONRPCRequest(request);
|
||||||
|
@ -3780,6 +3850,7 @@ static const CRPCCommand commands[] =
|
||||||
{ "wallet", "setaccount", &setaccount, {"address","account"} },
|
{ "wallet", "setaccount", &setaccount, {"address","account"} },
|
||||||
{ "wallet", "settxfee", &settxfee, {"amount"} },
|
{ "wallet", "settxfee", &settxfee, {"amount"} },
|
||||||
{ "wallet", "signmessage", &signmessage, {"address","message"} },
|
{ "wallet", "signmessage", &signmessage, {"address","message"} },
|
||||||
|
{ "wallet", "signrawtransactionwithwallet", &signrawtransactionwithwallet, {"hexstring","prevtxs","sighashtype"} },
|
||||||
{ "wallet", "walletlock", &walletlock, {} },
|
{ "wallet", "walletlock", &walletlock, {} },
|
||||||
{ "wallet", "walletpassphrasechange", &walletpassphrasechange, {"oldpassphrase","newpassphrase"} },
|
{ "wallet", "walletpassphrasechange", &walletpassphrasechange, {"oldpassphrase","newpassphrase"} },
|
||||||
{ "wallet", "walletpassphrase", &walletpassphrase, {"passphrase","timeout"} },
|
{ "wallet", "walletpassphrase", &walletpassphrase, {"passphrase","timeout"} },
|
||||||
|
|
|
@ -27,5 +27,5 @@ void EnsureWalletIsUnlocked(CWallet *);
|
||||||
bool EnsureWalletIsAvailable(CWallet *, bool avoidException);
|
bool EnsureWalletIsAvailable(CWallet *, bool avoidException);
|
||||||
|
|
||||||
UniValue getaddressinfo(const JSONRPCRequest& request);
|
UniValue getaddressinfo(const JSONRPCRequest& request);
|
||||||
|
UniValue signrawtransactionwithwallet(const JSONRPCRequest& request);
|
||||||
#endif //BITCOIN_WALLET_RPCWALLET_H
|
#endif //BITCOIN_WALLET_RPCWALLET_H
|
||||||
|
|
|
@ -70,7 +70,7 @@ class BIP68Test(BitcoinTestFramework):
|
||||||
tx1.vin = [CTxIn(COutPoint(int(utxo["txid"], 16), utxo["vout"]), nSequence=sequence_value)]
|
tx1.vin = [CTxIn(COutPoint(int(utxo["txid"], 16), utxo["vout"]), nSequence=sequence_value)]
|
||||||
tx1.vout = [CTxOut(value, CScript([b'a']))]
|
tx1.vout = [CTxOut(value, CScript([b'a']))]
|
||||||
|
|
||||||
tx1_signed = self.nodes[0].signrawtransaction(ToHex(tx1))["hex"]
|
tx1_signed = self.nodes[0].signrawtransactionwithwallet(ToHex(tx1))["hex"]
|
||||||
tx1_id = self.nodes[0].sendrawtransaction(tx1_signed)
|
tx1_id = self.nodes[0].sendrawtransaction(tx1_signed)
|
||||||
tx1_id = int(tx1_id, 16)
|
tx1_id = int(tx1_id, 16)
|
||||||
|
|
||||||
|
@ -176,7 +176,7 @@ class BIP68Test(BitcoinTestFramework):
|
||||||
# Overestimate the size of the tx - signatures should be less than 120 bytes, and leave 50 for the output
|
# Overestimate the size of the tx - signatures should be less than 120 bytes, and leave 50 for the output
|
||||||
tx_size = len(ToHex(tx))//2 + 120*num_inputs + 50
|
tx_size = len(ToHex(tx))//2 + 120*num_inputs + 50
|
||||||
tx.vout.append(CTxOut(int(value-self.relayfee*tx_size*COIN/1000), CScript([b'a'])))
|
tx.vout.append(CTxOut(int(value-self.relayfee*tx_size*COIN/1000), CScript([b'a'])))
|
||||||
rawtx = self.nodes[0].signrawtransaction(ToHex(tx))["hex"]
|
rawtx = self.nodes[0].signrawtransactionwithwallet(ToHex(tx))["hex"]
|
||||||
|
|
||||||
if (using_sequence_locks and not should_pass):
|
if (using_sequence_locks and not should_pass):
|
||||||
# This transaction should be rejected
|
# This transaction should be rejected
|
||||||
|
@ -205,7 +205,7 @@ class BIP68Test(BitcoinTestFramework):
|
||||||
tx2.nVersion = 2
|
tx2.nVersion = 2
|
||||||
tx2.vin = [CTxIn(COutPoint(tx1.sha256, 0), nSequence=0)]
|
tx2.vin = [CTxIn(COutPoint(tx1.sha256, 0), nSequence=0)]
|
||||||
tx2.vout = [CTxOut(int(tx1.vout[0].nValue - self.relayfee*COIN), CScript([b'a']))]
|
tx2.vout = [CTxOut(int(tx1.vout[0].nValue - self.relayfee*COIN), CScript([b'a']))]
|
||||||
tx2_raw = self.nodes[0].signrawtransaction(ToHex(tx2))["hex"]
|
tx2_raw = self.nodes[0].signrawtransactionwithwallet(ToHex(tx2))["hex"]
|
||||||
tx2 = FromHex(tx2, tx2_raw)
|
tx2 = FromHex(tx2, tx2_raw)
|
||||||
tx2.rehash()
|
tx2.rehash()
|
||||||
|
|
||||||
|
@ -278,7 +278,7 @@ class BIP68Test(BitcoinTestFramework):
|
||||||
utxos = self.nodes[0].listunspent()
|
utxos = self.nodes[0].listunspent()
|
||||||
tx5.vin.append(CTxIn(COutPoint(int(utxos[0]["txid"], 16), utxos[0]["vout"]), nSequence=1))
|
tx5.vin.append(CTxIn(COutPoint(int(utxos[0]["txid"], 16), utxos[0]["vout"]), nSequence=1))
|
||||||
tx5.vout[0].nValue += int(utxos[0]["amount"]*COIN)
|
tx5.vout[0].nValue += int(utxos[0]["amount"]*COIN)
|
||||||
raw_tx5 = self.nodes[0].signrawtransaction(ToHex(tx5))["hex"]
|
raw_tx5 = self.nodes[0].signrawtransactionwithwallet(ToHex(tx5))["hex"]
|
||||||
|
|
||||||
assert_raises_rpc_error(-26, NOT_FINAL_ERROR, self.nodes[0].sendrawtransaction, raw_tx5)
|
assert_raises_rpc_error(-26, NOT_FINAL_ERROR, self.nodes[0].sendrawtransaction, raw_tx5)
|
||||||
|
|
||||||
|
@ -338,7 +338,7 @@ class BIP68Test(BitcoinTestFramework):
|
||||||
tx2.vout = [CTxOut(int(tx1.vout[0].nValue - self.relayfee*COIN), CScript([b'a']))]
|
tx2.vout = [CTxOut(int(tx1.vout[0].nValue - self.relayfee*COIN), CScript([b'a']))]
|
||||||
|
|
||||||
# sign tx2
|
# sign tx2
|
||||||
tx2_raw = self.nodes[0].signrawtransaction(ToHex(tx2))["hex"]
|
tx2_raw = self.nodes[0].signrawtransactionwithwallet(ToHex(tx2))["hex"]
|
||||||
tx2 = FromHex(tx2, tx2_raw)
|
tx2 = FromHex(tx2, tx2_raw)
|
||||||
tx2.rehash()
|
tx2.rehash()
|
||||||
|
|
||||||
|
@ -388,7 +388,7 @@ class BIP68Test(BitcoinTestFramework):
|
||||||
rawtxfund = self.nodes[1].fundrawtransaction(rawtx)['hex']
|
rawtxfund = self.nodes[1].fundrawtransaction(rawtx)['hex']
|
||||||
tx = FromHex(CTransaction(), rawtxfund)
|
tx = FromHex(CTransaction(), rawtxfund)
|
||||||
tx.nVersion = 2
|
tx.nVersion = 2
|
||||||
tx_signed = self.nodes[1].signrawtransaction(ToHex(tx))["hex"]
|
tx_signed = self.nodes[1].signrawtransactionwithwallet(ToHex(tx))["hex"]
|
||||||
self.nodes[1].sendrawtransaction(tx_signed)
|
self.nodes[1].sendrawtransaction(tx_signed)
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
|
@ -51,7 +51,7 @@ class BIP9SoftForksTest(ComparisonTestFramework):
|
||||||
return tx
|
return tx
|
||||||
|
|
||||||
def sign_transaction(self, node, tx):
|
def sign_transaction(self, node, tx):
|
||||||
signresult = node.signrawtransaction(bytes_to_hex_str(tx.serialize()))
|
signresult = node.signrawtransactionwithwallet(bytes_to_hex_str(tx.serialize()))
|
||||||
tx = CTransaction()
|
tx = CTransaction()
|
||||||
f = BytesIO(hex_str_to_bytes(signresult['hex']))
|
f = BytesIO(hex_str_to_bytes(signresult['hex']))
|
||||||
tx.deserialize(f)
|
tx.deserialize(f)
|
||||||
|
|
|
@ -41,7 +41,7 @@ def cltv_validate(node, tx, height):
|
||||||
tx.nLockTime = height
|
tx.nLockTime = height
|
||||||
|
|
||||||
# Need to re-sign, since nSequence and nLockTime changed
|
# Need to re-sign, since nSequence and nLockTime changed
|
||||||
signed_result = node.signrawtransaction(ToHex(tx))
|
signed_result = node.signrawtransactionwithwallet(ToHex(tx))
|
||||||
new_tx = CTransaction()
|
new_tx = CTransaction()
|
||||||
new_tx.deserialize(BytesIO(hex_str_to_bytes(signed_result['hex'])))
|
new_tx.deserialize(BytesIO(hex_str_to_bytes(signed_result['hex'])))
|
||||||
|
|
||||||
|
@ -54,7 +54,7 @@ def create_transaction(node, coinbase, to_address, amount):
|
||||||
inputs = [{ "txid" : from_txid, "vout" : 0}]
|
inputs = [{ "txid" : from_txid, "vout" : 0}]
|
||||||
outputs = { to_address : amount }
|
outputs = { to_address : amount }
|
||||||
rawtx = node.createrawtransaction(inputs, outputs)
|
rawtx = node.createrawtransaction(inputs, outputs)
|
||||||
signresult = node.signrawtransaction(rawtx)
|
signresult = node.signrawtransactionwithwallet(rawtx)
|
||||||
tx = CTransaction()
|
tx = CTransaction()
|
||||||
tx.deserialize(BytesIO(hex_str_to_bytes(signresult['hex'])))
|
tx.deserialize(BytesIO(hex_str_to_bytes(signresult['hex'])))
|
||||||
return tx
|
return tx
|
||||||
|
|
|
@ -118,7 +118,7 @@ class BIP68_112_113Test(ComparisonTestFramework):
|
||||||
|
|
||||||
def sign_transaction(self, node, unsignedtx):
|
def sign_transaction(self, node, unsignedtx):
|
||||||
rawtx = ToHex(unsignedtx)
|
rawtx = ToHex(unsignedtx)
|
||||||
signresult = node.signrawtransaction(rawtx)
|
signresult = node.signrawtransactionwithwallet(rawtx)
|
||||||
tx = CTransaction()
|
tx = CTransaction()
|
||||||
f = BytesIO(hex_str_to_bytes(signresult['hex']))
|
f = BytesIO(hex_str_to_bytes(signresult['hex']))
|
||||||
tx.deserialize(f)
|
tx.deserialize(f)
|
||||||
|
|
|
@ -206,7 +206,7 @@ class ChainstateWriteCrashTest(BitcoinTestFramework):
|
||||||
tx.vout.append(CTxOut(output_amount, hex_str_to_bytes(utxo['scriptPubKey'])))
|
tx.vout.append(CTxOut(output_amount, hex_str_to_bytes(utxo['scriptPubKey'])))
|
||||||
|
|
||||||
# Sign and send the transaction to get into the mempool
|
# Sign and send the transaction to get into the mempool
|
||||||
tx_signed_hex = node.signrawtransaction(ToHex(tx))['hex']
|
tx_signed_hex = node.signrawtransactionwithwallet(ToHex(tx))['hex']
|
||||||
node.sendrawtransaction(tx_signed_hex)
|
node.sendrawtransaction(tx_signed_hex)
|
||||||
num_transactions += 1
|
num_transactions += 1
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@ def create_transaction(node, coinbase, to_address, amount):
|
||||||
inputs = [{ "txid" : from_txid, "vout" : 0}]
|
inputs = [{ "txid" : from_txid, "vout" : 0}]
|
||||||
outputs = { to_address : amount }
|
outputs = { to_address : amount }
|
||||||
rawtx = node.createrawtransaction(inputs, outputs)
|
rawtx = node.createrawtransaction(inputs, outputs)
|
||||||
signresult = node.signrawtransaction(rawtx)
|
signresult = node.signrawtransactionwithwallet(rawtx)
|
||||||
tx = CTransaction()
|
tx = CTransaction()
|
||||||
tx.deserialize(BytesIO(hex_str_to_bytes(signresult['hex'])))
|
tx.deserialize(BytesIO(hex_str_to_bytes(signresult['hex'])))
|
||||||
return tx
|
return tx
|
||||||
|
|
|
@ -91,7 +91,7 @@ def split_inputs(from_node, txins, txouts, initial_split=False):
|
||||||
# If this is the initial split we actually need to sign the transaction
|
# If this is the initial split we actually need to sign the transaction
|
||||||
# Otherwise we just need to insert the proper ScriptSig
|
# Otherwise we just need to insert the proper ScriptSig
|
||||||
if (initial_split):
|
if (initial_split):
|
||||||
completetx = from_node.signrawtransaction(ToHex(tx))["hex"]
|
completetx = from_node.signrawtransactionwithwallet(ToHex(tx))["hex"]
|
||||||
else:
|
else:
|
||||||
tx.vin[0].scriptSig = SCRIPT_SIG[prevtxout["vout"]]
|
tx.vin[0].scriptSig = SCRIPT_SIG[prevtxout["vout"]]
|
||||||
completetx = ToHex(tx)
|
completetx = ToHex(tx)
|
||||||
|
|
|
@ -102,7 +102,7 @@ class NULLDUMMYTest(BitcoinTestFramework):
|
||||||
inputs = [{ "txid" : txid, "vout" : 0}]
|
inputs = [{ "txid" : txid, "vout" : 0}]
|
||||||
outputs = { to_address : amount }
|
outputs = { to_address : amount }
|
||||||
rawtx = node.createrawtransaction(inputs, outputs)
|
rawtx = node.createrawtransaction(inputs, outputs)
|
||||||
signresult = node.signrawtransaction(rawtx)
|
signresult = node.signrawtransactionwithwallet(rawtx)
|
||||||
tx = CTransaction()
|
tx = CTransaction()
|
||||||
f = BytesIO(hex_str_to_bytes(signresult['hex']))
|
f = BytesIO(hex_str_to_bytes(signresult['hex']))
|
||||||
tx.deserialize(f)
|
tx.deserialize(f)
|
||||||
|
|
|
@ -42,7 +42,7 @@ def make_utxo(node, amount, confirmed=True, scriptPubKey=CScript([1])):
|
||||||
tx2.vout = [CTxOut(amount, scriptPubKey)]
|
tx2.vout = [CTxOut(amount, scriptPubKey)]
|
||||||
tx2.rehash()
|
tx2.rehash()
|
||||||
|
|
||||||
signed_tx = node.signrawtransaction(txToHex(tx2))
|
signed_tx = node.signrawtransactionwithwallet(txToHex(tx2))
|
||||||
|
|
||||||
txid = node.sendrawtransaction(signed_tx['hex'], True)
|
txid = node.sendrawtransaction(signed_tx['hex'], True)
|
||||||
|
|
||||||
|
|
|
@ -221,7 +221,7 @@ class SegWitTest(BitcoinTestFramework):
|
||||||
tx = CTransaction()
|
tx = CTransaction()
|
||||||
tx.vin.append(CTxIn(COutPoint(int(txid1, 16), 0), b''))
|
tx.vin.append(CTxIn(COutPoint(int(txid1, 16), 0), b''))
|
||||||
tx.vout.append(CTxOut(int(49.99*COIN), CScript([OP_TRUE])))
|
tx.vout.append(CTxOut(int(49.99*COIN), CScript([OP_TRUE])))
|
||||||
tx2_hex = self.nodes[0].signrawtransaction(ToHex(tx))['hex']
|
tx2_hex = self.nodes[0].signrawtransactionwithwallet(ToHex(tx))['hex']
|
||||||
txid2 = self.nodes[0].sendrawtransaction(tx2_hex)
|
txid2 = self.nodes[0].sendrawtransaction(tx2_hex)
|
||||||
tx = FromHex(CTransaction(), tx2_hex)
|
tx = FromHex(CTransaction(), tx2_hex)
|
||||||
assert(not tx.wit.is_null())
|
assert(not tx.wit.is_null())
|
||||||
|
@ -559,7 +559,7 @@ class SegWitTest(BitcoinTestFramework):
|
||||||
|
|
||||||
self.nodes[1].importaddress(scriptPubKey, "", False)
|
self.nodes[1].importaddress(scriptPubKey, "", False)
|
||||||
rawtxfund = self.nodes[1].fundrawtransaction(transaction)['hex']
|
rawtxfund = self.nodes[1].fundrawtransaction(transaction)['hex']
|
||||||
rawtxfund = self.nodes[1].signrawtransaction(rawtxfund)["hex"]
|
rawtxfund = self.nodes[1].signrawtransactionwithwallet(rawtxfund)["hex"]
|
||||||
txid = self.nodes[1].sendrawtransaction(rawtxfund)
|
txid = self.nodes[1].sendrawtransaction(rawtxfund)
|
||||||
|
|
||||||
assert_equal(self.nodes[1].gettransaction(txid, True)["txid"], txid)
|
assert_equal(self.nodes[1].gettransaction(txid, True)["txid"], txid)
|
||||||
|
@ -578,7 +578,7 @@ class SegWitTest(BitcoinTestFramework):
|
||||||
for i in script_list:
|
for i in script_list:
|
||||||
tx.vout.append(CTxOut(10000000, i))
|
tx.vout.append(CTxOut(10000000, i))
|
||||||
tx.rehash()
|
tx.rehash()
|
||||||
signresults = self.nodes[0].signrawtransaction(bytes_to_hex_str(tx.serialize_without_witness()))['hex']
|
signresults = self.nodes[0].signrawtransactionwithwallet(bytes_to_hex_str(tx.serialize_without_witness()))['hex']
|
||||||
txid = self.nodes[0].sendrawtransaction(signresults, True)
|
txid = self.nodes[0].sendrawtransaction(signresults, True)
|
||||||
self.nodes[0].generate(1)
|
self.nodes[0].generate(1)
|
||||||
sync_blocks(self.nodes)
|
sync_blocks(self.nodes)
|
||||||
|
@ -630,7 +630,7 @@ class SegWitTest(BitcoinTestFramework):
|
||||||
tx.vin.append(CTxIn(COutPoint(int('0x'+i,0), j)))
|
tx.vin.append(CTxIn(COutPoint(int('0x'+i,0), j)))
|
||||||
tx.vout.append(CTxOut(0, CScript()))
|
tx.vout.append(CTxOut(0, CScript()))
|
||||||
tx.rehash()
|
tx.rehash()
|
||||||
signresults = self.nodes[0].signrawtransaction(bytes_to_hex_str(tx.serialize_without_witness()))['hex']
|
signresults = self.nodes[0].signrawtransactionwithwallet(bytes_to_hex_str(tx.serialize_without_witness()))['hex']
|
||||||
self.nodes[0].sendrawtransaction(signresults, True)
|
self.nodes[0].sendrawtransaction(signresults, True)
|
||||||
self.nodes[0].generate(1)
|
self.nodes[0].generate(1)
|
||||||
sync_blocks(self.nodes)
|
sync_blocks(self.nodes)
|
||||||
|
|
|
@ -32,7 +32,7 @@ class MempoolLimitTest(BitcoinTestFramework):
|
||||||
self.nodes[0].settxfee(relayfee) # specifically fund this tx with low fee
|
self.nodes[0].settxfee(relayfee) # specifically fund this tx with low fee
|
||||||
txF = self.nodes[0].fundrawtransaction(tx)
|
txF = self.nodes[0].fundrawtransaction(tx)
|
||||||
self.nodes[0].settxfee(0) # return to automatic fee selection
|
self.nodes[0].settxfee(0) # return to automatic fee selection
|
||||||
txFS = self.nodes[0].signrawtransaction(txF['hex'])
|
txFS = self.nodes[0].signrawtransactionwithwallet(txF['hex'])
|
||||||
txid = self.nodes[0].sendrawtransaction(txFS['hex'])
|
txid = self.nodes[0].sendrawtransaction(txFS['hex'])
|
||||||
|
|
||||||
relayfee = self.nodes[0].getnetworkinfo()['relayfee']
|
relayfee = self.nodes[0].getnetworkinfo()['relayfee']
|
||||||
|
@ -57,7 +57,7 @@ class MempoolLimitTest(BitcoinTestFramework):
|
||||||
tx = self.nodes[0].createrawtransaction(inputs, outputs)
|
tx = self.nodes[0].createrawtransaction(inputs, outputs)
|
||||||
# specifically fund this tx with a fee < mempoolminfee, >= than minrelaytxfee
|
# specifically fund this tx with a fee < mempoolminfee, >= than minrelaytxfee
|
||||||
txF = self.nodes[0].fundrawtransaction(tx, {'feeRate': relayfee})
|
txF = self.nodes[0].fundrawtransaction(tx, {'feeRate': relayfee})
|
||||||
txFS = self.nodes[0].signrawtransaction(txF['hex'])
|
txFS = self.nodes[0].signrawtransactionwithwallet(txF['hex'])
|
||||||
assert_raises_rpc_error(-26, "mempool min fee not met, 166 < 411 (code 66)", self.nodes[0].sendrawtransaction, txFS['hex'])
|
assert_raises_rpc_error(-26, "mempool min fee not met, 166 < 411 (code 66)", self.nodes[0].sendrawtransaction, txFS['hex'])
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
|
@ -25,7 +25,7 @@ class MempoolPackagesTest(BitcoinTestFramework):
|
||||||
for i in range(num_outputs):
|
for i in range(num_outputs):
|
||||||
outputs[node.getnewaddress()] = send_value
|
outputs[node.getnewaddress()] = send_value
|
||||||
rawtx = node.createrawtransaction(inputs, outputs)
|
rawtx = node.createrawtransaction(inputs, outputs)
|
||||||
signedtx = node.signrawtransaction(rawtx)
|
signedtx = node.signrawtransactionwithwallet(rawtx)
|
||||||
txid = node.sendrawtransaction(signedtx['hex'])
|
txid = node.sendrawtransaction(signedtx['hex'])
|
||||||
fulltx = node.getrawtransaction(txid, 1)
|
fulltx = node.getrawtransaction(txid, 1)
|
||||||
assert(len(fulltx['vout']) == num_outputs) # make sure we didn't generate a change output
|
assert(len(fulltx['vout']) == num_outputs) # make sure we didn't generate a change output
|
||||||
|
@ -205,7 +205,7 @@ class MempoolPackagesTest(BitcoinTestFramework):
|
||||||
for i in range(2):
|
for i in range(2):
|
||||||
outputs[self.nodes[0].getnewaddress()] = send_value
|
outputs[self.nodes[0].getnewaddress()] = send_value
|
||||||
rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
|
rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
|
||||||
signedtx = self.nodes[0].signrawtransaction(rawtx)
|
signedtx = self.nodes[0].signrawtransactionwithwallet(rawtx)
|
||||||
txid = self.nodes[0].sendrawtransaction(signedtx['hex'])
|
txid = self.nodes[0].sendrawtransaction(signedtx['hex'])
|
||||||
tx0_id = txid
|
tx0_id = txid
|
||||||
value = send_value
|
value = send_value
|
||||||
|
@ -229,7 +229,7 @@ class MempoolPackagesTest(BitcoinTestFramework):
|
||||||
inputs = [ {'txid' : tx1_id, 'vout': 0}, {'txid' : txid, 'vout': 0} ]
|
inputs = [ {'txid' : tx1_id, 'vout': 0}, {'txid' : txid, 'vout': 0} ]
|
||||||
outputs = { self.nodes[0].getnewaddress() : send_value + value - 4*fee }
|
outputs = { self.nodes[0].getnewaddress() : send_value + value - 4*fee }
|
||||||
rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
|
rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
|
||||||
signedtx = self.nodes[0].signrawtransaction(rawtx)
|
signedtx = self.nodes[0].signrawtransactionwithwallet(rawtx)
|
||||||
txid = self.nodes[0].sendrawtransaction(signedtx['hex'])
|
txid = self.nodes[0].sendrawtransaction(signedtx['hex'])
|
||||||
sync_mempools(self.nodes)
|
sync_mempools(self.nodes)
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@ class MempoolCoinbaseTest(BitcoinTestFramework):
|
||||||
# Set the time lock
|
# Set the time lock
|
||||||
timelock_tx = timelock_tx.replace("ffffffff", "11111191", 1)
|
timelock_tx = timelock_tx.replace("ffffffff", "11111191", 1)
|
||||||
timelock_tx = timelock_tx[:-8] + hex(self.nodes[0].getblockcount() + 2)[2:] + "000000"
|
timelock_tx = timelock_tx[:-8] + hex(self.nodes[0].getblockcount() + 2)[2:] + "000000"
|
||||||
timelock_tx = self.nodes[0].signrawtransaction(timelock_tx)["hex"]
|
timelock_tx = self.nodes[0].signrawtransactionwithwallet(timelock_tx)["hex"]
|
||||||
# This will raise an exception because the timelock transaction is too immature to spend
|
# This will raise an exception because the timelock transaction is too immature to spend
|
||||||
assert_raises_rpc_error(-26, "non-final", self.nodes[0].sendrawtransaction, timelock_tx)
|
assert_raises_rpc_error(-26, "non-final", self.nodes[0].sendrawtransaction, timelock_tx)
|
||||||
|
|
||||||
|
|
|
@ -116,7 +116,7 @@ class PrioritiseTransactionTest(BitcoinTestFramework):
|
||||||
inputs.append({"txid" : utxo["txid"], "vout" : utxo["vout"]})
|
inputs.append({"txid" : utxo["txid"], "vout" : utxo["vout"]})
|
||||||
outputs[self.nodes[0].getnewaddress()] = utxo["amount"]
|
outputs[self.nodes[0].getnewaddress()] = utxo["amount"]
|
||||||
raw_tx = self.nodes[0].createrawtransaction(inputs, outputs)
|
raw_tx = self.nodes[0].createrawtransaction(inputs, outputs)
|
||||||
tx_hex = self.nodes[0].signrawtransaction(raw_tx)["hex"]
|
tx_hex = self.nodes[0].signrawtransactionwithwallet(raw_tx)["hex"]
|
||||||
tx_id = self.nodes[0].decoderawtransaction(tx_hex)["txid"]
|
tx_id = self.nodes[0].decoderawtransaction(tx_hex)["txid"]
|
||||||
|
|
||||||
# This will raise an exception due to min relay fee not being met
|
# This will raise an exception due to min relay fee not being met
|
||||||
|
|
|
@ -449,7 +449,7 @@ class RawTransactionsTest(BitcoinTestFramework):
|
||||||
rawtx = self.nodes[2].createrawtransaction(inputs, outputs)
|
rawtx = self.nodes[2].createrawtransaction(inputs, outputs)
|
||||||
fundedTx = self.nodes[2].fundrawtransaction(rawtx)
|
fundedTx = self.nodes[2].fundrawtransaction(rawtx)
|
||||||
|
|
||||||
signedTx = self.nodes[2].signrawtransaction(fundedTx['hex'])
|
signedTx = self.nodes[2].signrawtransactionwithwallet(fundedTx['hex'])
|
||||||
txId = self.nodes[2].sendrawtransaction(signedTx['hex'])
|
txId = self.nodes[2].sendrawtransaction(signedTx['hex'])
|
||||||
self.sync_all()
|
self.sync_all()
|
||||||
self.nodes[1].generate(1)
|
self.nodes[1].generate(1)
|
||||||
|
@ -503,7 +503,7 @@ class RawTransactionsTest(BitcoinTestFramework):
|
||||||
|
|
||||||
#now we need to unlock
|
#now we need to unlock
|
||||||
self.nodes[1].walletpassphrase("test", 600)
|
self.nodes[1].walletpassphrase("test", 600)
|
||||||
signedTx = self.nodes[1].signrawtransaction(fundedTx['hex'])
|
signedTx = self.nodes[1].signrawtransactionwithwallet(fundedTx['hex'])
|
||||||
txId = self.nodes[1].sendrawtransaction(signedTx['hex'])
|
txId = self.nodes[1].sendrawtransaction(signedTx['hex'])
|
||||||
self.nodes[1].generate(1)
|
self.nodes[1].generate(1)
|
||||||
self.sync_all()
|
self.sync_all()
|
||||||
|
@ -564,7 +564,7 @@ class RawTransactionsTest(BitcoinTestFramework):
|
||||||
outputs = {self.nodes[0].getnewaddress():0.15,self.nodes[0].getnewaddress():0.04}
|
outputs = {self.nodes[0].getnewaddress():0.15,self.nodes[0].getnewaddress():0.04}
|
||||||
rawtx = self.nodes[1].createrawtransaction(inputs, outputs)
|
rawtx = self.nodes[1].createrawtransaction(inputs, outputs)
|
||||||
fundedTx = self.nodes[1].fundrawtransaction(rawtx)
|
fundedTx = self.nodes[1].fundrawtransaction(rawtx)
|
||||||
fundedAndSignedTx = self.nodes[1].signrawtransaction(fundedTx['hex'])
|
fundedAndSignedTx = self.nodes[1].signrawtransactionwithwallet(fundedTx['hex'])
|
||||||
txId = self.nodes[1].sendrawtransaction(fundedAndSignedTx['hex'])
|
txId = self.nodes[1].sendrawtransaction(fundedAndSignedTx['hex'])
|
||||||
self.sync_all()
|
self.sync_all()
|
||||||
self.nodes[0].generate(1)
|
self.nodes[0].generate(1)
|
||||||
|
@ -622,9 +622,9 @@ class RawTransactionsTest(BitcoinTestFramework):
|
||||||
assert_greater_than(result["changepos"], -1)
|
assert_greater_than(result["changepos"], -1)
|
||||||
assert_equal(result["fee"] + res_dec["vout"][result["changepos"]]["value"], watchonly_amount / 10)
|
assert_equal(result["fee"] + res_dec["vout"][result["changepos"]]["value"], watchonly_amount / 10)
|
||||||
|
|
||||||
signedtx = self.nodes[3].signrawtransaction(result["hex"])
|
signedtx = self.nodes[3].signrawtransactionwithwallet(result["hex"])
|
||||||
assert(not signedtx["complete"])
|
assert(not signedtx["complete"])
|
||||||
signedtx = self.nodes[0].signrawtransaction(signedtx["hex"])
|
signedtx = self.nodes[0].signrawtransactionwithwallet(signedtx["hex"])
|
||||||
assert(signedtx["complete"])
|
assert(signedtx["complete"])
|
||||||
self.nodes[0].sendrawtransaction(signedtx["hex"])
|
self.nodes[0].sendrawtransaction(signedtx["hex"])
|
||||||
self.nodes[0].generate(1)
|
self.nodes[0].generate(1)
|
||||||
|
|
|
@ -131,7 +131,7 @@ class ListTransactionsTest(BitcoinTestFramework):
|
||||||
inputs = [{"txid":utxo_to_use["txid"], "vout":utxo_to_use["vout"]}]
|
inputs = [{"txid":utxo_to_use["txid"], "vout":utxo_to_use["vout"]}]
|
||||||
outputs = {self.nodes[0].getnewaddress(): 0.999}
|
outputs = {self.nodes[0].getnewaddress(): 0.999}
|
||||||
tx2 = self.nodes[1].createrawtransaction(inputs, outputs)
|
tx2 = self.nodes[1].createrawtransaction(inputs, outputs)
|
||||||
tx2_signed = self.nodes[1].signrawtransaction(tx2)["hex"]
|
tx2_signed = self.nodes[1].signrawtransactionwithwallet(tx2)["hex"]
|
||||||
txid_2 = self.nodes[1].sendrawtransaction(tx2_signed)
|
txid_2 = self.nodes[1].sendrawtransaction(tx2_signed)
|
||||||
|
|
||||||
# ...and check the result
|
# ...and check the result
|
||||||
|
@ -148,7 +148,7 @@ class ListTransactionsTest(BitcoinTestFramework):
|
||||||
tx3_modified = txFromHex(tx3)
|
tx3_modified = txFromHex(tx3)
|
||||||
tx3_modified.vin[0].nSequence = 0
|
tx3_modified.vin[0].nSequence = 0
|
||||||
tx3 = bytes_to_hex_str(tx3_modified.serialize())
|
tx3 = bytes_to_hex_str(tx3_modified.serialize())
|
||||||
tx3_signed = self.nodes[0].signrawtransaction(tx3)['hex']
|
tx3_signed = self.nodes[0].signrawtransactionwithwallet(tx3)['hex']
|
||||||
txid_3 = self.nodes[0].sendrawtransaction(tx3_signed)
|
txid_3 = self.nodes[0].sendrawtransaction(tx3_signed)
|
||||||
|
|
||||||
assert(is_opt_in(self.nodes[0], txid_3))
|
assert(is_opt_in(self.nodes[0], txid_3))
|
||||||
|
@ -162,7 +162,7 @@ class ListTransactionsTest(BitcoinTestFramework):
|
||||||
inputs = [{"txid": txid_3, "vout":utxo_to_use["vout"]}]
|
inputs = [{"txid": txid_3, "vout":utxo_to_use["vout"]}]
|
||||||
outputs = {self.nodes[0].getnewaddress(): 0.997}
|
outputs = {self.nodes[0].getnewaddress(): 0.997}
|
||||||
tx4 = self.nodes[1].createrawtransaction(inputs, outputs)
|
tx4 = self.nodes[1].createrawtransaction(inputs, outputs)
|
||||||
tx4_signed = self.nodes[1].signrawtransaction(tx4)["hex"]
|
tx4_signed = self.nodes[1].signrawtransactionwithwallet(tx4)["hex"]
|
||||||
txid_4 = self.nodes[1].sendrawtransaction(tx4_signed)
|
txid_4 = self.nodes[1].sendrawtransaction(tx4_signed)
|
||||||
|
|
||||||
assert(not is_opt_in(self.nodes[1], txid_4))
|
assert(not is_opt_in(self.nodes[1], txid_4))
|
||||||
|
@ -174,7 +174,7 @@ class ListTransactionsTest(BitcoinTestFramework):
|
||||||
tx3_b = tx3_modified
|
tx3_b = tx3_modified
|
||||||
tx3_b.vout[0].nValue -= int(Decimal("0.004") * COIN) # bump the fee
|
tx3_b.vout[0].nValue -= int(Decimal("0.004") * COIN) # bump the fee
|
||||||
tx3_b = bytes_to_hex_str(tx3_b.serialize())
|
tx3_b = bytes_to_hex_str(tx3_b.serialize())
|
||||||
tx3_b_signed = self.nodes[0].signrawtransaction(tx3_b)['hex']
|
tx3_b_signed = self.nodes[0].signrawtransactionwithwallet(tx3_b)['hex']
|
||||||
txid_3b = self.nodes[0].sendrawtransaction(tx3_b_signed, True)
|
txid_3b = self.nodes[0].sendrawtransaction(tx3_b_signed, True)
|
||||||
assert(is_opt_in(self.nodes[0], txid_3b))
|
assert(is_opt_in(self.nodes[0], txid_3b))
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
Test the following RPCs:
|
Test the following RPCs:
|
||||||
- createrawtransaction
|
- createrawtransaction
|
||||||
- signrawtransaction
|
- signrawtransactionwithwallet
|
||||||
- sendrawtransaction
|
- sendrawtransaction
|
||||||
- decoderawtransaction
|
- decoderawtransaction
|
||||||
- getrawtransaction
|
- getrawtransaction
|
||||||
|
@ -104,7 +104,7 @@ class RawTransactionsTest(BitcoinTestFramework):
|
||||||
inputs = [ {'txid' : "1d1d4e24ed99057e84c3f80fd8fbec79ed9e1acee37da269356ecea000000000", 'vout' : 1}] #won't exists
|
inputs = [ {'txid' : "1d1d4e24ed99057e84c3f80fd8fbec79ed9e1acee37da269356ecea000000000", 'vout' : 1}] #won't exists
|
||||||
outputs = { self.nodes[0].getnewaddress() : 4.998 }
|
outputs = { self.nodes[0].getnewaddress() : 4.998 }
|
||||||
rawtx = self.nodes[2].createrawtransaction(inputs, outputs)
|
rawtx = self.nodes[2].createrawtransaction(inputs, outputs)
|
||||||
rawtx = self.nodes[2].signrawtransaction(rawtx)
|
rawtx = self.nodes[2].signrawtransactionwithwallet(rawtx)
|
||||||
|
|
||||||
# This will raise an exception since there are missing inputs
|
# This will raise an exception since there are missing inputs
|
||||||
assert_raises_rpc_error(-25, "Missing inputs", self.nodes[2].sendrawtransaction, rawtx['hex'])
|
assert_raises_rpc_error(-25, "Missing inputs", self.nodes[2].sendrawtransaction, rawtx['hex'])
|
||||||
|
@ -202,10 +202,10 @@ class RawTransactionsTest(BitcoinTestFramework):
|
||||||
inputs = [{ "txid" : txId, "vout" : vout['n'], "scriptPubKey" : vout['scriptPubKey']['hex'], "amount" : vout['value']}]
|
inputs = [{ "txid" : txId, "vout" : vout['n'], "scriptPubKey" : vout['scriptPubKey']['hex'], "amount" : vout['value']}]
|
||||||
outputs = { self.nodes[0].getnewaddress() : 2.19 }
|
outputs = { self.nodes[0].getnewaddress() : 2.19 }
|
||||||
rawTx = self.nodes[2].createrawtransaction(inputs, outputs)
|
rawTx = self.nodes[2].createrawtransaction(inputs, outputs)
|
||||||
rawTxPartialSigned = self.nodes[1].signrawtransaction(rawTx, inputs)
|
rawTxPartialSigned = self.nodes[1].signrawtransactionwithwallet(rawTx, inputs)
|
||||||
assert_equal(rawTxPartialSigned['complete'], False) #node1 only has one key, can't comp. sign the tx
|
assert_equal(rawTxPartialSigned['complete'], False) #node1 only has one key, can't comp. sign the tx
|
||||||
|
|
||||||
rawTxSigned = self.nodes[2].signrawtransaction(rawTx, inputs)
|
rawTxSigned = self.nodes[2].signrawtransactionwithwallet(rawTx, inputs)
|
||||||
assert_equal(rawTxSigned['complete'], True) #node2 can sign the tx compl., own two of three keys
|
assert_equal(rawTxSigned['complete'], True) #node2 can sign the tx compl., own two of three keys
|
||||||
self.nodes[2].sendrawtransaction(rawTxSigned['hex'])
|
self.nodes[2].sendrawtransaction(rawTxSigned['hex'])
|
||||||
rawTx = self.nodes[0].decoderawtransaction(rawTxSigned['hex'])
|
rawTx = self.nodes[0].decoderawtransaction(rawTxSigned['hex'])
|
||||||
|
@ -247,11 +247,11 @@ class RawTransactionsTest(BitcoinTestFramework):
|
||||||
inputs = [{ "txid" : txId, "vout" : vout['n'], "scriptPubKey" : vout['scriptPubKey']['hex'], "redeemScript" : mSigObjValid['hex'], "amount" : vout['value']}]
|
inputs = [{ "txid" : txId, "vout" : vout['n'], "scriptPubKey" : vout['scriptPubKey']['hex'], "redeemScript" : mSigObjValid['hex'], "amount" : vout['value']}]
|
||||||
outputs = { self.nodes[0].getnewaddress() : 2.19 }
|
outputs = { self.nodes[0].getnewaddress() : 2.19 }
|
||||||
rawTx2 = self.nodes[2].createrawtransaction(inputs, outputs)
|
rawTx2 = self.nodes[2].createrawtransaction(inputs, outputs)
|
||||||
rawTxPartialSigned1 = self.nodes[1].signrawtransaction(rawTx2, inputs)
|
rawTxPartialSigned1 = self.nodes[1].signrawtransactionwithwallet(rawTx2, inputs)
|
||||||
self.log.info(rawTxPartialSigned1)
|
self.log.info(rawTxPartialSigned1)
|
||||||
assert_equal(rawTxPartialSigned['complete'], False) #node1 only has one key, can't comp. sign the tx
|
assert_equal(rawTxPartialSigned['complete'], False) #node1 only has one key, can't comp. sign the tx
|
||||||
|
|
||||||
rawTxPartialSigned2 = self.nodes[2].signrawtransaction(rawTx2, inputs)
|
rawTxPartialSigned2 = self.nodes[2].signrawtransactionwithwallet(rawTx2, inputs)
|
||||||
self.log.info(rawTxPartialSigned2)
|
self.log.info(rawTxPartialSigned2)
|
||||||
assert_equal(rawTxPartialSigned2['complete'], False) #node2 only has one key, can't comp. sign the tx
|
assert_equal(rawTxPartialSigned2['complete'], False) #node2 only has one key, can't comp. sign the tx
|
||||||
rawTxComb = self.nodes[2].combinerawtransaction([rawTxPartialSigned1['hex'], rawTxPartialSigned2['hex']])
|
rawTxComb = self.nodes[2].combinerawtransaction([rawTxPartialSigned1['hex'], rawTxPartialSigned2['hex']])
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# Copyright (c) 2015-2017 The Bitcoin Core developers
|
# Copyright (c) 2015-2017 The Bitcoin Core developers
|
||||||
# Distributed under the MIT software license, see the accompanying
|
# Distributed under the MIT software license, see the accompanying
|
||||||
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
"""Test transaction signing using the signrawtransaction RPC."""
|
"""Test transaction signing using the signrawtransaction* RPCs."""
|
||||||
|
|
||||||
from test_framework.test_framework import BitcoinTestFramework
|
from test_framework.test_framework import BitcoinTestFramework
|
||||||
from test_framework.util import *
|
from test_framework.util import *
|
||||||
|
@ -12,6 +12,7 @@ class SignRawTransactionsTest(BitcoinTestFramework):
|
||||||
def set_test_params(self):
|
def set_test_params(self):
|
||||||
self.setup_clean_chain = True
|
self.setup_clean_chain = True
|
||||||
self.num_nodes = 1
|
self.num_nodes = 1
|
||||||
|
self.extra_args = [["-deprecatedrpc=signrawtransaction"]]
|
||||||
|
|
||||||
def successful_signing_test(self):
|
def successful_signing_test(self):
|
||||||
"""Create and sign a valid raw transaction with one input.
|
"""Create and sign a valid raw transaction with one input.
|
||||||
|
@ -33,15 +34,18 @@ class SignRawTransactionsTest(BitcoinTestFramework):
|
||||||
outputs = {'mpLQjfK79b7CCV4VMJWEWAj5Mpx8Up5zxB': 0.1}
|
outputs = {'mpLQjfK79b7CCV4VMJWEWAj5Mpx8Up5zxB': 0.1}
|
||||||
|
|
||||||
rawTx = self.nodes[0].createrawtransaction(inputs, outputs)
|
rawTx = self.nodes[0].createrawtransaction(inputs, outputs)
|
||||||
rawTxSigned = self.nodes[0].signrawtransaction(rawTx, inputs, privKeys)
|
rawTxSigned = self.nodes[0].signrawtransactionwithkey(rawTx, privKeys, inputs)
|
||||||
|
|
||||||
# 1) The transaction has a complete set of signatures
|
# 1) The transaction has a complete set of signatures
|
||||||
assert 'complete' in rawTxSigned
|
assert rawTxSigned['complete']
|
||||||
assert_equal(rawTxSigned['complete'], True)
|
|
||||||
|
|
||||||
# 2) No script verification error occurred
|
# 2) No script verification error occurred
|
||||||
assert 'errors' not in rawTxSigned
|
assert 'errors' not in rawTxSigned
|
||||||
|
|
||||||
|
# Perform the same test on signrawtransaction
|
||||||
|
rawTxSigned2 = self.nodes[0].signrawtransaction(rawTx, inputs, privKeys)
|
||||||
|
assert_equal(rawTxSigned, rawTxSigned2)
|
||||||
|
|
||||||
def script_verification_error_test(self):
|
def script_verification_error_test(self):
|
||||||
"""Create and sign a raw transaction with valid (vin 0), invalid (vin 1) and one missing (vin 2) input script.
|
"""Create and sign a raw transaction with valid (vin 0), invalid (vin 1) and one missing (vin 2) input script.
|
||||||
|
|
||||||
|
@ -84,11 +88,10 @@ class SignRawTransactionsTest(BitcoinTestFramework):
|
||||||
# Make sure decoderawtransaction throws if there is extra data
|
# Make sure decoderawtransaction throws if there is extra data
|
||||||
assert_raises_rpc_error(-22, "TX decode failed", self.nodes[0].decoderawtransaction, rawTx + "00")
|
assert_raises_rpc_error(-22, "TX decode failed", self.nodes[0].decoderawtransaction, rawTx + "00")
|
||||||
|
|
||||||
rawTxSigned = self.nodes[0].signrawtransaction(rawTx, scripts, privKeys)
|
rawTxSigned = self.nodes[0].signrawtransactionwithkey(rawTx, privKeys, scripts)
|
||||||
|
|
||||||
# 3) The transaction has no complete set of signatures
|
# 3) The transaction has no complete set of signatures
|
||||||
assert 'complete' in rawTxSigned
|
assert not rawTxSigned['complete']
|
||||||
assert_equal(rawTxSigned['complete'], False)
|
|
||||||
|
|
||||||
# 4) Two script verification errors occurred
|
# 4) Two script verification errors occurred
|
||||||
assert 'errors' in rawTxSigned
|
assert 'errors' in rawTxSigned
|
||||||
|
@ -109,14 +112,17 @@ class SignRawTransactionsTest(BitcoinTestFramework):
|
||||||
assert_equal(rawTxSigned['errors'][1]['vout'], inputs[2]['vout'])
|
assert_equal(rawTxSigned['errors'][1]['vout'], inputs[2]['vout'])
|
||||||
assert not rawTxSigned['errors'][0]['witness']
|
assert not rawTxSigned['errors'][0]['witness']
|
||||||
|
|
||||||
|
# Perform same test with signrawtransaction
|
||||||
|
rawTxSigned2 = self.nodes[0].signrawtransaction(rawTx, scripts, privKeys)
|
||||||
|
assert_equal(rawTxSigned, rawTxSigned2)
|
||||||
|
|
||||||
# Now test signing failure for transaction with input witnesses
|
# Now test signing failure for transaction with input witnesses
|
||||||
p2wpkh_raw_tx = "01000000000102fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f00000000494830450221008b9d1dc26ba6a9cb62127b02742fa9d754cd3bebf337f7a55d114c8e5cdd30be022040529b194ba3f9281a99f2b1c0a19c0489bc22ede944ccf4ecbab4cc618ef3ed01eeffffffef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a0100000000ffffffff02202cb206000000001976a9148280b37df378db99f66f85c95a783a76ac7a6d5988ac9093510d000000001976a9143bde42dbee7e4dbe6a21b2d50ce2f0167faa815988ac000247304402203609e17b84f6a7d30c80bfa610b5b4542f32a8a0d5447a12fb1366d7f01cc44a0220573a954c4518331561406f90300e8f3358f51928d43c212a8caed02de67eebee0121025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee635711000000"
|
p2wpkh_raw_tx = "01000000000102fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f00000000494830450221008b9d1dc26ba6a9cb62127b02742fa9d754cd3bebf337f7a55d114c8e5cdd30be022040529b194ba3f9281a99f2b1c0a19c0489bc22ede944ccf4ecbab4cc618ef3ed01eeffffffef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a0100000000ffffffff02202cb206000000001976a9148280b37df378db99f66f85c95a783a76ac7a6d5988ac9093510d000000001976a9143bde42dbee7e4dbe6a21b2d50ce2f0167faa815988ac000247304402203609e17b84f6a7d30c80bfa610b5b4542f32a8a0d5447a12fb1366d7f01cc44a0220573a954c4518331561406f90300e8f3358f51928d43c212a8caed02de67eebee0121025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee635711000000"
|
||||||
|
|
||||||
rawTxSigned = self.nodes[0].signrawtransaction(p2wpkh_raw_tx)
|
rawTxSigned = self.nodes[0].signrawtransactionwithwallet(p2wpkh_raw_tx)
|
||||||
|
|
||||||
# 7) The transaction has no complete set of signatures
|
# 7) The transaction has no complete set of signatures
|
||||||
assert 'complete' in rawTxSigned
|
assert not rawTxSigned['complete']
|
||||||
assert_equal(rawTxSigned['complete'], False)
|
|
||||||
|
|
||||||
# 8) Two script verification errors occurred
|
# 8) Two script verification errors occurred
|
||||||
assert 'errors' in rawTxSigned
|
assert 'errors' in rawTxSigned
|
||||||
|
@ -134,6 +140,10 @@ class SignRawTransactionsTest(BitcoinTestFramework):
|
||||||
assert_equal(rawTxSigned['errors'][1]['witness'], ["304402203609e17b84f6a7d30c80bfa610b5b4542f32a8a0d5447a12fb1366d7f01cc44a0220573a954c4518331561406f90300e8f3358f51928d43c212a8caed02de67eebee01", "025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee6357"])
|
assert_equal(rawTxSigned['errors'][1]['witness'], ["304402203609e17b84f6a7d30c80bfa610b5b4542f32a8a0d5447a12fb1366d7f01cc44a0220573a954c4518331561406f90300e8f3358f51928d43c212a8caed02de67eebee01", "025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee6357"])
|
||||||
assert not rawTxSigned['errors'][0]['witness']
|
assert not rawTxSigned['errors'][0]['witness']
|
||||||
|
|
||||||
|
# Perform same test with signrawtransaction
|
||||||
|
rawTxSigned2 = self.nodes[0].signrawtransaction(p2wpkh_raw_tx)
|
||||||
|
assert_equal(rawTxSigned, rawTxSigned2)
|
||||||
|
|
||||||
def run_test(self):
|
def run_test(self):
|
||||||
self.successful_signing_test()
|
self.successful_signing_test()
|
||||||
self.script_verification_error_test()
|
self.script_verification_error_test()
|
||||||
|
|
|
@ -34,9 +34,9 @@ class MerkleBlockTest(BitcoinTestFramework):
|
||||||
|
|
||||||
node0utxos = self.nodes[0].listunspent(1)
|
node0utxos = self.nodes[0].listunspent(1)
|
||||||
tx1 = self.nodes[0].createrawtransaction([node0utxos.pop()], {self.nodes[1].getnewaddress(): 49.99})
|
tx1 = self.nodes[0].createrawtransaction([node0utxos.pop()], {self.nodes[1].getnewaddress(): 49.99})
|
||||||
txid1 = self.nodes[0].sendrawtransaction(self.nodes[0].signrawtransaction(tx1)["hex"])
|
txid1 = self.nodes[0].sendrawtransaction(self.nodes[0].signrawtransactionwithwallet(tx1)["hex"])
|
||||||
tx2 = self.nodes[0].createrawtransaction([node0utxos.pop()], {self.nodes[1].getnewaddress(): 49.99})
|
tx2 = self.nodes[0].createrawtransaction([node0utxos.pop()], {self.nodes[1].getnewaddress(): 49.99})
|
||||||
txid2 = self.nodes[0].sendrawtransaction(self.nodes[0].signrawtransaction(tx2)["hex"])
|
txid2 = self.nodes[0].sendrawtransaction(self.nodes[0].signrawtransactionwithwallet(tx2)["hex"])
|
||||||
# This will raise an exception because the transaction is not yet in a block
|
# This will raise an exception because the transaction is not yet in a block
|
||||||
assert_raises_rpc_error(-5, "Transaction not yet in block", self.nodes[0].gettxoutproof, [txid1])
|
assert_raises_rpc_error(-5, "Transaction not yet in block", self.nodes[0].gettxoutproof, [txid1])
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@ class MerkleBlockTest(BitcoinTestFramework):
|
||||||
|
|
||||||
txin_spent = self.nodes[1].listunspent(1).pop()
|
txin_spent = self.nodes[1].listunspent(1).pop()
|
||||||
tx3 = self.nodes[1].createrawtransaction([txin_spent], {self.nodes[0].getnewaddress(): 49.98})
|
tx3 = self.nodes[1].createrawtransaction([txin_spent], {self.nodes[0].getnewaddress(): 49.98})
|
||||||
txid3 = self.nodes[0].sendrawtransaction(self.nodes[1].signrawtransaction(tx3)["hex"])
|
txid3 = self.nodes[0].sendrawtransaction(self.nodes[1].signrawtransactionwithwallet(tx3)["hex"])
|
||||||
self.nodes[0].generate(1)
|
self.nodes[0].generate(1)
|
||||||
self.sync_all()
|
self.sync_all()
|
||||||
|
|
||||||
|
|
|
@ -160,7 +160,7 @@ def create_witness_tx(node, use_p2wsh, utxo, pubkey, encode_p2sh, amount):
|
||||||
def send_to_witness(use_p2wsh, node, utxo, pubkey, encode_p2sh, amount, sign=True, insert_redeem_script=""):
|
def send_to_witness(use_p2wsh, node, utxo, pubkey, encode_p2sh, amount, sign=True, insert_redeem_script=""):
|
||||||
tx_to_witness = create_witness_tx(node, use_p2wsh, utxo, pubkey, encode_p2sh, amount)
|
tx_to_witness = create_witness_tx(node, use_p2wsh, utxo, pubkey, encode_p2sh, amount)
|
||||||
if (sign):
|
if (sign):
|
||||||
signed = node.signrawtransaction(tx_to_witness)
|
signed = node.signrawtransactionwithwallet(tx_to_witness)
|
||||||
assert("errors" not in signed or len(["errors"]) == 0)
|
assert("errors" not in signed or len(["errors"]) == 0)
|
||||||
return node.sendrawtransaction(signed["hex"])
|
return node.sendrawtransaction(signed["hex"])
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -472,7 +472,7 @@ def random_transaction(nodes, amount, min_fee, fee_increment, fee_variants):
|
||||||
outputs[to_node.getnewaddress()] = float(amount)
|
outputs[to_node.getnewaddress()] = float(amount)
|
||||||
|
|
||||||
rawtx = from_node.createrawtransaction(inputs, outputs)
|
rawtx = from_node.createrawtransaction(inputs, outputs)
|
||||||
signresult = from_node.signrawtransaction(rawtx)
|
signresult = from_node.signrawtransactionwithwallet(rawtx)
|
||||||
txid = from_node.sendrawtransaction(signresult["hex"], True)
|
txid = from_node.sendrawtransaction(signresult["hex"], True)
|
||||||
|
|
||||||
return (txid, signresult["hex"], fee)
|
return (txid, signresult["hex"], fee)
|
||||||
|
@ -499,7 +499,7 @@ def create_confirmed_utxos(fee, node, count):
|
||||||
outputs[addr1] = satoshi_round(send_value / 2)
|
outputs[addr1] = satoshi_round(send_value / 2)
|
||||||
outputs[addr2] = satoshi_round(send_value / 2)
|
outputs[addr2] = satoshi_round(send_value / 2)
|
||||||
raw_tx = node.createrawtransaction(inputs, outputs)
|
raw_tx = node.createrawtransaction(inputs, outputs)
|
||||||
signed_tx = node.signrawtransaction(raw_tx)["hex"]
|
signed_tx = node.signrawtransactionwithwallet(raw_tx)["hex"]
|
||||||
node.sendrawtransaction(signed_tx)
|
node.sendrawtransaction(signed_tx)
|
||||||
|
|
||||||
while (node.getmempoolinfo()['size'] > 0):
|
while (node.getmempoolinfo()['size'] > 0):
|
||||||
|
@ -533,7 +533,7 @@ def create_tx(node, coinbase, to_address, amount):
|
||||||
inputs = [{"txid": coinbase, "vout": 0}]
|
inputs = [{"txid": coinbase, "vout": 0}]
|
||||||
outputs = {to_address: amount}
|
outputs = {to_address: amount}
|
||||||
rawtx = node.createrawtransaction(inputs, outputs)
|
rawtx = node.createrawtransaction(inputs, outputs)
|
||||||
signresult = node.signrawtransaction(rawtx)
|
signresult = node.signrawtransactionwithwallet(rawtx)
|
||||||
assert_equal(signresult["complete"], True)
|
assert_equal(signresult["complete"], True)
|
||||||
return signresult["hex"]
|
return signresult["hex"]
|
||||||
|
|
||||||
|
@ -552,7 +552,7 @@ def create_lots_of_big_transactions(node, txouts, utxos, num, fee):
|
||||||
newtx = rawtx[0:92]
|
newtx = rawtx[0:92]
|
||||||
newtx = newtx + txouts
|
newtx = newtx + txouts
|
||||||
newtx = newtx + rawtx[94:]
|
newtx = newtx + rawtx[94:]
|
||||||
signresult = node.signrawtransaction(newtx, None, None, "NONE")
|
signresult = node.signrawtransactionwithwallet(newtx, None, "NONE")
|
||||||
txid = node.sendrawtransaction(signresult["hex"], True)
|
txid = node.sendrawtransaction(signresult["hex"], True)
|
||||||
txids.append(txid)
|
txids.append(txid)
|
||||||
return txids
|
return txids
|
||||||
|
|
|
@ -55,7 +55,7 @@ class AbandonConflictTest(BitcoinTestFramework):
|
||||||
|
|
||||||
outputs[self.nodes[0].getnewaddress()] = Decimal("14.99998")
|
outputs[self.nodes[0].getnewaddress()] = Decimal("14.99998")
|
||||||
outputs[self.nodes[1].getnewaddress()] = Decimal("5")
|
outputs[self.nodes[1].getnewaddress()] = Decimal("5")
|
||||||
signed = self.nodes[0].signrawtransaction(self.nodes[0].createrawtransaction(inputs, outputs))
|
signed = self.nodes[0].signrawtransactionwithwallet(self.nodes[0].createrawtransaction(inputs, outputs))
|
||||||
txAB1 = self.nodes[0].sendrawtransaction(signed["hex"])
|
txAB1 = self.nodes[0].sendrawtransaction(signed["hex"])
|
||||||
|
|
||||||
# Identify the 14.99998btc output
|
# Identify the 14.99998btc output
|
||||||
|
@ -67,7 +67,7 @@ class AbandonConflictTest(BitcoinTestFramework):
|
||||||
inputs.append({"txid":txC, "vout":nC})
|
inputs.append({"txid":txC, "vout":nC})
|
||||||
outputs = {}
|
outputs = {}
|
||||||
outputs[self.nodes[0].getnewaddress()] = Decimal("24.9996")
|
outputs[self.nodes[0].getnewaddress()] = Decimal("24.9996")
|
||||||
signed2 = self.nodes[0].signrawtransaction(self.nodes[0].createrawtransaction(inputs, outputs))
|
signed2 = self.nodes[0].signrawtransactionwithwallet(self.nodes[0].createrawtransaction(inputs, outputs))
|
||||||
txABC2 = self.nodes[0].sendrawtransaction(signed2["hex"])
|
txABC2 = self.nodes[0].sendrawtransaction(signed2["hex"])
|
||||||
|
|
||||||
# In mempool txs from self should increase balance from change
|
# In mempool txs from self should increase balance from change
|
||||||
|
@ -138,7 +138,7 @@ class AbandonConflictTest(BitcoinTestFramework):
|
||||||
outputs = {}
|
outputs = {}
|
||||||
outputs[self.nodes[1].getnewaddress()] = Decimal("9.9999")
|
outputs[self.nodes[1].getnewaddress()] = Decimal("9.9999")
|
||||||
tx = self.nodes[0].createrawtransaction(inputs, outputs)
|
tx = self.nodes[0].createrawtransaction(inputs, outputs)
|
||||||
signed = self.nodes[0].signrawtransaction(tx)
|
signed = self.nodes[0].signrawtransactionwithwallet(tx)
|
||||||
self.nodes[1].sendrawtransaction(signed["hex"])
|
self.nodes[1].sendrawtransaction(signed["hex"])
|
||||||
self.nodes[1].generate(1)
|
self.nodes[1].generate(1)
|
||||||
|
|
||||||
|
|
|
@ -140,7 +140,7 @@ class WalletTest(BitcoinTestFramework):
|
||||||
inputs.append({ "txid" : utxo["txid"], "vout" : utxo["vout"]})
|
inputs.append({ "txid" : utxo["txid"], "vout" : utxo["vout"]})
|
||||||
outputs[self.nodes[2].getnewaddress("from1")] = utxo["amount"] - 3
|
outputs[self.nodes[2].getnewaddress("from1")] = utxo["amount"] - 3
|
||||||
raw_tx = self.nodes[0].createrawtransaction(inputs, outputs)
|
raw_tx = self.nodes[0].createrawtransaction(inputs, outputs)
|
||||||
txns_to_send.append(self.nodes[0].signrawtransaction(raw_tx))
|
txns_to_send.append(self.nodes[0].signrawtransactionwithwallet(raw_tx))
|
||||||
|
|
||||||
# Have node 1 (miner) send the transactions
|
# Have node 1 (miner) send the transactions
|
||||||
self.nodes[1].sendrawtransaction(txns_to_send[0]["hex"], True)
|
self.nodes[1].sendrawtransaction(txns_to_send[0]["hex"], True)
|
||||||
|
@ -225,7 +225,7 @@ class WalletTest(BitcoinTestFramework):
|
||||||
|
|
||||||
rawTx = self.nodes[1].createrawtransaction(inputs, outputs).replace("c0833842", "00000000") #replace 11.11 with 0.0 (int32)
|
rawTx = self.nodes[1].createrawtransaction(inputs, outputs).replace("c0833842", "00000000") #replace 11.11 with 0.0 (int32)
|
||||||
decRawTx = self.nodes[1].decoderawtransaction(rawTx)
|
decRawTx = self.nodes[1].decoderawtransaction(rawTx)
|
||||||
signedRawTx = self.nodes[1].signrawtransaction(rawTx)
|
signedRawTx = self.nodes[1].signrawtransactionwithwallet(rawTx)
|
||||||
decRawTx = self.nodes[1].decoderawtransaction(signedRawTx['hex'])
|
decRawTx = self.nodes[1].decoderawtransaction(signedRawTx['hex'])
|
||||||
zeroValueTxid= decRawTx['txid']
|
zeroValueTxid= decRawTx['txid']
|
||||||
self.nodes[1].sendrawtransaction(signedRawTx['hex'])
|
self.nodes[1].sendrawtransaction(signedRawTx['hex'])
|
||||||
|
@ -400,7 +400,7 @@ class WalletTest(BitcoinTestFramework):
|
||||||
node0_balance = self.nodes[0].getbalance()
|
node0_balance = self.nodes[0].getbalance()
|
||||||
# Split into two chains
|
# Split into two chains
|
||||||
rawtx = self.nodes[0].createrawtransaction([{"txid":singletxid, "vout":0}], {chain_addrs[0]:node0_balance/2-Decimal('0.01'), chain_addrs[1]:node0_balance/2-Decimal('0.01')})
|
rawtx = self.nodes[0].createrawtransaction([{"txid":singletxid, "vout":0}], {chain_addrs[0]:node0_balance/2-Decimal('0.01'), chain_addrs[1]:node0_balance/2-Decimal('0.01')})
|
||||||
signedtx = self.nodes[0].signrawtransaction(rawtx)
|
signedtx = self.nodes[0].signrawtransactionwithwallet(rawtx)
|
||||||
singletxid = self.nodes[0].sendrawtransaction(signedtx["hex"])
|
singletxid = self.nodes[0].sendrawtransaction(signedtx["hex"])
|
||||||
self.nodes[0].generate(1)
|
self.nodes[0].generate(1)
|
||||||
|
|
||||||
|
|
|
@ -121,7 +121,7 @@ def test_segwit_bumpfee_succeeds(rbf_node, dest_address):
|
||||||
"sequence": BIP125_SEQUENCE_NUMBER
|
"sequence": BIP125_SEQUENCE_NUMBER
|
||||||
}], {dest_address: Decimal("0.0005"),
|
}], {dest_address: Decimal("0.0005"),
|
||||||
rbf_node.getrawchangeaddress(): Decimal("0.0003")})
|
rbf_node.getrawchangeaddress(): Decimal("0.0003")})
|
||||||
rbfsigned = rbf_node.signrawtransaction(rbfraw)
|
rbfsigned = rbf_node.signrawtransactionwithwallet(rbfraw)
|
||||||
rbfid = rbf_node.sendrawtransaction(rbfsigned["hex"])
|
rbfid = rbf_node.sendrawtransaction(rbfsigned["hex"])
|
||||||
assert rbfid in rbf_node.getrawmempool()
|
assert rbfid in rbf_node.getrawmempool()
|
||||||
|
|
||||||
|
@ -150,8 +150,8 @@ def test_notmine_bumpfee_fails(rbf_node, peer_node, dest_address):
|
||||||
} for utxo in utxos]
|
} for utxo in utxos]
|
||||||
output_val = sum(utxo["amount"] for utxo in utxos) - Decimal("0.001")
|
output_val = sum(utxo["amount"] for utxo in utxos) - Decimal("0.001")
|
||||||
rawtx = rbf_node.createrawtransaction(inputs, {dest_address: output_val})
|
rawtx = rbf_node.createrawtransaction(inputs, {dest_address: output_val})
|
||||||
signedtx = rbf_node.signrawtransaction(rawtx)
|
signedtx = rbf_node.signrawtransactionwithwallet(rawtx)
|
||||||
signedtx = peer_node.signrawtransaction(signedtx["hex"])
|
signedtx = peer_node.signrawtransactionwithwallet(signedtx["hex"])
|
||||||
rbfid = rbf_node.sendrawtransaction(signedtx["hex"])
|
rbfid = rbf_node.sendrawtransaction(signedtx["hex"])
|
||||||
assert_raises_rpc_error(-4, "Transaction contains inputs that don't belong to this wallet",
|
assert_raises_rpc_error(-4, "Transaction contains inputs that don't belong to this wallet",
|
||||||
rbf_node.bumpfee, rbfid)
|
rbf_node.bumpfee, rbfid)
|
||||||
|
@ -162,7 +162,7 @@ def test_bumpfee_with_descendant_fails(rbf_node, rbf_node_address, dest_address)
|
||||||
# parent is send-to-self, so we don't have to check which output is change when creating the child tx
|
# parent is send-to-self, so we don't have to check which output is change when creating the child tx
|
||||||
parent_id = spend_one_input(rbf_node, rbf_node_address)
|
parent_id = spend_one_input(rbf_node, rbf_node_address)
|
||||||
tx = rbf_node.createrawtransaction([{"txid": parent_id, "vout": 0}], {dest_address: 0.00020000})
|
tx = rbf_node.createrawtransaction([{"txid": parent_id, "vout": 0}], {dest_address: 0.00020000})
|
||||||
tx = rbf_node.signrawtransaction(tx)
|
tx = rbf_node.signrawtransactionwithwallet(tx)
|
||||||
rbf_node.sendrawtransaction(tx["hex"])
|
rbf_node.sendrawtransaction(tx["hex"])
|
||||||
assert_raises_rpc_error(-8, "Transaction has descendants in the wallet", rbf_node.bumpfee, parent_id)
|
assert_raises_rpc_error(-8, "Transaction has descendants in the wallet", rbf_node.bumpfee, parent_id)
|
||||||
|
|
||||||
|
@ -277,7 +277,7 @@ def spend_one_input(node, dest_address):
|
||||||
rawtx = node.createrawtransaction(
|
rawtx = node.createrawtransaction(
|
||||||
[tx_input], {dest_address: Decimal("0.00050000"),
|
[tx_input], {dest_address: Decimal("0.00050000"),
|
||||||
node.getrawchangeaddress(): Decimal("0.00049000")})
|
node.getrawchangeaddress(): Decimal("0.00049000")})
|
||||||
signedtx = node.signrawtransaction(rawtx)
|
signedtx = node.signrawtransactionwithwallet(rawtx)
|
||||||
txid = node.sendrawtransaction(signedtx["hex"])
|
txid = node.sendrawtransaction(signedtx["hex"])
|
||||||
return txid
|
return txid
|
||||||
|
|
||||||
|
|
|
@ -158,7 +158,7 @@ class ListSinceBlockTest (BitcoinTestFramework):
|
||||||
'vout': utxo['vout'],
|
'vout': utxo['vout'],
|
||||||
}]
|
}]
|
||||||
txid1 = self.nodes[1].sendrawtransaction(
|
txid1 = self.nodes[1].sendrawtransaction(
|
||||||
self.nodes[1].signrawtransaction(
|
self.nodes[1].signrawtransactionwithwallet(
|
||||||
self.nodes[1].createrawtransaction(utxoDicts, recipientDict))['hex'])
|
self.nodes[1].createrawtransaction(utxoDicts, recipientDict))['hex'])
|
||||||
|
|
||||||
# send from nodes[2] using utxo to nodes[3]
|
# send from nodes[2] using utxo to nodes[3]
|
||||||
|
@ -167,7 +167,7 @@ class ListSinceBlockTest (BitcoinTestFramework):
|
||||||
self.nodes[2].getnewaddress(): change,
|
self.nodes[2].getnewaddress(): change,
|
||||||
}
|
}
|
||||||
self.nodes[2].sendrawtransaction(
|
self.nodes[2].sendrawtransaction(
|
||||||
self.nodes[2].signrawtransaction(
|
self.nodes[2].signrawtransactionwithwallet(
|
||||||
self.nodes[2].createrawtransaction(utxoDicts, recipientDict2))['hex'])
|
self.nodes[2].createrawtransaction(utxoDicts, recipientDict2))['hex'])
|
||||||
|
|
||||||
# generate on both sides
|
# generate on both sides
|
||||||
|
@ -232,7 +232,7 @@ class ListSinceBlockTest (BitcoinTestFramework):
|
||||||
'txid': utxo['txid'],
|
'txid': utxo['txid'],
|
||||||
'vout': utxo['vout'],
|
'vout': utxo['vout'],
|
||||||
}]
|
}]
|
||||||
signedtxres = self.nodes[2].signrawtransaction(
|
signedtxres = self.nodes[2].signrawtransactionwithwallet(
|
||||||
self.nodes[2].createrawtransaction(utxoDicts, recipientDict))
|
self.nodes[2].createrawtransaction(utxoDicts, recipientDict))
|
||||||
assert signedtxres['complete']
|
assert signedtxres['complete']
|
||||||
|
|
||||||
|
|
|
@ -78,7 +78,7 @@ class TxnMallTest(BitcoinTestFramework):
|
||||||
|
|
||||||
# Use a different signature hash type to sign. This creates an equivalent but malleated clone.
|
# Use a different signature hash type to sign. This creates an equivalent but malleated clone.
|
||||||
# Don't send the clone anywhere yet
|
# Don't send the clone anywhere yet
|
||||||
tx1_clone = self.nodes[0].signrawtransaction(clone_raw, None, None, "ALL|ANYONECANPAY")
|
tx1_clone = self.nodes[0].signrawtransactionwithwallet(clone_raw, None, "ALL|ANYONECANPAY")
|
||||||
assert_equal(tx1_clone["complete"], True)
|
assert_equal(tx1_clone["complete"], True)
|
||||||
|
|
||||||
# Have node0 mine a block, if requested:
|
# Have node0 mine a block, if requested:
|
||||||
|
|
|
@ -58,7 +58,7 @@ class TxnMallTest(BitcoinTestFramework):
|
||||||
outputs[node1_address] = 1240
|
outputs[node1_address] = 1240
|
||||||
outputs[change_address] = 1248 - 1240 + doublespend_fee
|
outputs[change_address] = 1248 - 1240 + doublespend_fee
|
||||||
rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
|
rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
|
||||||
doublespend = self.nodes[0].signrawtransaction(rawtx)
|
doublespend = self.nodes[0].signrawtransactionwithwallet(rawtx)
|
||||||
assert_equal(doublespend["complete"], True)
|
assert_equal(doublespend["complete"], True)
|
||||||
|
|
||||||
# Create two spends using 1 50 BTC coin each
|
# Create two spends using 1 50 BTC coin each
|
||||||
|
|
Loading…
Reference in a new issue