Move signature verification functions to CPubKey.

[novacoin.git] / src / wallet.h

diff --git a/src/wallet.h b/src/wallet.h
index b3d7d33..4db32e5 100644 (file)
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -158,7 +158,7 @@ public:
     CMalleableKeyView GenerateNewMalleableKey();
     // Adds a key to the store, and saves it to disk.
     bool AddKey(const CKey& key);
-    bool AddMalleableKey(const CMalleableKey& mKey);
+    bool AddKey(const CMalleableKey& mKey);
     // Adds a key to the store, without saving it to disk (used by LoadWallet)
     bool LoadKey(const CKey& key) { return CCryptoKeyStore::AddKey(key); }
     // Load metadata (used by LoadWallet)
@@ -166,8 +166,8 @@ public:
     bool LoadKeyMetadata(const CMalleableKeyView &keyView, const CKeyMetadata &metadata);
 
     // Load malleable key without saving it to disk (used by LoadWallet)
-    bool LoadMalleableKey(const CMalleableKeyView &keyView, const CSecret &vchSecretH) { return CCryptoKeyStore::AddMalleableKey(keyView, vchSecretH); }
-    bool LoadCryptedMalleableKey(const CMalleableKeyView &keyView, const std::vector<unsigned char> &vchCryptedSecretH) { return CCryptoKeyStore::AddCryptedMalleableKey(keyView, vchCryptedSecretH); }
+    bool LoadKey(const CMalleableKeyView &keyView, const CSecret &vchSecretH) { return CCryptoKeyStore::AddMalleableKey(keyView, vchSecretH); }
+    bool LoadCryptedKey(const CMalleableKeyView &keyView, const std::vector<unsigned char> &vchCryptedSecretH) { return CCryptoKeyStore::AddCryptedMalleableKey(keyView, vchCryptedSecretH); }
 
     bool LoadMinVersion(int nVersion) { nWalletVersion = nVersion; nWalletMaxVersion = std::max(nWalletMaxVersion, nVersion); return true; }
 
@@ -191,6 +191,7 @@ public:
     bool DecryptWallet(const SecureString& strWalletPassphrase);
 
     void GetAddresses(std::map<CBitcoinAddress, int64_t> &mapAddresses) const;
+    bool GetPEM(const CKeyID &keyID, const std::string &fileName, const SecureString &strPassPhrase) const;
 
 
     /** Increment the next transaction order id
@@ -319,6 +320,8 @@ public:
 
     DBErrors ZapWalletTx();
 
+    bool SetAddressBookName(const CTxDestination& address, const std::string& strName);
+
     bool SetAddressBookName(const CBitcoinAddress& address, const std::string& strName);
 
     bool DelAddressBookName(const CBitcoinAddress& address);