diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-02-18 14:55:02 +0100 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2012-02-18 15:42:29 +0100 |
commit | 0b807a417f4a15f3e37ae35e70a72e6169f01c02 (patch) | |
tree | da6bc0f32945d45a8cb9a366d6a729260e33bdda /src/wallet.h | |
parent | 2d36b60f9278f2b6fedadbb3b5f29e19244f5cef (diff) |
Add SetMinVersion to CWallet
Diffstat (limited to 'src/wallet.h')
-rw-r--r-- | src/wallet.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/wallet.h b/src/wallet.h index 3fdef50c03..622ff974b9 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -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); }; |