|
|
@ -587,6 +587,7 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer) |
|
|
|
|
|
|
|
|
|
|
|
// ********************************************************* Step 5: verify wallet database integrity
|
|
|
|
// ********************************************************* Step 5: verify wallet database integrity
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (1) { |
|
|
|
uiInterface.InitMessage(_("Verifying wallet...")); |
|
|
|
uiInterface.InitMessage(_("Verifying wallet...")); |
|
|
|
|
|
|
|
|
|
|
|
if (!bitdb.Open(GetDataDir())) |
|
|
|
if (!bitdb.Open(GetDataDir())) |
|
|
@ -630,6 +631,7 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer) |
|
|
|
if (r == CDBEnv::RECOVER_FAIL) |
|
|
|
if (r == CDBEnv::RECOVER_FAIL) |
|
|
|
return InitError(_("wallet.dat corrupt, salvage failed")); |
|
|
|
return InitError(_("wallet.dat corrupt, salvage failed")); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} // (1)
|
|
|
|
|
|
|
|
|
|
|
|
// ********************************************************* Step 6: network initialization
|
|
|
|
// ********************************************************* Step 6: network initialization
|
|
|
|
|
|
|
|
|
|
|
@ -898,6 +900,7 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer) |
|
|
|
|
|
|
|
|
|
|
|
// ********************************************************* Step 8: load wallet
|
|
|
|
// ********************************************************* Step 8: load wallet
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (1) { |
|
|
|
uiInterface.InitMessage(_("Loading wallet...")); |
|
|
|
uiInterface.InitMessage(_("Loading wallet...")); |
|
|
|
|
|
|
|
|
|
|
|
nStart = GetTimeMillis(); |
|
|
|
nStart = GetTimeMillis(); |
|
|
@ -984,6 +987,7 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer) |
|
|
|
pwalletMain->SetBestChain(chainActive.GetLocator()); |
|
|
|
pwalletMain->SetBestChain(chainActive.GetLocator()); |
|
|
|
nWalletDBUpdated++; |
|
|
|
nWalletDBUpdated++; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} // (1)
|
|
|
|
|
|
|
|
|
|
|
|
// ********************************************************* Step 9: import blocks
|
|
|
|
// ********************************************************* Step 9: import blocks
|
|
|
|
|
|
|
|
|
|
|
|