diff --git a/basilisk/basilisk.c b/basilisk/basilisk.c index 6f20cabd6..3d18f3b8f 100755 --- a/basilisk/basilisk.c +++ b/basilisk/basilisk.c @@ -209,7 +209,7 @@ int32_t basilisk_sendcmd(struct supernet_info *myinfo,char *destipaddr,char *typ } if ( basilisk_notarycmd(type) != 0 && myinfo->NOTARY.NUMRELAYS == 0 ) { - printf("no notary nodes to send (%s) to\n",type); + //printf("no notary nodes to send (%s) to\n",type); return(-1); } //portable_mutex_lock(&myinfo->allcoins_mutex); @@ -900,6 +900,8 @@ void basilisks_loop(void *arg) endmilli = startmilli + 1000; else endmilli = startmilli + 2000; } + //if ( myinfo->expiration != 0 && (myinfo->IAMLP != 0 || myinfo->DEXactive > time(NULL)) ) + // basilisk_requests_poll(myinfo); //printf("RELAYID.%d endmilli %f vs now %f\n",myinfo->NOTARY.RELAYID,endmilli,OS_milliseconds()); while ( OS_milliseconds() < endmilli ) usleep(10000); diff --git a/basilisk/basilisk_DEX.c b/basilisk/basilisk_DEX.c index d643c81ab..832a05cf2 100755 --- a/basilisk/basilisk_DEX.c +++ b/basilisk/basilisk_DEX.c @@ -216,6 +216,7 @@ int32_t basilisk_request_create(struct basilisk_request *rp,cJSON *valsobj,bits2 //if ( jstr(valsobj,"relay") != 0 ) // rp->relaybits = (uint32_t)calc_ipbits(jstr(valsobj,"relay")); rp->requestid = basilisk_requestid(rp); + printf("set requestid <- %u\n",rp->requestid); if ( rp->destamount != 0 && bits256_nonz(rp->desthash) != 0 ) { rp->quoteid = basilisk_quoteid(rp); diff --git a/basilisk/basilisk_MSG.c b/basilisk/basilisk_MSG.c index c4e0bb4b1..1d192e2ed 100755 --- a/basilisk/basilisk_MSG.c +++ b/basilisk/basilisk_MSG.c @@ -216,9 +216,9 @@ char *basilisk_respond_addmessage(struct supernet_info *myinfo,uint8_t *key,int3 msg->expiration = (uint32_t)time(NULL) + duration; HASH_ADD_KEYPTR(hh,myinfo->messagetable,msg->key,msg->keylen,msg); QUEUEITEMS++; - //int32_t i; for (i=0; iexpiration,msg,msg->hh.next,msg->hh.prev); + int32_t i; for (i=0; iexpiration,msg,msg->hh.next,msg->hh.prev); portable_mutex_unlock(&myinfo->messagemutex); //if ( myinfo->NOTARY.RELAYID >= 0 ) // dpow_handler(myinfo,msg); @@ -292,7 +292,7 @@ HASH_ARRAY_STRING(basilisk,sendmessage,hash,vals,hexstr) { int32_t keylen,datalen; uint8_t key[BASILISK_KEYSIZE],space[16384],*data,*ptr = 0; char *retstr=0; data = get_dataptr(BASILISK_HDROFFSET,&ptr,&datalen,&space[BASILISK_KEYSIZE],sizeof(space)-BASILISK_KEYSIZE,hexstr); - if ( myinfo->IAMNOTARY != 0 && myinfo->NOTARY.RELAYID >= 0 ) + //if ( myinfo->IAMNOTARY != 0 && myinfo->NOTARY.RELAYID >= 0 ) { keylen = basilisk_messagekey(key,juint(vals,"channel"),juint(vals,"msgid"),jbits256(vals,"srchash"),jbits256(vals,"desthash")); memcpy(space,key,BASILISK_KEYSIZE); @@ -304,7 +304,7 @@ HASH_ARRAY_STRING(basilisk,sendmessage,hash,vals,hexstr) free(ptr); if ( retstr != 0 ) free(retstr); - } else printf("not notary.%d relayid.%d\n",myinfo->IAMNOTARY,myinfo->NOTARY.RELAYID); + } //else printf("not notary.%d relayid.%d\n",myinfo->IAMNOTARY,myinfo->NOTARY.RELAYID); if ( vals != 0 && juint(vals,"fanout") == 0 ) jaddnum(vals,"fanout",MAX(8,(int32_t)sqrt(myinfo->NOTARY.NUMRELAYS)+2)); if ( data != 0 && datalen != 0 ) diff --git a/basilisk/basilisk_tradebot.c b/basilisk/basilisk_tradebot.c index 8930d28bf..d67b7150d 100755 --- a/basilisk/basilisk_tradebot.c +++ b/basilisk/basilisk_tradebot.c @@ -410,7 +410,7 @@ double basilisk_request_listprocess(struct supernet_info *myinfo,struct basilisk } } else noquoteflag++; } - //printf("%s -> %s myrequest.%d pendingid.%u noquoteflag.%d havequoteflag.%d maxi.%d %.8f\n",list[0].src,list[0].dest,myrequest,pendingid,noquoteflag,havequoteflag,maxi,dstr(maxamount)); + printf("%s -> %s myrequest.%d pendingid.%u noquoteflag.%d havequoteflag.%d maxi.%d %.8f\n",list[0].src,list[0].dest,myrequest,pendingid,noquoteflag,havequoteflag,maxi,dstr(maxamount)); double retvals[4],refprice,profitmargin,aveprice; cJSON *retjson; char *retstr; if ( myinfo->IAMLP != 0 && myrequest == 0 && pendingid == 0 && noquoteflag != 0 && (profitmargin= tradebot_liquidity_active(myinfo,&refprice,list[0].src,list[0].dest)) > 0. ) { diff --git a/iguana/iguana777.c b/iguana/iguana777.c index 4d58b2f8c..82c3830d6 100755 --- a/iguana/iguana777.c +++ b/iguana/iguana777.c @@ -893,11 +893,11 @@ void iguana_coinloop(void *arg) { if ( coin->FULLNODE < 0 ) continue; - if ( strcmp(coin->symbol,"RELAY") == 0 ) + /*if ( strcmp(coin->symbol,"RELAY") == 0 ) { if ( myinfo->expiration != 0 && (myinfo->IAMLP != 0 || myinfo->DEXactive > now) ) basilisk_requests_poll(myinfo); - } + }*/ if ( n > 1 && coin->RTheight > 0 && (rand() % 10) != 0 ) continue; if ( coin->peers == 0 )