|
|
@ -3928,9 +3928,14 @@ bool static ConnectTip(CValidationState &state, CBlockIndex *pindexNew, CBlock * |
|
|
|
int64_t nTime6 = GetTimeMicros(); nTimePostConnect += nTime6 - nTime5; nTimeTotal += nTime6 - nTime1; |
|
|
|
LogPrint("bench", " - Connect postprocess: %.2fms [%.2fs]\n", (nTime6 - nTime5) * 0.001, nTimePostConnect * 0.000001); |
|
|
|
LogPrint("bench", "- Connect block: %.2fms [%.2fs]\n", (nTime6 - nTime1) * 0.001, nTimeTotal * 0.000001); |
|
|
|
if ( HUSH_LONGESTCHAIN != 0 && (pindexNew->GetHeight() == HUSH_LONGESTCHAIN || pindexNew->GetHeight() == HUSH_LONGESTCHAIN+1) ) |
|
|
|
|
|
|
|
// Update synced-ness data
|
|
|
|
if ( HUSH_LONGESTCHAIN != 0 && (pindexNew->GetHeight() == HUSH_LONGESTCHAIN || pindexNew->GetHeight() == HUSH_LONGESTCHAIN+1) ) { |
|
|
|
HUSH_INSYNC = (int32_t)pindexNew->GetHeight(); |
|
|
|
else HUSH_INSYNC = 0; |
|
|
|
} else { |
|
|
|
HUSH_INSYNC = 0; |
|
|
|
fprintf(stderr,"%s: insync=%d,longestchain=%d,height=%d\n", __func__, HUSH_INSYNC, HUSH_LONGESTCHAIN, pindexNew->GetHeight() ); |
|
|
|
} |
|
|
|
//fprintf(stderr,"connect.%d insync.%d ASSETCHAINS_SAPLING.%d\n",(int32_t)pindexNew->GetHeight(),HUSH_INSYNC,ASSETCHAINS_SAPLING);
|
|
|
|
|
|
|
|
if ( HUSH_NSPV_FULLNODE ) |
|
|
@ -3951,9 +3956,9 @@ bool static ConnectTip(CValidationState &state, CBlockIndex *pindexNew, CBlock * |
|
|
|
fprintf(stderr, "snapshot completed in: %d seconds\n", (int32_t)(time(NULL)-start)); |
|
|
|
} |
|
|
|
} |
|
|
|
//fprintf(stderr,"%s: returning true\n", __FUNCTION__);
|
|
|
|
return true; |
|
|
|
} |
|
|
|
|
|
|
|
std::pair<std::map<CBlockIndex*, std::list<CTransaction>>, uint64_t> DrainRecentlyConflicted() |
|
|
|
{ |
|
|
|
uint64_t recentlyConflictedSequence; |
|
|
|