p2pool v4.3

Fix stop signal for stats container

.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 -DUSE_NGHTTP2=OFF
+        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 -DBUILD_EXAMPLES=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 -DUSE_NGHTTP2=OFF
+        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 -DBUILD_EXAMPLES=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 -DUSE_NGHTTP2=OFF
+        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 -DBUILD_EXAMPLES=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 -DUSE_NGHTTP2=OFF
+        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 -DBUILD_EXAMPLES=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 -DUSE_NGHTTP2=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="-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 -DBUILD_EXAMPLES=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 -DUSE_NGHTTP2=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="-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 -DBUILD_EXAMPLES=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 -DUSE_NGHTTP2=OFF
+          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 -DBUILD_EXAMPLES=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/cppcheck.yml

@@ -15,7 +15,7 @@ on:
 jobs:
   cppcheck-ubuntu:
 
-    timeout-minutes: 120
+    timeout-minutes: 180
     runs-on: ubuntu-latest
 
     steps:
@@ -48,12 +48,14 @@ jobs:
         ./run.sh
 
     - name: Archive full error list
+      if: '!cancelled()'
       uses: actions/upload-artifact@v4
       with:
         name: errors_full-linux
         path: cppcheck/errors_full.txt
 
     - name: Archive checkers report
+      if: '!cancelled()'
       uses: actions/upload-artifact@v4
       with:
         name: checkers_report-linux
@@ -96,12 +98,14 @@ jobs:
         ./run.cmd
 
     - name: Archive full error list
+      if: '!cancelled()'
       uses: actions/upload-artifact@v4
       with:
         name: errors_full-windows
         path: cppcheck/errors_full.txt
 
     - name: Archive checkers report
+      if: '!cancelled()'
       uses: actions/upload-artifact@v4
       with:
         name: checkers_report-windows

.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 -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=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 -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=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 -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=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 -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=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 -DBUILD_EXAMPLES=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 history_size=4" ./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 -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=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 -DBUILD_EXAMPLES=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
@@ -292,15 +280,10 @@ jobs:
       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 -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=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 -DBUILD_EXAMPLES=OFF
         make -j4
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -324,7 +307,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 +317,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 +362,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 +405,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()

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()

cppcheck/run.cmd

@@ -1,9 +1,19 @@
 @echo off
-"..\cppcheck-main\bin\cppcheck.exe" ../src/*.cpp -DSIZE_MAX=UINT64_MAX -DRAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN -D_WIN32=1 -D_WIN64=1 -DWIN32=1 -D_WINDOWS=1 -DNDEBUG=1 -DWITH_GRPC=1 -DPROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII=0 -DWITH_RANDOMX=1 -DWITH_UPNP=1 -DCURL_STATICLIB=1 -DWIN32_LEAN_AND_MEAN=1 -D_WIN32_WINNT=0x0600 -D_DISABLE_VECTOR_ANNOTATION=1 -D_DISABLE_STRING_ANNOTATION=1 -DZMQ_STATIC=1 -DHAVE_BITSCANREVERSE64=1 -DRAPIDJSON_PARSE_DEFAULT_FLAGS=kParseTrailingCommasFlag -DMINIUPNP_STATICLIB=1 -DCARES_STATICLIB=1 -DCMAKE_INTDIR="Release" -D__SSE2__=1 -D_MSC_VER=1929 -D__COVERITY__ --platform=win64 --std=c++17 --enable=all --inconclusive --inline-suppr --template="{file}:{line}:{id}{inconclusive: INCONCLUSIVE} {message}" --includes-file=includes.txt --suppressions-list=suppressions.txt --output-file=errors_full.txt --max-ctu-depth=3 --check-level=exhaustive --checkers-report=checkers_report.txt
+"..\cppcheck-main\bin\cppcheck.exe" ../src/*.cpp -D__cppcheck__ -DSIZE_MAX=UINT64_MAX -DRAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN -D_WIN32=1 -D_WIN64=1 -DWIN32=1 -D_WINDOWS=1 -DNDEBUG=1 -DWITH_GRPC=1 -DPROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII=0 -DWITH_RANDOMX=1 -DWITH_UPNP=1 -DCURL_STATICLIB=1 -DWIN32_LEAN_AND_MEAN=1 -D_WIN32_WINNT=0x0600 -D_DISABLE_VECTOR_ANNOTATION=1 -D_DISABLE_STRING_ANNOTATION=1 -DZMQ_STATIC=1 -DHAVE_BITSCANREVERSE64=1 -DRAPIDJSON_PARSE_DEFAULT_FLAGS=kParseTrailingCommasFlag -DMINIUPNP_STATICLIB=1 -DCARES_STATICLIB=1 -DCMAKE_INTDIR="Release" -D__SSE2__=1 -D_MSC_VER=1929 --platform=win64 --std=c++17 --enable=all --inconclusive --inline-suppr --template="{file}:{line}:{id}{inconclusive: INCONCLUSIVE} {message}" --includes-file=includes.txt --suppressions-list=suppressions.txt --output-file=errors_full.txt --max-ctu-depth=3 --check-level=exhaustive --checkers-report=checkers_report.txt
+
 findstr /V /C:"external\src" errors_full.txt > errors_filtered0.txt
 findstr /V /C:":checkersReport" errors_filtered0.txt > errors_filtered.txt
+
+findstr /C:"There were critical errors" checkers_report.txt > checkers_report_filtered.txt
+
 for /f %%i in ("errors_filtered.txt") do set size=%%~zi
 if %size% gtr 0 (
 	type errors_filtered.txt
 	exit 1
 )
+
+for /f %%i in ("checkers_report_filtered.txt") do set size2=%%~zi
+if %size2% gtr 0 (
+	type checkers_report_filtered.txt
+	exit 1
+)

cppcheck/run.sh

@@ -1,8 +1,17 @@
 #!/bin/bash
-../cppcheck-main/cppcheck --project=../build/compile_commands.json -DSIZE_MAX=UINT64_MAX -DRAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN -D__SSE2__=1 -D__BYTE_ORDER__=1 -D__ORDER_LITTLE_ENDIAN__=1 -D__linux__=1 --platform=unix64 --std=c++17 --enable=all --inconclusive --inline-suppr --template="{file}:{line}:{id}{inconclusive: INCONCLUSIVE} {message}" --suppressions-list=suppressions.txt --output-file=errors_full.txt --max-ctu-depth=3 --check-level=exhaustive --checkers-report=checkers_report.txt
+../cppcheck-main/cppcheck --project=../build/compile_commands.json -D__cppcheck__ -DSIZE_MAX=UINT64_MAX -DRAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN -DRAPIDJSON_64BIT=1 -D__SSE2__=1 -D__BYTE_ORDER__=1 -D__ORDER_LITTLE_ENDIAN__=1 -D__linux__=1 -D__x86_64 -D_M_AMD64 -D_M_X64 --platform=unix64 --std=c++17 --enable=all --inconclusive --inline-suppr --template="{file}:{line}:{id}{inconclusive: INCONCLUSIVE} {message}" --suppressions-list=suppressions.txt --output-file=errors_full.txt --max-ctu-depth=3 --check-level=exhaustive --checkers-report=checkers_report.txt
+
 grep -v 'external' errors_full.txt > errors_filtered0.txt
 grep -v ':checkersReport' errors_filtered0.txt > errors_filtered.txt
+
+grep 'There were critical errors' checkers_report.txt > checkers_report_filtered.txt
+
 if [ -s errors_filtered.txt ]; then
 	cat errors_filtered.txt
 	exit 1
 fi
+
+if [ -s checkers_report_filtered.txt ]; then
+	cat checkers_report_filtered.txt
+	exit 1
+fi

docker-compose/cfg/requirements.txt

@@ -1,3 +1,3 @@
 npyscreen==4.10.5
 MarkupSafe==2.0.1
-jinja2==3.1.4
+jinja2==3.1.5

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

docker-compose/statistics/Dockerfile

@@ -5,4 +5,6 @@ COPY app /app
 WORKDIR /app
 RUN pip install -r requirements.txt
 
+STOPSIGNAL SIGINT
+
 CMD ["/app/p2pool_statistics.py"]

docs/COMMAND_LINE.MD

@@ -10,8 +10,10 @@
 --addpeers           Comma-separated list of IP:port of other p2pool nodes to connect to
 --light-mode         Don't allocate RandomX dataset, saves 2GB of RAM
 --loglevel           Verbosity of the log, integer number between 0 and 6
---config             Name of p2pool sidechain's config file (don't use it unless you want to mine to a different p2pool chain)
---data-api           Path to the p2pool JSON data (use it in tandem with an external web-server)
+--data-dir           Path to store general p2pool files (log, cache, peer data, etc.), default is current directory
+--config             Deprecated, will be removed in the next version. Use --sidechain-config instead
+--sidechain-config   Name of the p2pool sidechain parameters file (only use it if you run your own sidechain)
+--data-api           Path to the p2pool JSON data (use it in tandem with an external web-server). Not affected by --data-dir setting!
 --local-api          Enable /local/ path in api path for Stratum Server and built-in miner statistics
 --stratum-api        An alias for --local-api
 --no-cache           Disable p2pool.cache
@@ -33,6 +35,7 @@
 --version            Print p2pool's version and build details
 --tls-cert file      Load TLS certificate chain from "file" in the PEM format
 --tls-cert-key file  Load TLS certificate private key from "file" in the PEM format
+--no-stratum-http    Disable HTTP on Stratum ports
 ```
 
 ### Example command line
@@ -67,9 +70,13 @@ 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
 

docs/html/index.html

@@ -281,7 +281,7 @@ It's highly recommended to create a new wallet for mining because wallet address
 <details><summary>Help and support</summary>
 P2Pool is a decentralized community, there is no dedicated support. You can reach and get help from other miners on:
 <ul>
-<li>IRC channels: <span>#monero-pools</span> and <span>#p2pool-log</span> (<span>#p2pool-mini</span> for P2Pool mini) on <a href="https://libera.chat/" target="_blank">Libera.Chat</a>
+<li>IRC channels: <span>#p2pool-log</span> (<span>#p2pool-mini</span> for P2Pool mini) on <a href="https://libera.chat/" target="_blank">Libera.Chat</a>
 <li>Reddit: <a href="https://reddit.com/r/MoneroMining/" target="_blank">r/MoneroMining</a>
 </ul></details>
 </td></tr></table>
@@ -310,7 +310,7 @@ P2Pool is a decentralized community, there is no dedicated support. You can reac
 <br><br>
 <div style="position:fixed;width:100%;bottom:0;background-color:#383838;font-size:1rem;text-align:center;color:#b0b0b0;">
 <a href="api/" target="_blank">Pool API</a>&nbsp;|&nbsp;<a href="https://github.com/SChernykh/p2pool" target="_blank">Source</a>&nbsp;|&nbsp;<a href="http://yucmgsbw7nknw7oi3bkuwudvc657g2xcqahhbjyewazusyytapqo4xid.onion/" target="_blank">Onion URL</a><br>
-Donate to support the project:<br><a href="monero:44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg?tx_description=Donation%20to%20P2Pool" style="font-size:0.9rem;color:#b0b0b0;">44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg</a><br>
+Donate to support the project:<br><span style="font-size:0.9rem;color:#b0b0b0;">44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg</span><br>
 &nbsp;
 </div>
 </body>

docs/html/mini/index.html

@@ -281,7 +281,7 @@ It's highly recommended to create a new wallet for mining because wallet address
 <details><summary>Help and support</summary>
 P2Pool is a decentralized community, there is no dedicated support. You can reach and get help from other miners on:
 <ul>
-<li>IRC channels: <span>#monero-pools</span> and <span>#p2pool-log</span> (<span>#p2pool-mini</span> for P2Pool mini) on <a href="https://libera.chat/" target="_blank">Libera.Chat</a>
+<li>IRC channels: <span>#p2pool-log</span> (<span>#p2pool-mini</span> for P2Pool mini) on <a href="https://libera.chat/" target="_blank">Libera.Chat</a>
 <li>Reddit: <a href="https://reddit.com/r/MoneroMining/" target="_blank">r/MoneroMining</a>
 </ul></details>
 </td></tr></table>
@@ -310,7 +310,7 @@ P2Pool is a decentralized community, there is no dedicated support. You can reac
 <br><br>
 <div style="position:fixed;width:100%;bottom:0;background-color:#383838;font-size:1rem;text-align:center;color:#b0b0b0;">
 <a href="api/" target="_blank">Pool API</a>&nbsp;|&nbsp;<a href="https://github.com/SChernykh/p2pool" target="_blank">Source</a>&nbsp;|&nbsp;<a href="http://yucmgsbw7nknw7oi3bkuwudvc657g2xcqahhbjyewazusyytapqo4xid.onion/mini/" target="_blank">Onion URL</a><br>
-Donate to support the project:<br><a href="monero:44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg?tx_description=Donation%20to%20P2Pool" style="font-size:0.9rem;color:#b0b0b0;">44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg</a><br>
+Donate to support the project:<br><span style="font-size:0.9rem;color:#b0b0b0;">44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg</span><br>
 &nbsp;
 </div>
 </body>

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_cache.cpp

@@ -19,6 +19,7 @@
 #include "block_cache.h"
 #include "pool_block.h"
 #include "p2p_server.h"
+#include "side_chain.h"
 
 LOG_CATEGORY(BlockCache)
 
@@ -35,9 +36,11 @@ struct BlockCache::Impl : public nocopy_nomove
 
 	Impl()
 	{
-		m_fd = open(cache_name, O_RDWR | O_CREAT, static_cast<mode_t>(0600));
+		const std::string cache_path = DATA_DIR + cache_name;
+
+		m_fd = open(cache_path.c_str(), O_RDWR | O_CREAT, static_cast<mode_t>(0600));
 		if (m_fd == -1) {
-			LOGERR(1, "couldn't open/create " << cache_name);
+			LOGERR(1, "couldn't open/create " << cache_path << ": error " << errno);
 			return;
 		}
 
@@ -86,11 +89,12 @@ struct BlockCache::Impl : public nocopy_nomove
 #elif defined(_WIN32)
 
 	Impl()
-		: m_file(CreateFile(cache_name, GENERIC_ALL, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_HIDDEN, NULL))
+		: m_cachePath(DATA_DIR + cache_name)
+		, m_file(CreateFile(m_cachePath.c_str(), GENERIC_ALL, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_HIDDEN, NULL))
 		, m_map(0)
 	{
 		if (m_file == INVALID_HANDLE_VALUE) {
-			LOGERR(1, "couldn't open " << cache_name << ", error " << static_cast<uint32_t>(GetLastError()));
+			LOGERR(1, "couldn't open " << m_cachePath << ": error " << static_cast<uint32_t>(GetLastError()));
 			return;
 		}
 
@@ -141,6 +145,7 @@ struct BlockCache::Impl : public nocopy_nomove
 		}
 	}
 
+	std::string m_cachePath;
 	HANDLE m_file;
 	HANDLE m_map;
 

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/console_commands.cpp

@@ -209,7 +209,7 @@ static void do_status(p2pool *m_pool, const char * /* args */)
 
 	m_pool->print_merge_mining_status();
 
