feat: zano hf6cyjan-zano-hf6

11 files changed, 159 insertions, 105 deletions

diff --git a/patches/zano/0001-fix-build-issues.patch b/patches/zano/0001-fix-build-issues.patch
index e3ba0a0..0d8e260 100644
--- a/patches/zano/0001-fix-build-issues.patch
+++ b/patches/zano/0001-fix-build-issues.patch
@@ -1,7 +1,7 @@
-From c6204cc6d141172c099e3c01d99825f7f85a9fa8 Mon Sep 17 00:00:00 2001
+From 27bb1c8ca74c87497e57ea0dbdc7d72c0f4592d1 Mon Sep 17 00:00:00 2001
 From: cyan <cyjan@mrcyjanek.net>
 Date: Sat, 2 Nov 2024 20:50:26 +0000
-Subject: [PATCH 1/7] fix build issues
+Subject: [PATCH 01/11] fix build issues
 
 ---
  contrib/db/libmdbx/CMakeLists.txt              | 2 +-
@@ -35,5 +35,5 @@ index 5949e9f0..e7b677bd 100644
  
  add_definitions(-DNDEBUG=1 -DMDBX_DEBUG=0 -DLIBMDBX_EXPORTS=1 -D_GNU_SOURCE=1)
 -- 
-2.51.0
+2.54.0 (Apple Git-156)
 
diff --git a/patches/zano/0002-fix-mingw-build-issues.patch b/patches/zano/0002-fix-mingw-build-issues.patch
index b4d346f..576ddea 100644
--- a/patches/zano/0002-fix-mingw-build-issues.patch
+++ b/patches/zano/0002-fix-mingw-build-issues.patch
@@ -1,7 +1,7 @@
-From 4e9ac1ac20c243d8cdccc2a4941f16e09951454b Mon Sep 17 00:00:00 2001
+From ec003422f5cb74962da19224c104b927689abf7f Mon Sep 17 00:00:00 2001
 From: cyan <cyjan@mrcyjanek.net>
 Date: Sun, 3 Nov 2024 08:59:22 +0000
-Subject: [PATCH 2/7] fix mingw build issues
+Subject: [PATCH 02/11] fix mingw build issues
 
 ---
  src/common/callstack_helper.cpp | 2 +-
@@ -35,5 +35,5 @@ index 9176de17..8b488135 100644
  #define I64T __int64
  #define U64C(v) (v##ui64)
 -- 
-2.51.0
+2.54.0 (Apple Git-156)
 
diff --git a/patches/zano/0003-fix-ios-builds.patch b/patches/zano/0003-fix-ios-builds.patch
index 3850d32..ee39c46 100644
--- a/patches/zano/0003-fix-ios-builds.patch
+++ b/patches/zano/0003-fix-ios-builds.patch
@@ -1,17 +1,17 @@
-From df278aa4633d1e20d55a905c7ab58cf786304058 Mon Sep 17 00:00:00 2001
+From 6ab4a4e288dbf48ea8d2203f4a90b46c6c5d7a82 Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Tue, 5 Nov 2024 16:52:23 +0100
-Subject: [PATCH 3/7] fix ios builds
+Subject: [PATCH 03/11] fix ios builds
 
 ---
  CMakeLists.txt | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4aa125a5..aa2687fd 100644
+index d5c975f3..83bf9e6d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -137,6 +137,8 @@ else()
+@@ -140,6 +140,8 @@ else()
    set(ARCH default CACHE STRING "CPU to build for: -march value or default")
    if("${ARCH}" STREQUAL "default")
      set(ARCH_FLAG "")
@@ -20,7 +20,7 @@ index 4aa125a5..aa2687fd 100644
    else()
      set(ARCH_FLAG "-march=${ARCH}")
    endif()
-@@ -209,7 +211,7 @@ else()
+@@ -212,7 +214,7 @@ else()
    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${RELEASE_FLAGS}")
    if(STATIC)
      if(APPLE)
@@ -30,5 +30,5 @@ index 4aa125a5..aa2687fd 100644
        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
      endif()
 -- 
-2.51.0
+2.54.0 (Apple Git-156)
 
