zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

wallet: Don't show Sapling receivers from UAs in `z_listaddresses` 

This API is deprecated in favour of `listaddresses`, so we aren't going
to extend it with UA support.
This commit is contained in:
Jack Grigg 2022-02-10 01:09:46 +00:00
parent 08dd842087
commit 0a9c27e8f2
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wallet/rpcwallet.cpp
View File

@ -3235,6 +3235,7 @@ UniValue z_listaddresses(const UniValue& params, bool fHelp)
"z_listaddresses ( includeWatchonly )\n"
"\nDEPRECATED\n"
"\nReturns the list of shielded addresses belonging to the wallet.\n"
"\nThis never returns Unified Addresses; see 'listaddresses' for them.\n"
"\nArguments:\n"
"1. includeWatchonly (bool, optional, default=false) Also include watchonly addresses (see 'z_importviewingkey')\n"
"\nResult:\n"
@ -3269,6 +3270,10 @@ UniValue z_listaddresses(const UniValue& params, bool fHelp)
std::set<libzcash::SaplingPaymentAddress> addresses;
pwalletMain->GetSaplingPaymentAddresses(addresses);
for (auto addr : addresses) {
// Don't show Sapling receivers that are part of an account in the wallet.
if (pwalletMain->FindUnifiedAddressByReceiver(addr).has_value()) {
continue;
}
if (fIncludeWatchonly || pwalletMain->HaveSaplingSpendingKeyForAddress(addr)) {
ret.push_back(keyIO.EncodePaymentAddress(addr));
}