diff --git a/iguana/iguana777.c b/iguana/iguana777.c index 62334cc02..351e1987c 100755 --- a/iguana/iguana777.c +++ b/iguana/iguana777.c @@ -284,7 +284,7 @@ void iguana_bundleQ(struct iguana_info *coin,struct iguana_bundle *bp,int32_t ti void iguana_validateQ(struct iguana_info *coin,struct iguana_bundle *bp) { - struct iguana_helper *ptr; + /*struct iguana_helper *ptr; //if ( bp->validated <= 1 ) { ptr = mycalloc('i',1,sizeof(*ptr)); @@ -297,7 +297,7 @@ void iguana_validateQ(struct iguana_info *coin,struct iguana_bundle *bp) bp->validated = 1; //printf("VALIDATE Q %s bundle.%d[%d] utxofinish.%u balancefinish.%u\n",coin->symbol,ptr->hdrsi,bp->n,bp->utxofinish,bp->balancefinish); queue_enqueue("validateQ",&validateQ,&ptr->DL,0); - } + }*/ } int32_t iguana_emitfinished(struct iguana_info *coin,int32_t queueincomplete) @@ -375,6 +375,7 @@ int32_t iguana_utxogen(struct iguana_info *coin,int32_t helperid,int32_t convert return(-1); if ( coin->PREFETCHLAG > 0 ) iguana_ramchain_prefetch(coin,&bp->ramchain,0); + iguana_bundlevalidate(coin,bp,0); if ( (retval= iguana_spendvectors(coin,bp,&bp->ramchain,0,bp->n,convertflag)) >= 0 ) { if ( retval > 0 ) @@ -414,13 +415,6 @@ int32_t iguana_utxogen(struct iguana_info *coin,int32_t helperid,int32_t convert } if ( convertflag != 0 || iguana_spendvectorsaves(coin) == 0 ) { - for (hdrsi=0; hdrsibundles[hdrsi],0); - //printf("%d ",hdrsi); - iguana_validateQ(coin,coin->bundles[hdrsi]); - } - //printf("add to validateQ\n"); if ( coin->origbalanceswritten <= 1 ) hdrsi = 0; else hdrsi = coin->origbalanceswritten; @@ -507,7 +501,7 @@ void iguana_helper(void *arg) myfree(ptr,ptr->allocsize); } else break; } - n = queue_size(&validateQ) / IGUANA_NUMHELPERS + 1; + /*n = queue_size(&validateQ) / IGUANA_NUMHELPERS + 1; printf("vQ is n.%d\n",n); for (iter=0; itercoin,ptr->bp); myfree(ptr,ptr->allocsize); flag++; - } + }*/ if ( queue_size(&bundlesQ) > 1 || queue_size(&validateQ) > 0 ) allcurrent = 0; if ( flag != 0 ) diff --git a/iguana/iguana777.h b/iguana/iguana777.h index 5dd6c38c5..67d367f05 100755 --- a/iguana/iguana777.h +++ b/iguana/iguana777.h @@ -883,6 +883,7 @@ int32_t iguana_vinsfname(struct iguana_info *coin,char *fname,int32_t slotid); bits256 iguana_merkle(struct iguana_info *coin,bits256 *tree,int32_t txn_count); int32_t iguana_bundleready(struct iguana_info *coin,struct iguana_bundle *bp,int32_t requiredflag); int32_t iguana_blast(struct iguana_info *coin,struct iguana_peer *addr); +int32_t iguana_validated(struct iguana_info *coin); extern int32_t HDRnet,netBLOCKS; diff --git a/iguana/main.c b/iguana/main.c index ea4d968fd..b0ac32a7b 100755 --- a/iguana/main.c +++ b/iguana/main.c @@ -420,7 +420,7 @@ void mainloop(struct supernet_info *myinfo) { for (j=0; jbundles[j]->ramchain); - if ( iguana_utxofinished(coin) < n || iguana_balancefinished(coin) < n ) + if ( iguana_validated(coin) < n || iguana_utxofinished(coin) < n || iguana_balancefinished(coin) < n ) { coin->spendvectorsaved = 1; printf("start UTXOGEN\n");