From f1307bbd7bbdd331ed6b7be42411bcd2ecd56b5a Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Wed, 2 Aug 2017 14:43:47 +0100 Subject: [PATCH 1/3] node_rpc_proxy: add a proxy for target height --- src/wallet/node_rpc_proxy.cpp | 37 +++++++++++++++++++++++++++++++---- src/wallet/node_rpc_proxy.h | 25 ++++++++++++----------- 2 files changed, 47 insertions(+), 15 deletions(-) diff --git a/src/wallet/node_rpc_proxy.cpp b/src/wallet/node_rpc_proxy.cpp index 1143a89d7..9f30e4ac5 100644 --- a/src/wallet/node_rpc_proxy.cpp +++ b/src/wallet/node_rpc_proxy.cpp @@ -48,6 +48,8 @@ NodeRPCProxy::NodeRPCProxy(epee::net_utils::http::http_simple_client &http_clien , m_dynamic_per_kb_fee_estimate_cached_height(0) , m_dynamic_per_kb_fee_estimate_grace_blocks(0) , m_rpc_version(0) + , m_target_height(0) + , m_target_height_time(0) {} void NodeRPCProxy::invalidate() @@ -60,9 +62,11 @@ void NodeRPCProxy::invalidate() m_dynamic_per_kb_fee_estimate_cached_height = 0; m_dynamic_per_kb_fee_estimate_grace_blocks = 0; m_rpc_version = 0; + m_target_height = 0; + m_target_height_time = 0; } -boost::optional NodeRPCProxy::get_rpc_version(uint32_t &rpc_version) +boost::optional NodeRPCProxy::get_rpc_version(uint32_t &rpc_version) const { const time_t now = time(NULL); if (m_rpc_version == 0) @@ -84,7 +88,7 @@ boost::optional NodeRPCProxy::get_rpc_version(uint32_t &rpc_version return boost::optional(); } -boost::optional NodeRPCProxy::get_height(uint64_t &height) +boost::optional NodeRPCProxy::get_height(uint64_t &height) const { const time_t now = time(NULL); if (m_height == 0 || now >= m_height_time + 30) // re-cache every 30 seconds @@ -110,7 +114,32 @@ void NodeRPCProxy::set_height(uint64_t h) m_height = h; } -boost::optional NodeRPCProxy::get_earliest_height(uint8_t version, uint64_t &earliest_height) +boost::optional NodeRPCProxy::get_target_height(uint64_t &height) const +{ + const time_t now = time(NULL); + if (m_height == 0 || now >= m_height_time + 30) // re-cache every 30 seconds + { + epee::json_rpc::request req_t = AUTO_VAL_INIT(req_t); + epee::json_rpc::response resp_t = AUTO_VAL_INIT(resp_t); + + req_t.jsonrpc = "2.0"; + req_t.id = epee::serialization::storage_entry(0); + req_t.method = "get_info"; + m_daemon_rpc_mutex.lock(); + bool r = net_utils::invoke_http_json("/json_rpc", req_t, resp_t, m_http_client, rpc_timeout); + m_daemon_rpc_mutex.unlock(); + + CHECK_AND_ASSERT_MES(r, std::string(), "Failed to connect to daemon"); + CHECK_AND_ASSERT_MES(resp_t.result.status != CORE_RPC_STATUS_BUSY, resp_t.result.status, "Failed to connect to daemon"); + CHECK_AND_ASSERT_MES(resp_t.result.status == CORE_RPC_STATUS_OK, resp_t.result.status, "Failed to get target blockchain height"); + m_target_height = resp_t.result.target_height; + m_target_height_time = now; + } + height = m_target_height; + return boost::optional(); +} + +boost::optional NodeRPCProxy::get_earliest_height(uint8_t version, uint64_t &earliest_height) const { if (m_earliest_height[version] == 0) { @@ -134,7 +163,7 @@ boost::optional NodeRPCProxy::get_earliest_height(uint8_t version, return boost::optional(); } -boost::optional NodeRPCProxy::get_dynamic_per_kb_fee_estimate(uint64_t grace_blocks, uint64_t &fee) +boost::optional NodeRPCProxy::get_dynamic_per_kb_fee_estimate(uint64_t grace_blocks, uint64_t &fee) const { uint64_t height; diff --git a/src/wallet/node_rpc_proxy.h b/src/wallet/node_rpc_proxy.h index 02d1d8d93..fb288189a 100644 --- a/src/wallet/node_rpc_proxy.h +++ b/src/wallet/node_rpc_proxy.h @@ -43,23 +43,26 @@ public: void invalidate(); - boost::optional get_rpc_version(uint32_t &version); - boost::optional get_height(uint64_t &height); + boost::optional get_rpc_version(uint32_t &version) const; + boost::optional get_height(uint64_t &height) const; void set_height(uint64_t h); - boost::optional get_earliest_height(uint8_t version, uint64_t &earliest_height); - boost::optional get_dynamic_per_kb_fee_estimate(uint64_t grace_blocks, uint64_t &fee); + boost::optional get_target_height(uint64_t &height) const; + boost::optional get_earliest_height(uint8_t version, uint64_t &earliest_height) const; + boost::optional get_dynamic_per_kb_fee_estimate(uint64_t grace_blocks, uint64_t &fee) const; private: epee::net_utils::http::http_simple_client &m_http_client; boost::mutex &m_daemon_rpc_mutex; - uint64_t m_height; - time_t m_height_time; - uint64_t m_earliest_height[256]; - uint64_t m_dynamic_per_kb_fee_estimate; - uint64_t m_dynamic_per_kb_fee_estimate_cached_height; - uint64_t m_dynamic_per_kb_fee_estimate_grace_blocks; - uint32_t m_rpc_version; + mutable uint64_t m_height; + mutable time_t m_height_time; + mutable uint64_t m_earliest_height[256]; + mutable uint64_t m_dynamic_per_kb_fee_estimate; + mutable uint64_t m_dynamic_per_kb_fee_estimate_cached_height; + mutable uint64_t m_dynamic_per_kb_fee_estimate_grace_blocks; + mutable uint32_t m_rpc_version; + mutable uint64_t m_target_height; + mutable time_t m_target_height_time; }; } From fa23a5006d20bd8f4a6b177ec999bfca4bc2e42c Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Wed, 2 Aug 2017 14:44:19 +0100 Subject: [PATCH 2/3] wallet2: add a is_synced function --- src/wallet/wallet2.cpp | 9 +++++++++ src/wallet/wallet2.h | 2 ++ 2 files changed, 11 insertions(+) diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 6b1026a55..bb8cdaf63 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -5667,6 +5667,15 @@ uint64_t wallet2::get_blockchain_height_by_date(uint16_t year, uint8_t month, ui } } //---------------------------------------------------------------------------------------------------- +bool wallet2::is_synced() const +{ + uint64_t height; + boost::optional result = m_node_rpc_proxy.get_target_height(height); + if (result && *result != CORE_RPC_STATUS_OK) + return false; + return get_blockchain_current_height() >= height; +} +//---------------------------------------------------------------------------------------------------- void wallet2::generate_genesis(cryptonote::block& b) { if (m_testnet) { diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index e7692badb..96dea2e40 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -597,6 +597,8 @@ namespace tools uint64_t get_blockchain_height_by_date(uint16_t year, uint8_t month, uint8_t day); // 1<=month<=12, 1<=day<=31 + bool is_synced() const; + private: /*! * \brief Stores wallet information to wallet file. From b7d6ec83648f145190cab9044d321f3ef6d4e8e7 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Wed, 2 Aug 2017 14:44:42 +0100 Subject: [PATCH 3/3] simplewallet: add (out of sync) or (no daemon) markers in the prompt Should help people who don't realize why they haven't seen their monero yet. --- contrib/epee/include/console_handler.h | 27 +++++++++++++++----------- src/simplewallet/simplewallet.cpp | 16 +++++++++++++-- src/simplewallet/simplewallet.h | 1 + 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/contrib/epee/include/console_handler.h b/contrib/epee/include/console_handler.h index e780ad4de..a3b2d30eb 100644 --- a/contrib/epee/include/console_handler.h +++ b/contrib/epee/include/console_handler.h @@ -293,13 +293,13 @@ namespace epee } template - bool run(t_server* psrv, chain_handler ch_handler, const std::string& prompt = "#", const std::string& usage = "") + bool run(t_server* psrv, chain_handler ch_handler, std::function prompt, const std::string& usage = "") { return run(prompt, usage, [&](const std::string& cmd) { return ch_handler(psrv, cmd); }, [&] { psrv->send_stop_signal(); }); } template - bool run(chain_handler ch_handler, const std::string& prompt = "#", const std::string& usage = "", std::function exit_handler = NULL) + bool run(chain_handler ch_handler, std::function prompt, const std::string& usage = "", std::function exit_handler = NULL) { return run(prompt, usage, [&](const std::string& cmd) { return ch_handler(cmd); }, exit_handler); } @@ -312,18 +312,19 @@ namespace epee void print_prompt() { - if (!m_prompt.empty()) + std::string prompt = m_prompt(); + if (!prompt.empty()) { #ifdef HAVE_READLINE - std::string color_prompt = "\001\033[1;33m\002" + m_prompt; - if (' ' != m_prompt.back()) + std::string color_prompt = "\001\033[1;33m\002" + prompt; + if (' ' != prompt.back()) color_prompt += " "; color_prompt += "\001\033[0m\002"; m_stdin_reader.get_readline_buffer().set_prompt(color_prompt); #else epee::set_console_color(epee::console_color_yellow, true); - std::cout << m_prompt; - if (' ' != m_prompt.back()) + std::cout << prompt; + if (' ' != prompt.back()) std::cout << ' '; epee::reset_console_color(); std::cout.flush(); @@ -333,7 +334,7 @@ namespace epee private: template - bool run(const std::string& prompt, const std::string& usage, const t_cmd_handler& cmd_handler, std::function exit_handler) + bool run(std::function prompt, const std::string& usage, const t_cmd_handler& cmd_handler, std::function exit_handler) { bool continue_handle = true; m_prompt = prompt; @@ -394,7 +395,7 @@ namespace epee private: async_stdin_reader m_stdin_reader; std::atomic m_running = {true}; - std::string m_prompt; + std::function m_prompt; }; @@ -516,19 +517,23 @@ namespace epee std::unique_ptr m_console_thread; async_console_handler m_console_handler; public: - bool start_handling(const std::string& prompt, const std::string& usage_string = "", std::function exit_handler = NULL) + bool start_handling(std::function prompt, const std::string& usage_string = "", std::function exit_handler = NULL) { m_console_thread.reset(new boost::thread(boost::bind(&console_handlers_binder::run_handling, this, prompt, usage_string, exit_handler))); m_console_thread->detach(); return true; } + bool start_handling(const std::string &prompt, const std::string& usage_string = "", std::function exit_handler = NULL) + { + return start_handling([prompt](){ return prompt; }, usage_string, exit_handler); + } void stop_handling() { m_console_handler.stop(); } - bool run_handling(const std::string& prompt, const std::string& usage_string, std::function exit_handler = NULL) + bool run_handling(std::function prompt, const std::string& usage_string, std::function exit_handler = NULL) { return m_console_handler.run(boost::bind(&console_handlers_binder::process_command_str, this, _1), prompt, usage_string, exit_handler); } diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index adf2fde80..29d31c7a5 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -3956,6 +3956,19 @@ void simple_wallet::wallet_idle_thread() } } //---------------------------------------------------------------------------------------------------- +std::string simple_wallet::get_prompt() const +{ + std::string addr_start = m_wallet->get_account().get_public_address_str(m_wallet->testnet()).substr(0, 6); + std::string prompt = std::string("[") + tr("wallet") + " " + addr_start; + uint32_t version; + if (!m_wallet->check_connection(&version)) + prompt += tr(" (no daemon)"); + else if (!m_wallet->is_synced()) + prompt += tr(" (out of sync)"); + prompt += "]: "; + return prompt; +} +//---------------------------------------------------------------------------------------------------- bool simple_wallet::run() { // check and display warning, but go on anyway @@ -3966,9 +3979,8 @@ bool simple_wallet::run() m_auto_refresh_enabled = m_wallet->auto_refresh(); m_idle_thread = boost::thread([&]{wallet_idle_thread();}); - std::string addr_start = m_wallet->get_account().get_public_address_str(m_wallet->testnet()).substr(0, 6); message_writer(console_color_green, false) << "Background refresh thread started"; - return m_cmd_binder.run_handling(std::string("[") + tr("wallet") + " " + addr_start + "]: ", ""); + return m_cmd_binder.run_handling([this](){return get_prompt();}, ""); } //---------------------------------------------------------------------------------------------------- void simple_wallet::stop() diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h index e04352295..b473953e0 100644 --- a/src/simplewallet/simplewallet.h +++ b/src/simplewallet/simplewallet.h @@ -182,6 +182,7 @@ namespace cryptonote bool accept_loaded_tx(const tools::wallet2::unsigned_tx_set &txs); bool accept_loaded_tx(const tools::wallet2::signed_tx_set &txs); bool print_ring_members(const std::vector& ptx_vector, std::ostream& ostr); + std::string get_prompt() const; /*! * \brief Prints the seed with a nice message