Merge with Master

.appveyor.yml

@@ -1,31 +1,59 @@
 version: '{branch}.{build}'
 skip_tags: true
-image: Visual Studio 2017
+image: Visual Studio 2019
 configuration: Release
 platform: x64
 clone_depth: 5
 environment:
   APPVEYOR_SAVE_CACHE_ON_ERROR: true
   CLCACHE_SERVER: 1
-  PACKAGES: berkeleydb boost-filesystem boost-signals2 boost-test libevent openssl rapidcheck zeromq double-conversion
   PATH: 'C:\Python37-x64;C:\Python37-x64\Scripts;%PATH%'
   PYTHONUTF8: 1
-  QT_DOWNLOAD_URL: 'https://github.com/sipsorcery/qt_win_binary/releases/download/v1.0/Qt5.9.7_ssl_x64_static_vs2017.zip'
-  QT_DOWNLOAD_HASH: 'D4D35B8112302B67E5610A03421BB3E43FE13F14D9A5F637C22AE60DCEC0E0F5'
-  QT_LOCAL_PATH: 'C:\Qt5.9.7_ssl_x64_static_vs2017'
+  QT_DOWNLOAD_URL: 'https://github.com/sipsorcery/qt_win_binary/releases/download/v1.6/Qt5.9.8_x64_static_vs2019.zip'
+  QT_DOWNLOAD_HASH: '9a8c6eb20967873785057fdcd329a657c7f922b0af08c5fde105cc597dd37e21'
+  QT_LOCAL_PATH: 'C:\Qt5.9.8_x64_static_vs2019'
+  VCPKG_INSTALL_PATH: 'C:\tools\vcpkg\installed'
+  VCPKG_COMMIT_ID: 'ed0df8ecc4ed7e755ea03e18aaf285fd9b4b4a74'
 cache:
-- C:\tools\vcpkg\installed
+- C:\tools\vcpkg\installed -> build_msvc\vcpkg-packages.txt
 - C:\Users\appveyor\clcache -> .appveyor.yml, build_msvc\**, **\Makefile.am, **\*.vcxproj.in
-- C:\Qt5.9.7_ssl_x64_static_vs2017
+- C:\Qt5.9.8_x64_static_vs2019
 install:
 - cmd: pip install --quiet git+https://github.com/frerich/clcache.git@v4.2.0
 # Disable zmq test for now since python zmq library on Windows would cause Access violation sometimes.
 # - cmd: pip install zmq
-- cmd: echo set(VCPKG_BUILD_TYPE release) >> C:\tools\vcpkg\triplets\%PLATFORM%-windows-static.cmake
-- cmd: vcpkg remove --outdated --recurse
-- cmd: vcpkg install --triplet %PLATFORM%-windows-static %PACKAGES% > NUL
+# Powershell block below is to install the c++ dependencies via vcpkg. The pseudo code is:
+# 1. Check whether the vcpkg install directory exists (note that updating the vcpkg-packages.txt file
+#    will cause the appveyor cache rules to invalidate the directory)
+# 2. If the directory is missing:
+#    a. Checkout the vcpkg source (including port files) for the specific checkout and build the vcpkg binary,
+#    b. Install the missing packages.
+- ps: |
+      $env:PACKAGES = Get-Content -Path build_msvc\vcpkg-packages.txt
+      Write-Host "vcpkg list: $env:PACKAGES"
+      if(!(Test-Path -Path ($env:VCPKG_INSTALL_PATH))) {
+          cd c:\tools\vcpkg
+          $env:GIT_REDIRECT_STDERR = '2>&1' # git is writing non-errors to STDERR when doing git pull. Send to STDOUT instead.
+          git pull origin master
+          git checkout $env:VCPKG_COMMIT_ID
+          .\bootstrap-vcpkg.bat
+          Add-Content "C:\tools\vcpkg\triplets\$env:PLATFORM-windows-static.cmake" "set(VCPKG_BUILD_TYPE release)"
+          .\vcpkg install --triplet $env:PLATFORM-windows-static $env:PACKAGES.split() > $null
+          cd "$env:APPVEYOR_BUILD_FOLDER"
+      }
+      else {
+        Write-Host "required vcpkg packages already installed."
+      }
+      c:\tools\vcpkg\vcpkg integrate install
 before_build:
 - ps:  clcache -M 536870912
