update ci builds

33 files changed, 43 insertions, 995 deletions

diff --git a/.github/workflows/full_check.yaml b/.github/workflows/full_check.yaml
index e9866a9..4ecefc3 100644
--- a/.github/workflows/full_check.yaml
+++ b/.github/workflows/full_check.yaml
@@ -391,7 +391,7 @@ jobs:
           key: depends-${{ github.job }}-${{ hashFiles('contrib/depends/packages/*.mk') }}
       - name: build
         run: |
-          ./build_single.sh ${{ matrix.coin }} aarch64-host-apple-darwin -j$(sysctl -n hw.logicalcpu)
+          ./build_single.sh ${{ matrix.coin }} arm64-apple-darwin11 -j$(sysctl -n hw.logicalcpu)
       - name: rename artifacts
         run: |
           mkdir release/gh/
@@ -448,7 +448,7 @@ jobs:
           key: depends-${{ github.job }}-${{ hashFiles('contrib/depends/packages/*.mk') }}
       - name: build
         run: |
-          ./build_single.sh ${{ matrix.coin }} host-apple-ios -j$(sysctl -n hw.logicalcpu)
+          ./build_single.sh ${{ matrix.coin }} arm64-apple-ios -j$(sysctl -n hw.logicalcpu)
       - name: rename artifacts
         run: |
           mkdir release/gh/
diff --git a/.gitmodules b/.gitmodules
index 7fb204f..74fba9d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,43 +6,4 @@
 [submodule "wownero"]
 	path = wownero
 	url = https://codeberg.org/wownero/wownero
-	shallow = true
-[submodule "external/polyseed"]
-	path = external/polyseed
-	url = https://github.com/mrcyjanek/polyseed
-	shallow = true
-[submodule "external/ios-cmake"]
-	path = external/ios-cmake
-	url = https://github.com/leetal/ios-cmake
-	shallow = true
-[submodule "external/wownero-seed"]
-	path = external/wownero-seed
-	url = https://github.com/wownero-mirror/wownero-seed
-	shallow = true
-[submodule "external/Apple-Boost-BuildScript"]
-	path = external/Apple-Boost-BuildScript
-	url = https://github.com/cake-tech/Apple-Boost-BuildScript.git
-	branch = build
-	shallow = true
-[submodule "external/OpenSSL-for-iPhone"]
-	path = external/OpenSSL-for-iPhone
-	url = https://github.com/MrCyjaneK/OpenSSL-for-iPhone.git
-	shallow = true
-[submodule "external/libsodium"]
-	path = external/libsodium
-	url = https://github.com/jedisct1/libsodium.git
-	branch = stable
-	shallow = true
-[submodule "external/unbound"]
-	path = external/unbound
-	url = https://github.com/NLnetLabs/unbound.git
-	branch = release-1.16.2
-	shallow = true
-[submodule "external/libzmq"]
-	path = external/libzmq
-	url = https://github.com/zeromq/libzmq
-	shallow = true
-[submodule "external/libexpat"]
-	path = external/libexpat
-	url = https://github.com/libexpat/libexpat.git
-	shallow = true
+	shallow = true
\ No newline at end of file
diff --git a/build_single.sh b/build_single.sh
index 153d9ef..0f43937 100755
--- a/build_single.sh
+++ b/build_single.sh
@@ -28,6 +28,7 @@ if [[ "x$repo" != "xwownero" && "x$repo" != "xmonero" ]];
 then
     echo "Usage: $0 monero/wownero $(gcc -dumpmachine) -j$proccount"
     echo "Invalid target given, only monero and wownero are supported targets"
+    exit 1
 fi
 
 if [[ ! -d "$repo" ]]
@@ -53,248 +54,8 @@ then
 fi
 cd $(dirname $0)
 WDIR=$PWD
-CC=""
-CXX=""
-case "$HOST_ABI" in
-    "x86_64-linux-gnu")
-        export CC="${HOST_ABI}-gcc"
-        export CXX="${HOST_ABI}-g++"
-    ;;
-    "i686-linux-gnu")
-        export CC="${HOST_ABI}-gcc"
-        export CXX="${HOST_ABI}-g++"
-    ;;
-    "i686-meego-linux-gnu")
-        # sanity checks, we should only run on native cpu
-        if [[ ! "$(uname -m)" == "x86_64" ]];
-        then
-            echo "${HOST_ABI} builds are only supported on x86_64 host."
-            exit 1
-        fi
-        # we also only support sailfishos linux
-        source /etc/os-release
-        if [[ ! "$ID" == "sailfishos" ]];
-        then
-            echo "${HOST_ABI} builds are only supported on sailfishos host."
-            exit 1
-        fi
-        export CC="${HOST_ABI}-gcc"
-        export CXX="${HOST_ABI}-g++"
-    ;;
-    "aarch64-linux-gnu")
-        export CC="${HOST_ABI}-gcc"
-        export CXX="${HOST_ABI}-g++"
-    ;;
-    "aarch64-meego-linux-gnu")
-        # sanity checks, we should only run on native cpu
-        if [[ ! "$(uname -m)" == "aarch64" ]];
-        then
-            echo "${HOST_ABI} builds are only supported on aarch64 host."
-            exit 1
-        fi
-        # we also only support sailfishos linux
-        source /etc/os-release
-        if [[ ! "$ID" == "sailfishos" ]];
-        then
-            echo "${HOST_ABI} builds are only supported on sailfishos host."
-            exit 1
-        fi
-        export CC="${HOST_ABI}-gcc"
-        export CXX="${HOST_ABI}-g++"
-    ;;
-    "x86_64-linux-android")
-        export PATH="$WDIR/contrib/depends/${HOST_ABI}/native/bin/:$PATH"
-        export CC=$WDIR/contrib/depends/${HOST_ABI}/native/bin/x86_64-linux-android21-clang
-        export CXX=$WDIR/contrib/depends/${HOST_ABI}/native/bin/x86_64-linux-android21-clang++
-    ;;
-    "i686-linux-android")
-        export PATH="$WDIR/contrib/depends/${HOST_ABI}/native/bin/:$PATH"
-        export CC=$WDIR/contrib/depends/${HOST_ABI}/native/bin/i686-linux-android21-clang
-        export CXX=$WDIR/contrib/depends/${HOST_ABI}/native/bin/i686-linux-android21-clang++
-    ;;
-    "aarch64-linux-android")
-        export PATH="$WDIR/contrib/depends/${HOST_ABI}/native/bin/:$PATH"
-        export CC=$WDIR/contrib/depends/${HOST_ABI}/native/bin/aarch64-linux-android21-clang
-        export CXX=$WDIR/contrib/depends/${HOST_ABI}/native/bin/aarch64-linux-android21-clang++
-    ;;
-    "armv7a-linux-androideabi")
-        export PATH="$WDIR/contrib/depends/${HOST_ABI}/native/bin/:$PATH"
-        export CC=$WDIR/contrib/depends/${HOST_ABI}/native/bin/armv7a-linux-androideabi21-clang
-        export CXX=$WDIR/contrib/depends/${HOST_ABI}/native/bin/armv7a-linux-androideabi21-clang++
-    ;;
-    "i686-w64-mingw32")
-        update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix
-        update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix
-        export CC=i686-w64-mingw32-gcc-posix
-        export CXX=i686-w64-mingw32-g++-posix
-    ;;
-    "x86_64-w64-mingw32")
-        $SUDO update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
-        $SUDO update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
-        export CC=x86_64-w64-mingw32-gcc-posix
-        export CXX=x86_64-w64-mingw32-g++-posix
-    ;;
-    "x86_64-apple-darwin11")
-        export PATH="$WDIR/contrib/depends/x86_64-apple-darwin11/native/bin:$PATH"
-        export CC="clang -stdlib=libc++ -target x86_64-apple-darwin11 -mmacosx-version-min=10.14 --sysroot $WDIR/contrib/depends/x86_64-apple-darwin11/native/SDK/ -mlinker-version=609 -B$WDIR/contrib/depends/x86_64-apple-darwin11/native/bin/x86_64-apple-darwin11-"
-        export CXX="clang++ -stdlib=libc++ -target x86_64-apple-darwin11 -mmacosx-version-min=10.14 --sysroot $WDIR/contrib/depends/x86_64-apple-darwin11/native/SDK/ -mlinker-version=609 -B$WDIR/contrib/depends/x86_64-apple-darwin11/native/bin/x86_64-apple-darwin11-"
-    ;;
-    "aarch64-apple-darwin11")
-        export PATH="$WDIR/contrib/depends/aarch64-apple-darwin11/native/bin:$PATH"
-        export CC="clang -stdlib=libc++ -target arm64-apple-darwin11 -mmacosx-version-min=10.14 --sysroot $WDIR/contrib/depends/aarch64-apple-darwin11/native/SDK/ -mlinker-version=609 -B$WDIR/contrib/depends/aarch64-apple-darwin11/native/bin/aarch64-apple-darwin11-"
-        export CXX="clang++ -stdlib=libc++ -target arm64-apple-darwin11 -mmacosx-version-min=10.14 --sysroot $WDIR/contrib/depends/aarch64-apple-darwin11/native/SDK/ -mlinker-version=609 -B$WDIR/contrib/depends/aarch64-apple-darwin11/native/bin/aarch64-apple-darwin11-"
-    ;;
-    "host-apple-darwin"|"x86_64-host-apple-darwin"|"aarch64-host-apple-darwin")
-        export CC="clang"
-        export CXX="clang++"
-    ;;
-    "host-apple-ios")
-        export IOS_CC="clang -arch arm64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
-        export IOS_CXX="clang++ -arch arm64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
-    ;;
-    *)
-        echo "Unsupported target."
-        exit 1
-    ;;
-esac
 pushd contrib/depends
