Compare commits
20 Commits
Author | SHA1 | Date |
---|---|---|
dsc | 330edacab9 | |
dsc | ec6474a840 | |
dsc | 69e1749856 | |
dsc | e93488af9b | |
dsc | a8861c62ea | |
dsc | e6651d55ff | |
dsc | 9c58913ee2 | |
dsc | 24ff2b7120 | |
dsc | 7c4f99c85d | |
wowario | 7cc5fd880e | |
wowario | ed9edb5ad6 | |
dsc | c0323ee329 | |
dsc | 40493475ba | |
dsc | 4098e8c0e5 | |
dsc | ca234008b9 | |
dsc | 2ebb41a371 | |
dsc | 6cf4299f78 | |
dsc | df0459da69 | |
dsc | 46accb1077 | |
dsc | 7a91ba5a84 |
109
CMakeLists.txt
109
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_MAJOR "4")
|
||||
set(VERSION_MINOR "1")
|
||||
set(VERSION_REVISION "0")
|
||||
set(VERSION "beta-5")
|
||||
set(VERSION_REVISION "1")
|
||||
set(VERSION "beta-8")
|
||||
|
||||
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})
|
||||
|
@ -96,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}")
|
||||
|
@ -111,45 +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()
|
||||
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(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)
|
||||
|
@ -191,38 +171,17 @@ if(TOR_BIN)
|
|||
# on the buildbot(s) Tor is baked into the image
|
||||
# - linux: See `Dockerfile`
|
||||
# - windows: See `Dockerfile.windows`
|
||||
#
|
||||
# ## MacOS:
|
||||
# we assume the following files are already present in src/assets/exec:
|
||||
# - tor
|
||||
# - libevent-2.1.7.dylib
|
||||
# so copy them beforehand and set TOR_BIN to something random.
|
||||
if(NOT EXISTS "${TOR_BIN}")
|
||||
message(FATAL_ERROR "TOR_BIN is set, but file does not exist: '${TOR_BIN}'")
|
||||
endif()
|
||||
|
||||
# MacOS, check if required files are present
|
||||
if(APPLE)
|
||||
foreach(fn libevent-2.1.7.dylib tor)
|
||||
set(tor_path "${CMAKE_CURRENT_SOURCE_DIR}/src/assets/exec/${fn}")
|
||||
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}'")
|
||||
endif()
|
||||
set(TOR_BIN "${tor_path}")
|
||||
endforeach()
|
||||
else()
|
||||
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 ${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()
|
||||
# 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
|
||||
|
@ -267,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)
|
||||
|
@ -285,14 +242,6 @@ 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} -fvisibility=default -std=c++11 -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)
|
||||
|
@ -327,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()
|
||||
|
@ -362,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)
|
||||
|
@ -378,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)
|
||||
|
|
46
Dockerfile
46
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
|
|
@ -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
|
||||
|
|
|
@ -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
|
27
Makefile
27
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)
|
||||
|
@ -72,29 +73,3 @@ windows-mxe-debug: CMAKEFLAGS += -DCMAKE_BUILD_TYPE=Debug
|
|||
windows-mxe-debug:
|
||||
cmake -Bbuild $(CMAKEFLAGS)
|
||||
$(MAKE) -Cbuild
|
||||
|
||||
mac: CMAKEFLAGS += -DSTATIC=Off
|
||||
mac: CMAKEFLAGS += -DTOR_BIN=$(or ${TOR_BIN},OFF)
|
||||
mac: CMAKEFLAGS += -DBUILD_TAG="mac-x64"
|
||||
mac: CMAKEFLAGS += -DCMAKE_BUILD_TYPE=Release
|
||||
mac:
|
||||
cmake -Bbuild $(CMAKEFLAGS)
|
||||
$(MAKE) -Cbuild
|
||||
$(MAKE) -Cbuild deploy
|
||||
|
||||
# used for release, covers both intel and M1
|
||||
# 1) assumes a *static* BOOST has been compiled at BOOST_ROOT, see docs/BUILDING.md
|
||||
# 2) assumes a *static* Tor and libevent at src/assets/exec, see docs/BUILDING.md
|
||||
mac-release: CMAKEFLAGS += -DARCH=default
|
||||
mac-release: CMAKEFLAGS += -DCMAKE_OSX_ARCHITECTURES="x86_64"
|
||||
mac-release: CMAKEFLAGS += -DSTATIC=Off
|
||||
mac-release: CMAKEFLAGS += -DTOR_BIN="foo"
|
||||
mac-release: CMAKEFLAGS += -DBUILD_TAG="mac-x64"
|
||||
mac-release: CMAKEFLAGS += -DCMAKE_BUILD_TYPE=Release
|
||||
mac-release: CMAKEFLAGS += -DBoost_USE_STATIC_RUNTIME=ON
|
||||
mac-release: CMAKEFLAGS += -DBoost_USE_STATIC_LIBS=ON
|
||||
mac-release: CMAKEFLAGS += -DBOOST_ROOT=/Users/${USER}/build/boost
|
||||
mac-release:
|
||||
cmake -Bbuild $(CMAKEFLAGS)
|
||||
$(MAKE) -Cbuild
|
||||
$(MAKE) -Cbuild deploy
|
||||
|
|
|
@ -2,23 +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 -qmldir="${CMAKE_SOURCE_DIR}"
|
||||
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/
|
||||
COMMENT "Copying libqsvg.dylib"
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
@ -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)
|
|
@ -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 )
|
120
docs/BUILDING.md
120
docs/BUILDING.md
|
@ -69,123 +69,3 @@ docker run --rm -it -v $PWD:/wowlet -w /wowlet wowlet:win sh -c 'make windows ro
|
|||
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`.
|
||||
|
||||
# Mac OS
|
||||
|
||||
## method 1 (easiest)
|
||||
|
||||
### 1. Get homebrew
|
||||
|
||||
Get [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
|
||||
```
|
||||
|
||||
### 2. Compile WOWlet
|
||||
|
||||
```bash
|
||||
CMAKE_PREFIX_PATH=/usr/local/opt/qt5/ make -j4 mac
|
||||
```
|
||||
|
||||
The resulting Mac OS application can be found `build/bin/wowlet.app` and will **not** have Tor embedded.
|
||||
|
||||
Since WOWlet needs Tor, install it, start it, and start at Mac OS boot:
|
||||
```bash
|
||||
brew install tor
|
||||
brew services start tor
|
||||
```
|
||||
|
||||
## method 2 (advanced, intel/m1 release binaries)
|
||||
|
||||
This assumes you have homebrew installed with the packages defined in the previous step ("Get homebrew").
|
||||
|
||||
### 1. Get Qt
|
||||
|
||||
Install Qt `5.15.2` from [the open-source Qt installer](https://www.qt.io/download).
|
||||
|
||||
### 2. Get static Boost
|
||||
|
||||
We'll install boost under `/Users/$USER/build/boost/`
|
||||
|
||||
```bash
|
||||
mkdir -p "/Users/$USER/build/boost"
|
||||
|
||||
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 && \
|
||||
cd boost_1_73_0
|
||||
|
||||
./bootstrap.sh --without-icu
|
||||
./b2 --disable-icu --with-atomic --with-system --with-filesystem --with-thread \
|
||||
--with-date_time --with-chrono --with-regex --with-serialization \
|
||||
--with-program_options --with-locale variant=release link=static \
|
||||
runtime-link=static cxxflags='-std=c++11' install -a --prefix="/Users/$USER/build/boost/"
|
||||
```
|
||||
|
||||
### 3. Get static Tor
|
||||
|
||||
1. Download the official Tor Browser `.dmg`
|
||||
2. Steal `tor.real` and `libevent-2.1.7.dylib` from the `.dmg`
|
||||
3. Place them both in `src/assets/exec/`
|
||||
- `src/assets/exec/tor`
|
||||
- `src/assets/exec/libevent-2.1.7.dylib`
|
||||
|
||||
### 4. Get static Tor
|
||||
|
||||
```bash
|
||||
CMAKE_PREFIX_PATH=/Users/dsc/Qt5.15.2/5.15.2/clang_64 TOR_BIN="foo" make -j10 mac-release
|
||||
```
|
||||
|
||||
Resulting *static* Mac OS package: `build/bin/wowlet.app`
|
||||
|
||||
## method 3 (from source, WIP, does not work yet)
|
||||
|
||||
Download Qt `https://download.qt.io/archive/qt/5.15/5.15.3/single/`, unpack it somewhere.
|
||||
|
||||
Patch Qt 5.15.3 source.
|
||||
|
||||
- Context: [#1](https://github.com/microsoft/vcpkg/pull/21056) [#2](https://code.qt.io/cgit/qt/qtbase.git/diff/?id=dece6f5840463ae2ddf927d65eb1b3680e34a547)
|
||||
|
||||
```
|
||||
diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
|
||||
index 5d4b6d6a71..cc7193d8b7 100644
|
||||
--- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
|
||||
+++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
|
||||
@@ -43,6 +43,7 @@
|
||||
#include <qpa/qplatformgraphicsbuffer.h>
|
||||
#include <private/qcore_mac_p.h>
|
||||
|
||||
+#include <CoreGraphics/CGColorSpace.h>
|
||||
#include <IOSurface/IOSurface.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
```
|
||||
|
||||
Build Qt:
|
||||
|
||||
```bash
|
||||
./configure -prefix $PWD/qtbase -release -opensource -confirm-license -ccache \
|
||||
-no-dbus -no-sql-sqlite -no-use-gold-linker -no-kms \
|
||||
-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 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
|
||||
|
||||
./configure -prefix $PWD/qtbase -release -nomake examples -nomake tests -skip qtwebchannel -skip qtpurchasing -skip webengine -skip qtwebview
|
||||
make -j 4
|
||||
```
|
||||
|
||||
Problem: QtQuick does not seem to be compiled, `Qt5QuickConfig.cmake` missing.
|
||||
|
||||
Build:
|
||||
|
||||
```bash
|
||||
CMAKE_PREFIX_PATH=/Users/$USER/Downloads/qt-everywhere-src-5.15.3/qtbase/ make -j4 mac
|
||||
```
|
||||
|
|
|
@ -33,13 +33,6 @@ libzmq3-dev libsodium-dev libhidapi-dev libnorm-dev libusb-1.0-0-dev libpgm-dev
|
|||
libprotobuf-dev protobuf-compiler libgcrypt20-dev libpng-dev
|
||||
```
|
||||
|
||||
## Mac OS
|
||||
|
||||
```bash
|
||||
brew install boost zmq openssl libpgm miniupnpc libsodium expat libunwind-headers \
|
||||
protobuf libgcrypt qrencode ccache cmake pkgconfig git
|
||||
```
|
||||
|
||||
## CMake
|
||||
|
||||
After installing Qt you might have a folder called `/home/$USER/Qt/`. You need to pass this to CMake
|
||||
|
@ -87,13 +80,6 @@ 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
|
||||
|
|
|
@ -70,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()
|
||||
set(ASSETS_TOR "assets_tor.qrc")
|
||||
endif()
|
||||
|
||||
set(EXECUTABLE_FLAG)
|
||||
|
@ -152,6 +148,13 @@ target_include_directories(wowlet PUBLIC
|
|||
${Qt5WebSockets_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
if(LINUX_ACTIVATION)
|
||||
target_include_directories(wowlet PUBLIC
|
||||
${CAIRO_INCLUDE_DIRS}
|
||||
${XFIXES_INCLUDE_DIR}
|
||||
)
|
||||
endif()
|
||||
|
||||
if(OPENVR)
|
||||
target_include_directories(wowlet PUBLIC ${CMAKE_SOURCE_DIR}/contrib/)
|
||||
endif()
|
||||
|
@ -181,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")
|
||||
|
@ -215,12 +218,10 @@ 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)
|
||||
|
@ -239,6 +240,8 @@ target_link_libraries(wowlet PUBLIC
|
|||
${OPENSSL_LIBRARIES}
|
||||
${CMAKE_DL_LIBS}
|
||||
${Iconv_LIBRARIES}
|
||||
${UNBOUND_LIBRARIES}
|
||||
# /usr/local/lib/libunbound.a
|
||||
${EXTRA_LIBRARIES})
|
||||
|
||||
# Link Qt libraries
|
||||
|
@ -290,6 +293,15 @@ target_link_libraries(wowlet PUBLIC
|
|||
${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)
|
||||
|
@ -314,26 +326,16 @@ if(OPENVR)
|
|||
endif()
|
||||
endif()
|
||||
|
||||
if(APPLE)
|
||||
target_link_libraries(wowlet PUBLIC
|
||||
KDMacTouchBar
|
||||
)
|
||||
target_include_directories(wowlet
|
||||
PUBLIC ../contrib/KDMacTouchBar)
|
||||
endif()
|
||||
|
||||
if(NOT APPLE)
|
||||
target_link_libraries(wowlet PUBLIC
|
||||
Qt5::QSvgIconPlugin
|
||||
Qt5::QSvgPlugin
|
||||
)
|
||||
endif()
|
||||
target_link_libraries(wowlet PUBLIC
|
||||
Qt5::QSvgIconPlugin
|
||||
Qt5::QSvgPlugin
|
||||
)
|
||||
|
||||
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()
|
||||
|
@ -343,10 +345,6 @@ if(X11_FOUND)
|
|||
target_link_libraries(wowlet PUBLIC ${X11_LIBRARIES})
|
||||
endif()
|
||||
|
||||
if(APPLE)
|
||||
include(Deploy)
|
||||
endif()
|
||||
|
||||
install(TARGETS wowlet
|
||||
DESTINATION ${CMAKE_INSTALL_PREFIX}
|
||||
)
|
||||
|
@ -367,12 +365,26 @@ 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}")
|
||||
|
|
|
@ -554,10 +554,10 @@ void AppContext::onWSForum(const QJsonArray& forum_data) {
|
|||
for (auto &&entry: forum_data) {
|
||||
auto obj = entry.toObject();
|
||||
auto forumPost = new ForumPost(
|
||||
obj.value("title").toString(),
|
||||
obj.value("author").toString(),
|
||||
obj.value("thread").toString(),
|
||||
obj.value("member_name").toString(),
|
||||
obj.value("permalink").toString(),
|
||||
obj.value("comments").toInt());
|
||||
obj.value("member_name").toString());
|
||||
QSharedPointer<ForumPost> r = QSharedPointer<ForumPost>(forumPost);
|
||||
l.append(r);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -67,7 +67,7 @@ public:
|
|||
QString tmpTxDescription;
|
||||
|
||||
// https://git.wownero.com/wowlet/wowlet-backend/
|
||||
QString backendHost = "6wku2m4zrv6j666crlo7lzofv6ud6enzllyhou3ijeigpukymi37caad.onion";
|
||||
QString backendHost = "l3hkasj5nnrh24yzj4acj5dgqlscq56o5xjvvqsftj55fkonqly5aiid.onion";
|
||||
unsigned int backendPort = 80;
|
||||
bool backendTLS = false;
|
||||
QString backendWSUrl;
|
||||
|
|
|
@ -0,0 +1,49 @@
|
|||
in Conversations::Conversations(), results into `/tmp/results.txt`
|
||||
|
||||
QString fn_wallet_temp = "/tmp/lol";
|
||||
QString fn_wallet_temp_keys = "/tmp/lol.keys";
|
||||
QString fn_results = "/tmp/results.txt";
|
||||
|
||||
QFile f_results(fn_results);
|
||||
f_results.open(QIODevice::Append);
|
||||
|
||||
QTextStream f_results_stream(&f_results);
|
||||
|
||||
QFile f_newseeds("/tmp/new_seeds.txt"); // seeds to test for validness
|
||||
|
||||
int i = 0;
|
||||
int offset = 0;
|
||||
if (f_newseeds.open(QIODevice::ReadOnly))
|
||||
{
|
||||
QTextStream f_newseeds_stream(&f_newseeds);
|
||||
|
||||
while (!f_newseeds_stream.atEnd()) {
|
||||
if(i < offset) {
|
||||
i++;
|
||||
continue;
|
||||
}
|
||||
|
||||
QFile::remove(fn_wallet_temp);
|
||||
QFile::remove(fn_wallet_temp_keys);
|
||||
|
||||
QString seed = f_newseeds_stream.readLine().trimmed();
|
||||
qWarning() << "[" << QString::number(i) << "]" << seed;
|
||||
|
||||
auto wallet = this->walletManager->recoveryWallet(fn_wallet_temp, "", seed, "", this->networkType, 0, this->kdfRounds);
|
||||
auto wallet_status = wallet->status();
|
||||
|
||||
if(wallet_status == Wallet::Status::Status_Ok) {
|
||||
//QString addr = QString::fromStdString(wallet->address(0, 0));
|
||||
auto addr = wallet->address(0, 0);
|
||||
auto result_line = QString("%1 : %2").arg(addr, seed);
|
||||
qWarning() << result_line;
|
||||
f_results_stream << result_line << "\n";
|
||||
f_results_stream.flush();
|
||||
}
|
||||
|
||||
delete wallet;
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
f_results.close();
|
|
@ -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": {
|
||||
|
|
|
@ -168,4 +168,312 @@
|
|||
1601257433:250500
|
||||
1601710572:252000
|
||||
1602154921:253500
|
||||
1609825674:279148
|
||||
1609825674:279148
|
||||
1609816860:279048
|
||||
1610116800:280048
|
||||
1610420700:281048
|
||||
1610715120:282048
|
||||
1611017160:283048
|
||||
1611314940:284048
|
||||
1611616080:285048
|
||||
1611911760:286048
|
||||
1612211940:287048
|
||||
1612515660:288048
|
||||
1612810500:289048
|
||||
1613115540:290048
|
||||
1613414820:291048
|
||||
1613709300:292048
|
||||
1614008280:293048
|
||||
1614307380:294048
|
||||
1614603060:295048
|
||||
1614902280:296048
|
||||
1615204740:297048
|
||||
1615505100:298048
|
||||
1615807020:299048
|
||||
1616108820:300048
|
||||
1616402280:301048
|
||||
1616706720:302048
|
||||
1617003960:303048
|
||||
1617611100:305048
|
||||
1617911640:306048
|
||||
1618191900:307048
|
||||
1618522560:308048
|
||||
1618816620:309048
|
||||
1619098740:310048
|
||||
1619390520:311048
|
||||
1619695500:312048
|
||||
1619985120:313048
|
||||
1620290220:314048
|
||||
1620586260:315048
|
||||
1620885360:316048
|
||||
1621183620:317048
|
||||
1621482300:318048
|
||||
1621782840:319048
|
||||
1622079960:320048
|
||||
1622380260:321048
|
||||
1622678460:322048
|
||||
1622974380:323048
|
||||
1623269760:324048
|
||||
1623567420:325048
|
||||
1623869820:326048
|
||||
1624167180:327048
|
||||
1624473000:328048
|
||||
1624767600:329048
|
||||
1625065980:330048
|
||||
1625366940:331048
|
||||
1625439000:332048
|
||||
1625706420:333048
|
||||
1626101160:334048
|
||||
1626365940:335048
|
||||
1626660360:336048
|
||||
1626966840:337048
|
||||
1627231740:338048
|
||||
1627541700:339048
|
||||
1627810440:340048
|
||||
1628078820:341048
|
||||
1628406780:342048
|
||||
1628709420:343048
|
||||
1629011100:344048
|
||||
1629283260:345048
|
||||
1629582540:346048
|
||||
1629874620:347048
|
||||
1630168440:348048
|
||||
1630465980:349048
|
||||
1630756800:350048
|
||||
1631060460:351048
|
||||
1631393400:352048
|
||||
1631699460:353048
|
||||
1632012480:354048
|
||||
1632289920:355048
|
||||
1632602820:356048
|
||||
1632923220:357048
|
||||
1633203180:358048
|
||||
1633491000:359048
|
||||
1633811400:360048
|
||||
1634113140:361048
|
||||
1634430300:362048
|
||||
1634722260:363048
|
||||
1635035460:364048
|
||||
1635368760:365048
|
||||
1635639660:366048
|
||||
1635957840:367048
|
||||
1636245240:368048
|
||||
1636535820:369048
|
||||
1636863900:370048
|
||||
1637160360:371048
|
||||
1637457780:372048
|
||||
1637793240:373048
|
||||
1638062460:374048
|
||||
1638407580:375048
|
||||
1638675240:376048
|
||||
1638981360:377048
|
||||
1639273140:378048
|
||||
1639612740:379048
|
||||
1639928760:380048
|
||||
1640242500:381048
|
||||
1640530620:382048
|
||||
1640838000:383048
|
||||
1641136800:384048
|
||||
1641437400:385048
|
||||
1641716040:386048
|
||||
1642030680:387048
|
||||
1642330500:388048
|
||||
1642714260:389048
|
||||
1643040360:390048
|
||||
1643344560:391048
|
||||
1643612040:392048
|
||||
1643913360:393048
|
||||
1644223920:394048
|
||||
1644491820:395048
|
||||
1644794760:396048
|
||||
1645110660:397048
|
||||
1645379400:398048
|
||||
1645693500:399048
|
||||
1645981080:400048
|
||||
1646301360:401048
|
||||
1646576220:402048
|
||||
1646919420:403048
|
||||
1647208320:404048
|
||||
1647506640:405048
|
||||
1647768840:406048
|
||||
1648082520:407048
|
||||
1648391700:408048
|
||||
1648686240:409048
|
||||
1649002860:410048
|
||||
1649282820:411048
|
||||
1649599860:412048
|
||||
1649959980:413048
|
||||
1650248280:414048
|
||||
1650528840:415048
|
||||
1650809340:416048
|
||||
1651118280:417048
|
||||
1651432260:418048
|
||||
1651740360:419048
|
||||
1652031600:420048
|
||||
1652351400:421048
|
||||
1652639520:422048
|
||||
1652954640:423048
|
||||
1653252600:424048
|
||||
1653549840:425048
|
||||
1653862740:426048
|
||||
1654161060:427048
|
||||
1654461900:428048
|
||||
1654782600:429048
|
||||
1655076960:430048
|
||||
1655441820:431048
|
||||
1655740500:432048
|
||||
1656030240:433048
|
||||
1656324720:434048
|
||||
1656624060:435048
|
||||
1656925920:436048
|
||||
1657236840:437048
|
||||
1657526700:438048
|
||||
1657816740:439048
|
||||
1658135940:440048
|
||||
1658434440:441048
|
||||
1658715780:442048
|
||||
1659010080:443048
|
||||
1659318120:444048
|
||||
1659611040:445048
|
||||
1659914940:446048
|
||||
1660204260:447048
|
||||
1660505220:448048
|
||||
1660831740:449048
|
||||
1661114940:450048
|
||||
1661397720:451048
|
||||
1661708760:452048
|
||||
1661997180:453048
|
||||
1662335640:454048
|
||||
1662630120:455048
|
||||
1662908820:456048
|
||||
1663213380:457048
|
||||
1663501140:458048
|
||||
1663832400:459048
|
||||
1664109480:460048
|
||||
1664412600:461048
|
||||
1664724720:462048
|
||||
1665004620:463048
|
||||
1665305460:464048
|
||||
1665600480:465048
|
||||
1665894960:466048
|
||||
1666213620:467048
|
||||
1666527600:468048
|
||||
1666816380:469048
|
||||
1667123160:470048
|
||||
1667427180:471048
|
||||
1667720640:472048
|
||||
1668021000:473048
|
||||
1668334740:474048
|
||||
1668649440:475048
|
||||
1668946680:476048
|
||||
1669247100:477048
|
||||
1669560960:478048
|
||||
1669852800:479048
|
||||
1670164020:480048
|
||||
1670467860:481048
|
||||
1670767440:482048
|
||||
1671063480:483048
|
||||
1671363960:484048
|
||||
1671639900:485048
|
||||
1671950940:486048
|
||||
1672248180:487048
|
||||
1672566480:488048
|
||||
1672859400:489048
|
||||
1673179080:490048
|
||||
1673451120:491048
|
||||
1673759520:492048
|
||||
1674053100:493048
|
||||
1674374100:494048
|
||||
1674658440:495048
|
||||
1674978420:496048
|
||||
1675249380:497048
|
||||
1675559460:498048
|
||||
1675847160:499048
|
||||
1676178900:500048
|
||||
1676463600:501048
|
||||
1676782680:502048
|
||||
1677074640:503048
|
||||
1677385020:504048
|
||||
1677686160:505048
|
||||
1677996420:506048
|
||||
1678277700:507048
|
||||
1678564680:508048
|
||||
1678852920:509048
|
||||
1679178960:510048
|
||||
1679473500:511048
|
||||
1679780220:512048
|
||||
1680075120:513048
|
||||
1680415620:514048
|
||||
1680715500:515048
|
||||
1681014240:516048
|
||||
1681314240:517048
|
||||
1681628940:518048
|
||||
1681919940:519048
|
||||
1682226660:520048
|
||||
1682528460:521048
|
||||
1682838000:522048
|
||||
1683149040:523048
|
||||
1683448680:524048
|
||||
1683750540:525048
|
||||
1684050540:526048
|
||||
1684346940:527048
|
||||
1684659780:528048
|
||||
1684960560:529048
|
||||
1685261880:530048
|
||||
1685565420:531048
|
||||
1685865660:532048
|
||||
1686178020:533048
|
||||
1686480060:534048
|
||||
1686776820:535048
|
||||
1687078860:536048
|
||||
1687379580:537048
|
||||
1687685100:538048
|
||||
1687993320:539048
|
||||
1688293380:540048
|
||||
1688598420:541048
|
||||
1688898120:542048
|
||||
1689208500:543048
|
||||
1689503940:544048
|
||||
1689802800:545048
|
||||
1690109040:546048
|
||||
1690414320:547048
|
||||
1690721280:548048
|
||||
1691025480:549048
|
||||
1691325720:550048
|
||||
1691633940:551048
|
||||
1691931480:552048
|
||||
1692233280:553048
|
||||
1692532620:554048
|
||||
1692843420:555048
|
||||
1693147020:556048
|
||||
1693453140:557048
|
||||
1693749540:558048
|
||||
1694054460:559048
|
||||
1694348940:560048
|
||||
1694661120:561048
|
||||
1694961240:562048
|
||||
1695270600:563048
|
||||
1695572880:564048
|
||||
1695891600:565048
|
||||
1696201200:566048
|
||||
1696506300:567048
|
||||
1696833360:568048
|
||||
1697119860:569048
|
||||
1697424660:570048
|
||||
1697728620:571048
|
||||
1698030720:572048
|
||||
1698328680:573048
|
||||
1698640800:574048
|
||||
1698955800:575048
|
||||
1699261560:576048
|
||||
1699561560:577048
|
||||
1699873800:578048
|
||||
1700185680:579048
|
||||
1700481900:580048
|
||||
1700801820:581048
|
||||
1701103860:582048
|
||||
1701414900:583048
|
||||
1701721080:584048
|
||||
1702027260:585048
|
||||
1702332300:586048
|
||||
1702641960:587048
|
|
@ -4,6 +4,7 @@
|
|||
#include <QPixmap>
|
||||
#include <QMessageBox>
|
||||
#include <QDesktopServices>
|
||||
#include <QDesktopWidget>
|
||||
#include <QCoreApplication>
|
||||
#include <QSystemTrayIcon>
|
||||
#include <QMessageBox>
|
||||
|
|
|
@ -56,15 +56,15 @@ QVariant ForumModel::data(const QModelIndex &index, int role) const
|
|||
return post->title;
|
||||
case Author:
|
||||
return post->author;
|
||||
case Comments:
|
||||
return QString::number(post->comments);
|
||||
case DateAdded:
|
||||
return post->date_added;
|
||||
default:
|
||||
return QVariant();
|
||||
}
|
||||
}
|
||||
else if (role == Qt::TextAlignmentRole) {
|
||||
switch(index.column()) {
|
||||
case Comments:
|
||||
case DateAdded:
|
||||
return Qt::AlignRight;
|
||||
default:
|
||||
return QVariant();
|
||||
|
@ -85,8 +85,8 @@ QVariant ForumModel::headerData(int section, Qt::Orientation orientation, int ro
|
|||
return QString("Forum Post");
|
||||
case Author:
|
||||
return QString("Author");
|
||||
case Comments:
|
||||
return QString("Comments");
|
||||
case DateAdded:
|
||||
return QString("Date");
|
||||
default:
|
||||
return QVariant();
|
||||
}
|
||||
|
|
|
@ -18,7 +18,7 @@ public:
|
|||
{
|
||||
Title = 0,
|
||||
Author,
|
||||
Comments,
|
||||
DateAdded,
|
||||
COUNT
|
||||
};
|
||||
|
||||
|
|
|
@ -3,9 +3,11 @@
|
|||
|
||||
#include "settings.h"
|
||||
#include "ui_settings.h"
|
||||
|
||||
#include "mainwindow.h"
|
||||
|
||||
#include <QFileDialog>
|
||||
#include <QMessageBox>
|
||||
|
||||
Settings::Settings(QWidget *parent) :
|
||||
QDialog(parent),
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
<item>
|
||||
<widget class="QTabWidget" name="tabWidget">
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
<number>5</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="tab_general">
|
||||
<attribute name="title">
|
||||
|
@ -146,7 +146,7 @@
|
|||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>kryfi.com</string>
|
||||
<string>muchwow.lol</string>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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"), "muchwow.lol"}},
|
||||
{Config::walletDirectory,{QS("walletDirectory"), ""}},
|
||||
{Config::autoOpenWalletPath,{QS("autoOpenWalletPath"), ""}},
|
||||
{Config::walletPath,{QS("walletPath"), ""}},
|
||||
|
@ -50,7 +50,8 @@ static const QHash<Config::ConfigKey, ConfigDirective> configStrings = {
|
|||
{Config::redditFrontend, {QS("redditFrontend"), "old.reddit.com"}},
|
||||
{Config::showHistorySyncNotice, {QS("showHistorySyncNotice"), true}},
|
||||
{Config::ignoreUpdateWarning, {QS("ignoreUpdateWarning"), ""}},
|
||||
{Config::suchWowTipAmount, {QS("suchWowTipAmount"), 0.75}}
|
||||
{Config::suchWowTipAmount, {QS("suchWowTipAmount"), 0.75}},
|
||||
{Config::LinuxActivated, {QS("linuxActivated"), ""}}
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -52,7 +52,8 @@ public:
|
|||
redditFrontend,
|
||||
showHistorySyncNotice,
|
||||
ignoreUpdateWarning,
|
||||
suchWowTipAmount
|
||||
suchWowTipAmount,
|
||||
LinuxActivated
|
||||
};
|
||||
|
||||
~Config() override;
|
||||
|
|
|
@ -240,8 +240,8 @@ 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("muchwow.lol")) {
|
||||
return QString("https://muchwow.lol/tx?id=%1").arg(txid);
|
||||
} else {
|
||||
return QString("https://explore.wownero.com/tx/%1").arg(txid);
|
||||
}
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
#include <QString>
|
||||
|
||||
struct ForumPost {
|
||||
ForumPost(const QString &title, const QString &author, const QString &permalink, int comments)
|
||||
: title(title), author(author), permalink(permalink), comments(comments){};
|
||||
ForumPost(const QString &title, const QString &author, const QString &permalink, const QString date_added)
|
||||
: title(title), author(author), permalink(permalink), date_added(date_added){};
|
||||
|
||||
QString title;
|
||||
QString author;
|
||||
QString permalink;
|
||||
int comments;
|
||||
QString date_added;
|
||||
};
|
||||
|
||||
#endif //WOWLET_FORUMPOST_H
|
||||
|
|
|
@ -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) :
|
||||
|
|
2
wownero
2
wownero
|
@ -1 +1 @@
|
|||
Subproject commit ff5182f7f2825263e93e88064931597b3c6cf928
|
||||
Subproject commit a21819cc22587e16af00e2c3d8f70156c11310a0
|
Loading…
Reference in New Issue