p2pool v4.9

Hash rate values in `local/stratum` API file stuck after all workers disconnected

.github/workflows/c-cpp.yml

@@ -2,6 +2,7 @@ name: C/C++ CI
 
 on:
   push:
+    branches: ["master"]
     paths-ignore:
       - 'docker-compose/**'
       - 'docs/**'
@@ -13,14 +14,14 @@ jobs:
   build-alpine-static:
 
     timeout-minutes: 240
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
         config:
           - {arch: x86_64, branch: latest-stable, flags: "-ffunction-sections"}
           - {arch: aarch64, branch: latest-stable, flags: "-ffunction-sections -mfix-cortex-a53-835769 -mfix-cortex-a53-843419"}
-          - {arch: riscv64, branch: edge, flags: "-ffunction-sections"}
+          - {arch: riscv64, branch: latest-stable, flags: "-ffunction-sections"}
 
     steps:
     - name: Setup Alpine Linux
@@ -32,7 +33,7 @@ jobs:
     - name: Install dependencies
       shell: alpine.sh --root {0}
       run: |
-        apk add git cmake gcc g++ make linux-headers
+        apk add git cmake gcc g++ make linux-headers xz
 
     - name: Checkout repository
       uses: actions/checkout@v4
@@ -43,7 +44,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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+        cmake . -DCMAKE_BUILD_TYPE=Release -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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
         make -j$(nproc)
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -53,7 +54,7 @@ jobs:
         cd external/src/libuv
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
         make -j$(nproc)
 
     - name: Build libzmq
@@ -62,7 +63,7 @@ jobs:
         cd external/src/libzmq
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_C_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
         make -j$(nproc)
 
     - name: Build p2pool
@@ -70,7 +71,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake ..  -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_BINARY=ON -DARCH_ID=${{ matrix.config.arch }}
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_BINARY=ON -DARCH_ID=${{ matrix.config.arch }}
         make -j$(nproc) p2pool
 
     - name: Run RandomX tests
@@ -87,14 +88,14 @@ jobs:
         cd tests
         mkdir build
         cd build
-        cmake ..  -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_LIBS=ON -DARCH_ID=${{ matrix.config.arch }}
-        make -j$(nproc)
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_LIBS=ON -DARCH_ID=${{ matrix.config.arch }}
+        make -j$(nproc) p2pool_tests
 
     - name: Run tests
       shell: alpine.sh {0}
       run: |
         cd tests/build
-        gunzip *.gz
+        unxz *.xz
         ./p2pool_tests
 
     - name: List directory
@@ -117,16 +118,19 @@ jobs:
     strategy:
       matrix:
         config:
-          - {os: ubuntu-20.04, c: gcc-8, cpp: g++-8, flags: ""}
-          - {os: ubuntu-20.04, c: gcc-11, cpp: g++-11, flags: ""}
+          - {os: ubuntu-22.04, c: gcc-9, cpp: g++-9, flags: ""}
+          - {os: ubuntu-22.04, c: gcc-10, cpp: g++-10, flags: ""}
+          - {os: ubuntu-22.04, c: gcc-11, cpp: g++-11, flags: ""}
           - {os: ubuntu-22.04, c: gcc-12, cpp: g++-12, flags: ""}
+          - {os: ubuntu-24.04, c: gcc-13, cpp: g++-13, flags: ""}
+          - {os: ubuntu-24.04, c: gcc-14, cpp: g++-14, flags: ""}
 
     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 ${{ matrix.config.c }} ${{ matrix.config.cpp }}
+        sudo apt install -y git build-essential cmake libuv1-dev libzmq3-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev xz-utils ${{ matrix.config.c }} ${{ matrix.config.cpp }}
 
     - name: Checkout repository
       uses: actions/checkout@v4
@@ -137,7 +141,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_CXX_COMPILER=${{ matrix.config.cpp }} -DCMAKE_C_FLAGS='${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }}'
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_CXX_COMPILER=${{ matrix.config.cpp }} -DCMAKE_C_FLAGS='${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }}' -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         make -j$(nproc) p2pool
 
     - name: Run RandomX tests
@@ -152,13 +156,13 @@ jobs:
         cd tests
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_CXX_COMPILER=${{ matrix.config.cpp }} -DCMAKE_C_FLAGS='${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }}'
-        make -j$(nproc)
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_CXX_COMPILER=${{ matrix.config.cpp }} -DCMAKE_C_FLAGS='${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }}' -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
+        make -j$(nproc) p2pool_tests
 
     - name: Run tests
       run: |
         cd tests/build
-        gunzip *.gz
+        unxz *.xz
         ./p2pool_tests
 
     - name: Archive binary
@@ -182,7 +186,7 @@ jobs:
       run: |
         sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
         sudo apt update
-        sudo apt install -y git build-essential cmake libgss-dev gcc-12 g++-12
+        sudo apt install -y git build-essential cmake libgss-dev gcc-12 g++-12 xz-utils
         sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100 --slave /usr/bin/g++ g++ /usr/bin/g++-12 --slave /usr/bin/gcov gcov /usr/bin/gcov-12
 
     - name: Checkout repository
@@ -193,7 +197,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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+        cmake . -DCMAKE_BUILD_TYPE=Release -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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
         make -j$(nproc)
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -202,7 +206,7 @@ jobs:
         cd external/src/libuv
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
         make -j$(nproc)
 
     - name: Build libzmq
@@ -210,14 +214,14 @@ jobs:
         cd external/src/libzmq
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         make -j$(nproc)
 
     - name: Build p2pool
       run: |
         mkdir build
         cd build
-        cmake ..  -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_LIBS=ON
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_LIBS=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         make -j$(nproc) p2pool
 
     - name: Run RandomX tests
@@ -232,13 +236,13 @@ jobs:
         cd tests
         mkdir build
         cd build
-        cmake ..  -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_LIBS=ON
-        make -j$(nproc)
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_LIBS=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
+        make -j$(nproc) p2pool_tests
 
     - name: Run tests
       run: |
         cd tests/build
-        gunzip *.gz
+        unxz *.xz
         ./p2pool_tests
 
     - name: Archive binary
@@ -255,14 +259,13 @@ jobs:
     strategy:
       matrix:
         config:
-          - {os: ubuntu-20.04, flags: "-fuse-linker-plugin -ffunction-sections -mfix-cortex-a53-835769 -mfix-cortex-a53-843419"}
-          - {os: ubuntu-22.04, flags: "-fuse-linker-plugin -ffunction-sections -mfix-cortex-a53-835769 -mfix-cortex-a53-843419"}
+          - {os: ubuntu-22.04-arm, flags: "-fuse-linker-plugin -ffunction-sections -mfix-cortex-a53-835769 -mfix-cortex-a53-843419"}
 
     steps:
     - name: Install dependencies
       run: |
         sudo apt update
-        sudo apt install -y git build-essential cmake gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu qemu-user
+        sudo apt install -y git build-essential cmake xz-utils
 
     - name: Checkout repository
       uses: actions/checkout@v4
@@ -272,7 +275,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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+        cmake . -DCMAKE_BUILD_TYPE=Release -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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
         make -j$(nproc)
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -281,7 +284,7 @@ jobs:
         cd external/src/libuv
         mkdir build
         cd build
-        cmake .. -DCMAKE_TOOLCHAIN_FILE=../../../cmake/aarch64_toolchain.cmake -DCMAKE_C_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
         make -j$(nproc)
 
     - name: Build libzmq
@@ -289,36 +292,36 @@ jobs:
         cd external/src/libzmq
         mkdir build
         cd build
-        cmake .. -DCMAKE_TOOLCHAIN_FILE=../../../cmake/aarch64_toolchain.cmake -DCMAKE_C_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         make -j$(nproc)
 
     - name: Build p2pool
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/aarch64_toolchain.cmake -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_LIBS=ON -DARCH_ID=aarch64
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_LIBS=ON -DARCH_ID=aarch64 -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         make -j$(nproc) p2pool
 
     - name: Run RandomX tests
       run: |
         cd build
-        qemu-aarch64 -L /usr/aarch64-linux-gnu p2pool --test
+        ./p2pool --test
         make -j$(nproc) randomx-tests
-        qemu-aarch64 -L /usr/aarch64-linux-gnu external/src/RandomX/randomx-tests
+        external/src/RandomX/randomx-tests
 
     - name: Build tests
       run: |
         cd tests
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ -DCMAKE_STRIP=/usr/bin/aarch64-linux-gnu-strip -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_LIBS=ON -DARCH_ID=aarch64
-        make -j$(nproc)
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_LIBS=ON -DARCH_ID=aarch64 -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
+        make -j$(nproc) p2pool_tests
 
     - name: Run tests
       run: |
         cd tests/build
-        gunzip *.gz
-        qemu-aarch64 -L /usr/aarch64-linux-gnu ./p2pool_tests
+        unxz *.xz
+        ./p2pool_tests
 
     - name: Archive binary
       uses: actions/upload-artifact@v4
@@ -326,6 +329,102 @@ jobs:
         name: p2pool-${{ matrix.config.os }}-aarch64
         path: build/p2pool
 
