LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Fix issue where CDataStream->nVersion was taken a CKeyPool record version

Browse source
This commit is contained in:
Jonas Schnelli 2017-01-16 11:10:12 +01:00
parent 9af8f00a75
commit d0a627a53a
No known key found for this signature in database
GPG key ID: 1EB776BB03C7922D
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/wallet/wallet.cpp
View file

@ -3933,6 +3933,7 @@ bool CWallet::BackupWallet(const std::string& strDest)
CKeyPool::CKeyPool() CKeyPool::CKeyPool()
{ {
nTime = GetTime(); nTime = GetTime();
fInternal = false;
} }
CKeyPool::CKeyPool(const CPubKey& vchPubKeyIn, bool internalIn) CKeyPool::CKeyPool(const CPubKey& vchPubKeyIn, bool internalIn)

13
src/wallet/wallet.h
View file

@ -114,14 +114,19 @@ public:
READWRITE(nVersion); READWRITE(nVersion);
READWRITE(nTime); READWRITE(nTime);
READWRITE(vchPubKey); READWRITE(vchPubKey);
if (nVersion >= FEATURE_HD_SPLIT) if (ser_action.ForRead()) {
try {
READWRITE(fInternal); READWRITE(fInternal);
else }
{ catch (...) {
if (ser_action.ForRead()) /* flag as external address if we can't read the internal boolean */
fInternal = false; fInternal = false;
} }
} }
else {
READWRITE(fInternal);
}
}
}; };
/** Address book data */ /** Address book data */