Browse Source

test

release/v0.1
jl777 9 years ago
parent
commit
9dad3f34c5
  1. 10
      basilisk/basilisk.c
  2. 2
      basilisk/basilisk_bitcoin.c
  3. 6
      iguana/swaps/iguana_BTCswap.c

10
basilisk/basilisk.c

@ -148,7 +148,7 @@ struct basilisk_item *basilisk_issueremote(struct supernet_info *myinfo,char *me
jaddnum(hexjson,"timeout",timeoutmillis);
if ( vals != 0 )
jadd(hexjson,"vals",jduplicate(vals));
printf("issue.(%s) timeout.%d\n",jprint(hexjson,0),timeoutmillis);
//printf("issue.(%s) timeout.%d\n",jprint(hexjson,0),timeoutmillis);
ptr = calloc(1,sizeof(*ptr));
ptr->basilisktag = basilisktag;
ptr->numrequired = minresults;
@ -262,7 +262,7 @@ char *basilisk_block(struct supernet_info *myinfo,struct iguana_info *coin,char
{
if ( (retstr= Lptr->retstr) == 0 )
retstr = clonestr("{\"result\":\"null return from local basilisk_issuecmd\"}");
printf("block got local.(%s)\n",retstr);
//printf("block got local.(%s)\n",retstr);
}
else
{
@ -303,7 +303,7 @@ char *basilisk_block(struct supernet_info *myinfo,struct iguana_info *coin,char
{
if ( addr->supernet != 0 && strcmp(addr->ipaddr,remoteaddr) == 0 )
{
printf("send back.%s basilisk_result addr->supernet.%u to (%s).%d\n",retstr,addr->supernet,addr->ipaddr,addr->A.port);
//printf("send back.%s basilisk_result addr->supernet.%u to (%s).%d\n",retstr,addr->supernet,addr->ipaddr,addr->A.port);
iguana_send_supernet(addr,retstr,0);
return(retstr);
}
@ -588,8 +588,8 @@ void basilisks_loop(void *arg)
}
}
if ( flag == 0 )
sleep(1);
else sleep(3);
usleep(100000);
else usleep(25000);
}
}

2
basilisk/basilisk_bitcoin.c

@ -444,7 +444,7 @@ double basilisk_bitcoin_rawtxmetric_dependents(struct supernet_info *myinfo,stru
{
if ( ptr->finished != 0 )
{
printf("parent finished\n");
//printf("parent finished\n");
if ( child->finished == 0 )
{
ptr->childrendone++;

6
iguana/swaps/iguana_BTCswap.c

@ -182,7 +182,7 @@ struct bitcoin_statetx *instantdex_signtx(char *str,struct supernet_info *myinfo
bitcoin_address(coin->changeaddr,coin->chain->pubtype,waddr->rmd160,20);
bitcoin_pubkey33(myinfo->ctx,pubkey33,myinfo->persistent_priv);
bitcoin_address(coinaddr,coin->chain->pubtype,pubkey33,33);
printf("%s persistent.(%s) (%s) change.(%s) scriptstr.(%s)\n",coin->symbol,myinfo->myaddr.BTC,coinaddr,coin->changeaddr,scriptstr);
//printf("%s persistent.(%s) (%s) change.(%s) scriptstr.(%s)\n",coin->symbol,myinfo->myaddr.BTC,coinaddr,coin->changeaddr,scriptstr);
if ( (waddr= iguana_waddresssearch(myinfo,coin,&wacct,coinaddr)) != 0 )
{
bitcoin_priv2wif(wifstr,waddr->privkey,coin->chain->wiftype);
@ -667,7 +667,7 @@ void instantdex_newjson(struct supernet_info *myinfo,struct bitcoin_swapinfo *sw
{
jaddbits256(newjson,"feetxid",swap->myfee->txid);
jaddstr(newjson,"feetx",swap->myfee->txbytes);
//printf("add feetx to newjson have.%x\n",swap->havestate);
printf("add feetx to newjson have.%x\n",swap->havestate);
}
if ( instantdex_isbob(swap) == 0 )
{
@ -810,7 +810,7 @@ cJSON *instantdex_parseargjson(struct supernet_info *myinfo,struct exchange_info
swap->otherverifiedcut = 1;
if ( juint(argjson,"have") != 0 )
swap->otherhavestate |= juint(argjson,"have");
//printf("got other.%x myhave.%x choosei.(%d %d)\n",swap->otherhavestate,swap->havestate,swap->choosei,swap->otherchoosei);
printf("got other.%x myhave.%x choosei.(%d %d) otherfee.%p dep.%p pay.%p alt.%p\n",swap->otherhavestate,swap->havestate,swap->choosei,swap->otherchoosei,swap->otherfee,swap->deposit,swap->payment,swap->altpayment);
}
return(newjson);
}

Loading…
Cancel
Save