Skip to content

refactor: follow-ups for dash#6638 #6643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PastaPastaPasta merged 3 commits into from
Apr 25, 2025
Merged

refactor: follow-ups for dash#6638 #6643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cc8f0a
fix: removed duplicated check IsMine
knst Apr 23, 2025
f03b36f
refactor: remove unused CChainState definition
knst Apr 23, 2025
249f2b3
refactor: simplify condition if chain is not crypted in CheckDecrypti…
knst Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/evo/deterministicmns.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@

class CBlock;
class CBlockIndex;
class CChainState;
class CCoinsViewCache;
class CEvoDB;
class TxValidationState;
Expand Down
9 changes: 0 additions & 9 deletions src/wallet/rpcwallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/wallet/scriptpubkeyman.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down