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

Merge pull request #5802 from nuttycom/bug/z_listaddress_internal 

Do not display internal addresses in z_listaddresses.
This commit is contained in:
Daira Hopwood 2022-04-01 22:47:09 +01:00 committed by GitHub
parent f7b11f6da1 5e4eb72a9b
commit 8e15446c17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qa/rpc-tests/wallet_accounts.py
View File

@ -55,6 +55,10 @@ class WalletAccountsTest(BitcoinTestFramework):
account0 = self.nodes[0].z_getnewaccount()
assert_equal(account0['account'], 0)
# Verify that just creating the account does not generate any visible addresses
addresses = self.nodes[0].z_listaddresses()
assert_equal([], addresses)
# The next account will be 1.
account1 = self.nodes[0].z_getnewaccount()
assert_equal(account1['account'], 1)

3
src/wallet/rpcwallet.cpp
View File

@ -3491,7 +3491,8 @@ UniValue z_listaddresses(const UniValue& params, bool fHelp)
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()) {
if (pwalletMain->FindUnifiedAddressByReceiver(addr).has_value()
|| pwalletMain->IsInternalRecipient(addr)) {
continue;
}
if (fIncludeWatchonly || pwalletMain->HaveSaplingSpendingKeyForAddress(addr)) {