diff --git a/patches/zano/0004-use-boost-filesystem-instead-of-stdfs.patch b/patches/zano/0004-use-boost-filesystem-instead-of-stdfs.patch
index 38862a2..44f99cb 100644
--- a/patches/zano/0004-use-boost-filesystem-instead-of-stdfs.patch
+++ b/patches/zano/0004-use-boost-filesystem-instead-of-stdfs.patch
@@ -1,28 +1,41 @@
-From 5a5c7a4d565ed9679bf960a08e894fcaff9ce73b Mon Sep 17 00:00:00 2001
+From d8366419e21cd171de6bb8aaf5b863522ed3398d Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Wed, 4 Dec 2024 17:21:44 -0600
-Subject: [PATCH 4/7] use boost::filesystem instead of stdfs
+Subject: [PATCH 04/11] use boost::filesystem instead of stdfs
 
 ---
- CMakeLists.txt                       | 19 ++-----------------
+ CMakeLists.txt                       | 26 ++++----------------------
  contrib/epee/include/file_io_utils.h |  6 +++---
- 2 files changed, 5 insertions(+), 20 deletions(-)
+ src/gui/qt-daemon/layout             |  2 +-
+ 3 files changed, 8 insertions(+), 26 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aa2687fd..7694b8eb 100644
+index 83bf9e6d..c102348b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -234,22 +234,7 @@ if(STATIC)
+@@ -241,14 +241,7 @@ if(Boost_FATLIB)
+   set(Boost_LIBRARIES ${Boost_FATLIB})
+ else()
+   # manually specify boost libs for mobile platforms
+-  if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
+-    if(NOT DEFINED SKIP_BOOST_FATLIB_LIB OR NOT SKIP_BOOST_FATLIB_LIB)
+-      message("Ios: libboost.a included as library")    
+-      set(Boost_LIBRARIES "libboost.a")
+-    else()
+-      message("Ios: libboost.a not included as library")    
+-    endif()
+-  elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
++  if(CMAKE_SYSTEM_NAME STREQUAL "Android")
+     if(CAKEWALLET)
+       find_package(Boost ${ZANO_BOOST_MIN_VER} REQUIRED COMPONENTS system filesystem locale thread timer date_time chrono regex serialization atomic program_options)
+     else()
+@@ -263,18 +256,7 @@ else()
  endif()
  
  message("CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}")    
 -if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
--  set(CMAKE_OSX_DEPLOYMENT_TARGET 12.00)
--  if(NOT DEFINED SKIP_BOOST_FATLIB_LIB OR NOT SKIP_BOOST_FATLIB_LIB)
--	message("Ios: libboost.a included as library")    
--	set(Boost_LIBRARIES "libboost.a")
--  else()
--	message("Ios: libboost.a not included as library")    
+-  if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET)
+-    set(CMAKE_OSX_DEPLOYMENT_TARGET 12.00)
 -  endif()
 -  #workaround for new XCode 12 policy for builds(now it includes a slice for the "arm64" when builds for simulator)
 -  set(__iphoneos_archs "arm64")
@@ -33,18 +46,27 @@ index aa2687fd..7694b8eb 100644
 -  #set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphonesimulator*] "${__iphonesimulator_archs}")
 -elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
 +if(CMAKE_SYSTEM_NAME STREQUAL "Android")
-   if(CAKEWALLET)
-     find_package(Boost ${ZANO_BOOST_MIN_VER} REQUIRED COMPONENTS system filesystem locale thread timer date_time chrono regex serialization atomic program_options)
-   else()
-@@ -306,7 +291,7 @@ else()
+   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC")
+   set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC")
+ endif()
+@@ -321,7 +303,7 @@ else()
    find_package(Git QUIET)
    if(Git_FOUND OR GIT_FOUND)
      message(STATUS "Found Git: ${GIT_EXECUTABLE}")
