Merge pull request #136 from Beldex-Coin/dev

Merge Dev Branch into Master for New Hardfork-18

Author: sanada08

.drone.jsonnet

@@ -1,5 +1,5 @@
 local default_deps_base='libsystemd-dev libboost-thread-dev libgtest-dev ' +
-    'libboost-serialization-dev libboost-program-options-dev libunbound-dev nettle-dev libevent-dev libminiupnpc-dev ' +
+    'libboost-serialization-dev libboost-program-options-dev libunbound-dev nettle-dev libevent-dev ' +
     'libunwind8-dev libsodium-dev libssl-dev libreadline-dev libhidapi-dev libusb-1.0-0-dev python3 ' +
     'pkg-config libsqlite3-dev qttools5-dev libcurl4-openssl-dev';
 local default_deps='g++ ' + default_deps_base; // g++ sometimes needs replacement
@@ -137,7 +137,7 @@ local android_build_steps(android_abi, android_platform=21, jobs=6, cmake_extra=
         '-DCMAKE_BUILD_TYPE=Release ' +
         '-DCMAKE_TOOLCHAIN_FILE=/usr/lib/android-sdk/ndk-bundle/build/cmake/android.toolchain.cmake ' +
         '-DANDROID_PLATFORM=' + android_platform + ' -DANDROID_ABI=' + android_abi + ' ' +
-        '-DMONERO_SLOW_HASH=ON ' +
+        '-DMONERO_SLOW_HASH=ON'+' -DWARNINGS_AS_ERRORS=OFF'+' -DBUILD_TESTS=OFF ' +
         '-DLOCAL_MIRROR=https://builds.belnet.dev/deps ' +
         '-DBUILD_STATIC_DEPS=ON -DSTATIC=ON -G Ninja ' + cmake_extra,
     'ninja -j' + jobs + ' -v wallet_merged',
@@ -228,11 +228,11 @@ local gui_wallet_step_darwin = {
     {   name: 'Android wallet_api', kind: 'pipeline', type: 'docker', platform: { arch: 'amd64' },
         steps: [submodules, {
                 name: 'build',
-                image: 'debian:sid',
+                image: 'debian:bullseye',
                 environment: { SSH_KEY: { from_secret: "SSH_KEY" } },
                 commands: [
                     'echo "man-db man-db/auto-update boolean false" | debconf-set-selections',
-                    'echo deb http://deb.debian.org/debian sid contrib >/etc/apt/sources.list.d/sid-contrib.list',
+                    'echo deb http://deb.debian.org/debian bullseye contrib >/etc/apt/sources.list.d/bullseye-contrib.list',
                     apt_get_quiet + ' update',
                     apt_get_quiet + ' install -y eatmydata',
                     'eatmydata ' + apt_get_quiet + ' dist-upgrade -y',

.gitignore

@@ -113,3 +113,6 @@ nbproject
 /testnet
 
 __pycache__/
+
+# brew build lock file
+contrib/brew/Brewfile.lock.json

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "external/miniupnp"]
-	path = external/miniupnp
-	url = https://github.com/miniupnp/miniupnp
 [submodule "external/rapidjson"]
 	path = external/rapidjson
 	url = https://github.com/Tencent/rapidjson
@@ -28,3 +25,9 @@
 [submodule "external/ghc-filesystem"]
 	path = external/ghc-filesystem
 	url = https://github.com/gulrak/filesystem.git
+[submodule "external/fmt"]
+	path = external/fmt
+	url = https://github.com/fmtlib/fmt.git
+[submodule "external/oxen-encoding"]
+	path = external/oxen-encoding
+	url = https://github.com/oxen-io/oxen-encoding.git

CMakeLists.txt

@@ -51,9 +51,9 @@ message(STATUS "CMake version ${CMAKE_VERSION}")
 set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12 CACHE STRING "macOS deployment target (Apple clang only)")
 
 project(beldex
-    VERSION 4.1.0
+    VERSION 5.0.0
     LANGUAGES CXX C)
-set(BELDEX_RELEASE_CODENAME "Bucephalus")
+set(BELDEX_RELEASE_CODENAME "Bern")
 
 # String value to append to the full version string; this is intended to easily identify whether a
 # binary was build from the release or development branches.  This should be permanently set to an
@@ -283,8 +283,7 @@ if(NOT MANUAL_SUBMODULES)
       endforeach()
     endfunction ()
 
-    message(STATUS "Checking submodules")
-    check_submodule(external/miniupnp)
+    message(STATUS "Checking submodules")    
     check_submodule(external/rapidjson)
     check_submodule(external/trezor-common)
     check_submodule(external/randomx)
@@ -322,7 +321,6 @@ else()
 endif()
 message(STATUS "Building for a ${ARCH_WIDTH}-bit system")
 
-# Check if we're on FreeBSD so we can exclude the local miniupnpc (it should be installed from ports instead)
 # CMAKE_SYSTEM_NAME checks are commonly known, but specifically taken from libsdl's CMakeLists
 if(CMAKE_SYSTEM_NAME MATCHES "kFreeBSD.*|FreeBSD")
   set(FREEBSD TRUE)
@@ -357,6 +355,7 @@ if(APPLE)
 endif()
 
 option(BUILD_STATIC_DEPS "Download, build and statically link against core dependencies" OFF)
+option(HTTPS_AND_SSL "Use https and ssl while statically build" ON)
 if(BUILD_STATIC_DEPS)
   include(StaticBuild)
 endif()
@@ -429,24 +428,6 @@ find_package(Threads)
 
 if (APPLE AND NOT IOS)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64 -fvisibility=default")
-  if (NOT OpenSSL_DIR)
-      EXECUTE_PROCESS(COMMAND brew --prefix openssl
-        OUTPUT_VARIABLE OPENSSL_ROOT_DIR
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-    message(STATUS "Using OpenSSL found at ${OPENSSL_ROOT_DIR}")
-  endif()
-endif()
-
-if(BUILD_STATIC_DEPS)
-  # SSL::* targets already set up
-else()
-  find_package(OpenSSL REQUIRED)
-endif()
-message(STATUS "Using OpenSSL include dir at ${OPENSSL_INCLUDE_DIR}")
-
-if(MINGW)
-  # OpenSSL doesn't seem to properly set up its dependencies on Windows, leading to linking errors
-  target_link_libraries(OpenSSL::Crypto INTERFACE ws2_32)
 endif()
 
 add_definition_if_library_exists(c memset_s "string.h" HAVE_MEMSET_S)
@@ -456,7 +437,6 @@ add_definition_if_function_found(strptime HAVE_STRPTIME)
 # Generate header for embedded translations
 add_subdirectory(translations)
 
-add_library(miniupnpc INTERFACE)
 add_library(systemd INTERFACE)  # Will do nothing unless we find and enable systemd support
 
 if(NOT TARGET sodium)
@@ -483,12 +463,6 @@ if(NOT TARGET sodium)
   export(TARGETS sodium NAMESPACE sodium:: FILE sodium-exports.cmake)
 endif()
 
-if (NOT BUILD_STATIC_DEPS)
-  find_package(PkgConfig REQUIRED)
-  pkg_check_modules(UNBOUND libunbound REQUIRED IMPORTED_TARGET)
-  add_library(libunbound INTERFACE)
-  target_link_libraries(libunbound INTERFACE PkgConfig::UNBOUND)
-endif()
 
 option(WITH_SYSTEMD "Attempts to link against and enable systemd daemon notification support" ON)
 if (WITH_SYSTEMD AND NOT BUILD_STATIC_DEPS)
@@ -560,7 +534,7 @@ else()
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
 
-  set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-unused-variable -Wno-error=unused-variable -Wno-error=uninitialized")
+  set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-unused-variable -Wno-error=unused-variable -Wno-error=uninitialized")
 
   option(WARNINGS_AS_ERRORS "Enable warning as errors" OFF)
   if(NOT MINGW AND WARNINGS_AS_ERRORS)
@@ -790,20 +764,14 @@ set(Boost_USE_MULTITHREADED TRUE) # Needed for macOS, at least, and won't hurt e
 if(BUILD_STATIC_DEPS)
   # StaticBuild.cmake sets Boost targets up for us
 else()
-  find_package(Boost 1.58 QUIET REQUIRED COMPONENTS system thread serialization program_options)
+  find_package(Boost 1.62 QUIET REQUIRED COMPONENTS system thread serialization program_options)
 endif()
 
 set(CMAKE_FIND_LIBRARY_SUFFIXES ${OLD_LIB_SUFFIXES})
 if(NOT Boost_FOUND)
   message(FATAL_ERROR "Could not find Boost libraries, please make sure you have installed Boost or libboost-all-dev (>=1.58) or the equivalent")
 elseif(Boost_FOUND)
   message(STATUS "Found Boost Version: ${Boost_VERSION}")
-  if (OPENSSL_VERSION VERSION_GREATER_EQUAL 1.1 AND (
-        Boost_VERSION VERSION_LESS 1.62.0 OR (Boost_VERSION VERSION_GREATER 100000 AND Boost_VERSION VERSION_LESS 106200)))
-      message(FATAL_ERROR "Boost ${Boost_VERSION} (older than 1.62) is too old to link with OpenSSL ${OPENSSL_VERSION} (1.1 or newer) found at ${OPENSSL_INCLUDE_DIR} and ${OPENSSL_LIBRARIES}. "
-                          "Update Boost or install OpenSSL 1.0 and set path to it when running cmake: "
-                          "cmake -DOPENSSL_ROOT_DIR='/usr/include/openssl-1.0'")
-  endif()
 endif()
 
 # Interface target for random extra system libraries that we need to link everything against

Dockerfile

@@ -33,16 +33,16 @@ RUN set -ex && \
 
 WORKDIR /usr/local/src
 
-ARG OPENSSL_VERSION=1.1.1g
-ARG OPENSSL_HASH=ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46
-RUN set -ex \
-    && curl -s -O https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \
-    && echo "${OPENSSL_HASH}  openssl-${OPENSSL_VERSION}.tar.gz" | sha256sum -c \
-    && tar xf openssl-${OPENSSL_VERSION}.tar.gz \
-    && cd openssl-${OPENSSL_VERSION} \
-    && ./Configure --prefix=/usr linux-x86_64 no-shared --static \
-    && make -j$(nproc) \
-    && make install_sw -j$(nproc)
+# ARG OPENSSL_VERSION=1.1.1g
+# ARG OPENSSL_HASH=ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46
+# RUN set -ex \
+#     && curl -s -O https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \
+#     && echo "${OPENSSL_HASH}  openssl-${OPENSSL_VERSION}.tar.gz" | sha256sum -c \
+#     && tar xf openssl-${OPENSSL_VERSION}.tar.gz \
+#     && cd openssl-${OPENSSL_VERSION} \
+#     && ./Configure --prefix=/usr linux-x86_64 no-shared --static \
+#     && make -j$(nproc) \
+#     && make install_sw -j$(nproc)
 
 ARG BOOST_VERSION=1_72_0
 ARG BOOST_VERSION_DOT=1.72.0
@@ -95,17 +95,17 @@ RUN set -ex \
     && make install
 
 RUN set -ex \
-    && apt install wget -y \
-    && wget https://github.com/libexpat/libexpat/releases/download/R_2_3_0/expat-2.3.0.tar.gz \
-    && tar xf expat-2.3.0.tar.gz \
-    && cd expat-2.3.0 \
-    && ./configure --enable-static --prefix=/usr && make && make install
+    && apt install wget -y
+#     && wget https://github.com/libexpat/libexpat/releases/download/R_2_3_0/expat-2.3.0.tar.gz \
+#     && tar xf expat-2.3.0.tar.gz \
+#     && cd expat-2.3.0 \
+#     && ./configure --enable-static --prefix=/usr && make && make install
 
 RUN set -ex \
     && wget https://curl.se/download/curl-7.76.1.tar.gz \
     && tar xf curl-7.76.1.tar.gz \
     && cd curl-7.76.1 \
-    && ./configure --with-openssl --enable-static --prefix=/usr && make && make install
+    && ./configure --enable-static --prefix=/usr && make && make install
 
 RUN set -ex \
     && apt-get update -y \
@@ -118,20 +118,20 @@ RUN set -ex \
     && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 70 --slave /usr/bin/g++ g++ /usr/bin/g++-7 --slave /usr/bin/gcov gcov /usr/bin/gcov-7 \
     && gcc --version
 
-RUN set -ex \
-    && apt install libevent-dev -y \
-    && wget https://nlnetlabs.nl/downloads/unbound/unbound-1.13.1.tar.gz \
-    && tar xf unbound-1.13.1.tar.gz \
-    && cd unbound-1.13.1 \
-     && ./configure --enable-static --disable-flto --prefix=/usr CFLAGS=-fPIC && make && make install
+# RUN set -ex \
+#     && apt install libevent-dev -y \
+#     && wget https://nlnetlabs.nl/downloads/unbound/unbound-1.13.1.tar.gz \
+#     && tar xf unbound-1.13.1.tar.gz \
+#     && cd unbound-1.13.1 \
+#      && ./configure --enable-static --disable-flto --prefix=/usr CFLAGS=-fPIC && make && make install
 
 WORKDIR /src
 COPY . .
 
 RUN set -ex && \
     git submodule update --init --recursive && \
     rm -rf build/release && mkdir -p build/release && cd build/release && \
-    cmake -DSTATIC=ON -DARCH=x86-64 -DCMAKE_BUILD_TYPE=Release ../.. && \
+    cmake -DSTATIC=ON -DARCH=x86-64 -DHTTPS_AND_SSL=OFF -DCMAKE_BUILD_TYPE=Release ../.. && \
     make -j$(nproc) VERBOSE=1
 
 RUN set -ex && \

Makefile

@@ -101,7 +101,7 @@ release-test:
 
 release-all:
 	mkdir -p $(builddir)/release
-	cd $(builddir)/release && cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE)
+	cd $(builddir)/release && cmake -D BUILD_TESTS=OFF -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE)
 
 release-static:
 	mkdir -p $(builddir)/release

README.md

@@ -44,18 +44,14 @@ library archives (`.a`).
 | CMake        | 3.10          | NO       | `cmake`                | `cmake`      | `cmake`             | NO       |                  |
 | pkg-config   | any           | NO       | `pkg-config`           | `base-devel` | `pkgconf`           | NO       |                  |
 | Boost        | 1.65          | NO       | `libboost-all-dev`[2]  | `boost`      | `boost-devel`       | NO       | C++ libraries    |
-| OpenSSL      | basically any | NO       | `libssl-dev`           | `openssl`    | `openssl-devel`     | NO       | sha256 sum       |
 | libzmq       | 4.3.0         | YES      | `libzmq3-dev`          | `zeromq`     | `zeromq-devel`      | NO       | ZeroMQ library   |
 | sqlite3      | ?             | YES      | `libsqlite3-dev`       | `sqlite`     | `sqlite-devel`      | NO       | Beldex Name System |
-| libunbound   | 1.4.16        | NO       | `libunbound-dev`       | `unbound`    | `unbound-devel`     | NO       | DNS resolver     |
 | libsodium    | 1.0.9         | YES      | `libsodium-dev`        | `libsodium`  | `libsodium-devel`   | NO       | cryptography     |
-| libcurl      | 4.0           | NO       | `libcurl4-openssl-dev` | `curl`       | `curl-devel`        | NO       | HTTP RPC         |
+| libcurl      | 4.0           | NO       | `curl`                 | `curl-devel` | NO                  | HTTP     | RPC              |
 | libuv (Win)  | any           | NO       | (Windows only)         | --           | --                  | NO       | RPC event loop   |
 | libunwind    | any           | NO       | `libunwind8-dev`       | `libunwind`  | `libunwind-devel`   | YES      | Stack traces     |
 | liblzma      | any           | NO       | `liblzma-dev`          | `xz`         | `xz-devel`          | YES      | For libunwind    |
 | libreadline  | 6.3.0         | NO       | `libreadline-dev`      | `readline`   | `readline-devel`    | YES      | Input editing    |
-| ldns         | 1.6.17        | NO       | `libldns-dev`          | `ldns`       | `ldns-devel`        | YES      | SSL toolkit      |
-| expat        | 1.1           | NO       | `libexpat1-dev`        | `expat`      | `expat-devel`       | YES      | XML parsing      |
 | Doxygen      | any           | NO       | `doxygen`              | `doxygen`    | `doxygen`           | YES      | Documentation    |
 | Graphviz     | any           | NO       | `graphviz`             | `graphviz`   | `graphviz`          | YES      | Documentation    |
 | Qt tools     | 5.x           | NO       | `qttools5-dev`         | `qt5-tools`  | `qt5-linguist`      | YES      | Translations     |
@@ -74,14 +70,14 @@ breakdown of the minimum set of required boost packages.
 Install all dependencies at once on Debian/Ubuntu:
 
 ```
-sudo apt update && sudo apt install build-essential cmake pkg-config libboost-all-dev libssl-dev libzmq3-dev libunbound-dev libsodium-dev libunwind8-dev liblzma-dev libreadline6-dev libldns-dev libexpat1-dev doxygen graphviz libpgm-dev libsqlite3-dev libcurl4-openssl-dev
+sudo apt update && sudo apt install build-essential cmake pkg-config libboost-all-dev libzmq3-dev libsodium-dev libunwind8-dev liblzma-dev libreadline6-dev doxygen graphviz libpgm-dev libsqlite3-dev curl
 ```
 
 Install all dependencies at once on macOS with the provided Brewfile:
 ``` brew update && brew bundle --file=contrib/brew/Brewfile ```
 
 FreeBSD one liner for required to build dependencies
-```pkg install git gmake cmake pkgconf boost-libs libzmq4 libsodium sqlite3 openssl unbound miniupnpc```
+```pkg install git gmake cmake pkgconf boost-libs libzmq4 libsodium sqlite3 miniupnpc```
 
 ### Cloning the repository
 
@@ -202,13 +198,13 @@ application.
     To build for 64-bit Windows:
 
     ```bash
-    pacman -S git mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-sqlite3 mingw-w64-x86_64-unbound
+    pacman -S git mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-sqlite3
     ```
 
     To build for 32-bit Windows:
 
     ```bash
-    pacman -S git mingw-w64-i686-toolchain make mingw-w64-i686-cmake mingw-w64-i686-boost mingw-w64-i686-openssl mingw-w64-i686-zeromq mingw-w64-i686-libsodium mingw-w64-i686-hidapi mingw-w64-i686-sqlite3 mingw-w64-i686-unbound
+    pacman -S git mingw-w64-i686-toolchain make mingw-w64-i686-cmake mingw-w64-i686-boost mingw-w64-i686-zeromq mingw-w64-i686-libsodium mingw-w64-i686-hidapi mingw-w64-i686-sqlite3
     ```
 
 * Close and reopen the MSYS MinGW shell via `MSYS2 MinGW 64-bit` shortcut on