Merge branch 'master' of git.wownero.com:wowlet/wowlet into update-explorers-2023

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

CMakeLists.txt

@@ -4,10 +4,10 @@ project(wowlet)
 message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)
-set(VERSION_MAJOR "3")
-set(VERSION_MINOR "1")
+set(VERSION_MAJOR "4")
+set(VERSION_MINOR "0")
 set(VERSION_REVISION "0")
-set(VERSION "beta-5")
+set(VERSION "beta-7")
 
 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 "a21819cc22587e16af00e2c3d8f70156c11310a0")
 set(BUILD_GUI_DEPS ON)
 set(BUILD_64 ON CACHE BOOL "Build 64-bit binaries")
 set(INSTALL_VENDORED_LIBUNBOUND ${STATIC})
@@ -116,6 +116,9 @@ message(STATUS "libsodium: libraries at ${SODIUM_LIBRARY}")
 # HIDApi
 set(HIDAPI_FOUND OFF)
 
+# Unbound
+find_package(Unbound REQUIRED)
+
 # QrEncode
 find_package(QREncode REQUIRED)
 

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,10 +277,29 @@ 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 && \
@@ -393,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 && \
@@ -416,4 +434,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/
@@ -16,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
@@ -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 && \
-    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 && \
@@ -185,4 +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
+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

@@ -246,6 +246,7 @@ target_link_libraries(wowlet PUBLIC
         ${OPENSSL_LIBRARIES}
         ${CMAKE_DL_LIBS}
         ${Iconv_LIBRARIES}
+        /usr/local/lib/libunbound.a
         ${EXTRA_LIBRARIES})
 
 # Link Qt libraries

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",
-      "wow.pwned.systems:34568",
-      "de1.wownodes.com:34568",
-      "global.wownodes.com:34568"
+      "global.wownodes.com:34568",
+      "super.fast.node.xmr.pm:34568",
+      "node.wownero.club: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/settings.ui

@@ -141,12 +141,12 @@
         <widget class="QComboBox" name="comboBox_blockExplorer">
          <item>
           <property name="text">
-           <string>explore.wownero.com</string>
+           <string>muchwow.lol</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>kryfi.com</string>
+           <string>explorer.suchwow.xyz</string>
           </property>
          </item>
         </widget>

src/utils/config.cpp

@@ -26,7 +26,7 @@ static const QHash<Config::ConfigKey, ConfigDirective> configStrings = {
         {Config::openVRSkin,{QS("openVRSkin"), "default"}},
         {Config::openVRStreamerMode,{QS("openVRStreamerMode"), false}},
         {Config::preferredFiatCurrency,{QS("preferredFiatCurrency"), "USD"}},
-        {Config::blockExplorer,{QS("blockExplorer"), "kryfi.com"}},
+        {Config::blockExplorer,{QS("blockExplorer"), "explorer.suchwow.xyz"}},
         {Config::walletDirectory,{QS("walletDirectory"), ""}},
         {Config::autoOpenWalletPath,{QS("autoOpenWalletPath"), ""}},
         {Config::walletPath,{QS("walletPath"), ""}},

src/utils/utils.cpp

@@ -240,10 +240,10 @@ QString Utils::copyFromClipboard() {
 
 QString Utils::blockExplorerLink(const QString &txid) {
     auto explorer = config()->get(Config::blockExplorer).toString();
-    if(explorer.startsWith("kryfi.com")) {
-        return QString("https://kryfi.com/explorer/wownero/tx/%1").arg(txid);
+    if(explorer.startsWith("explorer.suchwow.xyz")) {
+        return QString("https://explorer.suchwow.xyz/tx/%1").arg(txid);
     } else {
-        return QString("https://explore.wownero.com/tx/%1").arg(txid);
+        return QString("https://muchwow.lol/tx?id=%1").arg(txid);
     }
 }