p2pool v4.4

Fix stop signal for stats container

.github/workflows/c-cpp.yml

@@ -12,36 +12,38 @@ on:
 jobs:
   build-alpine-static:
 
-    timeout-minutes: 75
+    timeout-minutes: 240
     runs-on: ubuntu-22.04
 
     strategy:
       matrix:
         config:
-          - {arch: x86_64, flags: "-flto=2 -fuse-linker-plugin -ffunction-sections -Wno-error=inline"}
-          - {arch: aarch64, flags: "-flto=2 -fuse-linker-plugin -ffunction-sections -Wno-error=inline -mfix-cortex-a53-835769 -mfix-cortex-a53-843419"}
+          - {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"}
 
     steps:
     - name: Setup Alpine Linux
       uses: jirutka/setup-alpine@v1
       with:
         arch: ${{ matrix.config.arch }}
+        branch: ${{ matrix.config.branch }}
 
     - name: Install dependencies
       shell: alpine.sh --root {0}
       run: |
-        apk add git cmake gcc g++ make
+        apk add git cmake gcc g++ make linux-headers
 
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
-        submodules: true
+        submodules: recursive
 
     - name: Build libcurl
       shell: alpine.sh {0}
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_C_FLAGS="-Os ${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF
+        cmake . -DCMAKE_C_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
         make -j$(nproc)
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -51,7 +53,7 @@ jobs:
         cd external/src/libuv
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_FLAGS='-Os ${{ matrix.config.flags }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+        cmake .. -DCMAKE_C_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
         make -j$(nproc)
 
     - name: Build libzmq
@@ -60,7 +62,7 @@ jobs:
         cd external/src/libzmq
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_FLAGS='-Os ${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='-Os ${{ matrix.config.flags }}' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+        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
         make -j$(nproc)
 
     - name: Build p2pool
@@ -69,13 +71,15 @@ jobs:
         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 }}
-        make -j$(nproc)
+        make -j$(nproc) p2pool
 
     - name: Run RandomX tests
       shell: alpine.sh {0}
       run: |
-        build/p2pool --test
-        build/external/src/RandomX/randomx-tests
+        cd build
+        ./p2pool --test
+        make -j$(nproc) randomx-tests
+        external/src/RandomX/randomx-tests
 
     - name: Build tests
       shell: alpine.sh {0}
@@ -100,21 +104,22 @@ jobs:
         file p2pool
 
     - name: Archive binary
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: p2pool-alpine-static-${{ matrix.config.arch }}
         path: build/p2pool
 
   build-ubuntu:
 
-    timeout-minutes: 10
+    timeout-minutes: 60
     runs-on: ${{ matrix.config.os }}
 
     strategy:
       matrix:
         config:
-          - {os: ubuntu-20.04, c: gcc-11, cpp: g++-11}
-          - {os: ubuntu-22.04, c: gcc-12, cpp: g++-12}
+          - {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-12, cpp: g++-12, flags: ""}
 
     steps:
     - name: Install dependencies
@@ -124,28 +129,30 @@ jobs:
         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 }}
 
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
-        submodules: true
+        submodules: recursive
 
     - name: Build p2pool
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_CXX_COMPILER=${{ matrix.config.cpp }} -DCMAKE_C_FLAGS='-flto=2' -DCMAKE_CXX_FLAGS='-flto=2'
-        make -j$(nproc)
+        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) p2pool
 
     - name: Run RandomX tests
       run: |
-        build/p2pool --test
-        build/external/src/RandomX/randomx-tests
+        cd build
+        ./p2pool --test
+        make -j$(nproc) randomx-tests
+        external/src/RandomX/randomx-tests
 
     - name: Build tests
       run: |
         cd tests
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_CXX_COMPILER=${{ matrix.config.cpp }} -DCMAKE_C_FLAGS='-flto=2' -DCMAKE_CXX_FLAGS='-flto=2'
+        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)
 
     - name: Run tests
@@ -155,20 +162,20 @@ jobs:
         ./p2pool_tests
 
     - name: Archive binary
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: p2pool-${{ matrix.config.os }}
+        name: p2pool-${{ matrix.config.os }}-${{ matrix.config.c }}
         path: build/p2pool
 
   build-ubuntu-static-libs:
 
-    timeout-minutes: 15
+    timeout-minutes: 60
     runs-on: ubuntu-22.04
 
     strategy:
       matrix:
         config:
-          - {flags: "-flto=2 -fuse-linker-plugin -ffunction-sections -Wno-error=inline"}
+          - {flags: "-fuse-linker-plugin -ffunction-sections"}
 
     steps:
     - name: Install dependencies
@@ -179,14 +186,14 @@ jobs:
         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
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
-        submodules: true
+        submodules: recursive
 
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_C_FLAGS="-Os ${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF
+        cmake . -DCMAKE_C_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
         make -j$(nproc)
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -195,7 +202,7 @@ jobs:
         cd external/src/libuv
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_FLAGS='-Os ${{ matrix.config.flags }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+        cmake .. -DCMAKE_C_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
         make -j$(nproc)
 
     - name: Build libzmq
@@ -203,7 +210,7 @@ jobs:
         cd external/src/libzmq
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_FLAGS='-Os ${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='-Os ${{ matrix.config.flags }}' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+        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
         make -j$(nproc)
 
     - name: Build p2pool
@@ -211,12 +218,14 @@ jobs:
         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)
+        make -j$(nproc) p2pool
 
     - name: Run RandomX tests
       run: |
-        build/p2pool --test
-        build/external/src/RandomX/randomx-tests
+        cd build
+        ./p2pool --test
+        make -j$(nproc) randomx-tests
+        external/src/RandomX/randomx-tests
 
     - name: Build tests
       run: |
@@ -233,21 +242,21 @@ jobs:
         ./p2pool_tests
 
     - name: Archive binary
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: p2pool-ubuntu-static-libs
         path: build/p2pool
 
   build-ubuntu-aarch64:
 
-    timeout-minutes: 15
+    timeout-minutes: 60
     runs-on: ${{ matrix.config.os }}
 
     strategy:
       matrix:
         config:
-          - {os: ubuntu-20.04, flags: "-flto=2 -fuse-linker-plugin -ffunction-sections -mfix-cortex-a53-835769 -mfix-cortex-a53-843419"}
-          - {os: ubuntu-22.04, flags: "-flto=2 -fuse-linker-plugin -ffunction-sections -mfix-cortex-a53-835769 -mfix-cortex-a53-843419"}
+          - {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"}
 
     steps:
     - name: Install dependencies
@@ -256,14 +265,14 @@ jobs:
         sudo apt install -y git build-essential cmake gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu qemu-user
 
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
-        submodules: true
+        submodules: recursive
 
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_C_FLAGS="-Os ${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF
+        cmake . -DCMAKE_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
         make -j$(nproc)
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -272,7 +281,7 @@ jobs:
         cd external/src/libuv
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_C_FLAGS='-Os ${{ matrix.config.flags }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+        cmake .. -DCMAKE_TOOLCHAIN_FILE=../../../cmake/aarch64_toolchain.cmake -DCMAKE_C_FLAGS='-Os -flto=auto ${{ matrix.config.flags }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
         make -j$(nproc)
 
     - name: Build libzmq
@@ -280,20 +289,22 @@ jobs:
         cd external/src/libzmq
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ -DCMAKE_C_FLAGS='-Os ${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='-Os ${{ matrix.config.flags }}' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+        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
         make -j$(nproc)
 
     - name: Build p2pool
       run: |
         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_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
+        make -j$(nproc) p2pool
 
     - name: Run RandomX tests
       run: |
-        qemu-aarch64 -L /usr/aarch64-linux-gnu build/p2pool --test
-        qemu-aarch64 -L /usr/aarch64-linux-gnu build/external/src/RandomX/randomx-tests
+        cd build
+        qemu-aarch64 -L /usr/aarch64-linux-gnu p2pool --test
+        make -j$(nproc) randomx-tests
+        qemu-aarch64 -L /usr/aarch64-linux-gnu external/src/RandomX/randomx-tests
 
     - name: Build tests
       run: |
@@ -310,21 +321,21 @@ jobs:
         qemu-aarch64 -L /usr/aarch64-linux-gnu ./p2pool_tests
 
     - name: Archive binary
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: p2pool-${{ matrix.config.os }}-aarch64
         path: build/p2pool
 
   build-windows-msys2:
 
-    timeout-minutes: 45
+    timeout-minutes: 60
     runs-on: windows-latest
 
     strategy:
       matrix:
         config:
-          - {c: "gcc", cxx: "g++", flags: "-flto=2 -fuse-linker-plugin -ffunction-sections -Wno-error=maybe-uninitialized -Wno-error=attributes"}
-          - {c: "clang", cxx: "clang++", flags: "-flto -ffunction-sections -fuse-ld=lld -Wno-unused-command-line-argument"}
+          - {c: "gcc", cxx: "g++", flags: "-ffunction-sections -Wno-error=maybe-uninitialized -Wno-error=attributes"}
+          - {c: "clang", cxx: "clang++", flags: "-fuse-ld=lld -Wno-unused-command-line-argument -Wno-nan-infinity-disabled"}
 
     defaults:
       run:
@@ -332,7 +343,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -340,12 +351,17 @@ jobs:
       uses: eine/setup-msys2@v2
       with:
         update: true
-        install: mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang mingw-w64-x86_64-lld mingw-w64-x86_64-cmake make
+        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_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF
+        cmake . -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
         make -j$(nproc)
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -369,20 +385,22 @@ jobs:
       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
-        make -j$(nproc)
+        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
+        make -j$(nproc) p2pool
 
     - name: Run RandomX tests
       run: |
-        build/p2pool.exe --test
-        build/external/src/RandomX/randomx-tests.exe
+        cd build
+        ./p2pool.exe --test
+        make -j$(nproc) randomx-tests
+        external/src/RandomX/randomx-tests.exe
 
     - name: Build tests
       run: |
         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
+        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)
 
     - name: Run tests
@@ -392,45 +410,60 @@ jobs:
         ./p2pool_tests.exe
 
     - name: Archive binary
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: p2pool-msys2-${{ matrix.config.c }}.exe
         path: build/p2pool.exe
 
   build-windows-msbuild:
 
-    timeout-minutes: 20
+    timeout-minutes: 60
     runs-on: windows-${{ matrix.config.os }}
 
     strategy:
       matrix:
         config:
-          - {vs: Visual Studio 16 2019, os: 2019, msbuild: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\MSBuild\\Current\\Bin\\amd64\\", rx: "ON", upnp: "ON"}
-          - {vs: Visual Studio 16 2019, os: 2019, msbuild: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\MSBuild\\Current\\Bin\\amd64\\", rx: "OFF", upnp: "ON"}
-          - {vs: Visual Studio 16 2019, os: 2019, msbuild: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\MSBuild\\Current\\Bin\\amd64\\", rx: "OFF", upnp: "OFF"}
+          - {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"}
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 
     - name: Setup cmake
       uses: lukka/get-cmake@latest
 
+    - name: Apply patch
+      run: |
+        git apply --verbose --ignore-whitespace --directory=external/src/grpc/third_party/boringssl-with-bazel patches/boringssl/win7.patch
+
     - name: Build p2pool
       run: |
         mkdir build
         cd build
-        cmake .. -G "${{ matrix.config.vs }}" -DWITH_RANDOMX=${{ matrix.config.rx }} -DWITH_UPNP=${{ matrix.config.upnp }}
-        & "${{ matrix.config.msbuild }}msbuild" -v:m /m /p:Configuration=Release p2pool.vcxproj
+        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 }}
+        & "${{ matrix.config.vspath }}\\MSBuild\\Current\\Bin\\amd64\\msbuild" -v:m /m /p:Configuration=Release p2pool.vcxproj
+
+    - name: Check Windows 7 compatibility
+      shell: cmd
+      run: |
+        call "${{ matrix.config.vspath }}\\VC\\Auxiliary\\Build\\vcvarsall.bat" amd64
+        dumpbin /IMPORTS build/Release/p2pool.exe > 1.txt
+        findstr /R /C:"^  *[0-9A-F][0-9A-F]* [a-zA-Z][a-zA-Z0-9]*$" 1.txt > 2.txt
+        python tests/src/check_win7.py 2.txt
 
     - name: Run RandomX tests
       if: matrix.config.rx == 'ON'
       run: |
         build/Release/p2pool.exe --test
         cd build/external/src/RandomX
-        & "${{ matrix.config.msbuild }}msbuild" -v:m /m /p:Configuration=Release randomx-tests.vcxproj
+        & "${{ matrix.config.vspath }}\\MSBuild\\Current\\Bin\\amd64\\msbuild" -v:m /m /p:Configuration=Release randomx-tests.vcxproj
         Release/randomx-tests.exe
 
     - name: Build tests
@@ -438,36 +471,106 @@ jobs:
         cd tests
         mkdir build
         cd build
-        cmake .. -G "${{ matrix.config.vs }}"
-        & "${{ matrix.config.msbuild }}msbuild" -v:m /m /p:Configuration=Debug p2pool_tests.vcxproj
+        cmake .. -G "${{ matrix.config.vs }}" -DCMAKE_SYSTEM_VERSION="10.0" -DDEV_WITH_ASAN=ON
+        & "${{ 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
-        ./p2pool_tests.exe
+        call "${{ matrix.config.vspath }}\\VC\\Auxiliary\\Build\\vcvarsall.bat" amd64
+        p2pool_tests.exe
 
     - name: Archive binary
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: p2pool-msbuild-${{ matrix.config.os }}-randomx-${{ matrix.config.rx }}-upnp-${{ matrix.config.upnp }}.exe
+        name: p2pool-vs-${{ matrix.config.os }}-randomx-${{ matrix.config.rx }}-upnp-${{ matrix.config.upnp }}-grpc-${{ matrix.config.grpc }}-tls-${{ matrix.config.tls }}.exe
         path: build/Release/p2pool.exe
 
   build-macos:
 
-    timeout-minutes: 20
-    runs-on: macos-11
+    timeout-minutes: 60
+    runs-on: macos-13
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 
     - 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" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF
+        cmake . -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="-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
+        make -j4
+        cd lib && mkdir .libs && cp libcurl.a .libs
+
+    - name: Build libuv
+      run: |
+        cd external/src/libuv
+        mkdir build
+        cd build
+        cmake .. -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='-Os -flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+        make -j4
+
+    - name: Build libzmq
+      run: |
+        cd external/src/libzmq
+        mkdir build
+        cd build
+        cmake .. -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@15)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='-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
+        make -j4 p2pool
+
+    - name: Run RandomX tests
+      run: |
+        cd build
+        ./p2pool --test
+        make -j4 randomx-tests
+        external/src/RandomX/randomx-tests
+
+    - name: Build tests
+      run: |
+        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
+
+    - name: Run tests
+      run: |
+        cd tests/build
+        gunzip *.gz
+        ./p2pool_tests
+
+    - name: Archive binary
+      uses: actions/upload-artifact@v4
+      with:
+        name: p2pool-macos-13
+        path: build/p2pool
+
+  build-macos-aarch64:
+
+    timeout-minutes: 30
+    runs-on: macos-14
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - 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
         make -j3
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -476,7 +579,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' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+        cmake .. -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='-Os -target arm64-apple-macos-11' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
         make -j3
 
     - name: Build libzmq
@@ -484,27 +587,29 @@ 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' -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_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="-flto" -DCMAKE_CXX_FLAGS="-flto" -DSTATIC_LIBS=ON
-        make -j3
+        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 p2pool
 
     - name: Run RandomX tests
       run: |
-        build/p2pool --test
-        build/external/src/RandomX/randomx-tests
+        cd build
+        ./p2pool --test
+        make -j3 randomx-tests
+        external/src/RandomX/randomx-tests
 
     - name: Build tests
       run: |
         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" -DCMAKE_CXX_FLAGS="-flto" -DSTATIC_LIBS=ON
+        cmake .. -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@15)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="-target arm64-apple-macos-11" -DCMAKE_CXX_FLAGS="-target arm64-apple-macos-11" -DSTATIC_LIBS=ON -DWITH_LTO=OFF -DARCH_ID=aarch64
         make -j3
 
     - name: Run tests
@@ -514,61 +619,14 @@ jobs:
         ./p2pool_tests
 
     - name: Archive binary
-      uses: actions/upload-artifact@v3
-      with:
-        name: p2pool-macos-11
-        path: build/p2pool
-
-  build-macos-aarch64:
-
-    timeout-minutes: 20
-    runs-on: macos-11
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-      with:
-        submodules: recursive
-
-    - name: Build libcurl
-      run: |
-        cd external/src/curl
-        cmake . -DCMAKE_C_FLAGS="-Os -target arm64-apple-macos-11" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF
-        make -j3
-        cd lib && mkdir .libs && cp libcurl.a .libs
-
-    - name: Build libuv
-      run: |
-        cd external/src/libuv
-        mkdir build
-        cd build
-        cmake .. -DCMAKE_C_FLAGS='-Os -target arm64-apple-macos-11' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
-        make -j3
-
-    - name: Build libzmq
-      run: |
-        cd external/src/libzmq
-        mkdir build
-        cd build
-        cmake .. -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_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
-
-    - name: Archive binary
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: p2pool-macos-11-aarch64
         path: build/p2pool
 
   build-freebsd:
 
-    timeout-minutes: 75
+    timeout-minutes: 60
     runs-on: ${{ matrix.os.host }}
 
     strategy:
@@ -576,62 +634,70 @@ jobs:
         os:
           - name: freebsd
             architecture: x86-64
-            version: '12.4'
-            host: ubuntu-22.04
+            version: '13.3'
+            host: ubuntu-latest
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 
+    - name: Delete unused files
+      run: |
+        rm -rf .git
+        rm -rf external/lib
+
     - name: Build p2pool
-      uses: cross-platform-actions/action@v0.19.0
+      uses: cross-platform-actions/action@v0.24.0
       with:
         operating_system: ${{ matrix.os.name }}
         architecture: ${{ matrix.os.architecture }}
         version: ${{ matrix.os.version }}
+        memory: 12G
+        cpu_count: 4
         shell: bash
         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_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF
-          make -j2
+          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
+          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
-          make -j2
+          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
-          make -j2
+          make -j4
           cd ../../../..
           mkdir build
           cd build
-          cmake .. -DCMAKE_C_FLAGS='-flto' -DCMAKE_CXX_FLAGS='-flto' -DSTATIC_LIBS=ON
-          make -j2
+          cmake .. -DSTATIC_LIBS=ON
+          make -j4 p2pool
           ./p2pool --test
+          make -j4 randomx-tests
           external/src/RandomX/randomx-tests
           cd ../tests
           mkdir build
           cd build
-          cmake .. -DCMAKE_C_FLAGS='-flto' -DCMAKE_CXX_FLAGS='-flto' -DSTATIC_LIBS=ON
-          make -j2
+          cmake .. -DSTATIC_LIBS=ON
+          make -j4 p2pool_tests
           gunzip *.gz
           ./p2pool_tests
 
     - name: Archive binary
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: p2pool-${{ matrix.os.name }}-${{ matrix.os.version }}
         path: build/p2pool
 
   build-openbsd:
 
-    timeout-minutes: 75
+    timeout-minutes: 60
     runs-on: ${{ matrix.os.host }}
 
     strategy:
@@ -639,36 +705,43 @@ jobs:
         os:
           - name: openbsd
             architecture: x86-64
-            version: '7.2'
-            host: ubuntu-22.04
+            version: '7.4'
+            host: ubuntu-latest
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 
+    - name: Delete unused files
+      run: |
+        rm -rf .git
+        rm -rf external/lib
+
     - name: Build p2pool
-      uses: cross-platform-actions/action@v0.19.0
+      uses: cross-platform-actions/action@v0.24.0
       with:
         operating_system: ${{ matrix.os.name }}
         architecture: ${{ matrix.os.architecture }}
         version: ${{ matrix.os.version }}
+        memory: 12G
+        cpu_count: 4
         shell: bash
         run: |
           sudo pkg_add -I cmake libuv zeromq curl
           mkdir build && cd build
           cmake ..
-          make -j2
+          make -j4 p2pool
           cd ../tests
           mkdir build && cd build
           cmake ..
-          make -j2
+          make -j4 p2pool_tests
           gunzip *.gz
           ./p2pool_tests
 
     - name: Archive binary
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: p2pool-${{ matrix.os.name }}-${{ matrix.os.version }}
         path: build/p2pool

.github/workflows/clang-tidy.yml

@@ -14,31 +14,26 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-    - name: Install dependencies
-      run: |
-        sudo apt update
-        sudo apt install -y libuv1-dev libzmq3-dev libcurl4-openssl-dev
-
     - name: Install clang
       run: |
         wget https://apt.llvm.org/llvm.sh
         chmod +x llvm.sh
-        sudo ./llvm.sh 17
-        sudo apt-get install -y clang-tidy-17
-        clang-tidy-17 --verify-config
+        sudo ./llvm.sh 20
+        sudo apt-get install -y clang-tidy-20
+        clang-tidy-20 --verify-config
 
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
-        submodules: true
+        submodules: recursive
 
     - name: cmake p2pool
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-17 -DCMAKE_CXX_COMPILER=clang++-17 -DDEV_CLANG_TIDY=ON
+        cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-20 -DCMAKE_CXX_COMPILER=clang++-20 -DDEV_CLANG_TIDY=ON -DSTATIC_LIBS=ON
 
     - name: Run clang-tidy
       run: |
         cd src
-        clang-tidy-17 *.cpp -p ../build -checks=-clang-diagnostic-undefined-internal -warnings-as-errors=* -header-filter=^[^\.]
+        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=^[^\.]

.github/workflows/codeql-analysis.yml

@@ -26,7 +26,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    timeout-minutes: 20
+    timeout-minutes: 180
     runs-on: ubuntu-latest
     permissions:
       actions: read
@@ -47,13 +47,13 @@ jobs:
           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
 
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
-        submodules: true
+        submodules: recursive
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -64,7 +64,7 @@ jobs:
     # 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@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -78,4 +78,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/cppcheck.yml

@@ -15,22 +15,17 @@ on:
 jobs:
   cppcheck-ubuntu:
 
-    timeout-minutes: 50
+    timeout-minutes: 240
     runs-on: ubuntu-latest
 
     steps:
-    - name: Install dependencies
-      run: |
-        sudo apt update
-        sudo apt install -y libuv1-dev libzmq3-dev libcurl4-openssl-dev
-
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
-        submodules: true
+        submodules: recursive
 
     - name: Checkout cppcheck
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: danmar/cppcheck
         path: cppcheck-main
@@ -44,7 +39,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DSTATIC_LIBS=ON
+        cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DSTATIC_LIBS=ON -DWITH_GRPC=OFF
         python ../cppcheck/remove_external.py compile_commands.json
 
     - name: Run cppcheck
@@ -53,24 +48,32 @@ jobs:
         ./run.sh
 
     - name: Archive full error list
-      uses: actions/upload-artifact@v3
+      if: '!cancelled()'
+      uses: actions/upload-artifact@v4
       with:
         name: errors_full-linux
         path: cppcheck/errors_full.txt
 
+    - name: Archive checkers report
+      if: '!cancelled()'
+      uses: actions/upload-artifact@v4
+      with:
+        name: checkers_report-linux
+        path: cppcheck/checkers_report.txt
+
   cppcheck-windows:
 
-    timeout-minutes: 50
+    timeout-minutes: 60
     runs-on: windows-latest
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
-        submodules: true
+        submodules: recursive
 
     - name: Checkout cppcheck
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: danmar/cppcheck
         path: cppcheck-main
@@ -78,7 +81,7 @@ jobs:
     - name: Build cppcheck
       run: |
         cd cppcheck-main
-        & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\msbuild.exe" /m /p:Configuration=Release /p:Platform=x64
+        & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\msbuild.exe" -v:m /m /p:Configuration=Release /p:Platform=x64
 
     - name: Setup cmake
       uses: lukka/get-cmake@latest
@@ -95,7 +98,15 @@ jobs:
         ./run.cmd
 
     - name: Archive full error list
-      uses: actions/upload-artifact@v3
+      if: '!cancelled()'
+      uses: actions/upload-artifact@v4
       with:
         name: errors_full-windows
         path: cppcheck/errors_full.txt
+
+    - name: Archive checkers report
+      if: '!cancelled()'
+      uses: actions/upload-artifact@v4
+      with:
+        name: checkers_report-windows
+        path: cppcheck/checkers_report.txt

.github/workflows/msvc-analysis.yml

@@ -28,14 +28,14 @@ env:
 jobs:
   analyze:
     name: Analyze
-    timeout-minutes: 15
+    timeout-minutes: 240
     runs-on: windows-latest
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
-          submodules: true
+          submodules: recursive
 
       - name: Configure CMake
         run: cmake -B ${{ env.build }} -DCMAKE_BUILD_TYPE=${{ env.config }}
@@ -45,7 +45,7 @@ jobs:
       #   run: cmake --build ${{ env.build }}
 
       - name: Initialize MSVC Code Analysis
-        uses: microsoft/msvc-code-analysis-action@24c285ab36952c9e9182f4b78dfafbac38a7e5ee
+        uses: microsoft/msvc-code-analysis-action@96315324a485db21449515180214ecb78c16a1c5
         # Provide a unique ID to access the sarif output path
         id: run-analysis
         with:
@@ -53,16 +53,17 @@ jobs:
           buildConfiguration: ${{ env.config }}
           # Ruleset file that will determine what checks will be run
           ruleset: NativeRecommendedRules.ruleset
+          ignoredPaths: ${{ github.workspace }}/external
 
       # Upload SARIF file to GitHub Code Scanning Alerts
       - name: Upload SARIF to GitHub
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: ${{ steps.run-analysis.outputs.sarif }}
 
       # Upload SARIF file as an Artifact to download and view
       - name: Upload SARIF as an Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: sarif-file
           path: ${{ steps.run-analysis.outputs.sarif }}

.github/workflows/source-snapshot.yml

@@ -8,9 +8,9 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
-        submodules: true
+        submodules: recursive
 
     - name: Compress source code
       run: |
@@ -18,7 +18,7 @@ jobs:
         XZ_OPT=-e9 tar --exclude=".git" --exclude="build" -f build/p2pool_source.tar.xz -c ../p2pool --xz
 
     - name: Archive source code
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: p2pool_source.tar.xz
         path: build/p2pool_source.tar.xz

.github/workflows/test-sync.yml

@@ -10,12 +10,12 @@ on:
   pull_request:
 
   schedule:
-    - cron: '17 0/3 * * *'
+    - cron: '47 0/3 * * *'
 
 jobs:
   sync-test-ubuntu-tsan:
 
-    timeout-minutes: 30
+    timeout-minutes: 60
     runs-on: ubuntu-22.04
 
     steps:
@@ -26,14 +26,14 @@ jobs:
         sudo apt install -y git build-essential cmake gcc-12 g++-12
 
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
-        submodules: true
+        submodules: recursive
 
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_C_FLAGS='-fsanitize=thread -Os -fno-omit-frame-pointer -g' -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF
+        cmake . -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_C_FLAGS='-fsanitize=thread -Og -fno-omit-frame-pointer -g' -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_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
         make -j$(nproc)
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -42,7 +42,7 @@ jobs:
         cd external/src/libuv
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_C_FLAGS='-fsanitize=thread -Os -fno-omit-frame-pointer -g' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+        cmake .. -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_C_FLAGS='-fsanitize=thread -Og -fno-omit-frame-pointer -g' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
         make -j$(nproc)
 
     - name: Build libzmq
@@ -50,15 +50,15 @@ 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 -Os -fno-omit-frame-pointer -g' -DCMAKE_CXX_FLAGS='-fsanitize=thread -Os -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
         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 -DWITH_LTO=OFF -DSTATIC_LIBS=ON
-        make -j$(nproc)
+        cmake .. -DDEV_TEST_SYNC=ON -DDEV_WITH_TSAN=ON -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 -DCMAKE_C_FLAGS='-fsanitize=thread -Og -fno-omit-frame-pointer -g' -DCMAKE_CXX_FLAGS='-fsanitize=thread -Og -fno-omit-frame-pointer -g' -DWITH_LTO=OFF -DSTATIC_LIBS=ON
+        make -j$(nproc) p2pool
 
     - name: Run p2pool
       run: |
@@ -67,7 +67,8 @@ jobs:
         python ../tests/src/stratum_dummy.py 1 &
         python ../tests/src/stratum_dummy.py 2 &
         python ../tests/src/stratum_dummy.py 3 &
-        TSAN_OPTIONS="suppressions=../tests/src/tsan_sup.txt halt_on_error=1" ./p2pool --host xmrnode.facspro.net --rpc-port 18089 --zmq-port 18084 --host xmr2.rs.me --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
+        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
 
     - name: Check p2pool.log
       run: |
@@ -75,7 +76,7 @@ jobs:
         grep 'Synchronization finished successfully' p2pool.log
 
     - name: Archive p2pool.log
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: p2pool_ubuntu_data_tsan
         path: |
@@ -83,7 +84,7 @@ jobs:
           build/data/
 
   sync-test-ubuntu-msan:
-    timeout-minutes: 30
+    timeout-minutes: 60
     runs-on: ubuntu-22.04
 
     steps:
@@ -96,14 +97,14 @@ jobs:
       run: |
         wget https://apt.llvm.org/llvm.sh
         chmod +x llvm.sh
-        sudo ./llvm.sh 17
+        sudo ./llvm.sh 19
 
     - name: Build libcxx_msan
       run: |
-        git clone --depth=1 https://github.com/llvm/llvm-project -b release/17.x
+        git clone --depth=1 https://github.com/llvm/llvm-project -b release/19.x
         cd llvm-project
         mkdir build
-        cmake -G Ninja -S runtimes -B build -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" -DCMAKE_C_COMPILER=clang-17 -DCMAKE_CXX_COMPILER=clang++-17 -DLLVM_USE_SANITIZER=MemoryWithOrigins
+        cmake -G Ninja -S runtimes -B build -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" -DCMAKE_C_COMPILER=clang-19 -DCMAKE_CXX_COMPILER=clang++-19 -DLLVM_USE_SANITIZER=MemoryWithOrigins -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
         ninja -C build cxx cxxabi
         cd build
         mkdir /tmp/libcxx_msan
@@ -111,14 +112,14 @@ jobs:
         cp -r lib /tmp/libcxx_msan
 
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
-        submodules: true
+        submodules: recursive
 
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_C_COMPILER=clang-17 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Os -fno-omit-frame-pointer -g' -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF
+        cmake . -DCMAKE_C_COMPILER=clang-19 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Og -fno-omit-frame-pointer -g' -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_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
         make -j$(nproc)
         cd lib && mkdir .libs && cp libcurl.a .libs
 
@@ -127,7 +128,7 @@ jobs:
         cd external/src/libuv
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_COMPILER=clang-17 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Os -fno-omit-frame-pointer -g' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+        cmake .. -DCMAKE_C_COMPILER=clang-19 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Og -fno-omit-frame-pointer -g' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
         make -j$(nproc)
 
     - name: Build libzmq
@@ -135,15 +136,15 @@ jobs:
         cd external/src/libzmq
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_COMPILER=clang-17 -DCMAKE_CXX_COMPILER=clang++-17 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Os -fno-omit-frame-pointer -g' -DCMAKE_CXX_FLAGS='-nostdinc++ -nostdlib++ -fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Os -fno-omit-frame-pointer -g -isystem /tmp/libcxx_msan/include/c++/v1 -L/tmp/libcxx_msan/lib -lc++ -lc++abi -Wno-unused-command-line-argument' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+        cmake .. -DCMAKE_C_COMPILER=clang-19 -DCMAKE_CXX_COMPILER=clang++-19 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Og -fno-omit-frame-pointer -g' -DCMAKE_CXX_FLAGS='-nostdinc++ -nostdlib++ -fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Og -fno-omit-frame-pointer -g -isystem /tmp/libcxx_msan/include/c++/v1 -L/tmp/libcxx_msan/lib -lc++ -lc++abi -Wno-unused-command-line-argument' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
         make -j$(nproc)
 
     - name: Build p2pool
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_COMPILER=clang-17 -DCMAKE_CXX_COMPILER=clang++-17 -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-17 -fno-omit-frame-pointer -g' -DDEV_TEST_SYNC=ON -DDEV_WITH_MSAN=ON -DSTATIC_LIBS=ON
-        make -j$(nproc)
+        cmake .. -DCMAKE_C_COMPILER=clang-19 -DCMAKE_CXX_COMPILER=clang++-19 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -fno-omit-frame-pointer -g' -DCMAKE_CXX_FLAGS='-nostdinc++ -nostdlib++ -fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -isystem /tmp/libcxx_msan/include/c++/v1 -L/tmp/libcxx_msan/lib -Wl,-rpath /tmp/libcxx_msan/lib -lc++ -lc++abi -Wno-unused-command-line-argument -fuse-ld=lld-19 -fno-omit-frame-pointer -g' -DDEV_TEST_SYNC=ON -DDEV_WITH_MSAN=ON -DWITH_LTO=OFF -DSTATIC_LIBS=ON
+        make -j$(nproc) p2pool
 
     - name: Run p2pool
       run: |
@@ -152,7 +153,8 @@ jobs:
         python ../tests/src/stratum_dummy.py 1 &
         python ../tests/src/stratum_dummy.py 2 &
         python ../tests/src/stratum_dummy.py 3 &
-        MSAN_OPTIONS="halt_on_error=1" ./p2pool --host xmrnode.facspro.net --rpc-port 18089 --zmq-port 18084 --host xmr2.rs.me --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
+        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
 
     - name: Check p2pool.log
       run: |
@@ -160,7 +162,7 @@ jobs:
         grep 'Synchronization finished successfully' p2pool.log
 
     - name: Archive p2pool.log
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: p2pool_ubuntu_data_msan
         path: |
@@ -169,7 +171,7 @@ jobs:
 
   sync-test-ubuntu-ubsan:
 
-    timeout-minutes: 30
+    timeout-minutes: 60
     runs-on: ubuntu-22.04
 
     steps:
@@ -180,16 +182,16 @@ jobs:
         sudo apt install -y git build-essential cmake libuv1-dev libzmq3-dev libsodium-dev libpgm-dev libnorm-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev gcc-12 g++-12
 
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
-        submodules: true
+        submodules: recursive
 
     - name: Build p2pool
       run: |
         mkdir build
         cd build
-        cmake .. -DDEV_TEST_SYNC=ON -DDEV_WITH_UBSAN=ON -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 -DCMAKE_C_FLAGS="-flto=2" -DCMAKE_CXX_FLAGS="-flto=2"
-        make -j$(nproc)
+        cmake .. -DDEV_TEST_SYNC=ON -DDEV_WITH_UBSAN=ON -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 -DWITH_LTO=OFF
+        make -j$(nproc) p2pool
 
     - name: Run p2pool
       run: |
@@ -198,7 +200,8 @@ jobs:
         python ../tests/src/stratum_dummy.py 1 &
         python ../tests/src/stratum_dummy.py 2 &
         python ../tests/src/stratum_dummy.py 3 &
-        UBSAN_OPTIONS="suppressions=../tests/src/ubsan_sup.txt halt_on_error=1" ./p2pool --host xmrnode.facspro.net --rpc-port 18089 --zmq-port 18084 --host xmr2.rs.me --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
+        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
 
     - name: Check p2pool.log
       run: |
@@ -206,7 +209,7 @@ jobs:
         grep 'Synchronization finished successfully' p2pool.log
 
     - name: Archive p2pool.log
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: p2pool_ubuntu_data_ubsan
         path: |
@@ -215,7 +218,7 @@ jobs:
 
   sync-test-ubuntu-asan:
 
-    timeout-minutes: 30
+    timeout-minutes: 60
     runs-on: ubuntu-22.04
 
     steps:
@@ -226,16 +229,16 @@ jobs:
         sudo apt install -y git build-essential cmake libuv1-dev libzmq3-dev libsodium-dev libpgm-dev libnorm-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev gcc-12 g++-12
 
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
-        submodules: true
+        submodules: recursive
 
     - name: Build p2pool
       run: |
         mkdir build
         cd build
-        cmake .. -DDEV_TEST_SYNC=ON -DDEV_WITH_ASAN=ON -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 -DCMAKE_C_FLAGS="-flto=2" -DCMAKE_CXX_FLAGS="-flto=2"
-        make -j$(nproc)
+        cmake .. -DDEV_TEST_SYNC=ON -DDEV_WITH_ASAN=ON -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 -DCMAKE_C_FLAGS="-fno-omit-frame-pointer -fsanitize=address -Og -g" -DCMAKE_CXX_FLAGS="-fno-omit-frame-pointer -fsanitize=address -Og -g" -DWITH_LTO=OFF
+        make -j$(nproc) p2pool
 
     - name: Run p2pool
       run: |
@@ -244,7 +247,8 @@ jobs:
         python ../tests/src/stratum_dummy.py 1 &
         python ../tests/src/stratum_dummy.py 2 &
         python ../tests/src/stratum_dummy.py 3 &
-        ASAN_OPTIONS="detect_stack_use_after_return=1 atexit=1" ./p2pool --host xmrnode.facspro.net --rpc-port 18089 --zmq-port 18084 --host xmr2.rs.me --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
+        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
 
     - name: Check p2pool.log
       run: |
@@ -252,7 +256,7 @@ jobs:
         grep 'Synchronization finished successfully' p2pool.log
 
     - name: Archive p2pool.log
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: p2pool_ubuntu_data_asan
         path: |
@@ -261,25 +265,26 @@ jobs:
 
   sync-test-macos:
 
-    timeout-minutes: 30
-    runs-on: macos-11
+    timeout-minutes: 60
+    runs-on: ${{ matrix.config.os }}
+
+    strategy:
+      matrix:
+        config:
+          - {os: macos-13, flags: ""}
+          - {os: macos-14, flags: "-target arm64-apple-macos-11"}
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 
-    - name: Install dependencies
-      run: |
-        HOMEBREW_NO_AUTO_UPDATE=1 brew install pyenv
-        pyenv install 3:latest
-
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="-Os -flto" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF
-        make -j3
+        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
+        make -j4
         cd lib && mkdir .libs && cp libcurl.a .libs
 
     - name: Build libuv
@@ -287,23 +292,23 @@ 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' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
-        make -j3
+        cmake .. -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='${{ matrix.config.flags }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+        make -j4
 
     - name: Build libzmq
       run: |
         cd external/src/libzmq
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@15)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='-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 -j3
+        cmake .. -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@15)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }}' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+        make -j4
 
     - name: Build p2pool
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@15)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="-flto" -DCMAKE_CXX_FLAGS="-flto" -DSTATIC_LIBS=ON -DDEV_TEST_SYNC=ON
-        make -j3
+        cmake .. -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@15)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }}' -DWITH_LTO=OFF -DSTATIC_LIBS=ON -DDEV_TEST_SYNC=ON -DDEV_DEBUG=ON
+        make -j4 p2pool
 
     - name: Run p2pool
       run: |
