From d5b515f60de8a077b3b10753778605ccebcca505 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 23 May 2017 19:31:21 +0300 Subject: [PATCH] Test --- crypto777/bitcoind_RPC.c | 2 +- iguana/dpow/dpow_network.c | 5 ++++- iguana/exchanges/LP_unspents.c | 2 +- iguana/exchanges/mm.c | 2 +- iguana/iguana777.h | 2 +- iguana/iguana_notary.c | 1 + 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/crypto777/bitcoind_RPC.c b/crypto777/bitcoind_RPC.c index d10e23671..db54e4317 100755 --- a/crypto777/bitcoind_RPC.c +++ b/crypto777/bitcoind_RPC.c @@ -153,7 +153,7 @@ try_again: curl_easy_setopt(curl_handle,CURLOPT_WRITEDATA, &s); // we pass our 's' struct to the callback curl_easy_setopt(curl_handle,CURLOPT_NOSIGNAL, 1L); // supposed to fix "Alarm clock" and long jump crash curl_easy_setopt(curl_handle,CURLOPT_NOPROGRESS, 1L); // no progress callback - curl_easy_setopt(curl_handle,CURLOPT_TIMEOUT, 6L); + //curl_easy_setopt(curl_handle,CURLOPT_TIMEOUT, 60L); // causes problems with iguana timeouts if ( strncmp(url,"https",5) == 0 ) { curl_easy_setopt(curl_handle,CURLOPT_SSL_VERIFYPEER,0); diff --git a/iguana/dpow/dpow_network.c b/iguana/dpow/dpow_network.c index 38789f35c..9eafc39be 100755 --- a/iguana/dpow/dpow_network.c +++ b/iguana/dpow/dpow_network.c @@ -1183,7 +1183,10 @@ char *_dex_listunspentarg(struct supernet_info *myinfo,char *symbol,char *addres char *_dex_listunspent(struct supernet_info *myinfo,char *symbol,char *address) { - return(_dex_listunspentarg(myinfo,symbol,address,'u')); // 'U' old variant + char *retstr; + retstr = _dex_listunspentarg(myinfo,symbol,address,'u'); // 'U' old variant + //printf("_dex_listunspent.(%s)\n",retstr); + return(retstr); } char *_dex_listunspent2(struct supernet_info *myinfo,char *symbol,char *address) diff --git a/iguana/exchanges/LP_unspents.c b/iguana/exchanges/LP_unspents.c index 513fe7924..143c1bf06 100644 --- a/iguana/exchanges/LP_unspents.c +++ b/iguana/exchanges/LP_unspents.c @@ -292,7 +292,7 @@ void LPinit(uint16_t port,double profitmargin) } } } - sleep(10); + sleep(60); } } diff --git a/iguana/exchanges/mm.c b/iguana/exchanges/mm.c index e40509cd2..daeeefe26 100644 --- a/iguana/exchanges/mm.c +++ b/iguana/exchanges/mm.c @@ -181,7 +181,7 @@ char *DEX_listunspent(char *coin,char *coinaddr) { char url[512],postdata[1024]; sprintf(url,"%s/?",IGUANA_URL); - sprintf(postdata,"{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"%s\",\"symbol\":\"%s\"}",coinaddr,coin); + sprintf(postdata,"{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"%s\",\"symbol\":\"%s\",\"timeout\":60000}",coinaddr,coin); return(bitcoind_RPC(0,"dex",url,0,"listunspent",postdata)); } diff --git a/iguana/iguana777.h b/iguana/iguana777.h index 778ab3806..74412e6f0 100755 --- a/iguana/iguana777.h +++ b/iguana/iguana777.h @@ -167,7 +167,7 @@ struct supernet_info #ifdef NOTARY_TESTMODE char dexseed_ipaddrs[1][64]; #else - char dexseed_ipaddrs[8][64]; + char dexseed_ipaddrs[4][64]; #endif uint32_t dexipbits[128]; int32_t numdexipbits; portable_mutex_t dexmutex; // compatibility diff --git a/iguana/iguana_notary.c b/iguana/iguana_notary.c index c70a4c408..e7c02acda 100755 --- a/iguana/iguana_notary.c +++ b/iguana/iguana_notary.c @@ -679,6 +679,7 @@ TWO_STRINGS(dex,listunspent,symbol,address) } else if ( coin != 0 && coin->FULLNODE < 0 ) return(jprint(dpow_listunspent(myinfo,coin,address),1)); + //printf("call _dex_listunspent\n"); return(_dex_listunspent(myinfo,symbol,address)); }