bump to beta-6, 3.2.0 - fix ring error, update Dockerfile build

Reviewed-on: https://git.wownero.com/wowlet/wowlet/pulls/105

CMakeLists.txt

@@ -5,9 +5,9 @@ message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 set(VERSION_MAJOR "3")
-set(VERSION_MINOR "1")
+set(VERSION_MINOR "2")
 set(VERSION_REVISION "0")
-set(VERSION "beta-5")
+set(VERSION "beta-6")
 
 option(FETCH_DEPS "Download dependencies if they are not found" ON)
 option(OPENVR "Include OpenVR support")
@@ -25,7 +25,7 @@ include(FindCcache)
 include(CheckIncludeFile)
 include(CheckSymbolExists)
 
-set(WOWNERO_HEAD "ff5182f7f2825263e93e88064931597b3c6cf928")
+set(WOWNERO_HEAD "cf3bba3aee00d9d3e3f902f66f3710d820d3bdfb")
 set(BUILD_GUI_DEPS ON)
 set(BUILD_64 ON CACHE BOOL "Build 64-bit binaries")
 set(INSTALL_VENDORED_LIBUNBOUND ${STATIC})
@@ -119,23 +119,8 @@ set(HIDAPI_FOUND OFF)
 # QrEncode
 find_package(QREncode REQUIRED)
 
-# Tevador 14 word Monero seed
+# Tevador 14 word seed (https://git.wownero.com/wowlet/wownero-seed)
-find_package(monero-seed CONFIG)
+find_package(wownero-seed CONFIG REQUIRED)
-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()
 
 # Boost
 if(DEBUG)

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 && \
@@ -278,7 +277,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)
 
@@ -393,9 +391,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 && \
+RUN git clone https://git.wownero.com/wowlet/wownero-seed.git && \
-    cd monero-seed && \
+    cd wownero-seed && \
-    git reset --hard 4674ef09b6faa6fe602ab5ae0b9ca8e1fd7d5e1b && \
+    git reset --hard ef6910b6bb3b61757c36e2e5db0927d75f1731c8 && \
     cmake -DCMAKE_BUILD_TYPE=Release -Bbuild && \
     make -Cbuild -j$THREADS && \
     make -Cbuild install && \
@@ -416,4 +414,6 @@ RUN mkdir linuxdeployqt && \
     ./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.windows

@@ -1,7 +1,7 @@
 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/
@@ -96,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" \
@@ -175,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 && \
+RUN git clone https://git.wownero.com/wowlet/wownero-seed.git && \
-    cd monero-seed && \
+    cd wownero-seed && \
-    git reset --hard 4674ef09b6faa6fe602ab5ae0b9ca8e1fd7d5e1b && \
+    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 && \
@@ -186,3 +186,4 @@ RUN git clone https://git.wownero.com/wowlet/monero-seed.git && \
     rm -rf $(pwd)
 
 RUN git config --global --add safe.directory /wowlet
+RUN git config --global --add safe.directory /wowlet/wownero

Makefile

@@ -41,6 +41,7 @@ CMAKEFLAGS = \
 
 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)

src/CMakeLists.txt

@@ -225,9 +225,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
 if(UNIX AND NOT APPLE)
     # 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)
+    target_link_libraries(wowlet PUBLIC -Wl,--whole-archive wownero-seed::wownero-seed -Wl,--no-whole-archive)
 else()
-    target_link_libraries(wowlet PUBLIC monero-seed::monero-seed)
+    target_link_libraries(wowlet PUBLIC wownero-seed::wownero-seed)
 endif()
 
 if(ANDROID)

src/appcontext.cpp

@@ -660,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);
     }
 

src/assets/nodes.json

