Browse Source

Put back ETH/ERC20 calls to portfolio. Without cache for now.

pass-iguana-arg
Artem Pikulin 7 years ago
parent
commit
5a5a620fbd
  1. 9
      iguana/exchanges/LP_coins.c
  2. 4
      iguana/exchanges/LP_portfolio.c
  3. 3
      iguana/exchanges/etomicswap/etomiccurl.c

9
iguana/exchanges/LP_coins.c

@ -251,10 +251,13 @@ cJSON *LP_coinjson(struct iguana_info *coin,int32_t showwif)
} }
#ifndef NOTETOMIC #ifndef NOTETOMIC
else if (coin->etomic[0] != 0) { else if (coin->etomic[0] != 0) {
//balance = LP_etomic_get_balance(coin, coin->smartaddr); if (coin->inactive == 0) {
balance = LP_etomic_get_balance(coin, coin->smartaddr);
} else {
balance = 0;
}
jaddnum(item,"height",-1); jaddnum(item,"height",-1);
//jaddnum(item,"balance",dstr(balance)); jaddnum(item,"balance",dstr(balance));
jaddnum(item,"balance",0);
} }
#endif #endif
else else

4
iguana/exchanges/LP_portfolio.c

@ -95,14 +95,12 @@ uint64_t LP_balance(uint64_t *valuep,int32_t iambob,char *symbol,char *coinaddr)
cJSON *array,*item; bits256 zero; int32_t i,n; uint64_t valuesum,satoshisum,value; cJSON *array,*item; bits256 zero; int32_t i,n; uint64_t valuesum,satoshisum,value;
valuesum = satoshisum = 0; valuesum = satoshisum = 0;
memset(zero.bytes,0,sizeof(zero)); memset(zero.bytes,0,sizeof(zero));
/*
#ifndef NOTETOMIC #ifndef NOTETOMIC
struct iguana_info *coin = LP_coinfind(symbol); struct iguana_info *coin = LP_coinfind(symbol);
if (coin->etomic[0] != 0) { if (coin->etomic[0] != 0 && coin->inactive == 0) {
valuesum = LP_etomic_get_balance(coin, coinaddr); valuesum = LP_etomic_get_balance(coin, coinaddr);
} else } else
#endif #endif
*/
if ( (array= LP_listunspent(symbol,coinaddr,zero,zero)) != 0 ) if ( (array= LP_listunspent(symbol,coinaddr,zero,zero)) != 0 )
{ {
if ( is_cJSON_Array(array) != 0 && (n= cJSON_GetArraySize(array)) > 0 ) if ( is_cJSON_Array(array) != 0 && (n= cJSON_GetArraySize(array)) > 0 )

3
iguana/exchanges/etomicswap/etomiccurl.c

@ -35,10 +35,9 @@ size_t writefunc(void *ptr, size_t size, size_t nmemb, struct string *s)
cJSON *parseEthRpcResponse(char *requestResult) cJSON *parseEthRpcResponse(char *requestResult)
{ {
printf("Trying to parse ETH RPC response: %s\n", requestResult);
cJSON *json = cJSON_Parse(requestResult); cJSON *json = cJSON_Parse(requestResult);
if (json == NULL) { if (json == NULL) {
printf("ETH RPC response parse failed!\n"); printf("ETH RPC response parse failed: %s!\n", requestResult);
return NULL; return NULL;
} }
cJSON *tmp = cJSON_GetObjectItem(json, "result"); cJSON *tmp = cJSON_GetObjectItem(json, "result");

Loading…
Cancel
Save