mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 18:49:30 +01:00
Code Issues Projects Releases Wiki Activity

Move fDecryptionThoroughlyChecked from CWallet to LegacyScriptPubKeyMan

Browse Source
This commit is contained in:
Andrew Chow 2019-12-05 18:02:36 -05:00
parent 97c0374a46
commit 14b5efd66f
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wallet/scriptpubkeyman.cpp
View File

@ -1396,8 +1396,7 @@ LegacyScriptPubKeyMan::LegacyScriptPubKeyMan(CWallet& wallet)
: ScriptPubKeyMan(wallet), : ScriptPubKeyMan(wallet),
m_wallet(wallet), m_wallet(wallet),
cs_wallet(wallet.cs_wallet), cs_wallet(wallet.cs_wallet),
fUseCrypto(wallet.fUseCrypto), fUseCrypto(wallet.fUseCrypto) {}
fDecryptionThoroughlyChecked(wallet.fDecryptionThoroughlyChecked) {}
bool LegacyScriptPubKeyMan::SetCrypted() { return m_wallet.SetCrypted(); } bool LegacyScriptPubKeyMan::SetCrypted() { return m_wallet.SetCrypted(); }
bool LegacyScriptPubKeyMan::IsCrypted() const { return m_wallet.IsCrypted(); } bool LegacyScriptPubKeyMan::IsCrypted() const { return m_wallet.IsCrypted(); }

4
src/wallet/scriptpubkeyman.h
View File

@ -198,6 +198,9 @@ public:
class LegacyScriptPubKeyMan : public ScriptPubKeyMan, public FillableSigningProvider class LegacyScriptPubKeyMan : public ScriptPubKeyMan, public FillableSigningProvider
{ {
private: private:
//! keeps track of whether Unlock has run a thorough check before
bool fDecryptionThoroughlyChecked = false;
using WatchOnlySet = std::set<CScript>; using WatchOnlySet = std::set<CScript>;
using WatchKeyMap = std::map<CKeyID, CPubKey>; using WatchKeyMap = std::map<CKeyID, CPubKey>;
@ -417,7 +420,6 @@ public:
CWallet& m_wallet; CWallet& m_wallet;
CCriticalSection& cs_wallet; CCriticalSection& cs_wallet;
std::atomic<bool>& fUseCrypto; std::atomic<bool>& fUseCrypto;
bool& fDecryptionThoroughlyChecked;
}; };
#endif // BITCOIN_WALLET_SCRIPTPUBKEYMAN_H #endif // BITCOIN_WALLET_SCRIPTPUBKEYMAN_H

3
src/wallet/wallet.h
View File

@ -601,8 +601,6 @@ private:
//! if fUseCrypto is false, vMasterKey must be empty //! if fUseCrypto is false, vMasterKey must be empty
std::atomic<bool> fUseCrypto; std::atomic<bool> fUseCrypto;
//! keeps track of whether Unlock has run a thorough check before
bool fDecryptionThoroughlyChecked;
bool SetCrypted(); bool SetCrypted();
bool Unlock(const CKeyingMaterial& vMasterKeyIn, bool accept_no_keys = false); bool Unlock(const CKeyingMaterial& vMasterKeyIn, bool accept_no_keys = false);
@ -735,7 +733,6 @@ public:
/** Construct wallet with specified name and database implementation. */ /** Construct wallet with specified name and database implementation. */
CWallet(interfaces::Chain* chain, const WalletLocation& location, std::unique_ptr<WalletDatabase> database) CWallet(interfaces::Chain* chain, const WalletLocation& location, std::unique_ptr<WalletDatabase> database)
: fUseCrypto(false), : fUseCrypto(false),
fDecryptionThoroughlyChecked(false),
m_chain(chain), m_chain(chain),
m_location(location), m_location(location),
database(std::move(database)) database(std::move(database))