Update version to 4.2

Parallel checks could result in a deadlock

.github/workflows/c-cpp.yml

@@ -43,7 +43,7 @@ jobs:
       shell: alpine.sh {0}
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_C_FLAGS="-Os -flto=auto ${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON
+        cmake . -DCMAKE_C_FLAGS="-Os -flto=auto ${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF
         make -j$(nproc)
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -193,7 +193,7 @@ jobs:
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_C_FLAGS="-Os -flto=auto ${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON
+        cmake . -DCMAKE_C_FLAGS="-Os -flto=auto ${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF
         make -j$(nproc)
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -272,7 +272,7 @@ jobs:
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_TOOLCHAIN_FILE=../../../cmake/aarch64_toolchain.cmake -DCMAKE_C_FLAGS="-Os -flto=auto ${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON
+        cmake . -DCMAKE_TOOLCHAIN_FILE=../../../cmake/aarch64_toolchain.cmake -DCMAKE_C_FLAGS="-Os -flto=auto ${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF
         make -j$(nproc)
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -361,7 +361,7 @@ jobs:
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -G "Unix Makefiles" -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_C_FLAGS="-Os ${{ matrix.config.flags }}" -DCURL_TARGET_WINDOWS_VERSION=0x0600 -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON
+        cmake . -G "Unix Makefiles" -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_C_FLAGS="-Os ${{ matrix.config.flags }}" -DCURL_TARGET_WINDOWS_VERSION=0x0600 -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF
         make -j$(nproc)
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -439,6 +439,10 @@ jobs:
     - name: Setup cmake
       uses: lukka/get-cmake@latest
 
+    - name: Apply patch
+      run: |
+        git apply --verbose --ignore-whitespace --directory=external/src/grpc/third_party/boringssl-with-bazel patches/boringssl/win7.patch
+
     - name: Build p2pool
       run: |
         mkdir build
@@ -498,7 +502,7 @@ jobs:
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="-Os -flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON
+        cmake . -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="-Os -flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF
         make -j4
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -566,7 +570,7 @@ jobs:
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="-Os -target arm64-apple-macos-11" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON
+        cmake . -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="-Os -target arm64-apple-macos-11" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF
         make -j3
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -656,7 +660,7 @@ jobs:
         run: |
           sudo pkg install -y cmake
           cd external/src/curl
-          cmake . -DCMAKE_C_FLAGS="-Os -flto" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON
+          cmake . -DCMAKE_C_FLAGS="-Os -flto" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF
           make -j4
           cd lib && mkdir .libs && cp libcurl.a .libs
           cd ../../libuv

.github/workflows/clang-tidy.yml

@@ -18,9 +18,9 @@ jobs:
       run: |
         wget https://apt.llvm.org/llvm.sh
         chmod +x llvm.sh
-        sudo ./llvm.sh 18
-        sudo apt-get install -y clang-tidy-18
-        clang-tidy-18 --verify-config
+        sudo ./llvm.sh 19
+        sudo apt-get install -y clang-tidy-19
+        clang-tidy-19 --verify-config
 
     - name: Checkout repository
       uses: actions/checkout@v4
@@ -31,9 +31,9 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-18 -DCMAKE_CXX_COMPILER=clang++-18 -DDEV_CLANG_TIDY=ON -DSTATIC_LIBS=ON
+        cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-19 -DCMAKE_CXX_COMPILER=clang++-19 -DDEV_CLANG_TIDY=ON -DSTATIC_LIBS=ON
 
     - name: Run clang-tidy
       run: |
         cd src
-        clang-tidy-18 *.cpp -p ../build -checks=-clang-diagnostic-undefined-internal,-clang-analyzer-optin.performance.Padding,-clang-diagnostic-nan-infinity-disabled -warnings-as-errors=* -header-filter=^[^\.]
+        clang-tidy-19 *.cpp -p ../build -checks=-clang-diagnostic-undefined-internal,-clang-analyzer-optin.performance.Padding,-clang-diagnostic-nan-infinity-disabled -warnings-as-errors=* -header-filter=^[^\.]

.github/workflows/test-sync-old.yml

