test

[VerusCoin.git] / src / keystore.h

diff --git a/src/keystore.h b/src/keystore.h
index 927ebe221d4d1d648f4d4151ebfcff92a5890720..84595cfb0f45f3caa84fde33c4e2c02a02a2b3a8 100644 (file)
--- a/src/keystore.h
+++ b/src/keystore.h
@@ -12,6 +12,7 @@
 #include "script/standard.h"
 #include "sync.h"
 #include "zcash/Address.hpp"
+#include "zcash/NoteEncryption.hpp"
 
 #include <boost/signals2/signal.hpp>
 #include <boost/variant.hpp>
@@ -21,6 +22,7 @@ class CKeyStore
 {
 protected:
     mutable CCriticalSection cs_KeyStore;
+    mutable CCriticalSection cs_SpendingKeyStore;
 
 public:
     virtual ~CKeyStore() {}
@@ -59,6 +61,7 @@ typedef std::map<CKeyID, CKey> KeyMap;
 typedef std::map<CScriptID, CScript > ScriptMap;
 typedef std::set<CScript> WatchOnlySet;
 typedef std::map<libzcash::PaymentAddress, libzcash::SpendingKey> SpendingKeyMap;
+typedef std::map<libzcash::PaymentAddress, ZCNoteDecryption> NoteDecryptorMap;
 
 /** Basic key store, that keeps keys in an address->secret map */
 class CBasicKeyStore : public CKeyStore
@@ -68,6 +71,7 @@ protected:
     ScriptMap mapScripts;
     WatchOnlySet setWatchOnly;
     SpendingKeyMap mapSpendingKeys;
+    NoteDecryptorMap mapNoteDecryptors;
 
 public:
     bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey);
@@ -120,7 +124,7 @@ public:
     {
         bool result;
         {
-            LOCK(cs_KeyStore);
+            LOCK(cs_SpendingKeyStore);
             result = (mapSpendingKeys.count(address) > 0);
         }
         return result;
@@ -128,7 +132,7 @@ public:
     bool GetSpendingKey(const libzcash::PaymentAddress &address, libzcash::SpendingKey &skOut) const
     {
         {
-            LOCK(cs_KeyStore);
+            LOCK(cs_SpendingKeyStore);
             SpendingKeyMap::const_iterator mi = mapSpendingKeys.find(address);
             if (mi != mapSpendingKeys.end())
             {
@@ -138,11 +142,24 @@ public:
         }
         return false;
     }
+    bool GetNoteDecryptor(const libzcash::PaymentAddress &address, ZCNoteDecryption &decOut) const
+    {
+        {
+            LOCK(cs_SpendingKeyStore);
+            NoteDecryptorMap::const_iterator mi = mapNoteDecryptors.find(address);
+            if (mi != mapNoteDecryptors.end())
+            {
+                decOut = mi->second;
+                return true;
+            }
+        }
+        return false;
+    }
     void GetPaymentAddresses(std::set<libzcash::PaymentAddress> &setAddress) const
     {
         setAddress.clear();
         {
-            LOCK(cs_KeyStore);
+            LOCK(cs_SpendingKeyStore);
             SpendingKeyMap::const_iterator mi = mapSpendingKeys.begin();
             while (mi != mapSpendingKeys.end())
             {
@@ -155,5 +172,6 @@ public:
 
 typedef std::vector<unsigned char, secure_allocator<unsigned char> > CKeyingMaterial;
 typedef std::map<CKeyID, std::pair<CPubKey, std::vector<unsigned char> > > CryptedKeyMap;
+typedef std::map<libzcash::PaymentAddress, std::vector<unsigned char> > CryptedSpendingKeyMap;
 
 #endif // BITCOIN_KEYSTORE_H