This commit is contained in:
@@ -45,8 +45,8 @@ void ScriptPubKeyToJSON(const CScript& scriptPubKey, UniValue& out, bool fInclud
|
|||||||
if (fIncludeHex)
|
if (fIncludeHex)
|
||||||
out.push_back(Pair("hex", HexStr(scriptPubKey.begin(), scriptPubKey.end())));
|
out.push_back(Pair("hex", HexStr(scriptPubKey.begin(), scriptPubKey.end())));
|
||||||
|
|
||||||
if (!ExtractDestinations(scriptPubKey, type, addresses, nRequired)) {
|
if (!ExtractDestinations(scriptPubKey, type, addresses, nRequired))
|
||||||
fprintf(stderr,"extractdestinations error\n");
|
{
|
||||||
out.push_back(Pair("type", GetTxnOutputType(type)));
|
out.push_back(Pair("type", GetTxnOutputType(type)));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -264,7 +264,6 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
|
|||||||
|
|
||||||
else if (IsCryptoConditionsEnabled() != 0 && whichType == TX_CRYPTOCONDITION)
|
else if (IsCryptoConditionsEnabled() != 0 && whichType == TX_CRYPTOCONDITION)
|
||||||
{
|
{
|
||||||
fprintf(stderr,"found CC type\n");
|
|
||||||
addressRet = CScriptID(uint160(vSolutions[0]));
|
addressRet = CScriptID(uint160(vSolutions[0]));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -306,7 +305,6 @@ bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, vecto
|
|||||||
CTxDestination address;
|
CTxDestination address;
|
||||||
if (!ExtractDestination(scriptPubKey, address))
|
if (!ExtractDestination(scriptPubKey, address))
|
||||||
{
|
{
|
||||||
fprintf(stderr,"error extractdestination from extractdestinations\n");
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
addressRet.push_back(address);
|
addressRet.push_back(address);
|
||||||
|
|||||||
Reference in New Issue
Block a user