v2.2.2-20231121 (#non-privacy)

Core Update v2.2.2-20231121 (#non-privacy) - MANDATORY DEADLINE 15/12/2023
dynexcoin · Dec 4, 2023 · bb72db4 · bb72db4
1 parent a760833
commit bb72db4
Show file tree

Hide file tree

Showing 650 changed files with 21,471 additions and 806,009 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,59 +10,6 @@ on:
       - main
 
 jobs:
-  ubuntu-18_04:
-    runs-on: ubuntu-18.04
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [
-          "core-avx2",
-          "core2",
-          "nocona",
-        ]
-    steps:
-      - name: checkout
-        uses: actions/checkout@v3
-      - name: Setup cmake
-        uses: jwlawson/[email protected]
-        with:
-          cmake-version: '3.18.x'
-      - name: Extract branch name & commit
-        id: extract_branch
-        run: |
-          echo "git_hash=$(git rev-parse --short=7 "$GITHUB_SHA")" >> $GITHUB_OUTPUT
-          echo "branch=$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//\./g')" >> $GITHUB_OUTPUT
-      - name: install apt-get deps
-        run: |
-          sudo apt-get update
-          sudo apt-get install libboost-all-dev libcurl4-openssl-dev
-          sudo apt-get install libdb++-dev build-essential libtool autotools-dev automake pkg-config bsdmainutils ccache python3 python3-pip python3-setuptools python-setuptools
-          sudo apt-get install libevent-dev python3-zmq python3-dev libboost-python-dev libboost-system-dev libboost-filesystem-dev libboost-test-dev libboost-thread-dev libminiupnpc-dev libzmq3-dev
-      - name: build Dynex
-        run: |
-          (
-          rm -rf build
-          mkdir build;
-          cd build;
-          cmake -DCMAKE_CXX_FLAGS=-march=${{ matrix.arch }} -mtune=generic -DCMAKE_C_FLAGS=-march=${{ matrix.arch }} -mtune=generic ..;
-          make -j2;
-          )
-      - name: create artifacts
-        if: success()
-        run: |
-          mkdir -p ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}
-          mv ./build/src/connectivity_tool ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}/connectivity_tool
-          mv ./build/src/dynexd ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}/dynexd
-          mv ./build/src/simplewallet ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}/simplewallet
-          mv ./build/src/walletd ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}/walletd
-          mv ./release Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}
-      - name: Archive artifacts on GH
-        if: success()
-        uses: actions/upload-artifact@v3
-        with:
-          name: Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}-ubuntu-18.04-linux-x64-${{ matrix.arch }}
-          path: Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}
-
   ubuntu-20_04:
     runs-on: ubuntu-20.04
     strategy:
@@ -91,13 +38,14 @@ jobs:
           sudo apt-get install libboost-all-dev libcurl4-openssl-dev
           sudo apt-get install libdb++-dev build-essential libtool autotools-dev automake pkg-config bsdmainutils ccache python3 python3-pip python3-setuptools python-setuptools
           sudo apt-get install libevent-dev python3-zmq python3-dev libboost-python-dev libboost-system-dev libboost-filesystem-dev libboost-test-dev libboost-thread-dev libminiupnpc-dev libzmq3-dev
+          sudo apt install qtcreator qtbase5-dev qt5-qmake cmake
       - name: build Dynex
         run: |
           (
           rm -rf build
           mkdir build;
           cd build;
-          cmake -DCMAKE_CXX_FLAGS=-march=${{ matrix.arch }} -mtune=generic -DCMAKE_C_FLAGS=-march=${{ matrix.arch }} -mtune=generic ..;
+          cmake -DGUI=True -DCMAKE_CXX_FLAGS=-march=${{ matrix.arch }} -mtune=generic -DCMAKE_C_FLAGS=-march=${{ matrix.arch }} -mtune=generic ..;
           make -j2;
           )
       - name: create artifacts
@@ -108,6 +56,7 @@ jobs:
           mv ./build/src/dynexd ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}/dynexd
           mv ./build/src/simplewallet ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}/simplewallet
           mv ./build/src/walletd ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}/walletd
