|
|
|
@ -203,7 +203,11 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
|
|
|
|
|
|
|
|
|
|
if (whichType == TX_PUBKEY)
|
|
|
|
|
{
|
|
|
|
|
addressRet = CPubKey(vSolutions[0]).GetID();
|
|
|
|
|
CPubKey pubKey(vSolutions[0]);
|
|
|
|
|
if (!pubKey.IsValid())
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
addressRet = pubKey.GetID();
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
else if (whichType == TX_PUBKEYHASH)
|
|
|
|
@ -237,9 +241,16 @@ bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, vecto
|
|
|
|
|
nRequiredRet = vSolutions.front()[0];
|
|
|
|
|
for (unsigned int i = 1; i < vSolutions.size()-1; i++)
|
|
|
|
|
{
|
|
|
|
|
CTxDestination address = CPubKey(vSolutions[i]).GetID();
|
|
|
|
|
CPubKey pubKey(vSolutions[i]);
|
|
|
|
|
if (!pubKey.IsValid())
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
CTxDestination address = pubKey.GetID();
|
|
|
|
|
addressRet.push_back(address);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (addressRet.empty())
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|