--    add_custom_target(version ALL "${CMAKE_COMMAND}" "-D" "VERSION=${VERSION}" "-D" "GIT=${GIT_EXECUTABLE}" "-D" "TO=${CMAKE_BINARY_DIR}/version/version.h" "-P" "src/version.cmake" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
-+    add_custom_target(version ALL "${CMAKE_COMMAND}" "-D" "VERSION=${VERSION}" "-D" "GIT=${GIT_EXECUTABLE}" "-D" "TO=${CMAKE_BINARY_DIR}/version/version.h" "-P" "src/version.cmake" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+-    add_custom_target(version ALL "${CMAKE_COMMAND}" "-D" "VERSION=${VERSION}" "-D" "TESTNET=${TESTNET}"  "-D" "GIT=${GIT_EXECUTABLE}" "-D" "TO=${CMAKE_BINARY_DIR}/version/version.h" "-P" "src/version.cmake" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
++    add_custom_target(version ALL "${CMAKE_COMMAND}" "-D" "VERSION=${VERSION}" "-D" "TESTNET=${TESTNET}"  "-D" "GIT=${GIT_EXECUTABLE}" "-D" "TO=${CMAKE_BINARY_DIR}/version/version.h" "-P" "src/version.cmake" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
    else()
      message(STATUS "WARNING: Git was not found!")
      set(VERSION "${VERSION}-unknown")
+@@ -338,7 +320,7 @@ if(BUILD_GUI)
+     "-D" "HTML_DIR=${HTML_CONTENT_HASH_DIR}"
+     "-D" "TO=${CMAKE_BINARY_DIR}/version/html_content_hash.h"
+     "-P" "src/gui/qt-daemon/html_content_hash.cmake"
+-    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
++    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+   )
+ endif()
+ 
 diff --git a/contrib/epee/include/file_io_utils.h b/contrib/epee/include/file_io_utils.h
 index bb21ae99..ced01092 100644
 --- a/contrib/epee/include/file_io_utils.h
@@ -63,6 +85,13 @@ index bb21ae99..ced01092 100644
  				{
  					continue;
  				}
+diff --git a/src/gui/qt-daemon/layout b/src/gui/qt-daemon/layout
+index 52b429c6..7f7128e8 160000
+--- a/src/gui/qt-daemon/layout
++++ b/src/gui/qt-daemon/layout
+@@ -1 +1 @@
+-Subproject commit 52b429c6f0b40979e543bc57ab911d220b07b83d
++Subproject commit 7f7128e8c3d5c04d801a327a7228abcc9aba85cd
 -- 
-2.51.0
+2.54.0 (Apple Git-156)
 
diff --git a/patches/zano/0005-downgrade-cmake-version-so-LIB_DEPENDS-shows-up.patch b/patches/zano/0005-downgrade-cmake-version-so-LIB_DEPENDS-shows-up.patch
index 4586a6f..df3e059 100644
--- a/patches/zano/0005-downgrade-cmake-version-so-LIB_DEPENDS-shows-up.patch
+++ b/patches/zano/0005-downgrade-cmake-version-so-LIB_DEPENDS-shows-up.patch
@@ -1,14 +1,14 @@
-From 9979233174da7a64add9710adcf95ec7257a3feb Mon Sep 17 00:00:00 2001
+From 482cd96898315bb05747cfbf0902a4ff97433851 Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Thu, 5 Dec 2024 09:36:34 -0600
-Subject: [PATCH 5/7] downgrade cmake version so LIB_DEPENDS shows up
+Subject: [PATCH 05/11] downgrade cmake version so LIB_DEPENDS shows up
 
 ---
  CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7694b8eb..793cc94c 100644
+index c102348b..a624bc0f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -1,4 +1,4 @@
@@ -18,5 +18,5 @@ index 7694b8eb..793cc94c 100644
  PROJECT(Zano)
  
 -- 
-2.51.0
+2.54.0 (Apple Git-156)
 
diff --git a/patches/zano/0006-increase-max-password.patch b/patches/zano/0006-increase-max-password.patch
index 84cdcc0..5055b43 100644
--- a/patches/zano/0006-increase-max-password.patch
+++ b/patches/zano/0006-increase-max-password.patch
@@ -1,17 +1,17 @@
-From e41a28439c60a2695b7ec0dc3f9aa811757defe6 Mon Sep 17 00:00:00 2001
+From 6c60a03eda231120bb1a327b628320f172fdc6e3 Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Thu, 12 Dec 2024 09:00:57 -0500
-Subject: [PATCH 6/7] increase max password
+Subject: [PATCH 06/11] increase max password
 
 ---
  src/currency_core/currency_format_utils.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/currency_core/currency_format_utils.cpp b/src/currency_core/currency_format_utils.cpp
-index 6c7d0a39..4fa2d00e 100644
+index 69adea7d..71a6bb82 100644
 --- a/src/currency_core/currency_format_utils.cpp
 +++ b/src/currency_core/currency_format_utils.cpp
-@@ -3675,7 +3675,7 @@ namespace currency
+@@ -4060,7 +4060,7 @@ namespace currency
      return true;
    }
    //------------------------------------------------------------------
@@ -21,5 +21,5 @@ index 6c7d0a39..4fa2d00e 100644
    {
      // OLD: static const std::string allowed_password_symbols = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz~!?@#$%^&*_+|{}[]()<>:;\"'-=\\/.,";
 -- 
-2.51.0
+2.54.0 (Apple Git-156)
 
diff --git a/patches/zano/0007-relax-mutex-in-invoke-call.patch b/patches/zano/0007-relax-mutex-in-invoke-call.patch
index e6ed17f..dc1e418 100644
--- a/patches/zano/0007-relax-mutex-in-invoke-call.patch
+++ b/patches/zano/0007-relax-mutex-in-invoke-call.patch
@@ -1,25 +1,31 @@
-From c8be0ef787060efcba6067729ae08b422bdde235 Mon Sep 17 00:00:00 2001
+From 4450a463d185bb539080c3bbd5ece18bd42f42a0 Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Tue, 18 Feb 2025 14:27:36 +0100
-Subject: [PATCH 7/7] relax mutex in invoke call
+Subject: [PATCH 07/11] relax mutex in invoke call
 
 ---
- src/gui/qt-daemon/layout       |  2 +-
+ src/common/error_codes.h       |  1 +
  src/wallet/wallets_manager.cpp | 37 ++++++++++++++++++++++++++++++----
- 2 files changed, 34 insertions(+), 5 deletions(-)
+ 2 files changed, 34 insertions(+), 4 deletions(-)
 
-diff --git a/src/gui/qt-daemon/layout b/src/gui/qt-daemon/layout
-index 7f7128e8..8ec45f89 160000
---- a/src/gui/qt-daemon/layout
-+++ b/src/gui/qt-daemon/layout
-@@ -1 +1 @@
--Subproject commit 7f7128e8c3d5c04d801a327a7228abcc9aba85cd
-+Subproject commit 8ec45f89802358be95c7fbb0eec5abe4382bd28e
+diff --git a/src/common/error_codes.h b/src/common/error_codes.h
+index e86373e5..d4f9ff33 100644
+--- a/src/common/error_codes.h
++++ b/src/common/error_codes.h
+@@ -51,6 +51,7 @@
+ #define API_RETURN_CODE_ARG_OUT_OF_LIMITS                       "ARG_OUT_OF_LIMITS"
+ #define API_RETURN_CODE_TX_HAS_TOO_MANY_OUTPUTS                 "TX_HAS_TOO_MANY_OUTPUTS"
+ #define API_RETURN_CODE_TX_HAS_TOO_MANY_INPUTS                  "TX_HAS_TOO_MANY_INPUTS"
++#define API_RETURN_CODE_BAD_JSON                                "BAD_JSON" 
+ #define API_RETURN_CODE_TX_FREEZE_PERIOD                        "TX_FREEZE_PERIOD"
+ #define API_RETURN_CODE_TX_POOL_FULL                            "TX_POOL_FULL"
+ #define API_RETURN_CODE_SIMULATION_FAILED                       "SIMULATION_FAILED"
+\ No newline at end of file
 diff --git a/src/wallet/wallets_manager.cpp b/src/wallet/wallets_manager.cpp
-index 0152e3d4..490ae0e8 100644
+index 02f47730..731aa1f3 100644
 --- a/src/wallet/wallets_manager.cpp
 +++ b/src/wallet/wallets_manager.cpp
-@@ -1698,10 +1698,27 @@ std::string wallets_manager::get_wallet_status(uint64_t wallet_id)
+@@ -1740,10 +1740,27 @@ std::string wallets_manager::get_wallet_status(uint64_t wallet_id)
    return epee::serialization::store_t_to_json(wsi);
  }
  
@@ -47,7 +53,7 @@ index 0152e3d4..490ae0e8 100644
    CRITICAL_REGION_LOCAL1(wo.long_refresh_in_progress_lock);
    if (wo.long_refresh_in_progress)
    {
-@@ -1711,16 +1728,28 @@ std::string wallets_manager::invoke(uint64_t wallet_id, std::string params)
+@@ -1753,16 +1770,28 @@ std::string wallets_manager::invoke(uint64_t wallet_id, std::string params)
      return epee::serialization::store_t_to_json(error_response);
    }
  
@@ -79,17 +85,7 @@ index 0152e3d4..490ae0e8 100644
 +
    return response_info.m_body;
  }
-
-diff --git a/src/common/error_codes.h b/src/common/error_codes.h
-index b538fa87..7471b2d1 100644
---- a/src/common/error_codes.h
-+++ b/src/common/error_codes.h
-@@ -48,3 +48,4 @@
- #define API_RETURN_CODE_MISSING_ZC_INPUTS                       "MISSING_ZC_INPUTS"
- #define API_RETURN_CODE_ARG_OUT_OF_LIMITS                       "ARG_OUT_OF_LIMITS"
- #define API_RETURN_CODE_TX_HAS_TOO_MANY_OUTPUTS                 "TX_HAS_TOO_MANY_OUTPUTS"
-+#define API_RETURN_CODE_BAD_JSON                                "BAD_JSON" 
-
+ 
 -- 
-2.51.0
+2.54.0 (Apple Git-156)
 
diff --git a/patches/zano/0008-fix-don-t-depend-on-locale-on-non-windows.patch b/patches/zano/0008-fix-don-t-depend-on-locale-on-non-windows.patch
index adc3734..80eb447 100644
--- a/patches/zano/0008-fix-don-t-depend-on-locale-on-non-windows.patch
+++ b/patches/zano/0008-fix-don-t-depend-on-locale-on-non-windows.patch
@@ -1,39 +1,37 @@
-From 5cbc5a0bd2e05bb5ef819a536fe49dc47383487b Mon Sep 17 00:00:00 2001
+From 0f649e87f0a4efbfc75d469f6611767051ece2c5 Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Fri, 6 Mar 2026 22:03:04 +0100
-Subject: [PATCH] fix: don't depend on locale on non-windows
+Subject: [PATCH 08/11] fix: don't depend on locale on non-windows
 
 ---
  CMakeLists.txt | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 793cc94c..5186bc87 100644
+index a624bc0f..452de748 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -236,7 +236,7 @@ endif()
- message("CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}")    
- if(CMAKE_SYSTEM_NAME STREQUAL "Android")
-   if(CAKEWALLET)
+@@ -243,15 +243,17 @@ else()
+   # manually specify boost libs for mobile platforms
+   if(CMAKE_SYSTEM_NAME STREQUAL "Android")
+     if(CAKEWALLET)
+-      find_package(Boost ${ZANO_BOOST_MIN_VER} REQUIRED COMPONENTS system filesystem locale thread timer date_time chrono regex serialization atomic program_options)
++      find_package(Boost ${ZANO_BOOST_MIN_VER} REQUIRED COMPONENTS filesystem thread timer date_time chrono regex serialization atomic program_options)
+     else()
+       set(Boost_LIBRARY_DIRS "${Boost_LIBRARY_DIRS}/${CMAKE_ANDROID_ARCH_ABI}/")
+       set(Boost_LIBRARIES "${Boost_LIBRARY_DIRS}libboost_system.a;${Boost_LIBRARY_DIRS}libboost_filesystem.a;${Boost_LIBRARY_DIRS}libboost_thread.a;${Boost_LIBRARY_DIRS}libboost_timer.a;${Boost_LIBRARY_DIRS}libboost_date_time.a;${Boost_LIBRARY_DIRS}libboost_chrono.a;${Boost_LIBRARY_DIRS}libboost_regex.a;${Boost_LIBRARY_DIRS}libboost_serialization.a;${Boost_LIBRARY_DIRS}libboost_atomic.a;${Boost_LIBRARY_DIRS}libboost_program_options.a")
+     endif()  
+   elseif(APPLE)
 -    find_package(Boost ${ZANO_BOOST_MIN_VER} REQUIRED COMPONENTS system filesystem locale thread timer date_time chrono regex serialization atomic program_options)
 +    find_package(Boost ${ZANO_BOOST_MIN_VER} REQUIRED COMPONENTS filesystem thread timer date_time chrono regex serialization atomic program_options)
++  elseif(MINGW)
++    find_package(Boost ${ZANO_BOOST_MIN_VER} REQUIRED COMPONENTS filesystem thread timer date_time chrono regex serialization atomic program_options log locale)
    else()
-     set(Boost_LIBRARY_DIRS "${Boost_LIBRARY_DIRS}/${CMAKE_ANDROID_ARCH_ABI}/")
-     set(Boost_LIBRARIES "${Boost_LIBRARY_DIRS}libboost_system.a;${Boost_LIBRARY_DIRS}libboost_filesystem.a;${Boost_LIBRARY_DIRS}libboost_thread.a;${Boost_LIBRARY_DIRS}libboost_timer.a;${Boost_LIBRARY_DIRS}libboost_date_time.a;${Boost_LIBRARY_DIRS}libboost_chrono.a;${Boost_LIBRARY_DIRS}libboost_regex.a;${Boost_LIBRARY_DIRS}libboost_serialization.a;${Boost_LIBRARY_DIRS}libboost_atomic.a;${Boost_LIBRARY_DIRS}libboost_program_options.a")
-@@ -244,9 +244,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Android")
-   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC")
-   set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC")
- elseif(APPLE)
--  find_package(Boost ${ZANO_BOOST_MIN_VER} REQUIRED COMPONENTS system filesystem locale thread timer date_time chrono regex serialization atomic program_options)
-+  find_package(Boost ${ZANO_BOOST_MIN_VER} REQUIRED COMPONENTS filesystem thread timer date_time chrono regex serialization atomic program_options)
-+elseif(MINGW)
-+  find_package(Boost ${ZANO_BOOST_MIN_VER} REQUIRED COMPONENTS filesystem thread timer date_time chrono regex serialization atomic program_options log locale)
- else()
--  find_package(Boost ${ZANO_BOOST_MIN_VER} REQUIRED COMPONENTS system filesystem locale thread timer date_time chrono regex serialization atomic program_options log)
-+  find_package(Boost ${ZANO_BOOST_MIN_VER} REQUIRED COMPONENTS filesystem thread timer date_time chrono regex serialization atomic program_options log)
+-    find_package(Boost ${ZANO_BOOST_MIN_VER} REQUIRED COMPONENTS system filesystem locale thread timer date_time chrono regex serialization atomic program_options log)
++    find_package(Boost ${ZANO_BOOST_MIN_VER} REQUIRED COMPONENTS filesystem thread timer date_time chrono regex serialization atomic program_options log)
+   endif()
  endif()
  
- 
 -- 
-2.51.0
+2.54.0 (Apple Git-156)
 
diff --git a/patches/zano/0009-fix-threads-on-iOS.patch b/patches/zano/0009-fix-threads-on-iOS.patch
index ed393aa..f17f94d 100644
--- a/patches/zano/0009-fix-threads-on-iOS.patch
+++ b/patches/zano/0009-fix-threads-on-iOS.patch
@@ -1,29 +1,28 @@
-From 40280e2316d37cb19ec3e9dd6e3a466811dd75c9 Mon Sep 17 00:00:00 2001
+From 759cd27fdbd815bd2188174638735c995b508811 Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Sat, 7 Mar 2026 00:06:53 +0100
-Subject: [PATCH] fix: threads on iOS
+Subject: [PATCH 09/11] fix: threads on iOS
 
 ---
- CMakeLists.txt | 6 ++++++
- 1 file changed, 6 insertions(+)
+ CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5186bc87..ad4815ea 100644
+index 452de748..2eab048e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -244,6 +244,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Android")
-   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC")
-   set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC")
- elseif(APPLE)
+@@ -249,6 +249,11 @@ else()
+       set(Boost_LIBRARIES "${Boost_LIBRARY_DIRS}libboost_system.a;${Boost_LIBRARY_DIRS}libboost_filesystem.a;${Boost_LIBRARY_DIRS}libboost_thread.a;${Boost_LIBRARY_DIRS}libboost_timer.a;${Boost_LIBRARY_DIRS}libboost_date_time.a;${Boost_LIBRARY_DIRS}libboost_chrono.a;${Boost_LIBRARY_DIRS}libboost_regex.a;${Boost_LIBRARY_DIRS}libboost_serialization.a;${Boost_LIBRARY_DIRS}libboost_atomic.a;${Boost_LIBRARY_DIRS}libboost_program_options.a")
+     endif()  
+   elseif(APPLE)
 +    set(THREADS_PREFER_PTHREAD_FLAG ON)
-+    
 +    set(CMAKE_THREAD_LIBS_INIT "-lpthread")
 +    set(CMAKE_HAVE_THREADS_LIBRARY 1)
 +    set(CMAKE_USE_PTHREADS_INIT 1)
 +    set(Threads_FOUND TRUE)
-   find_package(Boost ${ZANO_BOOST_MIN_VER} REQUIRED COMPONENTS filesystem thread timer date_time chrono regex serialization atomic program_options)
- elseif(MINGW)
-   find_package(Boost ${ZANO_BOOST_MIN_VER} REQUIRED COMPONENTS filesystem thread timer date_time chrono regex serialization atomic program_options log locale)
+     find_package(Boost ${ZANO_BOOST_MIN_VER} REQUIRED COMPONENTS filesystem thread timer date_time chrono regex serialization atomic program_options)
+   elseif(MINGW)
+     find_package(Boost ${ZANO_BOOST_MIN_VER} REQUIRED COMPONENTS filesystem thread timer date_time chrono regex serialization atomic program_options log locale)
 -- 
-2.51.0
+2.54.0 (Apple Git-156)
 
diff --git a/patches/zano/0010-workaround-no-op-MARK_AS_POD_C11.patch b/patches/zano/0010-workaround-no-op-MARK_AS_POD_C11.patch
index bc40f21..a2dce6f 100644
--- a/patches/zano/0010-workaround-no-op-MARK_AS_POD_C11.patch
+++ b/patches/zano/0010-workaround-no-op-MARK_AS_POD_C11.patch
@@ -1,7 +1,7 @@
-From 4efc6b9bc08ee8b2d51524a54b957df88003136e Mon Sep 17 00:00:00 2001
+From 2ca9fcd1b79c687ab95495b84deac0eed58c81ef Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Sat, 7 Mar 2026 00:20:47 +0100
-Subject: [PATCH] workaround: no-op MARK_AS_POD_C11
+Subject: [PATCH 10/11] workaround: no-op MARK_AS_POD_C11
 
 ---
  contrib/epee/include/misc_language.h | 11 +----------
@@ -30,5 +30,5 @@ index 04cb9750..7d512c3d 100644
  namespace epee
  {
 -- 
-2.51.0
+2.54.0 (Apple Git-156)
 
diff --git a/patches/zano/0011-wrap-pfr-in-DISABLE_PFR_SERIALIZATION_SELFCHECK.patch b/patches/zano/0011-wrap-pfr-in-DISABLE_PFR_SERIALIZATION_SELFCHECK.patch
new file mode 100644
index 0000000..c221c22
--- /dev/null
+++ b/patches/zano/0011-wrap-pfr-in-DISABLE_PFR_SERIALIZATION_SELFCHECK.patch
@@ -0,0 +1,32 @@
+From 8c8a732fa170aaba26570ca4927b24f11748ac23 Mon Sep 17 00:00:00 2001
+From: Czarek Nakamoto <cyjan@mrcyjanek.net>
+Date: Tue, 30 Jun 2026 09:46:18 +0200
+Subject: [PATCH 11/11] wrap pfr in DISABLE_PFR_SERIALIZATION_SELFCHECK
+
+---
+ src/common/boost_serialization_maps.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/common/boost_serialization_maps.h b/src/common/boost_serialization_maps.h
+index 988e42d3..9773a4ba 100644
+--- a/src/common/boost_serialization_maps.h
++++ b/src/common/boost_serialization_maps.h
+@@ -51,6 +51,7 @@ template<size_t A, size_t B> struct TAssertEquality {
+   be accompanied by a thorough review of the serialization map to ensure no fields are omitted.
+ **********************************************************************************************************************************/
+ 
++#ifndef DISABLE_PFR_SERIALIZATION_SELFCHECK
+ template <std::size_t Expected, std::size_t Actual>
+ struct if_you_see_this_check_END_BOOST_SERIALIZATION_TOTAL_FIELDS_macro;
+ 
+@@ -59,6 +60,7 @@ using validate_fields_t = std::conditional_t<(boost::pfr::tuple_size_v<T> == Exp
+ 
+ template<std::size_t expected, std::size_t actual>
+ constexpr bool static_check_num_eq() { static_assert(expected == actual, "numbers mismatched -- see static_check_num_eq<expected, actual> in the instantiation below"); return expected == actual; }
++#endif
+ 
+ 
+ #ifndef DISABLE_PFR_SERIALIZATION_SELFCHECK
+-- 
+2.54.0 (Apple Git-156)
+