-    case "$HOST_ABI" in
-        "x86_64-linux-gnu" | "i686-linux-gnu" | "i686-meego-linux-gnu" | "aarch64-linux-gnu" | "aarch64-meego-linux-gnu" | "x86_64-linux-android" | "i686-linux-android" | "aarch64-linux-android" | "armv7a-linux-androideabi" | "i686-w64-mingw32" | "x86_64-w64-mingw32" | "x86_64-apple-darwin11" | "aarch64-apple-darwin11")
-            env -i PATH="$PATH" CC=gcc CXX=g++ make HOST="$HOST_ABI" "$NPROC"
-        ;;
-        "host-apple-darwin" | "x86_64-host-apple-darwin" | "aarch64-host-apple-darwin")
-            echo "===================================="
-            echo "=                                  ="
-            echo "=  CHECK README.md IF BUILD FAILS  ="
-            echo "=                                  ="
-            echo "===================================="
-            echo "WARN: using host dependencies on macos."
-            POLYSEED_DIR=../../../external/polyseed/build/${HOST_ABI}
-            rm -rf ${POLYSEED_DIR}
-            mkdir -p ${POLYSEED_DIR}
-            pushd ${POLYSEED_DIR}
-                CC="${CC}" CXX="${CXX}" cmake ../..
-                make $NPROC
-            popd
-            if [[ "$repo" == "wownero" ]];
-            then
-                WOWNEROSEED_DIR=../../../external/wownero-seed/build/${HOST_ABI}
-                rm -rf ${WOWNEROSEED_DIR}
-                mkdir -p ${WOWNEROSEED_DIR}
-                pushd ${WOWNEROSEED_DIR}
-                    pushd ../..
-                        git reset --hard
-                        patch -p1 < ../wownero-seed-0001-fix-duplicate-symbol-error.patch
-                    popd
-                    CC="${CC}" CXX="${CXX}" cmake ../..
-                    make $NPROC
-                popd
-            fi
-            MACOS_LIBS_DIR="${PWD}/${HOST_ABI}"
-            rm -rf ${MACOS_LIBS_DIR}
-            mkdir -p ${MACOS_LIBS_DIR}/lib
-            if [[ "$(uname -m)" == "arm64" ]];
-            then
-                export HOMEBREW_PREFIX="/opt/homebrew"
-            elif [[ "$(uname -m)" == "x86_64" ]];
-            then
-                export HOMEBREW_PREFIX="/usr/local"
-            fi
-            pushd ../../../external/macos
-                ./build_unbound.sh
-            popd
-            # NOTE: we can use unbound from brew but app store rejects the app because of nghttp2 symbols being included
-            # verbose_copy "${HOMEBREW_PREFIX}/lib/libunbound.a" ${MACOS_LIBS_DIR}/lib/libunbound.a
-            verbose_copy "../../../external/macos/build/MACOS/lib/libunbound.a" ${MACOS_LIBS_DIR}/lib/libunbound.a
-            verbose_copy "${HOMEBREW_PREFIX}/lib/libboost_chrono-mt.a" ${MACOS_LIBS_DIR}/lib/libboost_chrono-mt.a
-            verbose_copy "${HOMEBREW_PREFIX}/lib/libboost_locale-mt.a" ${MACOS_LIBS_DIR}/lib/libboost_locale-mt.a
-            verbose_copy "${HOMEBREW_PREFIX}/lib/libboost_date_time-mt.a" ${MACOS_LIBS_DIR}/lib/libboost_date_time-mt.a
-            verbose_copy "${HOMEBREW_PREFIX}/lib/libboost_filesystem-mt.a" ${MACOS_LIBS_DIR}/lib/libboost_filesystem-mt.a
-            verbose_copy "${HOMEBREW_PREFIX}/lib/libboost_program_options-mt.a" ${MACOS_LIBS_DIR}/lib/libboost_program_options-mt.a
-            verbose_copy "${HOMEBREW_PREFIX}/lib/libboost_regex-mt.a" ${MACOS_LIBS_DIR}/lib/libboost_regex-mt.a
-            verbose_copy "${HOMEBREW_PREFIX}/lib/libboost_serialization-mt.a" ${MACOS_LIBS_DIR}/lib/libboost_serialization-mt.a
-            verbose_copy "${HOMEBREW_PREFIX}/lib/libboost_system-mt.a" ${MACOS_LIBS_DIR}/lib/libboost_system-mt.a
-            verbose_copy "${HOMEBREW_PREFIX}/lib/libboost_thread-mt.a" ${MACOS_LIBS_DIR}/lib/libboost_thread-mt.a
-            verbose_copy "${HOMEBREW_PREFIX}/lib/libboost_wserialization-mt.a" ${MACOS_LIBS_DIR}/lib/libboost_wserialization-mt.a
-            verbose_copy "${POLYSEED_DIR}/libpolyseed.a" ${MACOS_LIBS_DIR}/lib/libpolyseed.a
-            verbose_copy "${HOMEBREW_PREFIX}/lib/libssl.a" ${MACOS_LIBS_DIR}/lib/libssl.a
-            verbose_copy "${HOMEBREW_PREFIX}/lib/libcrypto.a" ${MACOS_LIBS_DIR}/lib/libcrypto.a
-            verbose_copy "${HOMEBREW_PREFIX}/lib/libsodium.a" ${MACOS_LIBS_DIR}/lib/libsodium.a
-            if [[ "$repo" == "wownero" ]];
-            then
-                verbose_copy "${WOWNEROSEED_DIR}/libwownero-seed.a" ${MACOS_LIBS_DIR}/lib/libwownero-seed.a
-            fi
-        ;;
-        "host-apple-ios")
-            echo "===================================="
-            echo "=                                  ="
-            echo "=  CHECK README.md IF BUILD FAILS  ="
-            echo "=                                  ="
-            echo "===================================="
-            pwd
-            pushd ../../../external/ios
-                ./install_missing_headers.sh
-                ./build_openssl.sh
-                ./build_boost.sh
-                ./build_sodium.sh
-                ./build_zmq.sh
-                ./build_unbound.sh
-                if [[ "$repo" == "wownero" ]];
-                then
-                    ./build_wownero_seed.sh
-                fi
-            popd
-            POLYSEED_DIR=../../../external/polyseed/build/${HOST_ABI}
-            rm -rf ${POLYSEED_DIR}
-            mkdir -p ${POLYSEED_DIR}
-            pushd ${POLYSEED_DIR}
-                CC="${IOS_CC}" CXX="${IOS_CXX}" cmake  -DCMAKE_TOOLCHAIN_FILE=../../../ios-cmake/ios.toolchain.cmake -DPLATFORM=OS64 ../..
-                make $NPROC
-            popd
-            if [[ "$repo" == "wownero" ]];
-            then
-                WOWNEROSEED_DIR=../../../external/wownero-seed/build/${HOST_ABI}
-                rm -rf ${WOWNEROSEED_DIR}
-                mkdir -p ${WOWNEROSEED_DIR}
-                pushd ${WOWNEROSEED_DIR}
-                    pushd ../..
-                        git reset --hard
-                        patch -p1 < ../wownero-seed-0001-fix-duplicate-symbol-error.patch
-                    popd
-                    CC="${CC}" CXX="${CXX}" cmake -DCMAKE_TOOLCHAIN_FILE=../../../ios-cmake/ios.toolchain.cmake -DPLATFORM=OS64 ../..
-                    make $NPROC
-                popd
-            fi
-            IOS_LIBS_DIR="${PWD}/host-apple-ios"
-            rm -rf ${IOS_LIBS_DIR}
-            mkdir -p ${IOS_LIBS_DIR}/lib
-            export IOS_PREFIX="$(realpath "${PWD}/../../../external/ios/build/ios")"
-            verbose_copy "${IOS_PREFIX}/lib/libunbound.a" ${IOS_LIBS_DIR}/lib/libunbound.a
-            verbose_copy "${IOS_PREFIX}/lib/libboost_chrono.a" ${IOS_LIBS_DIR}/lib/libboost_chrono.a
-            verbose_copy "${IOS_PREFIX}/lib/libboost_locale.a" ${IOS_LIBS_DIR}/lib/libboost_locale.a
-            verbose_copy "${IOS_PREFIX}/lib/libboost_date_time.a" ${IOS_LIBS_DIR}/lib/libboost_date_time.a
-            verbose_copy "${IOS_PREFIX}/lib/libboost_filesystem.a" ${IOS_LIBS_DIR}/lib/libboost_filesystem.a
-            verbose_copy "${IOS_PREFIX}/lib/libboost_program_options.a" ${IOS_LIBS_DIR}/lib/libboost_program_options.a
-            verbose_copy "${IOS_PREFIX}/lib/libboost_regex.a" ${IOS_LIBS_DIR}/lib/libboost_regex.a
-            verbose_copy "${IOS_PREFIX}/lib/libboost_serialization.a" ${IOS_LIBS_DIR}/lib/libboost_serialization.a
-            verbose_copy "${IOS_PREFIX}/lib/libboost_system.a" ${IOS_LIBS_DIR}/lib/libboost_system.a
-            verbose_copy "${IOS_PREFIX}/lib/libboost_thread.a" ${IOS_LIBS_DIR}/lib/libboost_thread.a
-            verbose_copy "${IOS_PREFIX}/lib/libboost_wserialization.a" ${IOS_LIBS_DIR}/lib/libboost_wserialization.a
-            verbose_copy "${POLYSEED_DIR}/libpolyseed.a" ${IOS_LIBS_DIR}/lib/libpolyseed.a
-            verbose_copy "${IOS_PREFIX}/lib/libssl.a" ${IOS_LIBS_DIR}/lib/libssl.a
-            verbose_copy "${IOS_PREFIX}/lib/libcrypto.a" ${IOS_LIBS_DIR}/lib/libcrypto.a
-            verbose_copy "${IOS_PREFIX}/lib/libsodium.a" ${IOS_LIBS_DIR}/lib/libsodium.a
-            if [[ "$repo" == "wownero" ]];
-            then
-                verbose_copy "${WOWNEROSEED_DIR}/libwownero-seed.a" ${IOS_LIBS_DIR}/lib/libwownero-seed.a
-            fi
-            # verbose_copy "${IOS_PREFIX}/lib/libevent.a" ${IOS_LIBS_DIR}/lib/libevent.a
-        ;;
-        *)
-            echo "Unable to build dependencies for '$HOST_ABI'."
-            exit 1
-        ;;
-    esac
+    env -i PATH="$PATH" CC=gcc CXX=g++ make HOST="$HOST_ABI" "$NPROC"
 popd
 
 buildType=Debug
