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

Merge pull request #1137 from Mixa84/FSM

Browse Source 
Fixing print of CC address in transaction
This commit is contained in:
jl777
2019-01-02 09:00:15 -11:00
committed by GitHub
parent 8a606896dd 79c1797de3
commit b1dc77875a
2 changed files with 20 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/cc/dapps/oraclefeed.c
View File

@@ -822,22 +822,6 @@ int32_t get_gatewaysinfo(char *refcoin,char *acname,char *depositaddr,int32_t *M
else return(0); else return(0);
} }
int32_t tx_notarizedconfirmed(char *refcoin,char *acname,bits256 txid)
{
char *retstr,str[65]; cJSON *retjson; int32_t result;
if ( (retjson= get_komodocli(refcoin,&retstr,acname,"txnotarizedconfirmed",bits256_str(str,txid),"","","")) != 0 )
{
if (is_cJSON_True(jobj(retjson,"result")) != 0 ) result=1;
else result=0;
free_json(retjson);
}
else if ( retstr != 0 )
{
printf("error parsing txnotarizedconfirmed.(%s)\n",retstr);
free(retstr);
}
}
int32_t tx_has_voutaddress(char *refcoin,char *acname,bits256 txid,char *coinaddr) int32_t tx_has_voutaddress(char *refcoin,char *acname,bits256 txid,char *coinaddr)
{ {
cJSON *txobj,*vouts,*vout,*vins,*vin,*sobj,*addresses; char *addr,str[65]; int32_t i,j,n,numarray,retval = 0, hasvout=0; cJSON *txobj,*vouts,*vout,*vins,*vin,*sobj,*addresses; char *addr,str[65]; int32_t i,j,n,numarray,retval = 0, hasvout=0;

39
src/script/standard.cpp
View File

@@ -468,26 +468,27 @@ bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, vecto
if (addressRet.empty()) if (addressRet.empty())
return false; return false;
} }
else if (IsCryptoConditionsEnabled() != 0 && typeRet == TX_CRYPTOCONDITION) // Removed to get CC address printed in getrawtransaction and decoderawtransaction
{ // else if (IsCryptoConditionsEnabled() != 0 && typeRet == TX_CRYPTOCONDITION)
nRequiredRet = vSolutions.front()[0]; // {
for (unsigned int i = 1; i < vSolutions.size()-1; i++) // nRequiredRet = vSolutions.front()[0];
{ // for (unsigned int i = 1; i < vSolutions.size()-1; i++)
CTxDestination address; // {
if (vSolutions[i].size() == 20) // CTxDestination address;
{ // if (vSolutions[i].size() == 20)
address = CKeyID(uint160(vSolutions[i])); // {
} // address = CKeyID(uint160(vSolutions[i]));
else // }
{ // else
address = CPubKey(vSolutions[i]); // {
} // address = CPubKey(vSolutions[i]);
addressRet.push_back(address); // }
} // addressRet.push_back(address);
// }
if (addressRet.empty()) // if (addressRet.empty())
return false; // return false;
} // }
else else
{ {
nRequiredRet = 1; nRequiredRet = 1;