Browse Source

Test

etomic
jl777 8 years ago
parent
commit
be27eecbe5
  1. 2
      basilisk/basilisk.c
  2. 9
      basilisk/smartaddress.c
  3. 3
      iguana/main.c

2
basilisk/basilisk.c

@ -1921,7 +1921,7 @@ INT_ARG(InstantDEX,incoming,requestid)
else else
{ {
jaddstr(retjson,"error","cant do InstantDEX channelget"); jaddstr(retjson,"error","cant do InstantDEX channelget");
printf("error channelget\n"); char str[65]; printf("error channelget %s %x\n",bits256_str(str,myinfo->myaddr.persistent),msgid);
} }
return(jprint(retjson,1)); return(jprint(retjson,1));
} }

9
basilisk/smartaddress.c

@ -546,11 +546,14 @@ void smartaddress_update(struct supernet_info *myinfo,int32_t selector)
smartaddress_coinupdate(myinfo,symbol,kmdcoin->DEXinfo.btcprice,kmdcoin->DEXinfo.avail,kmdcoin->DEXinfo.USD_average); smartaddress_coinupdate(myinfo,symbol,kmdcoin->DEXinfo.btcprice,kmdcoin->DEXinfo.avail,kmdcoin->DEXinfo.USD_average);
else else
{ {
printf("Action.(%s)\n",jprint(coinitem,0)); printf("Action.%s (%s)\n",typestr,jprint(coinitem,0));
if ( (address= jstr(coinitem,"address")) != 0 ) if ( (address= jstr(coinitem,"address")) != 0 )
{ {
bitcoin_addr2rmd160(&addrtype,rmd160,address); if ( strcmp(typestr,"jumblr") == 0 )
bitcoin_address(coinaddr,kmdcoin->chain->pubtype,rmd160,20); {
bitcoin_addr2rmd160(&addrtype,rmd160,address);
bitcoin_address(coinaddr,kmdcoin->chain->pubtype,rmd160,20);
} else strcpy(coinaddr,address);
maxbid = jdouble(coinitem,"maxbid"); maxbid = jdouble(coinitem,"maxbid");
minask = jdouble(coinitem,"minask"); minask = jdouble(coinitem,"minask");
extraobj = jobj(coinitem,"extra"); extraobj = jobj(coinitem,"extra");

3
iguana/main.c

@ -756,7 +756,8 @@ void jumblr_loop(void *ptr)
if ( (coin= iguana_coinfind("KMD")) != 0 ) if ( (coin= iguana_coinfind("KMD")) != 0 )
{ {
n++; n++;
smartaddress_update(myinfo,n & 1); if ( (n % 3) == 0 )
smartaddress_update(myinfo,(n/3) & 1);
if ( myinfo->jumblr_passphrase[0] != 0 && coin->FULLNODE < 0 ) if ( myinfo->jumblr_passphrase[0] != 0 && coin->FULLNODE < 0 )
{ {
// if BTC has arrived in destination address, invoke DEX -> BTC // if BTC has arrived in destination address, invoke DEX -> BTC

Loading…
Cancel
Save