-	bkg_jobs_tracker.print_status();
+	bkg_jobs_tracker->print_status();
 
 	if (p2p) {
 		p2p->check_for_updates(true);
@@ -313,7 +313,7 @@ static void do_stop_mining(p2pool* m_pool, const char* /*args*/)
 
 static void do_exit(p2pool *m_pool, const char * /* args */)
 {
-	bkg_jobs_tracker.wait();
+	bkg_jobs_tracker->wait();
 	m_pool->stop();
 }
 
@@ -358,7 +358,7 @@ void ConsoleCommands::stdinReadCallback(uv_stream_t* stream, ssize_t nread, cons
 }
 
 
-void ConsoleCommands::process_input(std::string& command, char* data, uint32_t size)
+void ConsoleCommands::process_input(std::string& command, const char* data, uint32_t size)
 {
 	command.append(data, size);
 

src/console_commands.h

@@ -40,7 +40,7 @@ public:
 		size_t size() const override { return sizeof(ConsoleClient); }
 
 		bool on_connect() override { return true; };
-		bool on_read(char* data, uint32_t size) override { static_cast<ConsoleCommands*>(m_owner)->process_input(m_command, data, size); return true; };
+		bool on_read(const char* data, uint32_t size) override { static_cast<ConsoleCommands*>(m_owner)->process_input(m_command, data, size); return true; };
 
 		char m_consoleReadBuf[1024] = {};
 
@@ -66,7 +66,7 @@ private:
 	static void allocCallback(uv_handle_t* handle, size_t suggested_size, uv_buf_t* buf);
 	static void stdinReadCallback(uv_stream_t* stream, ssize_t nread, const uv_buf_t* buf);
 
-	void process_input(std::string& command, char* data, uint32_t size);
+	void process_input(std::string& command, const char* data, uint32_t size);
 };
 
 } // namespace p2pool

src/crypto.cpp

@@ -37,9 +37,7 @@ class RandomBytes
 public:
 	RandomBytes() : rng(RandomDeviceSeed::instance), dist(0, 255)
 	{
-		if (uv_mutex_init(&m) != 0) {
-			abort();
-		}
+		uv_mutex_init_checked(&m);
 
 		// Diffuse the initial state in case it has low quality
 		rng.discard(10000);
@@ -66,7 +64,7 @@ private:
 	std::uniform_int_distribution<> dist;
 };
 
-static RandomBytes randomBytes;
+static RandomBytes* randomBytes = nullptr;
 
 }
 
