beta-4 (bulletproof+, solo-mining)

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

.gitmodules

@@ -1,10 +1,9 @@
 [submodule "contrib/KDMacTouchBar"]
 	path = contrib/KDMacTouchBar
 	url = https://github.com/KDAB/KDMacTouchBar.git
-[submodule "monero"]
-	path = monero
-	url = https://git.wownero.com/wownero/wownero
-	branch = wowlet
 [submodule "contrib/quirc"]
 	path = contrib/quirc
 	url = https://github.com/dlbeer/quirc.git
+[submodule "wownero"]
+	path = wownero
+	url = https://git.wownero.com/wownero/wownero.git

CMakeLists.txt

@@ -4,13 +4,13 @@ project(wowlet)
 message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)
-set(VERSION_MAJOR "2")
+set(VERSION_MAJOR "3")
 set(VERSION_MINOR "0")
 set(VERSION_REVISION "0")
-set(VERSION "beta-2")
+set(VERSION "beta-4")
 
 option(FETCH_DEPS "Download dependencies if they are not found" ON)
-option(XMRIG "Include XMRig module" ON)
+option(XMRIG "Include XMRig module")
 option(OPENVR "Include OpenVR support")
 option(QML "Include QtQuick (QML)")
 option(ANDROID "Android deployment")
@@ -57,7 +57,7 @@ if(STATIC)
     # manually set the unbound submodule the right commit that has the fix.
     # This only works with -DMANUAL_SUBMODULES=1
     message(STATUS "applying unbound static build fix contrib/unbound_static.patch")
-    execute_process(COMMAND bash -c "git -C ${CMAKE_SOURCE_DIR}/monero/external/unbound apply ${CMAKE_SOURCE_DIR}/contrib/unbound_static.patch")
+    execute_process(COMMAND bash -c "git -C ${CMAKE_SOURCE_DIR}/wownero/external/unbound apply ${CMAKE_SOURCE_DIR}/contrib/unbound_static.patch")
 
     set(Boost_USE_STATIC_LIBS ON)
     set(Boost_USE_STATIC_RUNTIME ON)
@@ -90,21 +90,19 @@ function (add_linker_flag_if_supported flag var)
 endfunction()
 
 find_package(Git)
-if(GIT_FOUND)
-    message(STATUS "Initializing submodules")
-    execute_process(COMMAND git "submodule" "update" "--init" "--recursive")
-    execute_process(COMMAND git rev-parse "HEAD" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/monero OUTPUT_VARIABLE _WOWNERO_HEAD OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if(NOT _WOWNERO_HEAD STREQUAL WOWNERO_HEAD)
-        message(FATAL_ERROR "[submodule] Monero HEAD was at ${_WOWNERO_HEAD} but should be at ${WOWNERO_HEAD}")
-    else()
-        message(STATUS "[submodule] Wownero HEAD @ ${WOWNERO_HEAD}")
-    endif()
-endif()
+#if(GIT_FOUND)
+#    message(STATUS "Initializing submodules")
+#    execute_process(COMMAND git "submodule" "update" "--init" "--recursive")
+#    execute_process(COMMAND git rev-parse "HEAD" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/wownero OUTPUT_VARIABLE _WOWNERO_HEAD OUTPUT_STRIP_TRAILING_WHITESPACE)
+#    if(NOT _WOWNERO_HEAD STREQUAL WOWNERO_HEAD)
+#        message(FATAL_ERROR "[submodule] Wownero HEAD was at ${_WOWNERO_HEAD} but should be at ${WOWNERO_HEAD}")
+#    else()
+#        message(STATUS "[submodule] Wownero HEAD @ ${WOWNERO_HEAD}")
+#    endif()
+#endif()
 
-add_subdirectory(monero)
-set_property(TARGET wallet_merged PROPERTY FOLDER "monero")
-get_directory_property(ARCH_WIDTH DIRECTORY "monero" DEFINITION ARCH_WIDTH)
-get_directory_property(UNBOUND_LIBRARY DIRECTORY "monero" DEFINITION UNBOUND_LIBRARY)
+add_subdirectory(wownero)
+get_directory_property(ARCH_WIDTH DIRECTORY "wownero" DEFINITION ARCH_WIDTH)
 
 include(CMakePackageConfigHelpers)
 include(VersionMonero)

Makefile

@@ -27,7 +27,6 @@
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
 
 CMAKEFLAGS = \
-	-DARCH=x86_64 \
 	-DBUILD_64=On \
 	-DBUILD_TESTS=Off \
 	-DOPENVR=Off \
@@ -43,7 +42,7 @@ CMAKEFLAGS = \
 	$(CMAKEFLAGS_EXTRA)
 
 release-static: CMAKEFLAGS += -DBUILD_TAG="linux-x64"
-release-static: CMAKEFLAGS += -DXMRIG=ON
+release-static: CMAKEFLAGS += -DXMRIG=OFF
 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)

