Add SetMinVersion to CWallet

This commit is contained in:
Pieter Wuille
2012-02-18 14:55:02 +01:00
parent 2d36b60f92
commit 0b807a417f
4 changed files with 44 additions and 2 deletions

View File

@@ -25,6 +25,8 @@ private:
CWalletDB *pwalletdbEncryption;
int nWalletVersion;
public:
mutable CCriticalSection cs_wallet;
@@ -33,18 +35,21 @@ public:
std::set<int64> setKeyPool;
typedef std::map<unsigned int, CMasterKey> MasterKeyMap;
MasterKeyMap mapMasterKeys;
unsigned int nMasterKeyMaxID;
CWallet()
{
nWalletVersion = 0;
fFileBacked = false;
nMasterKeyMaxID = 0;
pwalletdbEncryption = NULL;
}
CWallet(std::string strWalletFileIn)
{
nWalletVersion = 0;
strWalletFile = strWalletFileIn;
fFileBacked = true;
nMasterKeyMaxID = 0;
@@ -66,6 +71,8 @@ public:
// Adds a key to the store, without saving it to disk (used by LoadWallet)
bool LoadKey(const CKey& key) { return CCryptoKeyStore::AddKey(key); }
bool LoadMinVersion(int nVersion) { nWalletVersion = nVersion; return true; }
// Adds an encrypted key to the store, and saves it to disk.
bool AddCryptedKey(const std::vector<unsigned char> &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret);
// Adds an encrypted key to the store, without saving it to disk (used by LoadWallet)
@@ -206,6 +213,8 @@ public:
bool GetTransaction(const uint256 &hashTx, CWalletTx& wtx);
bool SetDefaultKey(const std::vector<unsigned char> &vchPubKey);
bool SetMinVersion(int nVersion, CWalletDB* pwalletdbIn = NULL);
};