From 0fe1134337f1ffbe15895e9ef67eb02a965861dc Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Sun, 7 Nov 2021 11:26:28 -0500
Subject: [PATCH] Only maintain CKeyID for the transparent part of
 ZcashdUnifiedAddress

---
 src/zcash/address/zip32.cpp | 2 +-
 src/zcash/address/zip32.h   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/zcash/address/zip32.cpp b/src/zcash/address/zip32.cpp
index 3b3da1223..f3aeb864e 100644
--- a/src/zcash/address/zip32.cpp
+++ b/src/zcash/address/zip32.cpp
@@ -355,7 +355,7 @@ std::optional<ZcashdUnifiedAddress> ZcashdUnifiedFullViewingKey::Address(diversi
 
         CExtPubKey childKey;
         if (changeKey.Derive(childKey, childIndex.value())) {
-            ua.transparentKey = childKey.pubkey;
+            ua.transparentAddress = childKey.pubkey.GetID();
         } else {
             return std::nullopt;
         }
diff --git a/src/zcash/address/zip32.h b/src/zcash/address/zip32.h
index f159cd2a4..f6a1a584f 100644
--- a/src/zcash/address/zip32.h
+++ b/src/zcash/address/zip32.h
@@ -314,15 +314,15 @@ class ZcashdUnifiedFullViewingKey;
 class ZcashdUnifiedAddress {
 private:
     diversifier_index_t diversifier_index;
-    std::optional<CPubKey> transparentKey; //TODO: should this just be the public key hash?
+    std::optional<CKeyID> transparentAddress;
     std::optional<SaplingPaymentAddress> saplingAddress;
 
     friend class ZcashdUnifiedFullViewingKey;
 
     ZcashdUnifiedAddress() {}
 public:
-    const std::optional<CPubKey>& GetTransparentKey() const {
-        return transparentKey;
+    const std::optional<CKeyID>& GetTransparentAddress() const {
+        return transparentAddress;
     }
 
     const std::optional<SaplingPaymentAddress>& GetSaplingPaymentAddress() const {