Merge #6643: refactor: follow-ups for dash#6638

249f2b3 refactor: simplify condition if chain is not crypted in CheckDecryptionKey (Konstantin Akimov)
f03b36f refactor: remove unused CChainState definition (Konstantin Akimov)
7cc8f0a fix: removed duplicated check IsMine (Konstantin Akimov)

Pull request description:

  ## Issue being fixed or feature implemented
  Minor refactorings / improvements for dash#6638

  ## What was done?
  See commits

  ## How Has This Been Tested?
  Run unit / functional tests

  ## Breaking Changes
  N/A

  ## Checklist:
  - [x] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  UdjinM6:
    utACK 249f2b3

Tree-SHA512: 08c47550a5dce299dcb93d2b1f9af557ed280ce96f1078f2cebbadcaa01b45c806e8a68a11bea53bfa8407996aac195a456fb76edc6c24d1e1bd2cb505d325fb

Author: PastaPastaPasta

src/evo/deterministicmns.h

@@ -28,7 +28,6 @@
 
 class CBlock;
 class CBlockIndex;
-class CChainState;
 class CCoinsViewCache;
 class CEvoDB;
 class TxValidationState;

src/wallet/rpcwallet.cpp

@@ -952,8 +952,6 @@ struct tallyitem
 
 static UniValue ListReceived(const CWallet& wallet, const UniValue& params, const bool by_label, const bool include_immature_coinbase) EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet)
 {
-    AssertLockHeld(wallet.cs_wallet);
-
     // Minimum confirmations
     int nMinDepth = 1;
     if (!params[0].isNull())
@@ -1032,19 +1030,12 @@ static UniValue ListReceived(const CWallet& wallet, const UniValue& params, cons
     std::map<std::string, tallyitem> label_tally;
 
     const auto& func = [&](const CTxDestination& address, const std::string& label, const std::string& purpose, bool is_change)
-        EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet)
     {
-        AssertLockHeld(wallet.cs_wallet);
-
         if (is_change) return; // no change addresses
         auto it = mapTally.find(address);
         if (it == mapTally.end() && !fIncludeEmpty)
             return;
 
-        isminefilter mine = wallet.IsMine(address);
-        if (!(mine & filter))
-            return;
-
         CAmount nAmount = 0;
         int nConf = std::numeric_limits<int>::max();
         bool fIsWatchonly = false;

src/wallet/scriptpubkeyman.cpp

@@ -219,7 +219,7 @@ bool LegacyScriptPubKeyMan::CheckDecryptionKey(const CKeyingMaterial& master_key
         if (keyFail) {
             return false;
         }
-        if (!keyPass && !accept_no_keys && (m_hd_chain.IsNull() || (!m_hd_chain.IsNull() && !m_hd_chain.IsCrypted()))) {
+        if (!keyPass && !accept_no_keys && (m_hd_chain.IsNull() || !m_hd_chain.IsCrypted())) {
             return false;
         }