merged with upstream

2016-04-26 13:46:20 +03:00
parent d500272fa8
commit 3dd4b4ccf9
5 changed files with 106 additions and 3 deletions
@@ -62,6 +62,8 @@ public:
    bool store(const std::string &path);
    bool init(const std::string &daemon_address, uint64_t upper_transaction_size_limit);
    bool connectToDaemon();
+    void setTrustedDaemon(bool arg);
+    bool trustedDaemon() const;
    uint64_t balance() const;
    uint64_t unlockedBalance() const;
    bool refresh();
@@ -81,6 +83,7 @@ private:
    std::string m_errorString;
    std::string m_password;
    TransactionHistoryImpl * m_history;
+    bool        m_trustedDaemon;
 };