diff --git a/basilisk/basilisk.c b/basilisk/basilisk.c index 05e5a49e0..b498c8534 100755 --- a/basilisk/basilisk.c +++ b/basilisk/basilisk.c @@ -633,7 +633,8 @@ void basilisk_msgprocess(struct supernet_info *myinfo,void *_addr,uint32_t sende CMD[i] = toupper((int32_t)CMD[i]); cmd[i] = tolower((int32_t)CMD[i]); } - printf("MSGPROCESS.(%s) tag.%d\n",(char *)data,basilisktag); + if ( strcmp(CMD,"RID") != 0 ) + printf("MSGPROCESS %s.(%s) tag.%d\n",CMD,(char *)data,basilisktag); myinfo->basilisk_busy = 1; if ( valsobj != 0 ) { diff --git a/basilisk/basilisk_DEX.c b/basilisk/basilisk_DEX.c index f351737ff..1e56e36bd 100755 --- a/basilisk/basilisk_DEX.c +++ b/basilisk/basilisk_DEX.c @@ -53,6 +53,7 @@ int32_t basilisk_rwDEXquote(int32_t rwflag,uint8_t *serialized,struct basilisk_r len += iguana_rwnum(rwflag,&serialized[len],sizeof(rp->requestid),&rp->requestid); len += iguana_rwnum(rwflag,&serialized[len],sizeof(rp->timestamp),&rp->timestamp); // must be 2nd len += iguana_rwnum(rwflag,&serialized[len],sizeof(rp->quoteid),&rp->quoteid); + len += iguana_rwnum(rwflag,&serialized[len],sizeof(rp->quotetime),&rp->quotetime); len += iguana_rwnum(rwflag,&serialized[len],sizeof(rp->relaybits),&rp->relaybits); len += iguana_rwnum(rwflag,&serialized[len],sizeof(rp->srcamount),&rp->srcamount); len += iguana_rwnum(rwflag,&serialized[len],sizeof(rp->minamount),&rp->minamount); @@ -109,6 +110,7 @@ struct basilisk_request *basilisk_parsejson(struct basilisk_request *rp,cJSON *r if ( jstr(reqjson,"relay") != 0 ) rp->relaybits = (uint32_t)calc_ipbits(jstr(reqjson,"relay")); rp->timestamp = juint(reqjson,"timestamp"); + rp->quotetime = juint(reqjson,"quotetime"); safecopy(rp->src,jstr(reqjson,"src"),sizeof(rp->src)); safecopy(rp->dest,jstr(reqjson,"dest"),sizeof(rp->dest)); /*if ( jobj(reqjson,"message") != 0 ) @@ -147,6 +149,7 @@ cJSON *basilisk_requestjson(uint32_t relaybits,struct basilisk_request *rp) jaddstr(item,"dest",rp->dest); if ( rp->destamount != 0 ) jadd64bits(item,"destamount",rp->destamount); + jaddnum(item,"quotetime",rp->quotetime); jaddnum(item,"timestamp",rp->timestamp); jaddnum(item,"requestid",rp->requestid); jaddnum(item,"quoteid",rp->quoteid);