jl777 8 years ago
parent
commit
7d3afba0ab
  1. 2
      basilisk/basilisk_CMD.c
  2. 2
      basilisk/basilisk_DEX.c
  3. 6
      basilisk/basilisk_MSG.c
  4. 2
      iguana/iguana_wallet.c

2
basilisk/basilisk_CMD.c

@ -243,7 +243,7 @@ char *basilisk_respond_getinfo(struct supernet_info *myinfo,char *CMD,void *addr
{
char *symbol,*retstr=0; struct basilisk_item Lptr,*ptr; int32_t timeoutmillis; struct iguana_info *coin = 0;
if ( (timeoutmillis= jint(valsobj,"timeout")) <= 0 )
timeoutmillis = 1000;
timeoutmillis = 5000;
if ( (symbol= jstr(valsobj,"coin")) != 0 || (symbol= jstr(valsobj,"symbol")) != 0 )
coin = iguana_coinfind(symbol);
if ( coin != 0 && (ptr= basilisk_getinfo(&Lptr,myinfo,coin,remoteaddr,basilisktag,timeoutmillis,valsobj)) != 0 )

2
basilisk/basilisk_DEX.c

@ -453,7 +453,7 @@ HASH_ARRAY_STRING(InstantDEX,request,hash,vals,hexstr)
myinfo->DEXactive = (uint32_t)time(NULL) + 3*BASILISK_TIMEOUT;
jadd64bits(vals,"minamount",jdouble(vals,"minprice") * jdouble(vals,"amount") * SATOSHIDEN);
if ( jobj(vals,"srchash") == 0 )
jaddbits256(vals,"srchash",myinfo->myaddr.pubkey);
jaddbits256(vals,"srchash",myinfo->myaddr.persistent);
if ( jobj(vals,"desthash") == 0 )
jaddbits256(vals,"desthash",hash);
jadd64bits(vals,"satoshis",jdouble(vals,"amount") * SATOSHIDEN);

6
basilisk/basilisk_MSG.c

@ -156,9 +156,11 @@ char *basilisk_iterate_MSG(struct supernet_info *myinfo,uint32_t channel,uint32_
retjson = cJSON_CreateObject();
jaddstr(retjson,"result","success");
jadd(retjson,"messages",array);
//printf("MESSAGES.(%s)\n",jprint(array,0));
printf("MESSAGES.(%s)\n",jprint(array,0));
return(jprint(retjson,1));
} else return(clonestr("{\"error\":\"no messages\"}"));
}
printf("no matching messages\n");
return(clonestr("{\"error\":\"no messages\"}"));
}
char *basilisk_respond_addmessage(struct supernet_info *myinfo,uint8_t *key,int32_t keylen,uint8_t *data,int32_t datalen,int32_t sendping,uint32_t duration)

2
iguana/iguana_wallet.c

@ -1146,7 +1146,7 @@ ZERO_ARGS(bitcoinrpc,getinfo)
else
{
valsobj = cJSON_CreateObject();
ptr = basilisk_getinfo(&Lptr,myinfo,coin,remoteaddr,0,3000,valsobj);
ptr = basilisk_getinfo(&Lptr,myinfo,coin,remoteaddr,0,5000,valsobj);
free_json(valsobj);
if ( ptr != 0 && ptr->retstr != 0 )
{

Loading…
Cancel
Save