From f956a72677c1e855e29697b2b8221c8ea7a7f6c8 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 30 Oct 2017 18:54:38 +0200 Subject: [PATCH 1/4] Test --- iguana/exchanges/LP_RTmetrics.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/iguana/exchanges/LP_RTmetrics.c b/iguana/exchanges/LP_RTmetrics.c index ebadeec52..35fd9ed8d 100644 --- a/iguana/exchanges/LP_RTmetrics.c +++ b/iguana/exchanges/LP_RTmetrics.c @@ -206,7 +206,7 @@ double _LP_RTmetric_calc(struct LP_metricinfo *mp,double bestprice,double maxpri while ( n-- > 0 ) metric *= 1.1; if ( metric != origmetric ) - printf("price %.8f orig %.8f -> %.8f relvol %.8f min %.8f max %.8f bal %.8f age.%d pend.%d\n",mp->price,origmetric,metric,relvolume,mp->minvol,mp->maxvol,mp->balance,mp->age,mp->pendingswaps); + printf("i.%d price %.8f orig %.8f -> %.8f relvol %.8f min %.8f max %.8f bal %.8f age.%d pend.%d\n",mp->ind,mp->price,origmetric,metric,relvolume,mp->minvol,mp->maxvol,mp->balance,mp->age,mp->pendingswaps); return(metric); } @@ -241,9 +241,10 @@ cJSON *LP_RTmetrics_sort(char *base,char *rel,cJSON *rawasks,int32_t numasks,dou groupi = i; num++; } - if ( 0 && groupi > 0 ) + if ( groupi > 0 ) { sortbuf = calloc(groupi+1,sizeof(*sortbuf)); + printf("alloc %d\n",groupi+1); prevdepth = 0.; for (i=0; i<=groupi; i++) { @@ -251,7 +252,9 @@ cJSON *LP_RTmetrics_sort(char *base,char *rel,cJSON *rawasks,int32_t numasks,dou LP_RTmetric_calc(sortbuf,i,item,bestprice,maxprice,relvolume,prevdepth); prevdepth = jdouble(item,"depth"); } + printf("call revsortds\n"); revsortds(&sortbuf[0].metric,groupi+1,sizeof(*sortbuf)); + printf("back\n"); array = cJSON_CreateArray(); for (i=0; i<=groupi; i++) { From 30d0e7560671fb481415ee0984b5c0ec33a4399a Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 30 Oct 2017 19:01:46 +0200 Subject: [PATCH 2/4] Test --- iguana/exchanges/LP_RTmetrics.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/iguana/exchanges/LP_RTmetrics.c b/iguana/exchanges/LP_RTmetrics.c index 35fd9ed8d..c32e91507 100644 --- a/iguana/exchanges/LP_RTmetrics.c +++ b/iguana/exchanges/LP_RTmetrics.c @@ -20,8 +20,10 @@ struct LP_metricinfo { + double metric; + double price,balance,minvol; bits256 pubkey; - double metric,price,balance,minvol,maxvol; + double maxvol; int32_t ind,numutxos,age,pendingswaps; }; @@ -205,7 +207,7 @@ double _LP_RTmetric_calc(struct LP_metricinfo *mp,double bestprice,double maxpri if ( (n= mp->pendingswaps) > 0 ) while ( n-- > 0 ) metric *= 1.1; - if ( metric != origmetric ) + //if ( metric != origmetric ) printf("i.%d price %.8f orig %.8f -> %.8f relvol %.8f min %.8f max %.8f bal %.8f age.%d pend.%d\n",mp->ind,mp->price,origmetric,metric,relvolume,mp->minvol,mp->maxvol,mp->balance,mp->age,mp->pendingswaps); return(metric); } @@ -226,7 +228,7 @@ void LP_RTmetric_calc(struct LP_metricinfo *sortbuf,int32_t ind,cJSON *item,doub cJSON *LP_RTmetrics_sort(char *base,char *rel,cJSON *rawasks,int32_t numasks,double maxprice,double relvolume) { - cJSON *array,*item; int32_t i,num,groupi; double price,prevdepth,bestprice; struct LP_metricinfo *sortbuf; + cJSON *array=rawasks,*item; int32_t i,num,groupi; double price,prevdepth,bestprice; struct LP_metricinfo *sortbuf; groupi = -1; bestprice = 0.; for (num=i=0; i Date: Mon, 30 Oct 2017 19:08:39 +0200 Subject: [PATCH 3/4] Test --- iguana/exchanges/LP_RTmetrics.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/iguana/exchanges/LP_RTmetrics.c b/iguana/exchanges/LP_RTmetrics.c index c32e91507..c44c86dbe 100644 --- a/iguana/exchanges/LP_RTmetrics.c +++ b/iguana/exchanges/LP_RTmetrics.c @@ -183,7 +183,10 @@ double _LP_RTmetric_calc(struct LP_metricinfo *mp,double bestprice,double maxpri int32_t n; double metric,origmetric = (mp->price / bestprice); metric = origmetric; if ( mp->numutxos == 0 || relvolume == 0. || mp->maxvol == 0. || mp->balance == 0. ) + { + printf("skip i.%d as no info\n",mp->ind); return(metric * 100.); + } if ( relvolume < mp->minvol ) { metric *= (mp->minvol / relvolume); @@ -246,7 +249,6 @@ cJSON *LP_RTmetrics_sort(char *base,char *rel,cJSON *rawasks,int32_t numasks,dou if ( groupi > 0 ) { sortbuf = calloc(groupi+1,sizeof(*sortbuf)); - printf("alloc %d\n",groupi+1); prevdepth = 0.; for (i=0; i<=groupi; i++) { @@ -254,13 +256,11 @@ cJSON *LP_RTmetrics_sort(char *base,char *rel,cJSON *rawasks,int32_t numasks,dou LP_RTmetric_calc(sortbuf,i,item,bestprice,maxprice,relvolume,prevdepth); prevdepth = jdouble(item,"depth"); } - printf("call revsortds\n"); revsortds(&sortbuf[0].metric,groupi+1,sizeof(*sortbuf)); - printf("back\n"); array = cJSON_CreateArray(); for (i=0; i<=groupi; i++) { - printf("(%d -> %d) ",i,sortbuf[i].ind); + printf("(%d -> %d %.3f) ",i,sortbuf[i].ind,sortbuf[i].metric); item = jitem(rawasks,sortbuf[i].ind); jaddi(array,jduplicate(item)); } From 065998ae87534a7760972988532cc0a1bb6dc0a3 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 30 Oct 2017 19:12:12 +0200 Subject: [PATCH 4/4] Test --- iguana/exchanges/LP_nativeDEX.c | 2 +- iguana/exchanges/LP_swap.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/iguana/exchanges/LP_nativeDEX.c b/iguana/exchanges/LP_nativeDEX.c index 7c519636e..395866af8 100644 --- a/iguana/exchanges/LP_nativeDEX.c +++ b/iguana/exchanges/LP_nativeDEX.c @@ -208,7 +208,7 @@ char *LP_process_message(void *ctx,char *typestr,char *myipaddr,int32_t pubsock, } else { - printf("packet not for this node %u\n",crc32); + //printf("packet not for this node %u\n",crc32); } } else printf("error (%s) method is %s\n",jsonstr,method); } diff --git a/iguana/exchanges/LP_swap.c b/iguana/exchanges/LP_swap.c index 65cbcefb0..0238e398b 100644 --- a/iguana/exchanges/LP_swap.c +++ b/iguana/exchanges/LP_swap.c @@ -575,10 +575,10 @@ int32_t LP_rawtx_spendscript(struct basilisk_swap *swap,int32_t height,struct ba if ( rawtx->I.redeemlen > 0 && rawtx->I.redeemlen < 0x100 ) { memcpy(rawtx->redeemscript,&data[datalen],rawtx->I.redeemlen); - for (i=0; iI.redeemlen; i++) - printf("%02x",rawtx->redeemscript[i]); + //for (i=0; iI.redeemlen; i++) + // printf("%02x",rawtx->redeemscript[i]); bitcoin_address(redeemaddr,rawtx->coin->taddr,rawtx->coin->p2shtype,rawtx->redeemscript,rawtx->I.redeemlen); - printf(" received redeemscript.(%s) %s taddr.%d\n",redeemaddr,rawtx->coin->symbol,rawtx->coin->taddr); + //printf(" received redeemscript.(%s) %s taddr.%d\n",redeemaddr,rawtx->coin->symbol,rawtx->coin->taddr); LP_swap_coinaddr(rawtx->coin,checkaddr,0,data,datalen,0); if ( strcmp(redeemaddr,checkaddr) != 0 ) {