+  build-ubuntu-riscv64:
+
+    timeout-minutes: 60
+    runs-on: ${{ matrix.config.os }}
+
+    strategy:
+      matrix:
+        config:
+          - {os: ubuntu-22.04, flags: "-fuse-linker-plugin -ffunction-sections"}
+
+    steps:
+    - name: Setup Alpine Linux
+      uses: jirutka/setup-alpine@v1
+      with:
+        arch: riscv64
+        branch: latest-stable
+
+    - name: Install dependencies
+      run: |
+        sudo apt update
+        sudo apt install -y git build-essential cmake gcc-riscv64-linux-gnu g++-riscv64-linux-gnu binutils-riscv64-linux-gnu xz-utils
+        sudo cp /usr/riscv64-linux-gnu/lib/* /home/runner/rootfs/alpine-latest-riscv64/lib
+
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - name: Build libcurl
+      run: |
+        cd external/src/curl
+        cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../../cmake/riscv64_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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+        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_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../../cmake/riscv64_toolchain.cmake -DCMAKE_C_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+        make -j$(nproc)
+
+    - name: Build libzmq
+      run: |
+        cd external/src/libzmq
+        mkdir build
+        cd build
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../../cmake/riscv64_toolchain.cmake -DCMAKE_C_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
+        make -j$(nproc)
+
+    - name: Build p2pool
+      run: |
+        mkdir build
+        cd build
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../cmake/riscv64_toolchain.cmake -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_LIBS=ON -DARCH_ID=riscv64 -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
+        make -j$(nproc) p2pool
+
+    - name: Run self-test
+      shell: alpine.sh {0}
+      run: build/p2pool --test
+
+    - name: Build RandomX tests
+      run: |
+        cd build
+        make -j$(nproc) randomx-tests
+
+    - name: Run RandomX tests
+      shell: alpine.sh {0}
+      run: build/external/src/RandomX/randomx-tests
+
+    - name: Build tests
+      run: |
+        cd tests
+        mkdir build
+        cd build
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../cmake/riscv64_toolchain.cmake -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_LIBS=ON -DARCH_ID=riscv64 -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
+        make -j$(nproc) p2pool_tests
+
+    - name: Prepare test data
+      run: |
+        cd tests/build
+        unxz *.xz
+
+    - name: Run tests
+      shell: alpine.sh {0}
+      run: |
+        cd tests/build
+        ./p2pool_tests
+
+    - name: Archive binary
+      uses: actions/upload-artifact@v4
+      with:
+        name: p2pool-${{ matrix.config.os }}-riscv64
+        path: build/p2pool
+
   build-windows-msys2:
 
     timeout-minutes: 60
@@ -353,15 +452,10 @@ jobs:
         update: true
         install: mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang mingw-w64-x86_64-lld mingw-w64-x86_64-cmake make git
 
-    - name: Apply patch
-      run: |
-        cd /
-        git apply --verbose --ignore-whitespace --directory=mingw64/include/c++/`ls mingw64/include/c++`/ /d/a/p2pool/p2pool/patches/msys2/typeinfo.patch
-
     - 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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+        cmake . -DCMAKE_BUILD_TYPE=Release -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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
         make -j$(nproc)
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -370,7 +464,7 @@ jobs:
         cd external/src/libuv
         mkdir build
         cd build
-        cmake .. -G "Unix Makefiles" -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_C_FLAGS='-Os ${{ matrix.config.flags }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+        cmake .. -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles" -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_C_FLAGS='-Os ${{ matrix.config.flags }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
         make -j$(nproc)
 
     - name: Build libzmq
@@ -378,14 +472,14 @@ jobs:
         cd external/src/libzmq
         mkdir build
         cd build
-        cmake .. -G "Unix Makefiles" -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_FLAGS='-Os ${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='-Os ${{ matrix.config.flags }}' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DZMQ_HAVE_IPC=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+        cmake .. -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles" -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_FLAGS='-Os ${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='-Os ${{ matrix.config.flags }}' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DZMQ_HAVE_IPC=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         make -j$(nproc)
 
     - name: Build p2pool
       run: |
         mkdir build
         cd build
-        cmake .. -G "Unix Makefiles" -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_FLAGS="${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections" -DCMAKE_CXX_FLAGS="${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections" -DSTATIC_LIBS=ON -DOPENSSL_NO_ASM=ON -DWITH_LTO=OFF
+        cmake .. -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles" -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_FLAGS="${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections" -DCMAKE_CXX_FLAGS="${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections" -DSTATIC_LIBS=ON -DOPENSSL_NO_ASM=ON -DWITH_LTO=OFF -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         make -j$(nproc) p2pool
 
     - name: Run RandomX tests
@@ -400,13 +494,13 @@ jobs:
         cd tests
         mkdir build
         cd build
-        cmake .. -G "Unix Makefiles" -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_FLAGS="${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections" -DCMAKE_CXX_FLAGS="${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections" -DSTATIC_LIBS=ON -DOPENSSL_NO_ASM=ON
-        make -j$(nproc)
+        cmake .. -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles" -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_FLAGS="${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections" -DCMAKE_CXX_FLAGS="${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections" -DSTATIC_LIBS=ON -DOPENSSL_NO_ASM=ON
+        make -j$(nproc) p2pool_tests
 
     - name: Run tests
       run: |
         cd tests/build
-        gunzip *.gz
+        unxz *.xz
         ./p2pool_tests.exe
 
     - name: Archive binary
@@ -424,11 +518,10 @@ jobs:
       matrix:
         config:
           - {vs: Visual Studio 17 2022, os: 2022, vspath: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise", rx: "ON", upnp: "ON", grpc: "ON", tls: "ON"}
-          - {vs: Visual Studio 16 2019, os: 2019, vspath: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise", rx: "ON", upnp: "ON", grpc: "ON", tls: "ON"}
-          - {vs: Visual Studio 16 2019, os: 2019, vspath: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise", rx: "ON", upnp: "ON", grpc: "OFF", tls: "ON"}
-          - {vs: Visual Studio 16 2019, os: 2019, vspath: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise", rx: "OFF", upnp: "ON", grpc: "OFF", tls: "ON"}
-          - {vs: Visual Studio 16 2019, os: 2019, vspath: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise", rx: "OFF", upnp: "OFF", grpc: "OFF", tls: "ON"}
-          - {vs: Visual Studio 16 2019, os: 2019, vspath: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise", rx: "OFF", upnp: "OFF", grpc: "OFF", tls: "OFF"}
+          - {vs: Visual Studio 17 2022, os: 2022, vspath: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise", rx: "ON", upnp: "ON", grpc: "OFF", tls: "ON"}
+          - {vs: Visual Studio 17 2022, os: 2022, vspath: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise", rx: "OFF", upnp: "ON", grpc: "OFF", tls: "ON"}
+          - {vs: Visual Studio 17 2022, os: 2022, vspath: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise", rx: "OFF", upnp: "OFF", grpc: "OFF", tls: "ON"}
+          - {vs: Visual Studio 17 2022, os: 2022, vspath: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise", rx: "OFF", upnp: "OFF", grpc: "OFF", tls: "OFF"}
 
     steps:
     - name: Checkout repository
@@ -447,7 +540,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -G "${{ matrix.config.vs }}" -DCMAKE_SYSTEM_VERSION="10.0" -DWITH_RANDOMX=${{ matrix.config.rx }} -DWITH_UPNP=${{ matrix.config.upnp }} -DWITH_GRPC=${{ matrix.config.grpc }} -DWITH_TLS=${{ matrix.config.tls }}
+        cmake .. -G "${{ matrix.config.vs }}" -DCMAKE_SYSTEM_VERSION="10.0" -DWITH_RANDOMX=${{ matrix.config.rx }} -DWITH_UPNP=${{ matrix.config.upnp }} -DWITH_GRPC=${{ matrix.config.grpc }} -DWITH_TLS=${{ matrix.config.tls }} -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         & "${{ matrix.config.vspath }}\\MSBuild\\Current\\Bin\\amd64\\msbuild" -v:m /m /p:Configuration=Release p2pool.vcxproj
 
     - name: Check Windows 7 compatibility
@@ -471,14 +564,14 @@ jobs:
         cd tests
         mkdir build
         cd build
-        cmake .. -G "${{ matrix.config.vs }}" -DCMAKE_SYSTEM_VERSION="10.0" -DDEV_WITH_ASAN=ON
+        cmake .. -G "${{ matrix.config.vs }}" -DCMAKE_SYSTEM_VERSION="10.0" -DDEV_WITH_ASAN=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         & "${{ matrix.config.vspath }}\\MSBuild\\Current\\Bin\\amd64\\msbuild" -v:m /m /p:Configuration=Debug p2pool_tests.vcxproj
 
     - name: Run tests
       shell: cmd
       run: |
         cd tests/build/Debug
-        7z x *.gz
+        7z x *.xz
         call "${{ matrix.config.vspath }}\\VC\\Auxiliary\\Build\\vcvarsall.bat" amd64
         p2pool_tests.exe
 
@@ -502,7 +595,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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+        cmake . -DCMAKE_BUILD_TYPE=Release -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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
         make -j4
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -511,7 +604,7 @@ jobs:
         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='-Os -flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+        cmake .. -DCMAKE_BUILD_TYPE=Release -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_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
         make -j4
 
     - name: Build libzmq
@@ -519,14 +612,14 @@ jobs:
         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='-Os -flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DCMAKE_CXX_FLAGS='-Os -flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+        cmake .. -DCMAKE_BUILD_TYPE=Release -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='-Os -flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DCMAKE_CXX_FLAGS='-Os -flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -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='-flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DCMAKE_CXX_FLAGS='-flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DCMAKE_ASM_FLAGS='-target x86_64-apple-macos10.13' -DSTATIC_LIBS=ON
+        cmake .. -DCMAKE_BUILD_TYPE=Release -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='-flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DCMAKE_CXX_FLAGS='-flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DCMAKE_ASM_FLAGS='-target x86_64-apple-macos10.13' -DSTATIC_LIBS=ON
         make -j4 p2pool
 
     - name: Run RandomX tests
@@ -541,13 +634,13 @@ jobs:
         cd tests
         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='-flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DCMAKE_CXX_FLAGS='-flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DCMAKE_ASM_FLAGS='-target x86_64-apple-macos10.13' -DSTATIC_LIBS=ON
-        make -j4
+        cmake .. -DCMAKE_BUILD_TYPE=Release -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='-flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DCMAKE_CXX_FLAGS='-flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DCMAKE_ASM_FLAGS='-target x86_64-apple-macos10.13' -DSTATIC_LIBS=ON
+        make -j4 p2pool_tests
 
     - name: Run tests
       run: |
         cd tests/build
-        gunzip *.gz
+        unxz *.xz
         ./p2pool_tests
 
     - name: Archive binary
@@ -570,7 +663,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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+        cmake . -DCMAKE_BUILD_TYPE=Release -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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
         make -j3
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -579,7 +672,7 @@ jobs:
         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='-Os -target arm64-apple-macos-11' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+        cmake .. -DCMAKE_BUILD_TYPE=Release -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_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
         make -j3
 
     - name: Build libzmq
@@ -587,14 +680,14 @@ jobs:
         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='-Os -target arm64-apple-macos-11' -DCMAKE_CXX_FLAGS='-Os -target arm64-apple-macos-11' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+        cmake .. -DCMAKE_BUILD_TYPE=Release -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='-Os -target arm64-apple-macos-11' -DCMAKE_CXX_FLAGS='-Os -target arm64-apple-macos-11' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
         make -j3
 
     - 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="-target arm64-apple-macos-11" -DCMAKE_CXX_FLAGS="-target arm64-apple-macos-11" -DSTATIC_LIBS=ON -DWITH_LTO=OFF -DARCH_ID=aarch64
+        cmake .. -DCMAKE_BUILD_TYPE=Release -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="-target arm64-apple-macos-11" -DCMAKE_CXX_FLAGS="-target arm64-apple-macos-11" -DSTATIC_LIBS=ON -DWITH_LTO=OFF -DARCH_ID=aarch64
         make -j3 p2pool
 
     - name: Run RandomX tests
@@ -609,13 +702,13 @@ jobs:
         cd tests
         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="-target arm64-apple-macos-11" -DCMAKE_CXX_FLAGS="-target arm64-apple-macos-11" -DSTATIC_LIBS=ON -DWITH_LTO=OFF -DARCH_ID=aarch64
-        make -j3
+        cmake .. -DCMAKE_BUILD_TYPE=Release -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="-target arm64-apple-macos-11" -DCMAKE_CXX_FLAGS="-target arm64-apple-macos-11" -DSTATIC_LIBS=ON -DWITH_LTO=OFF -DARCH_ID=aarch64
+        make -j3 p2pool_tests
 
     - name: Run tests
       run: |
         cd tests/build
-        gunzip *.gz
+        unxz *.xz
         ./p2pool_tests
 
     - name: Archive binary
@@ -660,23 +753,23 @@ 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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+          cmake . -DCMAKE_BUILD_TYPE=Release -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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
           make -j4
           cd lib && mkdir .libs && cp libcurl.a .libs
           cd ../../libuv
           mkdir build
           cd build
-          cmake .. -DCMAKE_C_FLAGS='-Os -flto' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+          cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS='-Os -flto' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
           make -j4
           cd ../../libzmq
           mkdir build
           cd build
-          cmake .. -DCMAKE_C_FLAGS='-Os -flto' -DCMAKE_CXX_FLAGS='-Os -flto' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+          cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS='-Os -flto' -DCMAKE_CXX_FLAGS='-Os -flto' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
           make -j4
           cd ../../../..
           mkdir build
           cd build
-          cmake .. -DSTATIC_LIBS=ON
+          cmake .. -DCMAKE_BUILD_TYPE=Release -DSTATIC_LIBS=ON
           make -j4 p2pool
           ./p2pool --test
           make -j4 randomx-tests
@@ -684,9 +777,9 @@ jobs:
           cd ../tests
           mkdir build
           cd build
-          cmake .. -DSTATIC_LIBS=ON
+          cmake .. -DCMAKE_BUILD_TYPE=Release -DSTATIC_LIBS=ON
           make -j4 p2pool_tests
-          gunzip *.gz
+          unxz *.xz
           ./p2pool_tests
 
     - name: Archive binary
@@ -731,13 +824,13 @@ jobs:
         run: |
           sudo pkg_add -I cmake libuv zeromq curl
           mkdir build && cd build
-          cmake ..
+          cmake .. -DCMAKE_BUILD_TYPE=Release
           make -j4 p2pool
           cd ../tests
           mkdir build && cd build
-          cmake ..
+          cmake .. -DCMAKE_BUILD_TYPE=Release
           make -j4 p2pool_tests
-          gunzip *.gz
+          unxz *.xz
           ./p2pool_tests
 
     - name: Archive binary

.github/workflows/clang-tidy.yml

@@ -2,6 +2,7 @@ name: clang-tidy
 
 on:
   push:
+    branches: ["master"]
     paths-ignore:
       - 'docker-compose/**'
       - 'docs/**'
@@ -18,9 +19,9 @@ jobs:
       run: |
         wget https://apt.llvm.org/llvm.sh
         chmod +x llvm.sh
-        sudo ./llvm.sh 20
-        sudo apt-get install -y clang-tidy-20
-        clang-tidy-20 --verify-config
+        sudo ./llvm.sh 21
+        sudo apt-get install -y clang-tidy-21
+        clang-tidy-21 --verify-config
 
     - name: Checkout repository
       uses: actions/checkout@v4
@@ -31,9 +32,9 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-20 -DCMAKE_CXX_COMPILER=clang++-20 -DDEV_CLANG_TIDY=ON -DSTATIC_LIBS=ON
+        cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-21 -DCMAKE_CXX_COMPILER=clang++-21 -DDEV_CLANG_TIDY=ON -DSTATIC_LIBS=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
 
     - name: Run clang-tidy
       run: |
         cd src
-        clang-tidy-20 *.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-21 *.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/codeql-analysis.yml

@@ -13,6 +13,7 @@ name: "CodeQL"
 
 on:
   push:
+    branches: ["master"]
     paths-ignore:
       - 'docker-compose/**'
       - 'docs/**'
@@ -44,7 +45,7 @@ jobs:
     steps:
     - name: Install dependencies
       run: |
-          sudo apt update && sudo apt install git build-essential cmake libuv1-dev libzmq3-dev libsodium-dev libpgm-dev libnorm-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev
+          sudo apt update && sudo apt install git build-essential cmake libuv1-dev libzmq3-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev
 
     - name: Checkout repository
       uses: actions/checkout@v4
@@ -61,21 +62,13 @@ jobs:
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
     # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
     #    and modify them (or add more) to build your code if your project
     #    uses a compiled language
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+    - run: |
+       cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
+       make -j$(nproc) p2pool
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v3

.github/workflows/coverage.yml

@@ -0,0 +1,91 @@
+name: Code coverage
+
+on:
+  push:
+    branches: ["master"]
+    paths-ignore:
+      - 'docker-compose/**'
+      - 'docs/**'
+      - 'README.md'
+
+  pull_request:
+
+jobs:
+  coverage:
+
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Install dependencies
+      run: |
+        sudo apt update
+        sudo apt install -y cmake libuv1-dev libzmq3-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev lcov xz-utils
+
+    - name: Install clang
+      run: |
+        wget https://apt.llvm.org/llvm.sh
+        chmod +x llvm.sh
+        sudo ./llvm.sh 21 all
+
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - name: Build tests
+      run: |
+        cd tests
+        mkdir build
+        cd build
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DDEV_DEBUG=ON -DWITH_COVERAGE=ON -DCMAKE_C_COMPILER=clang-21 -DCMAKE_CXX_COMPILER=clang++-21 -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
+        make -j$(nproc) p2pool_tests
+
+    - name: Run tests
+      run: |
+        cd tests/build
+        unxz *.xz
+        LLVM_PROFILE_FILE="p2pool_tests.profraw" ./p2pool_tests
+
+    - name: Merge profile data
+      run: |
+        cd tests/build
+        llvm-profdata-21 merge -sparse ./p2pool_tests.profraw -o ./p2pool_tests.profdata
+
+    - name: Export profile data
+      run: |
+        cd tests/build
+        llvm-cov-21 export ./p2pool_tests -format=lcov -instr-profile=./p2pool_tests.profdata > coverage.info
+
+    - name: Run genhtml
+      run: |
+        cd tests/build
+        genhtml --demangle-cpp -o coverage coverage.info
+
+    - name: Checkout GitHub Pages repository
+      uses: actions/checkout@v4
+      with:
+        repository: SChernykh/SChernykh.github.io
+        token: ${{ secrets.PAGES_DEPLOY_TOKEN }}
+        path: gh-pages
+
+    - name: Copy coverage report to GitHub Pages repo
+      run: |
+        rm -rf gh-pages/p2pool-coverage
+        cp -r tests/build/coverage gh-pages/p2pool-coverage
+
+    - name: Commit and push coverage report
+      run: |
+        cd gh-pages
+        git config user.name "github-actions[bot]"
+        git config user.email "github-actions[bot]@users.noreply.github.com"
+        git add p2pool-coverage
+        git commit -m "Update p2pool coverage report"
+        git push
+
+    - name: Archive coverage data
+      if: '!cancelled()'
+      uses: actions/upload-artifact@v4
+      with:
+        name: p2pool-coverage
+        path: tests/build/coverage

.github/workflows/cppcheck.yml

@@ -2,6 +2,7 @@ name: cppcheck
 
 on:
   push:
+    branches: ["master"]
     paths-ignore:
       - 'docker-compose/**'
       - 'docs/**'
@@ -25,10 +26,8 @@ jobs:
         submodules: recursive
 
     - name: Checkout cppcheck
-      uses: actions/checkout@v4
-      with:
-        repository: danmar/cppcheck
-        path: cppcheck-main
+      run: |
+        git clone https://github.com/danmar/cppcheck cppcheck-main
 
     - name: Build cppcheck
       run: |
@@ -39,7 +38,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DSTATIC_LIBS=ON -DWITH_GRPC=OFF
+        cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DSTATIC_LIBS=ON -DWITH_GRPC=OFF -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         python ../cppcheck/remove_external.py compile_commands.json
 
     - name: Run cppcheck
@@ -73,10 +72,8 @@ jobs:
         submodules: recursive
 
     - name: Checkout cppcheck
-      uses: actions/checkout@v4
-      with:
-        repository: danmar/cppcheck
-        path: cppcheck-main
+      run: |
+        git clone https://github.com/danmar/cppcheck cppcheck-main
 
     - name: Build cppcheck
       run: |
@@ -90,7 +87,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -G "Visual Studio 17 2022" -DSTATIC_LIBS=ON
+        cmake .. -G "Visual Studio 17 2022" -DSTATIC_LIBS=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
 
     - name: Run cppcheck
       run: |

.github/workflows/msvc-analysis.yml

@@ -10,6 +10,7 @@ name: Microsoft C++ Code Analysis
 
 on:
   push:
+    branches: ["master"]
     paths-ignore:
       - 'docker-compose/**'
       - 'docs/**'
@@ -38,7 +39,7 @@ jobs:
           submodules: recursive
 
       - name: Configure CMake
-        run: cmake -B ${{ env.build }} -DCMAKE_BUILD_TYPE=${{ env.config }}
+        run: cmake -B ${{ env.build }} -DCMAKE_BUILD_TYPE=${{ env.config }} -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
 
       # Build is not required unless generated source files are used
       # - name: Build CMake

.github/workflows/source-snapshot.yml

@@ -1,6 +1,10 @@
 name: source-snapshot
 
-on: [push, pull_request]
+on:
+  push:
+    branches: ["master"]
+
+  pull_request:
 
 jobs:
   source-snapshot:

.github/workflows/test-sync.yml

@@ -2,6 +2,7 @@ name: Sync test
 
 on:
   push:
+    branches: ["master"]
     paths-ignore:
       - 'docker-compose/**'
       - 'docs/**'
@@ -33,7 +34,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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+        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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
         make -j$(nproc)
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -50,14 +51,14 @@ jobs:
         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
+        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 -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         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
+        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 -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         make -j$(nproc) p2pool
 
     - name: Run p2pool
@@ -68,7 +69,7 @@ jobs:
         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 history_size=4" ./p2pool --host xmr.support --rpc-port 18081 --zmq-port 18083 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --rpc-ssl --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
+        TSAN_OPTIONS="suppressions=../tests/src/tsan_sup.txt halt_on_error=1 history_size=4" ./p2pool --host node.monerodevs.org --rpc-port 18089 --zmq-port 18084 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --rpc-ssl --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6
 
     - name: Check p2pool.log
       run: |
@@ -97,14 +98,14 @@ jobs:
       run: |
         wget https://apt.llvm.org/llvm.sh
         chmod +x llvm.sh
-        sudo ./llvm.sh 19
+        sudo ./llvm.sh 20 all
 
     - name: Build libcxx_msan
       run: |
-        git clone --depth=1 https://github.com/llvm/llvm-project -b release/19.x
+        git clone --depth=1 https://github.com/llvm/llvm-project -b release/20.x
         cd llvm-project
         mkdir build
-        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
+        cmake -G Ninja -S runtimes -B build -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" -DCMAKE_C_COMPILER=clang-20 -DCMAKE_CXX_COMPILER=clang++-20 -DLLVM_USE_SANITIZER=MemoryWithOrigins -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
         ninja -C build cxx cxxabi
         cd build
         mkdir /tmp/libcxx_msan
@@ -119,7 +120,7 @@ jobs:
     - name: Build libcurl
       run: |
         cd external/src/curl
-        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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+        cmake . -DCMAKE_C_COMPILER=clang-20 -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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
         make -j$(nproc)
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -128,7 +129,7 @@ jobs:
         cd external/src/libuv
         mkdir build
         cd build
-        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
+        cmake .. -DCMAKE_C_COMPILER=clang-20 -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
@@ -136,14 +137,14 @@ jobs:
         cd external/src/libzmq
         mkdir build
         cd build
-        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
+        cmake .. -DCMAKE_C_COMPILER=clang-20 -DCMAKE_CXX_COMPILER=clang++-20 -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 -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         make -j$(nproc)
 
     - name: Build p2pool
       run: |
         mkdir build
         cd build
-        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
+        cmake .. -DCMAKE_C_COMPILER=clang-20 -DCMAKE_CXX_COMPILER=clang++-20 -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-20 -fno-omit-frame-pointer -g' -DDEV_TEST_SYNC=ON -DDEV_WITH_MSAN=ON -DWITH_LTO=OFF -DSTATIC_LIBS=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         make -j$(nproc) p2pool
 
     - name: Run p2pool
@@ -154,7 +155,7 @@ jobs:
         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 --rpc-ssl --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
+        MSAN_OPTIONS="halt_on_error=1" ./p2pool --host node.monerodevs.org --rpc-port 18089 --zmq-port 18084 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --rpc-ssl --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6
 
     - name: Check p2pool.log
       run: |
@@ -179,7 +180,7 @@ jobs:
       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
+        sudo apt install -y git build-essential cmake libuv1-dev libzmq3-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev gcc-12 g++-12
 
     - name: Checkout repository
       uses: actions/checkout@v4
@@ -190,7 +191,7 @@ jobs:
       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
+        cmake .. -DDEV_TEST_SYNC=ON -DDEV_WITH_UBSAN=ON -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 -DWITH_LTO=OFF -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         make -j$(nproc) p2pool
 
     - name: Run p2pool
@@ -201,7 +202,7 @@ jobs:
         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 --rpc-ssl --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
+        UBSAN_OPTIONS="suppressions=../tests/src/ubsan_sup.txt halt_on_error=1" ./p2pool --host node.monerodevs.org --rpc-port 18089 --zmq-port 18084 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --rpc-ssl --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6
 
     - name: Check p2pool.log
       run: |
@@ -226,7 +227,7 @@ jobs:
       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
+        sudo apt install -y git build-essential cmake libuv1-dev libzmq3-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev gcc-12 g++-12
 
     - name: Checkout repository
       uses: actions/checkout@v4
@@ -237,7 +238,7 @@ jobs:
       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
+        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 -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         make -j$(nproc) p2pool
 
     - name: Run p2pool
@@ -248,7 +249,7 @@ jobs:
         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 --rpc-ssl --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
+        ASAN_OPTIONS="detect_stack_use_after_return=1 atexit=1" ./p2pool --host node.monerodevs.org --rpc-port 18089 --zmq-port 18084 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --rpc-ssl --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6
 
     - name: Check p2pool.log
       run: |
@@ -283,7 +284,7 @@ jobs:
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+        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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=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 -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
         make -j4
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -317,7 +318,7 @@ jobs:
         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 --rpc-ssl --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
+        ./p2pool --host node.monerodevs.org --rpc-port 18089 --zmq-port 18084 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --rpc-ssl --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6
 
     - name: Check p2pool.log
       run: |
@@ -350,7 +351,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -G "Visual Studio 17 2022" -DCMAKE_SYSTEM_VERSION="10.0" -DDEV_TEST_SYNC=ON -DDEV_WITH_ASAN=ON
+        cmake .. -G "Visual Studio 17 2022" -DCMAKE_SYSTEM_VERSION="10.0" -DDEV_TEST_SYNC=ON -DDEV_WITH_ASAN=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\msbuild" -v:m /m /p:Configuration=Debug p2pool.vcxproj
 
     - name: Run p2pool
@@ -362,7 +363,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
-        p2pool.exe --host xmr.support --rpc-port 18081 --zmq-port 18083 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --rpc-ssl --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
+        p2pool.exe --host node.monerodevs.org --rpc-port 18089 --zmq-port 18084 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --rpc-ssl --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6
 
     - name: Check p2pool.log
       run: |
@@ -395,7 +396,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -G "Visual Studio 17 2022" -DCMAKE_SYSTEM_VERSION="10.0" -DDEV_TEST_SYNC=ON -DDEV_TRACK_MEMORY=ON
+        cmake .. -G "Visual Studio 17 2022" -DCMAKE_SYSTEM_VERSION="10.0" -DDEV_TEST_SYNC=ON -DDEV_TRACK_MEMORY=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\msbuild" -v:m /m /p:Configuration=RelWithDebInfo p2pool.vcxproj
 
     - name: Run p2pool
@@ -405,7 +406,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"
-        ./p2pool.exe --host xmr.support --rpc-port 18081 --zmq-port 18083 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --rpc-ssl --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
+        ./p2pool.exe --host node.monerodevs.org --rpc-port 18089 --zmq-port 18084 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --rpc-ssl --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6
 
     - name: Check p2pool.log
       run: |

.gitignore

@@ -1,2 +1,3 @@
+.vscode
 build
 logs

CMakeLists.txt

@@ -17,7 +17,9 @@ option(WITH_RANDOMX "Include the RandomX library in the build. If this is turned
 option(WITH_LTO "Use link-time compiler optimization (if linking fails for you, run cmake with -DWITH_LTO=OFF)" ON)
 option(WITH_UPNP "Include UPnP support. If this is turned off, p2pool will not be able to configure port forwarding on UPnP-enabled routers." ON)
 option(WITH_GRPC "Include gRPC support. If this is turned off, p2pool will not be able to merge mine with Tari." ON)
-option(WITH_TLS "Include TLS support. If this is turned off, p2pool will not support Stratum TLS connections." ON)
+option(WITH_TLS "Include TLS support. If this is turned off, p2pool will not support Stratum TLS connections, and lack many other security features. It's recommended to keep it ON!" ON)
+
+option(WITH_MERGE_MINING_DONATION "Merge mine donations to the author. This doesn't affect your hashrate or payouts in any way - only unused merge mining capacity will be utilised. If you merge mine yourself, your settings will take priority." ON)
 
 option(DEV_TEST_SYNC "[Developer only] Sync test, stop p2pool after sync is complete" OFF)
 option(DEV_WITH_TSAN "[Developer only] Compile with thread sanitizer" OFF)
@@ -56,6 +58,10 @@ if (WITH_UPNP)
 	set(LIBS ${LIBS} libminiupnpc-static)
 endif()
 
+if (WITH_MERGE_MINING_DONATION)
+	add_definitions(-DWITH_MERGE_MINING_DONATION)
+endif()
+
 if (DEV_TEST_SYNC)
 	add_definitions(-DDEV_TEST_SYNC)
 endif()
@@ -185,6 +191,18 @@ endif()
 source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "Header Files" FILES ${HEADERS})
 source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "Source Files" FILES ${SOURCES})
 
+include(CheckFunctionExists)
+
+if (STATIC_BINARY)
+	add_definitions(-DCURL_STATICLIB)
+
+	check_function_exists(__nss_module_disable_loading HAVE_NSS_MODULE_DISABLE_LOADING)
+
+	if (HAVE_NSS_MODULE_DISABLE_LOADING)
+		add_definitions(-DHAVE_NSS_MODULE_DISABLE_LOADING)
+	endif()
+endif()
+
 if (NOT ((CMAKE_CXX_COMPILER_ID MATCHES MSVC) OR STATIC_BINARY OR STATIC_LIBS))
 	include(FindCURL)
 endif()
@@ -250,22 +268,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang)
 			find_library(CURL_LIBRARY NAMES curl)
 		endif()
 	endif()
-	find_library(SODIUM_LIBRARY sodium)
-endif()
-
-find_library(PGM_LIBRARY pgm)
-find_library(NORM_LIBRARY norm)
-
-if (PGM_LIBRARY)
-	set(LIBS ${LIBS} ${PGM_LIBRARY})
-endif()
-
-if (NORM_LIBRARY)
-	set(LIBS ${LIBS} ${NORM_LIBRARY})
-endif()
-
-if (SODIUM_LIBRARY)
-	set(LIBS ${LIBS} ${SODIUM_LIBRARY})
 endif()
 
 if(APPLE)
@@ -275,13 +277,13 @@ if(APPLE)
 	set(LIBS ${LIBS} ${FOUNDATION_LIB} ${CORE_FOUNDATION_LIB} ${SYSTEM_CONFIGURATION_LIB})
 endif()
 
-add_definitions(/DZMQ_STATIC)
+add_definitions(-DZMQ_STATIC)
 
 include(CheckIncludeFile)
 
 check_include_file(asm/hwcap.h HAVE_HWCAP)
 if(HAVE_HWCAP)
-	add_definitions(/DHAVE_HWCAP)
+	add_definitions(-DHAVE_HWCAP)
 endif()
 
 include(CheckCXXSourceCompiles)
@@ -345,33 +347,57 @@ int main(int argc, char* argv[])
 	return 0;
 }" HAVE_RES_QUERY)
 
+check_c_source_compiles("
+#define _GNU_SOURCE
+#include <pthread.h>
+
+int main()
+{
+	pthread_setname_np(pthread_self(), \"Main\");
+	return 0;
+}" HAVE_PTHREAD_SETNAME_NP)
+
 set(CMAKE_REQUIRED_LIBRARIES)
 
 if (HAVE_BUILTIN_CLZLL)
-	add_definitions(/DHAVE_BUILTIN_CLZLL)
+	add_definitions(-DHAVE_BUILTIN_CLZLL)
 endif()
 
 if (HAVE_BITSCANREVERSE64)
-	add_definitions(/DHAVE_BITSCANREVERSE64)
+	add_definitions(-DHAVE_BITSCANREVERSE64)
 endif()
 
 if (HAVE_SCHED)
-	add_definitions(/DHAVE_SCHED)
+	add_definitions(-DHAVE_SCHED)
 endif()
 
 if (HAVE_RES_QUERY)
-	add_definitions(/DHAVE_RES_QUERY)
+	add_definitions(-DHAVE_RES_QUERY)
 	if (HAVE_RESOLV_LIB)
 		set(LIBS ${LIBS} resolv)
 	endif()
 endif()
 
+if (HAVE_PTHREAD_SETNAME_NP)
+	add_definitions(-DHAVE_PTHREAD_SETNAME_NP)
+endif()
+
+check_c_source_compiles("#include <gnu/libc-version.h>\nint main() { return (gnu_get_libc_version() && gnu_get_libc_release()) ? 0 : 1; }" HAVE_GLIBC)
+
+if (HAVE_GLIBC)
+	add_definitions(-DHAVE_GLIBC)
+endif()
+
 add_definitions("-DRAPIDJSON_PARSE_DEFAULT_FLAGS=kParseTrailingCommasFlag")
 
+if (WIN32 AND (CMAKE_BUILD_TYPE STREQUAL "Release"))
+	add_definitions(-DNDEBUG)
+endif()
+
 add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES})
 
 if (STATIC_BINARY OR STATIC_LIBS)
-	if (NOT (DEV_WITH_TSAN OR DEV_WITH_MSAN OR DEV_WITH_UBSAN OR DEV_WITH_ASAN))
+	if ((CMAKE_BUILD_TYPE STREQUAL "Release") AND (NOT (DEV_WITH_TSAN OR DEV_WITH_MSAN OR DEV_WITH_UBSAN OR DEV_WITH_ASAN)))
 		if (WIN32)
 			add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_STRIP} "${CMAKE_PROJECT_NAME}.exe")
 		else()
@@ -392,7 +418,7 @@ if (STATIC_BINARY OR STATIC_LIBS)
 	if (WIN32)
 		set(STATIC_LIBS ${STATIC_LIBS} ws2_32 iphlpapi userenv psapi dnsapi dbghelp)
 		if ((CMAKE_CXX_COMPILER_ID MATCHES GNU) OR (CMAKE_CXX_COMPILER_ID MATCHES Clang))
-			set(STATIC_LIBS ${STATIC_LIBS} bcrypt)
+			set(STATIC_LIBS ${STATIC_LIBS} bcrypt pthread)
 		endif()
 	elseif (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
 		set(STATIC_LIBS ${STATIC_LIBS} pthread)
@@ -415,6 +441,10 @@ if (STATIC_BINARY OR STATIC_LIBS)
 		set(STATIC_LIBS ${STATIC_LIBS} ssl crypto)
 	endif()
 
+	if ((CMAKE_CXX_COMPILER_ID MATCHES GNU) AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9))
+		set(STATIC_LIBS ${STATIC_LIBS} stdc++fs)
+	endif()
+
 	target_link_libraries(${CMAKE_PROJECT_NAME}
 		"${CMAKE_SOURCE_DIR}/external/src/libzmq/build/lib/libzmq.a"
 		"${CMAKE_SOURCE_DIR}/external/src/libuv/build/libuv.a"
@@ -428,12 +458,16 @@ else()
 		set(LIBS ${LIBS} ssl crypto)
 	endif()
 
+	if ((CMAKE_CXX_COMPILER_ID MATCHES GNU) AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9))
+		set(LIBS ${LIBS} stdc++fs)
+	endif()
+
 	target_link_libraries(${CMAKE_PROJECT_NAME} debug ${ZMQ_LIBRARY_DEBUG} debug ${UV_LIBRARY_DEBUG} debug ${CURL_LIBRARY_DEBUG} optimized ${ZMQ_LIBRARY} optimized ${UV_LIBRARY} optimized ${CURL_LIBRARY} ${LIBS})
 endif()
 
 message(STATUS "Summary of build options:
-    C compiler:      ${CMAKE_C_COMPILER} (${CMAKE_C_COMPILER_ID})
-    CXX compiler:    ${CMAKE_CXX_COMPILER} (${CMAKE_CXX_COMPILER_ID})
-    C_FLAGS:         ${CMAKE_C_FLAGS}
-    CXX_FLAGS:       ${CMAKE_CXX_FLAGS}
+    C compiler:         ${CMAKE_C_COMPILER} (${CMAKE_C_COMPILER_ID})
+    CXX compiler:       ${CMAKE_CXX_COMPILER} (${CMAKE_CXX_COMPILER_ID})
+    C_FLAGS:            ${CMAKE_C_FLAGS}
+    CXX_FLAGS:          ${CMAKE_CXX_FLAGS}
 ")

README.md

@@ -32,6 +32,7 @@ These are 3rd-party pages. If they are down, it doesn't mean there is a problem
   - [GNU/Linux](#gnulinux)
   - [Windows](#windows)
 - [Build instructions](#build-instructions)
+- [Reproducible builds](#reproducible-builds)
 - [Donations](#donations)
 
 ## Pool mining vs Solo mining vs P2Pool mining
@@ -75,20 +76,19 @@ First you need to find a pool share. This share will stay in [PPLNS](https://en.
 ## Monero version support
 
 - The latest Monero network upgrade happened on August 13th, 2022 (block 2,688,888).
-- The latest P2Pool network upgrade happened on March 18th, 2023 at 21:00 UTC.
-- Next P2Pool network upgrade will happen on October 12th, 2024 at 20:00 UTC.
+- The latest P2Pool network upgrade happened on October 12th, 2024 at 20:00 UTC.
 
 In order to continue mining on P2Pool, you must update both Monero and P2Pool software to the latest available versions as soon as they are released.
 
 |Monero protocol version|Required Monero software version|Required P2Pool version
 |-|-|-|
-|v15, v16 (active after August 13th, 2022)|v0.18.0.0 or newer, v0.18.3.4 is recommended|v4.0 or newer
+|v15, v16 (active after August 13th, 2022)|v0.18.0.0 or newer, v0.18.4.1 is recommended|v4.0 or newer
 
 ## How to mine on P2Pool
 
 ### General Considerations
 
-- In order to mine on P2Pool, a synced Monero node using monerod v0.18.0.0 or newer is required. If you don't currently have one, you can download the official Monero binaries, start `monerod` on your PC and wait until it's fully synced. Advanced Monero node setup instructions are [here](https://sethforprivacy.com/guides/run-a-monero-node-advanced/).
+- In order to mine on P2Pool, a synced Monero node using monerod v0.18.0.0 or newer is required. If you don't currently have one, you can download the [official Monero binaries](https://www.getmonero.org/downloads/), start `monerod` on your PC and wait until it's fully synced. Advanced Monero node setup instructions are [here](https://sethforprivacy.com/guides/run-a-monero-node-advanced/).
 - It is highly recommended that you create a separate restricted user account (in your OS) for mining. While P2Pool has been battle-tested for a long time now, any software may have unknown bugs/vulnerabilities. 
 - You have to use a primary wallet address (the one starting with `4`) for mining. Subaddresses and integrated addresses are not supported, just like with monerod solo mining.
 - You can add the `--mini` parameter to your P2Pool command to connect to the **p2pool-mini** sidechain. Note that it will also change the default p2p port from 37889 to 37888.
@@ -111,20 +111,36 @@ In order to continue mining on P2Pool, you must update both Monero and P2Pool so
 
 ### Merge mining
 
-Merge mining will be available in P2Pool after the fork on October 12th, 2024. Version 4.0 or newer is required to use it.
+Merge mining is available in P2Pool since the fork that happened on October 12th, 2024. Version 4.0 or newer is required to use it.
 
-- Blockchains that will support [Merge mining RPC API](https://github.com/SChernykh/p2pool/blob/master/docs/MERGE_MINING.MD#proposed-rpc-api)
-  - [Townforge](https://townforge.net/) supports it in their [tmp-mm branch](https://git.townforge.net/townforge/townforge/src/branch/tmp-mm) (not released yet)
-  - [DarkFi](https://dark.fi/) is going to support it, but it's [not ready yet](https://github.com/darkrenaissance/darkfi/issues/244)
-  ```
-  p2pool.exe --wallet YOUR_MONERO_WALLET_ADDRESS --merge-mine IP:port YOUR_WALLET_ADDRESS_ON_ANOTHER_BLOCKCHAIN
-  ```
+Blockchains that will support [Merge mining RPC API](https://github.com/SChernykh/p2pool/blob/master/docs/MERGE_MINING.MD#proposed-rpc-api):
+- [Townforge](https://townforge.net/) supports it in their [tmp-mm branch](https://git.townforge.net/townforge/townforge/src/branch/tmp-mm) (not released yet)
+- [DarkFi](https://dark.fi/) is going to support it, but it's [not ready yet](https://github.com/darkrenaissance/darkfi/issues/244)
+```
+p2pool.exe --wallet YOUR_MONERO_WALLET_ADDRESS --merge-mine IP:port YOUR_WALLET_ADDRESS_ON_ANOTHER_BLOCKCHAIN
+```
 
-- [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
-  ```
-  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).
+Blockchains that support merge mining already: [Tari](https://www.tari.com/)
+
+Tari uses their own gRPC API and requires a different command line:
+```
+./p2pool --wallet YOUR_MONERO_WALLET_ADDRESS --merge-mine tari://TARI_NODE_IP:18102 TARI_WALLET_ADDRESS
+```
+and on the Tari side
+```
+./minotari_node --grpc-enabled --mining-enabled
+```
+TARI_NODE_IP is 127.0.0.1 if you run both on the same machine (recommended).
+
+Merge mining is available on Tari's mainnet:
+- Download [Tari suite](https://github.com/tari-project/tari/releases/latest) for your OS
+- Run Minotari node and wait until in synchronizes
+- Run Minotari console wallet to create a Tari wallet
+- Copy the "Tari Address one-sided" from the "Receive" tab of the wallet
+- Paste it into the P2Pool command line above
+- Everything is ready now to start merge mining Monero and Tari!
+
+Note that Tari will be mined in solo mode (only full Tari blocks can be mined for now). This doesn't affect P2Pool payouts - they will stay the same.
 
 ### GNU/Linux
 
@@ -342,6 +358,29 @@ cmake ..
 make -j$(nproc)
 ```
 
+## Reproducible builds
+
+Starting from v4.9, P2Pool uses [reproducible builds](https://en.wikipedia.org/wiki/Reproducible_builds) to create the release binaries. This allows verification that no vulnerabilities or backdoors have been introduced during the compilation process, and that the compiled binaries correspond to the source code.
+
+It removes the need for trust that the author or maintainer of the code is not malicious/compromised, and that the build server is not compromised.
+
+Anyone can run the same build script on the same source code, and get the same release binaries in the end, confirming their authenticity.
+
+Prerequisites: Ubuntu with Docker and Git installed.
+
+Example of building v4.9 release binaries:
+
+```
+git clone --branch v4.9 --recursive https://github.com/SChernykh/p2pool
+p2pool/scripts/release/build_all.sh v4.9
+```
+The binaries will be created in `p2pool/scripts/release` folder. First time you run it, it will take up to several hours to first build the Docker image with all the necessary tools in it. Wait until all builds are finished and then run
+```
+cd p2pool/scripts/release
+./gen_sums.sh
+```
+to generate the hash sums and compare them with the official release's hash sums.
+
 ## Donations
 
 If you'd like to support further development of Monero P2Pool, you're welcome to send any amount of XMR to the following address:
@@ -349,3 +388,13 @@ If you'd like to support further development of Monero P2Pool, you're welcome to
 ```
 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg
 ```
+
+Starting from v4.6, P2Pool will also have an ability to merge mine donations for the author.
+
+Note that this will not affect your hashrate or payouts in any way. P2Pool will always (100% of the time) keep mining to your configured Monero wallet address, but it might also use the available merge mining capacity to donate to the author.
+
+If you merge mine yourself, your settings will take priority.
+
+The merge mining donation runs without a donation server - there is no "phoning home" to a server, everything is done through the P2Pool's network in a decentralized way.
+
+To opt out of this, build P2Pool with `-DWITH_MERGE_MINING_DONATION=OFF` in cmake command line. Due to the architecture of the decentralized P2Pool network, your node will still relay donation messages to other nodes even if you opted out (but it will not process them).

cmake/aarch64_toolchain.cmake

@@ -1,8 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_CROSSCOMPILING TRUE)
-
-set(CMAKE_SYSTEM_PROCESSOR aarch64)
-
-set(CMAKE_C_COMPILER /usr/bin/aarch64-linux-gnu-gcc)
-set(CMAKE_CXX_COMPILER /usr/bin/aarch64-linux-gnu-g++)
-set(CMAKE_STRIP /usr/bin/aarch64-linux-gnu-strip)

cmake/aarch64_toolchain_clang.cmake

@@ -0,0 +1,9 @@
+set(CMAKE_CROSSCOMPILING TRUE)
+
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_PROCESSOR aarch64)
+
+set(CMAKE_C_COMPILER clang)
+set(CMAKE_CXX_COMPILER clang++)
+set(CMAKE_ASM_COMPILER aarch64-linux-gnu-as)
+set(CMAKE_STRIP aarch64-linux-gnu-strip)

cmake/flags.cmake

@@ -17,23 +17,33 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
 		set(GENERAL_FLAGS "${GENERAL_FLAGS} -fno-omit-frame-pointer -fsanitize=address")
 	endif()
 
-	set(WARNING_FLAGS "-Wall -Wextra -Wcast-qual -Wlogical-op -Wundef -Wformat=2 -Wpointer-arith -Werror -Wno-error=inline")
+	set(WARNING_FLAGS "-Wall -Wextra -Wcast-qual -Wlogical-op -Wundef -Wformat=2 -Wpointer-arith -Werror -Wno-error=inline -Wno-error=unused-function -Wno-error=strict-overflow")
 
 	if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.5.0)
 		set(WARNING_FLAGS "${WARNING_FLAGS} -Wstrict-overflow=2")
 	endif()
 
+	if (NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15))
+		set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-cpp")
+	endif()
+
 	if (DISABLE_WARNINGS)
 		set(WARNING_FLAGS "-w")
 	endif()
 
-	if (DEV_WITH_TSAN OR DEV_WITH_UBSAN OR DEV_WITH_ASAN OR DEV_DEBUG)
-		set(OPTIMIZATION_FLAGS "-Og -g -ftrapv")
+	if (DEV_WITH_TSAN OR DEV_WITH_UBSAN OR DEV_WITH_ASAN OR DEV_DEBUG OR (CMAKE_BUILD_TYPE STREQUAL "Debug") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
+		add_definitions(-DDEBUG_BUILD)
+		if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+			set(OPTIMIZATION_FLAGS "-O0")
+		else()
+			set(OPTIMIZATION_FLAGS "-Og")
+		endif()
+		set(OPTIMIZATION_FLAGS "${OPTIMIZATION_FLAGS} -g3 -ftrapv")
 	else()
 		set(OPTIMIZATION_FLAGS "-O3 -ffast-math -s")
 	endif()
 
-	if (WITH_LTO)
+	if (WITH_LTO AND (CMAKE_BUILD_TYPE STREQUAL "Release"))
 		set(OPTIMIZATION_FLAGS "${OPTIMIZATION_FLAGS} -flto=auto -fuse-linker-plugin")
 	endif()
 
@@ -42,10 +52,16 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
 	endif()
 
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GENERAL_FLAGS} ${WARNING_FLAGS} ${OPTIMIZATION_FLAGS}")
-	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${GENERAL_FLAGS} ${WARNING_FLAGS} ${OPTIMIZATION_FLAGS}")
+	set(CMAKE_C_FLAGS_DEBUG "")
+	set(CMAKE_C_FLAGS_RELEASE "")
+	set(CMAKE_C_FLAGS_RELWITHDEBINFO "")
+	set(CMAKE_C_FLAGS_MINSIZEREL "")
 
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GENERAL_FLAGS} ${WARNING_FLAGS} ${OPTIMIZATION_FLAGS}")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${GENERAL_FLAGS} ${WARNING_FLAGS} ${OPTIMIZATION_FLAGS}")
+	set(CMAKE_CXX_FLAGS_DEBUG "")
+	set(CMAKE_CXX_FLAGS_RELEASE "")
+	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "")
+	set(CMAKE_CXX_FLAGS_MINSIZEREL "")
 
 	if (WIN32)
 		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
@@ -66,6 +82,10 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
 		set(WARNING_FLAGS "/W0")
 	endif()
 
+	if (DEV_DEBUG OR (CMAKE_BUILD_TYPE STREQUAL "Debug") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
+		add_definitions(-DDEBUG_BUILD)
+	endif()
+
 	set(CMAKE_C_FLAGS_DEBUG "${GENERAL_FLAGS} ${WARNING_FLAGS} ${SECURITY_FLAGS} /Od /Ob0 /Zi /MTd")
 	set(CMAKE_CXX_FLAGS_DEBUG "${GENERAL_FLAGS} ${WARNING_FLAGS} ${SECURITY_FLAGS} /Od /Ob0 /Zi /MTd")
 
@@ -93,25 +113,45 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
 		set(GENERAL_FLAGS "${GENERAL_FLAGS} -mfix-cortex-a53-835769")
 	endif()
 
-	set(WARNING_FLAGS "-Wall -Wextra -Wno-undefined-internal -Wunreachable-code-aggressive -Wmissing-prototypes -Wmissing-variable-declarations -Werror")
+	set(WARNING_FLAGS "-Wall -Wextra -Wno-unused-function -Wno-undefined-internal -Wno-unknown-warning-option -Wno-nan-infinity-disabled -Wunreachable-code-aggressive -Wmissing-prototypes -Wmissing-variable-declarations -Werror")
+
+	if (NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 20))
+		set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-cpp")
+	endif()
 
 	if (DISABLE_WARNINGS)
 		set(WARNING_FLAGS "-w")
 	endif()
 
-	if (DEV_WITH_MSAN OR DEV_DEBUG)
-		set(OPTIMIZATION_FLAGS "-Og -g -ftrapv")
+	if (DEV_WITH_MSAN OR DEV_DEBUG OR (CMAKE_BUILD_TYPE STREQUAL "Debug") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
+		add_definitions(-DDEBUG_BUILD)
+		if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+			set(OPTIMIZATION_FLAGS "-O0")
+		else()
+			set(OPTIMIZATION_FLAGS "-Og")
+		endif()
+		set(OPTIMIZATION_FLAGS "${OPTIMIZATION_FLAGS} -g3 -ftrapv")
 	else()
 		set(OPTIMIZATION_FLAGS "-O3 -ffast-math -funroll-loops -fmerge-all-constants")
 	endif()
 
-	if (WITH_LTO)
+	if (WITH_LTO AND (CMAKE_BUILD_TYPE STREQUAL "Release"))
 		set(OPTIMIZATION_FLAGS "${OPTIMIZATION_FLAGS} -flto")
 	endif()
 
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GENERAL_FLAGS} ${WARNING_FLAGS} ${OPTIMIZATION_FLAGS}")
-	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${GENERAL_FLAGS} ${WARNING_FLAGS} ${OPTIMIZATION_FLAGS}")
+	set(CMAKE_C_FLAGS_DEBUG "")
+	set(CMAKE_C_FLAGS_RELEASE "")
+	set(CMAKE_C_FLAGS_RELWITHDEBINFO "")
+	set(CMAKE_C_FLAGS_MINSIZEREL "")
 
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GENERAL_FLAGS} ${WARNING_FLAGS} ${OPTIMIZATION_FLAGS}")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${GENERAL_FLAGS} ${WARNING_FLAGS} ${OPTIMIZATION_FLAGS}")
+	set(CMAKE_CXX_FLAGS_DEBUG "")
+	set(CMAKE_CXX_FLAGS_RELEASE "")
+	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "")
+	set(CMAKE_CXX_FLAGS_MINSIZEREL "")
+
+	if (STATIC_BINARY)
+		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
+	endif()
 endif()

cmake/freebsd_aarch64_toolchain_clang.cmake

@@ -0,0 +1,7 @@
+set(CMAKE_CROSSCOMPILING TRUE)
+
+set(CMAKE_SYSTEM_NAME FreeBSD)
+set(CMAKE_SYSTEM_PROCESSOR aarch64)
+
+set(CMAKE_C_COMPILER clang)
+set(CMAKE_CXX_COMPILER clang++)

cmake/freebsd_x86_64_toolchain_clang.cmake

@@ -0,0 +1,7 @@
+set(CMAKE_CROSSCOMPILING TRUE)
+
+set(CMAKE_SYSTEM_NAME FreeBSD)
+set(CMAKE_SYSTEM_PROCESSOR x86_64)
+
+set(CMAKE_C_COMPILER clang)
+set(CMAKE_CXX_COMPILER clang++)

cmake/macos_aarch64_toolchain_clang.cmake

@@ -0,0 +1,9 @@
+set(CMAKE_SYSTEM_NAME Darwin)
+set(CMAKE_CROSSCOMPILING TRUE)
+
+set(CMAKE_SYSTEM_PROCESSOR aarch64)
+
+set(CMAKE_C_COMPILER /usr/local/bin/aarch64-apple-darwin24.5-clang)
+set(CMAKE_CXX_COMPILER /usr/local/bin/aarch64-apple-darwin24.5-clang++)
+set(CMAKE_ASM_COMPILER /usr/local/bin/aarch64-apple-darwin24.5-as)
+set(CMAKE_STRIP /usr/local/bin/aarch64-apple-darwin24.5-strip)

cmake/macos_x86_64_toolchain_clang.cmake

@@ -0,0 +1,9 @@
+set(CMAKE_SYSTEM_NAME Darwin)
+set(CMAKE_CROSSCOMPILING TRUE)
+
+set(CMAKE_SYSTEM_PROCESSOR x86_64)
+
+set(CMAKE_C_COMPILER /usr/local/bin/x86_64-apple-darwin24.5-clang)
+set(CMAKE_CXX_COMPILER /usr/local/bin/x86_64-apple-darwin24.5-clang++)
+set(CMAKE_ASM_COMPILER /usr/local/bin/x86_64-apple-darwin24.5-as)
+set(CMAKE_STRIP /usr/local/bin/x86_64-apple-darwin24.5-strip)

cmake/riscv64_toolchain.cmake

@@ -0,0 +1,8 @@
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_CROSSCOMPILING TRUE)
+
+set(CMAKE_SYSTEM_PROCESSOR riscv64)
+
+set(CMAKE_C_COMPILER /usr/bin/riscv64-linux-gnu-gcc)
+set(CMAKE_CXX_COMPILER /usr/bin/riscv64-linux-gnu-g++)
+set(CMAKE_STRIP /usr/bin/riscv64-linux-gnu-strip)

cmake/riscv64_toolchain_clang.cmake

@@ -0,0 +1,9 @@
+set(CMAKE_CROSSCOMPILING TRUE)
+
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_PROCESSOR riscv64)
+
+set(CMAKE_C_COMPILER clang)
+set(CMAKE_CXX_COMPILER clang++)
+set(CMAKE_ASM_COMPILER riscv64-linux-gnu-as)
+set(CMAKE_STRIP riscv64-linux-gnu-strip)

cmake/windows_x86_64_toolchain_clang.cmake

@@ -0,0 +1,8 @@
+set(CMAKE_CROSSCOMPILING TRUE)
+
+set(CMAKE_SYSTEM_NAME Windows)
+set(CMAKE_SYSTEM_VERSION 6.0)
+set(CMAKE_SYSTEM_PROCESSOR x86_64)
+
+set(CMAKE_C_COMPILER clang)
+set(CMAKE_CXX_COMPILER clang++)

cppcheck/run.cmd

@@ -1,5 +1,5 @@
 @echo off
-"..\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
+"..\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 -DWITH_TLS=1 -DWITH_MERGE_MINING_DONATION=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

docker-compose/cfg/requirements.txt

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

docs/BSD_RC_SCRIPT.MD

@@ -0,0 +1,93 @@
+## Setting up P2Pool as a service controlled by a RC script (FreeBSD, and possibly other)
+
+In order to use this RC script, it is required to create a `p2pool` user account on the system for this service. An example **passwd(5)** line for this user would be:
+```
+p2pool:*:818:818::0:0:Monero P2Pool:/var/db/p2pool:/usr/sbin/nologin
+```
+Also an example **group(5)** line:
+```
+p2pool:*:818:
+```
+
+When creating such an user and a group, make sure the UID and GID aren't being used by any other user/group in the system. The home directory of the user will be used as the data directory of P2Pool; set it to your desired location as needed.
+
+The RC script assumes the P2Pool executable is installed as `/usr/local/bin/p2pool`.
+
+### /usr/local/etc/rc.d/p2pool
+```sh
+#!/bin/sh
+
+# PROVIDE: p2pool
+# REQUIRE: LOGIN FILESYSTEMS
+# KEYWORD: shutdown
+
+. /etc/rc.subr
+
+name=p2pool
+rcvar=p2pool_enable
+
+load_rc_config $name
+
+: ${p2pool_enable:="NO"} ${p2pool_local_api:="NO"}
+
+[ -z "$p2pool_wallet" ] && exit 1
+p2pool_user=p2pool
+p2pool_home="`getent passwd ${p2pool_user} | cut -d : -f 6`"
+[ -z "$p2pool_home" ] && exit 1
+p2pool_env="HOME=$p2pool_home"
+p2pool_chdir="$p2pool_home"
+procname=/usr/local/bin/p2pool
+pidfile="$p2pool_home/p2pool.pid"
+command=/usr/sbin/daemon
+flags="-p ${pidfile} -f -- ${procname} ${p2pool_flags} --data-dir ${p2pool_home} --wallet ${p2pool_wallet}"
+[ -n "${p2pool_api_path}" ] && flags="${flags} --data-api ${p2pool_api_path}"
+if checkyesno p2pool_local_api; then
+	if [ -n "${p2pool_api_path}" ]; then
+		flags="${flags} --local-api"
+	else
+		echo 'Warning: p2pool_local_api="YES" requires p2pool_api_path being set, ignoring' 1>&2
+	fi
+fi
+start_precmd="p2pool_prestart"
+stop_postcmd="rm -f ${pidfile}"
+
+p2pool_prestart() {
+	if [ -n "${p2pool_api_path}" ]; then
+		[ -d "${p2pool_api_path}" ] || mkdir -p "${p2pool_api_path}"
+		gid="`getent passwd ${p2pool_user} | cut -d : -f 4`"
+		chown ${p2pool_user}:${gid} "${p2pool_api_path}"
+	fi
+}
+
+run_rc_command "$1"
+```
+
+### Configuration variables in /etc/rc.conf (or /etc/rc.conf.local)
+
+* `p2pool_enable` Set to `YES` to enable this service; required.
+* `p2pool_wallet` Your wallet address; required.
+* `p2pool_api_path` Path to API directory (See p2pool option `--data-api`), this directory will be created automatically if not already exists, on service startup; optional.
+* `p2pool_local_api` Set to `YES` to enable creation of `local` path in API directory (See p2pool option `--local-api`), requires `p2pool_api_path` also being set; optional.
+* `p2pool_flags` Additional options you want to pass to p2pool; optional.
+
+#### Example
+```sh
+p2pool_enable="YES"
+p2pool_wallet="44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg"
+p2pool_api_path="/tmp/p2pool-api"
+p2pool_local_api="YES"
+p2pool_flags="--host 127.0.0.1 --in-peers 200"
+```
+
+## /usr/local/etc/newsyslog.conf.d/p2pool.conf (optional)
+
+You can create this drop-in **newsyslog(8)** configuration file to periodically rotate the P2Pool log file. The drop-in location `/usr/local/etc/newsyslog.conf.d/` assumes that `/etc/newsyslog.conf` contains an `include` directive for searching drop-in configuration files in it.
+
+This example assumes `/var/db/p2pool` as your P2Pool data directory.
+
+```
+# log file			owner:group		mode	count	size (KiB)	when	flags	pid file				signal
+/var/db/p2pool/p2pool.log	p2pool:p2pool		640	16	65536		@0101T	BEJ	/var/db/p2pool/p2pool.pid		SIGUSR1
+```
+
+You should adjust the `count`, `size`, `when` and/or `flags` fields to fit your needs.

docs/COMMAND_LINE.MD

@@ -8,6 +8,7 @@
 --stratum             Comma-separated list of IP:port for stratum server to listen on
 --p2p                 Comma-separated list of IP:port for p2p server to listen on
 --addpeers            Comma-separated list of IP:port of other p2pool nodes to connect to
+--stratum-ban-time N  Number of seconds to ban misbehaving stratum client, default is 600
 --light-mode          Don't allocate RandomX dataset, saves 2GB of RAM
 --loglevel            Verbosity of the log, integer number between 0 and 6
 --data-dir            Path to store general p2pool files (log, cache, peer data, etc.), default is current directory
@@ -22,6 +23,7 @@
 --in-peers N          Maximum number of incoming connections for p2p server (any value between 10 and 450)
 --start-mining N      Start built-in miner using N threads (any value between 1 and 64)
 --mini                Connect to p2pool-mini sidechain. Note that it will also change default p2p port from 37889 to 37888
+--nano                Connect to p2pool-nano sidechain. Note that it will also change default p2p port from 37889 to 37890
 --no-autodiff         Disable automatic difficulty adjustment for miners connected to stratum (WARNING: incompatible with Nicehash and MRR)
 --rpc-login           Specify username[:password] required for Monero RPC server
 --socks5              Specify IP:port of a SOCKS5 proxy to use for outgoing connections
@@ -60,7 +62,7 @@ p2pool.exe --host 127.0.0.1 --host node.monerodevs.org --rpc-port 18089 --zmq-po
 
 ### Merge mining
 
-Merge mining will be available in P2Pool after the fork on October 12th, 2024. Version 4.0 or newer is required to use it.
+Merge mining is available in P2Pool since the fork that happened on October 12th, 2024. Version 4.0 or newer is required to use it.
 
 - Blockchains that will support [Merge mining RPC API](https://github.com/SChernykh/p2pool/blob/master/docs/MERGE_MINING.MD#proposed-rpc-api)
   - [Townforge](https://townforge.net/) supports it in their [tmp-mm branch](https://git.townforge.net/townforge/townforge/src/branch/tmp-mm) (not released yet)
@@ -69,15 +71,27 @@ Merge mining will be available in P2Pool after the fork on October 12th, 2024. V
   p2pool.exe --wallet YOUR_MONERO_WALLET_ADDRESS --merge-mine IP:port YOUR_WALLET_ADDRESS_ON_ANOTHER_BLOCKCHAIN
   ```
 
-- [Tari](https://www.tari.com/) uses their own gRPC API and requires a different command line:
-  ```
-  ./p2pool --wallet YOUR_MONERO_WALLET_ADDRESS --merge-mine tari://IP:port TARI_WALLET_ADDRESS
-  ```
-  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).
+### Tari merge mining
+
+[Tari](https://www.tari.com/) uses their own gRPC API and requires a different command line:
+```
+./p2pool --wallet YOUR_MONERO_WALLET_ADDRESS --merge-mine tari://TARI_NODE_IP:18102 TARI_WALLET_ADDRESS
+```
+and on the Tari side
+```
+./minotari_node --grpc-enabled --mining-enabled
+```
+TARI_NODE_IP is 127.0.0.1 if you run both on the same machine (recommended).
+
+Merge mining is available on Tari's mainnet:
+- Download [Tari suite](https://github.com/tari-project/tari/releases/latest) for your OS
+- Run Minotari node and wait until in synchronizes
+- Run Minotari console wallet to create a Tari wallet
+- Copy the interactive wallet address from the "Receive" tab of the wallet
+- Paste it into the P2Pool command line above
+- Everything is ready now to start merge mining Monero and Tari!
+
+Note that Tari will be mined in solo mode (only full Tari blocks can be mined for now). This doesn't affect P2Pool payouts - they will stay the same.
 
 ### TLS
 
@@ -101,4 +115,4 @@ P2Pool supports certificate pinning on RPC-SSL connections via `--rpc-ssl-finger
 openssl x509 -in rpc_ssl.crt -pubkey -noout -inform pem | openssl pkey -pubin -outform der | openssl dgst -sha256 -binary | openssl enc -base64
 ```
 
-By default, `rpc_ssl.crt` can be found in Monero data directory: `/home/username/.bitmonero/rpc_ssl.crt` on Linux and `C:\ProgramData\bitmonero\rpc_ssl.crt` on Windows.
+By default, `rpc_ssl.crt` can be found in Monero data directory: `/home/username/.bitmonero/rpc_ssl.crt` on Linux and `C:\ProgramData\bitmonero\rpc_ssl.crt` on Windows.

docs/CONSOLE_COMMANDS.MD

@@ -18,3 +18,30 @@ start_mining **T**|start mining (**T** is the number of threads to use, must be
 stop_mining|stop mining
 exit|terminate p2pool
 version|show p2pool version
+
+### Non-interactive console access
+
+It's possible to send console commands via a local TCP connection. For this, you need to enable the API: `--data-api api --local-api`.
+
+A sample Python script that sends console commands to P2Pool via TCP:
+
+```
+import sys
+import socket
+import json
+
+with open('api/local/console', 'r') as file:
+    data = json.load(file)
+
+s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+s.connect(('127.0.0.1', data['tcp_port']))
+
+command = data['cookie'];
+command += sys.argv[1];
+command += '\n';
+
+s.sendall(command.encode('utf-8'))
+s.close()
+```
+
+Run it in P2Pool's directory: `python3 ./p2pool_cmd.py status`

external/src/Tari/proto/gRPC/base_node.grpc.pb.cc

@@ -59,6 +59,7 @@ static const char* BaseNode_method_names[] = {
   "/tari.rpc.BaseNode/GetShardKey",
   "/tari.rpc.BaseNode/GetTemplateRegistrations",
   "/tari.rpc.BaseNode/GetSideChainUtxos",
+  "/tari.rpc.BaseNode/GetNetworkState",
 };
 
 std::unique_ptr< BaseNode::Stub> BaseNode::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) {
@@ -104,6 +105,7 @@ BaseNode::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel,
   , rpcmethod_GetShardKey_(BaseNode_method_names[33], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
   , rpcmethod_GetTemplateRegistrations_(BaseNode_method_names[34], options.suffix_for_stats(),::grpc::internal::RpcMethod::SERVER_STREAMING, channel)
   , rpcmethod_GetSideChainUtxos_(BaseNode_method_names[35], options.suffix_for_stats(),::grpc::internal::RpcMethod::SERVER_STREAMING, channel)
+  , rpcmethod_GetNetworkState_(BaseNode_method_names[36], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
   {}
 
 ::grpc::ClientReader< ::tari::rpc::BlockHeaderResponse>* BaseNode::Stub::ListHeadersRaw(::grpc::ClientContext* context, const ::tari::rpc::ListHeadersRequest& request) {
@@ -850,6 +852,29 @@ void BaseNode::Stub::async::GetSideChainUtxos(::grpc::ClientContext* context, co
   return ::grpc::internal::ClientAsyncReaderFactory< ::tari::rpc::GetSideChainUtxosResponse>::Create(channel_.get(), cq, rpcmethod_GetSideChainUtxos_, context, request, false, nullptr);
 }
 
+::grpc::Status BaseNode::Stub::GetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::tari::rpc::GetNetworkStateResponse* response) {
+  return ::grpc::internal::BlockingUnaryCall< ::tari::rpc::GetNetworkStateRequest, ::tari::rpc::GetNetworkStateResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_GetNetworkState_, context, request, response);
+}
+
+void BaseNode::Stub::async::GetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest* request, ::tari::rpc::GetNetworkStateResponse* response, std::function<void(::grpc::Status)> f) {
+  ::grpc::internal::CallbackUnaryCall< ::tari::rpc::GetNetworkStateRequest, ::tari::rpc::GetNetworkStateResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_GetNetworkState_, context, request, response, std::move(f));
+}
+
+void BaseNode::Stub::async::GetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest* request, ::tari::rpc::GetNetworkStateResponse* response, ::grpc::ClientUnaryReactor* reactor) {
+  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_GetNetworkState_, context, request, response, reactor);
+}
+
+::grpc::ClientAsyncResponseReader< ::tari::rpc::GetNetworkStateResponse>* BaseNode::Stub::PrepareAsyncGetNetworkStateRaw(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::grpc::CompletionQueue* cq) {
+  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::tari::rpc::GetNetworkStateResponse, ::tari::rpc::GetNetworkStateRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_GetNetworkState_, context, request);
+}
+
+::grpc::ClientAsyncResponseReader< ::tari::rpc::GetNetworkStateResponse>* BaseNode::Stub::AsyncGetNetworkStateRaw(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::grpc::CompletionQueue* cq) {
+  auto* result =
+    this->PrepareAsyncGetNetworkStateRaw(context, request, cq);
+  result->StartCall();
+  return result;
+}
+
 BaseNode::Service::Service() {
   AddMethod(new ::grpc::internal::RpcServiceMethod(
       BaseNode_method_names[0],
@@ -1211,6 +1236,16 @@ BaseNode::Service::Service() {
              ::grpc::ServerWriter<::tari::rpc::GetSideChainUtxosResponse>* writer) {
                return service->GetSideChainUtxos(ctx, req, writer);
              }, this)));
+  AddMethod(new ::grpc::internal::RpcServiceMethod(
+      BaseNode_method_names[36],
+      ::grpc::internal::RpcMethod::NORMAL_RPC,
+      new ::grpc::internal::RpcMethodHandler< BaseNode::Service, ::tari::rpc::GetNetworkStateRequest, ::tari::rpc::GetNetworkStateResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
+          [](BaseNode::Service* service,
+             ::grpc::ServerContext* ctx,
+             const ::tari::rpc::GetNetworkStateRequest* req,
+             ::tari::rpc::GetNetworkStateResponse* resp) {
+               return service->GetNetworkState(ctx, req, resp);
+             }, this)));
 }
 
 BaseNode::Service::~Service() {
@@ -1468,6 +1503,13 @@ BaseNode::Service::~Service() {
   return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
 }
 
+::grpc::Status BaseNode::Service::GetNetworkState(::grpc::ServerContext* context, const ::tari::rpc::GetNetworkStateRequest* request, ::tari::rpc::GetNetworkStateResponse* response) {
+  (void) context;
+  (void) request;
+  (void) response;
+  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
+}
+
 
 }  // namespace tari
 }  // namespace rpc

external/src/Tari/proto/gRPC/base_node.grpc.pb.h

@@ -367,6 +367,13 @@ class BaseNode final {
     std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::tari::rpc::GetSideChainUtxosResponse>> PrepareAsyncGetSideChainUtxos(::grpc::ClientContext* context, const ::tari::rpc::GetSideChainUtxosRequest& request, ::grpc::CompletionQueue* cq) {
       return std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::tari::rpc::GetSideChainUtxosResponse>>(PrepareAsyncGetSideChainUtxosRaw(context, request, cq));
     }
+    virtual ::grpc::Status GetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::tari::rpc::GetNetworkStateResponse* response) = 0;
+    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::tari::rpc::GetNetworkStateResponse>> AsyncGetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::grpc::CompletionQueue* cq) {
+      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::tari::rpc::GetNetworkStateResponse>>(AsyncGetNetworkStateRaw(context, request, cq));
+    }
+    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::tari::rpc::GetNetworkStateResponse>> PrepareAsyncGetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::grpc::CompletionQueue* cq) {
+      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::tari::rpc::GetNetworkStateResponse>>(PrepareAsyncGetNetworkStateRaw(context, request, cq));
+    }
     class async_interface {
      public:
       virtual ~async_interface() {}
@@ -462,6 +469,8 @@ class BaseNode final {
       // Get templates
       virtual void GetTemplateRegistrations(::grpc::ClientContext* context, const ::tari::rpc::GetTemplateRegistrationsRequest* request, ::grpc::ClientReadReactor< ::tari::rpc::GetTemplateRegistrationResponse>* reactor) = 0;
       virtual void GetSideChainUtxos(::grpc::ClientContext* context, const ::tari::rpc::GetSideChainUtxosRequest* request, ::grpc::ClientReadReactor< ::tari::rpc::GetSideChainUtxosResponse>* reactor) = 0;
+      virtual void GetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest* request, ::tari::rpc::GetNetworkStateResponse* response, std::function<void(::grpc::Status)>) = 0;
+      virtual void GetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest* request, ::tari::rpc::GetNetworkStateResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
     };
     typedef class async_interface experimental_async_interface;
     virtual class async_interface* async() { return nullptr; }
@@ -551,6 +560,8 @@ class BaseNode final {
     virtual ::grpc::ClientReaderInterface< ::tari::rpc::GetSideChainUtxosResponse>* GetSideChainUtxosRaw(::grpc::ClientContext* context, const ::tari::rpc::GetSideChainUtxosRequest& request) = 0;
     virtual ::grpc::ClientAsyncReaderInterface< ::tari::rpc::GetSideChainUtxosResponse>* AsyncGetSideChainUtxosRaw(::grpc::ClientContext* context, const ::tari::rpc::GetSideChainUtxosRequest& request, ::grpc::CompletionQueue* cq, void* tag) = 0;
     virtual ::grpc::ClientAsyncReaderInterface< ::tari::rpc::GetSideChainUtxosResponse>* PrepareAsyncGetSideChainUtxosRaw(::grpc::ClientContext* context, const ::tari::rpc::GetSideChainUtxosRequest& request, ::grpc::CompletionQueue* cq) = 0;
+    virtual ::grpc::ClientAsyncResponseReaderInterface< ::tari::rpc::GetNetworkStateResponse>* AsyncGetNetworkStateRaw(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::grpc::CompletionQueue* cq) = 0;
+    virtual ::grpc::ClientAsyncResponseReaderInterface< ::tari::rpc::GetNetworkStateResponse>* PrepareAsyncGetNetworkStateRaw(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::grpc::CompletionQueue* cq) = 0;
   };
   class Stub final : public StubInterface {
    public:
@@ -831,6 +842,13 @@ class BaseNode final {
     std::unique_ptr< ::grpc::ClientAsyncReader< ::tari::rpc::GetSideChainUtxosResponse>> PrepareAsyncGetSideChainUtxos(::grpc::ClientContext* context, const ::tari::rpc::GetSideChainUtxosRequest& request, ::grpc::CompletionQueue* cq) {
       return std::unique_ptr< ::grpc::ClientAsyncReader< ::tari::rpc::GetSideChainUtxosResponse>>(PrepareAsyncGetSideChainUtxosRaw(context, request, cq));
     }
+    ::grpc::Status GetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::tari::rpc::GetNetworkStateResponse* response) override;
+    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::tari::rpc::GetNetworkStateResponse>> AsyncGetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::grpc::CompletionQueue* cq) {
+      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::tari::rpc::GetNetworkStateResponse>>(AsyncGetNetworkStateRaw(context, request, cq));
+    }
+    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::tari::rpc::GetNetworkStateResponse>> PrepareAsyncGetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::grpc::CompletionQueue* cq) {
+      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::tari::rpc::GetNetworkStateResponse>>(PrepareAsyncGetNetworkStateRaw(context, request, cq));
+    }
     class async final :
       public StubInterface::async_interface {
      public:
@@ -894,6 +912,8 @@ class BaseNode final {
       void GetShardKey(::grpc::ClientContext* context, const ::tari::rpc::GetShardKeyRequest* request, ::tari::rpc::GetShardKeyResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
       void GetTemplateRegistrations(::grpc::ClientContext* context, const ::tari::rpc::GetTemplateRegistrationsRequest* request, ::grpc::ClientReadReactor< ::tari::rpc::GetTemplateRegistrationResponse>* reactor) override;
       void GetSideChainUtxos(::grpc::ClientContext* context, const ::tari::rpc::GetSideChainUtxosRequest* request, ::grpc::ClientReadReactor< ::tari::rpc::GetSideChainUtxosResponse>* reactor) override;
+      void GetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest* request, ::tari::rpc::GetNetworkStateResponse* response, std::function<void(::grpc::Status)>) override;
+      void GetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest* request, ::tari::rpc::GetNetworkStateResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
      private:
       friend class Stub;
       explicit async(Stub* stub): stub_(stub) { }
@@ -989,6 +1009,8 @@ class BaseNode final {
     ::grpc::ClientReader< ::tari::rpc::GetSideChainUtxosResponse>* GetSideChainUtxosRaw(::grpc::ClientContext* context, const ::tari::rpc::GetSideChainUtxosRequest& request) override;
     ::grpc::ClientAsyncReader< ::tari::rpc::GetSideChainUtxosResponse>* AsyncGetSideChainUtxosRaw(::grpc::ClientContext* context, const ::tari::rpc::GetSideChainUtxosRequest& request, ::grpc::CompletionQueue* cq, void* tag) override;
     ::grpc::ClientAsyncReader< ::tari::rpc::GetSideChainUtxosResponse>* PrepareAsyncGetSideChainUtxosRaw(::grpc::ClientContext* context, const ::tari::rpc::GetSideChainUtxosRequest& request, ::grpc::CompletionQueue* cq) override;
+    ::grpc::ClientAsyncResponseReader< ::tari::rpc::GetNetworkStateResponse>* AsyncGetNetworkStateRaw(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::grpc::CompletionQueue* cq) override;
+    ::grpc::ClientAsyncResponseReader< ::tari::rpc::GetNetworkStateResponse>* PrepareAsyncGetNetworkStateRaw(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::grpc::CompletionQueue* cq) override;
     const ::grpc::internal::RpcMethod rpcmethod_ListHeaders_;
     const ::grpc::internal::RpcMethod rpcmethod_GetHeaderByHash_;
     const ::grpc::internal::RpcMethod rpcmethod_GetBlocks_;
@@ -1025,6 +1047,7 @@ class BaseNode final {
     const ::grpc::internal::RpcMethod rpcmethod_GetShardKey_;
     const ::grpc::internal::RpcMethod rpcmethod_GetTemplateRegistrations_;
     const ::grpc::internal::RpcMethod rpcmethod_GetSideChainUtxos_;
+    const ::grpc::internal::RpcMethod rpcmethod_GetNetworkState_;
   };
   static std::unique_ptr<Stub> NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
 
@@ -1100,6 +1123,7 @@ class BaseNode final {
     // Get templates
     virtual ::grpc::Status GetTemplateRegistrations(::grpc::ServerContext* context, const ::tari::rpc::GetTemplateRegistrationsRequest* request, ::grpc::ServerWriter< ::tari::rpc::GetTemplateRegistrationResponse>* writer);
     virtual ::grpc::Status GetSideChainUtxos(::grpc::ServerContext* context, const ::tari::rpc::GetSideChainUtxosRequest* request, ::grpc::ServerWriter< ::tari::rpc::GetSideChainUtxosResponse>* writer);
+    virtual ::grpc::Status GetNetworkState(::grpc::ServerContext* context, const ::tari::rpc::GetNetworkStateRequest* request, ::tari::rpc::GetNetworkStateResponse* response);
   };
   template <class BaseClass>
   class WithAsyncMethod_ListHeaders : public BaseClass {
@@ -1821,7 +1845,27 @@ class BaseNode final {
       ::grpc::Service::RequestAsyncServerStreaming(35, context, request, writer, new_call_cq, notification_cq, tag);
     }
   };
-  typedef WithAsyncMethod_ListHeaders<WithAsyncMethod_GetHeaderByHash<WithAsyncMethod_GetBlocks<WithAsyncMethod_GetBlockTiming<WithAsyncMethod_GetConstants<WithAsyncMethod_GetBlockSize<WithAsyncMethod_GetBlockFees<WithAsyncMethod_GetVersion<WithAsyncMethod_CheckForUpdates<WithAsyncMethod_GetTokensInCirculation<WithAsyncMethod_GetNetworkDifficulty<WithAsyncMethod_GetNewBlockTemplate<WithAsyncMethod_GetNewBlock<WithAsyncMethod_GetNewBlockWithCoinbases<WithAsyncMethod_GetNewBlockTemplateWithCoinbases<WithAsyncMethod_GetNewBlockBlob<WithAsyncMethod_SubmitBlock<WithAsyncMethod_SubmitBlockBlob<WithAsyncMethod_SubmitTransaction<WithAsyncMethod_GetSyncInfo<WithAsyncMethod_GetSyncProgress<WithAsyncMethod_GetTipInfo<WithAsyncMethod_SearchKernels<WithAsyncMethod_SearchUtxos<WithAsyncMethod_FetchMatchingUtxos<WithAsyncMethod_GetPeers<WithAsyncMethod_GetMempoolTransactions<WithAsyncMethod_TransactionState<WithAsyncMethod_Identify<WithAsyncMethod_GetNetworkStatus<WithAsyncMethod_ListConnectedPeers<WithAsyncMethod_GetMempoolStats<WithAsyncMethod_GetActiveValidatorNodes<WithAsyncMethod_GetShardKey<WithAsyncMethod_GetTemplateRegistrations<WithAsyncMethod_GetSideChainUtxos<Service > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > AsyncService;
+  template <class BaseClass>
+  class WithAsyncMethod_GetNetworkState : public BaseClass {
+   private:
+    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
+   public:
+    WithAsyncMethod_GetNetworkState() {
+      ::grpc::Service::MarkMethodAsync(36);
+    }
+    ~WithAsyncMethod_GetNetworkState() override {
+      BaseClassMustBeDerivedFromService(this);
+    }
+    // disable synchronous version of this method
+    ::grpc::Status GetNetworkState(::grpc::ServerContext* /*context*/, const ::tari::rpc::GetNetworkStateRequest* /*request*/, ::tari::rpc::GetNetworkStateResponse* /*response*/) override {
+      abort();
+      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
+    }
+    void RequestGetNetworkState(::grpc::ServerContext* context, ::tari::rpc::GetNetworkStateRequest* request, ::grpc::ServerAsyncResponseWriter< ::tari::rpc::GetNetworkStateResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
+      ::grpc::Service::RequestAsyncUnary(36, context, request, response, new_call_cq, notification_cq, tag);
+    }
+  };
+  typedef WithAsyncMethod_ListHeaders<WithAsyncMethod_GetHeaderByHash<WithAsyncMethod_GetBlocks<WithAsyncMethod_GetBlockTiming<WithAsyncMethod_GetConstants<WithAsyncMethod_GetBlockSize<WithAsyncMethod_GetBlockFees<WithAsyncMethod_GetVersion<WithAsyncMethod_CheckForUpdates<WithAsyncMethod_GetTokensInCirculation<WithAsyncMethod_GetNetworkDifficulty<WithAsyncMethod_GetNewBlockTemplate<WithAsyncMethod_GetNewBlock<WithAsyncMethod_GetNewBlockWithCoinbases<WithAsyncMethod_GetNewBlockTemplateWithCoinbases<WithAsyncMethod_GetNewBlockBlob<WithAsyncMethod_SubmitBlock<WithAsyncMethod_SubmitBlockBlob<WithAsyncMethod_SubmitTransaction<WithAsyncMethod_GetSyncInfo<WithAsyncMethod_GetSyncProgress<WithAsyncMethod_GetTipInfo<WithAsyncMethod_SearchKernels<WithAsyncMethod_SearchUtxos<WithAsyncMethod_FetchMatchingUtxos<WithAsyncMethod_GetPeers<WithAsyncMethod_GetMempoolTransactions<WithAsyncMethod_TransactionState<WithAsyncMethod_Identify<WithAsyncMethod_GetNetworkStatus<WithAsyncMethod_ListConnectedPeers<WithAsyncMethod_GetMempoolStats<WithAsyncMethod_GetActiveValidatorNodes<WithAsyncMethod_GetShardKey<WithAsyncMethod_GetTemplateRegistrations<WithAsyncMethod_GetSideChainUtxos<WithAsyncMethod_GetNetworkState<Service > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > AsyncService;
   template <class BaseClass>
   class WithCallbackMethod_ListHeaders : public BaseClass {
    private:
@@ -2734,7 +2778,34 @@ class BaseNode final {
     virtual ::grpc::ServerWriteReactor< ::tari::rpc::GetSideChainUtxosResponse>* GetSideChainUtxos(
       ::grpc::CallbackServerContext* /*context*/, const ::tari::rpc::GetSideChainUtxosRequest* /*request*/)  { return nullptr; }
   };
-  typedef WithCallbackMethod_ListHeaders<WithCallbackMethod_GetHeaderByHash<WithCallbackMethod_GetBlocks<WithCallbackMethod_GetBlockTiming<WithCallbackMethod_GetConstants<WithCallbackMethod_GetBlockSize<WithCallbackMethod_GetBlockFees<WithCallbackMethod_GetVersion<WithCallbackMethod_CheckForUpdates<WithCallbackMethod_GetTokensInCirculation<WithCallbackMethod_GetNetworkDifficulty<WithCallbackMethod_GetNewBlockTemplate<WithCallbackMethod_GetNewBlock<WithCallbackMethod_GetNewBlockWithCoinbases<WithCallbackMethod_GetNewBlockTemplateWithCoinbases<WithCallbackMethod_GetNewBlockBlob<WithCallbackMethod_SubmitBlock<WithCallbackMethod_SubmitBlockBlob<WithCallbackMethod_SubmitTransaction<WithCallbackMethod_GetSyncInfo<WithCallbackMethod_GetSyncProgress<WithCallbackMethod_GetTipInfo<WithCallbackMethod_SearchKernels<WithCallbackMethod_SearchUtxos<WithCallbackMethod_FetchMatchingUtxos<WithCallbackMethod_GetPeers<WithCallbackMethod_GetMempoolTransactions<WithCallbackMethod_TransactionState<WithCallbackMethod_Identify<WithCallbackMethod_GetNetworkStatus<WithCallbackMethod_ListConnectedPeers<WithCallbackMethod_GetMempoolStats<WithCallbackMethod_GetActiveValidatorNodes<WithCallbackMethod_GetShardKey<WithCallbackMethod_GetTemplateRegistrations<WithCallbackMethod_GetSideChainUtxos<Service > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > CallbackService;
+  template <class BaseClass>
+  class WithCallbackMethod_GetNetworkState : public BaseClass {
+   private:
+    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
+   public:
+    WithCallbackMethod_GetNetworkState() {
+      ::grpc::Service::MarkMethodCallback(36,
+          new ::grpc::internal::CallbackUnaryHandler< ::tari::rpc::GetNetworkStateRequest, ::tari::rpc::GetNetworkStateResponse>(
+            [this](
+                   ::grpc::CallbackServerContext* context, const ::tari::rpc::GetNetworkStateRequest* request, ::tari::rpc::GetNetworkStateResponse* response) { return this->GetNetworkState(context, request, response); }));}
+    void SetMessageAllocatorFor_GetNetworkState(
+        ::grpc::MessageAllocator< ::tari::rpc::GetNetworkStateRequest, ::tari::rpc::GetNetworkStateResponse>* allocator) {
+      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(36);
+      static_cast<::grpc::internal::CallbackUnaryHandler< ::tari::rpc::GetNetworkStateRequest, ::tari::rpc::GetNetworkStateResponse>*>(handler)
+              ->SetMessageAllocator(allocator);
+    }
+    ~WithCallbackMethod_GetNetworkState() override {
+      BaseClassMustBeDerivedFromService(this);
+    }
+    // disable synchronous version of this method
+    ::grpc::Status GetNetworkState(::grpc::ServerContext* /*context*/, const ::tari::rpc::GetNetworkStateRequest* /*request*/, ::tari::rpc::GetNetworkStateResponse* /*response*/) override {
+      abort();
+      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
+    }
+    virtual ::grpc::ServerUnaryReactor* GetNetworkState(
+      ::grpc::CallbackServerContext* /*context*/, const ::tari::rpc::GetNetworkStateRequest* /*request*/, ::tari::rpc::GetNetworkStateResponse* /*response*/)  { return nullptr; }
+  };
+  typedef WithCallbackMethod_ListHeaders<WithCallbackMethod_GetHeaderByHash<WithCallbackMethod_GetBlocks<WithCallbackMethod_GetBlockTiming<WithCallbackMethod_GetConstants<WithCallbackMethod_GetBlockSize<WithCallbackMethod_GetBlockFees<WithCallbackMethod_GetVersion<WithCallbackMethod_CheckForUpdates<WithCallbackMethod_GetTokensInCirculation<WithCallbackMethod_GetNetworkDifficulty<WithCallbackMethod_GetNewBlockTemplate<WithCallbackMethod_GetNewBlock<WithCallbackMethod_GetNewBlockWithCoinbases<WithCallbackMethod_GetNewBlockTemplateWithCoinbases<WithCallbackMethod_GetNewBlockBlob<WithCallbackMethod_SubmitBlock<WithCallbackMethod_SubmitBlockBlob<WithCallbackMethod_SubmitTransaction<WithCallbackMethod_GetSyncInfo<WithCallbackMethod_GetSyncProgress<WithCallbackMethod_GetTipInfo<WithCallbackMethod_SearchKernels<WithCallbackMethod_SearchUtxos<WithCallbackMethod_FetchMatchingUtxos<WithCallbackMethod_GetPeers<WithCallbackMethod_GetMempoolTransactions<WithCallbackMethod_TransactionState<WithCallbackMethod_Identify<WithCallbackMethod_GetNetworkStatus<WithCallbackMethod_ListConnectedPeers<WithCallbackMethod_GetMempoolStats<WithCallbackMethod_GetActiveValidatorNodes<WithCallbackMethod_GetShardKey<WithCallbackMethod_GetTemplateRegistrations<WithCallbackMethod_GetSideChainUtxos<WithCallbackMethod_GetNetworkState<Service > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > CallbackService;
   typedef CallbackService ExperimentalCallbackService;
   template <class BaseClass>
   class WithGenericMethod_ListHeaders : public BaseClass {
@@ -3349,6 +3420,23 @@ class BaseNode final {
     }
   };
   template <class BaseClass>
+  class WithGenericMethod_GetNetworkState : public BaseClass {
+   private:
+    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
+   public:
+    WithGenericMethod_GetNetworkState() {
+      ::grpc::Service::MarkMethodGeneric(36);
+    }
+    ~WithGenericMethod_GetNetworkState() override {
+      BaseClassMustBeDerivedFromService(this);
+    }
+    // disable synchronous version of this method
+    ::grpc::Status GetNetworkState(::grpc::ServerContext* /*context*/, const ::tari::rpc::GetNetworkStateRequest* /*request*/, ::tari::rpc::GetNetworkStateResponse* /*response*/) override {
+      abort();
+      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
+    }
+  };
+  template <class BaseClass>
   class WithRawMethod_ListHeaders : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
@@ -4069,6 +4157,26 @@ class BaseNode final {
     }
   };
   template <class BaseClass>