+          mv ./build/src/WalletGui/dynexwallet ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}/dynexwallet
           mv ./release Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}
       - name: Archive artifacts on GH
         if: success()
@@ -144,13 +93,14 @@ jobs:
           sudo apt-get install libboost-all-dev libcurl4-openssl-dev
           sudo apt-get install libdb++-dev build-essential libtool autotools-dev automake pkg-config bsdmainutils ccache python3 python3-pip python3-setuptools python-setuptools
           sudo apt-get install libevent-dev python3-zmq python3-dev libboost-python-dev libboost-system-dev libboost-filesystem-dev libboost-test-dev libboost-thread-dev libminiupnpc-dev libzmq3-dev
+          sudo apt install qtcreator qtbase5-dev qt5-qmake cmake
       - name: build Dynex
         run: |
           (
           rm -rf build
           mkdir build;
           cd build;
-          cmake -DCMAKE_CXX_FLAGS=-march=${{ matrix.arch }} -mtune=generic -DCMAKE_C_FLAGS=-march=${{ matrix.arch }} -mtune=generic ..;
+          cmake -DGUI=True -DCMAKE_CXX_FLAGS=-march=${{ matrix.arch }} -mtune=generic -DCMAKE_C_FLAGS=-march=${{ matrix.arch }} -mtune=generic ..;
           make -j2;
           )
       - name: create artifacts
@@ -161,6 +111,7 @@ jobs:
           mv ./build/src/dynexd ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}/dynexd
           mv ./build/src/simplewallet ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}/simplewallet
           mv ./build/src/walletd ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}/walletd
+          mv ./build/src/WalletGui/dynexwallet ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}/dynexwallet
           mv ./release Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}
       - name: Archive artifacts on GH
         if: success()
@@ -220,57 +171,6 @@ jobs:
           name: Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}-macos-11
           path: Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}
 
-  macos_1015:
-    runs-on: macos-10.15
-    steps:
-      - name: checkout
-        uses: actions/checkout@v3
-      - name: Setup cmake
-        uses: jwlawson/[email protected]
-        with:
-          cmake-version: '3.18.x'
-      - name: Extract branch name & commit
-        id: extract_branch
-        run: |
-          echo "git_hash=$(git rev-parse --short=7 "$GITHUB_SHA")" >> $GITHUB_OUTPUT
-          echo "branch=$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//\./g')" >> $GITHUB_OUTPUT
-      - name: Install boost
-        uses: MarkusJx/[email protected]
-        id: install-boost
-        with:
-            # REQUIRED: Specify the required boost version
-            # A list of supported versions can be found here:
-            # https://github.com/MarkusJx/prebuilt-boost/blob/main/versions-manifest.json
-            boost_version: 1.79.0
-            platform_version: 10.15
-      - name: build Dynex
-        env:
-          BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
-        run: |
-          (
-          rm -rf build
-          mkdir build;
-          cd build;
-          cmake .. -DBoost_INCLUDE_DIR=${{steps.install-boost.outputs.BOOST_ROOT}}/include\
-            -DBoost_LIBRARY_DIRS=${{steps.install-boost.outputs.BOOST_ROOT}}/lib;
-          make -j2;
-          )
-      - name: create artifacts
-        if: success()
-        run: |
-          mkdir -p ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}
-          mv ./build/src/connectivity_tool ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}/connectivity_tool
-          mv ./build/src/dynexd ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}/dynexd
-          mv ./build/src/simplewallet ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}/simplewallet
-          mv ./build/src/walletd ./release/Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}/walletd
-          mv ./release Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}
-      - name: Archive artifacts on GH
-        if: success()
-        uses: actions/upload-artifact@v3
-        with:
-          name: Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}-macos-10.15
-          path: Dynex-${{ steps.extract_branch.outputs.branch }}-${{ steps.extract_branch.outputs.git_hash }}
-
   macos_12:
     runs-on: macos-12
     steps:

diff --git a/CMakeLists.linux.txt b/CMakeLists.linux.txt
@@ -12,7 +12,7 @@ enable_testing()
 # copy CTestCustom.cmake to build dir to disable long running tests in 'make test'
 configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR})
 
-project(CryptoNote)
+project(DynexCN)
 
 include_directories(include src external "${CMAKE_BINARY_DIR}/version")
 if(APPLE)

