diff options
| author | Ross Nicoll <[email protected]> | 2014-04-09 22:18:28 +0100 |
|---|---|---|
| committer | Ross Nicoll <[email protected]> | 2014-04-09 22:18:28 +0100 |
| commit | 3aa3865f1141d5e58c83d9358838889ef0332b0c (patch) | |
| tree | fc55a62259f9841cd4f0656ad74247d5441980ea /src/walletdb.cpp | |
| parent | Merge pull request #428 from leofidus/1.7-bitcoin-0.9.1 (diff) | |
| download | discoin-3aa3865f1141d5e58c83d9358838889ef0332b0c.tar.xz discoin-3aa3865f1141d5e58c83d9358838889ef0332b0c.zip | |
Removed wallet upgrade code inherited from Bitcoin/Litecoin, as it does not apply to Dogecoin
wallets (too new at base.
Diffstat (limited to 'src/walletdb.cpp')
| -rw-r--r-- | src/walletdb.cpp | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/walletdb.cpp b/src/walletdb.cpp index d762f9ecb..d7991634b 100644 --- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -357,26 +357,6 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, else return false; - // Undo serialize changes in 31600 - if (31404 <= wtx.fTimeReceivedIsTxTime && wtx.fTimeReceivedIsTxTime <= 31703) - { - if (!ssValue.empty()) - { - char fTmp; - char fUnused; - ssValue >> fTmp >> fUnused >> wtx.strFromAccount; - strErr = strprintf("LoadWallet() upgrading tx ver=%d %d '%s' %s", - wtx.fTimeReceivedIsTxTime, fTmp, wtx.strFromAccount, hash.ToString()); - wtx.fTimeReceivedIsTxTime = fTmp; - } - else - { - strErr = strprintf("LoadWallet() repairing tx ver=%d %s", wtx.fTimeReceivedIsTxTime, hash.ToString()); - wtx.fTimeReceivedIsTxTime = 0; - } - wss.vWalletUpgrade.push_back(hash); - } - if (wtx.nOrderPos == -1) wss.fAnyUnordered = true; @@ -669,10 +649,6 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet) BOOST_FOREACH(uint256 hash, wss.vWalletUpgrade) WriteTx(hash, pwallet->mapWallet[hash]); - // Rewrite encrypted wallets of versions 0.4.0 and 0.5.0rc: - if (wss.fIsEncrypted && (wss.nFileVersion == 40000 || wss.nFileVersion == 50000)) - return DB_NEED_REWRITE; - if (wss.nFileVersion < CLIENT_VERSION) // Update WriteVersion(CLIENT_VERSION); |