lost seed script

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")
@@ -253,8 +226,6 @@ if(MINGW)
     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()

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.
+
+FIND_PATH(CAIRO_INCLUDE_DIRS
+        NAMES cairo.h
+        HINTS ${PC_CAIRO_INCLUDEDIR}
+        ${PC_CAIRO_INCLUDE_DIRS}
+        PATH_SUFFIXES cairo
+        )
+
+FIND_LIBRARY(CAIRO_LIBRARIES
+        NAMES cairo
+        HINTS ${PC_CAIRO_LIBDIR}
+        ${PC_CAIRO_LIBRARY_DIRS}
+        )
+
+IF (CAIRO_INCLUDE_DIRS)
+    IF (EXISTS "${CAIRO_INCLUDE_DIRS}/cairo-version.h")
+        FILE(READ "${CAIRO_INCLUDE_DIRS}/cairo-version.h" CAIRO_VERSION_CONTENT)
+
+        STRING(REGEX MATCH "#define +CAIRO_VERSION_MAJOR +([0-9]+)" _dummy "${CAIRO_VERSION_CONTENT}")
+        SET(CAIRO_VERSION_MAJOR "${CMAKE_MATCH_1}")
+
+        STRING(REGEX MATCH "#define +CAIRO_VERSION_MINOR +([0-9]+)" _dummy "${CAIRO_VERSION_CONTENT}")
+        SET(CAIRO_VERSION_MINOR "${CMAKE_MATCH_1}")
+
+        STRING(REGEX MATCH "#define +CAIRO_VERSION_MICRO +([0-9]+)" _dummy "${CAIRO_VERSION_CONTENT}")
+        SET(CAIRO_VERSION_MICRO "${CMAKE_MATCH_1}")
+
+        SET(CAIRO_VERSION "${CAIRO_VERSION_MAJOR}.${CAIRO_VERSION_MINOR}.${CAIRO_VERSION_MICRO}")
+    ENDIF ()
+ENDIF ()
+
+# FIXME: Should not be needed anymore once we start depending on CMake 2.8.3
+SET(VERSION_OK TRUE)
+IF (Cairo_FIND_VERSION)
+    IF (Cairo_FIND_VERSION_EXACT)
+        IF ("${Cairo_FIND_VERSION}" VERSION_EQUAL "${CAIRO_VERSION}")
+            # FIXME: Use IF (NOT ...) with CMake 2.8.2+ to get rid of the ELSE block
+        ELSE ()
+            SET(VERSION_OK FALSE)
+        ENDIF ()
+    ELSE ()
+        IF ("${Cairo_FIND_VERSION}" VERSION_GREATER "${CAIRO_VERSION}")
+            SET(VERSION_OK FALSE)
+        ENDIF ()
+    ENDIF ()
+ENDIF ()
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cairo DEFAULT_MSG CAIRO_INCLUDE_DIRS CAIRO_LIBRARIES VERSION_OK)

cmake/FindXfixes.cmake

@@ -0,0 +1,26 @@
+# - Find XFixes
+# Find the XFixes libraries
+#
+#  This module defines the following variables:
+#     XFIXES_FOUND        - 1 if XFIXES_INCLUDE_DIR & XFIXES_LIBRARY are found, 0 otherwise
+#     XFIXES_INCLUDE_DIR  - where to find Xlib.h, etc.
+#     XFIXES_LIBRARY      - the X11 library
+#
+
+find_path( XFIXES_INCLUDE_DIR
+        NAMES X11/extensions/Xfixes.h
+        PATH_SUFFIXES X11/extensions
+        DOC "The XFixes include directory" )
+
+find_library( XFIXES_LIBRARY
+        NAMES Xfixes
+        PATHS /usr/lib /lib
+        DOC "The XFixes library" )
+
+if( XFIXES_INCLUDE_DIR AND XFIXES_LIBRARY )
+    set( XFIXES_FOUND 1 )
+else()
+    set( XFIXES_FOUND 0 )
+endif()
+
+mark_as_advanced( XFIXES_INCLUDE_DIR XFIXES_LIBRARY )

cmake/GenVersion.cmake

@@ -35,7 +35,7 @@ if(RET)
     message(WARNING "Cannot determine current commit. Make sure that you are building either from a Git working tree or from a source archive.")
     set(VERSIONTAG "unknown")
     set(VERSION_IS_RELEASE "false")
-    configure_file("monero/src/version.cpp.in" "${TO}")
+    configure_file("wownero/src/version.cpp.in" "${TO}")
 else()
     string(SUBSTRING ${COMMIT} 0 9 COMMIT)
     message(STATUS "You are currently on commit ${COMMIT}")
@@ -61,5 +61,5 @@ else()
             set(VERSION_IS_RELEASE "false")
         endif()
     endif()
-    configure_file("monero/src/version.cpp.in" "${TO}")
+    configure_file("wownero/src/version.cpp.in" "${TO}")
 endif()

cmake/VersionMonero.cmake

@@ -4,7 +4,7 @@
 find_package(Git QUIET)
 # Check what commit we're on
 execute_process(COMMAND "${GIT_EXECUTABLE}" rev-parse --short=9 HEAD RESULT_VARIABLE RET OUTPUT_VARIABLE COMMIT OUTPUT_STRIP_TRAILING_WHITESPACE
-                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/monero)
+                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/wownero)
 
 if(RET)
     # Something went wrong, set the version tag to -unknown
@@ -37,7 +37,7 @@ endif()
 
 # Check latest tagged release
 execute_process(COMMAND "${GIT_EXECUTABLE}" describe --abbrev=0 RESULT_VARIABLE RET OUTPUT_VARIABLE TAG OUTPUT_STRIP_TRAILING_WHITESPACE
-                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/monero)
+                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/wownero)
 
 if(RET)
     message(WARNING "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive.")

cmake/config-wowlet.h.cmake

@@ -3,6 +3,7 @@
 
 #define WOWLET_VERSION "@VERSION@"
 #define WOWLET_BRANCH "@WOWLET_BRANCH@"
+#define WOWLET_VERSION_SEMVER "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_REVISION@"
 
 #define MONERO_VERSION "@MONERO_VERSION@"
 #define MONERO_BRANCH "@MONERO_BRANCH@"

contrib/build-appimage.sh

@@ -1,33 +0,0 @@
-#!/bin/bash
-
-set -e
-unset SOURCE_DATE_EPOCH
-
-APPDIR="$PWD/wowlet.AppDir"
-
-mkdir -p "$APPDIR"
-mkdir -p "$APPDIR/usr/share/applications/"
-mkdir -p "$APPDIR/usr/bin"
-
-cp "$PWD/src/assets/org.wowlet.wowlet.desktop" "$APPDIR/usr/share/applications/org.wowlet.wowlet.desktop"
-cp "$PWD/src/assets/images/appicons/64x64.png" "$APPDIR/wowlet.png"
-cp "$PWD/build/bin/wowlet" "$APPDIR/usr/bin/wowlet"
-
-LD_LIBRARY_PATH=/usr/local/lib /linuxdeployqt/squashfs-root/AppRun wowlet.AppDir/usr/share/applications/org.wowlet.wowlet.desktop -bundle-non-qt-libs
-
-find wowlet.AppDir/ -exec touch -h -a -m -t 202101010100.00 {} \;
-
-# Manually create AppImage (reproducibly)
-
-# download runtime
-wget -nc https://github.com/AppImage/AppImageKit/releases/download/12/runtime-x86_64
-echo "24da8e0e149b7211cbfb00a545189a1101cb18d1f27d4cfc1895837d2c30bc30 runtime-x86_64" | sha256sum -c
-
-mksquashfs wowlet.AppDir wowlet.squashfs -info -root-owned -no-xattrs -noappend -fstime 0
-# mksquashfs writes a timestamp to the header
-printf '\x00\x00\x00\x00' | dd conv=notrunc of=wowlet.squashfs bs=1 seek=$((0x8))
-
-rm -f wowlet.AppImage
-cat runtime-x86_64 >> wowlet.AppImage
-cat wowlet.squashfs >> wowlet.AppImage
-chmod a+x wowlet.AppImage