@@ -1,428 +0,0 @@
-name: Sync test (old)
-
-on:
-  push:
-    paths-ignore:
-      - 'docker-compose/**'
-      - 'docs/**'
-      - 'README.md'
-
-  pull_request:
-
-  schedule:
-    - cron: '47 0/3 * * *'
-
-jobs:
-  sync-test-ubuntu-tsan:
-
-    timeout-minutes: 60
-    runs-on: ubuntu-22.04
-
-    steps:
-    - name: Install dependencies
-      run: |
-        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-        sudo apt update
-        sudo apt install -y git build-essential cmake gcc-12 g++-12
-
-    - name: Checkout repository
-      uses: actions/checkout@v4
-      with:
-        submodules: recursive
-
-    - name: Build libcurl
-      run: |
-        cd external/src/curl
-        cmake . -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_C_FLAGS='-fsanitize=thread -Og -fno-omit-frame-pointer -g' -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF
-        make -j$(nproc)
-        cd lib && mkdir .libs && cp libcurl.a .libs
-
-    - name: Build libuv
-      run: |
-        cd external/src/libuv
-        mkdir build
-        cd build
-        cmake .. -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_C_FLAGS='-fsanitize=thread -Og -fno-omit-frame-pointer -g' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
-        make -j$(nproc)
-
-    - name: Build libzmq
-      run: |
-        cd external/src/libzmq
-        mkdir build
-        cd build
-        cmake .. -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 -DCMAKE_C_FLAGS='-fsanitize=thread -Og -fno-omit-frame-pointer -g' -DCMAKE_CXX_FLAGS='-fsanitize=thread -Og -fno-omit-frame-pointer -g' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
-        make -j$(nproc)
-
-    - name: Build p2pool
-      run: |
-        mkdir build
-        cd build
-        cmake .. -DDEV_TEST_SYNC=ON -DDEV_WITH_TSAN=ON -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 -DCMAKE_C_FLAGS='-fsanitize=thread -Og -fno-omit-frame-pointer -g' -DCMAKE_CXX_FLAGS='-fsanitize=thread -Og -fno-omit-frame-pointer -g' -DWITH_LTO=OFF -DSTATIC_LIBS=ON
-        make -j$(nproc) p2pool
-
-    - name: Run p2pool
-      run: |
-        cd build
-        mkdir data
-        python ../tests/src/stratum_dummy.py 1 &
-        python ../tests/src/stratum_dummy.py 2 &
-        python ../tests/src/stratum_dummy.py 3 &
-        sudo sysctl vm.mmap_rnd_bits=28
-        TSAN_OPTIONS="suppressions=../tests/src/tsan_sup.txt halt_on_error=1" ./p2pool --host xmr.support --rpc-port 18081 --zmq-port 18083 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
-
-    - name: Check p2pool.log
-      run: |
-        cd build
-        grep 'Synchronization finished successfully' p2pool.log
-
-    - name: Archive p2pool.log
-      uses: actions/upload-artifact@v4
-      with:
-        name: p2pool_ubuntu_data_tsan
-        path: |
-          build/*.log
-          build/data/
-
-  sync-test-ubuntu-msan:
-    timeout-minutes: 60
-    runs-on: ubuntu-22.04
-
-    steps:
-    - name: Install dependencies
-      run: |
-        sudo apt update
-        sudo apt install -y git build-essential cmake ninja-build
-
-    - name: Install clang
-      run: |
-        wget https://apt.llvm.org/llvm.sh
-        chmod +x llvm.sh
-        sudo ./llvm.sh 18
-
-    - name: Build libcxx_msan
-      run: |
-        git clone --depth=1 https://github.com/llvm/llvm-project -b release/18.x
-        cd llvm-project
-        mkdir build
-        cmake -G Ninja -S runtimes -B build -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" -DCMAKE_C_COMPILER=clang-18 -DCMAKE_CXX_COMPILER=clang++-18 -DLLVM_USE_SANITIZER=MemoryWithOrigins -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
-        ninja -C build cxx cxxabi
-        cd build
-        mkdir /tmp/libcxx_msan
-        cp -r include /tmp/libcxx_msan
-        cp -r lib /tmp/libcxx_msan
-
-    - name: Checkout repository
-      uses: actions/checkout@v4
-      with:
-        submodules: recursive
-
-    - name: Build libcurl
-      run: |
-        cd external/src/curl
-        cmake . -DCMAKE_C_COMPILER=clang-18 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Og -fno-omit-frame-pointer -g' -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF
-        make -j$(nproc)
-        cd lib && mkdir .libs && cp libcurl.a .libs
-
-    - name: Build libuv
-      run: |
-        cd external/src/libuv
-        mkdir build
-        cd build
-        cmake .. -DCMAKE_C_COMPILER=clang-18 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Og -fno-omit-frame-pointer -g' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
-        make -j$(nproc)
-
-    - name: Build libzmq
-      run: |
-        cd external/src/libzmq
-        mkdir build
-        cd build
-        cmake .. -DCMAKE_C_COMPILER=clang-18 -DCMAKE_CXX_COMPILER=clang++-18 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Og -fno-omit-frame-pointer -g' -DCMAKE_CXX_FLAGS='-nostdinc++ -nostdlib++ -fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Og -fno-omit-frame-pointer -g -isystem /tmp/libcxx_msan/include/c++/v1 -L/tmp/libcxx_msan/lib -lc++ -lc++abi -Wno-unused-command-line-argument' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
-        make -j$(nproc)
-
-    - name: Build p2pool
-      run: |
-        mkdir build
-        cd build
-        cmake .. -DCMAKE_C_COMPILER=clang-18 -DCMAKE_CXX_COMPILER=clang++-18 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -fno-omit-frame-pointer -g' -DCMAKE_CXX_FLAGS='-nostdinc++ -nostdlib++ -fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -isystem /tmp/libcxx_msan/include/c++/v1 -L/tmp/libcxx_msan/lib -Wl,-rpath /tmp/libcxx_msan/lib -lc++ -lc++abi -Wno-unused-command-line-argument -fuse-ld=lld-18 -fno-omit-frame-pointer -g' -DDEV_TEST_SYNC=ON -DDEV_WITH_MSAN=ON -DWITH_LTO=OFF -DSTATIC_LIBS=ON
-        make -j$(nproc) p2pool
-
-    - name: Run p2pool
-      run: |
-        cd build
-        mkdir data
-        python ../tests/src/stratum_dummy.py 1 &
-        python ../tests/src/stratum_dummy.py 2 &
-        python ../tests/src/stratum_dummy.py 3 &
-        sudo sysctl vm.mmap_rnd_bits=28
-        MSAN_OPTIONS="halt_on_error=1" ./p2pool --host xmr.support --rpc-port 18081 --zmq-port 18083 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
-
-    - name: Check p2pool.log
-      run: |
-        cd build
-        grep 'Synchronization finished successfully' p2pool.log
-
-    - name: Archive p2pool.log
-      uses: actions/upload-artifact@v4
-      with:
-        name: p2pool_ubuntu_data_msan
-        path: |
-          build/*.log
-          build/data/
-
-  sync-test-ubuntu-ubsan:
-
-    timeout-minutes: 60
-    runs-on: ubuntu-22.04
-
-    steps:
-    - name: Install dependencies
-      run: |
-        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-        sudo apt update
-        sudo apt install -y git build-essential cmake libuv1-dev libzmq3-dev libsodium-dev libpgm-dev libnorm-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev gcc-12 g++-12
-
-    - name: Checkout repository
-      uses: actions/checkout@v4
-      with:
-        submodules: recursive
-
-    - name: Build p2pool
-      run: |
-        mkdir build
-        cd build
-        cmake .. -DDEV_TEST_SYNC=ON -DDEV_WITH_UBSAN=ON -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 -DWITH_LTO=OFF
-        make -j$(nproc) p2pool
-
-    - name: Run p2pool
-      run: |
-        cd build
-        mkdir data
-        python ../tests/src/stratum_dummy.py 1 &
-        python ../tests/src/stratum_dummy.py 2 &
-        python ../tests/src/stratum_dummy.py 3 &
-        sudo sysctl vm.mmap_rnd_bits=28
-        UBSAN_OPTIONS="suppressions=../tests/src/ubsan_sup.txt halt_on_error=1" ./p2pool --host xmr.support --rpc-port 18081 --zmq-port 18083 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
-
-    - name: Check p2pool.log
-      run: |
-        cd build
-        grep 'Synchronization finished successfully' p2pool.log
-
-    - name: Archive p2pool.log
-      uses: actions/upload-artifact@v4
-      with:
-        name: p2pool_ubuntu_data_ubsan
-        path: |
-          build/*.log
-          build/data/
-
-  sync-test-ubuntu-asan:
-
-    timeout-minutes: 60
-    runs-on: ubuntu-22.04
-
-    steps:
-    - name: Install dependencies
-      run: |
-        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-        sudo apt update
-        sudo apt install -y git build-essential cmake libuv1-dev libzmq3-dev libsodium-dev libpgm-dev libnorm-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev gcc-12 g++-12
-
-    - name: Checkout repository
-      uses: actions/checkout@v4
-      with:
-        submodules: recursive
-
-    - name: Build p2pool
-      run: |
-        mkdir build
-        cd build
-        cmake .. -DDEV_TEST_SYNC=ON -DDEV_WITH_ASAN=ON -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 -DCMAKE_C_FLAGS="-fno-omit-frame-pointer -fsanitize=address -Og -g" -DCMAKE_CXX_FLAGS="-fno-omit-frame-pointer -fsanitize=address -Og -g" -DWITH_LTO=OFF
-        make -j$(nproc) p2pool
-
-    - name: Run p2pool
-      run: |
-        cd build
-        mkdir data
-        python ../tests/src/stratum_dummy.py 1 &
-        python ../tests/src/stratum_dummy.py 2 &
-        python ../tests/src/stratum_dummy.py 3 &
-        sudo sysctl vm.mmap_rnd_bits=28
-        ASAN_OPTIONS="detect_stack_use_after_return=1 atexit=1" ./p2pool --host xmr.support --rpc-port 18081 --zmq-port 18083 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
-
-    - name: Check p2pool.log
-      run: |
-        cd build
-        grep 'Synchronization finished successfully' p2pool.log
-
-    - name: Archive p2pool.log
-      uses: actions/upload-artifact@v4
-      with:
-        name: p2pool_ubuntu_data_asan
-        path: |
-          build/*.log
-          build/data/
-
-  sync-test-macos:
-
-    timeout-minutes: 60
-    runs-on: ${{ matrix.config.os }}
-
-    strategy:
-      matrix:
-        config:
-          - {os: macos-13, flags: "-Og -ftrapv"}
-          - {os: macos-14, flags: "-Og -ftrapv -target arm64-apple-macos-11"}
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-      with:
-        submodules: recursive
-
-    - name: Install dependencies
-      run: |
-        HOMEBREW_NO_AUTO_UPDATE=1 brew install pyenv
-        pyenv install 3:latest
-
-    - name: Build libcurl
-      run: |
-        cd external/src/curl
-        cmake . -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF
-        make -j4
-        cd lib && mkdir .libs && cp libcurl.a .libs
-
-    - name: Build libuv
-      run: |
-        cd external/src/libuv
-        mkdir build
-        cd build
-        cmake .. -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='${{ matrix.config.flags }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
-        make -j4
-
-    - name: Build libzmq
-      run: |
-        cd external/src/libzmq
-        mkdir build
-        cd build
-        cmake .. -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@15)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }}' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
-        make -j4
-
-    - name: Build p2pool
-      run: |
-        mkdir build
-        cd build
-        cmake .. -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@15)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }}' -DWITH_LTO=OFF -DSTATIC_LIBS=ON -DDEV_TEST_SYNC=ON
-        make -j4 p2pool
-
-    - name: Run p2pool
-      run: |
-        cd build
-        mkdir data
-        python3 ../tests/src/stratum_dummy.py 1 &
-        python3 ../tests/src/stratum_dummy.py 2 &
-        python3 ../tests/src/stratum_dummy.py 3 &
-        ./p2pool --host xmr.support --rpc-port 18081 --zmq-port 18083 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
-
-    - name: Check p2pool.log
-      run: |
-        cd build
-        grep 'Synchronization finished successfully' p2pool.log
-
-    - name: Archive p2pool.log
-      uses: actions/upload-artifact@v4
-      with:
-        name: p2pool_${{ matrix.config.os }}_data
-        path: |
-          build/*.log
-          build/data/
-
-  sync-test-windows-debug-asan:
-
-    timeout-minutes: 60
-    runs-on: windows-2022
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-      with:
-        submodules: recursive
-
-    - name: Setup cmake
-      uses: lukka/get-cmake@latest
-
-    - name: Build p2pool
-      run: |
-        mkdir build
-        cd build
-        cmake .. -G "Visual Studio 17 2022" -DCMAKE_SYSTEM_VERSION="10.0" -DDEV_TEST_SYNC=ON -DDEV_WITH_ASAN=ON
-        & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\msbuild" -v:m /m /p:Configuration=Debug p2pool.vcxproj
-
-    - name: Run p2pool
-      shell: cmd
-      run: |
-        call "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat" amd64
-        cd build/Debug
-        mkdir data
-        start python ../../tests/src/stratum_dummy.py 1
-        start python ../../tests/src/stratum_dummy.py 2
-        start python ../../tests/src/stratum_dummy.py 3
-        p2pool.exe --host xmr.support --rpc-port 18081 --zmq-port 18083 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
-
-    - name: Check p2pool.log
-      run: |
-        cd build/Debug
-        findstr /C:"Synchronization finished successfully" p2pool.log
-
-    - name: Archive p2pool.log
-      uses: actions/upload-artifact@v4
-      with:
-        name: p2pool_windows_data_debug_asan
-        path: |
-          build/Debug/*.log
-          build/Debug/data/
-
-  sync-test-windows-leaks:
-
-    timeout-minutes: 60
-    runs-on: windows-2022
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-      with:
-        submodules: recursive
-
-    - name: Setup cmake
-      uses: lukka/get-cmake@latest
-
-    - name: Build p2pool
-      run: |
-        mkdir build
-        cd build
-        cmake .. -G "Visual Studio 17 2022" -DCMAKE_SYSTEM_VERSION="10.0" -DDEV_TEST_SYNC=ON -DDEV_TRACK_MEMORY=ON
-        & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\msbuild" -v:m /m /p:Configuration=RelWithDebInfo p2pool.vcxproj
-
-    - name: Run p2pool
-      run: |
-        cd build/RelWithDebInfo
-        mkdir data
-        Start-Process python -ArgumentList "../../tests/src/stratum_dummy.py 1"
-        Start-Process python -ArgumentList "../../tests/src/stratum_dummy.py 2"
-        Start-Process python -ArgumentList "../../tests/src/stratum_dummy.py 3"
-        ./p2pool.exe --host xmr.support --rpc-port 18081 --zmq-port 18083 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
-
-    - name: Check p2pool.log
-      run: |
-        cd build/RelWithDebInfo
-        Remove-Item p2pool.cache -Force
-        findstr /C:"Synchronization finished successfully" p2pool.log
-
-    - name: Archive p2pool.log
-      if: '!cancelled()'
-      uses: actions/upload-artifact@v4
-      with:
-        name: p2pool_windows_data_leaks
-        path: |
-          build/RelWithDebInfo/p2pool.*
-          build/RelWithDebInfo/data/

.github/workflows/test-sync.yml

@@ -10,7 +10,7 @@ on:
   pull_request:
 
   schedule:
-    - cron: '17 0/3 * * *'
+    - cron: '47 0/3 * * *'
 
 jobs:
   sync-test-ubuntu-tsan:
@@ -33,7 +33,7 @@ jobs:
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_C_FLAGS='-fsanitize=thread -Og -fno-omit-frame-pointer -g' -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF
+        cmake . -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_C_FLAGS='-fsanitize=thread -Og -fno-omit-frame-pointer -g' -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF
         make -j$(nproc)
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -67,11 +67,8 @@ jobs:
         python ../tests/src/stratum_dummy.py 1 &
         python ../tests/src/stratum_dummy.py 2 &
         python ../tests/src/stratum_dummy.py 3 &
-        python ../tests/src/mm_server.py 8000 id0 data0 &
-        python ../tests/src/mm_server.py 8001 id1 data1 &
-        python ../tests/src/mm_server.py 8002 id2 data2 &
         sudo sysctl vm.mmap_rnd_bits=28
-        TSAN_OPTIONS="suppressions=../tests/src/tsan_sup.txt halt_on_error=1" ./p2pool ${{ secrets.TESTNET_NODE_PARAMS }} --config ../tests/src/mm_test_config.json --wallet 9y9HUSpSZX7j2J5UUngX5nCRezR6mZfLmL2D5JXpmPjYVDCPCCcw6Tab2R55xqPTN2FoQEEDmz99TVdy9EW74mqMUw5xRun --data-api data --local-api --merge-mine 127.0.0.1:8000 test0 --merge-mine 127.0.0.1:8001 test1 --merge-mine 127.0.0.1:8002 test2 --loglevel 6
+        TSAN_OPTIONS="suppressions=../tests/src/tsan_sup.txt halt_on_error=1" ./p2pool --host xmr.support --rpc-port 18081 --zmq-port 18083 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
 
     - name: Check p2pool.log
       run: |
@@ -100,14 +97,14 @@ jobs:
       run: |
         wget https://apt.llvm.org/llvm.sh
         chmod +x llvm.sh
-        sudo ./llvm.sh 18
+        sudo ./llvm.sh 19
 
     - name: Build libcxx_msan
       run: |
-        git clone --depth=1 https://github.com/llvm/llvm-project -b release/18.x
+        git clone --depth=1 https://github.com/llvm/llvm-project -b release/19.x
         cd llvm-project
         mkdir build
-        cmake -G Ninja -S runtimes -B build -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" -DCMAKE_C_COMPILER=clang-18 -DCMAKE_CXX_COMPILER=clang++-18 -DLLVM_USE_SANITIZER=MemoryWithOrigins -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
+        cmake -G Ninja -S runtimes -B build -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" -DCMAKE_C_COMPILER=clang-19 -DCMAKE_CXX_COMPILER=clang++-19 -DLLVM_USE_SANITIZER=MemoryWithOrigins -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
         ninja -C build cxx cxxabi
         cd build
         mkdir /tmp/libcxx_msan
@@ -122,7 +119,7 @@ jobs:
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_C_COMPILER=clang-18 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Og -fno-omit-frame-pointer -g' -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF
+        cmake . -DCMAKE_C_COMPILER=clang-19 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Og -fno-omit-frame-pointer -g' -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF
         make -j$(nproc)
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -131,7 +128,7 @@ jobs:
         cd external/src/libuv
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_COMPILER=clang-18 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Og -fno-omit-frame-pointer -g' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+        cmake .. -DCMAKE_C_COMPILER=clang-19 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Og -fno-omit-frame-pointer -g' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
         make -j$(nproc)
 
     - name: Build libzmq
@@ -139,14 +136,14 @@ jobs:
         cd external/src/libzmq
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_COMPILER=clang-18 -DCMAKE_CXX_COMPILER=clang++-18 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Og -fno-omit-frame-pointer -g' -DCMAKE_CXX_FLAGS='-nostdinc++ -nostdlib++ -fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Og -fno-omit-frame-pointer -g -isystem /tmp/libcxx_msan/include/c++/v1 -L/tmp/libcxx_msan/lib -lc++ -lc++abi -Wno-unused-command-line-argument' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+        cmake .. -DCMAKE_C_COMPILER=clang-19 -DCMAKE_CXX_COMPILER=clang++-19 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Og -fno-omit-frame-pointer -g' -DCMAKE_CXX_FLAGS='-nostdinc++ -nostdlib++ -fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Og -fno-omit-frame-pointer -g -isystem /tmp/libcxx_msan/include/c++/v1 -L/tmp/libcxx_msan/lib -lc++ -lc++abi -Wno-unused-command-line-argument' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
         make -j$(nproc)
 
     - name: Build p2pool
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_COMPILER=clang-18 -DCMAKE_CXX_COMPILER=clang++-18 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -fno-omit-frame-pointer -g' -DCMAKE_CXX_FLAGS='-nostdinc++ -nostdlib++ -fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -isystem /tmp/libcxx_msan/include/c++/v1 -L/tmp/libcxx_msan/lib -Wl,-rpath /tmp/libcxx_msan/lib -lc++ -lc++abi -Wno-unused-command-line-argument -fuse-ld=lld-18 -fno-omit-frame-pointer -g' -DDEV_TEST_SYNC=ON -DDEV_WITH_MSAN=ON -DWITH_LTO=OFF -DSTATIC_LIBS=ON
+        cmake .. -DCMAKE_C_COMPILER=clang-19 -DCMAKE_CXX_COMPILER=clang++-19 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -fno-omit-frame-pointer -g' -DCMAKE_CXX_FLAGS='-nostdinc++ -nostdlib++ -fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -isystem /tmp/libcxx_msan/include/c++/v1 -L/tmp/libcxx_msan/lib -Wl,-rpath /tmp/libcxx_msan/lib -lc++ -lc++abi -Wno-unused-command-line-argument -fuse-ld=lld-19 -fno-omit-frame-pointer -g' -DDEV_TEST_SYNC=ON -DDEV_WITH_MSAN=ON -DWITH_LTO=OFF -DSTATIC_LIBS=ON
         make -j$(nproc) p2pool
 
     - name: Run p2pool
@@ -156,11 +153,8 @@ jobs:
         python ../tests/src/stratum_dummy.py 1 &
         python ../tests/src/stratum_dummy.py 2 &
         python ../tests/src/stratum_dummy.py 3 &
-        python ../tests/src/mm_server.py 8000 id0 data0 &
-        python ../tests/src/mm_server.py 8001 id1 data1 &
-        python ../tests/src/mm_server.py 8002 id2 data2 &
         sudo sysctl vm.mmap_rnd_bits=28
-        MSAN_OPTIONS="halt_on_error=1" ./p2pool ${{ secrets.TESTNET_NODE_PARAMS }} --config ../tests/src/mm_test_config.json --wallet 9y9HUSpSZX7j2J5UUngX5nCRezR6mZfLmL2D5JXpmPjYVDCPCCcw6Tab2R55xqPTN2FoQEEDmz99TVdy9EW74mqMUw5xRun --data-api data --local-api --merge-mine 127.0.0.1:8000 test0 --merge-mine 127.0.0.1:8001 test1 --merge-mine 127.0.0.1:8002 test2 --loglevel 6
+        MSAN_OPTIONS="halt_on_error=1" ./p2pool --host xmr.support --rpc-port 18081 --zmq-port 18083 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
 
     - name: Check p2pool.log
       run: |
@@ -206,11 +200,8 @@ jobs:
         python ../tests/src/stratum_dummy.py 1 &
         python ../tests/src/stratum_dummy.py 2 &
         python ../tests/src/stratum_dummy.py 3 &
-        python ../tests/src/mm_server.py 8000 id0 data0 &
-        python ../tests/src/mm_server.py 8001 id1 data1 &
-        python ../tests/src/mm_server.py 8002 id2 data2 &
         sudo sysctl vm.mmap_rnd_bits=28
-        UBSAN_OPTIONS="suppressions=../tests/src/ubsan_sup.txt halt_on_error=1" ./p2pool ${{ secrets.TESTNET_NODE_PARAMS }} --config ../tests/src/mm_test_config.json --wallet 9y9HUSpSZX7j2J5UUngX5nCRezR6mZfLmL2D5JXpmPjYVDCPCCcw6Tab2R55xqPTN2FoQEEDmz99TVdy9EW74mqMUw5xRun --data-api data --local-api --merge-mine 127.0.0.1:8000 test0 --merge-mine 127.0.0.1:8001 test1 --merge-mine 127.0.0.1:8002 test2 --loglevel 6
+        UBSAN_OPTIONS="suppressions=../tests/src/ubsan_sup.txt halt_on_error=1" ./p2pool --host xmr.support --rpc-port 18081 --zmq-port 18083 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
 
     - name: Check p2pool.log
       run: |
@@ -256,11 +247,8 @@ jobs:
         python ../tests/src/stratum_dummy.py 1 &
         python ../tests/src/stratum_dummy.py 2 &
         python ../tests/src/stratum_dummy.py 3 &
-        python ../tests/src/mm_server.py 8000 id0 data0 &
-        python ../tests/src/mm_server.py 8001 id1 data1 &
-        python ../tests/src/mm_server.py 8002 id2 data2 &
         sudo sysctl vm.mmap_rnd_bits=28
-        ASAN_OPTIONS="detect_stack_use_after_return=1 atexit=1" ./p2pool ${{ secrets.TESTNET_NODE_PARAMS }} --config ../tests/src/mm_test_config.json --wallet 9y9HUSpSZX7j2J5UUngX5nCRezR6mZfLmL2D5JXpmPjYVDCPCCcw6Tab2R55xqPTN2FoQEEDmz99TVdy9EW74mqMUw5xRun --data-api data --local-api --merge-mine 127.0.0.1:8000 test0 --merge-mine 127.0.0.1:8001 test1 --merge-mine 127.0.0.1:8002 test2 --loglevel 6
+        ASAN_OPTIONS="detect_stack_use_after_return=1 atexit=1" ./p2pool --host xmr.support --rpc-port 18081 --zmq-port 18083 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
 
     - name: Check p2pool.log
       run: |
@@ -283,8 +271,8 @@ jobs:
     strategy:
       matrix:
         config:
-          - {os: macos-13, flags: "-Og -ftrapv"}
-          - {os: macos-14, flags: "-Og -ftrapv -target arm64-apple-macos-11"}
+          - {os: macos-13, flags: ""}
+          - {os: macos-14, flags: "-target arm64-apple-macos-11"}
 
     steps:
     - name: Checkout repository
@@ -300,7 +288,7 @@ jobs:
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF
+        cmake . -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF
         make -j4
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -324,7 +312,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@15)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }}' -DWITH_LTO=OFF -DSTATIC_LIBS=ON -DDEV_TEST_SYNC=ON
+        cmake .. -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@15)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }}' -DWITH_LTO=OFF -DSTATIC_LIBS=ON -DDEV_TEST_SYNC=ON -DDEV_DEBUG=ON
         make -j4 p2pool
 
     - name: Run p2pool
@@ -334,10 +322,7 @@ jobs:
         python3 ../tests/src/stratum_dummy.py 1 &
         python3 ../tests/src/stratum_dummy.py 2 &
         python3 ../tests/src/stratum_dummy.py 3 &
-        python3 ../tests/src/mm_server.py 8000 id0 data0 &
-        python3 ../tests/src/mm_server.py 8001 id1 data1 &
-        python3 ../tests/src/mm_server.py 8002 id2 data2 &
-        ./p2pool ${{ secrets.TESTNET_NODE_PARAMS }} --config ../tests/src/mm_test_config.json --wallet 9y9HUSpSZX7j2J5UUngX5nCRezR6mZfLmL2D5JXpmPjYVDCPCCcw6Tab2R55xqPTN2FoQEEDmz99TVdy9EW74mqMUw5xRun --data-api data --local-api --merge-mine 127.0.0.1:8000 test0 --merge-mine 127.0.0.1:8001 test1 --merge-mine 127.0.0.1:8002 test2 --loglevel 6
+        ./p2pool --host xmr.support --rpc-port 18081 --zmq-port 18083 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
 
     - name: Check p2pool.log
       run: |
@@ -382,10 +367,7 @@ jobs:
         start python ../../tests/src/stratum_dummy.py 1
         start python ../../tests/src/stratum_dummy.py 2
         start python ../../tests/src/stratum_dummy.py 3
-        start python ../../tests/src/mm_server.py 8000 id0 data0 &
-        start python ../../tests/src/mm_server.py 8001 id1 data1 &
-        start python ../../tests/src/mm_server.py 8002 id2 data2 &
-        p2pool.exe ${{ secrets.TESTNET_NODE_PARAMS }} --config ../../tests/src/mm_test_config.json --wallet 9y9HUSpSZX7j2J5UUngX5nCRezR6mZfLmL2D5JXpmPjYVDCPCCcw6Tab2R55xqPTN2FoQEEDmz99TVdy9EW74mqMUw5xRun --data-api data --local-api --merge-mine 127.0.0.1:8000 test0 --merge-mine 127.0.0.1:8001 test1 --merge-mine 127.0.0.1:8002 test2 --loglevel 6
+        p2pool.exe --host xmr.support --rpc-port 18081 --zmq-port 18083 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
 
     - name: Check p2pool.log
       run: |
@@ -428,10 +410,7 @@ jobs:
         Start-Process python -ArgumentList "../../tests/src/stratum_dummy.py 1"
         Start-Process python -ArgumentList "../../tests/src/stratum_dummy.py 2"
         Start-Process python -ArgumentList "../../tests/src/stratum_dummy.py 3"
-        Start-Process python -ArgumentList "../../tests/src/mm_server.py 8000 id0 data0"
-        Start-Process python -ArgumentList "../../tests/src/mm_server.py 8001 id1 data1"
-        Start-Process python -ArgumentList "../../tests/src/mm_server.py 8002 id2 data2"
-        ./p2pool.exe ${{ secrets.TESTNET_NODE_PARAMS }} --config ../../tests/src/mm_test_config.json --wallet 9y9HUSpSZX7j2J5UUngX5nCRezR6mZfLmL2D5JXpmPjYVDCPCCcw6Tab2R55xqPTN2FoQEEDmz99TVdy9EW74mqMUw5xRun --data-api data --local-api --merge-mine 127.0.0.1:8000 test0 --merge-mine 127.0.0.1:8001 test1 --merge-mine 127.0.0.1:8002 test2 --loglevel 6
+        ./p2pool.exe --host xmr.support --rpc-port 18081 --zmq-port 18083 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
 
     - name: Check p2pool.log
       run: |

CMakeLists.txt

@@ -26,6 +26,7 @@ option(DEV_WITH_UBSAN "[Developer only] Compile with undefined behavior sanitize
 option(DEV_WITH_ASAN "[Developer only] Compile with address sanitizer" OFF)
 option(DEV_CLANG_TIDY "[Developer only] Compile for clang-tidy" OFF)
 option(DEV_TRACK_MEMORY "[Developer only] Track memory allocations" OFF)
+option(DEV_DEBUG "[Developer only] Compile a debug build" OFF)
 
 set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT p2pool)
 
@@ -83,6 +84,10 @@ if (DEV_TRACK_MEMORY)
 	add_definitions(-DDEV_TRACK_MEMORY)
 endif()
 
+if (DEV_DEBUG)
+	add_definitions(-DDEV_DEBUG)
+endif()
+
 include(cmake/flags.cmake)
 
 set(HEADERS
@@ -215,7 +220,7 @@ if (WITH_UPNP)
 endif()
 
 if (WIN32)
-	set(LIBS ${LIBS} ws2_32 iphlpapi userenv psapi dnsapi dbghelp)
+	set(LIBS ${LIBS} ws2_32 iphlpapi userenv psapi dnsapi dbghelp advapi32)
 	if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
 		set(LIBS ${LIBS} bcrypt)
 	endif()

README.md

@@ -82,7 +82,7 @@ In order to continue mining on P2Pool, you must update both Monero and P2Pool so
 
 |Monero protocol version|Required Monero software version|Required P2Pool version
 |-|-|-|
-|v15, v16 (active after August 13th, 2022)|v0.18.0.0 or newer, v0.18.3.3 is recommended|v4.0 or newer
+|v15, v16 (active after August 13th, 2022)|v0.18.0.0 or newer, v0.18.3.4 is recommended|v4.0 or newer
 
 ## How to mine on P2Pool
 

cmake/flags.cmake

@@ -27,8 +27,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
 		set(WARNING_FLAGS "-w")
 	endif()
 
-	if (DEV_WITH_TSAN OR DEV_WITH_UBSAN OR DEV_WITH_ASAN)
-		set(OPTIMIZATION_FLAGS "-Og -g")
+	if (DEV_WITH_TSAN OR DEV_WITH_UBSAN OR DEV_WITH_ASAN OR DEV_DEBUG)
+		set(OPTIMIZATION_FLAGS "-Og -g -ftrapv")
 	else()
 		set(OPTIMIZATION_FLAGS "-O3 -ffast-math -s")
 	endif()
@@ -99,8 +99,8 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
 		set(WARNING_FLAGS "-w")
 	endif()
 
-	if (DEV_WITH_MSAN)
-		set(OPTIMIZATION_FLAGS "-Og -g")
+	if (DEV_WITH_MSAN OR DEV_DEBUG)
+		set(OPTIMIZATION_FLAGS "-Og -g -ftrapv")
 	else()
 		set(OPTIMIZATION_FLAGS "-O3 -ffast-math -funroll-loops -fmerge-all-constants")
 	endif()

docker-compose/configure

@@ -7,12 +7,11 @@ if [ -z "$DOCKER_VER" ]; then
     echo "Docker not found; install it: https://docs.docker.com/engine/install/"
     exit 1
 fi
-if [ "$(echo "$DOCKER_VER"| cut -d'.' -f 1)" -ge 19 ] && \
-   [ "$(echo "$DOCKER_VER"| cut -d'.' -f 2)" -ge 0 ]  && \
-   [ "$(echo "$DOCKER_VER"| cut -d'.' -f 3)" -ge 3 ]; then
+MIN_DOCKER_VER=19.0.3
+if { echo "$MIN_DOCKER_VER"; echo "$DOCKER_VER"; } | sort --version-sort --check=quiet; then
     echo "Docker Found; OK"
 else
-    echo "Docker version less than 19.0.3; upgrade it: https://docs.docker.com/engine/install/"
+    echo "Docker version less than $MIN_DOCKER_VER; upgrade it: https://docs.docker.com/engine/install/"
     exit 1
 fi
 docker compose version 2>&1 > /dev/null

docs/COMMAND_LINE.MD

@@ -67,12 +67,18 @@ Merge mining will be available in P2Pool after the fork on October 12th, 2024. V
 
 - [Tari](https://www.tari.com/) uses their own gRPC API and requires a different command line:
   ```
-  p2pool.exe --wallet YOUR_MONERO_WALLET_ADDRESS --merge-mine tari://IP:port TARI_WALLET_ADDRESS
+  ./p2pool --wallet YOUR_MONERO_WALLET_ADDRESS --merge-mine tari://IP:port TARI_WALLET_ADDRESS
   ```
-  Merge mining is available for testing in Tari's [v1.0.0-pre.14 release](https://github.com/tari-project/tari/releases/tag/v1.0.0-pre.14) (Esmeralda testnet).
+  and on the Tari side
+  ```
+  ./minotari_node --grpc-enabled --mining-enabled
+  ```
+  Merge mining is available for testing in Tari's [latest release](https://github.com/tari-project/tari/releases) (Esmeralda testnet).
 
 ### TLS
 
+Starting from v4.1, P2Pool supports SSL/TLS connections to its Stratum port. Port 443 can also be safely used for Stratum connections since v4.1 - P2Pool will detect HTTP requests and respond to them.
+
 All `--tls...` parameters are optional. If they are not provided, P2Pool will generate a self-signed certificate upon startup.
 
 If you want to use your own certificate, please refer to your certificate provider's documentation (or OpenSSL documentation) on how to generate the appropriate PEM files.

patches/boringssl/win7.patch

@@ -0,0 +1,58 @@
+diff --git a/src/crypto/rand_extra/windows.c b/src/crypto/rand_extra/windows.c
+index a44774d23..09cf10942 100644
+--- a/src/crypto/rand_extra/windows.c
++++ b/src/crypto/rand_extra/windows.c
+@@ -26,6 +26,7 @@
+ OPENSSL_MSVC_PRAGMA(warning(push, 3))
+ 
+ #include <windows.h>
++#include <wincrypt.h>
+ 
+ #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \
+     !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+@@ -61,16 +62,40 @@ void CRYPTO_sysrand(uint8_t *out, size_t requested) {
+ // See: https://learn.microsoft.com/en-us/windows/win32/seccng/processprng
+ typedef BOOL (WINAPI *ProcessPrngFunction)(PBYTE pbData, SIZE_T cbData);
+ static ProcessPrngFunction g_processprng_fn = NULL;
++static HCRYPTPROV g_hCryptProv = NULL;
++
++static BOOL WINAPI wrapper_CryptGenRandom(PBYTE pbData, SIZE_T cbData)
++{
++  return CryptGenRandom(g_hCryptProv, cbData, pbData);
++}
+ 
+ static void init_processprng(void) {
+   HMODULE hmod = LoadLibraryW(L"bcryptprimitives");
+-  if (hmod == NULL) {
+-    abort();
++
++  if (hmod) {
++    g_processprng_fn = (ProcessPrngFunction)GetProcAddress(hmod, "ProcessPrng");
++    if (g_processprng_fn) {
++      return;
++    }
+   }
+-  g_processprng_fn = (ProcessPrngFunction)GetProcAddress(hmod, "ProcessPrng");
+-  if (g_processprng_fn == NULL) {
+-    abort();
++
++  if (CryptAcquireContext(&g_hCryptProv, NULL, NULL, PROV_RSA_FULL, 0)) {
++    g_processprng_fn = &wrapper_CryptGenRandom;
++    return;
++  }
++
++  DWORD err = GetLastError();
++  if (err == NTE_BAD_KEYSET) {
++    if (CryptAcquireContext(&g_hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET)) {
++      g_processprng_fn = &wrapper_CryptGenRandom;
++      return;
++    }
++    else {
++      err = GetLastError();
++    }
+   }
++
++  abort();
+ }
+ 
+ void CRYPTO_init_sysrand(void) {

src/block_template.cpp

@@ -324,15 +324,9 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const
 		parallel_run(uv_default_loop_checked(), Precalc(m_shares, m_poolBlockTemplate->m_txkeySec));
 	}
 
-	if (m_poolBlockTemplate->merge_mining_enabled()) {
-		m_poolBlockTemplate->m_merkleTreeData = PoolBlock::encode_merkle_tree_data(static_cast<uint32_t>(data.aux_chains.size() + 1), data.aux_nonce);
-		m_poolBlockTemplate->m_merkleTreeDataSize = 0;
-		writeVarint(m_poolBlockTemplate->m_merkleTreeData, [this](uint8_t) { ++m_poolBlockTemplate->m_merkleTreeDataSize; });
-	}
-	else {
-		m_poolBlockTemplate->m_merkleTreeData = 0;
-		m_poolBlockTemplate->m_merkleTreeDataSize = 0;
-	}
+	m_poolBlockTemplate->m_merkleTreeData = PoolBlock::encode_merkle_tree_data(static_cast<uint32_t>(data.aux_chains.size() + 1), data.aux_nonce);
+	m_poolBlockTemplate->m_merkleTreeDataSize = 0;
+	writeVarint(m_poolBlockTemplate->m_merkleTreeData, [this](uint8_t) { ++m_poolBlockTemplate->m_merkleTreeDataSize; });
 
 	select_mempool_transactions(mempool);
 
@@ -615,14 +609,8 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const
 	m_poolBlockTemplate->m_sidechainId = {};
 	m_poolBlockTemplate->m_merkleRoot = {};
 
-	if (m_poolBlockTemplate->merge_mining_enabled()) {
-		m_poolBlockTemplate->m_auxChains = data.aux_chains;
-		m_poolBlockTemplate->m_auxNonce = data.aux_nonce;
-	}
-	else {
-		m_poolBlockTemplate->m_auxChains.clear();
-		m_poolBlockTemplate->m_auxNonce = 0;
-	}
+	m_poolBlockTemplate->m_auxChains = data.aux_chains;
+	m_poolBlockTemplate->m_auxNonce = data.aux_nonce;
 
 	init_merge_mining_merkle_proof();
 
@@ -663,10 +651,7 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const
 	}
 
 	if (pool_block_debug()) {
-		const size_t merkle_root_offset = 
-			m_poolBlockTemplate->merge_mining_enabled()
-				? (m_extraNonceOffsetInTemplate + m_poolBlockTemplate->m_extraNonceSize + 2 + m_poolBlockTemplate->m_merkleTreeDataSize)
-				: (m_extraNonceOffsetInTemplate + m_poolBlockTemplate->m_extraNonceSize + 2);
+		const size_t merkle_root_offset = m_extraNonceOffsetInTemplate + m_poolBlockTemplate->m_extraNonceSize + 2 + m_poolBlockTemplate->m_merkleTreeDataSize;
 
 		memcpy(m_blockTemplateBlob.data() + merkle_root_offset, m_poolBlockTemplate->m_merkleRoot.h, HASH_SIZE);
 		memcpy(m_fullDataBlob.data() + merkle_root_offset, m_poolBlockTemplate->m_merkleRoot.h, HASH_SIZE);
@@ -965,15 +950,9 @@ int BlockTemplate::create_miner_tx(const MinerData& data, const std::vector<Mine
 
 	m_minerTxExtra.push_back(TX_EXTRA_MERGE_MINING_TAG);
 
-	if (!m_poolBlockTemplate->merge_mining_enabled()) {
-		m_minerTxExtra.push_back(HASH_SIZE);
-		m_minerTxExtra.insert(m_minerTxExtra.end(), HASH_SIZE, 0);
-	}
-	else {
-		m_minerTxExtra.push_back(static_cast<uint8_t>(m_poolBlockTemplate->m_merkleTreeDataSize + HASH_SIZE));
-		writeVarint(m_poolBlockTemplate->m_merkleTreeData, m_minerTxExtra);
-		m_minerTxExtra.insert(m_minerTxExtra.end(), HASH_SIZE, 0);
-	}
+	m_minerTxExtra.push_back(static_cast<uint8_t>(m_poolBlockTemplate->m_merkleTreeDataSize + HASH_SIZE));
+	writeVarint(m_poolBlockTemplate->m_merkleTreeData, m_minerTxExtra);
+	m_minerTxExtra.insert(m_minerTxExtra.end(), HASH_SIZE, 0);
 	// TX_EXTRA end
 
 	writeVarint(m_minerTxExtra.size(), m_minerTx);
@@ -1064,9 +1043,7 @@ hash BlockTemplate::calc_miner_tx_hash(uint32_t extra_nonce) const
 		merge_mining_root = get_root_from_proof(sidechain_id, m_poolBlockTemplate->m_merkleProof, aux_slot, n_aux_chains);
 	}
 
-	const size_t merkle_root_offset = m_poolBlockTemplate->merge_mining_enabled()
-		? (extra_nonce_offset + m_poolBlockTemplate->m_extraNonceSize + 2 + m_poolBlockTemplate->m_merkleTreeDataSize)
-		: (extra_nonce_offset + m_poolBlockTemplate->m_extraNonceSize + 2);
+	const size_t merkle_root_offset = extra_nonce_offset + m_poolBlockTemplate->m_extraNonceSize + 2 + m_poolBlockTemplate->m_merkleTreeDataSize;
 
 	// 1. Prefix (everything except vin_rct_type byte in the end)
 	// Apply extra_nonce in-place because we can't write to the block template here
@@ -1416,9 +1393,7 @@ std::vector<uint8_t> BlockTemplate::get_block_template_blob(uint32_t template_id
 	const uint32_t aux_slot = get_aux_slot(m_sidechain->consensus_hash(), m_poolBlockTemplate->m_auxNonce, n_aux_chains);
 	merge_mining_root = get_root_from_proof(sidechain_id, m_poolBlockTemplate->m_merkleProof, aux_slot, n_aux_chains);
 
-	merkle_root_offset = m_poolBlockTemplate->merge_mining_enabled()
-		? (m_extraNonceOffsetInTemplate + m_poolBlockTemplate->m_extraNonceSize + 2 + m_poolBlockTemplate->m_merkleTreeDataSize)
-		: (m_extraNonceOffsetInTemplate + m_poolBlockTemplate->m_extraNonceSize + 2);
+	merkle_root_offset = m_extraNonceOffsetInTemplate + m_poolBlockTemplate->m_extraNonceSize + 2 + m_poolBlockTemplate->m_merkleTreeDataSize;
 
 	*pThis = this;
 

src/common.h

@@ -52,6 +52,7 @@
 
 #include <array>
 #include <vector>
+#include <deque>
 #include <string>
 #include <algorithm>
 #include <atomic>
@@ -92,7 +93,7 @@
   #define __has_feature(x) 0
 #endif
 
-#if defined(_DEBUG) || defined(__SANITIZE_ADDRESS__) || __has_feature(address_sanitizer) || defined(__SANITIZE_THREAD__) || __has_feature(thread_sanitizer)
+#if defined(_DEBUG) || defined(DEV_DEBUG) || defined(__SANITIZE_ADDRESS__) || __has_feature(address_sanitizer) || defined(__SANITIZE_THREAD__) || __has_feature(thread_sanitizer)
 #define P2POOL_DEBUGGING 1
 #endif
 

src/json_rpc_request.cpp

@@ -67,7 +67,6 @@ struct CurlContext
 
 	uv_loop_t* m_loop;
 	uv_timer_t m_timer;
-	uv_async_t m_async;
 	CURLM* m_multiHandle;
 	CURL* m_handle;
 
@@ -88,7 +87,6 @@ CurlContext::CurlContext(const std::string& address, int port, const std::string
 	, m_closeCallback(close_cb)
 	, m_loop(loop)
 	, m_timer{}
-	, m_async{}
 	, m_multiHandle(nullptr)
 	, m_handle(nullptr)
 	, m_req(req)
@@ -123,19 +121,10 @@ CurlContext::CurlContext(const std::string& address, int port, const std::string
 	}
 	m_timer.data = this;
 
-	err = uv_async_init(m_loop, &m_async, reinterpret_cast<uv_async_cb>(on_timeout));
-	if (err) {
-		LOGERR(1, "uv_async_init failed, error " << uv_err_name(err));
-		uv_close(reinterpret_cast<uv_handle_t*>(&m_timer), nullptr);
-		throw std::runtime_error("uv_async_init failed");
-	}
-	m_async.data = this;
-
 	m_multiHandle = curl_multi_init();
 	if (!m_multiHandle) {
 		static constexpr char msg[] = "curl_multi_init() failed";
 		LOGERR(1, msg);
-		uv_close(reinterpret_cast<uv_handle_t*>(&m_async), nullptr);
 		uv_close(reinterpret_cast<uv_handle_t*>(&m_timer), nullptr);
 		throw std::runtime_error(msg);
 	}
@@ -161,7 +150,6 @@ CurlContext::CurlContext(const std::string& address, int port, const std::string
 		static constexpr char msg[] = "curl_easy_init() failed";
 		LOGERR(1, msg);
 		curl_multi_cleanup(m_multiHandle);
-		uv_close(reinterpret_cast<uv_handle_t*>(&m_async), nullptr);
 		uv_close(reinterpret_cast<uv_handle_t*>(&m_timer), nullptr);
 		throw std::runtime_error(msg);
 	}
@@ -217,7 +205,6 @@ CurlContext::CurlContext(const std::string& address, int port, const std::string
 		LOGERR(1, "curl_multi_add_handle failed, error " << curl_multi_strerror(curl_err));
 		curl_easy_cleanup(m_handle);
 		curl_multi_cleanup(m_multiHandle);
-		uv_close(reinterpret_cast<uv_handle_t*>(&m_async), nullptr);
 		uv_close(reinterpret_cast<uv_handle_t*>(&m_timer), nullptr);
 		throw std::runtime_error("curl_multi_add_handle failed");
 	}
@@ -333,20 +320,6 @@ int CurlContext::on_timer(CURLM* /*multi*/, long timeout_ms)
 		return 0;
 	}
 
