1 files changed, 25 insertions, 4 deletions

diff --git a/src/wallet/api/wallet_manager.h b/src/wallet/api/wallet_manager.h
index 7585c1af7..033e8108f 100644
--- a/src/wallet/api/wallet_manager.h
+++ b/src/wallet/api/wallet_manager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2016, The Monero Project
+// Copyright (c) 2014-2017, The Monero Project
 //
 // All rights reserved.
 //
@@ -32,7 +32,7 @@
 #include "wallet/wallet2_api.h"
 #include <string>
 
-namespace Bitmonero {
+namespace Monero {
 
 class WalletManagerImpl : public WalletManager
 {
@@ -40,17 +40,38 @@ public:
     Wallet * createWallet(const std::string &path, const std::string &password,
                           const std::string &language, bool testnet);
     Wallet * openWallet(const std::string &path, const std::string &password, bool testnet);
-    virtual Wallet * recoveryWallet(const std::string &path, const std::string &memo, bool testnet);
+    virtual Wallet * recoveryWallet(const std::string &path, const std::string &memo, bool testnet, uint64_t restoreHeight);
+    virtual Wallet * createWalletFromKeys(const std::string &path, 
+                                                    const std::string &language,
+                                                    bool testnet, 
+                                                    uint64_t restoreHeight,
+                                                    const std::string &addressString,
+                                                    const std::string &viewKeyString,
+                                                    const std::string &spendKeyString = "");
     virtual bool closeWallet(Wallet *wallet);
     bool walletExists(const std::string &path);
     std::vector<std::string> findWallets(const std::string &path);
     std::string errorString() const;
-    void setDaemonHost(const std::string &hostname);
+    void setDaemonAddress(const std::string &address);
+    bool connected(uint32_t *version = NULL) const;
+    bool checkPayment(const std::string &address, const std::string &txid, const std::string &txkey, const std::string &daemon_address, uint64_t &received, uint64_t &height, std::string &error) const;
+    uint64_t blockchainHeight() const;
+    uint64_t blockchainTargetHeight() const;
+    uint64_t networkDifficulty() const;
+    double miningHashRate() const;
+    uint64_t blockTarget() const;
+    bool isMining() const;
+    bool startMining(const std::string &address, uint32_t threads = 1, bool background_mining = false, bool ignore_battery = true);
+    bool stopMining();
+    std::string resolveOpenAlias(const std::string &address, bool &dnssec_valid) const;
 
 private:
     WalletManagerImpl() {}
     friend struct WalletManagerFactory;
+    std::string m_daemonAddress;
     std::string m_errorString;
 };
 
 } // namespace
+
+namespace Bitmonero = Monero;