From f8e809f9960e4b1d29dbec52e199ad89cb3176b1 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 7 Apr 2016 00:19:28 -0500 Subject: [PATCH] test --- iguana/iguana_blocks.c | 2 +- iguana/iguana_bundles.c | 6 +++--- iguana/iguana_recv.c | 2 +- iguana/iguana_unspents.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/iguana/iguana_blocks.c b/iguana/iguana_blocks.c index 8e548f118..589f215ca 100755 --- a/iguana/iguana_blocks.c +++ b/iguana/iguana_blocks.c @@ -410,7 +410,7 @@ struct iguana_block *_iguana_chainlink(struct iguana_info *coin,struct iguana_bl if ( 1 && (block->height % 1000) == 0 ) { //printf("EXTENDMAIN %s %d <- (%s) n.%u max.%u PoW %f numtx.%d valid.%d\n",str,block->height,str2,hwmchain->height+1,coin->blocks.maxblocks,block->PoW,block->RO.txn_count,block->valid); - iguana_walkchain(coin); + //iguana_walkchain(coin); } struct iguana_bundle *bp; int32_t hdrsi; if ( (block->height % coin->chain->bundlesize) == 0 ) diff --git a/iguana/iguana_bundles.c b/iguana/iguana_bundles.c index fbd7da318..41ce0ad4b 100755 --- a/iguana/iguana_bundles.c +++ b/iguana/iguana_bundles.c @@ -1255,10 +1255,10 @@ void iguana_bundlestats(struct iguana_info *coin,char *str,int32_t lag) if ( coin->stucktime != 0 && time(NULL)-coin->stucktime > coin->maxstuck ) coin->maxstuck = (uint32_t)time(NULL) - coin->stucktime; sprintf(str,"%s.RT%d u.%d b.%d/%d v.%d/%d (%d+%d/%d 1st.%d).s%d to %d N[%d] h.%d r.%d c.%d s.%d d.%d E.%d maxB.%d peers.%d/%d Q.(%d %d) (L.%d %d:%d) M.%d %s",coin->symbol,coin->RTheight,numutxo,numbalances,numconverted,numv,coin->pendbalances,firstgap!=0?firstgap->numcached:-1,firstgap!=0?firstgap->numsaved:-1,firstgap!=0?firstgap->numhashes:-1,firstgap!=0?firstgap->hdrsi:-1,firstgap!=0?firstgap->numspec:-1,coin->lastpending!=0?coin->lastpending->hdrsi:0,count,numhashes,coin->blocksrecv,numcached,numsaved,done,numemit,coin->MAXBUNDLES,p,coin->MAXPEERS,queue_size(&coin->priorityQ),queue_size(&coin->blocksQ),coin->longestchain,coin->longestchain/coin->chain->bundlesize,coin->longestchain%coin->chain->bundlesize,coin->blocks.hwmchain.height,bits256_str(str5,coin->blocks.hwmchain.RO.hash2)); - /*if ( coin->current != 0 && coin->current->hdrsi == coin->longestchain/coin->chain->bundlesize && done+numemit < coin->current->hdrsi ) + if ( coin->current != 0 && coin->current->hdrsi == coin->longestchain/coin->chain->bundlesize && numemit == coin->current->hdrsi && numutxo == coin->bundlescount-1 ) { - printf("missing bundles d.%d + E.%d != %d\n",done,numemit,coin->current->hdrsi); - }*/ + printf("have all utxo, generate balances\n"); + } // u.202 b.0/202 v.202/202 if ( coin->current != 0 && numutxo == coin->bundlescount-1 && numutxo == coin->current->hdrsi && numbalances == 0 && numconverted == numutxo ) { diff --git a/iguana/iguana_recv.c b/iguana/iguana_recv.c index beff070c3..51a073fab 100755 --- a/iguana/iguana_recv.c +++ b/iguana/iguana_recv.c @@ -1150,7 +1150,7 @@ int32_t iguana_reqblocks(struct iguana_info *coin) } } } - if ( bits256_nonz(hash2) > 0 ) //strcmp("BTC",coin->symbol) == 0 && + if ( bits256_nonz(hash2) > 0 ) //strcmp("BTC",coin->symbol) == 0 && { coin->backstopmillis = OS_milliseconds(); iguana_blockQ("mainchain",coin,0,-1,hash2,1);//lag > threshold); diff --git a/iguana/iguana_unspents.c b/iguana/iguana_unspents.c index 89657931c..abd94033a 100755 --- a/iguana/iguana_unspents.c +++ b/iguana/iguana_unspents.c @@ -1540,7 +1540,7 @@ int32_t iguana_balancenormal(struct iguana_info *coin,struct iguana_bundle *bp,i break; } //printf("B [%d] j.%d u.%u b.%u\n",bp->hdrsi,j,bp->utxofinish,bp->balancefinish); - if ( (j == n || bp->hdrsi == 0) && bp->bundleheight+bp->n <= coin->blocks.hwmchain.height && bp->utxofinish > 1 && bp->balancefinish == 0 ) + if ( (j == n || bp->hdrsi == 0) && bp->bundleheight+bp->n <= coin->blocks.hwmchain.height && bp->utxofinish > 1 && bp->balancefinish <= 1 ) { bp->balancefinish = 1; if ( bp->hdrsi >= coin->balanceswritten )