Merge pull request #902

014f3a0 Add a daemon RPC version, and make simplewallet check it (moneromooo-monero)
2016-07-20 13:55:59 +02:00
parent b1bec02ce5 014f3a0d39
commit fc3e135b83
7 changed files with 86 additions and 20 deletions
@@ -147,7 +147,7 @@ namespace cryptonote
    bool verify(const std::vector<std::string> &args);

    uint64_t get_daemon_blockchain_height(std::string& err);
-    bool try_connect_to_daemon();
+    bool try_connect_to_daemon(bool silent = false);
    bool ask_wallet_create_if_needed();
    bool get_address_from_str(const std::string &str, cryptonote::account_public_address &address, bool &has_payment_id, crypto::hash8 &payment_id);

@@ -240,6 +240,7 @@ namespace cryptonote
    bool m_restore_deterministic_wallet;  // recover flag
    bool m_non_deterministic;  // old 2-random generation
    bool m_trusted_daemon;
+    bool m_allow_mismatched_daemon_version;
    uint64_t m_restore_height;  // optional

    std::string m_daemon_address;