Pass SaplingPaymentAddress to store through the CKeyStore

2018-08-02 22:34:31 +01:00
parent bc6344b350
commit 5175a7f07b
9 changed files with 76 additions and 39 deletions
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -1006,9 +1006,13 @@ public:
    //! Generates new Sapling key
    libzcash::SaplingPaymentAddress GenerateNewSaplingZKey();
    //! Adds Sapling spending key to the store, and saves it to disk
-    bool AddSaplingZKey(const libzcash::SaplingSpendingKey &key);
-    bool AddCryptedSaplingSpendingKey(const libzcash::SaplingFullViewingKey &fvk,
-                                      const std::vector<unsigned char> &vchCryptedSecret);
+    bool AddSaplingZKey(
+        const libzcash::SaplingSpendingKey &key,
+        const boost::optional<libzcash::SaplingPaymentAddress> &defaultAddr = boost::none);
+    bool AddCryptedSaplingSpendingKey(
+        const libzcash::SaplingFullViewingKey &fvk,
+        const std::vector<unsigned char> &vchCryptedSecret,
+        const boost::optional<libzcash::SaplingPaymentAddress> &defaultAddr = boost::none);

    /** 
     * Increment the next transaction order id