Browse Source

Merge pull request #300 from jl777/dev

Dev
win-cross
jl777 8 years ago
committed by GitHub
parent
commit
8265022eaa
  1. 4
      .gitignore
  2. 3
      basilisk/jumblr.c

4
.gitignore

@ -196,3 +196,7 @@ iguana/DB/SWAPS/548227681-1452262678
*.swap *.swap
iguana/DB/SWAPS/1268007736-526212866 iguana/DB/SWAPS/1268007736-526212866
iguana/DB/SWAPS/3111936786-3185288772
iguana/DB/SWAPS/3368214189-2405641584

3
basilisk/jumblr.c

@ -424,6 +424,7 @@ void jumblr_iteration(struct supernet_info *myinfo,struct iguana_info *coin,int3
switch ( selector ) switch ( selector )
{ {
case 0: // public -> z, need to importprivkey case 0: // public -> z, need to importprivkey
jumblr_privkey(myinfo,BTCaddr,KMDaddr,JUMBLR_DEPOSITPREFIX);
if ( (total= jumblr_balance(myinfo,coin,KMDaddr)) >= (JUMBLR_INCR + 3*(fee+JUMBLR_TXFEE))*SATOSHIDEN ) if ( (total= jumblr_balance(myinfo,coin,KMDaddr)) >= (JUMBLR_INCR + 3*(fee+JUMBLR_TXFEE))*SATOSHIDEN )
{ {
if ( (r & 1) == 0 ) if ( (r & 1) == 0 )
@ -443,7 +444,7 @@ void jumblr_iteration(struct supernet_info *myinfo,struct iguana_info *coin,int3
free(zaddr); free(zaddr);
} else printf("no zaddr from jumblr_zgetnewaddress\n"); } else printf("no zaddr from jumblr_zgetnewaddress\n");
} }
} //else printf("%s total %.8f vs %.8f\n",KMDaddr,dstr(total),(JUMBLR_INCR + 3*(fee+JUMBLR_TXFEE))); } else printf("%s total %.8f vs %.8f\n",KMDaddr,dstr(total),(JUMBLR_INCR + 3*(fee+JUMBLR_TXFEE)));
break; break;
case 1: // z -> z case 1: // z -> z
jumblr_opidsupdate(myinfo,coin); jumblr_opidsupdate(myinfo,coin);

Loading…
Cancel
Save