-	if ((timeout_ms == 0) && !uv_is_closing(reinterpret_cast<uv_handle_t*>(&m_async))) {
-		// 0 ms timeout, but we can't just call on_timeout() here - we have to kick the UV loop
-		const int result = uv_async_send(&m_async);
-		if (result < 0) {
-			LOGERR(1, "uv_async_send failed with error " << uv_err_name(result));
-
-			// if async call didn't work, try to use the timer with 1 ms timeout
-			timeout_ms = 1;
-		}
-		else {
-			return 0;
-		}
-	}
-
 	const int result = uv_timer_start(&m_timer, reinterpret_cast<uv_timer_cb>(on_timeout), timeout_ms, 0);
 	if (result < 0) {
 		LOGERR(1, "uv_timer_start failed with error " << uv_err_name(result));
@@ -456,7 +429,7 @@ void CurlContext::on_close(uv_handle_t* h)
 	CurlContext* ctx = reinterpret_cast<CurlContext*>(h->data);
 	h->data = nullptr;
 
-	if (ctx->m_timer.data || ctx->m_async.data) {
+	if (ctx->m_timer.data) {
 		return;
 	}
 
@@ -471,10 +444,6 @@ void CurlContext::shutdown()
 	}
 	m_pollHandles.clear();
 
-	if (m_async.data && !uv_is_closing(reinterpret_cast<uv_handle_t*>(&m_async))) {
-		uv_close(reinterpret_cast<uv_handle_t*>(&m_async), on_close);
-	}
-
 	if (m_timer.data && !uv_is_closing(reinterpret_cast<uv_handle_t*>(&m_timer))) {
 		uv_close(reinterpret_cast<uv_handle_t*>(&m_timer), on_close);
 	}
@@ -495,6 +464,8 @@ void Call(const std::string& address, int port, const std::string& req, const st
 			catch (const std::exception& e) {
 				const char* msg = e.what();
 				(*close_cb)(msg, strlen(msg), 0.0);
+				delete cb;
+				delete close_cb;
 			}
 		});
 
