From 24c9011f42e9bf7773abaf404776dd8fc3bb7d2d Mon Sep 17 00:00:00 2001 From: "crypro.zoidberg" Date: Tue, 15 Jan 2019 22:41:30 +0300 Subject: [PATCH 1/2] fixed ofline state --- src/wallet/core_default_rpc_proxy.cpp | 10 ++++++++++ src/wallet/core_default_rpc_proxy.h | 9 +++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/wallet/core_default_rpc_proxy.cpp b/src/wallet/core_default_rpc_proxy.cpp index 8634cc3f..6140270d 100644 --- a/src/wallet/core_default_rpc_proxy.cpp +++ b/src/wallet/core_default_rpc_proxy.cpp @@ -154,6 +154,16 @@ namespace tools { return tools::get_transfer_address(adr_str, addr, payment_id, this); } + //------------------------------------------------------------------------------------------------------------------------------ + void default_http_core_proxy::set_plast_daemon_is_disconnected(std::atomic *plast_daemon_is_disconnected) + { + CRITICAL_REGION_LOCAL(m_lock); + m_plast_daemon_is_disconnected = plast_daemon_is_disconnected ? plast_daemon_is_disconnected : &m_last_daemon_is_disconnected_stub; + } + //------------------------------------------------------------------------------------------------------------------------------ + default_http_core_proxy::default_http_core_proxy():m_plast_daemon_is_disconnected(&m_last_daemon_is_disconnected_stub) + { + } } diff --git a/src/wallet/core_default_rpc_proxy.h b/src/wallet/core_default_rpc_proxy.h index cc853577..6ac1b111 100644 --- a/src/wallet/core_default_rpc_proxy.h +++ b/src/wallet/core_default_rpc_proxy.h @@ -20,6 +20,7 @@ namespace tools { public: + bool set_connection_addr(const std::string& url) override; bool call_COMMAND_RPC_GET_TX_GLOBAL_OUTPUTS_INDEXES(const currency::COMMAND_RPC_GET_TX_GLOBAL_OUTPUTS_INDEXES::request& rqt, currency::COMMAND_RPC_GET_TX_GLOBAL_OUTPUTS_INDEXES::response& rsp) override; bool call_COMMAND_RPC_GET_BLOCKS_FAST(const currency::COMMAND_RPC_GET_BLOCKS_FAST::request& rqt, currency::COMMAND_RPC_GET_BLOCKS_FAST::response& rsp) override; @@ -46,12 +47,8 @@ namespace tools bool check_connection() override; bool get_transfer_address(const std::string& adr_str, currency::account_public_address& addr, std::string& payment_id) override; - void set_plast_daemon_is_disconnected(std::atomic *plast_daemon_is_disconnected) - { - CRITICAL_REGION_LOCAL(m_lock); - m_plast_daemon_is_disconnected = plast_daemon_is_disconnected ? plast_daemon_is_disconnected : &m_last_daemon_is_disconnected_stub; - } - + void set_plast_daemon_is_disconnected(std::atomic *plast_daemon_is_disconnected); + default_http_core_proxy(); private: template From 6cfc33f88796a9609f20c30848144bc1edaf58d2 Mon Sep 17 00:00:00 2001 From: "crypro.zoidberg" Date: Tue, 15 Jan 2019 22:42:28 +0300 Subject: [PATCH 2/2] Version incremented --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index f9120dc9..c4dc2e23 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -2,6 +2,6 @@ #define BUILD_COMMIT_ID "@VERSION@" #define PROJECT_VERSION "1.0" -#define PROJECT_VERSION_BUILD_NO 4 +#define PROJECT_VERSION_BUILD_NO 5 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO) #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]"