diff --git a/contrib/depends/funcs.mk b/contrib/depends/funcs.mk
index 5e31428..c998b03 100644
--- a/contrib/depends/funcs.mk
+++ b/contrib/depends/funcs.mk
@@ -143,7 +143,7 @@ $(1)_config_env+=PKG_CONFIG_PATH=$($($(1)_type)_prefix)/share/pkgconfig
 $(1)_config_env+=PATH="$(build_prefix)/bin:$(PATH)"
 $(1)_build_env+=PATH="$(build_prefix)/bin:$(PATH)"
 $(1)_stage_env+=PATH="$(build_prefix)/bin:$(PATH)"
-$(1)_autoconf=./configure --host=$($($(1)_type)_host) --prefix=$($($(1)_type)_prefix) $$($(1)_config_opts) CC="$$($(1)_cc)" CXX="$$($(1)_cxx)"
+$(1)_autoconf=./configure --host=$($($(1)_type)_host) --prefix=$($($(1)_type)_prefix) $$($(1)_config_opts) CC="$$($(1)_cc)" CXX="$$($(1)_cxx)" AR="$$($(1)_ar)"
 
 ifeq ($(filter $(1),libusb unbound),)
 $(1)_autoconf += --disable-dependency-tracking
diff --git a/contrib/depends/hosts/ios.mk b/contrib/depends/hosts/ios.mk
new file mode 100644
index 0000000..c1a7c33
--- /dev/null
+++ b/contrib/depends/hosts/ios.mk
@@ -0,0 +1,24 @@
+IOS_MIN_VERSION=12.0
+IOS_SDK=$(shell xcrun --sdk iphoneos --show-sdk-path)
+IOS_SIMULATOR_SDK=$(shell xcrun --sdk iphonesimulator --show-sdk-path)
+
+ifeq (aarch64, $(host_arch))
+CC_target_ios=arm64-apple-ios
+else
+CC_target_ios=x86_64-apple-ios
+endif
+
+ios_CC=$(shell xcrun -f clang) -target $(CC_target_ios) -mios-version-min=$(IOS_MIN_VERSION) --sysroot $(IOS_SDK)
+ios_CXX=$(shell xcrun -f clang++) -target $(CC_target_ios) -mios-version-min=$(IOS_MIN_VERSION) --sysroot $(IOS_SDK) -stdlib=libc++ -std=c++14
+ios_AR:=$(shell xcrun -f ar)
+ios_RANLIB:=$(shell xcrun -f ranlib)
+ios_STRIP:=$(shell xcrun -f strip)
+ios_LIBTOOL:=$(shell xcrun -f libtool)
+ios_OTOOL:=$(shell xcrun -f otool)
+ios_NM:=$(shell xcrun -f nm)
+ios_INSTALL_NAME_TOOL:=$(shell xcrun -f install_name_tool)
+ios_native_toolchain=
+
+
+ios_CFLAGS=-pipe
+ios_CXXFLAGS=$(ios_CFLAGS)
\ No newline at end of file
diff --git a/contrib/depends/packages/boost.mk b/contrib/depends/packages/boost.mk
index 6077a92..12d0c18 100644
--- a/contrib/depends/packages/boost.mk
+++ b/contrib/depends/packages/boost.mk
@@ -5,6 +5,7 @@ $(package)_file_name=$(package)_$($(package)_version).tar.bz2
 $(package)_sha256_hash=7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617
 $(package)_dependencies=libiconv
 $(package)_patches=fix_io_control_hpp.patch
+$(package)_ios_COMPILER_VERSION=16
 
 define $(package)_set_vars
 $(package)_config_opts_release=variant=release