+  class WithRawMethod_GetNetworkState : public BaseClass {
+   private:
+    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
+   public:
+    WithRawMethod_GetNetworkState() {
+      ::grpc::Service::MarkMethodRaw(36);
+    }
+    ~WithRawMethod_GetNetworkState() override {
+      BaseClassMustBeDerivedFromService(this);
+    }
+    // disable synchronous version of this method
+    ::grpc::Status GetNetworkState(::grpc::ServerContext* /*context*/, const ::tari::rpc::GetNetworkStateRequest* /*request*/, ::tari::rpc::GetNetworkStateResponse* /*response*/) override {
+      abort();
+      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
+    }
+    void RequestGetNetworkState(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
+      ::grpc::Service::RequestAsyncUnary(36, context, request, response, new_call_cq, notification_cq, tag);
+    }
+  };
+  template <class BaseClass>
   class WithRawCallbackMethod_ListHeaders : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
@@ -4861,6 +4969,28 @@ class BaseNode final {
       ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/)  { return nullptr; }
   };
   template <class BaseClass>
+  class WithRawCallbackMethod_GetNetworkState : public BaseClass {
+   private:
+    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
+   public:
+    WithRawCallbackMethod_GetNetworkState() {
+      ::grpc::Service::MarkMethodRawCallback(36,
+          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
+            [this](
+                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->GetNetworkState(context, request, response); }));
+    }
+    ~WithRawCallbackMethod_GetNetworkState() override {
+      BaseClassMustBeDerivedFromService(this);
+    }
+    // disable synchronous version of this method
+    ::grpc::Status GetNetworkState(::grpc::ServerContext* /*context*/, const ::tari::rpc::GetNetworkStateRequest* /*request*/, ::tari::rpc::GetNetworkStateResponse* /*response*/) override {
+      abort();
+      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
+    }
+    virtual ::grpc::ServerUnaryReactor* GetNetworkState(
+      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
+  };
+  template <class BaseClass>
   class WithStreamedUnaryMethod_GetHeaderByHash : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