+# Powershell block below is to download and extract the Qt static libraries. The pseudo code is:
+# 1. If the Qt destination directory exists assume it is correct and do nothing. To
+#    force a fresh install of the packages delete the job's appveyor cache.
+# 2. Otherwise:
+#    a. Download the zip file with the prebuilt Qt static libraries.
+#    b. Check that the downloaded file matches the expected hash.
+#    c. Extract the zip file to the specific destination path expected by the msbuild projects.
 - ps: |
       if(!(Test-Path -Path ($env:QT_LOCAL_PATH))) {
         Write-Host "Downloading Qt binaries.";
@@ -44,27 +72,21 @@ before_build:
          Write-Host "Qt binaries already present.";
       }
 - cmd: python build_msvc\msvc-autogen.py
-- ps:  $files = (Get-ChildItem -Recurse | where {$_.extension -eq ".vcxproj"}).FullName
-- ps:  for (${i} = 0; ${i} -lt ${files}.length; ${i}++) {
-           ${content} = (Get-Content ${files}[${i}]);
-           ${content} = ${content}.Replace("</RuntimeLibrary>", "</RuntimeLibrary><DebugInformationFormat>None</DebugInformationFormat>");
-           ${content} = ${content}.Replace("<WholeProgramOptimization>true", "<WholeProgramOptimization>false");
-           Set-Content ${files}[${i}] ${content};
-       }
 - ps:  Start-Process clcache-server
 - ps:  fsutil behavior set disablelastaccess 0 # Enable Access time feature on Windows (for clcache)
 build_script:
-- cmd: msbuild /p:TrackFileAccess=false /p:CLToolExe=clcache.exe build_msvc\bitcoin.sln /m /v:n /nologo
+- cmd: msbuild /p:TrackFileAccess=false /p:CLToolExe=clcache.exe build_msvc\verium.sln /m /v:q /nologo
 after_build:
 - ps:  fsutil behavior set disablelastaccess 1 # Disable Access time feature on Windows (better performance)
 - ps:  clcache -z
-#- 7z a bitcoin-%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\build_msvc\%platform%\%configuration%\*.exe
+- 7z a verium-%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\build_msvc\%platform%\%configuration%\*.exe
 test_script:
-- cmd: src\test_bitcoin.exe -k stdout -e stdout 2> NUL
-- cmd: src\bench_bitcoin.exe -evals=1 -scaling=0 > NUL
+- cmd: src\test_verium.exe -l test_suite
+- cmd: src\bench_verium.exe -evals=1 -scaling=0 > NUL
 - ps:  python test\util\bitcoin-util-test.py
 - cmd: python test\util\rpcauth-test.py
-- cmd: python test\functional\test_runner.py --ci --quiet --combinedlogslen=4000 --failfast
+# Fee estimation test failing on appveyor with: WinError 10048] Only one usage of each socket address (protocol/network address/port) is normally permitted.
+- cmd: python test\functional\test_runner.py --ci --quiet --combinedlogslen=4000 --failfast --exclude feature_fee_estimation
 artifacts:
-#- path: bitcoin-%APPVEYOR_BUILD_VERSION%.zip
-deploy: off
+- path: verium-%APPVEYOR_BUILD_VERSION%.zip
+deploy: off

.cirrus.yml

@@ -16,7 +16,7 @@ task:
   ccache_cache:
     folder: "/tmp/ccache_dir"
   install_script:
-    - pkg install -y autoconf automake boost-libs git gmake libevent libtool openssl pkgconf python3 ccache
+    - pkg install -y autoconf automake boost-libs git gmake libevent libtool pkgconf python3 ccache
     - ./contrib/install_db4.sh $(pwd)
     - ccache --max-size=${CCACHE_SIZE}
   configure_script:
@@ -37,19 +37,17 @@ task:
   timeout_in: 60m
   env:
     MAKEJOBS: "-j9"
-    RUN_CI_ON_HOST: "1"
+    DANGER_RUN_CI_ON_HOST: "1"
     TEST_RUNNER_PORT_MIN: "14000"  # Must be larger than 12321, which is used for the http cache. See https://cirrus-ci.org/guide/writing-tasks/#http-cache
     CCACHE_SIZE: "200M"
     CCACHE_DIR: "/tmp/ccache_dir"
   ccache_cache:
     folder: "/tmp/ccache_dir"
   depends_built_cache:
     folder: "/tmp/cirrus-ci-build/depends/built"