@@ -14,24 +15,27 @@ $(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1
 $(package)_config_opts_linux=threadapi=pthread runtime-link=static
 $(package)_config_opts_android=threadapi=pthread runtime-link=static target-os=android
 $(package)_config_opts_darwin=--toolset=darwin runtime-link=static
+$(package)_config_opts_ios=--toolset=darwin-$($(package)_ios_COMPILER_VERSION)~iphone runtime-link=static
 $(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static
 $(package)_config_opts_x86_64_mingw32=address-model=64
 $(package)_config_opts_i686_mingw32=address-model=32
 $(package)_config_opts_i686_linux=address-model=32 architecture=x86
-$(package)_toolset_$(host_os)=gcc
+$(package)_toolset_$(host_os)=clang
 $(package)_archiver_$(host_os)=$($(package)_ar)
 $(package)_toolset_darwin=darwin
+$(package)_toolset_ios=darwin
+$(package)_toolset2_ios=$($(package)_ios_COMPILER_VERSION)~iphone
 $(package)_archiver_darwin=$($(package)_libtool)
 $(package)_config_libraries=system,filesystem,thread,timer,date_time,chrono,regex,serialization,atomic,program_options,locale,log
-$(package)_cxxflags=-std=c++11
 $(package)_cxxflags_linux=-fPIC
 $(package)_cxxflags_freebsd=-fPIC
 $(package)_cxxflags_android=-fPIC
-$(package)_ldflags=-L$(host_prefix)/lib -L$(shell xcrun --sdk macosx --show-sdk-path)/usr/lib
+$(package)_ldflags_darwin=-L$(host_prefix)/lib -L$(shell xcrun --sdk macosx --show-sdk-path)/usr/lib
+$(package)_ldflags_ios=-L$(host_prefix)/lib -L$(IOS_SDK)/usr/lib
 endef
 
 define $(package)_preprocess_cmds
-  echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$(boost_archiver_$(host_os))\" <arflags>\"$($(package)_arflags)\" <striper>\"$(host_STRIP)\"  <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam
+  echo "using $(boost_toolset_$(host_os)) : $(boost_toolset2_$(host_os)) : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$($(package)_archiver_$(host_os))\" <arflags>\"$($(package)_arflags)\" <striper>\"$(host_STRIP)\"  <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam
 endef
 
 define $(package)_config_cmds
@@ -39,9 +43,9 @@ define $(package)_config_cmds
 endef
 
 define $(package)_build_cmds
-  ./b2 -d2 -j2 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) $($(package)_config_opts_release) stage
+  ./b2 -d2 -j1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) $($(package)_config_opts_release) stage
 endef
 
 define $(package)_stage_cmds
-  ./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) $($(package)_config_opts_release) install
+  ./b2 -d0 -j1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) $($(package)_config_opts_release) install
 endef
diff --git a/contrib/depends/packages/libiconv.mk b/contrib/depends/packages/libiconv.mk
index b2f23eb..c4f3357 100644
--- a/contrib/depends/packages/libiconv.mk
+++ b/contrib/depends/packages/libiconv.mk
@@ -7,8 +7,10 @@ $(package)_sha256_hash=8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65
 define $(package)_set_vars
   $(package)_config_opts=--disable-nls
   $(package)_config_opts=--enable-static
+  $(package)_config_opts=--disable-shared
   $(package)_config_opts_linux=--with-pic
   $(package)_config_opts_freebsd=--with-pic
+  $(package)_ar_ios=$(package)_ar rcs
 endef
 
 define $(package)_preprocess_cmds
@@ -16,7 +18,7 @@ define $(package)_preprocess_cmds
 endef
 
 define $(package)_config_cmds
-  $($(package)_autoconf) AR_FLAGS=$($(package)_arflags)
+  $($(package)_autoconf)
 endef
 
 define $(package)_build_cmds
