From 1c3ed5a4e86ebde0581ac08be2ee7f9723f3576d Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 4 Mar 2017 17:59:37 +0200 Subject: [PATCH] Test --- .gitignore | 2 ++ basilisk/basilisk_DEX.c | 4 ++-- basilisk/basilisk_MSG.c | 2 +- basilisk/basilisk_bitcoin.c | 2 +- basilisk/basilisk_tradebot.c | 2 +- iguana/iguana_payments.c | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ba6f0a1f2..04fc232c4 100755 --- a/.gitignore +++ b/.gitignore @@ -160,3 +160,5 @@ iguana/help.json iguana/index7778.html *.json + +iguana/DB/KMD/utxo.dat diff --git a/basilisk/basilisk_DEX.c b/basilisk/basilisk_DEX.c index 5379c271a..85b9c5376 100755 --- a/basilisk/basilisk_DEX.c +++ b/basilisk/basilisk_DEX.c @@ -276,7 +276,7 @@ void basilisk_requests_poll(struct supernet_info *myinfo) { static uint32_t lastpoll; char *retstr; uint8_t data[32768]; cJSON *outerarray,*retjson; uint32_t msgid,channel; int32_t datalen,i,n; struct basilisk_request issueR; double hwm = 0.; - if ( time(NULL) < lastpoll+3 ) + if ( time(NULL) < lastpoll+13 ) return; lastpoll = (uint32_t)time(NULL); memset(&issueR,0,sizeof(issueR)); @@ -570,7 +570,7 @@ cJSON *basilisk_unspents(struct supernet_info *myinfo,struct iguana_info *coin,c } else if ( coin->FULLNODE == 0 ) { - if ( (retstr= _dex_listunspent(myinfo,coin->symbol,coinaddr)) != 0 ) + if ( (retstr= dex_listunspent(myinfo,coin,0,0,coin->symbol,coinaddr)) != 0 ) { unspents = cJSON_Parse(retstr); free(retstr); diff --git a/basilisk/basilisk_MSG.c b/basilisk/basilisk_MSG.c index fc2200360..4cf5b5f49 100755 --- a/basilisk/basilisk_MSG.c +++ b/basilisk/basilisk_MSG.c @@ -217,7 +217,7 @@ char *basilisk_respond_addmessage(struct supernet_info *myinfo,uint8_t *key,int3 HASH_ADD_KEYPTR(hh,myinfo->messagetable,msg->key,msg->keylen,msg); QUEUEITEMS++; portable_mutex_unlock(&myinfo->messagemutex); -//printf("add message keylen.%d [%d]\n",msg->keylen,datalen); +printf("add message keylen.%d [%d]\n",msg->keylen,datalen); //if ( myinfo->NOTARY.RELAYID >= 0 ) // dpow_handler(myinfo,msg); if ( sendping != 0 ) diff --git a/basilisk/basilisk_bitcoin.c b/basilisk/basilisk_bitcoin.c index ea1574e31..5864db483 100755 --- a/basilisk/basilisk_bitcoin.c +++ b/basilisk/basilisk_bitcoin.c @@ -769,7 +769,7 @@ char *basilisk_bitcoinrawtx(struct supernet_info *myinfo,struct iguana_info *coi addresses = iguana_getaddressesbyaccount(myinfo,coin,"*"); jadd(valsobj,"addresses",addresses); } - //printf("use addresses.(%s)\n",jprint(addresses,0)); + printf("use addresses.(%s)\n",jprint(addresses,0)); //printf("(%s) vals.(%s) change.(%s) spend.%s\n",coin->symbol,jprint(valsobj,0),changeaddr,spendscriptstr); if ( changeaddr == 0 || changeaddr[0] == 0 || spendscriptstr == 0 || spendscriptstr[0] == 0 ) return(clonestr("{\"error\":\"invalid changeaddr or spendscript or addresses\"}")); diff --git a/basilisk/basilisk_tradebot.c b/basilisk/basilisk_tradebot.c index 4ae47f069..d98bc1200 100755 --- a/basilisk/basilisk_tradebot.c +++ b/basilisk/basilisk_tradebot.c @@ -104,7 +104,7 @@ int32_t basilisk_swapconv(struct supernet_info *myinfo,struct basilisk_swap *swa if ( juint(obj,"requestid") == swap->I.req.requestid && juint(obj,"quoteid") == swap->I.req.quoteid ) return(0); printf("swapconv mismatched req/quote %d %d, %d %d\n",juint(obj,"requestid"),swap->I.req.requestid,juint(obj,"quoteid"),swap->I.req.quoteid); - } else printf("no info field in swap obj\n"); + } else printf("no info field in swap obj.(%s)\n",jprint(obj,0)); return(-1); } diff --git a/iguana/iguana_payments.c b/iguana/iguana_payments.c index 86f22cb3c..73b11d919 100755 --- a/iguana/iguana_payments.c +++ b/iguana/iguana_payments.c @@ -426,7 +426,7 @@ char *iguana_calcrawtx(struct supernet_info *myinfo,struct iguana_info *coin,cJS coinaddr = jstri(addresses,i); if ( (array= basilisk_unspents(myinfo,coin,coinaddr)) != 0 ) { - //printf("unspents.(%s) %s\n",coinaddr,jprint(array,0)); + printf("unspents.(%s) %s\n",coinaddr,jprint(array,0)); if ( (m= cJSON_GetArraySize(array)) > 0 ) { for (j=0; j