From 4a95e2757462b73a6e942890ac47a955482da15c Mon Sep 17 00:00:00 2001 From: sowle Date: Mon, 17 Apr 2023 23:12:09 +0200 Subject: [PATCH 01/34] new checkpoint at height 2M --- src/currency_core/checkpoints_create.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/currency_core/checkpoints_create.h b/src/currency_core/checkpoints_create.h index e0152685..49d10037 100644 --- a/src/currency_core/checkpoints_create.h +++ b/src/currency_core/checkpoints_create.h @@ -26,6 +26,7 @@ namespace currency ADD_CHECKPOINT(900000, "2205b73cd79d4937b087b02a8b001171b73c34464bc4a952834eaf7c2bd63e86"); ADD_CHECKPOINT(1161000, "96990d851b484e30190678756ba2a4d3a2f92b987e2470728ac1e38b2bf35908"); ADD_CHECKPOINT(1480000, "5dd3381eec35e8b4eba4518bfd8eec682a4292761d92218fd59b9f0ffedad3fe"); + ADD_CHECKPOINT(2000000, "7b6698a8cc279aa78d6263f01fef186bd16f5b1ea263a7f4714abc1d506b9cb3"); #endif return true; From 863baecaee80624566e29515e533bfc4964cbbdc Mon Sep 17 00:00:00 2001 From: sowle Date: Sat, 8 Apr 2023 22:41:31 +0200 Subject: [PATCH 02/34] readme: max versions updated --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2d2950cb..b6397a88 100644 --- a/README.md +++ b/README.md @@ -13,11 +13,11 @@ Be sure to clone the repository properly:\ ### Dependencies | component / version | minimum
(not recommended but may work) | recommended | most recent of what we have ever tested | |--|--|--|--| -| gcc (Linux) | 5.4.0 | 7.4.0 | 8.3.0 | +| gcc (Linux) | 5.4.0 | 7.5.0 | 8.3.0 | | llvm/clang (Linux) | UNKNOWN | 7.0.1 | 8.0.0 | -| [MSVC](https://visualstudio.microsoft.com/downloads/) (Windows) | 2015 (14.0 update 1) | 2017 (15.9.0) | 2019 | +| [MSVC](https://visualstudio.microsoft.com/downloads/) (Windows) | 2015 (14.0 update 1) | 2017 (15.9.0) | 2022 (17.4.2) | | [XCode](https://developer.apple.com/downloads/) (macOS) | 9.2 | 12.3 | 12.3 | -| [CMake](https://cmake.org/download/) | 2.8.6 | 3.15.5 | 3.20 | +| [CMake](https://cmake.org/download/) | 2.8.6 | 3.15.5 | 3.26.3 | | [Boost](https://www.boost.org/users/download/) | 1.70 | 1.70 | 1.76 | | [OpenSSL](https://www.openssl.org/source/) [(win)](https://slproweb.com/products/Win32OpenSSL.html) | - | 1.1.1n | 1.1.1n | | [Qt](https://download.qt.io/archive/qt/) (*only for GUI*) | 5.8.0 | 5.11.2 | 5.15.2 | @@ -63,7 +63,7 @@ Recommended OS version: Ubuntu 18.04 LTS. 4. Install OpenSSL - We recommend installing OpenSSL v1.1.1n locally unless you would like to use the same version system-wide. + We recommend installing OpenSSL v1.1.1n locally unless you would like to use the same version system-wide. Adjust the local path `/home/user/openssl` in the commands below according to your needs. curl -OL https://www.openssl.org/source/openssl-1.1.1n.tar.gz tar xaf openssl-1.1.1n.tar.gz From 21fd86156d60a85238711831383614de084c3a3e Mon Sep 17 00:00:00 2001 From: sowle Date: Sat, 8 Apr 2023 05:38:01 +0200 Subject: [PATCH 03/34] readme: minor improvements to building scripts for boost and openssl --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b6397a88..13558e5f 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Recommended OS version: Ubuntu 18.04 LTS. 2. Download and build Boost curl -OL https://boostorg.jfrog.io/artifactory/main/release/1.70.0/source/boost_1_70_0.tar.bz2 - tar -xjf boost_1_70_0.tar.bz2 + echo "430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778 boost_1_70_0.tar.bz2" | shasum -c && tar -xjf boost_1_70_0.tar.bz2 cd boost_1_70_0 ./bootstrap.sh --with-libraries=system,filesystem,thread,date_time,chrono,regex,serialization,atomic,program_options,locale,timer,log ./b2 @@ -66,7 +66,7 @@ Recommended OS version: Ubuntu 18.04 LTS. We recommend installing OpenSSL v1.1.1n locally unless you would like to use the same version system-wide. Adjust the local path `/home/user/openssl` in the commands below according to your needs. curl -OL https://www.openssl.org/source/openssl-1.1.1n.tar.gz - tar xaf openssl-1.1.1n.tar.gz + echo "40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a openssl-1.1.1n.tar.gz" | shasum -c && tar xaf openssl-1.1.1n.tar.gz cd openssl-1.1.1n/ ./config --prefix=/home/user/openssl --openssldir=/home/user/openssl shared zlib make From 901aba2ff9985043c4814286d876aab6f77adfc3 Mon Sep 17 00:00:00 2001 From: sowle Date: Tue, 18 Apr 2023 00:05:52 +0200 Subject: [PATCH 04/34] version bump: 1.5.0.144 -> 1.5.1.145 --- src/version.h.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.h.in b/src/version.h.in index 50c2fe88..f02b4970 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -5,9 +5,9 @@ #define PROJECT_MAJOR_VERSION "1" #define PROJECT_MINOR_VERSION "5" -#define PROJECT_REVISION "0" +#define PROJECT_REVISION "1" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 144 +#define PROJECT_VERSION_BUILD_NO 145 #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 faeefa8927480527313184d70b05278b0311b947 Mon Sep 17 00:00:00 2001 From: sowle Date: Tue, 18 Apr 2023 20:12:19 +0200 Subject: [PATCH 05/34] minor fix for a --stop-after-height option --- src/currency_core/currency_core.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/currency_core/currency_core.cpp b/src/currency_core/currency_core.cpp index cd0b5d85..fded84a5 100644 --- a/src/currency_core/currency_core.cpp +++ b/src/currency_core/currency_core.cpp @@ -499,23 +499,24 @@ namespace currency //----------------------------------------------------------------------------------------------- bool core::add_new_block(const block& b, block_verification_context& bvc) { + uint64_t h = m_blockchain_storage.get_top_block_height(); + if (h >= m_stop_after_height) + { + LOG_PRINT_YELLOW("Blockchain top block height is " << h << ", the daemon will now stop as requested", LOG_LEVEL_0); + if (m_critical_error_handler) + return m_critical_error_handler->on_immediate_stop_requested(); + return false; + } + bool r = m_blockchain_storage.add_new_block(b, bvc); if (r && bvc.m_added_to_main_chain) { - uint64_t h = get_block_height(b); + h = get_block_height(b); auto& crc = m_blockchain_storage.get_core_runtime_config(); if (h == crc.hard_fork_01_starts_after_height + 1) { LOG_PRINT_GREEN("Hardfork 1 activated at height " << h, LOG_LEVEL_0); } else if (h == crc.hard_fork_02_starts_after_height + 1) { LOG_PRINT_GREEN("Hardfork 2 activated at height " << h, LOG_LEVEL_0); } - - if (h == m_stop_after_height) - { - LOG_PRINT_YELLOW("Reached block " << h << ", the daemon will now stop as requested", LOG_LEVEL_0); - if (m_critical_error_handler) - return m_critical_error_handler->on_immediate_stop_requested(); - return false; - } } return r; } From 740425409bd121aeecf20bc6ee729e33ecd76a1b Mon Sep 17 00:00:00 2001 From: sowle Date: Tue, 18 Apr 2023 23:24:42 +0200 Subject: [PATCH 06/34] predownload files updated up to height 2067777 --- src/common/pre_download.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/pre_download.h b/src/common/pre_download.h index 3a3e8666..c37b0ce2 100644 --- a/src/common/pre_download.h +++ b/src/common/pre_download.h @@ -21,8 +21,8 @@ namespace tools }; #ifndef TESTNET - static constexpr pre_download_entry c_pre_download_mdbx = { "http://95.217.42.247/pre-download/zano_mdbx_95_1569000.pak", "c2aff6fb65c2d7a40492738c75d1d04f2f35388d3c1a664aeb77420f2d90d644", 1740147926, 3221176320 }; - static constexpr pre_download_entry c_pre_download_lmdb = { "http://95.217.42.247/pre-download/zano_lmdb_95_1569000.pak", "f673636638b666b36c976168a3c64b2fd1fcf071c41b5d9cf01ed58a5924f80a", 2244905636, 3216977920 }; + static constexpr pre_download_entry c_pre_download_mdbx = { "http://95.217.42.247/pre-download/zano_mdbx_95_2067777.pak", "274bd55166bf9c6f418a767bcb76fdb65defd2327af03fa1da081ae3ca3f1132", 2343511695, 4563333120 }; + static constexpr pre_download_entry c_pre_download_lmdb = { "http://95.217.42.247/pre-download/zano_lmdb_95_2067777.pak", "3e5b86992d3d6e283946213f06244fe0695480d3017615128e0392bde4e6cb12", 3380684284, 4892069888 }; #else static constexpr pre_download_entry c_pre_download_mdbx = { "", "", 0, 0 }; static constexpr pre_download_entry c_pre_download_lmdb = { "", "", 0, 0 }; From 9f1b68e2b6b696c8f4755bd09c3e37431aa1f24b Mon Sep 17 00:00:00 2001 From: sowle Date: Tue, 18 Apr 2023 23:31:26 +0200 Subject: [PATCH 07/34] minor fix for a --stop-after-height option (2) --- src/currency_core/currency_core.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/currency_core/currency_core.cpp b/src/currency_core/currency_core.cpp index fded84a5..fde150f9 100644 --- a/src/currency_core/currency_core.cpp +++ b/src/currency_core/currency_core.cpp @@ -500,7 +500,7 @@ namespace currency bool core::add_new_block(const block& b, block_verification_context& bvc) { uint64_t h = m_blockchain_storage.get_top_block_height(); - if (h >= m_stop_after_height) + if (m_stop_after_height != 0 && h >= m_stop_after_height) { LOG_PRINT_YELLOW("Blockchain top block height is " << h << ", the daemon will now stop as requested", LOG_LEVEL_0); if (m_critical_error_handler) From b93bf1d187255d53574b7a0dcfd97c62087289dd Mon Sep 17 00:00:00 2001 From: sowle Date: Thu, 18 May 2023 14:10:10 +0200 Subject: [PATCH 08/34] predownload updated to height 2100000 --- src/common/pre_download.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/pre_download.h b/src/common/pre_download.h index c37b0ce2..ba3eff1b 100644 --- a/src/common/pre_download.h +++ b/src/common/pre_download.h @@ -21,8 +21,8 @@ namespace tools }; #ifndef TESTNET - static constexpr pre_download_entry c_pre_download_mdbx = { "http://95.217.42.247/pre-download/zano_mdbx_95_2067777.pak", "274bd55166bf9c6f418a767bcb76fdb65defd2327af03fa1da081ae3ca3f1132", 2343511695, 4563333120 }; - static constexpr pre_download_entry c_pre_download_lmdb = { "http://95.217.42.247/pre-download/zano_lmdb_95_2067777.pak", "3e5b86992d3d6e283946213f06244fe0695480d3017615128e0392bde4e6cb12", 3380684284, 4892069888 }; + static constexpr pre_download_entry c_pre_download_mdbx = { "http://95.217.42.247/pre-download/zano_mdbx_95_2100000.pak", "91cff6f45d257dcd77d889329d3918f0d9760061d29549af3276cb3c23540bc3", 2544045360, 5100195840 }; + static constexpr pre_download_entry c_pre_download_lmdb = { "http://95.217.42.247/pre-download/zano_lmdb_95_2100000.pak", "8ba077de1cf066dcde048a35f7d41876ba6842f9ec8f923b0d3fec88991fa416", 3294916455, 4895219712 }; #else static constexpr pre_download_entry c_pre_download_mdbx = { "", "", 0, 0 }; static constexpr pre_download_entry c_pre_download_lmdb = { "", "", 0, 0 }; From 282ba96efc13f043ba9af3adfe3393a37b03a232 Mon Sep 17 00:00:00 2001 From: sowle Date: Wed, 29 Mar 2023 19:24:11 +0200 Subject: [PATCH 09/34] build system: windows builds uploading fixed --- utils/build_script_windows.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/build_script_windows.bat b/utils/build_script_windows.bat index 4ccd5e09..1bda773b 100644 --- a/utils/build_script_windows.bat +++ b/utils/build_script_windows.bat @@ -179,14 +179,14 @@ set installer_path=%BUILDS_PATH%\builds\%installer_file% @echo " UPLOADING TO SERVER ...." -pscp -load zano_build_server %installer_path% build.zano.org:/var/www/html/builds +pscp %installer_path% zano_build_server:/var/www/html/builds IF %ERRORLEVEL% NEQ 0 ( @echo "FAILED TO UPLOAD EXE TO SERVER" goto error ) call :sha256 %installer_path% installer_checksum -pscp -load zano_build_server %build_zip_path% build.zano.org:/var/www/html/builds +pscp %build_zip_path% zano_build_server:/var/www/html/builds IF %ERRORLEVEL% NEQ 0 ( @echo "FAILED TO UPLOAD ZIP TO SERVER" goto error From 5b2625ab0e325e1a31152b580645f3f7c84dcb77 Mon Sep 17 00:00:00 2001 From: sowle Date: Fri, 31 Mar 2023 15:00:41 +0200 Subject: [PATCH 10/34] build system: added a href to emails for all platforms --- utils/build_script_linux.sh | 2 +- utils/build_script_linux_appimage.sh | 2 +- utils/build_script_mac_osx.sh | 2 +- utils/build_script_windows.bat | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/build_script_linux.sh b/utils/build_script_linux.sh index fe5adbef..ffc5914a 100755 --- a/utils/build_script_linux.sh +++ b/utils/build_script_linux.sh @@ -137,7 +137,7 @@ fi read checksum <<< $(sha256sum $package_filename | awk '/^/ { print $1 }' ) mail_msg="New ${build_prefix_label}${testnet_label}${copy_qt_dev_tools_label}build for linux-x64:
-https://build.zano.org/builds/$package_filename
+https://build.zano.org/builds/$package_filename
sha256: $checksum" echo "$mail_msg" diff --git a/utils/build_script_linux_appimage.sh b/utils/build_script_linux_appimage.sh index 94cb3cce..f6ee4a70 100755 --- a/utils/build_script_linux_appimage.sh +++ b/utils/build_script_linux_appimage.sh @@ -149,7 +149,7 @@ fi read checksum <<< $(sha256sum $package_filename | awk '/^/ { print $1 }' ) mail_msg="New ${build_prefix_label}${testnet_label}${copy_qt_dev_tools_label}build for linux-x64:
-https://build.zano.org/builds/$package_filename
+https://build.zano.org/builds/$package_filename
sha256: $checksum" echo "$mail_msg" diff --git a/utils/build_script_mac_osx.sh b/utils/build_script_mac_osx.sh index 15acd9e3..580a0914 100755 --- a/utils/build_script_mac_osx.sh +++ b/utils/build_script_mac_osx.sh @@ -160,7 +160,7 @@ fi read checksum <<< $( shasum -a 256 $package_filepath | awk '/^/ { print $1 }' ) mail_msg="New ${build_prefix_label}${testnet_label}build for macOS-x64:
-https://build.zano.org/builds/$package_filename
+https://build.zano.org/builds/$package_filename
sha256: $checksum" echo "$mail_msg" diff --git a/utils/build_script_windows.bat b/utils/build_script_windows.bat index 1bda773b..ce180a66 100644 --- a/utils/build_script_windows.bat +++ b/utils/build_script_windows.bat @@ -193,7 +193,7 @@ IF %ERRORLEVEL% NEQ 0 ( ) call :sha256 %build_zip_path% build_zip_checksum -set mail_msg="New %build_prefix% %TESTNET_LABEL%build for win-x64:
INST: https://build.zano.org/builds/%installer_file%
sha256: %installer_checksum%

ZIP: https://build.zano.org/builds/%build_zip_filename%
sha256: %build_zip_checksum%
" +set mail_msg="New %build_prefix% %TESTNET_LABEL%build for win-x64:
INST: https://build.zano.org/builds/%installer_file%
sha256: %installer_checksum%

ZIP: m_pos_mint_packing_size) + // coinbase tx outputs still should NOT be packed now (it's only possible with the stake) + alice_wlt->set_pos_mint_packing_size(10); r = alice_wlt->try_mint_pos(); CHECK_AND_ASSERT_MES(r, false, "try_mint_pos failed"); @@ -1117,11 +1124,10 @@ bool pos_minting_tx_packing::c1(currency::core& c, size_t ev_index, const std::v m_alice_start_amount + CURRENCY_BLOCK_REWARD * (m_pos_mint_packing_size + 2), // total (+1 one block reward) true, UINT64_MAX, - // CURRENCY_BLOCK_REWARD * m_pos_mint_packing_size locked for stake - // CURRENCY_BLOCK_REWARD * (m_pos_mint_packing_size + 1) locked for packing tx - m_alice_start_amount + CURRENCY_BLOCK_REWARD - CURRENCY_BLOCK_REWARD * (m_pos_mint_packing_size + 1) // unlocked + m_alice_start_amount + CURRENCY_BLOCK_REWARD * (m_pos_mint_packing_size + 0) // unlocked ), false, ""); + alice_wlt->set_pos_mint_packing_size(8); r = alice_wlt->try_mint_pos(); CHECK_AND_ASSERT_MES(r, false, "try_mint_pos failed"); @@ -1129,8 +1135,7 @@ bool pos_minting_tx_packing::c1(currency::core& c, size_t ev_index, const std::v m_alice_start_amount + CURRENCY_BLOCK_REWARD * (m_pos_mint_packing_size + 3), // total (+1 one block reward) true, UINT64_MAX, - // CURRENCY_BLOCK_REWARD * m_pos_mint_packing_size locked for stake - m_alice_start_amount + CURRENCY_BLOCK_REWARD - CURRENCY_BLOCK_REWARD * (m_pos_mint_packing_size + 1) - CURRENCY_BLOCK_REWARD * m_pos_mint_packing_size // unlocked + 0 // unlocked ), false, ""); return true; From 8cbf3a7ebb4b3614f7a842da1e9505ba12a4462f Mon Sep 17 00:00:00 2001 From: sowle Date: Thu, 6 Jul 2023 18:50:15 +0200 Subject: [PATCH 17/34] wallet2: fixed a rare bug preventing PoS block creation when UTXO defragmentation tx accidently uses stake output (pre-zarcanum) --- src/wallet/wallet2.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 75be5fa5..9fe9323c 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -3596,6 +3596,16 @@ bool wallet2::build_minted_block(const currency::COMMAND_RPC_SCAN_POS::request& tmpl_req.pos_index = req.pos_entries[rsp.index].index; tmpl_req.extra_text = m_miner_text_info; tmpl_req.stake_unlock_time = req.pos_entries[rsp.index].stake_unlock_time; + + // mark stake source as spent and make sure it will be restored in case of error + const std::vector stake_transfer_idx_vec{ req.pos_entries[rsp.index].wallet_index }; + mark_transfers_as_spent(stake_transfer_idx_vec, "stake source"); + bool gracefull_leaving = false; + auto stake_transfer_spent_flag_restorer = epee::misc_utils::create_scope_leave_handler([&](){ + if (!gracefull_leaving) + clear_transfers_from_flag(stake_transfer_idx_vec, WALLET_TRANSFER_DETAIL_FLAG_SPENT, "stake source"); + }); + //generate packing tx transaction pack_tx = AUTO_VAL_INIT(pack_tx); if (generate_packing_transaction_if_needed(pack_tx, 0)) @@ -3643,7 +3653,7 @@ bool wallet2::build_minted_block(const currency::COMMAND_RPC_SCAN_POS::request& keys_ptrs); WLT_CHECK_AND_ASSERT_MES(res, false, "Failed to prepare_and_sign_pos_block"); - WLT_LOG_GREEN("Block constructed <" << get_block_hash(b) << ">, sending to core...", LOG_LEVEL_0); + WLT_LOG_GREEN("Block " << get_block_hash(b) << " @ " << get_block_height(b) << " has been constructed, sending to core...", LOG_LEVEL_0); currency::COMMAND_RPC_SUBMITBLOCK2::request subm_req = AUTO_VAL_INIT(subm_req); currency::COMMAND_RPC_SUBMITBLOCK2::response subm_rsp = AUTO_VAL_INIT(subm_rsp); @@ -3660,6 +3670,7 @@ bool wallet2::build_minted_block(const currency::COMMAND_RPC_SCAN_POS::request& WLT_LOG_GREEN("POS block generated and accepted, congrats!", LOG_LEVEL_0); m_wcallback->on_pos_block_found(b); + gracefull_leaving = true; // to prevent source transfer flags be cleared in scope leave handler return true; } //---------------------------------------------------------------------------------------------------- From babfde7318a02c97f951e7737ba85527187bc8b3 Mon Sep 17 00:00:00 2001 From: sowle Date: Wed, 12 Jul 2023 12:31:50 +0200 Subject: [PATCH 18/34] win build system improvements --- utils/build_mail.py | 36 +++++++++++++++++++++++++++++ utils/build_script_windows.bat | 42 ++++++++++++++++++---------------- 2 files changed, 58 insertions(+), 20 deletions(-) create mode 100644 utils/build_mail.py diff --git a/utils/build_mail.py b/utils/build_mail.py new file mode 100644 index 00000000..4b547204 --- /dev/null +++ b/utils/build_mail.py @@ -0,0 +1,36 @@ +import sys +import os +import smtplib +from email.message import EmailMessage + +def getenv(e): + t = os.getenv(e) + if t == None: + print("Error: environment variable " + e + " was not set") + exit(1) + return t + +zs_from = getenv("ZANO_SMTP_FROM") +zs_addr = getenv("ZANO_SMTP_ADDR") +zs_port = getenv("ZANO_SMTP_PORT") +zs_user = getenv("ZANO_SMTP_USER") +zs_pass = getenv("ZANO_SMTP_PASS") + +if len(sys.argv) != 4: + print("Usage: " + sys.argv[0] + " ") + exit(1) + +msg = EmailMessage() +msg['Subject'] = sys.argv[1] +msg['From'] = zs_from +msg['To'] = sys.argv[2] +msg.add_header('Content-Type','text/html') +msg.set_payload(sys.argv[3]) + +s = smtplib.SMTP(zs_addr, zs_port) +s.starttls() +s.login(zs_user, zs_pass) +s.send_message(msg) +s.quit() + +print("e-mail sent.") diff --git a/utils/build_script_windows.bat b/utils/build_script_windows.bat index ce180a66..b44c27ee 100644 --- a/utils/build_script_windows.bat +++ b/utils/build_script_windows.bat @@ -1,9 +1,5 @@ call configure_local_paths.cmd -;; MSVC version-specific paths -SET LOCAL_BOOST_LIB_PATH=%LOCAL_BOOST_PATH%\lib64-msvc-14.1 -SET QT_MSVC_PATH=%QT_PREFIX_PATH%\msvc2017_64 - SET ACHIVE_NAME_PREFIX=zano-win-x64- SET MY_PATH=%~dp0 SET SOURCES_PATH=%MY_PATH:~0,-7% @@ -44,12 +40,13 @@ cd %SOURCES_PATH% rmdir build /s /q mkdir build cd build -cmake %TESTNET_DEF% -D OPENSSL_ROOT_DIR="%OPENSSL_ROOT_DIR%" -D CMAKE_PREFIX_PATH="%QT_MSVC_PATH%" -D BUILD_GUI=TRUE -D STATIC=FALSE -G "Visual Studio 15 2017 Win64" -T host=x64 .. + +cmake %TESTNET_DEF% -D OPENSSL_ROOT_DIR="%OPENSSL_ROOT_DIR%" -D CMAKE_PREFIX_PATH="%QT_PREFIX_PATH%"\msvc2017_64 -D BUILD_GUI=TRUE -D STATIC=FALSE -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_ROOT%\lib64-msvc-14.1" -G "Visual Studio 16 2019" -A x64 -T host=x64 .. IF %ERRORLEVEL% NEQ 0 ( goto error ) -call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat" x86_amd64 +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" x86_amd64 echo on cd %SOURCES_PATH%\build @@ -96,7 +93,9 @@ del /F /Q %build_zip_path% cd src\release - +call :sign_file Zano.exe || goto error +call :sign_file zanod.exe || goto error +call :sign_file simplewallet.exe || goto error @echo on @@ -168,37 +167,31 @@ IF %ERRORLEVEL% NEQ 0 ( set installer_file=%ACHIVE_NAME_PREFIX%%version%-installer.exe set installer_path=%BUILDS_PATH%\builds\%installer_file% -:: Signing temporary disable -::@echo " SIGNING ...." -:: -::%ZANO_SIGN_CMD% %installer_path% -::IF %ERRORLEVEL% NEQ 0 ( -:: @echo "failed to sign installer" -:: goto error -::) +@echo " SIGNING the installer ...." + +call :sign_file %installer_path% || goto error @echo " UPLOADING TO SERVER ...." -pscp %installer_path% zano_build_server:/var/www/html/builds +pscp -load zano_build_server %installer_path% %ZANO_BUILDS_HOST%:/var/www/html/builds IF %ERRORLEVEL% NEQ 0 ( @echo "FAILED TO UPLOAD EXE TO SERVER" goto error ) call :sha256 %installer_path% installer_checksum -pscp %build_zip_path% zano_build_server:/var/www/html/builds +pscp -load zano_build_server %build_zip_path% %ZANO_BUILDS_HOST%:/var/www/html/builds IF %ERRORLEVEL% NEQ 0 ( @echo "FAILED TO UPLOAD ZIP TO SERVER" goto error ) call :sha256 %build_zip_path% build_zip_checksum -set mail_msg="New %build_prefix% %TESTNET_LABEL%build for win-x64:
INST: https://build.zano.org/builds/%installer_file%
sha256: %installer_checksum%

