Changeset View
Changeset View
Standalone View
Standalone View
src/wallet/wallet.cpp
Show First 20 Lines • Show All 1,837 Lines • ▼ Show 20 Lines | if (pindex) { | ||||
} | } | ||||
if (GetTime() >= nNow + 60) { | if (GetTime() >= nNow + 60) { | ||||
nNow = GetTime(); | nNow = GetTime(); | ||||
LogPrintf("Still rescanning. At block %d. Progress=%f\n", | LogPrintf("Still rescanning. At block %d. Progress=%f\n", | ||||
pindex->nHeight, gvp); | pindex->nHeight, gvp); | ||||
} | } | ||||
CBlock block; | CBlock block; | ||||
if (ReadBlockFromDisk(block, pindex, GetConfig())) { | if (ReadBlockFromDisk(block, pindex, chainParams.GetConsensus())) { | ||||
LOCK2(cs_main, cs_wallet); | LOCK2(cs_main, cs_wallet); | ||||
if (pindex && !chainActive.Contains(pindex)) { | if (pindex && !chainActive.Contains(pindex)) { | ||||
// Abort scan if current block is no longer active, to | // Abort scan if current block is no longer active, to | ||||
// prevent marking transactions as coming from the wrong | // prevent marking transactions as coming from the wrong | ||||
// block. | // block. | ||||
ret = pindex; | ret = pindex; | ||||
break; | break; | ||||
} | } | ||||
▲ Show 20 Lines • Show All 2,921 Lines • Show Last 20 Lines |