From a9289e9cd69c56dd3a92ebcf25c9ec738d49a7be Mon Sep 17 00:00:00 2001 From: sowle Date: Thu, 5 Sep 2019 21:38:43 +0300 Subject: [PATCH 1/5] === build number: 54 -> 55 === --- 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 8b4a2f64..f2aaa664 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -7,6 +7,6 @@ #define PROJECT_REVISION "0" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 54 +#define PROJECT_VERSION_BUILD_NO 55 #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 "]" From a78c475169aea30d097e4464452e8a7280ad8d27 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Thu, 5 Sep 2019 20:42:47 +0200 Subject: [PATCH 2/5] hardfork shifted to 15 of september --- src/currency_core/currency_config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/currency_core/currency_config.h b/src/currency_core/currency_config.h index 791033bf..37cdd8f1 100644 --- a/src/currency_core/currency_config.h +++ b/src/currency_core/currency_config.h @@ -219,7 +219,7 @@ #define BLOCK_MINOR_VERSION_GENESIS 0 #define BLOCK_MAJOR_VERSION_INITAL 0 #ifndef TESTNET -#define ZANO_HARDFORK_1_AFTER_HEIGHT 180840 +#define ZANO_HARDFORK_1_AFTER_HEIGHT 186247 #else #define ZANO_HARDFORK_1_AFTER_HEIGHT 1440 #endif From 888d97d27d8dc39e9f3b0708a11b2ef17d21e009 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Fri, 6 Sep 2019 15:13:28 +0200 Subject: [PATCH 3/5] fixed bug with wallet deactivation on poor connection, related to PoS mining failures --- src/currency_core/blockchain_storage.cpp | 1 - .../qt-daemon/application/daemon_backend.cpp | 19 ++++++++++++------- .../qt-daemon/application/daemon_backend.h | 5 ++++- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/currency_core/blockchain_storage.cpp b/src/currency_core/blockchain_storage.cpp index 86c16f4d..959e2765 100644 --- a/src/currency_core/blockchain_storage.cpp +++ b/src/currency_core/blockchain_storage.cpp @@ -156,7 +156,6 @@ void blockchain_storage::init_options(boost::program_options::options_descriptio command_line::add_arg(desc, arg_db_cache_l2); } //------------------------------------------------------------------ - uint64_t blockchain_storage::get_block_h_older_then(uint64_t timestamp) const { // get avarage block position diff --git a/src/gui/qt-daemon/application/daemon_backend.cpp b/src/gui/qt-daemon/application/daemon_backend.cpp index d3eb94a8..a3bd0956 100644 --- a/src/gui/qt-daemon/application/daemon_backend.cpp +++ b/src/gui/qt-daemon/application/daemon_backend.cpp @@ -429,7 +429,8 @@ void daemon_backend::main_worker(const po::variables_map& m_vm) //m_pview->update_daemon_status(dsi); try { - wo.second.stop = true; + wo.second.major_stop = true; + wo.second.stop_for_refresh = true; wo.second.w.unlocked_get()->stop(); wo.second.w->get()->store(); @@ -543,7 +544,8 @@ void daemon_backend::init_wallet_entry(wallet_vs_options& wo, uint64_t id) { wo.wallet_id = id; wo.do_mining = false; - wo.stop = false; + wo.major_stop = false; + wo.stop_for_refresh = false; wo.plast_daemon_height = &m_last_daemon_height; wo.plast_daemon_network_state = &m_last_daemon_network_state; wo.plast_daemon_is_disconnected = &m_last_daemon_is_disconnected; @@ -837,7 +839,8 @@ std::string daemon_backend::close_wallet(size_t wallet_id) try { - it->second.stop = true; + it->second.major_stop = true; + it->second.stop_for_refresh = true; it->second.w.unlocked_get()->stop(); it->second.w->get()->store(); @@ -1488,8 +1491,9 @@ void daemon_backend::wallet_vs_options::worker_func() epee::math_helper::once_a_time_seconds<1> scan_pool_interval; epee::math_helper::once_a_time_seconds pos_minin_interval; view::wallet_status_info wsi = AUTO_VAL_INIT(wsi); - while (!stop) + while (!major_stop) { + stop_for_refresh = false; try { wsi.wallet_state = view::wallet_status_info::wallet_state_ready; @@ -1516,7 +1520,7 @@ void daemon_backend::wallet_vs_options::worker_func() prepare_wallet_status_info(*this, wsi); pview->update_wallet_status(wsi); } - w->get()->refresh(stop); + w->get()->refresh(stop_for_refresh); w->get()->resend_unconfirmed(); { auto w_ptr = *w; // get locked exclusive access to the wallet first (it's more likely that wallet is locked for a long time than 'offers') @@ -1548,7 +1552,7 @@ void daemon_backend::wallet_vs_options::worker_func() }); } - if (stop) + if (major_stop || stop_for_refresh) break; //****************************************************************************************** //mining zone @@ -1614,7 +1618,8 @@ void daemon_backend::wallet_vs_options::worker_func() daemon_backend::wallet_vs_options::~wallet_vs_options() { do_mining = false; - stop = true; + major_stop = true; + stop_for_refresh = true; break_mining_loop = true; if (miner_thread.joinable()) miner_thread.join(); diff --git a/src/gui/qt-daemon/application/daemon_backend.h b/src/gui/qt-daemon/application/daemon_backend.h index bcf878ee..372919f3 100644 --- a/src/gui/qt-daemon/application/daemon_backend.h +++ b/src/gui/qt-daemon/application/daemon_backend.h @@ -56,7 +56,10 @@ public: currency::core_runtime_config core_conf; epee::locked_object, wallet_lock_time_watching_policy> w; std::atomic do_mining; - std::atomic stop; + std::atomic major_stop; + std::atomic stop_for_refresh; //use separate var for passing to "refresh" member function, + //because it can be changed there due to internal interruption logis + std::atomic break_mining_loop; std::atomic wallet_state; std::atomic last_wallet_synch_height; From 3730826d6caa2dac6b06c5d8653a4e49edafdc6f Mon Sep 17 00:00:00 2001 From: sowle Date: Fri, 6 Sep 2019 17:15:54 +0300 Subject: [PATCH 4/5] === build number: 55 -> 56 === --- 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 f2aaa664..1a166f27 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -7,6 +7,6 @@ #define PROJECT_REVISION "0" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 55 +#define PROJECT_VERSION_BUILD_NO 56 #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 "]" From c064864a7571a897f4f91b9f0354c5fd79b195b0 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Fri, 6 Sep 2019 16:20:45 +0200 Subject: [PATCH 5/5] shifted hardfork date to 21 of september --- src/currency_core/currency_config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/currency_core/currency_config.h b/src/currency_core/currency_config.h index 37cdd8f1..af7ad918 100644 --- a/src/currency_core/currency_config.h +++ b/src/currency_core/currency_config.h @@ -219,7 +219,7 @@ #define BLOCK_MINOR_VERSION_GENESIS 0 #define BLOCK_MAJOR_VERSION_INITAL 0 #ifndef TESTNET -#define ZANO_HARDFORK_1_AFTER_HEIGHT 186247 +#define ZANO_HARDFORK_1_AFTER_HEIGHT 194624 #else #define ZANO_HARDFORK_1_AFTER_HEIGHT 1440 #endif