ZIP: https://build.zano.org/builds/%installer_file%
sha256: %installer_checksum%

ZIP: https://build.zano.org/builds/%build_zip_filename%
sha256: %build_zip_checksum%
" echo %mail_msg% -senditquiet.exe -t %emails% -subject "Zano win-x64 %build_prefix% %TESTNET_LABEL%build %version%" -body %mail_msg% - +python ../utils/build_mail.py "Zano win-x64 %build_prefix% %TESTNET_LABEL%build %version%" "%emails%" %mail_msg% goto success @@ -228,3 +221,12 @@ EXIT /B %ERRORLEVEL% @set "%2=%hash: =% ) @exit /B 0 + + +:sign_file +%ZANO_SIGN_CMD% %1 +@if %ERRORLEVEL% neq 0 ( + @echo ERROR: failed to sign %1 + @exit /B 1 +) +@exit /B 0 From 9e6530e1468e01e8eec5002625904ed23a8d7f0d Mon Sep 17 00:00:00 2001 From: sowle Date: Fri, 14 Jul 2023 19:59:39 +0200 Subject: [PATCH 19/34] win build script updated --- utils/build_script_windows.bat | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/utils/build_script_windows.bat b/utils/build_script_windows.bat index b44c27ee..90fba36a 100644 --- a/utils/build_script_windows.bat +++ b/utils/build_script_windows.bat @@ -1,5 +1,8 @@ call configure_local_paths.cmd +;; MSVC version-specific paths +SET QT_MSVC_PATH=%QT_PREFIX_PATH%\msvc2017_64 + SET ACHIVE_NAME_PREFIX=zano-win-x64- SET MY_PATH=%~dp0 SET SOURCES_PATH=%MY_PATH:~0,-7% @@ -41,7 +44,7 @@ rmdir build /s /q mkdir build cd build -cmake %TESTNET_DEF% -D OPENSSL_ROOT_DIR="%OPENSSL_ROOT_DIR%" -D CMAKE_PREFIX_PATH="%QT_PREFIX_PATH%"\msvc2017_64 -D BUILD_GUI=TRUE -D STATIC=FALSE -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_ROOT%\lib64-msvc-14.1" -G "Visual Studio 16 2019" -A x64 -T host=x64 .. +cmake %TESTNET_DEF% -D OPENSSL_ROOT_DIR="%OPENSSL_ROOT_DIR%" -D CMAKE_PREFIX_PATH="%QT_MSVC_PATH%" -D BUILD_GUI=TRUE -D STATIC=FALSE -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_ROOT%\lib64-msvc-14.1" -G "Visual Studio 16 2019" -A x64 -T host=x64 .. IF %ERRORLEVEL% NEQ 0 ( goto error ) @@ -107,7 +110,7 @@ copy /Y zanod.exe bunch copy /Y simplewallet.exe bunch copy /Y *.pdb bunch -%QT_MSVC_PATH%\bin\windeployqt.exe bunch\Zano.exe +%QT_MSVC_PATH%\bin\windeployqt.exe bunch\Zano.exe || goto error cd bunch @@ -224,7 +227,8 @@ EXIT /B %ERRORLEVEL% :sign_file -%ZANO_SIGN_CMD% %1 +@echo Signing %1... +@call %ZANO_SIGN_CMD% %1 @if %ERRORLEVEL% neq 0 ( @echo ERROR: failed to sign %1 @exit /B 1 From 6156c0dc6c16bfd3d2310eae53b3e9f03375e8fa Mon Sep 17 00:00:00 2001 From: sowle Date: Fri, 14 Jul 2023 20:01:21 +0200 Subject: [PATCH 20/34] version bump: 1.5.1.145 -> 1.5.1.146 --- 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 f02b4970..96e674ad 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "1" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 145 +#define PROJECT_VERSION_BUILD_NO 146 #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 689fa2c63ee314fcad7fb8c35d8eff2f6a0d0c5a Mon Sep 17 00:00:00 2001 From: sowle Date: Fri, 14 Jul 2023 20:21:41 +0200 Subject: [PATCH 21/34] linux and mac build: email sending updated improved (switched to python script) --- utils/build_script_linux.sh | 2 +- utils/build_script_linux_appimage.sh | 4 ++-- utils/build_script_mac_osx.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/build_script_linux.sh b/utils/build_script_linux.sh index ffc5914a..96bf6ea0 100755 --- a/utils/build_script_linux.sh +++ b/utils/build_script_linux.sh @@ -142,6 +142,6 @@ sha256: $checksum" echo "$mail_msg" -echo "$mail_msg" | mail -s "Zano linux-x64 ${build_prefix_label}${testnet_label}${copy_qt_dev_tools_label}build $version_str" ${emails} +python3 ../../utils/build_mail.py "Zano linux-x64 ${build_prefix_label}${testnet_label}${copy_qt_dev_tools_label}build $version_str" "${emails}" "$mail_msg" exit 0 diff --git a/utils/build_script_linux_appimage.sh b/utils/build_script_linux_appimage.sh index f6ee4a70..dad4b69e 100755 --- a/utils/build_script_linux_appimage.sh +++ b/utils/build_script_linux_appimage.sh @@ -154,6 +154,6 @@ sha256: $checksum" echo "$mail_msg" -echo "$mail_msg" | mail -s "Zano linux-x64 ${build_prefix_label}${testnet_label}${copy_qt_dev_tools_label}build $version_str" ${emails} +python3 ../../utils/build_mail.py "Zano linux-x64 ${build_prefix_label}${testnet_label}${copy_qt_dev_tools_label}build $version_str" "${emails}" "$mail_msg" -exit 0 \ No newline at end of file +exit 0 diff --git a/utils/build_script_mac_osx.sh b/utils/build_script_mac_osx.sh index 580a0914..7216d9d4 100755 --- a/utils/build_script_mac_osx.sh +++ b/utils/build_script_mac_osx.sh @@ -165,7 +165,7 @@ sha256: $checksum" echo "$mail_msg" -echo "$mail_msg" | mail -s "Zano macOS-x64 ${build_prefix_label}${testnet_label}build $version_str" ${emails} +python3 ../../../utils/build_mail.py "Zano linux-x64 ${build_prefix_label}${testnet_label}build $version_str" "${emails}" "$mail_msg" ###################### From 145a1b65b54786c79e43f953c8ec29495bdb83cf Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Wed, 19 Jul 2023 15:21:44 +0200 Subject: [PATCH 22/34] moved UI to latest commit --- 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 1424e812..e1c5dea6 160000 --- a/src/gui/qt-daemon/layout +++ b/src/gui/qt-daemon/layout @@ -1 +1 @@ -Subproject commit 1424e812c365d465e76f812a2ed29ddefd123115 +Subproject commit e1c5dea6068c7eb2d3ff60a6423b514ea2e4f5ff From 1a5f9e16e61ab14cb722c44e326ef02b80aa1d26 Mon Sep 17 00:00:00 2001 From: sowle Date: Fri, 21 Jul 2023 13:17:46 +0200 Subject: [PATCH 23/34] ui submodule updated --- 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 e1c5dea6..52ffcfe2 160000 --- a/src/gui/qt-daemon/layout +++ b/src/gui/qt-daemon/layout @@ -1 +1 @@ -Subproject commit e1c5dea6068c7eb2d3ff60a6423b514ea2e4f5ff +Subproject commit 52ffcfe23fa03efd968ff0c3910dc66e31c050bb From f8d953afe2ea382731789bc1c37ecc973caf2b56 Mon Sep 17 00:00:00 2001 From: sowle Date: Fri, 21 Jul 2023 13:18:40 +0200 Subject: [PATCH 24/34] remove annoying debug log message --- src/currency_core/blockchain_storage.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/currency_core/blockchain_storage.cpp b/src/currency_core/blockchain_storage.cpp index 9ab636f5..dd22e385 100644 --- a/src/currency_core/blockchain_storage.cpp +++ b/src/currency_core/blockchain_storage.cpp @@ -3919,9 +3919,6 @@ bool blockchain_storage::add_transaction_from_block(const transaction& tx, const if (need_to_profile && mixins_count > 0) { m_performance_data.tx_mixin_count.push(mixins_count); -#ifdef _DEBUG - LOG_PRINT_L0("[TX_MIXINS]: " << mixins_count); -#endif } //check if there is already transaction with this hash From 57cf32b6bec53c1d2c38826aa7b692ffe1c33c30 Mon Sep 17 00:00:00 2001 From: sowle Date: Fri, 21 Jul 2023 13:20:55 +0200 Subject: [PATCH 25/34] build: macOS build script updated --- utils/build_script_mac_osx.sh | 11 +++++--- utils/macosx_build_uploader.sh | 51 ++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 utils/macosx_build_uploader.sh diff --git a/utils/build_script_mac_osx.sh b/utils/build_script_mac_osx.sh index 7216d9d4..6f842883 100755 --- a/utils/build_script_mac_osx.sh +++ b/utils/build_script_mac_osx.sh @@ -148,13 +148,17 @@ echo "Build success" echo "############### Uploading... ################" -package_filepath=$package_filename +package_filepath="$(pwd)/$package_filename" -scp $package_filepath zano_build_server:/var/www/html/builds/ +#scp $package_filepath zano_build_server:/var/www/html/builds/ +source ../../../macosx_build_uploader.sh +pushd . +upload_build $package_filepath if [ $? -ne 0 ]; then echo "Failed to upload to remote server" exit 1 fi +popd read checksum <<< $( shasum -a 256 $package_filepath | awk '/^/ { print $1 }' ) @@ -165,8 +169,7 @@ sha256: $checksum" echo "$mail_msg" -python3 ../../../utils/build_mail.py "Zano linux-x64 ${build_prefix_label}${testnet_label}build $version_str" "${emails}" "$mail_msg" - +python3 ../../../utils/build_mail.py "Zano macOS-x64 ${build_prefix_label}${testnet_label}build $version_str" "${emails}" "$mail_msg" ###################### # notarization diff --git a/utils/macosx_build_uploader.sh b/utils/macosx_build_uploader.sh new file mode 100644 index 00000000..acd23652 --- /dev/null +++ b/utils/macosx_build_uploader.sh @@ -0,0 +1,51 @@ +set +e +curr_path=${BASH_SOURCE%/*} + +function upload_build() # $1 - path to the file to be uploaded +{ + if [ -z "$1" ] + then + echo "ERROR: upload_build is called with no or invalid parameters" + return 1 + fi + + # check if the directory contains files + #if [ -n "$(ls -A "$ZANO_BLD_UPL_DIR" 2>/dev/null)" ] + #then + # echo "ERROR: uploading folder contains files" + # return 1 + #fi + + cd "$ZANO_BLD_UPL_DIR" || return 2 + rm -rf ./* || return 3 + #popd || return 4 + + touch WAIT || return 5 + cp $1 . || return 6 + rm WAIT || return 7 + + counter=0 + while [ ! -f DONE ] + do + if [ "$counter" -ge 150 ] + then + echo "ERROR: uploading is taking longer than expected" + touch STOP + return 8 + fi + sleep 2 + echo "waiting..." + counter=$((counter + 1)) + done + + rc=$( Date: Fri, 21 Jul 2023 13:21:52 +0200 Subject: [PATCH 26/34] version bump: 1.5.1.146 -> 1.5.1.147 --- 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 96e674ad..bd2bc71b 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "1" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 146 +#define PROJECT_VERSION_BUILD_NO 147 #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 e6be30aa5ad5c6ada87e108df8a9981c0e926bb4 Mon Sep 17 00:00:00 2001 From: sowle Date: Wed, 26 Jul 2023 18:26:53 +0200 Subject: [PATCH 27/34] ui submodule updated --- 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 52ffcfe2..f2e13497 160000 --- a/src/gui/qt-daemon/layout +++ b/src/gui/qt-daemon/layout @@ -1 +1 @@ -Subproject commit 52ffcfe23fa03efd968ff0c3910dc66e31c050bb +Subproject commit f2e13497af5ce4dd27289e2b162e826e60b3d94e From fa4888aecebc879b2c019a3c197fdd619b5b3dfa Mon Sep 17 00:00:00 2001 From: sowle Date: Wed, 26 Jul 2023 18:28:18 +0200 Subject: [PATCH 28/34] version bump: 1.5.1.147 -> 1.5.1.148 --- 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 bd2bc71b..53ee8337 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "1" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 147 +#define PROJECT_VERSION_BUILD_NO 148 #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 07c96ea9b61f2a370ef5caae0d44867abaf1a57b Mon Sep 17 00:00:00 2001 From: sowle Date: Wed, 26 Jul 2023 18:43:03 +0200 Subject: [PATCH 29/34] build: macOS build script updated --- utils/build_script_mac_osx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/build_script_mac_osx.sh b/utils/build_script_mac_osx.sh index 6f842883..c26b8da9 100755 --- a/utils/build_script_mac_osx.sh +++ b/utils/build_script_mac_osx.sh @@ -151,7 +151,7 @@ echo "############### Uploading... ################" package_filepath="$(pwd)/$package_filename" #scp $package_filepath zano_build_server:/var/www/html/builds/ -source ../../../macosx_build_uploader.sh +source ../../../utils/macosx_build_uploader.sh pushd . upload_build $package_filepath if [ $? -ne 0 ]; then From 78890eea6b3e95ffcf4d2b2354158852dc81334d Mon Sep 17 00:00:00 2001 From: sowle Date: Mon, 31 Jul 2023 15:27:30 +0200 Subject: [PATCH 30/34] predownload file updated to height 2200000 --- src/common/pre_download.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/pre_download.h b/src/common/pre_download.h index ba3eff1b..373c0bd4 100644 --- a/src/common/pre_download.h +++ b/src/common/pre_download.h @@ -21,8 +21,8 @@ namespace tools }; #ifndef TESTNET - static constexpr pre_download_entry c_pre_download_mdbx = { "http://95.217.42.247/pre-download/zano_mdbx_95_2100000.pak", "91cff6f45d257dcd77d889329d3918f0d9760061d29549af3276cb3c23540bc3", 2544045360, 5100195840 }; - static constexpr pre_download_entry c_pre_download_lmdb = { "http://95.217.42.247/pre-download/zano_lmdb_95_2100000.pak", "8ba077de1cf066dcde048a35f7d41876ba6842f9ec8f923b0d3fec88991fa416", 3294916455, 4895219712 }; + static constexpr pre_download_entry c_pre_download_mdbx = { "http://95.217.42.247/pre-download/zano_mdbx_95_2200000.pak", "c3bd64c62495c3f266759750952519f13f32fc161b59547beaa8202b6e26d516", 2628767033, 5100195840 }; + static constexpr pre_download_entry c_pre_download_lmdb = { "http://95.217.42.247/pre-download/zano_lmdb_95_2200000.pak", "fcbf0ab3b23836e1a51fa675e719900fb94110cfb74790b3323cebce7fb9f5bd", 3426025872, 4954472448 }; #else static constexpr pre_download_entry c_pre_download_mdbx = { "", "", 0, 0 }; static constexpr pre_download_entry c_pre_download_lmdb = { "", "", 0, 0 }; From f910b661454789993f863e991ef69856e2cc0555 Mon Sep 17 00:00:00 2001 From: sowle Date: Mon, 31 Jul 2023 18:12:06 +0200 Subject: [PATCH 31/34] ui submodule updated --- 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 f2e13497..25c7bb49 160000 --- a/src/gui/qt-daemon/layout +++ b/src/gui/qt-daemon/layout @@ -1 +1 @@ -Subproject commit f2e13497af5ce4dd27289e2b162e826e60b3d94e +Subproject commit 25c7bb49f26bd755d13b30a148530a9b0b486c14 From c756bde213592ce689f87ab30810fcde54e9421d Mon Sep 17 00:00:00 2001 From: sowle Date: Mon, 31 Jul 2023 18:15:43 +0200 Subject: [PATCH 32/34] version bump: 1.5.1.148 -> 1.5.2.149 --- src/version.h.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.h.in b/src/version.h.in index 53ee8337..1ddc64cf 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -5,9 +5,9 @@ #define PROJECT_MAJOR_VERSION "1" #define PROJECT_MINOR_VERSION "5" -#define PROJECT_REVISION "1" +#define PROJECT_REVISION "2" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 148 +#define PROJECT_VERSION_BUILD_NO 149 #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 3346a5155ae95de61f82a781e9a089d34d9db96a Mon Sep 17 00:00:00 2001 From: sowle Date: Mon, 31 Jul 2023 19:14:22 +0200 Subject: [PATCH 33/34] ui submodule updated --- 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 25c7bb49..047a4602 160000 --- a/src/gui/qt-daemon/layout +++ b/src/gui/qt-daemon/layout @@ -1 +1 @@ -Subproject commit 25c7bb49f26bd755d13b30a148530a9b0b486c14 +Subproject commit 047a4602748e0d3e40456f9d2fc2eeef1bc89b06 From 12bb214276efd71d569ac964699536d20e843914 Mon Sep 17 00:00:00 2001 From: sowle Date: Mon, 31 Jul 2023 19:15:22 +0200 Subject: [PATCH 34/34] version bump: 1.5.2.149 -> 1.5.2.150 --- 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 1ddc64cf..9b0be01a 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "2" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 149 +#define PROJECT_VERSION_BUILD_NO 150 #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 "]"