diff --git a/iguana/iguana_instantdex.c b/iguana/iguana_instantdex.c index af9bc92df..b7dc24ed4 100755 --- a/iguana/iguana_instantdex.c +++ b/iguana/iguana_instantdex.c @@ -1135,7 +1135,7 @@ char *InstantDEX_hexmsg(struct supernet_info *myinfo,void *ptr,int32_t len,char else if ( (signerbits= acct777_validate(&msg->sig,acct777_msgprivkey(serdata,datalen),msg->sig.pubkey)) != 0 || 1 ) { flag++; - printf("InstantDEX_hexmsg <<<<<<<<<<<<< sigsize.%ld VALIDATED [%ld] len.%d t%u allocsize.%d (%s) [%d]\n",sizeof(msg->sig),(long)serdata-(long)msg,datalen,msg->sig.timestamp,msg->sig.allocsize,(char *)msg->serialized,serdata[datalen-1]); + //printf("InstantDEX_hexmsg <<<<<<<<<<<<< sigsize.%ld VALIDATED [%ld] len.%d t%u allocsize.%d (%s) [%d]\n",sizeof(msg->sig),(long)serdata-(long)msg,datalen,msg->sig.timestamp,msg->sig.allocsize,(char *)msg->serialized,serdata[datalen-1]); newlen = (int32_t)(msg->sig.allocsize - ((long)msg->serialized - (long)msg)); serdata = msg->serialized; //printf("newlen.%d diff.%ld alloc.%d datalen.%d\n",newlen,((long)msg->serialized - (long)msg),msg->sig.allocsize,datalen); @@ -1221,13 +1221,16 @@ void instantdex_update(struct supernet_info *myinfo) { struct instantdex_msghdr *pm; struct category_msg *m; bits256 instantdexhash; char *str,remote[64]; queue_t *Q; struct queueitem *item; instantdexhash = calc_categoryhashes(0,"InstantDEX",0); - //char str[65]; printf("getmsg.(%s) %llx\n",bits256_str(str,categoryhash),(long long)subhash.txid); + //char str2[65]; printf("instantdexhash.(%s)\n",bits256_str(str2,instantdexhash)); if ( (Q= category_Q(instantdexhash,myinfo->myaddr.persistent)) != 0 && queue_size(Q) > 0 && (item= Q->list) != 0 ) { m = (void *)item; - if ( m->remoteipbits == 0 && (m= queue_dequeue(Q,0)) ) + m= queue_dequeue(Q,0); + pm = (struct instantdex_msghdr *)m->msg; + //printf("loop cmd.(%s)\n",pm->cmd); + //if ( m->remoteipbits == 0 && (m= queue_dequeue(Q,0)) ) { - if ( (void *)m == (void *)item ) + //if ( (void *)m == (void *)item ) { pm = (struct instantdex_msghdr *)m->msg; if ( m->remoteipbits != 0 ) @@ -1235,7 +1238,7 @@ void instantdex_update(struct supernet_info *myinfo) else remote[0] = 0; if ( (str= InstantDEX_hexmsg(myinfo,pm,m->len,remote)) != 0 ) free(str); - } else printf("instantdex_update: unexpected m.%p changed item.%p\n",m,item); + } //else printf("instantdex_update: unexpected m.%p changed item.%p\n",m,item); free(m); } } diff --git a/iguana/swaps/iguana_BTCswap.c b/iguana/swaps/iguana_BTCswap.c index 8d43947f3..b6ac2ee49 100755 --- a/iguana/swaps/iguana_BTCswap.c +++ b/iguana/swaps/iguana_BTCswap.c @@ -165,9 +165,8 @@ int32_t instantdex_feetxverify(struct supernet_info *myinfo,struct iguana_info * } } else printf("pk_scriptlen %d mismatch %d\n",msgtx.vouts[0].pk_scriptlen,n); free_json(txobj); - } printf("error converting (%s) txobj\n",swap->otherfeetx); + } else printf("error converting (%s) txobj\n",swap->otherfeetx); } else printf("no feetx to verify\n"); - return(0); return(retval); }