From 52690233a3cab3a9ca5909dbe38a4d7a5f31a3cf Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 26 Sep 2017 21:15:44 +0200 Subject: [PATCH] Test --- iguana/exchanges/LP_ordermatch.c | 6 +++--- iguana/exchanges/LP_rpc.c | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/iguana/exchanges/LP_ordermatch.c b/iguana/exchanges/LP_ordermatch.c index 70f49c12a..06ca2e6a0 100644 --- a/iguana/exchanges/LP_ordermatch.c +++ b/iguana/exchanges/LP_ordermatch.c @@ -26,11 +26,11 @@ uint64_t LP_txfeecalc(struct iguana_info *coin,uint64_t txfee) if ( strcmp(coin->symbol,"BTC") == 0 ) { coin->rate = LP_getestimatedrate(coin); - if ( (txfee= coin->rate * LP_AVETXSIZE) <= LP_MIN_TXFEE ) + if ( (txfee= SATOSHIDEN * coin->rate * LP_AVETXSIZE) <= LP_MIN_TXFEE ) { - coin->rate = 0.; + coin->rate = -1.; coin->rate = _LP_getestimatedrate(coin); - if ( (txfee= coin->rate * LP_AVETXSIZE) <= LP_MIN_TXFEE ) + if ( (txfee= SATOSHIDEN * coin->rate * LP_AVETXSIZE) <= LP_MIN_TXFEE ) txfee = LP_MIN_TXFEE; } } else txfee = coin->txfee; diff --git a/iguana/exchanges/LP_rpc.c b/iguana/exchanges/LP_rpc.c index d1b0d5b3c..f7b065506 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 ( time(NULL) > coin->ratetime+30 ) + if ( coin->rate < 0. || 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 ) @@ -631,11 +631,10 @@ double LP_getestimatedrate(struct iguana_info *coin) { double rate = 0.00000020; if ( coin == 0 ) - return(0.0001); - if ( (rate= _LP_getestimatedrate(coin)) != 0. ) - coin->txfee = LP_AVETXSIZE * (coin->rate * SATOSHIDEN); - else rate = dstr(coin->txfee) / LP_AVETXSIZE; - return(SATOSHIDEN * rate); + return(rate); + if ( (rate= _LP_getestimatedrate(coin)) <= 0. ) + rate = dstr(coin->txfee) / LP_AVETXSIZE; + return(rate); } char *LP_sendrawtransaction(char *symbol,char *signedtx)