Browse Source

Test

etomic
jl777 8 years ago
parent
commit
04f0146676
  1. 8
      basilisk/basilisk_DEX.c
  2. 3
      iguana/main.c
  3. 2
      includes/iguana_structs.h

8
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->src,&serialized[len],sizeof(rp->src)), len += sizeof(rp->src);
memcpy(rp->dest,&serialized[len],sizeof(rp->dest)), len += sizeof(rp->dest); 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->DEXselector),&rp->DEXselector);
len += iguana_rwnum(rwflag,&serialized[len],sizeof(rp->extraspace),&rp->extraspace); //len += iguana_rwnum(rwflag,&serialized[len],sizeof(rp->extraspace),&rp->extraspace);
if ( rp->quoteid != 0 && basilisk_quoteid(rp) != rp->quoteid ) 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); 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 ) if ( basilisk_requestid(rp) != rp->requestid )
@ -170,7 +170,7 @@ cJSON *basilisk_requestjson(struct basilisk_request *rp)
jaddnum(item,"timestamp",rp->timestamp); jaddnum(item,"timestamp",rp->timestamp);
jaddnum(item,"requestid",rp->requestid); jaddnum(item,"requestid",rp->requestid);
jaddnum(item,"quoteid",rp->quoteid); jaddnum(item,"quoteid",rp->quoteid);
jaddnum(item,"DEXselector",rp->DEXselector); //jaddnum(item,"DEXselector",rp->DEXselector);
jaddnum(item,"optionhours",rp->optionhours); jaddnum(item,"optionhours",rp->optionhours);
jaddnum(item,"profit",(double)rp->profitmargin / 1000000.); jaddnum(item,"profit",(double)rp->profitmargin / 1000000.);
if ( rp->quoteid != 0 && basilisk_quoteid(rp) != rp->quoteid ) 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->srchash = jbits256(valsobj,"srchash");
rp->optionhours = jint(valsobj,"optionhours"); rp->optionhours = jint(valsobj,"optionhours");
rp->profitmargin = jdouble(valsobj,"profit") * 1000000; rp->profitmargin = jdouble(valsobj,"profit") * 1000000;
rp->DEXselector = DEXselector; //rp->DEXselector = DEXselector;
strncpy(rp->src,src,sizeof(rp->src)-1); strncpy(rp->src,src,sizeof(rp->src)-1);
strncpy(rp->dest,dest,sizeof(rp->dest)-1); strncpy(rp->dest,dest,sizeof(rp->dest)-1);
//if ( jstr(valsobj,"relay") != 0 ) //if ( jstr(valsobj,"relay") != 0 )

3
iguana/main.c

@ -755,6 +755,9 @@ void jumblr_loop(void *ptr)
{ {
if ( (coin= iguana_coinfind("KMD")) != 0 ) if ( (coin= iguana_coinfind("KMD")) != 0 )
{ {
#ifdef __APPLE__
jumblr_DEXcheck(myinfo,coin);
#endif
if ( myinfo->jumblr_passphrase[0] != 0 && coin->FULLNODE < 0 ) if ( myinfo->jumblr_passphrase[0] != 0 && coin->FULLNODE < 0 )
{ {
// if BTC has arrived in destination address, invoke DEX -> BTC // if BTC has arrived in destination address, invoke DEX -> BTC

2
includes/iguana_structs.h

@ -604,7 +604,7 @@ struct basilisk_request
char src[8],dest[8]; char src[8],dest[8];
//char volatile_start,message[43]; //char volatile_start,message[43];
uint64_t destamount; uint64_t destamount;
int32_t optionhours,profitmargin,DEXselector,extraspace; int32_t optionhours,profitmargin;//,DEXselector,extraspace;
} PACKEDSTRUCT; } PACKEDSTRUCT;
struct basilisk_relaystatus struct basilisk_relaystatus

Loading…
Cancel
Save