Bump version to 4.1.1

Reviewed-on: #110

.gitmodules

@@ -1,10 +1,9 @@
 [submodule "contrib/KDMacTouchBar"]
 	path = contrib/KDMacTouchBar
 	url = https://github.com/KDAB/KDMacTouchBar.git
-[submodule "monero"]
-	path = monero
-	url = https://git.wownero.com/wownero/wownero
-	branch = wowlet
 [submodule "contrib/quirc"]
 	path = contrib/quirc
 	url = https://github.com/dlbeer/quirc.git
+[submodule "wownero"]
+	path = wownero
+	url = https://git.wownero.com/wownero/wownero.git

CMakeLists.txt

@@ -4,19 +4,18 @@ project(wowlet)
 message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)
-set(VERSION_MAJOR "0")
-set(VERSION_MINOR "2")
-set(VERSION_REVISION "0")
-set(VERSION "beta-2")
+set(VERSION_MAJOR "4")
+set(VERSION_MINOR "1")
+set(VERSION_REVISION "1")
+set(VERSION "beta-8")
 
 option(FETCH_DEPS "Download dependencies if they are not found" ON)
-option(XMRIG "Include XMRig module" ON)
-option(OPENVR "Include OpenVR support" OFF)
-option(QML "Include QtQuick (QML)" OFF)
-option(TOR_BIN "Path to Tor binary to embed inside WOWlet" OFF)
+option(OPENVR "Include OpenVR support")
+option(ANDROID "Android deployment")
+option(ANDROID_DEBUG "View the Android app on desktop")
+option(TOR_BIN "Path to Tor binary to embed inside WOWlet")
 option(STATIC "Link libraries statically, requires static Qt")
-option(USE_DEVICE_TREZOR "Trezor support compilation" OFF)
-option(DONATE_BEG "Prompt donation window every once in a while" ON)
+option(USE_DEVICE_TREZOR "Trezor support compilation")
 list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_SOURCE_DIR}/cmake")
 include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
@@ -26,25 +25,18 @@ include(FindCcache)
 include(CheckIncludeFile)
 include(CheckSymbolExists)
 
-set(WOWNERO_HEAD "f611d5c9e32bc62f1735f6571b0bdb95cc020531")
+set(WOWNERO_HEAD "a21819cc22587e16af00e2c3d8f70156c11310a0")
 set(BUILD_GUI_DEPS ON)
-set(ARCH "x86-64")
-set(BUILD_64 ON)
+set(BUILD_64 ON CACHE BOOL "Build 64-bit binaries")
 set(INSTALL_VENDORED_LIBUNBOUND ${STATIC})
 set(USE_SINGLE_BUILDDIR ON)