diff --git a/external/Apple-Boost-BuildScript b/external/Apple-Boost-BuildScript
deleted file mode 160000
-Subproject 513dd145f6e67a694160b858957978e375c8d69
diff --git a/external/OpenSSL-for-iPhone b/external/OpenSSL-for-iPhone
deleted file mode 160000
-Subproject d3ec433a47708594d18ef6e248b66e3d64f00f0
diff --git a/external/alpine/libexecinfo/10-execinfo.patch b/external/alpine/libexecinfo/10-execinfo.patch
deleted file mode 100644
index 44db530..0000000
--- a/external/alpine/libexecinfo/10-execinfo.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/execinfo.c.orig
-+++ b/execinfo.c
-@@ -69,7 +69,8 @@
- char **
- backtrace_symbols(void *const *buffer, int size)
- {
--    int i, clen, alen, offset;
-+    size_t clen, alen;
-+    int i, offset;
-     char **rval;
-     char *cp;
-     Dl_info info;
-@@ -78,7 +79,6 @@
-     rval = malloc(clen);
-     if (rval == NULL)
-         return NULL;
--    (char **)cp = &(rval[size]);
-     for (i = 0; i < size; i++) {
-         if (dladdr(buffer[i], &info) != 0) {
-             if (info.dli_sname == NULL)
-@@ -92,14 +92,14 @@
-                    2 +                      /* " <" */
-                    strlen(info.dli_sname) + /* "function" */
-                    1 +                      /* "+" */
--                   D10(offset) +            /* "offset */
-+                   10 +                     /* "offset */
-                    5 +                      /* "> at " */
-                    strlen(info.dli_fname) + /* "filename" */
-                    1;                       /* "\0" */
-             rval = realloc_safe(rval, clen + alen);
-             if (rval == NULL)
-                 return NULL;
--            snprintf(cp, alen, "%p <%s+%d> at %s",
-+            snprintf((char *) rval + clen, alen, "%p <%s+%d> at %s",
-               buffer[i], info.dli_sname, offset, info.dli_fname);
-         } else {
-             alen = 2 +                      /* "0x" */
-@@ -108,12 +108,15 @@
-             rval = realloc_safe(rval, clen + alen);
-             if (rval == NULL)
-                 return NULL;
--            snprintf(cp, alen, "%p", buffer[i]);
-+            snprintf((char *) rval + clen, alen, "%p", buffer[i]);
-         }
--        rval[i] = cp;
--        cp += alen;
-+        rval[i] = (char *) clen;
-+        clen += alen;
-     }
- 
-+    for (i = 0; i < size; i++)
-+        rval[i] += (long) rval;
-+
-     return rval;
- }
- 
-@@ -155,6 +158,6 @@
-                 return;
-             snprintf(buf, len, "%p\n", buffer[i]);
-         }
--        write(fd, buf, len - 1);
-+        write(fd, buf, strlen(buf));
-     }
- }
diff --git a/external/alpine/libexecinfo/20-define-gnu-source.patch b/external/alpine/libexecinfo/20-define-gnu-source.patch
deleted file mode 100644
index 7255ecd..0000000
--- a/external/alpine/libexecinfo/20-define-gnu-source.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/execinfo.c.orig
-+++ b/execinfo.c
-@@ -26,6 +26,7 @@
-  * $Id: execinfo.c,v 1.3 2004/07/19 05:21:09 sobomax Exp $
-  */
- 
-+#define _GNU_SOURCE
- #include <sys/types.h>
- #include <sys/uio.h>
- #include <dlfcn.h>
---- a/stacktraverse.c.orig
-+++ b/stacktraverse.c
-@@ -1,3 +1,4 @@
-+#define _GNU_SOURCE
- #include <stddef.h>
- 
- #include "stacktraverse.h"
---- a/test.c.orig
-+++ b/test.c
-@@ -1,3 +1,4 @@
-+#define _GNU_SOURCE
- #include <stdio.h>
- #include <stdlib.h>
- 
diff --git a/external/alpine/libexecinfo/30-linux-makefile.patch b/external/alpine/libexecinfo/30-linux-makefile.patch
deleted file mode 100644
index 6bc8a89..0000000
--- a/external/alpine/libexecinfo/30-linux-makefile.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/Makefile.orig
-+++ b/Makefile
-@@ -23,24 +23,25 @@
- # SUCH DAMAGE.
- #
- # $Id: Makefile,v 1.3 2004/07/19 05:19:55 sobomax Exp $
-+#
-+# Linux Makefile by Matt Smith <mcs@darkregion.net>, 2011/01/04
- 
--LIB=	execinfo
-+CC=cc
-+AR=ar
-+EXECINFO_CFLAGS=$(CFLAGS) -O2 -pipe -fno-strict-aliasing -std=gnu99 -fstack-protector -c
-+EXECINFO_LDFLAGS=$(LDFLAGS)
- 
--SRCS=	stacktraverse.c stacktraverse.h execinfo.c execinfo.h
-+all: static dynamic
- 
--INCS=	execinfo.h
-+static:
-+	$(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c
-+	$(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c
-+	$(AR) rcs libexecinfo.a stacktraverse.o execinfo.o
- 
--SHLIB_MAJOR=	1
--SHLIB_MINOR=	0
-+dynamic:
-+	$(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c -o stacktraverse.So
-+	$(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c -o execinfo.So
-+	$(CC) -shared -Wl,-soname,libexecinfo.so.1 -o libexecinfo.so.1 stacktraverse.So execinfo.So
- 
--NOPROFILE=	yes
--
--DPADD=		${LIBM}
--LDADD=		-lm
--
--#WARNS?=	4
--
--#stacktraverse.c: gen.py
--#	./gen.py > stacktraverse.c
--
--.include <bsd.lib.mk>
-+clean:
-+	rm -rf *.o *.So *.a *.so
diff --git a/external/alpine/libexecinfo/APKBUILD b/external/alpine/libexecinfo/APKBUILD
deleted file mode 100644
index 0e91c2c..0000000
--- a/external/alpine/libexecinfo/APKBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Contributor: Philipp Andronov <filipp.andronov@gmail.com>
-# Maintainer: Matt Smith <mcs@darkregion.net>
-pkgname=libexecinfo
-pkgver=1.1
-pkgrel=1
-pkgdesc="A quick-n-dirty BSD licensed clone of the GNU libc backtrace facility."
-options="!check" # No testsuite
-url="https://www.freshports.org/devel/libexecinfo"
-arch="all"
-license="BSD-2-Clause"
-subpackages="$pkgname-static ${pkgname}-dev"
-source="http://distcache.freebsd.org/local-distfiles/itetcu/$pkgname-$pkgver.tar.bz2
-	10-execinfo.patch
-	20-define-gnu-source.patch
-	30-linux-makefile.patch
-	"
-
-build() {
-	cd "$builddir"
-	export CFLAGS="${CFLAGS} -fno-omit-frame-pointer"
-	make
-}
-
-package() {
-	cd "$builddir"
-
-	install -D -m755 "$builddir"/execinfo.h \
-		"$pkgdir"/usr/include/execinfo.h
-	install -D -m755 "$builddir"/stacktraverse.h \
-		"$pkgdir"/usr/include/stacktraverse.h
-	install -D -m755 "$builddir"/libexecinfo.a \
-		"$pkgdir"/usr/lib/libexecinfo.a
-	install -D -m755 "$builddir"/libexecinfo.so.1 \
-		"$pkgdir"/usr/lib/libexecinfo.so.1
-	ln -s /usr/lib/libexecinfo.so.1 \
-		"$pkgdir"/usr/lib/libexecinfo.so
-}
-
-static() {
-	depends=""
-	pkgdesc="$pkgdesc (static library)"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
-}
-
-sha512sums="51fea7910ef6873061a25c22434ce4da724e9d8e37616a069ad0a58c0463755be4c6c7da88cd747484c2f3373909d7be4678b32a4bd91b6d9e0f74526094e92c  libexecinfo-1.1.tar.bz2
-cd35c9046d88b39b05bc36faffb1e71ae3b2140632da7da37f374fff671d4ad812eebd0581011ff9e3b25d3cb4bc962cf35957074f713817b3b617511425af1a  10-execinfo.patch
-c961b2f86cba291e8c69a507e3880354ad7369fd04c8948d54c4db0578fe30cca8f4250742cb63d1ab6e5875988f04c4729256197030369404f0e925f299a66c  20-define-gnu-source.patch
-13d3df88a6dabd78ee2cf50092511f5a10f0e5ff3d81dbacb182fcf85ceb0c13a5f0252397b4eb0ac57f8d8bd3fc3af6c05865d6398cbc1517f347210c5750da  30-linux-makefile.patch"
diff --git a/external/ios-cmake b/external/ios-cmake
deleted file mode 160000
-Subproject ad96a372b168930c2a1ff9455e1a9ccb1302161
diff --git a/external/ios/build_boost.sh b/external/ios/build_boost.sh
deleted file mode 100755
index e2e8b8a..0000000
--- a/external/ios/build_boost.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. ./config.sh
-
-MIN_IOS_VERSION=10.0
-BOOST_DIR_PATH="${EXTERNAL_IOS_SOURCE_DIR}/Apple-Boost-BuildScript"
-BOOST_VERSION=1.84.0
-BOOST_LIBS="random regex graph random chrono thread filesystem system date_time locale serialization program_options"
-
-echo "============================ Boost ============================"
-
-# Check if the directory already exists.
-if [ -d "$BOOST_DIR_PATH" ]; then
-    echo "Boost directory already exists."
-else
-    echo "Cloning Boost from $BOOST_URL"
-    mkdir -p "$BOOST_DIR_PATH" || true
-    rm -rf "$BOOST_DIR_PATH" || true
-    cp -r "${MONEROC_DIR}/external/Apple-Boost-BuildScript" "$BOOST_DIR_PATH"
-fi
-cd "$BOOST_DIR_PATH"
-
-./boost.sh -ios \
-	--min-ios-version ${MIN_IOS_VERSION} \
-	--boost-libs "${BOOST_LIBS}" \
-	--boost-version ${BOOST_VERSION} \
-        --ios-sdk 17.5 \
-	--no-framework
-
-cp -r "${BOOST_DIR_PATH}/build/boost/${BOOST_VERSION}"/ios/release/prefix/include/boost  "$EXTERNAL_IOS_INCLUDE_DIR/boost"
-cp -r "${BOOST_DIR_PATH}/build/boost/${BOOST_VERSION}"/ios/release/prefix/lib/*  "$EXTERNAL_IOS_LIB_DIR/"
diff --git a/external/ios/build_monero_all.sh b/external/ios/build_monero_all.sh
deleted file mode 100755
index 4957e69..0000000
--- a/external/ios/build_monero_all.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -e
-
-rm -rf build
-
-. ./config.sh
-
-rm -rf "$EXTERNAL_IOS_LIB_DIR"
-rm -rf "$EXTERNAL_IOS_INCLUDE_DIR"
-
-./install_missing_headers.sh
-./build_openssl.sh
-./build_boost.sh
-./build_sodium.sh
-./build_zmq.sh
-./build_unbound.sh
-
diff --git a/external/ios/build_openssl.sh b/external/ios/build_openssl.sh
deleted file mode 100755
index 4bf6aa2..0000000
--- a/external/ios/build_openssl.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. ./config.sh
-
-OPEN_SSL_DIR_PATH="${EXTERNAL_IOS_SOURCE_DIR}/OpenSSL"
-
-echo "============================ OpenSSL ============================"
-
-echo "Cloning Open SSL from - $OPEN_SSL_URL"
-
-# Check if the directory already exists.
-if [ -d "$OPEN_SSL_DIR_PATH" ]; then
-    echo "OpenSSL directory already exists."
-else
-    mkdir -p "$OPEN_SSL_DIR_PATH" || true
-    rm -rf "$OPEN_SSL_DIR_PATH"
-	cp -r "${MONEROC_DIR}/external/OpenSSL-for-iPhone" "$OPEN_SSL_DIR_PATH"
-fi
-cd "$OPEN_SSL_DIR_PATH"
-
-./build-libssl.sh --version=1.1.1q --targets="ios-cross-arm64" --deprecated
-
-
-cp -r "${OPEN_SSL_DIR_PATH}"/include/* "$EXTERNAL_IOS_INCLUDE_DIR/"
-cp "${OPEN_SSL_DIR_PATH}"/lib/libcrypto-iOS.a "${EXTERNAL_IOS_LIB_DIR}"/libcrypto.a
-cp "${OPEN_SSL_DIR_PATH}"/lib/libssl-iOS.a "${EXTERNAL_IOS_LIB_DIR}"/libssl.a
\ No newline at end of file
diff --git a/external/ios/build_sodium.sh b/external/ios/build_sodium.sh
deleted file mode 100755
index d8f8777..0000000
--- a/external/ios/build_sodium.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. ./config.sh
-
-SODIUM_PATH="${EXTERNAL_IOS_SOURCE_DIR}/libsodium"
-SODIUM_URL="https://github.com/jedisct1/libsodium.git"
-
-echo "============================ SODIUM ============================"
-
-echo "Cloning SODIUM from - $SODIUM_URL"
-
-# Check if the directory already exists.
-if [ -d "$SODIUM_PATH" ]; then
-    echo "Sodium directory already exists."
-else
-    echo "Cloning Sodium from $SODIUM_URL"
-    mkdir -p "$SODIUM_PATH" || true
-    rm -rf "$SODIUM_PATH"
-	cp -r "${MONEROC_DIR}/external/libsodium" "$SODIUM_PATH"
-fi
-
-cd "$SODIUM_PATH"
-../../../../libsodium_apple-ios.sh
-
-cp -r "${SODIUM_PATH}"/libsodium-apple/ios/include/* "$EXTERNAL_IOS_INCLUDE_DIR/"
-cp -r "${SODIUM_PATH}"/libsodium-apple/ios/lib/* "$EXTERNAL_IOS_LIB_DIR/"
\ No newline at end of file
diff --git a/external/ios/build_unbound.sh b/external/ios/build_unbound.sh
deleted file mode 100755
index 14efef8..0000000
--- a/external/ios/build_unbound.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. ./config.sh
-
-UNBOUND_VERSION=release-1.16.2
-UNBOUND_HASH="cbed768b8ff9bfcf11089a5f1699b7e5707f1ea5"
-UNBOUND_URL="https://www.nlnetlabs.nl/downloads/unbound/unbound-${UNBOUND_VERSION}.tar.gz"
-UNBOUND_GIT_URL="https://github.com/NLnetLabs/unbound.git"
-UNBOUND_DIR_PATH="${EXTERNAL_IOS_SOURCE_DIR}/unbound-1.16.2"
-
-echo "============================ Unbound ============================"
-rm -rf ${UNBOUND_DIR_PATH}
-
-# Check if the directory already exists.
-if [ -d "$UNBOUND_DIR_PATH" ]; then
-    echo "Unbound directory already exists."
-else
-    echo "Cloning Unbound from $Unbound_URL"
-    mkdir -p ${UNBOUND_DIR_PATH} || true
-    rm -rf ${UNBOUND_DIR_PATH}
-	cp -r "${MONEROC_DIR}/external/unbound" ${UNBOUND_DIR_PATH}
-fi
-
-cd $UNBOUND_DIR_PATH
-
-export IOS_SDK=iPhone
-export IOS_CPU=arm64
-export IOS_PREFIX=$EXTERNAL_IOS_DIR
-export AUTOTOOLS_HOST=aarch64-apple-ios
-export AUTOTOOLS_BUILD="$(./config.guess)"
-source ./contrib/ios/setenv_ios.sh
-./contrib/ios/install_tools.sh
-./contrib/ios/install_expat.sh
-./configure --build="$AUTOTOOLS_BUILD" --host="$AUTOTOOLS_HOST" --prefix="$IOS_PREFIX" --with-ssl="$IOS_PREFIX" --with-libexpat="$IOS_PREFIX"
-make -j$(sysctl -n hw.logicalcpu)
-make install
\ No newline at end of file
diff --git a/external/ios/build_wownero_seed.sh b/external/ios/build_wownero_seed.sh
deleted file mode 100755
index 7672db5..0000000
--- a/external/ios/build_wownero_seed.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-set -x -e
-
-. ./config.sh
-
-SEED_VERSION=0.3.0
-SEED_SRC_DIR="${EXTERNAL_IOS_SOURCE_DIR}/seed"
-
-rm -rf "$SEED_SRC_DIR" > /dev/null
-
-echo "[*] cloning $SEED_URL"
-mkdir -p ${SEED_SRC_DIR} || true
-rm -rf ${SEED_SRC_DIR}
-cp -r "${MONEROC_DIR}/external/wownero-seed" ${SEED_SRC_DIR}
-cd $SEED_SRC_DIR
-
-patch -p1 < ../../../../../wownero-seed-0001-fix-duplicate-symbol-error.patch
-
-BUILD_TYPE=release
-PREFIX=${EXTERNAL_IOS_DIR}
-DEST_LIB_DIR=${EXTERNAL_IOS_LIB_DIR}/wownero-seed
-DEST_INCLUDE_DIR=${EXTERNAL_IOS_INCLUDE_DIR}/wownero-seed
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-if [ -z $INSTALL_PREFIX ]; then
-    INSTALL_PREFIX=${ROOT_DIR}/wownero-seed
-fi
-
-for arch in "arm64" #"armv7" "arm64"
-do
-
-echo "Building wownero-seed IOS ${arch}"
-export CMAKE_INCLUDE_PATH="${PREFIX}/include"
-export CMAKE_LIBRARY_PATH="${PREFIX}/lib"
-
-case $arch in
-	"armv7"	)
-		DEST_LIB=../../lib-armv7;;
-	"arm64"	)
-		DEST_LIB=../../lib-armv8-a;;
-esac
-
-cmake -Bbuild -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DCMAKE_SYSTEM_NAME="iOS" -DCMAKE_OSX_ARCHITECTURES="${arch}" .
-make -Cbuild -j$(nproc)
-make -Cbuild install
-
-done
\ No newline at end of file
diff --git a/external/ios/build_zmq.sh b/external/ios/build_zmq.sh
deleted file mode 100755
index 63306b2..0000000
--- a/external/ios/build_zmq.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. ./config.sh
-
-ZMQ_PATH="${EXTERNAL_IOS_SOURCE_DIR}/libzmq"
-
-echo "============================ ZMQ ============================"
-
-echo "Cloning ZMQ from - $ZMQ_URL"
-
-# Check if the directory already exists.
-if [ -d "$ZMQ_PATH" ]; then
-    echo "ZeroMQ directory already exists."
-else
-    echo "Cloning ZeroMQ from $ZeroMQ_URL"
-    mkdir -p $ZMQ_PATH || true
-    rm -rf $ZMQ_PATH
-	cp -r "${MONEROC_DIR}/external/libzmq" $ZMQ_PATH
-fi
-
-cd $ZMQ_PATH
-
-mkdir -p cmake-build
-cd cmake-build
-cmake ..
-make -j$(sysctl -n hw.logicalcpu)
-
-
-cp ${ZMQ_PATH}/include/* $EXTERNAL_IOS_INCLUDE_DIR
-cp ${ZMQ_PATH}/cmake-build/lib/libzmq.a $EXTERNAL_IOS_LIB_DIR
\ No newline at end of file
diff --git a/external/ios/config.sh b/external/ios/config.sh
deleted file mode 100755
index e65c5a3..0000000
--- a/external/ios/config.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-export IOS_SCRIPTS_DIR="$(pwd)"
-export MONEROC_DIR="$(pwd)/../.."
-export CW_ROOT="${IOS_SCRIPTS_DIR}"
-export EXTERNAL_DIR="${CW_ROOT}/build"
-export EXTERNAL_IOS_DIR="${EXTERNAL_DIR}/ios"
-export EXTERNAL_IOS_SOURCE_DIR="${EXTERNAL_IOS_DIR}/sources"
-export EXTERNAL_IOS_LIB_DIR="${EXTERNAL_IOS_DIR}/lib"
-export EXTERNAL_IOS_INCLUDE_DIR="${EXTERNAL_IOS_DIR}/include"
-
-mkdir -p "$EXTERNAL_IOS_LIB_DIR"
-mkdir -p "$EXTERNAL_IOS_INCLUDE_DIR"
\ No newline at end of file
diff --git a/external/ios/install_missing_headers.sh b/external/ios/install_missing_headers.sh
deleted file mode 100755
index 5ae794a..0000000
--- a/external/ios/install_missing_headers.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. ./config.sh
-
-echo "Installing missing headers"
-
-# vmmeter
-mkdir -p ${EXTERNAL_IOS_INCLUDE_DIR}/sys
-
-if [ ! -f ${EXTERNAL_IOS_INCLUDE_DIR}/sys/vmmeter.h ]; then
-  cp /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/vmmeter.h ${EXTERNAL_IOS_INCLUDE_DIR}/sys/vmmeter.h
-fi
-
-# netinet
-mkdir -p ${EXTERNAL_IOS_INCLUDE_DIR}/netinet
-if [ ! -f ${EXTERNAL_IOS_INCLUDE_DIR}/netinet/ip_var.h ]; then
-  cp /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/netinet/ip_var.h ${EXTERNAL_IOS_INCLUDE_DIR}/netinet/ip_var.h
-fi
-
-if [ ! -f ${EXTERNAL_IOS_INCLUDE_DIR}/netinet/udp_var.h ]; then
-  cp /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/netinet/udp_var.h ${EXTERNAL_IOS_INCLUDE_DIR}/netinet/udp_var.h
-fi
-
-# IOKit
-mkdir -p ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit
-if [ ! -f ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOTypes.h ]; then
-  cp /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/Headers/IOTypes.h  ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOTypes.h
-fi
-
-if [ ! -f ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOMapTypes.h ]; then
-  cp /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/Headers/IOMapTypes.h  ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOMapTypes.h
-fi
-
-if [ ! -f ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOKitLib.h ]; then
-  cp /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/Headers/IOKitLib.h ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOKitLib.h
-fi
-
-if [ ! -f ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOReturn.h ]; then
-  cp /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/Headers/IOReturn.h ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOReturn.h
-fi
-
-if [ ! -f ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/OSMessageNotification.h ]; then
-  cp /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/Headers/OSMessageNotification.h  ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/OSMessageNotification.h
-fi
-
-# IOKit/ps
-mkdir -p ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/ps
-
-if [ ! -f ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/ps/IOPSKeys.h ]; then
-  cp /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/Headers/ps/IOPSKeys.h ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/ps/IOPSKeys.h
-fi
-
-if [ ! -f ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/ps/IOPowerSources.h ]; then
-  cp /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/Headers/ps/IOPowerSources.h ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/ps/IOPowerSources.h
-fi
-
-
-# libkern
-mkdir -p ${EXTERNAL_IOS_INCLUDE_DIR}/libkern
-
-if [ ! -f ${EXTERNAL_IOS_INCLUDE_DIR}/libkern/OSTypes.h ]; then
-  cp /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/libkern/OSTypes.h ${EXTERNAL_IOS_INCLUDE_DIR}/libkern/OSTypes.h
-fi
-
-if [ ! -f ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOKitKeys.h ]; then
-  cp /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/Headers/IOKitKeys.h ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOKitKeys.h
-fi
diff --git a/external/ios/libsodium_apple-ios.sh b/external/ios/libsodium_apple-ios.sh
deleted file mode 100755
index 963ba32..0000000
--- a/external/ios/libsodium_apple-ios.sh
+++ /dev/null
@@ -1,147 +0,0 @@
-#! /bin/sh
-
-export PREFIX="$(pwd)/libsodium-apple"
-export MACOS_ARM64_PREFIX="${PREFIX}/tmp/macos-arm64"
-export MACOS_X86_64_PREFIX="${PREFIX}/tmp/macos-x86_64"
-export IOS32_PREFIX="${PREFIX}/tmp/ios32"
-export IOS32s_PREFIX="${PREFIX}/tmp/ios32s"
-export IOS64_PREFIX="${PREFIX}/tmp/ios64"
-export IOS_SIMULATOR_ARM64_PREFIX="${PREFIX}/tmp/ios-simulator-arm64"
-export IOS_SIMULATOR_I386_PREFIX="${PREFIX}/tmp/ios-simulator-i386"
-export IOS_SIMULATOR_X86_64_PREFIX="${PREFIX}/tmp/ios-simulator-x86_64"
-export WATCHOS32_PREFIX="${PREFIX}/tmp/watchos32"
-export WATCHOS64_32_PREFIX="${PREFIX}/tmp/watchos64_32"
-export WATCHOS64_PREFIX="${PREFIX}/tmp/watchos64"
-export WATCHOS_SIMULATOR_ARM64_PREFIX="${PREFIX}/tmp/watchos-simulator-arm64"
-export WATCHOS_SIMULATOR_I386_PREFIX="${PREFIX}/tmp/watchos-simulator-i386"
-export WATCHOS_SIMULATOR_X86_64_PREFIX="${PREFIX}/tmp/watchos-simulator-x86_64"
-export TVOS_PREFIX="${PREFIX}/tmp/tvos"
-export TVOS_SIMULATOR_ARM64_PREFIX="${PREFIX}/tmp/tvos-simulator-arm64"
-export TVOS_SIMULATOR_X86_64_PREFIX="${PREFIX}/tmp/tvos-simulator-x86_64"
-export VISIONOS_PREFIX="${PREFIX}/tmp/visionos"
-export VISIONOS_SIMULATOR_PREFIX="${PREFIX}/tmp/visionos-simulator"
-export CATALYST_ARM64_PREFIX="${PREFIX}/tmp/catalyst-arm64"
-export CATALYST_X86_64_PREFIX="${PREFIX}/tmp/catalyst-x86_64"
-export LOG_FILE="${PREFIX}/tmp/build_log"
-export XCODEDIR="$(xcode-select -p)"
-
-export MACOS_VERSION_MIN=${MACOS_VERSION_MIN-"10.10"}
-export IOS_SIMULATOR_VERSION_MIN=${IOS_SIMULATOR_VERSION_MIN-"9.0.0"}
-export IOS_VERSION_MIN=${IOS_VERSION_MIN-"9.0.0"}
-export WATCHOS_SIMULATOR_VERSION_MIN=${WATCHOS_SIMULATOR_VERSION_MIN-"4.0.0"}
-export WATCHOS_VERSION_MIN=${WATCHOS_VERSION_MIN-"4.0.0"}
-export TVOS_SIMULATOR_VERSION_MIN=${TVOS_SIMULATOR_VERSION_MIN-"9.0.0"}
-export TVOS_VERSION_MIN=${TVOS_VERSION_MIN-"9.0.0"}
-
-echo
-echo "Warnings related to headers being present but not usable are due to functions"
-echo "that didn't exist in the specified minimum iOS version level."
-echo "They can be safely ignored."
-echo
-echo "Define the LIBSODIUM_FULL_BUILD environment variable to build the full"
-echo "library (including all deprecated/undocumented/low-level functions)."
-echo
-echo "Define the LIBSODIUM_SKIP_SIMULATORS environment variable to skip building"
-echo "the simulators libraries (iOS, watchOS, tvOS, visionOS simulators)."
-echo
-
-if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
-  export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
-else
-  export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
-fi
-
-APPLE_SILICON_SUPPORTED=false
-echo 'int main(void){return 0;}' >comptest.c && cc --target=arm64-macos comptest.c 2>/dev/null && APPLE_SILICON_SUPPORTED=true
-rm -f comptest.c
-
-NPROCESSORS=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
-PROCESSORS=${NPROCESSORS:-3}
-
-swift_module_map() {
-  echo 'module Clibsodium {'
-  echo '    header "sodium.h"'
-  echo '    export *'
-  echo '}'
-}
-
-build_ios() {
-  export BASEDIR="${XCODEDIR}/Platforms/iPhoneOS.platform/Developer"
-  export PATH="${BASEDIR}/usr/bin:$BASEDIR/usr/sbin:$PATH"
-  export SDK="${BASEDIR}/SDKs/iPhoneOS.sdk"
-
-  ## 32-bit iOS
-  export CFLAGS="-O2 -mthumb -arch armv7 -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
-  export LDFLAGS="-mthumb -arch armv7 -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
-
-  make distclean >/dev/null 2>&1
-  ./configure --host=arm-apple-darwin10 --prefix="$IOS32_PREFIX" \
-    ${LIBSODIUM_ENABLE_MINIMAL_FLAG} || exit 1
-  make -j${PROCESSORS} install || exit 1
-
-  ## 32-bit armv7s iOS
-  export CFLAGS="-O2 -mthumb -arch armv7s -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
-  export LDFLAGS="-mthumb -arch armv7s -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
-
-  make distclean >/dev/null 2>&1
-  ./configure --host=arm-apple-darwin10 --prefix="$IOS32s_PREFIX" \
-    ${LIBSODIUM_ENABLE_MINIMAL_FLAG} || exit 1
-  make -j${PROCESSORS} install || exit 1
-
-  ## 64-bit iOS
-  export CFLAGS="-O2 -arch arm64 -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
-  export LDFLAGS="-arch arm64 -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
-
-  make distclean >/dev/null 2>&1
-  ./configure --host=arm-apple-darwin10 --prefix="$IOS64_PREFIX" \
-    ${LIBSODIUM_ENABLE_MINIMAL_FLAG} || exit 1
-  make -j${PROCESSORS} install || exit 1
-}
-
-mkdir -p "${PREFIX}/tmp"
-
-echo "Building for iOS... ($LOG_FILE)"
-./autogen.sh
-./configure
-build_ios >"$LOG_FILE" 2>&1 || exit 1
-
-echo "Adding the Clibsodium module map for Swift..."
-
-find "$PREFIX" -name "include" -type d -print | while read -r f; do
-  swift_module_map >"${f}/module.modulemap"
-done
-
-echo "Bundling iOS targets..."
-
-mkdir -p "${PREFIX}/ios/lib"
-cp -a "${IOS64_PREFIX}/include" "${PREFIX}/ios/"
-for ext in a dylib; do
-  lipo -create \
-    "$IOS32_PREFIX/lib/libsodium.${ext}" \
-    "$IOS32s_PREFIX/lib/libsodium.${ext}" \
-    "$IOS64_PREFIX/lib/libsodium.${ext}" \
-    -output "$PREFIX/ios/lib/libsodium.${ext}"
-done
-
-echo "Creating Clibsodium.xcframework..."
-
-rm -rf "${PREFIX}/Clibsodium.xcframework"
-
-XCFRAMEWORK_ARGS=""
-for f in ios; do
-  XCFRAMEWORK_ARGS="${XCFRAMEWORK_ARGS} -library ${PREFIX}/${f}/lib/libsodium.a"
-  XCFRAMEWORK_ARGS="${XCFRAMEWORK_ARGS} -headers ${PREFIX}/${f}/include"
-done
-xcodebuild -create-xcframework \
-  ${XCFRAMEWORK_ARGS} \
-  -output "${PREFIX}/Clibsodium.xcframework" >/dev/null
-
-ls -ld -- "$PREFIX"
-ls -l -- "$PREFIX"
-ls -l -- "$PREFIX/Clibsodium.xcframework"
-
-echo "Done!"
-
-# Cleanup
-rm -rf -- "$PREFIX/tmp"
-make distclean >/dev/null
diff --git a/external/libexpat b/external/libexpat
deleted file mode 160000
-Subproject 038a0bf44f940ad7f7df59cfa5ed6fcb2c63f64
diff --git a/external/libsodium b/external/libsodium
deleted file mode 160000
-Subproject 3c6da4b8c27c7d546746eadabc9e2dd6c1fdfc2
diff --git a/external/libzmq b/external/libzmq
deleted file mode 160000
-Subproject 90b4f410a07222fa2e9a5f53b454a09d4533e45
diff --git a/external/macos/build_unbound.sh b/external/macos/build_unbound.sh
deleted file mode 100755
index d1c3825..0000000
--- a/external/macos/build_unbound.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-set -x -e
-
-. config.sh
-
-#### expat
-
-EXPAT_VERSION=R_2_4_8
-EXPAT_HASH="3bab6c09bbe8bf42d84b81563ddbcf4cca4be838"
-EXPAT_SRC_DIR=${EXTERNAL_MACOS_SOURCE_DIR}/libexpat
-rm -rf $EXPAT_SRC_DIR
-if [ -d "$EXPAT_SRC_DIR" ]; then
-    echo "Unbound directory already exists."
-else
-    echo "Cloning Unbound from $Unbound_URL"
-    mkdir -p ${EXPAT_SRC_DIR} || true
-    rm -rf ${EXPAT_SRC_DIR}
-	cp -r "${MONEROC_DIR}/external/libexpat" ${EXPAT_SRC_DIR}
-fi
-cd $EXPAT_SRC_DIR
-cd $EXPAT_SRC_DIR/expat
-
-./buildconf.sh
-./configure --enable-static --disable-shared --prefix=${EXTERNAL_MACOS_DIR}
-make
-make install
-
-#### unbound
-
-UNBOUND_VERSION=release-1.16.2
-UNBOUND_HASH="cbed768b8ff9bfcf11089a5f1699b7e5707f1ea5"
-UNBOUND_URL="https://www.nlnetlabs.nl/downloads/unbound/unbound-${UNBOUND_VERSION}.tar.gz"
-UNBOUND_DIR_PATH="${EXTERNAL_MACOS_SOURCE_DIR}/unbound-1.16.2"
-
-echo "============================ Unbound ============================"
-rm -rf ${UNBOUND_DIR_PATH}
-# Check if the directory already exists.
-if [ -d "$UNBOUND_DIR_PATH" ]; then
-    echo "Unbound directory already exists."
-else
-    echo "Cloning Unbound from $Unbound_URL"
-    mkdir -p ${UNBOUND_DIR_PATH} || true
-    rm -rf ${UNBOUND_DIR_PATH}
-	cp -r "${MONEROC_DIR}/external/unbound" ${UNBOUND_DIR_PATH}
-fi
-cd $UNBOUND_DIR_PATH
-./configure --prefix="${EXTERNAL_MACOS_DIR}" \
-	    --with-ssl="${HOMEBREW_PREFIX}" \
-			--with-libexpat="${EXTERNAL_MACOS_DIR}" \
-			--enable-static \
-			--disable-shared \
-			--disable-flto
-make
-make install
diff --git a/external/macos/config.sh b/external/macos/config.sh
deleted file mode 100755
index 3c40625..0000000
--- a/external/macos/config.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-export MACOS_SCRIPTS_DIR="$(pwd)"
-export CW_ROOT="${MACOS_SCRIPTS_DIR}"
-export EXTERNAL_DIR="${CW_ROOT}/build"
-export EXTERNAL_MACOS_DIR="${EXTERNAL_DIR}/MACOS"
-export EXTERNAL_MACOS_SOURCE_DIR="${EXTERNAL_MACOS_DIR}/sources"
-export EXTERNAL_MACOS_LIB_DIR="${EXTERNAL_MACOS_DIR}/lib"
-export EXTERNAL_MACOS_INCLUDE_DIR="${EXTERNAL_MACOS_DIR}/include"
-export MONEROC_DIR="$(pwd)/../.."
-
-mkdir -p "$EXTERNAL_MACOS_LIB_DIR" || true
-mkdir -p "$EXTERNAL_MACOS_INCLUDE_DIR" || true
\ No newline at end of file
diff --git a/external/polyseed b/external/polyseed
deleted file mode 160000
-Subproject bd79f5014c331273357277ed8a3d756fb61b9fa
diff --git a/external/unbound b/external/unbound
deleted file mode 160000
-Subproject cbed768b8ff9bfcf11089a5f1699b7e5707f1ea
diff --git a/external/wownero-seed b/external/wownero-seed
deleted file mode 160000
-Subproject d3f68be347facfeebbd8f68fd74982c705cb917
diff --git a/external/wownero-seed-0001-fix-duplicate-symbol-error.patch b/external/wownero-seed-0001-fix-duplicate-symbol-error.patch
deleted file mode 120000
index b31660d..0000000
--- a/external/wownero-seed-0001-fix-duplicate-symbol-error.patch
+++ /dev/null
@@ -1 +0,0 @@
-../wownero/contrib/depends/patches/wownero_seed/0001-fix-duplicate-symbol-error.patch
\ No newline at end of file