cmake/GenVersion.cmake

@@ -35,7 +35,7 @@ if(RET)
     message(WARNING "Cannot determine current commit. Make sure that you are building either from a Git working tree or from a source archive.")
     set(VERSIONTAG "unknown")
     set(VERSION_IS_RELEASE "false")
-    configure_file("monero/src/version.cpp.in" "${TO}")
+    configure_file("wownero/src/version.cpp.in" "${TO}")
 else()
     string(SUBSTRING ${COMMIT} 0 9 COMMIT)
     message(STATUS "You are currently on commit ${COMMIT}")
@@ -61,5 +61,5 @@ else()
             set(VERSION_IS_RELEASE "false")
         endif()
     endif()
-    configure_file("monero/src/version.cpp.in" "${TO}")
+    configure_file("wownero/src/version.cpp.in" "${TO}")
 endif()

cmake/VersionMonero.cmake

@@ -4,7 +4,7 @@
 find_package(Git QUIET)
 # Check what commit we're on
 execute_process(COMMAND "${GIT_EXECUTABLE}" rev-parse --short=9 HEAD RESULT_VARIABLE RET OUTPUT_VARIABLE COMMIT OUTPUT_STRIP_TRAILING_WHITESPACE
-                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/monero)
+                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/wownero)
 
 if(RET)
     # Something went wrong, set the version tag to -unknown
@@ -37,7 +37,7 @@ endif()
 
 # Check latest tagged release
 execute_process(COMMAND "${GIT_EXECUTABLE}" describe --abbrev=0 RESULT_VARIABLE RET OUTPUT_VARIABLE TAG OUTPUT_STRIP_TRAILING_WHITESPACE
-                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/monero)
+                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/wownero)
 
 if(RET)
     message(WARNING "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive.")

contrib/debian/build-deb.sh

@@ -43,4 +43,4 @@ cp "$PWD/src/assets/images/appicons/256x256.png" "$DEBDIR/usr/share/icons/hicolo
 # Build deb package
 
 dpkg-deb --build $DEBDIR
-mv wowlet.DebDir.deb wowlet_2.0_amd64.deb
+mv wowlet.DebDir.deb wowlet_2.1_amd64.deb

contrib/debian/control

@@ -1,5 +1,5 @@
 Package: wowlet
-Version: 2.0
+Version: 2.1
 Section: net
 Priority: optional
 Architecture: amd64

docs/BUILDING.md

@@ -27,7 +27,7 @@ Replace `master` with the desired version tag (e.g. `beta-4`) to build the relea
 #### 2. Base image
 
 ```bash
-docker build --tag wowlet:linux --build-arg THREADS=4 .
+docker build --tag wowlet:linux --build-arg THREADS=6 .
 ```
 
 Building the base image takes a while. You only need to build the base image once.
@@ -37,7 +37,7 @@ Building the base image takes a while. You only need to build the base image onc
 ##### Standalone binary
 
 ```bash
-docker run --rm -it -v $PWD:/wowlet -w /wowlet wowlet:linux sh -c 'make release-static -j4'
+docker run --rm -it -v $PWD:/wowlet -w /wowlet wowlet:linux sh -c 'make release-static -j6'
 ```
 
 If you're re-running a build make sure to `rm -rf build/` first.