-  depends_sdk_cache:
-    folder: "/tmp/cirrus-ci-build/depends/sdk-sources"
   install_script:
     - apt-get update
     - apt-get -y install git bash ccache
     - ccache --max-size=${CCACHE_SIZE}
   ci_script:
-    - ./ci/test_run_all.sh
+    - ./ci/test_run_all.sh

.github/workflows/Linux64-1.yml

@@ -0,0 +1,199 @@
+name: Build Verium (Linux x86_64 • depends)
+
+on:
+  workflow_dispatch:
+    inputs:
+      target_ref:
+        description: "Branch/Tag/SHA to build"
+        required: true
+        default: "Verium-1.3.5"
+      depends_target:
+        description: "Optional: build only this depends pkg first (e.g., boost, openssl). Leave empty for full depends."
+        required: false
+        default: ""
+      verbose_make:
+        description: "Verbose make output (V=1)"
+        required: false
+        default: "false"
+
+concurrency:
+  group: verium-linux
+  cancel-in-progress: true
+
+permissions:
+  contents: write
+
+defaults:
+  run:
+    shell: bash
+
+env:
+  HOST_TRIPLET: x86_64-pc-linux-gnu
+
+jobs:
+  linux64:
+    runs-on: ubuntu-22.04
+    env:
+      HOST_TRIPLET: x86_64-pc-linux-gnu
+      # NEW: force toolchain to GCC 9 everywhere
+      CC: gcc-9
+      CXX: g++-9
+
+
+    steps:
+      - name: Checkout target ref
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.target_ref }}
+          submodules: recursive
+          fetch-depth: 0
+
+      - name: Select GCC 9 toolchain (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          set -euo pipefail
+          sudo apt-get update
+          sudo apt-get install -y gcc-9 g++-9
+          # Make gcc/g++ point to version 9 everywhere (covers scripts that hardcode 'gcc')
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 100 \
+            --slave /usr/bin/g++ g++ /usr/bin/g++-9 \
+            --slave /usr/bin/gcov gcov /usr/bin/gcov-9 \
+            --slave /usr/bin/gcc-ar gcc-ar /usr/bin/gcc-ar-9 \
+            --slave /usr/bin/gcc-ranlib gcc-ranlib /usr/bin/gcc-ranlib-9 \
+            --slave /usr/bin/gcc-nm gcc-nm /usr/bin/gcc-nm-9
+          gcc --version
+          g++ --version    
+
+      - name: Export GCC 9 env (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          echo "CC=gcc" >> $GITHUB_ENV
+          echo "CXX=g++" >> $GITHUB_ENV
+          echo "CPP=gcc -E" >> $GITHUB_ENV
+          echo "AR=ar" >> $GITHUB_ENV
+          echo "RANLIB=ranlib" >> $GITHUB_ENV
+          echo "NM=nm" >> $GITHUB_ENV
+
+      - name: Base build deps (host)
+        run: |
+          set -euo pipefail
+          sudo apt-get update
+          # NEW: install gcc-9/g++-9
+          sudo apt-get install -y \
+            build-essential automake libtool pkg-config python3 \
+            curl zip unzip ccache \
+            gcc-9 g++-9
+          "$CC" --version; "$CXX" --version
+
+      - name: Build depends (Linux)
+        run: |
+          set -e
+          # If user asked to prime a single depends target, do it first (with GCC 9)
+          if [ -n "${{ inputs.depends_target }}" ]; then
+            echo "Priming depends target: ${{ inputs.depends_target }}"
+            CC=gcc-9 CXX=g++-9 make -C depends HOST=${HOST_TRIPLET} \
+              ${{ inputs.depends_target }} -j"$(nproc || echo 2)"
+          fi
+
+          # Always pre-build FreeType with GCC 11 (it’s a C lib; ABI-safe)
+          echo "Priming FreeType with GCC 11"
+          make -C depends HOST=${HOST_TRIPLET} CC=gcc-11 CXX=g++-11 freetype -j"$(nproc || echo 2)"
+
+          # Build everything else with GCC 9
+          export CC=gcc-9 CXX=g++-9
+          make -C depends HOST=${HOST_TRIPLET} -j"$(nproc || echo 2)" || {
+            echo "---- tail any config.log ----"
+            find depends/work/build -name config.log -exec sh -c 'echo "==> {}"; tail -n 120 "{}"' \;
+            exit 1
+          }
+
+      - name: Configure (Linux)
+        run: |
+          set -e
+
+          ./autogen.sh
+
+          export CONFIG_SITE="$(pwd)/depends/${HOST_TRIPLET}/share/config.site"
+          DEP="$(pwd)/depends/${HOST_TRIPLET}"
+
+          # Make configure search depends first
+          export BOOST_CPPFLAGS="-I$DEP/include"
+          export BOOST_LDFLAGS="-L$DEP/lib"
+          export CPPFLAGS="$BOOST_CPPFLAGS ${CPPFLAGS:-}"
+          export LDFLAGS="$BOOST_LDFLAGS ${LDFLAGS:-}"
+
+          # Detect the exact Boost suffix produced by depends (e.g. -mt-x64)
+          bs="$(ls "$DEP/lib"/libboost_system*.a | head -n1 || true)"
+          if [ -z "$bs" ]; then
+            echo "ERROR: No libboost_system*.a found in $DEP/lib (did depends/boost build?)."
+            ls -l "$DEP/lib" || true
+            exit 1
+          fi
+          suf="${bs##*/}"; suf="${suf#libboost_system}"; suf="${suf%.a}"
+          export BOOST_LIB_SUFFIX="$suf"
+          export BOOST_THREAD_LIB_SUFFIX="$suf"   # some macros still read this
+          echo "Using BOOST_LIB_SUFFIX='$BOOST_LIB_SUFFIX'"
+
+          # Helpful when linking statically
+          export LIBS="${LIBS:-} -pthread -lrt"
+
+          # Pass CC/CXX explicitly; also hint where Boost lives
+          CC="${CC:-gcc-9}" CXX="${CXX:-g++-9}" \
+          ./configure \
+            --host=${HOST_TRIPLET} \
+            --prefix="$DEP" \
+            --with-gui=qt5 \
+            --with-qt-bindir="$DEP/native/bin" \
+            --with-qt-incdir="$DEP/include" \
+            --with-qt-libdir="$DEP/lib" \
+            --with-boost="$DEP" \
+            --with-boost-libdir="$DEP/lib" \
+            --disable-bench --disable-tests \
+            --enable-reduce-exports \
+            --disable-shared --enable-static
+
+
+      - name: Build (Linux)
+        run: |
+          set -e
+          if [ "${{ inputs.verbose_make }}" = "true" ]; then
+            make CC="$CC" CXX="$CXX" -j"$(nproc || echo 2)" V=1
+          else
+            make CC="$CC" CXX="$CXX" -j"$(nproc || echo 2)"
+          fi
+
+      - name: Package + checksums (Linux)
+        run: |
+          set -euo pipefail
+          V=$(git describe --tags --dirty --always || echo untagged)
+          OUTDIR="out-linux"
+          mkdir -p "$OUTDIR"
+          cp -f src/verium* "$OUTDIR/" 2>/dev/null || true
+          cp -f src/qt/verium* "$OUTDIR/" 2>/dev/null || true
+          if [ -z "$(ls -A "$OUTDIR" 2>/dev/null)" ]; then
+            echo "No Linux binaries found in $OUTDIR; exiting."
+            exit 2
+          fi
+          PKG="verium-${V}-${HOST_TRIPLET}.tar.gz"
+          tar -C "$OUTDIR" -czf "$PKG" .
+          sha256sum "$PKG" > "${PKG}.SHA256SUMS"
+          echo "ART_MAIN=$PKG" >> $GITHUB_ENV
+          echo "ART_SUMS=${PKG}.SHA256SUMS" >> $GITHUB_ENV
+
+      - name: Upload artifacts (binaries + checksums)
+        uses: actions/upload-artifact@v4
+        with:
+          name: linux64-${{ env.HOST_TRIPLET }}
+          path: |
+            ${{ env.ART_MAIN }}
+            ${{ env.ART_SUMS }}
+
+      - name: Upload build logs (for debugging)
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: linux-dep-logs
+          path: |
+            depends/work/build/**/config.log
+            depends/work/build/**/config.status
+          if-no-files-found: ignore