@@ -5508,7 +5638,34 @@ class BaseNode final {
     // replace default version of method with streamed unary
     virtual ::grpc::Status StreamedGetShardKey(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::tari::rpc::GetShardKeyRequest,::tari::rpc::GetShardKeyResponse>* server_unary_streamer) = 0;
   };
-  typedef WithStreamedUnaryMethod_GetHeaderByHash<WithStreamedUnaryMethod_GetBlockTiming<WithStreamedUnaryMethod_GetConstants<WithStreamedUnaryMethod_GetBlockSize<WithStreamedUnaryMethod_GetBlockFees<WithStreamedUnaryMethod_GetVersion<WithStreamedUnaryMethod_CheckForUpdates<WithStreamedUnaryMethod_GetNewBlockTemplate<WithStreamedUnaryMethod_GetNewBlock<WithStreamedUnaryMethod_GetNewBlockWithCoinbases<WithStreamedUnaryMethod_GetNewBlockTemplateWithCoinbases<WithStreamedUnaryMethod_GetNewBlockBlob<WithStreamedUnaryMethod_SubmitBlock<WithStreamedUnaryMethod_SubmitBlockBlob<WithStreamedUnaryMethod_SubmitTransaction<WithStreamedUnaryMethod_GetSyncInfo<WithStreamedUnaryMethod_GetSyncProgress<WithStreamedUnaryMethod_GetTipInfo<WithStreamedUnaryMethod_TransactionState<WithStreamedUnaryMethod_Identify<WithStreamedUnaryMethod_GetNetworkStatus<WithStreamedUnaryMethod_ListConnectedPeers<WithStreamedUnaryMethod_GetMempoolStats<WithStreamedUnaryMethod_GetShardKey<Service > > > > > > > > > > > > > > > > > > > > > > > > StreamedUnaryService;
+  template <class BaseClass>
+  class WithStreamedUnaryMethod_GetNetworkState : public BaseClass {
+   private:
+    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
+   public:
+    WithStreamedUnaryMethod_GetNetworkState() {
+      ::grpc::Service::MarkMethodStreamed(36,
+        new ::grpc::internal::StreamedUnaryHandler<
+          ::tari::rpc::GetNetworkStateRequest, ::tari::rpc::GetNetworkStateResponse>(
+            [this](::grpc::ServerContext* context,
+                   ::grpc::ServerUnaryStreamer<
+                     ::tari::rpc::GetNetworkStateRequest, ::tari::rpc::GetNetworkStateResponse>* streamer) {
+                       return this->StreamedGetNetworkState(context,
+                         streamer);
+                  }));
+    }
+    ~WithStreamedUnaryMethod_GetNetworkState() override {
+      BaseClassMustBeDerivedFromService(this);
+    }
+    // disable regular version of this method
+    ::grpc::Status GetNetworkState(::grpc::ServerContext* /*context*/, const ::tari::rpc::GetNetworkStateRequest* /*request*/, ::tari::rpc::GetNetworkStateResponse* /*response*/) override {
+      abort();
+      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
+    }
+    // replace default version of method with streamed unary
+    virtual ::grpc::Status StreamedGetNetworkState(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::tari::rpc::GetNetworkStateRequest,::tari::rpc::GetNetworkStateResponse>* server_unary_streamer) = 0;
+  };
+  typedef WithStreamedUnaryMethod_GetHeaderByHash<WithStreamedUnaryMethod_GetBlockTiming<WithStreamedUnaryMethod_GetConstants<WithStreamedUnaryMethod_GetBlockSize<WithStreamedUnaryMethod_GetBlockFees<WithStreamedUnaryMethod_GetVersion<WithStreamedUnaryMethod_CheckForUpdates<WithStreamedUnaryMethod_GetNewBlockTemplate<WithStreamedUnaryMethod_GetNewBlock<WithStreamedUnaryMethod_GetNewBlockWithCoinbases<WithStreamedUnaryMethod_GetNewBlockTemplateWithCoinbases<WithStreamedUnaryMethod_GetNewBlockBlob<WithStreamedUnaryMethod_SubmitBlock<WithStreamedUnaryMethod_SubmitBlockBlob<WithStreamedUnaryMethod_SubmitTransaction<WithStreamedUnaryMethod_GetSyncInfo<WithStreamedUnaryMethod_GetSyncProgress<WithStreamedUnaryMethod_GetTipInfo<WithStreamedUnaryMethod_TransactionState<WithStreamedUnaryMethod_Identify<WithStreamedUnaryMethod_GetNetworkStatus<WithStreamedUnaryMethod_ListConnectedPeers<WithStreamedUnaryMethod_GetMempoolStats<WithStreamedUnaryMethod_GetShardKey<WithStreamedUnaryMethod_GetNetworkState<Service > > > > > > > > > > > > > > > > > > > > > > > > > StreamedUnaryService;
   template <class BaseClass>
   class WithSplitStreamingMethod_ListHeaders : public BaseClass {
    private:
@@ -5834,7 +5991,7 @@ class BaseNode final {
     virtual ::grpc::Status StreamedGetSideChainUtxos(::grpc::ServerContext* context, ::grpc::ServerSplitStreamer< ::tari::rpc::GetSideChainUtxosRequest,::tari::rpc::GetSideChainUtxosResponse>* server_split_streamer) = 0;
   };
   typedef WithSplitStreamingMethod_ListHeaders<WithSplitStreamingMethod_GetBlocks<WithSplitStreamingMethod_GetTokensInCirculation<WithSplitStreamingMethod_GetNetworkDifficulty<WithSplitStreamingMethod_SearchKernels<WithSplitStreamingMethod_SearchUtxos<WithSplitStreamingMethod_FetchMatchingUtxos<WithSplitStreamingMethod_GetPeers<WithSplitStreamingMethod_GetMempoolTransactions<WithSplitStreamingMethod_GetActiveValidatorNodes<WithSplitStreamingMethod_GetTemplateRegistrations<WithSplitStreamingMethod_GetSideChainUtxos<Service > > > > > > > > > > > > SplitStreamedService;
-  typedef WithSplitStreamingMethod_ListHeaders<WithStreamedUnaryMethod_GetHeaderByHash<WithSplitStreamingMethod_GetBlocks<WithStreamedUnaryMethod_GetBlockTiming<WithStreamedUnaryMethod_GetConstants<WithStreamedUnaryMethod_GetBlockSize<WithStreamedUnaryMethod_GetBlockFees<WithStreamedUnaryMethod_GetVersion<WithStreamedUnaryMethod_CheckForUpdates<WithSplitStreamingMethod_GetTokensInCirculation<WithSplitStreamingMethod_GetNetworkDifficulty<WithStreamedUnaryMethod_GetNewBlockTemplate<WithStreamedUnaryMethod_GetNewBlock<WithStreamedUnaryMethod_GetNewBlockWithCoinbases<WithStreamedUnaryMethod_GetNewBlockTemplateWithCoinbases<WithStreamedUnaryMethod_GetNewBlockBlob<WithStreamedUnaryMethod_SubmitBlock<WithStreamedUnaryMethod_SubmitBlockBlob<WithStreamedUnaryMethod_SubmitTransaction<WithStreamedUnaryMethod_GetSyncInfo<WithStreamedUnaryMethod_GetSyncProgress<WithStreamedUnaryMethod_GetTipInfo<WithSplitStreamingMethod_SearchKernels<WithSplitStreamingMethod_SearchUtxos<WithSplitStreamingMethod_FetchMatchingUtxos<WithSplitStreamingMethod_GetPeers<WithSplitStreamingMethod_GetMempoolTransactions<WithStreamedUnaryMethod_TransactionState<WithStreamedUnaryMethod_Identify<WithStreamedUnaryMethod_GetNetworkStatus<WithStreamedUnaryMethod_ListConnectedPeers<WithStreamedUnaryMethod_GetMempoolStats<WithSplitStreamingMethod_GetActiveValidatorNodes<WithStreamedUnaryMethod_GetShardKey<WithSplitStreamingMethod_GetTemplateRegistrations<WithSplitStreamingMethod_GetSideChainUtxos<Service > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > StreamedService;
+  typedef WithSplitStreamingMethod_ListHeaders<WithStreamedUnaryMethod_GetHeaderByHash<WithSplitStreamingMethod_GetBlocks<WithStreamedUnaryMethod_GetBlockTiming<WithStreamedUnaryMethod_GetConstants<WithStreamedUnaryMethod_GetBlockSize<WithStreamedUnaryMethod_GetBlockFees<WithStreamedUnaryMethod_GetVersion<WithStreamedUnaryMethod_CheckForUpdates<WithSplitStreamingMethod_GetTokensInCirculation<WithSplitStreamingMethod_GetNetworkDifficulty<WithStreamedUnaryMethod_GetNewBlockTemplate<WithStreamedUnaryMethod_GetNewBlock<WithStreamedUnaryMethod_GetNewBlockWithCoinbases<WithStreamedUnaryMethod_GetNewBlockTemplateWithCoinbases<WithStreamedUnaryMethod_GetNewBlockBlob<WithStreamedUnaryMethod_SubmitBlock<WithStreamedUnaryMethod_SubmitBlockBlob<WithStreamedUnaryMethod_SubmitTransaction<WithStreamedUnaryMethod_GetSyncInfo<WithStreamedUnaryMethod_GetSyncProgress<WithStreamedUnaryMethod_GetTipInfo<WithSplitStreamingMethod_SearchKernels<WithSplitStreamingMethod_SearchUtxos<WithSplitStreamingMethod_FetchMatchingUtxos<WithSplitStreamingMethod_GetPeers<WithSplitStreamingMethod_GetMempoolTransactions<WithStreamedUnaryMethod_TransactionState<WithStreamedUnaryMethod_Identify<WithStreamedUnaryMethod_GetNetworkStatus<WithStreamedUnaryMethod_ListConnectedPeers<WithStreamedUnaryMethod_GetMempoolStats<WithSplitStreamingMethod_GetActiveValidatorNodes<WithStreamedUnaryMethod_GetShardKey<WithSplitStreamingMethod_GetTemplateRegistrations<WithSplitStreamingMethod_GetSideChainUtxos<WithStreamedUnaryMethod_GetNetworkState<Service > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > StreamedService;
 };
 
 }  // namespace rpc

external/src/Tari/proto/gRPC/base_node.proto

