From bd3e5c418f60993b847dd5da85855e96d58e1d0c Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 9 Dec 2017 21:08:10 +0400 Subject: [PATCH] Test --- iguana/exchanges/LP_include.h | 1 + iguana/exchanges/LP_instantdex.c | 15 ++++++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/iguana/exchanges/LP_include.h b/iguana/exchanges/LP_include.h index cf9beab63..ccddae1a5 100644 --- a/iguana/exchanges/LP_include.h +++ b/iguana/exchanges/LP_include.h @@ -507,6 +507,7 @@ int32_t iguana_signrawtransaction(void *ctx,char *symbol,uint8_t wiftaddr,uint8_ struct LP_address_utxo *LP_address_utxofind(struct iguana_info *coin,char *coinaddr,bits256 txid,int32_t vout); int64_t LP_myzcredits(); void LP_instantdex_depositadd(char *coinaddr,bits256 txid); +int64_t LP_instantdex_creditcalc(struct iguana_info *coin,int32_t dispflag,bits256 txid,char *refaddr); int32_t LP_destaddr(char *destaddr,cJSON *item); int32_t LP_waitmempool(char *symbol,char *coinaddr,bits256 txid,int32_t vout,int32_t duration); cJSON *LP_statslog_disp(uint32_t starttime,uint32_t endtime,char *refgui,bits256 refpubkey,char *refbase,char *refrel); diff --git a/iguana/exchanges/LP_instantdex.c b/iguana/exchanges/LP_instantdex.c index bbd84bd0e..32694fd0f 100644 --- a/iguana/exchanges/LP_instantdex.c +++ b/iguana/exchanges/LP_instantdex.c @@ -114,7 +114,8 @@ void LP_instantdex_filescreate(char *coinaddr) void LP_instantdex_depositadd(char *coinaddr,bits256 txid) { static FILE *depositsfp; - char fname[512],str[65],*addr; bits256 prevtxid; cJSON *array,*txobj; int32_t i,n,iter; + struct iguana_info *coin; char fname[512],*addr; bits256 prevtxid; cJSON *array; int32_t i,n,iter; + coin = LP_coinfind("KMD"); if ( depositsfp == 0 ) { sprintf(fname,"%s/deposits.%s",GLOBAL_DBDIR,coinaddr), OS_compatible_path(fname); @@ -126,7 +127,7 @@ void LP_instantdex_depositadd(char *coinaddr,bits256 txid) if ( iter < 2 ) addr = coinaddr; else addr = ""; - if ( (array= LP_instantdex_txids(iter&1,addr)) != 0 ) + if ( coin != 0 && (array= LP_instantdex_txids(iter&1,addr)) != 0 ) { if ( (n= cJSON_GetArraySize(array)) > 0 ) { @@ -134,15 +135,11 @@ void LP_instantdex_depositadd(char *coinaddr,bits256 txid) { prevtxid = jbits256i(array,i); //printf("instantdex iter.%d i.%d check %s\n",iter,i,bits256_str(str,prevtxid)); - if ( (txobj= LP_gettxout("KMD",coinaddr,prevtxid,0)) != 0 ) - free_json(txobj); - else + if ( LP_instantdex_creditcalc(coin,0,prevtxid,coinaddr) > 0 ) { - printf("null gettxout %s %s\n",coinaddr,bits256_str(str,prevtxid)); - continue; + LP_instantdex_deposituniq(depositsfp,prevtxid); + fflush(depositsfp); } - LP_instantdex_deposituniq(depositsfp,prevtxid); - fflush(depositsfp); } } free_json(array);