From 80d74e755b893d2898ad6465dbd39537af54e373 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 4 Mar 2017 10:21:28 +0200 Subject: [PATCH] Test --- basilisk/jumblr.c | 8 +++++--- iguana/main.c | 8 ++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/basilisk/jumblr.c b/basilisk/jumblr.c index ccb90f81d..13ab787e9 100755 --- a/basilisk/jumblr.c +++ b/basilisk/jumblr.c @@ -322,6 +322,7 @@ r = 0; { if ( strlen(ptr->src) < 40 ) { + printf("%s -> %s check for z to z\n",ptr->src,ptr->dest); if ( (r & 7) == 0 && ptr->spent == 0 && (total= jumblr_balance(myinfo,coin,ptr->dest)) >= (fee + JUMBLR_FEE)*SATOSHIDEN ) { if ( (zaddr= jumblr_zgetnewaddress(myinfo,coin)) != 0 ) @@ -345,6 +346,7 @@ r = 0; { if ( strlen(ptr->src) >= 40 ) { + printf("%s -> %s check for z to t\n",ptr->src,ptr->dest); if ( (r & 7) == 0 && ptr->spent == 0 && (total= jumblr_balance(myinfo,coin,ptr->dest)) >= (fee + JUMBLR_FEE)*SATOSHIDEN ) { priv0 = jumblr_privkey(myinfo,BTCaddr,KMDaddr,""); @@ -423,10 +425,10 @@ ZERO_ARGS(jumblr,status) jaddnum(retjson,"t_to_z",dstr(step_t2z)); jaddnum(retjson,"z_to_z",dstr(step_z2z)); jaddnum(retjson,"z_to_t",dstr(step_z2t)); - jaddnum(retjson,"finished",dstr(finished)); - jaddnum(retjson,"received",dstr(received)); - jaddnum(retjson,"pending",dstr(received) - dstr(finished)); + jaddnum(retjson,"pending",dstr(deposited) + dstr(step_t2z) + dstr(step_z2z) + dstr(step_z2t)); jaddnum(retjson,"jumblred",dstr(jumblred)); + jaddnum(retjson,"received",dstr(received)); + jaddnum(retjson,"finished",dstr(finished)); return(jprint(retjson,1)); } else return(clonestr("{\"error\":\"no passphrase or no native komodod\"}")); } diff --git a/iguana/main.c b/iguana/main.c index fc9ed1609..86742ee04 100755 --- a/iguana/main.c +++ b/iguana/main.c @@ -747,17 +747,17 @@ void iguana_urlinit(struct supernet_info *myinfo,int32_t ismainnet,int32_t usess void jumblr_loop(void *ptr) { - struct iguana_info *coin; uint32_t t; struct supernet_info *myinfo = ptr; + struct iguana_info *coin; uint32_t t; struct supernet_info *myinfo = ptr; int32_t mult = 1; printf("JUMBLR loop\n"); while ( 1 ) { t = (uint32_t)time(NULL); - if ( (coin= iguana_coinfind("KMD")) != 0 && coin->FULLNODE < 0 && myinfo->jumblr_passphrase[0] != 0 && (t % 1200) < 60 ) + if ( (coin= iguana_coinfind("KMD")) != 0 && coin->FULLNODE < 0 && myinfo->jumblr_passphrase[0] != 0 && (t % (120 * mult)) < 60 ) { - jumblr_iteration(myinfo,coin,(t % 3600) / 1200,t % 1200); + jumblr_iteration(myinfo,coin,(t % (360 * mult)) / (120 * mult),t % (120 * mult)); } //printf("t.%u %p.%d %s\n",t,coin,coin!=0?coin->FULLNODE:0,myinfo->jumblr_passphrase); - sleep(20); + sleep(40); } }