diff options
author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2016-07-10 16:49:40 +0100 |
---|---|---|
committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2016-07-10 16:49:40 +0100 |
commit | 014f3a0d39e5314c13ae7420283b1ea5eb593517 (patch) | |
tree | c7e5ce5486436584e0f9e65037b07e0060a966a8 /src/simplewallet/simplewallet.h | |
parent | Merge pull request #889 (diff) | |
download | monero-014f3a0d39e5314c13ae7420283b1ea5eb593517.tar.xz |
Add a daemon RPC version, and make simplewallet check it
If the version is different, simplewallet will refuse to use that
daemon, unless --allow-mismatched-daemon-version is used.
Diffstat (limited to '')
-rw-r--r-- | src/simplewallet/simplewallet.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h index e0478eb6e..aba935449 100644 --- a/src/simplewallet/simplewallet.h +++ b/src/simplewallet/simplewallet.h @@ -145,7 +145,7 @@ namespace cryptonote bool set_default_fee_multiplier(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); @@ -238,6 +238,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; |