This commit is contained in:
jl777
2018-11-22 01:43:58 -11:00
parent 19042ac062
commit 77cad1396f
2 changed files with 7 additions and 4 deletions

View File

@@ -1489,7 +1489,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
if ( checkval != fAddressIndex ) if ( checkval != fAddressIndex )
{ {
pblocktree->WriteFlag("addressindex", fAddressIndex); pblocktree->WriteFlag("addressindex", fAddressIndex);
fprintf(stderr,"set addressindex, will reindex. sorry will take a while.\n"); fprintf(stderr,"set addressindex, will reindex. could take a while.\n");
fReindex = true; fReindex = true;
} }
fSpentIndex = GetBoolArg("-spentindex", DEFAULT_SPENTINDEX); fSpentIndex = GetBoolArg("-spentindex", DEFAULT_SPENTINDEX);
@@ -1497,7 +1497,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
if ( checkval != fSpentIndex ) if ( checkval != fSpentIndex )
{ {
pblocktree->WriteFlag("spentindex", fSpentIndex); pblocktree->WriteFlag("spentindex", fSpentIndex);
fprintf(stderr,"set spentindex, will reindex. sorry will take a while.\n"); fprintf(stderr,"set spentindex, will reindex. could take a while.\n");
fReindex = true; fReindex = true;
} }
} }

View File

@@ -3784,6 +3784,9 @@ int32_t komodo_activate_sapling(CBlockIndex *pindex)
fprintf(stderr,"komodo_activate_sapling null pindex\n"); fprintf(stderr,"komodo_activate_sapling null pindex\n");
return(0); return(0);
} }
height = pindex->GetHeight();
blocktime = (uint32_t)pindex->nTime;
fprintf(stderr,"komodo_activate_sapling.%d starting blocktime %u cmp.%d\n",height,blocktime,blocktime > KOMODO_SAPLING_ACTIVATION);
for (i=0; i<60; i++) for (i=0; i<60; i++)
{ {
if ( (prev= pindex->pprev) == 0 ) if ( (prev= pindex->pprev) == 0 )
@@ -3797,14 +3800,14 @@ int32_t komodo_activate_sapling(CBlockIndex *pindex)
} }
height = pindex->GetHeight(); height = pindex->GetHeight();
blocktime = (uint32_t)pindex->nTime; blocktime = (uint32_t)pindex->nTime;
//fprintf(stderr,"starting blocktime %u cmp.%d\n",blocktime,blocktime > KOMODO_SAPLING_ACTIVATION); fprintf(stderr,"starting blocktime %u cmp.%d\n",blocktime,blocktime > KOMODO_SAPLING_ACTIVATION);
if ( blocktime > KOMODO_SAPLING_ACTIVATION ) // find the earliest transition if ( blocktime > KOMODO_SAPLING_ACTIVATION ) // find the earliest transition
{ {
while ( (prev= pindex->pprev) != 0 ) while ( (prev= pindex->pprev) != 0 )
{ {
prevht = prev->GetHeight(); prevht = prev->GetHeight();
prevtime = (uint32_t)prev->nTime; prevtime = (uint32_t)prev->nTime;
//fprintf(stderr,"(%d, %u) -> (%d, %u)\n",prevht,prevtime,height,blocktime); fprintf(stderr,"(%d, %u) -> (%d, %u)\n",prevht,prevtime,height,blocktime);
if ( prevht+1 != height ) if ( prevht+1 != height )
{ {
fprintf(stderr,"komodo_activate_sapling: unexpected non-contiguous ht %d vs %d\n",prevht,height); fprintf(stderr,"komodo_activate_sapling: unexpected non-contiguous ht %d vs %d\n",prevht,height);