@@ -502,6 +473,8 @@ void Call(const std::string& address, int port, const std::string& req, const st
 		static constexpr char err[] = "CallOnLoop failed";
 		LOGERR(1, err);
 		(*close_cb)(err, sizeof(err) - 1, 0.0);
+		delete cb;
+		delete close_cb;
 	}
 }
 

src/merge_mining_client_json_rpc.h

@@ -76,7 +76,7 @@ private:
 
 		uv_close(reinterpret_cast<uv_handle_t*>(&client->m_shutdownAsync), nullptr);
 
-		delete GetLoopUserData(&client->m_loop, false);
+		DeleteLoopUserData(&client->m_loop);
 	}
 
 	void on_shutdown();

src/p2p_server.cpp

@@ -27,6 +27,7 @@
 #include "json_parsers.h"
 #include "block_template.h"
 #include "p2pool_api.h"
+#include "stratum_server.h"
 #include <rapidjson/document.h>
 #include <fstream>
 #include <numeric>
@@ -56,6 +57,7 @@ P2PServer::P2PServer(p2pool* pool)
 	, m_timer{}
 	, m_timerCounter(0)
 	, m_timerInterval(2)
+	, m_seenGoodPeers(false)
 	, m_peerListLastSaved(0)
 	, m_lookForMissingBlocks(true)
 	, m_fastestPeer(nullptr)
