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
a8cc2a898b
commit
16eabe18d4
3 changed files with 55 additions and 69 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_include.h
  2. 4
      iguana/exchanges/LP_socket.c
  3. 118
      iguana/exchanges/LP_tradebots.c

2
iguana/exchanges/LP_include.h
View File

@ -39,7 +39,7 @@ void emscripten_usleep(int32_t x); // returns immediate, no sense for sleeping
#define LP_HTTP_TIMEOUT 3 // 1 is too small due to edge cases of time(NULL) #define LP_HTTP_TIMEOUT 3 // 1 is too small due to edge cases of time(NULL)
#define LP_AUTOTRADE_TIMEOUT 30 #define LP_AUTOTRADE_TIMEOUT 30
#define ELECTRUM_TIMEOUT 15 #define ELECTRUM_TIMEOUT 7
#define LP_ELECTRUM_KEEPALIVE 60 #define LP_ELECTRUM_KEEPALIVE 60
#define LP_ELECTRUM_MAXERRORS 777 #define LP_ELECTRUM_MAXERRORS 777
#define LP_MEMPOOL_TIMEINCR 10 #define LP_MEMPOOL_TIMEINCR 10

4
iguana/exchanges/LP_socket.c
View File

@ -423,7 +423,7 @@ cJSON *electrum_submit(char *symbol,struct electrum_info *ep,cJSON **retjsonp,ch
{ {
*retjsonp = 0; *retjsonp = 0;
sprintf(stratumreq,"{ \"jsonrpc\":\"2.0\", \"id\": %u, \"method\":\"%s\", \"params\": %s }\n",ep->stratumid,method,params); sprintf(stratumreq,"{ \"jsonrpc\":\"2.0\", \"id\": %u, \"method\":\"%s\", \"params\": %s }\n",ep->stratumid,method,params);
printf("%s %s",symbol,stratumreq); //printf("%s %s",symbol,stratumreq);
memset(ep->buf,0,ep->bufsize); memset(ep->buf,0,ep->bufsize);
sitem = electrum_sitem(ep,stratumreq,timeout,retjsonp); sitem = electrum_sitem(ep,stratumreq,timeout,retjsonp);
/*sitem = (struct stritem *)queueitem(stratumreq); /*sitem = (struct stritem *)queueitem(stratumreq);
@ -900,7 +900,7 @@ int32_t LP_recvfunc(struct electrum_info *ep,char *str,int32_t len)
ep->lasttime = (uint32_t)time(NULL); ep->lasttime = (uint32_t)time(NULL);
if ( (strjson= cJSON_Parse(str)) != 0 ) if ( (strjson= cJSON_Parse(str)) != 0 )
{ {
printf("%s RECV.(%ld) id.%d\n",ep->symbol,strlen(str),jint(strjson,"id")); //printf("%s RECV.(%ld) id.%d\n",ep->symbol,strlen(str),jint(strjson,"id"));
resultjson = jobj(strjson,"result"); resultjson = jobj(strjson,"result");
//printf("strjson.(%s)\n",jprint(strjson,0)); //printf("strjson.(%s)\n",jprint(strjson,0));
if ( (method= jstr(strjson,"method")) != 0 ) if ( (method= jstr(strjson,"method")) != 0 )

118
iguana/exchanges/LP_tradebots.c
View File

@ -26,7 +26,7 @@ struct LP_tradebot_trade
double maxprice,totalrelvolume,basevol,relvol; double maxprice,totalrelvolume,basevol,relvol;
uint64_t aliceid; uint64_t aliceid;
int32_t dispdir; int32_t dispdir;
uint32_t started,finished,requestid,quoteid,tradeid,completed; uint32_t started,finished,requestid,quoteid,tradeid,expired;
char base[32],rel[32],event[32]; char base[32],rel[32],event[32];
}; };
@ -55,18 +55,10 @@ void LP_tradebot_updatestats(struct LP_tradebot *bot,struct LP_tradebot_trade *t
{ {
if ( strcmp(status,"finished") == 0 ) if ( strcmp(status,"finished") == 0 )
{ {
flag = 1; if ( tp->finished == 0 )
bot->completed++; tp->finished = (uint32_t)time(NULL);
bot->basesum += tp->basevol;
bot->relsum += tp->relvol;
} }
} }
if ( flag == 0 )
{
bot->numpending++;
bot->pendbasesum += tp->basevol;
bot->pendrelsum += tp->relvol;
}
free_json(swapjson); free_json(swapjson);
} }
free(swapstr); free(swapstr);
@ -75,11 +67,39 @@ void LP_tradebot_updatestats(struct LP_tradebot *bot,struct LP_tradebot_trade *t
void LP_tradebot_calcstats(struct LP_tradebot *bot) void LP_tradebot_calcstats(struct LP_tradebot *bot)
{ {
int32_t i; int32_t i; struct LP_tradebot_trade *tp;
bot->basesum = bot->relsum = bot->pendbasesum = bot->pendrelsum = 0.; bot->basesum = bot->relsum = bot->pendbasesum = bot->pendrelsum = 0.;
bot->numpending = bot->completed = 0; bot->numpending = bot->completed = 0;
for (i=0; i<bot->numtrades; i++) for (i=0; i<bot->numtrades; i++)
LP_tradebot_updatestats(bot,bot->trades[i]); {
if ( (tp= bot->trades[i]) == 0 )
continue;
if ( tp->finished == 0 && time(NULL) > tp->started+INSTANTDEX_LOCKTIME*2 )
{
tp->expired = tp->finished = (uint32_t)time(NULL);
printf("tradeid.%u expired\n",tp->tradeid);
}
if ( tp->finished != 0 )
{
if ( tp->expired == 0 )
{
bot->basesum += tp->basevol;
bot->relsum += tp->relvol;
bot->completed++;
}
}
else
{
if ( tp->requestid != 0 && tp->quoteid != 0 )
{
bot->pendbasesum += tp->basevol;
bot->pendrelsum += tp->relvol;
bot->numpending++;
}
}
//LP_tradebot_updatestats(bot,bot->trades[i]);
}
printf("completed.%d (%.8f / %.8f) pending.%d (%.8f / %.8f)\n",bot->completed,bot->basesum,bot->relsum,bot->numpending,bot->pendbasesum,bot->pendrelsum);
} }
double LP_pricevol_invert(double *basevolumep,double maxprice,double relvolume) double LP_pricevol_invert(double *basevolumep,double maxprice,double relvolume)
@ -129,6 +149,7 @@ cJSON *LP_tradebot_tradejson(struct LP_tradebot_trade *tp,int32_t dispflag)
cJSON *LP_tradebot_json(struct LP_tradebot *bot) cJSON *LP_tradebot_json(struct LP_tradebot *bot)
{ {
int32_t i; double aveprice,basevolume,vol; cJSON *json,*array; int32_t i; double aveprice,basevolume,vol; cJSON *json,*array;
LP_tradebot_calcstats(bot);
json = cJSON_CreateObject(); json = cJSON_CreateObject();
jaddstr(json,"result","success"); jaddstr(json,"result","success");
jaddstr(json,"name",bot->name); jaddstr(json,"name",bot->name);
@ -169,7 +190,6 @@ cJSON *LP_tradebot_json(struct LP_tradebot *bot)
} }
} }
array = cJSON_CreateArray(); array = cJSON_CreateArray();
LP_tradebot_calcstats(bot);
for (i=0; i<bot->numtrades; i++) for (i=0; i<bot->numtrades; i++)
jaddi(array,LP_tradebot_tradejson(bot->trades[i],bot->dispdir)); jaddi(array,LP_tradebot_tradejson(bot->trades[i],bot->dispdir));
jadd(json,"trades",array); jadd(json,"trades",array);
@ -255,9 +275,6 @@ struct LP_tradebot_trade *LP_tradebot_pending(struct LP_tradebot *bot,cJSON *pen
tp->basevol = jdouble(pending,"basevalue"); tp->basevol = jdouble(pending,"basevalue");
tp->relvol = jdouble(pending,"relvalue"); tp->relvol = jdouble(pending,"relvalue");
printf("tradebot pending basevol %.8f relvol %.8f\n",tp->basevol,tp->relvol); printf("tradebot pending basevol %.8f relvol %.8f\n",tp->basevol,tp->relvol);
//bot->pendrelsum += tp->relvol;
//bot->pendbasesum += tp->basevol;
//bot->numpending++;
return(tp); return(tp);
} }
@ -293,6 +310,7 @@ void LP_tradebot_timeslice(void *ctx,struct LP_tradebot *bot)
{ {
double remaining,maxrel; struct LP_tradebot_trade *tp; int32_t i,maxiters = 10; uint32_t tradeid; bits256 destpubkey; char *retstr,*liststr; cJSON *retjson,*retjson2,*pending; double remaining,maxrel; struct LP_tradebot_trade *tp; int32_t i,maxiters = 10; uint32_t tradeid; bits256 destpubkey; char *retstr,*liststr; cJSON *retjson,*retjson2,*pending;
memset(destpubkey.bytes,0,sizeof(destpubkey)); memset(destpubkey.bytes,0,sizeof(destpubkey));
LP_tradebot_calcstats(bot);
if ( bot->dead == 0 && bot->pause == 0 && bot->userpause == 0 && bot->numtrades < sizeof(bot->trades)/sizeof(*bot->trades) ) if ( bot->dead == 0 && bot->pause == 0 && bot->userpause == 0 && bot->numtrades < sizeof(bot->trades)/sizeof(*bot->trades) )
{ {
if ( (liststr= LP_recent_swaps(0)) != 0 ) if ( (liststr= LP_recent_swaps(0)) != 0 )
@ -328,6 +346,7 @@ void LP_tradebot_timeslice(void *ctx,struct LP_tradebot *bot)
free(retstr); free(retstr);
} }
} }
LP_tradebot_calcstats(bot);
} }
free_json(retjson); free_json(retjson);
} }
@ -347,18 +366,21 @@ void LP_aliceid(uint32_t tradeid,uint64_t aliceid,char *event,uint32_t requestid
{ {
for (i=0; i<bot->numtrades; i++) for (i=0; i<bot->numtrades; i++)
{ {
if ( (tp= bot->trades[i]) != 0 && tp->finished == 0 && tp->tradeid == tradeid ) if ( (tp= bot->trades[i]) != 0 )
{ {
tp->aliceid = aliceid; if ( tp->finished == 0 && tp->tradeid == tradeid )
printf("bot event tradeid.%u aliceid.%llu (%s) r.%u q.%u\n",tradeid,(long long)aliceid,event,requestid,quoteid);
if ( requestid != 0 && quoteid != 0 )
{ {
tp->requestid = requestid; tp->aliceid = aliceid;
tp->quoteid = quoteid; printf("bot event tradeid.%u aliceid.%llu (%s) r.%u q.%u\n",tradeid,(long long)aliceid,event,requestid,quoteid);
} if ( requestid != 0 && quoteid != 0 )
strcpy(tp->event,event); {
matched = 0; tp->requestid = requestid;
break; tp->quoteid = quoteid;
}
strcpy(tp->event,event);
matched = 1;
break;
} else printf("tradeid.%u finished.%u\n",tp->tradeid,tp->finished);
} }
} }
if ( matched != 0 ) if ( matched != 0 )
@ -379,11 +401,8 @@ void LP_tradebot_finished(uint32_t tradeid,uint32_t requestid,uint32_t quoteid)
{ {
tp->requestid = requestid; tp->requestid = requestid;
tp->quoteid = quoteid; tp->quoteid = quoteid;
//bot->pendbasesum -= tp->basevol, bot->basesum += tp->basevol; printf("bot.%u detected completion tradeid.%u aliceid.%llu r.%u q.%u, numpending.%d completed.%d\n",bot->id,tp->tradeid,(long long)tp->aliceid,tp->requestid,tp->quoteid,bot->numpending,bot->completed);
//bot->pendrelsum -= tp->relvol, bot->relsum += tp->relvol; tp->finished = (uint32_t)time(NULL);
//bot->numpending--, bot->completed++;
printf("bot.%u detected completion tradeid.%u aliceid.%llx r.%u q.%u, numpending.%d completed.%d\n",bot->id,tp->tradeid,(long long)tp->aliceid,tp->requestid,tp->quoteid,bot->numpending,bot->completed);
tp->completed = tp->finished = (uint32_t)time(NULL);
strcpy(tp->event,"finished"); strcpy(tp->event,"finished");
break; break;
} }
@ -394,44 +413,11 @@ void LP_tradebot_finished(uint32_t tradeid,uint32_t requestid,uint32_t quoteid)
void LP_tradebots_timeslice(void *ctx) void LP_tradebots_timeslice(void *ctx)
{ {
static uint32_t lastnumfinished = 0; static uint32_t lastnumfinished = 0;
struct LP_tradebot_trade *tp; struct iguana_info *relcoin; struct LP_tradebot *bot,*tmp; int32_t i; struct iguana_info *relcoin; struct LP_tradebot *bot,*tmp;
DL_FOREACH_SAFE(LP_tradebots,bot,tmp) DL_FOREACH_SAFE(LP_tradebots,bot,tmp)
{ {
if ( (relcoin= LP_coinfind(bot->rel)) != 0 ) if ( (relcoin= LP_coinfind(bot->rel)) != 0 )
LP_listunspent_issue(bot->rel,relcoin->smartaddr,1); LP_listunspent_issue(bot->rel,relcoin->smartaddr,1);
if ( bot->numpending > 0 && LP_numfinished > lastnumfinished )
{
// expire pending trades and see if any still need their requestid/quoteid
bot->basesum = bot->pendbasesum = 0.;//-= tp->basevol;
bot->relsum = bot->pendrelsum = 0.;//-= tp->relvol;
bot->completed = bot->numpending = 0;//--;
for (i=0; i<bot->numtrades; i++)
{
if ( (tp= bot->trades[i]) != 0 )
{
if (tp->finished == 0 )
{
if ( time(NULL) > tp->started+INSTANTDEX_LOCKTIME*2 )
{
tp->finished = (uint32_t)time(NULL);
printf("%s trade.%d of %d expired\n",bot->name,i,bot->numtrades);
}
}
if ( tp->finished != 0 && tp->completed != 0 )
{
bot->basesum += tp->basevol;
bot->relsum += tp->relvol;
bot->completed++;
}
else if ( tp->finished == 0 && tp->requestid != 0 && tp->quoteid != 0 )
{
bot->pendbasesum += tp->basevol;
bot->pendrelsum += tp->relvol;
bot->numpending++;
}
}
}
}
if ( bot->relsum >= 0.99*bot->totalrelvolume-SMALLVAL || bot->basesum >= 0.99*bot->totalbasevolume-SMALLVAL ) if ( bot->relsum >= 0.99*bot->totalrelvolume-SMALLVAL || bot->basesum >= 0.99*bot->totalbasevolume-SMALLVAL )
bot->dead = (uint32_t)time(NULL); bot->dead = (uint32_t)time(NULL);
else if ( (bot->pendrelsum+bot->relsum) >= 0.99*bot->totalrelvolume-SMALLVAL || (bot->basesum+bot->pendbasesum) >= 0.99*bot->totalbasevolume-SMALLVAL ) else if ( (bot->pendrelsum+bot->relsum) >= 0.99*bot->totalrelvolume-SMALLVAL || (bot->basesum+bot->pendbasesum) >= 0.99*bot->totalbasevolume-SMALLVAL )

Write Preview
Loading…
Cancel
Save