lukechilds
/
SuperNET
mirror of https://github.com/lukechilds/SuperNET.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Test

etomic
jl777 7 years ago
parent
9321ab763d
commit
2dfd937f90
11 changed files with 131 additions and 79 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      iguana/exchanges/LP_RTmetrics.c
  2. 12
      iguana/exchanges/LP_commands.c
  3. 2
      iguana/exchanges/LP_include.h
  4. 12
      iguana/exchanges/LP_instantdex.c
  5. 4
      iguana/exchanges/LP_nativeDEX.c
  6. 4
      iguana/exchanges/LP_ordermatch.c
  7. 4
      iguana/exchanges/LP_prices.c
  8. 29
      iguana/exchanges/LP_remember.c
  9. 135
      iguana/exchanges/LP_stats.c
  10. 4
      iguana/exchanges/LP_swap.c
  11. 2
      iguana/exchanges/LP_tradebots.c

2
iguana/exchanges/LP_RTmetrics.c
View File

@ -132,7 +132,7 @@ void LP_RTmetrics_swapsinfo(char *refbase,char *refrel,cJSON *swaps,int32_t nums
quoteid = juint(item,"quoteid"); quoteid = juint(item,"quoteid");
LP_RTmetrics_pendingswap(srcpub,LP_kmdvalue(base,basesatoshis)); LP_RTmetrics_pendingswap(srcpub,LP_kmdvalue(base,basesatoshis));
LP_RTmetrics_pendingswap(destpub,LP_kmdvalue(rel,relsatoshis)); LP_RTmetrics_pendingswap(destpub,LP_kmdvalue(rel,relsatoshis));
if ( 0 && (retstr= basilisk_swapentry(requestid,quoteid)) != 0 ) // no need for this if ( 0 && (retstr= basilisk_swapentry(requestid,quoteid,0)) != 0 ) // no need for this
{ {
if ( (swapjson= cJSON_Parse(retstr)) != 0 ) if ( (swapjson= cJSON_Parse(retstr)) != 0 )
{ {

12
iguana/exchanges/LP_commands.c
View File

@ -288,13 +288,13 @@ instantdex_claim()\n\
uint32_t requestid,quoteid; uint32_t requestid,quoteid;
if ( (requestid= juint(argjson,"requestid")) != 0 && (quoteid= juint(argjson,"quoteid")) != 0 ) if ( (requestid= juint(argjson,"requestid")) != 0 && (quoteid= juint(argjson,"quoteid")) != 0 )
{ {
return(basilisk_swapentry(requestid,quoteid)); return(basilisk_swapentry(requestid,quoteid,1));
} }
else if ( coin[0] != 0 ) else if ( coin[0] != 0 )
return(basilisk_swapentries(coin,0,jint(argjson,"limit"))); return(basilisk_swapentries(coin,0,jint(argjson,"limit")));
else if ( base[0] != 0 && rel[0] != 0 ) else if ( base[0] != 0 && rel[0] != 0 )
return(basilisk_swapentries(base,rel,jint(argjson,"limit"))); return(basilisk_swapentries(base,rel,jint(argjson,"limit")));
else return(basilisk_swaplist(0,0)); else return(basilisk_swaplist(0,0,0));
} }
else if ( strcmp(method,"dynamictrust") == 0 ) else if ( strcmp(method,"dynamictrust") == 0 )
{ {
@ -603,14 +603,10 @@ instantdex_claim()\n\
} }
argjson = reqjson; argjson = reqjson;
} }
if ( strcmp(method,"gettradestatus") == 0 )
retstr = clonestr("{\"result\":\"success\"}");
} }
else else
{ {
if ( strcmp(method,"gettradestatus") == 0 ) if ( strcmp(method,"tradesarray") == 0 )
return(LP_gettradestatus(j64bits(argjson,"aliceid")));
else if ( strcmp(method,"tradesarray") == 0 )
{ {
return(jprint(LP_tradesarray(base,rel,juint(argjson,"starttime"),juint(argjson,"endtime"),jint(argjson,"timescale")),1)); return(jprint(LP_tradesarray(base,rel,juint(argjson,"starttime"),juint(argjson,"endtime"),jint(argjson,"timescale")),1));
} }
@ -618,6 +614,8 @@ instantdex_claim()\n\
// received response // received response
if ( strcmp(method,"swapstatus") == 0 ) if ( strcmp(method,"swapstatus") == 0 )
return(LP_swapstatus_recv(argjson)); return(LP_swapstatus_recv(argjson));
else if ( strcmp(method,"gettradestatus") == 0 )
return(LP_gettradestatus(j64bits(argjson,"aliceid"),juint(argjson,"requestid"),juint(argjson,"quoteid")));
else if ( strcmp(method,"postprice") == 0 ) else if ( strcmp(method,"postprice") == 0 )
return(LP_postprice_recv(argjson)); return(LP_postprice_recv(argjson));
else if ( strcmp(method,"uitem") == 0 ) else if ( strcmp(method,"uitem") == 0 )

2
iguana/exchanges/LP_include.h
View File

@ -516,7 +516,7 @@ cJSON *LP_transactioninit(struct iguana_info *coin,bits256 txid,int32_t iter,cJS
int32_t LP_mempoolscan(char *symbol,bits256 searchtxid); int32_t LP_mempoolscan(char *symbol,bits256 searchtxid);
int32_t LP_txheight(struct iguana_info *coin,bits256 txid); int32_t LP_txheight(struct iguana_info *coin,bits256 txid);
int32_t LP_numpeers(); int32_t LP_numpeers();
char *basilisk_swapentry(uint32_t requestid,uint32_t quoteid); char *basilisk_swapentry(uint32_t requestid,uint32_t quoteid,int32_t forceflag);
int64_t LP_KMDvalue(struct iguana_info *coin,int64_t balance); int64_t LP_KMDvalue(struct iguana_info *coin,int64_t balance);
int32_t LP_address_utxoadd(uint32_t timestamp,char *debug,struct iguana_info *coin,char *coinaddr,bits256 txid,int32_t vout,uint64_t value,int32_t height,int32_t spendheight); int32_t LP_address_utxoadd(uint32_t timestamp,char *debug,struct iguana_info *coin,char *coinaddr,bits256 txid,int32_t vout,uint64_t value,int32_t height,int32_t spendheight);
void LP_smartutxos_push(struct iguana_info *coin); void LP_smartutxos_push(struct iguana_info *coin);

12
iguana/exchanges/LP_instantdex.c
View File

@ -447,7 +447,7 @@ int64_t LP_myzcredits()
cJSON *LP_swapstats_item(struct LP_swapstats *sp,int32_t iambob) cJSON *LP_swapstats_item(struct LP_swapstats *sp,int32_t iambob)
{ {
struct iguana_info *bob,*alice; int32_t flag = 0; cJSON *item; char *retstr; struct iguana_info *bob,*alice; int32_t flag = 0; bits256 zero; cJSON *item,*reqjson;
item = cJSON_CreateObject(); item = cJSON_CreateObject();
jaddnum(item,"iambob",iambob); jaddnum(item,"iambob",iambob);
jaddnum(item,"aliceid",sp->aliceid); jaddnum(item,"aliceid",sp->aliceid);
@ -475,8 +475,14 @@ cJSON *LP_swapstats_item(struct LP_swapstats *sp,int32_t iambob)
if ( sp->aliceneeds_dPoW == 1 ) if ( sp->aliceneeds_dPoW == 1 )
flag = 1; flag = 1;
} }
if ( flag != 0 && (retstr= LP_gettradestatus(sp->aliceid)) != 0 ) if ( flag != 0 )
free(retstr); {
reqjson = cJSON_CreateObject();
jaddstr(reqjson,"method","gettradestatus");
jadd64bits(reqjson,"aliceid",sp->aliceid);
memset(zero.bytes,0,sizeof(zero));
LP_reserved_msg(0,"","",zero,jprint(reqjson,1));
}
} }
return(item); return(item);
} }