contrib/debian/build-deb.sh

@@ -22,13 +22,13 @@ mkdir -p "$DEBDIR/usr/share/icons/hicolor/256x256/apps/"
 
 # Copy over assets
 
-cp "$PWD/src/assets/control" "$DEBDIR/DEBIAN/control"
-cp "$PWD/src/assets/copyright" "$DEBDIR/debian/copyright"
-cp "$PWD/src/assets/copyright" "$DEBDIR/usr/share/doc/wowlet/copyright"
-cp "$PWD/src/assets/changelog.gz" "$DEBDIR/usr/share/doc/wowlet/changelog.gz"
+cp "$PWD/contrib/debian/control" "$DEBDIR/DEBIAN/control"
+cp "$PWD/contrib/debian/copyright" "$DEBDIR/debian/copyright"
+cp "$PWD/contrib/debian/copyright" "$DEBDIR/usr/share/doc/wowlet/copyright"
+cp "$PWD/contrib/debian/changelog.gz" "$DEBDIR/usr/share/doc/wowlet/changelog.gz"
 cp "$PWD/src/assets/org.wowlet.wowlet.metainfo.xml" "$DEBDIR/usr/share/metainfo/org.wowlet.wowlet.metainfo.xml"
 cp "$PWD/README.md" "$DEBDIR/usr/share/doc/wowlet/README"
-cp "$PWD/SECURITY.md" "$DEBDIR/usr/share/doc/wowlet/SECURITY"
+cp "$PWD/docs/SECURITY.md" "$DEBDIR/usr/share/doc/wowlet/SECURITY"
 cp "$PWD/build/bin/wowlet" "$DEBDIR/usr/bin/wowlet"
 cp "$PWD/src/assets/org.wowlet.wowlet.desktop" "$DEBDIR/usr/share/applications/org.wowlet.wowlet.desktop"
 cp "$PWD/src/assets/wowlet.1.gz" "$DEBDIR/usr/share/man/man1/wowlet.1.gz"
@@ -43,4 +43,4 @@ cp "$PWD/src/assets/images/appicons/256x256.png" "$DEBDIR/usr/share/icons/hicolo
 # Build deb package
 
 dpkg-deb --build $DEBDIR
-mv wowlet.DebDir.deb wowlet_1.0_amd64.deb
+mv wowlet.DebDir.deb wowlet_2.1_amd64.deb

contrib/debian/control

@@ -1,5 +1,5 @@
 Package: wowlet
-Version: 1.0
+Version: 2.1
 Section: net
 Priority: optional
 Architecture: amd64

docs/BUILDING.md

@@ -1,108 +1,71 @@
-## Buildbot builds
+# Building WOWlet
 
-The docker build bins can be found here: https://build.wownero.org/files/
-
-## Docker static builds
-
-Static builds via Docker are done in 3 steps:
+Building for Linux and Windows via Docker is done in 3 steps:
 
 1. Cloning this repository (+submodules)
 2. Creating a base Docker image
 3. Using the base image to compile a build
 
-### Linux (reproducible)
+**important:** you only have to do step 2 (base docker image) once.
+
+For Mac OS, scroll down.
+
+# Linux
 
-The docker image for reproducible Linux static builds uses Ubuntu 16.04 and compiles the required libraries statically 
-so that the resulting `wowlet` binary is static. For more information, check the Dockerfile: `Dockerfile`.
+For more information, check the Dockerfile: `Dockerfile`.
 
-#### 1. Clone
+### 1. Clone
 
 ```bash
 git clone --branch master --recursive https://git.wownero.com/wowlet/wowlet.git
 cd wowlet
 ```
 
-Replace `master` with the desired version tag (e.g. `beta-4`) to build the release binary.
+Replace `master` with the desired version tag (e.g. `v3.1.0`) to build the release binary.
 
-#### 2. Base image
+### 2. Base image
 
 ```bash
-docker build --tag wowlet:linux --build-arg THREADS=4 .
+docker build --tag wowlet:linux --build-arg THREADS=6 .
 ```
 
-Building the base image takes a while. You only need to build the base image once.
+Building the base image takes a while. **You only need to build the base image once.**
 
-#### 3. Build
-
-##### Standalone binary
+### 3. Build
 
 ```bash
-docker run --rm -it -v $PWD:/wowlet -w /wowlet wowlet:linux sh -c 'make release-static -j4'
+docker run --rm -it -v $PWD:/wowlet -w /wowlet wowlet:linux sh -c 'make release-static -j6'
 ```
 
 If you're re-running a build make sure to `rm -rf build/` first.
 
 The resulting binary can be found in `build/bin/wowlet`.
 
-##### AppImage
+# Windows
 
-First create the standalone binary using the Docker command in the previous step.
-
-```bash
-docker run --rm -it -v $PWD:/wowlet -w /wowlet wowlet:linux contrib/build-appimage.sh
-```
-
-### Windows (reproducible)
-
-#### 1. Clone
+### 1. Clone
 
 ```bash
 git clone --branch master --recursive https://git.wownero.com/wowlet/wowlet.git
 cd wowlet
 ```
 
-Replace `master` with the desired version tag (e.g. `beta-4`) to build the release binary.
-
-#### 2. Base image
+Replace `master` with the desired version tag (e.g. `v3.1.0`) to build the release binary.
 
+### 2. Base image
 
 ```bash
-docker build -f Dockerfile.windows --tag wowlet:win --build-arg THREADS=4 .
+docker build -f Dockerfile.windows --tag wowlet:win --build-arg THREADS=6 .
 ```
 
-Building the base image takes a while. You only need to build the base image once.
+Building the base image takes a while. **You only need to build the base image once.**
 
-#### 3. Build
+### 3. Build
 
 ```bash
-docker run --rm -it -v $PWD:/wowlet -w /wowlet wowlet:win sh -c 'make depends root=/depends target=x86_64-w64-mingw32 tag=win-x64 -j4'
+docker run --rm -it -v $PWD:/wowlet -w /wowlet wowlet:win sh -c 'make windows root=/depends target=x86_64-w64-mingw32 tag=win-x64 -j6'
 ```
 
 If you're re-running a build make sure to `rm -rf build/` first.
 
 The resulting binary can be found in `build/x86_64-w64-mingw32/release/bin/wowlet.exe`.
-
-## macOS
-
-For MacOS it's easiest to leverage [brew](https://brew.sh) to install the required dependencies. 
-
-```bash
-HOMEBREW_OPTFLAGS="-march=core2" HOMEBREW_OPTIMIZATION_LEVEL="O0" \
-    brew install boost zmq openssl libpgm miniupnpc libsodium expat libunwind-headers protobuf libgcrypt qrencode ccache cmake pkgconfig git
-```
-
-Clone the repository.
-
-```bash
-git clone --recursive https://git.wownero.com/wowlet/wowlet.git
-``` 
-
-Get the latest LTS from here: https://www.qt.io/offline-installers and install.
-
-Build WOWlet.
-
-```bash
-CMAKE_PREFIX_PATH=~/Qt5.15.1/5.15.1/clang_64 make mac-release
-```
-
-The resulting Mac OS application can be found `build/bin/wowlet.app` and will **not** have Tor embedded.

docs/HACKING.md

@@ -22,47 +22,33 @@ by running this command: `pandoc wowlet.1.md -s -t man -o wowlet.1 && gzip wowle
 
 ## Requirements
 
+(Possibly out-of-date)
+
 ### Ubuntu/Debian
 
 ```bash
 apt install -y git cmake libqrencode-dev build-essential cmake libboost-all-dev \
 miniupnpc libunbound-dev graphviz doxygen libunwind8-dev pkg-config libssl-dev \
 libzmq3-dev libsodium-dev libhidapi-dev libnorm-dev libusb-1.0-0-dev libpgm-dev \
