From 14a0be050e0f994493d9c2c735ffdb54cdc46f94 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Wed, 8 May 2024 21:54:15 +0400 Subject: [PATCH 1/8] added extra logs for wallet issue --- src/wallet/wallet2.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index ecda7231..d56abc47 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -576,6 +576,8 @@ void wallet2::process_new_transaction(const currency::transaction& tx, uint64_t { if (pglobal_indexes->size()) { + //@#@ + LOG_PRINT_L1("add_to_last_zc_global_indexs: h: " << height << ", b: " << currency::get_block_hash(b) << " , tx: " << currency::get_transaction_hash(tx)); add_to_last_zc_global_indexs(ptc.height, pglobal_indexes->back()); } } @@ -1891,9 +1893,16 @@ void wallet2::process_new_blockchain_entry(const currency::block& b, const curre TIME_MEASURE_FINISH(miner_tx_handle_time); TIME_MEASURE_START(txs_handle_time); + size_t count = 0; for(const auto& tx_entry: bche.txs_ptr) { + if (b.tx_hashes.size() < count || currency::get_transaction_hash(tx_entry->tx) != b.tx_hashes[count]) + { + LOG_ERROR("Found tx order fail in process_new_blockchain_entry: count=" << count + << ", b.tx_hashes.size() = " << b.tx_hashes.size() << ", tx real id: " << currency::get_transaction_hash(tx_entry->tx) << ", bl_id: " << bl_id); + } process_new_transaction(tx_entry->tx, height, b, &(tx_entry->m_global_output_indexes)); + count++; } TIME_MEASURE_FINISH(txs_handle_time); WLT_LOG_L3("Processed block: " << bl_id << ", height " << height << ", " << miner_tx_handle_time + txs_handle_time << "(" << miner_tx_handle_time << "/" << txs_handle_time <<")ms"); From fe3c3d731b764c6381adcd4e5a5ad137b9357838 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Wed, 8 May 2024 21:59:30 +0400 Subject: [PATCH 2/8] added extra logs for wallet issue - 2 --- src/wallet/wallet2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index d56abc47..baadc1ea 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -577,7 +577,7 @@ void wallet2::process_new_transaction(const currency::transaction& tx, uint64_t if (pglobal_indexes->size()) { //@#@ - LOG_PRINT_L1("add_to_last_zc_global_indexs: h: " << height << ", b: " << currency::get_block_hash(b) << " , tx: " << currency::get_transaction_hash(tx)); + LOG_PRINT_L1("add_to_last_zc_global_indexs: h: " << height << ", b: " << currency::get_block_hash(b) << " , tx: " << currency::get_transaction_hash(tx) << ", last_zc_output_index: " << pglobal_indexes->back()); add_to_last_zc_global_indexs(ptc.height, pglobal_indexes->back()); } } From 16096314313156c188bcef9a0b9a9eb610495e02 Mon Sep 17 00:00:00 2001 From: zano build machine Date: Wed, 8 May 2024 21:01:12 +0300 Subject: [PATCH 3/8] === build number: 309 -> 310 === --- 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 6f6c9bad..362cc5c4 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "0" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 309 +#define PROJECT_VERSION_BUILD_NO 310 #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 7ff0463587dab7f937e5d5fec2b5738e2a9e4111 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Wed, 8 May 2024 22:07:19 +0400 Subject: [PATCH 4/8] add wallet prefix to log --- src/wallet/wallet2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index baadc1ea..ea38b3ad 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -577,7 +577,7 @@ void wallet2::process_new_transaction(const currency::transaction& tx, uint64_t if (pglobal_indexes->size()) { //@#@ - LOG_PRINT_L1("add_to_last_zc_global_indexs: h: " << height << ", b: " << currency::get_block_hash(b) << " , tx: " << currency::get_transaction_hash(tx) << ", last_zc_output_index: " << pglobal_indexes->back()); + WLT_LOG_L1("add_to_last_zc_global_indexs: h: " << height << ", b: " << currency::get_block_hash(b) << " , tx: " << currency::get_transaction_hash(tx) << ", last_zc_output_index: " << pglobal_indexes->back()); add_to_last_zc_global_indexs(ptc.height, pglobal_indexes->back()); } } From 6655a6feaf05fdf276546e79a96640906ec4e257 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Wed, 8 May 2024 23:43:52 +0400 Subject: [PATCH 5/8] attempt to fix file with wrong item in last m_last_zc_global_indexs --- src/currency_core/currency_config.h | 2 +- src/wallet/wallet2.cpp | 2 +- src/wallet/wallet2.h | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/currency_core/currency_config.h b/src/currency_core/currency_config.h index a15af43c..e6a21e0b 100644 --- a/src/currency_core/currency_config.h +++ b/src/currency_core/currency_config.h @@ -250,7 +250,7 @@ #define BC_OFFERS_CURRENCY_MARKET_FILENAME "market.bin" -#define WALLET_FILE_SERIALIZATION_VERSION 166 +#define WALLET_FILE_SERIALIZATION_VERSION 167 #define WALLET_FILE_LAST_SUPPORTED_VERSION 165 #define CURRENT_MEMPOOL_ARCHIVE_VER (CURRENCY_FORMATION_VERSION+31) diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index ea38b3ad..3b1144aa 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -577,7 +577,7 @@ void wallet2::process_new_transaction(const currency::transaction& tx, uint64_t if (pglobal_indexes->size()) { //@#@ - WLT_LOG_L1("add_to_last_zc_global_indexs: h: " << height << ", b: " << currency::get_block_hash(b) << " , tx: " << currency::get_transaction_hash(tx) << ", last_zc_output_index: " << pglobal_indexes->back()); + WLT_LOG_L2("add_to_last_zc_global_indexs: h: " << height << ", b: " << currency::get_block_hash(b) << " , tx: " << currency::get_transaction_hash(tx) << ", last_zc_output_index: " << pglobal_indexes->back()); add_to_last_zc_global_indexs(ptc.height, pglobal_indexes->back()); } } diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index e220959c..725c2c42 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -227,11 +227,14 @@ namespace tools uint64_t last_zc_global_index = 0; a& last_zc_global_index; m_last_zc_global_indexs.push_back(std::make_pair(uint64_t(0), last_zc_global_index)); + return; } - else + a& m_last_zc_global_indexs; + if (ver == 166 && m_last_zc_global_indexs.size()) { - a& m_last_zc_global_indexs; - } + //workaround for m_last_zc_global_indexs holding invalid index for last item + m_last_zc_global_indexs.pop_front(); + } } }; From 525132cf11823e767c2527adf9723dec686c389c Mon Sep 17 00:00:00 2001 From: zano build machine Date: Wed, 8 May 2024 22:44:29 +0300 Subject: [PATCH 6/8] === build number: 310 -> 311 === --- 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 362cc5c4..d4fca377 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "0" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 310 +#define PROJECT_VERSION_BUILD_NO 311 #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 4bdfb47fc36a643650afad955ef371a03135e143 Mon Sep 17 00:00:00 2001 From: sowle Date: Thu, 9 May 2024 15:42:49 +0200 Subject: [PATCH 7/8] ui update --- src/gui/qt-daemon/layout | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/qt-daemon/layout b/src/gui/qt-daemon/layout index a1d86d01..6f11b2f9 160000 --- a/src/gui/qt-daemon/layout +++ b/src/gui/qt-daemon/layout @@ -1 +1 @@ -Subproject commit a1d86d01aaeb13bb013c8b2539e01967de9b5f04 +Subproject commit 6f11b2f9c4d0fa98bc9e8b06f29aba357d9b8b80 From e45dbb4f2cdf13a7bcf73473752302676f07d8c7 Mon Sep 17 00:00:00 2001 From: zano build machine Date: Thu, 9 May 2024 16:43:31 +0300 Subject: [PATCH 8/8] === build number: 311 -> 312 === --- 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 d4fca377..2492710c 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "0" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 311 +#define PROJECT_VERSION_BUILD_NO 312 #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 "]"