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

Wallet: Replace CAddressBookData.name with GetLabel() method

Browse source
This commit is contained in:
Luke Dashjr 2020-04-03 03:02:16 +00:00
parent d7092c392e
commit 2952c46b92
5 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/interfaces/wallet.cpp
View file

@ -156,7 +156,7 @@ public:
return false; return false;
} }
if (name) { if (name) {
*name = it->second.name; *name = it->second.GetLabel();
} }
if (is_mine) { if (is_mine) {
*is_mine = m_wallet->IsMine(dest); *is_mine = m_wallet->IsMine(dest);
@ -172,7 +172,7 @@ public:
std::vector<WalletAddress> result; std::vector<WalletAddress> result;
for (const auto& item : m_wallet->m_address_book) { for (const auto& item : m_wallet->m_address_book) {
if (item.second.IsChange()) continue; if (item.second.IsChange()) continue;
result.emplace_back(item.first, m_wallet->IsMine(item.first), item.second.name, item.second.purpose); result.emplace_back(item.first, m_wallet->IsMine(item.first), item.second.GetLabel(), item.second.purpose);
} }
return result; return result;
} }

2
src/wallet/rpcdump.cpp
View file

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

20
src/wallet/rpcwallet.cpp
View file

@ -501,7 +501,7 @@ static UniValue listaddressgroupings(const JSONRPCRequest& request)
{ {
const auto* address_book_entry = pwallet->FindAddressBookEntry(address); const auto* address_book_entry = pwallet->FindAddressBookEntry(address);
if (address_book_entry) { if (address_book_entry) {
addressInfo.push_back(address_book_entry->name); addressInfo.push_back(address_book_entry->GetLabel());
} }
} }
jsonGrouping.push_back(addressInfo); jsonGrouping.push_back(addressInfo);
@ -1109,7 +1109,7 @@ static UniValue ListReceived(interfaces::Chain::Lock& locked_chain, const CWalle
{ {
if (item_it->second.IsChange()) continue; if (item_it->second.IsChange()) continue;
const CTxDestination& address = item_it->first; const CTxDestination& address = item_it->first;
const std::string& label = item_it->second.name; 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; continue;
@ -1311,7 +1311,7 @@ static void ListTransactions(interfaces::Chain::Lock& locked_chain, const CWalle
entry.pushKV("amount", ValueFromAmount(-s.amount)); entry.pushKV("amount", ValueFromAmount(-s.amount));
const auto* address_book_entry = pwallet->FindAddressBookEntry(s.destination); const auto* address_book_entry = pwallet->FindAddressBookEntry(s.destination);
if (address_book_entry) { if (address_book_entry) {
entry.pushKV("label", address_book_entry->name); entry.pushKV("label", address_book_entry->GetLabel());
} }
entry.pushKV("vout", s.vout); entry.pushKV("vout", s.vout);
entry.pushKV("fee", ValueFromAmount(-nFee)); entry.pushKV("fee", ValueFromAmount(-nFee));
@ -1329,7 +1329,7 @@ static void ListTransactions(interfaces::Chain::Lock& locked_chain, const CWalle
std::string label; std::string label;
const auto* address_book_entry = pwallet->FindAddressBookEntry(r.destination); const auto* address_book_entry = pwallet->FindAddressBookEntry(r.destination);
if (address_book_entry) { if (address_book_entry) {
label = address_book_entry->name; label = address_book_entry->GetLabel();
} }
if (filter_label && label != *filter_label) { if (filter_label && label != *filter_label) {
continue; continue;
@ -2963,7 +2963,7 @@ static UniValue listunspent(const JSONRPCRequest& request)
const auto* address_book_entry = pwallet->FindAddressBookEntry(address); const auto* address_book_entry = pwallet->FindAddressBookEntry(address);
if (address_book_entry) { if (address_book_entry) {
entry.pushKV("label", address_book_entry->name); entry.pushKV("label", address_book_entry->GetLabel());
} }
std::unique_ptr<SigningProvider> provider = pwallet->GetSolvingProvider(scriptPubKey); std::unique_ptr<SigningProvider> provider = pwallet->GetSolvingProvider(scriptPubKey);
@ -3710,7 +3710,7 @@ static UniValue AddressBookDataToJSON(const CAddressBookData& data, const bool v
{ {
UniValue ret(UniValue::VOBJ); UniValue ret(UniValue::VOBJ);
if (verbose) { if (verbose) {
ret.pushKV("name", data.name); ret.pushKV("name", data.GetLabel());
} }
ret.pushKV("purpose", data.purpose); ret.pushKV("purpose", data.purpose);
return ret; return ret;
@ -3822,7 +3822,7 @@ UniValue getaddressinfo(const JSONRPCRequest& request)
// value of the name key/value pair in the labels array below. // value of the name key/value pair in the labels array below.
const auto* address_book_entry = pwallet->FindAddressBookEntry(dest); const auto* address_book_entry = pwallet->FindAddressBookEntry(dest);
if (pwallet->chain().rpcEnableDeprecated("label") && address_book_entry) { if (pwallet->chain().rpcEnableDeprecated("label") && address_book_entry) {
ret.pushKV("label", address_book_entry->name); ret.pushKV("label", address_book_entry->GetLabel());
} }
ret.pushKV("ischange", pwallet->IsChange(scriptPubKey)); ret.pushKV("ischange", pwallet->IsChange(scriptPubKey));
@ -3851,7 +3851,7 @@ UniValue getaddressinfo(const JSONRPCRequest& request)
if (pwallet->chain().rpcEnableDeprecated("labelspurpose")) { if (pwallet->chain().rpcEnableDeprecated("labelspurpose")) {
labels.push_back(AddressBookDataToJSON(*address_book_entry, true)); labels.push_back(AddressBookDataToJSON(*address_book_entry, true));
} else { } else {
labels.push_back(address_book_entry->name); labels.push_back(address_book_entry->GetLabel());
} }
} }
ret.pushKV("labels", std::move(labels)); ret.pushKV("labels", std::move(labels));
@ -3897,7 +3897,7 @@ static UniValue getaddressesbylabel(const JSONRPCRequest& request)
std::set<std::string> addresses; std::set<std::string> addresses;
for (const std::pair<const CTxDestination, CAddressBookData>& item : pwallet->m_address_book) { for (const std::pair<const CTxDestination, CAddressBookData>& item : pwallet->m_address_book) {
if (item.second.IsChange()) continue; if (item.second.IsChange()) continue;
if (item.second.name == label) { if (item.second.GetLabel() == label) {
std::string address = EncodeDestination(item.first); std::string address = EncodeDestination(item.first);
// CWallet::m_address_book is not expected to contain duplicate // CWallet::m_address_book is not expected to contain duplicate
// address strings, but build a separate set as a precaution just in // address strings, but build a separate set as a precaution just in
@ -3963,7 +3963,7 @@ static UniValue listlabels(const JSONRPCRequest& request)
for (const std::pair<const CTxDestination, CAddressBookData>& entry : pwallet->m_address_book) { for (const std::pair<const CTxDestination, CAddressBookData>& entry : pwallet->m_address_book) {
if (entry.second.IsChange()) continue; if (entry.second.IsChange()) continue;
if (purpose.empty() || entry.second.purpose == purpose) { if (purpose.empty() || entry.second.purpose == purpose) {
label_set.insert(entry.second.name); label_set.insert(entry.second.GetLabel());
} }
} }

2
src/wallet/wallet.cpp
View file

@ -3472,7 +3472,7 @@ std::set<CTxDestination> CWallet::GetLabelAddresses(const std::string& label) co
{ {
if (item.second.IsChange()) continue; if (item.second.IsChange()) continue;
const CTxDestination& address = item.first; const CTxDestination& address = item.first;
const std::string& strName = item.second.name; const std::string& strName = item.second.GetLabel();
if (strName == label) if (strName == label)
result.insert(address); result.insert(address);
} }

4
src/wallet/wallet.h
View file

@ -185,15 +185,15 @@ private:
bool m_change{true}; bool m_change{true};
std::string m_label; std::string m_label;
public: public:
const std::string& name;
std::string purpose; std::string purpose;
CAddressBookData() : name(m_label), purpose("unknown") {} CAddressBookData() : purpose("unknown") {}
typedef std::map<std::string, std::string> StringMap; typedef std::map<std::string, std::string> StringMap;
StringMap destdata; StringMap destdata;
bool IsChange() const { return m_change; } bool IsChange() const { return m_change; }
const std::string& GetLabel() const { return m_label; }
void SetLabel(const std::string& label) { void SetLabel(const std::string& label) {
m_change = false; m_change = false;
m_label = label; m_label = label;