[Sapling] Add crypted keystore sapling add key.

furszy · furszy · commit f6cb741fc964 · 2020-08-02T23:03:34.000-03:00
diff --git a/src/crypter.cpp b/src/crypter.cpp
@@ -213,6 +213,48 @@ bool CCryptoKeyStore::GetPubKey(const CKeyID& address, CPubKey& vchPubKeyOut) co
     return false;
 }
 
+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;
+}
+
+// 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::EncryptKeys(CKeyingMaterial& vMasterKeyIn)
 {
     {
diff --git a/src/crypter.h b/src/crypter.h
@@ -141,6 +141,8 @@ class CCryptoKeyStore : public CBasicKeyStore
 protected:
     // TODO: In the future, move this variable to the wallet class directly following upstream's structure.
     CKeyingMaterial vMasterKey;
+    // Sapling
+    CryptedSaplingSpendingKeyMap mapCryptedSaplingSpendingKeys;
 
     bool SetCrypted();
 
@@ -198,6 +200,11 @@ class CCryptoKeyStore : public CBasicKeyStore
         }
     }
 
+    //! 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.
      * Note: Called without locks held.
diff --git a/src/keystore.h b/src/keystore.h
@@ -134,5 +134,7 @@ class CBasicKeyStore : public CKeyStore
 
 typedef std::vector<unsigned char, secure_allocator<unsigned char> > CKeyingMaterial;
 typedef std::map<CKeyID, std::pair<CPubKey, std::vector<unsigned char> > > CryptedKeyMap;
+//! Sapling
+typedef std::map<libzcash::SaplingFullViewingKey, std::vector<unsigned char> > CryptedSaplingSpendingKeyMap;
 
 #endif // BITCOIN_KEYSTORE_H
diff --git a/src/test/librust/wallet_zkeys_tests.cpp b/src/test/librust/wallet_zkeys_tests.cpp
@@ -26,31 +26,26 @@ BOOST_FIXTURE_TEST_SUITE(wallet_zkeys_tests, BasicTestingSetup)
   * This test covers Sapling methods on CWallet
   * GenerateNewSaplingZKey()
   */
-BOOST_AUTO_TEST_CASE(testVectors) {
+BOOST_AUTO_TEST_CASE(store_and_load_sapling_zkeys) {
 
     CWallet wallet;
-    // wallet should be empty
-    // std::set<libzcash::SaplingPaymentAddress> addrs;
-    // wallet.GetSaplingPaymentAddresses(addrs);
-    // ASSERT_EQ(0, addrs.size());
-
-    // wallet should have one key
-    auto saplingAddr = wallet.GenerateNewSaplingZKey();
-    // ASSERT_NE(boost::get<libzcash::SaplingPaymentAddress>(&address), nullptr);
-    // auto sapling_addr = boost::get<libzcash::SaplingPaymentAddress>(saplingAddr);
-    // wallet.GetSaplingPaymentAddresses(addrs);
-    // ASSERT_EQ(1, addrs.size());
 
+    auto address = wallet.GenerateNewSaplingZKey();
+
+    // verify wallet has incoming viewing key for the address
+    BOOST_CHECK(wallet.HaveSaplingIncomingViewingKey(address));
+
+    // manually add new spending key to wallet
     auto sk = libzcash::SaplingSpendingKey::random();
-    auto full_viewing_key = sk.full_viewing_key();
-    BOOST_CHECK(wallet.AddSaplingSpendingKey(sk));
+    BOOST_CHECK(wallet.AddSaplingZKey(sk));
 
-    // verify wallet has spending key for the address
-    BOOST_CHECK(wallet.HaveSaplingSpendingKey(full_viewing_key));
+    // verify wallet did add it
+    auto fvk = sk.full_viewing_key();
+    BOOST_CHECK(wallet.HaveSaplingSpendingKey(fvk));
 
     // check key is the same
     libzcash::SaplingSpendingKey keyOut;
-    wallet.GetSaplingSpendingKey(full_viewing_key, keyOut);
+    wallet.GetSaplingSpendingKey(fvk, keyOut);
     BOOST_CHECK(sk == keyOut);
 }
 