@@ -86,7 +84,7 @@ static FORCEINLINE bool less32(const uint8_t* k0, const uint8_t* k1)
 void generate_keys(hash& pub, hash& sec)
 {
 	do {
-		do { randomBytes(sec.h); } while (!less32(sec.h, limit));
+		do { (*randomBytes)(sec.h); } while (!less32(sec.h, limit));
 		sc_reduce32(sec.h);
 	} while (!sc_isnonzero(sec.h));
 
@@ -472,6 +470,10 @@ void derive_view_tag(const hash& derivation, size_t output_index, uint8_t& view_
 
 void init_crypto_cache()
 {
+	if (!randomBytes) {
+		randomBytes = new RandomBytes();
+	}
+
 	if (!cache) {
 		cache = new Cache();
 	}
@@ -479,9 +481,15 @@ void init_crypto_cache()
 
 void destroy_crypto_cache()
 {
-	if (cache) {
-		delete cache;
+	{
+		auto p = randomBytes;
+		randomBytes = nullptr;
+		delete p;
+	}
+	{
+		auto p = cache;
 		cache = nullptr;
+		delete p;
 	}
 }
 

src/keccak.cpp

@@ -116,17 +116,14 @@ NOINLINE void keccakf_plain(std::array<uint64_t, 25>& st)
 	}
 }
 
-void (*keccakf)(std::array<uint64_t, 25>&) = keccakf_plain;
-
+keccakf_func keccakf = []() {
 #if defined(__x86_64__) || defined(_M_AMD64)
-static struct KeccakBMI_Check {
-	KeccakBMI_Check() {
-		if (randomx::Cpu().hasBmi()) {
-			keccakf = keccakf_bmi;
-		}
+	if (randomx::Cpu().hasBmi()) {
+		return keccakf_bmi;
 	}
-} keccak_bmi_check;
 #endif
+	return keccakf_plain;
+}();
 
 NOINLINE void keccak_step(const uint8_t* &in, int &inlen, std::array<uint64_t, 25>& st)
 {

src/keccak.h

@@ -25,7 +25,9 @@ enum KeccakParams {
 };
 
 extern const uint64_t keccakf_rndc[24];
-extern void (*keccakf)(std::array<uint64_t, 25>& st);
+
+typedef void (*keccakf_func)(std::array<uint64_t, 25>&);
+extern keccakf_func keccakf;
 
 void keccakf_plain(std::array<uint64_t, 25>& st);
 void keccakf_bmi(std::array<uint64_t, 25>& st);

src/log.cpp

@@ -117,38 +117,28 @@ public:
 	FORCEINLINE Worker()
 		: m_writePos(0)
 		, m_readPos(0)
-		, m_started{ false }
 		, m_stopped(false)
 	{
 #if defined(_WIN32) && defined(_MSC_VER) && !defined(NDEBUG)
 		SetUnhandledExceptionFilter(UnhandledExceptionFilter);
-		SymInitialize(GetCurrentProcess(), NULL, TRUE);
 #endif
 
 		set_main_thread();
 
 		std::setlocale(LC_ALL, "en_001");
 
-		m_logFile.open(log_file_name, std::ios::app | std::ios::binary);
+		m_logFilePath = DATA_DIR + log_file_name;
+		m_logFile.open(m_logFilePath, std::ios::app | std::ios::binary);
+
+		if (!m_logFile.is_open()) {
+			fprintf(stderr, "failed to open %s: error %d\n", m_logFilePath.c_str(), errno);
+		}
 
 		m_buf.resize(BUF_SIZE);
 
-		// Create default loop here
-		uv_default_loop();
-
 		uv_cond_init(&m_cond);
 		uv_mutex_init(&m_mutex);
 
-		const int err = uv_thread_create(&m_worker, run_wrapper, this);
-		if (err) {
-			fprintf(stderr, "failed to start logger thread (%s), aborting\n", uv_err_name(err));
-			abort();
-		}
-
-		while (m_started.load() == false) {
-			std::this_thread::yield();
-		}
-
 #ifdef _WIN32
 		SetConsoleMode(hStdIn, ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_EXTENDED_FLAGS);
 
@@ -163,13 +153,13 @@ public:
 			CONSOLE_COLORS = false;
 		}
 
-		LOGINFO(0, "started");
-
-		if (!m_logFile.is_open()) {
-			LOGERR(0, "failed to open " << log_file_name);
-		}
-
 		init_uv_threadpool();
+
+		const int err = uv_thread_create(&m_worker, run_wrapper, this);
+		if (err) {
+			fprintf(stderr, "failed to start logger thread (%s), aborting\n", uv_err_name(err));
+			abort();
+		}
 	}
 
 	~Worker()
@@ -196,17 +186,8 @@ public:
 		uv_thread_join(&m_worker);
 		uv_cond_destroy(&m_cond);
 		uv_mutex_destroy(&m_mutex);
-		uv_loop_close(uv_default_loop());
-
-#if ((UV_VERSION_MAJOR > 1) || ((UV_VERSION_MAJOR == 1) && (UV_VERSION_MINOR >= 38)))
-		uv_library_shutdown();
-#endif
 
 		m_logFile.close();
-
-#if defined(_WIN32) && defined(_MSC_VER) && !defined(NDEBUG)
-		SymCleanup(GetCurrentProcess());
-#endif
 	}
 
 	FORCEINLINE void write(const char* buf, uint32_t size)
@@ -236,6 +217,8 @@ public:
 		uv_cond_signal(&m_cond);
 	}
 
+	const std::string& log_file_path() const { return m_logFilePath; }
+
 private:
 	static void init_uv_threadpool()
 	{
@@ -252,13 +235,13 @@ private:
 		int err = putenv(buf);
 		if (err != 0) {
 			err = errno;
-			LOGWARN(0, "Couldn't set UV thread pool size to " << N << " threads, putenv returned error " << err);
+			fprintf(stderr, "Couldn't set UV thread pool size to %u threads, putenv returned error %d\n", N, err);
 		}
 
 		static uv_work_t dummy;
 		err = uv_queue_work(uv_default_loop_checked(), &dummy, [](uv_work_t*) {}, nullptr);
 		if (err) {
-			LOGERR(0, "init_uv_threadpool: uv_queue_work failed, error " << uv_err_name(err));
+			fprintf(stderr, "init_uv_threadpool: uv_queue_work failed, error %s\n", uv_err_name(err));
 		}
 	}
 
@@ -267,8 +250,6 @@ private:
 
 	NOINLINE void run()
 	{
-		m_started.exchange(true);
-
 		do {
 			uv_mutex_lock(&m_mutex);
 			if (m_readPos == m_writePos.load()) {
@@ -346,9 +327,9 @@ private:
 
 				// Reopen the log file if it's been moved (logrotate support)
 				struct stat buf;
-				if (stat(log_file_name, &buf) != 0) {
+				if (stat(m_logFilePath.c_str(), &buf) != 0) {
 					m_logFile.close();
-					m_logFile.open(log_file_name, std::ios::app | std::ios::binary);
+					m_logFile.open(m_logFilePath, std::ios::app | std::ios::binary);
 				}
 			}
 
@@ -392,13 +373,13 @@ private:
 	uv_mutex_t m_mutex;
 	uv_thread_t m_worker;
 
-	std::atomic<bool> m_started;
 	bool m_stopped;
 
 	std::ofstream m_logFile;
+	std::string m_logFilePath;
 };
 
-static Worker worker;
+static Worker* worker = nullptr;
 
 #endif // P2POOL_LOG_DISABLE
 
@@ -445,20 +426,32 @@ NOINLINE Writer::~Writer()
 	m_buf[2] = static_cast<uint8_t>(size >> 8);
 	m_buf[m_pos] = '\n';
 #ifndef P2POOL_LOG_DISABLE
-	worker.write(m_buf, size);
+	worker->write(m_buf, size);
+#endif
+}
+
+void start()
+{
+#ifndef P2POOL_LOG_DISABLE
+	worker = new Worker();
+
+	LOGINFO(0, "started");
 #endif
 }
 
 void reopen()
 {
 	// This will trigger the worker thread which will then reopen log file if it's been moved
-	LOGINFO(0, "reopening " << log_file_name);
+#ifndef P2POOL_LOG_DISABLE
+	LOGINFO(0, "reopening " << worker->log_file_path());
+#endif
 }
 
 void stop()
 {
 #ifndef P2POOL_LOG_DISABLE
-	worker.stop();
+	delete worker;
+	worker = nullptr;
 #endif
 }
 

src/log.h

@@ -506,8 +506,8 @@ struct DummyStream
 	}
 };
 
-#ifdef __COVERITY__
-// Coverity doesn't like this macro - CID 393138: Big parameter passed by value (PASS_BY_VALUE)
+#if defined(__COVERITY__) || defined(__cppcheck__)
+// Coverity and cppcheck don't like this macro - CID 393138: Big parameter passed by value (PASS_BY_VALUE)
 #define SIDE_EFFECT_CHECK(level, ...)
 #else
 #define SIDE_EFFECT_CHECK(level, ...) \
@@ -547,6 +547,7 @@ struct DummyStream
 
 #endif
 
+void start();
 void reopen();
 void stop();
 

src/main.cpp

@@ -21,11 +21,20 @@
 #include "stratum_server.h"
 #include "p2p_server.h"
 #include <curl/curl.h>
+#include <filesystem>
 
 #ifdef WITH_RANDOMX
 #include "randomx.h"
 #endif
 
+#if defined(_WIN32) && defined(_MSC_VER) && !defined(NDEBUG)
+
+#include <DbgHelp.h>
+
+#pragma comment(lib, "Dbghelp.lib")
+
+#endif
+
 void p2pool_usage()
 {
 	printf("P2Pool %s\n"
@@ -39,8 +48,10 @@ void p2pool_usage()
 		"--addpeers           Comma-separated list of IP:port of other p2pool nodes to connect to\n"
 		"--light-mode         Don't allocate RandomX dataset, saves 2GB of RAM\n"
 		"--loglevel           Verbosity of the log, integer number between 0 and %d\n"
-		"--config             Name of the p2pool config file\n"
-		"--data-api           Path to the p2pool JSON data (use it in tandem with an external web-server)\n"
+		"--data-dir           Path to store general p2pool files (log, cache, peer data, etc.), default is current directory\n"
+		"--config             Deprecated, will be removed in the next version. Use --sidechain-config instead\n"
+		"--sidechain-config   Name of the p2pool sidechain parameters file (only use it if you run your own sidechain)\n"
+		"--data-api           Path to the p2pool JSON data (use it in tandem with an external web-server). Not affected by --data-dir setting!\n"
 		"--local-api          Enable /local/ path in api path for Stratum Server and built-in miner statistics\n"
 		"--stratum-api        An alias for --local-api\n"
 		"--no-cache           Disable p2pool.cache\n"
@@ -68,6 +79,7 @@ void p2pool_usage()
 		"--tls-cert file      Load TLS certificate chain from \"file\" in the PEM format\n"
 		"--tls-cert-key file  Load TLS certificate private key from \"file\" in the PEM format\n"
 #endif
+		"--no-stratum-http    Disable HTTP on Stratum ports\n"
 		"--help               Show this help message\n\n"
 		"Example command line:\n\n"
 		"%s --host 127.0.0.1 --rpc-port 18081 --zmq-port 18083 --wallet YOUR_WALLET_ADDRESS --stratum 0.0.0.0:%d --p2p 0.0.0.0:%d\n\n",
@@ -186,10 +198,39 @@ int main(int argc, char* argv[])
 		if (!strcmp(argv[i], "--test")) {
 			return p2pool_test();
 		}
+
+		if ((strcmp(argv[i], "--data-dir") == 0) && (i + 1 < argc)) {
+			std::string path = argv[++i];
+
+			if (!path.empty() && (path.back() != '/')
+#ifdef _WIN32
+				&& (path.back() != '\\')
+#endif
+				) {
+				path.append(1, '/');
+			}
+
+			p2pool::DATA_DIR = std::move(path);
+
+			// Try to create it if it doesn't exist
+			if (!p2pool::DATA_DIR.empty()) {
+				std::error_code err;
+				std::filesystem::create_directories(p2pool::DATA_DIR, err);
+			}
+		}
 	}
 
+#if defined(_WIN32) && defined(_MSC_VER) && !defined(NDEBUG)
+	SymInitialize(GetCurrentProcess(), NULL, TRUE);
+#endif
+
 	memory_tracking_start();
 
+	// Create default loop here
+	uv_default_loop();
+
+	p2pool::log::start();
+
 	p2pool::init_crypto_cache();
 
 	int result = static_cast<int>(curl_global_init_mem(CURL_GLOBAL_ALL, p2pool::malloc_hook, p2pool::free_hook, p2pool::realloc_hook, p2pool::strdup_hook, p2pool::calloc_hook));
@@ -209,9 +250,21 @@ int main(int argc, char* argv[])
 
 	p2pool::destroy_crypto_cache();
 
+	p2pool::log::stop();
+
+	uv_loop_close(uv_default_loop());
+
+#if ((UV_VERSION_MAJOR > 1) || ((UV_VERSION_MAJOR == 1) && (UV_VERSION_MINOR >= 38)))
+	uv_library_shutdown();
+#endif
+
 	if (!memory_tracking_stop()) {
 		result = 1;
 	}
 
+#if defined(_WIN32) && defined(_MSC_VER) && !defined(NDEBUG)
+	SymCleanup(GetCurrentProcess());
+#endif
+
 	return result;
 }