@@ -329,7 +331,10 @@ void P2PServer::update_peer_connections()
 	uint32_t N = m_maxOutgoingPeers;
 
 	// Special case: when we can't find p2pool peers, scan through monerod peers (try 25 peers at a time)
-	if (!has_good_peers && !m_peerListMonero.empty()) {
+	if (has_good_peers) {
+		m_seenGoodPeers = true;
+	}
+	else if (!m_peerListMonero.empty()) {
 		LOGINFO(3, "Scanning monerod peers, " << m_peerListMonero.size() << " left");
 		for (uint32_t i = 0; (i < 25) && !m_peerListMonero.empty(); ++i) {
 			peer_list.push_back(m_peerListMonero.back());
@@ -360,6 +365,13 @@ void P2PServer::update_peer_connections()
 			load_monerod_peer_list();
 		}
 	}
+
+	if (disconnected()) {
+		StratumServer* stratum_server = m_pool->stratum_server();
+		if (stratum_server) {
+			stratum_server->drop_connections_async();
+		}
+	}
 }
 
 void P2PServer::update_peer_list()
@@ -438,7 +450,7 @@ void P2PServer::save_peer_list()
 	std::ofstream f(saved_peer_list_file_name, std::ios::binary);
 
 	if (!f.is_open()) {
-		LOGERR(1, "failed to save peer list");
+		LOGERR(1, "failed to save peer list " << saved_peer_list_file_name << ", error " << errno);
 		return;
 	}
 
@@ -805,10 +817,7 @@ void P2PServer::broadcast(const PoolBlock& block, const PoolBlock* parent)
 	writeVarint(total_reward, data->pruned_blob);
 	writeVarint(outputs_blob_size, data->pruned_blob);
 
-	if (block.merge_mining_enabled()) {
-		data->pruned_blob.insert(data->pruned_blob.end(), block.m_sidechainId.h, block.m_sidechainId.h + HASH_SIZE);
-	}
-
+	data->pruned_blob.insert(data->pruned_blob.end(), block.m_sidechainId.h, block.m_sidechainId.h + HASH_SIZE);
 	data->pruned_blob.insert(data->pruned_blob.end(), mainchain_data.begin() + outputs_offset + outputs_blob_size, mainchain_data.end());
 
 	const size_t N = block.m_transactions.size();

src/p2p_server.h

@@ -186,6 +186,8 @@ public:
 
 	void check_for_updates(bool forced = false) const;
 
+	bool disconnected() const { return m_seenGoodPeers && (m_numConnections == 0); };
+
 private:
 	[[nodiscard]] const char* get_log_category() const override;
 
@@ -244,6 +246,7 @@ private:
 		uint64_t m_lastSeen;
 	};
 
+	std::atomic<bool> m_seenGoodPeers;
 	std::vector<Peer> m_peerList;
 	std::vector<Peer> m_peerListMonero;
 	std::atomic<uint64_t> m_peerListLastSaved;

src/p2pool.cpp

@@ -658,7 +658,7 @@ void p2pool::submit_aux_block_async(const std::vector<SubmitAuxBlockData>& aux_b
 
 	// If p2pool is stopped, m_submitAuxBlockAsync is most likely already closed
 	if (m_stopped) {
-		LOGWARN(0, "p2pool is shutting down, but a block was found. Trying to submit it anyway!");
+		LOGWARN(0, "p2pool is shutting down, but an aux block was found. Trying to submit it anyway!");
 		submit_aux_block();
 		return;
 	}
@@ -769,9 +769,7 @@ void p2pool::on_stop(uv_async_t* async)
 
 	init_signals(pool, false);
 
-	uv_loop_t* loop = uv_default_loop_checked();
-	delete GetLoopUserData(loop, false);
-	loop->data = nullptr;
+	DeleteLoopUserData(uv_default_loop_checked());
 }
 
 void p2pool::submit_block() const
@@ -998,8 +996,8 @@ void p2pool::download_block_headers(uint64_t current_height)
 			if (parse_block_headers_range(data, size) == current_height - start_height) {
 				update_median_timestamp();
 				if (m_serversStarted.exchange(1) == 0) {
-					m_stratumServer = new StratumServer(this);
 					m_p2pServer = new P2PServer(this);
+					m_stratumServer = new StratumServer(this);
 #ifdef WITH_RANDOMX
 					if (m_params->m_minerThreads) {
 						start_mining(m_params->m_minerThreads);
@@ -1697,6 +1695,9 @@ void p2pool::api_update_block_found(const ChainMain* data, const PoolBlock* bloc
 			f.flush();
 			f.close();
 		}
+		else {
+			LOGERR(1, "Failed to update " << FOUND_BLOCKS_FILE << ", error " << errno);
+		}
 	}
 
 	std::vector<FoundBlock> found_blocks;

src/pool_block.cpp

@@ -204,17 +204,10 @@ std::vector<uint8_t> PoolBlock::serialize_mainchain_data(size_t* header_size, si
 
 	*(p++) = TX_EXTRA_MERGE_MINING_TAG;
 
-	if (!merge_mining_enabled()) {
-		*(p++) = HASH_SIZE;
-		memcpy(p, m_sidechainId.h, HASH_SIZE);
-		p += HASH_SIZE;
-	}
-	else {
-		*(p++) = static_cast<uint8_t>(m_merkleTreeDataSize + HASH_SIZE);
-		writeVarint(m_merkleTreeData, [&p](const uint8_t b) { *(p++) = b; });
-		memcpy(p, m_merkleRoot.h, HASH_SIZE);
-		p += HASH_SIZE;
-	}
+	*(p++) = static_cast<uint8_t>(m_merkleTreeDataSize + HASH_SIZE);
+	writeVarint(m_merkleTreeData, [&p](const uint8_t b) { *(p++) = b; });
+	memcpy(p, m_merkleRoot.h, HASH_SIZE);
+	p += HASH_SIZE;
 
 	writeVarint(static_cast<size_t>(p - tx_extra), data);
 	data.insert(data.end(), tx_extra, p);
@@ -267,23 +260,21 @@ std::vector<uint8_t> PoolBlock::serialize_sidechain_data() const
 	writeVarint(m_cumulativeDifficulty.lo, data);
 	writeVarint(m_cumulativeDifficulty.hi, data);
 
-	if (merge_mining_enabled()) {
-		const uint8_t n = static_cast<uint8_t>(m_merkleProof.size());
-		data.push_back(n);
+	const uint8_t n = static_cast<uint8_t>(m_merkleProof.size());
+	data.push_back(n);
 
-		for (uint8_t i = 0; i < n; ++i) {
-			const hash& h = m_merkleProof[i];
-			data.insert(data.end(), h.h, h.h + HASH_SIZE);
-		}
+	for (uint8_t i = 0; i < n; ++i) {
+		const hash& h = m_merkleProof[i];
+		data.insert(data.end(), h.h, h.h + HASH_SIZE);
+	}
 
-		writeVarint(m_mergeMiningExtra.size(), data);
+	writeVarint(m_mergeMiningExtra.size(), data);
 
-		for (const auto& mm_extra_data : m_mergeMiningExtra) {
-			data.insert(data.end(), mm_extra_data.first.h, mm_extra_data.first.h + HASH_SIZE);
+	for (const auto& mm_extra_data : m_mergeMiningExtra) {
+		data.insert(data.end(), mm_extra_data.first.h, mm_extra_data.first.h + HASH_SIZE);
 
-			writeVarint(mm_extra_data.second.size(), data);
-			data.insert(data.end(), mm_extra_data.second.begin(), mm_extra_data.second.end());
-		}
+		writeVarint(mm_extra_data.second.size(), data);
+		data.insert(data.end(), mm_extra_data.second.begin(), mm_extra_data.second.end());
 	}
 
 	const uint8_t* p = reinterpret_cast<const uint8_t*>(m_sidechainExtraBuf);
@@ -422,20 +413,4 @@ hash PoolBlock::calculate_tx_key_seed() const
 	return result;
 }
 
-bool PoolBlock::merge_mining_enabled() const
-{
-#ifdef P2POOL_UNIT_TESTS
-	return false;
-#else
-	switch (SideChain::network_type()) {
-	case NetworkType::Mainnet:
-		return m_timestamp >= MERGE_MINING_FORK_TIME;
-	case NetworkType::Testnet:
-		return m_timestamp >= MERGE_MINING_TESTNET_FORK_TIME;
-	default:
-		return false;
-	}
-#endif
-}
-
 } // namespace p2pool

src/pool_block.h

@@ -20,7 +20,7 @@
 #include "uv_util.h"
 #include "wallet.h"
 
-#ifdef _DEBUG
+#if defined(_DEBUG) || defined(DEV_DEBUG)
 #define POOL_BLOCK_DEBUG 1
 #else
 #define POOL_BLOCK_DEBUG 0
@@ -63,12 +63,6 @@ static constexpr uint64_t MAX_SIDECHAIN_HEIGHT = 31556952000ULL;
 static constexpr uint64_t MERGE_MINING_MAX_CHAINS = 256;
 static constexpr uint64_t LOG2_MERGE_MINING_MAX_CHAINS = 8;
 
-// Oct 12 2024 20:00:00 GMT+0000
-static constexpr uint64_t MERGE_MINING_FORK_TIME = 1728763200;
-
-// Aug 11 2024 20:00:00 GMT+0000
-static constexpr uint64_t MERGE_MINING_TESTNET_FORK_TIME = 1723406400;
-
 struct DifficultyData
 {
 	FORCEINLINE DifficultyData(uint64_t t, const difficulty_type& d) : m_timestamp(t), m_cumulativeDifficulty(d) {}
@@ -217,8 +211,6 @@ struct PoolBlock
 		mm_n_aux_chains = 1U + ((k >> 3U) & ((1U << n) - 1U));
 		mm_nonce = static_cast<uint32_t>(m_merkleTreeData >> (3U + n));
 	}
-
-	bool merge_mining_enabled() const;
 };
 
 } // namespace p2pool

