From 881e0f2ca847a0564e2c91d8399040cb681482cb Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Mon, 21 Mar 2022 12:28:53 -0600 Subject: [PATCH] Rename unifiedaddress->address in z_getaddressforaccount results Fixes #5432 --- qa/rpc-tests/mining_shielded_coinbase.py | 2 +- qa/rpc-tests/orchard_reorg.py | 2 +- qa/rpc-tests/wallet_accounts.py | 12 ++++++------ qa/rpc-tests/wallet_addresses.py | 4 ++-- qa/rpc-tests/wallet_listreceived.py | 10 +++++----- qa/rpc-tests/wallet_orchard.py | 6 +++--- qa/rpc-tests/wallet_shieldcoinbase_ua_nu5.py | 2 +- qa/rpc-tests/wallet_shieldcoinbase_ua_sapling.py | 2 +- qa/rpc-tests/wallet_z_sendmany.py | 6 +++--- src/wallet/rpcwallet.cpp | 4 ++-- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/qa/rpc-tests/mining_shielded_coinbase.py b/qa/rpc-tests/mining_shielded_coinbase.py index 9d9fc517f..facfe337b 100755 --- a/qa/rpc-tests/mining_shielded_coinbase.py +++ b/qa/rpc-tests/mining_shielded_coinbase.py @@ -128,7 +128,7 @@ class ShieldCoinbaseTest (BitcoinTestFramework): node1_addr0 = self.nodes[1].z_getaddressforaccount(0) assert_equal(node1_addr0['account'], 0) assert_equal(set(node1_addr0['pools']), set(['transparent', 'sapling', 'orchard'])) - node1_ua = node1_addr0['unifiedaddress'] + node1_ua = node1_addr0['address'] # Set node 1's miner address to the UA self.nodes[1].stop() diff --git a/qa/rpc-tests/orchard_reorg.py b/qa/rpc-tests/orchard_reorg.py index 58d0bf8d9..9f4322edd 100755 --- a/qa/rpc-tests/orchard_reorg.py +++ b/qa/rpc-tests/orchard_reorg.py @@ -52,7 +52,7 @@ class OrchardReorgTest(BitcoinTestFramework): addr = self.nodes[0].z_getaddressforaccount(account, ['orchard']) assert_equal(addr['account'], account) assert_equal(set(addr['pools']), set(['orchard'])) - ua = addr['unifiedaddress'] + ua = addr['address'] # Before mining any Orchard notes, finalorchardroot should be the empty Orchard root. assert_equal( diff --git a/qa/rpc-tests/wallet_accounts.py b/qa/rpc-tests/wallet_accounts.py index fc9f5905a..0e4bba385 100755 --- a/qa/rpc-tests/wallet_accounts.py +++ b/qa/rpc-tests/wallet_accounts.py @@ -65,7 +65,7 @@ class WalletAccountsTest(BitcoinTestFramework): addr0 = self.nodes[0].z_getaddressforaccount(0) assert_equal(addr0['account'], 0) assert_equal(set(addr0['pools']), set(['transparent', 'sapling', 'orchard'])) - ua0 = addr0['unifiedaddress'] + ua0 = addr0['address'] # We pick mnemonic phrases to ensure that we can always generate the default # address in account 0; this is however not necessarily at diversifier index 0. @@ -83,26 +83,26 @@ class WalletAccountsTest(BitcoinTestFramework): addr0_2 = self.nodes[0].z_getaddressforaccount(0) assert_equal(addr0_2['account'], 0) assert_equal(set(addr0_2['pools']), set(['transparent', 'sapling', 'orchard'])) - ua0_2 = addr0_2['unifiedaddress'] + ua0_2 = addr0_2['address'] assert(ua0 != ua0_2) # We can generate a fully-shielded address. addr0_3 = self.nodes[0].z_getaddressforaccount(0, ['sapling', 'orchard']) assert_equal(addr0_3['account'], 0) assert_equal(set(addr0_3['pools']), set(['sapling', 'orchard'])) - ua0_3 = addr0_3['unifiedaddress'] + ua0_3 = addr0_3['address'] # We can generate an address without a Sapling receiver. addr0_4 = self.nodes[0].z_getaddressforaccount(0, ['transparent', 'orchard']) assert_equal(addr0_4['account'], 0) assert_equal(set(addr0_4['pools']), set(['transparent', 'orchard'])) - ua0_4 = addr0_4['unifiedaddress'] + ua0_4 = addr0_4['address'] # The first address for account 1 is different to account 0. addr1 = self.nodes[0].z_getaddressforaccount(1) assert_equal(addr1['account'], 1) assert_equal(set(addr1['pools']), set(['transparent', 'sapling', 'orchard'])) - ua1 = addr1['unifiedaddress'] + ua1 = addr1['address'] assert(ua0 != ua1) # The UA contains the expected receiver kinds. @@ -195,7 +195,7 @@ class WalletAccountsTest(BitcoinTestFramework): # Send Orchard funds from the UA. print('Sending account funds to Orchard-only UA') node1account = self.nodes[1].z_getnewaccount()['account'] - node1orchard = self.nodes[1].z_getaddressforaccount(node1account, ['orchard'])['unifiedaddress'] + node1orchard = self.nodes[1].z_getaddressforaccount(node1account, ['orchard'])['address'] recipients = [{'address': node1orchard, 'amount': Decimal('1')}] opid = self.nodes[0].z_sendmany(ua0, recipients, 1, 0) txid = wait_and_assert_operationid_status(self.nodes[0], opid) diff --git a/qa/rpc-tests/wallet_addresses.py b/qa/rpc-tests/wallet_addresses.py index 23041d2b6..591c43000 100755 --- a/qa/rpc-tests/wallet_addresses.py +++ b/qa/rpc-tests/wallet_addresses.py @@ -68,7 +68,7 @@ class WalletAddressesTest(BitcoinTestFramework): account = self.nodes[0].z_getnewaccount()['account'] sprout_1 = self.nodes[0].z_getnewaddress('sprout') sapling_1 = self.nodes[0].z_getnewaddress('sapling') - unified_1 = self.nodes[0].z_getaddressforaccount(account)['unifiedaddress'] + unified_1 = self.nodes[0].z_getaddressforaccount(account)['address'] types_and_addresses = [ ('sprout', sprout_1), ('sapling', sapling_1), @@ -111,7 +111,7 @@ class WalletAddressesTest(BitcoinTestFramework): assert_equal(self.nodes[0].getblockcount(), 2) # Sprout address generation is no longer allowed sapling_2 = self.nodes[0].z_getnewaddress('sapling') - unified_2 = self.nodes[0].z_getaddressforaccount(account)['unifiedaddress'] + unified_2 = self.nodes[0].z_getaddressforaccount(account)['address'] types_and_addresses = [ ('sapling', sapling_2), ('unified', unified_2), diff --git a/qa/rpc-tests/wallet_listreceived.py b/qa/rpc-tests/wallet_listreceived.py index 86a2ab6f0..da692d95f 100755 --- a/qa/rpc-tests/wallet_listreceived.py +++ b/qa/rpc-tests/wallet_listreceived.py @@ -375,7 +375,7 @@ class ListReceivedTest (BitcoinTestFramework): # Create a unified address on one node, try z_listreceivedbyaddress on another node account = self.nodes[0].z_getnewaccount()['account'] r = self.nodes[0].z_getaddressforaccount(account) - unified_addr = r['unifiedaddress'] + unified_addr = r['address'] # this address isn't in node1's wallet assert_raises_message( JSONRPCException, @@ -386,7 +386,7 @@ class ListReceivedTest (BitcoinTestFramework): r = node.z_getnewaccount() account = r['account'] r = node.z_getaddressforaccount(account) - unified_addr = r['unifiedaddress'] + unified_addr = r['address'] receivers = node.z_listunifiedreceivers(unified_addr) assert_equal(len(receivers), 3) assert 'transparent' in receivers @@ -450,17 +450,17 @@ class ListReceivedTest (BitcoinTestFramework): addrResO = self.nodes[1].z_getaddressforaccount(acct1, ['orchard']) assert_equal(addrResO['pools'], ['orchard']) - uao = addrResO['unifiedaddress'] + uao = addrResO['address'] addrResSO = self.nodes[1].z_getaddressforaccount(acct2, ['sapling', 'orchard']) assert_equal(addrResSO['pools'], ['sapling', 'orchard']) - uaso = addrResSO['unifiedaddress'] + uaso = addrResSO['address'] self.nodes[0].sendtoaddress(taddr, 4.0) self.generate_and_sync(height+2) acct_node0 = self.nodes[0].z_getnewaccount()['account'] - ua_node0 = self.nodes[0].z_getaddressforaccount(acct_node0, ['sapling', 'orchard'])['unifiedaddress'] + ua_node0 = self.nodes[0].z_getaddressforaccount(acct_node0, ['sapling', 'orchard'])['address'] opid = self.nodes[1].z_sendmany(taddr, [ {'address': uao, 'amount': 1, 'memo': my_memo}, diff --git a/qa/rpc-tests/wallet_orchard.py b/qa/rpc-tests/wallet_orchard.py index 2a1ee85a6..3cc1ad5e9 100755 --- a/qa/rpc-tests/wallet_orchard.py +++ b/qa/rpc-tests/wallet_orchard.py @@ -37,7 +37,7 @@ class WalletOrchardTest(BitcoinTestFramework): addrRes1 = self.nodes[1].z_getaddressforaccount(acct1, ['orchard']) assert_equal(acct1, addrRes1['account']) assert_equal(addrRes1['pools'], ['orchard']) - ua1 = addrRes1['unifiedaddress'] + ua1 = addrRes1['address'] # Verify that we have only an Orchard component receiver_types = self.nodes[0].z_listunifiedreceivers(ua1) @@ -50,7 +50,7 @@ class WalletOrchardTest(BitcoinTestFramework): acct2 = self.nodes[2].z_getnewaccount()['account'] addrRes2 = self.nodes[2].z_getaddressforaccount(acct2, ['sapling', 'orchard']) assert_equal(acct2, addrRes2['account']) - ua2 = addrRes2['unifiedaddress'] + ua2 = addrRes2['address'] saplingAddr2 = self.nodes[2].z_listunifiedreceivers(ua2)['sapling'] recipients = [{"address": saplingAddr2, "amount": Decimal('10')}] @@ -102,7 +102,7 @@ class WalletOrchardTest(BitcoinTestFramework): acct3 = self.nodes[3].z_getnewaccount()['account'] addrRes3 = self.nodes[3].z_getaddressforaccount(acct3, ['sapling', 'orchard']) assert_equal(acct3, addrRes3['account']) - ua3 = addrRes3['unifiedaddress'] + ua3 = addrRes3['address'] recipients = [{"address": ua3, "amount": Decimal('1')}] myopid = self.nodes[2].z_sendmany(ua2, recipients, 1, 0) diff --git a/qa/rpc-tests/wallet_shieldcoinbase_ua_nu5.py b/qa/rpc-tests/wallet_shieldcoinbase_ua_nu5.py index 30a7f22fb..12255dcac 100755 --- a/qa/rpc-tests/wallet_shieldcoinbase_ua_nu5.py +++ b/qa/rpc-tests/wallet_shieldcoinbase_ua_nu5.py @@ -15,7 +15,7 @@ class WalletShieldCoinbaseUANU5(WalletShieldCoinbaseTest): # this function may be called no more than once assert(self.account is None) self.account = node.z_getnewaccount()['account'] - self.addr = node.z_getaddressforaccount(self.account)['unifiedaddress'] + self.addr = node.z_getaddressforaccount(self.account)['address'] return self.addr def test_check_balance_zaddr(self, node, expected): diff --git a/qa/rpc-tests/wallet_shieldcoinbase_ua_sapling.py b/qa/rpc-tests/wallet_shieldcoinbase_ua_sapling.py index f07ef656e..3f1b88e4d 100755 --- a/qa/rpc-tests/wallet_shieldcoinbase_ua_sapling.py +++ b/qa/rpc-tests/wallet_shieldcoinbase_ua_sapling.py @@ -14,7 +14,7 @@ class WalletShieldCoinbaseUASapling(WalletShieldCoinbaseTest): # this function may be called no more than once assert(self.account is None) self.account = node.z_getnewaccount()['account'] - self.addr = node.z_getaddressforaccount(self.account)['unifiedaddress'] + self.addr = node.z_getaddressforaccount(self.account)['address'] return self.addr def test_check_balance_zaddr(self, node, expected): diff --git a/qa/rpc-tests/wallet_z_sendmany.py b/qa/rpc-tests/wallet_z_sendmany.py index dd1559305..ea102dca5 100755 --- a/qa/rpc-tests/wallet_z_sendmany.py +++ b/qa/rpc-tests/wallet_z_sendmany.py @@ -167,7 +167,7 @@ class WalletZSendmanyTest(BitcoinTestFramework): # Get a new unified account on node 2 & generate a UA n0account0 = self.nodes[0].z_getnewaccount()['account'] - n0ua0 = self.nodes[0].z_getaddressforaccount(n0account0)['unifiedaddress'] + n0ua0 = self.nodes[0].z_getaddressforaccount(n0account0)['address'] # Change went to a fresh address, so use `ANY_TADDR` which # should hold the rest of our transparent funds. @@ -297,8 +297,8 @@ class WalletZSendmanyTest(BitcoinTestFramework): # Generate a new account with two new addresses. n1account = self.nodes[1].z_getnewaccount()['account'] - n1ua0 = self.nodes[1].z_getaddressforaccount(n1account)['unifiedaddress'] - n1ua1 = self.nodes[1].z_getaddressforaccount(n1account)['unifiedaddress'] + n1ua0 = self.nodes[1].z_getaddressforaccount(n1account)['address'] + n1ua1 = self.nodes[1].z_getaddressforaccount(n1account)['address'] # Send funds to the transparent receivers of both addresses. for ua in [n1ua0, n1ua1]: diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 86f84521d..d81e3b24e 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -3271,7 +3271,7 @@ UniValue z_getaddressforaccount(const UniValue& params, bool fHelp) " \"account\": n, (numeric) the specified account number\n" " \"diversifier_index\": n, (numeric) the index specified or chosen\n" " \"pools\": [\"pool\",...]\", (json array of string) the pools (e.g. \"transparent\", \"orchard\") for which the UA contains receivers\n" - " \"unifiedaddress\" (string) The corresponding address\n" + " \"address\" (string) The corresponding address\n" "}\n" "\nExamples:\n" + HelpExampleCli("z_getaddressforaccount", "4") @@ -3344,7 +3344,7 @@ UniValue z_getaddressforaccount(const UniValue& params, bool fHelp) std::visit(match { [&](std::pair addr) { - result.pushKV("unifiedaddress", KeyIO(Params()).EncodePaymentAddress(addr.first)); + result.pushKV("address", KeyIO(Params()).EncodePaymentAddress(addr.first)); UniValue j; j.setNumStr(ArbitraryIntStr(std::vector(addr.second.begin(), addr.second.end()))); result.pushKV("diversifier_index", j);