diff --git a/CMakeLists.macosM1.txt b/CMakeLists.macosM1.txt
@@ -10,7 +10,7 @@ set(CMAKE_SUPPRESS_REGENERATION ON)
 enable_testing()
 configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR})
 
-project(CryptoNote)
+project(DynexCN)
 
 include_directories(include src external "${CMAKE_BINARY_DIR}/version")
 if(APPLE)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_SUPPRESS_REGENERATION ON)
 enable_testing()
 configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR})
 
-project(CryptoNote)
+project(Dynex)
 
 include_directories(include src external "${CMAKE_BINARY_DIR}/version")
 if(APPLE)
@@ -50,7 +50,7 @@ endif()
 set(STATIC ${MSVC} CACHE BOOL "Link libraries statically")
 
 if(MSVC)
-  add_definitions("/bigobj /MP /W3 /GS- /D_CRT_SECURE_NO_WARNINGS /wd4996 /wd4345 /D_WIN32_WINNT=0x0600 /DWIN32_LEAN_AND_MEAN /DGTEST_HAS_TR1_TUPLE=0 /D_VARIADIC_MAX=8 /D__SSE4_1__")
+  add_definitions("/bigobj /MP /W3 /GS- /D_CRT_SECURE_NO_WARNINGS /wd4996 /wd4345 /D_WIN32_WINNT=0x0600 /DWIN32_LEAN_AND_MEAN /DGTEST_HAS_TR1_TUPLE=0 /D_VARIADIC_MAX=8 /D__SSE4_1__ /d2archSSE42")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:10485760")
   if(STATIC)
     foreach(VAR CMAKE_C_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG CMAKE_C_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELEASE)
@@ -129,18 +129,16 @@ endif()
 
 # CURL is requred:
 FIND_PACKAGE(CURL REQUIRED)
-#IF(CURL_FOUND)
-#  INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIR})
-#  SET(CURL_LIBRARIES(${CURL_LIBRARIES}))
-#  
-#  if(APPLE)
-#    INCLUDE_DIRECTORIES("/usr/local/homebrew/cellar/curl/7.85.0/include")
-#    SET(CURL_LIBRARIES "-L /usr/local/homebrew/cellar/curl/7.85.0/lib -L /usr/local/homebrew/cellar/curl/7.85.0/include" )
-#    MESSAGE(INFO " Apple M1 curl path set to x86_64 versions /usr/local/homebrew/cellar/curl/7.85.0/")
-#  endif()
-#ELSE(CURL_FOUND)
-#  MESSAGE(FATAL_ERROR "Could not find the CURL library and development files.")
-#ENDIF(CURL_FOUND)
+IF(CURL_FOUND)
+  INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
+  if(APPLE)
+    INCLUDE_DIRECTORIES("/usr/local/homebrew/cellar/curl/7.85.0/include")
+    SET(CURL_LIBRARIES "-L /usr/local/homebrew/cellar/curl/7.85.0/lib -L /usr/local/homebrew/cellar/curl/7.85.0/include" )
+    MESSAGE(INFO " Apple M1 curl path set to x86_64 versions /usr/local/homebrew/cellar/curl/7.85.0/")
+  endif()
+ELSE(CURL_FOUND)
+  MESSAGE(FATAL_ERROR "Could not find the CURL library and development files.")
+ENDIF(CURL_FOUND)
 
 # Boost is required:
 if(STATIC)

diff --git a/CTestCustom.cmake b/CTestCustom.cmake
@@ -1,11 +1,11 @@
-set(CTEST_CUSTOM_TESTS_IGNORE
-  CoreTests
-  IntegrationTestLibrary
-  TestGenerator
-  CryptoTests
-  IntegrationTests
-  NodeRpcProxyTests
-  PerformanceTests
-  TransfersTests
-  )
-
+set(CTEST_CUSTOM_TESTS_IGNORE
+  CoreTests
+  IntegrationTestLibrary
+  TestGenerator
+  CryptoTests
+  IntegrationTests
+  NodeRpcProxyTests
+  PerformanceTests
+  TransfersTests
+  )
+