@@ -67,7 +67,7 @@ Replace `master` with the desired version tag (e.g. `beta-4`) to build the relea
 
 
 ```bash
-docker build -f Dockerfile.windows --tag wowlet:win --build-arg THREADS=4 .
+docker build -f Dockerfile.windows --tag wowlet:win --build-arg THREADS=6 .
 ```
 
 Building the base image takes a while. You only need to build the base image once.
@@ -75,7 +75,7 @@ Building the base image takes a while. You only need to build the base image onc
 #### 3. Build
 
 ```bash
-docker run --rm -it -v $PWD:/wowlet -w /wowlet wowlet:win sh -c 'make depends root=/depends target=x86_64-w64-mingw32 tag=win-x64 -j4'
+docker run --rm -it -v $PWD:/wowlet -w /wowlet wowlet:win sh -c 'make windows root=/depends target=x86_64-w64-mingw32 tag=win-x64 -j6'
 ```
 
 If you're re-running a build make sure to `rm -rf build/` first.

src/CMakeLists.txt

@@ -136,10 +136,10 @@ file(GLOB_RECURSE SRC_HEADERS *.h)
 
 target_include_directories(wowlet PUBLIC
         ${CMAKE_BINARY_DIR}/src/wowlet_autogen/include
-        ${CMAKE_SOURCE_DIR}/monero/include
-        ${CMAKE_SOURCE_DIR}/monero/src
-        ${CMAKE_SOURCE_DIR}/monero/external/easylogging++
-        ${CMAKE_SOURCE_DIR}/monero/contrib/epee/include
+        ${CMAKE_SOURCE_DIR}/wownero/include
+        ${CMAKE_SOURCE_DIR}/wownero/src
+        ${CMAKE_SOURCE_DIR}/wownero/external/easylogging++
+        ${CMAKE_SOURCE_DIR}/wownero/contrib/epee/include
         ${CMAKE_SOURCE_DIR}/src
         ${CMAKE_CURRENT_SOURCE_DIR}
         ${CMAKE_CURRENT_SOURCE_DIR}/daemon
@@ -251,14 +251,9 @@ endif()
 
 # Link Wownero core libraries
 target_link_libraries(wowlet PUBLIC
-        wallet_merged
-        ${LMDB_LIBRARY}
         epee
-        ${UNBOUND_LIBRARY}
-        ${SODIUM_LIBRARY}
+        wallet_api
         easylogging
-        blockchain_db
-        hardforks
         ${Boost_LIBRARIES}
         ${OPENSSL_LIBRARIES}
         ${CMAKE_DL_LIBS}

src/main.cpp

@@ -135,6 +135,7 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
     qputenv("QML_DISABLE_DISK_CACHE", "1");
 #endif
 
+#ifdef __ANDROID__
     if(android || androidDebug) {
 #ifndef HAS_QML
         qCritical() << "Wowlet compiled without QML support. Try -DQML=ON";
@@ -146,6 +147,7 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
         auto *mobile = new mobile::Mobile(ctx, &parser, &mobile_app);
         return mobile_app.exec();
     }
+#endif
 
     if(openVREnabled) {
 #ifdef HAS_OPENVR

src/mainwindow.cpp

@@ -93,8 +93,8 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) :
     });
     connect(ui->actionReport_bug, &QAction::triggered, [this](){
         QMessageBox::information(this, "Reporting Bugs",
-                                 "<body>Please report any bugs as issues on our git repo:<br>\n"
-                                 "<a href=\"https://git.wownero.com/wowlet/wowlet/issues\" style=\"color: #33A4DF\">https://git.wownero.com/wowlet/wowlet/issues</a><br/><br/>"
+                                 "<body>Please report any bugs as issues on the forum:<br>\n"
+                                 "<a href=\"https://forum.wownero.com\" style=\"color: #33A4DF\">https://forum.wownero.com/</a><br/><br/>"
                                  "\n"
                                  "Before reporting a bug, upgrade to the most recent version of WOWlet "
                                  "(latest release or git HEAD), and include the version number in your report. "

src/openpgp/CMakeLists.txt

@@ -16,5 +16,6 @@ target_include_directories(openpgp PUBLIC
 
 target_link_libraries(openpgp
   PUBLIC
+    epee
     ${GCRYPT_LIBRARY}
     ${GPG_ERROR_LIBRARY})