Browse Source

Test

etomic
jl777 8 years ago
parent
commit
8afca2e19b
  1. 4
      .gitignore
  2. 2
      basilisk/basilisk_bitcoin.c
  3. 3
      basilisk/basilisk_swap.c
  4. 2
      iguana/dpow/dpow_network.c
  5. 4
      iguana/main.c

4
.gitignore

@ -461,3 +461,7 @@ iguana/DB/SWAPS/654629381-1010651560
iguana/DB/SWAPS/1780095668-2225891679 iguana/DB/SWAPS/1780095668-2225891679
iguana/DB/SWAPS/3085356347-2346291696 iguana/DB/SWAPS/3085356347-2346291696
iguana/DB/SWAPS/1819165332-1507632737
iguana/DB/SWAPS/283982730-556239841

2
basilisk/basilisk_bitcoin.c

@ -781,7 +781,7 @@ char *basilisk_bitcoinrawtx(struct supernet_info *myinfo,struct iguana_info *coi
addresses = iguana_getaddressesbyaccount(myinfo,coin,"*"); addresses = iguana_getaddressesbyaccount(myinfo,coin,"*");
jadd(valsobj,"addresses",addresses); jadd(valsobj,"addresses",addresses);
} }
printf("use addresses.(%s)\n",jprint(addresses,0)); printf("use addresses.(%s) (%s)\n",jprint(addresses,0),spendscriptstr!=0?spendscriptstr:"no script");
//printf("(%s) vals.(%s) change.(%s) spend.%s\n",coin->symbol,jprint(valsobj,0),changeaddr,spendscriptstr); //printf("(%s) vals.(%s) change.(%s) spend.%s\n",coin->symbol,jprint(valsobj,0),changeaddr,spendscriptstr);
if ( changeaddr == 0 || changeaddr[0] == 0 || spendscriptstr == 0 || spendscriptstr[0] == 0 ) if ( changeaddr == 0 || changeaddr[0] == 0 || spendscriptstr == 0 || spendscriptstr[0] == 0 )
return(clonestr("{\"error\":\"invalid changeaddr or spendscript or addresses\"}")); return(clonestr("{\"error\":\"invalid changeaddr or spendscript or addresses\"}"));

3
basilisk/basilisk_swap.c

@ -2042,7 +2042,8 @@ uint32_t basilisk_swapdata_rawtxsend(struct supernet_info *myinfo,struct basilis
} }
} }
return(nextbits); return(nextbits);
} else printf("error from basilisk_swapdata_rawtx.%s %p len.%d\n",rawtx->name,rawtx->txbytes,rawtx->I.datalen); } else if ( swap->I.iambob == 0 )
printf("error from basilisk_swapdata_rawtx.%s %p len.%d\n",rawtx->name,rawtx->txbytes,rawtx->I.datalen);
return(0); return(0);
} }

2
iguana/dpow/dpow_network.c

@ -1173,7 +1173,7 @@ char *_dex_listunspentarg(struct supernet_info *myinfo,char *symbol,char *addres
dexreq.func = arg; dexreq.func = arg;
if ( (retstr= _dex_sendrequeststr(myinfo,&dexreq,address,0,1,"")) != 0 ) if ( (retstr= _dex_sendrequeststr(myinfo,&dexreq,address,0,1,"")) != 0 )
{ {
//printf("_dex_listunspentarg: %s UNSPENTS.(%s)\n",symbol,retstr); printf("_dex_listunspentarg: %s UNSPENTS.(%s)\n",symbol,retstr);
} }
return(_dex_arrayreturn(retstr)); return(_dex_arrayreturn(retstr));
} }

4
iguana/main.c

@ -756,8 +756,8 @@ void jumblr_loop(void *ptr)
if ( (coin= iguana_coinfind("KMD")) != 0 ) if ( (coin= iguana_coinfind("KMD")) != 0 )
{ {
n++; n++;
if ( (n % 7) == 0 ) if ( (n % 3) == 0 )
smartaddress_update(myinfo,(n/7) & 1); 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