foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-02 09:46:52 -05:00
Code Issues Activity

refactor: RPC 'ListReceived', encapsulate m_address_book access

Browse source
This commit is contained in:
furszy 2022-06-11 12:00:33 -03:00
parent fa9f2ab8fd
commit b459fc122f
No known key found for this signature in database
GPG key ID: 5DD23CCC686AA623
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/wallet/rpc/transactions.cpp
View file

@ -138,26 +138,12 @@ static UniValue ListReceived(const CWallet& wallet, const UniValue& params, cons
UniValue ret(UniValue::VARR); UniValue ret(UniValue::VARR);
std::map<std::string, tallyitem> label_tally; std::map<std::string, tallyitem> label_tally;
// Create m_address_book iterator const auto& func = [&](const CTxDestination& address, const std::string& label, const std::string& purpose, bool is_change) {
// If we aren't filtering, go from begin() to end() if (is_change) return; // no change addresses
auto start = wallet.m_address_book.begin();
auto end = wallet.m_address_book.end();
// If we are filtering, find() the applicable entry
if (has_filtered_address) {
start = wallet.m_address_book.find(filtered_address);
if (start != end) {
end = std::next(start);
}
}
for (auto item_it = start; item_it != end; ++item_it)
{
if (item_it->second.IsChange()) continue;
const CTxDestination& address = item_it->first;
const std::string& label = item_it->second.GetLabel();
auto it = mapTally.find(address); auto it = mapTally.find(address);
if (it == mapTally.end() && !fIncludeEmpty) if (it == mapTally.end() && !fIncludeEmpty)
continue; return;
CAmount nAmount = 0; CAmount nAmount = 0;
int nConf = std::numeric_limits<int>::max(); int nConf = std::numeric_limits<int>::max();
@ -196,6 +182,14 @@ static UniValue ListReceived(const CWallet& wallet, const UniValue& params, cons
obj.pushKV("txids", transactions); obj.pushKV("txids", transactions);
ret.push_back(obj); ret.push_back(obj);
} }
};
if (has_filtered_address) {
const auto& entry = wallet.FindAddressBookEntry(filtered_address, /*allow_change=*/false);
if (entry) func(filtered_address, entry->GetLabel(), entry->purpose, /*is_change=*/false);
} else {
// No filtered addr, walk-through the addressbook entry
wallet.ForEachAddrBookEntry(func);
} }
if (by_label) if (by_label)