@@ -312,7 +317,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 xmrnode.facspro.net --rpc-port 18089 --zmq-port 18084 --host xmr2.rs.me --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
+        ./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
 
     - name: Check p2pool.log
       run: |
@@ -320,21 +325,21 @@ jobs:
         grep 'Synchronization finished successfully' p2pool.log
 
     - name: Archive p2pool.log
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: p2pool_macos_data
+        name: p2pool_${{ matrix.config.os }}_data
         path: |
           build/*.log
           build/data/
 
   sync-test-windows-debug-asan:
 
-    timeout-minutes: 30
+    timeout-minutes: 60
     runs-on: windows-2022
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -345,17 +350,19 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -G "Visual Studio 17 2022" -DDEV_TEST_SYNC=ON
+        cmake .. -G "Visual Studio 17 2022" -DCMAKE_SYSTEM_VERSION="10.0" -DDEV_TEST_SYNC=ON -DDEV_WITH_ASAN=ON
         & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\msbuild" -v:m /m /p:Configuration=Debug p2pool.vcxproj
 
     - name: Run p2pool
+      shell: cmd
       run: |
+        call "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat" amd64
         cd build/Debug
         mkdir data
-        Start-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 xmrnode.facspro.net --rpc-port 18089 --zmq-port 18084 --host xmr2.rs.me --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
+        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
 
     - name: Check p2pool.log
       run: |
@@ -363,7 +370,7 @@ jobs:
         findstr /C:"Synchronization finished successfully" p2pool.log
 
     - name: Archive p2pool.log
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: p2pool_windows_data_debug_asan
         path: |
@@ -372,12 +379,12 @@ jobs:
 
   sync-test-windows-leaks:
 
-    timeout-minutes: 30
+    timeout-minutes: 60
     runs-on: windows-2022
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -388,7 +395,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -G "Visual Studio 17 2022" -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
         & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\msbuild" -v:m /m /p:Configuration=RelWithDebInfo p2pool.vcxproj
 
     - name: Run p2pool
@@ -398,17 +405,19 @@ 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 xmrnode.facspro.net --rpc-port 18089 --zmq-port 18084 --host xmr2.rs.me --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --mini --out-peers 200 --data-api data --local-api --loglevel 6
+        ./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
 
     - name: Check p2pool.log
       run: |
         cd build/RelWithDebInfo
+        Remove-Item p2pool.cache -Force
         findstr /C:"Synchronization finished successfully" p2pool.log
 
     - name: Archive p2pool.log
-      uses: actions/upload-artifact@v3
+      if: '!cancelled()'
+      uses: actions/upload-artifact@v4
       with:
         name: p2pool_windows_data_leaks
         path: |
-          build/RelWithDebInfo/*.log
+          build/RelWithDebInfo/p2pool.*
           build/RelWithDebInfo/data/

.gitmodules

@@ -25,3 +25,7 @@
 [submodule "external/src/miniupnp"]
 	path = external/src/miniupnp
 	url = https://github.com/SChernykh/miniupnp
+[submodule "external/src/grpc"]
+	path = external/src/grpc
+	url = https://github.com/SChernykh/grpc
+	branch = v1.61.x

CMakeLists.txt

@@ -1,11 +1,23 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 project(p2pool)
 
+include(cmake/standard.cmake)
+
+message(STATUS "Build environment:
+    System processor: ${CMAKE_SYSTEM_PROCESSOR}
+    C compiler:       ${CMAKE_C_COMPILER} (${CMAKE_C_COMPILER_ID})
+    CXX compiler:     ${CMAKE_CXX_COMPILER} (${CMAKE_CXX_COMPILER_ID})
+")
+
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
 option(STATIC_BINARY "Build static binary" OFF)
 option(STATIC_LIBS "Link libuv and libzmq statically" OFF)
 option(WITH_RANDOMX "Include the RandomX library in the build. If this is turned off, p2pool will rely on monerod for verifying RandomX hashes" ON)
 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(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)
@@ -14,11 +26,22 @@ option(DEV_WITH_UBSAN "[Developer only] Compile with undefined behavior sanitize
 option(DEV_WITH_ASAN "[Developer only] Compile with address sanitizer" OFF)
 option(DEV_CLANG_TIDY "[Developer only] Compile for clang-tidy" OFF)
 option(DEV_TRACK_MEMORY "[Developer only] Track memory allocations" OFF)
+option(DEV_DEBUG "[Developer only] Compile a debug build" OFF)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
+set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT p2pool)
 
-if (${CMAKE_VERSION} VERSION_GREATER "3.5.2") 
-	set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT p2pool)
+if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
+	include(cmake/msvc_libs.cmake)
+endif()
+
+if (WITH_GRPC)
+	add_definitions(-DWITH_GRPC)
+	include(cmake/grpc.cmake)
+
+	add_subdirectory(external/src/Tari)
+elseif (WITH_TLS)
+	add_subdirectory(cmake/ssl)
+	include_directories(external/src/grpc/third_party/boringssl-with-bazel/src/include)
 endif()
 
 if (WITH_RANDOMX)
@@ -61,9 +84,14 @@ if (DEV_TRACK_MEMORY)
 	add_definitions(-DDEV_TRACK_MEMORY)
 endif()
 
+if (DEV_DEBUG)
+	add_definitions(-DDEV_DEBUG)
+endif()
+
 include(cmake/flags.cmake)
 
 set(HEADERS
+	external/src/crypto/sha256.h
 	external/src/cryptonote/crypto-ops.h
 	external/src/hardforks/hardforks.h
 	src/block_cache.h
@@ -76,6 +104,9 @@ set(HEADERS
 	src/keccak.h
 	src/log.h
 	src/mempool.h
+	src/merge_mining_client.h
+	src/merge_mining_client_json_rpc.h
+	src/merkle.h
 	src/p2p_server.h
 	src/p2pool.h
 	src/p2pool_api.h
@@ -93,6 +124,7 @@ set(HEADERS
 )
 
 set(SOURCES
+	external/src/crypto/sha256.c
 	external/src/cryptonote/crypto-ops-data.c
 	external/src/cryptonote/crypto-ops.c
 	external/src/hardforks/hardforks.cpp
@@ -106,6 +138,9 @@ set(SOURCES
 	src/main.cpp
 	src/memory_leak_debug.cpp
 	src/mempool.cpp
+	src/merge_mining_client.cpp
+	src/merge_mining_client_json_rpc.cpp
+	src/merkle.cpp
 	src/p2p_server.cpp
 	src/p2pool.cpp
 	src/p2pool_api.cpp
@@ -120,11 +155,36 @@ set(SOURCES
 	src/zmq_reader.cpp
 )
 
+if (AMD64)
+	set(SOURCES ${SOURCES} src/keccak_bmi.cpp)
+	if (CMAKE_C_COMPILER_ID MATCHES GNU OR CMAKE_C_COMPILER_ID MATCHES Clang)
+		set_source_files_properties(src/keccak_bmi.cpp PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -mbmi")
+	endif()
+endif()
+
 if (WITH_RANDOMX)
 	set(HEADERS ${HEADERS} src/miner.h)
 	set(SOURCES ${SOURCES} src/miner.cpp)
+else()
+	set(HEADERS ${HEADERS} external/src/RandomX/src/cpu.hpp)
+	set(SOURCES ${SOURCES} external/src/RandomX/src/cpu.cpp)
 endif()
 
+if (WITH_GRPC)
+	set(HEADERS ${HEADERS} src/merge_mining_client_tari.h)
+	set(SOURCES ${SOURCES} src/merge_mining_client_tari.cpp)
+endif()
+
+if (WITH_TLS)
+	add_definitions(-DWITH_TLS)
+
+	set(HEADERS ${HEADERS} src/tls.h)
+	set(SOURCES ${SOURCES} src/tls.cpp)
+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})
+
 if (NOT ((CMAKE_CXX_COMPILER_ID MATCHES MSVC) OR STATIC_BINARY OR STATIC_LIBS))
 	include(FindCURL)
 endif()
@@ -145,6 +205,7 @@ endif()
 
 include_directories(src)
 include_directories(external/src)
+include_directories(external/src/crypto)
 include_directories(external/src/cryptonote)
 include_directories(${UV_INCLUDE_DIR})
 include_directories(external/src/cppzmq)
@@ -159,7 +220,7 @@ if (WITH_UPNP)
 endif()
 
 if (WIN32)
-	set(LIBS ${LIBS} ws2_32 iphlpapi userenv psapi dnsapi dbghelp)
+	set(LIBS ${LIBS} ws2_32 iphlpapi userenv psapi dnsapi dbghelp advapi32)
 	if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
 		set(LIBS ${LIBS} bcrypt)
 	endif()
@@ -172,23 +233,14 @@ elseif (NOT APPLE)
 	set(LIBS ${LIBS} pthread)
 endif()
 
-if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
-	find_library(ZMQ_LIBRARY_DEBUG NAMES libzmq-v142-mt-sgd-4_3_5 PATHS "external/lib/libzmq/Debug")
-	find_library(ZMQ_LIBRARY NAMES libzmq-v142-mt-s-4_3_5 PATHS "external/lib/libzmq/Release")
-	find_library(UV_LIBRARY_DEBUG NAMES libuv PATHS "external/lib/libuv/Debug")
-	find_library(UV_LIBRARY NAMES libuv PATHS "external/lib/libuv/Release")
-	find_library(CURL_LIBRARY_DEBUG NAMES libcurl-d PATHS "external/lib/libcurl/Debug")
-	find_library(CURL_LIBRARY NAMES libcurl PATHS "external/lib/libcurl/Release")
-	add_definitions(-D_DISABLE_VECTOR_ANNOTATION)
-	add_definitions(-D_DISABLE_STRING_ANNOTATION)
-elseif (CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang)
+if (CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang)
 	find_library(ZMQ_LIBRARY_DEBUG NAMES zmq libzmq.a)
 	find_library(ZMQ_LIBRARY NAMES zmq libzmq.a)
 	find_library(UV_LIBRARY_DEBUG NAMES uv libuv.a)
 	find_library(UV_LIBRARY NAMES uv libuv.a)
 	if (WIN32)
-		find_library(CURL_LIBRARY_DEBUG NAMES libcurl.a PATHS "external/src/curl/lib/.libs" NO_DEFAULT_PATH)
-		find_library(CURL_LIBRARY NAMES libcurl.a PATHS "external/src/curl/lib/.libs" NO_DEFAULT_PATH)
+		find_library(CURL_LIBRARY_DEBUG NAMES libcurl.a PATHS "external/src/curl/lib" NO_DEFAULT_PATH)
+		find_library(CURL_LIBRARY NAMES libcurl.a PATHS "external/src/curl/lib" NO_DEFAULT_PATH)
 	else()
 		if (CURL_LIBRARIES)
 			set(CURL_LIBRARY_DEBUG ${CURL_LIBRARIES})
@@ -225,10 +277,17 @@ endif()
 
 add_definitions(/DZMQ_STATIC)
 
+include(CheckIncludeFile)
+
+check_include_file(asm/hwcap.h HAVE_HWCAP)
+if(HAVE_HWCAP)
+	add_definitions(/DHAVE_HWCAP)
+endif()
+
 include(CheckCXXSourceCompiles)
 
 check_cxx_source_compiles("int main(){ return __builtin_clzll(1);}" HAVE_BUILTIN_CLZLL)
-check_cxx_source_compiles("#include <intrin.h>\n#pragma intrinsic(_BitScanReverse64)\nint main(){unsigned long r;_BitScanReverse64(&r,1);return r;}" HAVE_BITSCANREVERSE64)
+check_cxx_source_compiles("#include <intrin.h>\n#pragma intrinsic(_BitScanReverse64)\nint main(){unsigned long r;_BitScanReverse64(&r,1);return static_cast<int>(r);}" HAVE_BITSCANREVERSE64)
 check_cxx_source_compiles("#include <sched.h>\nint main(){sched_param param;return sched_setscheduler(0, SCHED_IDLE, &param);}" HAVE_SCHED)
 
 include(CheckCSourceCompiles)
@@ -350,13 +409,25 @@ if (STATIC_BINARY OR STATIC_LIBS)
 		set(STATIC_LIBS ${STATIC_LIBS} resolv)
 	endif()
 
+	if (WITH_GRPC)
+		set(STATIC_LIBS ${STATIC_LIBS} Tari_gRPC grpc grpc++ libprotobuf)
+	elseif(WITH_TLS)
+		set(STATIC_LIBS ${STATIC_LIBS} ssl crypto)
+	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"
-		"${CMAKE_SOURCE_DIR}/external/src/curl/lib/.libs/libcurl.a"
+		"${CMAKE_SOURCE_DIR}/external/src/curl/lib/libcurl.a"
 		${STATIC_LIBS}
 	)
 else()
+	if (WITH_GRPC)
+		set(LIBS ${LIBS} Tari_gRPC grpc grpc++ libprotobuf)
+	elseif(WITH_TLS)
+		set(LIBS ${LIBS} ssl crypto)
+	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()
 

README.md

@@ -28,6 +28,7 @@ These are 3rd-party pages. If they are down, it doesn't mean there is a problem
 - [How to mine on P2Pool](#how-to-mine-on-p2pool)
   - [General Considerations](#general-considerations)
   - [GUI for P2Pool](#gui-for-p2pool)
+  - [Merge mining](#merge-mining)
   - [GNU/Linux](#gnulinux)
   - [Windows](#windows)
 - [Build instructions](#build-instructions)
@@ -47,7 +48,7 @@ Here's the comparison table of the different ways of mining. While pool mining i
 
 * Decentralized: no central server that can be shutdown/blocked. P2Pool uses a separate blockchain to merge mine with Monero. Pool admin can't go rogue or be pressured to do an attack on the network because there is no pool admin!
 * Permissionless: there is no one to decide who can mine on the pool and who can't.
-* Trustless: there is no pool wallet, funds are never in custody. All pool blocks pay out to miners immediately.
+* Trustless: there is no pool wallet, funds are never in custody. All pool blocks pay out to miners directly.
 * PPLNS payout scheme
 * **0% fee**
 * **0 XMR payout fee**
@@ -75,12 +76,13 @@ First you need to find a pool share. This share will stay in [PPLNS](https://en.
 
 - 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.
 
 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.2.2 recommended|v3.0 or newer
+|v15, v16 (active after August 13th, 2022)|v0.18.0.0 or newer, v0.18.3.4 is recommended|v4.0 or newer
 
 ## How to mine on P2Pool
 
@@ -107,6 +109,23 @@ In order to continue mining on P2Pool, you must update both Monero and P2Pool so
 
 - [Gupax](https://github.com/hinto-janai/gupax) project aims to provide an easy to use cross-platform GUI to configure and run P2Pool & [XMRig](https://github.com/xmrig/xmrig).
 
+### 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.
+
+- 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).
+
 ### GNU/Linux
 
 1. Download the latest P2Pool binaries [here](https://github.com/SChernykh/p2pool/releases/latest).
@@ -119,12 +138,12 @@ sudo sysctl vm.nr_hugepages=3072
 4. Check that ports 18080 (Monero p2p port) and 37889/37888 (P2Pool/P2Pool mini p2p port) are open in your local firewall to ensure better connectivity. 
 5. Start `monerod` with the following command/options: 
 ```
-./monerod --zmq-pub tcp://127.0.0.1:18083 --out-peers 64 --in-peers 32 --add-priority-node=p2pmd.xmrvsbeast.com:18080 --add-priority-node=nodes.hashvault.pro:18080 --disable-dns-checkpoints --enable-dns-blocklist
+./monerod --zmq-pub tcp://127.0.0.1:18083 --out-peers 32 --in-peers 64 --add-priority-node=p2pmd.xmrvsbeast.com:18080 --add-priority-node=nodes.hashvault.pro:18080 --disable-dns-checkpoints --enable-dns-blocklist
 ``` 
 **Note:**
 The `--zmq-pub` option is required for P2Pool to work properly.
 
-`--out-peers 64 --in-peers 32` is needed to (1) have many connections to other nodes and (2) limit incoming connection count because it can grow uncontrollably and cause problems when it goes above 1000 (open files limit in Linux). If your network connection's **upload** bandwidth is less than **10 Mbit**, use `--out-peers 16 --in-peers 8` instead.
+`--out-peers 32 --in-peers 64` is needed to (1) have many connections to other nodes and (2) limit incoming connection count because it can grow uncontrollably and cause problems when it goes above 1000 (open files limit in Linux). If your network connection's **upload** bandwidth is less than **10 Mbit**, use `--out-peers 8 --in-peers 16` instead.
 
 `--add-priority-node=p2pmd.xmrvsbeast.com:18080 --add-priority-node=nodes.hashvault.pro:18080` is needed to have guaranteed good working nodes in your connected peers.
 
@@ -187,12 +206,12 @@ nocreate
 
 8. Start `monerod` with the following command/options: 
 ```
-.\Monero\monerod.exe --zmq-pub tcp://127.0.0.1:18083 --out-peers 64 --in-peers 32 --add-priority-node=p2pmd.xmrvsbeast.com:18080 --add-priority-node=nodes.hashvault.pro:18080 --disable-dns-checkpoints --enable-dns-blocklist
+.\Monero\monerod.exe --zmq-pub tcp://127.0.0.1:18083 --out-peers 32 --in-peers 64 --add-priority-node=p2pmd.xmrvsbeast.com:18080 --add-priority-node=nodes.hashvault.pro:18080 --disable-dns-checkpoints --enable-dns-blocklist
 ```
 **Note:**
 The `--zmq-pub` option is required for P2Pool to work properly.
 
-`--out-peers 64 --in-peers 32` is needed to (1) have many connections to other nodes and (2) limit incoming connection count because it can grow uncontrollably and cause problems when it goes above 1000 (open files limit in Linux). If your network connection's **upload** bandwidth is less than **10 Mbit**, use `--out-peers 16 --in-peers 8` instead.
+`--out-peers 32 --in-peers 64` is needed to (1) have many connections to other nodes and (2) limit incoming connection count because it can grow uncontrollably and cause problems when it goes above 1000 (open files limit in Linux). If your network connection's **upload** bandwidth is less than **10 Mbit**, use `--out-peers 8 --in-peers 16` instead.
 
 `--add-priority-node=p2pmd.xmrvsbeast.com:18080 --add-priority-node=nodes.hashvault.pro:18080` is needed to have guaranteed good working nodes in your connected peers.
 
@@ -218,7 +237,7 @@ The `--zmq-pub` option is required for P2Pool to work properly.
 13. *(Optional but highly recommended)* You can create a Quickstart by creating a batch (.bat) file with the following contents and placing it in your P2Pool directory along with `xmrig.exe`.
 ```
 @ECHO OFF
-start cmd /k %~dp0\Monero\monerod.exe --zmq-pub tcp://127.0.0.1:18083 --out-peers 64 --in-peers 32 --add-priority-node=p2pmd.xmrvsbeast.com:18080 --add-priority-node=nodes.hashvault.pro:18080 --disable-dns-checkpoints --enable-dns-blocklist
+start cmd /k %~dp0\Monero\monerod.exe --zmq-pub tcp://127.0.0.1:18083 --out-peers 32 --in-peers 64 --add-priority-node=p2pmd.xmrvsbeast.com:18080 --add-priority-node=nodes.hashvault.pro:18080 --disable-dns-checkpoints --enable-dns-blocklist
 ECHO Wait until the Monero daemon shows fully synced before continuing. This can take some time. Type 'status' in other window to check progress.
 PAUSE
 start cmd /k %~dp0\p2pool.exe --wallet YOUR_WALLET_ADDRESS --mini
@@ -230,7 +249,9 @@ PAUSE
 ## Build instructions
 Only 64-bit builds are supported, in particular ARMv7 or older CPUs are not supported. The reason is that RandomX hashing algorithm is too slow in 32-bit mode, and P2Pool needs to check new blocks very fast to keep up with other nodes.
 
-Please see the relevant instructions for your platform:
+### Prerequisites
+- cmake >= 3.10
+- C++ compiler with C++17 support. GCC-8, Clang-13 and MSVC-2019 have been tested and confirmed to work, older compilers may fail to build P2Pool.
 
 ### Ubuntu 20.04
 
@@ -244,7 +265,7 @@ cmake ..
 make -j$(nproc)
 ```
 
-### [Arch Linux](https://archlinux.org/packages/community/x86_64/p2pool/)
+### [Arch Linux](https://archlinux.org/packages/extra/x86_64/p2pool/)
 
 ```
 pacman -S p2pool

cmake/aarch64_toolchain.cmake

@@ -0,0 +1,8 @@
+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/flags.cmake

@@ -1,21 +1,3 @@
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_STANDARD 14)
-
-set(CMAKE_C_STANDARD 99)
-set(CMAKE_C_STANDARD_REQUIRED ON)
-
-if(NOT ARCH_ID)
-  if(CMAKE_SYSTEM_PROCESSOR STREQUAL "")
-    set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_HOST_SYSTEM_PROCESSOR})
-  endif()
-  string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" ARCH_ID)
-endif()
-
-if (ARCH_ID MATCHES "^(aarch64|arm64|armv8-a)$")
-	set(ARMv8 1)
-endif()
-
 if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
 	set(GENERAL_FLAGS "-pthread")
 
@@ -35,16 +17,24 @@ 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-align -Wcast-qual -Wlogical-op -Wstrict-overflow=2 -Wundef -Wformat=2 -Wpointer-arith -Werror")
+	set(WARNING_FLAGS "-Wall -Wextra -Wcast-qual -Wlogical-op -Wundef -Wformat=2 -Wpointer-arith -Werror -Wno-error=inline")
 
-	if (DEV_WITH_TSAN OR DEV_WITH_UBSAN OR DEV_WITH_ASAN)
-		set(OPTIMIZATION_FLAGS "-O2 -g")
+	if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.5.0)
+		set(WARNING_FLAGS "${WARNING_FLAGS} -Wstrict-overflow=2")
+	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")
 	else()
-		set(OPTIMIZATION_FLAGS "-Ofast -s")
+		set(OPTIMIZATION_FLAGS "-O3 -ffast-math -s")
 	endif()
 
 	if (WITH_LTO)
-		set(OPTIMIZATION_FLAGS "${OPTIMIZATION_FLAGS} -flto -fuse-linker-plugin")
+		set(OPTIMIZATION_FLAGS "${OPTIMIZATION_FLAGS} -flto=auto -fuse-linker-plugin")
 	endif()
 
 	if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9)
@@ -67,13 +57,22 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
 		endif()
 	endif()
 elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
-	set(GENERAL_FLAGS "/MP")
+	set(GENERAL_FLAGS "/MP /EHa")
 	set(WARNING_FLAGS "/Wall /WX /sdl")
 	set(SECURITY_FLAGS "/GS /guard:cf")
-	set(OPTIMIZATION_FLAGS "/O2 /Oi /Ob2 /Ot /DNDEBUG /GL")
+	set(OPTIMIZATION_FLAGS "/O2 /Oi /Ob2 /Ot /Oy /DNDEBUG /GL")
 
-	set(CMAKE_C_FLAGS_DEBUG "${GENERAL_FLAGS} ${WARNING_FLAGS} ${SECURITY_FLAGS} /Od /Ob0 /Zi /MTd /fsanitize=address")
-	set(CMAKE_CXX_FLAGS_DEBUG "${GENERAL_FLAGS} ${WARNING_FLAGS} ${SECURITY_FLAGS} /Od /Ob0 /Zi /MTd /fsanitize=address")
+	if (DISABLE_WARNINGS)
+		set(WARNING_FLAGS "/W0")
+	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")
+
+	if (DEV_WITH_ASAN)
+		set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /fsanitize=address")
+		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /fsanitize=address")
+	endif()
 
 	set(CMAKE_C_FLAGS_RELEASE "${GENERAL_FLAGS} ${WARNING_FLAGS} ${SECURITY_FLAGS} ${OPTIMIZATION_FLAGS} /MT")
 	set(CMAKE_CXX_FLAGS_RELEASE "${GENERAL_FLAGS} ${WARNING_FLAGS} ${SECURITY_FLAGS} ${OPTIMIZATION_FLAGS} /MT")
@@ -96,10 +95,14 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
 
 	set(WARNING_FLAGS "-Wall -Wextra -Wno-undefined-internal -Wunreachable-code-aggressive -Wmissing-prototypes -Wmissing-variable-declarations -Werror")
 
-	if (DEV_WITH_MSAN)
-		set(OPTIMIZATION_FLAGS "-O2 -g")
+	if (DISABLE_WARNINGS)
+		set(WARNING_FLAGS "-w")
+	endif()
+
+	if (DEV_WITH_MSAN OR DEV_DEBUG)
+		set(OPTIMIZATION_FLAGS "-Og -g -ftrapv")
 	else()
-		set(OPTIMIZATION_FLAGS "-Ofast -funroll-loops -fmerge-all-constants")
+		set(OPTIMIZATION_FLAGS "-O3 -ffast-math -funroll-loops -fmerge-all-constants")
 	endif()
 
 	if (WITH_LTO)

cmake/grpc.cmake

@@ -0,0 +1,40 @@
+set(protobuf_INSTALL OFF CACHE BOOL "Install protobuf binaries and files")
+set(protobuf_BUILD_TESTS OFF CACHE BOOL "Build protobuf tests")
+set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "Build libprotoc and protoc compiler")
+set(protobuf_BUILD_SHARED_LIBS OFF CACHE BOOL "Build protobuf Shared Libraries")
+set(protobuf_DISABLE_RTTI ON CACHE BOOL "Remove runtime type information in the binaries")
+
+set(utf8_range_ENABLE_TESTS OFF CACHE BOOL "Build test suite")
+set(utf8_range_ENABLE_INSTALL OFF CACHE BOOL "Configure installation")
+
+set(RE2_BUILD_TESTING OFF CACHE BOOL "enable testing for RE2")
+
+set(gRPC_BUILD_CODEGEN OFF CACHE BOOL "Build codegen")
+set(gRPC_DOWNLOAD_ARCHIVES OFF CACHE BOOL "Download archives for empty 3rd party directories")
+set(gRPC_BUILD_GRPC_CPP_PLUGIN OFF CACHE BOOL "Build grpc_cpp_plugin")
+set(gRPC_BUILD_GRPC_CSHARP_PLUGIN OFF CACHE BOOL "Build grpc_csharp_plugin")
+set(gRPC_BUILD_GRPC_NODE_PLUGIN OFF CACHE BOOL "Build grpc_node_plugin")
+set(gRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN OFF CACHE BOOL "Build grpc_objective_c_plugin")
+set(gRPC_BUILD_GRPC_PHP_PLUGIN OFF CACHE BOOL "Build grpc_php_plugin")
+set(gRPC_BUILD_GRPC_PYTHON_PLUGIN OFF CACHE BOOL "Build grpc_python_plugin")
+set(gRPC_BUILD_GRPC_RUBY_PLUGIN OFF CACHE BOOL "Build grpc_ruby_plugin")
+
+set(gRPC_MSVC_STATIC_RUNTIME ON CACHE BOOL "Link gRPC with static msvc runtime libraries")
+
+set(CARES_STATIC ON CACHE BOOL "Build as a static library")
+set(CARES_SHARED OFF CACHE BOOL "Build as a shared library")
+set(CARES_INSTALL OFF CACHE BOOL "Create installation targets (chain builders may want to disable this)")
+set(CARES_BUILD_TOOLS OFF CACHE BOOL "Build tools")
+
+if ((CMAKE_C_COMPILER_ID MATCHES MSVC) OR (CMAKE_CXX_COMPILER_ID MATCHES MSVC))
+	include_directories(external/src/common)
+endif()
+
+add_definitions(-DPROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII=0)
+
+add_subdirectory(external/src/grpc)
+
+include_directories(external/src/grpc/third_party/abseil-cpp)
+include_directories(external/src/grpc/third_party/boringssl-with-bazel/src/include)
+include_directories(external/src/grpc/third_party/protobuf/src)
+include_directories(external/src/grpc/include)

cmake/msvc_libs.cmake

@@ -0,0 +1,73 @@
+set(CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION 10.0)
+
+add_definitions(-D_DISABLE_VECTOR_ANNOTATION)
+add_definitions(-D_DISABLE_STRING_ANNOTATION)
+
+set(BUILD_TESTING OFF CACHE BOOL "")
+set(LIBUV_BUILD_SHARED OFF CACHE BOOL "")
+set(WITH_LIBSODIUM OFF CACHE BOOL "")
+set(WITH_LIBBSD OFF CACHE BOOL "")
+set(BUILD_TESTS OFF CACHE BOOL "")
+set(ZMQ_HAVE_IPC OFF CACHE BOOL "")
+set(WITH_DOCS OFF CACHE BOOL "")
+set(ENABLE_DRAFTS OFF CACHE BOOL "")
+set(BUILD_SHARED OFF CACHE BOOL "")
+set(ENABLE_CLANG OFF CACHE BOOL "")
+
+set(CURL_TARGET_WINDOWS_VERSION "0x0600" CACHE STRING "")
+set(BUILD_CURL_EXE OFF CACHE BOOL "")
+set(BUILD_SHARED_LIBS OFF CACHE BOOL "")
+set(CURL_DISABLE_INSTALL ON CACHE BOOL "")
+set(CURL_ENABLE_EXPORT_TARGET OFF CACHE BOOL "")
+set(CURL_DISABLE_HEADERS_API ON CACHE BOOL "")
+set(CURL_DISABLE_BINDLOCAL ON CACHE BOOL "")
+set(BUILD_LIBCURL_DOCS OFF CACHE BOOL "")
+set(BUILD_MISC_DOCS OFF CACHE BOOL "")
+set(ENABLE_CURL_MANUAL OFF CACHE BOOL "")
+set(CURL_ZLIB OFF CACHE BOOL "")
+set(CURL_BROTLI OFF CACHE BOOL "")
+set(CURL_ZSTD OFF CACHE BOOL "")
+set(CURL_DISABLE_ALTSVC ON CACHE BOOL "")
+set(CURL_DISABLE_COOKIES ON CACHE BOOL "")
+set(CURL_DISABLE_DOH ON CACHE BOOL "")
+set(CURL_DISABLE_GETOPTIONS ON CACHE BOOL "")
+set(CURL_DISABLE_HSTS ON CACHE BOOL "")
+set(CURL_DISABLE_LIBCURL_OPTION ON CACHE BOOL "")
+set(CURL_DISABLE_MIME ON CACHE BOOL "")
+set(CURL_DISABLE_NETRC ON CACHE BOOL "")
+set(CURL_DISABLE_NTLM ON CACHE BOOL "")
+set(CURL_DISABLE_PARSEDATE ON CACHE BOOL "")
+set(CURL_DISABLE_PROGRESS_METER ON CACHE BOOL "")
+set(CURL_DISABLE_SHUFFLE_DNS ON CACHE BOOL "")
+set(CURL_DISABLE_SOCKETPAIR ON CACHE BOOL "")
+set(CURL_DISABLE_VERBOSE_STRINGS ON CACHE BOOL "")
+set(CURL_DISABLE_WEBSOCKETS ON CACHE BOOL "")
+set(HTTP_ONLY ON CACHE BOOL "")
+set(CURL_ENABLE_SSL OFF CACHE BOOL "")
+set(USE_LIBIDN2 OFF CACHE BOOL "")
+set(CURL_USE_LIBPSL OFF CACHE BOOL "")
+set(CURL_USE_LIBSSH2 OFF CACHE BOOL "")
+set(ENABLE_UNIX_SOCKETS OFF CACHE BOOL "")
+set(CURL_DISABLE_TESTS ON CACHE BOOL "")
+set(USE_NGHTTP2 OFF CACHE BOOL "")
+set(BUILD_EXAMPLES OFF CACHE BOOL "")
+set(CURL_DISABLE_SRP ON CACHE BOOL "")
+set(CURL_STATIC_CRT ON CACHE BOOL "")
+
+if (WITH_TLS)
+	set(P2POOL_BORINGSSL ON CACHE BOOL "")
+	set(OPENSSL_INCLUDE_DIR "../grpc/third_party/boringssl-with-bazel/src/include" CACHE STRING "")
+endif()
+
+add_subdirectory(external/src/curl)
+add_subdirectory(external/src/libuv)
+add_subdirectory(external/src/libzmq)
+
+set(CURL_LIBRARY_DEBUG libcurl_static)
+set(CURL_LIBRARY libcurl_static)
+
+set(UV_LIBRARY_DEBUG uv_a)
+set(UV_LIBRARY uv_a)
+
+set(ZMQ_LIBRARY_DEBUG libzmq-static)
+set(ZMQ_LIBRARY libzmq-static)

cmake/ssl/CMakeLists.txt

@@ -0,0 +1,31 @@
+cmake_minimum_required(VERSION 3.12)
+
+project(P2Pool_SSL LANGUAGES C CXX)
+
+if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
+	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /W0 /Zi /Od /Ob0 /MP /MTd")
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /W0 /Zi /Od /Ob0 /MP /MTd")
+	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /W0 /O1 /Ob2 /Oi /Os /Oy /MP /MT")
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /W0 /O1 /Ob2 /Oi /Os /Oy /MP /MT")
+	set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /W0 /Ob1 /Ot /Zi /MP /MT")
+	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /W0 /Ob1 /Ot /Zi /MP /MT")
+else()
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Os -w")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Os -w")
+endif()
+
+if(CMAKE_GENERATOR MATCHES "Visual Studio")
+	if(CMAKE_VERSION VERSION_LESS 3.13)
+		message(WARNING "Disabling SSL assembly support because CMake version ${CMAKE_VERSION} is too old (less than 3.13)")
+		set(OPENSSL_NO_ASM ON)
+	else()
+		include(CheckLanguage)
+		check_language(ASM_NASM)
+		if(NOT CMAKE_ASM_NASM_COMPILER)
+			message(WARNING "Disabling SSL assembly support because NASM could not be found")
+			set(OPENSSL_NO_ASM ON)
+		endif()
+	endif()
+endif()
+
+add_subdirectory(../../external/src/grpc/third_party/boringssl-with-bazel BoringSSL)

cmake/standard.cmake

@@ -0,0 +1,21 @@
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+set(CMAKE_C_STANDARD 11)
+set(CMAKE_C_STANDARD_REQUIRED ON)
+
+if(NOT ARCH_ID)
+  if(CMAKE_SYSTEM_PROCESSOR STREQUAL "")
+    set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_HOST_SYSTEM_PROCESSOR})
+  endif()
+  string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" ARCH_ID)
+endif()
+
+if (ARCH_ID MATCHES "^(aarch64|arm64|armv8-a)$")
+	set(ARMv8 1)
+endif()
+
+if (ARCH_ID MATCHES "^(x86_64|x86-64|amd64)$")
+	set(AMD64 1)
+endif()

cppcheck/includes.txt

@@ -0,0 +1,14 @@
+../src/
+../external/src/
+../external/src/crypto/
+../external/src/cryptonote/
+../external/src/libuv/
+../external/src/cppzmq/
+../external/src/libzmq/
+../external/src/miniupnp/miniupnpc/include/
+../external/src/randomx/src/
+../external/src/rapidjson/include/
+../external/src/robin-hood-hashing/src/include/
+../external/src/grpc/include/
+../external/src/grpc/third_party/abseil-cpp/
+../external/src/grpc/third_party/protobuf/src/

cppcheck/run.cmd

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

cppcheck/run.sh

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

docker-compose/cfg/docker-compose.jinja2

@@ -120,8 +120,8 @@ services:
       --zmq-pub tcp://0.0.0.0:18083
       --disable-dns-checkpoints
       --enable-dns-blocklist
-      --out-peers 32
-      --in-peers 16
+      --out-peers 16
+      --in-peers 32
       --add-priority-node=nodes.hashvault.pro:18080
       --add-priority-node=p2pmd.xmrvsbeast.com:18080
       --non-interactive

docker-compose/cfg/requirements.txt

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

docker-compose/configure

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

docker-compose/docker-compose.yml

@@ -96,8 +96,8 @@ services:
       --zmq-pub tcp://0.0.0.0:18083
       --disable-dns-checkpoints
       --enable-dns-blocklist
-      --out-peers 32
-      --in-peers 16
+      --out-peers 16
+      --in-peers 32
       --add-priority-node=nodes.hashvault.pro:18080
       --add-priority-node=p2pmd.xmrvsbeast.com:18080
       --non-interactive

docker-compose/statistics/Dockerfile

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

docker-compose/statistics/app/p2pool_statistics.py

@@ -60,6 +60,16 @@ def render():
             network_stats = json.loads(reader.read())
         with open("/data/local/stratum", "r") as reader:
             local_stats = json.loads(reader.read())
+        workers = local_stats["workers"][:30] # limit workers output list
+        workers_concat = []
+        for w in workers:
+            w_list = w.split(",")
+            w_list[1] = humanfriendly.format_timespan(int(w_list[1]))
+            w_list[2] = human_numbers(int(w_list[2]))
+            workers_concat.append(w_list)
+        workers_concat = sorted(workers_concat, key=lambda x: int(x[3]), reverse=True)
+        for w in workers_concat:
+            w[3] = human_numbers(int(w[3]))
         return render_template(
             "index.html",
             my_bday=my_bday,
@@ -67,6 +77,7 @@ def render():
             pool_stats=pool_stats,
             network_stats=network_stats,
             local_stats=local_stats,
+            workers=workers_concat,
         )
     except Exception as e:
         return render_template("oops.html", error=str(e))

docker-compose/statistics/app/templates/index.html

@@ -64,6 +64,29 @@
                     <td>Block reward share</td>
                     <td>{{ local_stats["block_reward_share_percent"] }}%</td>
                   </tr>
+                  <tr>
+                    <td>Workers
+                      <h6 class="card-subtitle text-muted" style="font-size:80%;">(note: limited to the first 30 workers)</h6>
+                    </td>
+                    <td>
+                      <table style="font-size:65%;">
+                        <tr>
+                          <th>IP:Port</th>
+                          <th>Uptime</th>
+                          <th>Difficulty</th>
+                          <th>Hashrate</th>
+                          <th>Name</th>
+                        </tr>
+                        {% for w in workers %}
+                        <tr>
+                          {% for w_detail in w %}
+                          <td>{{ w_detail }}</td>
+                          {% endfor %}
+                        </tr>
+                        {% endfor %}
+                      </table> 
+                    </td>
+                  </tr> 
                 </tbody>
               </table>
             </div>

docs/COMMAND_LINE.MD

@@ -1,35 +1,42 @@
 ### P2Pool command line options
 
 ```
---wallet             Wallet address to mine to. Subaddresses and integrated addresses are not supported!
---host               IP address of your Monero node, default is 127.0.0.1
---rpc-port           monerod RPC API port number, default is 18081
---zmq-port           monerod ZMQ pub port number, default is 18083 (same port as in monerod's "--zmq-pub" command line parameter)
---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
---light-mode         Don't allocate RandomX dataset, saves 2GB of RAM
---loglevel           Verbosity of the log, integer number between 0 and 6
---config             Name of the p2pool config file
---data-api           Path to the p2pool JSON data (use it in tandem with an external web-server)
---local-api          Enable /local/ path in api path for Stratum Server and built-in miner statistics
---stratum-api        An alias for --local-api
---no-cache           Disable p2pool.cache
---no-color           Disable colors in console output
---no-randomx         Disable internal RandomX hasher: p2pool will use RPC calls to monerod to check PoW hashes
---out-peers N        Maximum number of outgoing connections for p2p server (any value between 10 and 450)
---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
---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
---no-dns             Disable DNS queries, use only IP addresses to connect to peers (seed node DNS will be unavailable too)
---p2p-external-port  Port number that your router uses for mapping to your local p2p port. Use it if you are behind a NAT and still want to accept incoming connections
---no-upnp            Disable UPnP port forwarding
---no-igd             An alias for --no-upnp
---upnp-stratum       Port forward Stratum port (it's not forwarded by default)
---version            Print p2pool's version and build details
+--wallet              Wallet address to mine to. Subaddresses and integrated addresses are not supported!
+--host                IP address of your Monero node, default is 127.0.0.1
+--rpc-port            monerod RPC API port number, default is 18081
+--zmq-port            monerod ZMQ pub port number, default is 18083 (same port as in monerod's "--zmq-pub" command line parameter)
+--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
+--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
+--sidechain-config    Name of the p2pool sidechain parameters file (only use it if you run your own sidechain)
+--data-api            Path to the p2pool JSON data (use it in tandem with an external web-server). Not affected by --data-dir setting!
+--local-api           Enable /local/ path in api path for Stratum Server and built-in miner statistics
+--stratum-api         An alias for --local-api
+--no-cache            Disable p2pool.cache
+--no-color            Disable colors in console output
+--no-randomx          Disable internal RandomX hasher: p2pool will use RPC calls to monerod to check PoW hashes
+--out-peers N         Maximum number of outgoing connections for p2p server (any value between 10 and 450)
+--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
+--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
+--no-dns              Disable DNS queries, use only IP addresses to connect to peers (seed node DNS will be unavailable too)
+--p2p-external-port   Port number that your router uses for mapping to your local p2p port. Use it if you are behind a NAT and still want to accept incoming connections
+--no-upnp             Disable UPnP port forwarding
+--no-igd              An alias for --no-upnp
+--upnp-stratum        Port forward Stratum port (it's not forwarded by default)
+--merge-mine          IP:port and wallet address for another blockchain to merge mine with
+--version             Print p2pool's version and build details
+--tls-cert file       Load TLS certificate chain from "file" in the PEM format
+--tls-cert-key file   Load TLS certificate private key from "file" in the PEM format
+--rpc-ssl             Enable SSL on RPC connections to the Monero node
+--rpc-ssl-fingerprint base64-encoded fingerprint of the Monero node's certificate (optional, use it for certificate pinning)
+--no-stratum-http     Disable HTTP on Stratum ports
 ```
 
 ### Example command line
@@ -42,11 +49,56 @@ p2pool.exe --host 127.0.0.1 --rpc-port 18081 --zmq-port 18083 --wallet YOUR_WALL
 
 You can have multiple hosts in command line. If P2Pool detects that the host it's currently using is down or stuck, it will cycle through hosts until it finds a working one. It will not switch back as long as the current host it found is working.
 
-Each new host uses RPC and zmq-pub port numbers from the previous host (or default 18081/18083 if none were specified). Note that `--rpc-login` is not copied from the previous host, you must specify it for each host that has username/password.
+Each new host uses RPC and zmq-pub port numbers from the previous host (or default 18081/18083 if none were specified). Note that `--rpc-login`, `--rpc-ssl` and `--rpc-ssl-fingerprint` are not copied from the previous host, you must specify it for each host that has username/password or RPC-SSL enabled.
 
-In this example, you have local Monero host running on ports 18081/18083 (RPC/zmq-pub), and several backup hosts running on ports 18089/18084.
+In the following example, you have local Monero host running on ports 18081/18083 (RPC/zmq-pub), and several backup hosts running on ports 18089/18084.
 
 
 ```
-p2pool.exe --host 127.0.0.1 --host xmr1.rs.me --rpc-port 18089 --zmq-port 18084 --host xmr2.rs.me --host xmr3.rs.me --wallet YOUR_WALLET_ADDRESS
+p2pool.exe --host 127.0.0.1 --host node.monerodevs.org --rpc-port 18089 --zmq-port 18084 --host node2.monerodevs.org --host node.richfowler.net --wallet YOUR_WALLET_ADDRESS
 ```
+
+### 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.
+
+- 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 --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).
+
+### TLS
+
+Starting from v4.1, P2Pool supports SSL/TLS connections to its Stratum port. Port 443 can also be safely used for Stratum connections since v4.1 - P2Pool will detect HTTP requests and respond to them.
+
+All `--tls...` parameters are optional. If they are not provided, P2Pool will generate a self-signed certificate upon startup.
+
+If you want to use your own certificate, please refer to your certificate provider's documentation (or OpenSSL documentation) on how to generate the appropriate PEM files.
+
+Note that you need to use certificate files and `--tls...` parameters to be able to use certificate pinning in XMRig miners that connect to your P2Pool instance.
+
+`--tls-cert` and `--tls-cert-key` parameters must always be used together.
+
+### RPC-SSL
+
+Starting from v4.4, P2Pool supports RPC-SSL connections to Monero nodes. Add `--rpc-ssl` to P2Pool command line to enable it.
+
+P2Pool supports certificate pinning on RPC-SSL connections via `--rpc-ssl-fingerprint MONERO_NODE_FINGERPRINT_BASE64` parameter. To get your node certificate's fingerprint, run
+
+```
+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.

docs/MERGE_MINING.MD

@@ -0,0 +1,124 @@
+## Merge mining tx_extra tag format
+
+- TX_EXTRA_MERGE_MINING_TAG (1 byte)
+	- A single byte of value `3`
+- Size (in bytes) of the following fields (1 byte)
+	- Technically a Varint, but it's always a single byte in practice
+- Merkle tree parameters (1 or multiple bytes - 64-bit value encoded as varint)
+- Merkle root hash (32 bytes)
+
+## Merkle tree parameters
+
+A 64-bit value encoding the total number of aux chains hashed into the Merkle root hash, and an aux nonce that defines the order of aux chains when building the Merkle tree.
+
+Bit|Description
+-|-
+0...2|`N-1` - number of bits used to store `n_aux_chains` (value 0 means 1 bit, ..., value 7 means 8 bits)
+3...`N`+2|`n_aux_chains-1` (value 0 means 1 chain, and so on)
+`N`+3...`N`+34|`aux_nonce` (32-bit value)
+`N`+35...63|reserved (current implementations must set these bits to all 0 when writing and ignore these bits when reading)
+
+`N` must be the smallest number of bits enough to represent `n_aux_chains-1`
+
+Reference code: `PoolBlock::encode_merkle_tree_data` and `PoolBlock::decode_merkle_tree_data` in `pool_block.h`
+
+## Merkle tree construction's first step (Monero-specific)
+
+If `n_aux_chains` is not a power of 2, their hashes are combined starting from the end of the list of hashes until there are a power of 2 hashes left. Then they're processed normally.
+
+Example 1: 6 hashes `H0, H1, H2, H3, H4, H5` will be transformed into 4 hashes `H0, H1, H(H2|H3), H(H4|H5)` where `H` is the hash function and `|` is concatenation.
+
+Example 2: 5 hashes `H0, H1, H2, H3, H4` will be transformed into 4 hashes `H0, H1, H2, H(H3|H4)`
+
+## The order of hashes in the Merkle tree
+
+Each of the aux chains must provide a 32-byte value `unique_id` that singles it out from any other chain. Genesis block's hash is a good choice for this value, but it can be anything else really.
+
+`unique_id` is used to enforce the order in which aux hashes are added to the Merkle tree. This prevents an attack where miners can mine two versions of the same chain (for example when double spending) without any additional cost.
+
+Forked chains can choose whether to keep their `unique_id` or change it. If they keep it, it will be impossible to merge mine with the chain they forked from beause they will always be assigned the same slot in the Merkle tree.
+
+A deterministic pseudo-random function `SHA256(unique_id|nonce|"m") % N` is applied to determine which slot is used by which chain. `nonce` is brute-forced until all `N` chains are assigned different slots. This limits `N` to no more than 15-16 in practice.
+
+Reference code: `get_aux_slot` and `find_aux_nonce` in `merkle.cpp`
+
+## Proposed RPC API
+
+P2Pool must be able to get mining jobs from merge mined chains and submit PoW solutions to them. All RPC calls here are sent as HTTP POST requests with `Content-Type: application/json`.
+
+### merge_mining_get_chain_id
+
+Gets a unique ID that identifies this merge mined chain and separates it from other chains.
+
+Example request: `{"jsonrpc":"2.0","id":"0","method":"merge_mining_get_chain_id"}`
+
+Response: a JSON containing these fields:
+Field|Description
+-|-
+`chain_id`|A unique 32-byte hex-encoded value that identifies this merge mined chain.
+
+Example response 1: `{"jsonrpc":"2.0","id":"0","result":{"chain_id":"0f28c4960d96647e77e7ab6d13b85bd16c7ca56f45df802cdc763a5e5c0c7863"}}`
+
+Example response 2: `{"jsonrpc":"2.0","id":"0","error":"something went wrong"}`
+
+### merge_mining_get_aux_block
+
+Gets a blob of data (usually a new block for the merge mined chain) and its hash to be used for merge mining.
+
+Example request: `{"jsonrpc":"2.0","id":"0","method":"merge_mining_get_aux_block","params":{"address":"MERGE_MINED_CHAIN_ADDRESS","aux_hash":"f6952d6eef555ddd87aca66e56b91530222d6e318414816f3ba7cf5bf694bf0f","height":3000000,"prev_id":"ad505b0be8a49b89273e307106fa42133cbd804456724c5e7635bd953215d92a"}}`
+
+Request: a JSON containing these fields:
+Field|Description
+-|-
+`address`|A wallet address on the merge mined chain
+`aux_hash`|Merge mining job that is currently being used
+`height`|Monero height
+`prev_id`|Hash of the previous Monero block
+
+Response: a JSON containing these fields:
+Field|Description
+-|-
+`aux_blob`|A hex-encoded blob of data. Merge mined chain defines the contents of this blob. It's opaque to P2Pool and will not be changed by it.
+`aux_diff`|Mining difficulty (decimal number).
+`aux_hash`|A 32-byte hex-encoded hash of the `aux_blob`. Merge mined chain defines how exactly this hash is calculated. It's opaque to P2Pool.
+
+If `aux_hash` is the same as in the request, all other fields will be ignored by P2Pool, so they don't have to be included in the response. Moreover, empty response will be interpreted as a response having the same `aux_hash` as in the request. This enables an efficient polling.
+
+Example response 1: `{"jsonrpc":"2.0","id":"0","result":{"aux_blob":"4c6f72656d20697073756d","aux_diff":123456,"aux_hash":"f6952d6eef555ddd87aca66e56b91530222d6e318414816f3ba7cf5bf694bf0f"}}`
+
+Example response 2: `{"jsonrpc":"2.0","id":"0","result":{}}`
+
+### merge_mining_submit_solution
+
+Submits a PoW solution for the merge mined chain's block. Note that when merge mining with Monero, the PoW solution is always a Monero block template with merge mining data included in it.
+
+Example request: `{"jsonrpc":"2.0","id":"0","method":"merge_mining_submit_solution","params":{"aux_blob":"4c6f72656d20697073756d","aux_hash":"f6952d6eef555ddd87aca66e56b91530222d6e318414816f3ba7cf5bf694bf0f","blob":"...","merkle_proof":["hash1","hash2","hash3"],"path":3,"seed_hash":"22c3d47c595ae888b5d7fc304235f92f8854644d4fad38c5680a5d4a81009fcd"}}`
+
+Request: a JSON containing these fields:
+Field|Description
+-|-
+`aux_blob`|Blob of data returned by `merge_mining_get_aux_block`.
+`aux_hash`|A 32-byte hex-encoded hash of the `aux_blob` - the same value that was returned by `merge_mining_get_aux_block`.
+`blob`|Monero block template that has enough PoW to satisfy difficulty returned by `merge_mining_get_aux_block`. It also must have a merge mining tag in tx_extra of the coinbase transaction.
+`merkle_proof`|A proof that `aux_hash` was included when calculating Merkle root hash from the merge mining tag
+`path`|A path bitmap (32-bit unsigned integer) that complements `merkle_proof`
+`seed_hash`|A 32-byte hex-encoded key that is used to [initialize RandomX dataset](https://github.com/tevador/RandomX/blob/master/doc/specs.md#7-dataset)
+
+Note that `merkle_proof` only contains a vector of 32-byte hashes for `aux_hash` to be combined with. It can be verified by running this pseudo-code and functions from `merkle.cpp` (adapt it to your codebase):
+
+`verify_merkle_proof(aux_hash, merkle_proof, get_aux_slot(unique_id, aux_nonce, n_aux_chains), n_aux_chains, merkle_root_hash)`
+
+`aux_nonce` and `n_aux_chains` can be extracted from the Merkle tree parameters (see above).
+`merkle_root_hash` can be extracted from the merge mining tag (see above).
+
+`merkle_proof` can also be verified by `verify_merkle_proof(aux_hash, merkle_proof, path, merkle_root_hash)`
+
+
+Response: a JSON containing these fields:
+Field|Description
+-|-
+`status`|Block submit status
+
+Example response 1: `{"jsonrpc":"2.0","id":"0","result":{"status":"accepted"}}`
+
+Example response 2: `{"jsonrpc":"2.0","id":"0","error":{"code":-1,"message":"Block not accepted"}}`

docs/html/index.html

@@ -80,9 +80,12 @@ async function load_data() {
 	let pool_stats_req = await fetch('api/pool/stats');
 	let pool_blocks_req = await fetch('api/pool/blocks');
 	let network_stats_req = await fetch('api/network/stats');
+	let latest_release_req = await fetch('api/latest_release');
+
 	let pool_stats = JSON.parse(await pool_stats_req.text());
 	let pool_blocks = JSON.parse(await pool_blocks_req.text());
 	let network_stats = JSON.parse(await network_stats_req.text());
+	let latest_release = JSON.parse(await latest_release_req.text());
 
 	let pool_hashrate = pool_stats.pool_statistics.hashRate / 1e6;
 	let pplns_duration = pool_stats.pool_statistics.pplnsWeight / pool_stats.pool_statistics.hashRate;
@@ -92,6 +95,7 @@ async function load_data() {
 	document.getElementById("pplns_duration").innerHTML = elapsedTimeStr(0, pplns_duration, 0) + ' ' + Math.floor(pplns_duration % 60) + 's';
 	document.getElementById("pool_miners").innerHTML = pool_stats.pool_statistics.miners;
 	document.getElementById("min_payout").innerHTML = min_payout.toFixed(5) + ' XMR';
+	document.getElementById("latest_release").innerHTML = '<a href="' + latest_release.html_url + '" target="_blank">' + latest_release.name + '</a>';
 
 	let ts = Math.floor(Date.now() / 1000);
 
@@ -190,6 +194,7 @@ function toggle_menu(name) {
 </head>
 <body onload="load_data();setInterval(load_data, 2000);toggle_menu(window.location.hash.substr(1));">
 <div style="font-size:3rem;text-align:center;">P2Pool</div><div style="font-size:1.1rem;text-align:center;">Decentralized Monero mining pool</div>
+<div style="font-size:1rem;text-align:center;">Latest release: <span id="latest_release"><a href="https://github.com/SChernykh/p2pool/releases/latest" target="_blank">P2Pool</a></span></div>
 <br>
 <table id="main_menu" style="width:100%;margin-left:auto;margin-right:auto;table-layout:fixed;text-align:center;-ms-touch-action:none;touch-action:none;"><tr>
 <td onclick="toggle_menu('pool')" id="button_pool">Pool</td>
@@ -243,8 +248,8 @@ It's highly recommended to create a new wallet for mining because wallet address
 <ul>
 <li>Download the latest Monero <a href="https://www.getmonero.org/downloads/" target="_blank">release</a>
 <li>[Optional] Open port <span>18080</span> (Monero p2p port) in your firewall to ensure better connectivity
-<li>Run <span>./monerod --zmq-pub tcp://127.0.0.1:18083 --out-peers 64 --in-peers 32 --add-priority-node=p2pmd.xmrvsbeast.com:18080 --add-priority-node=nodes.hashvault.pro:18080 --disable-dns-checkpoints --enable-dns-blocklist</span>
-<li>If your network connection's upload bandwidth is less than 10 Mbit, use <span>--out-peers 16 --in-peers 8</span> instead.
+<li>Run <span>./monerod --zmq-pub tcp://127.0.0.1:18083 --out-peers 32 --in-peers 64 --add-priority-node=p2pmd.xmrvsbeast.com:18080 --add-priority-node=nodes.hashvault.pro:18080 --disable-dns-checkpoints --enable-dns-blocklist</span>
+<li>If your network connection's upload bandwidth is less than 10 Mbit, use <span>--out-peers 8 --in-peers 16</span> instead.
 <li>Wait until it's fully synchronized. If you didn't run Monero node before, it can take up to several days to synchronize (5-6 hours on a modern PC with fast SSD and fast Internet connection). You can add <span>--prune-blockchain</span> argument to the command line to run a pruned node (3-4 times less disk usage)
 </ul></details>
 
@@ -262,6 +267,7 @@ It's highly recommended to create a new wallet for mining because wallet address
 <li>Once P2Pool sync is complete, XMRig should be able to connect to the stratum server on port <span>3333</span>
 <li>Run <span>./xmrig -o 127.0.0.1:3333</span>. Note that you don't need to specify wallet address for xmrig. Wallet address set in xmrig config will be ignored!
 <li>To set custom fixed difficulty for your miner (for example, <span>10000</span>), run <span>./xmrig -u x+10000 -o 127.0.0.1:3333</span>
+<li>To connect another mining rig to your P2Pool node, run <span>./xmrig -o YOUR_P2POOL_NODE_IP:3333</span> on that mining rig
 </ul></details>
 
 <details><summary>Checking your progress</summary>
@@ -275,7 +281,7 @@ It's highly recommended to create a new wallet for mining because wallet address
 <details><summary>Help and support</summary>
 P2Pool is a decentralized community, there is no dedicated support. You can reach and get help from other miners on:
 <ul>
-<li>IRC channels: <span>#monero-pools</span> and <span>#p2pool-log</span> (<span>#p2pool-mini</span> for P2Pool mini) on <a href="https://libera.chat/" target="_blank">Libera.Chat</a>
+<li>IRC channels: <span>#p2pool-log</span> (<span>#p2pool-mini</span> for P2Pool mini) on <a href="https://libera.chat/" target="_blank">Libera.Chat</a>
 <li>Reddit: <a href="https://reddit.com/r/MoneroMining/" target="_blank">r/MoneroMining</a>
 </ul></details>
 </td></tr></table>
@@ -304,7 +310,7 @@ P2Pool is a decentralized community, there is no dedicated support. You can reac
 <br><br>
 <div style="position:fixed;width:100%;bottom:0;background-color:#383838;font-size:1rem;text-align:center;color:#b0b0b0;">
 <a href="api/" target="_blank">Pool API</a>&nbsp;|&nbsp;<a href="https://github.com/SChernykh/p2pool" target="_blank">Source</a>&nbsp;|&nbsp;<a href="http://yucmgsbw7nknw7oi3bkuwudvc657g2xcqahhbjyewazusyytapqo4xid.onion/" target="_blank">Onion URL</a><br>
-Donate to support the project:<br><a href="monero:44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg?tx_description=Donation%20to%20P2Pool" style="font-size:0.9rem;color:#b0b0b0;">44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg</a><br>
+Donate to support the project:<br><span style="font-size:0.9rem;color:#b0b0b0;">44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg</span><br>
 &nbsp;
 </div>
 </body>

docs/html/mini/index.html

@@ -80,9 +80,12 @@ async function load_data() {
 	let pool_stats_req = await fetch('api/pool/stats');
 	let pool_blocks_req = await fetch('api/pool/blocks');
 	let network_stats_req = await fetch('api/network/stats');
+	let latest_release_req = await fetch('api/latest_release');
+
 	let pool_stats = JSON.parse(await pool_stats_req.text());
 	let pool_blocks = JSON.parse(await pool_blocks_req.text());
 	let network_stats = JSON.parse(await network_stats_req.text());
+	let latest_release = JSON.parse(await latest_release_req.text());
 
 	let pool_hashrate = pool_stats.pool_statistics.hashRate / 1e6;
 	let pplns_duration = pool_stats.pool_statistics.pplnsWeight / pool_stats.pool_statistics.hashRate;
@@ -92,6 +95,7 @@ async function load_data() {
 	document.getElementById("pplns_duration").innerHTML = elapsedTimeStr(0, pplns_duration, 0) + ' ' + Math.floor(pplns_duration % 60) + 's';
 	document.getElementById("pool_miners").innerHTML = pool_stats.pool_statistics.miners;
 	document.getElementById("min_payout").innerHTML = min_payout.toFixed(5) + ' XMR';
+	document.getElementById("latest_release").innerHTML = '<a href="' + latest_release.html_url + '" target="_blank">' + latest_release.name + '</a>';
 
 	let ts = Math.floor(Date.now() / 1000);
 
@@ -190,6 +194,7 @@ function toggle_menu(name) {
 </head>
 <body onload="load_data();setInterval(load_data, 2000);toggle_menu(window.location.hash.substr(1));">
 <div style="font-size:3rem;text-align:center;">P2Pool mini</div><div style="font-size:1.1rem;text-align:center;">Decentralized Monero mining pool</div>
+<div style="font-size:1rem;text-align:center;">Latest release: <span id="latest_release"><a href="https://github.com/SChernykh/p2pool/releases/latest" target="_blank">P2Pool</a></span></div>
 <br>
 <table id="main_menu" style="width:100%;margin-left:auto;margin-right:auto;table-layout:fixed;text-align:center;-ms-touch-action:none;touch-action:none;"><tr>
 <td onclick="toggle_menu('pool')" id="button_pool">Pool</td>
@@ -243,8 +248,8 @@ It's highly recommended to create a new wallet for mining because wallet address
 <ul>
 <li>Download the latest Monero <a href="https://www.getmonero.org/downloads/" target="_blank">release</a>
 <li>[Optional] Open port <span>18080</span> (Monero p2p port) in your firewall to ensure better connectivity
-<li>Run <span>./monerod --zmq-pub tcp://127.0.0.1:18083 --out-peers 64 --in-peers 32 --add-priority-node=p2pmd.xmrvsbeast.com:18080 --add-priority-node=nodes.hashvault.pro:18080 --disable-dns-checkpoints --enable-dns-blocklist</span>
-<li>If your network connection's upload bandwidth is less than 10 Mbit, use <span>--out-peers 16 --in-peers 8</span> instead.
+<li>Run <span>./monerod --zmq-pub tcp://127.0.0.1:18083 --out-peers 32 --in-peers 64 --add-priority-node=p2pmd.xmrvsbeast.com:18080 --add-priority-node=nodes.hashvault.pro:18080 --disable-dns-checkpoints --enable-dns-blocklist</span>
+<li>If your network connection's upload bandwidth is less than 10 Mbit, use <span>--out-peers 8 --in-peers 16</span> instead.
 <li>Wait until it's fully synchronized. If you didn't run Monero node before, it can take up to several days to synchronize (5-6 hours on a modern PC with fast SSD and fast Internet connection). You can add <span>--prune-blockchain</span> argument to the command line to run a pruned node (3-4 times less disk usage)
 </ul></details>
 
@@ -262,6 +267,7 @@ It's highly recommended to create a new wallet for mining because wallet address
 <li>Once P2Pool sync is complete, XMRig should be able to connect to the stratum server on port <span>3333</span>
 <li>Run <span>./xmrig -o 127.0.0.1:3333</span>. Note that you don't need to specify wallet address for xmrig. Wallet address set in xmrig config will be ignored!
 <li>To set custom fixed difficulty for your miner (for example, <span>10000</span>), run <span>./xmrig -u x+10000 -o 127.0.0.1:3333</span>
+<li>To connect another mining rig to your P2Pool node, run <span>./xmrig -o YOUR_P2POOL_NODE_IP:3333</span> on that mining rig
 </ul></details>
 
 <details><summary>Checking your progress</summary>
@@ -275,7 +281,7 @@ It's highly recommended to create a new wallet for mining because wallet address
 <details><summary>Help and support</summary>
 P2Pool is a decentralized community, there is no dedicated support. You can reach and get help from other miners on:
 <ul>
-<li>IRC channels: <span>#monero-pools</span> and <span>#p2pool-log</span> (<span>#p2pool-mini</span> for P2Pool mini) on <a href="https://libera.chat/" target="_blank">Libera.Chat</a>
+<li>IRC channels: <span>#p2pool-log</span> (<span>#p2pool-mini</span> for P2Pool mini) on <a href="https://libera.chat/" target="_blank">Libera.Chat</a>
 <li>Reddit: <a href="https://reddit.com/r/MoneroMining/" target="_blank">r/MoneroMining</a>
 </ul></details>
 </td></tr></table>
@@ -304,8 +310,8 @@ P2Pool is a decentralized community, there is no dedicated support. You can reac
 <br><br>
 <div style="position:fixed;width:100%;bottom:0;background-color:#383838;font-size:1rem;text-align:center;color:#b0b0b0;">
 <a href="api/" target="_blank">Pool API</a>&nbsp;|&nbsp;<a href="https://github.com/SChernykh/p2pool" target="_blank">Source</a>&nbsp;|&nbsp;<a href="http://yucmgsbw7nknw7oi3bkuwudvc657g2xcqahhbjyewazusyytapqo4xid.onion/mini/" target="_blank">Onion URL</a><br>
-Donate to support the project:<br><a href="monero:44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg?tx_description=Donation%20to%20P2Pool" style="font-size:0.9rem;color:#b0b0b0;">44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg</a><br>
+Donate to support the project:<br><span style="font-size:0.9rem;color:#b0b0b0;">44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg</span><br>
 &nbsp;
 </div>
 </body>
-</html>
+</html>

external/src/Tari/CMakeLists.txt

@@ -0,0 +1,51 @@
+cmake_minimum_required(VERSION 3.10)
+project(Tari_gRPC)
+
+set(HEADERS
+	proto/gRPC/base_node.pb.h
+	proto/gRPC/block.pb.h
+	proto/gRPC/network.pb.h
+	proto/gRPC/sidechain_types.pb.h
+	proto/gRPC/transaction.pb.h
+	proto/gRPC/types.pb.h
+	proto/gRPC/base_node.grpc.pb.h
+	proto/gRPC/block.grpc.pb.h
+	proto/gRPC/network.grpc.pb.h
+	proto/gRPC/sidechain_types.grpc.pb.h
+	proto/gRPC/transaction.grpc.pb.h
+	proto/gRPC/types.grpc.pb.h
+	proto.h
+)
+
+set(SOURCES
+	proto/gRPC/base_node.pb.cc
+	proto/gRPC/block.pb.cc
+	proto/gRPC/network.pb.cc
+	proto/gRPC/sidechain_types.pb.cc
+	proto/gRPC/transaction.pb.cc
+	proto/gRPC/types.pb.cc
+	proto/gRPC/base_node.grpc.pb.cc
+	proto/gRPC/block.grpc.pb.cc
+	proto/gRPC/network.grpc.pb.cc
+	proto/gRPC/sidechain_types.grpc.pb.cc
+	proto/gRPC/transaction.grpc.pb.cc
+	proto/gRPC/types.grpc.pb.cc
+)
+
+include_directories(../grpc/third_party/protobuf/src)
+include_directories(../grpc/include)
+include_directories(../grpc/third_party/abseil-cpp)
+
+if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
+	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /W0 /Zi /Od /Ob0 /MP /MTd")
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /W0 /Zi /Od /Ob0 /MP /MTd")
+	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /W0 /O1 /Ob2 /Oi /Os /Oy /MP /GL /MT /GS /guard:cf")
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /W0 /O1 /Ob2 /Oi /Os /Oy /MP /GL /MT /GS /guard:cf")
+	set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /W0 /Ob1 /Ot /Zi /MP /MT")
+	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /W0 /Ob1 /Ot /Zi /MP /MT")
+else()
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Os -w")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Os -w")
+endif()
+
+add_library(Tari_gRPC ${HEADERS} ${SOURCES})

external/src/Tari/proto.h

@@ -0,0 +1,30 @@
+#pragma once
+
+#ifdef _MSC_VER
+#pragma warning(push, 0)
+#pragma warning(disable : 4866)
+#endif
+
+#include "proto/gRPC/base_node.pb.h"
+#include "proto/gRPC/block.pb.h"
+#include "proto/gRPC/network.pb.h"
+#include "proto/gRPC/sidechain_types.pb.h"
+#include "proto/gRPC/transaction.pb.h"
+#include "proto/gRPC/types.pb.h"
+
+#include "proto/gRPC/base_node.grpc.pb.h"
+#include "proto/gRPC/block.grpc.pb.h"
+#include "proto/gRPC/network.grpc.pb.h"
+#include "proto/gRPC/sidechain_types.grpc.pb.h"
+#include "proto/gRPC/transaction.grpc.pb.h"
+#include "proto/gRPC/types.grpc.pb.h"
+
+#include <grpc/grpc.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/security/credentials.h>
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif

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

@@ -0,0 +1,517 @@
+// Copyright 2020. The Tari Project
+//
+// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+// following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+// disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
+// following disclaimer in the documentation and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote
+// products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+syntax = "proto3";
+
+import "types.proto";
+import "transaction.proto";
+import "block.proto";
+import "network.proto";
+import "sidechain_types.proto";
+
+package tari.rpc;
+
+// The gRPC interface for interacting with the base node.
+service BaseNode {
+    // Lists headers in the current best chain
+    rpc ListHeaders(ListHeadersRequest) returns (stream BlockHeaderResponse);
+    // Get header by hash
+    rpc GetHeaderByHash(GetHeaderByHashRequest) returns (BlockHeaderResponse);
+    // Returns blocks in the current best chain. Currently only supports querying by height
+    rpc GetBlocks(GetBlocksRequest) returns (stream HistoricalBlock);
+    // Returns the block timing for the chain heights
+    rpc GetBlockTiming(HeightRequest) returns (BlockTimingResponse);
+    // Returns the network Constants
+    rpc GetConstants(BlockHeight) returns (ConsensusConstants);
+    // Returns Block Sizes
+    rpc GetBlockSize (BlockGroupRequest) returns (BlockGroupResponse);
+    // Returns Block Fees
+    rpc GetBlockFees (BlockGroupRequest) returns (BlockGroupResponse);
+    // Get Version
+    rpc GetVersion(Empty) returns (StringValue);
+    // Check for new updates
+    rpc CheckForUpdates(Empty) returns (SoftwareUpdate);
+    // Get coins in circulation
+    rpc GetTokensInCirculation(GetBlocksRequest) returns (stream ValueAtHeightResponse);
+    // Get network difficulties
+    rpc GetNetworkDifficulty(HeightRequest) returns (stream NetworkDifficultyResponse);
+    // Get the block template
+    rpc GetNewBlockTemplate(NewBlockTemplateRequest) returns (NewBlockTemplateResponse);
+    // Construct a new block from a provided template
+    rpc GetNewBlock(NewBlockTemplate) returns (GetNewBlockResult);
+    // Construct a new block from a provided template
+    rpc GetNewBlockWithCoinbases(GetNewBlockWithCoinbasesRequest) returns (GetNewBlockResult);
+    // Construct a new block from a provided template
+    rpc GetNewBlockTemplateWithCoinbases(GetNewBlockTemplateWithCoinbasesRequest) returns (GetNewBlockResult);
+    // Construct a new block and header blob from a provided template
+    rpc GetNewBlockBlob(NewBlockTemplate) returns (GetNewBlockBlobResult);
+    // Submit a new block for propagation
+    rpc SubmitBlock(Block) returns (SubmitBlockResponse);
+    // Submit a new mined block blob for propagation
+    rpc SubmitBlockBlob(BlockBlobRequest) returns (SubmitBlockResponse);
+    // Submit a transaction for propagation
+    rpc SubmitTransaction(SubmitTransactionRequest) returns (SubmitTransactionResponse);
+    // Get the base node sync information
+    rpc GetSyncInfo(Empty) returns (SyncInfoResponse);
+    // Get the base node sync information
+    rpc GetSyncProgress(Empty) returns (SyncProgressResponse);
+    // Get the base node tip information
+    rpc GetTipInfo(Empty) returns (TipInfoResponse);
+    // Search for blocks containing the specified kernels
+    rpc SearchKernels(SearchKernelsRequest) returns (stream HistoricalBlock);
+    // Search for blocks containing the specified commitments
+    rpc SearchUtxos(SearchUtxosRequest) returns (stream HistoricalBlock);
+    // Fetch any utxos that exist in the main chain
+    rpc FetchMatchingUtxos(FetchMatchingUtxosRequest) returns (stream FetchMatchingUtxosResponse);
+    // get all peers from the base node
+    rpc GetPeers(GetPeersRequest) returns (stream GetPeersResponse);
+    rpc GetMempoolTransactions(GetMempoolTransactionsRequest) returns (stream GetMempoolTransactionsResponse);
+    rpc TransactionState(TransactionStateRequest) returns (TransactionStateResponse);
+    // This returns the node's network identity
+    rpc Identify (Empty) returns (NodeIdentity);
+    // Get Base Node network connectivity status
+    rpc GetNetworkStatus(Empty) returns (NetworkStatusResponse);
+    // List currently connected peers
+    rpc ListConnectedPeers(Empty) returns (ListConnectedPeersResponse);
+    // Get mempool stats
+    rpc GetMempoolStats(Empty) returns (MempoolStatsResponse);
+    // Get VNs
+    rpc GetActiveValidatorNodes(GetActiveValidatorNodesRequest) returns (stream GetActiveValidatorNodesResponse);
+    rpc GetShardKey(GetShardKeyRequest) returns (GetShardKeyResponse);
+    // Get templates
+    rpc GetTemplateRegistrations(GetTemplateRegistrationsRequest) returns (stream GetTemplateRegistrationResponse);
+    rpc GetSideChainUtxos(GetSideChainUtxosRequest) returns (stream GetSideChainUtxosResponse);
+}
+
+message GetAssetMetadataRequest {
+    bytes asset_public_key = 1;
+}
+
+message GetAssetMetadataResponse {
+    string name = 2;
+    string description =3;
+    string image = 4;
+    bytes owner_commitment = 5;
+    OutputFeatures features = 6;
+    uint64 mined_height = 7;
+    bytes mined_in_block = 8;
+}
+
+message ListAssetRegistrationsRequest {
+    uint64 offset = 2;
+    uint64 count = 3;
+}
+
+message ListAssetRegistrationsResponse {
+    bytes asset_public_key = 1;
+    bytes unique_id = 2;
+    bytes owner_commitment = 3;
+    uint64 mined_height = 4;
+    bytes mined_in_block = 5;
+    OutputFeatures features = 6;
+    bytes script = 7;
+}
+
+message GetTokensRequest {
+    bytes asset_public_key = 1;
+    // Optionally get a set of specific unique_ids
+    repeated bytes unique_ids = 2;
+}
+
+message GetTokensResponse {
+    bytes unique_id = 1;
+    bytes asset_public_key = 2;
+    bytes owner_commitment = 3;
+    bytes mined_in_block = 4;
+    uint64 mined_height = 5;
+    OutputFeatures features = 6;
+    bytes script = 7;
+}
+
+message SubmitBlockResponse {
+    bytes block_hash = 1;
+}
+
+message BlockBlobRequest{
+    bytes header_blob = 1;
+    bytes body_blob = 2;
+}
+
+/// return type of GetTipInfo
+message TipInfoResponse {
+    MetaData metadata = 1;
+    bool initial_sync_achieved = 2;
+    BaseNodeState base_node_state = 3;
+}
+
+enum BaseNodeState{
+    START_UP = 0;
+    HEADER_SYNC = 1;
+    HORIZON_SYNC = 2;
+    CONNECTING = 3;
+    BLOCK_SYNC = 4;
+    LISTENING = 5;
+    SYNC_FAILED = 6;
+}
+
+/// return type of GetNewBlockTemplate
+message NewBlockTemplateResponse {
+    NewBlockTemplate new_block_template = 1;
+    bool initial_sync_achieved = 3;
+    MinerData miner_data = 4;
+}
+
+/// return type of NewBlockTemplateRequest
+message NewBlockTemplateRequest{
+    PowAlgo algo = 1;
+    //This field should be moved to optional once optional keyword is standard
+    uint64 max_weight = 2;
+}
+
+/// return type of NewBlockTemplateRequest
+message GetNewBlockTemplateWithCoinbasesRequest{
+    PowAlgo algo = 1;
+    //This field should be moved to optional once optional keyword is standard
+    uint64 max_weight = 2;
+    repeated  NewBlockCoinbase coinbases = 3;
+}
+
+/// request  type of GetNewBlockWithCoinbasesRequest
+message GetNewBlockWithCoinbasesRequest{
+    NewBlockTemplate new_template = 1;
+    repeated  NewBlockCoinbase coinbases = 2;
+}
+
+message NewBlockCoinbase{
+    string address = 1;
+    uint64 value = 2;
+    bool stealth_payment= 3;
+    bool revealed_value_proof= 4;
+    bytes coinbase_extra =5;
+}
+
+// Network difficulty response
+message NetworkDifficultyResponse {
+    uint64 difficulty = 1;
+    uint64 estimated_hash_rate = 2;
+    uint64 height = 3;
+    uint64 timestamp = 4;
+    uint64 pow_algo = 5;
+    uint64 sha3x_estimated_hash_rate = 6;
+    uint64 randomx_estimated_hash_rate = 7;
+}
+
+// A generic single value response for a specific height
+message ValueAtHeightResponse {
+    uint64 value= 1;
+    uint64 height = 2;
+}
+
+// A generic uint value
+message IntegerValue {
+    uint64 value = 1;
+}
+
+// A generic String value
+message StringValue {
+    string value = 1;
+}
+
+/// GetBlockSize / GetBlockFees Request
+/// Either the starting and ending heights OR the from_tip param must be specified
+message BlockGroupRequest {
+    // The height from the chain tip (optional)
+    uint64 from_tip = 1;
+    // The starting height (optional)
+    uint64 start_height = 2;
+    // The ending height (optional)
+    uint64 end_height = 3;
+    /// The type of calculation required (optional)
+    /// Defaults to median
+    /// median, mean, quartile, quantile
+    CalcType calc_type = 4;
+}
+
+/// GetBlockSize / GetBlockFees  Response
+message BlockGroupResponse {
+    repeated double value = 1;
+    CalcType calc_type = 2;
+}
+
+enum CalcType {
+    MEAN = 0;
+    MEDIAN = 1;
+    QUANTILE = 2;
+    QUARTILE = 3;
+}
+
+// The request used for querying a function that requires a height, either between 2 points or from the chain tip
+// If start_height and end_height are set and > 0, they take precedence, otherwise from_tip is used
+message HeightRequest {
+    // The height from the chain tip (optional)
+    uint64 from_tip = 1;
+    // The starting height (optional)
+    uint64 start_height = 2;
+    // The ending height (optional)
+    uint64 end_height = 3;
+}
+
+// The return type of the rpc GetBlockTiming
+message BlockTimingResponse {
+    uint64 max = 1;
+    uint64 min = 2;
+    double avg = 3;
+}
+
+// Request that returns a header based by hash
+message GetHeaderByHashRequest {
+    // The hash of the block header
+    bytes hash = 1;
+}
+
+
+message BlockHeaderResponse {
+    // The block header
+    BlockHeader header = 1;
+    // The number of blocks from the tip of this block (a.k.a depth)
+    uint64 confirmations = 2;
+    // The block reward i.e mining reward + fees
+    uint64 reward = 3;
+    // Achieved difficulty
+    uint64 difficulty = 4;
+    // The number of transactions contained in the block
+    uint32 num_transactions = 5;
+}
+
+// The request used for querying headers from the base node. The parameters `from_height` and `num_headers` can be used
+// to page through the current best chain.
+message ListHeadersRequest {
+    // The height to start at. Depending on sorting, will either default to use the tip or genesis block, for `SORTING_DESC`
+    // and `SORTING_ASC` respectively, if a value is not provided. The first header returned will be at this height
+    // followed by `num_headers` - 1 headers in the direction specified by `sorting`. If greater than the current tip,
+    // the current tip will be used.
+    uint64 from_height = 1;
+    // The number of headers to return. If not specified, it will default to 10
+    uint64 num_headers = 2;
+    // The ordering to return the headers in. If not specified will default to SORTING_DESC. Note that if `from_height`
+    // is not specified or is 0, if `sorting` is SORTING_DESC, the tip will be used as `from_height`, otherwise the
+    // block at height 0 will be used.
+    Sorting sorting = 3;
+}
+
+// The request used for querying blocks in the base node's current best chain. Currently only querying by height is
+// available. Multiple blocks may be queried.e.g. [189092,100023,122424]. The order in which they are returned is not
+// guaranteed.
+message GetBlocksRequest {
+  repeated uint64 heights = 1;
+}
+
+// The return type of the rpc GetBlocks. Blocks are not guaranteed to be returned in the order requested.
+message GetBlocksResponse {
+    repeated HistoricalBlock blocks = 1;
+}
+
+enum Sorting {
+    SORTING_DESC = 0;
+    SORTING_ASC = 1;
+}
+
+message MetaData {
+    // The current chain height, or the block number of the longest valid chain, or `None` if there is no chain
+    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;
+}
+
+message SyncInfoResponse {
+    uint64 tip_height = 1;
+    uint64 local_height = 2;
+    repeated bytes peer_node_id = 3;
+}
+
+message SyncProgressResponse {
+    uint64 tip_height = 1;
+    uint64 local_height = 2;
+    SyncState state = 3;
+}
+
+enum SyncState {
+    STARTUP = 0;
+    HEADER_STARTING = 1;
+    HEADER = 2;
+    BLOCK_STARTING = 3;
+    BLOCK = 4;
+    DONE = 5;
+}
+
+// This is the message that is returned for a miner after it asks for a new block.
+message GetNewBlockResult{
+    // This is the header hash of the completed block
+    bytes block_hash = 1;
+    // This is the completed block
+    Block block = 2;
+    bytes merge_mining_hash =3;
+    bytes tari_unique_id =4;
+    MinerData miner_data = 5;
+}
+
+// This is the message that is returned for a miner after it asks for a new block.
+message GetNewBlockBlobResult{
+    // This is the header hash of the completed block
+    bytes block_hash = 1;
+    // This is the completed block's header
+    bytes header = 2;
+    // This is the completed block's body
+    bytes block_body = 3;
+    bytes merge_mining_hash =4;
+    bytes utxo_mr = 5;
+    bytes tari_unique_id =6;
+}
+
+// This is mining data for the miner asking for a new block
+message MinerData{
+    PowAlgo algo = 1;
+    uint64 target_difficulty = 2;
+    uint64 reward = 3;
+//    bytes merge_mining_hash =4;
+    uint64 total_fees = 5;
+}
+
+// This is the request type for the Search Kernels rpc
+message SearchKernelsRequest{
+    repeated Signature signatures = 1;
+}
+
+// This is the request type for the Search Utxo rpc
+message SearchUtxosRequest{
+    repeated bytes commitments = 1;
+}
+
+message FetchMatchingUtxosRequest {
+    repeated bytes hashes = 1;
+}
+
+message FetchMatchingUtxosResponse {
+    TransactionOutput output = 1;
+}
+
+// This is the request type of the get all peers rpc call
+message GetPeersResponse{
+    Peer peer = 1;
+}
+
+message GetPeersRequest{}
+
+message SubmitTransactionRequest {
+    Transaction transaction  = 1;
+}
+
+message SubmitTransactionResponse {
+    SubmitTransactionResult result =1;
+}
+
+enum SubmitTransactionResult {
+    NONE = 0;
+    ACCEPTED = 1;
+    NOT_PROCESSABLE_AT_THIS_TIME = 2;
+    ALREADY_MINED =  3;
+    REJECTED = 4;
+
+}
+
+message GetMempoolTransactionsRequest {
+
+}
+
+message GetMempoolTransactionsResponse {
+    Transaction transaction = 1;
+}
+
+message TransactionStateRequest {
+    Signature excess_sig  = 1;
+}
+
+message TransactionStateResponse {
+    TransactionLocation result =1;
+}
+
+enum TransactionLocation {
+    UNKNOWN = 0;
+    MEMPOOL = 1;
+    MINED = 2;
+    NOT_STORED = 3;
+}
+
+message MempoolStatsResponse {
+    uint64 unconfirmed_txs = 2;
+    uint64 reorg_txs = 3;
+    uint64 unconfirmed_weight = 4;
+}
+
+message GetActiveValidatorNodesRequest {
+    uint64 height = 1;
+}
+
+message GetActiveValidatorNodesResponse {
+    bytes shard_key = 1;
+    bytes public_key = 2;
+}
+
+message GetShardKeyRequest {
+    uint64 height = 1;
+    bytes public_key = 2;
+}
+
+message GetShardKeyResponse {
+    bytes shard_key = 1;
+    bool found = 2;
+}
+
+message GetTemplateRegistrationsRequest {
+    bytes start_hash = 1;
+    uint64 count = 2;
+}
+
+message GetTemplateRegistrationResponse {
+    bytes utxo_hash = 1;
+    TemplateRegistration registration = 2;
+}
+
+message BlockInfo {
+    uint64 height = 1;
+    bytes hash = 2;
+    bytes next_block_hash = 3;
+}
+
+message GetSideChainUtxosRequest {
+    bytes start_hash = 1;
+    uint64 count = 2;
+}
+
+message GetSideChainUtxosResponse {
+    BlockInfo block_info = 1;
+    repeated TransactionOutput outputs = 2;
+}
+

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

@@ -0,0 +1,27 @@
+// Generated by the gRPC C++ plugin.
+// If you make any local change, they will be lost.
+// source: block.proto
+
+#include "block.pb.h"
+#include "block.grpc.pb.h"
+
+#include <functional>
+#include <grpcpp/support/async_stream.h>
+#include <grpcpp/support/async_unary_call.h>
+#include <grpcpp/impl/channel_interface.h>
+#include <grpcpp/impl/client_unary_call.h>
+#include <grpcpp/support/client_callback.h>
+#include <grpcpp/support/message_allocator.h>
+#include <grpcpp/support/method_handler.h>
+#include <grpcpp/impl/rpc_service_method.h>
+#include <grpcpp/support/server_callback.h>
+#include <grpcpp/impl/server_callback_handlers.h>
+#include <grpcpp/server_context.h>
+#include <grpcpp/impl/service_type.h>
+#include <grpcpp/support/sync_stream.h>
+namespace tari {
+namespace rpc {
+
+}  // namespace tari
+}  // namespace rpc
+

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

@@ -0,0 +1,57 @@
+// Generated by the gRPC C++ plugin.
+// If you make any local change, they will be lost.
+// source: block.proto
+// Original file comments:
+// Copyright 2020. The Tari Project
+//
+// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+// following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+// disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
+// following disclaimer in the documentation and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote
+// products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#ifndef GRPC_block_2eproto__INCLUDED
+#define GRPC_block_2eproto__INCLUDED
+
+#include "block.pb.h"
+
+#include <functional>
+#include <grpcpp/generic/async_generic_service.h>
+#include <grpcpp/support/async_stream.h>
+#include <grpcpp/support/async_unary_call.h>
+#include <grpcpp/support/client_callback.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/completion_queue.h>
+#include <grpcpp/support/message_allocator.h>
+#include <grpcpp/support/method_handler.h>
+#include <grpcpp/impl/proto_utils.h>
+#include <grpcpp/impl/rpc_method.h>
+#include <grpcpp/support/server_callback.h>
+#include <grpcpp/impl/server_callback_handlers.h>
+#include <grpcpp/server_context.h>
+#include <grpcpp/impl/service_type.h>
+#include <grpcpp/support/status.h>
+#include <grpcpp/support/stub_options.h>
+#include <grpcpp/support/sync_stream.h>
+
+namespace tari {
+namespace rpc {
+
+}  // namespace rpc
+}  // namespace tari
+
+
+#endif  // GRPC_block_2eproto__INCLUDED

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

@@ -0,0 +1,137 @@
+// Copyright 2020. The Tari Project
+//
+// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+// following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+// disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
+// following disclaimer in the documentation and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote
+// products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+syntax = "proto3";
+
+package tari.rpc;
+
+import "transaction.proto";
+
+// The BlockHeader contains all the metadata for the block, including proof of work, a link to the previous block
+// and the transaction kernels.
+message BlockHeader {
+    // The hash of the block
+    bytes hash = 1;
+    // Version of the block
+    uint32 version = 2;
+    // Height of this block since the genesis block (height 0)
+    uint64 height = 3;
+    // Hash of the block previous to this in the chain.
+    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)
+    bytes output_mr = 6;
+    // This is the MMR root of the kernels
+    bytes kernel_mr = 8;
+    // This is the Merkle root of the inputs in this block
+    bytes input_mr = 9;
+    // Total accumulated sum of kernel offsets since genesis block. We can derive the kernel offset sum for *this*
+    // block from the total kernel offset of the previous block header.
+    bytes total_kernel_offset = 10;
+    // Nonce increment used to mine this block.
+    uint64 nonce = 11;
+    // Proof of work metadata
+    ProofOfWork pow = 12;
+    // Kernel MMR size
+    uint64 kernel_mmr_size = 13;
+    // Output MMR size
+    uint64 output_mmr_size = 14;
+    // Sum of script offsets for all kernels in this block.
+    bytes total_script_offset = 15;
+    // Merkle root of validator nodes
+    bytes validator_node_mr = 16;
+    // Validator size
+    uint64 validator_node_size = 17;
+}
+
+// The proof of work data structure that is included in the block header.
+message ProofOfWork {
+    // The algorithm used to mine this block
+    //   0 = Monero
+    //   1 = Sha3X
+    uint64 pow_algo = 1;
+    // Supplemental proof of work data. For example for Sha3x, this would be empty (only the block header is
+    // required), but for Monero merge mining we need the Monero block header and RandomX seed hash.
+    bytes pow_data = 4;
+}
+
+//This is used to request the which pow algo should be used with the block template
+message PowAlgo {
+    // The permitted pow algorithms
+    enum PowAlgos {
+        POW_ALGOS_RANDOMX = 0;    // Accessible as `grpc::pow_algo::PowAlgos::Randomx`
+        POW_ALGOS_SHA3X = 1;      // Accessible as `grpc::pow_algo::PowAlgos::Sha3x`
+    }
+    // The pow algo to use
+    PowAlgos pow_algo = 1;
+}
+
+
+// A Minotari block. Blocks are linked together into a blockchain.
+message Block {
+    // The BlockHeader contains all the metadata for the block, including proof of work, a link to the previous block
+    // and the transaction kernels.
+    BlockHeader header = 1;
+    // The components of the block or transaction. The same struct can be used for either, since in Mimblewimble,
+    // blocks consist of inputs, outputs and kernels, rather than transactions.
+    AggregateBody body = 2;
+}
+
+// The representation of a historical block in the blockchain. It is essentially identical to a protocol-defined
+// block but contains some extra metadata that clients such as Block Explorers will find interesting.
+message HistoricalBlock {
+    // The number of blocks that have been mined since this block, including this one. The current tip will have one
+    // confirmation.
+    uint64 confirmations = 1;
+    // The underlying block
+    Block block = 2;
+}
+
+
+// The NewBlockHeaderTemplate is used for the construction of a new mine-able block. It contains all the metadata for the block that the Base Node is able to complete on behalf of a Miner.
+message NewBlockHeaderTemplate {
+    // Version of the block
+    uint32 version = 1;
+    // Height of this block since the genesis block (height 0)
+    uint64 height = 2;
+    // Hash of the block previous to this in the chain.
+    bytes prev_hash = 3;
+    // Total accumulated sum of kernel offsets since genesis block. We can derive the kernel offset sum for *this*
+    // block from the total kernel offset of the previous block header.
+    bytes total_kernel_offset = 4;
+    // Proof of work metadata
+    ProofOfWork pow = 5;
+    // Sum of script offsets for all kernels in this block.
+    bytes total_script_offset = 7;
+}
+
+// The new block template is used constructing a new partial block, allowing a miner to added the coinbase utxo and as a final step the Base node to add the MMR roots to the header.
+message NewBlockTemplate {
+    // The NewBlockHeaderTemplate is used for the construction of a new mineable block. It contains all the metadata for
+    // the block that the Base Node is able to complete on behalf of a Miner.
+    NewBlockHeaderTemplate header = 1;
+    // 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;
+}
+

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

@@ -0,0 +1,27 @@
+// Generated by the gRPC C++ plugin.
+// If you make any local change, they will be lost.
+// source: network.proto
+
+#include "network.pb.h"
+#include "network.grpc.pb.h"
+
+#include <functional>
+#include <grpcpp/support/async_stream.h>
+#include <grpcpp/support/async_unary_call.h>
+#include <grpcpp/impl/channel_interface.h>
+#include <grpcpp/impl/client_unary_call.h>
+#include <grpcpp/support/client_callback.h>
+#include <grpcpp/support/message_allocator.h>
+#include <grpcpp/support/method_handler.h>
+#include <grpcpp/impl/rpc_service_method.h>
+#include <grpcpp/support/server_callback.h>
+#include <grpcpp/impl/server_callback_handlers.h>
+#include <grpcpp/server_context.h>
+#include <grpcpp/impl/service_type.h>
+#include <grpcpp/support/sync_stream.h>
+namespace tari {
+namespace rpc {
+
+}  // namespace tari
+}  // namespace rpc
+

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

@@ -0,0 +1,57 @@
+// Generated by the gRPC C++ plugin.
+// If you make any local change, they will be lost.
+// source: network.proto
+// Original file comments:
+// Copyright 2020. The Tari Project
+//
+// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+// following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+// disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
+// following disclaimer in the documentation and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote
+// products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#ifndef GRPC_network_2eproto__INCLUDED
+#define GRPC_network_2eproto__INCLUDED
+
+#include "network.pb.h"
+
+#include <functional>
+#include <grpcpp/generic/async_generic_service.h>
+#include <grpcpp/support/async_stream.h>
+#include <grpcpp/support/async_unary_call.h>
+#include <grpcpp/support/client_callback.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/completion_queue.h>
+#include <grpcpp/support/message_allocator.h>
+#include <grpcpp/support/method_handler.h>
+#include <grpcpp/impl/proto_utils.h>
+#include <grpcpp/impl/rpc_method.h>
+#include <grpcpp/support/server_callback.h>
+#include <grpcpp/impl/server_callback_handlers.h>
+#include <grpcpp/server_context.h>
+#include <grpcpp/impl/service_type.h>
+#include <grpcpp/support/status.h>
+#include <grpcpp/support/stub_options.h>
+#include <grpcpp/support/sync_stream.h>
+
+namespace tari {
+namespace rpc {
+
+}  // namespace rpc
+}  // namespace tari
+
+
+#endif  // GRPC_network_2eproto__INCLUDED

external/src/Tari/proto/gRPC/network.proto

@@ -0,0 +1,97 @@
+// Copyright 2020. The Tari Project
+//
+// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+// following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+// disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
+// following disclaimer in the documentation and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote
+// products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+syntax = "proto3";
+
+package tari.rpc;
+
+import "google/protobuf/timestamp.proto";
+
+message NodeIdentity {
+    bytes public_key = 1;
+    repeated string public_addresses = 2;
+    bytes node_id = 3;
+}
+
+message Peer {
+    /// Public key of the peer
+    bytes public_key =1;
+    /// NodeId of the peer
+    bytes node_id =2;
+    /// Peer's addresses
+    repeated Address addresses = 3;
+    /// Last connection attempt to peer
+    uint64 last_connection = 4;
+    /// Flags for the peer.
+    uint32 flags = 5;
+    uint64 banned_until= 6;
+    string banned_reason= 7;
+    uint64 offline_at = 8;
+    /// Features supported by the peer
+    uint32 features = 9;
+    /// used as information for more efficient protocol negotiation.
+    repeated bytes supported_protocols = 11;
+    /// User agent advertised by the peer
+    string user_agent = 12;
+}
+
+enum ConnectivityStatus {
+    Initializing = 0;
+    Online = 1;
+    Degraded = 2;
+    Offline = 3;
+}
+
+message NetworkStatusResponse {
+    ConnectivityStatus status = 1;
+    uint32 avg_latency_ms = 2;
+    uint32 num_node_connections = 3;
+}
+
+message Address{
+    bytes address =1;
+    string last_seen = 2;
+    uint32 connection_attempts = 3;
+    AverageLatency avg_latency = 5;
+}
+
+message AverageLatency {
+    uint64 latency = 1;
+}
+
+message ListConnectedPeersResponse {
+    repeated Peer connected_peers = 1;
+}
+
+message SoftwareUpdate {
+    bool has_update = 1;
+    string version = 2;
+    string sha = 3;
+    string download_url = 4;
+}
+
+message GetIdentityRequest { }
+
+message GetIdentityResponse {
+    bytes public_key = 1;
+    string public_address = 2;
+    bytes node_id = 3;
+}

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

@@ -0,0 +1,27 @@
+// Generated by the gRPC C++ plugin.
+// If you make any local change, they will be lost.
+// source: sidechain_types.proto
+
+#include "sidechain_types.pb.h"
+#include "sidechain_types.grpc.pb.h"
+
+#include <functional>
+#include <grpcpp/support/async_stream.h>
+#include <grpcpp/support/async_unary_call.h>
+#include <grpcpp/impl/channel_interface.h>
+#include <grpcpp/impl/client_unary_call.h>
+#include <grpcpp/support/client_callback.h>
+#include <grpcpp/support/message_allocator.h>
+#include <grpcpp/support/method_handler.h>
+#include <grpcpp/impl/rpc_service_method.h>
+#include <grpcpp/support/server_callback.h>
+#include <grpcpp/impl/server_callback_handlers.h>
+#include <grpcpp/server_context.h>
+#include <grpcpp/impl/service_type.h>
+#include <grpcpp/support/sync_stream.h>
+namespace tari {
+namespace rpc {
+
+}  // namespace tari
+}  // namespace rpc
+

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

@@ -0,0 +1,57 @@
+// Generated by the gRPC C++ plugin.
+// If you make any local change, they will be lost.
+// source: sidechain_types.proto
+// Original file comments:
+// Copyright 2020. The Tari Project
+//
+// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+// following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+// disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
+// following disclaimer in the documentation and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote
+// products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#ifndef GRPC_sidechain_5ftypes_2eproto__INCLUDED
+#define GRPC_sidechain_5ftypes_2eproto__INCLUDED
+
+#include "sidechain_types.pb.h"
+
+#include <functional>
+#include <grpcpp/generic/async_generic_service.h>
+#include <grpcpp/support/async_stream.h>
+#include <grpcpp/support/async_unary_call.h>
+#include <grpcpp/support/client_callback.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/completion_queue.h>
+#include <grpcpp/support/message_allocator.h>
+#include <grpcpp/support/method_handler.h>
+#include <grpcpp/impl/proto_utils.h>
+#include <grpcpp/impl/rpc_method.h>
+#include <grpcpp/support/server_callback.h>
+#include <grpcpp/impl/server_callback_handlers.h>
+#include <grpcpp/server_context.h>
+#include <grpcpp/impl/service_type.h>
+#include <grpcpp/support/status.h>
+#include <grpcpp/support/stub_options.h>
+#include <grpcpp/support/sync_stream.h>
+
+namespace tari {
+namespace rpc {
+
+}  // namespace rpc
+}  // namespace tari
+
+
+#endif  // GRPC_sidechain_5ftypes_2eproto__INCLUDED

external/src/Tari/proto/gRPC/sidechain_types.proto

@@ -0,0 +1,77 @@
+// Copyright 2020. The Tari Project
+//
+// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+// following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+// disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
+// following disclaimer in the documentation and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote
+// products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+syntax = "proto3";
+
+package tari.rpc;
+
+import "types.proto";
+
+message SideChainFeature {
+    oneof side_chain_feature {
+        ValidatorNodeRegistration validator_node_registration = 1;
+        TemplateRegistration template_registration = 2;
+        ConfidentialOutputData confidential_output = 3;
+    }
+}
+
+message ValidatorNodeRegistration {
+    bytes public_key = 1;
+    Signature signature = 2;
+}
+
+message TemplateRegistration {
+    bytes author_public_key = 1;
+    Signature author_signature = 2;
+    string template_name = 3;
+    uint32 template_version = 4;
+    TemplateType template_type = 5;
+    BuildInfo build_info = 6;
+    bytes binary_sha = 7;
+    string binary_url = 8;
+}
+
+message ConfidentialOutputData {
+    bytes claim_public_key = 1;
+}
+
+message TemplateType {
+    oneof template_type {
+        WasmInfo wasm = 1;
+        FlowInfo flow = 2;
+        ManifestInfo manifest = 3;
+    }
+}
+
+message WasmInfo {
+    uint32 abi_version = 1;
+}
+
+message FlowInfo {
+}
+
+message ManifestInfo {
+}
+
+message BuildInfo {
+    string repo_url = 1;
+    bytes commit_hash = 2;
+}

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

@@ -0,0 +1,27 @@
+// Generated by the gRPC C++ plugin.
+// If you make any local change, they will be lost.
+// source: transaction.proto
+
+#include "transaction.pb.h"
+#include "transaction.grpc.pb.h"
+
+#include <functional>
+#include <grpcpp/support/async_stream.h>
+#include <grpcpp/support/async_unary_call.h>
+#include <grpcpp/impl/channel_interface.h>
+#include <grpcpp/impl/client_unary_call.h>
+#include <grpcpp/support/client_callback.h>
+#include <grpcpp/support/message_allocator.h>
+#include <grpcpp/support/method_handler.h>
+#include <grpcpp/impl/rpc_service_method.h>
+#include <grpcpp/support/server_callback.h>
+#include <grpcpp/impl/server_callback_handlers.h>
+#include <grpcpp/server_context.h>
+#include <grpcpp/impl/service_type.h>
+#include <grpcpp/support/sync_stream.h>
+namespace tari {
+namespace rpc {
+
+}  // namespace tari
+}  // namespace rpc
+

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

@@ -0,0 +1,57 @@
+// Generated by the gRPC C++ plugin.
+// If you make any local change, they will be lost.
+// source: transaction.proto
+// Original file comments:
+// Copyright 2020. The Tari Project
+//
+// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+// following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+// disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
+// following disclaimer in the documentation and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote
+// products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#ifndef GRPC_transaction_2eproto__INCLUDED
+#define GRPC_transaction_2eproto__INCLUDED
+
+#include "transaction.pb.h"
+
+#include <functional>
+#include <grpcpp/generic/async_generic_service.h>
+#include <grpcpp/support/async_stream.h>
+#include <grpcpp/support/async_unary_call.h>
+#include <grpcpp/support/client_callback.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/completion_queue.h>
+#include <grpcpp/support/message_allocator.h>
+#include <grpcpp/support/method_handler.h>
+#include <grpcpp/impl/proto_utils.h>
+#include <grpcpp/impl/rpc_method.h>
+#include <grpcpp/support/server_callback.h>
+#include <grpcpp/impl/server_callback_handlers.h>
+#include <grpcpp/server_context.h>
+#include <grpcpp/impl/service_type.h>
+#include <grpcpp/support/status.h>
+#include <grpcpp/support/stub_options.h>
+#include <grpcpp/support/sync_stream.h>
+
+namespace tari {
+namespace rpc {
+
+}  // namespace rpc
+}  // namespace tari
+
+
+#endif  // GRPC_transaction_2eproto__INCLUDED

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

@@ -0,0 +1,182 @@
+// Copyright 2020. The Tari Project
+//
+// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+// following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+// disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
+// following disclaimer in the documentation and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote
+// products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+syntax = "proto3";
+
+package tari.rpc;
+
+import "types.proto";
+import "sidechain_types.proto";
+
+// The transaction kernel tracks the excess for a given transaction. For an explanation of what the excess is, and
+// why it is necessary, refer to the
+// [Mimblewimble TLU post](https://tlu.tarilabs.com/protocols/mimblewimble-1/sources/PITCHME.link.html?highlight=mimblewimble#mimblewimble).
+// The kernel also tracks other transaction metadata, such as the lock height for the transaction (i.e. the earliest
+// this transaction can be mined) and the transaction fee, in cleartext.
+message TransactionKernel {
+    // Options for a kernel's structure or use
+    uint32 features = 1;
+    /// Fee originally included in the transaction this proof is for (in MicroMinotari)
+    uint64 fee = 2;
+    // This kernel is not valid earlier than lock_height blocks
+    // The max lock_height of all *inputs* to this transaction
+    uint64 lock_height = 3;
+    // Remainder of the sum of all transaction commitments. If the transaction
+    // is well formed, amounts components should sum to zero and the excess
+    // is hence a valid public key.
+    bytes excess = 6;
+    // The signature proving the excess is a valid public key, which signs
+    // the transaction fee.
+    Signature excess_sig = 7;
+    // The hash of the kernel, as it appears in the MMR
+    bytes hash = 8;
+    // Version
+    uint32 version = 9;
+    // Optional burned commitment
+    bytes burn_commitment = 10;
+}
+
+// A transaction input.
+//
+// Primarily a reference to an output being spent by the transaction.
+message TransactionInput {
+    // The features of the output being spent. We will check maturity for all outputs.
+    OutputFeatures features = 1;
+    // The commitment referencing the output being spent.
+    bytes commitment = 2;
+    // Hash of the input, as it appears in the MMR
+    bytes hash = 3;
+    // The serialised script
+    bytes script = 4;
+    // The script input data, if any
+    bytes input_data = 5;
+    // A signature with k_s, signing the script, input data, and mined height
+    ComAndPubSignature script_signature = 7;
+    // The offset public key, K_O
+    bytes sender_offset_public_key = 8;
+    // The hash of the output this input is spending
+    bytes output_hash = 9;
+    // Covenant
+    bytes covenant = 10;
+    // Version
+    uint32 version = 11;
+    // The encrypted data
+    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 metadata signature for output this input is spending
+    ComAndPubSignature metadata_signature = 14;
+    // The rangeproof hash for output this input is spending
+    bytes rangeproof_hash = 15;
+}
+
+// Output for a transaction, defining the new ownership of coins that are being transferred. The commitment is a
+// blinded value for the output while the range proof guarantees the commitment includes a positive value without
+// overflow and the ownership of the private key.
+message TransactionOutput {
+    // Options for an output's structure or use
+    OutputFeatures features = 1;
+    // The homomorphic commitment representing the output amount
+    bytes commitment = 2;
+    // A proof that the commitment is in the right range
+    RangeProof range_proof = 3;
+    // The hash of the output, as it appears in the MMR
+    bytes hash = 4;
+    // Tari script serialised script
+    bytes script = 5;
+    // Tari script offset public key, K_O
+    bytes sender_offset_public_key = 6;
+    // Metadata signature with the homomorphic commitment private values (amount and blinding factor) and the sender
+    // offset private key
+    ComAndPubSignature metadata_signature = 7;
+    // Covenant
+    bytes covenant = 8;
+    // Version
+    uint32 version = 9;
+    // Encrypted Pedersen commitment openings (value and mask) for the output
+    bytes encrypted_data = 10;
+    // The minimum value of the commitment that is proven by the range proof (in MicroMinotari)
+    uint64 minimum_value_promise = 11;
+}
+
+// Options for UTXOs
+message OutputFeatures {
+    // Version
+    uint32 version = 1;
+    // The type of output, eg Coinbase, all of which have different consensus rules
+    uint32 output_type = 2;
+    // The maturity of the specific UTXO. This is the min lock height at which an UTXO can be spend. Coinbase UTXO
+    // require a min maturity of the Coinbase_lock_height, this should be checked on receiving new blocks.
+    uint64 maturity = 3;
+    // Additional arbitrary info in coinbase transactions supplied by miners
+    bytes coinbase_extra = 4;
+    // Features that are specific to a side chain
+    SideChainFeature sidechain_feature = 5;
+    // The type of range proof used in the output
+    uint32 range_proof_type = 6;
+}
+
+// The components of the block or transaction. The same struct can be used for either, since in Mimblewimble,
+// cut-through means that blocks and transactions have the same structure. The inputs, outputs and kernels should
+// be sorted by their Blake2b-256bit digest hash
+message AggregateBody {
+    // List of inputs spent by the transaction.
+    repeated TransactionInput inputs = 1;
+    // List of outputs the transaction produces.
+    repeated TransactionOutput outputs = 2;
+    // Kernels contain the excesses and their signatures for transaction
+    repeated TransactionKernel kernels = 3;
+}
+
+// A transaction which consists of a kernel offset and an aggregate body made up of inputs, outputs and kernels.
+message Transaction {
+    bytes offset = 1;
+    AggregateBody body = 2;
+    bytes script_offset = 3;
+}
+
+message UnblindedOutput {
+    // Value of the output
+    uint64 value = 1;
+    // Spending key of the output
+    bytes spending_key = 2;
+    // Options for an output's structure or use
+    OutputFeatures features = 3;
+    // Tari script serialised script
+    bytes script = 4;
+    // Tari script input data for spending
+    bytes input_data = 5;
+    // Tari script private key
+    bytes script_private_key = 7;
+    // Tari script offset pubkey, K_O
+    bytes sender_offset_public_key = 8;
+    // UTXO signature with the script offset private key, k_O
+    ComAndPubSignature metadata_signature = 9;
+    // The minimum height the script allows this output to be spent
+    uint64 script_lock_height = 10;
+    // Covenant
+    bytes covenant = 11;
+    // Encrypted data
+    bytes encrypted_data = 12;
+    // The minimum value of the commitment that is proven by the range proof (in MicroMinotari)
+    uint64 minimum_value_promise = 13;
+}
+

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

@@ -0,0 +1,27 @@
+// Generated by the gRPC C++ plugin.
+// If you make any local change, they will be lost.
+// source: types.proto
+
+#include "types.pb.h"
+#include "types.grpc.pb.h"
+
+#include <functional>
+#include <grpcpp/support/async_stream.h>
+#include <grpcpp/support/async_unary_call.h>
+#include <grpcpp/impl/channel_interface.h>
+#include <grpcpp/impl/client_unary_call.h>
+#include <grpcpp/support/client_callback.h>
+#include <grpcpp/support/message_allocator.h>
+#include <grpcpp/support/method_handler.h>
+#include <grpcpp/impl/rpc_service_method.h>
+#include <grpcpp/support/server_callback.h>
+#include <grpcpp/impl/server_callback_handlers.h>
+#include <grpcpp/server_context.h>
+#include <grpcpp/impl/service_type.h>
+#include <grpcpp/support/sync_stream.h>
+namespace tari {
+namespace rpc {
+
+}  // namespace tari
+}  // namespace rpc
+

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

@@ -0,0 +1,57 @@
+// Generated by the gRPC C++ plugin.
+// If you make any local change, they will be lost.
+// source: types.proto
+// Original file comments:
+// Copyright 2020. The Tari Project
+//
+// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+// following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+// disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
+// following disclaimer in the documentation and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote
+// products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#ifndef GRPC_types_2eproto__INCLUDED
+#define GRPC_types_2eproto__INCLUDED
+
+#include "types.pb.h"
+
+#include <functional>
+#include <grpcpp/generic/async_generic_service.h>
+#include <grpcpp/support/async_stream.h>
+#include <grpcpp/support/async_unary_call.h>
+#include <grpcpp/support/client_callback.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/completion_queue.h>
+#include <grpcpp/support/message_allocator.h>
+#include <grpcpp/support/method_handler.h>
+#include <grpcpp/impl/proto_utils.h>
+#include <grpcpp/impl/rpc_method.h>
+#include <grpcpp/support/server_callback.h>
+#include <grpcpp/impl/server_callback_handlers.h>
+#include <grpcpp/server_context.h>
+#include <grpcpp/impl/service_type.h>
+#include <grpcpp/support/status.h>
+#include <grpcpp/support/stub_options.h>
+#include <grpcpp/support/sync_stream.h>
+
+namespace tari {
+namespace rpc {
+
+}  // namespace rpc
+}  // namespace tari
+
+
+#endif  // GRPC_types_2eproto__INCLUDED

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

@@ -0,0 +1,146 @@
+// Copyright 2020. The Tari Project
+//
+// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+// following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+// disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
+// following disclaimer in the documentation and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote
+// products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+syntax = "proto3";
+
+package tari.rpc;
+
+/// An unsigned range interface to more accurately represent Rust native Range's
+message Range {
+    uint64 min = 1;
+    uint64 max = 2;
+}
+
+/// An Empty placeholder for endpoints without request parameters
+message Empty {}
+
+/// Define an interface for block height
+message BlockHeight {
+    uint64 block_height = 1;
+}
+
+// Define the explicit Signature implementation for the Minotari base layer. A different signature scheme can be
+// employed by redefining this type.
+message Signature {
+    bytes public_nonce = 1;
+    bytes signature = 2;
+}
+
+// Define the explicit ComAndPubSignature implementation for the Minotari base layer. A different signature scheme can be
+// employed by redefining this type.
+message ComAndPubSignature {
+    bytes ephemeral_commitment = 1;
+    bytes ephemeral_pubkey = 2;
+    bytes u_a = 3;
+    bytes u_x = 4;
+    bytes u_y = 5;
+}
+
+// Define the explicit CommitmentSignature implementation for the Minotari base layer. A different signature scheme can be
+// employed by redefining this type
+message CommitmentSignature {
+    bytes public_nonce = 1;
+    bytes u = 2;
+    bytes v = 3;
+}
+
+/// PoW Algorithm constants
+message PowAlgorithmConstants {
+    uint64 min_difficulty = 2;
+    uint64 max_difficulty = 3;
+    uint64 target_time = 4;
+}
+
+/// Weight params
+message WeightParams {
+    uint64 kernel_weight = 1;
+    uint64 input_weight = 2;
+    uint64 output_weight = 3;
+    uint64 features_and_scripts_bytes_per_gram = 4;
+}
+
+/// Output version
+message OutputsVersion {
+    Range outputs = 1;
+    Range features = 2;
+}
+
+/// Output types
+enum OutputType {
+    STANDARD = 0;
+    COINBASE = 1;
+    BURN = 2;
+    VALIDATOR_NODE_REGISTRATION = 3;
+    CODE_TEMPLATE_REGISTRATION = 4;
+}
+
+/// Range proof types
+enum RangeProofType {
+    BULLETPROOF_PLUS = 0;
+    REVEALED_VALUE = 1;
+}
+
+message PermittedRangeProofs {
+    OutputType output_type = 1;
+    repeated RangeProofType range_proof_types = 2;
+}
+
+/// Range proof
+message RangeProof {
+    bytes proof_bytes = 1;
+}
+
+/// Consensus Constants response
+message ConsensusConstants {
+    uint64 coinbase_min_maturity = 1;
+    uint32 blockchain_version = 2;
+    uint64 future_time_limit = 3;
+    uint64 difficulty_block_window = 5;
+    uint64 max_block_transaction_weight = 7;
+    uint64 pow_algo_count = 8;
+    uint64 median_timestamp_count = 9;
+    uint64 emission_initial = 10;
+    repeated uint64 emission_decay = 11;
+    uint64 emission_tail = 12 [deprecated=true];
+    uint64 min_sha3x_pow_difficulty = 13;
+    uint64 block_weight_inputs = 14;
+    uint64 block_weight_outputs = 15;
+    uint64 block_weight_kernels = 16;
+    uint64 faucet_value = 17;
+    uint64 max_script_byte_size = 18;
+    uint64 validator_node_validity_period = 19;
+    uint64 effective_from_height = 20;
+    Range valid_blockchain_version_range = 21;
+    uint64 max_randomx_seed_height = 22;
+    map<uint32, PowAlgorithmConstants> proof_of_work = 23;
+    WeightParams transaction_weight = 24;
+    Range input_version_range = 26;
+    OutputsVersion output_version_range = 27;
+    Range kernel_version_range = 28;
+    repeated OutputType permitted_output_types = 29;
+    uint64 epoch_length = 30;
+    uint64 validator_node_registration_min_deposit_amount = 31;
+    uint64 validator_node_registration_min_lock_height = 32;
+    uint64 validator_node_registration_shuffle_interval_epoch = 33;
+    repeated PermittedRangeProofs permitted_range_proof_types = 34;
+    uint64 inflation_bips = 35;
+    uint64 tail_epoch_length = 36;
+}

external/src/common/sanitizer/asan_interface.h

@@ -0,0 +1,12 @@
+#ifndef P2POOL_EXTERNAL_SRC_COMMON_SANITIZER_ASAN_INTERFACE_H
+#define P2POOL_EXTERNAL_SRC_COMMON_SANITIZER_ASAN_INTERFACE_H
+
+#ifndef ASAN_POISON_MEMORY_REGION
+#define ASAN_POISON_MEMORY_REGION(addr, size) __asan_poison_memory_region((addr), (size))
+#endif
+
+#ifndef ASAN_UNPOISON_MEMORY_REGION
+#define ASAN_UNPOISON_MEMORY_REGION(addr, size) __asan_unpoison_memory_region((addr), (size))
+#endif
+
+#endif // P2POOL_EXTERNAL_SRC_COMMON_SANITIZER_ASAN_INTERFACE_H

external/src/common/stdalign.h

@@ -0,0 +1,9 @@
+#ifndef P2POOL_EXTERNAL_SRC_COMMON_STDALIGN_H
+#define P2POOL_EXTERNAL_SRC_COMMON_STDALIGN_H
+
+#if !defined(__cplusplus) && defined(_MSC_VER)
+#define alignas(x) __declspec(align(x))
+#define alignof __alignof
+#endif
+
+#endif // P2POOL_EXTERNAL_SRC_COMMON_STDALIGN_H

external/src/crypto/sha256.c

@@ -0,0 +1,169 @@
+/*********************************************************************
+* Filename:   sha256.c
+* Author:     Brad Conte (brad AT bradconte.com)
+* Copyright:
+* Disclaimer: This code is presented "as is" without any guarantees.
+* Details:    Implementation of the SHA-256 hashing algorithm.
+              SHA-256 is one of the three algorithms in the SHA2
+              specification. The others, SHA-384 and SHA-512, are not
+              offered in this implementation.
+              Algorithm specification can be found here:
+               * http://csrc.nist.gov/publications/fips/fips180-2/fips180-2withchangenotice.pdf
+              This implementation uses little endian byte order.
+*********************************************************************/
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4668 4711)
+#endif
+
+/*************************** HEADER FILES ***************************/
+#include "sha256.h"
+#include <memory.h>
+
+/****************************** MACROS ******************************/
+#define ROTLEFT(a,b) (((a) << (b)) | ((a) >> (32-(b))))
+#define ROTRIGHT(a,b) (((a) >> (b)) | ((a) << (32-(b))))
+
+#define CH(x,y,z) (((x) & (y)) ^ (~(x) & (z)))
+#define MAJ(x,y,z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
+#define EP0(x) (ROTRIGHT(x,2) ^ ROTRIGHT(x,13) ^ ROTRIGHT(x,22))
+#define EP1(x) (ROTRIGHT(x,6) ^ ROTRIGHT(x,11) ^ ROTRIGHT(x,25))
+#define SIG0(x) (ROTRIGHT(x,7) ^ ROTRIGHT(x,18) ^ ((x) >> 3))
+#define SIG1(x) (ROTRIGHT(x,17) ^ ROTRIGHT(x,19) ^ ((x) >> 10))
+
+/**************************** VARIABLES *****************************/
+static const uint32_t k[64] = {
+	0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5,0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5,
+	0xd807aa98,0x12835b01,0x243185be,0x550c7dc3,0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174,
+	0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc,0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da,
+	0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7,0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967,
+	0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13,0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85,
+	0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3,0xd192e819,0xd6990624,0xf40e3585,0x106aa070,
+	0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5,0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3,
+	0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208,0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
+};
+
+/*********************** FUNCTION DEFINITIONS ***********************/
+static void sha256_transform(SHA256_CTX *ctx, const uint8_t* data)
+{
+	uint32_t a, b, c, d, e, f, g, h, i, j, t1, t2, m[64];
+
+	for (i = 0, j = 0; i < 16; ++i, j += 4)
+		m[i] = (((uint32_t)data[j]) << 24) | (((uint32_t)data[j + 1]) << 16) | (((uint32_t)data[j + 2]) << 8) | ((uint32_t)data[j + 3]);
+	for ( ; i < 64; ++i)
+		m[i] = SIG1(m[i - 2]) + m[i - 7] + SIG0(m[i - 15]) + m[i - 16];
+
+	a = ctx->state[0];
+	b = ctx->state[1];
+	c = ctx->state[2];
+	d = ctx->state[3];
+	e = ctx->state[4];
+	f = ctx->state[5];
+	g = ctx->state[6];
+	h = ctx->state[7];
+
+	for (i = 0; i < 64; ++i) {
+		t1 = h + EP1(e) + CH(e,f,g) + k[i] + m[i];
+		t2 = EP0(a) + MAJ(a,b,c);
+		h = g;
+		g = f;
+		f = e;
+		e = d + t1;
+		d = c;
+		c = b;
+		b = a;
+		a = t1 + t2;
+	}
+
+	ctx->state[0] += a;
+	ctx->state[1] += b;
+	ctx->state[2] += c;
+	ctx->state[3] += d;
+	ctx->state[4] += e;
+	ctx->state[5] += f;
+	ctx->state[6] += g;
+	ctx->state[7] += h;
+}
+
+void sha256_init(SHA256_CTX *ctx)
+{
+	ctx->datalen = 0;
+	ctx->bitlen = 0;
+	ctx->state[0] = 0x6a09e667;
+	ctx->state[1] = 0xbb67ae85;
+	ctx->state[2] = 0x3c6ef372;
+	ctx->state[3] = 0xa54ff53a;
+	ctx->state[4] = 0x510e527f;
+	ctx->state[5] = 0x9b05688c;
+	ctx->state[6] = 0x1f83d9ab;
+	ctx->state[7] = 0x5be0cd19;
+}
+
+void sha256_update(SHA256_CTX *ctx, const uint8_t* data, uint32_t len)
+{
+	uint32_t i;
+
+	for (i = 0; i < len; ++i) {
+		ctx->data[ctx->datalen] = data[i];
+		ctx->datalen++;
+		if (ctx->datalen == 64) {
+			sha256_transform(ctx, ctx->data);
+			ctx->bitlen += 512;
+			ctx->datalen = 0;
+		}
+	}
+}
+
+void sha256_final(SHA256_CTX *ctx, uint8_t* hash)
+{
+	uint32_t i;
+
+	i = ctx->datalen;
+
+	// Pad whatever data is left in the buffer.
+	if (ctx->datalen < 56) {
+		ctx->data[i++] = 0x80;
+		while (i < 56)
+			ctx->data[i++] = 0x00;
+	}
+	else {
+		ctx->data[i++] = 0x80;
+		while (i < 64)
+			ctx->data[i++] = 0x00;
+		sha256_transform(ctx, ctx->data);
+		memset(ctx->data, 0, 56);
+	}
+
+	// Append to the padding the total message's length in bits and transform.
+	ctx->bitlen += ctx->datalen * 8;
+	ctx->data[63] = (uint8_t)(ctx->bitlen);
+	ctx->data[62] = (uint8_t)(ctx->bitlen >> 8);
+	ctx->data[61] = (uint8_t)(ctx->bitlen >> 16);
+	ctx->data[60] = (uint8_t)(ctx->bitlen >> 24);
+	ctx->data[59] = (uint8_t)(ctx->bitlen >> 32);
+	ctx->data[58] = (uint8_t)(ctx->bitlen >> 40);
+	ctx->data[57] = (uint8_t)(ctx->bitlen >> 48);
+	ctx->data[56] = (uint8_t)(ctx->bitlen >> 56);
+	sha256_transform(ctx, ctx->data);
+
+	// Since this implementation uses little endian byte ordering and SHA uses big endian,
+	// reverse all the bytes when copying the final state to the output hash.
+	for (i = 0; i < 4; ++i) {
+		hash[i]      = (ctx->state[0] >> (24 - i * 8)) & 0x000000ff;
+		hash[i + 4]  = (ctx->state[1] >> (24 - i * 8)) & 0x000000ff;
+		hash[i + 8]  = (ctx->state[2] >> (24 - i * 8)) & 0x000000ff;
+		hash[i + 12] = (ctx->state[3] >> (24 - i * 8)) & 0x000000ff;
+		hash[i + 16] = (ctx->state[4] >> (24 - i * 8)) & 0x000000ff;
+		hash[i + 20] = (ctx->state[5] >> (24 - i * 8)) & 0x000000ff;
+		hash[i + 24] = (ctx->state[6] >> (24 - i * 8)) & 0x000000ff;
+		hash[i + 28] = (ctx->state[7] >> (24 - i * 8)) & 0x000000ff;
+	}
+}
+
+void sha256(const void* data, uint32_t len, uint8_t* hash)
+{
+	SHA256_CTX ctx;
+	sha256_init(&ctx);
+	sha256_update(&ctx, data, len);
+	sha256_final(&ctx, hash);
+}

