Browse Source

Merge pull request #1689 from gavinandresen/rawtx_singlefix

When using SIGHASH_SINGLE, only sign inputs that have corresponding outputs
0.8
Gregory Maxwell 12 years ago
parent
commit
b86da2abe8
  1. 6
      src/rpcrawtransaction.cpp

6
src/rpcrawtransaction.cpp

@ -428,6 +428,8 @@ Value signrawtransaction(const Array& params, bool fHelp) @@ -428,6 +428,8 @@ Value signrawtransaction(const Array& params, bool fHelp)
throw JSONRPCError(-8, "Invalid sighash param");
}
bool fHashSingle = ((nHashType & ~SIGHASH_ANYONECANPAY) == SIGHASH_SINGLE);
// Sign what we can:
for (unsigned int i = 0; i < mergedTx.vin.size(); i++)
{
@ -440,7 +442,9 @@ Value signrawtransaction(const Array& params, bool fHelp) @@ -440,7 +442,9 @@ Value signrawtransaction(const Array& params, bool fHelp)
const CScript& prevPubKey = mapPrevOut[txin.prevout];
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:
BOOST_FOREACH(const CTransaction& txv, txVariants)

Loading…
Cancel
Save