X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fkeystore.cpp;h=fdbecbabe873e281a89639f9c5731ab7a98b9341;hb=0a18ce8f4cd1a723f50333945d94c84b45c8d56b;hp=197b73ef12143d8336d6d02a1edf4d5c10408bc6;hpb=e5e4c598dc43bb5e01b3a30aaeb2dfc9376bd7b4;p=novacoin.git

diff --git a/src/keystore.cpp b/src/keystore.cpp
index 197b73e..fdbecba 100644
--- a/src/keystore.cpp
+++ b/src/keystore.cpp
@@ -29,6 +29,15 @@ bool CBasicKeyStore::AddKey(const CKey& key)
     return true;
 }
 
+bool CBasicKeyStore::AddMalleableKey(const CMalleableKey& mKey)
+{
+    {
+        LOCK(cs_KeyStore);
+        mapMalleableKeys[CMalleableKeyView(mKey)] = mKey;
+    }
+    return true;
+}
+
 bool CBasicKeyStore::AddCScript(const CScript& redeemScript)
 {
     if (redeemScript.size() > MAX_SCRIPT_ELEMENT_SIZE)
@@ -102,20 +111,6 @@ bool CBasicKeyStore::HaveWatchOnly() const
     return (!setWatchOnly.empty());
 }
 
-CCryptoKeyStore::CCryptoKeyStore() : fUseCrypto(false)
-{
-    std::string strMalleableKey = GetArg("-masterkey", "");
-    CMalleableKey malleableKey;
-    if (strMalleableKey != "")
-        malleableKey.SetString(strMalleableKey);
-    else
-        malleableKey.MakeNewKeys();
-
-    CMalleableKeyView keyView(malleableKey);
-
-    malleableKeyPair = std::pair<CMalleableKeyView, CMalleableKey>(keyView, malleableKey);
-}
-
 bool CCryptoKeyStore::SetCrypted()
 {
     {