[RPC] Add shield address support to getaddressinfo

random-zebra · random-zebra · commit 8ec1875f1b31 · 2021-01-04T18:25:24.000+01:00
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -143,9 +143,11 @@ UniValue getaddressinfo(const JSONRPCRequest& request)
                 "getaddressinfo ( \"address\" )\n"
                 "\nReturn information about the given PIVX address.\n"
                 "Some of the information will only be present if the address is in the active wallet.\n"
+                "Metadata for shield addresses is available only if the wallet is unlocked.\n"
                 "{Result:\n"
                 "  \"address\" : \"address\",              (string) The bitcoin address validated.\n"
-                "  \"scriptPubKey\" : \"hex\",             (string) The hex-encoded scriptPubKey generated by the address.\n"
+                "  \"isshield\" : true|false,            (boolean) If the address is shield or transparent.\n"
+                "  \"scriptPubKey\" : \"hex\",             (string, only if isshield=false) The hex-encoded scriptPubKey generated by the address.\n"
                 "  \"ismine\" : true|false,              (boolean) If the address is yours.\n"
                 "  \"iswatchonly\" : true|false,         (boolean) If the address is watchonly.\n"
                 "  \"label\" :  \"label\"                  (string) The label associated with the address, \"\" is the default label.\n"
@@ -169,23 +171,26 @@ UniValue getaddressinfo(const JSONRPCRequest& request)
 
     LOCK(pwallet->cs_wallet);
 
+    const std::string& strAdd = request.params[0].get_str();
     UniValue ret(UniValue::VOBJ);
+    ret.pushKV("address", strAdd);
 
-    CTxDestination dest = DecodeDestination(request.params[0].get_str());
+    const CWDestination& dest = Standard::DecodeDestination(strAdd);
     // Make sure the destination is valid
-    if (!IsValidDestination(dest)) {
+    if (!Standard::IsValidDestination(dest)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
     }
 
-    std::string currentAddress = request.params[0].get_str();
-    ret.pushKV("address", currentAddress);
+    const CTxDestination* pTransDest = Standard::GetTransparentDestination(dest);
+    ret.pushKV("isshield", pTransDest == nullptr);
 
-    CScript scriptPubKey = GetScriptForDestination(dest);
-    ret.pushKV("scriptPubKey", HexStr(scriptPubKey.begin(), scriptPubKey.end()));
+    if (pTransDest) {
+        ret.pushKV("scriptPubKey", HexStr(GetScriptForDestination(*pTransDest)));
+    }
 
     isminetype mine = IsMine(*pwallet, dest);
     ret.pushKV("ismine", bool(mine & ISMINE_SPENDABLE_ALL));
-    ret.pushKV("iswatchonly", bool(mine & ISMINE_WATCH_ONLY));
+    ret.pushKV("iswatchonly", bool(mine & ISMINE_WATCH_ONLY_ALL));
 
     // Return label field if existing. Currently only one label can be
     // associated with an address, so the label should be equivalent to the
@@ -198,20 +203,39 @@ UniValue getaddressinfo(const JSONRPCRequest& request)
     //ret.pushKV("ischange", pwallet->IsChange(scriptPubKey));
 
     ScriptPubKeyMan* spk_man = pwallet->GetScriptPubKeyMan();
-    if (spk_man) {
-        CKeyID* keyID = boost::get<CKeyID>(&dest);
+    SaplingScriptPubKeyMan* sspk_man = pwalletMain->GetSaplingScriptPubKeyMan();
+    CKeyMetadata* meta = nullptr;
+
+    if (spk_man && pTransDest) {
+        // transparent destination
+        const CKeyID* keyID = boost::get<CKeyID>(pTransDest);
         if (keyID) {
-            std::map<CKeyID, CKeyMetadata>::iterator it = pwallet->mapKeyMetadata.find(*keyID);
+            auto it = pwallet->mapKeyMetadata.find(*keyID);
             if(it != pwallet->mapKeyMetadata.end()) {
-                const CKeyMetadata& meta = it->second;
-                ret.pushKV("timestamp", meta.nCreateTime);
-                if (meta.HasKeyOrigin()) {
-                    ret.pushKV("hdkeypath", meta.key_origin.pathToString());
-                    ret.pushKV("hdseedid", meta.hd_seed_id.GetHex());
-                    ret.pushKV("hdmasterfingerprint", HexStr(meta.key_origin.fingerprint, meta.key_origin.fingerprint + 4));
-                }
+                meta = &it->second;
             }
         }
+    } else if (sspk_man && !pTransDest) {
+        // shield destination
+        const libzcash::SaplingPaymentAddress pa = *Standard::GetShieldedDestination(dest);
+        libzcash::SaplingExtendedSpendingKey extsk;
+        if (pwalletMain->GetSaplingExtendedSpendingKey(pa, extsk)) {
+            const auto& ivk = extsk.expsk.full_viewing_key().in_viewing_key();
+            auto it = sspk_man->mapSaplingZKeyMetadata.find(ivk);
+            if (it != sspk_man->mapSaplingZKeyMetadata.end()) {
+                meta = &it->second;
+            }
+        }
+    }
+
+    // Add metadata
+    if (meta) {
+        ret.pushKV("timestamp", meta->nCreateTime);
+        if (meta->HasKeyOrigin()) {
+            ret.pushKV("hdkeypath", meta->key_origin.pathToString());
+            ret.pushKV("hdseedid", meta->hd_seed_id.GetHex());
+            ret.pushKV("hdmasterfingerprint", HexStr(meta->key_origin.fingerprint, meta->key_origin.fingerprint + 4));
+        }
     }
 
     // Return a `labels` array containing the label associated with the address,
