When using SIGHASH_SINGLE, do not sign inputs that have no corresponding outputs.
This fixes issue #1688
This commit is contained in:
parent
b3a570d158
commit
d5e7b61173
1 changed files with 5 additions and 1 deletions
|
@ -428,6 +428,8 @@ Value signrawtransaction(const Array& params, bool fHelp)
|
||||||
throw JSONRPCError(-8, "Invalid sighash param");
|
throw JSONRPCError(-8, "Invalid sighash param");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool fHashSingle = ((nHashType & ~SIGHASH_ANYONECANPAY) == SIGHASH_SINGLE);
|
||||||
|
|
||||||
// Sign what we can:
|
// Sign what we can:
|
||||||
for (unsigned int i = 0; i < mergedTx.vin.size(); i++)
|
for (unsigned int i = 0; i < mergedTx.vin.size(); i++)
|
||||||
{
|
{
|
||||||
|
@ -440,7 +442,9 @@ Value signrawtransaction(const Array& params, bool fHelp)
|
||||||
const CScript& prevPubKey = mapPrevOut[txin.prevout];
|
const CScript& prevPubKey = mapPrevOut[txin.prevout];
|
||||||
|
|
||||||
txin.scriptSig.clear();
|
txin.scriptSig.clear();
|
||||||
SignSignature(keystore, prevPubKey, mergedTx, i, nHashType);
|
// Only sign SIGHASH_SINGLE if there's a corresponding output:
|
||||||
|
if (!fHashSingle || (i < mergedTx.vout.size()))
|
||||||
|
SignSignature(keystore, prevPubKey, mergedTx, i, nHashType);
|
||||||
|
|
||||||
// ... and merge in other signatures:
|
// ... and merge in other signatures:
|
||||||
BOOST_FOREACH(const CTransaction& txv, txVariants)
|
BOOST_FOREACH(const CTransaction& txv, txVariants)
|
||||||
|
|
Loading…
Reference in a new issue