-libprotobuf-dev protobuf-compiler libgcrypt20-dev
-```
-
-## Mac OS
-
-```bash
-brew install boost zmq openssl libpgm miniupnpc libsodium expat libunwind-headers \
-protobuf libgcrypt qrencode ccache cmake pkgconfig git
+libprotobuf-dev protobuf-compiler libgcrypt20-dev libpng-dev
 ```
 
 ## CMake
 
-After installing Qt you might have a folder called `/home/$user/Qt/`. You need to pass this to CMake 
+After installing Qt you might have a folder called `/home/$USER/Qt/`. You need to pass this to CMake 
 via the `CMAKE_PREFIX_PATH` definition.
 
 ```
--DCMAKE_PREFIX_PATH=/home/$user/QtNew/5.15.0/gcc_64
+-DCMAKE_PREFIX_PATH=/home/$USER/QtFooBar/5.15.0/gcc_64
 ```
 
-There are some Wownero/WOWlet related options/definitions that you may pass:
-
-- `-DXMRIG=OFF` - disable XMRig feature
-- `-DTOR_BIN=/path/to/tor` - Embed a Tor executable inside WOWlet
-- `-DDONATE_BEG=OFF` - disable the dreaded donate requests
+There are some Wownero/WOWlet related options/definitions that you may pass, see also `CMakeLists.txt`.
 
-And:
+At a bare minimum, recommended:
 
-```
--DMANUAL_SUBMODULES=1  
--DUSE_DEVICE_TREZOR=OFF 
--DUSE_SINGLE_BUILDDIR=ON 
--DDEV_MODE=ON 
-```
+`-DMANUAL_SUBMODULES=1 -DUSE_DEVICE_TREZOR=OFF -DUSE_SINGLE_BUILDDIR=ON -DDEV_MODE=ON`
 
-If you have OpenSSL installed in a custom location, try:
+If you have OpenSSL installed at a custom location, try:
 
 ```
 -DOPENSSL_INCLUDE_DIR=/usr/local/lib/openssl-1.1.1g/include 
@@ -85,7 +71,7 @@ Enable debugging symbols:
 ## Wowlet
 
 It's best to install Tor locally as a service and start `wowlet` with `--use-local-tor`, this 
-prevents the child process from starting up and saves time.
+prevents the child process from starting up each time you launch WOWlet and thus saves time.
 
 #### Ubuntu/Debian
 