src/pool_block_parser.inl

@@ -70,7 +70,7 @@ int PoolBlock::deserialize(const uint8_t* data, size_t size, const SideChain& si
 		READ_VARINT(m_timestamp);
 		READ_BUF(m_prevId.h, HASH_SIZE);
 
-		if (merge_mining_enabled() && (m_minorVersion > 127)) return __LINE__;
+		if (m_minorVersion > 127) return __LINE__;
 
 		const int nonce_offset = static_cast<int>(data - data_begin);
 		READ_BUF(&m_nonce, NONCE_SIZE);
@@ -150,9 +150,7 @@ int PoolBlock::deserialize(const uint8_t* data, size_t size, const SideChain& si
 			outputs_blob_size = static_cast<int>(tmp);
 
 			// Required by sidechain.get_outputs_blob() to speed up repeated broadcasts from different peers
-			if (merge_mining_enabled()) {
-				READ_BUF(m_sidechainId.h, HASH_SIZE);
-			}
+			READ_BUF(m_sidechainId.h, HASH_SIZE);
 		}
 
 		// Technically some p2pool node could keep stuffing block with transactions until reward is less than 0.6 XMR
@@ -193,36 +191,22 @@ int PoolBlock::deserialize(const uint8_t* data, size_t size, const SideChain& si
 		int mm_root_hash_offset;
 		uint32_t mm_n_aux_chains, mm_nonce;
 
-		if (!merge_mining_enabled()) {
-			EXPECT_BYTE(HASH_SIZE);
+		uint64_t mm_field_size;
+		READ_VARINT(mm_field_size);
 
-			mm_root_hash_offset = static_cast<int>((data - data_begin) + outputs_blob_size_diff);
-			READ_BUF(m_sidechainId.h, HASH_SIZE);
+		const uint8_t* const mm_field_begin = data;
 
-			mm_n_aux_chains = 1;
-			mm_nonce = 0;
+		READ_VARINT(m_merkleTreeData);
 
-			m_merkleRoot = static_cast<root_hash&>(m_sidechainId);
-			m_merkleTreeDataSize = 0;
-		}
-		else {
-			uint64_t mm_field_size;
-			READ_VARINT(mm_field_size);
+		m_merkleTreeDataSize = static_cast<uint32_t>(data - mm_field_begin);
 
-			const uint8_t* const mm_field_begin = data;
+		decode_merkle_tree_data(mm_n_aux_chains, mm_nonce);
 
-			READ_VARINT(m_merkleTreeData);
+		mm_root_hash_offset = static_cast<int>((data - data_begin) + outputs_blob_size_diff);
+		READ_BUF(m_merkleRoot.h, HASH_SIZE);
 
-			m_merkleTreeDataSize = static_cast<uint32_t>(data - mm_field_begin);
-
-			decode_merkle_tree_data(mm_n_aux_chains, mm_nonce);
-
-			mm_root_hash_offset = static_cast<int>((data - data_begin) + outputs_blob_size_diff);
-			READ_BUF(m_merkleRoot.h, HASH_SIZE);
-
-			if (static_cast<uint64_t>(data - mm_field_begin) != mm_field_size) {
-				return __LINE__;
-			}
+		if (static_cast<uint64_t>(data - mm_field_begin) != mm_field_size) {
+			return __LINE__;
 		}
 
 		if (static_cast<uint64_t>(data - tx_extra_begin) != tx_extra_size) return __LINE__;
@@ -363,52 +347,50 @@ int PoolBlock::deserialize(const uint8_t* data, size_t size, const SideChain& si
 		m_merkleProof.clear();
 		m_mergeMiningExtra.clear();
 
-		if (merge_mining_enabled()) {
-			uint8_t merkle_proof_size;
-			READ_BYTE(merkle_proof_size);
+		uint8_t merkle_proof_size;
+		READ_BYTE(merkle_proof_size);
 
-			if (merkle_proof_size > LOG2_MERGE_MINING_MAX_CHAINS) {
-				return __LINE__;
-			}
+		if (merkle_proof_size > LOG2_MERGE_MINING_MAX_CHAINS) {
+			return __LINE__;
+		}
 
-			m_merkleProof.reserve(merkle_proof_size);
+		m_merkleProof.reserve(merkle_proof_size);
 
-			for (uint8_t i = 0; i < merkle_proof_size; ++i) {
-				hash h;
-				READ_BUF(h.h, HASH_SIZE);
-				m_merkleProof.emplace_back(h);
-			}
+		for (uint8_t i = 0; i < merkle_proof_size; ++i) {
+			hash h;
+			READ_BUF(h.h, HASH_SIZE);
+			m_merkleProof.emplace_back(h);
+		}
 
-			uint64_t mm_extra_data_count;
-			READ_VARINT(mm_extra_data_count);
+		uint64_t mm_extra_data_count;
+		READ_VARINT(mm_extra_data_count);
+
+		if (mm_extra_data_count) {
+			// Sanity check
+			if (mm_extra_data_count > MERGE_MINING_MAX_CHAINS) return __LINE__;
+			if (static_cast<uint64_t>(data_end - data) < mm_extra_data_count * (HASH_SIZE + 1)) return __LINE__;
+
+			m_mergeMiningExtra.reserve(mm_extra_data_count);
+
+			for (uint64_t i = 0; i < mm_extra_data_count; ++i) {
+				hash chain_id;
+				READ_BUF(chain_id.h, HASH_SIZE);
+
+				// IDs must be ordered to avoid duplicates
+				if (i && !(m_mergeMiningExtra[i - 1].first < chain_id)) return __LINE__;
+
+				uint64_t n;
+				READ_VARINT(n);
 
-			if (mm_extra_data_count) {
 				// Sanity check
-				if (mm_extra_data_count > MERGE_MINING_MAX_CHAINS) return __LINE__;
-				if (static_cast<uint64_t>(data_end - data) < mm_extra_data_count * (HASH_SIZE + 1)) return __LINE__;
+				if (static_cast<uint64_t>(data_end - data) < n) return __LINE__;
 
-				m_mergeMiningExtra.reserve(mm_extra_data_count);
+				std::vector<uint8_t> t;
+				t.resize(n);
 
-				for (uint64_t i = 0; i < mm_extra_data_count; ++i) {
-					hash chain_id;
-					READ_BUF(chain_id.h, HASH_SIZE);
+				READ_BUF(t.data(), n);
 
-					// IDs must be ordered to avoid duplicates
-					if (i && !(m_mergeMiningExtra[i - 1].first < chain_id)) return __LINE__;
-
-					uint64_t n;
-					READ_VARINT(n);
-
-					// Sanity check
-					if (static_cast<uint64_t>(data_end - data) < n) return __LINE__;
-
-					std::vector<uint8_t> t;
-					t.resize(n);
-
-					READ_BUF(t.data(), n);
-
-					m_mergeMiningExtra.emplace_back(chain_id, std::move(t));
-				}
+				m_mergeMiningExtra.emplace_back(chain_id, std::move(t));
 			}
 		}
 

src/pow_hash.h

@@ -121,7 +121,7 @@ private:
 		RandomX_Hasher_RPC* server = reinterpret_cast<RandomX_Hasher_RPC*>(async->data);
 		uv_close(reinterpret_cast<uv_handle_t*>(&server->m_shutdownAsync), nullptr);
 
-		delete GetLoopUserData(&server->m_loop, false);
+		DeleteLoopUserData(&server->m_loop);
 	}
 };
 

src/side_chain.cpp

@@ -94,6 +94,7 @@ SideChain::SideChain(p2pool* pool, NetworkType type, const char* pool_name)
 	uv_mutex_init_checked(&m_seenWalletsLock);
 	uv_mutex_init_checked(&m_incomingBlocksLock);
 	uv_rwlock_init_checked(&m_curDifficultyLock);
+	uv_rwlock_init_checked(&m_watchBlockLock);
 
 	m_difficultyData.reserve(m_chainWindowSize);
 
@@ -213,6 +214,7 @@ SideChain::~SideChain()
 	uv_mutex_destroy(&m_seenWalletsLock);
 	uv_mutex_destroy(&m_incomingBlocksLock);
 	uv_rwlock_destroy(&m_curDifficultyLock);
+	uv_rwlock_destroy(&m_watchBlockLock);
 
 	for (const auto& it : m_blocksById) {
 		delete it.second;
@@ -629,7 +631,8 @@ bool SideChain::add_external_block(PoolBlock& block, std::vector<hash>& missing_
 
 	missing_blocks.clear();
 	{
-		WriteLock lock(m_sidechainLock);
+		ReadLock lock(m_sidechainLock);
+
 		if (!block.m_parent.empty() && (m_blocksById.find(block.m_parent) == m_blocksById.end())) {
 			missing_blocks.push_back(block.m_parent);
 		}
@@ -639,6 +642,10 @@ bool SideChain::add_external_block(PoolBlock& block, std::vector<hash>& missing_
 				missing_blocks.push_back(h);
 			}
 		}
+	}
+
+	{
+		WriteLock lock(m_watchBlockLock);
 
 		if (block.m_merkleRoot == m_watchBlockMerkleRoot) {
 			const Wallet& w = m_pool->params().m_wallet;
@@ -752,7 +759,7 @@ PoolBlock* SideChain::find_block_by_merkle_root(const root_hash& merkle_root) co
 
 void SideChain::watch_mainchain_block(const ChainMain& data, const hash& possible_merkle_root)
 {
-	WriteLock lock(m_sidechainLock);
+	WriteLock lock(m_watchBlockLock);
 	m_watchBlock = data;
 	m_watchBlockMerkleRoot = possible_merkle_root;
 }

src/side_chain.h

@@ -143,6 +143,7 @@ private:
 	mutable uv_rwlock_t m_curDifficultyLock;
 	difficulty_type m_curDifficulty;
 
+	uv_rwlock_t m_watchBlockLock;
 	ChainMain m_watchBlock;
 	hash m_watchBlockMerkleRoot;
 

src/stratum_server.cpp

@@ -22,6 +22,7 @@
 #include "side_chain.h"
 #include "params.h"
 #include "p2pool_api.h"
+#include "p2p_server.h"
 
 LOG_CATEGORY(StratumServer)
 
@@ -71,13 +72,6 @@ StratumServer::StratumServer(p2pool* pool)
 
 	m_extraNonce = get_random32();
 
-	m_submittedSharesPool.resize(10);
-	for (size_t i = 0; i < m_submittedSharesPool.size(); ++i) {
-		SubmittedShare* share = new SubmittedShare{};
-		ASAN_POISON_MEMORY_REGION(share, sizeof(SubmittedShare));
-		m_submittedSharesPool[i] = share;
-	}
-
 	uv_async_init_checked(&m_loop, &m_blobsAsync, on_blobs_ready);
 	m_blobsAsync.data = this;
 	m_blobsQueue.reserve(2);
@@ -105,11 +99,6 @@ StratumServer::~StratumServer()
 	uv_mutex_destroy(&m_showWorkersLock);
 	uv_mutex_destroy(&m_rngLock);
 	uv_rwlock_destroy(&m_hashrateDataLock);
-
-	for (SubmittedShare* share : m_submittedSharesPool) {
-		ASAN_UNPOISON_MEMORY_REGION(share, sizeof(SubmittedShare));
-		delete share;
-	}
 }
 
 void StratumServer::on_block(const BlockTemplate& block)
@@ -250,6 +239,24 @@ static bool get_custom_diff(const char* s, difficulty_type& diff)
 
 bool StratumServer::on_login(StratumClient* client, uint32_t id, const char* login)
 {
+	const P2PServer* p2p_server = m_pool->p2p_server();
+
+	// If there are no connections to other P2Pool peers, don't let Stratum clients connect
+	if (p2p_server && p2p_server->disconnected()) {
+		const bool result = send(client, [id](uint8_t* buf, size_t buf_size) {
+			log::Stream s(buf, buf_size);
+			s << "{\"id\":" << id << ",\"jsonrpc\":\"2.0\",\"error\":{\"message\":\"Disconnected from P2Pool network\"}}\n";
+			return s.m_pos;
+		});
+
+		if (!result) {
+			return false;
+		}
+
+		client->close();
+		return true;
+	}
+
 	if (client->m_rpcId) {
 		LOGWARN(4, "client " << static_cast<char*>(client->m_addrString) << " tried to login, but it's already logged in");
 		return false;
@@ -421,72 +428,77 @@ bool StratumServer::on_submit(StratumClient* client, uint32_t id, const char* jo
 			}
 		}
 
-		SubmittedShare* share;
-
-		if (!m_submittedSharesPool.empty()) {
-			share = m_submittedSharesPool.back();
-			m_submittedSharesPool.pop_back();
-			ASAN_UNPOISON_MEMORY_REGION(share, sizeof(SubmittedShare));
-		}
-		else {
-			share = new SubmittedShare{};
-		}
-
 		if (target >= TARGET_4_BYTES_LIMIT) {
 			// "Low diff share" fix: adjust target to the same value as XMRig would use
 			target = std::numeric_limits<uint64_t>::max() / (std::numeric_limits<uint32_t>::max() / (target >> 32));
 		}
 
-		share->m_req.data = share;
-		share->m_server = this;
-		share->m_client = client;
-		share->m_clientIPv6 = client->m_isV6;
-		share->m_clientAddr = client->m_addr;
-		memcpy(share->m_clientAddrString, client->m_addrString, sizeof(share->m_clientAddrString));
-		memcpy(share->m_clientCustomUser, client->m_customUser, sizeof(share->m_clientCustomUser));
-		share->m_clientResetCounter = client->m_resetCounter.load();
-		share->m_rpcId = client->m_rpcId;
-		share->m_id = id;
-		share->m_templateId = template_id;
-		share->m_nonce = nonce;
-		share->m_extraNonce = extra_nonce;
-		share->m_target = target;
-		share->m_resultHash = resultHash;
-		share->m_sidechainDifficulty = sidechain_diff;
-		share->m_mainchainHeight = height;
-		share->m_sidechainHeight = sidechain_height;
-		share->m_effort = -1.0;
-		share->m_timestamp = seconds_since_epoch();
+		SubmittedShare share{};
+
+		share.m_req.data = &share;
+		share.m_allocated = false;
+
+		share.m_server = this;
+		share.m_client = client;
+		share.m_clientIPv6 = client->m_isV6;
+		share.m_clientAddr = client->m_addr;
+		memcpy(share.m_clientAddrString, client->m_addrString, sizeof(share.m_clientAddrString));
+		memcpy(share.m_clientCustomUser, client->m_customUser, sizeof(share.m_clientCustomUser));
+		share.m_clientResetCounter = client->m_resetCounter.load();
+		share.m_rpcId = client->m_rpcId;
+		share.m_id = id;
+		share.m_templateId = template_id;
+		share.m_nonce = nonce;
+		share.m_extraNonce = extra_nonce;
+		share.m_target = target;
+		share.m_resultHash = resultHash;
+		share.m_sidechainDifficulty = sidechain_diff;
+		share.m_mainchainHeight = height;
+		share.m_sidechainHeight = sidechain_height;
+		share.m_effort = -1.0;
+		share.m_timestamp = seconds_since_epoch();
 
 		uint64_t rem;
-		share->m_hashes = (target > 1) ? udiv128(1, 0, target, &rem) : 1;
-		share->m_highEnoughDifficulty = sidechain_diff.check_pow(resultHash);
-		share->m_score = 0;
+		share.m_hashes = (target > 1) ? udiv128(1, 0, target, &rem) : 1;
+		share.m_highEnoughDifficulty = sidechain_diff.check_pow(resultHash);
+		share.m_score = 0;
 
 		// Don't count shares that were found during sync
 		const SideChain& side_chain = m_pool->side_chain();
 		const PoolBlock* tip = side_chain.chainTip();
 		if (tip && (sidechain_height + side_chain.chain_window_size() < tip->m_sidechainHeight)) {
-			share->m_highEnoughDifficulty = false;
+			share.m_highEnoughDifficulty = false;
 		}
 
-		update_auto_diff(client, share->m_timestamp, share->m_hashes);
+		update_auto_diff(client, share.m_timestamp, share.m_hashes);
 
 		// If this share is below sidechain difficulty, process it in this thread because it'll be quick
-		if (!share->m_highEnoughDifficulty) {
-			on_share_found(&share->m_req);
-			on_after_share_found(&share->m_req, 0);
+		if (!share.m_highEnoughDifficulty) {
+			on_share_found(&share.m_req);
+			on_after_share_found(&share.m_req, 0);
 			return true;
 		}
 
 		// Else switch to a worker thread to check PoW which can take a long time
-		const int err = uv_queue_work(&m_loop, &share->m_req, on_share_found, on_after_share_found);
-		if (err) {
-			LOGERR(1, "uv_queue_work failed, error " << uv_err_name(err));
+		SubmittedShare* share2 = new SubmittedShare(share);
 
-			// If uv_queue_work failed, process this share here anyway
-			on_share_found(&share->m_req);
-			on_after_share_found(&share->m_req, 0);
+		share2->m_req.data = share2;
+		share2->m_allocated = true;
+
+		m_pendingShareChecks.push_back(share2);
+		LOGINFO(5, "on_submit: pending share checks count = " << m_pendingShareChecks.size());
+
+		// If there were no pending share checks, run on_share_found in background
+		// on_after_share_found will pick the remaining share checks
+		if (m_pendingShareChecks.size() == 1) {
+			const int err = uv_queue_work(&m_loop, &share2->m_req, on_share_found, on_after_share_found);
+			if (err) {
+				LOGERR(1, "uv_queue_work failed, error " << uv_err_name(err));
+
+				// If uv_queue_work failed, process this share here anyway
+				on_share_found(&share2->m_req);
+				on_after_share_found(&share2->m_req, 0);
+			}
 		}
 
 		return true;
@@ -909,11 +921,11 @@ void StratumServer::on_share_found(uv_work_t* req)
 	const uint64_t target = share->m_target;
 	const uint64_t hashes = share->m_hashes;
 
-	if (pool->stopped()) {
-		LOGWARN(0, "p2pool is shutting down, but a share was found. Trying to process it anyway!");
-	}
-
 	if (share->m_highEnoughDifficulty) {
+		if (pool->stopped()) {
+			LOGWARN(0, "p2pool is shutting down, but a share was found. Trying to process it anyway!");
+		}
+
 		uint8_t blob[128];
 		uint64_t height;
 		difficulty_type difficulty;
@@ -998,6 +1010,9 @@ void StratumServer::on_share_found(uv_work_t* req)
 void StratumServer::on_after_share_found(uv_work_t* req, int /*status*/)
 {
 	SubmittedShare* share = reinterpret_cast<SubmittedShare*>(req->data);
+	StratumServer* server = share->m_server;
+
+	server->check_event_loop_thread(__func__);
 
 	if (share->m_highEnoughDifficulty) {
 		const char* s = share->m_clientCustomUser;
@@ -1021,14 +1036,6 @@ void StratumServer::on_after_share_found(uv_work_t* req, int /*status*/)
 		BACKGROUND_JOB_STOP(StratumServer::on_share_found);
 	}
 
-	StratumServer* server = share->m_server;
-
-	ON_SCOPE_LEAVE([share, server]()
-		{
-			ASAN_POISON_MEMORY_REGION(share, sizeof(SubmittedShare));
-			server->m_submittedSharesPool.push_back(share);
-		});
-
 	const bool bad_share = (share->m_result == SubmittedShare::Result::LOW_DIFF) || (share->m_result == SubmittedShare::Result::INVALID_POW);
 
 	StratumClient* client = share->m_client;
@@ -1074,6 +1081,30 @@ void StratumServer::on_after_share_found(uv_work_t* req, int /*status*/)
 	else if (bad_share) {
 		server->ban(share->m_clientIPv6, share->m_clientAddr, DEFAULT_BAN_TIME);
 	}
+
+	if (share->m_allocated) {
+		auto it = std::find(server->m_pendingShareChecks.begin(), server->m_pendingShareChecks.end(), share);
+		if (it != server->m_pendingShareChecks.end()) {
+			server->m_pendingShareChecks.erase(it);
+		}
+
+		delete share;
+
+		if (!server->m_pendingShareChecks.empty()) {
+			SubmittedShare* share2 = server->m_pendingShareChecks.front();
+
+			const int err = uv_queue_work(&server->m_loop, &share2->m_req, on_share_found, on_after_share_found);
+			if (err) {
+				LOGERR(1, "uv_queue_work failed, error " << uv_err_name(err));
+
+				// If uv_queue_work failed, process this share here anyway
+				server->on_share_found(&share2->m_req);
+				server->on_after_share_found(&share2->m_req, 0);
+			}
+		}
+
+		LOGINFO(5, "on_after_share_found: pending share checks count = " << server->m_pendingShareChecks.size());
+	}
 }
 
 void StratumServer::on_shutdown()
@@ -1167,12 +1198,19 @@ bool StratumServer::StratumClient::on_read(char* data, uint32_t size)
 		char* line_start = m_stratumReadBuf;
 		for (char *e = line_start + m_stratumReadBufBytes, *c = e - size; c < e; ++c) {
 			if (*c == '\n') {
-				// Check if the line starts with "GET " (an HTTP request)
-				if ((c - line_start >= 4) && (*reinterpret_cast<uint32_t*>(line_start) == 0x20544547U)) {
-					LOGINFO(5, "client " << log::Gray() << static_cast<const char*>(m_addrString) << log::NoColor() << " sent an HTTP request");
-					send_http_response();
-					close();
-					return true;
+				// Check if the line starts with "GET " or "HEAD" (an HTTP request)
+				if (c - line_start >= 4) {
+					const uint32_t line_start_data = read_unaligned(reinterpret_cast<uint32_t*>(line_start));
+
+					const bool is_http_get  = (line_start_data == 0x20544547U);
+					const bool is_http_head = (line_start_data == 0x44414548U);
+
+					if (is_http_get || is_http_head) {
+						LOGINFO(5, "client " << log::Gray() << static_cast<const char*>(m_addrString) << log::NoColor() << " sent an HTTP " << (is_http_get ? "GET" : "HEAD") << " request");
+						send_http_response(is_http_get);
+						close();
+						return true;
+					}
 				}
 
 				*c = '\0';
@@ -1374,22 +1412,24 @@ bool StratumServer::StratumClient::process_submit(rapidjson::Document& doc, uint
 	return static_cast<StratumServer*>(m_owner)->on_submit(this, id, job_id.GetString(), nonce.GetString(), result.GetString());
 }
 
-bool StratumServer::StratumClient::send_http_response()
+bool StratumServer::StratumClient::send_http_response(bool send_content)
 {
-	return m_owner->send(this, [](uint8_t *buf, size_t buf_size) -> size_t {
+	return m_owner->send(this, [send_content](uint8_t *buf, size_t buf_size) -> size_t {
 		static constexpr uint8_t data[] =
 			"HTTP/1.1 200 OK\r\n"
 			"Content-Length: 21\r\n"
-			"Content-Type: text/html\r\n"
+			"Content-Type: text/plain\r\n"
 			"Connection: Closed\r\n\r\n"
 			"P2Pool Stratum online";
 
-		if (buf_size < sizeof(data)) {
+		const size_t data_size = send_content ? (sizeof(data) - 1) : (sizeof(data) - 1 - 21);
+
+		if (buf_size < data_size) {
 			return 0;
 		}
 
-		memcpy(buf, data, sizeof(data));
-		return sizeof(data);
+		memcpy(buf, data, data_size);
+		return data_size;
 	});
 }
 

src/stratum_server.h

@@ -52,7 +52,7 @@ public:
 		[[nodiscard]] bool process_login(rapidjson::Document& doc, uint32_t id);
 		[[nodiscard]] bool process_submit(rapidjson::Document& doc, uint32_t id);
 
-		bool send_http_response();
+		bool send_http_response(bool send_content);
 
 		alignas(8) char m_rawReadBuf[STRATUM_BUF_SIZE];
 
@@ -147,6 +147,8 @@ private:
 	struct SubmittedShare
 	{
 		uv_work_t m_req;
+		bool m_allocated;
+
 		StratumServer* m_server;
 		StratumClient* m_client;
 		bool m_clientIPv6;
@@ -180,8 +182,6 @@ private:
 		} m_result;
 	};
 
-	std::vector<SubmittedShare*> m_submittedSharesPool;
-
 	struct HashrateData
 	{
 		uint64_t m_timestamp;
@@ -204,6 +204,8 @@ private:
 
 	std::atomic<uint64_t> m_apiLastUpdateTime;
 
+	std::deque<SubmittedShare*> m_pendingShareChecks;
+
 	void update_hashrate_data(uint64_t hashes, uint64_t timestamp);
 	void api_update_local_stats(uint64_t timestamp);
 

src/tcp_server.cpp

@@ -879,7 +879,7 @@ void TCPServer::on_shutdown(uv_async_t* async)
 	uv_close(reinterpret_cast<uv_handle_t*>(&s->m_dropConnectionsAsync), nullptr);
 	uv_close(reinterpret_cast<uv_handle_t*>(&s->m_shutdownAsync), nullptr);
 
-	delete GetLoopUserData(&s->m_loop, false);
+	DeleteLoopUserData(&s->m_loop);
 
 	s->m_numHandles = 0;
 	uv_walk(&s->m_loop, [](uv_handle_t*, void* n) { (*reinterpret_cast<uint32_t*>(n))++; }, &s->m_numHandles);

src/util.cpp

@@ -83,6 +83,11 @@ MinerCallbackHandler::~MinerCallbackHandler() {}
 
 void panic_stop(const char* message)
 {
+#ifdef DEV_TRACK_MEMORY
+	// Give it 1 minute to shut down, otherwise save a minidump
+	minidump_and_crash(60 * 1000);
+#endif
+
 	fprintf(stderr, "P2Pool can't continue execution: panic at %s\n", message);
 
 	p2pool::log::stop();
@@ -667,14 +672,30 @@ bool is_localhost(const std::string& host)
 
 UV_LoopUserData* GetLoopUserData(uv_loop_t* loop, bool create)
 {
-	UV_LoopUserData* data = reinterpret_cast<UV_LoopUserData*>(loop->data);
+	static_assert(sizeof(std::atomic<UV_LoopUserData*>) <= sizeof(void*), "loop->data size mismatch");
+	static_assert(alignof(std::atomic<UV_LoopUserData*>) <= alignof(void*), "loop->data alignment mismatch");
 
-	if (!data && create) {
-		data = new UV_LoopUserData(loop);
-		loop->data = data;
+	std::atomic<UV_LoopUserData*>& data = reinterpret_cast<std::atomic<UV_LoopUserData*>&>(loop->data);
+
+	UV_LoopUserData* result = data.load();
+
+	if (!result && create) {
+		UV_LoopUserData* new_data = new UV_LoopUserData(loop);
+
+		if (data.compare_exchange_strong(result, new_data)) {
+			result = new_data;
+		} else {
+			delete new_data;
+		}
 	}
 
-	return data;
+	return result;
+}
+
+void DeleteLoopUserData(uv_loop_t* loop)
+{
+	std::atomic<UV_LoopUserData*>& data = reinterpret_cast<std::atomic<UV_LoopUserData*>&>(loop->data);
+	delete data.exchange(nullptr);
 }
 
 #ifdef WITH_UPNP

src/util.h

@@ -35,7 +35,7 @@
 namespace p2pool {
 
 #define P2POOL_VERSION_MAJOR 4
-#define P2POOL_VERSION_MINOR 1
+#define P2POOL_VERSION_MINOR 2
 #define P2POOL_VERSION_PATCH 0
 
 constexpr uint32_t P2POOL_VERSION = (P2POOL_VERSION_MAJOR << 16) | (P2POOL_VERSION_MINOR << 8) | P2POOL_VERSION_PATCH;

src/uv_util.h

@@ -94,7 +94,6 @@ struct UV_LoopUserData
 
 	~UV_LoopUserData()
 	{
-		m_loop->data = nullptr;
 		uv_mutex_destroy(&m_callbacksLock);
 		uv_close(reinterpret_cast<uv_handle_t*>(m_async), [](uv_handle_t* h) { delete reinterpret_cast<uv_async_t*>(h); });
 		for (const UV_LoopCallbackBase* cb : m_callbacks) {
@@ -123,6 +122,7 @@ struct UV_LoopUserData
 };
 
 UV_LoopUserData* GetLoopUserData(uv_loop_t* loop, bool create = true);
+void DeleteLoopUserData(uv_loop_t* loop);
 
 template<typename T>
 bool CallOnLoop(uv_loop_t* loop, T&& callback)

tests/src/block_template_tests.cpp

@@ -60,7 +60,7 @@ TEST(block_template, update)
 	tpl.update(data, mempool, &wallet);
 
 	const PoolBlock* b = tpl.pool_block_template();
-	ASSERT_EQ(b->m_sidechainId, H("0355a4eeb586ab4d30f3ba89f0ebf7ac1c34a55aebf1bee50af04ff893330280"));
+	ASSERT_EQ(b->m_sidechainId, H("2c90c1926a75c81afd49bf4a4b63e9de7b4c153866411c47e7af864b547c23ec"));
 
 	std::vector<uint8_t> blobs;
 	uint64_t height;
@@ -79,7 +79,7 @@ TEST(block_template, update)
 
 	hash blobs_hash;
 	keccak(blobs.data(), static_cast<int>(blobs.size()), blobs_hash.h);
-	ASSERT_EQ(blobs_hash, H("70ee1661794c9a55f006432b57b0fc37922e0ccf8f1e4294b43890f8a6f44c62"));
+	ASSERT_EQ(blobs_hash, H("c043b754d043b4f6fe3f70273a937c77ff75a5afba9a6ca92776e79da28a1165"));
 
 	// Test 2: mempool with high fee and low fee transactions, it must choose high fee transactions
 	for (uint64_t i = 0; i < 512; ++i) {
@@ -92,7 +92,7 @@ TEST(block_template, update)
 
 	tpl.update(data, mempool, &wallet);
 
-	ASSERT_EQ(b->m_sidechainId, H("272a7eea0b804cf24427528977d221850d0ee06c26e935219a75f180cfbfc7f3"));
+	ASSERT_EQ(b->m_sidechainId, H("c9df4853003ab436416b9fc9a5a072d16b4dede849e697a8be2ebb9c88c8ec72"));
 	ASSERT_EQ(b->m_transactions.size(), 203);
 
 	for (size_t i = 1; i < b->m_transactions.size(); ++i) {
@@ -109,7 +109,7 @@ TEST(block_template, update)
 	ASSERT_EQ(template_id, 2U);
 
 	keccak(blobs.data(), static_cast<int>(blobs.size()), blobs_hash.h);
-	ASSERT_EQ(blobs_hash, H("c74d295a9cb7e808030284e2169a6f05b685a11c6c577a774d5eb8fad175d5cd"));
+	ASSERT_EQ(blobs_hash, H("f00e196216d160a4fcbf468f748205039d276d62edfa6c6fd4c81dbd1f62d9b7"));
 
 	destroy_crypto_cache();
 }

tests/src/check_win7.py

@@ -292,6 +292,8 @@ allowedAPIs = {
 	"DeleteFileA",
 	"GetFileAttributesA",
 	"OpenThreadToken",
+	"GetOverlappedResult",
+	"CryptGenRandom",
 }
 
 f = open(sys.argv[1], 'r')

tests/src/mm_test_config.json

@@ -1,8 +0,0 @@
-{
-	"name": "mm_test3",
-	"password": "",
-	"block_time": 10,
-	"min_diff": 100000,
-	"pplns_window": 216,
-	"uncle_penalty": 20
-}

tests/src/pool_block_tests.cpp

@@ -57,26 +57,26 @@ TEST(pool_block, deserialize)
 	int outputs_offset, outputs_blob_size;
 	const std::vector<uint8_t> mainchain_data = b.serialize_mainchain_data(&header_size, &miner_tx_size, &outputs_offset, &outputs_blob_size);
 
-	ASSERT_EQ(mainchain_data.size(), 1757U);
+	ASSERT_EQ(mainchain_data.size(), 1829U);
 	ASSERT_EQ(header_size, 43U);
-	ASSERT_EQ(miner_tx_size, 1457U);
+	ASSERT_EQ(miner_tx_size, 1145U);
 	ASSERT_EQ(outputs_offset, 54);
-	ASSERT_EQ(outputs_blob_size, 1371);
+	ASSERT_EQ(outputs_blob_size, 1058);
 
 	ASSERT_EQ(b.m_majorVersion, 16U);
 	ASSERT_EQ(b.m_minorVersion, 16U);
-	ASSERT_EQ(b.m_timestamp, 1679221824U);
-	ASSERT_EQ(b.m_nonce, 1247U);
-	ASSERT_EQ(b.m_txinGenHeight, 2845298U);
-	ASSERT_EQ(b.m_outputs.size(), 35U);
+	ASSERT_EQ(b.m_timestamp, 1728813765U);
+	ASSERT_EQ(b.m_nonce, 352454720U);
+	ASSERT_EQ(b.m_txinGenHeight, 3258099U);
+	ASSERT_EQ(b.m_outputs.size(), 27U);
 	ASSERT_EQ(b.m_extraNonceSize, 4U);
-	ASSERT_EQ(b.m_extraNonce, 1482827308U);
-	ASSERT_EQ(b.m_transactions.size(), 9U);
+	ASSERT_EQ(b.m_extraNonce, 2983923783U);
+	ASSERT_EQ(b.m_transactions.size(), 21U);
 	ASSERT_EQ(b.m_uncles.size(), 0U);
-	ASSERT_EQ(b.m_sidechainHeight, 4674483U);
-	ASSERT_EQ(b.m_difficulty.lo, 1854596983U);
+	ASSERT_EQ(b.m_sidechainHeight, 9443384U);
+	ASSERT_EQ(b.m_difficulty.lo, 1828732004U);
 	ASSERT_EQ(b.m_difficulty.hi, 0U);
-	ASSERT_EQ(b.m_cumulativeDifficulty.lo, 7172845253120126ull);
+	ASSERT_EQ(b.m_cumulativeDifficulty.lo, 15051095864465561ull);
 	ASSERT_EQ(b.m_cumulativeDifficulty.hi, 0U);
 	ASSERT_EQ(b.m_depth, 0U);
 	ASSERT_EQ(b.m_verified, false);
@@ -87,7 +87,7 @@ TEST(pool_block, deserialize)
 	hash seed;
 	{
 		std::stringstream s;
-		s << "6fc9c4a55eb513eb31955c084d9342e0082987f9e42da042449b7c9001176d3a";
+		s << "bf513dbe52c22b09e65edae222ec902d6adb75585a0141b81a165f0fb0c9c0bc";
 		s >> seed;
 	}
 
@@ -99,7 +99,7 @@ TEST(pool_block, deserialize)
 
 	std::stringstream s;
 	s << pow_hash;
-	ASSERT_EQ(s.str(), "aa7a3c4a2d67cb6a728e244288219bf038024f3b511b0da197a19ec601000000");
+	ASSERT_EQ(s.str(), "0906c001cc0900098fe1b62593f8ba52bd1ae2a0806096aa361a9f1702000000");
 
 	ASSERT_EQ(b.m_difficulty.check_pow(pow_hash), true);
 
@@ -118,16 +118,16 @@ TEST(pool_block, verify)
 		uint64_t m_sidechainHeight;
 		bool m_shuffle;
 	} tests[2] = {
-		{ "default", "sidechain_dump.dat", 2870010, 4957203, true },
-		{ "mini", "sidechain_dump_mini.dat", 2870010, 4414446, false },
+		{ "default", "sidechain_dump.dat", 3258121, 9443762, true },
+		{ "mini", "sidechain_dump_mini.dat", 3258121, 8912067, false },
 	};
 
 	for (const STest& t : tests)
 	{
 		SideChain sidechain(nullptr, NetworkType::Mainnet, t.m_poolName);
 
-		// Difficulty of block 2869248
-		sidechain.m_testMainChainDiff = difficulty_type(345786476185ULL, 0ULL);
+		// Difficulty of block 3256320
+		sidechain.m_testMainChainDiff = difficulty_type(374140388237ULL, 0ULL);
 
 		std::ifstream f(t.m_fileName, std::ios::binary | std::ios::ate);
 		ASSERT_EQ(f.good() && f.is_open(), true);