@@ -1,13 +1,35 @@
 {
   "mainnet": {
     "tor": [
-      "a2b6ain7ozgpxhzxkhl7vrnphrlvn4cqvibyhpcvyfbbgare6bm5m2yd.onion:18081"
+      "v2admi6gbeprxnk6i2oscizhgy4v5ixu6iezkhj5udiwbfjjs2w7dnid.onion:34568",
+      "awbibkoaa67jhuaqes4n2243gd6vtidjzqj2djukrubp2eudrmxr5mid.onion:34568",
+      "7ftpbpp6rbgqi5kjmhyin46essnh3eqb3m3rhfi7r2fr33iwkeuer3yd.onion:34568",
+      "j7rf2jcccizcp47y5moehguyuqdpg4lusk642sw4nayuruitqaqbc7ad.onion:34568",
+      "aje53o5z5twne5q2ljw44zkahhsuhjtwaxuburxddbf7n4pfsj4rj6qd.onion:34568",
+      "nepc4lxndsooj2akn7ofrj3ooqc25242obchcag6tw3f2mxrms2uuvyd.onion:34568",
+      "666l2ajxqjgj5lskvbokvworjysgvqag4oitokjuy7wz6juisul4jqad.onion:34568",
+      "ty7ppqozzodz75audgvkprekiiqsovbyrkfdjwadrkbe3etyzloatxad.onion:34568",
+      "ewynwpnprbgqllv2syn3drjdrqkw7ehoeg73znelm6mevvmpddexsoqd.onion:34568",
+      "mqkiqwmhhpqtzlrf26stv7jvtaudbyzkbg3lttkmvvvauzgtxm62tgyd.onion:34568",
+      "zao3w6isidntdbnyee5ufs7fyzmv7wzchpw32i3uo5eldjwmo4bxg2qd.onion:34568"
     ],
     "clearnet": [
-      "wownero.fyi:34568",
+      "global.wownodes.com:34568",
-      "wow.pwned.systems:34568",
+      "super.fast.node.xmr.pm:34568",
-      "de1.wownodes.com:34568",
+      "node.wownero.club:34568",
-      "global.wownodes.com:34568"
+      "node.suchwow.xyz:34568",
+      "eu-west-1.wow.xmr.pm:34568",
+      "eu-west-2.wow.xmr.pm:34568",
+      "eu-west-3.wow.xmr.pm:34568",
+      "eu-west-4.wow.xmr.pm:34568",
+      "eu-west-5.wow.xmr.pm:34568",
+      "eu-west-6.wow.xmr.pm:34568",
+      "na-west-1.wow.xmr.pm:34568",
+      "much.wow.such.money:34568",
+      "very.wow.such.money:34568",
+      "169.119.33.174:34568",
+      "wow.bot.tips:34568",
+      "idontwanttogototoronto.wow.fail:34568"
     ]
   },
   "stagenet": {

src/utils/RestoreHeightLookup.h

@@ -7,7 +7,7 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include <monero_seed/monero_seed.hpp>
+#include <wownero_seed/wownero_seed.hpp>
 
 #include "networktype.h"
 #include "utils/utils.h"

src/utils/WowletSeed.h

@@ -8,7 +8,7 @@
 #include "RestoreHeightLookup.h"
 
 enum SeedType {
-    MONERO = 0, // 25 word seeds
+    WOWNERO = 0, // 25 word seeds
     TEVADOR     // 14 word seeds
 };
 
@@ -28,7 +28,7 @@ struct WowletSeed {
     QString errorString;
 
     explicit WowletSeed(RestoreHeightLookup *lookup,
-                          const QString &coin = "monero",
+                          const QString &coin = "wownero",
                           const QString &language = "English",
                           const QStringList &mnemonic = {})
             : lookup(lookup), coin(coin), language(language), mnemonic(mnemonic)
@@ -36,7 +36,7 @@ struct WowletSeed {
         // Generate a new mnemonic if none was given
         if (this->mnemonic.length() == 0) {
             this->time = std::time(nullptr);
-            monero_seed seed(this->time, coin.toStdString());
+            wownero_seed seed(this->time, coin.toStdString());
 
             std::stringstream buffer;
             buffer << seed;
@@ -50,7 +50,7 @@ struct WowletSeed {
         }
 
         if (this->mnemonic.length() == 25) {
-            this->seedType = SeedType::MONERO;
+            this->seedType = SeedType::WOWNERO;
         }
         else if (this->mnemonic.length() == 14) {
             this->seedType = SeedType::TEVADOR;
@@ -61,7 +61,7 @@ struct WowletSeed {
 
         if (seedType == SeedType::TEVADOR) {
             try {
-                monero_seed seed(this->mnemonic.join(" ").toStdString(), coin.toStdString());
+                wownero_seed seed(this->mnemonic.join(" ").toStdString(), coin.toStdString());
 
                 this->time = seed.date();
                 this->setRestoreHeight();

src/utils/utils.h

@@ -12,7 +12,7 @@
 #include <QtAndroid>
 #endif
 
-#include <monero_seed/monero_seed.hpp>
+#include <wownero_seed/wownero_seed.hpp>
 
 #include "networktype.h"
 #include "libwalletqt/Wallet.h"

src/wizard/restorewallet.cpp

@@ -9,7 +9,7 @@
 #include <QPlainTextEdit>
 #include <QMessageBox>
 
-#include <monero_seed/wordlist.hpp>  // tevador 14 word
+#include <wownero_seed/wordlist.hpp>  // tevador 14 word
 #include "utils/WowletSeed.h"
 
 RestorePage::RestorePage(AppContext *ctx, QWidget *parent) :