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

diff --git a/src/keystore.cpp b/src/keystore.cpp
index fdba291..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,19 +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();
-
-    const CMalleableKeyView& keyView(malleableKey);
-    mapMalleableKeys[keyView] = malleableKey;
-}
-
 bool CCryptoKeyStore::SetCrypted()
 {
     {