external/src/crypto/sha256.h

@@ -0,0 +1,41 @@
+/*********************************************************************
+* Filename:   sha256.h
+* Author:     Brad Conte (brad AT bradconte.com)
+* Copyright:
+* Disclaimer: This code is presented "as is" without any guarantees.
+* Details:    Defines the API for the corresponding SHA1 implementation.
+*********************************************************************/
+
+#ifndef SHA256_H
+#define SHA256_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*************************** 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
+}
+#endif
+
+#endif   // SHA256_H

patches/boringssl/win7.patch

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

patches/msys2/typeinfo.patch

@@ -0,0 +1,14 @@
+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
+   {

src/block_cache.cpp

@@ -1,6 +1,6 @@
 /*
  * This file is part of the Monero P2Pool <https://github.com/SChernykh/p2pool>
- * Copyright (c) 2021-2023 SChernykh <https://github.com/SChernykh>
+ * Copyright (c) 2021-2024 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
@@ -19,6 +19,7 @@
 #include "block_cache.h"
 #include "pool_block.h"
 #include "p2p_server.h"
+#include "side_chain.h"
 
 LOG_CATEGORY(BlockCache)
 
@@ -35,9 +36,11 @@ struct BlockCache::Impl : public nocopy_nomove
 
 	Impl()
 	{
-		m_fd = open(cache_name, O_RDWR | O_CREAT, static_cast<mode_t>(0600));
+		const std::string cache_path = DATA_DIR + cache_name;
+
+		m_fd = open(cache_path.c_str(), O_RDWR | O_CREAT, static_cast<mode_t>(0600));
 		if (m_fd == -1) {
-			LOGERR(1, "couldn't open/create " << cache_name);
+			LOGERR(1, "couldn't open/create " << cache_path << ": error " << errno);
 			return;
 		}
 
@@ -86,10 +89,12 @@ struct BlockCache::Impl : public nocopy_nomove
 #elif defined(_WIN32)
 
 	Impl()
+		: m_cachePath(DATA_DIR + cache_name)
+		, m_file(CreateFile(m_cachePath.c_str(), GENERIC_ALL, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_HIDDEN, NULL))
+		, m_map(0)
 	{
-		m_file = CreateFile(cache_name, GENERIC_ALL, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_HIDDEN, NULL);
 		if (m_file == INVALID_HANDLE_VALUE) {
-			LOGERR(1, "couldn't open " << cache_name << ", error " << static_cast<uint32_t>(GetLastError()));
+			LOGERR(1, "couldn't open " << m_cachePath << ": error " << static_cast<uint32_t>(GetLastError()));
 			return;
 		}
 
@@ -140,8 +145,9 @@ struct BlockCache::Impl : public nocopy_nomove
 		}
 	}
 
-	HANDLE m_file = INVALID_HANDLE_VALUE;
-	HANDLE m_map = 0;
+	std::string m_cachePath;
+	HANDLE m_file;
+	HANDLE m_map;
 
 #else
 	// Not implemented on other platforms

src/block_cache.h

@@ -1,6 +1,6 @@
 /*
  * This file is part of the Monero P2Pool <https://github.com/SChernykh/p2pool>
- * Copyright (c) 2021-2023 SChernykh <https://github.com/SChernykh>
+ * Copyright (c) 2021-2024 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-2023 SChernykh <https://github.com/SChernykh>
+ * Copyright (c) 2021-2024 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>
@@ -28,6 +28,7 @@
 #include "side_chain.h"
 #include "pool_block.h"
 #include "params.h"
+#include "merkle.h"
 #include <zmq.hpp>
 #include <ctime>
 #include <numeric>
@@ -50,6 +51,7 @@ BlockTemplate::BlockTemplate(SideChain* sidechain, RandomX_Hasher_Base* hasher)
 	, m_prevId{}
 	, m_height(0)
 	, m_difficulty{}
+	, m_auxDifficulty{}
 	, m_seedHash{}
 	, m_timestamp(0)
 	, m_poolBlockTemplate(new PoolBlock())
@@ -132,15 +134,16 @@ BlockTemplate& BlockTemplate::operator=(const BlockTemplate& b)
 	m_prevId = b.m_prevId;
 	m_height = b.m_height.load();
 	m_difficulty = b.m_difficulty;
+	m_auxDifficulty = b.m_auxDifficulty;
 	m_seedHash = b.m_seedHash;
 	m_timestamp = b.m_timestamp;
 	*m_poolBlockTemplate = *b.m_poolBlockTemplate;
 	m_finalReward = b.m_finalReward.load();
 
-	memcpy(m_minerTxKeccakState, b.m_minerTxKeccakState, sizeof(m_minerTxKeccakState));
+	m_minerTxKeccakState = b.m_minerTxKeccakState;
 	m_minerTxKeccakStateInputLength = b.m_minerTxKeccakStateInputLength;
 
-	memcpy(m_sidechainHashKeccakState, b.m_sidechainHashKeccakState, sizeof(m_sidechainHashKeccakState));
+	m_sidechainHashKeccakState = b.m_sidechainHashKeccakState;
 	m_sidechainHashInputLength = b.m_sidechainHashInputLength;
 
 	m_minerTx.clear();
@@ -283,7 +286,7 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const
 				if (shares) {
 					const MinerShare* src = &s[0];
 					std::pair<hash, hash>* dst = shares;
-					std::pair<hash, hash>* e = shares + N;
+					const std::pair<hash, hash>* e = shares + N;
 
 					for (; dst < e; ++src, ++dst) {
 						const Wallet* w = src->m_wallet;
@@ -321,65 +324,11 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const
 		parallel_run(uv_default_loop_checked(), Precalc(m_shares, m_poolBlockTemplate->m_txkeySec));
 	}
 
-	// Only choose transactions that were received 5 or more seconds ago, or high fee (>= 0.006 XMR) transactions
-	size_t total_mempool_transactions;
-	{
-		m_mempoolTxs.clear();
+	m_poolBlockTemplate->m_merkleTreeData = PoolBlock::encode_merkle_tree_data(static_cast<uint32_t>(data.aux_chains.size() + 1), data.aux_nonce);
+	m_poolBlockTemplate->m_merkleTreeDataSize = 0;
+	writeVarint(m_poolBlockTemplate->m_merkleTreeData, [this](uint8_t) { ++m_poolBlockTemplate->m_merkleTreeDataSize; });
 
-		ReadLock mempool_lock(mempool.m_lock);
-
-		total_mempool_transactions = mempool.m_transactions.size();
-
-		const uint64_t cur_time = seconds_since_epoch();
-
-		for (auto& it : mempool.m_transactions) {
-			if ((cur_time > it.second.time_received + 5) || (it.second.fee >= HIGH_FEE_VALUE)) {
-				m_mempoolTxs.emplace_back(it.second);
-			}
-		}
-	}
-
-	// Safeguard for busy mempool moments
-	// If the block template gets too big, nodes won't be able to send and receive it because of p2p packet size limit
-	// Calculate how many transactions we can take
-	{
-		PoolBlock* b = m_poolBlockTemplate;
-		b->m_transactions.clear();
-		b->m_transactions.resize(1);
-		b->m_outputs.clear();
-
-		// Block template size without coinbase outputs and transactions (minus 2 bytes for output and tx count dummy varints)
-		size_t k = b->serialize_mainchain_data().size() + b->serialize_sidechain_data().size() - 2;
-
-		// Add output and tx count real varints
-		writeVarint(m_shares.size(), [&k](uint8_t) { ++k; });
-		writeVarint(m_mempoolTxs.size(), [&k](uint8_t) { ++k; });
-
-		// Add a rough upper bound estimation of outputs' size. All outputs have <= 5 bytes for each output's reward (< 0.034359738368 XMR per output)
-		k += m_shares.size() * (5 /* reward */ + 1 /* tx_type */ + HASH_SIZE /* stealth address */ + 1 /* viewtag */);
-
-		// >= 0.034359738368 XMR is required for a 6 byte varint, add 1 byte per each potential 6-byte varint
-		{
-			uint64_t r = BASE_BLOCK_REWARD;
-			for (const auto& tx : m_mempoolTxs) {
-				r += tx.fee;
-			}
-			k += r / 34359738368ULL;
-		}
-
-		const size_t max_transactions = (MAX_BLOCK_SIZE > k) ? ((MAX_BLOCK_SIZE - k) / HASH_SIZE) : 0;
-		LOGINFO(6, max_transactions << " transactions can be taken with current block size limit");
-
-		if (max_transactions == 0) {
-			m_mempoolTxs.clear();
-		}
-		else if (m_mempoolTxs.size() > max_transactions) {
-			std::nth_element(m_mempoolTxs.begin(), m_mempoolTxs.begin() + max_transactions, m_mempoolTxs.end());
-			m_mempoolTxs.resize(max_transactions);
-		}
-
-		LOGINFO(4, "mempool has " << total_mempool_transactions << " transactions, taking " << m_mempoolTxs.size() << " transactions from it");
-	}
+	select_mempool_transactions(mempool);
 
 	const uint64_t base_reward = get_base_reward(data.already_generated_coins);
 