src/memory_leak_debug.cpp

@@ -24,6 +24,8 @@
 #include <atomic>
 #include <type_traits>
 #include <iostream>
+#include <fstream>
+#include <mutex>
 
 #include <DbgHelp.h>
 
@@ -79,7 +81,7 @@ struct TrackedAllocation
 
 static_assert(sizeof(TrackedAllocation) == 256, "");
 
-uv_mutex_t allocation_lock;
+std::mutex allocation_lock;
 std::hash<void*> hasher;
 uint32_t first[N];
 uint32_t next[N];
@@ -98,7 +100,7 @@ void show_top_10_allocations()
 	const HANDLE h = GetCurrentProcess();
 
 	{
-		p2pool::MutexLock lock(allocation_lock);
+		std::lock_guard<std::mutex> lock(allocation_lock);
 
 		TrackedAllocation* end = buf;
 		for (size_t i = 0; i < N; ++i) {
@@ -173,7 +175,7 @@ FORCEINLINE static void add_alocation(void* p, size_t size)
 
 	const size_t index = hasher(p) & (N - 1);
 
-	p2pool::MutexLock lock(allocation_lock);
+	std::lock_guard<std::mutex> lock(allocation_lock);
 
 	++num_allocations;
 	if (num_allocations >= N / 2) {
@@ -204,7 +206,7 @@ FORCEINLINE static void remove_allocation(void* p)
 		return;
 	}
 
-	p2pool::MutexLock lock(allocation_lock);
+	std::lock_guard<std::mutex> lock(allocation_lock);
 
 	--num_allocations;
 
@@ -292,10 +294,14 @@ void memory_tracking_start()
 	// Trigger std::ostream initialization to avoid reporting it as leaks
 	std::cout << "Memory leak detection = " << 1 << std::endl;
 
+	// Trigger std::ofstream initialization to avoid reporting it as leaks
+	{
+		std::ofstream tmp("memory_tracking.tmp");
+	}
+
 	using namespace p2pool;
 
 	uv_replace_allocator(malloc_hook, realloc_hook, calloc_hook, free_hook);
-	uv_mutex_init_checked(&allocation_lock);
 	track_memory = true;
 }
 
@@ -304,7 +310,6 @@ bool memory_tracking_stop()
 	using namespace p2pool;
 
 	track_memory = false;
-	uv_mutex_destroy(&allocation_lock);
 
 	const HANDLE h = GetCurrentProcess();
 

src/mempool.cpp

@@ -17,7 +17,6 @@
 
 #include "common.h"
 #include "mempool.h"
-#include "util.h"
 
 LOG_CATEGORY(Mempool)
 

src/merge_mining_client_json_rpc.cpp

@@ -22,7 +22,7 @@
 #include "params.h"
 #include "json_rpc_request.h"
 #include "json_parsers.h"
-#include <rapidjson/document.h>
+#include "rapidjson_wrapper.h"
 
 LOG_CATEGORY(MergeMiningClientJSON_RPC)
 

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/merge_mining_client_tari.cpp

@@ -574,7 +574,7 @@ bool MergeMiningClientTari::TariClient::on_connect()
 	return true;
 }
 
-bool MergeMiningClientTari::TariClient::on_read(char* data, uint32_t size)
+bool MergeMiningClientTari::TariClient::on_read(const char* data, uint32_t size)
 {
 	MergeMiningClientTari::TariServer* server = static_cast<MergeMiningClientTari::TariServer*>(m_owner);
 	if (!server) {

src/merge_mining_client_tari.h

@@ -98,7 +98,7 @@ private:
 
 		void reset() override;
 		[[nodiscard]] bool on_connect() override;
-		[[nodiscard]] bool on_read(char* data, uint32_t size) override;
+		[[nodiscard]] bool on_read(const char* data, uint32_t size) override;
 
 		char m_buf[BUF_SIZE];
 		std::vector<uint8_t> m_pendingData;

src/p2p_server.cpp

@@ -27,7 +27,8 @@
 #include "json_parsers.h"
 #include "block_template.h"
 #include "p2pool_api.h"
-#include <rapidjson/document.h>
+#include "stratum_server.h"
+#include "rapidjson_wrapper.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()
@@ -435,10 +447,12 @@ void P2PServer::save_peer_list_async()
 
 void P2PServer::save_peer_list()
 {
-	std::ofstream f(saved_peer_list_file_name, std::ios::binary);
+	const std::string path = DATA_DIR + saved_peer_list_file_name;
+
+	std::ofstream f(path, std::ios::binary);
 
 	if (!f.is_open()) {
-		LOGERR(1, "failed to save peer list");
+		LOGERR(1, "failed to save peer list " << path << ": error " << errno);
 		return;
 	}
 
@@ -567,7 +581,9 @@ void P2PServer::load_peer_list()
 	}
 
 	// Finally load peers from p2pool_peers.txt
-	std::ifstream f(saved_peer_list_file_name);
+	const std::string path = DATA_DIR + saved_peer_list_file_name;
+
+	std::ifstream f(path);
 	if (f.is_open()) {
 		std::string address;
 		while (f.good()) {
@@ -805,10 +821,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();
@@ -1412,7 +1425,7 @@ void P2PServer::api_update_local_stats()
 				}
 			}
 
-			s << "],\"uptime\":" << cur_time - m_pool->start_time() << '}';
+			s << "],\"uptime\":" << cur_time - m_pool->start_time() << ",\"zmq_last_active\":" << (seconds_since_epoch() - m_pool->zmq_last_active()) << '}';
 		});
 }
 
@@ -1487,7 +1500,7 @@ bool P2PServer::P2PClient::on_connect()
 	return send_handshake_challenge();
 }
 