@@ -99,6 +99,7 @@ service BaseNode {
     // Get templates
     rpc GetTemplateRegistrations(GetTemplateRegistrationsRequest) returns (stream GetTemplateRegistrationResponse);
     rpc GetSideChainUtxos(GetSideChainUtxosRequest) returns (stream GetSideChainUtxosResponse);
+    rpc GetNetworkState(GetNetworkStateRequest) returns (GetNetworkStateResponse);
 }
 
 message GetAssetMetadataRequest {
@@ -160,6 +161,7 @@ message TipInfoResponse {
     MetaData metadata = 1;
     bool initial_sync_achieved = 2;
     BaseNodeState base_node_state = 3;
+    bool failed_checkpoints = 4;
 }
 
 enum BaseNodeState{
@@ -216,13 +218,17 @@ message NetworkDifficultyResponse {
     uint64 timestamp = 4;
     uint64 pow_algo = 5;
     uint64 sha3x_estimated_hash_rate = 6;
-    uint64 randomx_estimated_hash_rate = 7;
+    uint64 monero_randomx_estimated_hash_rate = 7;
+    uint64 tari_randomx_estimated_hash_rate = 10;
+    uint64 num_coinbases = 8;
+    repeated  bytes coinbase_extras = 9;
 }
 
 // A generic single value response for a specific height
 message ValueAtHeightResponse {
-    uint64 value= 1;
-    uint64 height = 2;
+    uint64 circulating_supply = 1;
+    uint64 spendable_supply = 2;
+    uint64 height = 3;
 }
 
 // A generic uint value
@@ -339,10 +345,11 @@ message MetaData {
     uint64 best_block_height = 1;
     // The block hash of the current tip of the longest valid chain, or `None` for an empty chain
     bytes best_block_hash = 2;
-    // This is the min height this node can provide complete blocks for. A 0 here means this node is archival and can provide complete blocks for every height.
-    uint64 pruned_height = 6;
     // The current geometric mean of the pow of the chain tip, or `None` if there is no chain
     bytes accumulated_difficulty = 5;
+    // This is the min height this node can provide complete blocks for. A 0 here means this node is archival and can provide complete blocks for every height.
+    uint64 pruned_height = 6;
+    uint64 timestamp = 7;
 }
 
 message SyncInfoResponse {
@@ -355,6 +362,8 @@ message SyncProgressResponse {
     uint64 tip_height = 1;
     uint64 local_height = 2;
     SyncState state = 3;
+    string short_desc = 4;
+    uint64 initial_connected_peers = 5;
 }
 
 enum SyncState {
@@ -375,6 +384,7 @@ message GetNewBlockResult{
     bytes merge_mining_hash =3;
     bytes tari_unique_id =4;
     MinerData miner_data = 5;
+    bytes vm_key = 6;
 }
 
 // This is the message that is returned for a miner after it asks for a new block.
@@ -515,3 +525,37 @@ message GetSideChainUtxosResponse {
     repeated TransactionOutput outputs = 2;
 }
 
+message GetNetworkStateRequest {
+}
+
+message GetNetworkStateResponse {
+   // metadata
+    MetaData metadata = 1;
+    // has the base node synced
+    bool initial_sync_achieved = 2;
+    //current state of the base node
+    BaseNodeState base_node_state = 3;
+    // do we have failed checkpoints
+    bool failed_checkpoints = 4;
+    // The block reward of the next tip
+    uint64 reward = 5;
+    // estimate sha3x hash rate
+    uint64 sha3x_estimated_hash_rate = 6;
+    // estimate randomx hash rate
+    uint64 monero_randomx_estimated_hash_rate = 7;
+    uint64 tari_randomx_estimated_hash_rate = 10;
+    // number of connections
+    uint64 num_connections = 8;
+    //liveness results
+    repeated LivenessResult liveness_results = 9;
+}
+
+message LivenessResult{
+    // node id
+    bytes peer_node_id = 1;
+    // time to discover
+    uint64 discover_latency = 2;
+    // Dial latency
+    uint64 ping_latency = 3;
+}
+

external/src/Tari/proto/gRPC/block.pb.cc

@@ -107,6 +107,9 @@ inline constexpr BlockHeader::Impl_::Impl_(
         output_mr_(
             &::google::protobuf::internal::fixed_address_empty_string,
             ::_pbi::ConstantInitialized()),
+        block_output_mr_(
+            &::google::protobuf::internal::fixed_address_empty_string,
+            ::_pbi::ConstantInitialized()),
         kernel_mr_(
             &::google::protobuf::internal::fixed_address_empty_string,
             ::_pbi::ConstantInitialized()),
@@ -149,7 +152,8 @@ inline constexpr NewBlockTemplate::Impl_::Impl_(
     ::_pbi::ConstantInitialized) noexcept
       : _cached_size_{0},
         header_{nullptr},
-        body_{nullptr} {}
+        body_{nullptr},
+        is_mempool_in_sync_{false} {}
 
 template <typename>
 PROTOBUF_CONSTEXPR NewBlockTemplate::NewBlockTemplate(::_pbi::ConstantInitialized)
@@ -227,6 +231,7 @@ const ::uint32_t
         PROTOBUF_FIELD_OFFSET(::tari::rpc::BlockHeader, _impl_.prev_hash_),
         PROTOBUF_FIELD_OFFSET(::tari::rpc::BlockHeader, _impl_.timestamp_),
         PROTOBUF_FIELD_OFFSET(::tari::rpc::BlockHeader, _impl_.output_mr_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::BlockHeader, _impl_.block_output_mr_),
         PROTOBUF_FIELD_OFFSET(::tari::rpc::BlockHeader, _impl_.kernel_mr_),
         PROTOBUF_FIELD_OFFSET(::tari::rpc::BlockHeader, _impl_.input_mr_),
         PROTOBUF_FIELD_OFFSET(::tari::rpc::BlockHeader, _impl_.total_kernel_offset_),
@@ -247,6 +252,7 @@ const ::uint32_t
         ~0u,
         ~0u,
         ~0u,
+        ~0u,
         0,
         ~0u,
         ~0u,
@@ -326,19 +332,21 @@ const ::uint32_t
         ~0u,  // no sizeof(Split)
         PROTOBUF_FIELD_OFFSET(::tari::rpc::NewBlockTemplate, _impl_.header_),
         PROTOBUF_FIELD_OFFSET(::tari::rpc::NewBlockTemplate, _impl_.body_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::NewBlockTemplate, _impl_.is_mempool_in_sync_),
         0,
         1,
+        ~0u,
 };
 
 static const ::_pbi::MigrationSchema
     schemas[] ABSL_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-        {0, 24, -1, sizeof(::tari::rpc::BlockHeader)},
-        {40, -1, -1, sizeof(::tari::rpc::ProofOfWork)},
-        {50, -1, -1, sizeof(::tari::rpc::PowAlgo)},
-        {59, 69, -1, sizeof(::tari::rpc::Block)},
-        {71, 81, -1, sizeof(::tari::rpc::HistoricalBlock)},
-        {83, 97, -1, sizeof(::tari::rpc::NewBlockHeaderTemplate)},
-        {103, 113, -1, sizeof(::tari::rpc::NewBlockTemplate)},
+        {0, 25, -1, sizeof(::tari::rpc::BlockHeader)},
+        {42, -1, -1, sizeof(::tari::rpc::ProofOfWork)},
+        {52, -1, -1, sizeof(::tari::rpc::PowAlgo)},
+        {61, 71, -1, sizeof(::tari::rpc::Block)},
+        {73, 83, -1, sizeof(::tari::rpc::HistoricalBlock)},
+        {85, 99, -1, sizeof(::tari::rpc::NewBlockHeaderTemplate)},
+        {105, 116, -1, sizeof(::tari::rpc::NewBlockTemplate)},
 };
 static const ::_pb::Message* const file_default_instances[] = {
     &::tari::rpc::_BlockHeader_default_instance_._instance,
@@ -352,31 +360,33 @@ static const ::_pb::Message* const file_default_instances[] = {
 const char descriptor_table_protodef_block_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
     protodesc_cold) = {
     "\n\013block.proto\022\010tari.rpc\032\021transaction.pro"
-    "to\"\361\002\n\013BlockHeader\022\014\n\004hash\030\001 \001(\014\022\017\n\007vers"
+    "to\"\212\003\n\013BlockHeader\022\014\n\004hash\030\001 \001(\014\022\017\n\007vers"
     "ion\030\002 \001(\r\022\016\n\006height\030\003 \001(\004\022\021\n\tprev_hash\030\004"
     " \001(\014\022\021\n\ttimestamp\030\005 \001(\004\022\021\n\toutput_mr\030\006 \001"
-    "(\014\022\021\n\tkernel_mr\030\010 \001(\014\022\020\n\010input_mr\030\t \001(\014\022"
-    "\033\n\023total_kernel_offset\030\n \001(\014\022\r\n\005nonce\030\013 "
-    "\001(\004\022\"\n\003pow\030\014 \001(\0132\025.tari.rpc.ProofOfWork\022"
-    "\027\n\017kernel_mmr_size\030\r \001(\004\022\027\n\017output_mmr_s"
-    "ize\030\016 \001(\004\022\033\n\023total_script_offset\030\017 \001(\014\022\031"
-    "\n\021validator_node_mr\030\020 \001(\014\022\033\n\023validator_n"
-    "ode_size\030\021 \001(\004\"1\n\013ProofOfWork\022\020\n\010pow_alg"
-    "o\030\001 \001(\004\022\020\n\010pow_data\030\004 \001(\014\"o\n\007PowAlgo\022,\n\010"
-    "pow_algo\030\001 \001(\0162\032.tari.rpc.PowAlgo.PowAlg"
-    "os\"6\n\010PowAlgos\022\025\n\021POW_ALGOS_RANDOMX\020\000\022\023\n"
-    "\017POW_ALGOS_SHA3X\020\001\"U\n\005Block\022%\n\006header\030\001 "
-    "\001(\0132\025.tari.rpc.BlockHeader\022%\n\004body\030\002 \001(\013"
-    "2\027.tari.rpc.AggregateBody\"H\n\017HistoricalB"
-    "lock\022\025\n\rconfirmations\030\001 \001(\004\022\036\n\005block\030\002 \001"
-    "(\0132\017.tari.rpc.Block\"\252\001\n\026NewBlockHeaderTe"
-    "mplate\022\017\n\007version\030\001 \001(\r\022\016\n\006height\030\002 \001(\004\022"
-    "\021\n\tprev_hash\030\003 \001(\014\022\033\n\023total_kernel_offse"
-    "t\030\004 \001(\014\022\"\n\003pow\030\005 \001(\0132\025.tari.rpc.ProofOfW"
-    "ork\022\033\n\023total_script_offset\030\007 \001(\014\"k\n\020NewB"
-    "lockTemplate\0220\n\006header\030\001 \001(\0132 .tari.rpc."
-    "NewBlockHeaderTemplate\022%\n\004body\030\002 \001(\0132\027.t"
-    "ari.rpc.AggregateBodyb\006proto3"
+    "(\014\022\027\n\017block_output_mr\030\007 \001(\014\022\021\n\tkernel_mr"
+    "\030\010 \001(\014\022\020\n\010input_mr\030\t \001(\014\022\033\n\023total_kernel"
+    "_offset\030\n \001(\014\022\r\n\005nonce\030\013 \001(\004\022\"\n\003pow\030\014 \001("
+    "\0132\025.tari.rpc.ProofOfWork\022\027\n\017kernel_mmr_s"
+    "ize\030\r \001(\004\022\027\n\017output_mmr_size\030\016 \001(\004\022\033\n\023to"
+    "tal_script_offset\030\017 \001(\014\022\031\n\021validator_nod"
+    "e_mr\030\020 \001(\014\022\033\n\023validator_node_size\030\021 \001(\004\""
+    "1\n\013ProofOfWork\022\020\n\010pow_algo\030\001 \001(\004\022\020\n\010pow_"
+    "data\030\004 \001(\014\"\210\001\n\007PowAlgo\022,\n\010pow_algo\030\001 \001(\016"
+    "2\032.tari.rpc.PowAlgo.PowAlgos\"O\n\010PowAlgos"
+    "\022\026\n\022POW_ALGOS_RANDOMXM\020\000\022\023\n\017POW_ALGOS_SH"
+    "A3X\020\001\022\026\n\022POW_ALGOS_RANDOMXT\020\002\"U\n\005Block\022%"
+    "\n\006header\030\001 \001(\0132\025.tari.rpc.BlockHeader\022%\n"
+    "\004body\030\002 \001(\0132\027.tari.rpc.AggregateBody\"H\n\017"
+    "HistoricalBlock\022\025\n\rconfirmations\030\001 \001(\004\022\036"
+    "\n\005block\030\002 \001(\0132\017.tari.rpc.Block\"\252\001\n\026NewBl"
+    "ockHeaderTemplate\022\017\n\007version\030\001 \001(\r\022\016\n\006he"
+    "ight\030\002 \001(\004\022\021\n\tprev_hash\030\003 \001(\014\022\033\n\023total_k"
+    "ernel_offset\030\004 \001(\014\022\"\n\003pow\030\005 \001(\0132\025.tari.r"
+    "pc.ProofOfWork\022\033\n\023total_script_offset\030\007 "
+    "\001(\014\"\207\001\n\020NewBlockTemplate\0220\n\006header\030\001 \001(\013"
+    "2 .tari.rpc.NewBlockHeaderTemplate\022%\n\004bo"
+    "dy\030\002 \001(\0132\027.tari.rpc.AggregateBody\022\032\n\022is_"
+    "mempool_in_sync\030\003 \001(\010b\006proto3"
 };
 static const ::_pbi::DescriptorTable* const descriptor_table_block_2eproto_deps[1] =
     {
@@ -386,7 +396,7 @@ static ::absl::once_flag descriptor_table_block_2eproto_once;
 const ::_pbi::DescriptorTable descriptor_table_block_2eproto = {
     false,
     false,
-    1029,
+    1109,
     descriptor_table_protodef_block_2eproto,
     "block.proto",
     &descriptor_table_block_2eproto_once,
@@ -422,15 +432,16 @@ const ::google::protobuf::EnumDescriptor* PowAlgo_PowAlgos_descriptor() {
   return file_level_enum_descriptors_block_2eproto[0];
 }
 PROTOBUF_CONSTINIT const uint32_t PowAlgo_PowAlgos_internal_data_[] = {
-    131072u, 0u, };
+    196608u, 0u, };
 bool PowAlgo_PowAlgos_IsValid(int value) {
-  return 0 <= value && value <= 1;
+  return 0 <= value && value <= 2;
 }
 #if (__cplusplus < 201703) && \
   (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
 
-constexpr PowAlgo_PowAlgos PowAlgo::POW_ALGOS_RANDOMX;
+constexpr PowAlgo_PowAlgos PowAlgo::POW_ALGOS_RANDOMXM;
 constexpr PowAlgo_PowAlgos PowAlgo::POW_ALGOS_SHA3X;
+constexpr PowAlgo_PowAlgos PowAlgo::POW_ALGOS_RANDOMXT;
 constexpr PowAlgo_PowAlgos PowAlgo::PowAlgos_MIN;
 constexpr PowAlgo_PowAlgos PowAlgo::PowAlgos_MAX;
 constexpr int PowAlgo::PowAlgos_ARRAYSIZE;
@@ -459,6 +470,7 @@ inline PROTOBUF_NDEBUG_INLINE BlockHeader::Impl_::Impl_(
         hash_(arena, from.hash_),
         prev_hash_(arena, from.prev_hash_),
         output_mr_(arena, from.output_mr_),
+        block_output_mr_(arena, from.block_output_mr_),
         kernel_mr_(arena, from.kernel_mr_),
         input_mr_(arena, from.input_mr_),
         total_kernel_offset_(arena, from.total_kernel_offset_),
@@ -495,6 +507,7 @@ inline PROTOBUF_NDEBUG_INLINE BlockHeader::Impl_::Impl_(
         hash_(arena),
         prev_hash_(arena),
         output_mr_(arena),
+        block_output_mr_(arena),
         kernel_mr_(arena),
         input_mr_(arena),
         total_kernel_offset_(arena),
@@ -520,6 +533,7 @@ inline void BlockHeader::SharedDtor() {
   _impl_.hash_.Destroy();
   _impl_.prev_hash_.Destroy();
   _impl_.output_mr_.Destroy();
+  _impl_.block_output_mr_.Destroy();
   _impl_.kernel_mr_.Destroy();
   _impl_.input_mr_.Destroy();
   _impl_.total_kernel_offset_.Destroy();
@@ -553,6 +567,7 @@ PROTOBUF_NOINLINE void BlockHeader::Clear() {
   _impl_.hash_.ClearToEmpty();
   _impl_.prev_hash_.ClearToEmpty();
   _impl_.output_mr_.ClearToEmpty();
+  _impl_.block_output_mr_.ClearToEmpty();
   _impl_.kernel_mr_.ClearToEmpty();
   _impl_.input_mr_.ClearToEmpty();
   _impl_.total_kernel_offset_.ClearToEmpty();
@@ -578,15 +593,15 @@ const char* BlockHeader::_InternalParse(
 
 
 PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<5, 16, 1, 0, 2> BlockHeader::_table_ = {
+const ::_pbi::TcParseTable<5, 17, 1, 0, 2> BlockHeader::_table_ = {
   {
     PROTOBUF_FIELD_OFFSET(BlockHeader, _impl_._has_bits_),
     0, // no _extensions_
     17, 248,  // max_field_number, fast_idx_mask
     offsetof(decltype(_table_), field_lookup_table),
-    4294836288,  // skipmap
+    4294836224,  // skipmap
     offsetof(decltype(_table_), field_entries),
-    16,  // num_field_entries
+    17,  // num_field_entries
     1,  // num_aux_entries
     offsetof(decltype(_table_), aux_entries),
     &_BlockHeader_default_instance_._instance,
@@ -614,7 +629,9 @@ const ::_pbi::TcParseTable<5, 16, 1, 0, 2> BlockHeader::_table_ = {
     // bytes output_mr = 6;
     {::_pbi::TcParser::FastBS1,
      {50, 63, 0, PROTOBUF_FIELD_OFFSET(BlockHeader, _impl_.output_mr_)}},
-    {::_pbi::TcParser::MiniParse, {}},
+    // bytes block_output_mr = 7;
+    {::_pbi::TcParser::FastBS1,
+     {58, 63, 0, PROTOBUF_FIELD_OFFSET(BlockHeader, _impl_.block_output_mr_)}},
     // bytes kernel_mr = 8;
     {::_pbi::TcParser::FastBS1,
      {66, 63, 0, PROTOBUF_FIELD_OFFSET(BlockHeader, _impl_.kernel_mr_)}},
@@ -680,6 +697,9 @@ const ::_pbi::TcParseTable<5, 16, 1, 0, 2> BlockHeader::_table_ = {
     // bytes output_mr = 6;
     {PROTOBUF_FIELD_OFFSET(BlockHeader, _impl_.output_mr_), -1, 0,
     (0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)},
+    // bytes block_output_mr = 7;
+    {PROTOBUF_FIELD_OFFSET(BlockHeader, _impl_.block_output_mr_), -1, 0,
+    (0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)},
     // bytes kernel_mr = 8;
     {PROTOBUF_FIELD_OFFSET(BlockHeader, _impl_.kernel_mr_), -1, 0,
     (0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)},
@@ -762,6 +782,12 @@ const ::_pbi::TcParseTable<5, 16, 1, 0, 2> BlockHeader::_table_ = {
     target = stream->WriteBytesMaybeAliased(6, _s, target);
   }
 
+  // bytes block_output_mr = 7;
+  if (!this->_internal_block_output_mr().empty()) {
+    const std::string& _s = this->_internal_block_output_mr();
+    target = stream->WriteBytesMaybeAliased(7, _s, target);
+  }
+
   // bytes kernel_mr = 8;
   if (!this->_internal_kernel_mr().empty()) {
     const std::string& _s = this->_internal_kernel_mr();
@@ -862,6 +888,12 @@ const ::_pbi::TcParseTable<5, 16, 1, 0, 2> BlockHeader::_table_ = {
                                     this->_internal_output_mr());
   }
 
+  // bytes block_output_mr = 7;
+  if (!this->_internal_block_output_mr().empty()) {
+    total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize(
+                                    this->_internal_block_output_mr());
+  }
+
   // bytes kernel_mr = 8;
   if (!this->_internal_kernel_mr().empty()) {
     total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize(
@@ -963,6 +995,9 @@ void BlockHeader::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::goo
   if (!from._internal_output_mr().empty()) {
     _this->_internal_set_output_mr(from._internal_output_mr());
   }
+  if (!from._internal_block_output_mr().empty()) {
+    _this->_internal_set_block_output_mr(from._internal_block_output_mr());
+  }
   if (!from._internal_kernel_mr().empty()) {
     _this->_internal_set_kernel_mr(from._internal_kernel_mr());
   }
@@ -1033,6 +1068,7 @@ void BlockHeader::InternalSwap(BlockHeader* PROTOBUF_RESTRICT other) {
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.hash_, &other->_impl_.hash_, arena);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.prev_hash_, &other->_impl_.prev_hash_, arena);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.output_mr_, &other->_impl_.output_mr_, arena);
+  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.block_output_mr_, &other->_impl_.block_output_mr_, arena);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.kernel_mr_, &other->_impl_.kernel_mr_, arena);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.input_mr_, &other->_impl_.input_mr_, arena);
   ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.total_kernel_offset_, &other->_impl_.total_kernel_offset_, arena);
@@ -2366,6 +2402,7 @@ NewBlockTemplate::NewBlockTemplate(
   _impl_.body_ = (cached_has_bits & 0x00000002u) ? ::google::protobuf::Message::CopyConstruct<::tari::rpc::AggregateBody>(
                               arena, *from._impl_.body_)
                         : nullptr;
+  _impl_.is_mempool_in_sync_ = from._impl_.is_mempool_in_sync_;
 
   // @@protoc_insertion_point(copy_constructor:tari.rpc.NewBlockTemplate)
 }
@@ -2379,9 +2416,9 @@ inline void NewBlockTemplate::SharedCtor(::_pb::Arena* arena) {
   ::memset(reinterpret_cast<char *>(&_impl_) +
                offsetof(Impl_, header_),
            0,
-           offsetof(Impl_, body_) -
+           offsetof(Impl_, is_mempool_in_sync_) -
                offsetof(Impl_, header_) +
-               sizeof(Impl_::body_));
+               sizeof(Impl_::is_mempool_in_sync_));
 }
 NewBlockTemplate::~NewBlockTemplate() {
   // @@protoc_insertion_point(destructor:tari.rpc.NewBlockTemplate)
@@ -2427,6 +2464,7 @@ PROTOBUF_NOINLINE void NewBlockTemplate::Clear() {
       _impl_.body_->Clear();
     }
   }
+  _impl_.is_mempool_in_sync_ = false;
   _impl_._has_bits_.Clear();
   _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
 }
@@ -2439,15 +2477,15 @@ const char* NewBlockTemplate::_InternalParse(
 
 
 PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> NewBlockTemplate::_table_ = {
+const ::_pbi::TcParseTable<2, 3, 2, 0, 2> NewBlockTemplate::_table_ = {
   {
     PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_._has_bits_),
     0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
+    3, 24,  // max_field_number, fast_idx_mask
     offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
+    4294967288,  // skipmap
     offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
+    3,  // num_field_entries
     2,  // num_aux_entries
     offsetof(decltype(_table_), aux_entries),
     &_NewBlockTemplate_default_instance_._instance,
@@ -2456,12 +2494,16 @@ const ::_pbi::TcParseTable<1, 2, 2, 0, 2> NewBlockTemplate::_table_ = {
     ::_pbi::TcParser::GetTable<::tari::rpc::NewBlockTemplate>(),  // to_prefetch
     #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
-    // .tari.rpc.AggregateBody body = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_.body_)}},
+    {::_pbi::TcParser::MiniParse, {}},
     // .tari.rpc.NewBlockHeaderTemplate header = 1;
     {::_pbi::TcParser::FastMtS1,
      {10, 0, 0, PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_.header_)}},
+    // .tari.rpc.AggregateBody body = 2;
+    {::_pbi::TcParser::FastMtS1,
+     {18, 1, 1, PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_.body_)}},
+    // bool is_mempool_in_sync = 3;
+    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(NewBlockTemplate, _impl_.is_mempool_in_sync_), 63>(),
+     {24, 63, 0, PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_.is_mempool_in_sync_)}},
   }}, {{
     65535, 65535
   }}, {{
@@ -2471,6 +2513,9 @@ const ::_pbi::TcParseTable<1, 2, 2, 0, 2> NewBlockTemplate::_table_ = {
     // .tari.rpc.AggregateBody body = 2;
     {PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_.body_), _Internal::kHasBitsOffset + 1, 1,
     (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
+    // bool is_mempool_in_sync = 3;
+    {PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_.is_mempool_in_sync_), -1, 0,
+    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
   }}, {{
     {::_pbi::TcParser::GetTable<::tari::rpc::NewBlockHeaderTemplate>()},
     {::_pbi::TcParser::GetTable<::tari::rpc::AggregateBody>()},
@@ -2498,6 +2543,13 @@ const ::_pbi::TcParseTable<1, 2, 2, 0, 2> NewBlockTemplate::_table_ = {
         2, *_impl_.body_, _impl_.body_->GetCachedSize(), target, stream);
   }
 
+  // bool is_mempool_in_sync = 3;
+  if (this->_internal_is_mempool_in_sync() != 0) {
+    target = stream->EnsureSpace(target);
+    target = ::_pbi::WireFormatLite::WriteBoolToArray(
+        3, this->_internal_is_mempool_in_sync(), target);
+  }
+
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
     target =
         ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
@@ -2530,6 +2582,11 @@ const ::_pbi::TcParseTable<1, 2, 2, 0, 2> NewBlockTemplate::_table_ = {
     }
 
   }
+  // bool is_mempool_in_sync = 3;
+  if (this->_internal_is_mempool_in_sync() != 0) {
+    total_size += 2;
+  }
+
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
@@ -2564,6 +2621,9 @@ void NewBlockTemplate::MergeImpl(::google::protobuf::MessageLite& to_msg, const
       }
     }
   }
+  if (from._internal_is_mempool_in_sync() != 0) {
+    _this->_impl_.is_mempool_in_sync_ = from._impl_.is_mempool_in_sync_;
+  }
   _this->_impl_._has_bits_[0] |= cached_has_bits;
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
@@ -2584,8 +2644,8 @@ void NewBlockTemplate::InternalSwap(NewBlockTemplate* PROTOBUF_RESTRICT other) {
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
   swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
   ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_.body_)
-      + sizeof(NewBlockTemplate::_impl_.body_)
+      PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_.is_mempool_in_sync_)
+      + sizeof(NewBlockTemplate::_impl_.is_mempool_in_sync_)
       - PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_.header_)>(
           reinterpret_cast<char*>(&_impl_.header_),
           reinterpret_cast<char*>(&other->_impl_.header_));

external/src/Tari/proto/gRPC/block.pb.h

@@ -84,8 +84,9 @@ namespace protobuf {
 namespace tari {
 namespace rpc {
 enum PowAlgo_PowAlgos : int {
-  PowAlgo_PowAlgos_POW_ALGOS_RANDOMX = 0,
+  PowAlgo_PowAlgos_POW_ALGOS_RANDOMXM = 0,
   PowAlgo_PowAlgos_POW_ALGOS_SHA3X = 1,
+  PowAlgo_PowAlgos_POW_ALGOS_RANDOMXT = 2,
   PowAlgo_PowAlgos_PowAlgo_PowAlgos_INT_MIN_SENTINEL_DO_NOT_USE_ =
       std::numeric_limits<::int32_t>::min(),
   PowAlgo_PowAlgos_PowAlgo_PowAlgos_INT_MAX_SENTINEL_DO_NOT_USE_ =
@@ -95,8 +96,8 @@ enum PowAlgo_PowAlgos : int {
 bool PowAlgo_PowAlgos_IsValid(int value);
 extern const uint32_t PowAlgo_PowAlgos_internal_data_[];
 constexpr PowAlgo_PowAlgos PowAlgo_PowAlgos_PowAlgos_MIN = static_cast<PowAlgo_PowAlgos>(0);
-constexpr PowAlgo_PowAlgos PowAlgo_PowAlgos_PowAlgos_MAX = static_cast<PowAlgo_PowAlgos>(1);
-constexpr int PowAlgo_PowAlgos_PowAlgos_ARRAYSIZE = 1 + 1;
+constexpr PowAlgo_PowAlgos PowAlgo_PowAlgos_PowAlgos_MAX = static_cast<PowAlgo_PowAlgos>(2);
+constexpr int PowAlgo_PowAlgos_PowAlgos_ARRAYSIZE = 2 + 1;
 const ::google::protobuf::EnumDescriptor*
 PowAlgo_PowAlgos_descriptor();
 template <typename T>
@@ -109,7 +110,7 @@ const std::string& PowAlgo_PowAlgos_Name(T value) {
 template <>
 inline const std::string& PowAlgo_PowAlgos_Name(PowAlgo_PowAlgos value) {
   return ::google::protobuf::internal::NameOfDenseEnum<PowAlgo_PowAlgos_descriptor,
-                                                 0, 1>(
+                                                 0, 2>(
       static_cast<int>(value));
 }
 inline bool PowAlgo_PowAlgos_Parse(absl::string_view name, PowAlgo_PowAlgos* value) {
@@ -430,8 +431,9 @@ class PowAlgo final : public ::google::protobuf::Message
   ::google::protobuf::Metadata GetMetadata() const final;
   // nested types ----------------------------------------------------
   using PowAlgos = PowAlgo_PowAlgos;
-  static constexpr PowAlgos POW_ALGOS_RANDOMX = PowAlgo_PowAlgos_POW_ALGOS_RANDOMX;
+  static constexpr PowAlgos POW_ALGOS_RANDOMXM = PowAlgo_PowAlgos_POW_ALGOS_RANDOMXM;
   static constexpr PowAlgos POW_ALGOS_SHA3X = PowAlgo_PowAlgos_POW_ALGOS_SHA3X;
+  static constexpr PowAlgos POW_ALGOS_RANDOMXT = PowAlgo_PowAlgos_POW_ALGOS_RANDOMXT;
   static inline bool PowAlgos_IsValid(int value) {
     return PowAlgo_PowAlgos_IsValid(value);
   }
@@ -872,6 +874,7 @@ class BlockHeader final : public ::google::protobuf::Message
     kHashFieldNumber = 1,
     kPrevHashFieldNumber = 4,
     kOutputMrFieldNumber = 6,
+    kBlockOutputMrFieldNumber = 7,
     kKernelMrFieldNumber = 8,
     kInputMrFieldNumber = 9,
     kTotalKernelOffsetFieldNumber = 10,
@@ -933,6 +936,22 @@ class BlockHeader final : public ::google::protobuf::Message
       const std::string& value);
   std::string* _internal_mutable_output_mr();
 
+  public:
+  // bytes block_output_mr = 7;
+  void clear_block_output_mr() ;
+  const std::string& block_output_mr() const;
+  template <typename Arg_ = const std::string&, typename... Args_>
+  void set_block_output_mr(Arg_&& arg, Args_... args);
+  std::string* mutable_block_output_mr();
+  PROTOBUF_NODISCARD std::string* release_block_output_mr();
+  void set_allocated_block_output_mr(std::string* value);
+
+  private:
+  const std::string& _internal_block_output_mr() const;
+  inline PROTOBUF_ALWAYS_INLINE void _internal_set_block_output_mr(
+      const std::string& value);
+  std::string* _internal_mutable_block_output_mr();
+
   public:
   // bytes kernel_mr = 8;
   void clear_kernel_mr() ;
@@ -1104,7 +1123,7 @@ class BlockHeader final : public ::google::protobuf::Message
   class _Internal;
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
-      5, 16, 1,
+      5, 17, 1,
       0, 2>
       _table_;
   friend class ::google::protobuf::MessageLite;
@@ -1125,6 +1144,7 @@ class BlockHeader final : public ::google::protobuf::Message
     ::google::protobuf::internal::ArenaStringPtr hash_;
     ::google::protobuf::internal::ArenaStringPtr prev_hash_;
     ::google::protobuf::internal::ArenaStringPtr output_mr_;
+    ::google::protobuf::internal::ArenaStringPtr block_output_mr_;
     ::google::protobuf::internal::ArenaStringPtr kernel_mr_;
     ::google::protobuf::internal::ArenaStringPtr input_mr_;
     ::google::protobuf::internal::ArenaStringPtr total_kernel_offset_;
@@ -1272,6 +1292,7 @@ class NewBlockTemplate final : public ::google::protobuf::Message
   enum : int {
     kHeaderFieldNumber = 1,
     kBodyFieldNumber = 2,
+    kIsMempoolInSyncFieldNumber = 3,
   };
   // .tari.rpc.NewBlockHeaderTemplate header = 1;
   bool has_header() const;
@@ -1302,13 +1323,23 @@ class NewBlockTemplate final : public ::google::protobuf::Message
   const ::tari::rpc::AggregateBody& _internal_body() const;
   ::tari::rpc::AggregateBody* _internal_mutable_body();
 
+  public:
+  // bool is_mempool_in_sync = 3;
+  void clear_is_mempool_in_sync() ;
+  bool is_mempool_in_sync() const;
+  void set_is_mempool_in_sync(bool value);
+
+  private:
+  bool _internal_is_mempool_in_sync() const;
+  void _internal_set_is_mempool_in_sync(bool value);
+
   public:
   // @@protoc_insertion_point(class_scope:tari.rpc.NewBlockTemplate)
  private:
   class _Internal;
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
+      2, 3, 2,
       0, 2>
       _table_;
   friend class ::google::protobuf::MessageLite;
@@ -1328,6 +1359,7 @@ class NewBlockTemplate final : public ::google::protobuf::Message
     mutable ::google::protobuf::internal::CachedSize _cached_size_;
     ::tari::rpc::NewBlockHeaderTemplate* header_;
     ::tari::rpc::AggregateBody* body_;
+    bool is_mempool_in_sync_;
     PROTOBUF_TSAN_DECLARE_MEMBER
   };
   union { Impl_ _impl_; };
@@ -1941,6 +1973,56 @@ inline void BlockHeader::set_allocated_output_mr(std::string* value) {
   // @@protoc_insertion_point(field_set_allocated:tari.rpc.BlockHeader.output_mr)
 }
 
+// bytes block_output_mr = 7;
+inline void BlockHeader::clear_block_output_mr() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  _impl_.block_output_mr_.ClearToEmpty();
+}
+inline const std::string& BlockHeader::block_output_mr() const
+    ABSL_ATTRIBUTE_LIFETIME_BOUND {
+  // @@protoc_insertion_point(field_get:tari.rpc.BlockHeader.block_output_mr)
+  return _internal_block_output_mr();
+}
+template <typename Arg_, typename... Args_>
+inline PROTOBUF_ALWAYS_INLINE void BlockHeader::set_block_output_mr(Arg_&& arg,
+                                                     Args_... args) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  _impl_.block_output_mr_.SetBytes(static_cast<Arg_&&>(arg), args..., GetArena());
+  // @@protoc_insertion_point(field_set:tari.rpc.BlockHeader.block_output_mr)
+}
+inline std::string* BlockHeader::mutable_block_output_mr() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+  std::string* _s = _internal_mutable_block_output_mr();
+  // @@protoc_insertion_point(field_mutable:tari.rpc.BlockHeader.block_output_mr)
+  return _s;
+}
+inline const std::string& BlockHeader::_internal_block_output_mr() const {
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  return _impl_.block_output_mr_.Get();
+}
+inline void BlockHeader::_internal_set_block_output_mr(const std::string& value) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  _impl_.block_output_mr_.Set(value, GetArena());
+}
+inline std::string* BlockHeader::_internal_mutable_block_output_mr() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  return _impl_.block_output_mr_.Mutable( GetArena());
+}
+inline std::string* BlockHeader::release_block_output_mr() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  // @@protoc_insertion_point(field_release:tari.rpc.BlockHeader.block_output_mr)
+  return _impl_.block_output_mr_.Release();
+}
+inline void BlockHeader::set_allocated_block_output_mr(std::string* value) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  _impl_.block_output_mr_.SetAllocated(value, GetArena());
+  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+        if (_impl_.block_output_mr_.IsDefault()) {
+          _impl_.block_output_mr_.Set("", GetArena());
+        }
+  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  // @@protoc_insertion_point(field_set_allocated:tari.rpc.BlockHeader.block_output_mr)
+}
+
 // bytes kernel_mr = 8;
 inline void BlockHeader::clear_kernel_mr() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -3275,6 +3357,28 @@ inline void NewBlockTemplate::set_allocated_body(::tari::rpc::AggregateBody* val
   // @@protoc_insertion_point(field_set_allocated:tari.rpc.NewBlockTemplate.body)
 }
 
+// bool is_mempool_in_sync = 3;
+inline void NewBlockTemplate::clear_is_mempool_in_sync() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  _impl_.is_mempool_in_sync_ = false;
+}
+inline bool NewBlockTemplate::is_mempool_in_sync() const {
+  // @@protoc_insertion_point(field_get:tari.rpc.NewBlockTemplate.is_mempool_in_sync)
+  return _internal_is_mempool_in_sync();
+}
+inline void NewBlockTemplate::set_is_mempool_in_sync(bool value) {
+  _internal_set_is_mempool_in_sync(value);
+  // @@protoc_insertion_point(field_set:tari.rpc.NewBlockTemplate.is_mempool_in_sync)
+}
+inline bool NewBlockTemplate::_internal_is_mempool_in_sync() const {
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  return _impl_.is_mempool_in_sync_;
+}
+inline void NewBlockTemplate::_internal_set_is_mempool_in_sync(bool value) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  _impl_.is_mempool_in_sync_ = value;
+}
+
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif  // __GNUC__

external/src/Tari/proto/gRPC/block.proto

@@ -38,9 +38,10 @@ message BlockHeader {
     bytes prev_hash = 4;
     // Timestamp at which the block was built.
     uint64 timestamp = 5;
-    // This is the UTXO merkle root of the outputs
-    // This is calculated as Hash (txo MMR root  || roaring bitmap hash of UTXO indices)
+    // This is the UTXO merkle root of the outputs in the blockchain
     bytes output_mr = 6;
+    // This is the merkle root of all outputs in this block
+    bytes block_output_mr = 7;
     // This is the MMR root of the kernels
     bytes kernel_mr = 8;
     // This is the Merkle root of the inputs in this block
@@ -79,8 +80,9 @@ message ProofOfWork {
 message PowAlgo {
     // The permitted pow algorithms
     enum PowAlgos {
-        POW_ALGOS_RANDOMX = 0;    // Accessible as `grpc::pow_algo::PowAlgos::Randomx`
+        POW_ALGOS_RANDOMXM = 0;    // Accessible as `grpc::pow_algo::PowAlgos::RandomxM`
         POW_ALGOS_SHA3X = 1;      // Accessible as `grpc::pow_algo::PowAlgos::Sha3x`
+        POW_ALGOS_RANDOMXT = 2;    // Accessible as `grpc::pow_algo::PowAlgos::RandomxT`
     }
     // The pow algo to use
     PowAlgos pow_algo = 1;
@@ -133,5 +135,8 @@ message NewBlockTemplate {
     // This flag indicates if the inputs, outputs and kernels have been sorted internally, that is, the sort() method
     // has been called. This may be false even if all components are sorted.
     AggregateBody body = 2;
+    // Sometimes the mempool has not synced to the latest tip, this flag indicates if the mempool is out of sync.
+    // In most cases the next call to get_new_block_template will return a block with the mempool in sync.
+    bool is_mempool_in_sync = 3;
 }
 

external/src/Tari/proto/gRPC/transaction.pb.cc

@@ -108,6 +108,7 @@ inline constexpr UnblindedOutput::Impl_::Impl_(
             ::_pbi::ConstantInitialized()),
         features_{nullptr},
         metadata_signature_{nullptr},
+        range_proof_{nullptr},
         value_{::uint64_t{0u}},
         script_lock_height_{::uint64_t{0u}},
         minimum_value_promise_{::uint64_t{0u}} {}
@@ -427,6 +428,7 @@ const ::uint32_t
         PROTOBUF_FIELD_OFFSET(::tari::rpc::UnblindedOutput, _impl_.covenant_),
         PROTOBUF_FIELD_OFFSET(::tari::rpc::UnblindedOutput, _impl_.encrypted_data_),
         PROTOBUF_FIELD_OFFSET(::tari::rpc::UnblindedOutput, _impl_.minimum_value_promise_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::UnblindedOutput, _impl_.range_proof_),
         ~0u,
         ~0u,
         0,
@@ -439,6 +441,7 @@ const ::uint32_t
         ~0u,
         ~0u,
         ~0u,
+        2,
 };
 
 static const ::_pbi::MigrationSchema
@@ -449,7 +452,7 @@ static const ::_pbi::MigrationSchema
         {90, 104, -1, sizeof(::tari::rpc::OutputFeatures)},
         {110, -1, -1, sizeof(::tari::rpc::AggregateBody)},
         {121, 132, -1, sizeof(::tari::rpc::Transaction)},
-        {135, 155, -1, sizeof(::tari::rpc::UnblindedOutput)},
+        {135, 156, -1, sizeof(::tari::rpc::UnblindedOutput)},
 };
 static const ::_pb::Message* const file_default_instances[] = {
     &::tari::rpc::_TransactionKernel_default_instance_._instance,
@@ -498,7 +501,7 @@ const char descriptor_table_protodef_transaction_2eproto[] ABSL_ATTRIBUTE_SECTIO
     "tari.rpc.TransactionKernel\"[\n\013Transactio"
     "n\022\016\n\006offset\030\001 \001(\014\022%\n\004body\030\002 \001(\0132\027.tari.r"
     "pc.AggregateBody\022\025\n\rscript_offset\030\003 \001(\014\""
-    "\343\002\n\017UnblindedOutput\022\r\n\005value\030\001 \001(\004\022\024\n\014sp"
+    "\216\003\n\017UnblindedOutput\022\r\n\005value\030\001 \001(\004\022\024\n\014sp"
     "ending_key\030\002 \001(\014\022*\n\010features\030\003 \001(\0132\030.tar"
     "i.rpc.OutputFeatures\022\016\n\006script\030\004 \001(\014\022\022\n\n"
     "input_data\030\005 \001(\014\022\032\n\022script_private_key\030\007"
@@ -506,8 +509,9 @@ const char descriptor_table_protodef_transaction_2eproto[] ABSL_ATTRIBUTE_SECTIO
     "\n\022metadata_signature\030\t \001(\0132\034.tari.rpc.Co"
     "mAndPubSignature\022\032\n\022script_lock_height\030\n"
     " \001(\004\022\020\n\010covenant\030\013 \001(\014\022\026\n\016encrypted_data"
-    "\030\014 \001(\014\022\035\n\025minimum_value_promise\030\r \001(\004b\006p"
-    "roto3"
+    "\030\014 \001(\014\022\035\n\025minimum_value_promise\030\r \001(\004\022)\n"
+    "\013range_proof\030\016 \001(\0132\024.tari.rpc.RangeProof"
+    "b\006proto3"
 };
 static const ::_pbi::DescriptorTable* const descriptor_table_transaction_2eproto_deps[2] =
     {
@@ -518,7 +522,7 @@ static ::absl::once_flag descriptor_table_transaction_2eproto_once;
 const ::_pbi::DescriptorTable descriptor_table_transaction_2eproto = {
     false,
     false,
-    1805,
+    1848,
     descriptor_table_protodef_transaction_2eproto,
     "transaction.proto",
     &descriptor_table_transaction_2eproto_once,
@@ -2988,6 +2992,11 @@ void UnblindedOutput::clear_metadata_signature() {
   if (_impl_.metadata_signature_ != nullptr) _impl_.metadata_signature_->Clear();
   _impl_._has_bits_[0] &= ~0x00000002u;
 }
+void UnblindedOutput::clear_range_proof() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  if (_impl_.range_proof_ != nullptr) _impl_.range_proof_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000004u;
+}
 UnblindedOutput::UnblindedOutput(::google::protobuf::Arena* arena)
     : ::google::protobuf::Message(arena) {
   SharedCtor(arena);
@@ -3022,6 +3031,9 @@ UnblindedOutput::UnblindedOutput(
   _impl_.metadata_signature_ = (cached_has_bits & 0x00000002u) ? ::google::protobuf::Message::CopyConstruct<::tari::rpc::ComAndPubSignature>(
                               arena, *from._impl_.metadata_signature_)
                         : nullptr;
+  _impl_.range_proof_ = (cached_has_bits & 0x00000004u) ? ::google::protobuf::Message::CopyConstruct<::tari::rpc::RangeProof>(
+                              arena, *from._impl_.range_proof_)
+                        : nullptr;
   ::memcpy(reinterpret_cast<char *>(&_impl_) +
                offsetof(Impl_, value_),
            reinterpret_cast<const char *>(&from._impl_) +
@@ -3069,6 +3081,7 @@ inline void UnblindedOutput::SharedDtor() {
   _impl_.encrypted_data_.Destroy();
   delete _impl_.features_;
   delete _impl_.metadata_signature_;
+  delete _impl_.range_proof_;
   _impl_.~Impl_();
 }
 
@@ -3101,7 +3114,7 @@ PROTOBUF_NOINLINE void UnblindedOutput::Clear() {
   _impl_.covenant_.ClearToEmpty();
   _impl_.encrypted_data_.ClearToEmpty();
   cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
+  if (cached_has_bits & 0x00000007u) {
     if (cached_has_bits & 0x00000001u) {
       ABSL_DCHECK(_impl_.features_ != nullptr);
       _impl_.features_->Clear();
@@ -3110,6 +3123,10 @@ PROTOBUF_NOINLINE void UnblindedOutput::Clear() {
       ABSL_DCHECK(_impl_.metadata_signature_ != nullptr);
       _impl_.metadata_signature_->Clear();
     }
+    if (cached_has_bits & 0x00000004u) {
+      ABSL_DCHECK(_impl_.range_proof_ != nullptr);
+      _impl_.range_proof_->Clear();
+    }
   }
   ::memset(&_impl_.value_, 0, static_cast<::size_t>(
       reinterpret_cast<char*>(&_impl_.minimum_value_promise_) -
@@ -3126,16 +3143,16 @@ const char* UnblindedOutput::_InternalParse(
 
 
 PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<4, 12, 2, 0, 2> UnblindedOutput::_table_ = {
+const ::_pbi::TcParseTable<4, 13, 3, 0, 2> UnblindedOutput::_table_ = {
   {
     PROTOBUF_FIELD_OFFSET(UnblindedOutput, _impl_._has_bits_),
     0, // no _extensions_
-    13, 120,  // max_field_number, fast_idx_mask
+    14, 120,  // max_field_number, fast_idx_mask
     offsetof(decltype(_table_), field_lookup_table),
-    4294959136,  // skipmap
+    4294950944,  // skipmap
     offsetof(decltype(_table_), field_entries),
-    12,  // num_field_entries
-    2,  // num_aux_entries
+    13,  // num_field_entries
+    3,  // num_aux_entries
     offsetof(decltype(_table_), aux_entries),
     &_UnblindedOutput_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
@@ -3181,7 +3198,9 @@ const ::_pbi::TcParseTable<4, 12, 2, 0, 2> UnblindedOutput::_table_ = {
     // uint64 minimum_value_promise = 13;
     {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(UnblindedOutput, _impl_.minimum_value_promise_), 63>(),
      {104, 63, 0, PROTOBUF_FIELD_OFFSET(UnblindedOutput, _impl_.minimum_value_promise_)}},
-    {::_pbi::TcParser::MiniParse, {}},
+    // .tari.rpc.RangeProof range_proof = 14;
+    {::_pbi::TcParser::FastMtS1,
+     {114, 2, 2, PROTOBUF_FIELD_OFFSET(UnblindedOutput, _impl_.range_proof_)}},
     {::_pbi::TcParser::MiniParse, {}},
   }}, {{
     65535, 65535
@@ -3222,9 +3241,13 @@ const ::_pbi::TcParseTable<4, 12, 2, 0, 2> UnblindedOutput::_table_ = {
     // uint64 minimum_value_promise = 13;
     {PROTOBUF_FIELD_OFFSET(UnblindedOutput, _impl_.minimum_value_promise_), -1, 0,
     (0 | ::_fl::kFcSingular | ::_fl::kUInt64)},
+    // .tari.rpc.RangeProof range_proof = 14;
+    {PROTOBUF_FIELD_OFFSET(UnblindedOutput, _impl_.range_proof_), _Internal::kHasBitsOffset + 2, 2,
+    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
   }}, {{
     {::_pbi::TcParser::GetTable<::tari::rpc::OutputFeatures>()},
     {::_pbi::TcParser::GetTable<::tari::rpc::ComAndPubSignature>()},
+    {::_pbi::TcParser::GetTable<::tari::rpc::RangeProof>()},
   }}, {{
   }},
 };
@@ -3312,6 +3335,12 @@ const ::_pbi::TcParseTable<4, 12, 2, 0, 2> UnblindedOutput::_table_ = {
         13, this->_internal_minimum_value_promise(), target);
   }
 
+  // .tari.rpc.RangeProof range_proof = 14;
+  if (cached_has_bits & 0x00000004u) {
+    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
+        14, *_impl_.range_proof_, _impl_.range_proof_->GetCachedSize(), target, stream);
+  }
+
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
     target =
         ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
@@ -3372,7 +3401,7 @@ const ::_pbi::TcParseTable<4, 12, 2, 0, 2> UnblindedOutput::_table_ = {
   }
 
   cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
+  if (cached_has_bits & 0x00000007u) {
     // .tari.rpc.OutputFeatures features = 3;
     if (cached_has_bits & 0x00000001u) {
       total_size +=
@@ -3385,6 +3414,12 @@ const ::_pbi::TcParseTable<4, 12, 2, 0, 2> UnblindedOutput::_table_ = {
           1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.metadata_signature_);
     }
 
+    // .tari.rpc.RangeProof range_proof = 14;
+    if (cached_has_bits & 0x00000004u) {
+      total_size +=
+          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.range_proof_);
+    }
+
   }
   // uint64 value = 1;
   if (this->_internal_value() != 0) {
@@ -3439,7 +3474,7 @@ void UnblindedOutput::MergeImpl(::google::protobuf::MessageLite& to_msg, const :
     _this->_internal_set_encrypted_data(from._internal_encrypted_data());
   }
   cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
+  if (cached_has_bits & 0x00000007u) {
     if (cached_has_bits & 0x00000001u) {
       ABSL_DCHECK(from._impl_.features_ != nullptr);
       if (_this->_impl_.features_ == nullptr) {
@@ -3458,6 +3493,15 @@ void UnblindedOutput::MergeImpl(::google::protobuf::MessageLite& to_msg, const :
         _this->_impl_.metadata_signature_->MergeFrom(*from._impl_.metadata_signature_);
       }
     }
+    if (cached_has_bits & 0x00000004u) {
+      ABSL_DCHECK(from._impl_.range_proof_ != nullptr);
+      if (_this->_impl_.range_proof_ == nullptr) {
+        _this->_impl_.range_proof_ =
+            ::google::protobuf::Message::CopyConstruct<::tari::rpc::RangeProof>(arena, *from._impl_.range_proof_);
+      } else {
+        _this->_impl_.range_proof_->MergeFrom(*from._impl_.range_proof_);
+      }
+    }
   }
   if (from._internal_value() != 0) {
     _this->_impl_.value_ = from._impl_.value_;

external/src/Tari/proto/gRPC/transaction.pb.h

@@ -737,6 +737,7 @@ class UnblindedOutput final : public ::google::protobuf::Message
     kEncryptedDataFieldNumber = 12,
     kFeaturesFieldNumber = 3,
     kMetadataSignatureFieldNumber = 9,
+    kRangeProofFieldNumber = 14,
     kValueFieldNumber = 1,
     kScriptLockHeightFieldNumber = 10,
     kMinimumValuePromiseFieldNumber = 13,
@@ -882,6 +883,21 @@ class UnblindedOutput final : public ::google::protobuf::Message
   const ::tari::rpc::ComAndPubSignature& _internal_metadata_signature() const;
   ::tari::rpc::ComAndPubSignature* _internal_mutable_metadata_signature();
 
+  public:
+  // .tari.rpc.RangeProof range_proof = 14;
+  bool has_range_proof() const;
+  void clear_range_proof() ;
+  const ::tari::rpc::RangeProof& range_proof() const;
+  PROTOBUF_NODISCARD ::tari::rpc::RangeProof* release_range_proof();
+  ::tari::rpc::RangeProof* mutable_range_proof();
+  void set_allocated_range_proof(::tari::rpc::RangeProof* value);
+  void unsafe_arena_set_allocated_range_proof(::tari::rpc::RangeProof* value);
+  ::tari::rpc::RangeProof* unsafe_arena_release_range_proof();
+
+  private:
+  const ::tari::rpc::RangeProof& _internal_range_proof() const;
+  ::tari::rpc::RangeProof* _internal_mutable_range_proof();
+
   public:
   // uint64 value = 1;
   void clear_value() ;
@@ -918,7 +934,7 @@ class UnblindedOutput final : public ::google::protobuf::Message
   class _Internal;
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
-      4, 12, 2,
+      4, 13, 3,
       0, 2>
       _table_;
   friend class ::google::protobuf::MessageLite;
@@ -945,6 +961,7 @@ class UnblindedOutput final : public ::google::protobuf::Message
     ::google::protobuf::internal::ArenaStringPtr encrypted_data_;
     ::tari::rpc::OutputFeatures* features_;
     ::tari::rpc::ComAndPubSignature* metadata_signature_;
+    ::tari::rpc::RangeProof* range_proof_;
     ::uint64_t value_;
     ::uint64_t script_lock_height_;
     ::uint64_t minimum_value_promise_;
@@ -5045,6 +5062,97 @@ inline void UnblindedOutput::_internal_set_minimum_value_promise(::uint64_t valu
   _impl_.minimum_value_promise_ = value;
 }
 
+// .tari.rpc.RangeProof range_proof = 14;
+inline bool UnblindedOutput::has_range_proof() const {
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.range_proof_ != nullptr);
+  return value;
+}
+inline const ::tari::rpc::RangeProof& UnblindedOutput::_internal_range_proof() const {
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  const ::tari::rpc::RangeProof* p = _impl_.range_proof_;
+  return p != nullptr ? *p : reinterpret_cast<const ::tari::rpc::RangeProof&>(::tari::rpc::_RangeProof_default_instance_);
+}
+inline const ::tari::rpc::RangeProof& UnblindedOutput::range_proof() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
+  // @@protoc_insertion_point(field_get:tari.rpc.UnblindedOutput.range_proof)
+  return _internal_range_proof();
+}
+inline void UnblindedOutput::unsafe_arena_set_allocated_range_proof(::tari::rpc::RangeProof* value) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  if (GetArena() == nullptr) {
+    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.range_proof_);
+  }
+  _impl_.range_proof_ = reinterpret_cast<::tari::rpc::RangeProof*>(value);
+  if (value != nullptr) {
+    _impl_._has_bits_[0] |= 0x00000004u;
+  } else {
+    _impl_._has_bits_[0] &= ~0x00000004u;
+  }
+  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:tari.rpc.UnblindedOutput.range_proof)
+}
+inline ::tari::rpc::RangeProof* UnblindedOutput::release_range_proof() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::tari::rpc::RangeProof* released = _impl_.range_proof_;
+  _impl_.range_proof_ = nullptr;
+#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
+  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
+  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
+  if (GetArena() == nullptr) {
+    delete old;
+  }
+#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
+  if (GetArena() != nullptr) {
+    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
+  }
+#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
+  return released;
+}
+inline ::tari::rpc::RangeProof* UnblindedOutput::unsafe_arena_release_range_proof() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  // @@protoc_insertion_point(field_release:tari.rpc.UnblindedOutput.range_proof)
+
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::tari::rpc::RangeProof* temp = _impl_.range_proof_;
+  _impl_.range_proof_ = nullptr;
+  return temp;
+}
+inline ::tari::rpc::RangeProof* UnblindedOutput::_internal_mutable_range_proof() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  if (_impl_.range_proof_ == nullptr) {
+    auto* p = ::google::protobuf::Message::DefaultConstruct<::tari::rpc::RangeProof>(GetArena());
+    _impl_.range_proof_ = reinterpret_cast<::tari::rpc::RangeProof*>(p);
+  }
+  return _impl_.range_proof_;
+}
+inline ::tari::rpc::RangeProof* UnblindedOutput::mutable_range_proof() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+  _impl_._has_bits_[0] |= 0x00000004u;
+  ::tari::rpc::RangeProof* _msg = _internal_mutable_range_proof();
+  // @@protoc_insertion_point(field_mutable:tari.rpc.UnblindedOutput.range_proof)
+  return _msg;
+}
+inline void UnblindedOutput::set_allocated_range_proof(::tari::rpc::RangeProof* value) {
+  ::google::protobuf::Arena* message_arena = GetArena();
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  if (message_arena == nullptr) {
+    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.range_proof_);
+  }
+
+  if (value != nullptr) {
+    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
+    if (message_arena != submessage_arena) {
+      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
+    }
+    _impl_._has_bits_[0] |= 0x00000004u;
+  } else {
+    _impl_._has_bits_[0] &= ~0x00000004u;
+  }
+
+  _impl_.range_proof_ = reinterpret_cast<::tari::rpc::RangeProof*>(value);
+  // @@protoc_insertion_point(field_set_allocated:tari.rpc.UnblindedOutput.range_proof)
+}
+
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif  // __GNUC__

external/src/Tari/proto/gRPC/transaction.proto

@@ -178,5 +178,7 @@ message UnblindedOutput {
     bytes encrypted_data = 12;
     // The minimum value of the commitment that is proven by the range proof (in MicroMinotari)
     uint64 minimum_value_promise = 13;
+    // The range proof
+    RangeProof range_proof = 14;
 }
 

external/src/Tari/proto/gRPC/types.pb.cc

@@ -302,7 +302,7 @@ inline constexpr ConsensusConstants::Impl_::Impl_(
         block_weight_inputs_{::uint64_t{0u}},
         block_weight_outputs_{::uint64_t{0u}},
         block_weight_kernels_{::uint64_t{0u}},
-        faucet_value_{::uint64_t{0u}},
+        pre_mine_value_{::uint64_t{0u}},
         max_script_byte_size_{::uint64_t{0u}},
         validator_node_validity_period_{::uint64_t{0u}},
         effective_from_height_{::uint64_t{0u}},
@@ -313,6 +313,7 @@ inline constexpr ConsensusConstants::Impl_::Impl_(
         validator_node_registration_shuffle_interval_epoch_{::uint64_t{0u}},
         inflation_bips_{::uint64_t{0u}},
         tail_epoch_length_{::uint64_t{0u}},
+        max_block_coinbase_count_{::uint64_t{0u}},
         blockchain_version_{0u} {}
 
 template <typename>
@@ -486,7 +487,7 @@ const ::uint32_t
         PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.block_weight_inputs_),
         PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.block_weight_outputs_),
         PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.block_weight_kernels_),
-        PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.faucet_value_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.pre_mine_value_),
         PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.max_script_byte_size_),
         PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.validator_node_validity_period_),
         PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.effective_from_height_),
@@ -505,6 +506,7 @@ const ::uint32_t
         PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.permitted_range_proof_types_),
         PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.inflation_bips_),
         PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.tail_epoch_length_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.max_block_coinbase_count_),
         ~0u,
         ~0u,
         ~0u,
