Browse Source

Merge pull request #2264 from gmaxwell/signrawtransaction_for_regular_missing_txins

Signrawtransaction shouldn't require redeemScript for non-p2sh txins.
0.8
Gavin Andresen 12 years ago
parent
commit
817c44a00d
  1. 8
      src/rpcrawtransaction.cpp

8
src/rpcrawtransaction.cpp

@ -421,7 +421,7 @@ Value signrawtransaction(const Array& params, bool fHelp) @@ -421,7 +421,7 @@ Value signrawtransaction(const Array& params, bool fHelp)
Object prevOut = p.get_obj();
RPCTypeCheck(prevOut, map_list_of("txid", str_type)("vout", int_type)("scriptPubKey", str_type)("redeemScript",str_type));
RPCTypeCheck(prevOut, map_list_of("txid", str_type)("vout", int_type)("scriptPubKey", str_type));
uint256 txid = ParseHashO(prevOut, "txid");
@ -450,8 +450,11 @@ Value signrawtransaction(const Array& params, bool fHelp) @@ -450,8 +450,11 @@ Value signrawtransaction(const Array& params, bool fHelp)
// 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())
{
RPCTypeCheck(prevOut, map_list_of("txid", str_type)("vout", int_type)("scriptPubKey", str_type)("redeemScript",str_type));
Value v = find_value(prevOut, "redeemScript");
if (fGivenKeys && scriptPubKey.IsPayToScriptHash() && !(v == Value::null))
if (!(v == Value::null))
{
vector<unsigned char> rsData(ParseHexV(v, "redeemScript"));
CScript redeemScript(rsData.begin(), rsData.end());
@ -459,6 +462,7 @@ Value signrawtransaction(const Array& params, bool fHelp) @@ -459,6 +462,7 @@ Value signrawtransaction(const Array& params, bool fHelp)
}
}
}
}
const CKeyStore& keystore = (fGivenKeys ? tempKeystore : *pwalletMain);

Loading…
Cancel
Save