BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #381 from TheBlueMatt/nminversion 

Add minversion to wallet.
This commit is contained in:
Jeff Garzik 2011-07-12 19:34:30 -07:00
parent 61e3c011f5 7ec552676c
commit 0fa89d8e81
4 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/db.cpp
View File

@ -670,7 +670,7 @@ void CWalletDB::ListAccountCreditDebit(const string& strAccount, list<CAccountin
} }
bool CWalletDB::LoadWallet(CWallet* pwallet) int CWalletDB::LoadWallet(CWallet* pwallet)
{ {
pwallet->vchDefaultKey.clear(); pwallet->vchDefaultKey.clear();
int nFileVersion = 0; int nFileVersion = 0;
@ -690,7 +690,7 @@ bool CWalletDB::LoadWallet(CWallet* pwallet)
// Get cursor // Get cursor
Dbc* pcursor = GetCursor(); Dbc* pcursor = GetCursor();
if (!pcursor) if (!pcursor)
return false; return DB_CORRUPT;
loop loop
{ {
@ -701,7 +701,7 @@ bool CWalletDB::LoadWallet(CWallet* pwallet)
if (ret == DB_NOTFOUND) if (ret == DB_NOTFOUND)
break; break;
else if (ret != 0) else if (ret != 0)
return false; return DB_CORRUPT;
// Unserialize // Unserialize
// Taking advantage of the fact that pair serialization // Taking advantage of the fact that pair serialization
@ -836,6 +836,13 @@ bool CWalletDB::LoadWallet(CWallet* pwallet)
if (strKey == "addrProxy") ssValue >> addrProxy; if (strKey == "addrProxy") ssValue >> addrProxy;
if (fHaveUPnP && strKey == "fUseUPnP") ssValue >> fUseUPnP; if (fHaveUPnP && strKey == "fUseUPnP") ssValue >> fUseUPnP;
} }
else if (strType == "minversion")
{
int nMinVersion = 0;
ssValue >> nMinVersion;
if (nMinVersion > VERSION)
return DB_TOO_NEW;
}
} }
pcursor->close(); pcursor->close();
} }
@ -865,7 +872,7 @@ bool CWalletDB::LoadWallet(CWallet* pwallet)
} }
return true; return DB_LOAD_OK;
} }
void ThreadFlushWalletDB(void* parg) void ThreadFlushWalletDB(void* parg)

9
src/db.h
View File

@ -342,6 +342,13 @@ public:
enum DBErrors
{
DB_LOAD_OK,
DB_CORRUPT,
DB_TOO_NEW
};
class CWalletDB : public CDB class CWalletDB : public CDB
{ {
public: public:
@ -469,7 +476,7 @@ public:
int64 GetAccountCreditDebit(const std::string& strAccount); int64 GetAccountCreditDebit(const std::string& strAccount);
void ListAccountCreditDebit(const std::string& strAccount, std::list<CAccountingEntry>& acentries); void ListAccountCreditDebit(const std::string& strAccount, std::list<CAccountingEntry>& acentries);
bool LoadWallet(CWallet* pwallet); int LoadWallet(CWallet* pwallet);
}; };
#endif #endif

12
src/init.cpp
View File

@ -387,8 +387,16 @@ bool AppInit2(int argc, char* argv[])
nStart = GetTimeMillis(); nStart = GetTimeMillis();
bool fFirstRun; bool fFirstRun;
pwalletMain = new CWallet("wallet.dat"); pwalletMain = new CWallet("wallet.dat");
if (!pwalletMain->LoadWallet(fFirstRun)) int nLoadWalletRet = pwalletMain->LoadWallet(fFirstRun);
strErrors += _("Error loading wallet.dat \n"); if (nLoadWalletRet != DB_LOAD_OK)
{
if (nLoadWalletRet == DB_CORRUPT)
strErrors += _("Error loading wallet.dat: Wallet corrupted \n");
else if (nLoadWalletRet == DB_TOO_NEW)
strErrors += _("Error loading wallet.dat: Wallet requires newer version of Bitcoin \n");
else
strErrors += _("Error loading wallet.dat \n");
}
printf(" wallet %15"PRI64d"ms\n", GetTimeMillis() - nStart); printf(" wallet %15"PRI64d"ms\n", GetTimeMillis() - nStart);
RegisterWallet(pwalletMain); RegisterWallet(pwalletMain);

5
src/wallet.cpp
View File

@ -1130,8 +1130,9 @@ bool CWallet::LoadWallet(bool& fFirstRunRet)
if (!fFileBacked) if (!fFileBacked)
return false; return false;
fFirstRunRet = false; fFirstRunRet = false;
if (!CWalletDB(strWalletFile,"cr+").LoadWallet(this)) int nLoadWalletRet = CWalletDB(strWalletFile,"cr+").LoadWallet(this);
return false; if (nLoadWalletRet != DB_LOAD_OK)
return nLoadWalletRet;
fFirstRunRet = vchDefaultKey.empty(); fFirstRunRet = vchDefaultKey.empty();
if (!HaveKey(vchDefaultKey)) if (!HaveKey(vchDefaultKey))