[RPC] Shield address setlabel/getaddressesbylabel

doc/release-notes.md

@@ -24,6 +24,15 @@ The `autocombinerewards` RPC command was soft-deprecated in v5.3.0 and replaced
 
 This command will be fully removed in v6.0.0.
 
+### Shield address support for RPC label commands
+
+The `setlabel` RPC command now supports a shield address input argument to allow users to set labels for shield addresses. Additionally, the `getaddressesbylabel` RPC command will also now return shield addresses with a matching label.
+
+### Specify optional label for getnewshieldaddress
+
+The `getnewshieldaddress` RPC command now takes an optional argument `label (string)` to denote the desired label for the generated address.
+
+
 *version* Change log
 ==============
 

src/wallet/rpcwallet.cpp

@@ -305,8 +305,12 @@ UniValue getaddressesbylabel(const JSONRPCRequest& request)
     UniValue ret(UniValue::VOBJ);
     for (auto it = pwallet->NewAddressBookIterator(); it.IsValid(); it.Next()) {
         auto addrBook = it.GetValue();
-        if (!addrBook.isShielded() && addrBook.name == label) {
-            ret.pushKV(EncodeDestination(*it.GetCTxDestKey(), AddressBook::IsColdStakingPurpose(addrBook.purpose)), AddressBookDataToJSON(addrBook, false));
+        if (addrBook.name == label) {
+            if (!addrBook.isShielded()) {
+                ret.pushKV(EncodeDestination(*it.GetCTxDestKey(), AddressBook::IsColdStakingPurpose(addrBook.purpose)), AddressBookDataToJSON(addrBook, false));
+            } else {
+                ret.pushKV(Standard::EncodeDestination(*it.GetShieldedDestKey()), AddressBookDataToJSON(addrBook, false));
+            }
         }
     }
 
@@ -999,9 +1003,11 @@ UniValue setlabel(const JSONRPCRequest& request)
 
     LOCK2(cs_main, pwallet->cs_wallet);
 
-    CTxDestination dest = DecodeDestination(request.params[0].get_str());
-    if (!IsValidDestination(dest))
-        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid PIVX address");
+    const CWDestination& dest = Standard::DecodeDestination(request.params[0].get_str());
+    // Make sure the destination is valid
+    if (!Standard::IsValidDestination(dest)) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
+    }
 
     std::string old_label = pwallet->GetNameForAddressBookEntry(dest);
     std::string label = LabelFromValue(request.params[1]);

test/functional/wallet_labels.py

@@ -120,6 +120,16 @@ def run_test(self):
             label.verify(node)
             assert_raises_rpc_error(-11, "No addresses with label", node.getaddressesbylabel, "")
 
+        if not self.options.legacywallet:
+            # Check that setlabel can assign a label to a new unused shield address.
+            for label in labels:
+                shield_address = node.getnewshieldaddress()
+                node.setlabel(shield_address, label.name)
+                label.add_address(shield_address)
+                label.purpose[shield_address] = "shielded_receive"
+                label.verify(node)
+                assert_raises_rpc_error(-11, "No addresses with label", node.getaddressesbylabel, "")
+
         # Check that addmultisigaddress can assign labels.
         for label in labels:
             addresses = []