From 1762bd5d253ab94be7482f6ebe69eb6945bfa09a Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 18 Sep 2016 13:14:13 -0300 Subject: [PATCH] revert utxofinish --- iguana/iguana_bundles.c | 2 +- iguana/iguana_ramchain.c | 4 ++-- iguana/iguana_recv.c | 4 ++-- iguana/iguana_spendvectors.c | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/iguana/iguana_bundles.c b/iguana/iguana_bundles.c index f1e968c0f..8b5b03341 100755 --- a/iguana/iguana_bundles.c +++ b/iguana/iguana_bundles.c @@ -1117,7 +1117,7 @@ int32_t iguana_bundleiters(struct supernet_info *myinfo,struct iguana_info *coin if ( coin->blockdepth == 0 && coin->blockdepth == 0 && bp->hdrsi == coin->bundlescount-1 ) iguana_autoextend(myinfo,coin,bp); if ( 0 && bp->hdrsi == 0 ) - printf("ITER utxo.%u now.%u spec.%-4d bundle.%-4d h.%-4d r.%-4d s.%-4d F.%d T.%d issued.%d mb.%d/%d\n",bp->emitfinish,(uint32_t)time(NULL),bp->numspec,bp->bundleheight/coin->chain->bundlesize,bp->numhashes,bp->numrecv,bp->numsaved,bp->emitfinish,timelimit,counter,coin->MAXBUNDLES,coin->bundlescount); + printf("ITER utxo.%u now.%u spec.%-4d bundle.%-4d h.%-4d r.%-4d s.%-4d F.%d T.%d issued.%d mb.%d/%d\n",bp->utxofinish,(uint32_t)time(NULL),bp->numspec,bp->bundleheight/coin->chain->bundlesize,bp->numhashes,bp->numrecv,bp->numsaved,bp->emitfinish,timelimit,counter,coin->MAXBUNDLES,coin->bundlescount); bp->nexttime = (uint32_t)time(NULL) + ((bp->hdrsi > starti) ? 0 : -2); if ( bp->hdrsi == coin->bundlescount-1 || (bp->numhashes < bp->n && bp->bundleheight < coin->longestchain-coin->chain->bundlesize) ) iguana_bundlehdr(myinfo,coin,bp,starti); diff --git a/iguana/iguana_ramchain.c b/iguana/iguana_ramchain.c index a24ef57f3..1cf3ba2ad 100755 --- a/iguana/iguana_ramchain.c +++ b/iguana/iguana_ramchain.c @@ -1293,7 +1293,7 @@ int32_t iguana_bundleremove(struct iguana_info *coin,int32_t hdrsi,int32_t tmpfi sprintf(fname,"%s/%s/accounts/debits.%d",GLOBAL_DBDIR,coin->symbol,bp->bundleheight), OS_removefile(fname,0); sprintf(fname,"%s/%s/accounts/lastspends.%d",GLOBAL_DBDIR,coin->symbol,bp->bundleheight), OS_removefile(fname,0); sprintf(fname,"%s/%s/validated/%d",GLOBAL_DBDIR,coin->symbol,bp->bundleheight), OS_removefile(fname,0); - bp->startutxo = bp->balancefinish = bp->validated = bp->emitfinish = bp->converted = 0; + bp->utxofinish = bp->startutxo = bp->balancefinish = bp->validated = bp->emitfinish = bp->converted = 0; //iguana_ramchain_free(coin,&bp->ramchain,1); return(0); } @@ -1334,7 +1334,7 @@ int32_t iguana_Xspendmap(struct iguana_info *coin,struct iguana_ramchain *ramcha { ramchain->Xspendptr = ptr; ramchain->numXspends = (int32_t)((filesize - sizeof(sha256)) / sizeof(*ramchain->Xspendinds)); - bp->startutxo = bp->emitfinish = (uint32_t)time(NULL); + bp->startutxo = bp->utxofinish = (uint32_t)time(NULL); if ( bp->Xvalid == 0 ) { if ( (rand() % 10) == 0 ) diff --git a/iguana/iguana_recv.c b/iguana/iguana_recv.c index b64bfac14..c0603add4 100755 --- a/iguana/iguana_recv.c +++ b/iguana/iguana_recv.c @@ -506,7 +506,7 @@ void iguana_oldgotblockM(struct supernet_info *myinfo,struct iguana_info *coin,s { numtx = origtxdata->zblock.RO.txn_count; for (i=0; ibundlescount; i++) - if ( (bp= coin->bundles[i]) != 0 && bp->emitfinish <= 1 ) + if ( (bp= coin->bundles[i]) != 0 && bp->utxofinish <= 1 ) break; if ( (i > coin->bundlescount-2 && coin->blocks.hwmchain.height > coin->longestchain-coin->chain->bundlesize*2) || coin->RTheight > 0 ) { @@ -676,7 +676,7 @@ void iguana_RTgotblock(struct iguana_info *coin,bits256 hash2,uint8_t *data,int3 if ( coin->almostRT == 0 ) { for (i=0; ibundlescount; i++) - if ( (bp= coin->bundles[i]) != 0 && bp->emitfinish <= 1 ) + if ( (bp= coin->bundles[i]) != 0 && bp->utxofinish <= 1 ) break; if ( (i > coin->bundlescount-2 && coin->blocks.hwmchain.height > coin->longestchain-coin->chain->bundlesize*2) || coin->RTheight > 0 ) coin->almostRT = 1; diff --git a/iguana/iguana_spendvectors.c b/iguana/iguana_spendvectors.c index 4c0d49ff7..67ee17029 100755 --- a/iguana/iguana_spendvectors.c +++ b/iguana/iguana_spendvectors.c @@ -622,7 +622,7 @@ int32_t iguana_volatilesinit(struct supernet_info *myinfo,struct iguana_info *co { if ( (bp= coin->bundles[i]) == 0 ) continue; - if ( bp->emitfinish <= 1 || (i > 0 && bp->emitfinish <= 1) ) + if ( bp->emitfinish <= 1 || (i > 0 && bp->utxofinish <= 1) ) { //printf("hdrsi.[%d] emitfinish.%u utxofinish.%u\n",i,bp->emitfinish,bp->utxofinish); continue; @@ -753,11 +753,11 @@ void iguana_initfinal(struct supernet_info *myinfo,struct iguana_info *coin,bits { if ( (bp= coin->bundles[i]) == 0 || bp->emitfinish <= 1 ) { - printf("%s initfinal break.[%d]: bp.%p or emit.%u utxofinish.%u\n",coin->symbol,i,bp,bp!=0?bp->emitfinish:-1,bp!=0?bp->emitfinish:-1); + printf("%s initfinal break.[%d]: bp.%p or emit.%u utxofinish.%u\n",coin->symbol,i,bp,bp!=0?bp->emitfinish:-1,bp!=0?bp->utxofinish:-1); break; } if ( i == 0 ) - bp->emitfinish = bp->startutxo = (uint32_t)time(NULL); + bp->utxofinish = bp->startutxo = (uint32_t)time(NULL); } if ( i < coin->bundlescount-1 ) { @@ -765,7 +765,7 @@ void iguana_initfinal(struct supernet_info *myinfo,struct iguana_info *coin,bits for (i=0; ibundlescount-1; i++) { if ( (bp= coin->bundles[i]) != 0 ) - bp->startutxo = bp->emitfinish = bp->converted = bp->balancefinish = bp->validated = 0; + bp->utxofinish = bp->startutxo = bp->emitfinish = bp->converted = bp->balancefinish = bp->validated = 0; } } else @@ -1160,7 +1160,7 @@ int32_t iguana_bundlevalidate(struct supernet_info *myinfo,struct iguana_info *c printf("%s %s VALIDATED.[%d] ht.%d duration.%d errs.%d total.%lld %u | total errs.%d validated.%d %llx\n",coin->symbol,errs!=0?"NOT":"",bp->hdrsi,bp->bundleheight,(uint32_t)time(NULL) - now,errs,(long long)total,bp->validated,totalerrs,totalvalidated,(long long)validatehash.txid); if ( errs == 0 ) bp->validated = (uint32_t)time(NULL); - else bp->startutxo = bp->emitfinish = 0; + else bp->startutxo = bp->utxofinish = 0; //iguana_volatilesmap(coin,&bp->ramchain); //if ( bp == coin->current ) // coin->RTdatabad = -1;