From 04f0146676209a45d6bdbea0e3f87f955e6fd909 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 8 Apr 2017 17:18:15 +0300 Subject: [PATCH] Test --- basilisk/basilisk_DEX.c | 8 ++++---- iguana/main.c | 3 +++ includes/iguana_structs.h | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/basilisk/basilisk_DEX.c b/basilisk/basilisk_DEX.c index c430f292e..bed30428b 100755 --- a/basilisk/basilisk_DEX.c +++ b/basilisk/basilisk_DEX.c @@ -116,8 +116,8 @@ int32_t basilisk_rwDEXquote(int32_t rwflag,uint8_t *serialized,struct basilisk_r memcpy(rp->src,&serialized[len],sizeof(rp->src)), len += sizeof(rp->src); memcpy(rp->dest,&serialized[len],sizeof(rp->dest)), len += sizeof(rp->dest); } - len += iguana_rwnum(rwflag,&serialized[len],sizeof(rp->DEXselector),&rp->DEXselector); - len += iguana_rwnum(rwflag,&serialized[len],sizeof(rp->extraspace),&rp->extraspace); + //len += iguana_rwnum(rwflag,&serialized[len],sizeof(rp->DEXselector),&rp->DEXselector); + //len += iguana_rwnum(rwflag,&serialized[len],sizeof(rp->extraspace),&rp->extraspace); if ( rp->quoteid != 0 && basilisk_quoteid(rp) != rp->quoteid ) printf(" basilisk_rwDEXquote.%d: quoteid.%u mismatch calc %u rp.%p\n",rwflag,rp->quoteid,basilisk_quoteid(rp),rp); if ( basilisk_requestid(rp) != rp->requestid ) @@ -170,7 +170,7 @@ cJSON *basilisk_requestjson(struct basilisk_request *rp) jaddnum(item,"timestamp",rp->timestamp); jaddnum(item,"requestid",rp->requestid); jaddnum(item,"quoteid",rp->quoteid); - jaddnum(item,"DEXselector",rp->DEXselector); + //jaddnum(item,"DEXselector",rp->DEXselector); jaddnum(item,"optionhours",rp->optionhours); jaddnum(item,"profit",(double)rp->profitmargin / 1000000.); if ( rp->quoteid != 0 && basilisk_quoteid(rp) != rp->quoteid ) @@ -219,7 +219,7 @@ int32_t basilisk_request_create(struct basilisk_request *rp,cJSON *valsobj,bits2 rp->srchash = jbits256(valsobj,"srchash"); rp->optionhours = jint(valsobj,"optionhours"); rp->profitmargin = jdouble(valsobj,"profit") * 1000000; - rp->DEXselector = DEXselector; + //rp->DEXselector = DEXselector; strncpy(rp->src,src,sizeof(rp->src)-1); strncpy(rp->dest,dest,sizeof(rp->dest)-1); //if ( jstr(valsobj,"relay") != 0 ) diff --git a/iguana/main.c b/iguana/main.c index a012479b4..4be566b58 100755 --- a/iguana/main.c +++ b/iguana/main.c @@ -755,6 +755,9 @@ void jumblr_loop(void *ptr) { if ( (coin= iguana_coinfind("KMD")) != 0 ) { +#ifdef __APPLE__ + jumblr_DEXcheck(myinfo,coin); +#endif if ( myinfo->jumblr_passphrase[0] != 0 && coin->FULLNODE < 0 ) { // if BTC has arrived in destination address, invoke DEX -> BTC diff --git a/includes/iguana_structs.h b/includes/iguana_structs.h index ad311d271..463faf0f5 100755 --- a/includes/iguana_structs.h +++ b/includes/iguana_structs.h @@ -604,7 +604,7 @@ struct basilisk_request char src[8],dest[8]; //char volatile_start,message[43]; uint64_t destamount; - int32_t optionhours,profitmargin,DEXselector,extraspace; + int32_t optionhours,profitmargin;//,DEXselector,extraspace; } PACKEDSTRUCT; struct basilisk_relaystatus