@@ -538,6 +540,7 @@ const ::uint32_t
         ~0u,
         ~0u,
         ~0u,
+        ~0u,
 };
 
 static const ::_pbi::MigrationSchema
@@ -554,7 +557,7 @@ static const ::_pbi::MigrationSchema
         {96, -1, -1, sizeof(::tari::rpc::PermittedRangeProofs)},
         {106, -1, -1, sizeof(::tari::rpc::RangeProof)},
         {115, 125, -1, sizeof(::tari::rpc::ConsensusConstants_ProofOfWorkEntry_DoNotUse)},
-        {127, 168, -1, sizeof(::tari::rpc::ConsensusConstants)},
+        {127, 169, -1, sizeof(::tari::rpc::ConsensusConstants)},
 };
 static const ::_pb::Message* const file_default_instances[] = {
     &::tari::rpc::_Range_default_instance_._instance,
@@ -593,7 +596,7 @@ const char descriptor_table_protodef_types_2eproto[] ABSL_ATTRIBUTE_SECTION_VARI
     "output_type\030\001 \001(\0162\024.tari.rpc.OutputType\022"
     "3\n\021range_proof_types\030\002 \003(\0162\030.tari.rpc.Ra"
     "ngeProofType\"!\n\nRangeProof\022\023\n\013proof_byte"
-    "s\030\001 \001(\014\"\327\n\n\022ConsensusConstants\022\035\n\025coinba"
+    "s\030\001 \001(\014\"\373\n\n\022ConsensusConstants\022\035\n\025coinba"
     "se_min_maturity\030\001 \001(\004\022\032\n\022blockchain_vers"
     "ion\030\002 \001(\r\022\031\n\021future_time_limit\030\003 \001(\004\022\037\n\027"
     "difficulty_block_window\030\005 \001(\004\022$\n\034max_blo"
@@ -604,41 +607,41 @@ const char descriptor_table_protodef_types_2eproto[] ABSL_ATTRIBUTE_SECTION_VARI
     "\022 \n\030min_sha3x_pow_difficulty\030\r \001(\004\022\033\n\023bl"
     "ock_weight_inputs\030\016 \001(\004\022\034\n\024block_weight_"
     "outputs\030\017 \001(\004\022\034\n\024block_weight_kernels\030\020 "
-    "\001(\004\022\024\n\014faucet_value\030\021 \001(\004\022\034\n\024max_script_"
-    "byte_size\030\022 \001(\004\022&\n\036validator_node_validi"
-    "ty_period\030\023 \001(\004\022\035\n\025effective_from_height"
-    "\030\024 \001(\004\0227\n\036valid_blockchain_version_range"
-    "\030\025 \001(\0132\017.tari.rpc.Range\022\037\n\027max_randomx_s"
-    "eed_height\030\026 \001(\004\022D\n\rproof_of_work\030\027 \003(\0132"
-    "-.tari.rpc.ConsensusConstants.ProofOfWor"
-    "kEntry\0222\n\022transaction_weight\030\030 \001(\0132\026.tar"
-    "i.rpc.WeightParams\022,\n\023input_version_rang"
-    "e\030\032 \001(\0132\017.tari.rpc.Range\0226\n\024output_versi"
-    "on_range\030\033 \001(\0132\030.tari.rpc.OutputsVersion"
-    "\022-\n\024kernel_version_range\030\034 \001(\0132\017.tari.rp"
-    "c.Range\0224\n\026permitted_output_types\030\035 \003(\0162"
-    "\024.tari.rpc.OutputType\022\024\n\014epoch_length\030\036 "
-    "\001(\004\0226\n.validator_node_registration_min_d"
-    "eposit_amount\030\037 \001(\004\0223\n+validator_node_re"
-    "gistration_min_lock_height\030  \001(\004\022:\n2vali"
-    "dator_node_registration_shuffle_interval"
-    "_epoch\030! \001(\004\022C\n\033permitted_range_proof_ty"
-    "pes\030\" \003(\0132\036.tari.rpc.PermittedRangeProof"
-    "s\022\026\n\016inflation_bips\030# \001(\004\022\031\n\021tail_epoch_"
-    "length\030$ \001(\004\032S\n\020ProofOfWorkEntry\022\013\n\003key\030"
-    "\001 \001(\r\022.\n\005value\030\002 \001(\0132\037.tari.rpc.PowAlgor"
-    "ithmConstants:\0028\001*s\n\nOutputType\022\014\n\010STAND"
-    "ARD\020\000\022\014\n\010COINBASE\020\001\022\010\n\004BURN\020\002\022\037\n\033VALIDAT"
-    "OR_NODE_REGISTRATION\020\003\022\036\n\032CODE_TEMPLATE_"
-    "REGISTRATION\020\004*:\n\016RangeProofType\022\024\n\020BULL"
-    "ETPROOF_PLUS\020\000\022\022\n\016REVEALED_VALUE\020\001b\006prot"
-    "o3"
+    "\001(\004\022\026\n\016pre_mine_value\030\021 \001(\004\022\034\n\024max_scrip"
+    "t_byte_size\030\022 \001(\004\022&\n\036validator_node_vali"
+    "dity_period\030\023 \001(\004\022\035\n\025effective_from_heig"
+    "ht\030\024 \001(\004\0227\n\036valid_blockchain_version_ran"
+    "ge\030\025 \001(\0132\017.tari.rpc.Range\022\037\n\027max_randomx"
+    "_seed_height\030\026 \001(\004\022D\n\rproof_of_work\030\027 \003("
+    "\0132-.tari.rpc.ConsensusConstants.ProofOfW"
+    "orkEntry\0222\n\022transaction_weight\030\030 \001(\0132\026.t"
+    "ari.rpc.WeightParams\022,\n\023input_version_ra"
+    "nge\030\032 \001(\0132\017.tari.rpc.Range\0226\n\024output_ver"
+    "sion_range\030\033 \001(\0132\030.tari.rpc.OutputsVersi"
+    "on\022-\n\024kernel_version_range\030\034 \001(\0132\017.tari."
+    "rpc.Range\0224\n\026permitted_output_types\030\035 \003("
+    "\0162\024.tari.rpc.OutputType\022\024\n\014epoch_length\030"
+    "\036 \001(\004\0226\n.validator_node_registration_min"
+    "_deposit_amount\030\037 \001(\004\0223\n+validator_node_"
+    "registration_min_lock_height\030  \001(\004\022:\n2va"
+    "lidator_node_registration_shuffle_interv"
+    "al_epoch\030! \001(\004\022C\n\033permitted_range_proof_"
+    "types\030\" \003(\0132\036.tari.rpc.PermittedRangePro"
+    "ofs\022\026\n\016inflation_bips\030# \001(\004\022\031\n\021tail_epoc"
+    "h_length\030$ \001(\004\022 \n\030max_block_coinbase_cou"
+    "nt\030% \001(\004\032S\n\020ProofOfWorkEntry\022\013\n\003key\030\001 \001("
+    "\r\022.\n\005value\030\002 \001(\0132\037.tari.rpc.PowAlgorithm"
+    "Constants:\0028\001*s\n\nOutputType\022\014\n\010STANDARD\020"
+    "\000\022\014\n\010COINBASE\020\001\022\010\n\004BURN\020\002\022\037\n\033VALIDATOR_N"
+    "ODE_REGISTRATION\020\003\022\036\n\032CODE_TEMPLATE_REGI"
+    "STRATION\020\004*:\n\016RangeProofType\022\024\n\020BULLETPR"
+    "OOF_PLUS\020\000\022\022\n\016REVEALED_VALUE\020\001b\006proto3"
 };
 static ::absl::once_flag descriptor_table_types_2eproto_once;
 const ::_pbi::DescriptorTable descriptor_table_types_2eproto = {
     false,
     false,
-    2362,
+    2398,
     descriptor_table_protodef_types_2eproto,
     "types.proto",
     &descriptor_table_types_2eproto_once,
@@ -3217,15 +3220,15 @@ const char* ConsensusConstants::_InternalParse(
 
 
 PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<5, 33, 8, 0, 7> ConsensusConstants::_table_ = {
+const ::_pbi::TcParseTable<5, 34, 8, 0, 7> ConsensusConstants::_table_ = {
   {
     PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_._has_bits_),
     0, // no _extensions_
-    36, 248,  // max_field_number, fast_idx_mask
+    37, 248,  // max_field_number, fast_idx_mask
     offsetof(decltype(_table_), field_lookup_table),
     16777256,  // skipmap
     offsetof(decltype(_table_), field_entries),
-    33,  // num_field_entries
+    34,  // num_field_entries
     8,  // num_aux_entries
     offsetof(decltype(_table_), aux_entries),
     &_ConsensusConstants_default_instance_._instance,
@@ -3279,9 +3282,9 @@ const ::_pbi::TcParseTable<5, 33, 8, 0, 7> ConsensusConstants::_table_ = {
     // uint64 block_weight_kernels = 16;
     {::_pbi::TcParser::FastV64S2,
      {384, 63, 0, PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.block_weight_kernels_)}},
-    // uint64 faucet_value = 17;
+    // uint64 pre_mine_value = 17;
     {::_pbi::TcParser::FastV64S2,
-     {392, 63, 0, PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.faucet_value_)}},
+     {392, 63, 0, PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.pre_mine_value_)}},
     // uint64 max_script_byte_size = 18;
     {::_pbi::TcParser::FastV64S2,
      {400, 63, 0, PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.max_script_byte_size_)}},
@@ -3322,7 +3325,7 @@ const ::_pbi::TcParseTable<5, 33, 8, 0, 7> ConsensusConstants::_table_ = {
      {504, 63, 0, PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.validator_node_registration_min_deposit_amount_)}},
   }}, {{
     33, 0, 1,
-    65520, 29,
+    65504, 29,
     65535, 65535
   }}, {{
     // uint64 coinbase_min_maturity = 1;
@@ -3367,8 +3370,8 @@ const ::_pbi::TcParseTable<5, 33, 8, 0, 7> ConsensusConstants::_table_ = {
     // uint64 block_weight_kernels = 16;
     {PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.block_weight_kernels_), -1, 0,
     (0 | ::_fl::kFcSingular | ::_fl::kUInt64)},
-    // uint64 faucet_value = 17;
-    {PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.faucet_value_), -1, 0,
+    // uint64 pre_mine_value = 17;
+    {PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.pre_mine_value_), -1, 0,
     (0 | ::_fl::kFcSingular | ::_fl::kUInt64)},
     // uint64 max_script_byte_size = 18;
     {PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.max_script_byte_size_), -1, 0,
@@ -3424,6 +3427,9 @@ const ::_pbi::TcParseTable<5, 33, 8, 0, 7> ConsensusConstants::_table_ = {
     // uint64 tail_epoch_length = 36;
     {PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.tail_epoch_length_), -1, 0,
     (0 | ::_fl::kFcSingular | ::_fl::kUInt64)},
+    // uint64 max_block_coinbase_count = 37;
+    {PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.max_block_coinbase_count_), -1, 0,
+    (0 | ::_fl::kFcSingular | ::_fl::kUInt64)},
   }}, {{
     {::_pbi::TcParser::GetTable<::tari::rpc::Range>()},
     {::_pbi::TcParser::GetMapAuxInfo<
@@ -3547,11 +3553,11 @@ const ::_pbi::TcParseTable<5, 33, 8, 0, 7> ConsensusConstants::_table_ = {
         16, this->_internal_block_weight_kernels(), target);
   }
 
-  // uint64 faucet_value = 17;
-  if (this->_internal_faucet_value() != 0) {
+  // uint64 pre_mine_value = 17;
+  if (this->_internal_pre_mine_value() != 0) {
     target = stream->EnsureSpace(target);
     target = ::_pbi::WireFormatLite::WriteUInt64ToArray(
-        17, this->_internal_faucet_value(), target);
+        17, this->_internal_pre_mine_value(), target);
   }
 
   // uint64 max_script_byte_size = 18;
@@ -3696,6 +3702,13 @@ const ::_pbi::TcParseTable<5, 33, 8, 0, 7> ConsensusConstants::_table_ = {
         36, this->_internal_tail_epoch_length(), target);
   }
 
+  // uint64 max_block_coinbase_count = 37;
+  if (this->_internal_max_block_coinbase_count() != 0) {
+    target = stream->EnsureSpace(target);
+    target = ::_pbi::WireFormatLite::WriteUInt64ToArray(
+        37, this->_internal_max_block_coinbase_count(), target);
+  }
+
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
     target =
         ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
@@ -3860,10 +3873,10 @@ const ::_pbi::TcParseTable<5, 33, 8, 0, 7> ConsensusConstants::_table_ = {
                                     this->_internal_block_weight_kernels());
   }
 
-  // uint64 faucet_value = 17;
-  if (this->_internal_faucet_value() != 0) {
+  // uint64 pre_mine_value = 17;
+  if (this->_internal_pre_mine_value() != 0) {
     total_size += 2 + ::_pbi::WireFormatLite::UInt64Size(
-                                    this->_internal_faucet_value());
+                                    this->_internal_pre_mine_value());
   }
 
   // uint64 max_script_byte_size = 18;
@@ -3926,6 +3939,12 @@ const ::_pbi::TcParseTable<5, 33, 8, 0, 7> ConsensusConstants::_table_ = {
                                     this->_internal_tail_epoch_length());
   }
 