@@ -646,11 +595,11 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const
 
 	// Layout: [software id, version, random number, sidechain extra_nonce]
 	uint32_t* sidechain_extra = m_poolBlockTemplate->m_sidechainExtraBuf;
-	sidechain_extra[0] = 0;
+	sidechain_extra[0] = static_cast<uint32_t>(SoftwareID::P2Pool);
 #ifdef P2POOL_SIDECHAIN_EXTRA_1
 	sidechain_extra[1] = P2POOL_SIDECHAIN_EXTRA_1;
 #else
-	sidechain_extra[1] = (P2POOL_VERSION_MAJOR << 16) | P2POOL_VERSION_MINOR;
+	sidechain_extra[1] = P2POOL_VERSION;
 #endif
 	sidechain_extra[2] = static_cast<uint32_t>(m_rng() >> 32);
 	sidechain_extra[3] = 0;
@@ -658,6 +607,12 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const
 	m_poolBlockTemplate->m_nonce = 0;
 	m_poolBlockTemplate->m_extraNonce = 0;
 	m_poolBlockTemplate->m_sidechainId = {};
+	m_poolBlockTemplate->m_merkleRoot = {};
+
+	m_poolBlockTemplate->m_auxChains = data.aux_chains;
+	m_poolBlockTemplate->m_auxNonce = data.aux_nonce;
+
+	init_merge_mining_merkle_proof();
 
 	const std::vector<uint8_t> sidechain_data = m_poolBlockTemplate->serialize_sidechain_data();
 	const std::vector<uint8_t>& consensus_id = m_sidechain->consensus_id();
