Ies_ctx_t - move to try catch block

[novacoin.git] / src / wallet.h

diff --git a/src/wallet.h b/src/wallet.h
index d07aa7c..6e36e9d 100644 (file)
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -17,6 +17,7 @@
 #include "ui_interface.h"
 #include "util.h"
 #include "walletdb.h"
+#include "base58.h"
 
 extern unsigned int nStakeMaxAge;
 extern bool fWalletUnlockMintOnly;
@@ -185,7 +186,7 @@ public:
     bool EncryptWallet(const SecureString& strWalletPassphrase);
     bool DecryptWallet(const SecureString& strWalletPassphrase);
 
-    void GetKeyBirthTimes(std::map<CKeyID, int64_t> &mapKeyBirth) const;
+    void GetAddresses(std::map<CBitcoinAddress, int64_t> &mapAddresses) const;
 
 
     /** Increment the next transaction order id
@@ -211,7 +212,7 @@ public:
     int ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate = false);
     int ScanForWalletTransaction(const uint256& hashTx);
     void ReacceptWalletTransactions();
-    void ResendWalletTransactions();
+    void ResendWalletTransactions(bool fForceResend=false);
     int64_t GetBalance() const;
     int64_t GetWatchOnlyBalance() const;
     int64_t GetUnconfirmedBalance() const;
@@ -339,7 +340,7 @@ public:
 
     bool GetTransaction(const uint256 &hashTx, CWalletTx& wtx);
 
-    bool ExtractAddress(const CScript& scriptPubKey, std::string& addressRet);
+    bool ExtractAddress(const CScript& scriptPubKey, CBitcoinAddress& addressRet);
 
     bool SetDefaultKey(const CPubKey &vchPubKey);