diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-09 13:03:27 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-09 13:04:02 +0100 |
| commit | b19bcb752bc19f7b6780fd8c099bb3d79e4d7cc9 (patch) | |
| tree | f4039908a6c1e266659e228fe66f45ab78f05e7b /src/wallet.cpp | |
| parent | 0514fb3b4cd4e2923d9fdddec84da0c4abcf3e5f (diff) | |
| parent | cdb6c169355488d4e64a2435d916cb67a9c01ebe (diff) | |
| download | bitcoin-b19bcb752bc19f7b6780fd8c099bb3d79e4d7cc9.tar.xz | |
Merge pull request #3638
cdb6c16 remove setting methods in wallet/walletdb (Cozz Lovan)
44eb59e [Qt] remove broken OptionsModel::Upgrade() (Cozz Lovan)
Diffstat (limited to 'src/wallet.cpp')
| -rw-r--r-- | src/wallet.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index 9648f6f88d..979560651c 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -191,18 +191,6 @@ void CWallet::SetBestChain(const CBlockLocator& loc) walletdb.WriteBestBlock(loc); } -// This class implements an addrIncoming entry that causes pre-0.4 -// clients to crash on startup if reading a private-key-encrypted wallet. -class CCorruptAddress -{ -public: - IMPLEMENT_SERIALIZE - ( - if (nType & SER_DISK) - READWRITE(nVersion); - ) -}; - bool CWallet::SetMinVersion(enum WalletFeature nVersion, CWalletDB* pwalletdbIn, bool fExplicit) { AssertLockHeld(cs_wallet); // nWalletVersion @@ -221,13 +209,6 @@ bool CWallet::SetMinVersion(enum WalletFeature nVersion, CWalletDB* pwalletdbIn, if (fFileBacked) { CWalletDB* pwalletdb = pwalletdbIn ? pwalletdbIn : new CWalletDB(strWalletFile); - if (nWalletVersion >= 40000) - { - // Versions prior to 0.4.0 did not support the "minversion" record. - // Use a CCorruptAddress to make them crash instead. - CCorruptAddress corruptAddress; - pwalletdb->WriteSetting("addrIncoming", corruptAddress); - } if (nWalletVersion > 40000) pwalletdb->WriteMinVersion(nWalletVersion); if (!pwalletdbIn) |