4
iguana/exchanges/LP_nativeDEX.c
View File

@ -816,7 +816,7 @@ void LP_swapsloop(void *ctx)
while ( 1 ) while ( 1 )
{ {
LP_millistats_update(&LP_swapsloop_stats); LP_millistats_update(&LP_swapsloop_stats);
if ( (retstr= basilisk_swapentry(0,0)) != 0 ) if ( (retstr= basilisk_swapentry(0,0,0)) != 0 )
free(retstr); free(retstr);
sleep(600); sleep(600);
} }
@ -1319,7 +1319,7 @@ void LP_fromjs_iter()
{ {
LP_notify_pubkeys(ctx,LP_mypubsock); LP_notify_pubkeys(ctx,LP_mypubsock);
LP_privkey_updates(ctx,LP_mypubsock,0); LP_privkey_updates(ctx,LP_mypubsock,0);
if ( (retstr= basilisk_swapentry(0,0)) != 0 ) if ( (retstr= basilisk_swapentry(0,0,0)) != 0 )
free(retstr); free(retstr);
} }
} }

4
iguana/exchanges/LP_ordermatch.c
View File

@ -85,7 +85,7 @@ uint64_t LP_txfeecalc(struct iguana_info *coin,uint64_t txfee,int32_t txlen)
return(txfee); return(txfee);
} }
double LP_qprice_calc(int64_t *destsatoshisp,int64_t *satoshisp,double price,uint64_t b_satoshis,uint64_t txfee,uint64_t a_value,uint64_t maxdestsatoshis,uint64_t desttxfee) /*double LP_qprice_calc(int64_t *destsatoshisp,int64_t *satoshisp,double price,uint64_t b_satoshis,uint64_t txfee,uint64_t a_value,uint64_t maxdestsatoshis,uint64_t desttxfee)
{ {
uint64_t destsatoshis,satoshis; uint64_t destsatoshis,satoshis;
a_value -= (desttxfee + 1); a_value -= (desttxfee + 1);
@ -100,7 +100,7 @@ double LP_qprice_calc(int64_t *destsatoshisp,int64_t *satoshisp,double price,uin
if ( satoshis > 0 ) if ( satoshis > 0 )
return((double)destsatoshis / satoshis); return((double)destsatoshis / satoshis);
else return(0.); else return(0.);
} }*/
int32_t LP_quote_checkmempool(struct LP_quoteinfo *qp,struct LP_utxoinfo *autxo,struct LP_utxoinfo *butxo) int32_t LP_quote_checkmempool(struct LP_quoteinfo *qp,struct LP_utxoinfo *autxo,struct LP_utxoinfo *butxo)
{ {

4
iguana/exchanges/LP_prices.c
View File

@ -408,9 +408,9 @@ double LP_pricecache(struct LP_quoteinfo *qp,char *base,char *rel,bits256 txid,i
{ {
if ( qp != 0 ) if ( qp != 0 )
(*qp) = ptr->Q; (*qp) = ptr->Q;
if ( ptr->price == 0. && ptr->Q.satoshis != 0 ) if ( ptr->price == 0. && ptr->Q.satoshis > ptr->Q.txfee )
{ {
ptr->price = (double)ptr->Q.destsatoshis / ptr->Q.satoshis; ptr->price = (double)ptr->Q.destsatoshis / (ptr->Q.satoshis - ptr->Q.txfee);
if ( LP_pricevalid(ptr->price) <= 0 ) if ( LP_pricevalid(ptr->price) <= 0 )
ptr->price = 0.; ptr->price = 0.;
printf("LP_pricecache: set %s/%s ptr->price %.8f\n",base,rel,ptr->price); printf("LP_pricecache: set %s/%s ptr->price %.8f\n",base,rel,ptr->price);

29
iguana/exchanges/LP_remember.c
View File

@ -529,7 +529,7 @@ cJSON *LP_swap_json(struct LP_swap_remember *rswap)
return(item); return(item);
} }
int32_t LP_rswap_init(struct LP_swap_remember *rswap,uint32_t requestid,uint32_t quoteid) int32_t LP_rswap_init(struct LP_swap_remember *rswap,uint32_t requestid,uint32_t quoteid,int32_t forceflag)
{ {
char fname[1024],*fstr,*secretstr,*srcstr,*deststr,*dest33,*txname; long fsize; cJSON *item,*txobj,*array; bits256 privkey; struct iguana_info *coin; uint32_t r,q; int32_t i,j,n; uint8_t other33[33]; char fname[1024],*fstr,*secretstr,*srcstr,*deststr,*dest33,*txname; long fsize; cJSON *item,*txobj,*array; bits256 privkey; struct iguana_info *coin; uint32_t r,q; int32_t i,j,n; uint8_t other33[33];
memset(rswap,0,sizeof(*rswap)); memset(rswap,0,sizeof(*rswap));
@ -664,6 +664,8 @@ int32_t LP_rswap_init(struct LP_swap_remember *rswap,uint32_t requestid,uint32_t
} }
rswap->origfinishedflag = basilisk_swap_isfinished(rswap->iambob,rswap->txids,rswap->sentflags,rswap->paymentspent,rswap->Apaymentspent,rswap->depositspent); rswap->origfinishedflag = basilisk_swap_isfinished(rswap->iambob,rswap->txids,rswap->sentflags,rswap->paymentspent,rswap->Apaymentspent,rswap->depositspent);
rswap->finishedflag = rswap->origfinishedflag; rswap->finishedflag = rswap->origfinishedflag;
if ( forceflag != 0 )
rswap->finishedflag = rswap->origfinishedflag = 0;
free(fstr); free(fstr);
} }
return(rswap->iambob); return(rswap->iambob);
@ -694,7 +696,7 @@ int32_t LP_refht_update(char *symbol,bits256 txid)
return(0); return(0);
} }
int32_t LP_swap_load(struct LP_swap_remember *rswap) int32_t LP_swap_load(struct LP_swap_remember *rswap,int32_t forceflag)
{ {
int32_t i,needflag,addflag; long fsize; char fname[1024],*fstr,*symbol,*rstr; cJSON *txobj,*sentobj,*fileobj; bits256 txid,checktxid; uint64_t value; int32_t i,needflag,addflag; long fsize; char fname[1024],*fstr,*symbol,*rstr; cJSON *txobj,*sentobj,*fileobj; bits256 txid,checktxid; uint64_t value;
rswap->iambob = -1; rswap->iambob = -1;
@ -704,7 +706,8 @@ int32_t LP_swap_load(struct LP_swap_remember *rswap)
if ( (fileobj= cJSON_Parse(fstr)) != 0 ) if ( (fileobj= cJSON_Parse(fstr)) != 0 )
{ {
rswap->finishtime = juint(fileobj,"finishtime"); rswap->finishtime = juint(fileobj,"finishtime");
rswap->origfinishedflag = rswap->finishedflag = 1; if ( forceflag == 0 )
rswap->origfinishedflag = rswap->finishedflag = 1;
free_json(fileobj); free_json(fileobj);
} }
free(fstr); free(fstr);
@ -872,16 +875,16 @@ int32_t LP_spends_set(struct LP_swap_remember *rswap)
return(numspent); return(numspent);
} }
cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requestid,uint32_t quoteid) cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requestid,uint32_t quoteid,int32_t forceflag)
{ {
static void *ctx; static void *ctx;
struct LP_swap_remember rswap; int32_t i,j,flag,numspent,len,secretstart,redeemlen; char str[65],*srcAdest,*srcBdest,*destAdest,*destBdest,otheraddr[64]; cJSON *item,*txoutobj; bits256 rev,signedtxid,zero,deadtxid; struct iguana_info *bob=0,*alice=0; uint8_t redeemscript[1024],userdata[1024]; struct LP_swap_remember rswap; int32_t i,j,flag,numspent,len,secretstart,redeemlen; char str[65],*srcAdest,*srcBdest,*destAdest,*destBdest,otheraddr[64]; cJSON *item,*txoutobj; bits256 rev,signedtxid,zero,deadtxid; struct iguana_info *bob=0,*alice=0; uint8_t redeemscript[1024],userdata[1024];
if ( ctx == 0 ) if ( ctx == 0 )
ctx = bitcoin_ctx(); ctx = bitcoin_ctx();
if ( (rswap.iambob= LP_rswap_init(&rswap,requestid,quoteid)) < 0 ) if ( (rswap.iambob= LP_rswap_init(&rswap,requestid,quoteid,forceflag)) < 0 )
return(cJSON_Parse("{\"error\":\"couldnt initialize rswap, are all coins active?\"}")); return(cJSON_Parse("{\"error\":\"couldnt initialize rswap, are all coins active?\"}"));
decode_hex(deadtxid.bytes,32,"deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef"); decode_hex(deadtxid.bytes,32,"deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef");
LP_swap_load(&rswap); LP_swap_load(&rswap,forceflag);
memset(zero.bytes,0,sizeof(zero)); memset(zero.bytes,0,sizeof(zero));
otheraddr[0] = 0; otheraddr[0] = 0;
srcAdest = srcBdest = destAdest = destBdest = 0; srcAdest = srcBdest = destAdest = destBdest = 0;
@ -1185,7 +1188,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
return(item); return(item);
} }
char *basilisk_swaplist(uint32_t origrequestid,uint32_t origquoteid) char *basilisk_swaplist(uint32_t origrequestid,uint32_t origquoteid,int32_t forceflag)
{ {
uint64_t ridqids[4096],ridqid; char fname[512]; FILE *fp; cJSON *item,*retjson,*array,*totalsobj; uint32_t r,q,quoteid,requestid; int64_t KMDtotals[LP_MAXPRICEINFOS],BTCtotals[LP_MAXPRICEINFOS],Btotal,Ktotal; int32_t i,j,count=0; uint64_t ridqids[4096],ridqid; char fname[512]; FILE *fp; cJSON *item,*retjson,*array,*totalsobj; uint32_t r,q,quoteid,requestid; int64_t KMDtotals[LP_MAXPRICEINFOS],BTCtotals[LP_MAXPRICEINFOS],Btotal,Ktotal; int32_t i,j,count=0;
portable_mutex_lock(&LP_swaplistmutex); portable_mutex_lock(&LP_swaplistmutex);
@ -1198,7 +1201,7 @@ char *basilisk_swaplist(uint32_t origrequestid,uint32_t origquoteid)
if ( origrequestid != 0 && origquoteid != 0 ) if ( origrequestid != 0 && origquoteid != 0 )
{ {
//printf("orig req.%u q.%u\n",origrequestid,origquoteid); //printf("orig req.%u q.%u\n",origrequestid,origquoteid);
if ( (item= basilisk_remember(KMDtotals,BTCtotals,origrequestid,origquoteid)) != 0 ) if ( (item= basilisk_remember(KMDtotals,BTCtotals,origrequestid,origquoteid,forceflag)) != 0 )
jaddi(array,item); jaddi(array,item);
//printf("got.(%s)\n",jprint(item,0)); //printf("got.(%s)\n",jprint(item,0));
} }
@ -1237,7 +1240,7 @@ char *basilisk_swaplist(uint32_t origrequestid,uint32_t origquoteid)
{ {
if ( count < sizeof(ridqids)/sizeof(*ridqids) ) if ( count < sizeof(ridqids)/sizeof(*ridqids) )
ridqids[count++] = ridqid; ridqids[count++] = ridqid;
if ( (item= basilisk_remember(KMDtotals,BTCtotals,requestid,quoteid)) != 0 ) if ( (item= basilisk_remember(KMDtotals,BTCtotals,requestid,quoteid,0)) != 0 )
jaddi(array,item); jaddi(array,item);
} }
} }
@ -1270,12 +1273,12 @@ char *basilisk_swaplist(uint32_t origrequestid,uint32_t origquoteid)
return(jprint(retjson,1)); return(jprint(retjson,1));
} }
char *basilisk_swapentry(uint32_t requestid,uint32_t quoteid) char *basilisk_swapentry(uint32_t requestid,uint32_t quoteid,int32_t forceflag)
{ {
cJSON *item; int64_t KMDtotals[LP_MAXPRICEINFOS],BTCtotals[LP_MAXPRICEINFOS]; cJSON *item; int64_t KMDtotals[LP_MAXPRICEINFOS],BTCtotals[LP_MAXPRICEINFOS];
memset(KMDtotals,0,sizeof(KMDtotals)); memset(KMDtotals,0,sizeof(KMDtotals));
memset(BTCtotals,0,sizeof(BTCtotals)); memset(BTCtotals,0,sizeof(BTCtotals));
if ( (item= basilisk_remember(KMDtotals,BTCtotals,requestid,quoteid)) != 0 ) if ( (item= basilisk_remember(KMDtotals,BTCtotals,requestid,quoteid,forceflag)) != 0 )
return(jprint(item,1)); return(jprint(item,1));
else return(clonestr("{\"error\":\"cant find requestid-quoteid\"}")); else return(clonestr("{\"error\":\"cant find requestid-quoteid\"}"));
} }
@ -1365,7 +1368,7 @@ char *basilisk_swapentries(char *refbase,char *refrel,int32_t limit)
limit = 10; limit = 10;
memset(ridqids,0,sizeof(ridqids)); memset(ridqids,0,sizeof(ridqids));
retarray = cJSON_CreateArray(); retarray = cJSON_CreateArray();
if ( (liststr= basilisk_swaplist(0,0)) != 0 ) if ( (liststr= basilisk_swaplist(0,0,0)) != 0 )
{ {
//printf("swapentry.(%s)\n",liststr); //printf("swapentry.(%s)\n",liststr);
if ( (retjson= cJSON_Parse(liststr)) != 0 ) if ( (retjson= cJSON_Parse(liststr)) != 0 )
@ -1408,7 +1411,7 @@ char *basilisk_swapentries(char *refbase,char *refrel,int32_t limit)
//printf("j.%d count.%d %u %u ridqid.%16llx\n",j,count,requestid,quoteid,(long long)ridqid); //printf("j.%d count.%d %u %u ridqid.%16llx\n",j,count,requestid,quoteid,(long long)ridqid);
if ( j == count ) if ( j == count )
{ {
if ( (retstr2= basilisk_swapentry(requestid,quoteid)) != 0 ) if ( (retstr2= basilisk_swapentry(requestid,quoteid,0)) != 0 )
{ {
if ( (swapjson= cJSON_Parse(retstr2)) != 0 ) if ( (swapjson= cJSON_Parse(retstr2)) != 0 )
{ {

135
iguana/exchanges/LP_stats.c
View File

@ -24,6 +24,7 @@ struct LP_swapstats *LP_swapstats,*LP_RTstats;
int32_t LP_statslog_parsequote(char *method,cJSON *lineobj); int32_t LP_statslog_parsequote(char *method,cJSON *lineobj);
char *LP_stats_methods[] = { "unknown", "request", "reserved", "connect", "connected", "tradestatus" }; char *LP_stats_methods[] = { "unknown", "request", "reserved", "connect", "connected", "tradestatus" };
#define LP_TRADESTATUS_METHODIND 5
static uint32_t LP_requests,LP_reserveds,LP_connects,LP_connecteds,LP_tradestatuses,LP_parse_errors,LP_unknowns,LP_duplicates,LP_aliceids; static uint32_t LP_requests,LP_reserveds,LP_connects,LP_connecteds,LP_tradestatuses,LP_parse_errors,LP_unknowns,LP_duplicates,LP_aliceids;
@ -325,10 +326,51 @@ int32_t LP_swap_finished(struct LP_swapstats *sp,int32_t dPoWflag)
return(0); return(0);
} }
struct LP_swapstats *LP_swapstats_create(uint64_t aliceid,int32_t RTflag,struct LP_quoteinfo *qp,double qprice,int32_t methodind)
{
struct LP_pubswap *ptr; struct iguana_info *alice,*bob; struct LP_pubkey_info *pubp; char *base,*rel; struct LP_swapstats *sp = 0;
base = qp->srccoin, rel = qp->destcoin;
if ( (sp= LP_swapstats_add(aliceid,RTflag)) != 0 )
{
sp->Q = *qp;
sp->qprice = qprice;
sp->methodind = methodind;
sp->ind = LP_aliceids++;
sp->lasttime = (uint32_t)time(NULL);
if ( sp->lasttime > sp->Q.timestamp+LP_atomic_locktime(base,rel)*2 )
sp->expired = sp->lasttime;
else
{
if ( (alice= LP_coinfind(rel)) != 0 && (alice->isassetchain != 0 || strcmp("KMD",alice->symbol) == 0) )
sp->aliceneeds_dPoW = 1;
if ( (bob= LP_coinfind(rel)) != 0 && (bob->isassetchain != 0 || strcmp(bob->symbol,"KMD") == 0) )
sp->bobneeds_dPoW = 1;
}
strcpy(sp->bobgui,"nogui");
strcpy(sp->alicegui,"nogui");
if ( LP_swap_finished(sp,1) == 0 ) //sp->finished == 0 && sp->expired == 0 )
{
if ( (pubp= LP_pubkeyadd(qp->srchash)) != 0 )
{
ptr = calloc(1,sizeof(*ptr));
ptr->swap = sp;
DL_APPEND(pubp->bobswaps,ptr);
}
if ( (pubp= LP_pubkeyadd(qp->desthash)) != 0 )
{
ptr = calloc(1,sizeof(*ptr));
ptr->swap = sp;
DL_APPEND(pubp->aliceswaps,ptr);
}
}
} else printf("unexpected LP_swapstats_add failure\n");
return(sp);
}
int32_t LP_statslog_parsequote(char *method,cJSON *lineobj) int32_t LP_statslog_parsequote(char *method,cJSON *lineobj)
{ {
static uint32_t unexpected; static uint32_t unexpected;
struct LP_swapstats *sp,*tmp; struct iguana_info *alice,*bob; struct LP_pubkey_info *pubp; struct LP_pubswap *ptr; double qprice; uint32_t requestid,quoteid,timestamp; int32_t i,RTflag,flag,numtrades[LP_MAXPRICEINFOS],methodind,destvout,feevout,duplicate=0; char *statusstr,*gui,*base,*rel; uint64_t aliceid,txfee,satoshis,destsatoshis; bits256 desttxid,feetxid; struct LP_quoteinfo Q; uint64_t basevols[LP_MAXPRICEINFOS],relvols[LP_MAXPRICEINFOS]; struct LP_swapstats *sp,*tmp; double qprice; uint32_t requestid,quoteid,timestamp; int32_t i,RTflag,flag,numtrades[LP_MAXPRICEINFOS],methodind,destvout,feevout,duplicate=0; char *statusstr,*gui,*base,*rel; uint64_t aliceid,txfee,satoshis,destsatoshis; bits256 desttxid,feetxid; struct LP_quoteinfo Q; uint64_t basevols[LP_MAXPRICEINFOS],relvols[LP_MAXPRICEINFOS];
memset(numtrades,0,sizeof(numtrades)); memset(numtrades,0,sizeof(numtrades));
memset(basevols,0,sizeof(basevols)); memset(basevols,0,sizeof(basevols));
memset(relvols,0,sizeof(relvols)); memset(relvols,0,sizeof(relvols));
@ -423,41 +465,8 @@ int32_t LP_statslog_parsequote(char *method,cJSON *lineobj)
} }
else else
{ {
sp = LP_swapstats_create(aliceid,RTflag,&Q,qprice,methodind);
//printf("create aliceid.%llu\n",(long long)aliceid); //printf("create aliceid.%llu\n",(long long)aliceid);
if ( (sp= LP_swapstats_add(aliceid,RTflag)) != 0 )
{
sp->Q = Q;
sp->qprice = qprice;
sp->methodind = methodind;
sp->ind = LP_aliceids++;
sp->lasttime = (uint32_t)time(NULL);
if ( sp->lasttime > sp->Q.timestamp+LP_atomic_locktime(base,rel)*2 )
sp->expired = sp->lasttime;
else
{
if ( (alice= LP_coinfind(rel)) != 0 && (alice->isassetchain != 0 || strcmp("KMD",alice->symbol) == 0) )
sp->aliceneeds_dPoW = 1;
if ( (bob= LP_coinfind(rel)) != 0 && (bob->isassetchain != 0 || strcmp(bob->symbol,"KMD") == 0) )
sp->bobneeds_dPoW = 1;
}
strcpy(sp->bobgui,"nogui");
strcpy(sp->alicegui,"nogui");
if ( LP_swap_finished(sp,1) == 0 ) //sp->finished == 0 && sp->expired == 0 )
{
if ( (pubp= LP_pubkeyadd(sp->Q.srchash)) != 0 )
{
ptr = calloc(1,sizeof(*ptr));
ptr->swap = sp;
DL_APPEND(pubp->bobswaps,ptr);
}
if ( (pubp= LP_pubkeyadd(sp->Q.desthash)) != 0 )
{
ptr = calloc(1,sizeof(*ptr));
ptr->swap = sp;
DL_APPEND(pubp->aliceswaps,ptr);
}
}
} else printf("unexpected LP_swapstats_add failure\n");
} }
if ( sp != 0 ) if ( sp != 0 )
{ {
@ -509,8 +518,22 @@ cJSON *LP_swapstats_json(struct LP_swapstats *sp)
char *LP_swapstatus_recv(cJSON *argjson) char *LP_swapstatus_recv(cJSON *argjson)
{ {
struct LP_swapstats *sp; int32_t methodind; bits256 txid; char str[65]; struct LP_swapstats *sp; char *statusstr; uint64_t aliceid; double qprice; struct LP_quoteinfo Q; int32_t methodind,RTflag; bits256 txid; //char str[65];
if ( (sp= LP_swapstats_find(j64bits(argjson,"aliceid"))) != 0 ) if ( (aliceid= j64bits(argjson,"aliceid")) == 0 )
return(clonestr("{\"error\":\"LP_swapstatus_recv null aliceid\"}"));
if ( (sp= LP_swapstats_find(aliceid)) == 0 )
{
LP_quoteparse(&Q,argjson);
if ( Q.satoshis > Q.txfee )
return(clonestr("{\"error\":\"LP_swapstatus_recv null satoshis\"}"));
qprice = (double)Q.destsatoshis / (Q.satoshis - Q.txfee);
if ( (statusstr= jstr(argjson,"status")) != 0 && strcmp(statusstr,"finished") == 0 )
RTflag = 0;
else RTflag = 1;
sp = LP_swapstats_create(aliceid,RTflag,&Q,qprice,LP_TRADESTATUS_METHODIND);
printf("create swapstatus from recv\n");
}
if ( sp != 0 )
{ {
if ( 0 && IAMLP == 0 ) if ( 0 && IAMLP == 0 )
printf("swapstatus.(%s)\n",jprint(argjson,0)); printf("swapstatus.(%s)\n",jprint(argjson,0));
@ -563,20 +586,42 @@ char *LP_swapstatus_recv(cJSON *argjson)
return(clonestr("{\"result\":\"success\"}")); return(clonestr("{\"result\":\"success\"}"));
} }
char *LP_gettradestatus(uint64_t aliceid) char *LP_gettradestatus(uint64_t aliceid,uint32_t requestid,uint32_t quoteid)
{ {
struct LP_swapstats *sp; cJSON *reqjson; bits256 zero; struct LP_swapstats *sp; char *swapstr,*statusstr; cJSON *reqjson,*swapjson; bits256 zero;
//printf("gettradestatus.(%llu)\n",(long long)aliceid); //printf("gettradestatus.(%llu)\n",(long long)aliceid);
if ( (sp= LP_swapstats_find(aliceid)) != 0 && time(NULL) > sp->lasttime+60 ) if ( IAMLP != 0 )
{ {
if ( (reqjson= LP_swapstats_json(sp)) != 0 ) if ( (sp= LP_swapstats_find(aliceid)) != 0 )
{ {
jaddstr(reqjson,"method","swapstatus"); if ( time(NULL) > sp->lasttime+60 )
memset(zero.bytes,0,sizeof(zero)); {
LP_reserved_msg(0,"","",zero,jprint(reqjson,1)); if ( (reqjson= LP_swapstats_json(sp)) != 0 )
{
jaddstr(reqjson,"method","swapstatus");
memset(zero.bytes,0,sizeof(zero));
LP_reserved_msg(0,"","",zero,jprint(reqjson,1));
}
}
return(clonestr("{\"result\":\"success\"}"));
}
}
if ( (swapstr= basilisk_swapentry(requestid,quoteid,0)) != 0 )
{
if ( (swapjson= cJSON_Parse(swapstr)) != 0 )
{
if ( (statusstr= jstr(swapjson,"status")) != 0 && strcmp(statusstr,"finished") == 0 )
{
jaddstr(swapjson,"method","swapstatus");
memset(zero.bytes,0,sizeof(zero));
printf("send local swapstatus\n");
LP_reserved_msg(0,"","",zero,jprint(swapjson,0));
}
free_json(swapjson);
} }
free(swapstr);
} }
return(clonestr("{\"error\":\"cant find aliceid\"}")); return(clonestr("{\"result\":\"success\"}"));
} }
int32_t LP_stats_dispiter(cJSON *array,struct LP_swapstats *sp,uint32_t starttime,uint32_t endtime,char *refbase,char *refrel,char *refgui,bits256 refpubkey) int32_t LP_stats_dispiter(cJSON *array,struct LP_swapstats *sp,uint32_t starttime,uint32_t endtime,char *refbase,char *refrel,char *refgui,bits256 refpubkey)

4
iguana/exchanges/LP_swap.c
View File

@ -751,7 +751,7 @@ int32_t LP_swapwait(struct basilisk_swap *swap,uint32_t requestid,uint32_t quote
// sleeptime = divisor * 60; // sleeptime = divisor * 60;
while ( time(NULL) < expiration ) while ( time(NULL) < expiration )
{ {
if ( (retstr= basilisk_swapentry(requestid,quoteid)) != 0 ) if ( (retstr= basilisk_swapentry(requestid,quoteid,1)) != 0 )
{ {
if ( (retjson= cJSON_Parse(retstr)) != 0 ) if ( (retjson= cJSON_Parse(retstr)) != 0 )
{ {
@ -775,7 +775,7 @@ int32_t LP_swapwait(struct basilisk_swap *swap,uint32_t requestid,uint32_t quote
{ {
printf("\n>>>>>>>>>>>>>>>>>>>>>>>>>\nSWAP completed! %u-%u %s\n",requestid,quoteid,jprint(retjson,0)); printf("\n>>>>>>>>>>>>>>>>>>>>>>>>>\nSWAP completed! %u-%u %s\n",requestid,quoteid,jprint(retjson,0));
free_json(retjson); free_json(retjson);
if ( 0 && (retstr= basilisk_swapentry(requestid,quoteid)) != 0 ) if ( 0 && (retstr= basilisk_swapentry(requestid,quoteid,1)) != 0 )
{ {
printf("second call.(%s)\n",retstr); printf("second call.(%s)\n",retstr);
free(retstr); free(retstr);

2
iguana/exchanges/LP_tradebots.c
View File

@ -43,7 +43,7 @@ struct LP_tradebot
void LP_tradebot_updatestats(struct LP_tradebot *bot,struct LP_tradebot_trade *tp) void LP_tradebot_updatestats(struct LP_tradebot *bot,struct LP_tradebot_trade *tp)
{ {
char *swapstr,*status; int32_t flag; cJSON *swapjson; char *swapstr,*status; int32_t flag; cJSON *swapjson;
if ( (swapstr= basilisk_swapentry(tp->requestid,tp->quoteid)) != 0 ) if ( (swapstr= basilisk_swapentry(tp->requestid,tp->quoteid,1)) != 0 )
{ {
flag = 0; flag = 0;
if ( (swapjson= cJSON_Parse(swapstr)) != 0 ) if ( (swapjson= cJSON_Parse(swapstr)) != 0 )

Write Preview
Loading…
Cancel
Save