Browse Source

test

release/v0.1
jl777 9 years ago
parent
commit
0d513217c3
  1. 4
      basilisk/basilisk.c
  2. 2
      basilisk/basilisk_tradebot.c
  3. 20
      crypto777/cJSON.c
  4. 16
      iguana/iguana_exchanges.c
  5. 1
      iguana/iguana_scripts.c
  6. 5
      iguana/tests/ratesloop

4
basilisk/basilisk.c

@ -733,6 +733,10 @@ void basilisk_p2p(void *_myinfo,void *_addr,char *senderip,uint8_t *data,int32_t
void basilisk_requests_poll(struct supernet_info *myinfo)
{
char *retstr; cJSON *outerarray; int32_t i,n; struct basilisk_request issueR; double hwm = 0.;
if ( myinfo == 0 )
{
;
}
memset(&issueR,0,sizeof(issueR));
if ( (retstr= InstantDEX_incoming(myinfo,0,0,0,0)) != 0 )
{

2
basilisk/basilisk_tradebot.c

@ -174,6 +174,8 @@ double basilisk_request_listprocess(struct supernet_info *myinfo,struct basilisk
double basilisk_process_results(struct supernet_info *myinfo,struct basilisk_request *issueR,cJSON *retjson,double hwm)
{
cJSON *array,*item; int32_t i,n,m; struct basilisk_request tmpR,R,refR,list[BASILISK_MAXRELAYS]; double metric=0.;
if ( myinfo == 0 )
;
if ( (array= jarray(&n,retjson,"result")) != 0 )
{
for (i=m=0; i<n; i++)

20
crypto777/cJSON.c

@ -827,7 +827,25 @@ void jaddi64bits(cJSON *json,uint64_t nxt64bits) { char numstr[64]; sprintf(nums
char *jstr(cJSON *json,char *field) { if ( json == 0 ) return(0); if ( field == 0 ) return(cJSON_str(json)); return(cJSON_str(cJSON_GetObjectItem(json,field))); }
char *jstri(cJSON *json,int32_t i) { return(cJSON_str(cJSON_GetArrayItem(json,i))); }
char *jprint(cJSON *json,int32_t freeflag) { char *str; if ( json == 0 ) return(clonestr("{}")); str = cJSON_Print(json), _stripwhite(str,' '); if ( freeflag != 0 ) free_json(json); return(str); }
char *jprint(cJSON *json,int32_t freeflag)
{
char *str;
/*static portable_mutex_t mutex; static int32_t initflag;
if ( initflag == 0 )
{
portable_mutex_init(&mutex);
initflag = 1;
}*/
if ( json == 0 )
return(clonestr("{}"));
//portable_mutex_lock(&mutex);
//usleep(5000);
str = cJSON_Print(json), _stripwhite(str,' ');
if ( freeflag != 0 )
free_json(json);
//portable_mutex_unlock(&mutex);
return(str);
}
bits256 get_API_bits256(cJSON *obj)
{

16
iguana/iguana_exchanges.c

@ -48,6 +48,8 @@ double instantdex_aveprice(struct supernet_info *myinfo,struct exchange_quote *s
char *str; double totalvol,pricesum; uint32_t timestamp;
struct exchange_quote quote; int32_t i,n,dir,num,depth = 100;
struct exchange_info *exchange; struct exchange_request *req,*active[64];
if ( myinfo == 0 )
myinfo = SuperNET_MYINFO(0);
timestamp = (uint32_t)time(NULL);
if ( basevolume < 0. )
basevolume = -basevolume, dir = -1;
@ -109,12 +111,18 @@ double instantdex_aveprice(struct supernet_info *myinfo,struct exchange_quote *s
return(0);
}
double instantdex_avehbla(struct supernet_info *myinfo,double retvals[4],char *base,char *rel,double basevolume)
double instantdex_avehbla(struct supernet_info *myinfo,double retvals[4],char *_base,char *_rel,double basevolume)
{
double avebid,aveask,bidvol,askvol; struct exchange_quote sortbuf[256]; cJSON *argjson;
double avebid,aveask,bidvol,askvol; struct exchange_quote sortbuf[2560]; cJSON *argjson; char base[64],rel[64];
if ( retvals == 0 )
return(0);
strcpy(base,_base);
strcpy(rel,_rel);
if ( myinfo == 0 )
myinfo = SuperNET_MYINFO(0);
argjson = cJSON_CreateObject();
aveask = instantdex_aveprice(myinfo,sortbuf,sizeof(sortbuf)/sizeof(*sortbuf),&askvol,base,rel,basevolume,argjson);
avebid = instantdex_aveprice(myinfo,sortbuf,sizeof(sortbuf)/sizeof(*sortbuf),&bidvol,base,rel,-basevolume,argjson);
aveask = instantdex_aveprice(myinfo,sortbuf,sizeof(sortbuf)/(4*sizeof(*sortbuf)),&askvol,base,rel,basevolume,argjson);
avebid = instantdex_aveprice(myinfo,sortbuf,sizeof(sortbuf)/(4*sizeof(*sortbuf)),&bidvol,base,rel,-basevolume,argjson);
free_json(argjson);
retvals[0] = avebid, retvals[1] = bidvol, retvals[2] = aveask, retvals[3] = askvol;
if ( avebid > SMALLVAL && aveask > SMALLVAL )

1
iguana/iguana_scripts.c

@ -42,6 +42,7 @@ int32_t bitcoin_revealsecret160(uint8_t *script,int32_t n,uint8_t secret160[20])
return(n);
}
// OP_DUP OP_HASH160 <hash of pubkey> OP_EQUALVERIFY OP_CHECKSIG
int32_t bitcoin_standardspend(uint8_t *script,int32_t n,uint8_t rmd160[20])
{
script[n++] = SCRIPT_OP_DUP;

5
iguana/tests/ratesloop

@ -0,0 +1,5 @@
while true
do
./rates
done
Loading…
Cancel
Save