Implement GetSaplingExtendedSpendingKey.

furszy · furszy · commit 76fcd87c0e14 · 2020-08-02T23:03:43.000-03:00
diff --git a/src/keystore.cpp b/src/keystore.cpp
@@ -233,6 +233,16 @@ bool CBasicKeyStore::GetSaplingIncomingViewingKey(const libzcash::SaplingPayment
     return false;
 }
 
+bool CBasicKeyStore::GetSaplingExtendedSpendingKey(const libzcash::SaplingPaymentAddress &addr,
+                                                   libzcash::SaplingExtendedSpendingKey &extskOut) const {
+    libzcash::SaplingIncomingViewingKey ivk;
+    libzcash::SaplingFullViewingKey fvk;
+
+    return GetSaplingIncomingViewingKey(addr, ivk) &&
+           GetSaplingFullViewingKey(ivk, fvk) &&
+           GetSaplingSpendingKey(fvk, extskOut);
+}
+
 void CBasicKeyStore::GetSaplingPaymentAddresses(std::set<libzcash::SaplingPaymentAddress> &setAddress) const
 {
     setAddress.clear();
diff --git a/src/keystore.h b/src/keystore.h
@@ -138,6 +138,11 @@ class CBasicKeyStore : public CKeyStore
     virtual bool GetSaplingIncomingViewingKey(
             const libzcash::SaplingPaymentAddress &addr,
             libzcash::SaplingIncomingViewingKey& ivkOut) const;
+
+    bool GetSaplingExtendedSpendingKey(
+            const libzcash::SaplingPaymentAddress &addr,
+            libzcash::SaplingExtendedSpendingKey &extskOut) const;
+
     void GetSaplingPaymentAddresses(std::set<libzcash::SaplingPaymentAddress> &setAddress) const;
 };
 
diff --git a/src/sapling/crypter_sapling.cpp b/src/sapling/crypter_sapling.cpp
@@ -19,7 +19,7 @@ bool CCryptoKeyStore::AddSaplingSpendingKey(
         const libzcash::SaplingPaymentAddress &defaultAddr)
 {
     {
-        LOCK(cs_SpendingKeyStore);
+        LOCK2(cs_SpendingKeyStore, cs_KeyStore);
         if (!IsCrypted()) {
             return CBasicKeyStore::AddSaplingSpendingKey(sk, defaultAddr);
         }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ bool CCryptoKeyStore::AddSaplingSpendingKey(`
`19`	`19`	`const libzcash::SaplingPaymentAddress &defaultAddr)`
`20`	`20`	`{`
`21`	`21`	`{`
`22`		`- LOCK(cs_SpendingKeyStore);`
	`22`	`+ LOCK2(cs_SpendingKeyStore, cs_KeyStore);`
`23`	`23`	`if (!IsCrypted()) {`
`24`	`24`	`return CBasicKeyStore::AddSaplingSpendingKey(sk, defaultAddr);`
`25`	`25`	`}`