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

Merge pull request #3701

Browse source 
09ec3af AddToWallet implies BindWallet (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan 2014-04-19 08:51:32 +02:00
parent fe451fe944 09ec3af166
commit 913e90db9a
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/wallet.cpp
View file

@ -471,6 +471,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet)
if (fFromLoadWallet) if (fFromLoadWallet)
{ {
mapWallet[hash] = wtxIn; mapWallet[hash] = wtxIn;
mapWallet[hash].BindWallet(this);
AddToSpends(hash); AddToSpends(hash);
} }
else else

4
src/walletdb.cpp
View file

@ -352,9 +352,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
CWalletTx wtx; CWalletTx wtx;
ssValue >> wtx; ssValue >> wtx;
CValidationState state; CValidationState state;
if (CheckTransaction(wtx, state) && (wtx.GetHash() == hash) && state.IsValid()) if (!(CheckTransaction(wtx, state) && (wtx.GetHash() == hash) && state.IsValid()))
wtx.BindWallet(pwallet);
else
return false; return false;
// Undo serialize changes in 31600 // Undo serialize changes in 31600