Add crypted keystore sapling add key

src/wallet/crypter.cpp

@@ -322,6 +322,35 @@ bool CCryptoKeyStore::AddSpendingKey(const libzcash::SproutSpendingKey &sk)
     return true;
 }
 
+bool CCryptoKeyStore::AddSaplingSpendingKey(const libzcash::SaplingSpendingKey &sk)
+{
+    {
+        LOCK(cs_SpendingKeyStore);
+        if (!IsCrypted()) {
+            return CBasicKeyStore::AddSaplingSpendingKey(sk);
+        }
+
+        if (IsLocked()) {
+            return false;
+        }
+
+        std::vector<unsigned char> vchCryptedSecret;
+        CSecureDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+        ss << sk;
+        CKeyingMaterial vchSecret(ss.begin(), ss.end());
+        auto address = sk.default_address();
+        auto fvk = sk.full_viewing_key();
+        if (!EncryptSecret(vMasterKey, vchSecret, address.GetHash(), vchCryptedSecret)) {
+            return false;
+        }
+
+        if (!AddCryptedSaplingSpendingKey(fvk, vchCryptedSecret)) {
+            return false;
+        }
+    }
+    return true;
+}
+
 bool CCryptoKeyStore::AddCryptedSpendingKey(const libzcash::SproutPaymentAddress &address,
                                             const libzcash::ReceivingKey &rk,
                                             const std::vector<unsigned char> &vchCryptedSecret)
@@ -337,6 +366,21 @@ bool CCryptoKeyStore::AddCryptedSpendingKey(const libzcash::SproutPaymentAddress
     return true;
 }
 
+// TODO: Handle note decryptors
+bool CCryptoKeyStore::AddCryptedSaplingSpendingKey(const libzcash::SaplingFullViewingKey &fvk,
+                                            const std::vector<unsigned char> &vchCryptedSecret)
+{
+    {
+        LOCK(cs_SpendingKeyStore);
+        if (!SetCrypted()) {
+            return false;
+        }
+
+        mapCryptedSaplingSpendingKeys[fvk] = vchCryptedSecret;
+    }
+    return true;
+}
+
 bool CCryptoKeyStore::GetSpendingKey(const libzcash::SproutPaymentAddress &address, libzcash::SproutSpendingKey &skOut) const
 {
     {

src/wallet/crypter.h

@@ -129,7 +129,9 @@ class CCryptoKeyStore : public CBasicKeyStore
 private:
     CryptedKeyMap mapCryptedKeys;
     CryptedSpendingKeyMap mapCryptedSpendingKeys;
-
+    
+    CryptedSaplingSpendingKeyMap mapCryptedSaplingSpendingKeys;
+    
     CKeyingMaterial vMasterKey;
 
     //! if fUseCrypto is true, mapKeys and mapSpendingKeys must be empty
@@ -230,6 +232,10 @@ public:
             mi++;
         }
     }
+    //! Sapling 
+    virtual bool AddCryptedSaplingSpendingKey(const libzcash::SaplingFullViewingKey &fvk,
+                                       const std::vector<unsigned char> &vchCryptedSecret);
+    bool AddSaplingSpendingKey(const libzcash::SaplingSpendingKey &sk);
 
     /**
      * Wallet status (encrypted, locked) changed.

src/wallet/gtest/test_wallet_zkeys.cpp

@@ -7,6 +7,29 @@
 
 #include <boost/filesystem.hpp>
 
+/**
+ * This test covers Sapling methods on CWallet
+ * GenerateNewSaplingZKey()
+ */
+TEST(wallet_zkeys_tests, store_and_load_sapling_zkeys) {
+    SelectParams(CBaseChainParams::MAIN);
+
+    CWallet wallet;
+
+    auto address = wallet.GenerateNewSaplingZKey();
+    
+    // verify wallet has incoming viewing key for the address
+    ASSERT_TRUE(wallet.HaveSaplingIncomingViewingKey(address));
+    
+    // manually add new spending key to wallet
+    auto sk = libzcash::SaplingSpendingKey::random();
+    ASSERT_TRUE(wallet.AddSaplingZKey(sk));
+
+    // verify wallet did add it
+    auto fvk = sk.full_viewing_key();
+    ASSERT_TRUE(wallet.HaveSaplingSpendingKey(fvk));
+}
+
 /**
  * This test covers methods on CWallet
  * GenerateNewZKey()