@@ -667,7 +622,7 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const
 	m_sidechainHashBlob.insert(m_sidechainHashBlob.end(), consensus_id.begin(), consensus_id.end());
 
 	{
-		memset(m_sidechainHashKeccakState, 0, sizeof(m_sidechainHashKeccakState));
+		m_sidechainHashKeccakState = {};
 
 		const size_t extra_nonce_offset = m_sidechainHashBlob.size() - HASH_SIZE - EXTRA_NONCE_SIZE;
 		if (extra_nonce_offset >= KeccakParams::HASH_DATA_AREA) {
@@ -689,13 +644,18 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const
 	LOGINFO(6, "blob size = " << m_fullDataBlob.size());
 
 	m_poolBlockTemplate->m_sidechainId = calc_sidechain_hash(0);
+	{
+		const uint32_t n_aux_chains = static_cast<uint32_t>(m_poolBlockTemplate->m_auxChains.size() + 1);
+		const uint32_t aux_slot = get_aux_slot(m_sidechain->consensus_hash(), m_poolBlockTemplate->m_auxNonce, n_aux_chains);
+		m_poolBlockTemplate->m_merkleRoot = get_root_from_proof(m_poolBlockTemplate->m_sidechainId, m_poolBlockTemplate->m_merkleProof, aux_slot, n_aux_chains);
+	}
 
 	if (pool_block_debug()) {
-		const size_t sidechain_hash_offset = m_extraNonceOffsetInTemplate + m_poolBlockTemplate->m_extraNonceSize + 2;
+		const size_t merkle_root_offset = m_extraNonceOffsetInTemplate + m_poolBlockTemplate->m_extraNonceSize + 2 + m_poolBlockTemplate->m_merkleTreeDataSize;
 
-		memcpy(m_blockTemplateBlob.data() + sidechain_hash_offset, m_poolBlockTemplate->m_sidechainId.h, HASH_SIZE);
-		memcpy(m_fullDataBlob.data() + sidechain_hash_offset, m_poolBlockTemplate->m_sidechainId.h, HASH_SIZE);
-		memcpy(m_minerTx.data() + sidechain_hash_offset - m_minerTxOffsetInTemplate, m_poolBlockTemplate->m_sidechainId.h, HASH_SIZE);
+		memcpy(m_blockTemplateBlob.data() + merkle_root_offset, m_poolBlockTemplate->m_merkleRoot.h, HASH_SIZE);
+		memcpy(m_fullDataBlob.data() + merkle_root_offset, m_poolBlockTemplate->m_merkleRoot.h, HASH_SIZE);
+		memcpy(m_minerTx.data() + merkle_root_offset - m_minerTxOffsetInTemplate, m_poolBlockTemplate->m_merkleRoot.h, HASH_SIZE);
 
 		const std::vector<uint8_t> mainchain_data = m_poolBlockTemplate->serialize_mainchain_data();
 		if (mainchain_data != m_blockTemplateBlob) {
@@ -716,7 +676,7 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const
 		}
 	}
 
-	memset(m_minerTxKeccakState, 0, sizeof(m_minerTxKeccakState));
+	m_minerTxKeccakState = {};
 
 	const size_t extra_nonce_offset = m_extraNonceOffsetInTemplate - m_minerTxOffsetInTemplate;
 	if (extra_nonce_offset >= KeccakParams::HASH_DATA_AREA) {
@@ -836,6 +796,64 @@ void BlockTemplate::fill_optimal_knapsack(const MinerData& data, uint64_t base_r
 }
 #endif
 
+void BlockTemplate::select_mempool_transactions(const Mempool& mempool)
+{
+	// Only choose transactions that were received 5 or more seconds ago, or high fee (>= 0.006 XMR) transactions
+	m_mempoolTxs.clear();
+
+	const uint64_t cur_time = seconds_since_epoch();
+	size_t total_mempool_transactions = 0;
+
+	mempool.iterate([this, cur_time, &total_mempool_transactions](const hash&, const TxMempoolData& tx) {
+		++total_mempool_transactions;
+
+		if ((cur_time > tx.time_received + 5) || (tx.fee >= HIGH_FEE_VALUE)) {
+			m_mempoolTxs.emplace_back(tx);
+		}
+	});
+
+	// Safeguard for busy mempool moments
+	// If the block template gets too big, nodes won't be able to send and receive it because of p2p packet size limit
+	// Calculate how many transactions we can take
+
+	PoolBlock* b = m_poolBlockTemplate;
+	b->m_transactions.clear();
+	b->m_transactions.resize(1);
+	b->m_outputs.clear();
+
+	// Block template size without coinbase outputs and transactions (minus 2 bytes for output and tx count dummy varints)
+	size_t k = b->serialize_mainchain_data().size() + b->serialize_sidechain_data().size() - 2;
+
+	// Add output and tx count real varints
+	writeVarint(m_shares.size(), [&k](uint8_t) { ++k; });
+	writeVarint(m_mempoolTxs.size(), [&k](uint8_t) { ++k; });
+
+	// Add a rough upper bound estimation of outputs' size. All outputs have <= 5 bytes for each output's reward (< 0.034359738368 XMR per output)
+	k += m_shares.size() * (5 /* reward */ + 1 /* tx_type */ + HASH_SIZE /* stealth address */ + 1 /* viewtag */);
+
+	// >= 0.034359738368 XMR is required for a 6 byte varint, add 1 byte per each potential 6-byte varint
+	{
+		uint64_t r = BASE_BLOCK_REWARD;
+		for (const auto& tx : m_mempoolTxs) {
+			r += tx.fee;
+		}
+		k += r / 34359738368ULL;
+	}
+
+	const size_t max_transactions = (MAX_BLOCK_SIZE > k) ? ((MAX_BLOCK_SIZE - k) / HASH_SIZE) : 0;
+	LOGINFO(6, max_transactions << " transactions can be taken with current block size limit");
+
+	if (max_transactions == 0) {
+		m_mempoolTxs.clear();
+	}
+	else if (m_mempoolTxs.size() > max_transactions) {
+		std::nth_element(m_mempoolTxs.begin(), m_mempoolTxs.begin() + max_transactions, m_mempoolTxs.end());
+		m_mempoolTxs.resize(max_transactions);
+	}
+
+	LOGINFO(4, "mempool has " << total_mempool_transactions << " transactions, taking " << m_mempoolTxs.size() << " transactions from it");
+}
+
 int BlockTemplate::create_miner_tx(const MinerData& data, const std::vector<MinerShare>& shares, uint64_t max_reward_amounts_weight, bool dry_run)
 {
 	// Miner transaction (coinbase)
@@ -931,7 +949,9 @@ int BlockTemplate::create_miner_tx(const MinerData& data, const std::vector<Mine
 	m_poolBlockTemplate->m_extraNonceSize = corrected_extra_nonce_size;
 
 	m_minerTxExtra.push_back(TX_EXTRA_MERGE_MINING_TAG);
-	writeVarint(HASH_SIZE, m_minerTxExtra);
+
+	m_minerTxExtra.push_back(static_cast<uint8_t>(m_poolBlockTemplate->m_merkleTreeDataSize + HASH_SIZE));
+	writeVarint(m_poolBlockTemplate->m_merkleTreeData, m_minerTxExtra);
 	m_minerTxExtra.insert(m_minerTxExtra.end(), HASH_SIZE, 0);
 	// TX_EXTRA end
 
@@ -986,15 +1006,14 @@ hash BlockTemplate::calc_sidechain_hash(uint32_t sidechain_extra_nonce) const
 		memcpy(buf, m_sidechainHashBlob.data() + N, size - N);
 		memcpy(buf + sidechain_extra_nonce_offset - N, sidechain_extra_nonce_buf, EXTRA_NONCE_SIZE);
 
-		uint64_t st[25];
-		memcpy(st, m_sidechainHashKeccakState, sizeof(st));
+		std::array<uint64_t, 25> st = m_sidechainHashKeccakState;
 		keccak_finish(buf, inlen, st);
 
-		if (pool_block_debug() && (memcmp(st, result.h, HASH_SIZE) != 0)) {
+		if (pool_block_debug() && (memcmp(st.data(), result.h, HASH_SIZE) != 0)) {
 			LOGERR(1, "calc_sidechain_hash fast path is broken. Fix the code!");
 		}
 
-		memcpy(result.h, st, HASH_SIZE);
+		memcpy(result.h, st.data(), HASH_SIZE);
 	}
 
 	return result;
@@ -1015,9 +1034,16 @@ hash BlockTemplate::calc_miner_tx_hash(uint32_t extra_nonce) const
 		static_cast<uint8_t>(extra_nonce >> 24)
 	};
 
-	// Calculate sidechain id with this extra_nonce
-	const hash sidechain_id = calc_sidechain_hash(extra_nonce);
-	const size_t sidechain_hash_offset = extra_nonce_offset + m_poolBlockTemplate->m_extraNonceSize + 2;
+	// Calculate sidechain id and merge mining root hash with this extra_nonce
+	hash merge_mining_root;
+	{
+		const hash sidechain_id = calc_sidechain_hash(extra_nonce);
+		const uint32_t n_aux_chains = static_cast<uint32_t>(m_poolBlockTemplate->m_auxChains.size() + 1);
+		const uint32_t aux_slot = get_aux_slot(m_sidechain->consensus_hash(), m_poolBlockTemplate->m_auxNonce, n_aux_chains);
+		merge_mining_root = get_root_from_proof(sidechain_id, m_poolBlockTemplate->m_merkleProof, aux_slot, n_aux_chains);
+	}
+
+	const size_t merkle_root_offset = extra_nonce_offset + m_poolBlockTemplate->m_extraNonceSize + 2 + m_poolBlockTemplate->m_merkleTreeDataSize;
 
 	// 1. Prefix (everything except vin_rct_type byte in the end)
 	// Apply extra_nonce in-place because we can't write to the block template here
@@ -1032,15 +1058,15 @@ hash BlockTemplate::calc_miner_tx_hash(uint32_t extra_nonce) const
 	// Slow path: O(N)
 	if (!b || pool_block_debug())
 	{
-		keccak_custom([data, extra_nonce_offset, &extra_nonce_buf, sidechain_hash_offset, &sidechain_id](int offset) {
+		keccak_custom([data, extra_nonce_offset, &extra_nonce_buf, merkle_root_offset, &merge_mining_root](int offset) {
 			uint32_t k = static_cast<uint32_t>(offset - static_cast<int>(extra_nonce_offset));
 			if (k < EXTRA_NONCE_SIZE) {
 				return extra_nonce_buf[k];
 			}
 
-			k = static_cast<uint32_t>(offset - static_cast<int>(sidechain_hash_offset));
+			k = static_cast<uint32_t>(offset - static_cast<int>(merkle_root_offset));
 			if (k < HASH_SIZE) {
-				return sidechain_id.h[k];
+				return merge_mining_root.h[k];
 			}
 
 			return data[offset];
@@ -1054,17 +1080,16 @@ hash BlockTemplate::calc_miner_tx_hash(uint32_t extra_nonce) const
 
 		memcpy(tx_buf, data + N, inlen);
 		memcpy(tx_buf + extra_nonce_offset - N, extra_nonce_buf, EXTRA_NONCE_SIZE);
-		memcpy(tx_buf + sidechain_hash_offset - N, sidechain_id.h, HASH_SIZE);
+		memcpy(tx_buf + merkle_root_offset - N, merge_mining_root.h, HASH_SIZE);
 
-		uint64_t st[25];
-		memcpy(st, m_minerTxKeccakState, sizeof(st));
+		std::array<uint64_t, 25> st = m_minerTxKeccakState;
 		keccak_finish(tx_buf, inlen, st);
 
-		if (pool_block_debug() && (memcmp(st, full_hash.h, HASH_SIZE) != 0)) {
+		if (pool_block_debug() && (memcmp(st.data(), full_hash.h, HASH_SIZE) != 0)) {
 			LOGERR(1, "calc_miner_tx_hash fast path is broken. Fix the code!");
 		}
 
-		memcpy(hashes, st, HASH_SIZE);
+		memcpy(hashes, st.data(), HASH_SIZE);
 	}
 
 	// 2. Base RCT, single 0 byte in miner tx
@@ -1132,7 +1157,7 @@ void BlockTemplate::calc_merkle_tree_main_branch()
 	}
 }
 
-bool BlockTemplate::get_difficulties(const uint32_t template_id, uint64_t& height, uint64_t& sidechain_height, difficulty_type& mainchain_difficulty, difficulty_type& sidechain_difficulty) const
+bool BlockTemplate::get_difficulties(const uint32_t template_id, uint64_t& height, uint64_t& sidechain_height, difficulty_type& mainchain_difficulty, difficulty_type& aux_diff, difficulty_type& sidechain_difficulty) const
 {
 	ReadLock lock(m_lock);
 
@@ -1140,6 +1165,7 @@ bool BlockTemplate::get_difficulties(const uint32_t template_id, uint64_t& heigh
 		height = m_height;
 		sidechain_height = m_poolBlockTemplate->m_sidechainHeight;
 		mainchain_difficulty = m_difficulty;
+		aux_diff = m_auxDifficulty;
 		sidechain_difficulty = m_poolBlockTemplate->m_difficulty;
 		return true;
 	}
@@ -1147,19 +1173,20 @@ bool BlockTemplate::get_difficulties(const uint32_t template_id, uint64_t& heigh
 	const BlockTemplate* old = m_oldTemplates[template_id % array_size(&BlockTemplate::m_oldTemplates)];
 
 	if (old && (template_id == old->m_templateId)) {
-		return old->get_difficulties(template_id, height, sidechain_height, mainchain_difficulty, sidechain_difficulty);
+		return old->get_difficulties(template_id, height, sidechain_height, mainchain_difficulty, aux_diff, sidechain_difficulty);
 	}
 
 	return false;
 }
 
-uint32_t BlockTemplate::get_hashing_blob(const uint32_t template_id, uint32_t extra_nonce, uint8_t (&blob)[128], uint64_t& height, difficulty_type& difficulty, difficulty_type& sidechain_difficulty, hash& seed_hash, size_t& nonce_offset) const
+uint32_t BlockTemplate::get_hashing_blob(const uint32_t template_id, uint32_t extra_nonce, uint8_t (&blob)[128], uint64_t& height, difficulty_type& difficulty, difficulty_type& aux_diff, difficulty_type& sidechain_difficulty, hash& seed_hash, size_t& nonce_offset) const
 {
 	ReadLock lock(m_lock);
 
 	if (template_id == m_templateId) {
 		height = m_height;
 		difficulty = m_difficulty;
+		aux_diff = m_auxDifficulty;
 		sidechain_difficulty = m_poolBlockTemplate->m_difficulty;
 		seed_hash = m_seedHash;
 		nonce_offset = m_nonceOffset;
@@ -1170,19 +1197,20 @@ uint32_t BlockTemplate::get_hashing_blob(const uint32_t template_id, uint32_t ex
 	const BlockTemplate* old = m_oldTemplates[template_id % array_size(&BlockTemplate::m_oldTemplates)];
 
 	if (old && (template_id == old->m_templateId)) {
-		return old->get_hashing_blob(template_id, extra_nonce, blob, height, difficulty, sidechain_difficulty, seed_hash, nonce_offset);
+		return old->get_hashing_blob(template_id, extra_nonce, blob, height, difficulty, aux_diff, sidechain_difficulty, seed_hash, nonce_offset);
 	}
 
 	return 0;
 }
 
-uint32_t BlockTemplate::get_hashing_blob(uint32_t extra_nonce, uint8_t (&blob)[128], uint64_t& height, uint64_t& sidechain_height, difficulty_type& difficulty, difficulty_type& sidechain_difficulty, hash& seed_hash, size_t& nonce_offset, uint32_t& template_id) const
+uint32_t BlockTemplate::get_hashing_blob(uint32_t extra_nonce, uint8_t (&blob)[128], uint64_t& height, uint64_t& sidechain_height, difficulty_type& difficulty, difficulty_type& aux_diff, difficulty_type& sidechain_difficulty, hash& seed_hash, size_t& nonce_offset, uint32_t& template_id) const
 {
 	ReadLock lock(m_lock);
 
 	height = m_height;
 	sidechain_height = m_poolBlockTemplate->m_sidechainHeight;
 	difficulty = m_difficulty;
+	aux_diff = m_auxDifficulty;
 	sidechain_difficulty = m_poolBlockTemplate->m_difficulty;
 	seed_hash = m_seedHash;
 	nonce_offset = m_nonceOffset;
@@ -1220,7 +1248,7 @@ uint32_t BlockTemplate::get_hashing_blob_nolock(uint32_t extra_nonce, uint8_t* b
 	return static_cast<uint32_t>(p - blob);
 }
 
-uint32_t BlockTemplate::get_hashing_blobs(uint32_t extra_nonce_start, uint32_t count, std::vector<uint8_t>& blobs, uint64_t& height, difficulty_type& difficulty, difficulty_type& sidechain_difficulty, hash& seed_hash, size_t& nonce_offset, uint32_t& template_id) const
+uint32_t BlockTemplate::get_hashing_blobs(uint32_t extra_nonce_start, uint32_t count, std::vector<uint8_t>& blobs, uint64_t& height, difficulty_type& difficulty, difficulty_type& aux_diff, difficulty_type& sidechain_difficulty, hash& seed_hash, size_t& nonce_offset, uint32_t& template_id) const
 {
 	blobs.clear();
 
@@ -1229,75 +1257,168 @@ uint32_t BlockTemplate::get_hashing_blobs(uint32_t extra_nonce_start, uint32_t c
 		blobs.reserve(required_capacity * 2);
 	}
 
-	uint32_t blob_size = 0;
-
 	ReadLock lock(m_lock);
 
 	height = m_height;
 	difficulty = m_difficulty;
+	aux_diff = m_auxDifficulty;
 	sidechain_difficulty = m_poolBlockTemplate->m_difficulty;
 	seed_hash = m_seedHash;
 	nonce_offset = m_nonceOffset;
 	template_id = m_templateId;
 
-	for (uint32_t i = 0; i < count; ++i) {
-		uint8_t blob[128];
-		uint32_t n = get_hashing_blob_nolock(extra_nonce_start + i, blob);
+	constexpr size_t MIN_BLOB_SIZE = 76;
+	constexpr size_t MAX_BLOB_SIZE = 128;
 
-		if (n > sizeof(blob)) {
-			LOGERR(1, "internal error: get_hashing_blob_nolock returned too large blob size " << n << ", expected <= " << sizeof(blob));
-			n = sizeof(blob);
-		}
-		else if (n < 76) {
-			LOGERR(1, "internal error: get_hashing_blob_nolock returned too little blob size " << n << ", expected >= 76");
-		}
+	blobs.resize(MAX_BLOB_SIZE);
+	const uint32_t blob_size = get_hashing_blob_nolock(extra_nonce_start, blobs.data());
 
-		if (blob_size == 0) {
-			blob_size = n;
-		}
-		else if (n != blob_size) {
-			LOGERR(1, "internal error: get_hashing_blob_nolock returned different blob size " << n << ", expected " << blob_size);
-		}
-		blobs.insert(blobs.end(), blob, blob + blob_size);
+	if (blob_size > MAX_BLOB_SIZE) {
+		LOGERR(1, "internal error: get_hashing_blob_nolock returned too large blob size " << blob_size << ", expected <= " << MAX_BLOB_SIZE);
+		PANIC_STOP();
+	}
+	else if (blob_size < MIN_BLOB_SIZE) {
+		LOGERR(1, "internal error: get_hashing_blob_nolock returned too little blob size " << blob_size << ", expected >= " << MIN_BLOB_SIZE);
+	}
+
+	blobs.resize(static_cast<size_t>(blob_size) * count);
+
+	if (count > 1) {
+		uint8_t* blobs_data = blobs.data();
+
+		std::atomic<uint32_t> counter = 1;
+
+		parallel_run(uv_default_loop_checked(), [this, blob_size, extra_nonce_start, count, &counter, blobs_data]() {
+			for (;;) {
+				const uint32_t i = counter.fetch_add(1);
+				if (i >= count) {
+					return;
+				}
+
+				const uint32_t n = get_hashing_blob_nolock(extra_nonce_start + i, blobs_data + static_cast<size_t>(i) * blob_size);
+				if (n != blob_size) {
+					LOGERR(1, "internal error: get_hashing_blob_nolock returned different blob size " << n << ", expected " << blob_size);
+				}
+			}
+		}, true);
 	}
 
 	return blob_size;
 }
 
-std::vector<uint8_t> BlockTemplate::get_block_template_blob(uint32_t template_id, uint32_t sidechain_extra_nonce, size_t& nonce_offset, size_t& extra_nonce_offset, size_t& sidechain_id_offset, hash& sidechain_id) const
+std::vector<AuxChainData> BlockTemplate::get_aux_chains(const uint32_t template_id) const
 {
 	ReadLock lock(m_lock);
 
 	if (template_id != m_templateId) {
 		const BlockTemplate* old = m_oldTemplates[template_id % array_size(&BlockTemplate::m_oldTemplates)];
 		if (old && (template_id == old->m_templateId)) {
-			return old->get_block_template_blob(template_id, sidechain_extra_nonce, nonce_offset, extra_nonce_offset, sidechain_id_offset, sidechain_id);
+			return old->get_aux_chains(template_id);
+		}
+
+		return {};
+	}
+
+	return m_poolBlockTemplate->m_auxChains;
+}
+
+bool BlockTemplate::get_aux_proof(const uint32_t template_id, uint32_t extra_nonce, const hash& h, std::vector<hash>& proof, uint32_t& path) const
+{
+	ReadLock lock(m_lock);
+
+	if (template_id != m_templateId) {
+		const BlockTemplate* old = m_oldTemplates[template_id % array_size(&BlockTemplate::m_oldTemplates)];
+		if (old && (template_id == old->m_templateId)) {
+			return old->get_aux_proof(template_id, extra_nonce, h, proof, path);
+		}
+
+		return false;
+	}
+
+	bool found = false;
+
+	const hash sidechain_id = calc_sidechain_hash(extra_nonce);
+	const uint32_t n_aux_chains = static_cast<uint32_t>(m_poolBlockTemplate->m_auxChains.size() + 1);
+
+	std::vector<hash> hashes(n_aux_chains);
+
+	for (const AuxChainData& aux_data : m_poolBlockTemplate->m_auxChains) {
+		const uint32_t aux_slot = get_aux_slot(aux_data.unique_id, m_poolBlockTemplate->m_auxNonce, n_aux_chains);
+		hashes[aux_slot] = aux_data.data;
+
+		if (aux_data.data == h) {
+			found = true;
+		}
+	}
+
+	const uint32_t aux_slot = get_aux_slot(m_sidechain->consensus_hash(), m_poolBlockTemplate->m_auxNonce, n_aux_chains);
+	hashes[aux_slot] = sidechain_id;
+
+	if (sidechain_id == h) {
+		found = true;
+	}
+
+	if (!found) {
+		return false;
+	}
+
+	std::vector<std::vector<hash>> tree;
+	merkle_hash_full_tree(hashes, tree);
+
+	return get_merkle_proof(tree, h, proof, path);
+}
+
+std::vector<uint8_t> BlockTemplate::get_block_template_blob(uint32_t template_id, uint32_t sidechain_extra_nonce, size_t& nonce_offset, size_t& extra_nonce_offset, size_t& merkle_root_offset, hash& merge_mining_root, const BlockTemplate** pThis) const
+{
+	ReadLock lock(m_lock);
+
+	if (template_id != m_templateId) {
+		const BlockTemplate* old = m_oldTemplates[template_id % array_size(&BlockTemplate::m_oldTemplates)];
+		if (old && (template_id == old->m_templateId)) {
+			return old->get_block_template_blob(template_id, sidechain_extra_nonce, nonce_offset, extra_nonce_offset, merkle_root_offset, merge_mining_root, pThis);
 		}
 
 		nonce_offset = 0;
 		extra_nonce_offset = 0;
-		sidechain_id_offset = 0;
-		sidechain_id = {};
+		merkle_root_offset = 0;
+		merge_mining_root = {};
 		return std::vector<uint8_t>();
 	}
 
 	nonce_offset = m_nonceOffset;
 	extra_nonce_offset = m_extraNonceOffsetInTemplate;
-	sidechain_id_offset = m_extraNonceOffsetInTemplate + m_poolBlockTemplate->m_extraNonceSize + 2;
-	sidechain_id = calc_sidechain_hash(sidechain_extra_nonce);
+
+	const hash sidechain_id = calc_sidechain_hash(sidechain_extra_nonce);
+	const uint32_t n_aux_chains = static_cast<uint32_t>(m_poolBlockTemplate->m_auxChains.size() + 1);
+	const uint32_t aux_slot = get_aux_slot(m_sidechain->consensus_hash(), m_poolBlockTemplate->m_auxNonce, n_aux_chains);
+	merge_mining_root = get_root_from_proof(sidechain_id, m_poolBlockTemplate->m_merkleProof, aux_slot, n_aux_chains);
+
+	merkle_root_offset = m_extraNonceOffsetInTemplate + m_poolBlockTemplate->m_extraNonceSize + 2 + m_poolBlockTemplate->m_merkleTreeDataSize;
+
+	*pThis = this;
+
 	return m_blockTemplateBlob;
 }
 
 bool BlockTemplate::submit_sidechain_block(uint32_t template_id, uint32_t nonce, uint32_t extra_nonce)
 {
+	const uint64_t received_timestamp = microseconds_since_epoch();
+
 	WriteLock lock(m_lock);
 
 	if (template_id == m_templateId) {
+		m_poolBlockTemplate->m_receivedTimestamp = received_timestamp;
+
 		m_poolBlockTemplate->m_nonce = nonce;
 		m_poolBlockTemplate->m_extraNonce = extra_nonce;
 		m_poolBlockTemplate->m_sidechainId = calc_sidechain_hash(extra_nonce);
 		m_poolBlockTemplate->m_sidechainExtraBuf[3] = extra_nonce;
 
+		const uint32_t n_aux_chains = static_cast<uint32_t>(m_poolBlockTemplate->m_auxChains.size() + 1);
+		const uint32_t aux_slot = get_aux_slot(m_sidechain->consensus_hash(), m_poolBlockTemplate->m_auxNonce, n_aux_chains);
+
+		m_poolBlockTemplate->m_merkleRoot = get_root_from_proof(m_poolBlockTemplate->m_sidechainId, m_poolBlockTemplate->m_merkleProof, aux_slot, n_aux_chains);
+
 		if (pool_block_debug()) {
 			std::vector<uint8_t> buf = m_poolBlockTemplate->serialize_mainchain_data();
 			const std::vector<uint8_t> sidechain_data = m_poolBlockTemplate->serialize_sidechain_data();
@@ -1349,4 +1470,45 @@ bool BlockTemplate::submit_sidechain_block(uint32_t template_id, uint32_t nonce,
 	return false;
 }
 
+void BlockTemplate::init_merge_mining_merkle_proof()
+{
+	const uint32_t n_aux_chains = static_cast<uint32_t>(m_poolBlockTemplate->m_auxChains.size() + 1);
+
+	m_poolBlockTemplate->m_merkleProof.clear();
+	m_auxDifficulty = diff_max;
+
+	if (n_aux_chains == 1) {
+		return;
+	}
+
+	std::vector<hash> hashes(n_aux_chains);
+	std::vector<bool> used(n_aux_chains);
+
+	for (const AuxChainData& aux_data : m_poolBlockTemplate->m_auxChains) {
+		const uint32_t aux_slot = get_aux_slot(aux_data.unique_id, m_poolBlockTemplate->m_auxNonce, n_aux_chains);
+		hashes[aux_slot] = aux_data.data;
+		used[aux_slot] = true;
+
+		if (aux_data.difficulty < m_auxDifficulty) {
+			m_auxDifficulty = aux_data.difficulty;
+		}
+	}
+
+	const uint32_t aux_slot = get_aux_slot(m_sidechain->consensus_hash(), m_poolBlockTemplate->m_auxNonce, n_aux_chains);
+	hashes[aux_slot] = m_poolBlockTemplate->m_sidechainId;
+	used[aux_slot] = true;
+
+	for (bool b : used) {
+		if (!b) {
+			LOGERR(1, "aux nonce is invalid. Fix the code!");
+			break;
+		}
+	}
+
+	std::vector<std::vector<hash>> tree;
+	merkle_hash_full_tree(hashes, tree);
+
+	get_merkle_proof(tree, m_poolBlockTemplate->m_sidechainId, m_poolBlockTemplate->m_merkleProof, m_poolBlockTemplate->m_merkleProofPath);
+}
+
 } // namespace p2pool

src/block_template.h

@@ -1,6 +1,6 @@
 /*
  * This file is part of the Monero P2Pool <https://github.com/SChernykh/p2pool>
- * Copyright (c) 2021-2023 SChernykh <https://github.com/SChernykh>
+ * Copyright (c) 2021-2024 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
@@ -42,13 +42,16 @@ public:
 	void update(const MinerData& data, const Mempool& mempool, const Wallet* miner_wallet);
 	uint64_t last_updated() const { return m_lastUpdated.load(); }
 
-	bool get_difficulties(const uint32_t template_id, uint64_t& height, uint64_t& sidechain_height, difficulty_type& mainchain_difficulty, difficulty_type& sidechain_difficulty) const;
-	uint32_t get_hashing_blob(const uint32_t template_id, uint32_t extra_nonce, uint8_t (&blob)[128], uint64_t& height, difficulty_type& difficulty, difficulty_type& sidechain_difficulty, hash& seed_hash, size_t& nonce_offset) const;
+	bool get_difficulties(const uint32_t template_id, uint64_t& height, uint64_t& sidechain_height, difficulty_type& mainchain_difficulty, difficulty_type& aux_diff, difficulty_type& sidechain_difficulty) const;
+	uint32_t get_hashing_blob(const uint32_t template_id, uint32_t extra_nonce, uint8_t (&blob)[128], uint64_t& height, difficulty_type& difficulty, difficulty_type& aux_diff, difficulty_type& sidechain_difficulty, hash& seed_hash, size_t& nonce_offset) const;
 
-	uint32_t get_hashing_blob(uint32_t extra_nonce, uint8_t (&blob)[128], uint64_t& height, uint64_t& sidechain_height, difficulty_type& difficulty, difficulty_type& sidechain_difficulty, hash& seed_hash, size_t& nonce_offset, uint32_t& template_id) const;
-	uint32_t get_hashing_blobs(uint32_t extra_nonce_start, uint32_t count, std::vector<uint8_t>& blobs, uint64_t& height, difficulty_type& difficulty, difficulty_type& sidechain_difficulty, hash& seed_hash, size_t& nonce_offset, uint32_t& template_id) const;
+	uint32_t get_hashing_blob(uint32_t extra_nonce, uint8_t (&blob)[128], uint64_t& height, uint64_t& sidechain_height, difficulty_type& difficulty, difficulty_type& aux_diff, difficulty_type& sidechain_difficulty, hash& seed_hash, size_t& nonce_offset, uint32_t& template_id) const;
+	uint32_t get_hashing_blobs(uint32_t extra_nonce_start, uint32_t count, std::vector<uint8_t>& blobs, uint64_t& height, difficulty_type& difficulty, difficulty_type& aux_diff, difficulty_type& sidechain_difficulty, hash& seed_hash, size_t& nonce_offset, uint32_t& template_id) const;
 
-	std::vector<uint8_t> get_block_template_blob(uint32_t template_id, uint32_t sidechain_extra_nonce, size_t& nonce_offset, size_t& extra_nonce_offset, size_t& sidechain_id_offset, hash& sidechain_id) const;
+	std::vector<AuxChainData> get_aux_chains(const uint32_t template_id) const;
+	bool get_aux_proof(const uint32_t template_id, uint32_t extra_nonce, const hash& h, std::vector<hash>& proof, uint32_t& path) const;
+
+	std::vector<uint8_t> get_block_template_blob(uint32_t template_id, uint32_t sidechain_extra_nonce, size_t& nonce_offset, size_t& extra_nonce_offset, size_t& merkle_root_offset, hash& merge_mining_root, const BlockTemplate** pThis) const;
 
 	FORCEINLINE uint64_t height() const { return m_height; }
 	FORCEINLINE difficulty_type difficulty() const { return m_difficulty; }
@@ -58,6 +61,8 @@ public:
 	FORCEINLINE const std::vector<MinerShare>& shares() const { return m_shares; }
 	FORCEINLINE uint64_t get_reward() const { return m_finalReward; }
 
+	FORCEINLINE std::vector<uint8_t> get_coinbase_merkle_proof() const { ReadLock lock(m_lock); return m_merkleTreeMainBranch; }
+
 #ifdef P2POOL_UNIT_TESTS
 	FORCEINLINE const PoolBlock* pool_block_template() const { return m_poolBlockTemplate; }
 	FORCEINLINE std::mt19937_64& rng() { return m_rng; }
@@ -68,6 +73,7 @@ private:
 	RandomX_Hasher_Base* m_hasher;
 
 private:
+	void select_mempool_transactions(const Mempool& mempool);
 	int create_miner_tx(const MinerData& data, const std::vector<MinerShare>& shares, uint64_t max_reward_amounts_weight, bool dry_run);
 	hash calc_sidechain_hash(uint32_t sidechain_extra_nonce) const;
 	hash calc_miner_tx_hash(uint32_t extra_nonce) const;
@@ -94,6 +100,7 @@ private:
 	hash m_prevId;
 	std::atomic<uint64_t> m_height;
 	difficulty_type m_difficulty;
+	difficulty_type m_auxDifficulty;
 	hash m_seedHash;
 
 	uint64_t m_timestamp;
@@ -106,11 +113,11 @@ private:
 
 	// Temp vectors, will be cleaned up after use and skipped in copy constructor/assignment operators
 	std::vector<uint8_t> m_minerTx;
-	uint64_t m_minerTxKeccakState[25];
+	std::array<uint64_t, 25> m_minerTxKeccakState;
 	size_t m_minerTxKeccakStateInputLength;
 
 	std::vector<uint8_t> m_sidechainHashBlob;
-	uint64_t m_sidechainHashKeccakState[25];
+	std::array<uint64_t, 25> m_sidechainHashKeccakState;
 	size_t m_sidechainHashInputLength;
 
 	std::vector<uint8_t> m_blockHeader;
@@ -132,6 +139,8 @@ private:
 
 	std::vector<uint32_t> m_knapsack;
 #endif
+
+	void init_merge_mining_merkle_proof();
 };
 
 } // namespace p2pool

src/common.h

@@ -1,6 +1,6 @@
 /*
  * This file is part of the Monero P2Pool <https://github.com/SChernykh/p2pool>
- * Copyright (c) 2021-2023 SChernykh <https://github.com/SChernykh>
+ * Copyright (c) 2021-2024 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
@@ -19,7 +19,7 @@
 
 #ifdef _MSC_VER
 
-#pragma warning(disable : 4005 4061 4324 4365 4464 4619 4625 4626 4668 4710 4711 4804 4820 5039 5045 5220 5246 5264)
+#pragma warning(disable : 4005 4061 4324 4365 4464 4619 4625 4626 4668 4710 4711 4714 4804 4820 5039 5045 5220 5246 5264)
 #define FORCEINLINE __forceinline
 #define NOINLINE __declspec(noinline)
 #define LIKELY(expression) expression
@@ -52,6 +52,7 @@
 
 #include <array>
 #include <vector>
+#include <deque>
 #include <string>
 #include <algorithm>
 #include <atomic>
@@ -92,7 +93,7 @@
   #define __has_feature(x) 0
 #endif
 
-#if defined(_DEBUG) || defined(__SANITIZE_ADDRESS__) || __has_feature(address_sanitizer) || defined(__SANITIZE_THREAD__) || __has_feature(thread_sanitizer)
+#if defined(_DEBUG) || defined(DEV_DEBUG) || defined(__SANITIZE_ADDRESS__) || __has_feature(address_sanitizer) || defined(__SANITIZE_THREAD__) || __has_feature(thread_sanitizer)
 #define P2POOL_DEBUGGING 1
 #endif
 
@@ -190,6 +191,10 @@ struct alignas(uint64_t) hash
 		return (a[0] == 0) && (a[1] == 0) && (a[2] == 0) && (a[3] == 0);
 	}
 
+	FORCEINLINE void clear() {
+		memset(h, 0, HASH_SIZE);
+	}
+
 	FORCEINLINE uint64_t* u64() { return reinterpret_cast<uint64_t*>(h); }
 	FORCEINLINE const uint64_t* u64() const { return reinterpret_cast<const uint64_t*>(h); }
 
@@ -197,8 +202,16 @@ struct alignas(uint64_t) hash
 	friend std::istream& operator>>(std::istream& s, hash& d);
 };
 
+struct root_hash : public hash
+{
+	FORCEINLINE root_hash() : hash() {}
+	explicit FORCEINLINE root_hash(const hash& h) : hash(h) {}
+};
+
 static_assert(sizeof(hash) == HASH_SIZE, "struct hash has invalid size, check your compiler options");
+static_assert(sizeof(root_hash) == HASH_SIZE, "struct root_hash has invalid size, check your compiler options");
 static_assert(std::is_standard_layout<hash>::value, "struct hash is not a POD, check your compiler options");
+static_assert(std::is_standard_layout<root_hash>::value, "struct root_hash is not a POD, check your compiler options");
 
 struct
 #ifdef __GNUC__
@@ -206,8 +219,9 @@ struct
 #endif
 	difficulty_type
 {
-	FORCEINLINE constexpr difficulty_type() : lo(0), hi(0) {}
-	FORCEINLINE constexpr difficulty_type(uint64_t a, uint64_t b) : lo(a), hi(b) {}
+	FORCEINLINE          constexpr difficulty_type() noexcept : lo(0), hi(0) {}
+	FORCEINLINE explicit constexpr difficulty_type(uint64_t a) noexcept : lo(a), hi(0) {}
+	FORCEINLINE          constexpr difficulty_type(uint64_t a, uint64_t b) noexcept : lo(a), hi(b) {}
 
 	uint64_t lo;
 	uint64_t hi;
@@ -379,6 +393,19 @@ struct TxMempoolData
 	uint64_t time_received;
 };
 
+struct AuxChainData
+{
+	FORCEINLINE AuxChainData(const hash& _id, const hash& _data, const difficulty_type& _difficulty) : unique_id(_id), data(_data), difficulty(_difficulty) {}
+
+	FORCEINLINE bool operator==(const AuxChainData& rhs) const {
+		return (unique_id == rhs.unique_id) && (data == rhs.data) && (difficulty == rhs.difficulty);
+	}
+
+	hash unique_id;
+	hash data;
+	difficulty_type difficulty;
+};
+
 struct MinerData
 {
 	FORCEINLINE MinerData()
@@ -390,6 +417,7 @@ struct MinerData
 		, median_weight(0)
 		, already_generated_coins(0)
 		, median_timestamp(0)
+		, aux_nonce(0)
 	{}
 
 	uint8_t major_version;
@@ -402,6 +430,9 @@ struct MinerData
 	uint64_t median_timestamp;
 	std::vector<TxMempoolData> tx_backlog;
 
+	std::vector<AuxChainData> aux_chains;
+	uint32_t aux_nonce;
+
 	std::chrono::high_resolution_clock::time_point time_received;
 };
 

src/console_commands.cpp

@@ -1,6 +1,6 @@
 /*
  * This file is part of the Monero P2Pool <https://github.com/SChernykh/p2pool>
- * Copyright (c) 2021-2023 SChernykh <https://github.com/SChernykh>
+ * Copyright (c) 2021-2024 SChernykh <https://github.com/SChernykh>
  * Copyright (c) 2021 hyc <https://github.com/hyc>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -35,7 +35,7 @@ static constexpr int DEFAULT_BACKLOG = 1;
 namespace p2pool {
 
 ConsoleCommands::ConsoleCommands(p2pool* pool)
-	: TCPServer(DEFAULT_BACKLOG, ConsoleClient::allocate)
+	: TCPServer(DEFAULT_BACKLOG, ConsoleClient::allocate, std::string())
 	, m_pool(pool)
 	, m_tty{}
 	, m_stdin_pipe{}
@@ -126,11 +126,6 @@ ConsoleCommands::ConsoleCommands(p2pool* pool)
 	m_loopThreadCreated = true;
 }
 
-ConsoleCommands::~ConsoleCommands()
-{
-	shutdown_tcp();
-}
-
 void ConsoleCommands::on_shutdown()
 {
 	if (m_stdin_handle) {
@@ -202,13 +197,23 @@ static void do_status(p2pool *m_pool, const char * /* args */)
 	if (m_pool->stratum_server()) {
 		m_pool->stratum_server()->print_status();
 	}
-	if (m_pool->p2p_server()) {
-		m_pool->p2p_server()->print_status();
+
+	P2PServer* p2p = m_pool->p2p_server();
+	if (p2p) {
+		p2p->print_status();
 	}
+
 #ifdef WITH_RANDOMX
 	m_pool->print_miner_status();
 #endif
-	bkg_jobs_tracker.print_status();
+
+	m_pool->print_merge_mining_status();
+
+	bkg_jobs_tracker->print_status();
+
+	if (p2p) {
+		p2p->check_for_updates(true);
+	}
 }
 
 static void do_loglevel(p2pool * /* m_pool */, const char *args)
@@ -308,13 +313,19 @@ static void do_stop_mining(p2pool* m_pool, const char* /*args*/)
 
 static void do_exit(p2pool *m_pool, const char * /* args */)
 {
-	bkg_jobs_tracker.wait();
+	bkg_jobs_tracker->wait();
 	m_pool->stop();
 }
 
-static void do_version(p2pool* /* m_pool */, const char* /* args */)
+// cppcheck-suppress constParameterCallback
+static void do_version(p2pool* m_pool, const char* /* args */)
 {
 	LOGINFO(0, log::LightCyan() << VERSION);
+
+	const P2PServer* p2p = m_pool->p2p_server();
+	if (p2p) {
+		p2p->check_for_updates(true);
+	}
 }
 
 void ConsoleCommands::allocCallback(uv_handle_t* handle, size_t /*suggested_size*/, uv_buf_t* buf)
@@ -347,7 +358,7 @@ void ConsoleCommands::stdinReadCallback(uv_stream_t* stream, ssize_t nread, cons
 }
 
 
-void ConsoleCommands::process_input(std::string& command, char* data, uint32_t size)
+void ConsoleCommands::process_input(std::string& command, const char* data, uint32_t size)
 {
 	command.append(data, size);
 
@@ -390,4 +401,13 @@ void ConsoleCommands::process_input(std::string& command, char* data, uint32_t s
 	} while (true);
 }
 
+ConsoleCommands::~ConsoleCommands()
+{
+#ifdef DEV_TEST_SYNC
+	do_status(m_pool, nullptr);
+#endif
+
+	shutdown_tcp();
+}
+
 } // namespace p2pool

src/console_commands.h

@@ -1,6 +1,6 @@
 /*
  * This file is part of the Monero P2Pool <https://github.com/SChernykh/p2pool>
- * Copyright (c) 2021-2023 SChernykh <https://github.com/SChernykh>
+ * Copyright (c) 2021-2024 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
@@ -28,19 +28,19 @@ class ConsoleCommands : public TCPServer
 {
 public:
 	explicit ConsoleCommands(p2pool* pool);
-	~ConsoleCommands();
+	~ConsoleCommands() override;
 
 	struct ConsoleClient : public Client
 	{
 		ConsoleClient() : Client(m_consoleReadBuf, sizeof(m_consoleReadBuf)) {}
-		~ConsoleClient() {}
+		~ConsoleClient() override {}
 
 		static Client* allocate() { return new ConsoleClient(); }
 
 		size_t size() const override { return sizeof(ConsoleClient); }
 
 		bool on_connect() override { return true; };
-		bool on_read(char* data, uint32_t size) override { static_cast<ConsoleCommands*>(m_owner)->process_input(m_command, data, size); return true; };
+		bool on_read(const char* data, uint32_t size) override { static_cast<ConsoleCommands*>(m_owner)->process_input(m_command, data, size); return true; };
 
 		char m_consoleReadBuf[1024] = {};
 
@@ -66,7 +66,7 @@ private:
 	static void allocCallback(uv_handle_t* handle, size_t suggested_size, uv_buf_t* buf);
 	static void stdinReadCallback(uv_stream_t* stream, ssize_t nread, const uv_buf_t* buf);
 
-	void process_input(std::string& command, char* data, uint32_t size);
+	void process_input(std::string& command, const char* data, uint32_t size);
 };
 
 } // namespace p2pool

src/crypto.cpp

@@ -1,6 +1,6 @@
 /*
  * This file is part of the Monero P2Pool <https://github.com/SChernykh/p2pool>
- * Copyright (c) 2021-2023 SChernykh <https://github.com/SChernykh>
+ * Copyright (c) 2021-2024 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
@@ -64,7 +64,7 @@ private:
 	std::uniform_int_distribution<> dist;
 };
 
-static RandomBytes randomBytes;
+static RandomBytes* randomBytes = nullptr;
 
 }
 
@@ -84,7 +84,7 @@ static FORCEINLINE bool less32(const uint8_t* k0, const uint8_t* k1)
 void generate_keys(hash& pub, hash& sec)
 {
 	do {
-		do { randomBytes(sec.h); } while (!less32(sec.h, limit));
+		do { (*randomBytes)(sec.h); } while (!less32(sec.h, limit));
 		sc_reduce32(sec.h);
 	} while (!sc_isnonzero(sec.h));
 
@@ -93,6 +93,7 @@ void generate_keys(hash& pub, hash& sec)
 	ge_p3_tobytes(pub.h, &point);
 }
 
+// cppcheck-suppress constParameterReference
 void generate_keys_deterministic(hash& pub, hash& sec, const uint8_t* entropy, size_t len)
 {
 	uint32_t counter = 0;
@@ -150,8 +151,7 @@ static FORCEINLINE void derivation_to_scalar(const hash& derivation, size_t outp
 	uint8_t* p = buf.output_index;
 	writeVarint(output_index, [&p](uint8_t b) { *(p++) = b; });
 
-	const uint8_t* data = buf.derivation;
-	hash_to_scalar(data, static_cast<int>(p - data), res);
+	hash_to_scalar(buf.derivation, static_cast<int>(sizeof(buf.derivation) + (p - buf.output_index)), res);
 }
 
 class Cache : public nocopy_nomove
@@ -218,8 +218,8 @@ public:
 		{
 			WriteLock lock(derivations_lock);
 
-			DerivationEntry& entry = derivations->emplace(index, DerivationEntry{ derivation, { 0xFFFFFFFFUL, 0xFFFFFFFFUL }, {}, t }).first->second;
-			entry.add_view_tag(static_cast<uint32_t>(output_index << 8) | view_tag);
+			auto entry = derivations->emplace(index, DerivationEntry{ derivation, { 0xFFFFFFFFUL, 0xFFFFFFFFUL }, {}, t }).first;
+			entry->second.add_view_tag(static_cast<uint32_t>(output_index << 8) | view_tag);
 		}
 
 		return true;
@@ -469,6 +469,10 @@ void derive_view_tag(const hash& derivation, size_t output_index, uint8_t& view_
 
 void init_crypto_cache()
 {
+	if (!randomBytes) {
+		randomBytes = new RandomBytes();
+	}
+
 	if (!cache) {
 		cache = new Cache();
 	}
@@ -476,9 +480,15 @@ void init_crypto_cache()
 
 void destroy_crypto_cache()
 {
-	if (cache) {
-		delete cache;
+	{
+		auto p = randomBytes;
+		randomBytes = nullptr;
+		delete p;
+	}
+	{
+		auto p = cache;
 		cache = nullptr;
+		delete p;
 	}
 }
 

src/crypto.h

@@ -1,6 +1,6 @@
 /*
  * This file is part of the Monero P2Pool <https://github.com/SChernykh/p2pool>
- * Copyright (c) 2021-2023 SChernykh <https://github.com/SChernykh>
+ * Copyright (c) 2021-2024 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/json_parsers.h

@@ -1,6 +1,6 @@
 /*
  * This file is part of the Monero P2Pool <https://github.com/SChernykh/p2pool>
- * Copyright (c) 2021-2023 SChernykh <https://github.com/SChernykh>
+ * Copyright (c) 2021-2024 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
@@ -38,10 +38,14 @@ struct parse_wrapper<T, out_type> \
 { \
 	static FORCEINLINE bool parse(T& v, const char* name, out_type& out_value) \
 	{ \
-		if (v.IsObject() && v.HasMember(name)) { \
-			const auto& t = v[name]; \
-			if (t.Is##type()) { \
-				out_value = static_cast<out_type>(t.Get##type()); \
+		if (!v.IsObject()) { \
+			return false; \
+		} \
+		const auto t = v.FindMember(name); \
+		if (t != v.MemberEnd()) { \
+			const auto& value = t->value; \
+			if (value.Is##type()) { \
+				out_value = static_cast<out_type>(value.Get##type()); \
 				return true; \
 			} \
 		} \

src/json_rpc_request.cpp

@@ -1,6 +1,6 @@
 /*
  * This file is part of the Monero P2Pool <https://github.com/SChernykh/p2pool>
- * Copyright (c) 2021-2023 SChernykh <https://github.com/SChernykh>
+ * Copyright (c) 2021-2024 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
@@ -27,7 +27,7 @@ namespace JSONRPCRequest {
 
 struct CurlContext
 {
-	CurlContext(const std::string& address, int port, const std::string& req, const std::string& auth, const std::string& proxy, CallbackBase* cb, CallbackBase* close_cb, uv_loop_t* loop);
+	CurlContext(const std::string& address, int port, const std::string& req, const std::string& auth, const std::string& proxy, bool ssl, const std::string& ssl_fingerprint, CallbackBase* cb, CallbackBase* close_cb, uv_loop_t* loop);
 	~CurlContext();
 
 	static int socket_func(CURL* easy, curl_socket_t s, int action, void* userp, void* socketp)
@@ -67,7 +67,6 @@ struct CurlContext
 
 	uv_loop_t* m_loop;
 	uv_timer_t m_timer;
-	uv_async_t m_async;
 	CURLM* m_multiHandle;
 	CURL* m_handle;
 
@@ -83,12 +82,11 @@ struct CurlContext
 	uint64_t m_connectedTime;
 };
 
-CurlContext::CurlContext(const std::string& address, int port, const std::string& req, const std::string& auth, const std::string& proxy, CallbackBase* cb, CallbackBase* close_cb, uv_loop_t* loop)
+CurlContext::CurlContext(const std::string& address, int port, const std::string& req, const std::string& auth, const std::string& proxy, bool ssl, const std::string& ssl_fingerprint, CallbackBase* cb, CallbackBase* close_cb, uv_loop_t* loop)
 	: m_callback(cb)
 	, m_closeCallback(close_cb)
 	, m_loop(loop)
 	, m_timer{}
-	, m_async{}
 	, m_multiHandle(nullptr)
 	, m_handle(nullptr)
 	, m_req(req)
@@ -102,8 +100,19 @@ CurlContext::CurlContext(const std::string& address, int port, const std::string
 		char buf[log::Stream::BUF_SIZE + 1];
 		buf[0] = '\0';
 
+		const char* protocol = "http://";
+
+#ifdef WITH_TLS
+		if (ssl) {
+			protocol = "https://";
+		}
+#else
+		(void)ssl;
+		(void)ssl_fingerprint;
+#endif
+
 		log::Stream s(buf);
-		s << "http://" << address << ':' << port;
+		s << protocol << address << ':' << port;
 
 		if (!m_req.empty() && (m_req.front() == '/')) {
 			s << m_req.c_str() << '\0';
@@ -123,19 +132,10 @@ CurlContext::CurlContext(const std::string& address, int port, const std::string
 	}
 	m_timer.data = this;
 
-	err = uv_async_init(m_loop, &m_async, reinterpret_cast<uv_async_cb>(on_timeout));
-	if (err) {
-		LOGERR(1, "uv_async_init failed, error " << uv_err_name(err));
-		uv_close(reinterpret_cast<uv_handle_t*>(&m_timer), nullptr);
-		throw std::runtime_error("uv_async_init failed");
-	}
-	m_async.data = this;
-
 	m_multiHandle = curl_multi_init();
 	if (!m_multiHandle) {
 		static constexpr char msg[] = "curl_multi_init() failed";
 		LOGERR(1, msg);
-		uv_close(reinterpret_cast<uv_handle_t*>(&m_async), nullptr);
 		uv_close(reinterpret_cast<uv_handle_t*>(&m_timer), nullptr);
 		throw std::runtime_error(msg);
 	}
@@ -161,7 +161,6 @@ CurlContext::CurlContext(const std::string& address, int port, const std::string
 		static constexpr char msg[] = "curl_easy_init() failed";
 		LOGERR(1, msg);
 		curl_multi_cleanup(m_multiHandle);
-		uv_close(reinterpret_cast<uv_handle_t*>(&m_async), nullptr);
 		uv_close(reinterpret_cast<uv_handle_t*>(&m_timer), nullptr);
 		throw std::runtime_error(msg);
 	}
@@ -176,6 +175,8 @@ CurlContext::CurlContext(const std::string& address, int port, const std::string
 		} \
 	} while (0)
 
+	curl_easy_setopt_checked(m_handle, CURLOPT_BUFFERSIZE, 102400L);
+
 	curl_easy_setopt_checked(m_handle, CURLOPT_WRITEFUNCTION, write_func);
 	curl_easy_setopt_checked(m_handle, CURLOPT_WRITEDATA, this);
 
@@ -210,12 +211,25 @@ CurlContext::CurlContext(const std::string& address, int port, const std::string
 		}
 	}
 
+#ifdef WITH_TLS
+	curl_easy_setopt_checked(m_handle, CURLOPT_SSL_VERIFYPEER, 0L);
+	curl_easy_setopt_checked(m_handle, CURLOPT_SSL_VERIFYHOST, 0L);
+
+	if (!ssl_fingerprint.empty()) {
+		char buf[64] = {};
+
+		log::Stream s(buf);
+		s << "sha256//" << ssl_fingerprint;
+
+		curl_easy_setopt_checked(m_handle, CURLOPT_PINNEDPUBLICKEY, buf);
+	}
+#endif
+
 	CURLMcode curl_err = curl_multi_add_handle(m_multiHandle, m_handle);
 	if (curl_err != CURLM_OK) {
-		LOGERR(1, "curl_multi_add_handle failed, error " << curl_multi_strerror(curl_err));
+		LOGERR(1, "curl_multi_add_handle failed: " << curl_multi_strerror(curl_err));
 		curl_easy_cleanup(m_handle);
 		curl_multi_cleanup(m_multiHandle);
-		uv_close(reinterpret_cast<uv_handle_t*>(&m_async), nullptr);
 		uv_close(reinterpret_cast<uv_handle_t*>(&m_timer), nullptr);
 		throw std::runtime_error("curl_multi_add_handle failed");
 	}
@@ -331,20 +345,6 @@ int CurlContext::on_timer(CURLM* /*multi*/, long timeout_ms)
 		return 0;
 	}
 
-	if ((timeout_ms == 0) && !uv_is_closing(reinterpret_cast<uv_handle_t*>(&m_async))) {
-		// 0 ms timeout, but we can't just call on_timeout() here - we have to kick the UV loop
-		const int result = uv_async_send(&m_async);
-		if (result < 0) {
-			LOGERR(1, "uv_async_send failed with error " << uv_err_name(result));
-
-			// if async call didn't work, try to use the timer with 1 ms timeout
-			timeout_ms = 1;
-		}
-		else {
-			return 0;
-		}
-	}
-
 	const int result = uv_timer_start(&m_timer, reinterpret_cast<uv_timer_cb>(on_timeout), timeout_ms, 0);
 	if (result < 0) {
 		LOGERR(1, "uv_timer_start failed with error " << uv_err_name(result));
@@ -361,7 +361,7 @@ void CurlContext::on_timeout(uv_handle_t* req)
 	int running_handles = 0;
 	const CURLMcode err = curl_multi_socket_action(ctx->m_multiHandle, CURL_SOCKET_TIMEOUT, 0, &running_handles);
 	if (err != CURLM_OK) {
-		LOGERR(1, "curl_multi_socket_action failed, error " << curl_multi_strerror(err));
+		LOGERR(1, "curl_multi_socket_action failed: " << curl_multi_strerror(err));
 	}
 
 	ctx->check_multi_info();
@@ -407,7 +407,7 @@ void CurlContext::curl_perform(uv_poll_t* req, int status, int events)
 	if (it != ctx->m_pollHandles.end()) {
 		const CURLMcode err = curl_multi_socket_action(ctx->m_multiHandle, it->first, flags, &running_handles);
 		if (err != CURLM_OK) {
-			LOGERR(1, "curl_multi_socket_action failed, error " << curl_multi_strerror(err));
+			LOGERR(1, "curl_multi_socket_action failed: " << curl_multi_strerror(err));
 		}
 	}
 
@@ -454,7 +454,7 @@ void CurlContext::on_close(uv_handle_t* h)
 	CurlContext* ctx = reinterpret_cast<CurlContext*>(h->data);
 	h->data = nullptr;
 
-	if (ctx->m_timer.data || ctx->m_async.data) {
+	if (ctx->m_timer.data) {
 		return;
 	}
 
@@ -469,16 +469,12 @@ void CurlContext::shutdown()
 	}
 	m_pollHandles.clear();
 
-	if (m_async.data && !uv_is_closing(reinterpret_cast<uv_handle_t*>(&m_async))) {
-		uv_close(reinterpret_cast<uv_handle_t*>(&m_async), on_close);
-	}
-
 	if (m_timer.data && !uv_is_closing(reinterpret_cast<uv_handle_t*>(&m_timer))) {
 		uv_close(reinterpret_cast<uv_handle_t*>(&m_timer), on_close);
 	}
 }
 
-void Call(const std::string& address, int port, const std::string& req, const std::string& auth, const std::string& proxy, CallbackBase* cb, CallbackBase* close_cb, uv_loop_t* loop)
+void Call(const std::string& address, int port, const std::string& req, const std::string& auth, const std::string& proxy, bool ssl, const std::string& ssl_fingerprint, CallbackBase* cb, CallbackBase* close_cb, uv_loop_t* loop)
 {
 	if (!loop) {
 		loop = uv_default_loop();
@@ -488,16 +484,22 @@ void Call(const std::string& address, int port, const std::string& req, const st
 		[=]()
 		{
 			try {
-				new CurlContext(address, port, req, auth, proxy, cb, close_cb, loop);
+				new CurlContext(address, port, req, auth, proxy, ssl, ssl_fingerprint, cb, close_cb, loop);
 			}
 			catch (const std::exception& e) {
 				const char* msg = e.what();
 				(*close_cb)(msg, strlen(msg), 0.0);
+				delete cb;
+				delete close_cb;
 			}
 		});
 
 	if (!result) {
-		LOGERR(1, "JSON RPC \"" << req << "\" failed");
+		static constexpr char err[] = "CallOnLoop failed";
+		LOGERR(1, err);
+		(*close_cb)(err, sizeof(err) - 1, 0.0);
+		delete cb;
+		delete close_cb;
 	}
 }