mining: dont exit when binding fails - we dont need to bind to any ports when we just want to mine

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

CMakeLists.txt

@@ -142,18 +142,12 @@ endif()
 if(MINGW)
     set(Boost_THREADAPI win32)
 endif()
-
-find_package(Boost 1.58 REQUIRED COMPONENTS
-        system
-        filesystem
-        thread
-        atomic
-        date_time
-        chrono
-        regex
-        serialization
-        program_options
-        locale)
+set(_BOOST_COMPONENTS system filesystem thread date_time chrono regex serialization program_options locale)
+if(APPLE)
+    # atomic is only present/needed on Apple
+    list(APPEND _BOOST_COMPONENTS atomic)
+endif()
+find_package(Boost 1.58 REQUIRED COMPONENTS ${_BOOST_COMPONENTS})
 
 if(UNIX AND NOT APPLE AND NOT ANDROID)
     if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -211,17 +205,17 @@ if(TOR_BIN)
             if (EXISTS "${tor_path}")
                 message(STATUS "Tor found: ${tor_path}")
             else()
-                message(FATAL_ERROR "TOR_BIN is set, so the following file needs to be present: '${fn}'")
+                message(FATAL_ERROR "TOR_BIN is set, so the following file needs to be present: '${tor_path}'")
             endif()
             set(TOR_BIN "${tor_path}")
         endforeach()
     else()
-        if(not EXISTS "${TOR_BIN}")
+        if(NOT EXISTS "${TOR_BIN}")
             message(FATAL_ERROR "TOR_BIN is set, but file does not exist: '${TOR_BIN}'")
         endif()
 
         # copy the Tor executable over
-        set(TOR_COPY_CMD "cp -u ${TOR_BIN} ${CMAKE_CURRENT_SOURCE_DIR}/src/assets/exec/tor")
+        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)
@@ -232,9 +226,11 @@ if(TOR_BIN)
     endif()
 
     # get Tor version while we're at it
-    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}")
+    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")
@@ -245,6 +241,8 @@ else()
 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")

Dockerfile

@@ -288,12 +288,17 @@ RUN rm /usr/lib/x86_64-linux-gnu/libX11.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 +306,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 && \
@@ -414,3 +415,5 @@ RUN mkdir linuxdeployqt && \
     chmod +x linuxdeployqt-7-x86_64.AppImage && \
     ./linuxdeployqt-7-x86_64.AppImage --appimage-extract && \
     rm linuxdeployqt-7-x86_64.AppImage
+
+RUN git config --global --add safe.directory /wowlet

Dockerfile.android

@@ -237,7 +237,6 @@ CMD set -ex \
     -DUSE_SINGLE_BUILDDIR=ON \
     -DMANUAL_SUBMODULES=1 \
     -DUSE_SINGLE_BUILDDIR=ON \
-    -DQML=ON \
     -DANDROID=ON \
     ../../.. \
     && PATH=${HOST_PATH} make generate_translations_header \

Dockerfile.windows

@@ -6,6 +6,7 @@ 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 \
@@ -184,3 +185,4 @@ 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

Makefile

@@ -54,7 +54,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"

src/CMakeLists.txt

@@ -141,6 +141,7 @@ target_include_directories(wowlet PUBLIC
         ${X11_INCLUDE_DIR}
         ${QRENCODE_INCLUDE_DIR}
         ${Boost_INCLUDE_DIRS}
+        ${Iconv_INCLUDE_DIRS}
         ${OPENSSL_INCLUDE_DIR}
         ${Qt5Core_INCLUDE_DIRS}
         ${Qt5Widgets_INCLUDE_DIRS}
@@ -237,6 +238,7 @@ target_link_libraries(wowlet PUBLIC
         ${Boost_LIBRARIES}
         ${OPENSSL_LIBRARIES}
         ${CMAKE_DL_LIBS}
+        ${Iconv_LIBRARIES}
         ${EXTRA_LIBRARIES})
 
 # Link Qt libraries
@@ -365,3 +367,20 @@ 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 "[+] OpenSSL")
+message(STATUS "  - version: ${OPENSSL_VERSION}")
+message(STATUS "  - dirs: ${OPENSSL_INCLUDE_DIR}")
+message(STATUS "  - libs: ${OPENSSL_LIBRARIES} ${OPENSSL_SSL_LIBRARIES}")
+
+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/mainwindow.cpp

@@ -273,13 +273,6 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
         }
     }
 
-    if(config()->get(Config::warnOnAlpha).toBool()) {
-        QString warning = "WOWlet is currently in beta.\n\nPlease report any bugs "
-                          "you encounter on our Git repository, IRC freenode #wownero or on /r/Wownero.";
-        QMessageBox::warning(this, "Beta Warning", warning);
-        config()->set(Config::warnOnAlpha, false);
-    }
-
     // settings connects
     connect(m_windowSettings, &Settings::preferredFiatCurrencyChanged, this, &MainWindow::onUpdateFiatBalanceWidget);
     connect(m_windowSettings, &Settings::preferredFiatCurrencyChanged, this, &MainWindow::onUpdateWowWidget);

src/ui/qml/mining.qml

@@ -615,7 +615,8 @@ Rectangle {
                 color: "black"
                 anchors.horizontalCenter: parent.horizontalCenter
                 anchors.verticalCenter: parent.verticalCenter
-                //font.family: ComicMonoBold.name;
+                font.pointSize: 14
+                font.family: ComicMonoBold.name;
             }
         }
     }

src/utils/config.cpp

@@ -21,7 +21,6 @@ static const QHash<Config::ConfigKey, ConfigDirective> configStrings = {
         {Config::checkForAppUpdates,{QS("checkForAppUpdates"), true}},
         {Config::warnOnStagenet,{QS("warnOnStagenet"), true}},
         {Config::warnOnTestnet,{QS("warnOnTestnet"), true}},
-        {Config::warnOnAlpha,{QS("warnOnAlpha"), true}},
         {Config::homeWidget,{QS("homeWidget"), 0}},
         {Config::skin,{QS("skin"), "light"}},
         {Config::openVRSkin,{QS("openVRSkin"), "default"}},

src/utils/config.h

@@ -23,7 +23,6 @@ public:
         checkForAppUpdates,
         warnOnStagenet,
         warnOnTestnet,
-        warnOnAlpha,
         homeWidget,
         autoOpenWalletPath,
         skin,

src/utils/xmrig.cpp

@@ -61,6 +61,13 @@ bool XmRig::start(const QString &path, int threads) {
 
     auto privateSpendKey = m_ctx->currentWallet->getSecretSpendKey();
     QStringList arguments;
+
+    // dont exit when binding fails - we dont need
+    // to bind to any ports when we just want to mine
+    arguments << "--no-zmq";
+    arguments << "--rpc-ignore-ipv4";
+    arguments << "--p2p-ignore-ipv4";
+
     arguments << "--mining-threads" << QString::number(threads);
     arguments << "--start-mining" << m_ctx->currentWallet->address(0, 0);
     arguments << "--spendkey" << privateSpendKey;