-bool P2PServer::P2PClient::on_read(char* data, uint32_t size)
+bool P2PServer::P2PClient::on_read(const char* data, uint32_t size)
 {
 	P2PServer* server = static_cast<P2PServer*>(m_owner);
 	if (!server) {
@@ -1931,11 +1944,9 @@ void P2PServer::P2PClient::send_handshake_solution(const uint8_t (&challenge)[CH
 	}
 }
 
-bool P2PServer::P2PClient::check_handshake_solution(const hash& solution, const uint8_t (&solution_salt)[CHALLENGE_SIZE])
+bool P2PServer::P2PClient::check_handshake_solution(const hash& solution, const uint8_t (&solution_salt)[CHALLENGE_SIZE]) const
 {
-	P2PServer* owner = static_cast<P2PServer*>(m_owner);
-
-	const std::vector<uint8_t>& consensus_id = owner->m_pool->side_chain().consensus_id();
+	const std::vector<uint8_t>& consensus_id = static_cast<const P2PServer*>(m_owner)->m_pool->side_chain().consensus_id();
 	const int consensus_id_size = static_cast<int>(consensus_id.size());
 
 	uint8_t challenge[CHALLENGE_SIZE];

src/p2p_server.h

@@ -79,7 +79,7 @@ public:
 
 		void reset() override;
 		[[nodiscard]] bool on_connect() override;
-		[[nodiscard]] bool on_read(char* data, uint32_t size) override;
+		[[nodiscard]] bool on_read(const char* data, uint32_t size) override;
 		void on_read_failed(int err) override;
 		void on_disconnected() override;
 
@@ -101,7 +101,7 @@ public:
 
 		[[nodiscard]] bool send_handshake_challenge();
 		void send_handshake_solution(const uint8_t (&challenge)[CHALLENGE_SIZE]);
-		[[nodiscard]] bool check_handshake_solution(const hash& solution, const uint8_t (&solution_salt)[CHALLENGE_SIZE]);
+		[[nodiscard]] bool check_handshake_solution(const hash& solution, const uint8_t (&solution_salt)[CHALLENGE_SIZE]) const;
 
 		[[nodiscard]] bool on_handshake_challenge(const uint8_t* buf);
 		[[nodiscard]] bool on_handshake_solution(const uint8_t* buf);
@@ -115,7 +115,7 @@ public:
 		void on_block_notify(const uint8_t* buf);
 
 		[[nodiscard]] bool handle_incoming_block_async(const PoolBlock* block, uint64_t max_time_delta = 0);
-		void handle_incoming_block(p2pool* pool, PoolBlock& block, std::vector<hash>& missing_blocks, bool& result);
+		static void handle_incoming_block(p2pool* pool, PoolBlock& block, std::vector<hash>& missing_blocks, bool& result);
 		void post_handle_incoming_block(p2pool* pool, const PoolBlock& block, const uint32_t reset_counter, bool is_v6, const raw_ip& addr, std::vector<hash>& missing_blocks, const bool result);
 
 		[[nodiscard]] bool is_good() const { return m_handshakeComplete && !m_handshakeInvalid && (m_listenPort >= 0); }
@@ -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

@@ -20,7 +20,7 @@
 #include "zmq_reader.h"
 #include "mempool.h"
 #include "json_rpc_request.h"
-#include "rapidjson/document.h"
+#include "rapidjson_wrapper.h"
 #include "json_parsers.h"
 #include "pow_hash.h"
 #include "block_template.h"
@@ -73,6 +73,8 @@ p2pool::p2pool(int argc, char* argv[])
 
 	m_params = p;
 
+	bkg_jobs_tracker = new BackgroundJobTracker();
+
 #ifdef WITH_UPNP
 	if (p->m_upnp) {
 		init_upnp();
@@ -184,6 +186,8 @@ p2pool::p2pool(int argc, char* argv[])
 	m_hasher = new RandomX_Hasher_RPC(this);
 #endif
 
+	PoolBlock::s_precalculatedSharesLock = new ReadWriteLock();
+
 	m_blockTemplate = new BlockTemplate(m_sideChain, m_hasher);
 	m_mempool = new Mempool();
 
@@ -232,6 +236,17 @@ p2pool::~p2pool()
 	delete m_blockTemplate;
 	delete m_mempool;
 	delete m_params;
+
+	{
+		auto p = bkg_jobs_tracker;
+		bkg_jobs_tracker = nullptr;
+		delete p;
+	}
+	{
+		auto p = PoolBlock::s_precalculatedSharesLock;
+		PoolBlock::s_precalculatedSharesLock = nullptr;
+		delete p;
+	}
 }
 
 void p2pool::update_host_ping(const std::string& display_name, double ping)
@@ -421,19 +436,36 @@ void p2pool::handle_miner_data(MinerData& data)
 
 	if (m_serversStarted.load()) {
 		std::vector<uint64_t> missing_heights;
+
+		auto check_height = [this, &missing_heights](uint64_t h) {
+			auto it = m_mainchainByHeight.find(h);
+			if ((it == m_mainchainByHeight.end()) || it->second.difficulty.empty()) {
+				missing_heights.push_back(h);
+			}
+		};
+
 		{
-			WriteLock lock(m_mainchainLock);
+			ReadLock lock(m_mainchainLock);
 
 			for (uint64_t h = data.height; h && (h + BLOCK_HEADERS_REQUIRED > data.height); --h) {
-				auto it = m_mainchainByHeight.find(h);
-				if ((it == m_mainchainByHeight.end()) || it->second.difficulty.empty()) {
-					LOGWARN(3, "Mainchain data for height " << h << " is missing, requesting it from monerod again");
-					missing_heights.push_back(h);
-				}
+				check_height(h);
 			}
+
+			const uint64_t seed_height = get_seed_height(data.height);
+			const uint64_t prev_seed_height = (seed_height > SEEDHASH_EPOCH_BLOCKS) ? (seed_height - SEEDHASH_EPOCH_BLOCKS) : 0;
+
+			check_height(seed_height);
+			check_height(prev_seed_height);
+		}
+
+		if (missing_heights.size() > 1) {
+			std::sort(missing_heights.begin(), missing_heights.end(), std::greater<uint64_t>());
+			missing_heights.erase(std::unique(missing_heights.begin(), missing_heights.end()), missing_heights.end());
 		}
 
 		for (uint64_t h : missing_heights) {
+			LOGWARN(3, "Mainchain data for height " << h << " is missing, requesting it from monerod again");
+
 			char buf[log::Stream::BUF_SIZE + 1] = {};
 			log::Stream s(buf);
 			s << "{\"jsonrpc\":\"2.0\",\"id\":\"0\",\"method\":\"get_block_header_by_height\",\"params\":{\"height\":" << h << "}}\0";
@@ -550,12 +582,12 @@ void p2pool::update_aux_data(const hash& chain_id)
 
 			aux_id.reserve(m_mergeMiningClients.size() + 1);
 
-			IMergeMiningClient::ChainParameters params;
+			IMergeMiningClient::ChainParameters chain_params;
 
 			for (const IMergeMiningClient* c : m_mergeMiningClients) {
-				if (c->get_params(params)) {
-					data.aux_chains.emplace_back(params.aux_id, params.aux_hash, params.aux_diff);
-					aux_id.emplace_back(params.aux_id);
+				if (c->get_params(chain_params)) {
+					data.aux_chains.emplace_back(chain_params.aux_id, chain_params.aux_hash, chain_params.aux_diff);
+					aux_id.emplace_back(chain_params.aux_id);
 				}
 			}
 			aux_id.emplace_back(m_sideChain->consensus_hash());
@@ -769,9 +801,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 +1028,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);
@@ -1158,7 +1188,7 @@ void p2pool::load_found_blocks()
 		return;
 	}
 
-	std::ifstream f(FOUND_BLOCKS_FILE);
+	std::ifstream f(DATA_DIR + FOUND_BLOCKS_FILE);
 	if (!f.is_open()) {
 		return;
 	}
@@ -1691,12 +1721,16 @@ void p2pool::api_update_block_found(const ChainMain* data, const PoolBlock* bloc
 	difficulty_type diff;
 
 	if (data && get_difficulty_at_height(data->height, diff)) {
-		std::ofstream f(FOUND_BLOCKS_FILE, std::ios::app);
+		const std::string path = DATA_DIR + FOUND_BLOCKS_FILE;
+		std::ofstream f(path, std::ios::app);
 		if (f.is_open()) {
 			f << cur_time << ' ' << data->height << ' ' << data->id << ' ' << diff << ' ' << total_hashes << '\n';
 			f.flush();
 			f.close();
 		}
+		else {
+			LOGERR(1, "Failed to update " << path << ": error " << errno);
+		}
 	}
 
 	std::vector<FoundBlock> found_blocks;
@@ -1937,7 +1971,7 @@ int p2pool::run()
 
 	m_stopped = true;
 
-	bkg_jobs_tracker.wait();
+	bkg_jobs_tracker->wait();
 
 #ifdef WITH_RANDOMX
 	delete m_miner;

src/params.cpp

@@ -95,8 +95,20 @@ Params::Params(int argc, char* const argv[])
 			ok = true;
 		}
 
+		if ((strcmp(argv[i], "--data-dir") == 0) && (i + 1 < argc)) {
+			// Processed in main.cpp
+			++i;
+			ok = true;
+		}
+
 		if ((strcmp(argv[i], "--config") == 0) && (i + 1 < argc)) {
-			m_config = argv[++i];
+			LOGWARN(0, "--config command line parameter is deprecated and will be removed in the next version. Use --sidechain-config instead");
+			m_sidechainConfig = argv[++i];
+			ok = true;
+		}
+
+		if ((strcmp(argv[i], "--sidechain-config") == 0) && (i + 1 < argc)) {
+			m_sidechainConfig = argv[++i];
 			ok = true;
 		}
 
@@ -207,6 +219,11 @@ Params::Params(int argc, char* const argv[])
 		}
 #endif
 
+		if (strcmp(argv[i], "--no-stratum-http") == 0) {
+			m_enableStratumHTTP = false;
+			ok = true;
+		}
+
 		if (!ok) {
 			fprintf(stderr, "Unknown command line parameter %s\n\n", argv[i]);
 			p2pool_usage();

src/params.h

@@ -68,7 +68,7 @@ struct Params
 	std::string m_stratumAddresses;
 	std::string m_p2pAddresses;
 	std::string m_p2pPeerList;
-	std::string m_config;
+	std::string m_sidechainConfig;
 	std::string m_apiPath;
 	bool m_localStats = false;
 	bool m_blockCache = true;
@@ -96,6 +96,7 @@ struct Params
 	std::string m_tlsCert;
 	std::string m_tlsCertKey;
 #endif
+	bool m_enableStratumHTTP = true;
 };
 
 } // namespace p2pool

src/pool_block.cpp

@@ -29,6 +29,8 @@ LOG_CATEGORY(PoolBlock)
 
 namespace p2pool {
 
+ReadWriteLock* PoolBlock::s_precalculatedSharesLock = nullptr;
+
 PoolBlock::PoolBlock()
 	: m_majorVersion(0)
 	, m_minorVersion(0)
@@ -115,6 +117,10 @@ PoolBlock& PoolBlock::operator=(const PoolBlock& b)
 	m_broadcasted = b.m_broadcasted;
 	m_wantBroadcast = b.m_wantBroadcast;
 	m_precalculated = b.m_precalculated;
+	{
+		WriteLock lock(*s_precalculatedSharesLock);
+		m_precalculatedShares = b.m_precalculatedShares;
+	}
 
 	m_localTimestamp = seconds_since_epoch();
 	m_receivedTimestamp = b.m_receivedTimestamp;
@@ -204,17 +210,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 +266,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);
@@ -311,6 +308,11 @@ void PoolBlock::reset_offchain_data()
 	m_wantBroadcast = false;
 
 	m_precalculated = false;
+	{
+		WriteLock lock(*s_precalculatedSharesLock);
+		m_precalculatedShares.clear();
+		m_precalculatedShares.shrink_to_fit();
+	}
 
 	m_localTimestamp = seconds_since_epoch();
 	m_receivedTimestamp = 0;
@@ -422,20 +424,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
@@ -32,6 +32,7 @@ static FORCEINLINE constexpr int pool_block_debug() { return POOL_BLOCK_DEBUG; }
 
 class RandomX_Hasher_Base;
 class SideChain;
+struct MinerShare;
 
 /*
 * --------------------------------------------------
@@ -63,12 +64,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) {}
@@ -167,6 +162,9 @@ struct PoolBlock
 
 	bool m_precalculated;
 
+	static ReadWriteLock* s_precalculatedSharesLock;
+	std::vector<MinerShare> m_precalculatedShares;
+
 	uint64_t m_localTimestamp;
 	uint64_t m_receivedTimestamp;
 
@@ -217,8 +215,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.cpp

@@ -26,7 +26,7 @@
 #endif
 #include "json_rpc_request.h"
 #include "json_parsers.h"
-#include <rapidjson/document.h>
+#include "rapidjson_wrapper.h"
 #include <thread>
 
 LOG_CATEGORY(RandomX_Hasher)

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/rapidjson_wrapper.h

@@ -0,0 +1,5 @@
+#if defined(_MSC_VER) && defined(__cppcheck__)
+// cppcheck chokes on rapidjson headers in Windows
+#else
+#include <rapidjson/document.h>
+#endif

src/side_chain.cpp

@@ -34,8 +34,12 @@
 #include "json_parsers.h"
 #include "crypto.h"
 #include "hardforks/hardforks.h"
+
+#if !defined(_MSC_VER) || !defined(__cppcheck__)
 #include <rapidjson/document.h>
 #include <rapidjson/istreamwrapper.h>
+#endif
+
 #include <fstream>
 #include <iterator>
 #include <numeric>
@@ -80,7 +84,7 @@ SideChain::SideChain(p2pool* pool, NetworkType type, const char* pool_name)
 
 	LOGINFO(1, log::LightCyan() << "network type  = " << type);
 
-	if (m_pool && !load_config(m_pool->params().m_config)) {
+	if (m_pool && !load_config(m_pool->params().m_sidechainConfig)) {
 		PANIC_STOP();
 	}
 
@@ -94,6 +98,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 +218,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;
@@ -505,7 +511,6 @@ void SideChain::cleanup_incoming_blocks()
 	MutexLock lock(m_incomingBlocksLock);
 
 	// Forget seen blocks that were added more than 10 minutes ago
-	hash h;
 	for (auto i = m_incomingBlocks.begin(); i != m_incomingBlocks.end();) {
 		if (cur_time < i->second + 10 * 60) {
 			++i;
@@ -629,7 +634,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 +645,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 +762,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;
 }
@@ -1670,7 +1680,13 @@ void SideChain::verify(PoolBlock* block)
 	}
 
 	std::vector<MinerShare> shares;
-	if (!get_shares(block, shares)) {
+
+	if (block->m_precalculated) {
+		WriteLock lock(*PoolBlock::s_precalculatedSharesLock);
+		shares = std::move(block->m_precalculatedShares);
+	}
+
+	if (shares.empty() && !get_shares(block, shares)) {
 		block->m_invalid = true;
 		return;
 	}
@@ -2338,10 +2354,13 @@ void SideChain::launch_precalc(const PoolBlock* block)
 			std::vector<MinerShare> shares;
 			if (get_shares(b, shares, nullptr, true)) {
 				b->m_precalculated = true;
-				PrecalcJob* job = new PrecalcJob{ b, std::move(shares) };
+				{
+					WriteLock lock(*PoolBlock::s_precalculatedSharesLock);
+					b->m_precalculatedShares = std::move(shares);
+				}
 				{
 					MutexLock lock2(m_precalcJobsMutex);
-					m_precalcJobs.push_back(job);
+					m_precalcJobs.push_back(b);
 					uv_cond_signal(&m_precalcJobsCond);
 				}
 			}
@@ -2351,9 +2370,12 @@ void SideChain::launch_precalc(const PoolBlock* block)
 
 void SideChain::precalc_worker()
 {
+	std::vector<std::pair<size_t, const Wallet*>> wallets;
+	wallets.reserve(m_chainWindowSize);
+
 	do {
-		PrecalcJob* job;
-		size_t num_inputs;
+		const PoolBlock* job;
+		
 		{
 			MutexLock lock(m_precalcJobsMutex);
 
@@ -2374,32 +2396,28 @@ void SideChain::precalc_worker()
 
 			// Filter out duplicate inputs for get_eph_public_key()
 			uint8_t t[HASH_SIZE * 2 + sizeof(size_t)];
-			memcpy(t, job->b->m_txkeySec.h, HASH_SIZE);
+			memcpy(t, job->m_txkeySec.h, HASH_SIZE);
 
-			const size_t n = job->shares.size();
-			num_inputs = n;
+			wallets.clear();
+
+			ReadLock lock2(*PoolBlock::s_precalculatedSharesLock);
+
+			const size_t n = job->m_precalculatedShares.size();
 
 			for (size_t i = 0; i < n; ++i) {
-				memcpy(t + HASH_SIZE, job->shares[i].m_wallet->view_public_key().h, HASH_SIZE);
+				memcpy(t + HASH_SIZE, job->m_precalculatedShares[i].m_wallet->view_public_key().h, HASH_SIZE);
 				memcpy(t + HASH_SIZE * 2, &i, sizeof(i));
-				if (!m_uniquePrecalcInputs->insert(robin_hood::hash_bytes(t, array_size(t))).second) {
-					job->shares[i].m_wallet = nullptr;
-					--num_inputs;
+				if (m_uniquePrecalcInputs->insert(robin_hood::hash_bytes(t, array_size(t))).second) {
+					wallets.emplace_back(i, job->m_precalculatedShares[i].m_wallet);
 				}
 			}
 		}
 
-		if (num_inputs) {
-			for (size_t i = 0, n = job->shares.size(); i < n; ++i) {
-				if (job->shares[i].m_wallet) {
-					hash eph_public_key;
-					uint8_t view_tag;
-					job->shares[i].m_wallet->get_eph_public_key(job->b->m_txkeySec, i, eph_public_key, view_tag);
-				}
-			}
+		for (const std::pair<size_t, const Wallet*>& w : wallets) {
+			hash eph_public_key;
+			uint8_t view_tag;
+			w.second->get_eph_public_key(job->m_txkeySec, w.first, eph_public_key, view_tag);
 		}
-
-		delete job;
 	} while (true);
 }
 
@@ -2413,9 +2431,6 @@ void SideChain::finish_precalc()
 	{
 		{
 			MutexLock lock(m_precalcJobsMutex);
-			for (PrecalcJob* job : m_precalcJobs) {
-				delete job;
-			}
 			m_precalcJobs.clear();
 			m_precalcJobs.shrink_to_fit();
 			uv_cond_broadcast(&m_precalcJobsCond);

src/side_chain.h

@@ -143,19 +143,14 @@ private:
 	mutable uv_rwlock_t m_curDifficultyLock;
 	difficulty_type m_curDifficulty;
 
+	uv_rwlock_t m_watchBlockLock;
 	ChainMain m_watchBlock;
 	hash m_watchBlockMerkleRoot;
 
-	struct PrecalcJob
-	{
-		const PoolBlock* b;
-		std::vector<MinerShare> shares;
-	};
-
 	uv_cond_t m_precalcJobsCond;
 	uv_mutex_t m_precalcJobsMutex;
 
-	std::vector<PrecalcJob*> m_precalcJobs;
+	std::vector<const PoolBlock*> m_precalcJobs;
 	std::vector<std::thread> m_precalcWorkers;
 	unordered_set<size_t>* m_uniquePrecalcInputs;
 

src/stratum_server.cpp

@@ -22,6 +22,9 @@
 #include "side_chain.h"
 #include "params.h"
 #include "p2pool_api.h"
+#include "p2p_server.h"
+
+#include "rapidjson_wrapper.h"
 
 LOG_CATEGORY(StratumServer)
 
@@ -53,11 +56,13 @@ StratumServer::StratumServer(p2pool* pool)
 	, m_hashrateDataTail_1h(0)
 	, m_hashrateDataTail_24h(0)
 	, m_cumulativeFoundSharesDiff(0.0)
-	, m_totalFoundShares(0)
-	, m_totalFailedShares(0)
+	, m_totalFoundSidechainShares(0)
+	, m_totalFailedSidechainShares(0)
+	, m_totalStratumShares(0)
 	, m_apiLastUpdateTime(0)
 {
-	m_callbackBuf.resize(STRATUM_BUF_SIZE);
+	// Need a bigger buffer for the TLS handshake
+	m_callbackBuf.resize(STRATUM_CALLBACK_BUF_SIZE);
 
 	// Diffuse the initial state in case it has low quality
 	m_rng.discard(10000);
@@ -71,13 +76,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 +103,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 +243,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 +432,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;
@@ -560,13 +576,13 @@ void StratumServer::show_workers()
 		}
 
 #ifdef WITH_TLS
-		const bool is_tls = c->m_tls.is_empty();
+		const bool is_tls = !c->m_tls.is_empty();
 #else
 		constexpr bool is_tls = false;
 #endif
 
 		LOGINFO(0, log::pad_right(static_cast<const char*>(c->m_addrString), addr_len + 8)
-				<< (is_tls ? "no     " : "yes    ")
+				<< (is_tls ? "yes    " : "no     ")
 				<< log::pad_right(log::Duration(cur_time - c->m_connectedTime), 20)
 				<< log::pad_right(diff, 20)
 				<< log::pad_right(log::Hashrate(c->m_autoDiff.lo / AUTO_DIFF_TARGET_TIME, m_autoDiff && (c->m_autoDiff != 0)), 15)
@@ -583,8 +599,13 @@ void StratumServer::reset_share_counters()
 	WriteLock lock(m_hashrateDataLock);
 
 	m_cumulativeHashesAtLastShare = m_cumulativeHashes;
-	m_totalFoundShares = 0;
-	m_totalFailedShares = 0;
+	m_totalFoundSidechainShares = 0;
+	m_totalFailedSidechainShares = 0;
+}
+
+bool StratumServer::http_enabled() const
+{
+	return m_pool->params().m_enableStratumHTTP;
 }
 
 const char* StratumServer::get_log_category() const
@@ -599,7 +620,8 @@ void StratumServer::print_stratum_status() const
 
 	uint64_t hashes_since_last_share;
 	double average_effort;
-	uint32_t shares_found, shares_failed;
+	uint32_t sidechain_shares_found, sidechain_shares_failed;
+	uint64_t total_stratum_shares;
 
 	{
 		ReadLock lock(m_hashrateDataLock);
@@ -628,8 +650,9 @@ void StratumServer::print_stratum_status() const
 			average_effort = static_cast<double>(m_cumulativeHashesAtLastShare) * 100.0 / diff;
 		}
 
-		shares_found = m_totalFoundShares;
-		shares_failed = m_totalFailedShares;
+		sidechain_shares_found = m_totalFoundSidechainShares;
+		sidechain_shares_failed = m_totalFailedSidechainShares;
+		total_stratum_shares = m_totalStratumShares;
 	}
 
 	const uint64_t hashrate_15m = (dt_15m > 0) ? (hashes_15m / dt_15m) : 0;
@@ -637,20 +660,21 @@ void StratumServer::print_stratum_status() const
 	const uint64_t hashrate_24h = (dt_24h > 0) ? (hashes_24h / dt_24h) : 0;
 
 	char shares_failed_buf[64] = {};
-	if (shares_failed) {
+	if (sidechain_shares_failed) {
 		log::Stream s(shares_failed_buf);
-		s << log::Yellow() << "\nShares failed      = " << shares_failed << log::NoColor();
+		s << log::Yellow() << "\nP2Pool shares failed = " << sidechain_shares_failed << log::NoColor();
 	}
 
 	LOGINFO(0, "status" <<
-		"\nHashrate (15m est) = " << log::Hashrate(hashrate_15m) <<
-		"\nHashrate (1h  est) = " << log::Hashrate(hashrate_1h) <<
-		"\nHashrate (24h est) = " << log::Hashrate(hashrate_24h) <<
-		"\nTotal hashes       = " << total_hashes <<
-		"\nShares found       = " << shares_found << static_cast<const char*>(shares_failed_buf) <<
-		"\nAverage effort     = " << average_effort << '%' <<
-		"\nCurrent effort     = " << static_cast<double>(hashes_since_last_share) * 100.0 / m_pool->side_chain().difficulty().to_double() << '%' <<
-		"\nConnections        = " << m_numConnections.load() << " (" << m_numIncomingConnections.load() << " incoming)"
+		"\nHashrate (15m est)   = " << log::Hashrate(hashrate_15m) <<
+		"\nHashrate (1h  est)   = " << log::Hashrate(hashrate_1h) <<
+		"\nHashrate (24h est)   = " << log::Hashrate(hashrate_24h) <<
+		"\nStratum hashes       = " << total_hashes <<
+		"\nStratum shares       = " << total_stratum_shares <<
+		"\nP2Pool shares found  = " << sidechain_shares_found << static_cast<const char*>(shares_failed_buf) <<
+		"\nAverage effort       = " << average_effort << '%' <<
+		"\nCurrent effort       = " << static_cast<double>(hashes_since_last_share) * 100.0 / m_pool->side_chain().difficulty().to_double() << '%' <<
+		"\nConnections          = " << m_numConnections.load() << " (" << m_numIncomingConnections.load() << " incoming)"
 	);
 }
 
@@ -864,7 +888,10 @@ void StratumServer::update_hashrate_data(uint64_t hashes, uint64_t timestamp)
 
 	WriteLock lock(m_hashrateDataLock);
 
-	m_cumulativeHashes += hashes;
+	if (hashes) {
+		m_cumulativeHashes += hashes;
+		++m_totalStratumShares;
+	}
 
 	HashrateData* data = m_hashrateData;
 	HashrateData& head = data[m_hashrateDataHead];
@@ -966,15 +993,15 @@ void StratumServer::on_share_found(uv_work_t* req)
 			server->m_cumulativeHashesAtLastShare = n;
 
 			server->m_cumulativeFoundSharesDiff += diff;
-			++server->m_totalFoundShares;
+			++server->m_totalFoundSidechainShares;
 		}
 
 		if (!pool->submit_sidechain_block(share->m_templateId, share->m_nonce, share->m_extraNonce)) {
 			WriteLock lock(server->m_hashrateDataLock);
 
-			if (server->m_totalFoundShares > 0) {
-				--server->m_totalFoundShares;
-				++server->m_totalFailedShares;
+			if (server->m_totalFoundSidechainShares > 0) {
+				--server->m_totalFoundSidechainShares;
+				++server->m_totalFailedSidechainShares;
 			}
 		}
 	}
@@ -998,6 +1025,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 +1051,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 +1096,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()
@@ -1104,6 +1150,7 @@ StratumServer::StratumClient::StratumClient()
 	, m_lastJobTarget(0)
 	, m_score(0)
 {
+	m_rawReadBuf[0] = '\0';
 	m_stratumReadBuf[0] = '\0';
 }
 
@@ -1139,7 +1186,7 @@ bool StratumServer::StratumClient::on_connect()
 	return true;
 }
 
-bool StratumServer::StratumClient::on_read(char* data, uint32_t size)
+bool StratumServer::StratumClient::on_read(const char* data, uint32_t size)
 {
 #ifdef WITH_TLS
 	if (!m_tlsChecked) {
@@ -1154,7 +1201,7 @@ bool StratumServer::StratumClient::on_read(char* data, uint32_t size)
 	}
 #endif
 
-	auto on_parse = [this](char* data, uint32_t size) {
+	auto on_parse = [this](const char* data, uint32_t size) {
 		if (static_cast<size_t>(m_stratumReadBufBytes) + size > STRATUM_BUF_SIZE) {
 			LOGWARN(4, "client " << static_cast<const char*>(m_addrString) << " sent too long Stratum message");
 			ban(DEFAULT_BAN_TIME);
@@ -1165,10 +1212,11 @@ bool StratumServer::StratumClient::on_read(char* data, uint32_t size)
 		m_stratumReadBufBytes += size;
 
 		char* line_start = m_stratumReadBuf;
-		for (char *e = line_start + m_stratumReadBufBytes, *c = e - size; c < e; ++c) {
+		const char* e = line_start + m_stratumReadBufBytes;
+		for (char *c = line_start + m_stratumReadBufBytes - size; c < e; ++c) {
 			if (*c == '\n') {
 				// Check if the line starts with "GET " or "HEAD" (an HTTP request)
-				if (c - line_start >= 4) {
+				if (static_cast<StratumServer*>(m_owner)->http_enabled() && (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);
@@ -1277,7 +1325,8 @@ bool StratumServer::StratumClient::process_request(char* data, uint32_t size)
 	return false;
 }
 
-bool StratumServer::StratumClient::process_login(rapidjson::Document& doc, uint32_t id)
+template<typename T>
+bool StratumServer::StratumClient::process_login(T& doc, uint32_t id)
 {
 	const auto params_it = doc.FindMember("params");
 	if (params_it == doc.MemberEnd()) {
@@ -1306,7 +1355,8 @@ bool StratumServer::StratumClient::process_login(rapidjson::Document& doc, uint3
 	return static_cast<StratumServer*>(m_owner)->on_login(this, id, login.GetString());
 }
 
-bool StratumServer::StratumClient::process_submit(rapidjson::Document& doc, uint32_t id)
+template<typename T>
+bool StratumServer::StratumClient::process_submit(T& doc, uint32_t id)
 {
 	const auto params_it = doc.FindMember("params");
 	if (params_it == doc.MemberEnd()) {
@@ -1424,6 +1474,7 @@ void StratumServer::api_update_local_stats(uint64_t timestamp)
 	uint64_t hashes_since_last_share;
 	double average_effort;
 	uint32_t shares_found, shares_failed;
+	uint64_t total_stratum_shares;
 
 	{
 		ReadLock lock(m_hashrateDataLock);
@@ -1452,8 +1503,9 @@ void StratumServer::api_update_local_stats(uint64_t timestamp)
 			average_effort = static_cast<double>(m_cumulativeHashesAtLastShare) * 100.0 / diff;
 		}
 
-		shares_found = m_totalFoundShares;
-		shares_failed = m_totalFailedShares;
+		shares_found = m_totalFoundSidechainShares;
+		shares_failed = m_totalFailedSidechainShares;
+		total_stratum_shares = m_totalStratumShares;
 	}
 
 	const uint64_t hashrate_15m = (dt_15m > 0) ? (hashes_15m / dt_15m) : 0;
@@ -1473,6 +1525,7 @@ void StratumServer::api_update_local_stats(uint64_t timestamp)
 				<< ",\"hashrate_1h\":" << hashrate_1h
 				<< ",\"hashrate_24h\":" << hashrate_24h
 				<< ",\"total_hashes\":" << total_hashes
+				<< ",\"total_stratum_shares\":" << total_stratum_shares
 				<< ",\"shares_found\":" << shares_found
 				<< ",\"shares_failed\":" << shares_failed
 				<< ",\"average_effort\":" << average_effort

src/stratum_server.h

@@ -18,7 +18,6 @@
 #pragma once
 
 #include "tcp_server.h"
-#include <rapidjson/document.h>
 
 namespace p2pool {
 
@@ -26,6 +25,7 @@ class p2pool;
 class BlockTemplate;
 
 static constexpr size_t STRATUM_BUF_SIZE = log::Stream::BUF_SIZE + 1;
+static constexpr size_t STRATUM_CALLBACK_BUF_SIZE = 16384;
 static constexpr int DEFAULT_STRATUM_PORT = 3333;
 
 class StratumServer : public TCPServer
@@ -46,11 +46,11 @@ public:
 
 		void reset() override;
 		[[nodiscard]] bool on_connect() override;
-		[[nodiscard]] bool on_read(char* data, uint32_t size) override;
+		[[nodiscard]] bool on_read(const char* data, uint32_t size) override;
 
 		[[nodiscard]] bool process_request(char* data, uint32_t size);
-		[[nodiscard]] bool process_login(rapidjson::Document& doc, uint32_t id);
-		[[nodiscard]] bool process_submit(rapidjson::Document& doc, uint32_t id);
+		template<typename T> [[nodiscard]] bool process_login(T& doc, uint32_t id);
+		template<typename T> [[nodiscard]] bool process_submit(T& doc, uint32_t id);
 
 		bool send_http_response(bool send_content);
 
@@ -102,6 +102,8 @@ public:
 
 	void reset_share_counters();
 
+	bool http_enabled() const;
+
 private:
 	[[nodiscard]] const char* get_log_category() const override;
 
@@ -147,6 +149,8 @@ private:
 	struct SubmittedShare
 	{
 		uv_work_t m_req;
+		bool m_allocated;
+
 		StratumServer* m_server;
 		StratumClient* m_client;
 		bool m_clientIPv6;
@@ -180,8 +184,6 @@ private:
 		} m_result;
 	};
 
-	std::vector<SubmittedShare*> m_submittedSharesPool;
-
 	struct HashrateData
 	{
 		uint64_t m_timestamp;
@@ -199,11 +201,14 @@ private:
 	uint64_t m_hashrateDataTail_24h;
 
 	double m_cumulativeFoundSharesDiff;
-	uint32_t m_totalFoundShares;
-	uint32_t m_totalFailedShares;
+	uint32_t m_totalFoundSidechainShares;
+	uint32_t m_totalFailedSidechainShares;
+	uint64_t m_totalStratumShares;
 
 	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);
@@ -1107,7 +1107,7 @@ void TCPServer::Client::on_read(uv_stream_t* stream, ssize_t nread, const uv_buf
 	}
 }
 
-bool TCPServer::Client::on_proxy_handshake(char* data, uint32_t size)
+bool TCPServer::Client::on_proxy_handshake(const char* data, uint32_t size)
 {
 	if ((data != m_readBuf + m_numRead) || (data + size > m_readBuf + m_readBufSize)) {
 		LOGERR(1, "peer " << static_cast<char*>(m_addrString) << " invalid data pointer or size in on_read()");

src/tcp_server.h

@@ -63,8 +63,8 @@ public:
 
 		virtual void reset();
 		[[nodiscard]] virtual bool on_connect() = 0;
-		[[nodiscard]] virtual bool on_read(char* data, uint32_t size) = 0;
-		[[nodiscard]] bool on_proxy_handshake(char* data, uint32_t size);
+		[[nodiscard]] virtual bool on_read(const char* data, uint32_t size) = 0;
+		[[nodiscard]] bool on_proxy_handshake(const char* data, uint32_t size);
 		virtual void on_read_failed(int /*err*/) {}
 		virtual void on_disconnected() {}
 

src/tls.cpp

@@ -217,7 +217,7 @@ bool ServerTls::init()
 	return true;
 }
 
