From 40a013fe43494b3dbc2ca06aa2f0a6ceb0a40b65 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 26 Sep 2017 21:09:18 +0200 Subject: [PATCH] Test --- iguana/exchanges/LP_rpc.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/iguana/exchanges/LP_rpc.c b/iguana/exchanges/LP_rpc.c index 63b8a02b1..d1b0d5b3c 100644 --- a/iguana/exchanges/LP_rpc.c +++ b/iguana/exchanges/LP_rpc.c @@ -598,7 +598,7 @@ int32_t LP_importaddress(char *symbol,char *address) double _LP_getestimatedrate(struct iguana_info *coin) { char buf[512],*retstr; cJSON *errjson; double rate = 0.00000020; - if ( coin->rate == 0. || time(NULL) > coin->ratetime+30 ) + if ( time(NULL) > coin->ratetime+30 ) { sprintf(buf,"[%d]",strcmp(coin->symbol,"BTC") == 0 ? 6 : 2); if ( (retstr= LP_apicall(coin,coin->electrum==0?"estimatefee" : "blockchain.estimatefee",buf)) != 0 ) @@ -623,7 +623,7 @@ double _LP_getestimatedrate(struct iguana_info *coin) } free(retstr); } - } + } else rate = coin->rate; return(rate); } @@ -632,12 +632,9 @@ double LP_getestimatedrate(struct iguana_info *coin) double rate = 0.00000020; if ( coin == 0 ) return(0.0001); - if ( coin->txfee == 0 || coin->rate == 0. || time(NULL) > coin->ratetime+600 ) - { - rate = _LP_getestimatedrate(coin); - if ( rate != 0. ) - coin->txfee = SATOSHIDEN * (coin->rate * LP_AVETXSIZE); - } else return((double)coin->txfee / (LP_AVETXSIZE * SATOSHIDEN)); + if ( (rate= _LP_getestimatedrate(coin)) != 0. ) + coin->txfee = LP_AVETXSIZE * (coin->rate * SATOSHIDEN); + else rate = dstr(coin->txfee) / LP_AVETXSIZE; return(SATOSHIDEN * rate); }