+  // uint64 max_block_coinbase_count = 37;
+  if (this->_internal_max_block_coinbase_count() != 0) {
+    total_size += 2 + ::_pbi::WireFormatLite::UInt64Size(
+                                    this->_internal_max_block_coinbase_count());
+  }
+
   // uint32 blockchain_version = 2;
   if (this->_internal_blockchain_version() != 0) {
     total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(
@@ -4034,8 +4053,8 @@ void ConsensusConstants::MergeImpl(::google::protobuf::MessageLite& to_msg, cons
   if (from._internal_block_weight_kernels() != 0) {
     _this->_impl_.block_weight_kernels_ = from._impl_.block_weight_kernels_;
   }
-  if (from._internal_faucet_value() != 0) {
-    _this->_impl_.faucet_value_ = from._impl_.faucet_value_;
+  if (from._internal_pre_mine_value() != 0) {
+    _this->_impl_.pre_mine_value_ = from._impl_.pre_mine_value_;
   }
   if (from._internal_max_script_byte_size() != 0) {
     _this->_impl_.max_script_byte_size_ = from._impl_.max_script_byte_size_;
@@ -4067,6 +4086,9 @@ void ConsensusConstants::MergeImpl(::google::protobuf::MessageLite& to_msg, cons
   if (from._internal_tail_epoch_length() != 0) {
     _this->_impl_.tail_epoch_length_ = from._impl_.tail_epoch_length_;
   }
+  if (from._internal_max_block_coinbase_count() != 0) {
+    _this->_impl_.max_block_coinbase_count_ = from._impl_.max_block_coinbase_count_;
+  }
   if (from._internal_blockchain_version() != 0) {
     _this->_impl_.blockchain_version_ = from._impl_.blockchain_version_;
   }

external/src/Tari/proto/gRPC/types.pb.h

@@ -2416,7 +2416,7 @@ class ConsensusConstants final : public ::google::protobuf::Message
     kBlockWeightInputsFieldNumber = 14,
     kBlockWeightOutputsFieldNumber = 15,
     kBlockWeightKernelsFieldNumber = 16,
-    kFaucetValueFieldNumber = 17,
+    kPreMineValueFieldNumber = 17,
     kMaxScriptByteSizeFieldNumber = 18,
     kValidatorNodeValidityPeriodFieldNumber = 19,
     kEffectiveFromHeightFieldNumber = 20,
@@ -2427,6 +2427,7 @@ class ConsensusConstants final : public ::google::protobuf::Message
     kValidatorNodeRegistrationShuffleIntervalEpochFieldNumber = 33,
     kInflationBipsFieldNumber = 35,
     kTailEpochLengthFieldNumber = 36,
+    kMaxBlockCoinbaseCountFieldNumber = 37,
     kBlockchainVersionFieldNumber = 2,
   };
   // repeated uint64 emission_decay = 11;
@@ -2693,14 +2694,14 @@ class ConsensusConstants final : public ::google::protobuf::Message
   void _internal_set_block_weight_kernels(::uint64_t value);
 
   public:
-  // uint64 faucet_value = 17;
-  void clear_faucet_value() ;
-  ::uint64_t faucet_value() const;
-  void set_faucet_value(::uint64_t value);
+  // uint64 pre_mine_value = 17;
+  void clear_pre_mine_value() ;
+  ::uint64_t pre_mine_value() const;
+  void set_pre_mine_value(::uint64_t value);
 
   private:
-  ::uint64_t _internal_faucet_value() const;
-  void _internal_set_faucet_value(::uint64_t value);
+  ::uint64_t _internal_pre_mine_value() const;
+  void _internal_set_pre_mine_value(::uint64_t value);
 
   public:
   // uint64 max_script_byte_size = 18;
@@ -2802,6 +2803,16 @@ class ConsensusConstants final : public ::google::protobuf::Message
   ::uint64_t _internal_tail_epoch_length() const;
   void _internal_set_tail_epoch_length(::uint64_t value);
 
+  public:
+  // uint64 max_block_coinbase_count = 37;
+  void clear_max_block_coinbase_count() ;
+  ::uint64_t max_block_coinbase_count() const;
+  void set_max_block_coinbase_count(::uint64_t value);
+
+  private:
+  ::uint64_t _internal_max_block_coinbase_count() const;
+  void _internal_set_max_block_coinbase_count(::uint64_t value);
+
   public:
   // uint32 blockchain_version = 2;
   void clear_blockchain_version() ;
@@ -2818,7 +2829,7 @@ class ConsensusConstants final : public ::google::protobuf::Message
   class _Internal;
   friend class ::google::protobuf::internal::TcParser;
   static const ::google::protobuf::internal::TcParseTable<
-      5, 33, 8,
+      5, 34, 8,
       0, 7>
       _table_;
   friend class ::google::protobuf::MessageLite;
@@ -2862,7 +2873,7 @@ class ConsensusConstants final : public ::google::protobuf::Message
     ::uint64_t block_weight_inputs_;
     ::uint64_t block_weight_outputs_;
     ::uint64_t block_weight_kernels_;
-    ::uint64_t faucet_value_;
+    ::uint64_t pre_mine_value_;
     ::uint64_t max_script_byte_size_;
     ::uint64_t validator_node_validity_period_;
     ::uint64_t effective_from_height_;
@@ -2873,6 +2884,7 @@ class ConsensusConstants final : public ::google::protobuf::Message
     ::uint64_t validator_node_registration_shuffle_interval_epoch_;
     ::uint64_t inflation_bips_;
     ::uint64_t tail_epoch_length_;
+    ::uint64_t max_block_coinbase_count_;
     ::uint32_t blockchain_version_;
     PROTOBUF_TSAN_DECLARE_MEMBER
   };
@@ -4302,26 +4314,26 @@ inline void ConsensusConstants::_internal_set_block_weight_kernels(::uint64_t va
   _impl_.block_weight_kernels_ = value;
 }
 
-// uint64 faucet_value = 17;
-inline void ConsensusConstants::clear_faucet_value() {
+// uint64 pre_mine_value = 17;
+inline void ConsensusConstants::clear_pre_mine_value() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.faucet_value_ = ::uint64_t{0u};
+  _impl_.pre_mine_value_ = ::uint64_t{0u};
 }
-inline ::uint64_t ConsensusConstants::faucet_value() const {
-  // @@protoc_insertion_point(field_get:tari.rpc.ConsensusConstants.faucet_value)
-  return _internal_faucet_value();
+inline ::uint64_t ConsensusConstants::pre_mine_value() const {
+  // @@protoc_insertion_point(field_get:tari.rpc.ConsensusConstants.pre_mine_value)
+  return _internal_pre_mine_value();
 }
-inline void ConsensusConstants::set_faucet_value(::uint64_t value) {
-  _internal_set_faucet_value(value);
-  // @@protoc_insertion_point(field_set:tari.rpc.ConsensusConstants.faucet_value)
+inline void ConsensusConstants::set_pre_mine_value(::uint64_t value) {
+  _internal_set_pre_mine_value(value);
+  // @@protoc_insertion_point(field_set:tari.rpc.ConsensusConstants.pre_mine_value)
 }
-inline ::uint64_t ConsensusConstants::_internal_faucet_value() const {
+inline ::uint64_t ConsensusConstants::_internal_pre_mine_value() const {
   PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.faucet_value_;
+  return _impl_.pre_mine_value_;
 }
-inline void ConsensusConstants::_internal_set_faucet_value(::uint64_t value) {
+inline void ConsensusConstants::_internal_set_pre_mine_value(::uint64_t value) {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.faucet_value_ = value;
+  _impl_.pre_mine_value_ = value;
 }
 
 // uint64 max_script_byte_size = 18;
@@ -5146,6 +5158,28 @@ inline void ConsensusConstants::_internal_set_tail_epoch_length(::uint64_t value
   _impl_.tail_epoch_length_ = value;
 }
 
+// uint64 max_block_coinbase_count = 37;
+inline void ConsensusConstants::clear_max_block_coinbase_count() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  _impl_.max_block_coinbase_count_ = ::uint64_t{0u};
+}
+inline ::uint64_t ConsensusConstants::max_block_coinbase_count() const {
+  // @@protoc_insertion_point(field_get:tari.rpc.ConsensusConstants.max_block_coinbase_count)
+  return _internal_max_block_coinbase_count();
+}
+inline void ConsensusConstants::set_max_block_coinbase_count(::uint64_t value) {
+  _internal_set_max_block_coinbase_count(value);
+  // @@protoc_insertion_point(field_set:tari.rpc.ConsensusConstants.max_block_coinbase_count)
+}
+inline ::uint64_t ConsensusConstants::_internal_max_block_coinbase_count() const {
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  return _impl_.max_block_coinbase_count_;
+}
+inline void ConsensusConstants::_internal_set_max_block_coinbase_count(::uint64_t value) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  _impl_.max_block_coinbase_count_ = value;
+}
+
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif  // __GNUC__

external/src/Tari/proto/gRPC/types.proto

@@ -124,7 +124,7 @@ message ConsensusConstants {
     uint64 block_weight_inputs = 14;
     uint64 block_weight_outputs = 15;
     uint64 block_weight_kernels = 16;
-    uint64 faucet_value = 17;
+    uint64 pre_mine_value = 17;
     uint64 max_script_byte_size = 18;
     uint64 validator_node_validity_period = 19;
     uint64 effective_from_height = 20;
@@ -143,4 +143,5 @@ message ConsensusConstants {
     repeated PermittedRangeProofs permitted_range_proof_types = 34;
     uint64 inflation_bips = 35;
     uint64 tail_epoch_length = 36;
+    uint64 max_block_coinbase_count = 37;
 }

external/src/crypto/sha256.c

@@ -21,6 +21,14 @@
 #include <memory.h>
 
 /****************************** MACROS ******************************/
+typedef struct {
+	uint8_t data[64];
+	uint32_t datalen;
+	uint32_t padding;
+	uint64_t bitlen;
+	uint32_t state[8];
+} SHA256_CTX;
+
 #define ROTLEFT(a,b) (((a) << (b)) | ((a) >> (32-(b))))
 #define ROTRIGHT(a,b) (((a) >> (b)) | ((a) << (32-(b))))
 
@@ -85,7 +93,7 @@ static void sha256_transform(SHA256_CTX *ctx, const uint8_t* data)
 	ctx->state[7] += h;
 }
 
-void sha256_init(SHA256_CTX *ctx)
+static void sha256_init(SHA256_CTX *ctx)
 {
 	ctx->datalen = 0;
 	ctx->bitlen = 0;
@@ -99,7 +107,7 @@ void sha256_init(SHA256_CTX *ctx)
 	ctx->state[7] = 0x5be0cd19;
 }
 
-void sha256_update(SHA256_CTX *ctx, const uint8_t* data, uint32_t len)
+static void sha256_update(SHA256_CTX *ctx, const uint8_t* data, uint32_t len)
 {
 	uint32_t i;
 
@@ -114,7 +122,7 @@ void sha256_update(SHA256_CTX *ctx, const uint8_t* data, uint32_t len)
 	}
 }
 
-void sha256_final(SHA256_CTX *ctx, uint8_t* hash)
+static void sha256_final(SHA256_CTX *ctx, uint8_t* hash)
 {
 	uint32_t i;
 

external/src/crypto/sha256.h

@@ -16,22 +16,6 @@ extern "C" {
 /*************************** HEADER FILES ***************************/
 #include <stdint.h>
 
-/****************************** MACROS ******************************/
-#define SHA256_BLOCK_SIZE 32            // SHA256 outputs a 32 byte digest
-
-typedef struct {
-	uint8_t data[64];
-	uint32_t datalen;
-	uint32_t padding;
-	uint64_t bitlen;
-	uint32_t state[8];
-} SHA256_CTX;
-
-/*********************** FUNCTION DECLARATIONS **********************/
-void sha256_init(SHA256_CTX *ctx);
-void sha256_update(SHA256_CTX *ctx, const uint8_t* data, uint32_t len);
-void sha256_final(SHA256_CTX *ctx, uint8_t* hash);
-
 void sha256(const void* data, uint32_t len, uint8_t* hash);
 
 #ifdef __cplusplus

patches/boringssl/win7.patch

@@ -14,7 +14,7 @@ index a44774d23..09cf10942 100644
  // 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 HCRYPTPROV g_hCryptProv = 0;
 +
 +static BOOL WINAPI wrapper_CryptGenRandom(PBYTE pbData, SIZE_T cbData)
 +{

patches/msys2/typeinfo.patch

@@ -1,14 +0,0 @@
-diff --git a/typeinfo b/typeinfo
-index 4cce6cb..323fbc1 100644
---- a/typeinfo
-+++ b/typeinfo
-@@ -189,6 +189,9 @@ namespace std
- #endif
- 
- #if __GXX_TYPEINFO_EQUALITY_INLINE || __cplusplus > 202002L
-+#ifdef __clang__
-+  __attribute__((always_inline))
-+#endif
-   _GLIBCXX23_CONSTEXPR inline bool
-   type_info::operator==(const type_info& __arg) const _GLIBCXX_NOEXCEPT
-   {

scripts/compiler_tests/build_all.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Example usage: build_all.sh v4.8.1
+
+cd "$(dirname "$0")"
+
+docker images | grep -q p2pool_compiler_tests_ubuntu
+
+if [ $? -ne 0 ]; then
+	echo "Build image not found, creating it"
+	images/ubuntu/build.sh
+fi
+
+for i in 8 15;
+do
+	gcc/build.sh $1 $i
+done
+
+for i in 17 21;
+do
+	clang/build.sh $1 $i
+done

scripts/compiler_tests/clang/Dockerfile

@@ -0,0 +1,4 @@
+FROM p2pool_compiler_tests_ubuntu
+ARG P2POOL_VERSION CLANG_VERSION
+ADD test.sh test2.sh /p2pool/
+RUN /p2pool/test.sh ${P2POOL_VERSION} ${CLANG_VERSION}

scripts/compiler_tests/clang/build.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Example usage: ./build.sh v4.8.1 20
+
+cd "$(dirname "$0")"
+
+docker build --build-arg P2POOL_VERSION=$1 --build-arg CLANG_VERSION=$2 -t p2pool_compiler_test_clang_$1_$2 .
+
+docker create --name p2pool_compiler_test_clang_$1_$2_container p2pool_compiler_test_clang_$1_$2:latest
+docker cp p2pool_compiler_test_clang_$1_$2_container:/p2pool/logs.tar.gz clang_$2_logs.tar.gz
+docker rm p2pool_compiler_test_clang_$1_$2_container
+
+docker image rm -f p2pool_compiler_test_clang_$1_$2

scripts/compiler_tests/clang/test.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+cd /p2pool
+git fetch --jobs=$(nproc)
+git checkout $1
+git submodule update --recursive --jobs $(nproc)
+
+export COMPILER="-DCMAKE_C_COMPILER=clang-$2 -DCMAKE_CXX_COMPILER=clang++-$2"
+
+./test2.sh
+
+tar -czvf /p2pool/logs.tar.gz /p2pool/output.log

scripts/compiler_tests/clang/test2.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+set -e
+
+cd /p2pool
+mkdir build && cd build
+
+cmake .. -DCMAKE_BUILD_TYPE=Release $COMPILER 1>> /p2pool/output.log 2>&1
+make -j$(nproc) p2pool 1>> /p2pool/output.log 2>&1
+
+./p2pool --test 1>> /p2pool/output.log 2>&1
+
+make -j$(nproc) randomx-tests 1>> /p2pool/output.log 2>&1
+external/src/RandomX/randomx-tests 1>> /p2pool/output.log 2>&1
+
+cd ../tests
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release $COMPILER 1>> /p2pool/output.log 2>&1
+make -j$(nproc) p2pool_tests 1>> /p2pool/output.log 2>&1
+unxz *.xz
+
+./p2pool_tests 1>> /p2pool/output.log 2>&1

scripts/compiler_tests/gcc/Dockerfile

@@ -0,0 +1,4 @@
+FROM p2pool_compiler_tests_ubuntu
+ARG P2POOL_VERSION GCC_VERSION
+ADD test.sh test2.sh /p2pool/
+RUN /p2pool/test.sh ${P2POOL_VERSION} ${GCC_VERSION}

scripts/compiler_tests/gcc/build.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Example usage: ./build.sh v4.8.1 15
+
+cd "$(dirname "$0")"
+
+docker build --build-arg P2POOL_VERSION=$1 --build-arg GCC_VERSION=$2 -t p2pool_compiler_test_gcc_$1_$2 .
+
+docker create --name p2pool_compiler_test_gcc_$1_$2_container p2pool_compiler_test_gcc_$1_$2:latest
+docker cp p2pool_compiler_test_gcc_$1_$2_container:/p2pool/logs.tar.gz gcc_$2_logs.tar.gz
+docker rm p2pool_compiler_test_gcc_$1_$2_container
+
+docker image rm -f p2pool_compiler_test_gcc_$1_$2

scripts/compiler_tests/gcc/test.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+cd /p2pool
+git fetch --jobs=$(nproc)
+git checkout $1
+git submodule update --recursive --jobs $(nproc)
+
+export COMPILER="-DCMAKE_C_COMPILER=/usr/local/gcc-$2/bin/gcc -DCMAKE_CXX_COMPILER=/usr/local/gcc-$2/bin/g++ -DCMAKE_AR=/usr/local/gcc-$2/bin/gcc-ar -DCMAKE_RANLIB=/usr/local/gcc-$2/bin/gcc-ranlib"
+
+./test2.sh
+
+tar -czvf /p2pool/logs.tar.gz /p2pool/output.log

scripts/compiler_tests/gcc/test2.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+set -e
+
+cd /p2pool
+mkdir build && cd build
+
+cmake .. -DCMAKE_BUILD_TYPE=Release $COMPILER 1>> /p2pool/output.log 2>&1
+make -j$(nproc) p2pool 1>> /p2pool/output.log 2>&1
+
+./p2pool --test 1>> /p2pool/output.log 2>&1
+
+make -j$(nproc) randomx-tests 1>> /p2pool/output.log 2>&1
+external/src/RandomX/randomx-tests 1>> /p2pool/output.log 2>&1
+
+cd ../tests
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release $COMPILER 1>> /p2pool/output.log 2>&1
+make -j$(nproc) p2pool_tests 1>> /p2pool/output.log 2>&1
+unxz *.xz
+
+./p2pool_tests 1>> /p2pool/output.log 2>&1

scripts/compiler_tests/images/ubuntu/Dockerfile

@@ -0,0 +1,3 @@
+FROM ubuntu:24.04
+ADD prepare.sh /
+RUN /prepare.sh

scripts/compiler_tests/images/ubuntu/build.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+cd "$(dirname "$0")"
+docker build -t p2pool_compiler_tests_ubuntu .

scripts/compiler_tests/images/ubuntu/prepare.sh

@@ -0,0 +1,145 @@
+#!/bin/sh
+set -e
+
+echo "Installing prerequisites"
+
+export DEBIAN_FRONTEND=noninteractive
+
+apt-get update && apt-get upgrade -yq --no-install-recommends
+apt-get install -yq --no-install-recommends ca-certificates curl bzip2 flex lsb-release wget software-properties-common gnupg xz-utils git gcc g++ cmake make libuv1-dev libzmq3-dev libsodium-dev libpgm-dev libnorm-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev
+
+echo "Installing GCC 8.5.0"
+
+cd /root
+
+git clone --depth 1 --branch releases/gcc-8.5.0 --jobs $(nproc) git://gcc.gnu.org/git/gcc.git gcc-8
+
+cd gcc-8
+contrib/download_prerequisites
+
+mkdir build && cd build
+../configure --enable-languages=c,c++ --disable-multilib --disable-bootstrap --prefix=/usr/local/gcc-8
+make -j$(nproc)
+make install
+
+echo "Installing GCC 9.5.0"
+
+cd /root
+
+git clone --depth 1 --branch releases/gcc-9.5.0 --jobs $(nproc) git://gcc.gnu.org/git/gcc.git gcc-9
+
+cd gcc-9
+contrib/download_prerequisites
+
+mkdir build && cd build
+../configure --enable-languages=c,c++ --disable-multilib --disable-bootstrap --prefix=/usr/local/gcc-9
+make -j$(nproc)
+make install
+
+echo "Installing GCC 10.5.0"
+
+cd /root
+
+git clone --depth 1 --branch releases/gcc-10.5.0 --jobs $(nproc) git://gcc.gnu.org/git/gcc.git gcc-10
+
+cd gcc-10
+contrib/download_prerequisites
+
+mkdir build && cd build
+../configure --enable-languages=c,c++ --disable-multilib --disable-bootstrap --prefix=/usr/local/gcc-10
+make -j$(nproc)
+make install
+
+echo "Installing GCC 11.5.0"
+
+cd /root
+
+git clone --depth 1 --branch releases/gcc-11.5.0 --jobs $(nproc) git://gcc.gnu.org/git/gcc.git gcc-11
+
+cd gcc-11
+contrib/download_prerequisites
+
+mkdir build && cd build
+../configure --enable-languages=c,c++ --disable-multilib --disable-bootstrap --prefix=/usr/local/gcc-11
+make -j$(nproc)
+make install
+
+echo "Installing GCC 12.4.0"
+
+cd /root
+
+git clone --depth 1 --branch releases/gcc-12.4.0 --jobs $(nproc) git://gcc.gnu.org/git/gcc.git gcc-12
+
+cd gcc-12
+contrib/download_prerequisites
+
+mkdir build && cd build
+../configure --enable-languages=c,c++ --disable-multilib --disable-bootstrap --prefix=/usr/local/gcc-12
+make -j$(nproc)
+make install
+
+echo "Installing GCC 13.4.0"
+
+cd /root
+
+git clone --depth 1 --branch releases/gcc-13.4.0 --jobs $(nproc) git://gcc.gnu.org/git/gcc.git gcc-13
+
+cd gcc-13
+contrib/download_prerequisites
+
+mkdir build && cd build
+../configure --enable-languages=c,c++ --disable-multilib --disable-bootstrap --prefix=/usr/local/gcc-13
+make -j$(nproc)
+make install
+
+echo "Installing GCC 14.3.0"
+
+cd /root
+
+git clone --depth 1 --branch releases/gcc-14.3.0 --jobs $(nproc) git://gcc.gnu.org/git/gcc.git gcc-14
+
+cd gcc-14
+contrib/download_prerequisites
+
+mkdir build && cd build
+../configure --enable-languages=c,c++ --disable-multilib --disable-bootstrap --prefix=/usr/local/gcc-14
+make -j$(nproc)
+make install
+
+echo "Installing GCC 15.1.0"
+
+cd /root
+
+git clone --depth 1 --branch releases/gcc-15.1.0 --jobs $(nproc) git://gcc.gnu.org/git/gcc.git gcc-15
+
+cd gcc-15
+contrib/download_prerequisites
+
+mkdir build && cd build
+../configure --enable-languages=c,c++ --disable-multilib --disable-bootstrap --prefix=/usr/local/gcc-15
+make -j$(nproc)
+make install
+
+echo "Installing clang"
+
+cd /root
+
+curl -L -O https://apt.llvm.org/llvm.sh
+chmod +x llvm.sh
+
+for i in 17 18 19 20 21;
+do
+	./llvm.sh $i
+done
+
+echo "Cloning the repository"
+
+cd /
+git clone --recursive --jobs $(nproc) https://github.com/SChernykh/p2pool
+
+echo "Deleting temporary files"
+
+cd /root
+rm -rf *
+
+echo "All done"

scripts/release/build_all.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Example usage: release_scripts/build_all.sh v4.8.1
+
+cd "$(dirname "$0")"
+
+docker images | grep -q p2pool_build_ubuntu
+
+if [ $? -ne 0 ]; then
+	echo "Build image not found, creating it"
+	images/ubuntu/build.sh
+fi
+
+gnome-terminal --tab -- freebsd_aarch64/build.sh $1
+gnome-terminal --tab -- freebsd_x64/build.sh $1
+gnome-terminal --tab -- linux_aarch64/build.sh $1
+gnome-terminal --tab -- linux_riscv64/build.sh $1
+gnome-terminal --tab -- linux_x64/build.sh $1
+gnome-terminal --tab -- windows_x64/build.sh $1
+gnome-terminal --tab -- macos_aarch64/build.sh $1
+gnome-terminal --tab -- macos_x64/build.sh $1
+gnome-terminal --tab -- source/build.sh $1

scripts/release/freebsd_aarch64/Dockerfile

@@ -0,0 +1,4 @@
+FROM p2pool_build_ubuntu
+ARG P2POOL_VERSION
+ADD p2pool_freebsd_aarch64.sh /p2pool/
+RUN /p2pool/p2pool_freebsd_aarch64.sh p2pool-${P2POOL_VERSION}-freebsd-aarch64 ${P2POOL_VERSION}

scripts/release/freebsd_aarch64/build.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Example usage: ./build.sh v4.8.1
+
+cd "$(dirname "$0")"
+
+docker build --build-arg P2POOL_VERSION=$1 -t p2pool_freebsd_aarch64_build_$1 .
+
+docker create --name p2pool_freebsd_aarch64_build_$1_container p2pool_freebsd_aarch64_build_$1:latest
+docker cp p2pool_freebsd_aarch64_build_$1_container:/p2pool/build/p2pool-$1-freebsd-aarch64.tar.gz ../p2pool-$1-freebsd-aarch64.tar.gz
+docker rm p2pool_freebsd_aarch64_build_$1_container
+
+docker image rm -f p2pool_freebsd_aarch64_build_$1

scripts/release/freebsd_aarch64/p2pool_freebsd_aarch64.sh

@@ -0,0 +1,56 @@
+#!/bin/sh
+set -e
+
+cd /p2pool
+git fetch --jobs=$(nproc)
+git checkout $2
+git submodule update --recursive --jobs $(nproc)
+
+export TZ=UTC0
+
+BUILD_TIMESTAMP=$(git show --no-patch --format=%ct $2)
+CURRENT_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y-%m-%d")
+CURRENT_TIME=$(date -u -d @$BUILD_TIMESTAMP +"%H:%M:%S")
+TOUCH_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y%m%d%H%M.%S")
+
+flags_size="-ffunction-sections -fdata-sections -Wl,-s -Wl,--gc-sections"
+flags_datetime="-D__DATE__=\"\\\"$CURRENT_DATE\\\"\" -D__TIME__=\"\\\"$CURRENT_TIME\\\"\" -Wno-builtin-macro-redefined"
+
+flags_libs="--target=aarch64-unknown-freebsd12.0 --sysroot=/usr/local/cross-freebsd-aarch64 -Os -flto -fuse-ld=lld -w $flags_size $flags_datetime"
+flags_p2pool="--target=aarch64-unknown-freebsd12.0 --sysroot=/usr/local/cross-freebsd-aarch64 -fuse-ld=lld -Wno-unused-command-line-argument $flags_size $flags_datetime"
+
+cd /p2pool/external/src/curl
+cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/freebsd_aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+make -j$(nproc)
+cd lib && cp -f libcurl.a .libs
+
+cd /p2pool/external/src/libuv
+rm -rf build
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../../cmake/freebsd_aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+make -j$(nproc)
+
+cd /p2pool/external/src/libzmq
+rm -rf build
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../../cmake/freebsd_aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DCMAKE_CXX_FLAGS="$flags_libs" -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+make -j$(nproc)
+
+cd /p2pool
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_TOOLCHAIN_FILE=../cmake/freebsd_aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DOPENSSL_NO_ASM=ON -DSTATIC_BINARY=ON -DARCH_ID=aarch64
+make -j$(nproc) p2pool
+
+mkdir $1
+
+mv p2pool $1
+mv ../LICENSE $1
+mv ../README.md $1
+
+chmod -R 0664 $1
+chmod 0775 $1
+chmod 0775 $1/p2pool
+
+tar cvf $1.tar --format=pax --pax-option='exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime' --sort=name --owner=0 --group=0 --mtime="$CURRENT_DATE $CURRENT_TIME" $1
+touch -t $TOUCH_DATE $1.tar
+7z a -tgzip -mx9 -mfb256 -stl $1.tar.gz $1.tar

scripts/release/freebsd_x64/Dockerfile

@@ -0,0 +1,4 @@
+FROM p2pool_build_ubuntu
+ARG P2POOL_VERSION
+ADD p2pool_freebsd_x64.sh /p2pool/
+RUN /p2pool/p2pool_freebsd_x64.sh p2pool-${P2POOL_VERSION}-freebsd-x64 ${P2POOL_VERSION}

scripts/release/freebsd_x64/build.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Example usage: ./build.sh v4.8.1
+
+cd "$(dirname "$0")"
+
+docker build --build-arg P2POOL_VERSION=$1 -t p2pool_freebsd_x64_build_$1 .
+
+docker create --name p2pool_freebsd_x64_build_$1_container p2pool_freebsd_x64_build_$1:latest
+docker cp p2pool_freebsd_x64_build_$1_container:/p2pool/build/p2pool-$1-freebsd-x64.tar.gz ../p2pool-$1-freebsd-x64.tar.gz
+docker rm p2pool_freebsd_x64_build_$1_container
+
+docker image rm -f p2pool_freebsd_x64_build_$1

scripts/release/freebsd_x64/p2pool_freebsd_x64.sh

@@ -0,0 +1,56 @@
+#!/bin/sh
+set -e
+
+cd /p2pool
+git fetch --jobs=$(nproc)
+git checkout $2
+git submodule update --recursive --jobs $(nproc)
+
+export TZ=UTC0
+
+BUILD_TIMESTAMP=$(git show --no-patch --format=%ct $2)
+CURRENT_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y-%m-%d")
+CURRENT_TIME=$(date -u -d @$BUILD_TIMESTAMP +"%H:%M:%S")
+TOUCH_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y%m%d%H%M.%S")
+
+flags_size="-ffunction-sections -fdata-sections -Wl,-s -Wl,--gc-sections"
+flags_datetime="-D__DATE__=\"\\\"$CURRENT_DATE\\\"\" -D__TIME__=\"\\\"$CURRENT_TIME\\\"\" -Wno-builtin-macro-redefined"
+
+flags_libs="--target=x86_64-unknown-freebsd12.0 --sysroot=/usr/local/cross-freebsd-x86_64 -Os -flto -fuse-ld=lld -w $flags_size $flags_datetime"
+flags_p2pool="--target=x86_64-unknown-freebsd12.0 --sysroot=/usr/local/cross-freebsd-x86_64 -fuse-ld=lld -Wno-unused-command-line-argument $flags_size $flags_datetime"
+
+cd /p2pool/external/src/curl
+cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/freebsd_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+make -j$(nproc)
+cd lib && cp -f libcurl.a .libs
+
+cd /p2pool/external/src/libuv
+rm -rf build
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../../cmake/freebsd_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+make -j$(nproc)
+
+cd /p2pool/external/src/libzmq
+rm -rf build
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../../cmake/freebsd_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DCMAKE_CXX_FLAGS="$flags_libs" -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+make -j$(nproc)
+
+cd /p2pool
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_TOOLCHAIN_FILE=../cmake/freebsd_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DOPENSSL_NO_ASM=ON -DSTATIC_BINARY=ON -DARCH_ID=x86_64
+make -j$(nproc) p2pool
+
+mkdir $1
+
+mv p2pool $1
+mv ../LICENSE $1
+mv ../README.md $1
+
+chmod -R 0664 $1
+chmod 0775 $1
+chmod 0775 $1/p2pool
+
+tar cvf $1.tar --format=pax --pax-option='exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime' --sort=name --owner=0 --group=0 --mtime="$CURRENT_DATE $CURRENT_TIME" $1
+touch -t $TOUCH_DATE $1.tar
+7z a -tgzip -mx9 -mfb256 -stl $1.tar.gz $1.tar

scripts/release/gen_sums.sh

@@ -0,0 +1,34 @@
+#!/bin/sh
+set -e
+
+OUTPUT_FILE=sha256sums.txt
+> $OUTPUT_FILE
+
+format_size() {
+	bytes=$1
+	if [ $bytes -lt 104857600 ]; then
+		kib=$(( bytes / 1024 ))
+		echo "${bytes} bytes : ${kib} KiB"
+	else
+		mib=$(( bytes / 1048576 ))
+		echo "${bytes} bytes : ${mib} MiB"
+	fi
+}
+
+first=1
+
+for file in *.tar.gz *.zip *.tar.xz; do
+	size=$(stat -c %s "$file")
+	size_fmt=$(format_size "$size")
+	sha=$(sha256sum "$file" | awk '{print $1}')
+
+	if [ $first -eq 0 ]; then
+		echo >> $OUTPUT_FILE
+	fi
+
+	echo "Name: $file" >> $OUTPUT_FILE
+	echo "Size: $size_fmt" >> $OUTPUT_FILE
+	echo "SHA256: $sha" >> $OUTPUT_FILE
+
+	first=0
+done

scripts/release/images/ubuntu/Dockerfile

@@ -0,0 +1,3 @@
+FROM ubuntu:24.04
+ADD prepare.sh /
+RUN /prepare.sh

scripts/release/images/ubuntu/build.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+cd "$(dirname "$0")"
+docker build -t p2pool_build_ubuntu .

scripts/release/images/ubuntu/prepare.sh

@@ -0,0 +1,447 @@
+#!/bin/sh
+set -e
+
+# Software versions to install
+
+_7ZIP_VERSION=2409
+BINUTILS_VERSION=2_44
+CLANG_VERSION=20.1.8
+CMAKE_VERSION=4.0.3
+FREEBSD_VERSION=12.4
+GCC_VERSION=15.1.0
+GLIBC_VERSION=2.41
+LINUX_HEADERS_VERSION=6.15.4
+MACOSX_SDK_VERSION=15.5
+MAKE_VERSION=4.4.1
+MINGW_VERSION=13.0.0
+XZ_VERSION=5.8.1
+
+_7ZIP_SHA256="914c7e20ad5ef8e4d3cf08620ff8894b28fe11b7eb99809d6930870fbe48a281"
+CMAKE_SHA256="585ae9e013107bc8e7c7c9ce872cbdcbdff569e675b07ef57aacfb88c886faac"
+FREEBSD_AARCH64_SHA256="6c401819bfb93e810c9f9aa670a1e4685f924df5e7e0c9c6397dd6c16c954fa2"
+FREEBSD_X86_64_SHA256="581c7edacfd2fca2bdf5791f667402d22fccd8a5e184635e0cac075564d57aa8"
+GLIBC_SHA256="a5a26b22f545d6b7d7b3dd828e11e428f24f4fac43c934fb071b6a7d0828e901"
+HEADERS_SHA256="0eafd627b602f58d73917d00e4fc3196ba18cba67df6995a42aa74744d8efa16"
+MACOSX_SDK_SHA256="c15cf0f3f17d714d1aa5a642da8e118db53d79429eb015771ba816aa7c6c1cbd"
+MAKE_SHA256="dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3"
+
+echo "Install prerequisites"
+
+export DEBIAN_FRONTEND=noninteractive
+
+apt-get update && apt-get upgrade -yq --no-install-recommends
+apt-get install -yq --no-install-recommends ca-certificates curl bzip2 flex texinfo bison ninja-build python3 file rsync xz-utils gawk gettext patch git gcc g++ make
+
+echo "Install 7-zip"
+
+cd /root
+
+_7ZIP_FILE=7z$_7ZIP_VERSION-linux-x64.tar.xz
+
+curl -L -O https://7-zip.org/a/$_7ZIP_FILE
+
+_7ZIP_FILE_SHA256="$(sha256sum $_7ZIP_FILE | awk '{ print $1 }')"
+
+if [ $_7ZIP_FILE_SHA256 != $_7ZIP_SHA256 ]; then
+    echo "Error: SHA256 sum does not match for $_7ZIP_FILE - expected $_7ZIP_SHA256, got $_7ZIP_FILE_SHA256"
+    exit 1
+fi
+
+tar xf $_7ZIP_FILE
+cp -f 7zz /usr/local/bin/7z
+
+echo "Install GCC"
+
+cd /root
+
+git clone --depth 1 --branch releases/gcc-$GCC_VERSION git://gcc.gnu.org/git/gcc.git
+rm -rf gcc/.git
+
+cd gcc
+contrib/download_prerequisites
+cd ..
+
+mkdir gcc_build && cd gcc_build
+../gcc/configure --enable-languages=c,c++ --disable-multilib
+
+make -j$(nproc) bootstrap
+make install
+
+echo "Install gmp version from GCC"
+
+cd /root/gcc_build/gmp
+make install
+
+echo "Install mpfr version from GCC"
+
+cd /root/gcc_build/mpfr
+make install
+
+echo "Install binutils"
+
+cd /root
+
+git clone --depth 1 --branch binutils-$BINUTILS_VERSION git://sourceware.org/git/binutils-gdb.git
+rm -rf binutils-gdb/.git
+
+cp -r binutils-gdb binutils-gdb-aarch64
+cp -r binutils-gdb binutils-gdb-riscv64
+cp -r binutils-gdb binutils-gdb-w64
+
+cd binutils-gdb
+
+CFLAGS='-std=gnu11 -O2' ./configure
+make -j$(nproc)
+make install
+
+echo "Install cmake"
+
+cd /root
+
+CMAKE_NAME=cmake-$CMAKE_VERSION-linux-x86_64
+CMAKE_FILE=$CMAKE_NAME.tar.gz
+
+curl -L -O https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/$CMAKE_FILE
+
+CMAKE_FILE_SHA256="$(sha256sum $CMAKE_FILE | awk '{ print $1 }')"
+
+if [ $CMAKE_FILE_SHA256 != $CMAKE_SHA256 ]; then
+    echo "Error: SHA256 sum does not match for $CMAKE_FILE - expected $CMAKE_SHA256, got $CMAKE_FILE_SHA256"
+    exit 1
+fi
+
+tar xvf $CMAKE_FILE
+cp $CMAKE_NAME/bin/* /usr/local/bin
+cp -r $CMAKE_NAME/share/cmake-4.0 /usr/local/share
+
+echo "Install make"
+
+cd /root
+
+MAKE_NAME=make-$MAKE_VERSION
+MAKE_FILE=$MAKE_NAME.tar.gz
+
+curl -L -O https://ftpmirror.gnu.org/make/$MAKE_FILE
+
+MAKE_FILE_SHA256="$(sha256sum $MAKE_FILE | awk '{ print $1 }')"
+
+if [ $MAKE_FILE_SHA256 != $MAKE_SHA256 ]; then
+    echo "Error: SHA256 sum does not match for $MAKE_FILE - expected $MAKE_SHA256, got $MAKE_FILE_SHA256"
+    exit 1
+fi
+
+tar xvf $MAKE_FILE
+cd $MAKE_NAME
+CFLAGS='-O2' ./configure
+make
+cp -f make /usr/bin
+
+echo "Install clang"
+
+cd /root
+
+git clone --depth 1 --branch llvmorg-$CLANG_VERSION https://github.com/llvm/llvm-project.git
+
+cd llvm-project
+mkdir build && cd build
+cmake -G Ninja -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DLLVM_ENABLE_PROJECTS="clang;lld;libc" -DCMAKE_BUILD_TYPE=Release -DLLVM_VERSION_SUFFIX="_p2pool" ../llvm
+ninja
+ninja install
+
+cd ..
+mkdir build_runtimes
+cmake -G Ninja -S runtimes -B build_runtimes -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
+ninja -C build_runtimes cxx cxxabi unwind
+ninja -C build_runtimes install
+
+echo "Install binutils for aarch64-linux-gnu"
+
+cd /root/binutils-gdb-aarch64
+
+CFLAGS='-std=gnu11 -O2' ./configure --target=aarch64-linux-gnu
+make -j$(nproc)
+make install
+
+echo "Install Linux headers for aarch64-linux-gnu"
+
+cd /root
+
+HEADERS_FILE=linux-$LINUX_HEADERS_VERSION.tar.xz
+
+curl -L -O https://www.kernel.org/pub/linux/kernel/v6.x/$HEADERS_FILE
+
+HEADERS_FILE_SHA256="$(sha256sum $HEADERS_FILE | awk '{ print $1 }')"
+
+if [ $HEADERS_FILE_SHA256 != $HEADERS_SHA256 ]; then
+    echo "Error: SHA256 sum does not match for $HEADERS_FILE - expected $HEADERS_SHA256, got $HEADERS_FILE_SHA256"
+    exit 1
+fi
+
+tar xf linux-$LINUX_HEADERS_VERSION.tar.xz
+cd linux-$LINUX_HEADERS_VERSION
+make ARCH=arm64 INSTALL_HDR_PATH=/usr/local/aarch64-linux-gnu headers_install
+
+echo "Install GCC for aarch64-linux-gnu"
+
+cd /root
+
+mkdir gcc_build_aarch64 && cd gcc_build_aarch64
+../gcc/configure --target=aarch64-linux-gnu --enable-languages=c,c++ --disable-multilib
+make -j$(nproc) all-gcc
+make install-gcc
+
+echo "Install glibc for aarch64-linux-gnu"
+
+cd /root
+
+GLIBC_FILE=glibc-$GLIBC_VERSION.tar.xz
+
+curl -L -O https://ftpmirror.gnu.org/glibc/$GLIBC_FILE
+
+GLIBC_FILE_SHA256="$(sha256sum $GLIBC_FILE | awk '{ print $1 }')"
+
+if [ $GLIBC_FILE_SHA256 != $GLIBC_SHA256 ]; then
+    echo "Error: SHA256 sum does not match for $GLIBC_FILE - expected $GLIBC_SHA256, got $GLIBC_FILE_SHA256"
+    exit 1
+fi
+
+tar xf $GLIBC_FILE
+
+mkdir glibc_build_aarch64 && cd glibc_build_aarch64
+CFLAGS='-O2' ../glibc-$GLIBC_VERSION/configure --build=x86_64-pc-linux-gnu --host=aarch64-linux-gnu --target=aarch64-linux-gnu --prefix=/usr/local/aarch64-linux-gnu --with-headers=/usr/local/aarch64-linux-gnu/include --disable-multilib --disable-sanity-checks libc_cv_forced_unwind=yes --enable-static-nss
+make -j$(nproc) install-bootstrap-headers=yes install-headers
+make -j$(nproc) csu/subdir_lib
+install csu/crt1.o csu/crti.o csu/crtn.o /usr/local/aarch64-linux-gnu/lib
+
+aarch64-linux-gnu-gcc -nostdlib -nostartfiles -shared -x c /dev/null -o /usr/local/aarch64-linux-gnu/lib/libc.so
+
+touch /usr/local/aarch64-linux-gnu/include/gnu/stubs.h
+
+cd /root/gcc_build_aarch64
+make -j$(nproc) all-target-libgcc
+make install-target-libgcc
+
+cd /root/glibc_build_aarch64
+make -j$(nproc)
+make install
+
+echo "Finish installing GCC for aarch64-linux-gnu"
+
+cd /root/gcc_build_aarch64
+make -j$(nproc) all-target-libstdc++-v3
+make install-target-libstdc++-v3
+
+echo "Install binutils for riscv64-linux-gnu"
+
+cd /root/binutils-gdb-riscv64
+
+CFLAGS='-std=gnu11 -O2' ./configure --target=riscv64-linux-gnu
+make -j$(nproc)
+make install
+
+echo "Install Linux headers for riscv64-linux-gnu"
+
+cd /root/linux-$LINUX_HEADERS_VERSION
+make ARCH=riscv INSTALL_HDR_PATH=/usr/local/riscv64-linux-gnu headers_install
+
+echo "Install GCC for riscv64-linux-gnu"
+
+cd /root
+
+mkdir gcc_build_riscv64 && cd gcc_build_riscv64
+../gcc/configure --target=riscv64-linux-gnu --enable-languages=c,c++ --disable-multilib
+make -j$(nproc) all-gcc
+make install-gcc
+
+echo "Install glibc for riscv64-linux-gnu"
+
+cd /root
+
+mkdir glibc_build_riscv64 && cd glibc_build_riscv64
+CFLAGS='-O2' ../glibc-$GLIBC_VERSION/configure --build=x86_64-pc-linux-gnu --host=riscv64-linux-gnu --target=riscv64-linux-gnu --prefix=/usr/local/riscv64-linux-gnu --with-headers=/usr/local/riscv64-linux-gnu/include --disable-multilib --disable-sanity-checks libc_cv_forced_unwind=yes --enable-static-nss
+make -j$(nproc) install-bootstrap-headers=yes install-headers
+make -j$(nproc) csu/subdir_lib
+install csu/crt1.o csu/crti.o csu/crtn.o /usr/local/riscv64-linux-gnu/lib
+
+riscv64-linux-gnu-gcc -nostdlib -nostartfiles -shared -x c /dev/null -o /usr/local/riscv64-linux-gnu/lib/libc.so
+
+touch /usr/local/riscv64-linux-gnu/include/gnu/stubs.h
+
+cd /root/gcc_build_riscv64
+make -j$(nproc) all-target-libgcc
+make install-target-libgcc
+
+cd /root/glibc_build_riscv64
+make -j$(nproc)
+make install
+
+echo "Finish installing GCC for riscv64-linux-gnu"
+
+cd /root/gcc_build_riscv64
+make -j$(nproc) all-target-libstdc++-v3
+make install-target-libstdc++-v3
+
+echo "Add lib path for lld"
+
+ln -s /usr/local/riscv64-linux-gnu/lib /usr/local/riscv64-linux-gnu/lib64
+
+echo "Install binutils for x86_64-w64-mingw32"
+
+cd /root/binutils-gdb-w64
+
+CFLAGS='-std=gnu11 -O2' ./configure --target=x86_64-w64-mingw32
+make -j$(nproc)
+make install
+
+echo "Install mingw-w64 headers"
+
+cd /root
+
+git clone --depth=1 --branch v$MINGW_VERSION https://git.code.sf.net/p/mingw-w64/mingw-w64 mingw-w64-v$MINGW_VERSION
+rm -rf mingw-w64-v$MINGW_VERSION/.git
+
+cd mingw-w64-v$MINGW_VERSION/mingw-w64-headers
+CFLAGS='-O2' ./configure --host=x86_64-w64-mingw32 --prefix=/usr/local/x86_64-w64-mingw32 --with-default-msvcrt=msvcrt --with-default-win32-winnt=0x0600
+make install
+
+echo "Install GCC for x86_64-w64-mingw32"
+
+cd /root
+
+mkdir gcc_build_w64 && cd gcc_build_w64
+../gcc/configure --target=x86_64-w64-mingw32 --enable-languages=c,c++ --disable-multilib
+make -j$(nproc) all-gcc
+make install-gcc
+
+echo "Install mingw-w64 CRT"
+
+# Need to do it two times for some reason - first time without pthreads, or it will fail to link.
+cd /root/mingw-w64-v$MINGW_VERSION
+CFLAGS='-O2' ./configure --host=x86_64-w64-mingw32 --prefix=/usr/local/x86_64-w64-mingw32 --with-default-msvcrt=msvcrt --with-default-win32-winnt=0x0600
+make -j$(nproc)
+make -j$(nproc) install
+
+cd /root/mingw-w64-v$MINGW_VERSION
+CFLAGS='-O2' ./configure --host=x86_64-w64-mingw32 --prefix=/usr/local/x86_64-w64-mingw32 --with-default-msvcrt=msvcrt --with-default-win32-winnt=0x0600 --with-libraries=winpthreads
+make -j$(nproc)
+make -j$(nproc) install
+
+echo "Finish installing GCC for x86_64-w64-mingw32"
+
+cd /root/gcc_build_w64
+make -j$(nproc) all-target-libstdc++-v3
+make install-target-libstdc++-v3
+
+echo "Install glibc for x86_64-pc-linux-gnu"
+
+cd /root
+
+mkdir glibc_build_x86_64 && cd glibc_build_x86_64
+CFLAGS='-O2' ../glibc-$GLIBC_VERSION/configure --build=x86_64-pc-linux-gnu --host=x86_64-pc-linux-gnu --target=x86_64-pc-linux-gnu --prefix=/usr/local/x86_64-pc-linux-gnu --disable-multilib --enable-static-nss
+make -j$(nproc) install-bootstrap-headers=yes install-headers
+make -j$(nproc) csu/subdir_lib
+
+install csu/crt1.o csu/crti.o csu/crtn.o /usr/local/x86_64-pc-linux-gnu/lib
+
+gcc -nostdlib -nostartfiles -shared -x c /dev/null -o /usr/local/x86_64-pc-linux-gnu/lib/libc.so
+
+make -j$(nproc)
+make install
+
+echo "Get osxcross"
+
+cd /root
+
+git clone --branch 2.0-llvm-based https://github.com/tpoechtrager/osxcross
+cd osxcross
+git checkout cb444e230e815c06202bef1c30eca5d353235a05
+
+echo "Get MacOSX $MACOSX_SDK_VERSION SDK"
+
+cd /root/osxcross/tarballs
+
+MACOSX_SDK_FILE=MacOSX$MACOSX_SDK_VERSION.sdk.tar.xz
+
+curl -L -O https://github.com/joseluisq/macosx-sdks/releases/download/$MACOSX_SDK_VERSION/$MACOSX_SDK_FILE
+
+MACOSX_SDK_FILE_SHA256="$(sha256sum $MACOSX_SDK_FILE | awk '{ print $1 }')"
+
+if [ $MACOSX_SDK_FILE_SHA256 != $MACOSX_SDK_SHA256 ]; then
+    echo "Error: SHA256 sum does not match for $MACOSX_SDK_FILE - expected $MACOSX_SDK_SHA256, got $MACOSX_SDK_FILE_SHA256"
+    exit 1
+fi
+
+echo "Build MacOSX cross compilers"
+
+cd /root/osxcross
+TARGET_DIR=/usr/local OSX_VERSION_MIN=10.15 UNATTENDED=1 ./build.sh
+./build_compiler_rt.sh
+
+echo "Install FreeBSD $FREEBSD_VERSION SDK"
+
+cd /usr/local
+
+FREEBSD_FILE=base.txz
+
+mkdir cross-freebsd-x86_64 && mkdir cross-freebsd-aarch64
+curl -L -Z -o cross-freebsd-x86_64/$FREEBSD_FILE -o cross-freebsd-aarch64/$FREEBSD_FILE https://archive.freebsd.org/old-releases/amd64/$FREEBSD_VERSION-RELEASE/$FREEBSD_FILE https://archive.freebsd.org/old-releases/arm64/$FREEBSD_VERSION-RELEASE/$FREEBSD_FILE
+
+cd /usr/local/cross-freebsd-x86_64
+
+FREEBSD_X86_64_FILE_SHA256="$(sha256sum $FREEBSD_FILE | awk '{ print $1 }')"
+
+if [ $FREEBSD_X86_64_FILE_SHA256 != $FREEBSD_X86_64_SHA256 ]; then
+    echo "Error: SHA256 sum does not match for $FREEBSD_FILE - expected $FREEBSD_X86_64_SHA256, got $FREEBSD_X86_64_FILE_SHA256"
+    exit 1
+fi
+
+tar -xf $FREEBSD_FILE ./lib/ ./usr/lib/ ./usr/include/
+rm $FREEBSD_FILE
+#find /usr/local/cross-freebsd-x86_64/usr/lib -xtype l|xargs ls -l|grep ' /lib/'|awk '{print "ln -sf /usr/local/cross-freebsd-x86_64"$11 " " $9}'|/bin/sh
+
+cd /usr/local/cross-freebsd-aarch64
+
+FREEBSD_AARCH64_FILE_SHA256="$(sha256sum $FREEBSD_FILE | awk '{ print $1 }')"
+
+if [ $FREEBSD_AARCH64_FILE_SHA256 != $FREEBSD_AARCH64_SHA256 ]; then
+    echo "Error: SHA256 sum does not match for $FREEBSD_FILE - expected $FREEBSD_AARCH64_SHA256, got $FREEBSD_AARCH64_FILE_SHA256"
+    exit 1
+fi
+
+tar -xf $FREEBSD_FILE ./lib/ ./usr/lib/ ./usr/include/
+rm $FREEBSD_FILE
+#find /usr/local/cross-freebsd-aarch64/usr/lib -xtype l|xargs ls -l|grep ' /lib/'|awk '{print "ln -sf /usr/local/cross-freebsd-aarch64"$11 " " $9}'|/bin/sh
+
+echo "Install xz"
+
+apt-get remove -yq xz-utils
+
+cd /root
+
+git clone --depth=1 --branch v$XZ_VERSION https://github.com/tukaani-project/xz
+cd xz
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang
+make -j$(nproc)
+
+cp -f lzma* /usr/bin
+cp -f xz* /usr/bin
+
+echo "Deleting system glibc files to force our glibc"
+
+rm /usr/lib/x86_64-linux-gnu/crt1.o
+rm /usr/lib/x86_64-linux-gnu/crti.o
+rm /usr/lib/x86_64-linux-gnu/crtn.o
+rm /usr/lib/x86_64-linux-gnu/libc.a
+
+echo "Deleting temporary files"
+
+cd /root
+rm -rf *
+
+echo "Cloning the repository"
+
+cd /
+git clone --recursive --jobs $(nproc) https://github.com/SChernykh/p2pool
+
+echo "All done"

scripts/release/linux_aarch64/Dockerfile

@@ -0,0 +1,4 @@
+FROM p2pool_build_ubuntu
+ARG P2POOL_VERSION
+ADD p2pool_linux_aarch64.sh /p2pool/
+RUN /p2pool/p2pool_linux_aarch64.sh p2pool-${P2POOL_VERSION}-linux-aarch64 ${P2POOL_VERSION}

scripts/release/linux_aarch64/build.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Example usage: ./build.sh v4.8.1
+
+cd "$(dirname "$0")"
+
+docker build --build-arg P2POOL_VERSION=$1 -t p2pool_ubuntu_aarch64_build_$1 .
+
+docker create --name p2pool_ubuntu_aarch64_build_$1_container p2pool_ubuntu_aarch64_build_$1:latest
+docker cp p2pool_ubuntu_aarch64_build_$1_container:/p2pool/build/p2pool-$1-linux-aarch64.tar.gz ../p2pool-$1-linux-aarch64.tar.gz
+docker rm p2pool_ubuntu_aarch64_build_$1_container
+
+docker image rm -f p2pool_ubuntu_aarch64_build_$1

scripts/release/linux_aarch64/p2pool_linux_aarch64.sh

@@ -0,0 +1,56 @@
+#!/bin/sh
+set -e
+
+cd /p2pool
+git fetch --jobs=$(nproc)
+git checkout $3
+git submodule update --recursive --jobs $(nproc)
+
+export TZ=UTC0
+
+BUILD_TIMESTAMP=$(git show --no-patch --format=%ct $2)
+CURRENT_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y-%m-%d")
+CURRENT_TIME=$(date -u -d @$BUILD_TIMESTAMP +"%H:%M:%S")
+TOUCH_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y%m%d%H%M.%S")
+
+flags_size="-ffunction-sections -fdata-sections -Wl,-s -Wl,--gc-sections"
+flags_datetime="-D__DATE__=\"\\\"$CURRENT_DATE\\\"\" -D__TIME__=\"\\\"$CURRENT_TIME\\\"\" -Wno-builtin-macro-redefined"
+
+flags_libs="--target=aarch64-linux-gnu -Os -flto -fuse-ld=lld -w $flags_size $flags_datetime"
+flags_p2pool="--target=aarch64-linux-gnu -fuse-ld=lld -Wno-unused-command-line-argument $flags_size $flags_datetime"
+
+cd /p2pool/external/src/curl
+cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+make -j$(nproc)
+cd lib && cp -f libcurl.a .libs
+
+cd /p2pool/external/src/libuv
+rm -rf build
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../../cmake/aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+make -j$(nproc)
+
+cd /p2pool/external/src/libzmq
+rm -rf build
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../../cmake/aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DCMAKE_CXX_FLAGS="$flags_libs" -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+make -j$(nproc)
+
+cd /p2pool
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_TOOLCHAIN_FILE=../cmake/aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DOPENSSL_NO_ASM=ON -DSTATIC_BINARY=ON -DARCH_ID=aarch64
+make -j$(nproc) p2pool
+
+mkdir $1
+
+mv p2pool $1
+mv ../LICENSE $1
+mv ../README.md $1
+
+chmod -R 0664 $1
+chmod 0775 $1
+chmod 0775 $1/p2pool
+
+tar cvf $1.tar --format=pax --pax-option='exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime' --sort=name --owner=0 --group=0 --mtime="$CURRENT_DATE $CURRENT_TIME" $1
+touch -t $TOUCH_DATE $1.tar
+7z a -tgzip -mx9 -mfb256 -stl $1.tar.gz $1.tar

scripts/release/linux_riscv64/Dockerfile

@@ -0,0 +1,4 @@
+FROM p2pool_build_ubuntu
+ARG P2POOL_VERSION
+ADD p2pool_linux_riscv64.sh /p2pool/
+RUN /p2pool/p2pool_linux_riscv64.sh p2pool-${P2POOL_VERSION}-linux-riscv64 ${P2POOL_VERSION}

scripts/release/linux_riscv64/build.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Example usage: ./build.sh v4.8.1
+
+cd "$(dirname "$0")"
+
+docker build --build-arg P2POOL_VERSION=$1 -t p2pool_ubuntu_riscv64_build_$1 .
+
+docker create --name p2pool_ubuntu_riscv64_build_$1_container p2pool_ubuntu_riscv64_build_$1:latest
+docker cp p2pool_ubuntu_riscv64_build_$1_container:/p2pool/build/p2pool-$1-linux-riscv64.tar.gz ../p2pool-$1-linux-riscv64.tar.gz
+docker rm p2pool_ubuntu_riscv64_build_$1_container
+
+docker image rm -f p2pool_ubuntu_riscv64_build_$1

scripts/release/linux_riscv64/p2pool_linux_riscv64.sh

@@ -0,0 +1,56 @@
+#!/bin/sh
+set -e
+
+cd /p2pool
+git fetch --jobs=$(nproc)
+git checkout $2
+git submodule update --recursive --jobs $(nproc)
+
+export TZ=UTC0
+
+BUILD_TIMESTAMP=$(git show --no-patch --format=%ct $2)
+CURRENT_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y-%m-%d")
+CURRENT_TIME=$(date -u -d @$BUILD_TIMESTAMP +"%H:%M:%S")
+TOUCH_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y%m%d%H%M.%S")
+
+flags_size="-ffunction-sections -fdata-sections -Wl,-s -Wl,--gc-sections"
+flags_datetime="-D__DATE__=\"\\\"$CURRENT_DATE\\\"\" -D__TIME__=\"\\\"$CURRENT_TIME\\\"\" -Wno-builtin-macro-redefined"
+
+flags_libs="--target=riscv64-linux-gnu -Os -flto -fuse-ld=lld -w $flags_size $flags_datetime"
+flags_p2pool="--target=riscv64-linux-gnu -fuse-ld=lld -Wno-unused-command-line-argument $flags_size $flags_datetime"
+
+cd /p2pool/external/src/curl
+cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/riscv64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+make -j$(nproc)
+cd lib && cp -f libcurl.a .libs
+
+cd /p2pool/external/src/libuv
+rm -rf build
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../../cmake/riscv64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+make -j$(nproc)
+
+cd /p2pool/external/src/libzmq
+rm -rf build
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../../cmake/riscv64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DCMAKE_CXX_FLAGS="$flags_libs" -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+make -j$(nproc)
+
+cd /p2pool
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_TOOLCHAIN_FILE=../cmake/riscv64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DOPENSSL_NO_ASM=ON -DSTATIC_BINARY=ON -DARCH_ID=riscv64
+make -j$(nproc) p2pool
+
+mkdir $1
+
+mv p2pool $1
+mv ../LICENSE $1
+mv ../README.md $1
+
+chmod -R 0664 $1
+chmod 0775 $1
+chmod 0775 $1/p2pool
+
+tar cvf $1.tar --format=pax --pax-option='exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime' --sort=name --owner=0 --group=0 --mtime="$CURRENT_DATE $CURRENT_TIME" $1
+touch -t $TOUCH_DATE $1.tar
+7z a -tgzip -mx9 -mfb256 -stl $1.tar.gz $1.tar

scripts/release/linux_x64/Dockerfile

@@ -0,0 +1,4 @@
+FROM p2pool_build_ubuntu
+ARG P2POOL_VERSION
+ADD p2pool_linux_x64.sh /p2pool/
+RUN /p2pool/p2pool_linux_x64.sh p2pool-${P2POOL_VERSION}-linux-x64 ${P2POOL_VERSION}

scripts/release/linux_x64/build.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Example usage: ./build.sh v4.8.1
+
+cd "$(dirname "$0")"
+
+docker build --build-arg P2POOL_VERSION=$1 -t p2pool_linux_x64_build_$1 .
+
+docker create --name p2pool_linux_x64_build_$1_container p2pool_linux_x64_build_$1:latest
+docker cp p2pool_linux_x64_build_$1_container:/p2pool/build/p2pool-$1-linux-x64.tar.gz ../p2pool-$1-linux-x64.tar.gz
+docker rm p2pool_linux_x64_build_$1_container
+
+docker image rm -f p2pool_linux_x64_build_$1

scripts/release/linux_x64/p2pool_linux_x64.sh

@@ -0,0 +1,56 @@
+#!/bin/sh
+set -e
+
+cd /p2pool
+git fetch --jobs=$(nproc)
+git checkout $2
+git submodule update --recursive --jobs $(nproc)
+
+export TZ=UTC0
+
+BUILD_TIMESTAMP=$(git show --no-patch --format=%ct $2)
+CURRENT_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y-%m-%d")
+CURRENT_TIME=$(date -u -d @$BUILD_TIMESTAMP +"%H:%M:%S")
+TOUCH_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y%m%d%H%M.%S")
+
+flags_size="-ffunction-sections -fdata-sections -Wl,-s -Wl,--gc-sections"
+flags_datetime="-D__DATE__=\"\\\"$CURRENT_DATE\\\"\" -D__TIME__=\"\\\"$CURRENT_TIME\\\"\" -Wno-builtin-macro-redefined"
+
+flags_libs="-Os -flto -fuse-ld=lld -w $flags_size $flags_datetime"
+flags_p2pool="-fuse-ld=lld -Wno-unused-command-line-argument $flags_size $flags_datetime"
+
+cd /p2pool/external/src/curl
+cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_C_COMPILER=clang -DCMAKE_C_FLAGS="$flags_libs" -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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+make -j$(nproc)
+cd lib && cp -f libcurl.a .libs
+
+cd /p2pool/external/src/libuv
+rm -rf build
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_C_COMPILER=clang -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+make -j$(nproc)
+
+cd /p2pool/external/src/libzmq
+rm -rf build
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_FLAGS="$flags_libs" -DCMAKE_CXX_FLAGS="$flags_libs" -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+make -j$(nproc)
+
+cd /p2pool
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DSTATIC_BINARY=ON -DARCH_ID=x86_64
+make -j$(nproc) p2pool
+
+mkdir $1
+
+mv p2pool $1
+mv ../LICENSE $1
+mv ../README.md $1
+
+chmod -R 0664 $1
+chmod 0775 $1
+chmod 0775 $1/p2pool
+
+tar cvf $1.tar --format=pax --pax-option='exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime' --sort=name --owner=0 --group=0 --mtime="$CURRENT_DATE $CURRENT_TIME" $1
+touch -t $TOUCH_DATE $1.tar
+7z a -tgzip -mx9 -mfb256 -stl $1.tar.gz $1.tar

scripts/release/macos_aarch64/Dockerfile

@@ -0,0 +1,4 @@
+FROM p2pool_build_ubuntu
+ARG P2POOL_VERSION
+ADD p2pool_macos_aarch64.sh zutil.patch /p2pool/
+RUN /p2pool/p2pool_macos_aarch64.sh p2pool-${P2POOL_VERSION}-macos-aarch64 ${P2POOL_VERSION}

scripts/release/macos_aarch64/build.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Example usage: ./build.sh v4.8.1
+
+cd "$(dirname "$0")"
+
+docker build --build-arg P2POOL_VERSION=$1 -t p2pool_macos_aarch64_build_$1 .
+
+docker create --name p2pool_macos_aarch64_build_$1_container p2pool_macos_aarch64_build_$1:latest
+docker cp p2pool_macos_aarch64_build_$1_container:/p2pool/build/p2pool-$1-macos-aarch64.tar.gz ../p2pool-$1-macos-aarch64.tar.gz
+docker rm p2pool_macos_aarch64_build_$1_container
+
+docker image rm -f p2pool_macos_aarch64_build_$1

scripts/release/macos_aarch64/p2pool_macos_aarch64.sh

@@ -0,0 +1,58 @@
+#!/bin/sh
+set -e
+
+cd /p2pool
+git fetch --jobs=$(nproc)
+git checkout $2
+git submodule update --recursive --jobs $(nproc)
+
+export TZ=UTC0
+
+BUILD_TIMESTAMP=$(git show --no-patch --format=%ct $2)
+CURRENT_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y-%m-%d")
+CURRENT_TIME=$(date -u -d @$BUILD_TIMESTAMP +"%H:%M:%S")
+TOUCH_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y%m%d%H%M.%S")
+
+flags_size=""
+flags_datetime="-D__DATE__=\"\\\"$CURRENT_DATE\\\"\" -D__TIME__=\"\\\"$CURRENT_TIME\\\"\" -Wno-builtin-macro-redefined"
+
+flags_libs="-Os -flto -w $flags_size $flags_datetime"
+flags_p2pool="$flags_size $flags_datetime"
+
+patch -u /p2pool/external/src/grpc/third_party/zlib/zutil.h -i /p2pool/zutil.patch
+
+cd /p2pool/external/src/curl
+cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/macos_aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+make -j$(nproc)
+cd lib && cp -f libcurl.a .libs
+
+cd /p2pool/external/src/libuv
+rm -rf build
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../../cmake/macos_aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+make -j$(nproc)
+
+cd /p2pool/external/src/libzmq
+rm -rf build
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../../cmake/macos_aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DCMAKE_CXX_FLAGS="$flags_libs" -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+make -j$(nproc)
+
+cd /p2pool
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_TOOLCHAIN_FILE=../cmake/macos_aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DOPENSSL_NO_ASM=ON -DSTATIC_LIBS=ON -DARCH_ID=aarch64
+make -j$(nproc) p2pool
+
+mkdir $1
+
+mv p2pool $1
+mv ../LICENSE $1
+mv ../README.md $1
+
+chmod -R 0664 $1
+chmod 0775 $1
+chmod 0775 $1/p2pool
+
+tar cvf $1.tar --format=pax --pax-option='exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime' --sort=name --owner=0 --group=0 --mtime="$CURRENT_DATE $CURRENT_TIME" $1
+touch -t $TOUCH_DATE $1.tar
+7z a -tgzip -mx9 -mfb256 -stl $1.tar.gz $1.tar

scripts/release/macos_aarch64/zutil.patch

@@ -0,0 +1,10 @@
+--- zutil.h
++++ zutil.h
+@@ -144,7 +144,6 @@
+ #      include <unix.h> /* for fdopen */
+ #    else
+ #      ifndef fdopen
+-#        define fdopen(fd,mode) NULL /* No fdopen() */
+ #      endif
+ #    endif
+ #  endif

scripts/release/macos_x64/Dockerfile

@@ -0,0 +1,4 @@
+FROM p2pool_build_ubuntu
+ARG P2POOL_VERSION
+ADD p2pool_macos_x64.sh zutil.patch /p2pool/
+RUN /p2pool/p2pool_macos_x64.sh p2pool-${P2POOL_VERSION}-macos-x64 ${P2POOL_VERSION}

scripts/release/macos_x64/build.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Example usage: ./build.sh v4.8.1
+
+cd "$(dirname "$0")"
+
+docker build --build-arg P2POOL_VERSION=$1 -t p2pool_macos_x64_build_$1 .
+
+docker create --name p2pool_macos_x64_build_$1_container p2pool_macos_x64_build_$1:latest
+docker cp p2pool_macos_x64_build_$1_container:/p2pool/build/p2pool-$1-macos-x64.tar.gz ../p2pool-$1-macos-x64.tar.gz
+docker rm p2pool_macos_x64_build_$1_container
+
+docker image rm -f p2pool_macos_x64_build_$1

scripts/release/macos_x64/p2pool_macos_x64.sh

@@ -0,0 +1,58 @@
+#!/bin/sh
+set -e
+
+cd /p2pool
+git fetch --jobs=$(nproc)
+git checkout $2
+git submodule update --recursive --jobs $(nproc)
+
+export TZ=UTC0
+
+BUILD_TIMESTAMP=$(git show --no-patch --format=%ct $2)
+CURRENT_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y-%m-%d")
+CURRENT_TIME=$(date -u -d @$BUILD_TIMESTAMP +"%H:%M:%S")
+TOUCH_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y%m%d%H%M.%S")
+
+flags_size=""
+flags_datetime="-D__DATE__=\"\\\"$CURRENT_DATE\\\"\" -D__TIME__=\"\\\"$CURRENT_TIME\\\"\" -Wno-builtin-macro-redefined"
+
+flags_libs="-Os -flto -w $flags_size $flags_datetime"
+flags_p2pool="$flags_size $flags_datetime"
+
+patch -u /p2pool/external/src/grpc/third_party/zlib/zutil.h -i /p2pool/zutil.patch
+
+cd /p2pool/external/src/curl
+cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/macos_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+make -j$(nproc)
+cd lib && cp -f libcurl.a .libs
+
+cd /p2pool/external/src/libuv
+rm -rf build
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../../cmake/macos_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+make -j$(nproc)
+
+cd /p2pool/external/src/libzmq
+rm -rf build
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../../cmake/macos_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DCMAKE_CXX_FLAGS="$flags_libs" -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+make -j$(nproc)
+
+cd /p2pool
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_TOOLCHAIN_FILE=../cmake/macos_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DOPENSSL_NO_ASM=ON -DSTATIC_LIBS=ON -DARCH_ID=x86_64
+make -j$(nproc) p2pool
+
+mkdir $1
+
+mv p2pool $1
+mv ../LICENSE $1
+mv ../README.md $1
+
+chmod -R 0664 $1
+chmod 0775 $1
+chmod 0775 $1/p2pool
+
+tar cvf $1.tar --format=pax --pax-option='exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime' --sort=name --owner=0 --group=0 --mtime="$CURRENT_DATE $CURRENT_TIME" $1
+touch -t $TOUCH_DATE $1.tar
+7z a -tgzip -mx9 -mfb256 -stl $1.tar.gz $1.tar

scripts/release/macos_x64/zutil.patch

@@ -0,0 +1,10 @@
+--- zutil.h
++++ zutil.h
+@@ -144,7 +144,6 @@
+ #      include <unix.h> /* for fdopen */
+ #    else
+ #      ifndef fdopen
+-#        define fdopen(fd,mode) NULL /* No fdopen() */
+ #      endif
+ #    endif
+ #  endif

scripts/release/source/Dockerfile

@@ -0,0 +1,4 @@
+FROM p2pool_build_ubuntu
+ARG P2POOL_VERSION
+ADD p2pool_source.sh /root
+RUN /root/p2pool_source.sh ${P2POOL_VERSION}

scripts/release/source/build.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Example usage: ./build.sh v4.8.1
+
+cd "$(dirname "$0")"
+
+docker build --build-arg P2POOL_VERSION=$1 -t p2pool_source_build_$1 .
+
+docker create --name p2pool_source_build_$1_container p2pool_source_build_$1:latest
+docker cp p2pool_source_build_$1_container:/p2pool_source-$1.tar.xz ../p2pool_source-$1.tar.xz
+docker rm p2pool_source_build_$1_container
+
+docker image rm -f p2pool_source_build_$1

scripts/release/source/p2pool_source.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+set -e
+
+cd /p2pool
+git fetch --jobs=$(nproc)
+git checkout $1
+git submodule update --recursive --jobs $(nproc)
+
+export TZ=UTC0
+
+BUILD_TIMESTAMP=$(git show --no-patch --format=%ct $1)
+CURRENT_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y-%m-%d")
+CURRENT_TIME=$(date -u -d @$BUILD_TIMESTAMP +"%H:%M:%S")
+TOUCH_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y%m%d%H%M.%S")
+
+cd /
+
+tar --format=pax --pax-option='exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime' --sort=name --owner=0 --group=0 --mtime="$CURRENT_DATE $CURRENT_TIME" --exclude=".git" -f p2pool_source-$1.tar -c p2pool
+touch -t $TOUCH_DATE p2pool_source-$1.tar
+
+xz --version
+xz --lzma2=preset=9e,dict=256MiB,pb=0 p2pool_source-$1.tar

scripts/release/windows_x64/Dockerfile

@@ -0,0 +1,4 @@
+FROM p2pool_build_ubuntu
+ARG P2POOL_VERSION
+ADD p2pool_windows_x64.sh /p2pool/
+RUN /p2pool/p2pool_windows_x64.sh p2pool-${P2POOL_VERSION}-windows-x64 ${P2POOL_VERSION}

scripts/release/windows_x64/build.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Example usage: ./build.sh v4.8.1
+
+cd "$(dirname "$0")"
+
+docker build --build-arg P2POOL_VERSION=$1 -t p2pool_windows_x64_build_$1 .
+
+docker create --name p2pool_windows_x64_build_$1_container p2pool_windows_x64_build_$1:latest
+docker cp p2pool_windows_x64_build_$1_container:/p2pool/build/p2pool-$1-windows-x64.zip ../p2pool-$1-windows-x64.zip
+docker rm p2pool_windows_x64_build_$1_container
+
+docker image rm -f p2pool_windows_x64_build_$1

scripts/release/windows_x64/p2pool_windows_x64.sh

@@ -0,0 +1,61 @@
+#!/bin/sh
+set -e
+
+cd /p2pool
+git fetch --jobs=$(nproc)
+git checkout $2
+git submodule update --recursive --jobs $(nproc)
+
+export TZ=UTC0
+
+BUILD_TIMESTAMP=$(git show --no-patch --format=%ct $2)
+CURRENT_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y-%m-%d")
+CURRENT_TIME=$(date -u -d @$BUILD_TIMESTAMP +"%H:%M:%S")
+TOUCH_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y%m%d%H%M.%S")
+
+flags_size="-ffunction-sections -fdata-sections -Wl,-s -Wl,--gc-sections"
+flags_datetime="-D__DATE__=\"\\\"$CURRENT_DATE\\\"\" -D__TIME__=\"\\\"$CURRENT_TIME\\\"\" -Wno-builtin-macro-redefined"
+
+flags_libs="--target=x86_64-pc-windows-gnu -Os -flto -Wl,/timestamp:$BUILD_TIMESTAMP -fuse-ld=lld -w $flags_size $flags_datetime"
+
+flags_p2pool="--target=x86_64-pc-windows-gnu -Wl,/timestamp:$BUILD_TIMESTAMP -fuse-ld=lld -femulated-tls -Wno-unused-command-line-argument $flags_size $flags_datetime"
+flags_cxx_headers="-isystem /usr/local/x86_64-w64-mingw32/include/c++ -isystem /usr/local/x86_64-w64-mingw32/include/c++/15.1.0 -isystem /usr/local/x86_64-w64-mingw32/include"
+
+cd /p2pool
+git apply --verbose --ignore-whitespace --directory=external/src/grpc/third_party/boringssl-with-bazel patches/boringssl/win7.patch
+
+cd /p2pool/external/src/curl
+cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/windows_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -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_BROTLI=OFF -DCURL_ZSTD=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 -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+make -j$(nproc)
+cd lib && cp -f libcurl.a .libs
+
+cd /p2pool/external/src/libuv
+rm -rf build
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../../cmake/windows_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+make -j$(nproc)
+
+cd /p2pool/external/src/libzmq
+rm -rf build
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../../cmake/windows_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DCMAKE_CXX_FLAGS="$flags_libs" -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF -DPOLLER=epoll
+make -j$(nproc)
+
+cd /p2pool
+mkdir build && cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_TOOLCHAIN_FILE=../cmake/windows_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool $flags_cxx_headers" -DOPENSSL_NO_ASM=ON -DSTATIC_BINARY=ON -DARCH_ID=x86_64
+make -j$(nproc) p2pool
+
+mkdir $1
+
+mv p2pool.exe $1
+mv ../LICENSE $1
+mv ../README.md $1
+
+chmod -R 0664 $1
+chmod 0775 $1
+chmod 0775 $1/p2pool.exe
+
+touch -t $TOUCH_DATE $1
+touch -t $TOUCH_DATE $1/*
+7z a -tzip -mx9 -mfb256 -stl $1.zip $1

src/block_cache.cpp

@@ -1,6 +1,6 @@
 /*
  * This file is part of the Monero P2Pool <https://github.com/SChernykh/p2pool>
- * Copyright (c) 2021-2024 SChernykh <https://github.com/SChernykh>
+ * Copyright (c) 2021-2025 SChernykh <https://github.com/SChernykh>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/block_cache.h

@@ -1,6 +1,6 @@
 /*
  * This file is part of the Monero P2Pool <https://github.com/SChernykh/p2pool>
- * Copyright (c) 2021-2024 SChernykh <https://github.com/SChernykh>
+ * Copyright (c) 2021-2025 SChernykh <https://github.com/SChernykh>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/block_template.cpp

@@ -1,6 +1,6 @@
 /*
  * This file is part of the Monero P2Pool <https://github.com/SChernykh/p2pool>
- * Copyright (c) 2021-2024 SChernykh <https://github.com/SChernykh>
+ * Copyright (c) 2021-2025 SChernykh <https://github.com/SChernykh>
  * Portions Copyright (c) 2012-2013 The Cryptonote developers
  * Portions Copyright (c) 2014-2021 The Monero Project
  * Portions Copyright (c) 2021 XMRig <https://github.com/xmrig>
@@ -612,6 +612,20 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const
 	m_poolBlockTemplate->m_auxChains = data.aux_chains;
 	m_poolBlockTemplate->m_auxNonce = data.aux_nonce;
 
+	m_poolBlockTemplate->m_mergeMiningExtra.clear();
+	
+	for (const AuxChainData& c : data.aux_chains) {
+		std::vector<uint8_t> v;
+		v.reserve(HASH_SIZE + 16);
+
+		v.assign(c.data.h, c.data.h + HASH_SIZE);
+
+		writeVarint(c.difficulty.lo, v);
+		writeVarint(c.difficulty.hi, v);
+
+		m_poolBlockTemplate->m_mergeMiningExtra.emplace(c.unique_id, std::move(v));
+	}
+
 	init_merge_mining_merkle_proof();
 
 	const std::vector<uint8_t> sidechain_data = m_poolBlockTemplate->serialize_sidechain_data();
@@ -727,7 +741,7 @@ void BlockTemplate::fill_optimal_knapsack(const MinerData& data, uint64_t base_r
 	constexpr uint64_t FEE_COEFF = 1000;
 
 	const uint64_t n = m_mempoolTxs.size();
-	const uint64_t max_weight = data.median_weight + (data.median_weight / 32) - miner_tx_weight;
+	const uint64_t max_weight = data.median_weight + (data.median_weight / 8) - miner_tx_weight;
 
 	m_knapsack.resize((n + 1) * max_weight);
 	memset(m_knapsack.data(), 0, max_weight * sizeof(uint32_t));