diff options
| author | Andrew Chow <achow101-github@achow101.com> | 2019-12-05 18:02:36 -0500 |
|---|---|---|
| committer | Andrew Chow <achow101-github@achow101.com> | 2019-12-06 15:05:48 -0500 |
| commit | 14b5efd66ff0afbf3bf9158a724534a9090fc7fc (patch) | |
| tree | c01bb76824220e70644b55c25c30b4084b80ce5a /src/wallet | |
| parent | 97c0374a46943b2ed38ea24eeeff1f1568dd55b3 (diff) | |
| download | bitcoin-14b5efd66ff0afbf3bf9158a724534a9090fc7fc.tar.xz | |
Move fDecryptionThoroughlyChecked from CWallet to LegacyScriptPubKeyMan
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/scriptpubkeyman.cpp | 3 | ||||
| -rw-r--r-- | src/wallet/scriptpubkeyman.h | 4 | ||||
| -rw-r--r-- | src/wallet/wallet.h | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp index 0adfefa1aa..8a3f36c2e2 100644 --- a/src/wallet/scriptpubkeyman.cpp +++ b/src/wallet/scriptpubkeyman.cpp @@ -1396,8 +1396,7 @@ LegacyScriptPubKeyMan::LegacyScriptPubKeyMan(CWallet& wallet) : ScriptPubKeyMan(wallet), m_wallet(wallet), cs_wallet(wallet.cs_wallet), - fUseCrypto(wallet.fUseCrypto), - fDecryptionThoroughlyChecked(wallet.fDecryptionThoroughlyChecked) {} + fUseCrypto(wallet.fUseCrypto) {} bool LegacyScriptPubKeyMan::SetCrypted() { return m_wallet.SetCrypted(); } bool LegacyScriptPubKeyMan::IsCrypted() const { return m_wallet.IsCrypted(); } diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h index f5d7bc658a..89e9dc01a3 100644 --- a/src/wallet/scriptpubkeyman.h +++ b/src/wallet/scriptpubkeyman.h @@ -198,6 +198,9 @@ public: class LegacyScriptPubKeyMan : public ScriptPubKeyMan, public FillableSigningProvider { private: + //! keeps track of whether Unlock has run a thorough check before + bool fDecryptionThoroughlyChecked = false; + using WatchOnlySet = std::set<CScript>; using WatchKeyMap = std::map<CKeyID, CPubKey>; @@ -417,7 +420,6 @@ public: CWallet& m_wallet; CCriticalSection& cs_wallet; std::atomic<bool>& fUseCrypto; - bool& fDecryptionThoroughlyChecked; }; #endif // BITCOIN_WALLET_SCRIPTPUBKEYMAN_H diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 82661fcc31..50cd8833ba 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -601,8 +601,6 @@ private: //! if fUseCrypto is false, vMasterKey must be empty std::atomic<bool> fUseCrypto; - //! keeps track of whether Unlock has run a thorough check before - bool fDecryptionThoroughlyChecked; bool SetCrypted(); bool Unlock(const CKeyingMaterial& vMasterKeyIn, bool accept_no_keys = false); @@ -735,7 +733,6 @@ public: /** Construct wallet with specified name and database implementation. */ CWallet(interfaces::Chain* chain, const WalletLocation& location, std::unique_ptr<WalletDatabase> database) : fUseCrypto(false), - fDecryptionThoroughlyChecked(false), m_chain(chain), m_location(location), database(std::move(database)) |