highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-28 14:59:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Wallet: Avoid unnecessary/redundant m_address_book lookups

Browse Source
This commit is contained in:
Luke Dashjr
2020-02-22 04:27:03 +00:00
parent c751d886f4
commit 6d2905f57a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet/rpcdump.cpp
View File

@@ -66,7 +66,7 @@ static bool GetWalletAddressesForKey(LegacyScriptPubKeyMan* spk_man, const CWall
strAddr += ",";
}
strAddr += EncodeDestination(dest);
strLabel = EncodeDumpString(pwallet->m_address_book.at(dest).name);
strLabel = EncodeDumpString(address_book_entry->name);
fLabelFound = true;
}
}

8
src/wallet/rpcwallet.cpp
View File

@@ -507,7 +507,7 @@ static UniValue listaddressgroupings(const JSONRPCRequest& request)
{
const auto* address_book_entry = pwallet->FindAddressBookEntry(address);
if (address_book_entry) {
addressInfo.push_back(pwallet->m_address_book.find(address)->second.name);
addressInfo.push_back(address_book_entry->name);
}
}
jsonGrouping.push_back(addressInfo);
@@ -1317,7 +1317,7 @@ static void ListTransactions(interfaces::Chain::Lock& locked_chain, const CWalle
entry.pushKV("amount", ValueFromAmount(-s.amount));
const auto* address_book_entry = pwallet->FindAddressBookEntry(s.destination);
if (address_book_entry) {
entry.pushKV("label", pwallet->m_address_book.at(s.destination).name);
entry.pushKV("label", address_book_entry->name);
}
entry.pushKV("vout", s.vout);
entry.pushKV("fee", ValueFromAmount(-nFee));
@@ -1335,7 +1335,7 @@ static void ListTransactions(interfaces::Chain::Lock& locked_chain, const CWalle
std::string label;
const auto* address_book_entry = pwallet->FindAddressBookEntry(r.destination);
if (address_book_entry) {
label = pwallet->m_address_book.at(r.destination).name;
label = address_book_entry->name;
}
if (filter_label && label != *filter_label) {
continue;
@@ -3820,7 +3820,7 @@ UniValue getaddressinfo(const JSONRPCRequest& request)
// value of the name key/value pair in the labels array below.
const auto* address_book_entry = pwallet->FindAddressBookEntry(dest);
if (pwallet->chain().rpcEnableDeprecated("label") && address_book_entry) {
ret.pushKV("label", pwallet->m_address_book.at(dest).name);
ret.pushKV("label", address_book_entry->name);
}
ret.pushKV("ischange", pwallet->IsChange(scriptPubKey));