@@ -94,19 +80,10 @@ apt install -y tor
 sudo service tor start
 ```
 
-#### Mac OS
-
-```bash
-brew install tor
-brew services start tor
-```
-
 To skip the wizards and open a wallet directly use `--wallet-file`: 
 
 ```bash
 ./wowlet --use-local-tor --wallet-file /home/user/Wownero/wallets/bla.keys
 ```
 
-It is recommended that you use `--stagenet` for development. Testnet is also possible, 
-but you'll have to provide Wownero a testnet node of your own.
  

monero

@@ -1 +0,0 @@
-Subproject commit f611d5c9e32bc62f1735f6571b0bdb95cc020531

src/CMakeLists.txt

@@ -2,14 +2,9 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-# pthread
 find_package(Threads REQUIRED)
-
-if(QML)
-    # PNG
-    find_package(ZLIB REQUIRED)
-    find_package(PNG REQUIRED)
-endif()
+find_package(ZLIB REQUIRED)
+find_package(PNG REQUIRED)
 
 # Compile these source files (.h/.cpp)
 file(GLOB SOURCE_FILES
@@ -39,11 +34,7 @@ file(GLOB SOURCE_FILES
         "dialog/*.cpp"
         )
 
-if(QML)
-    find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui Network Svg Xml WebSockets Quick Qml QuickControls2 QmlImportScanner Multimedia)
-else()
-    find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui Network Svg Xml WebSockets Multimedia)
-endif()
+find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui Network Svg Xml WebSockets Quick QuickWidgets Qml QuickControls2 QuickCompiler QmlImportScanner Multimedia)
 
 if(OPENVR)
     # include some extra files
@@ -57,12 +48,20 @@ if(OPENVR)
     list(APPEND SOURCE_FILES ${SOURCE_FILES_QML})
 endif()
 
+if(ANDROID OR ANDROID_DEBUG)
+    qt5_add_resources(RESOURCES mobile/qml.qrc)
+    file(GLOB SOURCE_FILES_QML
+            "mobile/*.h"
+            "mobile/*.cpp"
+            )
+    list(APPEND SOURCE_FILES ${SOURCE_FILES_QML})
+endif()
+
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wno-deprecated-declarations")  # @TODO: removeme
 
 add_subdirectory(libwalletqt)
 add_subdirectory(model)
 add_subdirectory(utils)
-add_subdirectory(openpgp)
 
 if(WITH_SCANNER)
     add_subdirectory(QR-Code-scanner)
@@ -71,11 +70,7 @@ endif()
 qt5_add_resources(RESOURCES assets.qrc)
 
 if(TOR_BIN)
-    if(APPLE)
-        set(ASSETS_TOR "assets_tor_macos.qrc")
-    else()
     set(ASSETS_TOR "assets_tor.qrc")
-    endif()
 endif()
 
 set(EXECUTABLE_FLAG)
@@ -98,11 +93,16 @@ if(APPLE)
     list(APPEND RESOURCES ${ICON})
 endif()
 
-add_executable(wowlet ${EXECUTABLE_FLAG} main.cpp
+if(NOT ANDROID)
+    add_executable(wowlet ${EXECUTABLE_FLAG} main.cpp
             ${SOURCE_FILES}
             ${RESOURCES}
             ${ASSETS_TOR}
-)
+            )
+else()
+    add_library(wowlet SHARED ${SOURCE_FILES} ${RESOURCES})
+    set_target_properties(wowlet PROPERTIES COMPILE_DEFINITIONS "ANDROID")
+endif()
 
 # mac os bundle
 set_target_properties(wowlet PROPERTIES
@@ -122,10 +122,10 @@ file(GLOB_RECURSE SRC_HEADERS *.h)
 
 target_include_directories(wowlet PUBLIC
         ${CMAKE_BINARY_DIR}/src/wowlet_autogen/include
-        ${CMAKE_SOURCE_DIR}/monero/include
-        ${CMAKE_SOURCE_DIR}/monero/src
-        ${CMAKE_SOURCE_DIR}/monero/external/easylogging++
-        ${CMAKE_SOURCE_DIR}/monero/contrib/epee/include
+        ${CMAKE_SOURCE_DIR}/wownero/include
+        ${CMAKE_SOURCE_DIR}/wownero/src
+        ${CMAKE_SOURCE_DIR}/wownero/external/easylogging++
+        ${CMAKE_SOURCE_DIR}/wownero/contrib/epee/include
         ${CMAKE_SOURCE_DIR}/src
         ${CMAKE_CURRENT_SOURCE_DIR}
         ${CMAKE_CURRENT_SOURCE_DIR}/daemon
@@ -135,7 +135,9 @@ target_include_directories(wowlet PUBLIC
         ${CMAKE_CURRENT_SOURCE_DIR}/tor
         ${CMAKE_CURRENT_SOURCE_DIR}/qrcode
         ${X11_INCLUDE_DIR}
+        ${QRENCODE_INCLUDE_DIR}
         ${Boost_INCLUDE_DIRS}
+        ${Iconv_INCLUDE_DIRS}
         ${OPENSSL_INCLUDE_DIR}
         ${Qt5Core_INCLUDE_DIRS}
         ${Qt5Widgets_INCLUDE_DIRS}
@@ -146,20 +148,27 @@ target_include_directories(wowlet PUBLIC
         ${Qt5WebSockets_INCLUDE_DIRS}
         )
 
-if(OPENVR)
-    target_include_directories(wowlet PUBLIC ${CMAKE_SOURCE_DIR}/contrib/)
+if(LINUX_ACTIVATION)
+    target_include_directories(wowlet PUBLIC
+            ${CAIRO_INCLUDE_DIRS}
+            ${XFIXES_INCLUDE_DIR}
+            )
 endif()
 
-if(DONATE_BEG)
-    target_compile_definitions(wowlet PRIVATE DONATE_BEG=1)
+if(OPENVR)
+    target_include_directories(wowlet PUBLIC ${CMAKE_SOURCE_DIR}/contrib/)
 endif()
 
 if(TOR_BIN)
     target_compile_definitions(wowlet PRIVATE HAS_TOR_BIN=1)
 endif()
 
-if(XMRIG)
-    target_compile_definitions(wowlet PRIVATE HAS_XMRIG=1)
+if(ANDROID)
+    target_compile_definitions(wowlet PRIVATE HAS_ANDROID=1)
+endif()
+
+if(ANDROID_DEBUG)
+    target_compile_definitions(wowlet PRIVATE HAS_ANDROID_DEBUG=1)
 endif()
 
 if(OPENVR)
@@ -175,8 +184,8 @@ if(STATIC)
     target_compile_definitions(wowlet PRIVATE STATIC=1)
 endif()
 
-if(STATIC)
-    target_compile_definitions(wowlet PRIVATE STATIC=1)
+if(LINUX_ACTIVATION)
+    target_compile_definitions(wowlet PRIVATE LINUX_ACTIVATION=1)
 endif()
 
 if("$ENV{DRONE}" STREQUAL "true")
@@ -194,10 +203,7 @@ endif()
 
 target_compile_definitions(wowlet PUBLIC VR_API_PUBLIC)
 
-if(QML)
-    qt5_import_qml_plugins(${PROJECT_NAME})
-    target_compile_definitions(wowlet PRIVATE HAS_QML=1)
-endif()
+qt5_import_qml_plugins(${PROJECT_NAME})
 
 target_compile_definitions(wowlet
         PUBLIC
@@ -212,32 +218,34 @@ target_compile_definitions(wowlet
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
 
-if(UNIX AND NOT APPLE)
+if(UNIX)
     # https://stackoverflow.com/questions/57766620/cmake-add-library-doesnt-initialize-static-global-variable
     # so that contrib/monero-seed/src/gf_elem.cpp properly initializes. A better solution is welcome.
-    target_link_libraries(wowlet PUBLIC -Wl,--whole-archive monero-seed::monero-seed -Wl,--no-whole-archive)
-else()
-    target_link_libraries(wowlet PUBLIC monero-seed::monero-seed)
+    target_link_libraries(wowlet PUBLIC -Wl,--whole-archive wownero-seed::wownero-seed -Wl,--no-whole-archive)
+endif()
+
+if(ANDROID)
+    # yolo some hardcoded paths
+    target_include_directories(wowlet PUBLIC
+            /opt/android/prefix/include/QtAndroidExtras/
+            )
 endif()
 
 # Link Wownero core libraries
 target_link_libraries(wowlet PUBLIC
-        wallet_merged
-        ${LMDB_LIBRARY}
         epee
-        ${UNBOUND_LIBRARY}
-        ${SODIUM_LIBRARY}
+        wallet_api
         easylogging
-        blockchain_db
-        hardforks
         ${Boost_LIBRARIES}
         ${OPENSSL_LIBRARIES}
         ${CMAKE_DL_LIBS}
+        ${Iconv_LIBRARIES}
+        ${UNBOUND_LIBRARIES}
+#        /usr/local/lib/libunbound.a
         ${EXTRA_LIBRARIES})
 
 # Link Qt libraries
-if(QML)
-    target_link_libraries(wowlet PUBLIC
+target_link_libraries(wowlet PUBLIC
         Qt5::Core
         Qt5::Widgets
         Qt5::Gui
@@ -249,26 +257,51 @@ if(QML)
         Qt5::WebSockets
         Qt5::Quick
         Qt5::Qml
-            Qt5::QuickControls2)
-else()
+        Qt5::QuickControls2
+        Qt5::QuickWidgets)
+
+if(ANDROID)
+    # yolo some hardcoded paths
     target_link_libraries(wowlet PUBLIC
-            Qt5::Core
-            Qt5::Widgets
-            Qt5::Gui
-            Qt5::Network
-            Qt5::Svg
-            Qt5::Xml
-            Qt5::WebSockets)
+            /opt/android/prefix/lib/libQt5QuickTemplates2_arm64-v8a.so
+            /opt/android/prefix/lib/libQt5Quick_arm64-v8a.so
+            /opt/android/prefix/lib/libQt5QmlModels_arm64-v8a.so
+            /opt/android/prefix/lib/libQt5Qml_arm64-v8a.so
+            /opt/android/prefix/lib/libQt5Svg_arm64-v8a.so
+            /opt/android/prefix/lib/libQt5Widgets_arm64-v8a.so
+            /opt/android/prefix/lib/libQt5Gui_arm64-v8a.so
+            /opt/android/prefix/lib/libQt5Xml_arm64-v8a.so
+            /opt/android/prefix/lib/libQt5XmlPatterns_arm64-v8a.so
+            /opt/android/prefix/lib/libQt5Network_arm64-v8a.so
+            /opt/android/prefix/lib/libQt5Core_arm64-v8a.so
+            /opt/android/prefix/lib/libQt5VirtualKeyboard_arm64-v8a.so
+            /opt/android/prefix/lib/libQt5AndroidExtras_arm64-v8a.so
+            /opt/android/prefix/plugins/bearer/libplugins_bearer_qandroidbearer_arm64-v8a.so
+            GLESv2
+            log
+            z
+            jnigraphics
+            android
+            EGL
+            c++_shared
+            )
 endif()
 
 # Link random other stuff
 target_link_libraries(wowlet PUBLIC
-        ${ICU_LIBRARIES}
-        openpgp
         Threads::Threads
         ${QRENCODE_LIBRARY}
         )
 
+# Link Cairo and Xfixes
+if(LINUX_ACTIVATION)
+    target_link_libraries(wowlet PUBLIC
+            ${CAIRO_LIBRARIES}
+            ${XFIXES_LIBRARY}
+            ${X11_Xinerama_LIB}
+            )
+endif()
+
 # Link scanner
 if(WITH_SCANNER)
     target_link_libraries(wowlet PUBLIC qrdecoder qrscanner)
@@ -293,26 +326,16 @@ if(OPENVR)
     endif()
 endif()
 
-if(APPLE)
-    target_link_libraries(wowlet
-            KDMacTouchBar
-            )
-    target_include_directories(wowlet
-            PUBLIC ../contrib/KDMacTouchBar)
-endif()
-
-if(NOT APPLE)
-    target_link_libraries(wowlet PUBLIC
+target_link_libraries(wowlet PUBLIC
         Qt5::QSvgIconPlugin
         Qt5::QSvgPlugin
-    )
-endif()
+)
 
 if(STATIC)
     target_link_libraries(wowlet PUBLIC
             Qt5::QSvgIconPlugin
             Qt5::QSvgPlugin)
-    if(UNIX AND NOT APPLE)
+    if(UNIX)
 	    target_link_libraries(wowlet PUBLIC
             	Qt5::QXcbIntegrationPlugin)
     endif()
@@ -322,10 +345,54 @@ if(X11_FOUND)
     target_link_libraries(wowlet PUBLIC ${X11_LIBRARIES})
 endif()
 
-if(APPLE)
-    include(Deploy)
-endif()
-
 install(TARGETS wowlet
         DESTINATION ${CMAKE_INSTALL_PREFIX}
         )
+
+
+message(STATUS "\n====================================== SUMMARY")
+if(GIT_FOUND)
+    execute_process(COMMAND git rev-parse "HEAD" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/wownero OUTPUT_VARIABLE _WOWNERO_HEAD OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(NOT _WOWNERO_HEAD STREQUAL WOWNERO_HEAD)
+        message(STATUS "[+] WOWNERO HEAD: ${_WOWNERO_HEAD} ... while CMake requested ${WOWNERO_HEAD}")
+    else()
+        message(STATUS "[+] WOWNERO HEAD: ${WOWNERO_HEAD}")
+    endif()
+endif()
+message(STATUS "[+] VERSION: ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}-${VERSION}")
+message(STATUS "[+] STATIC: ${STATIC}")
+message(STATUS "[+] Include Valve's OpenVR library: ${OPENVR}")
+message(STATUS "[+] This build is for Android: ${ANDROID}")
+message(STATUS "[+] This build is for testing the Android app on desktop: ${ANDROID_DEBUG}")
+message(STATUS "[+] TOR_BIN: ${TOR_BIN}")
+message(STATUS "[+] LINUX_ACTIVATION: ${LINUX_ACTIVATION}")
+
+message(STATUS "[+] OpenSSL")
+message(STATUS "  - version: ${OPENSSL_VERSION}")
+message(STATUS "  - dirs: ${OPENSSL_INCLUDE_DIR}")
+message(STATUS "  - libs: ${OPENSSL_LIBRARIES} ${OPENSSL_SSL_LIBRARIES}")
+
+if(CAIRO_FOUND)
+    message(STATUS "[+] Cairo")
+    message(STATUS "  - version: ${CAIRO_VERSION}")
+    message(STATUS "  - dirs: ${CAIRO_INCLUDE_DIRS}")
+    message(STATUS "  - libs: ${CAIRO_LIBRARIES}")
+endif()
+
+if(XFIXES_FOUND)
+    message(STATUS "[+] Xfixes")
+    message(STATUS "  - dirs: ${XFIXES_INCLUDE_DIR}")
+    message(STATUS "  - libs: ${XFIXES_LIBRARY}")
+endif()
+
+message(STATUS "[+] Boost")
+message(STATUS "  - version: ${Boost_VERSION}")
+message(STATUS "  - dirs: ${Boost_INCLUDE_DIRS}")
+message(STATUS "  - libs: ${Boost_LIBRARIES}")
+
+if(Iconv_FOUND)
+    message(STATUS "[+] Iconv")
+    message(STATUS "  - version: ${Iconv_VERSION}")
+    message(STATUS "  - libs: ${Iconv_LIBRARIES}")
+    message(STATUS "  - dirs: ${Iconv_INCLUDE_DIRS}")
+endif()

src/appcontext.cpp

@@ -6,6 +6,7 @@
 
 #include "appcontext.h"
 #include "globals.h"
+#include "config-wowlet.h"
 
 // libwalletqt
 #include "libwalletqt/TransactionHistory.h"
@@ -30,85 +31,90 @@ AppContext::AppContext(QCommandLineParser *cmdargs) {
     this->cmdargs = cmdargs;
     AppContext::isQML = false;
 
+    // OS & env
 #if defined(Q_OS_MAC)
+    this->isMac = true;
     this->isTorSocks = qgetenv("DYLD_INSERT_LIBRARIES").indexOf("libtorsocks") >= 0;
+#elif __ANDROID__
+    this->isAndroid = true;
 #elif defined(Q_OS_LINUX)
+    this->isLinux = true;
     this->isTorSocks = qgetenv("LD_PRELOAD").indexOf("libtorsocks") >= 0;
+    this->isTails = TailsOS::detect();
+    this->isWhonix = WhonixOS::detect();
 #elif defined(Q_OS_WIN)
+    this->isWindows = true;
     this->isTorSocks = false;
 #endif
+    this->androidDebug = cmdargs->isSet("android-debug");
 
-    this->isTails = TailsOS::detect();
-    this->isWhonix = WhonixOS::detect();
-
-    //Paths
+    // Paths
+    this->pathGenericData = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
     this->configRoot = QDir::homePath();
-    if (isTails) { // #if defined(PORTABLE)
-        QString portablePath = []{
-            QString appImagePath = qgetenv("APPIMAGE");
-            if (appImagePath.isEmpty()) {
-                qDebug() << "Not an appimage, using currentPath()";
-                return QDir::currentPath() + "/.wowlet";
-            }
-
-            QFileInfo appImageDir(appImagePath);
-            return appImageDir.absoluteDir().path() + "/.wowlet";
-        }();
-
-
-        if (QDir().mkpath(portablePath)) {
-            this->configRoot = portablePath;
-        } else {
-            qCritical() << "Unable to create portable directory: " << portablePath;
-        }
-    }
-
     this->accountName = Utils::getUnixAccountName();
     this->homeDir = QDir::homePath();
 
+    this->configDirectory = QString("%1/.config/wowlet/").arg(this->configRoot);
+    this->configDirectoryVR = QString("%1%2").arg(this->configDirectory, "vr");
+
+    if (isTails) this->setupPathsTails();
+
     QString walletDir = config()->get(Config::walletDirectory).toString();
-    if (walletDir.isEmpty()) {
-#if defined(Q_OS_LINUX) or defined(Q_OS_MAC)
-        this->defaultWalletDir = QString("%1/Wownero/wallets").arg(this->configRoot);
-        this->defaultWalletDirRoot = QString("%1/Wownero").arg(this->configRoot);
-#elif defined(Q_OS_WIN)
-        this->defaultWalletDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + "/Wownero";
-        this->defaultWalletDirRoot = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
-#endif
+    if(walletDir.isEmpty()) {
+        if (isAndroid && !androidDebug) setupPathsAndroid();
+        else if (isWindows) setupPathsWindows();
+        else if (isLinux || isMac) setupPathsUnix();
     } else {
         this->defaultWalletDir = walletDir;
         this->defaultWalletDirRoot = walletDir;
     }
 
+#ifdef __ANDROID__
+    // can haz disk I/O?
+    QVector<QString> perms = {
+        "android.permission.WRITE_EXTERNAL_STORAGE",
+        "android.permission.READ_EXTERNAL_STORAGE"
+    };
+    Utils::androidAskPermissions(perms);
+#endif
+
     // Create wallet dirs
+    qDebug() << "creating " << defaultWalletDir;
     if (!QDir().mkpath(defaultWalletDir))
         qCritical() << "Unable to create dir: " << defaultWalletDir;
 
-    this->configDirectory = QString("%1/.config/wowlet/").arg(this->configRoot);
-#if defined(Q_OS_UNIX)
-    if(!this->configDirectory.endsWith('/'))
-        this->configDirectory = QString("%1/").arg(this->configDirectory);
-#endif
-    this->configDirectoryVR = QString("%1%2").arg(this->configDirectory, "vr");
-
     // Create some directories
     createConfigDirectory(this->configDirectory);
-
-//    if(this->cmdargs->isSet("stagenet"))
-//        this->networkType = NetworkType::STAGENET;
-//    else if(this->cmdargs->isSet("testnet"))
-//        this->networkType = NetworkType::TESTNET;
-//    else
     this->networkType = NetworkType::MAINNET;
 
+    qDebug() << "configRoot: " << this->configRoot;
+    qDebug() << "homeDir: " << this->homeDir;
+    qDebug() << "customWalletDir: " << walletDir;
+    qDebug() << "defaultWalletDir: " << this->defaultWalletDir;
+    qDebug() << "defaultWalletDirRoot: " << this->defaultWalletDirRoot;
+    qDebug() << "configDirectory: " << this->configDirectory;
+
 //    auto nodeSourceUInt = config()->get(Config::nodeSource).toUInt();
 //    AppContext::nodeSource = static_cast<NodeSource>(nodeSourceUInt);
     this->nodes = new Nodes(this, this->networkClearnet);
     connect(this, &AppContext::nodeSourceChanged, this->nodes, &Nodes::onNodeSourceChanged);
     connect(this, &AppContext::setCustomNodes, this->nodes, &Nodes::setCustomNodes);
 
-    // Tor & socks proxy
-    this->ws = new WSClient(this, wsUrl);
+    // init backend URLs
+    if(cmdargs->isSet("backend-host"))
+      this->backendHost = cmdargs->value("backend-host");
+    if(cmdargs->isSet("backend-host"))
+      this->backendPort = cmdargs->value("backend-port").toUInt();
+    if(cmdargs->isSet("backend-tls"))
+      this->backendTLS = true;
+
+    backendWSUrl = this->backendTLS ? "wss://" : "ws://";
+    backendWSUrl += QString("%1:%2").arg(this->backendHost).arg(this->backendPort);
+    backendHTTPUrl = this->backendTLS ? "https://" : "http://";
+    backendHTTPUrl += QString("%1:%2").arg(this->backendHost).arg(this->backendPort);
+
+    // init websocket client
+    this->ws = new WSClient(this);
     connect(this->ws, &WSClient::WSMessage, this, &AppContext::onWSMessage);
     connect(this->ws, &WSClient::connectionEstablished, this, &AppContext::wsConnected);
     connect(this->ws, &WSClient::closed, this, &AppContext::wsDisconnected);
@@ -119,6 +125,24 @@ AppContext::AppContext(QCommandLineParser *cmdargs) {
         this->storeWallet();
     });
 
+    // If system clock skewed for >= 300 seconds, assume a wake-up from hibernate and reload the websocket connection
+    if(!this->isAndroid)
+        m_hibernateTimer.start(3 * 1000);
+
+    m_hibernatePreviousTime = std::chrono::steady_clock::now();
+    connect(&m_hibernateTimer, &QTimer::timeout, [this]() {
+        const auto now = std::chrono::steady_clock::now();
+        const auto elapsed = now - m_hibernatePreviousTime;
+
+        if(elapsed >= m_hibernateDetectInterval) {
+            qCritical() << "Clock skew detected, resetting websocket connection";
+            this->ws->webSocket.abort();
+            this->ws->start();
+        }
+
+        m_hibernatePreviousTime = now;
+    });
+
     // restore height lookup
     this->initRestoreHeights();
 
@@ -139,10 +163,8 @@ AppContext::AppContext(QCommandLineParser *cmdargs) {
     AppContext::prices = new Prices();
 
     // XMRig
-#ifdef HAS_XMRIG
     this->XMRig = new XmRig(this->configDirectory, this);
     this->XMRig->prepare();
-#endif
 
     this->walletManager = WalletManager::instance();
     QString logPath = QString("%1/daemon.log").arg(configDirectory);
@@ -160,17 +182,25 @@ AppContext::AppContext(QCommandLineParser *cmdargs) {
 
     // libwallet connects
     connect(this->walletManager, &WalletManager::walletOpened, this, &AppContext::onWalletOpened);
+
+    // hideOnClose
+    auto hideOnClose = config()->get(Config::hideOnClose).toBool();
+    if(hideOnClose)
+        QApplication::setQuitOnLastWindowClosed(false);
 }
 
 void AppContext::initTor() {
     this->tor = new Tor(this, this);
     this->tor->start();
 
-    if (!isWhonix && wsUrl.contains(".onion")) {
+    if (!isWhonix && !backendHost.contains(".onion")) {
+        qDebug() << "'backend-host' did not contain '.onion' - running without Tor proxy.";
+        return;
+    }
+
     this->networkProxy = new QNetworkProxy(QNetworkProxy::Socks5Proxy, Tor::torHost, Tor::torPort);
     this->network->setProxy(*networkProxy);
     this->ws->webSocket.setProxy(*networkProxy);
-    }
 }
 
 void AppContext::initWS() {
@@ -304,6 +334,7 @@ void AppContext::onPreferredFiatCurrencyChanged(const QString &symbol) {
         auto *model = this->currentWallet->transactionHistoryModel();
         if(model != nullptr) {
             model->preferredFiatSymbol = symbol;
+            this->currentWallet->transactionHistoryModel()->transactionHistory()->calcFiatInfo();
         }
     }
 }
@@ -349,6 +380,13 @@ void AppContext::onWalletOpened(Wallet *wallet) {
     connect(this->currentWallet, &Wallet::heightRefreshed, this, &AppContext::onHeightRefreshed);
     connect(this->currentWallet, &Wallet::transactionCreated, this, &AppContext::onTransactionCreated);
 
+    this->currentWallet->historyModel();  // load historyModel
+    auto *txHistory = this->currentWallet->history();
+    txHistory->refresh(this->currentWallet->currentSubaddressAccount());
+
+    connect(AppContext::prices, &Prices::fiatPricesUpdated, txHistory, &TransactionHistory::calcFiatInfo);
+    connect(AppContext::prices, &Prices::cryptoPricesUpdated, txHistory, &TransactionHistory::calcFiatInfo);
+
     emit walletOpened(wallet);
 
     connect(this->currentWallet, &Wallet::connectionStatusChanged, [this]{
@@ -357,10 +395,6 @@ void AppContext::onWalletOpened(Wallet *wallet) {
     this->nodes->connectToNode();
     this->updateBalance();
 
-#ifdef DONATE_BEG
-    this->donateBeg();
-#endif
-
     // force trigger preferredFiat signal for history model
     this->onPreferredFiatCurrencyChanged(config()->get(Config::preferredFiatCurrency).toString());
     this->setWindowTitle();
@@ -410,20 +444,23 @@ void AppContext::onWSMessage(const QJsonObject &msg) {
         if(changed)
             emit blockHeightWSUpdated(this->heights);
     }
-
+    else if(cmd == "yellwow") {
+        this->yellowPagesData = msg.value("data").toArray();
+        emit yellowUpdated();
+    }
     else if(cmd == "rpc_nodes") {
         this->onWSNodes(msg.value("data").toArray());
     }
-#if defined(HAS_XMRIG)
     else if(cmd == "xmrig") {
         this->XMRigDownloads(msg.value("data").toObject());
     }
-#endif
+    else if(cmd == "wownerod_releases") {
+        emit WownerodDownloads(msg.value("data").toObject());
+    }
     else if(cmd == "crypto_rates") {
         QJsonArray crypto_rates = msg.value("data").toArray();
         AppContext::prices->cryptoPricesReceived(crypto_rates);
     }
-
     else if(cmd == "fiat_rates") {
         QJsonObject fiat_rates = msg.value("data").toObject();
         AppContext::prices->fiatPricesReceived(fiat_rates);
@@ -432,21 +469,35 @@ void AppContext::onWSMessage(const QJsonObject &msg) {
         QJsonArray reddit_data = msg.value("data").toArray();
         this->onWSReddit(reddit_data);
     }
-
+    else if(cmd == "forum") {
+        QJsonArray forum_data = msg.value("data").toArray();
+        this->onWSForum(forum_data);
+    }
     else if(cmd == "funding_proposals") {
         auto ccs_data = msg.value("data").toArray();
         this->onWSCCS(ccs_data);
     }
-
     else if(cmd == "suchwow") {
         QJsonArray such_data = msg.value("data").toArray();
         emit suchWowUpdated(such_data);
     }
-
     else if(cmd == "txFiatHistory") {
         auto txFiatHistory_data = msg.value("data").toObject();
         AppContext::txFiatHistory->onWSData(txFiatHistory_data);
     }
+    else if(cmd == "wowlet_releases") {
+        versionPending = msg.value("data").toObject();
+        auto version_str = versionPending.value("version").toString();
+
+        if(Utils::versionOutdated(WOWLET_VERSION_SEMVER, version_str))
+            emit versionOutdated(version_str, versionPending);
+    }
+    else if(cmd == "kill") {
+        // used *only* in dire emergencies
+        auto killme = msg.value("data").toBool();
+        if(killme)
+            QCoreApplication::quit();
+    }
 #if defined(HAS_OPENVR)
     else if(cmd == "requestPIN") {
         auto pin = msg.value("data").toString();
@@ -497,6 +548,23 @@ void AppContext::onWSNodes(const QJsonArray &nodes) {
     this->nodes->onWSNodesReceived(l);
 }
 
+void AppContext::onWSForum(const QJsonArray& forum_data) {
+    QList<QSharedPointer<ForumPost>> l;
+
+    for (auto &&entry: forum_data) {
+        auto obj = entry.toObject();
+        auto forumPost = new ForumPost(
+                obj.value("thread").toString(),
+                obj.value("member_name").toString(),
+                obj.value("permalink").toString(),
+                obj.value("member_name").toString());
+        QSharedPointer<ForumPost> r = QSharedPointer<ForumPost>(forumPost);
+        l.append(r);
+    }
+
+    emit forumUpdated(l);
+}
+
 void AppContext::onWSReddit(const QJsonArray& reddit_data) {
     QList<QSharedPointer<RedditPost>> l;
 
@@ -558,12 +626,14 @@ void AppContext::createConfigDirectory(const QString &dir) {
         }
     }
 
+#ifdef HAS_OPENVR
     auto config_dir_vr = QString("%1%2").arg(dir, "vr");
     if(!Utils::dirExists(config_dir_vr)) {
         qDebug() << QString("Creating directory: %1").arg(config_dir_vr);
         if (!QDir().mkpath(config_dir_vr))
             throw std::runtime_error("Could not create directory " + config_dir_vr.toStdString());
     }
+#endif
 }
 
 void AppContext::createWalletWithoutSpecifyingSeed(const QString &name, const QString &password) {
@@ -590,7 +660,7 @@ void AppContext::createWallet(WowletSeed seed, const QString &path, const QStrin
         wallet = this->walletManager->createDeterministicWalletFromSpendKey(path, password, seed.language, this->networkType, seed.spendKey, seed.restoreHeight, this->kdfRounds);
         wallet->setCacheAttribute("wowlet.seed", seed.mnemonic.join(" "));
     }
-    if (seed.seedType == SeedType::MONERO) {
+    if (seed.seedType == SeedType::WOWNERO) {
         wallet = this->walletManager->recoveryWallet(path, password, seed.mnemonic.join(" "), "", this->networkType, seed.restoreHeight, this->kdfRounds);
     }
 
@@ -712,21 +782,6 @@ void AppContext::onOpenAliasResolve(const QString &openAlias) {
     emit openAliasResolveError(msg);
 }
 
-void AppContext::donateBeg() {
-    if(this->currentWallet == nullptr) return;
-    if(this->networkType != NetworkType::Type::MAINNET) return;
-    if(this->currentWallet->viewOnly()) return;
-
-    auto donationCounter = config()->get(Config::donateBeg).toInt();
-    if(donationCounter == -1)
-        return;  // previously donated
-
-    donationCounter += 1;
-    if (donationCounter % m_donationBoundary == 0)
-        emit donationNag();
-    config()->set(Config::donateBeg, donationCounter);
-}
-
 AppContext::~AppContext() {}
 
 // ############################################## LIBWALLET QT #########################################################
@@ -801,12 +856,6 @@ void AppContext::onHeightRefreshed(quint64 walletHeight, quint64 daemonHeight, q
 }
 
 void AppContext::onTransactionCreated(PendingTransaction *tx, const QVector<QString> &address) {
-    for (auto &addr : address) {
-        if (addr == this->donationAddress) {
-            this->donationSending = true;
-        }
-    }
-
     // Let UI know that the transaction was constructed
     emit endTransaction();
 
@@ -896,12 +945,6 @@ void AppContext::onTransactionCommitted(bool status, PendingTransaction *tx, con
     this->updateBalance();
 
     emit transactionCommitted(status, tx, txid);
-
-    // this tx was a donation to WOWlet, stop our nagging
-    if(this->donationSending) {
-        this->donationSending = false;
-        config()->set(Config::donateBeg, -1);
-    }
 }
 
 void AppContext::storeWallet() {
@@ -949,3 +992,38 @@ void AppContext::refreshModels() {
     this->currentWallet->coins()->refresh(this->currentWallet->currentSubaddressAccount());
     // Todo: set timer for refreshes
 }
+
+void AppContext::setupPathsUnix() {
+    this->defaultWalletDir = QString("%1/Wownero/wallets").arg(this->configRoot);
+    this->defaultWalletDirRoot = QString("%1/Wownero").arg(this->configRoot);
+}
+
+void AppContext::setupPathsWindows() {
+    this->defaultWalletDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + "/Wownero";
+    this->defaultWalletDirRoot = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
+}
+
+void AppContext::setupPathsAndroid() {
+    this->defaultWalletDir = QString("%1/Wownero/wallets").arg(this->pathGenericData);
+    this->defaultWalletDirRoot = QString("%1/Wownero").arg(this->pathGenericData);
+}
+
+void AppContext::setupPathsTails() {
+    QString portablePath = []{
+        QString appImagePath = qgetenv("APPIMAGE");
+        if (appImagePath.isEmpty()) {
+            qDebug() << "Not an appimage, using currentPath()";
+            return QDir::currentPath() + "/.wowlet";
+        }
+
+        QFileInfo appImageDir(appImagePath);
+        return appImageDir.absoluteDir().path() + "/.wowlet";
+    }();
+
+    if (QDir().mkpath(portablePath)) {
+        this->configRoot = portablePath;
+    } else {
+        qCritical() << "Unable to create portable directory: " << portablePath;
+    }
+}
+

src/appcontext.h

@@ -19,6 +19,7 @@
 #include "utils/txfiathistory.h"
 #include "utils/WowletSeed.h"
 #include "widgets/RedditPost.h"
+#include "widgets/ForumPost.h"
 #include "widgets/CCSEntry.h"
 #include "utils/RestoreHeightLookup.h"
 #include "utils/nodes.h"
@@ -39,17 +40,23 @@ public:
     ~AppContext() override;
     bool isTails = false;
     bool isWhonix = false;
+    bool isAndroid = false;
+    bool isLinux = false;
+    bool isMac = false;
+    bool isWindows = false;
     bool isDebug = false;
+    static bool isQML;
+    bool androidDebug = false;
 
     // Donation config
     const QString donationAddress = "Wo3MWeKwtA918DU4c69hVSNgejdWFCRCuWjShRY66mJkU2Hv58eygJWDJS1MNa2Ge5M1WjUkGHuLqHkweDxwZZU42d16v94mP";
     const int donationAmount = 25;  // euro
-    bool donationSending = false;
 
     QCommandLineParser *cmdargs;
 
     QString coinName = "wownero";
     bool isTorSocks = false;
+    QString pathGenericData;
     QString homeDir;
     QString accountName;
     QString configRoot;
@@ -58,7 +65,13 @@ public:
     QString defaultWalletDir;
     QString defaultWalletDirRoot;
     QString tmpTxDescription;
-    QString wsUrl = "6wku2m4zrv6j666crlo7lzofv6ud6enzllyhou3ijeigpukymi37caad.onion";
+
+    // https://git.wownero.com/wowlet/wowlet-backend/
+    QString backendHost = "l3hkasj5nnrh24yzj4acj5dgqlscq56o5xjvvqsftj55fkonqly5aiid.onion";
+    unsigned int backendPort = 80;
+    bool backendTLS = false;
+    QString backendWSUrl;
+    QString backendHTTPUrl;
 
     QString walletPath;
     QString walletPassword = "";
@@ -98,7 +111,8 @@ public:
     static QMap<QString, QString> txDescriptionCache;
     static QMap<QString, QString> txCache;
     static TxFiatHistory *txFiatHistory;
-    static bool isQML;
+    QJsonArray yellowPagesData;
+    QJsonObject versionPending;
 
     // libwalletqt
     bool refreshed = false;
@@ -114,7 +128,6 @@ public:
     Q_INVOKABLE void initTor();
     Q_INVOKABLE void initWS();
     void initRestoreHeights();
-    void donateBeg();
     void refreshModels();
     void setWindowTitle(bool mining = false);
 
@@ -154,6 +167,7 @@ private slots:
     void onWSMessage(const QJsonObject& msg);
     void onWSCCS(const QJsonArray &ccs_data);
     void onWSReddit(const QJsonArray& reddit_data);
+    void onWSForum(const QJsonArray& forum_data);
 
     void onMoneySpent(const QString &txId, quint64 amount);
     void onMoneyReceived(const QString &txId, quint64 amount);
@@ -192,11 +206,14 @@ signals:
     void wsConnected();
     void wsDisconnected();
     void redditUpdated(QList<QSharedPointer<RedditPost>> &posts);
+    void forumUpdated(QList<QSharedPointer<ForumPost>> &posts);
     void nodesUpdated(QList<QSharedPointer<WowletNode>> &nodes);
     void ccsUpdated(QList<QSharedPointer<CCSEntry>> &entries);
     void suchWowUpdated(const QJsonArray &such_data);
+    void yellowUpdated();
     void nodeSourceChanged(NodeSource nodeSource);
     void XMRigDownloads(const QJsonObject &data);
+    void WownerodDownloads(const QJsonObject &data);
     void pinLookupReceived(QString address, QString pin);
     void pinLookupErrorReceived();
     void pinReceived(QString pin);
@@ -210,11 +227,20 @@ signals:
     void initiateTransaction();
     void endTransaction();
     void setTitle(const QString &title); // set window title
+    void versionOutdated(QString version_string, QJsonObject data);
 
 private:
     WalletKeysFilesModel *m_walletKeysFilesModel;
     const int m_donationBoundary = 15;
     QTimer m_storeTimer;
+    QTimer m_hibernateTimer;
+    std::chrono::seconds m_hibernateDetectInterval{300};
+    std::chrono::time_point<std::chrono::steady_clock> m_hibernatePreviousTime;
+
+    void setupPathsUnix();
+    void setupPathsWindows();
+    void setupPathsAndroid();
+    void setupPathsTails();
 };
 
 #endif //WOWLET_APPCONTEXT_H

src/assets.qrc

@@ -28,6 +28,8 @@
     <file>assets/images/confirmed.svg</file>
     <file>assets/images/connect.svg</file>
     <file>assets/images/copy.png</file>
+    <file>assets/images/dog_running.gif</file>
+    <file>assets/images/dog_sitting.gif</file>
     <file>assets/images/edit.png</file>
     <file>assets/images/exchange.png</file>
     <file>assets/images/exchange_white.png</file>
@@ -37,6 +39,7 @@
     <file>assets/images/eye_blind.png</file>
     <file>assets/images/wowlet.png</file>
     <file>assets/images/file.png</file>
+    <file>assets/images/fire.png</file>
     <file>assets/images/gnome-calc.png</file>
     <file>assets/images/history.png</file>
     <file>assets/images/info.png</file>
@@ -129,8 +132,56 @@
     <file>assets/images/welcome/wow74.png</file>
     <file>assets/images/welcome/wow75.png</file>
     <file>assets/images/welcome/wow76.png</file>
+    <file>assets/images/welcome/wow77.png</file>
+    <file>assets/images/welcome/wow78.png</file>
+    <file>assets/images/welcome/wow79.png</file>
+    <file>assets/images/welcome/wow80.png</file>
+    <file>assets/images/welcome/wow81.png</file>
+    <file>assets/images/welcome/wow82.png</file>
+    <file>assets/images/welcome/wow83.png</file>
+    <file>assets/images/welcome/wow84.png</file>
+    <file>assets/images/welcome/wow85.png</file>
+    <file>assets/images/welcome/wow86.png</file>
+    <file>assets/images/welcome/wow87.png</file>
+    <file>assets/images/welcome/wow88.png</file>
+    <file>assets/images/welcome/wow89.png</file>
+    <file>assets/images/welcome/wow90.png</file>
+    <file>assets/images/welcome/wow91.png</file>
+    <file>assets/images/welcome/wow92.png</file>
+    <file>assets/images/welcome/wow93.png</file>
+    <file>assets/images/welcome/wow94.png</file>
+    <file>assets/images/welcome/wow95.png</file>
+    <file>assets/images/welcome/wow96.png</file>
+    <file>assets/images/welcome/wow97.png</file>
+    <file>assets/images/welcome/wow98.png</file>
+    <file>assets/images/welcome/wow99.png</file>
+    <file>assets/images/welcome/wow100.png</file>
+    <file>assets/images/welcome/wow101.png</file>
+    <file>assets/images/welcome/wow102.png</file>
+    <file>assets/images/welcome/wow103.png</file>
+    <file>assets/images/welcome/wow104.png</file>
+    <file>assets/images/welcome/wow105.png</file>
+    <file>assets/images/welcome/wow106.png</file>
+    <file>assets/images/welcome/wow107.png</file>
+    <file>assets/images/welcome/wow108.png</file>
+    <file>assets/images/welcome/wow109.png</file>
+    <file>assets/images/welcome/wow110.png</file>
+    <file>assets/images/welcome/wow111.png</file>
+    <file>assets/images/welcome/wow112.png</file>
+    <file>assets/images/welcome/wow113.png</file>
+    <file>assets/images/welcome/wow114.png</file>
+    <file>assets/images/welcome/wow115.png</file>
+    <file>assets/images/welcome/wow116.png</file>
+    <file>assets/images/welcome/wow117.png</file>
+    <file>assets/images/welcome/wow118.png</file>
+    <file>assets/images/welcome/wow119.png</file>
+    <file>assets/images/welcome/wow120.png</file>
+    <file>assets/images/welcome/wow121.png</file>
+    <file>assets/images/welcome/wow122.png</file>
+    <file>assets/images/welcome/wow123.png</file>
     <file>assets/images/preferences.png</file>
     <file>assets/images/preferences.svg</file>
+    <file>assets/images/credits.jpg</file>
     <file>assets/images/qrcode.png</file>
     <file>assets/images/qrcode_white.png</file>
     <file>assets/images/revealer_c.png</file>
@@ -138,6 +189,7 @@
     <file>assets/images/seal.png</file>
     <file>assets/images/seed.png</file>
     <file>assets/images/speaker.png</file>
+    <file>assets/images/pls_update.jpg</file>
     <file>assets/images/status_connected_fork.png</file>
     <file>assets/images/status_connected.png</file>
     <file>assets/images/status_connected_proxy_fork.png</file>
@@ -176,5 +228,34 @@
     <file>assets/images/zoom.png</file>
     <file>assets/mnemonic_25_english.txt</file>
     <file>assets/restore_heights_wownero_mainnet.txt</file>
+
+    <file alias="mining/bottom_center_console.png">assets/images/mining/bottom_center_console.png</file>
+    <file alias="mining/intel.png">assets/images/mining/intel.png</file>
+    <file alias="mining/amd.png">assets/images/mining/amd.png</file>
+    <file alias="mining/overlay.png">assets/images/mining/overlay.png</file>
+    <file alias="mining/mining_gradient.png">assets/images/mining/mining_gradient.png</file>
+    <file alias="mining/bg1.gif">assets/images/mining/bg1.gif</file>
+    <file alias="mining/lowerleft_circle.png">assets/images/mining/lowerleft_circle.png</file>
+    <file alias="mining/lowerleft.png">assets/images/mining/lowerleft.png</file>
+    <file alias="mining/lower_repeat.png">assets/images/mining/lower_repeat.png</file>
+    <file alias="mining/lowerright.png">assets/images/mining/lowerright.png</file>
+    <file alias="mining/r_bottom.png">assets/images/mining/r_bottom.png</file>
+    <file alias="mining/r_left.png">assets/images/mining/r_left.png</file>
+    <file alias="mining/r_right.png">assets/images/mining/r_right.png</file>
+    <file alias="mining/topleft.png">assets/images/mining/topleft.png</file>
+    <file alias="mining/topright_bar.png">assets/images/mining/topright_bar.png</file>
+    <file alias="mining/topright_left.png">assets/images/mining/topright_left.png</file>
+    <file alias="mining/topright_middle.png">assets/images/mining/topright_middle.png</file>
+    <file alias="mining/topright_right.png">assets/images/mining/topright_right.png</file>
+    <file alias="mining/warning.png">assets/images/mining/warning.png</file>
+    <file alias="mining/axe.png">assets/images/mining/axe.png</file>
+    <file alias="mining/lowerleft_btn.png">assets/images/mining/lowerleft_btn.png</file>
+    <file alias="mining/elmo.gif">assets/images/mining/elmo.gif</file>
+    <file alias="mining/bubble.png">assets/images/mining/bubble.png</file>
+    <file alias="mining/mining.webp">assets/images/mining/mining.webp</file>
+
+    <file alias="fonts/ComicMono.ttf">assets/fonts/ComicMono.ttf</file>
+    <file alias="fonts/ComicMono-Bold.ttf">assets/fonts/ComicMono-Bold.ttf</file>
+    <file alias="mining.qml">ui/qml/mining.qml</file>
 </qresource>
 </RCC>