DragonX/hush3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test

Browse Source
This commit is contained in:
jl777
2018-07-21 02:56:09 -11:00
parent f6753cc656
commit 4b80614b5e
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cc/assets.cpp
View File

@@ -230,15 +230,13 @@ bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
for (i=0; i<scriptPubKey.size(); i++)
fprintf(stderr,"%02x",ptr[i]);
fprintf(stderr," scriptPubKey\n");
if ( IsStandard(scriptPubKey,whichType) != 0 )
if ( ExtractDestination(scriptPubKey,address) != 0 )
{
if ( ExtractDestination(scriptPubKey,address) != 0 )
{
strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str());
return(true);
}
fprintf(stderr,"ExtractDestination failed\n");
} else fprintf(stderr,"Getscriptaddress nonstandard\n");
strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str());
fprintf("destaddr.(%s)\n",destaddr);
return(true);
}
fprintf(stderr,"ExtractDestination failed\n");
return(false);
}

1
src/script/standard.cpp
View File

@@ -254,6 +254,7 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
else if (IsCryptoConditionsEnabled() != 0 && whichType == TX_CRYPTOCONDITION)
{
fprintf(stderr,"found CC type\n");
addressRet = CScriptID(uint160(vSolutions[0]));
return true;
}