-if(OPENVR)
-    set(QML ON)
-endif()
 
 # Are we in debug mode?
 set(_CMAKE_BUILD_TYPE "")
 string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE)
 if("${_CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
     set(DEBUG ON)
-
     set(CMAKE_VERBOSE_MAKEFILE ON)
-    message(STATUS "OPENVR: ${OPENVR}")
-    message(STATUS "QML: ${QML}")
 endif()
 
 check_include_file(sys/prctl.h HAVE_SYS_PRCTL_H)
@@ -59,7 +51,7 @@ if(STATIC)
     # manually set the unbound submodule the right commit that has the fix.
     # This only works with -DMANUAL_SUBMODULES=1
     message(STATUS "applying unbound static build fix contrib/unbound_static.patch")
-    execute_process(COMMAND bash -c "git -C ${CMAKE_SOURCE_DIR}/monero/external/unbound apply ${CMAKE_SOURCE_DIR}/contrib/unbound_static.patch")
+    execute_process(COMMAND bash -c "git -C ${CMAKE_SOURCE_DIR}/wownero/external/unbound apply ${CMAKE_SOURCE_DIR}/contrib/unbound_static.patch")
 
     set(Boost_USE_STATIC_LIBS ON)
     set(Boost_USE_STATIC_RUNTIME ON)
@@ -92,21 +84,9 @@ function (add_linker_flag_if_supported flag var)
 endfunction()
 
 find_package(Git)
-if(GIT_FOUND)
-    message(STATUS "Initializing submodules")
-    execute_process(COMMAND git "submodule" "update" "--init" "--recursive")
-    execute_process(COMMAND git rev-parse "HEAD" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/monero OUTPUT_VARIABLE _WOWNERO_HEAD OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if(NOT _WOWNERO_HEAD STREQUAL WOWNERO_HEAD)
-        message(FATAL_ERROR "[submodule] Monero HEAD was at ${_WOWNERO_HEAD} but should be at ${WOWNERO_HEAD}")
-    else()
-        message(STATUS "[submodule] Wownero HEAD @ ${WOWNERO_HEAD}")
-    endif()
-endif()
 
-add_subdirectory(monero)
-set_property(TARGET wallet_merged PROPERTY FOLDER "monero")
-get_directory_property(ARCH_WIDTH DIRECTORY "monero" DEFINITION ARCH_WIDTH)
-get_directory_property(UNBOUND_LIBRARY DIRECTORY "monero" DEFINITION UNBOUND_LIBRARY)
+add_subdirectory(wownero)
+get_directory_property(ARCH_WIDTH DIRECTORY "wownero" DEFINITION ARCH_WIDTH)
 
 include(CMakePackageConfigHelpers)
 include(VersionMonero)
@@ -116,9 +96,6 @@ include_directories(${EASYLOGGING_INCLUDE})
 link_directories(${EASYLOGGING_LIBRARY_DIRS})
 
 # OpenSSL
-if(APPLE AND NOT OPENSSL_ROOT_DIR)
-    execute_process(COMMAND brew --prefix openssl OUTPUT_VARIABLE OPENSSL_ROOT_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif()
 find_package(OpenSSL REQUIRED)
 message(STATUS "OpenSSL: Version ${OPENSSL_VERSION}")
 message(STATUS "OpenSSL: include dir at ${OPENSSL_INCLUDE_DIR}")
@@ -131,49 +108,28 @@ message(STATUS "libsodium: libraries at ${SODIUM_LIBRARY}")
 # HIDApi
 set(HIDAPI_FOUND OFF)
 
+# Unbound
+find_package(Unbound REQUIRED)
+
 # QrEncode
 find_package(QREncode REQUIRED)
 
-# Tevador 14 word Monero seed
-find_package(monero-seed CONFIG)
-if(NOT monero-seed_FOUND)
-  if(FETCH_DEPS)
-    FetchContent_Declare(monero-seed
-      GIT_REPOSITORY https://git.wownero.com/wowlet/monero-seed.git)
-    FetchContent_GetProperties(monero-seed)
-    if(NOT monero-seed_POPULATED)
-      message(STATUS "Fetching monero-seed")
-      FetchContent_Populate(monero-seed)
-      add_subdirectory(${monero-seed_SOURCE_DIR} ${monero-seed_BINARY_DIR})
-    endif()
-    add_library(monero-seed::monero-seed ALIAS monero-seed)
-  else()
-    message(FATAL_ERROR "monero-seed was not installed and fetching deps is disabled")
-  endif()
-endif()
+# Tevador 14 word seed (https://git.wownero.com/wowlet/wownero-seed)
+find_package(wownero-seed CONFIG REQUIRED)
 
 # Boost
 if(DEBUG)
     set(Boost_DEBUG ON)
 endif()
-if(APPLE AND NOT BOOST_ROOT)
-    execute_process(COMMAND brew --prefix boost OUTPUT_VARIABLE BOOST_ROOT OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif()
+
 if(MINGW)
     set(Boost_THREADAPI win32)
 endif()
-find_package(Boost 1.58 REQUIRED COMPONENTS
-        system
-        filesystem
-        thread
-        date_time
-        chrono
-        regex
-        serialization
-        program_options
-        locale)
-
-if(UNIX AND NOT APPLE)
+set(_BOOST_COMPONENTS system filesystem thread date_time chrono regex serialization program_options locale)
+
+find_package(Boost 1.58 REQUIRED COMPONENTS ${_BOOST_COMPONENTS})
+
+if(UNIX AND NOT ANDROID)
     if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
         # https://github.com/monero-project/monero-gui/issues/3142#issuecomment-705940446
         set(CMAKE_SKIP_RPATH ON)
@@ -195,40 +151,57 @@ if("$ENV{DRONE}" STREQUAL "true")
     message(STATUS "We are inside a static compile with Drone CI")
 endif()
 
-# To build WOWlet with embedded (and static) Tor, pass CMake -DTOR_BIN=/path/to/tor
-if(TOR_BIN)
-    if(APPLE)
-        execute_process(COMMAND bash -c "touch ${CMAKE_CURRENT_SOURCE_DIR}/src/tor/libevent-2.1.7.dylib")
+if(UNIX)
+    if(NOT CMAKE_PREFIX_PATH AND DEFINED ENV{CMAKE_PREFIX_PATH})
+        message(STATUS "Using CMAKE_PREFIX_PATH environment variable: '$ENV{CMAKE_PREFIX_PATH}'")
+        set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
     endif()
-
-    execute_process(COMMAND bash -c "${TOR_BIN} --version --quiet" OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE out RESULT_VARIABLE ret)
-    if (ret EQUAL "0")
-        set(TOR_VERSION "${out}")
+    if(APPLE AND NOT CMAKE_PREFIX_PATH)
+        execute_process(COMMAND brew --prefix qt5 OUTPUT_VARIABLE QT5_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+        list(APPEND CMAKE_PREFIX_PATH ${QT5_DIR})
     endif()
-    message(STATUS "${TOR_VERSION}")
-    configure_file("cmake/config-wowlet.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/src/config-wowlet.h")
+endif()
 
-    # on the buildbot Tor is baked into the image
+if(TOR_BIN)
+    # To build WOWlet with embedded & static Tor, pass CMake -DTOR_BIN=/path/to/tor_executable
+    # The CMake below will copy the Tor binary into src/assets/exec
+    #
+    # For release:
+    # ## Linux / Window
+    # on the buildbot(s) Tor is baked into the image
     # - linux: See `Dockerfile`
     # - windows: See `Dockerfile.windows`
-    # - macos: taken from Tor Browser official release
-    if(REPRODUCIBLE) # Always copy Tor when doing a reproducible build to prevent old versions from getting included
-        set(TOR_COPY_CMD "cp ${TOR_BIN} ${CMAKE_CURRENT_SOURCE_DIR}/src/assets/exec/tor")
-    else()
-        set(TOR_COPY_CMD "cp -u ${TOR_BIN} ${CMAKE_CURRENT_SOURCE_DIR}/src/assets/exec/tor")
+    if(NOT EXISTS "${TOR_BIN}")
+        message(FATAL_ERROR "TOR_BIN is set, but file does not exist: '${TOR_BIN}'")
     endif()
-    message(STATUS "${TOR_COPY_CMD}")
+
+    # copy the Tor executable over
+    set(TOR_COPY_CMD "cp ${TOR_BIN} ${CMAKE_CURRENT_SOURCE_DIR}/src/assets/exec/tor")
+    message(STATUS "Tor cmd: ${TOR_COPY_CMD}")
+
     execute_process(COMMAND bash -c "${TOR_COPY_CMD}" RESULT_VARIABLE ret)
     if(ret EQUAL "1")
         message(FATAL_ERROR "Tor copy failure: ${TOR_COPY_CMD}")
     endif()
 
+    # get Tor version while we're at it
+    if(NOT TOR_VERSION)
+        execute_process(COMMAND bash -c "${TOR_BIN} --version --quiet | head -n1" OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE out RESULT_VARIABLE ret)
+        if (ret EQUAL "0")
+            set(TOR_VERSION "${out}")
+        endif()
+    endif()
+    message(STATUS "Tor version: ${TOR_VERSION}")
+    configure_file("cmake/config-wowlet.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/src/config-wowlet.h")
+
     message(STATUS "Embedding Tor binary at ${TOR_BIN}")
 else()
     message(STATUS "Skipping Tor inclusion because -DTOR_BIN=Off")
 endif()
 
 if(MINGW)
+    find_package(Iconv REQUIRED)
+
     string(REGEX MATCH "^[^/]:/[^/]*" msys2_install_path "${CMAKE_C_COMPILER}")
     message(STATUS "MSYS location: ${msys2_install_path}")
     set(CMAKE_INCLUDE_PATH "${msys2_install_path}/mingw${ARCH_WIDTH}/include")
@@ -249,12 +222,10 @@ if(MINGW)
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wa,-mbig-obj")
     set(EXTRA_LIBRARIES mswsock;ws2_32;iphlpapi;crypt32;bcrypt)
     if(DEPENDS)
-	set(ICU_LIBRARIES iconv)
+	    set(ICU_LIBRARIES iconv)
     else()
         set(ICU_LIBRARIES icuio icuin icuuc icudt icutu iconv)
     endif()
-elseif(APPLE)
-    set(EXTRA_LIBRARIES "-framework AppKit")
 elseif(OPENBSD)
     set(EXTRA_LIBRARIES "")
 elseif(FREEBSD)
@@ -264,30 +235,13 @@ elseif(DRAGONFLY)
     set(EXTRA_LIBRARIES execinfo ${COMPAT})
 elseif(CMAKE_SYSTEM_NAME MATCHES "(SunOS|Solaris)")
     set(EXTRA_LIBRARIES socket nsl resolv)
-elseif(NOT MSVC AND NOT DEPENDS)
+elseif(NOT MSVC AND NOT DEPENDS AND NOT ANDROID)
     find_library(RT rt)
     set(EXTRA_LIBRARIES ${RT})
 endif()
 
 list(APPEND EXTRA_LIBRARIES ${CMAKE_DL_LIBS})
 
-if(APPLE)
-    include_directories(SYSTEM /usr/include/malloc)
-    if(POLICY CMP0042)
-        cmake_policy(SET CMP0042 NEW)
-    endif()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64 -fvisibility=default -std=c++11")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default -DGTEST_HAS_TR1_TUPLE=0")
-endif()
-
-if (APPLE AND NOT IOS)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64 -fvisibility=default -std=c++11")
-endif()
-
-if(APPLE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default -DGTEST_HAS_TR1_TUPLE=0")
-endif()
-
 # warnings
 # @TODO: enable these 2 for migration to Qt 6
 #add_c_flag_if_supported(-Werror C_SECURITY_FLAGS)
@@ -322,12 +276,7 @@ if (NOT (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION VER
 endif()
 
 # linker
-if (APPLE)
-    add_linker_flag_if_supported(-Wl,-bind_at_load LD_SECURITY_FLAGS)
-    add_linker_flag_if_supported(-Wl,-dead_strip LD_SECURITY_FLAGS)
-    add_linker_flag_if_supported(-Wl,-dead_strip_dylibs LD_SECURITY_FLAGS)
-endif()
-if (NOT APPLE AND NOT (WIN32 AND CMAKE_C_COMPILER_ID STREQUAL "GNU"))
+if (NOT (WIN32 AND CMAKE_C_COMPILER_ID STREQUAL "GNU"))
     # Windows binaries die on startup with PIE when compiled with GCC
     add_linker_flag_if_supported(-pie LD_SECURITY_FLAGS)
 endif()
@@ -357,6 +306,11 @@ if(STATIC)
     endif()
 endif()
 
+if(LINUX_ACTIVATION)
+    find_package(Cairo REQUIRED)
+    find_package(Xfixes REQUIRED)
+endif()
+
 # With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
 # is fixed in the code (Issue #847), force compiler to be conservative.
 add_c_flag_if_supported(-fno-strict-aliasing C_SECURITY_FLAGS)
@@ -373,10 +327,6 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
 
-if(APPLE)
-    add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/contrib/KDMacTouchBar")
-endif()
-
 if(OPENVR)
     # Add contrib/openvr as library
     add_definitions(-DVR_API_PUBLIC)
@@ -384,10 +334,6 @@ if(OPENVR)
     add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/contrib/openvr")
 endif()
 
-if(APPLE)
-    add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/contrib/KDMacTouchBar")
-endif()
-
 if(WITH_SCANNER)
     add_library(quirc STATIC
             contrib/quirc/lib/decode.c

Dockerfile

@@ -17,7 +17,6 @@ RUN wget https://www.openssl.org/source/openssl-1.1.1i.tar.gz && \
     cd openssl-1.1.1i && \
     ./config no-shared no-dso --prefix=/usr/local/openssl && \
     make -j$THREADS && \
-    make test && \
     make -j$THREADS install_sw && \
     rm -rf $(pwd)
 
@@ -66,10 +65,10 @@ RUN git clone -b tor-0.4.5.5-rc --depth 1 https://git.torproject.org/tor.git &&
     rm -rf $(pwd) && \
     strip -s -D /usr/local/tor/bin/tor
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 ARG THREADS=1
-ARG QT_VERSION=5.15.2
+ARG QT_VERSION=v5.15.2
 
 ENV CFLAGS="-fPIC"
 ENV CPPFLAGS="-fPIC"
@@ -95,7 +94,7 @@ RUN apt-get update && \
 # libusb
     libudev-dev \
 # fontconfig
-    autopoint gettext gperf libpng12-dev \
+    autopoint gettext gperf libpng-dev \
 # libxcb
     libpthread-stubs0-dev \
 # xorgproto
@@ -161,7 +160,7 @@ RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-
     cd libxcb-util && \
     git reset --hard acf790d7752f36e450d476ad79807d4012ec863b && \
     git submodule init && \
-    git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
+    git clone https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
     git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \
     ./autogen.sh --enable-shared --disable-static && \
     make -j$THREADS && \
@@ -172,7 +171,7 @@ RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-
     cd libxcb-image && \
     git reset --hard d882052fb2ce439c6483fce944ba8f16f7294639 && \
     git submodule init && \
-    git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
+    git clone https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
     git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \
     ./autogen.sh --enable-shared --disable-static && \
     make -j$THREADS && \
@@ -183,7 +182,7 @@ RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-
     cd libxcb-keysyms && \
     git reset --hard 0e51ee5570a6a80bdf98770b975dfe8a57f4eeb1 && \
     git submodule init && \
-    git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
+    git clone https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
     git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \
     ./autogen.sh --enable-shared --disable-static && \
     make -j$THREADS && \
@@ -194,7 +193,7 @@ RUN git clone -b 0.3.9 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-
     cd libxcb-render-util && \
     git reset --hard 0317caf63de532fd7a0493ed6afa871a67253747 && \
     git submodule init && \
-    git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
+    git clone https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
     git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \
     ./autogen.sh --enable-shared --disable-static && \
     make -j$THREADS && \
@@ -205,7 +204,7 @@ RUN git clone -b 0.4.1 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-
     cd libxcb-wm && \
     git reset --hard 24eb17df2e1245885e72c9d4bbb0a0f69f0700f2 && \
     git submodule init && \
-    git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
+    git clone https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
     git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \
     ./autogen.sh --enable-shared --disable-static && \
     make -j$THREADS && \
@@ -262,7 +261,7 @@ RUN git clone -b release-64-2 --depth 1 https://github.com/unicode-org/icu && \
     make -j$THREADS install && \
     rm -rf $(pwd)
 
-RUN wget https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.gz && \
+RUN wget https://boostorg.jfrog.io/artifactory/main/release/1.73.0/source/boost_1_73_0.tar.gz && \
     echo "9995e192e68528793755692917f9eb6422f3052a53c5e13ba278a228af6c7acf boost_1_73_0.tar.gz" | sha256sum -c && \
     tar -xzf boost_1_73_0.tar.gz && \
     rm boost_1_73_0.tar.gz && \
@@ -278,22 +277,46 @@ RUN wget https://www.openssl.org/source/openssl-1.1.1i.tar.gz && \
     cd openssl-1.1.1i && \
     ./config no-shared no-dso --prefix=/usr/local/openssl && \
     make -j$THREADS && \
-    make test && \
     make -j$THREADS install_sw && \
     rm -rf $(pwd)
 
+RUN wget https://github.com/libexpat/libexpat/releases/download/R_2_4_8/expat-2.4.8.tar.bz2 && \
+    echo "a247a7f6bbb21cf2ca81ea4cbb916bfb9717ca523631675f99b3d4a5678dcd16 expat-2.4.8.tar.bz2" | sha256sum -c && \
+    tar -xf expat-2.4.8.tar.bz2 && \
+    rm expat-2.4.8.tar.bz2 && \
+    cd expat-2.4.8 && \
+    ./configure --enable-static --disable-shared --prefix=/usr/local/expat/ && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN wget https://www.nlnetlabs.nl/downloads/unbound/unbound-1.16.2.tar.gz && \
+    echo "2e32f283820c24c51ca1dd8afecfdb747c7385a137abe865c99db4b257403581 unbound-1.16.2.tar.gz" | sha256sum -c && \
+    tar -xzf unbound-1.16.2.tar.gz && \
+    rm unbound-1.16.2.tar.gz && \
+    cd unbound-1.16.2 && \
+    ./configure --disable-shared --enable-static --without-pyunbound --with-libexpat=/usr/local/expat/ --with-ssl=/usr/local/openssl/ --with-libevent=no --without-pythonmodule --disable-flto --with-pthreads --with-libunbound-only --with-pic && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
 RUN rm /usr/lib/x86_64-linux-gnu/libX11.a && \
     rm /usr/lib/x86_64-linux-gnu/libXext.a && \
     rm /usr/lib/x86_64-linux-gnu/libX11-xcb.a && \
     git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 && \
     cd qt5 && \
     git clone git://code.qt.io/qt/qtbase.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtdeclarative.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtgraphicaleffects.git -b ${QT_VERSION} --depth 1 && \
     git clone git://code.qt.io/qt/qtimageformats.git -b ${QT_VERSION} --depth 1 && \
     git clone git://code.qt.io/qt/qtmultimedia.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtquickcontrols.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtquickcontrols2.git -b ${QT_VERSION} --depth 1 && \
     git clone git://code.qt.io/qt/qtsvg.git -b ${QT_VERSION} --depth 1 && \
     git clone git://code.qt.io/qt/qttools.git -b ${QT_VERSION} --depth 1 && \
     git clone git://code.qt.io/qt/qttranslations.git -b ${QT_VERSION} --depth 1 && \
     git clone git://code.qt.io/qt/qtx11extras.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtxmlpatterns.git -b ${QT_VERSION} --depth 1 && \
     git clone git://code.qt.io/qt/qtwebsockets.git -b ${QT_VERSION} --depth 1 && \
     sed -ri s/\(Libs:.*\)/\\1\ -lexpat/ /usr/local/lib/pkgconfig/fontconfig.pc && \
     sed -ri s/\(Libs:.*\)/\\1\ -lz/ /usr/local/lib/pkgconfig/freetype2.pc && \
@@ -301,18 +324,14 @@ RUN rm /usr/lib/x86_64-linux-gnu/libX11.a && \
     sed -i s/\\/usr\\/X11R6\\/lib64/\\/usr\\/local\\/lib/ qtbase/mkspecs/linux-g++-64/qmake.conf && \
     OPENSSL_LIBS="-lssl -lcrypto -lpthread -ldl" \
     ./configure --prefix=/usr -platform linux-g++-64 -opensource -confirm-license -release -static -no-avx \
-    -no-opengl -qpa xcb --xcb -xcb-xlib -feature-xlib -openssl-linked -I /usr/local/openssl/include \
-    -L /usr/local/openssl/lib -system-freetype -fontconfig -glib \
-    -no-dbus -no-sql-sqlite -no-use-gold-linker -no-kms \
+    -opengl desktop -qpa xcb -xcb -xcb-xlib -feature-xlib -system-freetype -fontconfig -glib \
+    -no-dbus -no-feature-qml-worker-script -no-linuxfb -no-openssl -no-sql-sqlite -no-kms -no-use-gold-linker \
     -qt-harfbuzz -qt-libjpeg -qt-libpng -qt-pcre -qt-zlib \
     -skip qt3d -skip qtandroidextras -skip qtcanvas3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d \
-    -skip qtdoc -skip qtquickcontrols -skip qtquickcontrols2 -skip qtspeech  -skip qtgamepad \
-    -skip qtlocation -skip qtmacextras -skip qtnetworkauth -skip qtpurchasing -optimize-size \
+    -skip qtdoc -skip qtgamepad -skip qtlocation -skip qtmacextras -skip qtnetworkauth -skip qtpurchasing \
     -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qttools \
     -skip qtvirtualkeyboard -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebview \
     -skip qtwinextras -skip qtx11extras -skip gamepad -skip serialbus -skip location -skip webengine \
-    -skip qtdeclarative \
-    -no-feature-cups -no-feature-ftp -no-feature-pdf -no-feature-animation \
     -nomake examples -nomake tests -nomake tools && \
     make -j$THREADS && \
     make -j$THREADS install && \
@@ -392,9 +411,9 @@ RUN git clone -b v4.0.2 --depth 1 https://github.com/fukuchi/libqrencode.git &&
     make -j$THREADS install && \
     rm -rf $(pwd)
 
-RUN git clone https://git.wownero.com/wowlet/monero-seed.git && \
-    cd monero-seed && \
-    git reset --hard 4674ef09b6faa6fe602ab5ae0b9ca8e1fd7d5e1b && \
+RUN git clone https://git.wownero.com/wowlet/wownero-seed.git && \
+    cd wownero-seed && \
+    git reset --hard ef6910b6bb3b61757c36e2e5db0927d75f1731c8 && \
     cmake -DCMAKE_BUILD_TYPE=Release -Bbuild && \
     make -Cbuild -j$THREADS && \
     make -Cbuild install && \
@@ -414,3 +433,7 @@ RUN mkdir linuxdeployqt && \
     chmod +x linuxdeployqt-7-x86_64.AppImage && \
     ./linuxdeployqt-7-x86_64.AppImage --appimage-extract && \
     rm linuxdeployqt-7-x86_64.AppImage
+
+RUN apt-get update && \
+    apt-get -o Dpkg::Options::="--force-confold" install -q -y --force-yes libcairo2-dev libxinerama-dev
+RUN git config --global --add safe.directory /wowlet

Dockerfile.android

@@ -0,0 +1,244 @@
+FROM debian:stretch
+
+ARG THREADS=1
+ARG ANDROID_NDK_REVISION=21d
+ARG ANDROID_NDK_HASH=bcf4023eb8cb6976a4c7cff0a8a8f145f162bf4d
+ARG ANDROID_SDK_REVISION=4333796
+ARG ANDROID_SDK_HASH=92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9
+ARG QT_VERSION=5.15.2
+
+WORKDIR /opt/android
+ENV WORKDIR=/opt/android
+
+ENV ANDROID_NATIVE_API_LEVEL=28
+ENV ANDROID_API=android-${ANDROID_NATIVE_API_LEVEL}
+ENV ANDROID_CLANG=aarch64-linux-android${ANDROID_NATIVE_API_LEVEL}-clang
+ENV ANDROID_CLANGPP=aarch64-linux-android${ANDROID_NATIVE_API_LEVEL}-clang++
+ENV ANDROID_NDK_ROOT=${WORKDIR}/android-ndk-r${ANDROID_NDK_REVISION}
+ENV ANDROID_SDK_ROOT=${WORKDIR}/tools
+ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+ENV PATH=${JAVA_HOME}/bin:${PATH}
+ENV PREFIX=${WORKDIR}/prefix
+ENV TOOLCHAIN_DIR=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64
+
+RUN apt-get update \
+    && apt-get install -y ant automake build-essential ca-certificates-java file gettext git libc6 libncurses5 \
+    libssl-dev libstdc++6 libtinfo5 libtool libz1 openjdk-8-jdk-headless openjdk-8-jre-headless pkg-config python3 \
+    unzip wget
+
+RUN wget -q https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_REVISION}.zip \
+    && unzip -q sdk-tools-linux-${ANDROID_SDK_REVISION}.zip \
+    && rm -f sdk-tools-linux-${ANDROID_SDK_REVISION}.zip
+
+RUN wget -q https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip \
+    && unzip -q android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip \
+    && rm -f android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip
+
+RUN cd ${ANDROID_SDK_ROOT} && echo y | ./bin/sdkmanager "platform-tools" "platforms;${ANDROID_API}" "tools" > /dev/null
+RUN cp -r ${WORKDIR}/platforms ${WORKDIR}/platform-tools ${ANDROID_SDK_ROOT}
+
+ENV HOST_PATH=${PATH}
+ENV PATH=${TOOLCHAIN_DIR}/aarch64-linux-android/bin:${TOOLCHAIN_DIR}/bin:${PATH}
+
+ARG ZLIB_VERSION=1.2.11
+ARG ZLIB_HASH=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+RUN wget -q https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz \
+    && tar -xzf zlib-${ZLIB_VERSION}.tar.gz \
+    && rm zlib-${ZLIB_VERSION}.tar.gz \
+    && cd zlib-${ZLIB_VERSION} \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --prefix=${PREFIX} --static \
+    && make -j${THREADS} \
+    && make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+RUN git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 \
+    && cd qt5 \
+    && perl init-repository --module-subset=default,-qtwebengine \
+    && PATH=${HOST_PATH} ./configure -v -developer-build -release \
+    -xplatform android-clang \
+    -android-ndk-platform ${ANDROID_API} \
+    -android-ndk ${ANDROID_NDK_ROOT} \
+    -android-sdk ${ANDROID_SDK_ROOT} \
+    -android-ndk-host linux-x86_64 \
+    -no-dbus \
+    -opengl es2 \
+    -no-use-gold-linker \
+    -no-sql-mysql \
+    -opensource -confirm-license \
+    -android-arch arm64-v8a \
+    -prefix ${PREFIX} \
+    -nomake tools -nomake tests -nomake examples \
+    -skip qtwebengine \
+    -skip qtserialport \
+    -skip qtconnectivity \
+    -skip qttranslations \
+    -skip qtpurchasing \
+    -skip qtgamepad -skip qtscript -skip qtdoc \
+    -no-warnings-are-errors \
+    && sed -i '213,215d' qtbase/src/3rdparty/pcre2/src/sljit/sljitConfigInternal.h \
+    && PATH=${HOST_PATH} make -j${THREADS} \
+    && PATH=${HOST_PATH} make -j${THREADS} install \
+    && cd qttools/src/linguist/lrelease \
+    && ../../../../qtbase/bin/qmake \
+    && PATH=${HOST_PATH} make -j${THREADS} install \
+    && cd ../../../.. \
+    && rm -rf $(pwd)
+
+ARG ICONV_VERSION=1.16
+ARG ICONV_HASH=e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04
+RUN wget -q http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz \
+    && echo "${ICONV_HASH}  libiconv-${ICONV_VERSION}.tar.gz" | sha256sum -c \
+    && tar -xzf libiconv-${ICONV_VERSION}.tar.gz \
+    && rm -f libiconv-${ICONV_VERSION}.tar.gz \
+    && cd libiconv-${ICONV_VERSION} \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --build=x86_64-linux-gnu --host=aarch64 --prefix=${PREFIX} --disable-rpath \
+    && make -j${THREADS} \
+    && make -j${THREADS} install
+
+ARG BOOST_VERSION=1_74_0
+ARG BOOST_VERSION_DOT=1.74.0
+ARG BOOST_HASH=83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1
+RUN wget -q https://dl.bintray.com/boostorg/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.bz2 \
+    && echo "${BOOST_HASH}  boost_${BOOST_VERSION}.tar.bz2" | sha256sum -c \
+    && tar -xf boost_${BOOST_VERSION}.tar.bz2 \
+    && rm -f boost_${BOOST_VERSION}.tar.bz2 \
+    && cd boost_${BOOST_VERSION} \
+    && PATH=${HOST_PATH} ./bootstrap.sh --prefix=${PREFIX} \
+    && PATH=${TOOLCHAIN_DIR}/bin:${HOST_PATH} ./b2 --build-type=minimal link=static runtime-link=static \
+    --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization \
+    --with-system --with-thread --with-locale --build-dir=android --stagedir=android toolset=clang threading=multi \
+    threadapi=pthread target-os=android -sICONV_PATH=${PREFIX} \
+    cflags='--target=aarch64-linux-android' \
+    cxxflags='--target=aarch64-linux-android' \
+    linkflags='--target=aarch64-linux-android --sysroot=${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm64 ${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_shared.so -nostdlib++' \
+    install -j${THREADS} \
+    && rm -rf $(pwd)
+
+ARG OPENSSL_VERSION=1.1.1g
+ARG OPENSSL_HASH=ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46
+RUN wget -q https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \
+    && tar -xzf openssl-${OPENSSL_VERSION}.tar.gz \
+    && rm openssl-${OPENSSL_VERSION}.tar.gz \
+    && cd openssl-${OPENSSL_VERSION} \
+    && ANDROID_NDK_HOME=${ANDROID_NDK_ROOT} ./Configure CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} \
+    android-arm64 no-asm no-shared --static \
+    --with-zlib-include=${PREFIX}/include --with-zlib-lib=${PREFIX}/lib \
+    --prefix=${PREFIX} --openssldir=${PREFIX} \
+    && sed -i 's/CNF_EX_LIBS=-ldl -pthread//g;s/BIN_CFLAGS=-pie $(CNF_CFLAGS) $(CFLAGS)//g' Makefile \
+    && ANDROID_NDK_HOME=${ANDROID_NDK_ROOT} make -j${THREADS} \
+    && make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+ARG ZMQ_VERSION=v4.3.3
+ARG ZMQ_HASH=04f5bbedee58c538934374dc45182d8fc5926fa3
+RUN git clone https://github.com/zeromq/libzmq.git -b ${ZMQ_VERSION} --depth 1 \
+    && cd libzmq \
+    && git checkout ${ZMQ_HASH} \
+    && ./autogen.sh \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --prefix=${PREFIX} --host=aarch64-linux-android \
+    --enable-static --disable-shared \
+    && make -j${THREADS} \
+    && make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+ARG SODIUM_VERSION=1.0.18
+ARG SODIUM_HASH=4f5e89fa84ce1d178a6765b8b46f2b6f91216677
+RUN set -ex \
+    && git clone https://github.com/jedisct1/libsodium.git -b ${SODIUM_VERSION} --depth 1 \
+    && cd libsodium \
+    && test `git rev-parse HEAD` = ${SODIUM_HASH} || exit 1 \
+    && ./autogen.sh \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --prefix=${PREFIX} --host=aarch64-linux-android --enable-static --disable-shared \
+    && make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+RUN git clone -b libgpg-error-1.38 --depth 1 git://git.gnupg.org/libgpg-error.git \
+    && cd libgpg-error \
+    && git reset --hard 71d278824c5fe61865f7927a2ed1aa3115f9e439 \
+    && ./autogen.sh \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --host=aarch64-linux-android --prefix=${PREFIX} --disable-rpath --disable-shared --enable-static --disable-doc --disable-tests \
+    && PATH=${TOOLCHAIN_DIR}/bin:${HOST_PATH} make -j${THREADS} \
+    && make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+RUN git clone -b libgcrypt-1.8.5 --depth 1 git://git.gnupg.org/libgcrypt.git \
+    && cd libgcrypt \
+    && git reset --hard 56606331bc2a80536db9fc11ad53695126007298 \
+    && ./autogen.sh \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --host=aarch64-linux-android --prefix=${PREFIX} --with-gpg-error-prefix=${PREFIX} --disable-shared --enable-static --disable-doc --disable-tests \
+    && PATH=${TOOLCHAIN_DIR}/bin:${HOST_PATH} make -j${THREADS} \
+    && make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+RUN cd tools \
+    && wget -q http://dl-ssl.google.com/android/repository/tools_r25.2.5-linux.zip \
+    && unzip -q tools_r25.2.5-linux.zip \
+    && rm -f tools_r25.2.5-linux.zip \
+    && echo y | ${ANDROID_SDK_ROOT}/tools/android update sdk --no-ui --all --filter build-tools-28.0.3
+
+RUN git clone -b v3.19.7 --depth 1 https://github.com/Kitware/CMake \
+    && cd CMake \
+    && git reset --hard 22612dd53a46c7f9b4c3f4b7dbe5c78f9afd9581 \
+    && PATH=${HOST_PATH} ./bootstrap \
+    && PATH=${HOST_PATH} make -j${THREADS} \
+    && PATH=${HOST_PATH} make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+RUN git clone -b v1.6.35 --depth 1 https://github.com/glennrp/libpng.git && \
+    cd libpng && \
+    git reset --hard c17d164b4467f099b4484dfd4a279da0bc1dbd4a \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --with-zlib-prefix="${PREFIX}" --host=aarch64-linux-android --prefix=${PREFIX} --disable-shared --enable-static \
+    && PATH=${TOOLCHAIN_DIR}/bin:${HOST_PATH} make -j${THREADS} \
+    && make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+# @TODO: don't hardcode ANDROID_PLATFORM
+RUN git clone -b v4.0.2 --depth 1 https://github.com/fukuchi/libqrencode.git && \
+    cd libqrencode && \
+    git reset --hard 59ee597f913fcfda7a010a6e106fbee2595f68e4 && \
+    CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} cmake \
+    -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake" \
+    -DANDROID_PLATFORM="28" \
+    -DBUILD_SHARED_LIBS=OFF \
+    -DARCH="armv8-a" \
+    -DANDROID_ABI="arm64-v8a" \
+    -DANDROID_TOOLCHAIN=clang \
+    -DCMAKE_PREFIX_PATH="${PREFIX}" \
+    -DPNG_PNG_INCLUDE_DIR="${PREFIX}/include/libpng16/" \
+    -DPNG_LIBRARY="${PREFIX}/lib/libqtlibpng_arm64-v8a.a" \
+    -DICONV_LIBRARY=/opt/android/prefix/lib/libiconv.a \
+    -DICONV_INCLUDE_DIR=/opt/android/prefix/include/ \
+    -DCMAKE_INSTALL_PREFIX="${PREFIX}" && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN ls -al && uname -a
+
+# @TODO: switch to Release
+CMD set -ex \
+    && cd /wowlet \
+    && mkdir -p build/Android/release \
+    && cd build/Android/release \
+    && E=1 cmake \
+    -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake" \
+    -DCMAKE_PREFIX_PATH="${PREFIX}" \
+    -DCMAKE_FIND_ROOT_PATH="${PREFIX}" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DARCH="armv8-a" \
+    -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} \
+    -DANDROID_ABI="arm64-v8a" \
+    -DANDROID_TOOLCHAIN=clang \
+    -DBoost_USE_STATIC_RUNTIME=ON \
+    -DLRELEASE_PATH="${PREFIX}/bin" \
+    -DQT_ANDROID_APPLICATION_BINARY="wowlet" \
+    -DWITH_SCANNER=ON \
+    -DUSE_DEVICE_TREZOR=OFF \
+    -DUSE_SINGLE_BUILDDIR=ON \
+    -DMANUAL_SUBMODULES=1 \
+    -DUSE_SINGLE_BUILDDIR=ON \
+    -DANDROID=ON \
+    ../../.. \
+    && PATH=${HOST_PATH} make generate_translations_header \
+    && make -j${THREADS} -C src \
+    && make -j${THREADS} apk

Dockerfile.windows

@@ -1,11 +1,12 @@
 FROM ubuntu:20.04
 
 ARG THREADS=1
-ARG QT_VERSION=5.15.2
+ARG QT_VERSION=v5.15.2
 ENV SOURCE_DATE_EPOCH=1397818193
 
 ENV OPENSSL_ROOT_DIR=/usr/local/openssl/
 ENV TOR_BIN=/usr/local/tor/bin/tor.exe
+ENV TOR_VERSION='tor-0.4.5.7'
 
 RUN apt update && \
     DEBIAN_FRONTEND=noninteractive apt install -y curl nano wget zip automake build-essential cmake gcc-mingw-w64 g++-mingw-w64 gettext git libtool pkg-config \
@@ -15,9 +16,9 @@ RUN apt update && \
 RUN update-alternatives --set x86_64-w64-mingw32-g++ $(which x86_64-w64-mingw32-g++-posix) && \
     update-alternatives --set x86_64-w64-mingw32-gcc $(which x86_64-w64-mingw32-gcc-posix)
 
-RUN git clone -b v0.17.1.9 --depth 1 https://github.com/monero-project/monero && \
+RUN git clone -b v0.18.2.0 --depth 1 https://github.com/monero-project/monero && \
     cd monero && \
-    git reset --hard 8fef32e45c80aec41f25be9d1d8fb75adc883c64 && \
+    git reset --hard 99be9a044f3854f339548e2d99c539c18d7b1b01 && \
     cp -a contrib/depends / && \
     cd .. && \
     rm -rf monero
@@ -95,7 +96,7 @@ RUN git clone -b v1.2.11 --depth 1 https://github.com/madler/zlib && \
     rm -rf $(pwd)
 
 # libpng -> libqrencode
-RUN git clone -b libpng16 --depth 1 https://github.com/glennrp/libpng.git && \
+RUN git clone -b libpng16 https://github.com/glennrp/libpng.git && \
     cd libpng && \
     git reset --hard a37d4836519517bdce6cb9d956092321eca3e73b && \
     CPPFLAGS="-I/depends/x86_64-w64-mingw32/include" LDFLAGS="-L/depends/x86_64-w64-mingw32/lib" \
@@ -174,9 +175,9 @@ RUN git clone -b tor-0.4.5.7 --depth 1 https://git.torproject.org/tor.git && \
     rm -rf $(pwd) && \
     strip -s -D /usr/local/tor/bin/tor.exe
 
-RUN git clone https://git.wownero.com/wowlet/monero-seed.git && \
-    cd monero-seed && \
-    git reset --hard 4674ef09b6faa6fe602ab5ae0b9ca8e1fd7d5e1b && \
+RUN git clone https://git.wownero.com/wowlet/wownero-seed.git && \
+    cd wownero-seed && \
+    git reset --hard ef6910b6bb3b61757c36e2e5db0927d75f1731c8 && \
     cmake -DCMAKE_INSTALL_PREFIX=/depends/x86_64-w64-mingw32 \
           -DCMAKE_BUILD_TYPE=Release \
           -DCMAKE_TOOLCHAIN_FILE=/depends/x86_64-w64-mingw32/share/toolchain.cmake -Bbuild && \
@@ -184,3 +185,5 @@ RUN git clone https://git.wownero.com/wowlet/monero-seed.git && \
     make -Cbuild install && \
     rm -rf $(pwd)
 
+RUN git config --global --add safe.directory /wowlet
+RUN git config --global --add safe.directory /wowlet/wownero

Dockerfile_macos

@@ -1,13 +0,0 @@
-# this image is used internally for the buildbot
-FROM ubuntu:20.04
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt clean && apt update
-RUN apt install -y git build-essential wget curl ngrep unzip file ssh zip
-
-RUN cat /dev/zero | ssh-keygen -q -N ""
-
-RUN cat ~/.ssh/id_rsa.pub
-
-RUN printf "Host *\n    StrictHostKeyChecking no" > ~/.ssh/config

Makefile

@@ -27,12 +27,9 @@
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
 
 CMAKEFLAGS = \
-	-DARCH=x86_64 \
 	-DBUILD_64=On \
 	-DBUILD_TESTS=Off \
 	-DOPENVR=Off \
-	-DQML=Off \
-	-DXMRIG=Off \
 	-DTOR_BIN=Off \
 	-DCMAKE_CXX_STANDARD=11 \
 	-DCMAKE_VERBOSE_MAKEFILE=On \
@@ -43,6 +40,8 @@ CMAKEFLAGS = \
 	$(CMAKEFLAGS_EXTRA)
 
 release-static: CMAKEFLAGS += -DBUILD_TAG="linux-x64"
+release-static: CMAKEFLAGS += -DXMRIG=OFF
+release-static: CMAKEFLAGS += -DARCH=x86-64
 release-static: CMAKEFLAGS += -DTOR_BIN=$(or ${TOR_BIN},OFF)
 release-static: CMAKEFLAGS += -DCMAKE_BUILD_TYPE=Release
 release-static: CMAKEFLAGS += -DREPRODUCIBLE=$(or ${SOURCE_DATE_EPOCH},OFF)
@@ -56,7 +55,7 @@ depends:
 
 windows:
 	mkdir -p build/$(target)/release
-	cd build/$(target)/release && cmake -D STATIC=ON -DZLIB_ROOT=/usr/x86_64-w64-mingw32/ -DREPRODUCIBLE=$(or ${SOURCE_DATE_EPOCH},OFF) -DTOR_VERSION=$(or ${TOR_VERSION}, OFF) -DOPENVR=ON -DQML=ON -DWITH_SCANNER=ON -DTOR_BIN=$(or ${TOR_BIN},OFF) -D DEV_MODE=$(or ${DEV_MODE},OFF) -D BUILD_TAG=$(tag) -D CMAKE_BUILD_TYPE=Debug -D CMAKE_TOOLCHAIN_FILE=$(root)/$(target)/share/toolchain.cmake ../../.. && $(MAKE)
+	cd build/$(target)/release && cmake -D STATIC=ON -DZLIB_ROOT=/usr/x86_64-w64-mingw32/ -DREPRODUCIBLE=$(or ${SOURCE_DATE_EPOCH},OFF) -DTOR_VERSION=$(or ${TOR_VERSION}, OFF) -DOPENVR=ON -DWITH_SCANNER=ON -DTOR_BIN=$(or ${TOR_BIN},OFF) -D DEV_MODE=$(or ${DEV_MODE},OFF) -D BUILD_TAG=$(tag) -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=$(root)/$(target)/share/toolchain.cmake ../../.. && $(MAKE)
 
 
 windows-mxe-release: CMAKEFLAGS += -DBUILD_TAG="win-x64"
@@ -74,12 +73,3 @@ windows-mxe-debug: CMAKEFLAGS += -DCMAKE_BUILD_TYPE=Debug
 windows-mxe-debug:
 	cmake -Bbuild $(CMAKEFLAGS)
 	$(MAKE) -Cbuild
-
-mac-release: CMAKEFLAGS += -DSTATIC=Off
-mac-release: CMAKEFLAGS += -DTOR_BIN=$(or ${TOR_BIN},OFF)
-mac-release: CMAKEFLAGS += -DBUILD_TAG="mac-x64"
-mac-release: CMAKEFLAGS += -DCMAKE_BUILD_TYPE=Release
-mac-release:
-	cmake -Bbuild $(CMAKEFLAGS)
-	$(MAKE) -Cbuild
-	$(MAKE) -Cbuild deploy

README.md

@@ -1,12 +1,14 @@
-[![Build Status](https://ci.wownero.com/api/badges/wowlet/wowlet/status.svg)](https://ci.wownero.com/wowlet/wowlet)
-
 # WOWlet- a free Wownero desktop wallet 
 
+WOWlet is a free, open-source Wownero client for Linux, Mac OS, and Windows.
 
-WOWlet is a free, open-source Wownero client for Linux with ports for Mac OS and Windows.
+![https://i.imgur.com/l7fUf0f.png](https://i.imgur.com/l7fUf0f.png)
 
 ## Development resources
+
 * Git: [git.wownero.com/wowlet/wowlet](https://git.wownero.com/wowlet/wowlet)
-* IRC: `#wownero` on Freenode
+* IRC: `#wownero-dev` on [OFTC](https://oftc.net/)
+* [Building WOWlet from source](https://git.wownero.com/wowlet/wowlet/src/branch/master/docs/BUILDING.md)
+* [Working on WOWlet](https://git.wownero.com/wowlet/wowlet/src/branch/master/docs/HACKING.md)
 
 Copyright (c) 2020-2021 The Monero Project.

cmake/Deploy.cmake

@@ -2,27 +2,4 @@ if(APPLE OR (WIN32 AND NOT STATIC))
     add_custom_target(deploy)
     get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION)
     get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)
-
-    if(APPLE AND NOT IOS)
-        find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${_qt_bin_dir}")
-        add_custom_command(TARGET deploy
-                POST_BUILD
-                COMMAND "${MACDEPLOYQT_EXECUTABLE}" "$<TARGET_FILE_DIR:wowlet>/../.." -always-overwrite
-                COMMENT "Running macdeployqt..."
-                )
-
-        # workaround for a Qt bug that requires manually adding libqsvg.dylib to bundle
-        find_file(_qt_svg_dylib "libqsvg.dylib" PATHS "${CMAKE_PREFIX_PATH}/plugins/imageformats" NO_DEFAULT_PATH)
-        if(_qt_svg_dylib)
-            add_custom_command(TARGET deploy
-                    POST_BUILD
-                    COMMAND ${CMAKE_COMMAND} -E copy ${_qt_svg_dylib} $<TARGET_FILE_DIR:wowlet>/../PlugIns/imageformats/
-                    COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtGui.framework/Versions/5/QtGui" "@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:wowlet>/../PlugIns/imageformats/libqsvg.dylib
-                    COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtWidgets.framework/Versions/5/QtWidgets" "@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:wowlet>/../PlugIns/imageformats/libqsvg.dylib
-                    COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtSvg.framework/Versions/5/QtSvg" "@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:wowlet>/../PlugIns/imageformats/libqsvg.dylib
-                    COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtCore.framework/Versions/5/QtCore" "@executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:wowlet>/../PlugIns/imageformats/libqsvg.dylib
-                    COMMENT "Copying libqsvg.dylib, running install_name_tool"
-                    )
-        endif()
-    endif()
-endif()
+endif()

cmake/FindCairo.cmake

@@ -0,0 +1,81 @@
+# - Try to find Cairo
+# Once done, this will define
+#
+#  CAIRO_FOUND - system has Cairo
+#  CAIRO_INCLUDE_DIRS - the Cairo include directories
+#  CAIRO_LIBRARIES - link these to use Cairo
+#
+# Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1.  Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+# 2.  Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+FIND_PACKAGE(PkgConfig)
+PKG_CHECK_MODULES(PC_CAIRO cairo) # FIXME: After we require CMake 2.8.2 we can pass QUIET to this call.