From 6a83735cc10da9b4f1fd9a09d0f0fdb89b277a44 Mon Sep 17 00:00:00 2001 From: sowle Date: Tue, 14 Nov 2023 17:28:52 +0100 Subject: [PATCH 1/8] updated ui --- 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 5c46578b..50e07717 160000 --- a/src/gui/qt-daemon/layout +++ b/src/gui/qt-daemon/layout @@ -1 +1 @@ -Subproject commit 5c46578ba2cf2bd9bcb377e550e0701f8e5c9b77 +Subproject commit 50e07717bff0bc00617bd8d14589e15f2647fabf From 46f4e317f46db23e5360ac3b3cdd456998122b47 Mon Sep 17 00:00:00 2001 From: sowle Date: Tue, 14 Nov 2023 17:29:40 +0100 Subject: [PATCH 2/8] === build number: 156 -> 157 === --- 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 9dfd81f9..80015802 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 156 +#define PROJECT_VERSION_BUILD_NO 157 #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 dec913c4e9958cd0aed1311f658065baedf5a4ae Mon Sep 17 00:00:00 2001 From: sowle Date: Mon, 20 Nov 2023 15:50:16 +0100 Subject: [PATCH 3/8] build: an attempt to fix boost lib paths in macOS CLI binaries --- utils/build_script_mac_osx.sh | 20 ++++++++++---------- utils/macosx_fix_boost_libs_path.sh | 29 +++++++++++++++-------------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/utils/build_script_mac_osx.sh b/utils/build_script_mac_osx.sh index 7153fff9..bddf3fd6 100755 --- a/utils/build_script_mac_osx.sh +++ b/utils/build_script_mac_osx.sh @@ -59,12 +59,12 @@ if [ $? -ne 0 ]; then fi # copy all necessary libs into the bundle in order to workaround El Capitan's SIP restrictions -mkdir -p Zano.app/Contents/Frameworks/boost_libs -cp -R "$ZANO_BOOST_LIBS_PATH/" Zano.app/Contents/Frameworks/boost_libs/ -if [ $? -ne 0 ]; then - echo "Failed to cp workaround to MacOS" - exit 1 -fi +#mkdir -p Zano.app/Contents/Frameworks/boost_libs +#cp -R "$ZANO_BOOST_LIBS_PATH/" Zano.app/Contents/Frameworks/boost_libs/ +#if [ $? -ne 0 ]; then +# echo "Failed to cp workaround to MacOS" +# exit 1 +#fi # rename process name to big letter mv Zano.app/Contents/MacOS/zano Zano.app/Contents/MacOS/Zano @@ -81,10 +81,10 @@ fi # fix boost libs paths in main executable and libs to workaround El Capitan's SIP restrictions source ../../../utils/macosx_fix_boost_libs_path.sh -fix_boost_libs_in_binary @executable_path/../Frameworks/boost_libs Zano.app/Contents/MacOS/Zano -fix_boost_libs_in_binary @executable_path/../Frameworks/boost_libs Zano.app/Contents/MacOS/simplewallet -fix_boost_libs_in_binary @executable_path/../Frameworks/boost_libs Zano.app/Contents/MacOS/zanod -fix_boost_libs_in_libs @executable_path/../Frameworks/boost_libs Zano.app/Contents/Frameworks/boost_libs +fix_boost_libs_in_binary @executable_path/../Frameworks Zano.app/Contents/MacOS/Zano +fix_boost_libs_in_binary @executable_path/../Frameworks Zano.app/Contents/MacOS/simplewallet +fix_boost_libs_in_binary @executable_path/../Frameworks Zano.app/Contents/MacOS/zanod +#fix_boost_libs_in_libs @executable_path/../Frameworks/boost_libs Zano.app/Contents/Frameworks/boost_libs diff --git a/utils/macosx_fix_boost_libs_path.sh b/utils/macosx_fix_boost_libs_path.sh index ff290d92..15a02ce2 100644 --- a/utils/macosx_fix_boost_libs_path.sh +++ b/utils/macosx_fix_boost_libs_path.sh @@ -2,12 +2,12 @@ set -e function rel_path() # $1 - path to a target dir/file, $2 - base dir { - python -c "import os.path; print os.path.relpath('$1', os.path.dirname('$2'))" + python3 -c "import os.path; print(os.path.relpath('$1', os.path.dirname('$2')))" } function abs_path() { - python -c "import os.path; print os.path.abspath('$1')" + python3 -c "import os.path; print(os.path.abspath('$1'))" } function fix_boost_libs_in_binary() # $1 - path to boost libs, $2 - binary to fix @@ -17,23 +17,24 @@ function fix_boost_libs_in_binary() # $1 - path to boost libs, $2 - binary to fi echo "fix_boost_libs_in_binary is called with no or invalid parameters" return 1 fi - install_name_tool -change libboost_system.dylib $1/libboost_system.dylib $2 - install_name_tool -change libboost_filesystem.dylib $1/libboost_filesystem.dylib $2 - install_name_tool -change libboost_thread.dylib $1/libboost_thread.dylib $2 - install_name_tool -change libboost_date_time.dylib $1/libboost_date_time.dylib $2 - install_name_tool -change libboost_chrono.dylib $1/libboost_chrono.dylib $2 - install_name_tool -change libboost_regex.dylib $1/libboost_regex.dylib $2 - install_name_tool -change libboost_serialization.dylib $1/libboost_serialization.dylib $2 - install_name_tool -change libboost_atomic.dylib $1/libboost_atomic.dylib $2 - install_name_tool -change libboost_program_options.dylib $1/libboost_program_options.dylib $2 - install_name_tool -change libboost_locale.dylib $1/libboost_locale.dylib $2 - install_name_tool -change libboost_timer.dylib $1/libboost_timer.dylib $2 - install_name_tool -change libboost_chrono.dylib $1/libboost_chrono.dylib $2 + install_name_tool -change @rpath/libboost_system.dylib $1/libboost_system.dylib $2 + install_name_tool -change @rpath/libboost_filesystem.dylib $1/libboost_filesystem.dylib $2 + install_name_tool -change @rpath/libboost_thread.dylib $1/libboost_thread.dylib $2 + install_name_tool -change @rpath/libboost_date_time.dylib $1/libboost_date_time.dylib $2 + install_name_tool -change @rpath/libboost_chrono.dylib $1/libboost_chrono.dylib $2 + install_name_tool -change @rpath/libboost_regex.dylib $1/libboost_regex.dylib $2 + install_name_tool -change @rpath/libboost_serialization.dylib $1/libboost_serialization.dylib $2 + install_name_tool -change @rpath/libboost_atomic.dylib $1/libboost_atomic.dylib $2 + install_name_tool -change @rpath/libboost_program_options.dylib $1/libboost_program_options.dylib $2 + install_name_tool -change @rpath/libboost_locale.dylib $1/libboost_locale.dylib $2 + install_name_tool -change @rpath/libboost_timer.dylib $1/libboost_timer.dylib $2 + install_name_tool -change @rpath/libboost_chrono.dylib $1/libboost_chrono.dylib $2 return 0 } function fix_boost_libs_in_libs() # $1 - path to boost libs, $2 - path to libs folder { + return 0 # temporary disabled -- 2023-11-20, sowle install_name_tool -change libboost_system.dylib $1/libboost_system.dylib $2/libboost_filesystem.dylib install_name_tool -change libboost_system.dylib $1/libboost_system.dylib $2/libboost_thread.dylib install_name_tool -change libboost_system.dylib $1/libboost_system.dylib $2/libboost_chrono.dylib From 020ad2ec7a4e1c8c444b577013b7a876f4ce7993 Mon Sep 17 00:00:00 2001 From: sowle Date: Mon, 20 Nov 2023 15:51:13 +0100 Subject: [PATCH 4/8] === build number: 157 -> 158 === --- 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 80015802..89c14c92 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 157 +#define PROJECT_VERSION_BUILD_NO 158 #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 0e67f9449f64fccf9e553a71271d9901a6d0299e Mon Sep 17 00:00:00 2001 From: sowle Date: Mon, 20 Nov 2023 19:48:23 +0100 Subject: [PATCH 5/8] build: an attempt 2 to fix boost lib paths in macOS CLI binaries --- utils/build_script_mac_osx.sh | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/utils/build_script_mac_osx.sh b/utils/build_script_mac_osx.sh index bddf3fd6..79d74827 100755 --- a/utils/build_script_mac_osx.sh +++ b/utils/build_script_mac_osx.sh @@ -59,12 +59,12 @@ if [ $? -ne 0 ]; then fi # copy all necessary libs into the bundle in order to workaround El Capitan's SIP restrictions -#mkdir -p Zano.app/Contents/Frameworks/boost_libs -#cp -R "$ZANO_BOOST_LIBS_PATH/" Zano.app/Contents/Frameworks/boost_libs/ -#if [ $? -ne 0 ]; then -# echo "Failed to cp workaround to MacOS" -# exit 1 -#fi +mkdir -p Zano.app/Contents/Frameworks/boost_libs +cp -R $ZANO_BOOST_LIBS_PATH/*.dylib Zano.app/Contents/Frameworks/boost_libs/ +if [ $? -ne 0 ]; then + echo "Failed to cp workaround to MacOS" + exit 1 +fi # rename process name to big letter mv Zano.app/Contents/MacOS/zano Zano.app/Contents/MacOS/Zano @@ -81,13 +81,12 @@ fi # fix boost libs paths in main executable and libs to workaround El Capitan's SIP restrictions source ../../../utils/macosx_fix_boost_libs_path.sh -fix_boost_libs_in_binary @executable_path/../Frameworks Zano.app/Contents/MacOS/Zano -fix_boost_libs_in_binary @executable_path/../Frameworks Zano.app/Contents/MacOS/simplewallet -fix_boost_libs_in_binary @executable_path/../Frameworks Zano.app/Contents/MacOS/zanod +fix_boost_libs_in_binary @executable_path/../Frameworks/boost_libs Zano.app/Contents/MacOS/Zano +fix_boost_libs_in_binary @executable_path/../Frameworks/boost_libs Zano.app/Contents/MacOS/simplewallet +fix_boost_libs_in_binary @executable_path/../Frameworks/boost_libs Zano.app/Contents/MacOS/zanod #fix_boost_libs_in_libs @executable_path/../Frameworks/boost_libs Zano.app/Contents/Frameworks/boost_libs - "$ZANO_QT_PATH/clang_64/bin/macdeployqt" Zano.app if [ $? -ne 0 ]; then echo "Failed to macdeployqt Zano.app" @@ -95,6 +94,8 @@ if [ $? -ne 0 ]; then fi +rm -rf Zano.app/Contents/Frameworks/libboost*.dylib + rsync -a ../../../src/gui/qt-daemon/layout/html Zano.app/Contents/MacOS --exclude less --exclude package.json --exclude gulpfile.js if [ $? -ne 0 ]; then From 6b78438d1352929733392874ed0728b87cea600e Mon Sep 17 00:00:00 2001 From: sowle Date: Mon, 20 Nov 2023 19:49:28 +0100 Subject: [PATCH 6/8] === build number: 158 -> 159 === --- 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 89c14c92..eae6763d 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 158 +#define PROJECT_VERSION_BUILD_NO 159 #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 2e573721155120e3c97bbb52b79ccbecc9cf8fcc Mon Sep 17 00:00:00 2001 From: sowle Date: Thu, 30 Nov 2023 12:56:41 +0100 Subject: [PATCH 7/8] checkpoint @ height 2390000 --- 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 49d10037..77907927 100644 --- a/src/currency_core/checkpoints_create.h +++ b/src/currency_core/checkpoints_create.h @@ -27,6 +27,7 @@ namespace currency ADD_CHECKPOINT(1161000, "96990d851b484e30190678756ba2a4d3a2f92b987e2470728ac1e38b2bf35908"); ADD_CHECKPOINT(1480000, "5dd3381eec35e8b4eba4518bfd8eec682a4292761d92218fd59b9f0ffedad3fe"); ADD_CHECKPOINT(2000000, "7b6698a8cc279aa78d6263f01fef186bd16f5b1ea263a7f4714abc1d506b9cb3"); + ADD_CHECKPOINT(2390000, "10797d34349d0ef1d1ab4b41ada6f8f2c2f86a7f7eebe44dd2ba06067cb47e0a"); #endif return true; From 3c4a52809c7b1dca42ca871bc7ec24487673a218 Mon Sep 17 00:00:00 2001 From: sowle Date: Thu, 30 Nov 2023 13:00:54 +0100 Subject: [PATCH 8/8] ====== build number: 159 -> 160 === --- 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 eae6763d..018842ef 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 159 +#define PROJECT_VERSION_BUILD_NO 160 #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 "]"