|
|
@ -370,18 +370,21 @@ bool AppInit2(int argc, char* argv[]) |
|
|
|
strErrors = ""; |
|
|
|
strErrors = ""; |
|
|
|
int64 nStart; |
|
|
|
int64 nStart; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
InitMessage("Loading addresses..."); |
|
|
|
printf("Loading addresses...\n"); |
|
|
|
printf("Loading addresses...\n"); |
|
|
|
nStart = GetTimeMillis(); |
|
|
|
nStart = GetTimeMillis(); |
|
|
|
if (!LoadAddresses()) |
|
|
|
if (!LoadAddresses()) |
|
|
|
strErrors += _("Error loading addr.dat \n"); |
|
|
|
strErrors += _("Error loading addr.dat \n"); |
|
|
|
printf(" addresses %15"PRI64d"ms\n", GetTimeMillis() - nStart); |
|
|
|
printf(" addresses %15"PRI64d"ms\n", GetTimeMillis() - nStart); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
InitMessage("Loading block index..."); |
|
|
|
printf("Loading block index...\n"); |
|
|
|
printf("Loading block index...\n"); |
|
|
|
nStart = GetTimeMillis(); |
|
|
|
nStart = GetTimeMillis(); |
|
|
|
if (!LoadBlockIndex()) |
|
|
|
if (!LoadBlockIndex()) |
|
|
|
strErrors += _("Error loading blkindex.dat \n"); |
|
|
|
strErrors += _("Error loading blkindex.dat \n"); |
|
|
|
printf(" block index %15"PRI64d"ms\n", GetTimeMillis() - nStart); |
|
|
|
printf(" block index %15"PRI64d"ms\n", GetTimeMillis() - nStart); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
InitMessage("Loading wallet..."); |
|
|
|
printf("Loading wallet...\n"); |
|
|
|
printf("Loading wallet...\n"); |
|
|
|
nStart = GetTimeMillis(); |
|
|
|
nStart = GetTimeMillis(); |
|
|
|
bool fFirstRun; |
|
|
|
bool fFirstRun; |
|
|
@ -412,12 +415,14 @@ bool AppInit2(int argc, char* argv[]) |
|
|
|
} |
|
|
|
} |
|
|
|
if (pindexBest != pindexRescan) |
|
|
|
if (pindexBest != pindexRescan) |
|
|
|
{ |
|
|
|
{ |
|
|
|
|
|
|
|
InitMessage("Rescanning..."); |
|
|
|
printf("Rescanning last %i blocks (from block %i)...\n", pindexBest->nHeight - pindexRescan->nHeight, pindexRescan->nHeight); |
|
|
|
printf("Rescanning last %i blocks (from block %i)...\n", pindexBest->nHeight - pindexRescan->nHeight, pindexRescan->nHeight); |
|
|
|
nStart = GetTimeMillis(); |
|
|
|
nStart = GetTimeMillis(); |
|
|
|
pwalletMain->ScanForWalletTransactions(pindexRescan, true); |
|
|
|
pwalletMain->ScanForWalletTransactions(pindexRescan, true); |
|
|
|
printf(" rescan %15"PRI64d"ms\n", GetTimeMillis() - nStart); |
|
|
|
printf(" rescan %15"PRI64d"ms\n", GetTimeMillis() - nStart); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
InitMessage("Done loading"); |
|
|
|
printf("Done loading\n"); |
|
|
|
printf("Done loading\n"); |
|
|
|
|
|
|
|
|
|
|
|
//// debug print
|
|
|
|
//// debug print
|
|
|
|