
Untitled
By: a guest on
Oct 5th, 2010 | syntax:
Diff | size: 1.52 KB | hits: 65 | expires: Never
--- /downloads/svn/bitcoin/trunk/db.cpp 2010-09-19 12:19:39.000000000 +0000
+++ /downloads/git/bitcoin-git/db.cpp 2010-10-06 03:17:36.000000000 +0000
@@ -465,7 +465,7 @@ bool CTxDB::LoadBlockIndex()
CBlockIndex* pindexFork = NULL;
for (CBlockIndex* pindex = pindexBest; pindex && pindex->pprev; pindex = pindex->pprev)
{
- if (pindex->nHeight < 74000 && !mapArgs.count("-checkblocks"))
+ if (pindex->nHeight < nBestHeight-2500 && !mapArgs.count("-checkblocks"))
break;
CBlock block;
if (!block.ReadFromDisk(pindex))
@@ -591,6 +591,7 @@ bool CWalletDB::LoadWallet()
//// todo: shouldn't we catch exceptions and try to recover and continue?
CRITICAL_BLOCK(cs_mapKeys)
CRITICAL_BLOCK(cs_mapWallet)
+ CRITICAL_BLOCK(cs_mapMonitored)
{
// Get cursor
Dbc* pcursor = GetCursor();
@@ -619,6 +620,18 @@ bool CWalletDB::LoadWallet()
ssKey >> strAddress;
ssValue >> mapAddressBook[strAddress];
}
+ else if (strType == "monitoraddress")
+ {
+ string strAddress;
+ ssKey >> strAddress;
+ ssValue >> mapMonitorAddress[strAddress];
+ }
+ else if (strType == "monitorblocks")
+ {
+ string url;
+ ssKey >> url;
+ ssValue >> mapMonitorBlocks[url];
+ }
else if (strType == "tx")
{
uint256 hash;