-bool ServerTls::on_read_internal(char* data, uint32_t size, ReadCallback::Base&& read_callback, WriteCallback::Base&& write_callback)
+bool ServerTls::on_read_internal(const char* data, uint32_t size, ReadCallback::Base&& read_callback, WriteCallback::Base&& write_callback)
 {
 	SSL* ssl = m_ssl.get();
 	if (!ssl) {

src/tls.h

@@ -43,7 +43,7 @@ public:
 	[[nodiscard]] bool init();
 
 	template<typename T, typename U>
-	[[nodiscard]] FORCEINLINE bool on_read(char* data, uint32_t size, T&& read_callback, U&& write_callback)
+	[[nodiscard]] FORCEINLINE bool on_read(const char* data, uint32_t size, T&& read_callback, U&& write_callback)
 	{
 		return on_read_internal(data, size, ReadCallback::Derived<T>(std::move(read_callback)), WriteCallback::Derived<U>(std::move(write_callback)));
 	}
@@ -60,7 +60,7 @@ private:
 	typedef Callback<bool, char*, uint32_t> ReadCallback;
 	typedef Callback<bool, const uint8_t*, size_t> WriteCallback;
 
-	[[nodiscard]] bool on_read_internal(char* data, uint32_t size, ReadCallback::Base&& read_callback, WriteCallback::Base&& write_callback);
+	[[nodiscard]] bool on_read_internal(const char* data, uint32_t size, ReadCallback::Base&& read_callback, WriteCallback::Base&& write_callback);
 	[[nodiscard]] bool on_write_internal(const uint8_t* data, size_t size, WriteCallback::Base&& write_callback);
 
 private:

src/util.cpp

@@ -60,6 +60,8 @@ const char* VERSION = "v" STR2(P2POOL_VERSION_MAJOR) "." STR2(P2POOL_VERSION_MIN
 #endif
 " on " __DATE__ ")";
 
+std::string DATA_DIR;
+
 SoftwareID get_software_id(uint32_t value)
 {
 	switch (value) {
@@ -83,6 +85,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();
@@ -447,7 +454,7 @@ void BackgroundJobTracker::print_status()
 	m_impl->print_status();
 }
 
-BackgroundJobTracker bkg_jobs_tracker;
+BackgroundJobTracker* bkg_jobs_tracker = nullptr;
 
 static thread_local bool main_thread = false;
 void set_main_thread() { main_thread = true; }
@@ -667,14 +674,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,13 +35,15 @@
 namespace p2pool {
 
 #define P2POOL_VERSION_MAJOR 4
-#define P2POOL_VERSION_MINOR 1
-#define P2POOL_VERSION_PATCH 1
+#define P2POOL_VERSION_MINOR 3
+#define P2POOL_VERSION_PATCH 0
 
 constexpr uint32_t P2POOL_VERSION = (P2POOL_VERSION_MAJOR << 16) | (P2POOL_VERSION_MINOR << 8) | P2POOL_VERSION_PATCH;
 
 extern const char* VERSION;
 
+extern std::string DATA_DIR;
+
 enum class SoftwareID : uint32_t {
 	P2Pool = 0,
 	GoObserver = 0x624F6F47UL,
@@ -233,10 +235,10 @@ private:
 	Impl* m_impl;
 };
 
-extern BackgroundJobTracker bkg_jobs_tracker;
+extern BackgroundJobTracker* bkg_jobs_tracker;
 
-#define BACKGROUND_JOB_START(x) do { bkg_jobs_tracker.start(#x); } while (0)
-#define BACKGROUND_JOB_STOP(x)  do { bkg_jobs_tracker.stop(#x);  } while (0)
+#define BACKGROUND_JOB_START(x) do { bkg_jobs_tracker->start(#x); } while (0)
+#define BACKGROUND_JOB_STOP(x)  do { bkg_jobs_tracker->stop(#x);  } while (0)
 
 void set_main_thread();
 bool is_main_thread();

src/uv_util.h

@@ -25,6 +25,16 @@ static_assert(sizeof(in_addr) == 4, "struct in_addr has invalid size");
 
 namespace p2pool {
 
+struct ReadWriteLock : public nocopy_nomove {
+	FORCEINLINE  ReadWriteLock() { uv_rwlock_init(&m_lock);    }
+	FORCEINLINE ~ReadWriteLock() { uv_rwlock_destroy(&m_lock); }
+
+	FORCEINLINE operator uv_rwlock_t&() { return m_lock; }
+
+private:
+	uv_rwlock_t m_lock;
+};
+
 struct MutexLock : public nocopy_nomove
 {
 	explicit FORCEINLINE MutexLock(uv_mutex_t& handle) : m_handle(&handle) { uv_mutex_lock(&handle); }
@@ -94,7 +104,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 +132,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)

src/zmq_reader.cpp

@@ -18,7 +18,7 @@
 #include "common.h"
 #include "zmq_reader.h"
 #include "json_parsers.h"
-#include <rapidjson/document.h>
+#include "rapidjson_wrapper.h"
 
 LOG_CATEGORY(ZMQReader)
 

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

@@ -293,6 +293,9 @@ allowedAPIs = {
 	"GetFileAttributesA",
 	"OpenThreadToken",
 	"GetOverlappedResult",
+	"CryptGenRandom",
+	"HeapQueryInformation",
+	"AreFileApisANSI",
 }
 
 f = open(sys.argv[1], 'r')

tests/src/main.cpp

@@ -15,14 +15,26 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "common.h"
+#include "util.h"
+#include "pool_block.h"
+
 #include "gtest/gtest.h"
 
 void p2pool_usage() {}
-namespace p2pool { void set_main_thread(); }
+
+using namespace p2pool;
 
 int main(int argc, char** argv)
 {
-	p2pool::set_main_thread();
+	set_main_thread();
+
+	PoolBlock::s_precalculatedSharesLock = new ReadWriteLock();
+
 	testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
+	const int result = RUN_ALL_TESTS();
+
+	delete PoolBlock::s_precalculatedSharesLock;
+
+	return result;
 }

tests/src/merkle_tests.cpp

@@ -19,6 +19,7 @@
 #include "keccak.h"
 #include "merkle.h"
 #include "pool_block.h"
+#include "side_chain.h"
 #include "keccak.h"
 #include "gtest/gtest.h"
 

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);