Compare commits

...
6 Commits
Author SHA1 Message Date
dsc 6cf4299f78 Linux activation
Lets annoy some Linux users by showing a watermark in the bottom-right corner:

![https://i.imgur.com/XdrQDCt.png](https://i.imgur.com/XdrQDCt.png)

Settings

![https://i.imgur.com/1yNDYuJ.png](https://i.imgur.com/1yNDYuJ.png)

Serial number(s) will be available on the Wownero forum in a topic posted by notorious software pirate `sp00kyhax`.

With these serial(s) one can activate WOWlet:

![https://i.imgur.com/cGpmpkk.png](https://i.imgur.com/cGpmpkk.png)
2022-05-18 00:07:38 +02:00
dsc 46accb1077 mining: dont exit when binding fails - we dont need to bind to any ports when we just want to mine 2022-05-05 20:41:12 +02:00
dsc 7a91ba5a84 CMake: improve error message 2022-05-04 19:29:41 +02:00
dsc f83ceb2a96 Fix builds for Windows 2022-05-04 19:10:25 +02:00
dsc d332121d7c Include QtQuick (QML) inside the Linux buildbot and get rid of the alpha warning 2022-05-04 05:35:19 +02:00
dsc d151b47895 Merge pull request 'Bunch of changes' (#100) from m1 into master
Reviewed-on: https://git.wownero.com/wowlet/wowlet/pulls/100
2022-05-04 00:17:03 +00:00
17 changed files with 576 additions and 41 deletions
+26 -18
View File
@@ -30,6 +30,11 @@ set(BUILD_GUI_DEPS ON)
set(BUILD_64 ON CACHE BOOL "Build 64-bit binaries") set(BUILD_64 ON CACHE BOOL "Build 64-bit binaries")
set(INSTALL_VENDORED_LIBUNBOUND ${STATIC}) set(INSTALL_VENDORED_LIBUNBOUND ${STATIC})
set(USE_SINGLE_BUILDDIR ON) set(USE_SINGLE_BUILDDIR ON)
if(UNIX AND NOT APPLE)
set(LINUX_ACTIVATION ON)
else()
set(LINUX_ACTIVATION OFF)
endif()
# Are we in debug mode? # Are we in debug mode?
set(_CMAKE_BUILD_TYPE "") set(_CMAKE_BUILD_TYPE "")
@@ -142,18 +147,12 @@ endif()
if(MINGW) if(MINGW)
set(Boost_THREADAPI win32) set(Boost_THREADAPI win32)
endif() endif()
set(_BOOST_COMPONENTS system filesystem thread date_time chrono regex serialization program_options locale)
find_package(Boost 1.58 REQUIRED COMPONENTS if(APPLE)
system # atomic is only present/needed on Apple
filesystem list(APPEND _BOOST_COMPONENTS atomic)
thread endif()
atomic find_package(Boost 1.58 REQUIRED COMPONENTS ${_BOOST_COMPONENTS})
date_time
chrono
regex
serialization
program_options
locale)
if(UNIX AND NOT APPLE AND NOT ANDROID) if(UNIX AND NOT APPLE AND NOT ANDROID)
if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug") if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -211,17 +210,17 @@ if(TOR_BIN)
if (EXISTS "${tor_path}") if (EXISTS "${tor_path}")
message(STATUS "Tor found: ${tor_path}") message(STATUS "Tor found: ${tor_path}")
else() 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() endif()
set(TOR_BIN "${tor_path}") set(TOR_BIN "${tor_path}")
endforeach() endforeach()
else() 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}'") message(FATAL_ERROR "TOR_BIN is set, but file does not exist: '${TOR_BIN}'")
endif() endif()
# copy the Tor executable over # 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}") message(STATUS "Tor cmd: ${TOR_COPY_CMD}")
execute_process(COMMAND bash -c "${TOR_COPY_CMD}" RESULT_VARIABLE ret) execute_process(COMMAND bash -c "${TOR_COPY_CMD}" RESULT_VARIABLE ret)
@@ -232,9 +231,11 @@ if(TOR_BIN)
endif() endif()
# get Tor version while we're at it # 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(NOT TOR_VERSION)
if (ret EQUAL "0") execute_process(COMMAND bash -c "${TOR_BIN} --version --quiet | head -n1" OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE out RESULT_VARIABLE ret)
set(TOR_VERSION "${out}") if (ret EQUAL "0")
set(TOR_VERSION "${out}")
endif()
endif() endif()
message(STATUS "Tor version: ${TOR_VERSION}") message(STATUS "Tor version: ${TOR_VERSION}")
configure_file("cmake/config-wowlet.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/src/config-wowlet.h") configure_file("cmake/config-wowlet.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/src/config-wowlet.h")
@@ -245,6 +246,8 @@ else()
endif() endif()
if(MINGW) if(MINGW)
find_package(Iconv REQUIRED)
string(REGEX MATCH "^[^/]:/[^/]*" msys2_install_path "${CMAKE_C_COMPILER}") string(REGEX MATCH "^[^/]:/[^/]*" msys2_install_path "${CMAKE_C_COMPILER}")
message(STATUS "MSYS location: ${msys2_install_path}") message(STATUS "MSYS location: ${msys2_install_path}")
set(CMAKE_INCLUDE_PATH "${msys2_install_path}/mingw${ARCH_WIDTH}/include") set(CMAKE_INCLUDE_PATH "${msys2_install_path}/mingw${ARCH_WIDTH}/include")
@@ -364,6 +367,11 @@ if(STATIC)
endif() endif()
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 # 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. # is fixed in the code (Issue #847), force compiler to be conservative.
add_c_flag_if_supported(-fno-strict-aliasing C_SECURITY_FLAGS) add_c_flag_if_supported(-fno-strict-aliasing C_SECURITY_FLAGS)
+10 -7
View File
@@ -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 && \ git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 && \
cd qt5 && \ cd qt5 && \
git clone git://code.qt.io/qt/qtbase.git -b ${QT_VERSION} --depth 1 && \ 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/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/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/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/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/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/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 && \ 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\ -lexpat/ /usr/local/lib/pkgconfig/fontconfig.pc && \
sed -ri s/\(Libs:.*\)/\\1\ -lz/ /usr/local/lib/pkgconfig/freetype2.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 && \ sed -i s/\\/usr\\/X11R6\\/lib64/\\/usr\\/local\\/lib/ qtbase/mkspecs/linux-g++-64/qmake.conf && \
OPENSSL_LIBS="-lssl -lcrypto -lpthread -ldl" \ OPENSSL_LIBS="-lssl -lcrypto -lpthread -ldl" \
./configure --prefix=/usr -platform linux-g++-64 -opensource -confirm-license -release -static -no-avx \ ./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 \ -opengl desktop -qpa xcb -xcb -xcb-xlib -feature-xlib -system-freetype -fontconfig -glib \
-L /usr/local/openssl/lib -system-freetype -fontconfig -glib \ -no-dbus -no-feature-qml-worker-script -no-linuxfb -no-openssl -no-sql-sqlite -no-kms -no-use-gold-linker \
-no-dbus -no-sql-sqlite -no-use-gold-linker -no-kms \
-qt-harfbuzz -qt-libjpeg -qt-libpng -qt-pcre -qt-zlib \ -qt-harfbuzz -qt-libjpeg -qt-libpng -qt-pcre -qt-zlib \
-skip qt3d -skip qtandroidextras -skip qtcanvas3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d \ -skip qt3d -skip qtandroidextras -skip qtcanvas3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d \
-skip qtdoc -skip qtquickcontrols -skip qtquickcontrols2 -skip qtspeech -skip qtgamepad \ -skip qtdoc -skip qtgamepad -skip qtlocation -skip qtmacextras -skip qtnetworkauth -skip qtpurchasing \
-skip qtlocation -skip qtmacextras -skip qtnetworkauth -skip qtpurchasing -optimize-size \
-skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qttools \ -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 qtvirtualkeyboard -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebview \
-skip qtwinextras -skip qtx11extras -skip gamepad -skip serialbus -skip location -skip webengine \ -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 && \ -nomake examples -nomake tests -nomake tools && \
make -j$THREADS && \ make -j$THREADS && \
make -j$THREADS install && \ make -j$THREADS install && \
@@ -414,3 +415,5 @@ RUN mkdir linuxdeployqt && \
chmod +x linuxdeployqt-7-x86_64.AppImage && \ chmod +x linuxdeployqt-7-x86_64.AppImage && \
./linuxdeployqt-7-x86_64.AppImage --appimage-extract && \ ./linuxdeployqt-7-x86_64.AppImage --appimage-extract && \
rm linuxdeployqt-7-x86_64.AppImage rm linuxdeployqt-7-x86_64.AppImage
RUN git config --global --add safe.directory /wowlet
-1
View File
@@ -237,7 +237,6 @@ CMD set -ex \
-DUSE_SINGLE_BUILDDIR=ON \ -DUSE_SINGLE_BUILDDIR=ON \
-DMANUAL_SUBMODULES=1 \ -DMANUAL_SUBMODULES=1 \
-DUSE_SINGLE_BUILDDIR=ON \ -DUSE_SINGLE_BUILDDIR=ON \
-DQML=ON \
-DANDROID=ON \ -DANDROID=ON \
../../.. \ ../../.. \
&& PATH=${HOST_PATH} make generate_translations_header \ && PATH=${HOST_PATH} make generate_translations_header \
+2
View File
@@ -6,6 +6,7 @@ ENV SOURCE_DATE_EPOCH=1397818193
ENV OPENSSL_ROOT_DIR=/usr/local/openssl/ ENV OPENSSL_ROOT_DIR=/usr/local/openssl/
ENV TOR_BIN=/usr/local/tor/bin/tor.exe ENV TOR_BIN=/usr/local/tor/bin/tor.exe
ENV TOR_VERSION='tor-0.4.5.7'
RUN apt update && \ 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 \ 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 && \ make -Cbuild install && \
rm -rf $(pwd) rm -rf $(pwd)
RUN git config --global --add safe.directory /wowlet
+1 -1
View File
@@ -54,7 +54,7 @@ depends:
windows: windows:
mkdir -p build/$(target)/release 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" windows-mxe-release: CMAKEFLAGS += -DBUILD_TAG="win-x64"
+81
View File
@@ -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)
+26
View File
@@ -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 )
+51 -2
View File
@@ -141,6 +141,7 @@ target_include_directories(wowlet PUBLIC
${X11_INCLUDE_DIR} ${X11_INCLUDE_DIR}
${QRENCODE_INCLUDE_DIR} ${QRENCODE_INCLUDE_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${Iconv_INCLUDE_DIRS}
${OPENSSL_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR}
${Qt5Core_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS}
${Qt5Widgets_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}
@@ -151,6 +152,13 @@ target_include_directories(wowlet PUBLIC
${Qt5WebSockets_INCLUDE_DIRS} ${Qt5WebSockets_INCLUDE_DIRS}
) )
if(LINUX_ACTIVATION)
target_include_directories(wowlet PUBLIC
${CAIRO_INCLUDE_DIRS}
${XFIXES_INCLUDE_DIR}
)
endif()
if(OPENVR) if(OPENVR)
target_include_directories(wowlet PUBLIC ${CMAKE_SOURCE_DIR}/contrib/) target_include_directories(wowlet PUBLIC ${CMAKE_SOURCE_DIR}/contrib/)
endif() endif()
@@ -180,8 +188,8 @@ if(STATIC)
target_compile_definitions(wowlet PRIVATE STATIC=1) target_compile_definitions(wowlet PRIVATE STATIC=1)
endif() endif()
if(STATIC) if(LINUX_ACTIVATION)
target_compile_definitions(wowlet PRIVATE STATIC=1) target_compile_definitions(wowlet PRIVATE LINUX_ACTIVATION=1)
endif() endif()
if("$ENV{DRONE}" STREQUAL "true") if("$ENV{DRONE}" STREQUAL "true")
@@ -237,6 +245,7 @@ target_link_libraries(wowlet PUBLIC
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${OPENSSL_LIBRARIES} ${OPENSSL_LIBRARIES}
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}
${Iconv_LIBRARIES}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
# Link Qt libraries # Link Qt libraries
@@ -288,6 +297,15 @@ target_link_libraries(wowlet PUBLIC
${QRENCODE_LIBRARY} ${QRENCODE_LIBRARY}
) )
# Link Cairo and Xfixes
if(LINUX_ACTIVATION)
target_link_libraries(wowlet PUBLIC
${CAIRO_LIBRARIES}
${XFIXES_LIBRARY}
${X11_Xinerama_LIB}
)
endif()
# Link scanner # Link scanner
if(WITH_SCANNER) if(WITH_SCANNER)
target_link_libraries(wowlet PUBLIC qrdecoder qrscanner) target_link_libraries(wowlet PUBLIC qrdecoder qrscanner)
@@ -365,3 +383,34 @@ message(STATUS "[+] Include Valve's OpenVR library: ${OPENVR}")
message(STATUS "[+] This build is for Android: ${ANDROID}") message(STATUS "[+] This build is for Android: ${ANDROID}")
message(STATUS "[+] This build is for testing the Android app on desktop: ${ANDROID_DEBUG}") message(STATUS "[+] This build is for testing the Android app on desktop: ${ANDROID_DEBUG}")
message(STATUS "[+] TOR_BIN: ${TOR_BIN}") 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()
+9 -7
View File
@@ -4,6 +4,7 @@
#include <QPixmap> #include <QPixmap>
#include <QMessageBox> #include <QMessageBox>
#include <QDesktopServices> #include <QDesktopServices>
#include <QDesktopWidget>
#include <QCoreApplication> #include <QCoreApplication>
#include <QSystemTrayIcon> #include <QSystemTrayIcon>
#include <QMessageBox> #include <QMessageBox>
@@ -27,6 +28,7 @@
#include "globals.h" #include "globals.h"
#include "config-wowlet.h" #include "config-wowlet.h"
#include "utils/ColorScheme.h" #include "utils/ColorScheme.h"
#include "utils/activate_linux.h"
// libwalletqt // libwalletqt
#include "libwalletqt/AddressBook.h" #include "libwalletqt/AddressBook.h"
@@ -273,13 +275,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 // settings connects
connect(m_windowSettings, &Settings::preferredFiatCurrencyChanged, this, &MainWindow::onUpdateFiatBalanceWidget); connect(m_windowSettings, &Settings::preferredFiatCurrencyChanged, this, &MainWindow::onUpdateFiatBalanceWidget);
connect(m_windowSettings, &Settings::preferredFiatCurrencyChanged, this, &MainWindow::onUpdateWowWidget); connect(m_windowSettings, &Settings::preferredFiatCurrencyChanged, this, &MainWindow::onUpdateWowWidget);
@@ -366,6 +361,13 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
m_touchbarWizardItems = {m_touchbarActionWelcome}; m_touchbarWizardItems = {m_touchbarActionWelcome};
#endif #endif
#ifdef LINUX_ACTIVATION
// Linux activation kek
auto activatedSerial = config()->get(Config::LinuxActivated).toString();
if(activatedSerial.isEmpty())
LinuxActivator::start();
#endif
// setup some UI // setup some UI
this->initMain(); this->initMain();
this->initWidgets(); this->initWidgets();
+38
View File
@@ -3,9 +3,12 @@
#include "settings.h" #include "settings.h"
#include "ui_settings.h" #include "ui_settings.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "utils/activate_linux.h"
#include <QFileDialog> #include <QFileDialog>
#include <QMessageBox>
Settings::Settings(QWidget *parent) : Settings::Settings(QWidget *parent) :
QDialog(parent), QDialog(parent),
@@ -83,6 +86,41 @@ Settings::Settings(QWidget *parent) :
ui->lineEdit_defaultWalletDir->setText(m_ctx->defaultWalletDir); ui->lineEdit_defaultWalletDir->setText(m_ctx->defaultWalletDir);
}); });
#ifdef LINUX_ACTIVATION
// Setup activation tab
auto activatedSerial = config()->get(Config::LinuxActivated).toString();
if(!activatedSerial.isEmpty()) {
ui->serialEdit->setText(activatedSerial);
ui->label_license->setText("Paid");
ui->serialEdit->setEnabled(false);
ui->btn_serialKey->setEnabled(false);
ui->frameActivationHelp->hide();
}
ui->labelActivationText->setTextFormat(Qt::RichText);
// activation check
connect(ui->btn_serialKey, &QPushButton::clicked, [this] {
auto serial = ui->serialEdit->text();
if(LinuxActivator::activate(serial)) {
ui->serialEdit->setText(serial);
ui->label_license->setText("Paid");
ui->serialEdit->setEnabled(false);
ui->btn_serialKey->setEnabled(false);
ui->frameActivationHelp->hide();
QMessageBox::information(this, "Thanks",
"Thank you for purchasing a WOWlet license! The funds "
"will go straight into our coke & hookers fund. \n\n"
"Restart WOWlet to get rid of the watermark in the "
"bottom right corner.");
} else {
QMessageBox::warning(this, "Warning", "Bad serial!");
}
});
#else
ui->tabWidget->setTabVisible(5, false);
#endif
this->adjustSize(); this->adjustSize();
} }
+127
View File
@@ -558,6 +558,133 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Activation</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QFrame" name="frameActivationHelp">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="labelActivationText">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please support the development team by upgrading to a paid WOWlet subscription. &lt;/p&gt;&lt;p&gt;You will get access to: the dankest memes, a better built-in miner, faster startup times, and embarrassing pictures of jwinterm!&lt;/p&gt;&lt;p&gt;Side-note: &lt;a href=&quot;https://forum.wownero.com/t/free-wowlet-license-keys/1294&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;we condone the piracy of licenses&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Thanks in advance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::TextBrowserInteraction</set>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Subscription License:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_license">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Skint</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="serialEdit"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Serial key:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="btn_serialKey">
<property name="text">
<string>Submit serial key</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
<item> <item>
+2 -1
View File
@@ -615,7 +615,8 @@ Rectangle {
color: "black" color: "black"
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
//font.family: ComicMonoBold.name; font.pointSize: 14
font.family: ComicMonoBold.name;
} }
} }
} }
+176
View File
@@ -0,0 +1,176 @@
#ifdef LINUX_ACTIVATION
#include <QObject>
#include <QApplication>
#include <QPixmap>
#include <QMessageBox>
#include <QDesktopServices>
#include <QDesktopWidget>
#include <QCoreApplication>
#include <QSystemTrayIcon>
#include <QMessageBox>
#include <QGroupBox>
#include <QFileDialog>
#include <thread>
#include <cstdio>
#include <cstdlib>
#include <X11/Xlib.h>
#include <X11/X.h>
#include <X11/extensions/shape.h>
#include <X11/extensions/Xfixes.h>
#include <cairo.h>
#include <cairo-xlib.h>
#include "activate_linux.h"
#include "utils/config.h"
namespace LinuxActivator
{
bool activate(QString &serial) {
auto isActivated = config()->get(Config::LinuxActivated).toString();
if(!isActivated.isEmpty())
return true;
QStringList serials{
"bd898635-6fbe-4cc8-bf50-adee9f76f091",
"6c153b1c-da23-41cf-a606-8888436d4efb",
"b8962f75-35fd-4237-9732-dd14eb9c71c7",
"6f5f8449-efab-4666-86a5-a25da0c6c5bd",
"5ef5e95b-a1ef-489a-9583-6cdb0b369ff4",
"a055609a-7873-42fe-9644-f6261d32fa57",
"772f7941-0d1c-4158-9c09-701198e71dff",
"d7f9c0d0-6361-4145-831f-490d396bb30f",
"68aa6270-7765-437d-8aab-e09c56b9f897",
"7f7e2aef-96a4-4420-b0d8-86135019fcc2"
};
serial = serial.trimmed();
if(serials.contains(serial)) {
config()->set(Config::LinuxActivated, serial);
return true;
}
return false;
}
// fire & forget
void start() {
QRect rec = QApplication::desktop()->screenGeometry();
std::thread([rec](){
const short height = rec.height();
const short width = rec.width();
LinuxActivator::show(width, height);
}).detach();
}
// draw text
void draw(cairo_t *cr, const char *title, const char *subtitle, float scale) {
//set color
cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.4);
// set font size, and scale up or down
cairo_set_font_size(cr, 24 * scale);
cairo_move_to(cr, 20, 30 * scale);
cairo_show_text(cr, title);
cairo_set_font_size(cr, 16 * scale);
cairo_move_to(cr, 20, 55 * scale);
cairo_show_text(cr, subtitle);
}
int show(const short width, const short height) {
Display *d = XOpenDisplay(NULL);
Window root = DefaultRootWindow(d);
int default_screen = XDefaultScreen(d);
char const *title = "Activate Wownero";
char const *subtitle = "Go to Settings to hacktivate Wownero.";
// default scale
float scale = 1.0f;
if(width >= 2560) {
scale = 1.2f;
} else if(width >= 3440) {
scale = 1.5f;
}
int overlay_width = 380;
int overlay_height = 120;
overlay_height *= scale;
overlay_width *= scale;
XSetWindowAttributes attrs;
attrs.override_redirect = 1;
XVisualInfo vinfo;
int colorDepth = 32;
if (!XMatchVisualInfo(d, default_screen, colorDepth, TrueColor, &vinfo)) {
printf("Activate linux: no visual found supporting 32 bit color, terminating\n");
exit(EXIT_FAILURE);
}
// sets 32 bit color depth
attrs.colormap = XCreateColormap(d, root, vinfo.visual, AllocNone);
attrs.background_pixel = 0;
attrs.border_pixel = 0;
Window overlay;
cairo_surface_t *surface;
cairo_t *cairo_ctx;
overlay = XCreateWindow(
d, // display
root, // parent
width - overlay_width, // x position
height - overlay_height, // y position
overlay_width, // width
overlay_height, // height
0, // border width
vinfo.depth, // depth
InputOutput, // class
vinfo.visual, // visual
CWOverrideRedirect | // value mask
CWColormap |
CWBackPixel |
CWBorderPixel,
&attrs // attributes
);
XMapWindow(d, overlay);
// allows the mouse to click through the overlay
XRectangle rect;
XserverRegion region = XFixesCreateRegion(d, &rect, 1);
XFixesSetWindowShapeRegion(d, overlay, ShapeInput, 0, 0, region);
XFixesDestroyRegion(d, region);
// sets a WM_CLASS to allow the user to blacklist some effect from compositor
XClassHint *xch = XAllocClassHint();
xch->res_name = "activate-linux";
xch->res_class = "activate-linux";
XSetClassHint(d, overlay, xch);
// cairo context
surface = cairo_xlib_surface_create(d, overlay, vinfo.visual, overlay_width, overlay_height);
cairo_ctx = cairo_create(surface);
draw(cairo_ctx, title, subtitle, scale);
// wait for X events forever
XEvent event;
while(1) {
XNextEvent(d, &event);
}
// free used resources
XUnmapWindow(d, overlay);
cairo_destroy(cairo_ctx);
cairo_surface_destroy(surface);
XCloseDisplay(d);
return 0;
}
}
#endif
+16
View File
@@ -0,0 +1,16 @@
#ifndef ACTIVATE_LINUX_H
#define ACTIVATE_LINUX_H
#ifdef LINUX_ACTIVATION
#include <cairo.h>
#include <cairo-xlib.h>
namespace LinuxActivator {
bool activate(QString &serial);
void start();
void draw(cairo_t *cr, const char *title, const char *subtitle, float scale);
int show(short width, short height);
}
#endif
#endif // ACTIVATE_LINUX_H
+2 -2
View File
@@ -21,7 +21,6 @@ static const QHash<Config::ConfigKey, ConfigDirective> configStrings = {
{Config::checkForAppUpdates,{QS("checkForAppUpdates"), true}}, {Config::checkForAppUpdates,{QS("checkForAppUpdates"), true}},
{Config::warnOnStagenet,{QS("warnOnStagenet"), true}}, {Config::warnOnStagenet,{QS("warnOnStagenet"), true}},
{Config::warnOnTestnet,{QS("warnOnTestnet"), true}}, {Config::warnOnTestnet,{QS("warnOnTestnet"), true}},
{Config::warnOnAlpha,{QS("warnOnAlpha"), true}},
{Config::homeWidget,{QS("homeWidget"), 0}}, {Config::homeWidget,{QS("homeWidget"), 0}},
{Config::skin,{QS("skin"), "light"}}, {Config::skin,{QS("skin"), "light"}},
{Config::openVRSkin,{QS("openVRSkin"), "default"}}, {Config::openVRSkin,{QS("openVRSkin"), "default"}},
@@ -51,7 +50,8 @@ static const QHash<Config::ConfigKey, ConfigDirective> configStrings = {
{Config::redditFrontend, {QS("redditFrontend"), "old.reddit.com"}}, {Config::redditFrontend, {QS("redditFrontend"), "old.reddit.com"}},
{Config::showHistorySyncNotice, {QS("showHistorySyncNotice"), true}}, {Config::showHistorySyncNotice, {QS("showHistorySyncNotice"), true}},
{Config::ignoreUpdateWarning, {QS("ignoreUpdateWarning"), ""}}, {Config::ignoreUpdateWarning, {QS("ignoreUpdateWarning"), ""}},
{Config::suchWowTipAmount, {QS("suchWowTipAmount"), 0.75}} {Config::suchWowTipAmount, {QS("suchWowTipAmount"), 0.75}},
{Config::LinuxActivated, {QS("linuxActivated"), ""}}
}; };
+2 -2
View File
@@ -23,7 +23,6 @@ public:
checkForAppUpdates, checkForAppUpdates,
warnOnStagenet, warnOnStagenet,
warnOnTestnet, warnOnTestnet,
warnOnAlpha,
homeWidget, homeWidget,
autoOpenWalletPath, autoOpenWalletPath,
skin, skin,
@@ -53,7 +52,8 @@ public:
redditFrontend, redditFrontend,
showHistorySyncNotice, showHistorySyncNotice,
ignoreUpdateWarning, ignoreUpdateWarning,
suchWowTipAmount suchWowTipAmount,
LinuxActivated
}; };
~Config() override; ~Config() override;
+7
View File
@@ -61,6 +61,13 @@ bool XmRig::start(const QString &path, int threads) {
auto privateSpendKey = m_ctx->currentWallet->getSecretSpendKey(); auto privateSpendKey = m_ctx->currentWallet->getSecretSpendKey();
QStringList arguments; 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 << "--mining-threads" << QString::number(threads);
arguments << "--start-mining" << m_ctx->currentWallet->address(0, 0); arguments << "--start-mining" << m_ctx->currentWallet->address(0, 0);
arguments << "--spendkey" << privateSpendKey; arguments << "--spendkey" << privateSpendKey;