diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-08-22 09:59:42 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-08-22 10:02:11 +0200 |
| commit | 0738b88fe0b6c840e3cefa810c2b6de6c8b32ed0 (patch) | |
| tree | 26c07086723ab1f45fe539e52db036492b96e30a /src | |
| parent | 2df11322faae555bd963a7610102b61049168333 (diff) | |
| parent | 321159e53e800c1df2d8dfd6ac03374f1829c327 (diff) | |
| download | bitcoin-0738b88fe0b6c840e3cefa810c2b6de6c8b32ed0.tar.xz | |
Merge #13967: [walletdb] don't report minversion wallet entry as unknown
321159e53e800c1df2d8dfd6ac03374f1829c327 don't report minversion wallet entry as unknown (Gregory Sanders)
Pull request description:
It is known in WalletBatch::LoadWallet
Tree-SHA512: 82f7e12f48ae7d17317074ce5b5e27c70ba8334b04adbf7cc863f8169cc1aa460b9454571e2698aa00059c8c8f669fe19c0d40c4910dcded260ddca6ce78be9d
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/walletdb.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index 15c5b82c52..1b787be198 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -509,7 +509,8 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, strErr = "Error reading wallet database: Unknown non-tolerable wallet flags found"; return false; } - } else if (strType != "bestblock" && strType != "bestblock_nomerkle") { + } else if (strType != "bestblock" && strType != "bestblock_nomerkle" && + strType != "minversion") { wss.m_unknown_records++; } } catch (...) |