p2pool v4.12

P2Pool-main: 8.2 MB saved
P2Pool-mini: 66 MB saved
P2Pool-nano: 25.2 MB saved

The feature is available only when building from source and is intended for use on low-memory systems (for example, a VPS server with < 1 GB RAM).

It only makes sense to use with `--no-cache --no-randomx` in the command line because cache and RandomX hasher take much more memory.

.github/workflows/c-cpp.yml

@@ -44,7 +44,7 @@ jobs:
       shell: alpine.sh {0}
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Os -flto=auto ${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+        cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Os -flto=auto ${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include
         make -j$(nproc)
 
     - name: Build libuv
@@ -196,7 +196,7 @@ jobs:
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Os -flto=auto ${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+        cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Os -flto=auto ${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include
         make -j$(nproc)
 
     - name: Build libuv
@@ -273,7 +273,7 @@ jobs:
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Os -flto=auto ${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+        cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Os -flto=auto ${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include
         make -j$(nproc)
 
     - name: Build libuv
@@ -357,7 +357,7 @@ jobs:
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../../cmake/riscv64_toolchain.cmake -DCMAKE_C_FLAGS="-Os -flto=auto ${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+        cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../../cmake/riscv64_toolchain.cmake -DCMAKE_C_FLAGS="-Os -flto=auto ${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include
         make -j$(nproc)
 
     - name: Build libuv
@@ -429,8 +429,8 @@ jobs:
     strategy:
       matrix:
         config:
-          - {c: "gcc", cxx: "g++", flags: "-ffunction-sections -Wno-error=maybe-uninitialized -Wno-error=attributes -Wno-unknown-attributes"}
-          - {c: "clang", cxx: "clang++", flags: "-fuse-ld=lld -Wno-unused-command-line-argument -Wno-nan-infinity-disabled -Wno-unknown-attributes"}
+          - {c: "gcc", cxx: "g++", flags: "-ffunction-sections -Wno-error=maybe-uninitialized -Wno-error=attributes -Wno-attributes"}
+          - {c: "clang", cxx: "clang++", flags: "-fuse-ld=lld -Wno-unused-command-line-argument -Wno-nan-infinity-disabled -Wno-attributes"}
 
     defaults:
       run:
@@ -455,7 +455,7 @@ jobs:
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles" -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_C_FLAGS="-Os ${{ matrix.config.flags }}" -DCURL_TARGET_WINDOWS_VERSION=0x0600 -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+        cmake . -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles" -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_C_FLAGS="-Os ${{ matrix.config.flags }}" -DCURL_TARGET_WINDOWS_VERSION=0x0600 -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include
         make -j$(nproc)
 
     - name: Build libuv
@@ -582,8 +582,8 @@ jobs:
 
   build-macos:
 
-    timeout-minutes: 60
-    runs-on: macos-13
+    timeout-minutes: 90
+    runs-on: macos-15-intel
 
     steps:
     - name: Checkout repository
@@ -594,7 +594,7 @@ jobs:
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="-Os -flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+        cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(brew --prefix llvm@18)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@18)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@18)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="-Os -flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include
         make -j4
 
     - name: Build libuv
@@ -602,7 +602,7 @@ jobs:
         cd external/src/libuv
         mkdir build
         cd build
-        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='-Os -flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(brew --prefix llvm@18)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@18)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@18)/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
@@ -610,14 +610,14 @@ jobs:
         cd external/src/libzmq
         mkdir build
         cd build
-        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@15)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='-Os -flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DCMAKE_CXX_FLAGS='-Os -flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(brew --prefix llvm@18)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@18)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@18)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@18)/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_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@15)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='-flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DCMAKE_CXX_FLAGS='-flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DCMAKE_ASM_FLAGS='-target x86_64-apple-macos10.13' -DSTATIC_LIBS=ON
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(brew --prefix llvm@18)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@18)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@18)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@18)/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
@@ -632,7 +632,7 @@ jobs:
         cd tests
         mkdir build
         cd build
-        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@15)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='-flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DCMAKE_CXX_FLAGS='-flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DCMAKE_ASM_FLAGS='-target x86_64-apple-macos10.13' -DSTATIC_LIBS=ON
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(brew --prefix llvm@18)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@18)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@18)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@18)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='-flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DCMAKE_CXX_FLAGS='-flto -target x86_64-apple-macos10.13 -Wno-overriding-t-option' -DCMAKE_ASM_FLAGS='-target x86_64-apple-macos10.13' -DSTATIC_LIBS=ON
         make -j4 p2pool_tests
 
     - name: Run tests
@@ -644,13 +644,13 @@ jobs:
     - name: Archive binary
       uses: actions/upload-artifact@v4
       with:
-        name: p2pool-macos-13
+        name: p2pool-macos
         path: build/p2pool
 
   build-macos-aarch64:
 
     timeout-minutes: 30
-    runs-on: macos-14
+    runs-on: macos-15
 
     steps:
     - name: Checkout repository
@@ -661,7 +661,7 @@ jobs:
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="-Os -target arm64-apple-macos-11" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+        cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(brew --prefix llvm@18)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@18)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@18)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="-Os -target arm64-apple-macos-11" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include
         make -j3
 
     - name: Build libuv
@@ -669,7 +669,7 @@ jobs:
         cd external/src/libuv
         mkdir build
         cd build
-        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='-Os -target arm64-apple-macos-11' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(brew --prefix llvm@18)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@18)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@18)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='-Os -target arm64-apple-macos-11' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
         make -j3
 
     - name: Build libzmq
@@ -677,14 +677,14 @@ jobs:
         cd external/src/libzmq
         mkdir build
         cd build
-        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@15)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='-Os -target arm64-apple-macos-11' -DCMAKE_CXX_FLAGS='-Os -target arm64-apple-macos-11' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(brew --prefix llvm@18)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@18)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@18)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@18)/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_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@15)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="-target arm64-apple-macos-11" -DCMAKE_CXX_FLAGS="-target arm64-apple-macos-11" -DSTATIC_LIBS=ON -DWITH_LTO=OFF -DARCH_ID=aarch64
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(brew --prefix llvm@18)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@18)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@18)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@18)/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
@@ -699,7 +699,7 @@ jobs:
         cd tests
         mkdir build
         cd build
-        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@15)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="-target arm64-apple-macos-11" -DCMAKE_CXX_FLAGS="-target arm64-apple-macos-11" -DSTATIC_LIBS=ON -DWITH_LTO=OFF -DARCH_ID=aarch64
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="$(brew --prefix llvm@18)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@18)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@18)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@18)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="-target arm64-apple-macos-11" -DCMAKE_CXX_FLAGS="-target arm64-apple-macos-11" -DSTATIC_LIBS=ON -DWITH_LTO=OFF -DARCH_ID=aarch64
         make -j3 p2pool_tests
 
     - name: Run tests
@@ -711,7 +711,7 @@ jobs:
     - name: Archive binary
       uses: actions/upload-artifact@v4
       with:
-        name: p2pool-macos-11-aarch64
+        name: p2pool-macos-aarch64
         path: build/p2pool
 
   build-freebsd:
@@ -750,7 +750,7 @@ jobs:
         run: |
           sudo pkg install -y cmake
           cd external/src/curl
-          cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Os -flto" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+          cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Os -flto" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include
           make -j4
           cd ../libuv
           mkdir build

.github/workflows/clang-tidy.yml

@@ -32,9 +32,9 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-21 -DCMAKE_CXX_COMPILER=clang++-21 -DDEV_CLANG_TIDY=ON -DSTATIC_LIBS=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
+        cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-21 -DCMAKE_CXX_COMPILER=clang++-21 -DDEV_CLANG_TIDY=ON -DSTATIC_LIBS=ON -DWITH_INDEXED_HASHES=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
 
     - name: Run clang-tidy
       run: |
         cd src
-        clang-tidy-21 *.cpp -p ../build -checks=bugprone-*,clang-analyzer-*,llvm-*,cppcoreguidelines-pro-type-cstyle-cast,cppcoreguidelines-rvalue-reference-param-not-moved,hicpp-use-emplace,hicpp-use-override,-bugprone-easily-swappable-parameters,-bugprone-empty-catch,-llvm-include-order -warnings-as-errors=* -header-filter=^[^\./]
+        clang-tidy-21 *.cpp -p ../build -checks=bugprone-*,clang-analyzer-*,llvm-*,cppcoreguidelines-pro-type-const-cast,cppcoreguidelines-pro-type-cstyle-cast,cppcoreguidelines-rvalue-reference-param-not-moved,hicpp-use-emplace,hicpp-use-override,-bugprone-easily-swappable-parameters,-bugprone-empty-catch,-llvm-include-order -warnings-as-errors=* -header-filter=^[^\./]

.github/workflows/coverage.yml

@@ -38,7 +38,7 @@ jobs:
         cd tests
         mkdir build
         cd build
-        cmake .. -DCMAKE_BUILD_TYPE=Release -DDEV_DEBUG=ON -DWITH_COVERAGE=ON -DCMAKE_C_COMPILER=clang-21 -DCMAKE_CXX_COMPILER=clang++-21 -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DDEV_DEBUG=ON -DWITH_INDEXED_HASHES=ON -DWITH_COVERAGE=ON -DCMAKE_C_COMPILER=clang-21 -DCMAKE_CXX_COMPILER=clang++-21 -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         make -j$(nproc) p2pool_tests
 
     - name: Run tests

.github/workflows/cppcheck.yml

@@ -38,7 +38,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DSTATIC_LIBS=ON -DWITH_GRPC=OFF -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
+        cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DSTATIC_LIBS=ON -DWITH_GRPC=OFF -DWITH_INDEXED_HASHES=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         python ../cppcheck/remove_external.py compile_commands.json
 
     - name: Run cppcheck

.github/workflows/test-sync.yml

@@ -34,7 +34,7 @@ jobs:
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_C_FLAGS='-fsanitize=thread -Og -fno-omit-frame-pointer -g' -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+        cmake . -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_C_FLAGS='-fsanitize=thread -Og -fno-omit-frame-pointer -g' -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include
         make -j$(nproc)
 
     - name: Build libuv
@@ -57,7 +57,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -DDEV_TEST_SYNC=ON -DDEV_WITH_TSAN=ON -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 -DCMAKE_C_FLAGS='-fsanitize=thread -Og -fno-omit-frame-pointer -g' -DCMAKE_CXX_FLAGS='-fsanitize=thread -Og -fno-omit-frame-pointer -g' -DWITH_LTO=OFF -DSTATIC_LIBS=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
+        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 -DWITH_INDEXED_HASHES=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         make -j$(nproc) p2pool
 
     - name: Run p2pool
@@ -70,12 +70,18 @@ jobs:
         sudo sysctl vm.mmap_rnd_bits=28
         TSAN_OPTIONS="suppressions=../tests/src/tsan_sup.txt halt_on_error=1 history_size=4" ./p2pool --host node.monerodevs.org --rpc-port 18089 --zmq-port 18084 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --rpc-ssl --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6
 
-    - name: Check p2pool.log
+    - name: Check synchronization
       run: |
         cd build
         grep 'Synchronization finished successfully' p2pool.log
 
+    - name: Check p2pool.log for errors
+      run: |
+        cd build
+        ../scripts/workflows/test-sync-check.sh
+
     - name: Archive p2pool.log
+      if: '!cancelled()'
       uses: actions/upload-artifact@v4
       with:
         name: p2pool_ubuntu_data_tsan
@@ -119,7 +125,7 @@ jobs:
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=clang-21 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -O0 -fno-omit-frame-pointer -g3' -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+        cmake . -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=clang-21 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -O0 -fno-omit-frame-pointer -g3' -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include
         make -j$(nproc)
 
     - name: Build libuv
@@ -142,7 +148,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=clang-21 -DCMAKE_CXX_COMPILER=clang++-21 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -fno-omit-frame-pointer' -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-21 -fno-omit-frame-pointer' -DDEV_TEST_SYNC=ON -DDEV_WITH_MSAN=ON -DWITH_LTO=OFF -DSTATIC_LIBS=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
+        cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=clang-21 -DCMAKE_CXX_COMPILER=clang++-21 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -fno-omit-frame-pointer' -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-21 -fno-omit-frame-pointer' -DDEV_TEST_SYNC=ON -DDEV_WITH_MSAN=ON -DWITH_LTO=OFF -DSTATIC_LIBS=ON -DWITH_INDEXED_HASHES=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         make -j$(nproc) p2pool
 
     - name: Run p2pool
@@ -155,12 +161,18 @@ jobs:
         sudo sysctl vm.mmap_rnd_bits=28
         MSAN_OPTIONS="halt_on_error=1" ./p2pool --host node.monerodevs.org --rpc-port 18089 --zmq-port 18084 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --rpc-ssl --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg ${{ secrets.MM_PARAMS }} --out-peers 50 --data-api data --local-api --loglevel 6
 
-    - name: Check p2pool.log
+    - name: Check synchronization
       run: |
         cd build
         grep 'Synchronization finished successfully' p2pool.log
 
+    - name: Check p2pool.log for errors
+      run: |
+        cd build
+        ../scripts/workflows/test-sync-check.sh
+
     - name: Archive p2pool.log
+      if: '!cancelled()'
       uses: actions/upload-artifact@v4
       with:
         name: p2pool_ubuntu_data_msan
@@ -189,7 +201,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -DDEV_TEST_SYNC=ON -DDEV_WITH_UBSAN=ON -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 -DWITH_LTO=OFF -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
+        cmake .. -DDEV_TEST_SYNC=ON -DDEV_WITH_UBSAN=ON -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 -DWITH_LTO=OFF -DWITH_INDEXED_HASHES=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         make -j$(nproc) p2pool
 
     - name: Run p2pool
@@ -202,12 +214,18 @@ jobs:
         sudo sysctl vm.mmap_rnd_bits=28
         UBSAN_OPTIONS="suppressions=../tests/src/ubsan_sup.txt halt_on_error=1" ./p2pool --host node.monerodevs.org --rpc-port 18089 --zmq-port 18084 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --rpc-ssl --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6
 
-    - name: Check p2pool.log
+    - name: Check synchronization
       run: |
         cd build
         grep 'Synchronization finished successfully' p2pool.log
 
+    - name: Check p2pool.log for errors
+      run: |
+        cd build
+        ../scripts/workflows/test-sync-check.sh
+
     - name: Archive p2pool.log
+      if: '!cancelled()'
       uses: actions/upload-artifact@v4
       with:
         name: p2pool_ubuntu_data_ubsan
@@ -236,7 +254,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -DDEV_TEST_SYNC=ON -DDEV_WITH_ASAN=ON -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 -DCMAKE_C_FLAGS="-fno-omit-frame-pointer -fsanitize=address -Og -g" -DCMAKE_CXX_FLAGS="-fno-omit-frame-pointer -fsanitize=address -Og -g" -DWITH_LTO=OFF -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
+        cmake .. -DDEV_TEST_SYNC=ON -DDEV_DEBUG=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 -DWITH_INDEXED_HASHES=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         make -j$(nproc) p2pool
 
     - name: Run p2pool
@@ -249,12 +267,18 @@ jobs:
         sudo sysctl vm.mmap_rnd_bits=28
         ASAN_OPTIONS="detect_stack_use_after_return=1 atexit=1" ./p2pool --host node.monerodevs.org --rpc-port 18089 --zmq-port 18084 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --rpc-ssl --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6
 
-    - name: Check p2pool.log
+    - name: Check synchronization
       run: |
         cd build
         grep 'Synchronization finished successfully' p2pool.log
 
+    - name: Check p2pool.log for errors
+      run: |
+        cd build
+        ../scripts/workflows/test-sync-check.sh
+
     - name: Archive p2pool.log
+      if: '!cancelled()'
       uses: actions/upload-artifact@v4
       with:
         name: p2pool_ubuntu_data_asan
@@ -264,14 +288,14 @@ jobs:
 
   sync-test-macos:
 
-    timeout-minutes: 60
+    timeout-minutes: 120
     runs-on: ${{ matrix.config.os }}
 
     strategy:
       matrix:
         config:
-          - {os: macos-13, flags: ""}
-          - {os: macos-14, flags: "-target arm64-apple-macos-11"}
+          - {os: macos-15-intel, flags: ""}
+          - {os: macos-15, flags: "-target arm64-apple-macos-11"}
 
     steps:
     - name: Checkout repository
@@ -282,7 +306,7 @@ jobs:
     - name: Build libcurl
       run: |
         cd external/src/curl
-        cmake . -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+        cmake . -DCMAKE_C_COMPILER="$(brew --prefix llvm@18)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@18)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@18)/bin/llvm-ranlib" -DCMAKE_C_FLAGS="${{ matrix.config.flags }}" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DCURL_DISABLE_TESTS=ON -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include
         make -j4
 
     - name: Build libuv
@@ -290,7 +314,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='${{ matrix.config.flags }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
+        cmake .. -DCMAKE_C_COMPILER="$(brew --prefix llvm@18)/bin/clang" -DCMAKE_AR="$(brew --prefix llvm@18)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@18)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='${{ matrix.config.flags }}' -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF
         make -j4
 
     - name: Build libzmq
@@ -298,14 +322,14 @@ jobs:
         cd external/src/libzmq
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@15)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='${{ 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
+        cmake .. -DCMAKE_C_COMPILER="$(brew --prefix llvm@18)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@18)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@18)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@18)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }}' -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF
         make -j4
 
     - name: Build p2pool
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_C_COMPILER="$(brew --prefix llvm@15)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@15)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@15)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@15)/bin/llvm-ranlib" -DCMAKE_C_FLAGS='${{ matrix.config.flags }}' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }}' -DWITH_LTO=OFF -DSTATIC_LIBS=ON -DDEV_TEST_SYNC=ON -DDEV_DEBUG=ON
+        cmake .. -DCMAKE_C_COMPILER="$(brew --prefix llvm@18)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm@18)/bin/clang++" -DCMAKE_AR="$(brew --prefix llvm@18)/bin/llvm-ar" -DCMAKE_RANLIB="$(brew --prefix llvm@18)/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 -DWITH_INDEXED_HASHES=ON
         make -j4 p2pool
 
     - name: Run p2pool
@@ -317,12 +341,18 @@ jobs:
         python3 ../tests/src/stratum_dummy.py 3 &
         ./p2pool --host node.monerodevs.org --rpc-port 18089 --zmq-port 18084 --host node.richfowler.net --rpc-port 18089 --zmq-port 18084 --rpc-ssl --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6
 
-    - name: Check p2pool.log
+    - name: Check synchronization
       run: |
         cd build
         grep 'Synchronization finished successfully' p2pool.log
 
+    - name: Check p2pool.log for errors
+      run: |
+        cd build
+        ../scripts/workflows/test-sync-check.sh
+
     - name: Archive p2pool.log
+      if: '!cancelled()'
       uses: actions/upload-artifact@v4
       with:
         name: p2pool_${{ matrix.config.os }}_data
@@ -348,7 +378,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -G "Visual Studio 17 2022" -DCMAKE_SYSTEM_VERSION="10.0" -DDEV_TEST_SYNC=ON -DDEV_WITH_ASAN=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
+        cmake .. -G "Visual Studio 17 2022" -DCMAKE_SYSTEM_VERSION="10.0" -DDEV_TEST_SYNC=ON -DDEV_WITH_ASAN=ON -DDEV_DEBUG=ON -DWITH_INDEXED_HASHES=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\msbuild" -v:m /m /p:Configuration=Debug p2pool.vcxproj
 
     - name: Run p2pool
@@ -368,6 +398,7 @@ jobs:
         findstr /C:"Synchronization finished successfully" p2pool.log
 
     - name: Archive p2pool.log
+      if: '!cancelled()'
       uses: actions/upload-artifact@v4
       with:
         name: p2pool_windows_data_debug_asan
@@ -393,7 +424,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -G "Visual Studio 17 2022" -DCMAKE_SYSTEM_VERSION="10.0" -DDEV_TEST_SYNC=ON -DDEV_TRACK_MEMORY=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
+        cmake .. -G "Visual Studio 17 2022" -DCMAKE_SYSTEM_VERSION="10.0" -DDEV_TEST_SYNC=ON -DDEV_DEBUG=ON -DDEV_TRACK_MEMORY=ON -DWITH_INDEXED_HASHES=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
         & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\msbuild" -v:m /m /p:Configuration=RelWithDebInfo p2pool.vcxproj
 
     - name: Run p2pool

CMakeLists.txt

@@ -18,6 +18,7 @@ option(WITH_LTO "Use link-time compiler optimization (if linking fails for you,
 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, and lack many other security features. It's recommended to keep it ON!" ON)
+option(WITH_INDEXED_HASHES "Save memory used for storing transaction hashes and public keys (a bit slower block verification - use it only if you compile for a very low memory system)" OFF)
 
 option(WITH_MERGE_MINING_DONATION "Merge mine donations to the author. This doesn't affect your hashrate or payouts in any way - only unused merge mining capacity will be utilised. If you merge mine yourself, your settings will take priority." ON)
 
@@ -32,6 +33,8 @@ option(DEV_DEBUG "[Developer only] Compile a debug build" OFF)
 
 set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT p2pool)
 
+set(BUILD_TESTING OFF CACHE BOOL "CMake's CTest module")
+
 if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
 	include(cmake/msvc_libs.cmake)
 endif()
@@ -43,7 +46,7 @@ if (WITH_GRPC)
 	add_subdirectory(external/src/Tari)
 elseif (WITH_TLS)
 	add_subdirectory(cmake/ssl)
-	include_directories(external/src/grpc/third_party/boringssl-with-bazel/src/include)
+	include_directories(external/src/grpc/third_party/boringssl-with-bazel/include)
 endif()
 
 if (WITH_RANDOMX)
@@ -133,6 +136,7 @@ set(SOURCES
 	external/src/crypto/sha256.c
 	external/src/cryptonote/crypto-ops-data.c
 	external/src/cryptonote/crypto-ops.c
+	external/src/cryptonote/fcmp_pp_crypto.cpp
 	external/src/hardforks/hardforks.cpp
 	src/block_cache.cpp
 	src/block_template.cpp
@@ -188,6 +192,11 @@ if (WITH_TLS)
 	set(SOURCES ${SOURCES} src/tls.cpp)
 endif()
 
+if (WITH_INDEXED_HASHES)
+	add_compile_definitions(WITH_INDEXED_HASHES)
+	set(SOURCES ${SOURCES} src/indexed_hash.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})
 

README.md

@@ -60,6 +60,7 @@ Here's the comparison table of the different ways of mining. While pool mining i
 * Advanced mempool picking algorithm, it creates blocks with better reward than what monerod solo mining does
 * Password protected private pools
 * Highly reliable configurations are supported (multiple P2Pool nodes mining to the same wallet, each P2Pool node can use multiple Monero nodes and switch on the fly if an issue is detected)
+* Mining through [TOR](docs/TOR.MD) is fully supported
 
 ## How payouts work in P2Pool
 
@@ -90,7 +91,7 @@ In order to continue mining on P2Pool, you must update both Monero and P2Pool so
 
 - In order to mine on P2Pool, a synced Monero node using monerod v0.18.0.0 or newer is required. If you don't currently have one, you can download the [official Monero binaries](https://www.getmonero.org/downloads/), start `monerod` on your PC and wait until it's fully synced. Advanced Monero node setup instructions are [here](https://sethforprivacy.com/guides/run-a-monero-node-advanced/).
 - It is highly recommended that you create a separate restricted user account (in your OS) for mining. While P2Pool has been battle-tested for a long time now, any software may have unknown bugs/vulnerabilities. 
-- You have to use a primary wallet address (the one starting with `4`) for mining. Subaddresses and integrated addresses are not supported, just like with monerod solo mining.
+- You can mine to a primary wallet address (the one starting with `4`) for mining. If you want to mine to a subaddress, you will need to provide both the main address (starting with 4) and the subaddress (starting with 8) using `--wallet` and `--subaddress` command line parameters.
 - You can add the `--mini` parameter to your P2Pool command to connect to the **p2pool-mini** sidechain. Note that it will also change the default p2p port from 37889 to 37888.
 - Check that ports 18080 (Monero p2p port) and 37889/37888 (P2Pool/P2Pool mini p2p port) are open in your firewall to ensure better connectivity. If you're mining from a computer behind NAT (like a router) you could consider forwarding the ports to your local machine.
 - You can connect multiple miners to the same P2Pool node. The more the better!

cmake/grpc.cmake

@@ -40,6 +40,6 @@ add_definitions(-DGRPC_NO_XDS)
 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/boringssl-with-bazel/include)
 include_directories(external/src/grpc/third_party/protobuf/src)
 include_directories(external/src/grpc/include)

cmake/macos_aarch64_toolchain_clang.cmake

@@ -3,7 +3,7 @@ set(CMAKE_CROSSCOMPILING TRUE)
 
 set(CMAKE_SYSTEM_PROCESSOR aarch64)
 
-set(CMAKE_C_COMPILER /usr/local/bin/aarch64-apple-darwin24.5-clang)
-set(CMAKE_CXX_COMPILER /usr/local/bin/aarch64-apple-darwin24.5-clang++)
-set(CMAKE_ASM_COMPILER /usr/local/bin/aarch64-apple-darwin24.5-as)
-set(CMAKE_STRIP /usr/local/bin/aarch64-apple-darwin24.5-strip)
+set(CMAKE_C_COMPILER /usr/local/bin/aarch64-apple-darwin25-clang)
+set(CMAKE_CXX_COMPILER /usr/local/bin/aarch64-apple-darwin25-clang++)
+set(CMAKE_ASM_COMPILER /usr/local/bin/aarch64-apple-darwin25-as)
+set(CMAKE_STRIP /usr/local/bin/aarch64-apple-darwin25-strip)

cmake/macos_x86_64_toolchain_clang.cmake

@@ -3,7 +3,7 @@ set(CMAKE_CROSSCOMPILING TRUE)
 
 set(CMAKE_SYSTEM_PROCESSOR x86_64)
 
-set(CMAKE_C_COMPILER /usr/local/bin/x86_64-apple-darwin24.5-clang)
-set(CMAKE_CXX_COMPILER /usr/local/bin/x86_64-apple-darwin24.5-clang++)
-set(CMAKE_ASM_COMPILER /usr/local/bin/x86_64-apple-darwin24.5-as)
-set(CMAKE_STRIP /usr/local/bin/x86_64-apple-darwin24.5-strip)
+set(CMAKE_C_COMPILER /usr/local/bin/x86_64-apple-darwin25-clang)
+set(CMAKE_CXX_COMPILER /usr/local/bin/x86_64-apple-darwin25-clang++)
+set(CMAKE_ASM_COMPILER /usr/local/bin/x86_64-apple-darwin25-as)
+set(CMAKE_STRIP /usr/local/bin/x86_64-apple-darwin25-strip)

cmake/msvc_libs.cmake

@@ -56,7 +56,7 @@ 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 "")
+	set(OPENSSL_INCLUDE_DIR "../grpc/third_party/boringssl-with-bazel/include" CACHE STRING "")
 endif()
 
 add_subdirectory(external/src/curl)

docs/COMMAND_LINE.MD

@@ -41,6 +41,8 @@
 --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
 --full-validation     Enables full share validation / increases CPU usage
+--onion-address       Tell other peers to use this .onion address to connect to this node through TOR
+--no-clearnet-p2p     Forces P2P server to listen on 127.0.0.1 and to not connect to clearnet IPs
 ```
 
 ### Example command line
@@ -49,6 +51,12 @@
 p2pool.exe --host 127.0.0.1 --rpc-port 18081 --zmq-port 18083 --wallet YOUR_WALLET_ADDRESS --stratum 0.0.0.0:3333 --p2p 0.0.0.0:37889
 ```
 
+### Example command line (mining to a subaddress)
+
+```
+p2pool.exe --host 127.0.0.1 --wallet WALLET_MAIN_ADDRESS --subaddress SUBADDRESS_FROM_THE_SAME_WALLET
+```
+
 ### Multiple backup hosts
 
 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.

docs/TOR.MD

@@ -0,0 +1,31 @@
+## Running P2Pool with TOR
+
+P2Pool has several command-line options that should be used for TOR setup:
+
+- `--socks5 IP:port` to specify your TOR proxy address (usually `127.0.0.1:9050` if you installed TOR on the same PC)
+- `--no-dns` to disable all DNS queries and prevent DNS leaks. P2Pool only ever makes DNS requests to get a list of seed nodes, to resolve your Monero node's domain (if it's not set as an IP address), and to resolve manually added peers
+- `--no-upnp` to disable UPnP requests (they are sent to your router, so use this option if you are not on your home network)
+- `--onion-address` your hidden service's address (without port number). This address will be broadcast to other peers when you mine a share in P2Pool. This is to prevent address spamming - you have to mine a real share to be able to broadcast your TOR address.
+	- **Attention: this also links the onion address with the Monero wallet you use for mining. Create a new onion address when mining through TOR, don't use your existing onion addresses to avoid meta-data leaks.**
+- `--no-clearnet-p2p` to never connect to clearnet P2Pool nodes. This also makes sure that your P2Pool traffic doesn't exit the TOR network (and is not seen/modified by the exit nodes)
+
+## Setting up a hidden service for P2Pool (Linux)
+
+- Add these lines to your TOR config in `/etc/tor/torrc`:
+	```
+	HiddenServiceDir /var/lib/tor/p2pool/
+	HiddenServicePort 28722 127.0.0.1:37889
+	```
+	Note that you must use port 28722 as the hidden service's port because this is what other peers will use when trying to connect to you. The internal port (37889) should be your actual P2Pool listening port (37889 for P2Pool-main, 37888 for P2Pool-mini, 37890 for P2Pool-nano)
+- Restart the TOR service:
+	```
+	sudo systemctl restart tor.service
+	```
+- If there were no errors, you should now have the `/var/lib/tor/p2pool` directory with a `hostname` file in it. This file will contain your onion address
+- Use this address in P2Pool's command line: `--onion-address ADDRESS_FROM_HOSTNAME_FILE`
+- It is strongly recommended to create a new onion address for mining (see `--onion-address` remarks). This guide ensures you will be using a new onion address, assuming that you don't already have a hidden service named `p2pool`.
+
+## Command line example
+```
+./p2pool --host MONERO_NODE_IP --wallet YOUR_WALLET --socks5 127.0.0.1:9050 --no-dns --no-upnp --onion-address ADDRESS_FROM_HOSTNAME_FILE
+```

docs/html/index.html

@@ -241,7 +241,7 @@ Wallets with confirmed P2Pool support<br>
 <li><a href="https://featherwallet.org/" target="_blank">Feather Wallet v2.1.0</a> and newer
 <li><a href="https://mymonero.com/" target="_blank">MyMonero</a>
 </ul>
-It's highly recommended to create a new wallet for mining because wallet addresses are public on p2pool. You have to use the primary wallet address for mining. Subaddresses and integrated addresses are not supported, just like with monerod solo mining.
+It's highly recommended to create a new wallet for mining because wallet addresses are public on p2pool. You can mine to a primary wallet address (the one starting with `4`) for mining. If you want to mine to a subaddress, you will need to provide both the main address (starting with 4) and the subaddress (starting with 8) using "--wallet" and "--subaddress" command line parameters.
 </details>
 
 <details><summary>Setup Monero node</summary>

docs/html/mini/index.html

@@ -241,7 +241,7 @@ Wallets with confirmed P2Pool support<br>
 <li><a href="https://featherwallet.org/" target="_blank">Feather Wallet v2.1.0</a> and newer
 <li><a href="https://mymonero.com/" target="_blank">MyMonero</a>
 </ul>
-It's highly recommended to create a new wallet for mining because wallet addresses are public on p2pool. You have to use the primary wallet address for mining. Subaddresses and integrated addresses are not supported, just like with monerod solo mining.
+It's highly recommended to create a new wallet for mining because wallet addresses are public on p2pool. You can mine to a primary wallet address (the one starting with `4`) for mining. If you want to mine to a subaddress, you will need to provide both the main address (starting with 4) and the subaddress (starting with 8) using "--wallet" and "--subaddress" command line parameters.
 </details>
 
 <details><summary>Setup Monero node</summary>

docs/html/nano/index.html

@@ -244,7 +244,7 @@ Wallets with confirmed P2Pool support<br>
 <li><a href="https://featherwallet.org/" target="_blank">Feather Wallet v2.1.0</a> and newer
 <li><a href="https://mymonero.com/" target="_blank">MyMonero</a>
 </ul>
-It's highly recommended to create a new wallet for mining because wallet addresses are public on p2pool. You have to use the primary wallet address for mining. Subaddresses and integrated addresses are not supported, just like with monerod solo mining.
+It's highly recommended to create a new wallet for mining because wallet addresses are public on p2pool. You can mine to a primary wallet address (the one starting with `4`) for mining. If you want to mine to a subaddress, you will need to provide both the main address (starting with 4) and the subaddress (starting with 8) using "--wallet" and "--subaddress" command line parameters.
 </details>
 
 <details><summary>Setup Monero node</summary>

external/src/cryptonote/crypto-ops-data.c

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2020, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -42,6 +42,13 @@ const fe fe_d = {-10913610, 13857413, -15372611, 6949391, 114729, -8787816, -627
 const fe fe_sqrtm1 = {-32595792, -7943725, 9377950, 3500415, 12389472, -272473, -25146209, -2005654, 326686, 11406482}; /* sqrt(-1) */
 const fe fe_d2 = {-21827239, -5839606, -30745221, 13898782, 229458, 15978800, -12551817, -6495438, 29715968, 9444199}; /* 2 * d */
 
+/* a = -1 */
+// TODO: double check these consts
+const fe fe_a_sub_d = {10913609, -13857413, 15372611, -6949391, -114729, 8787816, 6275908, 3247719, 18696448, 12055116}; /* a - d */
+const fe fe_a0 = {-21827241, -5839606, -30745221, 13898782, 229458, 15978800, -12551817, -6495438, 29715968, 9444199}; /* A0 = 2 * (a + d) */
+const fe fe_ap = {-23454401, 11679213, -5618422, 5756869, -458917, 1596832, 25103633, 12990876, 7676928, 14666033}; /* Ap = -2 * A0 */
+const fe fe_msqrt2b = {-1359796, -3165658, 8463188, -8916281, -9242332, 8801166, -2887120, 14417306, 28934311, 6371549};
+
 /* base[i][j] = (j+1)*256^i*B */
 const ge_precomp ge_base[32][8] = {
   {
@@ -874,6 +881,11 @@ const fe fe_fffb1 = {-31702527, -2466483, -26106795, -12203692, -12169197, -3210
 const fe fe_fffb2 = {8166131, -6741800, -17040804, 3154616, 21461005, 1466302, -30876704, -6368709, 10503587, -13363080}; /* sqrt(2 * A * (A + 2)) */
 const fe fe_fffb3 = {-13620103, 14639558, 4532995, 7679154, 16815101, -15883539, -22863840, -14813421, 13716513, -6477756}; /* sqrt(-sqrt(-1) * A * (A + 2)) */
 const fe fe_fffb4 = {-21786234, -12173074, 21573800, 4524538, -4645904, 16204591, 8012863, -8444712, 3212926, 6885324}; /* sqrt(sqrt(-1) * A * (A + 2)) */
+const fe fe_a_inv_3 = {-22207407, 11184811, 22369621, -11184811, -22369621, 11184811, 22369621, -11184811, -22369621, 11184811}; /* A / 3*/
+const fe fe_c = {-12222970, -8312128, -11511410, 9067497, -15300785, -241793, 25456130, 14121551, -12187136, 3972024}; /* sqrt(-(A + 2))*/
+const fe fe_one = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+const fe fe_m1 = {-1, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+const fe fe_inv2 = {10, 0, 0, 0, 0, 0, 0, 0, 0, -16777216}; /* 1 / 2 */
 const ge_p3 ge_p3_identity = { {0}, {1, 0}, {1, 0}, {0} };
 const ge_p3 ge_p3_H = {
   {7329926, -15101362, 31411471, 7614783, 27996851, -3197071, -11157635, -6878293, 466949, -7986503},

external/src/cryptonote/crypto-ops.c

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2020, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -34,13 +34,13 @@
 
 #include <assert.h>
 #include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "crypto-ops.h"
 
 /* Predeclarations */
 
-static void fe_mul(fe, const fe, const fe);
-static void fe_sq(fe, const fe);
 static void ge_madd(ge_p1p1 *, const ge_p3 *, const ge_precomp *);
 static void ge_msub(ge_p1p1 *, const ge_p3 *, const ge_precomp *);
 static void ge_p2_0(ge_p2 *);
@@ -73,7 +73,7 @@ uint64_t load_4(const unsigned char *in)
 h = 0
 */
 
-static void fe_0(fe h) {
+void fe_0(fe h) {
   h[0] = 0;
   h[1] = 0;
   h[2] = 0;
@@ -92,7 +92,7 @@ static void fe_0(fe h) {
 h = 1
 */
 
-static void fe_1(fe h) {
+void fe_1(fe h) {
   h[0] = 1;
   h[1] = 0;
   h[2] = 0;
@@ -232,7 +232,7 @@ static void fe_cmov(fe f, const fe g, unsigned int b) {
 h = f
 */
 
-static void fe_copy(fe h, const fe f) {
+void fe_copy(fe h, const fe f) {
   int32_t f0 = f[0];
   int32_t f1 = f[1];
   int32_t f2 = f[2];
@@ -315,6 +315,39 @@ void fe_invert(fe out, const fe z) {
   return;
 }
 
+// Montgomery's trick
+// https://iacr.org/archive/pkc2004/29470042/29470042.pdf 2.2
+int fe_batch_invert(fe *out, const fe *in, const int n) {
+  if (n == 0) {
+    return 0;
+  }
+
+  // Step 1: collect initial muls
+  fe *init_muls = (fe *) malloc(n * sizeof(fe));
+  if (!init_muls) {
+    return 1;
+  }
+  memcpy(&init_muls[0], &in[0], sizeof(fe));
+  for (int i = 1; i < n; ++i) {
+    fe_mul(init_muls[i], init_muls[i-1], in[i]);
+  }
+
+  // Step 2: get the inverse of all elems multiplied together
+  fe a;
+  fe_invert(a, init_muls[n-1]);
+
+  // Step 3: get each inverse
+  for (int i = n; i > 1; --i) {
+    fe_mul(out[i-1], a, init_muls[i-2]);
+    fe_mul(a, a, in[i-1]);
+  }
+  memcpy(&out[0], &a, sizeof(fe));
+
+  free(init_muls);
+
+  return 0;
+}
+
 /* From fe_isnegative.c */
 
 /*
@@ -325,7 +358,7 @@ Preconditions:
    |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
 */
 
-static int fe_isnegative(const fe f) {
+int fe_isnegative(const fe f) {
   unsigned char s[32];
   fe_tobytes(s, f);
   return s[0] & 1;
@@ -376,7 +409,7 @@ Can get away with 11 carries, but then data flow is much deeper.
 With tighter constraints on inputs can squeeze carries into int32.
 */
 
-static void fe_mul(fe h, const fe f, const fe g) {
+void fe_mul(fe h, const fe f, const fe g) {
   int32_t f0 = f[0];
   int32_t f1 = f[1];
   int32_t f2 = f[2];
@@ -606,7 +639,7 @@ Postconditions:
    |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
 */
 
-static void fe_neg(fe h, const fe f) {
+void fe_neg(fe h, const fe f) {
   int32_t f0 = f[0];
   int32_t f1 = f[1];
   int32_t f2 = f[2];
@@ -656,7 +689,7 @@ Postconditions:
 See fe_mul.c for discussion of implementation strategy.
 */
 
-static void fe_sq(fe h, const fe f) {
+void fe_sq(fe h, const fe f) {
   int32_t f0 = f[0];
   int32_t f1 = f[1];
   int32_t f2 = f[2];
@@ -960,7 +993,7 @@ Postconditions:
    |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
 */
 
-static void fe_sub(fe h, const fe f, const fe g) {
+void fe_sub(fe h, const fe f, const fe g) {
   int32_t f0 = f[0];
   int32_t f1 = f[1];
   int32_t f2 = f[2];
@@ -1330,16 +1363,9 @@ void ge_double_scalarmult_base_vartime_p3(ge_p3 *r3, const unsigned char *a, con
   }
 }
 
-/* From ge_frombytes.c, modified */
-
-int ge_frombytes_vartime(ge_p3 *h, const unsigned char *s) {
-  fe u;
-  fe v;
-  fe vxx;
-  fe check;
-
-  /* From fe_frombytes.c */
+/* From fe_frombytes.c */
 
+int fe_frombytes_vartime(fe y, const unsigned char *s) {
   int64_t h0 = load_4(s);
   int64_t h1 = load_3(s + 4) << 6;
   int64_t h2 = load_3(s + 7) << 5;
@@ -1380,18 +1406,31 @@ int ge_frombytes_vartime(ge_p3 *h, const unsigned char *s) {
   carry6 = (h6 + (int64_t) (1<<25)) >> 26; h7 += carry6; h6 -= carry6 << 26;
   carry8 = (h8 + (int64_t) (1<<25)) >> 26; h9 += carry8; h8 -= carry8 << 26;
 
-  h->Y[0] = h0;
-  h->Y[1] = h1;
-  h->Y[2] = h2;
-  h->Y[3] = h3;
-  h->Y[4] = h4;
-  h->Y[5] = h5;
-  h->Y[6] = h6;
-  h->Y[7] = h7;
-  h->Y[8] = h8;
-  h->Y[9] = h9;
+  y[0] = h0;
+  y[1] = h1;
+  y[2] = h2;
+  y[3] = h3;
+  y[4] = h4;
+  y[5] = h5;
+  y[6] = h6;
+  y[7] = h7;
+  y[8] = h8;
+  y[9] = h9;
 
-  /* End fe_frombytes.c */
+  return 0;
+}
+
+/* From ge_frombytes.c, modified */
+
+int ge_frombytes_vartime(ge_p3 *h, const unsigned char *s) {
+  fe u;
+  fe v;
+  fe vxx;
+  fe check;
+
+  if (fe_frombytes_vartime(h->Y, s) != 0) {
+    return -1;
+  }
 
   fe_1(h->Z);
   fe_sq(u, h->Y);
@@ -1608,7 +1647,7 @@ static void ge_precomp_cmov(ge_precomp *t, const ge_precomp *u, unsigned char b)
   fe_cmov(t->xy2d, u->xy2d, b);
 }
 
-static void select(ge_precomp *t, int pos, signed char b) {
+static void _select(ge_precomp *t, int pos, signed char b) {
   ge_precomp minust;
   unsigned char bnegative = negative(b);
   unsigned char babs = b - (((-bnegative) & b) << 1);
@@ -1628,6 +1667,32 @@ static void select(ge_precomp *t, int pos, signed char b) {
   ge_precomp_cmov(t, &minust, bnegative);
 }
 
+// With these select_vartime/ge_scalarmult_base_vartime I got ~25% speed up comparing to the select/ge_scalarmult_base -- sowle
+static void select_vartime(ge_precomp *t, int pos, signed char b) {
+  unsigned char bnegative = negative(b);
+  unsigned char babs = b - (((-bnegative) & b) << 1);
+  const ge_precomp* base;
+
+  if (babs == 0)
+  {
+    ge_precomp_0(t);
+  }
+  else if (bnegative == 0)
+  {
+    base = &ge_base[pos][babs - 1];
+    fe_copy(t->yplusx,  base->yplusx);
+    fe_copy(t->yminusx, base->yminusx);
+    fe_copy(t->xy2d,    base->xy2d);
+  }
+  else
+  {
+    base = &ge_base[pos][babs - 1];
+    fe_copy(t->yplusx,  base->yminusx);
+    fe_copy(t->yminusx, base->yplusx);
+    fe_neg(t->xy2d,     base->xy2d);
+  }
+}
+
 /*
 h = a * B
 where a = a[0]+256*a[1]+...+256^31 a[31]
@@ -1664,7 +1729,7 @@ void ge_scalarmult_base(ge_p3 *h, const unsigned char *a) {
 
   ge_p3_0(h);
   for (i = 1; i < 64; i += 2) {
-    select(&t, i / 2, e[i]);
+    _select(&t, i / 2, e[i]);
     ge_madd(&r, h, &t); ge_p1p1_to_p3(h, &r);
   }
 
@@ -1674,7 +1739,49 @@ void ge_scalarmult_base(ge_p3 *h, const unsigned char *a) {
   ge_p2_dbl(&r, &s); ge_p1p1_to_p3(h, &r);
 
   for (i = 0; i < 64; i += 2) {
-    select(&t, i / 2, e[i]);
+    _select(&t, i / 2, e[i]);
+    ge_madd(&r, h, &t); ge_p1p1_to_p3(h, &r);
+  }
+}
+
+void ge_scalarmult_base_vartime(ge_p3 *h, const unsigned char *a) {
+  signed char e[64];
+  signed char carry;
+  ge_p1p1 r;
+  ge_p2 s;
+  ge_precomp t;
+  int i;
+
+  for (i = 0; i < 32; ++i) {
+    e[2 * i + 0] = (a[i] >> 0) & 15;
+    e[2 * i + 1] = (a[i] >> 4) & 15;
+  }
+  /* each e[i] is between 0 and 15 */
+  /* e[63] is between 0 and 7 */
+
+  carry = 0;
+  for (i = 0; i < 63; ++i) {
+    e[i] += carry;
+    carry = e[i] + 8;
+    carry >>= 4;
+    e[i] -= carry << 4;
+  }
+  e[63] += carry;
+  /* each e[i] is between -8 and 8 */
+
+  ge_p3_0(h);
+  for (i = 1; i < 64; i += 2) {
+    select_vartime(&t, i / 2, e[i]);
+    ge_madd(&r, h, &t); ge_p1p1_to_p3(h, &r);
+  }
+
+  ge_p3_dbl(&r, h);  ge_p1p1_to_p2(&s, &r);
+  ge_p2_dbl(&r, &s); ge_p1p1_to_p2(&s, &r);
+  ge_p2_dbl(&r, &s); ge_p1p1_to_p2(&s, &r);
+  ge_p2_dbl(&r, &s); ge_p1p1_to_p3(h, &r);
+
+  for (i = 0; i < 64; i += 2) {
+    select_vartime(&t, i / 2, e[i]);
     ge_madd(&r, h, &t); ge_p1p1_to_p3(h, &r);
   }
 }
@@ -1955,26 +2062,18 @@ void sc_reduce(unsigned char *s) {
   s[31] = s11 >> 17;
 }
 
-/* New code */
+/* From fe_pow22523.c */
 
-static void fe_divpowm1(fe r, const fe u, const fe v) {
-  fe v3, uv7, t0, t1, t2;
+void fe_pow22523(fe out, const fe z) {
+  fe t0;
+  fe t1;
+  fe t2;
   int i;
 
-  fe_sq(v3, v);
-  fe_mul(v3, v3, v); /* v3 = v^3 */
-  fe_sq(uv7, v3);
-  fe_mul(uv7, uv7, v);
-  fe_mul(uv7, uv7, u); /* uv7 = uv^7 */
-
-  /*fe_pow22523(uv7, uv7);*/
-
-  /* From fe_pow22523.c */
-
-  fe_sq(t0, uv7);
+  fe_sq(t0, z);
   fe_sq(t1, t0);
   fe_sq(t1, t1);
-  fe_mul(t1, uv7, t1);
+  fe_mul(t1, z, t1);
   fe_mul(t0, t0, t1);
   fe_sq(t0, t0);
   fe_mul(t0, t1, t0);
@@ -2013,12 +2112,24 @@ static void fe_divpowm1(fe r, const fe u, const fe v) {
   fe_mul(t0, t1, t0);
   fe_sq(t0, t0);
   fe_sq(t0, t0);
-  fe_mul(t0, t0, uv7);
+  fe_mul(out, t0, z);
+}
 
-  /* End fe_pow22523.c */
-  /* t0 = (uv^7)^((q-5)/8) */
-  fe_mul(t0, t0, v3);
-  fe_mul(r, t0, u); /* u^(m+1)v^(-(m+1)) */
+/* New code */
+
+static void fe_divpowm1(fe r, const fe u, const fe v) {
+  fe v3, uv7;
+
+  fe_sq(v3, v);
+  fe_mul(v3, v3, v); /* v3 = v^3 */
+  fe_sq(uv7, v3);
+  fe_mul(uv7, uv7, v);
+  fe_mul(uv7, uv7, u); /* uv7 = uv^7 */
+
+  fe_pow22523(r, uv7); /* (uv^7)^((q-5)/8) */
+
+  fe_mul(r, r, v3);
+  fe_mul(r, r, u); /* u^(m+1)v^(-(m+1)) */
 }
 
 static void ge_cached_0(ge_cached *r) {
@@ -2096,6 +2207,43 @@ void ge_scalarmult(ge_p2 *r, const unsigned char *a, const ge_p3 *A) {
   }
 }
 
+void ge_scalarmult_vartime(ge_p2 *r, const unsigned char *a, const ge_p3 *A) {
+  signed char aslide[256];
+  ge_dsmp Ai; /* A, 3A, 5A, 7A, 9A, 11A, 13A, 15A */
+  ge_p1p1 t;
+  ge_p3 u;
+  ge_p2 r_p2;
+  int i;
+
+  slide(aslide, a);
+  ge_dsm_precomp(Ai, A);
+
+  ge_p2_0(&r_p2);
+  ge_p2_0(r);
+
+  for (i = 255; i >= 0; --i) {
+    if (aslide[i]) break;
+  }
+
+  for (; i >= 0; --i) {
+    ge_p2_dbl(&t, &r_p2);
+
+    if (aslide[i] > 0) {
+      ge_p1p1_to_p3(&u, &t);
+      ge_add(&t, &u, &Ai[aslide[i] / 2]);
+    }
+    else if (aslide[i] < 0) {
+      ge_p1p1_to_p3(&u, &t);
+      ge_sub(&t, &u, &Ai[(-aslide[i]) / 2]);
+    }
+
+    if (i != 0)
+      ge_p1p1_to_p2(&r_p2, &t);
+    else
+      ge_p1p1_to_p2(r, &t); // last step
+  }
+}
+
 void ge_scalarmult_p3(ge_p3 *r3, const unsigned char *a, const ge_p3 *A) {
   signed char e[64];
   int carry, carry2, i;
@@ -2431,6 +2579,14 @@ void sc_0(unsigned char *s) {
   }
 }
 
+void sc_1(unsigned char *s) {
+  int i;
+  s[0] = 1;
+  for (i = 1; i < 32; i++) {
+    s[i] = 0;
+  }
+}
+
 void sc_reduce32(unsigned char *s) {
   int64_t s0 = 2097151 & load_3(s);
   int64_t s1 = 2097151 & (load_4(s + 2) >> 5);
@@ -3831,6 +3987,92 @@ int sc_isnonzero(const unsigned char *s) {
     s[27] | s[28] | s[29] | s[30] | s[31]) - 1) >> 8) + 1;
 }
 
+static void edwardsYZ_to_x25519(unsigned char *xbytes, const fe Y, const fe Z) {
+  // y = Y/Z
+  // x_mont = (1 + y) / (1 - y)
+  //        = (1 + Y/Z) / (1 - Y/Z)
+  //        = (Z + Y) / (Z - Y)
+
+  fe tmp0;
+  fe tmp1;
+  fe_add(tmp0, Z, Y);       // Z + Y
+  fe_sub(tmp1, Z, Y);       // Z - Y
+  fe_invert(tmp1, tmp1);    // 1/(Z - Y)
+  fe_mul(tmp0, tmp0, tmp1); // (Z + Y) / (Z - Y)
+  fe_tobytes(xbytes, tmp0); // tobytes((Z + Y) / (Z - Y))
+}
+
+void ge_p3_to_x25519(unsigned char *xbytes, const ge_p3 *h)
+{
+  edwardsYZ_to_x25519(xbytes, h->Y, h->Z);
+} 
+
+int edwards_bytes_to_x25519_vartime(unsigned char *xbytes, const unsigned char *s)
+{
+  /* From fe_frombytes.c */
+
+  int64_t h0 = load_4(s);
+  int64_t h1 = load_3(s + 4) << 6;
+  int64_t h2 = load_3(s + 7) << 5;
+  int64_t h3 = load_3(s + 10) << 3;
+  int64_t h4 = load_3(s + 13) << 2;
+  int64_t h5 = load_4(s + 16);
+  int64_t h6 = load_3(s + 20) << 7;
+  int64_t h7 = load_3(s + 23) << 5;
+  int64_t h8 = load_3(s + 26) << 4;
+  int64_t h9 = (load_3(s + 29) & 8388607) << 2;
+  int64_t carry0;
+  int64_t carry1;
+  int64_t carry2;
+  int64_t carry3;
+  int64_t carry4;
+  int64_t carry5;
+  int64_t carry6;
+  int64_t carry7;
+  int64_t carry8;
+  int64_t carry9;
+
+  /* Validate the number to be canonical */
+  if (h9 == 33554428 && h8 == 268435440 && h7 == 536870880 && h6 == 2147483520 &&
+    h5 == 4294967295 && h4 == 67108860 && h3 == 134217720 && h2 == 536870880 &&
+    h1 == 1073741760 && h0 >= 4294967277) {
+    return -1;
+  }
+
+  carry9 = (h9 + (int64_t) (1<<24)) >> 25; h0 += carry9 * 19; h9 -= carry9 << 25;
+  carry1 = (h1 + (int64_t) (1<<24)) >> 25; h2 += carry1; h1 -= carry1 << 25;
+  carry3 = (h3 + (int64_t) (1<<24)) >> 25; h4 += carry3; h3 -= carry3 << 25;
+  carry5 = (h5 + (int64_t) (1<<24)) >> 25; h6 += carry5; h5 -= carry5 << 25;
+  carry7 = (h7 + (int64_t) (1<<24)) >> 25; h8 += carry7; h7 -= carry7 << 25;
+
+  carry0 = (h0 + (int64_t) (1<<25)) >> 26; h1 += carry0; h0 -= carry0 << 26;
+  carry2 = (h2 + (int64_t) (1<<25)) >> 26; h3 += carry2; h2 -= carry2 << 26;
+  carry4 = (h4 + (int64_t) (1<<25)) >> 26; h5 += carry4; h4 -= carry4 << 26;
+  carry6 = (h6 + (int64_t) (1<<25)) >> 26; h7 += carry6; h6 -= carry6 << 26;
+  carry8 = (h8 + (int64_t) (1<<25)) >> 26; h9 += carry8; h8 -= carry8 << 26;
+
+  fe Y;
+  Y[0] = h0;
+  Y[1] = h1;
+  Y[2] = h2;
+  Y[3] = h3;
+  Y[4] = h4;
+  Y[5] = h5;
+  Y[6] = h6;
+  Y[7] = h7;
+  Y[8] = h8;
+  Y[9] = h9;
+
+  /* End fe_frombytes.c */
+
+  fe Z;
+  fe_1(Z);
+
+  edwardsYZ_to_x25519(xbytes, Y, Z);
+
+  return 0;
+}
+
 int ge_p3_is_point_at_infinity_vartime(const ge_p3 *p) {
   // https://eprint.iacr.org/2008/522
   // X == T == 0 and Y/Z == 1
@@ -3879,3 +4121,67 @@ int ge_p3_is_point_at_infinity_vartime(const ge_p3 *p) {
   // Y/Z = 0/0
   return 0;
 }
+
+// https://www.ietf.org/archive/id/draft-ietf-lwig-curve-representations-02.pdf E.2
+static void fe_ed_derivatives_to_wei_x(unsigned char *wei_x, const fe inv_one_minus_y, const fe one_plus_y)
+{
+  // (1/(1-y))*(1+y)
+  fe inv_one_minus_y_mul_one_plus_y;
+  fe_mul(inv_one_minus_y_mul_one_plus_y, inv_one_minus_y, one_plus_y);
+
+  // wei x = (1/(1-y))*(1+y) + (A/3)
+  fe wei_x_fe;
+  fe_add(wei_x_fe, inv_one_minus_y_mul_one_plus_y, fe_a_inv_3);
+  fe_tobytes(wei_x, wei_x_fe);
+}
+
+// https://www.ietf.org/archive/id/draft-ietf-lwig-curve-representations-02.pdf E.2
+void fe_ed_derivatives_to_wei_x_y(unsigned char *wei_x, unsigned char *wei_y, const fe inv_one_minus_y, const fe one_plus_y, const fe inv_one_minus_y_mul_x)
+{
+  fe_ed_derivatives_to_wei_x(wei_x, inv_one_minus_y, one_plus_y);
+
+  // c*(1+y)
+  fe fe_c_mul_one_plus_y;
+  fe_mul(fe_c_mul_one_plus_y, fe_c, one_plus_y);
+
+  // wei y = c * (1+y) * (1/((1-y)*x))
+  fe wei_y_fe;
+  fe_mul(wei_y_fe, fe_c_mul_one_plus_y, inv_one_minus_y_mul_x);
+  fe_tobytes(wei_y, wei_y_fe);
+}
+
+/*
+Since fe_add and fe_sub enforce the following conditions:
+
+Preconditions:
+   |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+   |g| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+
+Postconditions:
+   |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
+
+We sometimes need to "reduce" field elems when they are in the poscondition's
+larger domain to match the precondition domain. This way we can take the output
+of fe_add or fe_sub and use it as input to another call to fe_add or fe_sub.
+
+We reduce by converting the field elem to its byte repr, then re-deriving the
+field elem from the byte repr.
+*/
+void fe_reduce(fe reduced_f, const fe f)
+{
+  unsigned char f_bytes[32];
+  fe_tobytes(f_bytes, f);
+  fe_frombytes_vartime(reduced_f, f_bytes);
+}
+
+void fe_dbl(fe h, const fe f)
+{
+  // Reduce the input for safety to ensure we meet the preconditions for fe_add
+  fe f_reduced;
+  fe_reduce(f_reduced, f);
+  fe h_res;
+  fe_add(h_res, f_reduced, f_reduced);
+  // Reduce the output for safety to ensure the result can be used as input to
+  // fe_add or fe_sub without an extra call to fe_reduce
+  fe_reduce(h, h_res);
+}

external/src/cryptonote/crypto-ops.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2020, The Monero Project
+// Copyright (c) 2014-2024, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -30,6 +30,8 @@
 
 #pragma once
 
+#include <stdint.h>
+
 /* From fe.h */
 
 typedef int32_t fe[10];
@@ -86,6 +88,7 @@ void ge_double_scalarmult_base_vartime_p3(ge_p3 *, const unsigned char *, const
 
 extern const fe fe_sqrtm1;
 extern const fe fe_d;
+int fe_frombytes_vartime(fe, const unsigned char *);
 int ge_frombytes_vartime(ge_p3 *, const unsigned char *);
 
 /* From ge_p1p1_to_p2.c */
@@ -118,6 +121,8 @@ void ge_p3_tobytes(unsigned char *, const ge_p3 *);
 extern const ge_precomp ge_base[32][8];
 void ge_scalarmult_base(ge_p3 *, const unsigned char *);
 
+void ge_scalarmult_base_vartime(ge_p3 *h, const unsigned char *a);
+
 /* From ge_tobytes.c */
 
 void ge_tobytes(unsigned char *, const ge_p2 *);
@@ -126,25 +131,40 @@ void ge_tobytes(unsigned char *, const ge_p2 *);
 
 void sc_reduce(unsigned char *);
 
+/* From fe_pow22523.c */
+
+void fe_pow22523(fe, const fe);
+
 /* New code */
 
 void ge_scalarmult(ge_p2 *, const unsigned char *, const ge_p3 *);
+void ge_scalarmult_vartime(ge_p2 *r, const unsigned char *a, const ge_p3 *A);
 void ge_scalarmult_p3(ge_p3 *, const unsigned char *, const ge_p3 *);
 void ge_double_scalarmult_precomp_vartime(ge_p2 *, const unsigned char *, const ge_p3 *, const unsigned char *, const ge_dsmp);
 void ge_triple_scalarmult_precomp_vartime(ge_p2 *, const unsigned char *, const ge_dsmp, const unsigned char *, const ge_dsmp, const unsigned char *, const ge_dsmp);
 void ge_double_scalarmult_precomp_vartime2(ge_p2 *, const unsigned char *, const ge_dsmp, const unsigned char *, const ge_dsmp);
 void ge_double_scalarmult_precomp_vartime2_p3(ge_p3 *, const unsigned char *, const ge_dsmp, const unsigned char *, const ge_dsmp);
 void ge_mul8(ge_p1p1 *, const ge_p2 *);
+extern const fe fe_a_sub_d;
+extern const fe fe_a0;
+extern const fe fe_ap;
+extern const fe fe_msqrt2b;
 extern const fe fe_ma2;
 extern const fe fe_ma;
 extern const fe fe_fffb1;
 extern const fe fe_fffb2;
 extern const fe fe_fffb3;
 extern const fe fe_fffb4;
+extern const fe fe_a_inv_3;
+extern const fe fe_c;
+extern const fe fe_one;
+extern const fe fe_m1;
+extern const fe fe_inv2;
 extern const ge_p3 ge_p3_identity;
 extern const ge_p3 ge_p3_H;
 void ge_fromfe_frombytes_vartime(ge_p2 *, const unsigned char *);
 void sc_0(unsigned char *);
+void sc_1(unsigned char *);
 void sc_reduce32(unsigned char *);
 void sc_add(unsigned char *, const unsigned char *, const unsigned char *);
 void sc_sub(unsigned char *, const unsigned char *, const unsigned char *);
@@ -154,12 +174,32 @@ void sc_muladd(unsigned char *s, const unsigned char *a, const unsigned char *b,
 int sc_check(const unsigned char *);
 int sc_isnonzero(const unsigned char *); /* Doesn't normalize */
 
+/**
+ * brief: Convert Ed25519 y-coord to X25519 x-coord, AKA "ConvertPointE()" in the Carrot spec
+ */
+void ge_p3_to_x25519(unsigned char *xbytes, const ge_p3 *h);
+int edwards_bytes_to_x25519_vartime(unsigned char *xbytes, const unsigned char *s);
+
 // internal
 uint64_t load_3(const unsigned char *in);
 uint64_t load_4(const unsigned char *in);
 void ge_sub(ge_p1p1 *r, const ge_p3 *p, const ge_cached *q);
 void fe_add(fe h, const fe f, const fe g);
+void fe_neg(fe h, const fe f);
 void fe_tobytes(unsigned char *, const fe);
+void fe_copy(fe h, const fe f);
+int fe_isnegative(const fe f);
 void fe_invert(fe out, const fe z);
+int fe_batch_invert(fe *out, const fe *in, const int n);
+void fe_mul(fe out, const fe, const fe);
+void fe_sq(fe h, const fe f);
+void fe_sub(fe h, const fe f, const fe g);
+void fe_0(fe h);
+void fe_1(fe h);
 
 int ge_p3_is_point_at_infinity_vartime(const ge_p3 *p);
+
+void fe_ed_derivatives_to_wei_x_y(unsigned char *wei_x, unsigned char *wei_y, const fe inv_one_minus_y, const fe one_plus_y, const fe inv_one_minus_y_mul_x);
+
+void fe_reduce(fe reduced_f, const fe f);
+void fe_dbl(fe h, const fe f);

external/src/cryptonote/fcmp_pp_crypto.cpp

@@ -0,0 +1,251 @@
+// Copyright (c) 2024, The Monero Project
+// 
+// All rights reserved.
+// 
+// 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.
+
+#ifdef _MSC_VER
+#pragma warning(disable: 4800)
+#endif
+
+extern "C" {
+#include "crypto-ops.h"
+}
+
+#include "fcmp_pp_crypto.h"
+#include <cstring>
+
+static bool fe_compare(const fe a, const fe b)
+{
+    unsigned char a_bytes[32];
+    unsigned char b_bytes[32];
+
+    fe_tobytes(a_bytes, a);
+    fe_tobytes(b_bytes, b);
+
+    return memcmp(a_bytes, b_bytes, sizeof(a_bytes)) == 0;
+}
+
+static bool sqrt_ext(fe y, const fe x)
+{
+    fe y_res;
+
+    fe x2;
+    fe_dbl(x2, x);
+
+    fe b;
+    fe_pow22523(b, x2);
+
+    fe b_sq;
+    fe_sq(b_sq, b);
+
+    fe c;
+    fe_mul(c, x2, b_sq);
+
+    if (fe_compare(c, fe_one) || fe_compare(c, fe_m1))
+    {
+        fe_0(c);
+        c[0] = 3;
+    }
+
+    fe c_sub_1;
+    fe_sub(c_sub_1, c, fe_one);
+
+    fe_mul(y_res, x, b);
+    fe_mul(y_res, y_res, c_sub_1);
+
+    if (fe_isnegative(y_res)) {
+        fe_neg(y_res, y_res);
+    }
+
+    fe y_sq;
+    fe_sq(y_sq, y_res);
+    bool r = fe_compare(x, y_sq);
+
+    fe_copy(y, y_res);
+    return r;
+};
+
+namespace fcmp_pp
+{
+    // TODO: impl faster sqrt
+    bool sqrt(fe y, const fe x)
+    {
+        return sqrt_ext(y, x);
+    };
+} // namespace fcmp_pp
+
+static void inv_iso(fe u_out, fe w_out, const fe u, const fe w)
+{
+    // 4u
+    fe_dbl(u_out, u);
+    fe_dbl(u_out, u_out);
+    // 2w
+    fe_dbl(w_out, w);
+};
+
+static void inv_psi1(fe e_out, fe u_out, fe w_out, const fe e, const fe u, const fe w)
+{
+    fe e_res, u_res, w_res;
+
+    fe tt;
+    bool cc = sqrt_ext(tt, u);
+    fe_copy(w_res, tt);
+    fe w_;
+    fe_copy(w_, w);
+    fe_copy(e_res, e);
+
+    if (!cc)
+    {
+        fe tt_sq;
+        fe_sq(tt_sq, tt);
+        fe neg_u_dbl;
+        fe_dbl(neg_u_dbl, u);
+        fe_neg(neg_u_dbl, neg_u_dbl);
+        if (fe_compare(tt_sq, neg_u_dbl)) {
+            fe_mul(tt, tt, fe_sqrtm1);
+        }
+
+        fe_mul(w_, w, tt);
+
+        fe e_sq;
+        fe_sq(e_sq, e);
+        fe_mul(w_res, fe_msqrt2b, e_sq);
+
+        fe_mul(e_res, e_res, tt);
+    }
+
+    fe w_res_sq;
+    fe_sq(w_res_sq, w_res);
+
+    fe e_res_sq;
+    fe_sq(e_res_sq, e_res);
+
+    fe A_e_sq;
+    fe_mul(A_e_sq, fe_a0, e_res_sq);
+
+    fe w_res_w;
+    fe_mul(w_res_w, w_res, w_);
+
+    fe_sub(u_res, w_res_sq, A_e_sq);
+    fe_reduce(u_res, u_res);
+    fe_sub(u_res, u_res, w_res_w);
+    fe_mul(u_res, u_res, fe_inv2);
+
+    fe_copy(e_out, e_res);
+    fe_copy(u_out, u_res);
+    fe_copy(w_out, w_res);
+};
+
+static bool inv_psi2(fe u_out, fe w_out, const fe e, const fe u, const fe w)
+{
+    fe u_res, w_res;
+
+    if (!fcmp_pp::sqrt(w_res, u))
+        return false;
+    fe e_sq;
+    fe_sq(e_sq, e);
+    fe Ap_e_sq;
+    fe_mul(Ap_e_sq, fe_ap, e_sq);
+
+    fe w_res_w;
+    fe_mul(w_res_w, w_res, w);
+
+    fe_sub(u_res, u, Ap_e_sq);
+    fe_reduce(u_res, u_res);
+    fe_sub(u_res, u_res, w_res_w);
+    fe_mul(u_res, u_res, fe_inv2);
+
+    fe_copy(u_out, u_res);
+    fe_copy(w_out, w_res);
+
+    return true;
+};
+
+namespace fcmp_pp
+{
+//----------------------------------------------------------------------------------------------------------------------
+bool mul8_is_identity(const ge_p3 &point) {
+    ge_p2 point_ge_p2;
+    ge_p3_to_p2(&point_ge_p2, &point);
+    ge_p1p1 point_mul8;
+    ge_mul8(&point_mul8, &point_ge_p2);
+    ge_p3 point_mul8_p3;
+    ge_p1p1_to_p3(&point_mul8_p3, &point_mul8);
+    return ge_p3_is_point_at_infinity_vartime(&point_mul8_p3);
+}
+//----------------------------------------------------------------------------------------------------------------------
+// https://github.com/kayabaNerve/fcmp-plus-plus/blob/94744c5324e869a9483bbbd93a864e108304bf76/crypto/divisors/src/tests/torsion_check.rs
+// Returns true if point is torsion free
+// Pre-condition: point is a valid point and point*8 not equal to identity
+// WARNING1: this approach needs to be carefully vetted academically and audited
+// before it can be used in production.
+// WARNING2: since fe_add and fe_sub expect the input fe's to be within a
+// smaller domain than the output fe, we sometimes need to "reduce" a field elem
+// to chain calls to fe_add and fe_sub. Notice all calls to fe_reduce.
+bool torsion_check_vartime(const ge_p3 &point) {
+    //assert(!mul8_is_identity(point));
+
+    // ed to wei
+    fe e, u, w;
+    {
+        fe z_plus_ed_y, z_minus_ed_y;
+        fe_add(z_plus_ed_y, fe_one, point.Y);
+        fe_sub(z_minus_ed_y, fe_one, point.Y);
+
+        // e
+        fe_mul(e, z_minus_ed_y, point.X);
+        // u
+        fe_mul(u, fe_a_sub_d, z_plus_ed_y);
+        fe_mul(u, u, point.X);
+        fe_mul(u, u, e);
+        // w
+        fe_dbl(w, z_minus_ed_y);
+    }
+
+    //assert(check_e_u_w(e, u, w));
+
+    // Torsion check
+    for (int i = 0; i < 2; ++i) {
+        inv_iso(u, w, u, w);
+        if (!inv_psi2(u, w, e, u, w)) {
+            return false;
+        }
+        inv_psi1(e, u, w, e, u, w);
+        //assert(check_e_u_w(e, u, w));
+    }
+
+    fe _;
+    inv_iso(u, _, u, w);
+
+    if (!sqrt(u, u)) {
+        return false;
+    }
+
+    return true;
+}
+//----------------------------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------------------------------------
+}//namespace fcmp_pp

external/src/cryptonote/fcmp_pp_crypto.h

@@ -0,0 +1,36 @@
+// Copyright (c) 2024, The Monero Project
+// 
+// All rights reserved.
+// 
+// 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.
+
+#pragma once
+
+namespace fcmp_pp
+{
+bool sqrt(fe y, const fe x);
+bool mul8_is_identity(const ge_p3 &point);
+bool torsion_check_vartime(const ge_p3 &point);
+}  //namespace fcmp_pp

patches/boringssl/win7.patch

@@ -1,7 +1,7 @@
-diff --git a/src/crypto/rand/windows.cc b/src/crypto/rand/windows.cc
+diff --git a/crypto/rand/windows.cc b/crypto/rand/windows.cc
 index 59df467e7..aa5ac076c 100644
---- a/src/crypto/rand/windows.cc
-+++ b/src/crypto/rand/windows.cc
+--- a/crypto/rand/windows.cc
++++ b/crypto/rand/windows.cc
 @@ -24,6 +24,7 @@
  #include <stdlib.h>
  

scripts/release/freebsd_aarch64/p2pool_freebsd_aarch64.sh

@@ -20,7 +20,7 @@ flags_libs="--target=aarch64-unknown-freebsd12.0 --sysroot=/usr/local/cross-free
 flags_p2pool="--target=aarch64-unknown-freebsd12.0 --sysroot=/usr/local/cross-freebsd-aarch64 -fuse-ld=lld -Wno-unused-command-line-argument $flags_size $flags_datetime"
 
 cd /p2pool/external/src/curl
-cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/freebsd_aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/freebsd_aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include
 make -j$(nproc)
 
 cd /p2pool/external/src/libuv
@@ -52,4 +52,4 @@ chmod 0775 $1/p2pool
 
 tar cvf $1.tar --format=pax --pax-option='exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime' --sort=name --owner=0 --group=0 --mtime="$CURRENT_DATE $CURRENT_TIME" $1
 touch -t $TOUCH_DATE $1.tar
-7z a -tgzip -mx9 -mfb256 -stl $1.tar.gz $1.tar
+7z a -tgzip -mx9 -mfb256 -mpass15 -stl $1.tar.gz $1.tar

scripts/release/freebsd_x64/p2pool_freebsd_x64.sh

@@ -20,7 +20,7 @@ flags_libs="--target=x86_64-unknown-freebsd12.0 --sysroot=/usr/local/cross-freeb
 flags_p2pool="--target=x86_64-unknown-freebsd12.0 --sysroot=/usr/local/cross-freebsd-x86_64 -fuse-ld=lld -Wno-unused-command-line-argument $flags_size $flags_datetime"
 
 cd /p2pool/external/src/curl
-cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/freebsd_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/freebsd_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include
 make -j$(nproc)
 
 cd /p2pool/external/src/libuv
@@ -52,4 +52,4 @@ chmod 0775 $1/p2pool
 
 tar cvf $1.tar --format=pax --pax-option='exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime' --sort=name --owner=0 --group=0 --mtime="$CURRENT_DATE $CURRENT_TIME" $1
 touch -t $TOUCH_DATE $1.tar
-7z a -tgzip -mx9 -mfb256 -stl $1.tar.gz $1.tar
+7z a -tgzip -mx9 -mfb256 -mpass15 -stl $1.tar.gz $1.tar

scripts/release/images/ubuntu/prepare.sh

@@ -5,25 +5,26 @@ set -e
 
 _7ZIP_VERSION=2501
 BINUTILS_VERSION=2_45
-CLANG_VERSION=21.1.2
-CMAKE_VERSION=4.1.1
+CLANG_VERSION=21.1.5
+CMAKE_VERSION=4.1.2
 FREEBSD_VERSION=12.4
 GCC_VERSION=15.2.0
 GLIBC_VERSION=2.42
-LINUX_HEADERS_VERSION=6.16.8
-MACOSX_SDK_VERSION=15.5
+LINUX_HEADERS_VERSION=6.17.7
+MACOSX_SDK_VERSION=26.0
+OSXCROSS_VERSION=7e8a4d170cc6bda1f0a32f5dc5f6ace4676baf98
 MAKE_VERSION=4.4.1
 MINGW_VERSION=13.0.0
 XZ_VERSION=5.8.1
 TAR_VERSION=1.35
 
 _7ZIP_SHA256="4ca3b7c6f2f67866b92622818b58233dc70367be2f36b498eb0bdeaaa44b53f4"
-CMAKE_SHA256="5a6c61cb62b38e153148a2c8d4af7b3d387f0c8c32b6dbceb5eb4af113efd65a"
+CMAKE_SHA256="773cc679c3a7395413bd096523f8e5d6c39f8718af4e12eb4e4195f72f35e4ab"
 FREEBSD_AARCH64_SHA256="6c401819bfb93e810c9f9aa670a1e4685f924df5e7e0c9c6397dd6c16c954fa2"
 FREEBSD_X86_64_SHA256="581c7edacfd2fca2bdf5791f667402d22fccd8a5e184635e0cac075564d57aa8"
 GLIBC_SHA256="d1775e32e4628e64ef930f435b67bb63af7599acb6be2b335b9f19f16509f17f"
-HEADERS_SHA256="231311bd7084dc3129944d26bb43be6ff837da82fb2104a67704aebca8bfa69f"
-MACOSX_SDK_SHA256="c15cf0f3f17d714d1aa5a642da8e118db53d79429eb015771ba816aa7c6c1cbd"
+HEADERS_SHA256="ddf2ea0d4439e1d57136be3623102af9458f601f5b1cb77e83246e88aea09d0e"
+MACOSX_SDK_SHA256="07ccaa2891454713c3a230dd87283f76124193309d9a7617ebee45354c9302d2"
 MAKE_SHA256="dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3"
 TAR_SHA256="4d62ff37342ec7aed748535323930c7cf94acf71c3591882b26a7ea50f3edc16"
 
@@ -421,7 +422,7 @@ make install
 echo "Build MacOSX cross compilers"
 
 cd /root/osxcross
-git checkout cb444e230e815c06202bef1c30eca5d353235a05
+git checkout ${OSXCROSS_VERSION}
 
 TARGET_DIR=/usr/local OSX_VERSION_MIN=10.15 UNATTENDED=1 ./build.sh
 ./build_compiler_rt.sh

scripts/release/linux_aarch64/p2pool_linux_aarch64.sh

@@ -20,7 +20,7 @@ flags_libs="--target=aarch64-linux-gnu -Os -flto -fuse-ld=lld -w $flags_size $fl
 flags_p2pool="--target=aarch64-linux-gnu -fuse-ld=lld -Wno-unused-command-line-argument $flags_size $flags_datetime"
 
 cd /p2pool/external/src/curl
-cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include
 make -j$(nproc)
 
 cd /p2pool/external/src/libuv
@@ -52,4 +52,4 @@ chmod 0775 $1/p2pool
 
 tar cvf $1.tar --format=pax --pax-option='exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime' --sort=name --owner=0 --group=0 --mtime="$CURRENT_DATE $CURRENT_TIME" $1
 touch -t $TOUCH_DATE $1.tar
-7z a -tgzip -mx9 -mfb256 -stl $1.tar.gz $1.tar
+7z a -tgzip -mx9 -mfb256 -mpass15 -stl $1.tar.gz $1.tar

scripts/release/linux_riscv64/p2pool_linux_riscv64.sh

@@ -20,7 +20,7 @@ flags_libs="--target=riscv64-linux-gnu -Os -flto -fuse-ld=lld -w $flags_size $fl
 flags_p2pool="--target=riscv64-linux-gnu -fuse-ld=lld -Wno-unused-command-line-argument $flags_size $flags_datetime"
 
 cd /p2pool/external/src/curl
-cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/riscv64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/riscv64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include
 make -j$(nproc)
 
 cd /p2pool/external/src/libuv
@@ -52,4 +52,4 @@ chmod 0775 $1/p2pool
 
 tar cvf $1.tar --format=pax --pax-option='exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime' --sort=name --owner=0 --group=0 --mtime="$CURRENT_DATE $CURRENT_TIME" $1
 touch -t $TOUCH_DATE $1.tar
-7z a -tgzip -mx9 -mfb256 -stl $1.tar.gz $1.tar
+7z a -tgzip -mx9 -mfb256 -mpass15 -stl $1.tar.gz $1.tar

scripts/release/linux_x64/p2pool_linux_x64.sh

@@ -20,7 +20,7 @@ flags_libs="-Os -flto -fuse-ld=lld -w $flags_size $flags_datetime"
 flags_p2pool="-fuse-ld=lld -Wno-unused-command-line-argument $flags_size $flags_datetime"
 
 cd /p2pool/external/src/curl
-cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_C_COMPILER=clang -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_C_COMPILER=clang -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include
 make -j$(nproc)
 
 cd /p2pool/external/src/libuv
@@ -37,7 +37,7 @@ make -j$(nproc)
 
 cd /p2pool
 mkdir build && cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DSTATIC_BINARY=ON -DARCH_ID=x86_64 -DGIT_COMMIT="$(git rev-parse --short=7 HEAD)"
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_FLAGS="$flags_p2pool" -DCMAKE_CXX_FLAGS="$flags_p2pool" -DOPENSSL_NO_ASM=ON -DSTATIC_BINARY=ON -DARCH_ID=x86_64 -DGIT_COMMIT="$(git rev-parse --short=7 HEAD)"
 make -j$(nproc) p2pool
 
 mkdir $1
@@ -52,4 +52,4 @@ chmod 0775 $1/p2pool
 
 tar cvf $1.tar --format=pax --pax-option='exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime' --sort=name --owner=0 --group=0 --mtime="$CURRENT_DATE $CURRENT_TIME" $1
 touch -t $TOUCH_DATE $1.tar
-7z a -tgzip -mx9 -mfb256 -stl $1.tar.gz $1.tar
+7z a -tgzip -mx9 -mfb256 -mpass15 -stl $1.tar.gz $1.tar

scripts/release/macos_aarch64/p2pool_macos_aarch64.sh

@@ -20,7 +20,7 @@ flags_libs="-Os -flto -w $flags_size $flags_datetime"
 flags_p2pool="$flags_size $flags_datetime"
 
 cd /p2pool/external/src/curl
-cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/macos_aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/macos_aarch64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include
 make -j$(nproc)
 
 cd /p2pool/external/src/libuv
@@ -52,4 +52,4 @@ chmod 0775 $1/p2pool
 
 tar cvf $1.tar --format=pax --pax-option='exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime' --sort=name --owner=0 --group=0 --mtime="$CURRENT_DATE $CURRENT_TIME" $1
 touch -t $TOUCH_DATE $1.tar
-7z a -tgzip -mx9 -mfb256 -stl $1.tar.gz $1.tar
+7z a -tgzip -mx9 -mfb256 -mpass15 -stl $1.tar.gz $1.tar

scripts/release/macos_x64/p2pool_macos_x64.sh

@@ -20,7 +20,7 @@ flags_libs="-Os -flto -w $flags_size $flags_datetime"
 flags_p2pool="$flags_size $flags_datetime"
 
 cd /p2pool/external/src/curl
-cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/macos_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/macos_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include
 make -j$(nproc)
 
 cd /p2pool/external/src/libuv
@@ -52,4 +52,4 @@ chmod 0775 $1/p2pool
 
 tar cvf $1.tar --format=pax --pax-option='exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime' --sort=name --owner=0 --group=0 --mtime="$CURRENT_DATE $CURRENT_TIME" $1
 touch -t $TOUCH_DATE $1.tar
-7z a -tgzip -mx9 -mfb256 -stl $1.tar.gz $1.tar
+7z a -tgzip -mx9 -mfb256 -mpass15 -stl $1.tar.gz $1.tar

scripts/release/windows_x64/p2pool_windows_x64.sh

@@ -25,7 +25,7 @@ cd /p2pool
 git apply --verbose --ignore-whitespace --directory=external/src/grpc/third_party/boringssl-with-bazel patches/boringssl/win7.patch
 
 cd /p2pool/external/src/curl
-cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/windows_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/src/include
+cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=../../../cmake/windows_x86_64_toolchain_clang.cmake -DCMAKE_C_FLAGS="$flags_libs" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DCURL_ENABLE_EXPORT_TARGET=OFF -DCURL_DISABLE_HEADERS_API=ON -DCURL_DISABLE_BINDLOCAL=ON -DBUILD_LIBCURL_DOCS=OFF -DBUILD_MISC_DOCS=OFF -DENABLE_CURL_MANUAL=OFF -DCURL_ZLIB=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DCURL_DISABLE_WEBSOCKETS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF -DBUILD_TESTING=OFF -DUSE_NGHTTP2=OFF -DBUILD_EXAMPLES=OFF -DP2POOL_BORINGSSL=ON -DCURL_DISABLE_SRP=ON -DCURL_DISABLE_AWS=ON -DCURL_DISABLE_BASIC_AUTH=ON -DCURL_DISABLE_BEARER_AUTH=ON -DCURL_DISABLE_KERBEROS_AUTH=ON -DCURL_DISABLE_NEGOTIATE_AUTH=ON -DOPENSSL_INCLUDE_DIR=../grpc/third_party/boringssl-with-bazel/include
 make -j$(nproc)
 
 cd /p2pool/external/src/libuv
@@ -57,4 +57,4 @@ chmod 0775 $1/p2pool.exe
 
 touch -t $TOUCH_DATE $1
 touch -t $TOUCH_DATE $1/*
-7z a -tzip -mx9 -mfb256 -stl $1.zip $1
+7z a -tzip -mx9 -mfb256 -mpass15 -stl $1.zip $1

scripts/workflows/test-sync-check.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+grep 'ERROR ' p2pool.log | grep -E -v 'submit_block|failed to bind|ZMQ is not running|block header for seed' > errors.log
+
+if [ -s errors.log ]; then
+	cat errors.log
+	exit 1
+fi

src/block_template.cpp

@@ -204,7 +204,7 @@ void BlockTemplate::shuffle_tx_order()
 	}
 }
 
-void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const Wallet& miner_wallet, const Wallet& subaddress)
+void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const Params* params)
 {
 	if (data.major_version > HARDFORK_SUPPORTED_VERSION) {
 		LOGERR(1, "got hardfork version " << data.major_version << ", expected <= " << HARDFORK_SUPPORTED_VERSION);
@@ -269,9 +269,12 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const
 
 	m_blockHeaderSize = m_blockHeader.size();
 
-	m_poolBlockTemplate->m_minerWallet = miner_wallet;
+	m_poolBlockTemplate->m_minerWallet = params->m_miningWallet;
 
-	m_sidechain->fill_sidechain_data(*m_poolBlockTemplate, m_shares);
+	if (!m_sidechain->fill_sidechain_data(*m_poolBlockTemplate, m_shares)) {
+		use_old_template();
+		return;
+	}
 
 	// Pre-calculate outputs to speed up miner tx generation
 	if (!m_shares.empty()) {
@@ -392,7 +395,8 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const
 				LOGERR(1, "Added transaction " << tx.id << " twice. Fix the code!");
 				continue;
 			}
-			m_transactionHashes.insert(m_transactionHashes.end(), tx.id.h, tx.id.h + HASH_SIZE);
+			const hash h = tx.id;
+			m_transactionHashes.insert(m_transactionHashes.end(), h.h, h.h + HASH_SIZE);
 			final_fees += tx.fee;
 			final_weight += tx.weight;
 		}
@@ -473,7 +477,8 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const
 				LOGERR(1, "Added transaction " << tx.id << " twice. Fix the code!");
 				continue;
 			}
-			m_transactionHashes.insert(m_transactionHashes.end(), tx.id.h, tx.id.h + HASH_SIZE);
+			const hash h = tx.id;
+			m_transactionHashes.insert(m_transactionHashes.end(), h.h, h.h + HASH_SIZE);
 			final_fees += tx.fee;
 			final_weight += tx.weight;
 		}
@@ -590,7 +595,7 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const
 		m_poolBlockTemplate->m_transactions.push_back(m_mempoolTxs[m_mempoolTxsOrder[i]].id);
 	}
 
-	m_poolBlockTemplate->m_minerWallet = miner_wallet;
+	m_poolBlockTemplate->m_minerWallet = params->m_miningWallet;
 
 	// Layout: [software id, version, random number, sidechain extra_nonce]
 	uint32_t* sidechain_extra = m_poolBlockTemplate->m_sidechainExtraBuf;
@@ -625,16 +630,18 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const
 		m_poolBlockTemplate->m_mergeMiningExtra.emplace(c.unique_id, std::move(v));
 	}
 
-	if (subaddress.valid()) {
-		std::vector<uint8_t> v;
-		v.reserve(HASH_SIZE + 2);
+	if (params->m_subaddress.valid()) {
+		uint8_t buf[HASH_SIZE + 2] = {};
+		memcpy(buf, params->m_subaddress.view_public_key().h, HASH_SIZE);
 
-		const hash& key = subaddress.view_public_key();
-		v.insert(v.end(), key.h, key.h + HASH_SIZE);
-		v.push_back(0);
-		v.push_back(0);
+		m_poolBlockTemplate->m_mergeMiningExtra.emplace(keccak_subaddress_viewpub, std::vector(buf, buf + sizeof(buf)));
+	}
 
-		m_poolBlockTemplate->m_mergeMiningExtra.emplace(keccak_subaddress_viewpub, std::move(v));
+	if (!params->m_onionPubkey.empty()) {
+		uint8_t buf[HASH_SIZE + 2] = {};
+		memcpy(buf, params->m_onionPubkey.h, HASH_SIZE);
+
+		m_poolBlockTemplate->m_mergeMiningExtra.emplace(keccak_onion_address_v3, std::vector(buf, buf + sizeof(buf)));
 	}
 
 	init_merge_mining_merkle_proof();
@@ -725,7 +732,7 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const
 
 	LOGINFO(3, "final reward = " << log::Gray() << log::XMRAmount(final_reward) << log::NoColor() <<
 		", weight = " << log::Gray() << final_weight << log::NoColor() <<
-		", outputs = " << log::Gray() << m_poolBlockTemplate->m_outputs.size() << log::NoColor() <<
+		", outputs = " << log::Gray() << m_poolBlockTemplate->m_outputAmounts.size() << log::NoColor() <<
 		", " << log::Gray() << m_numTransactionHashes << log::NoColor() <<
 		" of " << log::Gray() << m_mempoolTxs.size() << log::NoColor() << " transactions included");
 
@@ -844,7 +851,8 @@ void BlockTemplate::select_mempool_transactions(const Mempool& mempool)
 	PoolBlock* b = m_poolBlockTemplate;
 	b->m_transactions.clear();
 	b->m_transactions.resize(1);
-	b->m_outputs.clear();
+	b->m_ephPublicKeys.clear();
+	b->m_outputAmounts.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;
@@ -906,10 +914,11 @@ int BlockTemplate::create_miner_tx(const MinerData& data, const std::vector<Mine
 	// Number of outputs (1 output per miner)
 	writeVarint(num_outputs, m_minerTx);
 
-	m_poolBlockTemplate->m_outputs.clear();
-	m_poolBlockTemplate->m_outputs.reserve(num_outputs);
+	m_poolBlockTemplate->m_ephPublicKeys.clear();
+	m_poolBlockTemplate->m_outputAmounts.clear();
 
-	const uint8_t tx_type = m_poolBlockTemplate->get_tx_type();
+	m_poolBlockTemplate->m_ephPublicKeys.reserve(num_outputs);
+	m_poolBlockTemplate->m_outputAmounts.reserve(num_outputs);
 
 	uint64_t reward_amounts_weight = 0;
 	for (size_t i = 0; i < num_outputs; ++i) {
@@ -918,7 +927,7 @@ int BlockTemplate::create_miner_tx(const MinerData& data, const std::vector<Mine
 				m_minerTx.push_back(b);
 				++reward_amounts_weight;
 			});
-		m_minerTx.push_back(tx_type);
+		m_minerTx.push_back(TXOUT_TO_TAGGED_KEY);
 
 		uint8_t view_tag = 0;
 
@@ -931,12 +940,11 @@ int BlockTemplate::create_miner_tx(const MinerData& data, const std::vector<Mine
 				LOGERR(1, "get_eph_public_key failed at index " << i);
 			}
 			m_minerTx.insert(m_minerTx.end(), eph_public_key.h, eph_public_key.h + HASH_SIZE);
-			m_poolBlockTemplate->m_outputs.emplace_back(m_rewards[i], eph_public_key, view_tag);
+			m_poolBlockTemplate->m_ephPublicKeys.emplace_back(eph_public_key);
+			m_poolBlockTemplate->m_outputAmounts.emplace_back(m_rewards[i], view_tag);
 		}
 
-		if (tx_type == TXOUT_TO_TAGGED_KEY) {
-			m_minerTx.emplace_back(view_tag);
-		}
+		m_minerTx.emplace_back(view_tag);
 	}
 
 	if (dry_run) {
@@ -1360,11 +1368,11 @@ bool BlockTemplate::get_aux_proof(const uint32_t template_id, uint32_t extra_non
 		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);
 
+	uint32_t found_aux_slot = n_aux_chains;
+
 	std::vector<hash> hashes(n_aux_chains);
 
 	for (const AuxChainData& aux_data : m_poolBlockTemplate->m_auxChains) {
@@ -1372,7 +1380,7 @@ bool BlockTemplate::get_aux_proof(const uint32_t template_id, uint32_t extra_non
 		hashes[aux_slot] = aux_data.data;
 
 		if (aux_data.data == h) {
-			found = true;
+			found_aux_slot = aux_slot;
 		}
 	}
 
@@ -1380,17 +1388,31 @@ bool BlockTemplate::get_aux_proof(const uint32_t template_id, uint32_t extra_non
 	hashes[aux_slot] = sidechain_id;
 
 	if (sidechain_id == h) {
-		found = true;
+		found_aux_slot = aux_slot;
 	}
 
-	if (!found) {
+	if (found_aux_slot >= n_aux_chains) {
 		return false;
 	}
 
-	std::vector<std::vector<hash>> tree;
-	merkle_hash_full_tree(hashes, tree);
+	root_hash root;
+	const bool result = merkle_hash_with_proof(hashes, found_aux_slot, proof, path, root);
 
-	return get_merkle_proof(tree, h, proof, path);
+	if (pool_block_debug()) {
+		std::vector<std::vector<hash>> tree;
+		merkle_hash_full_tree(hashes, tree);
+
+		std::vector<hash> proof2;
+		uint32_t path2 = 0;
+
+		const bool result2 = get_merkle_proof(tree, h, proof2, path2);
+		
+		if ((result2 != result) || (proof2 != proof) || (path2 != path)) {
+			LOGERR(1, "get_aux_proof: merkle_hash_with_proof and get_merkle_proof returned different results. Fix the code!");
+		}
+	}
+
+	return result;
 }
 
 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
@@ -1530,10 +1552,28 @@ void BlockTemplate::init_merge_mining_merkle_proof()
 		}
 	}
 
-	std::vector<std::vector<hash>> tree;
-	merkle_hash_full_tree(hashes, tree);
+	root_hash root;
+	if (!merkle_hash_with_proof(hashes, aux_slot, m_poolBlockTemplate->m_merkleProof, m_poolBlockTemplate->m_merkleProofPath, root)) {
+		LOGERR(1, "init_merge_mining_merkle_proof: merkle_hash_with_proof failed. Fix the code!");
+		return;
+	}
 
-	get_merkle_proof(tree, m_poolBlockTemplate->m_sidechainId, m_poolBlockTemplate->m_merkleProof, m_poolBlockTemplate->m_merkleProofPath);
+	if (pool_block_debug()) {
+		std::vector<std::vector<hash>> tree;
+		merkle_hash_full_tree(hashes, tree);
+
+		std::vector<hash> proof;
+		uint32_t path = 0;
+
+		if (!get_merkle_proof(tree, m_poolBlockTemplate->m_sidechainId, proof, path)) {
+			LOGERR(1, "init_merge_mining_merkle_proof: get_merkle_proof failed. Fix the code!");
+			return;
+		}
+
+		if ((proof != m_poolBlockTemplate->m_merkleProof) || (path != m_poolBlockTemplate->m_merkleProofPath)) {
+			LOGERR(1, "init_merge_mining_merkle_proof: merkle_hash_with_proof and get_merkle_proof returned different results. Fix the code!");
+		}
+	}
 }
 
 } // namespace p2pool

src/block_template.h

@@ -29,6 +29,7 @@ class Mempool;
 class Wallet;
 struct PoolBlock;
 struct MinerShare;
+struct Params;
 
 class BlockTemplate
 {
@@ -39,7 +40,7 @@ public:
 	BlockTemplate(const BlockTemplate& b);
 	BlockTemplate& operator=(const BlockTemplate& b);
 
-	void update(const MinerData& data, const Mempool& mempool, const Wallet& miner_wallet, const Wallet& subaddress);
+	void update(const MinerData& data, const Mempool& mempool, const Params* params);
 	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& aux_diff, difficulty_type& sidechain_difficulty) const;
@@ -107,7 +108,11 @@ private:
 
 	PoolBlock* m_poolBlockTemplate;
 
+#ifdef P2POOL_UNIT_TESTS
+	BlockTemplate* m_oldTemplates[1] = {};
+#else
 	BlockTemplate* m_oldTemplates[4] = {};
+#endif
 
 	std::atomic<uint64_t> m_finalReward;
 

src/common.h

@@ -117,7 +117,6 @@ extern "C" void __nss_module_disable_loading();
 namespace p2pool {
 
 constexpr size_t HASH_SIZE = 32;
-constexpr uint8_t HARDFORK_VIEW_TAGS_VERSION = 15;
 constexpr uint8_t HARDFORK_SUPPORTED_VERSION = 16;
 constexpr uint8_t MINER_REWARD_UNLOCK_TIME = 60;
 constexpr uint8_t NONCE_SIZE = 4;
@@ -125,7 +124,6 @@ constexpr uint8_t EXTRA_NONCE_SIZE = 4;
 constexpr uint8_t EXTRA_NONCE_MAX_SIZE = EXTRA_NONCE_SIZE + 10;
 constexpr uint8_t TX_VERSION = 2;
 constexpr uint8_t TXIN_GEN = 0xFF;
-constexpr uint8_t TXOUT_TO_KEY = 2;
 constexpr uint8_t TXOUT_TO_TAGGED_KEY = 3;
 constexpr uint8_t TX_EXTRA_TAG_PUBKEY = 1;
 constexpr uint8_t TX_EXTRA_NONCE = 2;
@@ -164,7 +162,7 @@ struct alignas(uint64_t) hash
 {
 	uint8_t h[HASH_SIZE];
 
-	FORCEINLINE hash() : h{} {}
+	FORCEINLINE constexpr hash() : h{} {}
 
 	constexpr hash(std::initializer_list<uint8_t> l) : h{} {
 		auto it = l.begin();
@@ -212,6 +210,22 @@ struct alignas(uint64_t) hash
 	FORCEINLINE uint64_t* u64() { return reinterpret_cast<uint64_t*>(h); }
 	FORCEINLINE const uint64_t* u64() const { return reinterpret_cast<const uint64_t*>(h); }
 
+	template<int index>
+	FORCEINLINE constexpr uint64_t u64() const
+	{
+		if constexpr ((index < 0) || (index >= HASH_SIZE / sizeof(uint64_t))) {
+			return 0;
+		}
+
+		uint64_t k = 0;
+
+		for (size_t i = 0; i < sizeof(uint64_t); ++i) {
+			k |= static_cast<uint64_t>(h[index * sizeof(uint64_t) + i]) << (i * sizeof(uint64_t));
+		}
+
+		return k;
+	}
+
 	friend std::ostream& operator<<(std::ostream& s, const hash& d);
 	friend std::istream& operator>>(std::istream& s, hash& d);
 };
@@ -379,6 +393,85 @@ FORCEINLINE difficulty_type operator/(const difficulty_type& a, const T& b)
 	return result;
 }
 
+#ifdef WITH_INDEXED_HASHES
+struct indexed_hash
+{
+	enum {
+		BUCKET_BITS = 12,
+		BUCKET_SHIFT = 32 - BUCKET_BITS,
+	};
+
+	static_assert((BUCKET_BITS > 0) && (BUCKET_BITS < 32), "Invalid bucket bit size");
+
+	FORCEINLINE indexed_hash() : m_index(std::numeric_limits<uint32_t>::max()) {}
+
+	explicit indexed_hash(const hash& h);
+	~indexed_hash();
+
+	indexed_hash(const indexed_hash& h);
+	FORCEINLINE indexed_hash(indexed_hash&& h) : m_index(h.m_index) { h.m_index = std::numeric_limits<uint32_t>::max(); }
+
+	indexed_hash& operator=(const indexed_hash& h);
+	indexed_hash& operator=(indexed_hash&& h);
+
+	FORCEINLINE indexed_hash& operator=(const hash& h)
+	{
+		if (*this == h) {
+			return *this;
+		}
+		return operator=(indexed_hash(h));
+	}
+
+	FORCEINLINE bool operator==(const indexed_hash& h) const { return m_index == h.m_index; }
+
+	FORCEINLINE bool operator==(const hash& h) const
+	{
+		const uint32_t i = m_index;
+
+		if (i == std::numeric_limits<uint32_t>::max()) {
+			return h.empty();
+		}
+
+		const uint32_t bucket = i >> BUCKET_SHIFT;
+
+		if (bucket != get_bucket(h)) {
+			return false;
+		}
+
+		return is_same(i, bucket, h);
+	}
+
+	FORCEINLINE operator hash() const
+	{
+		const uint32_t i = m_index;
+
+		if (i == std::numeric_limits<uint32_t>::max()) {
+			return {};
+		}
+
+		return get(i);
+	}
+
+	FORCEINLINE uint32_t get_bucket() const { return m_index >> BUCKET_SHIFT; }
+
+	static void cleanup_storage();
+
+	static void print_status();
+
+private:
+	uint32_t m_index;
+
+	static FORCEINLINE uint32_t get_bucket(const hash& h) { return h.u64()[3] >> (64 - BUCKET_BITS); }
+
+	static hash get(uint32_t index);
+	static bool is_same(uint32_t index, uint32_t bucket, const hash& h);
+};
+
+static_assert(sizeof(indexed_hash) == 4, "indexed_hash has wrong size");
+#else
+typedef hash indexed_hash;
+#endif
+
 struct TxMempoolData
 {
 	FORCEINLINE TxMempoolData() : id(), blob_size(0), weight(0), fee(0), time_received(0) {}
@@ -397,10 +490,22 @@ struct TxMempoolData
 		if (weight > tx.weight) return false;
 
 		// If two transactions have exactly the same fee and weight, just order them by id
+#ifdef WITH_INDEXED_HASHES
+		const uint32_t id_bucket = id.get_bucket();
+		const uint32_t tx_id_bucket = tx.id.get_bucket();
+
+		if (id_bucket < tx_id_bucket) return true;
+		if (id_bucket > tx_id_bucket) return false;
+
+		const hash h1 = id;
+		const hash h2 = tx.id;
+		return h1 < h2;
+#else
 		return id < tx.id;
+#endif
 	}
 
-	hash id;
+	indexed_hash id;
 	uint64_t blob_size;
 	uint64_t weight;
 	uint64_t fee;

src/console_commands.cpp

@@ -224,6 +224,10 @@ static void do_status(p2pool *m_pool, const char * /* args */)
 
 	m_pool->print_merge_mining_status();
 
+#ifdef WITH_INDEXED_HASHES
+	indexed_hash::print_status();
+#endif
+
 	bkg_jobs_tracker->print_status();
 
 	if (p2p) {

src/crypto.cpp

@@ -89,7 +89,7 @@ void generate_keys(hash& pub, hash& sec)
 	} while (!sc_isnonzero(sec.h));
 
 	ge_p3 point;
-	ge_scalarmult_base(&point, sec.h);
+	ge_scalarmult_base_vartime(&point, sec.h);
 	ge_p3_tobytes(pub.h, &point);
 }
 
@@ -113,7 +113,7 @@ void generate_keys_deterministic(hash& pub, hash& sec, const uint8_t* entropy, s
 	} while (!sc_isnonzero(sec.h));
 
 	ge_p3 point;
-	ge_scalarmult_base(&point, sec.h);
+	ge_scalarmult_base_vartime(&point, sec.h);
 	ge_p3_tobytes(pub.h, &point);
 }
 
@@ -125,7 +125,7 @@ bool check_keys(const hash& pub, const hash& sec)
 	}
 
 	ge_p3 point;
-	ge_scalarmult_base(&point, sec.h);
+	ge_scalarmult_base_vartime(&point, sec.h);
 
 	hash pub_check;
 	ge_p3_tobytes(pub_check.h, &point);
@@ -206,7 +206,7 @@ public:
 				return false;
 			}
 
-			ge_scalarmult(&point2, key2.h, &point);
+			ge_scalarmult_vartime(&point2, key2.h, &point);
 			ge_mul8(&point3, &point2);
 			ge_p1p1_to_p2(&point2, &point3);
 			ge_tobytes(reinterpret_cast<uint8_t*>(&derivation), &point2);
@@ -218,7 +218,7 @@ public:
 		{
 			WriteLock lock(derivations_lock);
 
-			auto entry = derivations->emplace(index, DerivationEntry{ derivation, { 0xFFFFFFFFUL, 0xFFFFFFFFUL }, {}, t }).first;
+			auto entry = derivations->emplace(index, DerivationEntry{ derivation, { 0xFFFFFFFFUL, 0xFFFFFFFFUL }, {}, static_cast<uint32_t>(t) }).first;
 			entry->second.add_view_tag(static_cast<uint32_t>(output_index << 8) | view_tag);
 		}
 
@@ -253,7 +253,7 @@ public:
 		}
 
 		derivation_to_scalar(derivation, output_index, scalar);
-		ge_scalarmult_base(&point2, reinterpret_cast<uint8_t*>(&scalar));
+		ge_scalarmult_base_vartime(&point2, reinterpret_cast<uint8_t*>(&scalar));
 		ge_p3_to_cached(&point3, &point2);
 		ge_add(&point4, &point1, &point3);
 		ge_p1p1_to_p2(&point5, &point4);
@@ -262,7 +262,7 @@ public:
 		const uint64_t t = seconds_since_epoch();
 		{
 			WriteLock lock(public_keys_lock);
-			public_keys->emplace(index, PublicKeyEntry{ derived_key, t });
+			public_keys->emplace(index, PublicKeyEntry{ static_cast<indexed_hash>(derived_key), static_cast<uint32_t>(t) });
 		}
 
 		return true;
@@ -297,7 +297,7 @@ public:
 		const uint64_t t = seconds_since_epoch();
 		{
 			WriteLock lock(tx_keys_lock);
-			tx_keys->emplace(index, TxKeyEntry{ pub, sec, t });
+			tx_keys->emplace(index, TxKeyEntry{ pub, sec, static_cast<uint32_t>(t) });
 		}
 	}
 
@@ -306,7 +306,8 @@ public:
 		if (timestamp) {
 			auto clean_old = [timestamp](auto* table) {
 				for (auto it = table->begin(); it != table->end();) {
-					if (it->second.m_timestamp < timestamp) {
+					// Wraparound-safe way of checking "it->second.m_timestamp < timestamp"
+					if (((it->second.m_timestamp - static_cast<uint32_t>(timestamp)) & 0x80000000UL) != 0) {
 						it = table->erase(it);
 					}
 					else {
@@ -357,7 +358,7 @@ private:
 		uint32_t m_viewTags1[2] = { 0xFFFFFFFFUL, 0xFFFFFFFFUL };
 		std::vector<uint32_t> m_viewTags2;
 		// cppcheck-suppress unusedStructMember
-		uint64_t m_timestamp;
+		uint32_t m_timestamp;
 
 		FORCEINLINE bool find_view_tag(size_t output_index, uint8_t& view_tag) const
 		{
@@ -407,9 +408,9 @@ private:
 
 	struct PublicKeyEntry
 	{
-		hash m_key;
+		indexed_hash m_key;
 		// cppcheck-suppress unusedStructMember
-		uint64_t m_timestamp;
+		uint32_t m_timestamp;
 	};
 
 	struct TxKeyEntry
@@ -417,7 +418,7 @@ private:
 		hash m_pub;
 		hash m_sec;
 		// cppcheck-suppress unusedStructMember
-		uint64_t m_timestamp;
+		uint32_t m_timestamp;
 	};
 
 	typedef unordered_map<std::array<uint8_t, HASH_SIZE * 2>, DerivationEntry> DerivationsMap;

src/indexed_hash.cpp

@@ -0,0 +1,291 @@
+/*
+ * This file is part of the Monero P2Pool <https://github.com/SChernykh/p2pool>
+ * Copyright (c) 2021-2025 SChernykh <https://github.com/SChernykh>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "common.h"
+#include "util.h"
+#include "uv_util.h"
+
+LOG_CATEGORY(indexed_hash)
+
+namespace p2pool {
+
+static constexpr uint32_t BUCKET_COUNT = 1U << indexed_hash::BUCKET_BITS;
+static constexpr uint32_t INDEX_MASK = (1U << indexed_hash::BUCKET_SHIFT) - 1U;
+
+// Stores hashes only
+static std::vector<hash> storage1[BUCKET_COUNT];
+
+// Stores first 4 bytes of each hash (for better cache locality during search) and reference counters
+static std::vector<std::pair<uint32_t, uint32_t>> storage2[BUCKET_COUNT];
+
+static constexpr uint32_t LOCK_COUNT = 64;
+
+static ReadWriteLock locks[LOCK_COUNT];
+
+static FORCEINLINE void decref(uint32_t index)
+{
+	if (index == std::numeric_limits<uint32_t>::max()) {
+		return;
+	}
+
+	const uint32_t bucket = index >> indexed_hash::BUCKET_SHIFT;
+	index &= INDEX_MASK;
+
+	auto& d2 = storage2[bucket];
+
+	WriteLock lock(locks[bucket % LOCK_COUNT]);
+
+	auto& p2 = d2[index];
+
+#ifdef P2POOL_DEBUGGING
+	if (p2.second == 0) {
+		LOGERR(0, "fatal error: reference counter is 0 when it shouldn't be 0");
+		PANIC_STOP();
+	}
+#endif
+
+	--p2.second;
+}
+
+static FORCEINLINE void incref(uint32_t index)
+{
+	if (index == std::numeric_limits<uint32_t>::max()) {
+		return;
+	}
+
+	const uint32_t bucket = index >> indexed_hash::BUCKET_SHIFT;
+	index &= INDEX_MASK;
+
+	auto& d2 = storage2[bucket];
+
+	WriteLock lock(locks[bucket % LOCK_COUNT]);
+	++d2[index].second;
+}
+
+indexed_hash::indexed_hash(const hash& h)
+{
+	if (h.empty()) {
+		m_index = std::numeric_limits<uint32_t>::max();
+		return;
+	}
+
+	const uint32_t bucket = get_bucket(h);
+
+	auto& d1 = storage1[bucket];
+	auto& d2 = storage2[bucket];
+
+	const uint32_t h32 = static_cast<uint32_t>(h.u64()[0]);
+	uint32_t first_free_slot = std::numeric_limits<uint32_t>::max();
+
+	WriteLock lock(locks[bucket % LOCK_COUNT]);
+
+	const uint32_t n = static_cast<uint32_t>(d1.size());
+
+	for (uint32_t i = 0; i < n; ++i) {
+		auto& p2 = d2[i];
+
+		if ((p2.first == h32) && (d1[i] == h)) {
+			m_index = (bucket << BUCKET_SHIFT) | i;
+			++p2.second;
+			return;
+		}
+
+		if ((p2.second == 0) && (first_free_slot == std::numeric_limits<uint32_t>::max())) {
+			first_free_slot = i;
+		}
+	}
+
+	if (first_free_slot != std::numeric_limits<uint32_t>::max()) {
+		m_index = (bucket << BUCKET_SHIFT) | first_free_slot;
+
+		d1[first_free_slot] = h;
+
+		auto& p2 = d2[first_free_slot];
+		p2.first = h32;
+		p2.second = 1;
+	}
+	else {
+		if (n > INDEX_MASK) {
+			LOGERR(0, "fatal error: storage overflow");
+			PANIC_STOP();
+		}
+
+		m_index = (bucket << BUCKET_SHIFT) | n;
+
+		if (n == d1.capacity()) {
+			const uint32_t new_capacity = static_cast<uint32_t>(std::min<size_t>(n + ((n + 3) / 4), INDEX_MASK + 1));
+			d1.reserve(new_capacity);
+			d2.reserve(new_capacity);
+		}
+
+		d1.emplace_back(h);
+		d2.emplace_back(h32, 1);
+	}
+}
+
+indexed_hash::~indexed_hash()
+{
+	decref(m_index);
+}
+
+indexed_hash::indexed_hash(const indexed_hash& h)
+{
+	const uint32_t i = h.m_index;
+
+	m_index = i;
+	incref(i);
+}
+
+indexed_hash& indexed_hash::operator=(const indexed_hash& h)
+{
+	if (this == &h) {
+		return *this;
+	}
+
+	const uint32_t i = m_index;
+	const uint32_t j = h.m_index;
+
+	if (i == j) {
+		return *this;
+	}
+
+	decref(i);
+
+	m_index = j;
+	incref(j);
+
+	return *this;
+}
+
+indexed_hash& indexed_hash::operator=(indexed_hash&& h)
+{
+	if (this == &h) {
+		return *this;
+	}
+
+	const uint32_t i = m_index;
+	const uint32_t j = h.m_index;
+
+	// Empty h because we're moving it
+	h.m_index = std::numeric_limits<uint32_t>::max();
+
+	if (i == j) {
+		// If h had the same index, decrease h's reference counter because now we have 1 instead of 2 objects using this index
+		decref(j);
+		return *this;
+	}
+
+	// If h had a different index, decrease our reference counter because our index will be overwritten by the index from h
+	decref(i);
+
+	// No need to change the reference counter anymore because now we are referencing the hash that was referenced by h
+	m_index = j;
+
+	return *this;
+}
+
+hash indexed_hash::get(uint32_t index)
+{
+	const uint32_t bucket = index >> BUCKET_SHIFT;
+
+	const auto& d1 = storage1[bucket];
+	index &= INDEX_MASK;
+
+	ReadLock lock(locks[bucket % LOCK_COUNT]);
+
+#ifdef P2POOL_DEBUGGING
+	if (storage2[bucket][index].second == 0) {
+		LOGERR(0, "fatal error: reference counter is 0 when it shouldn't be 0");
+		PANIC_STOP();
+	}
+#endif
+
+	return d1[index];
+}
+
+bool indexed_hash::is_same(uint32_t index, uint32_t bucket, const hash& h)
+{
+	const auto& d1 = storage1[bucket];
+	index &= INDEX_MASK;
+
+	ReadLock lock(locks[bucket % LOCK_COUNT]);
+
+#ifdef P2POOL_DEBUGGING
+	if (storage2[bucket][index].second == 0) {
+		LOGERR(0, "fatal error: reference counter is 0 when it shouldn't be 0");
+		PANIC_STOP();
+	}
+#endif
+
+	return d1[index] == h;
+}
+
+void indexed_hash::cleanup_storage()
+{
+	for (auto& d1 : storage1) {
+		d1.clear();
+		d1.shrink_to_fit();
+	}
+
+	for (auto& d2 : storage2) {
+#ifdef P2POOL_DEBUGGING
+		for (const auto& p2 : d2) {
+			if (p2.second) {
+				LOGERR(0, "storage is not empty at exit. Fix the code!");
+				PANIC_STOP();
+			}
+		}
+#endif
+		d2.clear();
+		d2.shrink_to_fit();
+	}
+}
+
+void indexed_hash::print_status()
+{
+	size_t total_hashes_stored = 0;
+	size_t total_refcount = 0;
+	size_t memory_used = 0;
+
+	const auto& s1 = storage1;
+	const auto& s2 = storage2;
+
+	for (uint32_t i = 0; i < LOCK_COUNT; ++i) {
+		ReadLock lock(locks[i]);
+
+		for (uint32_t j = i; j < BUCKET_COUNT; j += LOCK_COUNT) {
+			memory_used += s1[j].capacity() * HASH_SIZE + s2[j].capacity() * sizeof(uint32_t) * 2;
+
+			for (const auto& p2 : storage2[j]) {
+				if (p2.second) {
+					++total_hashes_stored;
+					total_refcount += p2.second;
+				}
+			}
+		}
+	}
+
+	memory_used += total_refcount * sizeof(indexed_hash);
+
+	LOGINFO(4, "status" <<
+		"\nTotal hashes stored = " << total_hashes_stored <<
+		"\nTotal refcount = " << total_refcount <<
+		"\nMemory used = " << static_cast<double>(memory_used) / 1048576.0 << " MB (reduced from " << static_cast<double>(total_refcount * HASH_SIZE) / 1048576.0 << " MB)"
+	);
+}
+
+} // namespace p2pool

src/json_parsers.h

@@ -85,6 +85,23 @@ struct parse_wrapper<T, hash>
 	}
 };
 
+#ifdef WITH_INDEXED_HASHES
+template<typename T>
+struct parse_wrapper<T, indexed_hash>
+{
+	static NOINLINE bool parse(T& v, const char* name, indexed_hash& out_value)
+	{
+		hash h;
+		if (!parse_wrapper<T, hash>::parse(v, name, h)) {
+			return false;
+		}
+
+		out_value = static_cast<indexed_hash>(h);
+		return true;
+	}
+};
+#endif
+
 template<typename T>
 struct parse_wrapper<T, difficulty_type>
 {

src/keccak.h

@@ -17,6 +17,8 @@
 
 #pragma once
 
+#include "keccak_constexpr.h"
+
 namespace p2pool {
 
 enum KeccakParams {
@@ -26,12 +28,6 @@ enum KeccakParams {
 
 extern const uint64_t keccakf_rndc[24];
 
-// keccak hash of a single 0x00 byte
-constexpr hash keccak_0x00{ 0xbc, 0x36, 0x78, 0x9e, 0x7a, 0x1e, 0x28, 0x14, 0x36, 0x46, 0x42, 0x29, 0x82, 0x8f, 0x81, 0x7d, 0x66, 0x12, 0xf7, 0xb4, 0x77, 0xd6, 0x65, 0x91, 0xff, 0x96, 0xa9, 0xe0, 0x64, 0xbc, 0xc9, 0x8a };
-
-// keccak hash of "subaddress_viewpub"
-constexpr hash keccak_subaddress_viewpub{ 0x40, 0xb2, 0x0e, 0x14, 0xc5, 0x9e, 0xdc, 0x32, 0x57, 0xb1, 0x71, 0xb0, 0xf3, 0x76, 0x27, 0x01, 0x8e, 0x92, 0x45, 0xed, 0xd5, 0x2a, 0x69, 0x0b, 0xf6, 0xd9, 0xe6, 0x21, 0xa0, 0x98, 0xb9, 0x6a };
-
 typedef void (*keccakf_func)(std::array<uint64_t, 25>&);
 extern keccakf_func keccakf;
 
@@ -53,7 +49,7 @@ FORCEINLINE void keccak(const uint8_t* in, int inlen, uint8_t (&md)[N])
 }
 
 template<typename T>
-FORCEINLINE void keccak_custom(T&& in, int inlen, uint8_t* md, int mdlen)
+FORCEINLINE void keccak_custom(T&& in, int inlen, uint8_t* md, int mdlen, bool SHA3 = false)
 {
 	std::array<uint64_t, 25> st = {};
 
@@ -80,7 +76,7 @@ FORCEINLINE void keccak_custom(T&& in, int inlen, uint8_t* md, int mdlen)
 		temp[i] = in(offset + i);
 	}
 
-	temp[inlen++] = 1;
+	temp[inlen++] = SHA3 ? 6 : 1;
 	memset(temp + inlen, 0, rsiz - inlen);
 	temp[rsiz - 1] |= 0x80;
 

src/keccak_constexpr.h

@@ -0,0 +1,113 @@
+/*
+ * This file is part of the Monero P2Pool <https://github.com/SChernykh/p2pool>
+ * Copyright (c) 2021-2025 SChernykh <https://github.com/SChernykh>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+namespace p2pool {
+
+namespace ConstexprKeccak
+{
+
+template<int ROUNDS>
+static FORCEINLINE constexpr void keccakf(std::array<uint64_t, 25>& st)
+{
+	constexpr uint64_t round_constants[24] = 
+	{
+		0x0000000000000001, 0x0000000000008082, 0x800000000000808a,
+		0x8000000080008000, 0x000000000000808b, 0x0000000080000001,
+		0x8000000080008081, 0x8000000000008009, 0x000000000000008a,
+		0x0000000000000088, 0x0000000080008009, 0x000000008000000a,
+		0x000000008000808b, 0x800000000000008b, 0x8000000000008089,
+		0x8000000000008003, 0x8000000000008002, 0x8000000000000080, 
+		0x000000000000800a, 0x800000008000000a, 0x8000000080008081,
+		0x8000000000008080, 0x0000000080000001, 0x8000000080008008
+	};
+	constexpr int order[25] = { 1, 6, 9, 22, 14, 20, 2, 12, 13, 19, 23, 15, 4, 24, 21, 8, 16, 5, 3, 18, 17, 11, 7, 10, 1 };
+	constexpr int shift[24] = { 44, 20, 61, 39, 18, 62, 43, 25, 8, 56, 41, 27, 14, 2, 55, 45, 36, 28, 21, 15, 10, 6, 3, 1 };
+
+	for (int round = 0; round < ROUNDS; ++round) {
+		uint64_t bc[5] = {};
+
+		// Theta
+		for (int i = 0; i < 5; ++i) bc[i] = st[i] ^ st[i + 5] ^ st[i + 10] ^ st[i + 15] ^ st[i + 20];
+
+		for (int i = 0; i < 5; ++i) {
+			const uint64_t t = bc[(i + 4) % 5] ^ ((bc[(i + 1) % 5] << 1) | (bc[(i + 1) % 5] >> 63));
+			for (int j = 0; j < 25; j += 5) st[i + j] ^= t;
+		}
+
+		// Rho Pi
+		const auto st0 = st;
+		for (int i = 0; i < 24; ++i) st[order[i]] = (st0[order[i + 1]] << shift[i]) | (st0[order[i + 1]] >> (64 - shift[i]));
+
+		//  Chi
+		for (int i = 0; i < 25; i += 5) {
+			const uint64_t t[5] = { st[i], st[i + 1], st[i + 2], st[i + 3], st[i + 4] };
+			for (int j = 0; j < 5; ++j) st[i + j] ^= ~t[(j + 1) % 5] & t[(j + 2) % 5];
+		}
+
+		// Iota
+		st[0] ^= round_constants[round];
+	}
+}
+
+} // namespace ConstexprKeccak
+
+template<int len>
+static constexpr hash keccak(const char (&input)[len])
+{
+	constexpr int rsiz = 136;
+	constexpr int inlen = len - 1;
+	static_assert(inlen < rsiz, "Too long input");
+
+	uint8_t temp[rsiz] = {};
+
+	for (int i = 0; i < inlen; ++i) {
+		temp[i] = static_cast<uint8_t>(input[i]);
+	}
+
+	temp[inlen] = 1;
+	temp[rsiz - 1] |= 0x80;
+
+	std::array<uint64_t, 25> st = {};
+
+	for (int i = 0; i < rsiz / 8; i++) {
+		uint64_t k = 0;
+		for (int j = 0; j < 8; ++j) {
+			k |= static_cast<uint64_t>(temp[i * 8 + j]) << (j * 8);
+		}
+		st[i] ^= k;
+	}
+
+	ConstexprKeccak::keccakf<24>(st);
+
+	hash result{};
+
+	for (size_t i = 0; i < HASH_SIZE; ++i) {
+		result.h[i] = static_cast<uint8_t>(st[i / 8] >> ((i % 8) * 8));
+	}
+
+	return result;
+}
+
+constexpr hash keccak_0x00 = keccak("\0");
+constexpr hash keccak_subaddress_viewpub = keccak("subaddress_viewpub");
+constexpr hash keccak_onion_address_v3 = keccak("onion_address_v3");
+
+static_assert(keccak_0x00.u64<0>() == 0x14281E7A9E7836BCULL, "constexpr keccak code check failed");
+
+} // namespace p2pool

src/log.h

@@ -184,6 +184,11 @@ template<> struct Stream::Entry<char>
 	static FORCEINLINE void put(char c, Stream* wrapper) { wrapper->writeBuf(&c, 1); }
 };
 
+template<> struct Stream::Entry<std::string_view>
+{
+	static FORCEINLINE void put(const std::string_view& data, Stream* wrapper) { wrapper->writeBuf(data.data(), data.size()); }
+};
+
 #define INT_ENTRY(x) \
 template<> struct Stream::Entry<x> { static FORCEINLINE void put(x data, Stream* wrapper) { wrapper->writeInt(data); } };
 
@@ -259,6 +264,13 @@ template<> struct Stream::Entry<hash>
 	}
 };
 
+#ifdef WITH_INDEXED_HASHES
+template<> struct Stream::Entry<indexed_hash>
+{
+	static FORCEINLINE void put(const indexed_hash& data, Stream* wrapper) { Stream::Entry<hash>::put(data, wrapper); }
+};
+#endif
+
 template<> struct Stream::Entry<difficulty_type>
 {
 	static NOINLINE void put(const difficulty_type& data, Stream* wrapper)
@@ -584,7 +596,12 @@ struct DummyStream
 
 #define LOGINFO(level, ...) SIDE_EFFECT_CHECK(level, log_category_prefix << __VA_ARGS__)
 #define LOGWARN(level, ...) SIDE_EFFECT_CHECK(level, log_category_prefix << __VA_ARGS__)
+
+#ifdef P2POOL_ABORT_ON_LOG_ERROR
+#define LOGERR(level, ...) do { SIDE_EFFECT_CHECK(level, log_category_prefix << __VA_ARGS__); abort(); } while (0)
+#else
 #define LOGERR(level, ...) SIDE_EFFECT_CHECK(level, log_category_prefix << __VA_ARGS__)
+#endif
 
 #else
 

src/main.cpp

@@ -106,6 +106,8 @@ void p2pool_usage()
 #endif
 		"--no-stratum-http     Disable HTTP on Stratum ports\n"
 		"--full-validation     Enables full share validation / increases CPU usage\n"
+		"--onion-address       Tell other peers to use this .onion address to connect to this node through TOR\n"
+		"--no-clearnet-p2p     Forces P2P server to listen on 127.0.0.1 and to not connect to clearnet IPs\n"
 		"--help                Show this help message\n\n"
 		"Example command line:\n\n"
 		"%s --host 127.0.0.1 --rpc-port 18081 --zmq-port 18083 --wallet YOUR_WALLET_ADDRESS --stratum 0.0.0.0:%d --p2p 0.0.0.0:%d\n\n",
@@ -340,6 +342,10 @@ int main(int argc, char* argv[])
 
 	p2pool::destroy_crypto_cache();
 
+#ifdef WITH_INDEXED_HASHES
+	p2pool::indexed_hash::cleanup_storage();
+#endif
+
 	p2pool::log::stop();
 
 	uv_loop_close(uv_default_loop());

src/merge_mining_client_tari.cpp

@@ -235,26 +235,24 @@ void MergeMiningClientTari::on_external_block(const PoolBlock& block)
 		return;
 	}
 
-	std::vector<std::pair<hash, std::vector<uint8_t>>> mm_extra;
-	mm_extra.reserve(block.m_mergeMiningExtra.size());
-
-	// Filter aux chain data only
-	for (const auto& i : block.m_mergeMiningExtra) {
-		if (i.first != keccak_subaddress_viewpub) {
-			mm_extra.emplace_back(i.first, i.second);
-		}
-	}
-
-	std::vector<hash> aux_ids;
-	std::vector<AuxChainData> aux_chains;
-
 	// All aux chains in this block + the P2Pool sidechain
-	aux_ids.reserve(mm_extra.size() + 1);
+	std::vector<hash> aux_ids;
 
 	// All aux chains in this block
-	aux_chains.reserve(mm_extra.size());
+	std::vector<AuxChainData> aux_chains;
+
+	aux_ids.reserve(block.m_mergeMiningExtra.size() + 1);
+	aux_chains.reserve(block.m_mergeMiningExtra.size() + 1);
+
+	uint64_t mm_extra_size = 0;
+
+	for (const auto& i : block.m_mergeMiningExtra) {
+		// Filter aux chain data only
+		if ((i.first == keccak_subaddress_viewpub) || (i.first == keccak_onion_address_v3)) {
+			continue;
+		}
+		++mm_extra_size;
 
-	for (const auto& i : mm_extra) {
 		hash data;
 		difficulty_type diff;
 		{
@@ -327,20 +325,34 @@ void MergeMiningClientTari::on_external_block(const PoolBlock& block)
 	LOGINFO(0, log::LightGreen() << "External aux job solution found. Processing it!");
 
 	// coinbase_merkle_proof
-
-	std::vector<std::vector<hash>> tree;
-
-	merkle_hash_full_tree(block.m_transactions, tree);
-
+	root_hash root;
 	std::vector<hash> proof;
 	uint32_t path;
 
-	if (!get_merkle_proof(tree, block.m_transactions[0], proof, path)) {
-		LOGWARN(3, "on_external_block: get_merkle_proof failed for coinbase transaction");
+#ifdef WITH_INDEXED_HASHES
+	std::vector<hash> transactions;
+	transactions.reserve(block.m_transactions.size());
+
+	for (const auto& h : block.m_transactions) {
+		transactions.emplace_back(h);
+	}
+#else
+	const std::vector<hash>& transactions = block.m_transactions;
+#endif
+
+	if (!merkle_hash_with_proof(transactions, 0, proof, path, root)) {
+		LOGWARN(3, "on_external_block: merkle_hash_with_proof failed for coinbase transaction");
+		return;
+	}
+
+	if (!verify_merkle_proof(transactions[0], proof, path, root)) {
+		LOGWARN(3, "on_external_block: verify_merkle_proof failed for coinbase transaction");
 		return;
 	}
 
 	std::vector<uint8_t> coinbase_merkle_proof;
+	coinbase_merkle_proof.reserve(proof.size() * HASH_SIZE);
+	
 	for (const hash& h : proof) {
 		coinbase_merkle_proof.insert(coinbase_merkle_proof.end(), h.h, h.h + HASH_SIZE);
 	}
@@ -368,7 +380,7 @@ void MergeMiningClientTari::on_external_block(const PoolBlock& block)
 	uint32_t aux_merkle_proof_path = 0;
 
 	const hash sidechain_id = block.m_sidechainId;
-	const uint32_t n_aux_chains = static_cast<uint32_t>(mm_extra.size() + 1);
+	const uint32_t n_aux_chains = static_cast<uint32_t>(mm_extra_size + 1);
 
 	std::vector<hash> hashes(n_aux_chains);
 
@@ -398,15 +410,18 @@ void MergeMiningClientTari::on_external_block(const PoolBlock& block)
 
 	hashes[aux_slot] = sidechain_id;
 
-	merkle_hash_full_tree(hashes, tree);
+	if (!merkle_hash_with_proof(hashes, chain_params.aux_hash, aux_merkle_proof, aux_merkle_proof_path, root)) {
+		LOGWARN(3, "on_external_block: merkle_hash_with_proof failed for the aux hash");
+		return;
+	}
 
-	if (tree.empty() || tree.back().empty() || (tree.back().front() != block.m_merkleRoot)) {
+	if (root != block.m_merkleRoot) {
 		LOGWARN(3, "on_external_block: merkle root didn't match");
 		return;
 	}
 
-	if (!get_merkle_proof(tree, chain_params.aux_hash, aux_merkle_proof, aux_merkle_proof_path)) {
-		LOGWARN(3, "on_external_block: get_merkle_proof failed for the aux hash");
+	if (!verify_merkle_proof(chain_params.aux_hash, aux_merkle_proof, aux_merkle_proof_path, root)) {
+		LOGWARN(3, "on_external_block: verify_merkle_proof failed for the aux hash");
 		return;
 	}
 
@@ -894,7 +909,7 @@ bool MergeMiningClientTari::TariServer::connect_upstream(TariClient* downstream)
 
 	upstream->m_owner = this;
 	upstream->m_port = port;
-	upstream->m_isV6 = is_v6;
+	upstream->m_addressType = is_v6 ? Client::AddressType::IPv6 : Client::AddressType::IPv4;
 
 	if (!str_to_ip(is_v6, ip.c_str(), upstream->m_addr)) {
 		return_client(upstream);
@@ -979,6 +994,10 @@ bool MergeMiningClientTari::TariClient::on_connect()
 		// Check if the incoming connection (downstream) has already sent something that needs to be relayed
 		TariClient* downstream = m_pairedClient;
 
+		if (!downstream) {
+			return false;
+		}
+
 		const std::vector<uint8_t>& v = downstream->m_pendingData;
 
 		if (!v.empty()) {

src/merkle.cpp

@@ -128,6 +128,98 @@ void merkle_hash_full_tree(const std::vector<hash>& hashes, std::vector<std::vec
 	}
 }
 
+bool merkle_hash_with_proof(const std::vector<hash>& hashes, const hash& hash_to_prove, std::vector<hash>& proof, uint32_t& path, root_hash& root)
+{
+	for (size_t i = 0, n = hashes.size(); i < n; ++i) {
+		if (hashes[i] == hash_to_prove) {
+			return merkle_hash_with_proof(hashes, i, proof, path, root);
+		}
+	}
+	return false;
+}
+
+bool merkle_hash_with_proof(const std::vector<hash>& hashes, size_t index_to_prove, std::vector<hash>& proof, uint32_t& path, root_hash& root)
+{
+	const size_t count = hashes.size();
+
+	proof.clear();
+	path = 0;
+
+	if ((count == 0) || (index_to_prove >= count)) {
+		root.clear();
+		return false;
+	}
+
+	const uint8_t* h = hashes[0].h;
+
+	if (count == 1) {
+		root = root_hash(hashes[0]);
+	}
+	else if (count == 2) {
+		keccak(h, HASH_SIZE * 2, root.h);
+
+		proof.reserve(1);
+		proof.emplace_back(hashes[index_to_prove ^ 1]);
+		path = static_cast<uint32_t>(index_to_prove);
+	}
+	else {
+		hash h2 = hashes[index_to_prove];
+
+		size_t cnt = 1, proof_max_size = 0;
+		do {
+			cnt <<= 1;
+			++proof_max_size;
+		} while (cnt <= count);
+		cnt >>= 1;
+
+		proof.reserve(proof_max_size);
+
+		std::vector<hash> tmp_ints(cnt);
+
+		const size_t k = cnt * 2 - count;
+		memcpy(tmp_ints.data(), h, k * HASH_SIZE);
+
+		for (size_t i = k, j = k; j < cnt; i += 2, ++j) {
+			keccak(h + i * HASH_SIZE, HASH_SIZE * 2, tmp_ints[j].h);
+
+			if (hashes[i] == h2) {
+				proof.emplace_back(hashes[i + 1]);
+				h2 = tmp_ints[j];
+			}
+			else if (hashes[i + 1] == h2) {
+				proof.emplace_back(hashes[i]);
+				h2 = tmp_ints[j];
+				path = 1;
+			}
+		}
+
+		while (cnt >= 2) {
+			cnt >>= 1;
+			for (size_t i = 0, j = 0; j < cnt; i += 2, ++j) {
+				hash tmp;
+				keccak(tmp_ints[i].h, HASH_SIZE * 2, tmp.h);
+
+				if (tmp_ints[i] == h2) {
+					proof.emplace_back(tmp_ints[i + 1]);
+					h2 = tmp;
+					path <<= 1;
+				}
+				else if (tmp_ints[i + 1] == h2) {
+					proof.emplace_back(tmp_ints[i]);
+					h2 = tmp;
+					path = (path << 1) | 1;
+				}
+
+				tmp_ints[j] = tmp;
+			}
+		}
+
+		root = static_cast<root_hash>(tmp_ints[0]);
+	}
+
+	return true;
+}
+
 bool get_merkle_proof(const std::vector<std::vector<hash>>& tree, const hash& h, std::vector<hash>& proof, uint32_t& path)
 {
 	if (tree.empty()) {
@@ -156,7 +248,7 @@ bool get_merkle_proof(const std::vector<std::vector<hash>>& tree, const hash& h,
 
 	if (count == 2) {
 		proof.emplace_back(hashes[index ^ 1]);
-		path = index & 1;
+		path = static_cast<uint32_t>(index);
 	}
 	else {
 		size_t cnt = 1;

src/merkle.h

@@ -22,6 +22,9 @@ namespace p2pool {
 void merkle_hash(const std::vector<hash>& hashes, root_hash& root);
 void merkle_hash_full_tree(const std::vector<hash>& hashes, std::vector<std::vector<hash>>& tree);
 
+bool merkle_hash_with_proof(const std::vector<hash>& hashes, const hash& hash_to_prove, std::vector<hash>& proof, uint32_t& path, root_hash& root);
+bool merkle_hash_with_proof(const std::vector<hash>& hashes, size_t index_to_prove, std::vector<hash>& proof, uint32_t& path, root_hash& root);
+
 bool get_merkle_proof(const std::vector<std::vector<hash>>& tree, const hash& h, std::vector<hash>& proof, uint32_t& path);
 
 root_hash get_root_from_proof(hash h, const std::vector<hash>& proof, size_t index, size_t count);

src/p2p_server.cpp

@@ -47,6 +47,7 @@
 LOG_CATEGORY(P2PServer)
 
 static constexpr char saved_peer_list_file_name[] = "p2pool_peers.txt";
+static constexpr char saved_onion_peer_list_file_name[] = "p2pool_onion_peers.txt";
 static const char* seed_nodes[] = { "seeds.p2pool.io", "main.p2poolpeers.net", "main.gupax.io", "" };
 static const char* seed_nodes_mini[] = { "seeds-mini.p2pool.io", "mini.p2poolpeers.net", "mini.gupax.io", "" };
 static const char* seed_nodes_nano[] = { "seeds-nano.p2pool.io", "nano.p2poolpeers.net", "nano.gupax.io", ""};
@@ -57,6 +58,11 @@ static constexpr uint64_t PEER_REQUEST_DELAY = 60;
 
 namespace p2pool {
 
+static constexpr hash seed_onion_nodes[] = {
+	from_onion_v3_const("p2pseeds5qoenuuseyuqxhzzefzxpbhiq4z4h5hfbry5dxd5y2fwudyd.onion"),
+	from_onion_v3_const("p2pseedtwyepi4crkf4akceen4twejcptnsbm6gjmzdfgxua57hiijid.onion")
+};
+
 P2PServer::P2PServer(p2pool* pool)
 	: TCPServer(DEFAULT_BACKLOG, P2PClient::allocate, pool->params().m_socks5Proxy)
 	, m_pool(pool)
@@ -72,6 +78,7 @@ P2PServer::P2PServer(p2pool* pool)
 	, m_timerInterval(2)
 	, m_seenGoodPeers(false)
 	, m_peerListLastSaved(0)
+	, m_numOnionConnections(0)
 	, m_lookForMissingBlocks(true)
 	, m_fastestPeer(nullptr)
 	, m_newP2PoolVersionDetected(false)
@@ -87,6 +94,7 @@ P2PServer::P2PServer(p2pool* pool)
 	m_rng.discard(10000);
 
 	m_peerId = m_rng();
+	m_peerId_TOR = m_rng();
 
 	const Params& params = pool->params();
 
@@ -274,7 +282,15 @@ void P2PServer::connect_to_peers(const std::string& peer_list)
 	parse_address_list(peer_list,
 		[this](bool is_v6, const std::string& /*address*/, std::string ip, int port)
 		{
-			if (!m_pool->params().m_dns || resolve_host(ip, is_v6)) {
+			const Params& params = m_pool->params();
+
+			if (!m_socks5Proxy.empty() && (ip.find_first_not_of("0123456789.:") != std::string::npos)) {
+				// Assume it's a domain name and use the proxy to resolve it
+				if (!connect_to_peer(ip, port)) {
+					LOGERR(5, "connect_to_peers: failed to connect to " << ip);
+				}
+			}
+			else if (!params.m_noClearnetP2P && (!params.m_dns || resolve_host(ip, is_v6))) {
 				if (!connect_to_peer(is_v6, ip.c_str(), port)) {
 					LOGERR(5, "connect_to_peers: failed to connect to " << ip);
 				}
@@ -311,15 +327,23 @@ void P2PServer::update_peer_connections()
 	uint64_t newer_version_p2pool = 0;
 
 	unordered_set<raw_ip> connected_clients;
+	unordered_set<std::string_view> connected_clients_domain;
 
 	connected_clients.reserve(m_numConnections);
+
+	if (!m_socks5Proxy.empty()) {
+		connected_clients_domain.reserve(m_numConnections);
+	}
+
 	for (P2PClient* client = static_cast<P2PClient*>(m_connectedClientsList->m_next); client != m_connectedClientsList; client = static_cast<P2PClient*>(client->m_next)) {
 		const int timeout = client->m_handshakeComplete ? 300 : 10;
-		if ((cur_time >= client->m_lastAlive + timeout) && (client->m_socks5ProxyState == Client::Socks5ProxyState::Default)) {
-			const uint64_t idle_time = static_cast<uint64_t>(cur_time - client->m_lastAlive);
-			LOGWARN(5, "peer " << static_cast<char*>(client->m_addrString) << " has been idle for " << idle_time << " seconds, disconnecting");
-			client->close();
-			continue;
+		if (client->m_lastAlive && (cur_time >= client->m_lastAlive + timeout)) {
+			if (client->m_socks5ProxyState == Client::Socks5ProxyState::Default) {
+				const uint64_t idle_time = static_cast<uint64_t>(cur_time - client->m_lastAlive);
+				LOGWARN(5, "peer " << static_cast<char*>(client->m_addrString) << " has been idle for " << idle_time << " seconds, disconnecting");
+				client->close();
+				continue;
+			}
 		}
 
 		if (client->m_handshakeComplete && client->m_lastBroadcastTimestamp) {
@@ -337,7 +361,19 @@ void P2PServer::update_peer_connections()
 			}
 		}
 
-		connected_clients.insert(client->m_addr);
+		if ((client->m_addressType == Client::AddressType::IPv4) || (client->m_addressType == Client::AddressType::IPv6)) {
+			connected_clients.insert(client->m_addr);
+		}
+		else if (!m_socks5Proxy.empty() && (client->m_addressType == Client::AddressType::DomainName)) {
+			const char* c = strchr(client->m_addrString, ':');
+			if (c) {
+				connected_clients_domain.emplace(client->m_addrString, c - client->m_addrString);
+			}
+			else {
+				connected_clients_domain.emplace(client->m_addrString);
+			}
+		}
+
 		if (client->is_good()) {
 			has_good_peers = true;
 			if ((client->m_pingTime >= 0) && (!m_fastestPeer || (m_fastestPeer->m_pingTime > client->m_pingTime))) {
@@ -388,19 +424,52 @@ void P2PServer::update_peer_connections()
 		N = static_cast<uint32_t>(peer_list.size());
 	}
 
+	uint32_t num_outgoing = m_numConnections - m_numIncomingConnections;
+
+	// Try to have at least N/2 outgoing onion connections
+	if (!m_socks5Proxy.empty()) {
+		std::vector<hash> pubkeys = m_pool->side_chain().seen_onion_pubkeys();
+
+		// Add seed nodes
+		pubkeys.insert(pubkeys.end(), seed_onion_nodes, seed_onion_nodes + array_size(seed_onion_nodes));
+
+		for (uint32_t i = m_numOnionConnections, n = N / 2; (i < n) && !pubkeys.empty();) {
+			const uint64_t k = get_random64() % pubkeys.size();
+			const std::string addr = to_onion_v3(pubkeys[k]);
+
+			int port = DEFAULT_P2P_PORT_ONION;
+
+			for (const hash& seed_onion : seed_onion_nodes) {
+				if (pubkeys[k] == seed_onion) {
+					const SideChain& s = m_pool->side_chain();
+					port = s.is_mini() ? DEFAULT_P2P_PORT_MINI : (s.is_nano() ? DEFAULT_P2P_PORT_NANO : DEFAULT_P2P_PORT);
+					break;
+				}
+			}
+
+			if ((connected_clients_domain.find(addr) == connected_clients_domain.end()) && connect_to_peer(addr, port)) {
+				++i;
+				++num_outgoing;
+			}
+
+			pubkeys[k] = pubkeys.back();
+			pubkeys.pop_back();
+		}
+	}
+
 	// Try to have at least N outgoing connections (N defaults to 10, can be set via --out-peers command line parameter)
-	for (uint32_t i = m_numConnections - m_numIncomingConnections; (i < N) && !peer_list.empty();) {
-		const uint64_t k = get_random64() % peer_list.size();
-		const Peer& peer = peer_list[k];
+	if (!m_pool->params().m_noClearnetP2P) {
+		while ((num_outgoing < N) && !peer_list.empty()) {
+			const uint64_t k = get_random64() % peer_list.size();
+			const Peer& peer = peer_list[k];
 
-		if ((connected_clients.find(peer.m_addr) == connected_clients.end()) && connect_to_peer(peer.m_isV6, peer.m_addr, peer.m_port)) {
-			++i;
-		}
+			if ((connected_clients.find(peer.m_addr) == connected_clients.end()) && connect_to_peer(peer.m_isV6, peer.m_addr, peer.m_port)) {
+				++num_outgoing;
+			}
 
-		if (k + 1 < peer_list.size()) {
 			peer_list[k] = peer_list.back();
+			peer_list.pop_back();
 		}
-		peer_list.pop_back();
 	}
 
 	if (!has_good_peers && ((m_timerCounter % 10) == 0) && (SideChain::network_type() == NetworkType::Mainnet)) {
@@ -533,6 +602,31 @@ void P2PServer::save_peer_list()
 	f.close();
 
 	LOGINFO(5, "peer list saved (" << peer_list.size() << " peers)");
+
+	const SideChain& s = m_pool->side_chain();
+
+	if (s.onion_pubkeys_count() > 0) {
+		const std::string onion_path = DATA_DIR + saved_onion_peer_list_file_name;
+
+		f.open(onion_path, std::ios::binary);
+
+		if (!f.is_open()) {
+			LOGERR(1, "failed to save onion peer list " << onion_path << ": error " << errno);
+		}
+		else {
+			const std::vector<hash> pubkeys = s.seen_onion_pubkeys();
+
+			for (const hash& h : pubkeys) {
+				f << to_onion_v3(h) << '\n';
+			}
+
+			f.flush();
+			f.close();
+
+			LOGINFO(5, "onion peer list saved (" << pubkeys.size() << " peers)");
+		}
+	}
+
 	m_peerListLastSaved = seconds_since_epoch();
 }
 
@@ -616,34 +710,54 @@ void P2PServer::load_peer_list()
 		}
 	};
 
+	SideChain& s = m_pool->side_chain();
+
 	if (m_pool->params().m_dns) {
-		if (m_pool->side_chain().is_default()) {
+		if (s.is_default()) {
 			load_from_seed_nodes(seed_nodes, DEFAULT_P2P_PORT);
 		}
-		else if (m_pool->side_chain().is_mini()) {
+		else if (s.is_mini()) {
 			load_from_seed_nodes(seed_nodes_mini, DEFAULT_P2P_PORT_MINI);
 		}
-		else if (m_pool->side_chain().is_nano()) {
+		else if (s.is_nano()) {
 			load_from_seed_nodes(seed_nodes_nano, DEFAULT_P2P_PORT_NANO);
 		}
 	}
 
-	// Finally load peers from p2pool_peers.txt
-	const std::string path = DATA_DIR + saved_peer_list_file_name;
+	// Finally load peers from p2pool_peers.txt and p2pool_onion_peers.txt
+	for (size_t i = 0, n = (m_socks5Proxy.empty() ? 1 : 2); i < n; ++i) {
+		const std::string path = DATA_DIR + (i ? saved_onion_peer_list_file_name : saved_peer_list_file_name);
 
-	std::ifstream f(path);
-	if (f.is_open()) {
-		std::string address;
-		while (f.good()) {
-			std::getline(f, address);
-			if (!address.empty()) {
-				if (!saved_list.empty()) {
-					saved_list += ',';
+		std::ifstream f(path);
+
+		if (f.is_open()) {
+			std::string address;
+			std::vector<hash> pubkeys;
+
+			while (f.good()) {
+				std::getline(f, address);
+
+				if (!address.empty()) {
+					if (i > 0) {
+						const hash h = from_onion_v3(address);
+						if (!h.empty()) {
+							pubkeys.emplace_back(h);
+						}
+					}
+					else {
+						if (!saved_list.empty()) {
+							saved_list += ',';
+						}
+						saved_list += address;
+					}
 				}
-				saved_list += address;
+			}
+			f.close();
+
+			if (i > 0) {
+				s.add_onion_pubkeys(pubkeys);
 			}
 		}
-		f.close();
 	}
 
 	if (saved_list.empty()) {
@@ -791,7 +905,7 @@ void P2PServer::remove_peer_from_list(const P2PClient* client)
 
 	for (auto it = m_peerList.begin(); it != m_peerList.end(); ++it) {
 		const Peer& p = *it;
-		if ((p.m_isV6 == client->m_isV6) && (p.m_port == client->m_listenPort) && (p.m_addr == client->m_addr)) {
+		if ((p.m_isV6 == client->isV6()) && (p.m_port == client->m_listenPort) && (p.m_addr == client->m_addr)) {
 			m_peerList.erase(it);
 			return;
 		}
@@ -842,7 +956,7 @@ P2PServer::Broadcast::Broadcast(const PoolBlock& block, const PoolBlock* parent)
 	// 0 outputs in the pruned blob
 	data->pruned_blob.push_back(0);
 
-	const uint64_t total_reward = std::accumulate(block.m_outputs.begin(), block.m_outputs.end(), 0ULL,
+	const uint64_t total_reward = std::accumulate(block.m_outputAmounts.begin(), block.m_outputAmounts.end(), 0ULL,
 		[](uint64_t a, const PoolBlock::TxOutput& b)
 		{
 			return a + b.m_reward;
@@ -1082,12 +1196,15 @@ uint64_t P2PServer::get_random64()
 
 void P2PServer::print_status()
 {
+	const uint64_t onion_list_size = m_pool->side_chain().onion_pubkeys_count();
+
 	MutexLock lock(m_peerListLock);
 
 	LOGINFO(0, "status" <<
-		"\nConnections    = " << m_numConnections.load() << " (" << m_numIncomingConnections.load() << " incoming)" <<
-		"\nPeer list size = " << m_peerList.size() <<
-		"\nUptime         = " << log::Duration(seconds_since_epoch() - m_pool->start_time())
+		"\nConnections     = " << m_numConnections.load() << " (" << m_numIncomingConnections.load() << " incoming, " << m_numOnionConnections.load() << " onion)"
+		"\nPeer list size  = " << m_peerList.size() <<
+		"\nOnion list size = " << onion_list_size <<
+		"\nUptime          = " << log::Duration(seconds_since_epoch() - m_pool->start_time())
 	);
 }
 
@@ -1416,6 +1533,7 @@ P2PServer::P2PClient::P2PClient()
 	, m_lastBlockrequestTimestamp(0)
 	, m_broadcastedHashes{}
 	, m_broadcastedHashesIndex(0)
+	, m_lastMoneroBlockBroadcastDigest{}
 {
 	m_p2pReadBuf[0] = '\0';
 }
@@ -1712,13 +1830,19 @@ void P2PServer::broadcast_monero_block(const uint8_t* data, uint32_t data_size,
 		return;
 	}
 
-	if (!duplicate_check_done && !store_monero_block_broadcast(data + sizeof(MoneroBlockBroadcastHeader), data_size - sizeof(MoneroBlockBroadcastHeader))) {
+	hash digest;
+	sha256(data + sizeof(MoneroBlockBroadcastHeader), data_size - sizeof(MoneroBlockBroadcastHeader), digest.h);
+
+	if (!duplicate_check_done && !store_monero_block_broadcast(digest)) {
 		LOGINFO(6, "broadcast_monero_block: skipping duplicate broadcast");
 		return;
 	}
 
 	for (P2PClient* client = static_cast<P2PClient*>(m_connectedClientsList->m_next); client != m_connectedClientsList; client = static_cast<P2PClient*>(client->m_next)) {
-		if ((source && (client == source)) || !client->is_good() || (client->m_protocolVersion < PROTOCOL_VERSION_1_4)) {
+		if ((source && (client == source)) ||
+			!client->is_good() ||
+			(client->m_protocolVersion < PROTOCOL_VERSION_1_4) ||
+			(client->m_lastMoneroBlockBroadcastDigest == digest)) {
 			continue;
 		}
 
@@ -1749,11 +1873,8 @@ void P2PServer::broadcast_monero_block(const uint8_t* data, uint32_t data_size,
 	}
 }
 
-bool P2PServer::store_monero_block_broadcast(const uint8_t* data, uint32_t data_size)
+bool P2PServer::store_monero_block_broadcast(const hash& digest)
 {
-	hash digest;
-	sha256(data, data_size, digest.h);
-
 	// Every message can be received from multiple peers, so broadcast it only once
 	MutexLock lock(m_MoneroBlockBroadcastsLock);
 	return m_MoneroBlockBroadcasts.emplace(*digest.u64(), seconds_since_epoch()).second;
@@ -1767,8 +1888,13 @@ void P2PServer::P2PClient::reset()
 {
 	P2PServer* server = static_cast<P2PServer*>(m_owner);
 
-	if (server && (server->m_fastestPeer == this)) {
-		server->m_fastestPeer = nullptr;
+	if (server) {
+		if (server->m_fastestPeer == this) {
+			server->m_fastestPeer = nullptr;
+		}
+		if (m_addressType == AddressType::DomainName) {
+			--server->m_numOnionConnections;
+		}
 	}
 
 	Client::reset();
@@ -1799,11 +1925,13 @@ void P2PServer::P2PClient::reset()
 		h = {};
 	}
 	m_broadcastedHashesIndex = 0;
+
+	m_lastMoneroBlockBroadcastDigest = {};
 }
 
 bool P2PServer::P2PClient::on_connect()
 {
-	const P2PServer* server = static_cast<P2PServer*>(m_owner);
+	P2PServer* server = static_cast<P2PServer*>(m_owner);
 
 	if (!server) {
 		return false;
@@ -1824,6 +1952,10 @@ bool P2PServer::P2PClient::on_connect()
 		}
 	}
 
+	if (m_addressType == AddressType::DomainName) {
+		++server->m_numOnionConnections;
+	}
+
 	const uint64_t cur_time = seconds_since_epoch();
 	m_connectedTime = cur_time;
 	m_lastAlive = cur_time;
@@ -2158,7 +2290,7 @@ bool P2PServer::P2PClient::send_handshake_challenge()
 				k >>= 8;
 			}
 
-			k = owner->get_peerId();
+			k = owner->get_peerId((m_addressType == AddressType::DomainName) && (strstr(m_addrString, ".onion:")));
 			memcpy(p, &k, sizeof(uint64_t));
 			p += sizeof(uint64_t);
 
@@ -2351,7 +2483,7 @@ bool P2PServer::P2PClient::on_handshake_challenge(const uint8_t* buf)
 	uint64_t peer_id;
 	memcpy(&peer_id, buf + CHALLENGE_SIZE, sizeof(uint64_t));
 
-	if (peer_id == server->get_peerId()) {
+	if ((peer_id == server->get_peerId(false)) || (peer_id == server->get_peerId(true))) {
 		LOGWARN(5, "tried to connect to self at " << static_cast<const char*>(m_addrString));
 		return false;
 	}
@@ -2456,7 +2588,7 @@ bool P2PServer::P2PClient::on_listen_port(const uint8_t* buf)
 
 	m_listenPort = port;
 
-	static_cast<P2PServer*>(m_owner)->update_peer_in_list(m_isV6, m_addr, port);
+	static_cast<P2PServer*>(m_owner)->update_peer_in_list(isV6(), m_addr, port);
 	return true;
 }
 
@@ -2669,7 +2801,7 @@ bool P2PServer::P2PClient::on_peer_list_request(const uint8_t*)
 				continue;
 			}
 
-			const Peer p{ client->m_isV6, client->m_addr, client->m_listenPort, 0, 0 };
+			const Peer p{ client->isV6(), client->m_addr, client->m_listenPort, 0, 0 };
 			++n;
 
 			// Use https://en.wikipedia.org/wiki/Reservoir_sampling algorithm
@@ -3069,8 +3201,10 @@ bool P2PServer::P2PClient::on_monero_block_broadcast(const uint8_t* buf, uint32_
 		return true;
 	}
 
+	sha256(buf, size, m_lastMoneroBlockBroadcastDigest.h);
+
 	// Ignore repeated old messages
-	if (!server->store_monero_block_broadcast(buf, size)) {
+	if (!server->store_monero_block_broadcast(m_lastMoneroBlockBroadcastDigest)) {
 		LOGINFO(6, "Repeated MONERO_BLOCK_BROADCAST - ignored");
 		return true;
 	}
@@ -3138,7 +3272,7 @@ bool P2PServer::P2PClient::on_monero_block_broadcast(const uint8_t* buf, uint32_
 		bool pow_check_passed;
 	};
 
-	Work* work = new Work{ {}, server, this, m_resetCounter, m_isV6, m_addr, pool->hasher(), std::move(blob), height, seed, diff, { buf0, buf0 + size0 }, false };
+	Work* work = new Work{ {}, server, this, m_resetCounter, isV6(), m_addr, pool->hasher(), std::move(blob), height, seed, diff, { buf0, buf0 + size0 }, false };
 	work->req.data = work;
 
 	const int err = uv_queue_work(&server->m_loop, &work->req,
@@ -3293,7 +3427,7 @@ bool P2PServer::P2PClient::handle_incoming_block_async(const PoolBlock* block, u
 		bool result;
 	};
 
-	Work* work = new Work{ {}, *block, this, server, m_resetCounter.load(), m_isV6, m_addr, {}, true };
+	Work* work = new Work{ {}, *block, this, server, m_resetCounter.load(), isV6(), m_addr, {}, true };
 	work->req.data = work;
 
 	const int err = uv_queue_work(&server->m_loop, &work->req,
@@ -3361,7 +3495,7 @@ void P2PServer::P2PClient::post_handle_incoming_block(p2pool* pool, const PoolBl
 		P2PClient* c = server->m_fastestPeer;
 		if (c && (c != this) && (c->m_broadcastMaxHeight >= block.m_sidechainHeight)) {
 			LOGINFO(5, "peer " << static_cast<char*>(c->m_addrString) << " is faster, sending BLOCK_REQUEST to it instead");
-			c->post_handle_incoming_block(pool, block, c->m_resetCounter.load(), c->m_isV6, c->m_addr, missing_blocks, true);
+			c->post_handle_incoming_block(pool, block, c->m_resetCounter.load(), c->isV6(), c->m_addr, missing_blocks, true);
 			return;
 		}
 	}

src/p2p_server.h

@@ -36,6 +36,8 @@ static constexpr int DEFAULT_P2P_PORT = 37889;
 static constexpr int DEFAULT_P2P_PORT_MINI = 37888;
 static constexpr int DEFAULT_P2P_PORT_NANO = 37890;
 
+static constexpr int DEFAULT_P2P_PORT_ONION = 28722;
+
 static constexpr uint32_t PROTOCOL_VERSION_1_0 = 0x00010000UL;
 static constexpr uint32_t PROTOCOL_VERSION_1_1 = 0x00010001UL;
 static constexpr uint32_t PROTOCOL_VERSION_1_2 = 0x00010002UL;
@@ -162,6 +164,8 @@ public:
 		hash m_broadcastedHashes[8];
 		uint32_t m_broadcastedHashesIndex;
 
+		hash m_lastMoneroBlockBroadcastDigest;
+
 		// log::Stream wrapper
 		struct SoftwareDisplayName
 		{
@@ -187,7 +191,7 @@ public:
 
 	void broadcast(const PoolBlock& block, const PoolBlock* parent);
 	[[nodiscard]] uint64_t get_random64();
-	[[nodiscard]] uint64_t get_peerId() const { return m_peerId; }
+	[[nodiscard]] uint64_t get_peerId(bool is_tor) const { return is_tor ? m_peerId_TOR : m_peerId; }
 
 	void print_status() override;
 	void show_peers_async();
@@ -220,7 +224,7 @@ public:
 	void broadcast_monero_block_handler();
 	void broadcast_monero_block(const uint8_t* data, uint32_t data_size, const P2PClient* source, bool duplicate_check_done);
 
-	bool store_monero_block_broadcast(const uint8_t* data, uint32_t data_size);
+	bool store_monero_block_broadcast(const hash& digest);
 
 private:
 	[[nodiscard]] const char* get_log_category() const override;
@@ -266,6 +270,7 @@ private:
 	uint64_t m_timerInterval;
 
 	uint64_t m_peerId;
+	uint64_t m_peerId_TOR;
 
 	mutable uv_mutex_t m_peerListLock;
 
@@ -285,6 +290,8 @@ private:
 	std::vector<Peer> m_peerListMonero;
 	std::atomic<uint64_t> m_peerListLastSaved;
 
+	std::atomic<uint32_t> m_numOnionConnections;
+
 	uv_mutex_t m_broadcastLock;
 	uv_async_t m_broadcastAsync;
 	std::vector<Broadcast*> m_broadcastQueue;

src/p2pool.cpp

@@ -42,6 +42,7 @@
 #include "keccak.h"
 #include "merkle.h"
 #include "merge_mining_client.h"
+#include "sha256.h"
 
 #ifdef WITH_TLS
 #include <openssl/curve25519.h>
@@ -204,9 +205,16 @@ p2pool::p2pool(int argc, char* argv[])
 
 	m_sideChain = new SideChain(this, type, p->m_mini ? "mini" : (p->m_nano ? "nano" : nullptr));
 
-	if (p->m_p2pAddresses.empty()) {
-		const int p2p_port = m_sideChain->is_mini() ? DEFAULT_P2P_PORT_MINI : (m_sideChain->is_nano() ? DEFAULT_P2P_PORT_NANO : DEFAULT_P2P_PORT);
+	const int p2p_port = m_sideChain->is_mini() ? DEFAULT_P2P_PORT_MINI : (m_sideChain->is_nano() ? DEFAULT_P2P_PORT_NANO : DEFAULT_P2P_PORT);
 
+	if (p->m_noClearnetP2P) {
+		char buf[48] = {};
+		log::Stream s(buf);
+		s << "127.0.0.1:" << p2p_port;
+
+		p->m_p2pAddresses = buf;
+	}
+	else if (p->m_p2pAddresses.empty()) {
 		char buf[48] = {};
 		log::Stream s(buf);
 		s << "[::]:" << p2p_port << ",0.0.0.0:" << p2p_port;
@@ -805,6 +813,7 @@ void p2pool::send_aux_job_donation()
 	}
 
 	Params::AuthorKey key;
+	ON_SCOPE_LEAVE([&key](){ secure_zero_memory(key); });
 
 	if (f.tellg() != static_cast<std::streampos>(sizeof(key))) {
 		LOGERR(1, "send_aux_job_donation: " << m_params->m_authorKeyFile << " has an invalid size");
@@ -868,8 +877,6 @@ void p2pool::send_aux_job_donation()
 		return;
 	}
 
-	OPENSSL_cleanse(&key, sizeof(key));
-
 	job.insert(job.end(), signature, signature + sizeof(signature));
 
 	m_p2pServer->broadcast_aux_job_donation_async(job.data(), static_cast<uint32_t>(job.size()), timestamp);
@@ -1146,7 +1153,10 @@ void p2pool::submit_block() const
 	}
 	request.append("\"]}");
 
-	m_p2pServer->store_monero_block_broadcast(blob.data(), static_cast<uint32_t>(blob.size()));
+	hash digest;
+	sha256(blob.data(), static_cast<uint32_t>(blob.size()), digest.h);
+
+	m_p2pServer->store_monero_block_broadcast(digest);
 
 	const Params::Host& host = current_host();
 
@@ -1243,7 +1253,7 @@ void p2pool::update_block_template()
 	if (m_updateSeed.exchange(false)) {
 		m_hasher->set_seed_async(data.seed_hash);
 	}
-	m_blockTemplate->update(data, *m_mempool, m_params->m_miningWallet, m_params->m_subaddress);
+	m_blockTemplate->update(data, *m_mempool, m_params);
 	stratum_on_block();
 	api_update_pool_stats();
 

src/params.cpp

@@ -73,12 +73,22 @@ Params::Params(int argc, char* const argv[])
 		}
 
 		if ((strcmp(argv[i], "--wallet") == 0) && (i + 1 < argc)) {
-			m_mainWallet.decode(argv[++i]);
+			const char* s = argv[++i];
+
+			if (!m_mainWallet.decode(s)) {
+				LOGERR(1, "Wallet " << s << " failed to decode");
+			}
+
 			ok = true;
 		}
 
 		if ((strcmp(argv[i], "--subaddress") == 0) && (i + 1 < argc)) {
-			m_subaddress.decode(argv[++i]);
+			const char* s = argv[++i];
+
+			if (!m_subaddress.decode(s)) {
+				LOGERR(1, "Subaddress " << s << " failed to decode");
+			}
+
 			ok = true;
 		}
 
@@ -268,6 +278,16 @@ Params::Params(int argc, char* const argv[])
 			ok = true;
 		}
 
+		if ((strcmp(argv[i], "--onion-address") == 0) && (i + 1 < argc)) {
+			m_onionAddress = argv[++i];
+			ok = true;
+		}
+
+		if (strcmp(argv[i], "--no-clearnet-p2p") == 0) {
+			m_noClearnetP2P = true;
+			ok = true;
+		}
+
 		if (!ok) {
 			// Wait to avoid log messages overlapping with printf() calls and making a mess on screen
 			std::this_thread::sleep_for(std::chrono::milliseconds(10));
@@ -278,6 +298,15 @@ Params::Params(int argc, char* const argv[])
 		}
 	}
 
+	if (!m_onionAddress.empty()) {
+		m_onionPubkey = from_onion_v3(m_onionAddress);
+
+		if (m_onionPubkey.empty()) {
+			LOGERR(1, "Failed to parse \"" << m_onionAddress << '"');
+			throw std::exception();
+		}
+	}
+
 	auto invalid_host = [](const Host& h)
 	{
 		if (!h.valid()) {
@@ -314,8 +343,14 @@ Params::Params(int argc, char* const argv[])
 	char display_wallet_buf[Wallet::ADDRESS_LENGTH] = {};
 
 	if (m_mainWallet.valid() && m_subaddress.valid()) {
-		m_miningWallet.assign(m_subaddress.spend_public_key(), m_mainWallet.view_public_key(), m_mainWallet.type(), false);
-		m_subaddress.encode(display_wallet_buf);
+		if (!m_miningWallet.assign(m_subaddress.spend_public_key(), m_mainWallet.view_public_key(), m_mainWallet.type(), false)) {
+			LOGERR(1, "Failed to configure the mining wallet, falling back to " << m_mainWallet);
+			m_miningWallet = m_mainWallet;
+			m_mainWallet.encode(display_wallet_buf);
+		}
+		else {
+			m_subaddress.encode(display_wallet_buf);
+		}
 	}
 	else if (m_mainWallet.valid()) {
 		m_miningWallet = m_mainWallet;
@@ -348,6 +383,16 @@ bool Params::valid() const
 		}
 	}
 
+	if (!m_mainWallet.torsion_check()) {
+		LOGERR(1, m_mainWallet << " didn't pass the torsion check. It will be incompatible with FCMP++.");
+		return false;
+	}
+
+	if (m_subaddress.valid() && !m_subaddress.torsion_check()) {
+		LOGERR(1, m_subaddress << " didn't pass the torsion check. It will be incompatible with FCMP++.");
+		return false;
+	}
+
 	if (m_mergeMiningHosts.size() > 10) {
 		LOGERR(1, "Too many merge mining blockchains.");
 		return false;

src/params.h

@@ -25,6 +25,10 @@ static constexpr uint64_t DEFAULT_STRATUM_BAN_TIME = 600;
 
 struct Params
 {
+#ifdef P2POOL_UNIT_TESTS
+	FORCEINLINE Params() {}
+#endif
+
 	Params(int argc, char* const argv[]);
 
 	bool valid() const;
@@ -124,6 +128,10 @@ struct Params
 	};
 #endif
 	bool m_enableFullValidation = false;
+
+	std::string m_onionAddress;
+	hash m_onionPubkey;
+	bool m_noClearnetP2P = false;
 };
 
 } // namespace p2pool

src/pool_block.cpp

@@ -90,7 +90,8 @@ PoolBlock& PoolBlock::operator=(const PoolBlock& b)
 	m_prevId = b.m_prevId;
 	m_nonce = b.m_nonce;
 	m_txinGenHeight = b.m_txinGenHeight;
-	m_outputs = b.m_outputs;
+	m_ephPublicKeys = b.m_ephPublicKeys;
+	m_outputAmounts = b.m_outputAmounts;
 	m_txkeyPub = b.m_txkeyPub;
 	m_extraNonceSize = b.m_extraNonceSize;
 	m_extraNonce = b.m_extraNonce;
@@ -139,7 +140,7 @@ PoolBlock& PoolBlock::operator=(const PoolBlock& b)
 std::vector<uint8_t> PoolBlock::serialize_mainchain_data(size_t* header_size, size_t* miner_tx_size, int* outputs_offset, int* outputs_blob_size, const uint32_t* nonce, const uint32_t* extra_nonce) const
 {
 	std::vector<uint8_t> data;
-	data.reserve(128 + m_outputs.size() * 39 + m_transactions.size() * HASH_SIZE);
+	data.reserve(std::min<size_t>(128 + m_outputAmounts.size() * 39 + m_transactions.size() * HASH_SIZE, 131072));
 
 	// Header
 	data.push_back(m_majorVersion);
@@ -169,18 +170,16 @@ std::vector<uint8_t> PoolBlock::serialize_mainchain_data(size_t* header_size, si
 		*outputs_offset = outputs_offset0;
 	}
 
-	writeVarint(m_outputs.size(), data);
+	writeVarint(m_outputAmounts.size(), data);
 
-	const uint8_t tx_type = get_tx_type();
+	for (size_t i = 0, n = m_outputAmounts.size(); i < n; ++i) {
+		const TxOutput& output = m_outputAmounts[i];
 
-	for (const TxOutput& output : m_outputs) {
 		writeVarint(output.m_reward, data);
-		data.push_back(tx_type);
-		data.insert(data.end(), output.m_ephPublicKey.h, output.m_ephPublicKey.h + HASH_SIZE);
-
-		if (tx_type == TXOUT_TO_TAGGED_KEY) {
-			data.push_back(static_cast<uint8_t>(output.m_viewTag));
-		}
+		data.push_back(TXOUT_TO_TAGGED_KEY);
+		const hash h = m_ephPublicKeys[i];
+		data.insert(data.end(), h.h, h.h + HASH_SIZE);
+		data.push_back(static_cast<uint8_t>(output.m_viewTag));
 	}
 
 	if (outputs_blob_size) {
@@ -230,8 +229,16 @@ std::vector<uint8_t> PoolBlock::serialize_mainchain_data(size_t* header_size, si
 	}
 
 	writeVarint(m_transactions.size() - 1, data);
+
+#ifdef WITH_INDEXED_HASHES
+	for (size_t i = 1, n = m_transactions.size(); i < n; ++i) {
+		const hash h = m_transactions[i];
+		data.insert(data.end(), h.h, h.h + HASH_SIZE);
+	}
+#else
 	const uint8_t* t = reinterpret_cast<const uint8_t*>(m_transactions.data());
 	data.insert(data.end(), t + HASH_SIZE, t + m_transactions.size() * HASH_SIZE);
+#endif
 
 #if POOL_BLOCK_DEBUG
 	if ((nonce == &m_nonce) && (extra_nonce == &m_extraNonce) && !m_mainChainDataDebug.empty() && (data != m_mainChainDataDebug)) {
@@ -374,15 +381,27 @@ bool PoolBlock::get_pow_hash(RandomX_Hasher_Base* hasher, uint64_t height, const
 		memcpy(hashes, tmp.h, HASH_SIZE);
 
 		count = m_transactions.size();
-		uint8_t* h = reinterpret_cast<uint8_t*>(m_transactions.data());
 
 		keccak(reinterpret_cast<uint8_t*>(hashes), HASH_SIZE * 3, tmp.h);
 
 		// Save the coinbase tx hash into the first element of m_transactions
-		memcpy(h, tmp.h, HASH_SIZE);
+		m_transactions[0] = static_cast<indexed_hash>(tmp);
 
 		root_hash tmp_root;
+
+#ifdef WITH_INDEXED_HASHES
+		std::vector<hash> transactions;
+		transactions.reserve(m_transactions.size());
+
+		for (const auto& h : m_transactions) {
+			transactions.emplace_back(h);
+		}
+
+		merkle_hash(transactions, tmp_root);
+#else
 		merkle_hash(m_transactions, tmp_root);
+#endif
+
 		memcpy(blob + blob_size, tmp_root.h, HASH_SIZE);
 		blob_size += HASH_SIZE;
 	}
@@ -397,24 +416,15 @@ bool PoolBlock::get_pow_hash(RandomX_Hasher_Base* hasher, uint64_t height, const
 
 uint64_t PoolBlock::get_payout(const Wallet& w) const
 {
-	const uint8_t tx_type = get_tx_type();
+	for (size_t i = 0, n = m_outputAmounts.size(); i < n; ++i) {
+		const TxOutput& out = m_outputAmounts[i];
 
-	for (size_t i = 0, n = m_outputs.size(); i < n; ++i) {
-		const TxOutput& out = m_outputs[i];
 		hash eph_public_key;
 
-		if (tx_type == TXOUT_TO_TAGGED_KEY) {
-			uint8_t view_tag;
-			const uint8_t expected_view_tag = out.m_viewTag;
-			if (w.get_eph_public_key(m_txkeySec, i, eph_public_key, view_tag, &expected_view_tag) && (eph_public_key == out.m_ephPublicKey)) {
-				return out.m_reward;
-			}
-		}
-		else {
-			uint8_t view_tag;
-			if (w.get_eph_public_key(m_txkeySec, i, eph_public_key, view_tag) && (eph_public_key == out.m_ephPublicKey)) {
-				return out.m_reward;
-			}
+		uint8_t view_tag;
+		const uint8_t expected_view_tag = out.m_viewTag;
+		if (w.get_eph_public_key(m_txkeySec, i, eph_public_key, view_tag, &expected_view_tag) && (m_ephPublicKeys[i] == eph_public_key)) {
+			return out.m_reward;
 		}
 	}
 

src/pool_block.h

@@ -98,17 +98,17 @@ struct PoolBlock
 
 	struct TxOutput
 	{
-		FORCEINLINE TxOutput() : m_ephPublicKey(), m_reward(0), m_viewTag(0) {}
-		FORCEINLINE TxOutput(uint64_t r, const hash& k, uint8_t view_tag) : m_ephPublicKey(k), m_reward(r), m_viewTag(view_tag) {}
+		FORCEINLINE TxOutput() : m_reward(0), m_viewTag(0) {}
+		FORCEINLINE TxOutput(uint64_t r, uint8_t view_tag) : m_reward(r), m_viewTag(view_tag) {}
 
-		hash m_ephPublicKey;
 		uint64_t m_reward : 56;
 		uint64_t m_viewTag : 8;
 	};
 
-	static_assert(sizeof(TxOutput) == sizeof(hash) + sizeof(uint64_t), "TxOutput bit packing didn't work with this compiler, fix the code!");
+	static_assert(sizeof(TxOutput) == sizeof(uint64_t), "TxOutput bit packing didn't work with this compiler, fix the code!");
 
-	std::vector<TxOutput> m_outputs;
+	std::vector<indexed_hash> m_ephPublicKeys;
+	std::vector<TxOutput> m_outputAmounts;
 
 	hash m_txkeyPub;
 	uint64_t m_extraNonceSize;
@@ -119,7 +119,7 @@ struct PoolBlock
 	root_hash m_merkleRoot;
 
 	// All block transaction hashes including the miner transaction hash at index 0
-	std::vector<hash> m_transactions;
+	std::vector<indexed_hash> m_transactions;
 
 	// Miner's wallet
 	Wallet m_minerWallet{ nullptr };
@@ -194,10 +194,6 @@ struct PoolBlock
 
 	uint64_t get_payout(const Wallet& w) const;
 
-	// Both tx types are allowed by Monero consensus during v15 because it needs to process pre-fork mempool transactions,
-	// but P2Pool can switch to using only TXOUT_TO_TAGGED_KEY for miner payouts starting from v15
-	FORCEINLINE uint8_t get_tx_type() const { return (m_majorVersion < HARDFORK_VIEW_TAGS_VERSION) ? TXOUT_TO_KEY : TXOUT_TO_TAGGED_KEY; }
-
 	typedef std::array<uint8_t, HASH_SIZE + NONCE_SIZE + EXTRA_NONCE_SIZE> full_id;
 
 	FORCEINLINE full_id get_full_id() const

src/pool_block_parser.inl

@@ -105,13 +105,14 @@ int PoolBlock::deserialize(const uint8_t* data, size_t size, const SideChain& si
 			if (num_outputs > std::numeric_limits<uint64_t>::max() / MIN_OUTPUT_SIZE) return __LINE__;
 			if (static_cast<uint64_t>(data_end - data) < num_outputs * MIN_OUTPUT_SIZE) return __LINE__;
 
-			m_outputs.resize(num_outputs);
-			m_outputs.shrink_to_fit();
+			m_ephPublicKeys.resize(num_outputs);
+			m_outputAmounts.resize(num_outputs);
 
-			const uint8_t expected_tx_type = get_tx_type();
+			m_ephPublicKeys.shrink_to_fit();
+			m_outputAmounts.shrink_to_fit();
 
 			for (uint64_t i = 0; i < num_outputs; ++i) {
-				TxOutput& t = m_outputs[i];
+				TxOutput& t = m_outputAmounts[i];
 
 				uint64_t reward;
 				READ_VARINT(reward);
@@ -124,15 +125,15 @@ int PoolBlock::deserialize(const uint8_t* data, size_t size, const SideChain& si
 				t.m_reward = reward;
 				total_reward += reward;
 
-				EXPECT_BYTE(expected_tx_type);
+				EXPECT_BYTE(TXOUT_TO_TAGGED_KEY);
 
-				READ_BUF(t.m_ephPublicKey.h, HASH_SIZE);
+				hash ephPublicKey;
+				READ_BUF(ephPublicKey.h, HASH_SIZE);
+				m_ephPublicKeys[i] = ephPublicKey;
 
-				if (expected_tx_type == TXOUT_TO_TAGGED_KEY) {
-					uint8_t view_tag;
-					READ_BYTE(view_tag);
-					t.m_viewTag = view_tag;
-				}
+				uint8_t view_tag;
+				READ_BYTE(view_tag);
+				t.m_viewTag = view_tag;
 			}
 
 			outputs_blob_size = static_cast<int>(data - data_begin) - outputs_offset;
@@ -225,17 +226,18 @@ int PoolBlock::deserialize(const uint8_t* data, size_t size, const SideChain& si
 		const int transactions_offset = static_cast<int>(data - data_begin);
 
 		std::vector<uint64_t> parent_indices;
+		std::vector<hash> transactions;
 		if (compact) {
 			if (static_cast<uint64_t>(data_end - data) < num_transactions) return __LINE__;
 
-			m_transactions.resize(1);
-			parent_indices.resize(1);
-
 			// limit reserved memory size because we can't check "num_transactions" properly here
 			const uint64_t k = std::min<uint64_t>(num_transactions + 1, 256);
-			m_transactions.reserve(k);
+			transactions.reserve(k);
 			parent_indices.reserve(k);
 
+			transactions.resize(1);
+			parent_indices.resize(1);
+
 			for (uint64_t i = 0; i < num_transactions; ++i) {
 				uint64_t parent_index;
 				READ_VARINT(parent_index);
@@ -245,7 +247,7 @@ int PoolBlock::deserialize(const uint8_t* data, size_t size, const SideChain& si
 					READ_BUF(id.h, HASH_SIZE);
 				}
 
-				m_transactions.emplace_back(id);
+				transactions.emplace_back(id);
 				parent_indices.emplace_back(parent_index);
 			}
 		}
@@ -253,13 +255,13 @@ int PoolBlock::deserialize(const uint8_t* data, size_t size, const SideChain& si
 			if (num_transactions > std::numeric_limits<uint64_t>::max() / HASH_SIZE) return __LINE__;
 			if (static_cast<uint64_t>(data_end - data) < num_transactions * HASH_SIZE) return __LINE__;
 
-			m_transactions.resize(1);
-			m_transactions.reserve(num_transactions + 1);
+			transactions.reserve(num_transactions + 1);
+			transactions.resize(1);
 
 			for (uint64_t i = 0; i < num_transactions; ++i) {
 				hash id;
 				READ_BUF(id.h, HASH_SIZE);
-				m_transactions.emplace_back(id);
+				transactions.emplace_back(id);
 			}
 		}
 
@@ -267,8 +269,6 @@ int PoolBlock::deserialize(const uint8_t* data, size_t size, const SideChain& si
 		const int transactions_blob_size = static_cast<int>(num_transactions) * HASH_SIZE;
 		const int transactions_blob_size_diff = transactions_blob_size - transactions_actual_blob_size;
 
-		m_transactions.shrink_to_fit();
-
 #if POOL_BLOCK_DEBUG
 		m_mainChainDataDebug.reserve((data - data_begin) + outputs_blob_size_diff + transactions_blob_size_diff);
 		m_mainChainDataDebug.assign(data_begin, data_begin + outputs_offset);
@@ -302,22 +302,42 @@ int PoolBlock::deserialize(const uint8_t* data, size_t size, const SideChain& si
 
 		READ_BUF(m_parent.h, HASH_SIZE);
 
+		m_transactions.clear();
+		m_transactions.reserve(transactions.size());
+
 		if (compact) {
 			const PoolBlock* parent = sidechain.find_block(m_parent);
 			if (!parent) {
 				return __LINE__;
 			}
 
-			for (uint64_t i = 1, n = m_transactions.size(); i < n; ++i) {
+			const uint64_t n = transactions.size();
+
+			if (n > 0) {
+				m_transactions.emplace_back(transactions[0]);
+			}
+
+			for (uint64_t i = 1; i < n; ++i) {
 				const uint64_t parent_index = parent_indices[i];
 				if (parent_index) {
 					if (parent_index >= parent->m_transactions.size()) {
 						return __LINE__;
 					}
-					m_transactions[i] = parent->m_transactions[parent_index];
+					transactions[i] = parent->m_transactions[parent_index];
+					m_transactions.emplace_back(parent->m_transactions[parent_index]);
+				}
+				else {
+					m_transactions.emplace_back(transactions[i]);
 				}
 			}
 		}
+		else {
+			for (const hash& h : transactions) {
+				m_transactions.emplace_back(h);
+			}
+		}
+
+		m_transactions.shrink_to_fit();
 
 		uint64_t num_uncles;
 		READ_VARINT(num_uncles);
@@ -420,7 +440,7 @@ int PoolBlock::deserialize(const uint8_t* data, size_t size, const SideChain& si
 			return __LINE__;
 		}
 
-		const uint8_t* transactions_blob = reinterpret_cast<uint8_t*>(m_transactions.data() + 1);
+		const uint8_t* transactions_blob = reinterpret_cast<uint8_t*>(transactions.data() + 1);
 
 #if POOL_BLOCK_DEBUG
 		memcpy(m_mainChainDataDebug.data() + outputs_offset, outputs_blob.data(), outputs_blob_size);

src/side_chain.cpp

@@ -101,7 +101,6 @@ SideChain::SideChain(p2pool* pool, NetworkType type, const char* pool_name)
 	m_curDifficulty = m_minDifficulty;
 
 	uv_rwlock_init_checked(&m_sidechainLock);
-	uv_mutex_init_checked(&m_seenWalletsLock);
 	uv_mutex_init_checked(&m_incomingBlocksLock);
 	uv_rwlock_init_checked(&m_curDifficultyLock);
 	uv_rwlock_init_checked(&m_watchBlockLock);
@@ -226,7 +225,6 @@ SideChain::~SideChain()
 	finish_precalc();
 
 	uv_rwlock_destroy(&m_sidechainLock);
-	uv_mutex_destroy(&m_seenWalletsLock);
 	uv_mutex_destroy(&m_incomingBlocksLock);
 	uv_rwlock_destroy(&m_curDifficultyLock);
 	uv_rwlock_destroy(&m_watchBlockLock);
@@ -238,7 +236,7 @@ SideChain::~SideChain()
 	s_networkType = NetworkType::Invalid;
 }
 
-void SideChain::fill_sidechain_data(PoolBlock& block, std::vector<MinerShare>& shares) const
+bool SideChain::fill_sidechain_data(PoolBlock& block, std::vector<MinerShare>& shares) const
 {
 	block.m_uncles.clear();
 
@@ -254,10 +252,7 @@ void SideChain::fill_sidechain_data(PoolBlock& block, std::vector<MinerShare>& s
 		block.m_txkeySecSeed = m_consensusHash;
 		get_tx_keys(block.m_txkeyPub, block.m_txkeySec, block.m_txkeySecSeed, block.m_prevId);
 
-		if (!get_shares(&block, shares)) {
-			LOGERR(6, "fill_sidechain_data: get_shares failed");
-		}
-		return;
+		return get_shares(&block, shares);
 	}
 
 	block.m_txkeySecSeed = (block.m_prevId == tip->m_prevId) ? tip->m_txkeySecSeed : tip->calculate_tx_key_seed();
@@ -350,9 +345,7 @@ void SideChain::fill_sidechain_data(PoolBlock& block, std::vector<MinerShare>& s
 		block.m_cumulativeDifficulty += it->second->m_difficulty;
 	}
 
-	if (!get_shares(&block, shares)) {
-		LOGERR(6, "fill_sidechain_data: get_shares failed");
-	}
+	return get_shares(&block, shares);
 }
 
 P2PServer* SideChain::p2pServer() const
@@ -406,7 +399,7 @@ bool SideChain::get_shares(const PoolBlock* tip, std::vector<MinerShare>& shares
 				return false;
 			}
 
-			PoolBlock* uncle = it->second;
+			const PoolBlock* uncle = it->second;
 
 			// Skip uncles which are already out of PPLNS window
 			if (tip->m_sidechainHeight - uncle->m_sidechainHeight >= m_chainWindowSize) {
@@ -698,8 +691,18 @@ bool SideChain::add_block(const PoolBlock& block)
 
 	PoolBlock* new_block = new PoolBlock(block);
 	{
-		MutexLock lock(m_seenWalletsLock);
+		WriteLock lock(m_seenDataLock);
+
 		m_seenWallets[new_block->m_minerWallet.spend_public_key()] = new_block->m_localTimestamp;
+
+		auto it = new_block->m_mergeMiningExtra.find(keccak_onion_address_v3);
+		if ((it != new_block->m_mergeMiningExtra.end()) && (it->second.size() >= HASH_SIZE)) {
+			hash h;
+			memcpy(h.h, it->second.data(), HASH_SIZE);
+			m_seenOnionPubkeys[h] = new_block->m_localTimestamp;
+		}
+
+		prune_seen_data();
 	}
 
 	WriteLock lock(m_sidechainLock);
@@ -747,7 +750,7 @@ bool SideChain::add_block(const PoolBlock& block)
 	return true;
 }
 
-PoolBlock* SideChain::find_block(const hash& id) const
+const PoolBlock* SideChain::find_block(const hash& id) const
 {
 	ReadLock lock(m_sidechainLock);
 
@@ -759,7 +762,7 @@ PoolBlock* SideChain::find_block(const hash& id) const
 	return nullptr;
 }
 
-PoolBlock* SideChain::find_block_by_merkle_root(const root_hash& merkle_root) const
+const PoolBlock* SideChain::find_block_by_merkle_root(const root_hash& merkle_root) const
 {
 	ReadLock lock(m_sidechainLock);
 
@@ -834,25 +837,23 @@ bool SideChain::get_outputs_blob(PoolBlock* block, uint64_t total_reward, std::v
 
 		auto it = block->m_sidechainId.empty() ? m_blocksById.end() : m_blocksById.find(block->m_sidechainId);
 		if (it != m_blocksById.end()) {
-			PoolBlock* b = it->second;
-			const size_t n = b->m_outputs.size();
+			const PoolBlock* b = it->second;
+			const size_t n = b->m_outputAmounts.size();
 
 			blob.reserve(n * 39 + 64);
 			writeVarint(n, blob);
 
-			const uint8_t tx_type = b->get_tx_type();
-
-			for (const PoolBlock::TxOutput& output : b->m_outputs) {
+			for (size_t i = 0; i < n; ++i) {
+				const PoolBlock::TxOutput& output = b->m_outputAmounts[i];
 				writeVarint(output.m_reward, blob);
-				blob.emplace_back(tx_type);
-				blob.insert(blob.end(), output.m_ephPublicKey.h, output.m_ephPublicKey.h + HASH_SIZE);
-
-				if (tx_type == TXOUT_TO_TAGGED_KEY) {
-					blob.emplace_back(static_cast<uint8_t>(output.m_viewTag));
-				}
+				blob.emplace_back(TXOUT_TO_TAGGED_KEY);
+				const hash h = b->m_ephPublicKeys[i];
+				blob.insert(blob.end(), h.h, h.h + HASH_SIZE);
+				blob.emplace_back(static_cast<uint8_t>(output.m_viewTag));
 			}
 
-			block->m_outputs = b->m_outputs;
+			block->m_ephPublicKeys = b->m_ephPublicKeys;
+			block->m_outputAmounts = b->m_outputAmounts;
 			return true;
 		}
 
@@ -897,10 +898,11 @@ bool SideChain::get_outputs_blob(PoolBlock* block, uint64_t total_reward, std::v
 
 	writeVarint(n, blob);
 
-	block->m_outputs.clear();
-	block->m_outputs.reserve(n);
+	block->m_ephPublicKeys.clear();
+	block->m_outputAmounts.clear();
 
-	const uint8_t tx_type = block->get_tx_type();
+	block->m_ephPublicKeys.reserve(n);
+	block->m_outputAmounts.reserve(n);
 
 	hash eph_public_key;
 	for (size_t i = 0; i < n; ++i) {
@@ -913,7 +915,7 @@ bool SideChain::get_outputs_blob(PoolBlock* block, uint64_t total_reward, std::v
 
 		writeVarint(tmpRewards[i], blob);
 
-		blob.emplace_back(tx_type);
+		blob.emplace_back(TXOUT_TO_TAGGED_KEY);
 
 		uint8_t view_tag;
 		if (!data->tmpShares[i].m_wallet->get_eph_public_key(data->txkeySec, i, eph_public_key, view_tag)) {
@@ -921,14 +923,14 @@ bool SideChain::get_outputs_blob(PoolBlock* block, uint64_t total_reward, std::v
 		}
 		blob.insert(blob.end(), eph_public_key.h, eph_public_key.h + HASH_SIZE);
 
-		if (tx_type == TXOUT_TO_TAGGED_KEY) {
-			blob.emplace_back(view_tag);
-		}
+		blob.emplace_back(view_tag);
 
-		block->m_outputs.emplace_back(tmpRewards[i], eph_public_key, view_tag);
+		block->m_ephPublicKeys.emplace_back(eph_public_key);
+		block->m_outputAmounts.emplace_back(tmpRewards[i], view_tag);
 	}
 
-	block->m_outputs.shrink_to_fit();
+	block->m_ephPublicKeys.shrink_to_fit();
+	block->m_outputAmounts.shrink_to_fit();
 	return true;
 }
 
@@ -1095,23 +1097,14 @@ double SideChain::get_reward_share(const Wallet& w) const
 
 		const PoolBlock* tip = m_chainTip;
 		if (tip) {
-			const uint8_t tx_type = tip->get_tx_type();
 			hash eph_public_key;
-			for (size_t i = 0, n = tip->m_outputs.size(); i < n; ++i) {
-				const PoolBlock::TxOutput& out = tip->m_outputs[i];
+			for (size_t i = 0, n = tip->m_outputAmounts.size(); i < n; ++i) {
+				const PoolBlock::TxOutput& out = tip->m_outputAmounts[i];
 				if (!reward) {
-					if (tx_type == TXOUT_TO_TAGGED_KEY) {
-						uint8_t view_tag;
-						const uint8_t expected_view_tag = out.m_viewTag;
-						if (w.get_eph_public_key(tip->m_txkeySec, i, eph_public_key, view_tag, &expected_view_tag) && (out.m_ephPublicKey == eph_public_key)) {
-							reward = out.m_reward;
-						}
-					}
-					else {
-						uint8_t view_tag;
-						if (w.get_eph_public_key(tip->m_txkeySec, i, eph_public_key, view_tag) && (out.m_ephPublicKey == eph_public_key)) {
-							reward = out.m_reward;
-						}
+					uint8_t view_tag;
+					const uint8_t expected_view_tag = out.m_viewTag;
+					if (w.get_eph_public_key(tip->m_txkeySec, i, eph_public_key, view_tag, &expected_view_tag) && (tip->m_ephPublicKeys[i] == eph_public_key)) {
+						reward = out.m_reward;
 					}
 				}
 				total_reward += out.m_reward;
@@ -1158,26 +1151,31 @@ difficulty_type SideChain::total_hashes() const
 	return tip ? tip->m_cumulativeDifficulty : difficulty_type();
 }
 
-uint64_t SideChain::miner_count()
+// Expects that m_seenDataLock is already locked for writing
+void SideChain::prune_seen_data()
 {
 	const uint64_t cur_time = seconds_since_epoch();
 
-	MutexLock lock(m_seenWalletsLock);
-
-	// Every 5 minutes, delete wallets that weren't seen for more than 72 hours
+	// Every 5 minutes, delete wallets that weren't seen for more than 72 hours and onion pubkeys that weren't seen for more than 12 hours
 	if (m_seenWalletsLastPruneTime + 5ul * 60ul <= cur_time) {
-		for (auto it = m_seenWallets.begin(); it != m_seenWallets.end();) {
-			if (it->second + 72ul * 60ul * 60ul < cur_time) {
-				it = m_seenWallets.erase(it);
+		auto prune = [cur_time](auto& data, uint64_t timeout) {
+			for (auto it = data.begin(); it != data.end();) {
+				if (it->second + timeout < cur_time) {
+					it = data.erase(it);
+				}
+				else {
+					++it;
+				}
 			}
-			else {
-				++it;
-			}
-		}
+		};
+
+		constexpr uint64_t hour = 3600;
+
+		prune(m_seenWallets, 72 * hour);
+		prune(m_seenOnionPubkeys, 12 * hour);
+
 		m_seenWalletsLastPruneTime = cur_time;
 	}
-
-	return m_seenWallets.size();
 }
 
 uint64_t SideChain::last_updated() const
@@ -1371,12 +1369,44 @@ bool SideChain::p2pool_update_available() const
 	return newer_p2pool_diff * 5 >= total_p2pool_diff;
 }
 
+std::vector<hash> SideChain::seen_onion_pubkeys() const
+{
+	std::vector<hash> result;
+
+	ReadLock lock(m_seenDataLock);
+
+	result.reserve(m_seenOnionPubkeys.size());
+
+	for (const auto& it : m_seenOnionPubkeys) {
+		result.push_back(it.first);
+	}
+
+	return result;
+}
+
+void SideChain::add_onion_pubkeys(const std::vector<hash>& pubkeys)
+{
+	if (pubkeys.empty()) {
+		return;
+	}
+
+	const uint64_t cur_time = seconds_since_epoch();
+
+	WriteLock lock(m_seenDataLock);
+
+	for (const hash& h : pubkeys) {
+		if (!h.empty()) {
+			m_seenOnionPubkeys[h] = cur_time;
+		}
+	}
+}
+
 void SideChain::verify_loop(PoolBlock* block)
 {
 	// PoW is already checked at this point
 
 	std::vector<PoolBlock*> blocks_to_verify(1, block);
-	const PoolBlock* highest_block = nullptr;
+	PoolBlock* highest_block = nullptr;
 
 	while (!blocks_to_verify.empty()) {
 		block = blocks_to_verify.back();
@@ -1521,7 +1551,7 @@ void SideChain::verify(PoolBlock* block)
 	}
 
 	// If it's invalid then this block is also invalid
-	PoolBlock* parent = it->second;
+	const PoolBlock* parent = it->second;
 	if (parent->m_invalid) {
 		block->m_verified = true;
 		block->m_invalid = true;
@@ -1570,7 +1600,7 @@ void SideChain::verify(PoolBlock* block)
 	if (!block->m_uncles.empty()) {
 		mined_blocks.reserve(UNCLE_BLOCK_DEPTH * 2 + 1);
 
-		PoolBlock* tmp = parent;
+		const PoolBlock* tmp = parent;
 		for (uint64_t i = 0, n = std::min<uint64_t>(UNCLE_BLOCK_DEPTH, block->m_sidechainHeight + 1); tmp && (i < n); ++i) {
 			mined_blocks.push_back(tmp->m_sidechainId);
 			mined_blocks.insert(mined_blocks.end(), tmp->m_uncles.begin(), tmp->m_uncles.end());
@@ -1606,7 +1636,7 @@ void SideChain::verify(PoolBlock* block)
 			return;
 		}
 
-		PoolBlock* uncle = it->second;
+		const PoolBlock* uncle = it->second;
 
 		// If it's invalid then this block is also invalid
 		if (uncle->m_invalid) {
@@ -1722,16 +1752,16 @@ void SideChain::verify(PoolBlock* block)
 		return;
 	}
 
-	if (shares.size() != block->m_outputs.size()) {
+	if (shares.size() != block->m_outputAmounts.size()) {
 		LOGWARN(3, "block at height = " << block->m_sidechainHeight <<
 			", id = " << block->m_sidechainId <<
 			", mainchain height = " << block->m_txinGenHeight
-			<< " has invalid number of outputs: got " << block->m_outputs.size() << ", expected " << shares.size());
+			<< " has invalid number of outputs: got " << block->m_outputAmounts.size() << ", expected " << shares.size());
 		block->m_invalid = true;
 		return;
 	}
 
-	uint64_t total_reward = std::accumulate(block->m_outputs.begin(), block->m_outputs.end(), 0ULL,
+	uint64_t total_reward = std::accumulate(block->m_outputAmounts.begin(), block->m_outputAmounts.end(), 0ULL,
 		[](uint64_t a, const PoolBlock::TxOutput& b)
 		{
 			return a + b.m_reward;
@@ -1746,19 +1776,17 @@ void SideChain::verify(PoolBlock* block)
 		return;
 	}
 
-	if (rewards.size() != block->m_outputs.size()) {
+	if (rewards.size() != block->m_outputAmounts.size()) {
 		LOGWARN(3, "block at height = " << block->m_sidechainHeight <<
 			", id = " << block->m_sidechainId <<
 			", mainchain height = " << block->m_txinGenHeight
-			<< " has invalid number of outputs: got " << block->m_outputs.size() << ", expected " << rewards.size());
+			<< " has invalid number of outputs: got " << block->m_outputAmounts.size() << ", expected " << rewards.size());
 		block->m_invalid = true;
 		return;
 	}
 
-	const uint8_t tx_type = block->get_tx_type();
-
 	for (size_t i = 0, n = rewards.size(); i < n; ++i) {
-		const PoolBlock::TxOutput& out = block->m_outputs[i];
+		const PoolBlock::TxOutput& out = block->m_outputAmounts[i];
 
 		if (rewards[i] != out.m_reward) {
 			LOGWARN(3, "block at height = " << block->m_sidechainHeight <<
@@ -1780,7 +1808,7 @@ void SideChain::verify(PoolBlock* block)
 			return;
 		}
 
-		if ((tx_type == TXOUT_TO_TAGGED_KEY) && (out.m_viewTag != view_tag)) {
+		if (out.m_viewTag != view_tag) {
 			LOGWARN(3, "block at height = " << block->m_sidechainHeight <<
 				", id = " << block->m_sidechainId <<
 				", mainchain height = " << block->m_txinGenHeight <<
@@ -1789,7 +1817,7 @@ void SideChain::verify(PoolBlock* block)
 			return;
 		}
 
-		if (eph_public_key != out.m_ephPublicKey) {
+		if (eph_public_key != block->m_ephPublicKeys[i]) {
 			LOGWARN(3, "block at height = " << block->m_sidechainHeight <<
 				", id = " << block->m_sidechainId <<
 				", mainchain height = " << block->m_txinGenHeight <<
@@ -1803,7 +1831,7 @@ void SideChain::verify(PoolBlock* block)
 	block->m_invalid = false;
 }
 
-void SideChain::update_chain_tip(const PoolBlock* block)
+void SideChain::update_chain_tip(PoolBlock* block)
 {
 	if (!block->m_verified || block->m_invalid) {
 		LOGERR(1, "trying to update chain tip to an unverified or invalid block, fix the code!");
@@ -1815,7 +1843,7 @@ void SideChain::update_chain_tip(const PoolBlock* block)
 		return;
 	}
 
-	const PoolBlock* tip = m_chainTip;
+	PoolBlock* tip = m_chainTip;
 
 	if (block == tip) {
 		LOGINFO(5, "Trying to update chain tip to the same block again. Ignoring it.");
@@ -1826,7 +1854,10 @@ void SideChain::update_chain_tip(const PoolBlock* block)
 	if (is_longer_chain(tip, block, is_alternative)) {
 		difficulty_type diff;
 		if (get_difficulty(block, m_difficultyData, diff)) {
-			m_chainTip = const_cast<PoolBlock*>(block);
+			if (!m_chainTip.compare_exchange_strong(tip, block)) {
+				LOGINFO(5, "Trying to update an outdated chain tip. Ignoring it.");
+				return;
+			}
 			{
 				WriteLock lock(m_curDifficultyLock);
 				m_curDifficulty = diff;
@@ -2041,7 +2072,7 @@ void SideChain::update_depths(PoolBlock* block)
 		if (it == m_blocksByHeight.end()) {
 			continue;
 		}
-		for (PoolBlock* child : it->second) {
+		for (const PoolBlock* child : it->second) {
 			if (child->m_parent == block->m_sidechainId) {
 				if (i != 1) {
 					LOGWARN(3, "Block " << block->m_sidechainId << ": m_sidechainHeight is inconsistent with child's m_sidechainHeight.");
@@ -2455,7 +2486,9 @@ void SideChain::precalc_worker()
 		for (const std::pair<size_t, const Wallet*>& w : wallets) {
 			hash eph_public_key;
 			uint8_t view_tag;
-			w.second->get_eph_public_key(job->m_txkeySec, w.first, eph_public_key, view_tag);
+			if (!w.second->get_eph_public_key(job->m_txkeySec, w.first, eph_public_key, view_tag)) {
+				LOGWARN(6, "get_eph_public_key failed in precalc_worker");
+			}
 		}
 	} while (true);
 }

src/side_chain.h

@@ -43,7 +43,7 @@ public:
 	SideChain(p2pool* pool, NetworkType type, const char* pool_name = nullptr);
 	~SideChain();
 
-	void fill_sidechain_data(PoolBlock& block, std::vector<MinerShare>& shares) const;
+	[[nodiscard]] bool fill_sidechain_data(PoolBlock& block, std::vector<MinerShare>& shares) const;
 
 	[[nodiscard]] bool incoming_block_seen(const PoolBlock& block);
 	void forget_incoming_block(const PoolBlock& block);
@@ -53,8 +53,8 @@ public:
 	[[nodiscard]] bool add_block(const PoolBlock& block);
 	void get_missing_blocks(unordered_set<hash>& missing_blocks) const;
 
-	[[nodiscard]] PoolBlock* find_block(const hash& id) const;
-	[[nodiscard]] PoolBlock* find_block_by_merkle_root(const root_hash& merkle_root) const;
+	[[nodiscard]] const PoolBlock* find_block(const hash& id) const;
+	[[nodiscard]] const PoolBlock* find_block_by_merkle_root(const root_hash& merkle_root) const;
 	void watch_mainchain_block(const ChainMain& data, const hash& possible_merkle_root);
 
 	[[nodiscard]] const PoolBlock* get_block_blob(const hash& id, std::vector<uint8_t>& blob) const;
@@ -74,7 +74,8 @@ public:
 	[[nodiscard]] FORCEINLINE difficulty_type difficulty() const { ReadLock lock(m_curDifficultyLock); return m_curDifficulty; }
 	[[nodiscard]] difficulty_type total_hashes() const;
 	[[nodiscard]] uint64_t block_time() const { return m_targetBlockTime; }
-	[[nodiscard]] uint64_t miner_count();
+	[[nodiscard]] FORCEINLINE uint64_t miner_count() const { ReadLock lock(m_seenDataLock); return m_seenWallets.size(); }
+	[[nodiscard]] FORCEINLINE uint64_t onion_pubkeys_count() const { ReadLock lock(m_seenDataLock); return m_seenOnionPubkeys.size(); }
 	[[nodiscard]] uint64_t last_updated() const;
 	[[nodiscard]] bool is_default() const;
 	[[nodiscard]] bool is_mini() const;
@@ -86,6 +87,9 @@ public:
 
 	[[nodiscard]] bool p2pool_update_available() const;
 
+	[[nodiscard]] std::vector<hash> seen_onion_pubkeys() const;
+	void add_onion_pubkeys(const std::vector<hash>& pubkeys);
+
 #ifdef P2POOL_UNIT_TESTS
 	difficulty_type m_testMainChainDiff;
 	const unordered_map<hash, PoolBlock*>& blocksById() const { return m_blocksById; }
@@ -103,7 +107,7 @@ private:
 	[[nodiscard]] bool get_difficulty(const PoolBlock* tip, std::vector<DifficultyData>& difficultyData, difficulty_type& curDifficulty) const;
 	void verify_loop(PoolBlock* block);
 	void verify(PoolBlock* block);
-	void update_chain_tip(const PoolBlock* block);
+	void update_chain_tip(PoolBlock* block);
 	[[nodiscard]] PoolBlock* get_parent(const PoolBlock* block) const;
 
 	// Checks if "candidate" has longer (higher difficulty) chain than "block"
@@ -114,14 +118,17 @@ private:
 	[[nodiscard]] bool load_config(const std::string& filename);
 	[[nodiscard]] bool check_config() const;
 
+	void prune_seen_data();
+
 	mutable uv_rwlock_t m_sidechainLock;
 	std::atomic<PoolBlock*> m_chainTip;
 	std::map<uint64_t, std::vector<PoolBlock*>> m_blocksByHeight;
 	unordered_map<hash, PoolBlock*> m_blocksById;
 	unordered_map<root_hash, PoolBlock*> m_blocksByMerkleRoot;
 
-	uv_mutex_t m_seenWalletsLock;
+	mutable ReadWriteLock m_seenDataLock;
 	unordered_map<hash, uint64_t> m_seenWallets;
+	unordered_map<hash, uint64_t> m_seenOnionPubkeys;
 	uint64_t m_seenWalletsLastPruneTime;
 
 	// Used to quickly cut off multiple broadcasts of the same block by different peers. Only the first broadcast will be processed.

src/stratum_server.cpp

@@ -448,7 +448,7 @@ bool StratumServer::on_submit(StratumClient* client, uint32_t id, const char* jo
 
 		share.m_server = this;
 		share.m_client = client;
-		share.m_clientIPv6 = client->m_isV6;
+		share.m_clientIPv6 = client->isV6();
 		share.m_clientAddr = client->m_addr;
 		memcpy(share.m_clientAddrString, client->m_addrString, sizeof(share.m_clientAddrString));
 		memcpy(share.m_clientCustomUser, client->m_customUser, sizeof(share.m_clientCustomUser));

src/tcp_server.cpp

@@ -282,7 +282,7 @@ bool TCPServer::connect_to_peer(bool is_v6, const char* ip, int port)
 	Client* client = get_client();
 	client->m_owner = this;
 	client->m_port = port;
-	client->m_isV6 = is_v6;
+	client->m_addressType = is_v6 ? Client::AddressType::IPv6 : Client::AddressType::IPv4;
 
 	if (!str_to_ip(is_v6, ip, client->m_addr)) {
 		return_client(client);
@@ -310,12 +310,40 @@ bool TCPServer::connect_to_peer(bool is_v6, const raw_ip& ip, int port)
 	client->m_owner = this;
 	client->m_addr = ip;
 	client->m_port = port;
-	client->m_isV6 = is_v6;
+	client->m_addressType = is_v6 ? Client::AddressType::IPv6 : Client::AddressType::IPv4;
 	client->init_addr_string();
 
 	return connect_to_peer(client);
 }
 
+bool TCPServer::connect_to_peer(const std::string& domain, int port)
+{
+	if (m_socks5Proxy.empty()) {
+        LOGERR(1, "Can't connect to " << domain << ": SOCKS5 proxy is required");
+        return false;
+    }
+
+	if (m_finished.load()) {
+		return false;
+	}
+
+	Client* client = get_client();
+	client->m_owner = this;
+	client->m_addr = raw_ip::localhost_ipv4;
+	client->m_port = port;
+	client->m_addressType = Client::AddressType::DomainName;
+
+	log::Stream s(client->m_addrString);
+	s << domain << ':' << port << '\0';
+
+	if (s.m_spilled) {
+        LOGERR(1, "Can't connect to " << domain << ": too long domain name");
+		return false;
+	}
+
+	return connect_to_peer(client);
+}
+
 bool TCPServer::is_banned(bool is_v6, raw_ip ip)
 {
 	if (ip.is_localhost()) {
@@ -345,13 +373,13 @@ bool TCPServer::is_banned(bool is_v6, raw_ip ip)
 
 bool TCPServer::connect_to_peer(Client* client)
 {
-	if (is_banned(client->m_isV6, client->m_addr)) {
+	if (is_banned(client->isV6(), client->m_addr)) {
 		LOGINFO(5, "peer " << log::Gray() << static_cast<char*>(client->m_addrString) << log::NoColor() << " is banned, not connecting to it");
 		return_client(client);
 		return false;
 	}
 
-	if (!m_pendingConnections.insert(client->m_addr).second) {
+	if ((client->m_addressType != Client::AddressType::DomainName) && (m_pendingConnections.find(client->m_addr) != m_pendingConnections.end())) {
 		LOGINFO(6, "there is already a pending connection to this IP, not connecting to " << log::Gray() << static_cast<char*>(client->m_addrString));
 		return_client(client);
 		return false;
@@ -385,18 +413,22 @@ bool TCPServer::connect_to_peer(Client* client)
 	sockaddr_storage addr{};
 
 	if (m_socks5Proxy.empty()) {
-		if (client->m_isV6) {
+		if (client->m_addressType == Client::AddressType::IPv6) {
 			sockaddr_in6* addr6 = reinterpret_cast<sockaddr_in6*>(&addr);
 			addr6->sin6_family = AF_INET6;
 			memcpy(&addr6->sin6_addr, client->m_addr.data, sizeof(in6_addr));
 			addr6->sin6_port = htons(static_cast<uint16_t>(client->m_port));
 		}
-		else {
+		else if (client->m_addressType == Client::AddressType::IPv4) {
 			sockaddr_in* addr4 = reinterpret_cast<sockaddr_in*>(&addr);
 			addr4->sin_family = AF_INET;
 			memcpy(&addr4->sin_addr, client->m_addr.data + sizeof(raw_ip::ipv4_prefix), sizeof(in_addr));
 			addr4->sin_port = htons(static_cast<uint16_t>(client->m_port));
 		}
+		else {
+			LOGWARN(5, "failed to initiate tcp connection to " << static_cast<const char*>(client->m_addrString) << ": domain name is unresolved and SOCKS5 proxy is not enabled");
+			return false;
+		}
 	}
 	else {
 		if (m_socks5ProxyV6) {
@@ -416,11 +448,14 @@ bool TCPServer::connect_to_peer(Client* client)
 	err = uv_tcp_connect(connect_request, &client->m_socket, reinterpret_cast<sockaddr*>(&addr), on_connect);
 	if (err) {
 		LOGWARN(5, "failed to initiate tcp connection to " << static_cast<const char*>(client->m_addrString) << ", error " << uv_err_name(err));
-		m_pendingConnections.erase(client->m_addr);
 		uv_close(reinterpret_cast<uv_handle_t*>(&client->m_socket), on_connection_error);
 		return false;
 	}
 
+	if (client->m_addressType != Client::AddressType::DomainName) {
+		m_pendingConnections.insert(client->m_addr);
+	}
+
 	LOGINFO(5, "connecting to " << log::Gray() << static_cast<const char*>(client->m_addrString));
 	return true;
 }
@@ -755,7 +790,9 @@ void TCPServer::on_connect(uv_connect_t* req, int status)
 		return;
 	}
 
-	server->m_pendingConnections.erase(client->m_addr);
+	if (client->m_addressType != Client::AddressType::DomainName) {
+		server->m_pendingConnections.erase(client->m_addr);
+	}
 
 	if (status) {
 		if (status == UV_ETIMEDOUT) {
@@ -764,7 +801,7 @@ void TCPServer::on_connect(uv_connect_t* req, int status)
 		else {
 			LOGWARN(5, "failed to connect to " << static_cast<char*>(client->m_addrString) << ", error " << uv_err_name(status));
 		}
-		server->on_connect_failed(client->m_isV6, client->m_addr, client->m_port);
+		server->on_connect_failed(client->isV6(), client->m_addr, client->m_port);
 		client->on_connect_failed(status);
 		uv_close(reinterpret_cast<uv_handle_t*>(&client->m_socket), on_connection_error);
 		return;
@@ -823,18 +860,23 @@ void TCPServer::on_new_client(uv_stream_t* server, Client* client)
 	if (client->m_isIncoming) {
 		++m_numIncomingConnections;
 
-		client->m_isV6 = (std::find(m_listenSockets6.begin(), m_listenSockets6.end(), reinterpret_cast<uv_tcp_t*>(server)) != m_listenSockets6.end());
+		if (std::find(m_listenSockets6.begin(), m_listenSockets6.end(), reinterpret_cast<uv_tcp_t*>(server)) != m_listenSockets6.end()) {
+			client->m_addressType = Client::AddressType::IPv6;
+		}
+		else {
+			client->m_addressType = Client::AddressType::IPv4;
+		}
 
 		sockaddr_storage peer_addr;
 		int peer_addr_len = static_cast<int>(sizeof(peer_addr));
 		int err = uv_tcp_getpeername(&client->m_socket, reinterpret_cast<sockaddr*>(&peer_addr), &peer_addr_len);
 		if (err) {
-			LOGERR(1, "failed to get IP address of the client connection, error " << uv_err_name(err));
+			LOGWARN(5, "failed to get IP address of the client connection, error " << uv_err_name(err));
 			client->close();
 			return;
 		}
 
-		if (client->m_isV6) {
+		if (client->isV6()) {
 			memcpy(client->m_addr.data, &reinterpret_cast<sockaddr_in6*>(&peer_addr)->sin6_addr, sizeof(in6_addr));
 			client->m_port = ntohs(reinterpret_cast<sockaddr_in6*>(&peer_addr)->sin6_port);
 		}
@@ -849,7 +891,7 @@ void TCPServer::on_new_client(uv_stream_t* server, Client* client)
 
 	LOGINFO(5, "new connection " << (client->m_isIncoming ? "from " : "to ") << log::Gray() << static_cast<char*>(client->m_addrString));
 
-	if (is_banned(client->m_isV6, client->m_addr)) {
+	if (is_banned(client->isV6(), client->m_addr)) {
 		LOGINFO(5, "peer " << log::Gray() << static_cast<char*>(client->m_addrString) << log::NoColor() << " is banned, disconnecting");
 		client->close();
 		return;
@@ -1033,12 +1075,12 @@ TCPServer::Client::Client(char* read_buf, size_t size)
 	, m_prev(nullptr)
 	, m_next(nullptr)
 	, m_socket{}
-	, m_isV6(false)
+	, m_addressType(AddressType::IPv4)
 	, m_isIncoming(false)
 	, m_readBufInUse(false)
 	, m_isClosing(false)
 	, m_numRead(0)
-	, m_addr{}
+	, m_addr(raw_ip::localhost_ipv4)
 	, m_port(0)
 	, m_addrString{}
 	, m_socks5ProxyState(Socks5ProxyState::Default)
@@ -1059,12 +1101,12 @@ void TCPServer::Client::reset()
 	m_prev = nullptr;
 	m_next = nullptr;
 	memset(&m_socket, 0, sizeof(m_socket));
-	m_isV6 = false;
+	m_addressType = AddressType::IPv4;
 	m_isIncoming = false;
 	m_readBufInUse = false;
 	m_isClosing = false;
 	m_numRead = 0;
-	m_addr = {};
+	m_addr = raw_ip::localhost_ipv4;
 	m_port = -1;
 	m_addrString[0] = '\0';
 	m_socks5ProxyState = Socks5ProxyState::Default;
@@ -1157,27 +1199,44 @@ bool TCPServer::Client::on_proxy_handshake(const char* data, uint32_t size)
 			const bool result = m_owner->send(this,
 				[this](uint8_t* buf, size_t buf_size) -> size_t
 				{
-					if (buf_size < 22) {
+					if (buf_size < ADDR_STRING_SIZE + 7) {
 						return 0;
 					}
 
 					buf[0] = 5; // Protocol version (SOCKS5)
 					buf[1] = 1; // CONNECT
 					buf[2] = 0; // RESERVED
-					if (m_isV6) {
+
+					if (m_addressType == AddressType::DomainName) {
+						buf[3] = 3; // ATYP
+
+						const char* s = strchr(m_addrString, ':');
+						const size_t domain_len = s ? (s - m_addrString) : strlen(m_addrString);
+
+						buf[4] = static_cast<uint8_t>(domain_len);
+						memcpy(buf + 5, m_addrString, domain_len);
+
+						buf[domain_len + 5] = static_cast<uint8_t>(m_port >> 8);
+						buf[domain_len + 6] = static_cast<uint8_t>(m_port & 0xFF);
+
+						return domain_len + 7;
+					}
+
+					if (m_addressType == AddressType::IPv6) {
 						buf[3] = 4; // ATYP
 						memcpy(buf + 4, m_addr.data, 16);
 						buf[20] = static_cast<uint8_t>(m_port >> 8);
 						buf[21] = static_cast<uint8_t>(m_port & 0xFF);
-					}
-					else {
-						buf[3] = 1; // ATYP
-						memcpy(buf + 4, m_addr.data + sizeof(raw_ip::ipv4_prefix), 4);
-						buf[8] = static_cast<uint8_t>(m_port >> 8);
-						buf[9] = static_cast<uint8_t>(m_port & 0xFF);
+
+						return 22;
 					}
 
-					return m_isV6 ? 22 : 10;
+					buf[3] = 1; // ATYP
+					memcpy(buf + 4, m_addr.data + sizeof(raw_ip::ipv4_prefix), 4);
+					buf[8] = static_cast<uint8_t>(m_port >> 8);
+					buf[9] = static_cast<uint8_t>(m_port & 0xFF);
+
+					return 10;
 				});
 
 			if (result) {
@@ -1298,7 +1357,7 @@ void TCPServer::Client::ban(uint64_t seconds)
 
 	if (m_owner) {
 		LOGWARN(3, "peer " << static_cast<char*>(m_addrString) << " banned for " << seconds << " seconds");
-		m_owner->ban(m_isV6, m_addr, seconds);
+		m_owner->ban(isV6(), m_addr, seconds);
 	}
 }
 
@@ -1307,7 +1366,7 @@ void TCPServer::Client::init_addr_string()
 	const char* addr_str;
 	char addr_str_buf[64];
 
-	if (m_isV6) {
+	if (isV6()) {
 		addr_str = inet_ntop(AF_INET6, m_addr.data, addr_str_buf, sizeof(addr_str_buf));
 	}
 	else {
@@ -1321,7 +1380,7 @@ void TCPServer::Client::init_addr_string()
 		}
 
 		log::Stream s(m_addrString);
-		if (m_isV6) {
+		if (isV6()) {
 			s << '[' << log::const_buf(addr_str, n) << "]:" << m_port << '\0';
 		}
 		else {

src/tcp_server.h

@@ -47,6 +47,7 @@ public:
 	[[nodiscard]] virtual int external_listen_port() const { return m_listenPort; }
 
 	[[nodiscard]] bool connect_to_peer(bool is_v6, const raw_ip& ip, int port);
+	[[nodiscard]] bool connect_to_peer(const std::string& domain, int port);
 	[[nodiscard]] bool connect_to_peer(Client* client);
 
 	virtual void on_connect_failed(bool /*is_v6*/, const raw_ip& /*ip*/, int /*port*/) {}
@@ -80,6 +81,8 @@ public:
 
 		void asan_poison_this() const;
 
+		FORCEINLINE bool isV6() const { return m_addressType == AddressType::IPv6; }
+
 		char* m_readBuf;
 		uint32_t m_readBufSize;
 
@@ -91,7 +94,13 @@ public:
 
 		uv_tcp_t m_socket;
 
-		bool m_isV6;
+		enum class AddressType {
+			IPv4,
+			IPv6,
+			DomainName
+		};
+
+		AddressType m_addressType;
 		bool m_isIncoming;
 		bool m_readBufInUse;
 		bool m_isClosing;

src/util.cpp

@@ -18,6 +18,12 @@
 #include "common.h"
 #include "util.h"
 #include "uv_util.h"
+#include "keccak.h"
+
+extern "C" {
+#include "crypto-ops.h"
+}
+
 #include <map>
 #include <istream>
 #include <ostream>
@@ -124,6 +130,33 @@ void fixup_path(std::string& path)
 	}
 }
 
+// Tell the compiler to not optimize secure_zero_memory and hope that it listens
+
+#ifdef _MSC_VER
+#pragma optimize("", off)
+#endif
+
+void
+#if defined(__clang__)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif
+secure_zero_memory(volatile void* data, size_t size)
+{
+	volatile uint8_t* p = reinterpret_cast<volatile uint8_t*>(data);
+	// cppcheck-suppress constVariablePointer
+	volatile uint8_t* e = reinterpret_cast<volatile uint8_t*>(data) + size;
+
+	while (p < e) {
+		*(p++) = 0;
+	}
+}
+
+#ifdef _MSC_VER
+#pragma optimize("", on)
+#endif
+
 const uint8_t ED25519_MASTER_PUBLIC_KEY[32] = {51,175,37,73,203,241,188,115,195,255,123,53,218,120,90,74,186,240,82,178,67,139,124,91,180,106,188,181,187,51,236,10};
 
 std::string DATA_DIR;
@@ -453,7 +486,7 @@ struct BackgroundJobTracker::Impl
 			result.reserve(m_jobs.size());
 
 			for (const auto& job : m_jobs) {
-				result.emplace_back(job.first, job.second);
+				result.emplace_back(job.first.data(), job.second);
 			}
 		}
 		return result;
@@ -478,10 +511,8 @@ struct BackgroundJobTracker::Impl
 		LOGINFO(0, "background jobs running:" << log::const_buf(buf, s.m_pos));
 	}
 
-	struct Compare { FORCEINLINE bool operator()(const char* a, const char* b) const { return strcmp(a, b) < 0; } };
-
 	uv_mutex_t m_lock;
-	std::map<const char*, int32_t, Compare> m_jobs;
+	std::map<std::string_view, int32_t> m_jobs;
 };
 
 BackgroundJobTracker::BackgroundJobTracker() : m_impl(new Impl())
@@ -577,29 +608,28 @@ bool get_dns_txt_records_base(const std::string& host, const Callback<void, cons
 	}
 
 #ifdef _WIN32
-	try {
-		PDNS_RECORD pQueryResults;
-		if (DnsQuery(host.c_str(), DNS_TYPE_TEXT, DNS_QUERY_STANDARD, NULL, &pQueryResults, NULL) != 0) {
-			return false;
+	PDNS_RECORD pQueryResults;
+	if (DnsQuery(host.c_str(), DNS_TYPE_TEXT, DNS_QUERY_STANDARD, NULL, &pQueryResults, NULL) != 0) {
+		return false;
+	}
+
+	for (PDNS_RECORD p = pQueryResults; p; p = p->pNext) {
+		if (p->wType != DNS_TYPE_TEXT) {
+			continue;
 		}
 
-		for (PDNS_RECORD p = pQueryResults; p; p = p->pNext) {
-			for (size_t j = 0; j < p->Data.TXT.dwStringCount; ++j) {
-				const char* s = p->Data.TXT.pStringArray[j];
-				if (s) {
-					const size_t n = strlen(s);
-					if (n > 0) {
-						callback(s, n);
-					}
+		for (size_t j = 0; j < p->Data.TXT.dwStringCount; ++j) {
+			const char* s = p->Data.TXT.pStringArray[j];
+			if (s) {
+				const size_t n = strlen(s);
+				if (n > 0) {
+					callback(s, n);
 				}
 			}
 		}
+	}
 
-		DnsRecordListFree(pQueryResults, DnsFreeRecordList);
-	}
-	catch (...) {
-		return false;
-	}
+	DnsRecordListFree(pQueryResults, DnsFreeRecordList);
 
 	return true;
 #elif defined(HAVE_RES_QUERY)
@@ -921,4 +951,88 @@ void set_thread_name(const char* name)
 #endif
 }
 
+std::string to_onion_v3(const hash& pubkey)
+{
+	static constexpr uint8_t prefix[] = ".onion checksum";
+	static constexpr uint8_t version = 3;
+
+	hash h;
+	keccak_custom([&pubkey](int offset) -> uint8_t {
+		size_t k = static_cast<size_t>(offset);
+		if (k < sizeof(prefix) - 1) {
+			return prefix[k];
+		}
+		k -= sizeof(prefix) - 1;
+
+		return (k < HASH_SIZE) ? pubkey.h[k] : version;
+	}, sizeof(prefix) + HASH_SIZE, h.h, HASH_SIZE, true);
+
+	// pubkey (32 bytes), checksum (2 bytes), version (1 byte), and a zero byte for padding
+	uint8_t buf[HASH_SIZE + 4];
+
+	memcpy(buf, pubkey.h, HASH_SIZE);
+	memcpy(buf + HASH_SIZE, h.h, 2);
+	buf[HASH_SIZE + 2] = version;
+	buf[HASH_SIZE + 3] = 0;
+
+	std::string result;
+	result.reserve(62);
+
+	uint64_t data = 0;
+	uint64_t bit_size = 0;
+
+	for (size_t i = 0; i < HASH_SIZE + 3; ++i) {
+		data = (data << 8) | buf[i];
+		bit_size += 8;
+
+		while (bit_size >= 5) {
+			bit_size -= 5;
+			result += "abcdefghijklmnopqrstuvwxyz234567"[(data >> bit_size) & 31];
+		}
+	}
+
+	result.append(".onion");
+
+	return result;
+}
+
+hash from_onion_v3(const std::string& address)
+{
+	if ((address.length() < 6) || (address.find(".onion") != address.length() - 6)) {
+		LOGWARN(3, "Invalid onion address \"" << address << "\": doesn't end with \".onion\"");
+		return {};
+	}
+
+	if (address.length() != 62) {
+		LOGWARN(3, "Invalid onion address \"" << address << "\": expected length 62, got " << address.length() );
+		return {};
+	}
+
+	const hash result = from_onion_v3_const(address.c_str());
+
+	if (result.empty()) {
+		LOGWARN(3, "Invalid onion address \"" << address << "\": has invalid character(s)");
+		return {};
+	}
+
+	// Convert address to lowercase
+	std::string s = address;
+	std::transform(s.begin(), s.end(), s.begin(), [](unsigned char c) { return static_cast<char>(std::tolower(c)); });
+
+	// Checksum validation
+	if (to_onion_v3(result) != s) {
+		LOGWARN(3, "Invalid onion address \"" << address << "\": checksum failed");
+		return {};
+	}
+
+	// Pubkey validation
+	ge_p3 point;
+	if (ge_frombytes_vartime(&point, result.h) != 0) {
+		LOGWARN(3, "Invalid onion address \"" << address << "\": invalid ed25519 pubkey");
+		return {};
+	}
+
+	return result;
+}
+
 } // namespace p2pool

src/util.h

@@ -35,7 +35,7 @@
 namespace p2pool {
 
 #define P2POOL_VERSION_MAJOR 4
-#define P2POOL_VERSION_MINOR 11
+#define P2POOL_VERSION_MINOR 12
 #define P2POOL_VERSION_PATCH 0
 
 constexpr uint32_t P2POOL_VERSION = (P2POOL_VERSION_MAJOR << 16) | (P2POOL_VERSION_MINOR << 8) | P2POOL_VERSION_PATCH;
@@ -386,6 +386,63 @@ std::string p2pool_version();
 
 void fixup_path(std::string& path);
 
+void secure_zero_memory(volatile void* data, size_t size);
+
+template<typename T>
+FORCEINLINE void secure_zero_memory(T& value)
+{
+	static_assert(!std::is_pointer_v<T>, "Trying to zero a pointer instead of data it points to");
+	static_assert(std::is_trivially_copyable_v<T>, "Trying to zero a complex data type");
+
+	secure_zero_memory(&value, sizeof(T));
+}
+
+std::string to_onion_v3(const hash& pubkey);
+hash from_onion_v3(const std::string& address);
+
+static FORCEINLINE constexpr hash from_onion_v3_const(const char* address)
+{
+	uint8_t buf[HASH_SIZE + 4] = {};
+	uint8_t* p = buf;
+
+	uint64_t data = 0;
+	uint64_t bit_size = 0;
+
+	for (size_t i = 0; i < 56; ++i) {
+		const char c = address[i];
+		uint64_t digit = 0;
+
+		if ('a' <= c && c <= 'z') {
+			digit = static_cast<uint64_t>(c - 'a');
+		}
+		else if ('A' <= c && c <= 'Z') {
+			digit = static_cast<uint64_t>(c - 'A');
+		}
+		else if ('2' <= c && c <= '7') {
+			digit = static_cast<uint64_t>(c - '2') + 26;
+		}
+		else {
+			return {};
+		}
+
+		data = (data << 5) | digit;
+		bit_size += 5;
+
+		while (bit_size >= 8) {
+			bit_size -= 8;
+			*(p++) = static_cast<uint8_t>(data >> bit_size);
+		}
+	}
+
+	hash result;
+
+	for (size_t i = 0; i < HASH_SIZE; ++i) {
+		result.h[i] = buf[i];
+	}
+
+	return result;
+}
+
 } // namespace p2pool
 
 void memory_tracking_start();

src/wallet.cpp

@@ -27,6 +27,10 @@ extern "C" {
 #include "crypto-ops.h"
 }
 
+#include "fcmp_pp_crypto.h"
+
+LOG_CATEGORY(Wallet)
+
 namespace {
 
 // Allow only regular addresses (no integrated addresses, no subaddresses)
@@ -81,7 +85,9 @@ namespace p2pool {
 
 Wallet::Wallet(const char* address) : m_prefix(0), m_checksum(0), m_type(NetworkType::Invalid), m_subaddress(false)
 {
-	decode(address);
+	if (!decode(address) && address) {
+		LOGWARN(1, address << " failed to decode");
+	}
 }
 
 Wallet::Wallet(const Wallet& w)
@@ -179,6 +185,11 @@ bool Wallet::decode(const char* address)
 		m_type = NetworkType::Invalid;
 	}
 
+	if (!torsion_check()) {
+		LOGWARN(1, "Torsion check failed for wallet " << *this << "! It will not be compatible with FCMP++.");
+		// TODO: add "m_type = NetworkType::Invalid;" and return false in a later release, closer to FCMP++ hardfork
+	}
+
 	return valid();
 }
 
@@ -213,6 +224,11 @@ bool Wallet::assign(const hash& spend_pub_key, const hash& view_pub_key, Network
 	m_type = type;
 	m_subaddress = subaddress;
 
+	if (!torsion_check()) {
+		LOGWARN(1, "Torsion check failed for wallet " << *this << "! It will not be compatible with FCMP++.");		
+		// TODO: add "m_type = NetworkType::Invalid;" and return false in a later release, closer to FCMP++ hardfork
+	}
+
 	return true;
 }
 
@@ -256,4 +272,18 @@ bool Wallet::get_eph_public_key(const hash& txkey_sec, size_t output_index, hash
 	return true;
 }
 
+bool Wallet::torsion_check() const
+{
+	ge_p3 p1, p2;
+	if ((ge_frombytes_vartime(&p1, m_spendPublicKey.h) != 0) || (ge_frombytes_vartime(&p2, m_viewPublicKey.h) != 0)) {
+		return false;
+	}
+
+	return
+		!fcmp_pp::mul8_is_identity(p1) &&
+		!fcmp_pp::mul8_is_identity(p2) &&
+		fcmp_pp::torsion_check_vartime(p1) &&
+		fcmp_pp::torsion_check_vartime(p2);
+}
+
 } // namespace p2pool

src/wallet.h

@@ -34,31 +34,32 @@ public:
 	Wallet(const Wallet& w);
 	Wallet& operator=(const Wallet& w);
 
-	FORCEINLINE bool valid() const { return m_type != NetworkType::Invalid; }
+	[[nodiscard]] FORCEINLINE bool valid() const { return m_type != NetworkType::Invalid; }
 
-	bool decode(const char* address);
-	bool assign(const hash& spend_pub_key, const hash& view_pub_key, NetworkType type, bool subaddress);
+	[[nodiscard]] bool decode(const char* address);
+	[[nodiscard]] bool assign(const hash& spend_pub_key, const hash& view_pub_key, NetworkType type, bool subaddress);
 
 	void encode(char (&buf)[ADDRESS_LENGTH]) const;
 
-	FORCEINLINE std::string encode() const
+	[[nodiscard]] FORCEINLINE std::string encode() const
 	{
 		char buf[ADDRESS_LENGTH];
 		encode(buf);
 		return std::string(buf, buf + ADDRESS_LENGTH);
 	}
 
-	bool get_eph_public_key(const hash& txkey_sec, size_t output_index, hash& eph_public_key, uint8_t& view_tag, const uint8_t* expected_view_tag = nullptr) const;
+	[[nodiscard]] bool get_eph_public_key(const hash& txkey_sec, size_t output_index, hash& eph_public_key, uint8_t& view_tag, const uint8_t* expected_view_tag = nullptr) const;
 
 	FORCEINLINE bool operator<(const Wallet& w) const { return (m_spendPublicKey < w.m_spendPublicKey) || ((m_spendPublicKey == w.m_spendPublicKey) && (m_viewPublicKey < w.m_viewPublicKey)); }
 	FORCEINLINE bool operator==(const Wallet& w) const { return (m_spendPublicKey == w.m_spendPublicKey) && (m_viewPublicKey == w.m_viewPublicKey); }
 
-	FORCEINLINE uint64_t prefix() const { return m_prefix; }
-	FORCEINLINE const hash& spend_public_key() const { return m_spendPublicKey; }
-	FORCEINLINE const hash& view_public_key() const { return m_viewPublicKey; }
-	FORCEINLINE uint32_t checksum() const { return m_checksum; }
-	FORCEINLINE NetworkType type() const { return m_type; }
-	FORCEINLINE bool is_subaddress() const { return m_subaddress; }
+	[[nodiscard]] FORCEINLINE uint64_t prefix() const { return m_prefix; }
+	[[nodiscard]] FORCEINLINE const hash& spend_public_key() const { return m_spendPublicKey; }
+	[[nodiscard]] FORCEINLINE const hash& view_public_key() const { return m_viewPublicKey; }
+	[[nodiscard]] FORCEINLINE uint32_t checksum() const { return m_checksum; }
+	[[nodiscard]] FORCEINLINE NetworkType type() const { return m_type; }
+	[[nodiscard]] FORCEINLINE bool is_subaddress() const { return m_subaddress; }
+	[[nodiscard]] bool torsion_check() const;
 
 private:
 	uint64_t m_prefix;

tests/CMakeLists.txt

@@ -6,7 +6,8 @@ include(cmake/standard.cmake)
 option(STATIC_LIBS "Use locally built libuv and libzmq static libs" OFF)
 option(WITH_LTO "Use link-time compiler optimization (if linking fails for you, run cmake with -DWITH_LTO=OFF)" ON)
 option(WITH_COVERAGE "Generate code coverage data" OFF)
-option(DEV_DEBUG "[Developer only] Compile a debug build" OFF)
+option(WITH_INDEXED_HASHES "Save memory used for storing transaction hashes and public keys (a bit slower block verification, use it only if you compile for a very low memory system)" ON)
+option(DEV_DEBUG "[Developer only] Compile a debug build" ON)
 
 if (DEV_DEBUG)
 	add_definitions(-DDEV_DEBUG)
@@ -62,6 +63,7 @@ set(SOURCES
 	../external/src/crypto/sha256.c
 	../external/src/cryptonote/crypto-ops-data.c
 	../external/src/cryptonote/crypto-ops.c
+	../external/src/cryptonote/fcmp_pp_crypto.cpp
 	../external/src/hardforks/hardforks.cpp
 	../src/block_cache.cpp
 	../src/block_template.cpp
@@ -84,6 +86,11 @@ set(SOURCES
 	../src/wallet.cpp
 )
 
+if (WITH_INDEXED_HASHES)
+	add_compile_definitions(WITH_INDEXED_HASHES)
+	set(SOURCES ${SOURCES} ../src/indexed_hash.cpp)
+endif()
+
 if (AMD64)
 	set(SOURCES ${SOURCES} ../src/keccak_bmi.cpp)
 	if (CMAKE_C_COMPILER_ID MATCHES GNU OR CMAKE_C_COMPILER_ID MATCHES Clang)
@@ -160,7 +167,7 @@ if(APPLE)
 	set(LIBS ${LIBS} ${FOUNDATION_LIB} ${CORE_FOUNDATION_LIB} ${SYSTEM_CONFIGURATION_LIB})
 endif()
 
-add_definitions(/DZMQ_STATIC /DP2POOL_LOG_DISABLE)
+add_compile_definitions(ZMQ_STATIC P2POOL_LOG_DISABLE P2POOL_ABORT_ON_LOG_ERROR)
 
 include(CheckCXXSourceCompiles)
 

tests/src/block_template_tests.cpp

@@ -22,6 +22,7 @@
 #include "side_chain.h"
 #include "wallet.h"
 #include "keccak.h"
+#include "params.h"
 #include "gtest/gtest.h"
 
 namespace p2pool {
@@ -36,7 +37,7 @@ static hash H(const char* s)
 TEST(block_template, update)
 {
 	init_crypto_cache();
-
+	{
 	SideChain sidechain(nullptr, NetworkType::Mainnet);
 	BlockTemplate tpl(&sidechain, nullptr);
 	tpl.rng().seed(123);
@@ -52,11 +53,12 @@ TEST(block_template, update)
 	data.median_timestamp = (1ULL << 35) - 2;
 
 	Mempool mempool;
-	Wallet wallet("44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg");
-	Wallet subaddress{ nullptr };
+	Params params;
+
+	params.m_miningWallet = Wallet("44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg");
 
 	// Test 1: empty template
-	tpl.update(data, mempool, wallet, subaddress);
+	tpl.update(data, mempool, &params);
 	ASSERT_EQ(tpl.get_reward(), 600000000000ULL);
 
 	const PoolBlock* b = tpl.pool_block_template();
@@ -83,8 +85,11 @@ TEST(block_template, update)
 
 	// Test 2: mempool with high fee and low fee transactions, it must choose high fee transactions
 	for (uint64_t i = 0; i < 513; ++i) {
+		hash h;
+		h.u64()[0] = i;
+
 		TxMempoolData tx;
-		*reinterpret_cast<uint64_t*>(tx.id.h) = i;
+		tx.id = static_cast<indexed_hash>(h);
 		tx.fee = (i < 256) ? 30000000 : 60000000;
 		tx.weight = 1500;
 		mempool.add(tx);
@@ -108,14 +113,14 @@ TEST(block_template, update)
 	}
 	ASSERT_EQ(mempool.size(), 512);
 
-	tpl.update(data, mempool, wallet, subaddress);
+	tpl.update(data, mempool, &params);
 	ASSERT_EQ(tpl.get_reward(), 612054770773ULL);
 
 	ASSERT_EQ(b->m_sidechainId, H("c9df4853003ab436416b9fc9a5a072d16b4dede849e697a8be2ebb9c88c8ec72"));
 	ASSERT_EQ(b->m_transactions.size(), 203);
 
 	for (size_t i = 1; i < b->m_transactions.size(); ++i) {
-		ASSERT_GE(*reinterpret_cast<const uint64_t*>(b->m_transactions[i].h), 256);
+		ASSERT_GE(static_cast<hash>(b->m_transactions[i]).u64()[0], 256);
 	}
 
 	tpl.get_hashing_blobs(0, 1000, blobs, height, diff, aux_diff, sidechain_diff, seed_hash, nonce_offset, template_id);
@@ -135,8 +140,11 @@ TEST(block_template, update)
 	std::vector<TxMempoolData> transactions;
 
 	for (uint64_t i = 0; i < 10; ++i) {
+		hash h;
+		h.u64()[0] = i;
+
 		TxMempoolData tx;
-		*reinterpret_cast<uint64_t*>(tx.id.h) = i;
+		tx.id = static_cast<indexed_hash>(h);
 		tx.fee = 30000000;
 		tx.weight = 1500;
 		transactions.push_back(tx);
@@ -146,7 +154,7 @@ TEST(block_template, update)
 
 	data.aux_chains.emplace_back(H("01f0cf665bd4cd31cbb2b2470236389c483522b350335e10a4a5dca34cb85990"), H("d9de1cfba7cdbd47f12f77addcb39b24c1ae7a16c35372bf28d6aee5d7579ee6"), difficulty_type(1000000));
 
-	tpl.update(data, mempool, wallet, subaddress);
+	tpl.update(data, mempool, &params);
 	ASSERT_EQ(tpl.get_reward(), 600300000000ULL);
 
 	ASSERT_EQ(b->m_sidechainId, H("c32abac2cad40e263a94f5f43f90e0a7d7d4b151305b79951dbc8c88c3180613"));
@@ -171,10 +179,11 @@ TEST(block_template, update)
 	std::mt19937_64 rng;
 
 	for (uint64_t i = 0; i < 10000; ++i) {
+		hash h;
+		h.u64()[0] = i;
+
 		TxMempoolData tx;
-
-		*reinterpret_cast<uint64_t*>(tx.id.h) = i;
-
+		tx.id = static_cast<indexed_hash>(h);
 		tx.weight = 1500 + (rng() % 10007);
 		tx.fee = 30000000 + (rng() % 100000007);
 
@@ -182,7 +191,7 @@ TEST(block_template, update)
 	}
 	ASSERT_EQ(mempool.size(), 10000);
 
-	tpl.update(data, mempool, wallet, subaddress);
+	tpl.update(data, mempool, &params);
 	ASSERT_EQ(tpl.get_reward(), 619742028747ULL);
 
 	ASSERT_EQ(b->m_sidechainId, H("69e7dd43dd99ac6be3f57ca333cc0d814189e83aee1773c99a341aca085c0d46"));
@@ -199,14 +208,18 @@ TEST(block_template, update)
 
 	keccak(blobs.data(), static_cast<int>(blobs.size()), blobs_hash.h);
 	ASSERT_EQ(blobs_hash, H("4f62562aa84400eb085f58447d8daa45257369f1ec046b2150212329c9e86ae4"));
-
+	}
 	destroy_crypto_cache();
+
+#ifdef WITH_INDEXED_HASHES
+	indexed_hash::cleanup_storage();
+#endif
 }
 
 TEST(block_template, submit_sidechain_block)
 {
 	init_crypto_cache();
-
+	{
 	SideChain sidechain(nullptr, NetworkType::Mainnet, "unit_test");
 
 	ASSERT_EQ(sidechain.consensus_hash(), H("81d45b62c10afa4fdda7cebb02dd5ad82c43b577eb3fb0857824427c55fd8a8d"));
@@ -231,19 +244,20 @@ TEST(block_template, submit_sidechain_block)
 	data.median_timestamp = (1ULL << 35) - (sidechain.chain_window_size() * 2 + 10) * sidechain.block_time() - 3600;
 
 	Mempool mempool;
-	Wallet wallet("44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg");
-	Wallet subaddress{ nullptr };
+	Params params;
+
+	params.m_miningWallet = Wallet("44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg");
 
 	std::mt19937_64 rng(101112);
 
 	for (uint64_t i = 0, i2 = 0, i3 = 0; i < sidechain.chain_window_size() * 3; ++i) {
-		tpl.update(data, mempool, wallet, subaddress);
+		tpl.update(data, mempool, &params);
 
 		if ((rng() % 31) == 0) {
-			tpl2.update(data, mempool, wallet, subaddress);
+			tpl2.update(data, mempool, &params);
 
 			if ((rng() % 11) == 0) {
-				tpl3.update(data, mempool, wallet, subaddress);
+				tpl3.update(data, mempool, &params);
 				++i3;
 				ASSERT_TRUE(tpl3.submit_sidechain_block(i3, 0, 0));
 			}
@@ -270,8 +284,12 @@ TEST(block_template, submit_sidechain_block)
 	ASSERT_EQ(tip->m_sidechainHeight, sidechain.chain_window_size() * 3 - 1);
 
 	ASSERT_EQ(tip->m_sidechainId, H("12d57571a28d62d2b6dca3a647500d23ac22864138b22a133f237b459a0862da"));
-
+	}
 	destroy_crypto_cache();
+
+#ifdef WITH_INDEXED_HASHES
+	indexed_hash::cleanup_storage();
+#endif
 }
 
 }

tests/src/crypto_tests.cpp

@@ -18,15 +18,20 @@
 #include "common.h"
 #include "crypto.h"
 #include "util.h"
+extern "C" {
+#include "crypto-ops.h"
+}
+#include "fcmp_pp_crypto.h"
+
 #include "gtest/gtest.h"
 #include <fstream>
 
 namespace p2pool {
 
-TEST(crypto, derivation)
+TEST(crypto, ops)
 {
 	init_crypto_cache();
-
+	{
 	hash pub, sec;
 	generate_keys(pub, sec);
 	ASSERT_TRUE(check_keys(pub, sec));
@@ -103,11 +108,37 @@ TEST(crypto, derivation)
 				ASSERT_EQ(pub, pub_check);
 				ASSERT_EQ(sec, sec_check);
 			}
+			else if (name == "check_key") {
+				hash pub_key;
+				std::string result_str;
+
+				f >> pub_key >> result_str;				
+
+				ge_p3 p;
+				ASSERT_EQ(ge_frombytes_vartime(&p, pub_key.h) == 0, result_str == "true");
+			}
+			else if (name == "check_torsion") {
+				hash pub_key;
+				std::string result_str;
+
+				f >> pub_key >> result_str;				
+
+				ge_p3 p;
+				ASSERT_EQ(
+					(ge_frombytes_vartime(&p, pub_key.h) == 0)
+					&& !fcmp_pp::mul8_is_identity(p)
+					&& fcmp_pp::torsion_check_vartime(p)
+				, result_str == "true");
+			}
 		} while (!f.eof());
 	}
-
+	}
 	clear_crypto_cache(0);
 	destroy_crypto_cache();
+
+#ifdef WITH_INDEXED_HASHES
+	indexed_hash::cleanup_storage();
+#endif
 }
 
 }

tests/src/crypto_tests.txt

@@ -712,3 +712,404 @@ get_tx_keys 87f91cbbb4409ecb9e8fb7e4777ca92a4ffcd001e6254d5e39d9f05dce677775 988
 get_tx_keys e3542c51b61a3d9eb0773335582a8d6dd24c32413a969d5cb9629ddc77a8e49f c7d7ce6d43ec125071b8c5115f010164b89a33eb4aedf4ca31700a975177c617 df5476bf0fa51deeda6e0ac0c48e0fd64e8d3abf9b0e60572c757afebe2bb71a ef2c6830783a181234a503da9308a158c47f97d0da0c5b612a8ea67b4ec3e708
 get_tx_keys dfffcad8d938c771497214aad51e5f8e307b9cfb5bf7f37cfcf73ae19344aa50 1e117af98c71f5443715d961d0d0d4436e2451be401db8ad40e2a66de65dbc0d a165ebbedf785963098865897d62821c72e0d89afbeffad3b54012745be4cd78 3ae76a2dfd4acc0e7bb7cfbdd516e269a2294005b1bc877f2feeaf52ac2aa70c
 get_tx_keys cabfa01f1fed98842b2a30a547d34c5be1fbaa1c5753d83519b59f79239956c7 0faf698d4917c7edccb1dc401e9b33d775d6d699eff51ff6a29ca5da2d9df969 4021cad4e8a45714bc893475487d8b07c868bbddd7086f5befaadc92fca9e892 2417b7887c6f287775d736d0fbe1544d53e2ed33adc948ceca8c16f0b14b2d05
+check_key c2cb3cf3840aa9893e00ec77093d3d44dba7da840b51c48462072d58d8efd183 false
+check_key bd85a61bae0c101d826cbed54b1290f941d26e70607a07fc6f0ad611eb8f70a6 true
+check_key 328f81cad4eba24ab2bad7c0e56b1e2e7346e625bcb06ae649aef3ffa0b8bef3 false
+check_key 6016a5463b9e5a58c3410d3f892b76278883473c3f0b69459172d3de49e85abe true
+check_key 4c71282b2add07cdc6898a2622553f1ca4eb851e5cb121181628be5f3814c5b1 false
+check_key 69393c25c3b50e177f81f20f852dd604e768eb30052e23108b3cfa1a73f2736e true
+check_key 3d5a89b676cb84c2be3428d20a660dc6a37cae13912e127888a5132e8bac2163 true
+check_key 78cd665deb28cebc6208f307734c56fccdf5fa7e2933fadfcdd2b6246e9ae95c false
+check_key e03b2414e260580f86ee294cd4c636a5b153e617f704e81dad248fbf715b2ee4 true
+check_key 28c3503ce82d7cdc8e0d96c4553bcf0352bbcfc73925495dbe541e7e1df105fc false
+check_key 06855c3c3e0d03fec354059bda319b39916bdc10b6581e3f41b335ee7b014fd5 false
+check_key 556381485df0d7d5a268ab5ecfb2984b060acc63471183fcf538bf273b0c0cb5 true
+check_key c7f76d82ac64b1e7fdc32761ff00d6f0f7ada4cf223aa5a11187e3a02e1d5319 true
+check_key cfa85d8bdb6f633fcf031adee3a299ac42eeb6bd707744049f652f6322f5aa47 true
+check_key 91e9b63ced2b08979fee713365464cc3417c4f238f9bdd3396efbb3c58e195ee true
+check_key 7b56e76fe94bd30b3b2f2c4ba5fe4c504821753a8965eb1cbcf8896e2d6aba19 true
+check_key 7338df494bc416cf5edcc02069e067f39cb269ce67bd9faba956021ce3b3de3a false
+check_key f9a1f27b1618342a558379f4815fa5039a8fe9d98a09f45c1af857ba99231dc1 false
+check_key b2a1f37718180d4448a7fcb5f788048b1a7132dde1cfd25f0b9b01776a21c687 true
+check_key 0d3a0f9443a8b24510ad1e76a8117cca03bce416edfe35e3c2a2c2712454f8dc false
+check_key d8d3d806a76f120c4027dc9c9d741ad32e06861b9cfbc4ce39289c04e251bb3c false
+check_key 1e9e3ba7bc536cd113606842835d1f05b4b9e65875742f3a35bfb2d63164b5d5 true
+check_key 5c52d0087997a2cdf1d01ed0560d94b4bfd328cb741cb9a8d46ff50374b35a57 true
+check_key bb669d4d7ffc4b91a14defedcdbd96b330108b01adc63aa685e2165284c0033b false
+check_key d2709ae751a0a6fd796c98456fa95a7b64b75a3434f1caa3496eeaf5c14109b4 true
+check_key e0c238cba781684e655b10a7d4af04ab7ff2e7022182d7ed2279d6adf36b3e7a false
+check_key 34ebb4bf871572cee5c6935716fab8c8ec28feef4f039763d8f039b84a50bf4c false
+check_key 4730d4f38ec3f3b83e32e6335d2506df4ee39858848842c5a0184417fcc639e4 true
+check_key d42cf7fdf5e17e0a8a7f88505a2b7a3d297113bd93d3c20fa87e11509ec905a2 true
+check_key b757c95059cefabb0080d3a8ebca82e46efecfd29881be3121857f9d915e388c false
+check_key bbe777aaf04d02b96c0632f4b1c6f35f1c7bcbc5f22af192f92c077709a2b50b false
+check_key 73518522aabd28566f858c33fccb34b7a4de0e283f6f783f625604ee647afad9 true
+check_key f230622c4a8f6e516590466bd10f86b64fbef61695f6a054d37604e0b024d5af false
+check_key bc6b9a8379fd6c369f7c3bd9ddce58db6b78f27a41d798bb865c3920824d0943 false
+check_key 45a4f87c25898cd6be105fa1602b85c4d862782adaac8b85c996c4a2bcd8af47 true
+check_key eb4ad3561d21c4311affbd7cc2c7ff5fd509f72f88ba67dc097a75c31fdbd990 false
+check_key 2f34f4630c09a23b7ecc19f02b4190a26df69e07e13de8069ae5ff80d23762fc true
+check_key 2ea4e4fb5085eb5c8adee0d5ab7d35c67d74d343bd816cd13924536cffc2527c true
+check_key 5d35467ee6705a0d35818aa9ae94e4603c3e5500bfc4cf4c4f77a7160a597aa6 true
+check_key 8ff42bc76796e20c99b6e879369bd4b46a256db1366416291de9166e39d5a093 true
+check_key 0262ba718850df6c621e8a24cd9e4831c047e38818a89e15c7a06a489a4558e1 false
+check_key 58b29b2ba238b534b08fb46f05f430e61cb77dc251b0bb50afec1b6061fd9247 false
+check_key 153170e3dc2b0e1b368fc0d0e31053e872f094cdace9a2846367f0d9245a109b false
+check_key 40419d309d07522d493bb047ca9b5fb6c401aae226eefae6fd395f5bb9114200 true
+check_key 713068818d256ef69c78cd6082492013fbd48de3c9e7e076415dd0a692994504 true
+check_key a7218ee08e50781b0c87312d5e0031467e863c10081668e3792d96cbcee4e474 true
+check_key 356ce516b00e674ef1729c75b0a68090e7265cef675bbf32bf809495b67e9342 false
+check_key 52a5c053293675e3efd2c585047002ea6d77931cbf38f541b9070d319dc0d237 false
+check_key 77c0080bf157e069b18c4c604cc9505c5ec6f0f9930e087592d70507ca1b5534 false
+check_key e733bc41f880a4cfb1ca6f397916504130807289cacfca10b15f5b8d058ed1bf false
+check_key c4f1d3c884908a574ecea8be10e02277de35ef84a1d10f105f2be996f285161f true
+check_key aed677f7f69e146aa0863606ac580fc0bbdc22a88c4b4386abaa4bdfff66bcc9 false
+check_key 6ad0edf59769599af8caa986f502afc67aecbebb8107aaf5e7d3ae51d5cf8dd8 false
+check_key 64a0a70e99be1f775c222ee9cd6f1bee6f632cb9417899af398ff9aff70661c6 true
+check_key c63afaa03bb5c4ed7bc77aac175dbfb73f904440b2e3056a65850ac1bd261332 false
+check_key a4e89cd2471c26951513b1cfbdcf053a86575e095af52495276aa56ede8ce344 false
+check_key 2ce935d97f7c3ddb973de685d20f58ee39938fe557216328045ec2b83f3132be true
+check_key 3e3d38b1fca93c1559ac030d586616354c668aa76245a09e3fa6de55ac730973 true
+check_key 8b81b9681f76a4254007fd07ed1ded25fc675973ccb23afd06074805194733a4 false
+check_key 26d1c15dfc371489439e29bcef2afcf7ed01fac24960fdc2e7c20847a8067588 true
+check_key 85c1199b5a4591fc4cc36d23660648c1b9cfbb0e9c47199fa3eea33299a3dcec false
+check_key 60830ba5449c1f04ac54675dfc7cac7510106c4b7549852551f8fe65971123e2 false
+check_key 3e43c28c024597b3b836e4bc16905047cbf6e841b80e0b8cd6a325049070c2a5 false
+check_key 474792c16a0032343a6f28f4cb564747c3b1ea0b6a6b9a42f7c71d7cc3dd3b44 true
+check_key c8ec5e67cb5786673085191881950a3ca20dde88f46851b01dd91c695cfbad16 true
+check_key 861c4b24b24a87b8559e0bb665f84dcc506c147a909f335ae4573b92299f042f false
+check_key 2c9e0fe3e4983d79f86c8c36928528f1bc90d94352ce427032cdef6906d84d0b true
+check_key 9293742822c2dff63fdc1bf6645c864fd527cea2ddba6d4f3048d202fc340c9a true
+check_key 3956422ad380ef19cb9fe360ef09cc7aaec7163eea4114392a7a0b2e2671914e true
+check_key 5ae8e72cadda85e525922fec11bd53a261cf26ee230fe85a1187f831b1b2c258 false
+check_key 973feca43a0baf450c30ace5dc19015e19400f0898316e28d9f3c631da31f99a true
+check_key dd946c91a2077f45c5c16939e53859d9beabaf065e7b1b993d5e5cd385f8716e true
+check_key b3928f2d67e47f6bd6da81f72e64908d8ff391af5689f0202c4c6fec7666ffe8 true
+check_key 313382e82083697d7f9d256c3b3800b099b56c3ef33cacdccbd40a65622e25fc false
+check_key 7d65380c12144802d39ed9306eed79fe165854273700437c0b4b50559800c058 true
+check_key 4db5c20a49422fd27739c9ca80e2271a8a125dfcead22cb8f035d0e1b7b163be true
+check_key dd76a9f565ef0e44d1531349ec4c5f7c3c387c2f5823e693b4952f4b0b70808c true
+check_key 66430bf628eae23918c3ed17b42138db1f98c24819e55fc4a07452d0c85603eb true
+check_key 9f0b677830c3f089c27daf724bb10be848537f8285de83ab0292d35afb617f77 false
+check_key cbf98287391fb00b1e68ad64e9fb10198025864c099b8b9334d840457e673874 true
+check_key a42552e9446e49a83aed9e3370506671216b2d1471392293b8fc2b81c81a73ee false
+check_key fb3de55ac81a923d506a514602d65d004ec9d13e8b47e82d73af06da73006673 false
+check_key e17abb78e58a4b72ff4ad7387b290f2811be880b394b8bcaae7748ac09930169 false
+check_key 9ffbda7ace69753761cdb5eb01f75433efa5cdb6a4f1b664874182c6a95adcba true
+check_key 507123c979179ea0a3f7f67fb485f71c8636ec4ec70aa47b92f3c707e7541a54 false
+check_key f1d0b156571994ef578c61cb6545d34f834eb30e4357539a5633c862d4dffa91 false
+check_key 3de62311ec14f9ee95828c190b2dc3f03059d6119e8dfccb7323efc640e07c75 false
+check_key 5e50bb48bc9f6dd11d52c1f0d10d8ae5674d7a4af89cbbce178dafc8a562e5fe false
+check_key 20b2c16497be101995391ceefb979814b0ea76f1ed5b6987985bcdcd17b36a81 false
+check_key d63bff73b914ce791c840e99bfae0d47afdb99c2375e33c8f149d0df03d97873 false
+check_key 3f24b3d94b5ddd244e4c4e67a6d9f533f0396ca30454aa0ca799f21328b81d47 true
+check_key 6a44c016f09225a6d2e830290719d33eb29b53b553eea7737ed3a6e297b2e7d2 true
+check_key ff0f34df0c76c207b8340be2009db72f730c69c2bbfeea2013105eaccf1d1f8e true
+check_key 4baf559869fe4e915e219c3c8d9a2330fc91e542a5a2a7311d4d59fee996f807 true
+check_key 1632207dfef26e97d13b0d0035ea9468fc5a8a89b0990fce77bb143c9d7f3b67 true
+check_key fcb3dee3993d1a47630f29410903dd03706bd5e81c5802e6f1b9095cbdb404d3 true
+check_key fb527092b9809e3d27d7588c7ef89915a769b99c1e03e7f72bbead9ed837daae false
+check_key 902b118d27d40ab9cbd55edd375801ce302cdb59e09c8659a3ea1401918d8bba false
+check_key 4d6fbf25ca51e263a700f1abf84f758dde3d11b632e908b3093d64fe2e70ea0a true
+check_key f4c3211ec70affc1c9a94a6589460ee8360dad5f8c679152f16994038532e3fc true
+check_key c2b3d73ac14956d7fdf12fa92235af1bb09e1566a6a6ffd0025682c750abdd69 false
+check_key b7e68c12207d2e2104fb2ca224829b6fccc1c0e2154e8a931e3c837a945f4430 false
+check_key 56ca0ca227708f1099bda1463db9559541c8c11ffad7b3d95c717471f25a01bf true
+check_key 3eef3a46833e4d851671182a682e344e36bea7211a001f3b8af1093a9c83f1b2 true
+check_key bd1f4a4f26cab7c1cbc0e17049b90854d6d28d2d55181e1b5f7a8045fcdfa06e true
+check_key 8537b01c87e7c184d9555e8d93363dcd9b60a8acc94cd3e41eb7525fd3e1d35a false
+check_key 68ace49179d549bad391d98ab2cc8afee65f98ce14955c3c1b16e850fabec231 true
+check_key f9922f8a660e7c3e4f3735a817d18b72f59166a0be2d99795f953cf233a27e24 true
+check_key 036b6be3da26e80508d5a5a6a5999a1fe0db1ac4e9ade8f1ea2eaf2ea9b1a70e true
+check_key 5e595e886ce16b5ea31f53bcb619f16c8437276618c595739fece6339731feb0 false
+check_key 4ee2cebae3476ed2eeb7efef9d20958538b3642f938403302682a04115c0f8ed false
+check_key 519eedbd0da8676063ce7d5a605b3fc27afeecded857afa24b894ad248c87b5d false
+check_key ce2b627c0accf4a3105796680c37792b30c6337d2d4fea11678282455ff82ff7 false
+check_key aa26ed99071a8416215e8e7ded784aa7c2b303aab67e66f7539905d7e922eb4d false
+check_key 435ae49c9ca26758aa103bdcca8d51393b1906fe27a61c5245361e554f335ec2 true
+check_key 42568af395bd30024f6ccc95205c0e11a6ad1a7ee100f0ec46fcdf0af88e91fb false
+check_key 0b4a78d1fde56181445f04ca4780f0725daa9c375b496fab6c037d6b2c2275db true
+check_key 2f82d2a3c8ce801e1ad334f9e074a4fbf76ffac4080a7331dc1359c2b4f674a4 false
+check_key 24297d8832d733ed052dd102d4c40e813f702006f325644ccf0cb2c31f77953f false
+check_key 5231a53f6bea7c75b273bde4a9f673044ed87796f20e0909978f29d98fc8d4f0 true
+check_key 94b5affcf78be5cf62765c32a0794bc06b4900e8a47ddba0e166ec20cec05935 true
+check_key c14b4d846ea52ffbbb36aa62f059453af3cfae306280dada185d2d385ef8f317 true
+check_key cceb34fddf01a6182deb79c6000a998742d4800d23d1d8472e3f43cd61f94508 true
+check_key 1faffa33407fba1634d4136cf9447896776c16293b033c6794f06774b514744c true
+check_key faaac98f644a2b77fb09ba0ebf5fcddf3ff55f6604c0e9e77f0278063e25113a true
+check_key 09e8525b00bea395978279ca979247a76f38f86dce4465eb76c140a7f904c109 true
+check_key 2d797fc725e7fb6d3b412694e7386040effe4823cdf01f6ec7edea4bc0e77e20 false
+check_key bbb74dabee651a65f46bca472df6a8a749cc4ba5ca35078df5f6d27a772f922a false
+check_key 77513ca00f3866607c3eff5c2c011beffa775c0022c5a4e7de1120a27e6687fd true
+check_key 10064c14ace2a998fc2843eeeb62884fe3f7ab331ca70613d6a978f44d9868eb false
+check_key 026ae84beb5e54c62629a7b63702e85044e38cadfc9a1fcabee6099ba185005c false
+check_key aef91536292b7ba34a3e787fb019523c2fa7a0d56fca069cc82ccb6b02a45b14 false
+check_key 147bb1a82c623c722540feaad82b7adf4b85c6ec0cbcef3ca52906f3e85617ac true
+check_key fc9fb281a0847d58dc9340ef35ef02f7d20671142f12bdd1bfb324ab61d03911 false
+check_key b739801b9455ac617ca4a7190e2806669f638d4b2f9288171afb55e1542c8d71 false
+check_key 494cc1e2ee997eb1eb051f83c4c89968116714ddf74e460d4fa1c6e7c72e3eb3 true
+check_key ed2fbdf2b727ed9284db90ec900a942224787a880bc41d95c4bc4cf136260fd7 true
+check_key 02843d3e6fc6835ad03983670a592361a26948eb3e31648d572416a944d4909e true
+check_key c14fea556a7e1b6b6c3d4e2e38a4e7e95d834220ff0140d3f7f561a34e460801 true
+check_key 5f8f82a35452d0b0d09ffb40a1154641916c31e161ad1a6ab8cfddc2004efdf6 false
+check_key 7b93d72429fab07b49956007eba335bb8c5629fbf9e7a601eaa030f196934a56 true
+check_key 6a63ed96d2e46c2874beaf82344065d94b1e5c04406997f94caf4ccd97cfbab9 false
+check_key c915f409e1e0f776d1f440aa6969cfec97559ef864b07d8c0d7c1163871b4603 true
+check_key d06bc33630fc94303c2c369481308f805f5ce53c40141160aa4a1f072967617e false
+check_key 1aafb14ca15043c2589bcd32c7c5f29479216a1980e127e9536729faf1c40266 true
+check_key 58c115624a20f4b0c152ccd048c54a28a938556863ab8521b154d3165d3649cd false
+check_key 9001ba086e8aa8a67e128f36d700cc641071556306db7ec9b8ac12a6256b27b7 false
+check_key 898c468541634fb0def11f82c781341fce0def7b15695af4e642e397218c730c true
+check_key 47ea6539e65b7b611b0e1ae9ee170adf7c31581ca9f78796d8ebbcc5cd74b712 false
+check_key 0c60952a64eeac446652f5d3c136fd36966cf66310c15ee6ab2ecbf981461257 false
+check_key 682264c4686dc7736b6e46bdc8ab231239bc5dac3f5cb9681a1e97a527945e8e true
+check_key 276006845ca0ea4238b231434e20ad8b8b2a36876effbe1d1e3ffb1f14973397 true
+check_key eecd3a49e55e32446f86c045dce123ef6fe2e5c57db1d850644b3c56ec689fce true
+check_key a4dced63589118db3d5aebf6b5670e71250f07485ca4bb6dddf9cce3e4c227a1 false
+check_key b8ade608ba43d55db7ab481da88b74a9be513fca651c03e04d30cc79f50e0276 false
+check_key 0d91de88d007a03fe782f904808b036ff63dec6b73ce080c55231afd4ed261c3 true
+check_key 87c59becb52dd16501edadbb0e06b0406d69541c4d46115351e79951a8dd9c28 true
+check_key 9aee723be2265171fe10a86d1d3e9cf5a4e46178e859db83f86d1c6db104a247 false
+check_key 509d34ae5bf56db011845b8cdf0cc7729ed602fce765e9564cb433b4d4421a43 false
+check_key 06e766d9a6640558767c2aab29f73199130bfdc07fd858a73e6ae8e7b7ba23ba false
+check_key 801c4fe5ab3e7cf13f7aa2ca3bc57cc8eba587d21f8bc4cd40b1e98db7aec8d9 false
+check_key d85ad63aeb7d2faa22e5c9b87cd27f45b01e6d0fdc4c3ddf105584ac0a021465 false
+check_key a7ca13051eb2baeb5befa5e236e482e0bb71803ad06a6eae3ae48742393329d2 true
+check_key 5a9ba3ec20f116173d933bf5cf35c320ed3751432f3ab453e4a6c51c1d243257 false
+check_key a4091add8a6710c03285a422d6e67863a48b818f61c62e989b1e9b2ace240a87 false
+check_key bdee0c6442e6808f25bb18e21b19032cf93a55a5f5c6426fba2227a41c748684 true
+check_key d4aeb6cdad9667ec3b65c7fbc5bfd1b82bba1939c6bb448a86e40aec42be5f25 false
+check_key 73525b30a77f1212f7e339ec11f48c453e476f3669e6e70bebabc2fe9e37c160 true
+check_key 45501f2dc4d0a3131f9e0fe37a51c14869ab610abd8bf0158111617924953629 false
+check_key 07d0e4c592aa3676adf81cca31a95d50c8c269d995a78cde27b2a9a7a93083a6 false
+check_key a1797d6178c18add443d22fdbf45ca5e49ead2f78b70bdf1500f570ee90adca5 true
+check_key 0961e82e6e7855d7b7bf96777e14ae729f91c5bbd20f805bd7daac5ccbec4bab false
+check_key 57f5ba0ad36e997a4fb585cd2fc81b9cc5418db702c4d1e366639bb432d37c73 true
+check_key 82b005be61580856841e042ee8be74ae4ca66bb6733478e81ca1e56213de5c05 false
+check_key d7733dcae1874c93e9a2bd46385f720801f913744d60479930dad7d56c767cdc false
+check_key b8b8b698609ac3f1bd8f4965151b43b362e6c5e3d1c1feae312c1d43976d59ab true
+check_key 4bba7815a9a1b86a5b80b17ac0b514e2faa7a24024f269b330e5b7032ae8c04e true
+check_key 0f70da8f8266b58acda259935ef1a947c923f8698622c5503520ff31162e877b false
+check_key 233eaa3db80f314c6c895d1328a658a9175158fa2483ed216670c288a04b27bc false
+check_key a889f124fabfd7a1e2d176f485be0cbd8b3eeaafeee4f40e99e2a56befb665be true
+check_key 2b7b8abc198b11cf7efa21bc63ec436f790fe1f9b8c044440f183ab291af61d6 true
+check_key 2491804714f7938cf501fb2adf07597b4899b919cabbaab49518b8f8767fdc6a true
+check_key 52744a54fcb00dc930a5d7c2bc866cbfc1e75dd38b38021fd792bb0ca9f43164 true
+check_key e42cbf70b81ba318419104dffbb0cdc3b7e7d4698e422206b753a4e2e6fc69bb false
+check_key 2faff73e4fed62965f3dbf2e6446b5fea0364666cc8c9450b6ed63bbb6f5f0e7 true
+check_key 8b963928d75be661c3c18ddd4f4d1f37ebc095ce1edc13fe8b23784c8f416dfd false
+check_key b1162f952808434e4d2562ffda98bd311613d655d8cf85dc86e0a6c59f7158bc true
+check_key 5a69adcd9e4f5b0020467e968d85877cb3aa04fa86088d4499b57ca65a665836 true
+check_key 61ab47da432c829d0bc9d4fdb59520b135428eec665ad509678188b81c7adf49 false
+check_key 154bb547f22f65a87c0c3f56294f5791d04a3c14c8125d256aeed8ec54c4a06e true
+check_key 0a78197861c30fd3547b5f2eabd96d3ac22ac0632f03b7afd9d5d2bfc2db352f true
+check_key 8bdeadcca1f1f8a4a67b01ed2f10ef31aba7b034e8d1df3a69fe9aebf32454e0 false
+check_key f4b17dfca559be7d5cea500ac01e834624fed9befae3af746b39073d5f63190d true
+check_key 622c52821e16ddc63b58f3ec2b959fe8c6ea6b1a596d9a58fd81178963f41c01 true
+check_key 07bedd5d55c937ef5e23a56c6e58f31adb91224d985285d7fef39ede3a9efb17 false
+check_key 5179bf3b7458648e57dc20f003c6bbfd55e8cd7c0a6e90df6ef8e8183b46f99d true
+check_key 683c80c3f304f10fdd53a84813b5c25b1627ebd14eb29b258b41cd14396ef41f true
+check_key c266244ed597c438170875fe7874f81258a830105ca1108131e6b8fea95eb8ba true
+check_key 0c1cdc693df29c2d1e66b2ce3747e34a30287d5eb6c302495634ec856593fe8e true
+check_key 28950f508f6a0d4c20ab5e4d55b80565a6a539092e72b7eb0ed9fa5017ecef88 false
+check_key 8328a2a5fcfc4433b1c283539a8943e6eb8cc16c59f29dedc3af2c77cfd56f25 true
+check_key 5d0f82319676d4d3636ff5dc2a38ea5ec8aeaac4835fdcab983ab35d76b7967b false
+check_key cafcc75e94a014115f25c23aaae86e67352f928f468d4312b92240ff0f3a4481 false
+check_key 3e5fdd8072574218f389d018e959669e8ca4ef20b114ea7dce7bfb32339f9f42 true
+check_key 591763e3390a78ccb529ceea3d3a97165878b179ad2edaa166fd3c78ec69d391 true
+check_key 7a0a196935bf79dc2b1c3050e8f2bf0665f7773fc07511b828ec1c4b1451d317 false
+check_key 9cf0c034162131fbaa94a608f58546d0acbcc2e67b62a0b2be2ce75fc8c25b9a false
+check_key e3840846e3d32644d45654b96def09a5d6968caca9048c13fcaab7ae8851c316 false
+check_key a4e330253739af588d70fbda23543f6df7d76d894a486d169e5fedf7ed32d2e2 false
+check_key cfb41db7091223865f7ecbdda92b9a6fb08887827831451de5bcb3165395d95d true
+check_key 3d10bd023cef8ae30229fdbfa7446a3c218423d00f330857ff6adde080749015 false
+check_key 4403b53b8d4112bb1727bb8b5fd63d1f79f107705ffe17867704e70a61875328 false
+check_key 121ef0813a9f76b7a9c045058557c5072de6a102f06a9b103ead6af079420c29 true
+check_key 386204cf473caf3854351dda55844a41162eb9ce4740e1e31cfef037b41bc56e false
+check_key eb5872300dc658161df469364283e4658f37f6a1349976f8973bd6b5d1d57a39 true
+check_key b8f32188f0fc62eeb38a561ff7b7f3c94440e6d366a05ef7636958bc97834d02 false
+check_key a817f129a8292df79eef8531736fdebb2e985304653e7ef286574d0703b40fb4 false
+check_key 2c06595bc103447b9c20a71cd358c704cb43b0b34c23fb768e6730ac9494f39e true
+check_key dd84bc4c366ced4f65c50c26beb8a9bc26c88b7d4a77effbb0f7af1b28e25734 false
+check_key 76b4d33810eed637f90d49a530ac5415df97cafdac6f17eda1ba7eb9a14e5886 true
+check_key 926ce5161c4c92d90ec4efc58e5f449a2c385766c42d2e60af16b7362097aef5 false
+check_key 20c661f1e95e94a745eb9ec7a4fa719eff2f64052968e448d4734f90952aefee false
+check_key 671b50abbd119c756010416e15fcdcc9a8e92eed0f67cbca240c3a9154db55c0 false
+check_key df7aeee8458433e5c68253b8ef006a1c74ce3aef8951056f1fa918a8eb855213 false
+check_key 70c81a38b92849cf547e3d5a6570d78e5228d4eaf9c8fdd15959edc9eb750daf false
+check_key 55a512100b72d4ae0cfc16c75566fcaa3a7bb9116840db1559c71fd0e961cc36 false
+check_key dbfbec4d0d2433a794ad40dc0aea965b6582875805c9a7351b47377403296acd true
+check_key 0a7fe09eb9342214f98b38964f72ae3c787c19e5d7e256af9216f108f88b00a3 true
+check_key a82e54681475f53ced9730ee9e3a607e341014d9403f5a42f3dbdbe8fc52e842 true
+check_key 4d1f90059f7895a3f89abf16162e8d69b399c417f515ccb43b83144bbe8105f6 true
+check_key 94e5c5b8486b1f2ff4e98ddf3b9295787eb252ba9b408ca4d7724595861da834 false
+check_key d16e3e8dfa6d33d1d2db21c651006ccddbf4ce2e556594de5a22ae433e774ae6 false
+check_key a1b203ec5e36098a3af08d6077068fec57eab3a754cbb5f8192983f37191c2df false
+check_key 5378bb3ec8b4e49849bd7477356ed86f40757dd1ea3cee1e5183c7e7be4c3406 false
+check_key 541a4162edeb57130295441dc1cb604072d7323b6c7dffa02ea5e4fed1d2ee9e true
+check_key d8e86e189edcc4b5c262c26004691edd7bd909090997f886b00ed4b6af64d547 false
+check_key 18a8731d1983d1df2ce2703b4c85e7357b6356634ac1412e6c2ac33ad35f8364 false
+check_key b21212eac1eb11e811022514c5041233c4a07083a5b20acd7d632a938dc627de true
+check_key 50efcfac1a55e9829d89334513d6d921abeb237594174015d154512054e4f9d1 true
+check_key 9c44e8bcba31ddb4e67808422e42062540742ebd73439da0ba7837bf26649ec4 true
+check_key b068a4f90d5bd78fd350daa129de35e5297b0ad6be9c85c7a6f129e3760a1482 false
+check_key e9df93932f0096fcf2055564457c6dc685051673a4a6cd87779924be5c4abead true
+check_key eddab2fc52dac8ed12914d1eb5b0da9978662c4d35b388d64ddf8f065606acaf true
+check_key 54d3e6b3f2143d9083b4c98e4c22d98f99d274228050b2dc11695bf86631e89f true
+check_key 6da1d5ef1827de8bbf886623561b058032e196d17f983cbc52199b31b2acc75b true
+check_key e2a2df18e2235ebd743c9714e334f415d4ca4baf7ad1b335fb45021353d5117f true
+check_key f34cb7d6e861c8bfe6e15ac19de68e74ccc9b345a7b751a10a5c7f85a99dfeb6 false
+check_key f36e2f5967eb56244f9e4981a831f4d19c805e31983662641fe384e68176604a true
+check_key c7e2dc9e8aa6f9c23d379e0f5e3057a69b931b886bbb74ded9f660c06d457463 true
+check_key b97324364941e06f2ab4f5153a368f9b07c524a89e246720099042ad9e8c1c5b false
+check_key eff75c70d425f5bba0eef426e116a4697e54feefac870660d9cf24c685078d75 false
+check_key 161f3cd1a5873788755437e399136bcbf51ff5534700b3a8064f822995a15d24 false
+check_key 63d6d3d2c21e88b06c9ff856809572024d86c85d85d6d62a52105c0672d92e66 false
+check_key 1dc19b610b293de602f43dca6c204ce304702e6dc15d2a9337da55961bd26834 false
+check_key 28a16d02405f509e1cfef5236c0c5f73c3bcadcd23c8eff377253941f82769db true
+check_key 682d9cc3b65d149b8c2e54d6e20101e12b7cf96be90c9458e7a69699ec0c8ed7 false
+check_key 0000000000000000000000000000000000000000000000000000000000000000 true
+check_key 0000000000000000000000000000000000000000000000000000000000000080 true
+check_key 0100000000000000000000000000000000000000000000000000000000000000 true
+check_key 0100000000000000000000000000000000000000000000000000000000000080 false
+check_key 0200000000000000000000000000000000000000000000000000000000000000 false
+check_key 0200000000000000000000000000000000000000000000000000000000000080 false
+check_key 0300000000000000000000000000000000000000000000000000000000000000 true
+check_key 0300000000000000000000000000000000000000000000000000000000000080 true
+check_key 0400000000000000000000000000000000000000000000000000000000000000 true
+check_key 0400000000000000000000000000000000000000000000000000000000000080 true
+check_key 0500000000000000000000000000000000000000000000000000000000000000 true
+check_key 0500000000000000000000000000000000000000000000000000000000000080 true
+check_key 0600000000000000000000000000000000000000000000000000000000000000 true
+check_key 0600000000000000000000000000000000000000000000000000000000000080 true
+check_key 0700000000000000000000000000000000000000000000000000000000000000 false
+check_key 0700000000000000000000000000000000000000000000000000000000000080 false
+check_key 0800000000000000000000000000000000000000000000000000000000000000 false
+check_key 0800000000000000000000000000000000000000000000000000000000000080 false
+check_key 0900000000000000000000000000000000000000000000000000000000000000 true
+check_key 0900000000000000000000000000000000000000000000000000000000000080 true
+check_key 0a00000000000000000000000000000000000000000000000000000000000000 true
+check_key 0a00000000000000000000000000000000000000000000000000000000000080 true
+check_key 0b00000000000000000000000000000000000000000000000000000000000000 false
+check_key 0b00000000000000000000000000000000000000000000000000000000000080 false
+check_key 0c00000000000000000000000000000000000000000000000000000000000000 false
+check_key 0c00000000000000000000000000000000000000000000000000000000000080 false
+check_key 0d00000000000000000000000000000000000000000000000000000000000000 false
+check_key 0d00000000000000000000000000000000000000000000000000000000000080 false
+check_key 0e00000000000000000000000000000000000000000000000000000000000000 true
+check_key 0e00000000000000000000000000000000000000000000000000000000000080 true
+check_key 0f00000000000000000000000000000000000000000000000000000000000000 true
+check_key 0f00000000000000000000000000000000000000000000000000000000000080 true
+check_key 1000000000000000000000000000000000000000000000000000000000000000 true
+check_key 1000000000000000000000000000000000000000000000000000000000000080 true
+check_key 1100000000000000000000000000000000000000000000000000000000000000 false
+check_key 1100000000000000000000000000000000000000000000000000000000000080 false
+check_key 1200000000000000000000000000000000000000000000000000000000000000 true
+check_key 1200000000000000000000000000000000000000000000000000000000000080 true
+check_key 1300000000000000000000000000000000000000000000000000000000000000 true
+check_key 1300000000000000000000000000000000000000000000000000000000000080 true
+check_key daffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f true
+check_key daffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff true
+check_key dbffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f true
+check_key dbffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff true
+check_key dcffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key dcffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key ddffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f true
+check_key ddffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff true
+check_key deffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f true
+check_key deffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff true
+check_key dfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f true
+check_key dfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff true
+check_key e0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key e0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key e1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key e1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key e2ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key e2ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key e3ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f true
+check_key e3ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff true
+check_key e4ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f true
+check_key e4ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff true
+check_key e5ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key e5ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key e6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key e6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key e7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f true
+check_key e7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff true
+check_key e8ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f true
+check_key e8ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff true
+check_key e9ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f true
+check_key e9ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff true
+check_key eaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f true
+check_key eaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff true
+check_key ebffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key ebffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key ecffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f true
+check_key ecffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key edffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key edffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key eeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key eeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key f0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key f0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key f1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key f1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key f2ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key f2ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key f3ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key f3ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key f4ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key f4ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key f5ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key f5ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key f6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key f6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key f7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key f7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key f8ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key f8ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key f9ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key f9ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key faffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key faffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key fbffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key fbffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key fcffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key fcffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key fdffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key fdffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key feffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key feffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_key ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_key ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff false
+check_torsion 0100000000000000000000000000000000000000000000000000000000000000 false
+check_torsion 5866666666666666666666666666666666666666666666666666666666666666 true
+check_torsion c7176a703d4dd84fba3c0b760d10670f2a2053fa2c39ccc64ec7fd7792ac037a false
+check_torsion 0000000000000000000000000000000000000000000000000000000000000080 false
+check_torsion 26e8958fc2b227b045c3f489f2ef98f0d5dfac05d3c63339b13802886d53fc05 false
+check_torsion ecffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f false
+check_torsion 26e8958fc2b227b045c3f489f2ef98f0d5dfac05d3c63339b13802886d53fc85 false
+check_torsion c7176a703d4dd84fba3c0b760d10670f2a2053fa2c39ccc64ec7fd7792ac03fa false
+check_torsion 98519eadf35b995233b51b5cd23e9cc5a28b639b5a4af0ec903cb960d81b7819 false
+check_torsion 9bad33f580df7ecc49df5342bac8145d5bedc40f573d1b067f3c4ce449689a15 false
+check_torsion da99e28ba529cdde35a25fba9059e78ecaee239f99755b9b1aa4f65df00803e2 false
+check_torsion 9599999999999999999999999999999999999999999999999999999999999999 false
+check_torsion 55ae61520ca466adcc4ae4a32dc1633a5d749c64a5b50f136fc3469f27e487e6 false
+check_torsion 5252cc0a7f208133b620acbd4537eba2a4123bf0a8c2e4f980c3b31bb69765ea false
+check_torsion 13661d745ad63221ca5da0456fa618713511dc60668aa464e55b09a20ff7fc1d false
+check_torsion 0e7ea1fa7226d13cecabc4455bcfacbd7161d3500f7fc035d88fdf87810ff591 true
+check_torsion 29facca6fa66c12ba855e8a2b1dc3f159618b57d002a9b86293665c77bfb0063 false
+check_torsion 7bc3a7ddea737685757605ca318465ea96c443a67ac6023a0dabf3b6138cabde true
+check_torsion e3175b0d896b8b3f6abaf459e5152c57334f14cb1d16d84be35ae37eb95b3e42 false
+check_torsion 7173c529b1dbfc197c0c78f49c73f244b84a6296e8d23622de112dcd83bf413a true
+check_torsion 8e4d96422e571626a9b0fc6d19a42d0272ab6910657d5fb0603b7c0f83a17e3f false
+check_torsion e26bb95a4012a6c08207e01242dbb270a5c48949f4ef998d6604e9bb869cb830 true
+check_torsion 0b9446a5bfed593f7df81fedbd244d8f5a3b76b60b10667299fb1644796347cf false
+check_torsion 04e1c538fb0245416b852a40a2f6269b4dd3eaf3e6fffbb817c344d9916d389a true
+check_torsion 308538b9a3aa2c7ed290f507b8802f016f4747baa3ae3cbeb21b85689af1bad9 false
+check_torsion 7e6929588dcc0eed55c145f6a02116c11237b10dac6ad0f6a5f6e291f72bb2ca true
+check_torsion b808a048cb8674bf98a0adbc80f58fd961ff1a5d913396ec7fa3561789b22cb4 false
+check_torsion c54fa69bd6b14385dea0d851cf174f573ed8d42dc38149289b3ac974979a64c0 true
+check_torsion 46bf8c6159f85f60a890057a804b5bdd1b9c78d292a6cf6d936462e746496fd2 false

tests/src/difficulty_type_tests.cpp

@@ -258,6 +258,9 @@ TEST(difficulty_type, div128)
 	// (2^128 - 1) / (2^64 + 1) = 2^64 - 1
 	check(max_diff, { 1, 1 }, { std::numeric_limits<uint64_t>::max(), 0 });
 
+	// (2^128 - 1) / (2^64 + 2) = 2^64 - 2
+	check(max_diff, { 2, 1 }, { std::numeric_limits<uint64_t>::max() - 1, 0 });
+
 	// (2^128 - 1) / 8100430714362380904069067128193 = 42007935
 	check(max_diff, { 439125228929, 439125228929 }, { 42007935, 0 });
 
@@ -270,6 +273,49 @@ TEST(difficulty_type, div128)
 	// (2^128 - 2^64) / (2^64 - 1) = 2^64
 	check({ 0, std::numeric_limits<uint64_t>::max() }, { std::numeric_limits<uint64_t>::max(), 0 }, { 0, 1 });
 
+	// 2^128 - 1 = 3*5*17*257*641*65537*274177*6700417*67280421310721
+	constexpr uint64_t factors_2_128_minus_1[] = { 3, 5, 17, 257, 641, 65537, 274177, 6700417, 67280421310721 };
+
+	for (uint32_t i = 0, n = 1U << array_size(factors_2_128_minus_1); i < n; ++i) {
+		difficulty_type a{1, 0}, b{1, 0};
+
+		for (uint32_t j = 0; j < array_size(factors_2_128_minus_1); ++j) {
+			if (i & (1U << j)) {
+				a *= factors_2_128_minus_1[j];
+			}
+			else {
+				b *= factors_2_128_minus_1[j];
+			}
+		}
+
+		// Check that a*b = 2^128 - 1
+		difficulty_type c;
+		c.lo = umul128(a.lo, b.lo, &c.hi);
+
+		uint64_t t0;
+		const uint64_t t1 = umul128(a.lo, b.hi, &t0);
+		ASSERT_EQ(t0, 0);
+
+		c.hi += t1;
+		ASSERT_GE(c.hi, t1);
+
+		const uint64_t t2 = umul128(a.hi, b.lo, &t0);
+		ASSERT_EQ(t0, 0);
+
+		c.hi += t2;
+		ASSERT_GE(c.hi, t2);
+
+		ASSERT_EQ(c, max_diff);
+
+		check(max_diff, a, b);
+		check(max_diff - 1, a, b - 1);
+		check(max_diff - a, a, b - 1);
+
+		if (a != max_diff) {
+			check(max_diff - a - 1, a, b - 2);
+		}
+	}
+
 	{
 		difficulty_type a = max_diff - 4;
 

tests/src/keccak_tests.cpp

@@ -90,4 +90,42 @@ TEST(keccak, hashing_bmi)
 }
 #endif
 
+TEST(keccak, SHA3)
+{
+	auto check = [](const char* input, const char* expected_output) {
+		std::vector<uint8_t> data;
+		ASSERT_TRUE(from_hex(input, strlen(input), data));
+
+		hash h;
+
+		keccak_custom([&data](int offset) { return data[offset]; }, data.size(), h.h, HASH_SIZE, true);
+
+		char buf[log::Stream::BUF_SIZE + 1];
+		log::Stream s(buf);
+		s << h;
+
+		ASSERT_EQ(memcmp(buf, expected_output, HASH_SIZE * 2), 0);
+	};
+
+	check("", "a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a");
+
+	check("e9", "f0d04dd1e6cfc29a4460d521796852f25d9ef8d28b44ee91ff5b759d72c1e6d6");
+	check("d477", "94279e8f5ccdf6e17f292b59698ab4e614dfe696a46c46da78305fc6a3146ab7");
+	check("b053fa", "9d0ff086cd0ec06a682c51c094dc73abdc492004292344bd41b82a60498ccfdb");
+	check("e7372105", "3a42b68ab079f28c4ca3c752296f279006c4fe78b1eb79d989777f051e4046ae");
+
+	check("989fc49594afc73405bacee4dbbe7135804f800368de39e2ea3bbec04e59c6c52752927ee3aa233ba0d8aab5410240f4c109d770c8c570777c928fce9a0bec9bc5156c821e204f0f14a9ab547e0319d3e758ae9e28eb2dbc3d9f7acf51bd52f41bf23aeb6d97b5780a35ba08b94965989744edd3b1d6d67ad26c68099af85f98d0f0e4fff9", "b10adeb6a9395a48788931d45a7b4e4f69300a76d8b716c40c614c3113a0f051");
+	check("e5022f4c7dfe2dbd207105e2f27aaedd5a765c27c0bc60de958b49609440501848ccf398cf66dfe8dd7d131e04f1432f32827a057b8904d218e68ba3b0398038d755bd13d5f168cfa8a11ab34c0540873940c2a62eace3552dcd6953c683fdb29983d4e417078f1988c560c9521e6f8c78997c32618fc510db282a985f868f2d973f82351d11", "3293a4b9aeb8a65e1014d3847500ffc8241594e9c4564cbd7ce978bfa50767fe");
+	check("b1f6076509938432145bb15dbe1a7b2e007934be5f753908b50fd24333455970a7429f2ffbd28bd6fe1804c4688311f318fe3fcd9f6744410243e115bcb00d7e039a4fee4c326c2d119c42abd2e8f4155a44472643704cc0bc72403b8a8ab0fd4d68e04a059d6e5ed45033b906326abb4eb4147052779bad6a03b55ca5bd8b140e131bed2dfada", "f82d9602b231d332d902cb6436b15aef89acc591cb8626233ced20c0a6e80d7a");
+	check("56ea14d7fcb0db748ff649aaa5d0afdc2357528a9aad6076d73b2805b53d89e73681abfad26bee6c0f3d20215295f354f538ae80990d2281be6de0f6919aa9eb048c26b524f4d91ca87b54c0c54aa9b54ad02171e8bf31e8d158a9f586e92ffce994ecce9a5185cc80364d50a6f7b94849a914242fcb73f33a86ecc83c3403630d20650ddb8cd9c4", "4beae3515ba35ec8cbd1d94567e22b0d7809c466abfbafe9610349597ba15b45");
+
+	std::string s;
+	s.reserve(2000000);
+
+	for (size_t i = 0; i < 1000000; ++i) {
+		s += "61";
+	}
+	check(s.c_str(), "5c8875ae474a3634ba4fd55ec85bffd661f32aca75c6d699d0cdcb6c115891c1");
+}
+
 }

tests/src/main.cpp

@@ -41,6 +41,8 @@ int main(int argc, char** argv)
 {
 	set_main_thread();
 	p2pool_usage();
+	IMergeMiningClient::create({}, {}, {});
+	JSONRPCRequest::call({}, 0, {}, {}, {}, false, {}, [](const char*, size_t, double){}, [](const char*, size_t, double){});
 
 	PoolBlock::s_precalculatedSharesLock = new ReadWriteLock();
 

tests/src/merkle_tests.cpp

@@ -144,7 +144,24 @@ TEST(merkle, tree)
 			uint32_t path;
 
 			ASSERT_TRUE(get_merkle_proof(tree, h, proof, path));
+
+			root_hash root2;
+			std::vector<hash> proof2;
+			uint32_t path2;
+
+			ASSERT_TRUE(merkle_hash_with_proof(hashes, i, proof2, path2, root2));
+			ASSERT_EQ(root2, root);
+			ASSERT_EQ(proof2, proof);
+			ASSERT_EQ(path2, path);
+
+			ASSERT_TRUE(merkle_hash_with_proof(hashes, hashes[i], proof2, path2, root2));
+			ASSERT_EQ(root2, root);
+			ASSERT_EQ(proof2, proof);
+			ASSERT_EQ(path2, path);
+
 			ASSERT_FALSE(get_merkle_proof(tree, empty_hash, proof, path));
+			ASSERT_FALSE(merkle_hash_with_proof(hashes, n, proof2, path2, root2));
+			ASSERT_FALSE(merkle_hash_with_proof(hashes, empty_hash, proof2, path2, root2));
 
 			uint32_t path_monero;
 			ASSERT_TRUE(tree_path(n, i, &path_monero));

tests/src/pool_block_tests.cpp

@@ -17,19 +17,30 @@
 
 #include "common.h"
 #include "crypto.h"
+#include "block_template.h"
+#include "mempool.h"
 #include "pool_block.h"
 #include "pow_hash.h"
 #include "side_chain.h"
 #include "p2p_server.h"
+#include "keccak.h"
+#include "params.h"
 #include "gtest/gtest.h"
 #include <fstream>
 
 namespace p2pool {
 
+static hash H(const char* s)
+{
+	hash result;
+	from_hex(s, strlen(s), result);
+	return result;
+};
+
 TEST(pool_block, deserialize)
 {
 	init_crypto_cache();
-
+	{
 	PoolBlock b;
 	SideChain sidechain(nullptr, NetworkType::Mainnet, "default");
 
@@ -83,7 +94,8 @@ TEST(pool_block, deserialize)
 	ASSERT_EQ(b.m_timestamp, 1728813765U);
 	ASSERT_EQ(b.m_nonce, 352454720U);
 	ASSERT_EQ(b.m_txinGenHeight, 3258099U);
-	ASSERT_EQ(b.m_outputs.size(), 27U);
+	ASSERT_EQ(b.m_ephPublicKeys.size(), 27U);
+	ASSERT_EQ(b.m_outputAmounts.size(), 27U);
 	ASSERT_EQ(b.m_extraNonceSize, 4U);
 	ASSERT_EQ(b.m_extraNonce, 2983923783U);
 	ASSERT_EQ(b.m_transactions.size(), 21U);
@@ -99,12 +111,7 @@ TEST(pool_block, deserialize)
 	ASSERT_EQ(b.m_broadcasted, false);
 	ASSERT_EQ(b.m_wantBroadcast, false);
 
-	hash seed;
-	{
-		std::stringstream s;
-		s << "bf513dbe52c22b09e65edae222ec902d6adb75585a0141b81a165f0fb0c9c0bc";
-		s >> seed;
-	}
+	const hash seed = H("bf513dbe52c22b09e65edae222ec902d6adb75585a0141b81a165f0fb0c9c0bc");
 
 	RandomX_Hasher hasher(nullptr);
 	hasher.set_seed(seed);
@@ -123,14 +130,18 @@ TEST(pool_block, deserialize)
 
 	ASSERT_EQ(b.serialize_mainchain_data(), mainchain_data);
 	ASSERT_EQ(b.serialize_sidechain_data(), sidechain_data);
-
+	}
 	destroy_crypto_cache();
+
+#ifdef WITH_INDEXED_HASHES
+	indexed_hash::cleanup_storage();
+#endif
 }
 
 TEST(pool_block, verify)
 {
 	init_crypto_cache();
-
+	{
 	struct STest
 	{
 		const char* m_poolName;
@@ -139,13 +150,14 @@ TEST(pool_block, verify)
 		uint64_t m_sidechainHeight;
 		uint32_t m_expectedSharesNextBlock;
 		bool m_shuffle;
+		hash m_templateBlobsHash;
 	} tests[6] = {
-		{ "default", "sidechain_dump.dat", 3456189, 11704382, 53, false },
-		{ "default", "sidechain_dump.dat", 3456189, 11704382, 53, true },
-		{ "mini", "sidechain_dump_mini.dat", 3456189, 11207082, 578, false },
-		{ "mini", "sidechain_dump_mini.dat", 3456189, 11207082, 578, true },
-		{ "nano", "sidechain_dump_nano.dat", 3456189, 188542, 115, false },
-		{ "nano", "sidechain_dump_nano.dat", 3456189, 188542, 115, true },
+		{ "default", "sidechain_dump.dat", 3456189, 11704382, 53, false, H("c84a85eebf17ab266e8a81b347dd7490043ede3a055c0dbe85e9cd378905845a") },
+		{ "default", "sidechain_dump.dat", 3456189, 11704382, 53, true, H("c84a85eebf17ab266e8a81b347dd7490043ede3a055c0dbe85e9cd378905845a") },
+		{ "mini", "sidechain_dump_mini.dat", 3456189, 11207082, 578, false, H("08debd1378bae899017eb58362f4c638d78e5218558025142dcbc2651c76b27e") },
+		{ "mini", "sidechain_dump_mini.dat", 3456189, 11207082, 578, true, H("08debd1378bae899017eb58362f4c638d78e5218558025142dcbc2651c76b27e") },
+		{ "nano", "sidechain_dump_nano.dat", 3456189, 188542, 115, false, H("dd667c41eb15ffb0eb662065545dc0dfbbcac8393348a4fc0a7367040319b0d5") },
+		{ "nano", "sidechain_dump_nano.dat", 3456189, 188542, 115, true, H("dd667c41eb15ffb0eb662065545dc0dfbbcac8393348a4fc0a7367040319b0d5") },
 	};
 
 	for (const STest& t : tests)
@@ -207,12 +219,61 @@ TEST(pool_block, verify)
 		ASSERT_EQ(tip->m_txinGenHeight, t.m_txinGenHeight);
 		ASSERT_EQ(tip->m_sidechainHeight, t.m_sidechainHeight);
 
+		{
+			BlockTemplate tpl(&sidechain, nullptr);
+			auto& r = tpl.rng();
+			r.seed(0);
+
+			MinerData data;
+			data.major_version = 16;
+			data.height = t.m_txinGenHeight;
+			data.prev_id = H("f7723462d2f4d9f605601df8de8bd483802d2275f77cbf3a6f61d8f3fc4c47bc");
+			data.seed_hash = H("11186f5a8473d8dc7a0d3a0bf25834a07b1dffe8741d53cd543a8708c2e8b2a9");
+			data.difficulty = { 656711234691ULL, 0 };
+			data.median_weight = 300000;
+			data.already_generated_coins = std::numeric_limits<uint64_t>::max();
+			data.median_timestamp = (1ULL << 35) - 2;
+
+			Mempool mempool;
+
+			for (uint64_t i = 0; i < 8192; ++i) {
+				hash h;
+				h.u64()[0] = i;
+
+				TxMempoolData tx;
+				tx.id = static_cast<indexed_hash>(h);
+				tx.fee = (r() % 1'000'000'000) + 30'000'000;
+				tx.weight = (r() % 20'000) + 1'500;
+				mempool.add(tx);
+			}
+
+			Params params;
+
+			params.m_miningWallet = Wallet("44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg");
+			params.m_subaddress = Wallet("86eQxzSW4AZfvsWRSop755WZUsog6L3x32NRZukeeShnS4mBGVpcqQhS6pCNxj44usPKNwesZ45ooHyjDku6nVZdT3Q9qrz");
+
+			tpl.update(data, mempool, &params);
+
+			std::vector<uint8_t> blobs;
+			uint64_t height;
+			difficulty_type diff, aux_diff, sidechain_diff;
+			hash seed_hash;
+			size_t nonce_offset;
+			uint32_t template_id;
+			const uint32_t blob_size = tpl.get_hashing_blobs(0, 1000, blobs, height, diff, aux_diff, sidechain_diff, seed_hash, nonce_offset, template_id);
+			ASSERT_EQ(blob_size, 77);
+
+			hash blobs_hash;
+			keccak(blobs.data(), static_cast<int>(blobs.size()), blobs_hash.h);
+			ASSERT_EQ(blobs_hash, t.m_templateBlobsHash);
+		}
+
 		PoolBlock block;
-		block.m_minerWallet.decode("44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg");
+		ASSERT_TRUE(block.m_minerWallet.decode("44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg"));
 
 		std::vector<MinerShare> shares;
 
-		sidechain.fill_sidechain_data(block, shares);
+		ASSERT_TRUE(sidechain.fill_sidechain_data(block, shares));
 
 		ASSERT_EQ(block.m_sidechainHeight, t.m_sidechainHeight + 1);
 		ASSERT_EQ(shares.size(), t.m_expectedSharesNextBlock);
@@ -250,8 +311,12 @@ TEST(pool_block, verify)
 			ASSERT_EQ(v1, tip_full_blob);
 		}
 	}
-
+	}
 	destroy_crypto_cache();
+
+#ifdef WITH_INDEXED_HASHES
+	indexed_hash::cleanup_storage();
+#endif
 }
 
 }

tests/src/util_tests.cpp

@@ -17,6 +17,9 @@
 
 #include "common.h"
 #include "util.h"
+extern "C" {
+#include "crypto-ops.h"
+}
 #include "gtest/gtest.h"
 
 namespace p2pool {
@@ -112,4 +115,136 @@ TEST(util, bsr)
 	}
 }
 
+TEST(util, onion)
+{
+	const std::string tests[] = {
+		"yucmgsbw7nknw7oi3bkuwudvc657g2xcqahhbjyewazusyytapqo4xid.onion",
+		"p2pool2giz2r5cpqicajwoazjcxkfujxswtk3jolfk2ubilhrkqam2id.onion",
+		"p2pseeds5qoenuuseyuqxhzzefzxpbhiq4z4h5hfbry5dxd5y2fwudyd.onion",
+		"testhrjytc63cnmcgff5tlcz2phd4sixeogfkjq6uinihwcs2awm3oad.onion",
+		"testsao5qh4qz4ne3iqytyve6a6ijbzmrok6wbauwxfzplv4g276elyd.onion",
+		"testaohgecnzvl6k25fvhkqaizc3vu6e6dxg62qgbtzqmoflnj5bk6id.onion",
+		"testgamrbpyy5e6kogd5kk4cdzvr6qzd6w3fj5eyxa5ccyaudwuwx3ad.onion",
+		"testdriz2m4xh6czzkjmbsnicqoyqyyiilhkogp3n6if7x5qaairetid.onion",
+		"testc7rluz33af3wlypoiwamwzti6gup3il2kqkf7ly7td5qggpvknyd.onion",
+		"testlxqch2dtemlwjc4bt3y6fj3vvknjksywugceibnhscybw4vlnlyd.onion",
+		"testbbx66qk4cgy342mm32jrod6k6zi4gu6bfvyjxsx3m6mf4khvuyqd.onion",
+		"testpita5yopwhs4utuk5ylfndzkijxv3lh7d6gjifxjg7oriuhn3mqd.onion",
+		"testdtmzbyzi47b677ocnoyi7w6oylcnyqh77pl2yv5q22qla7agz7qd.onion",
+		"testv3qobc33v3gfjnccs24eorkrtdzh5e4jbth5yag32sd5d24xazid.onion",
+		"testgwoazhovosqn2yfqaewkd6snynwm66qb5egcbenh3m54yi3ur4yd.onion",
+		"testu2oufhxgp6qqehf2ytpxqvmr3qm6dit3k7p3ixhnxjbxwqmfooyd.onion",
+		"testvi6s6dp5reui35lv6lnu3tzxmu4h3dofejjmmttr6ax3eshvefid.onion",
+		"testsap5p4lorjlvo4ovs6yxmn4lb3lgehsjyolqfcm7l53rqeswvnid.onion",
+		"testexfa567ampq3dkw5smfmofci6qvicl3niaoe6pneekcheqdsbfad.onion",
+		"testhnodrpe2qukswkp5554csphtq325pnnpm7uqs4ats5es7gcujhqd.onion",
+		"testneyu3idcjyvgmdylszcebkw5xsl5bnxyfwdu27fcbb2cm7pcs3id.onion",
+		"test5y4it65r5lnm3w4en4lj3bmy35nypmbgshkawt2h2ep3f75yuwyd.onion",
+		"testknxevfffltpt2iq5xioye3z52eoh4aefy3aegfmhogqf7w6xtnqd.onion",
+		"testshitk3xpt5aex3doyepmbvpsbzptjr6ujso6gahz4arryp7s6vyd.onion",
+		"testfin66dkzp7ozolfu7exjxi3cuck35xunt4a56xfanivs4xqsfbqd.onion",
+		"testec5noqmo2javrlye5higddskhvsialohrwwi2naoqkxrrwhucaid.onion",
+		"testbo2fncb7mblktg23a77clp4pdqfdje7g6axohcegle46bk64hnad.onion",
+		"testd7rzyebdtzpx3fjalkqmeuppbmqs4pbx5pxusyq57m73fyjwgxyd.onion",
+		"testmw3wweekyz7ui7uodlgq3zbv23hehkusrb257yerlpsizhylswyd.onion",
+		"testspzmswow3rc3x6ymbbsfuovcia3umhzribfcpnry7xw66lyjysad.onion",
+		"test635ior3cpu4hd4e4ogd3kzy2pugyv3gkfp3q5u4x2riojbhrvtid.onion",
+		"testn3vi7q5c5j5dqiq3hd3wtkazpxhfaxg2s6kxe6q75hvjnu62iiqd.onion",
+		"testjmo662avqobpfukplqt4bg5jd2dqu6rdr53a6jyju6jf72iavbyd.onion",
+		"testertyaowcvevhjdjwqr3jjvqkzzc2vrmp5hvd3iecukgjbla5xnqd.onion",
+		"testivnwlanaiqoxbcsmlsgpswpx72c5zifljfwta444mtkfk476pmad.onion",
+		"test7u4feuytc3gulkk2mdrmobkqjs6kc5tqxc32qv2v565ybm3kvsyd.onion",
+		"testmcndo5ahfvfnlxefpc3325drm4xfgtgx42hj7p7we7ppyursrbyd.onion",
+		"testtcr5xoqnirota5v5aonhn6gpzulewfbzb7kduld73jx353drjpyd.onion",
+		"testc4biea6pwrya56s2vtus33c3bhrx6pnt3gfwwwoclhkuujvcwhyd.onion",
+		"testbjeyc5bizi7ys7cjgklkpeq3bhadaukk6sx3r6pycfxx35ksipyd.onion",
+		"testvvumkf5b7k3vaagl54yujefrwsr7iuldkepzewwdiwyogkzzwyyd.onion",
+		"testiysaar7h25477y7ee7xhz4foyrjkmtoxbh3kiiazvuehlp7ubiid.onion",
+		"test7zh6zfacxeyrt3qkbelnfpf4sepmcypvl33vkbbeylbk3ddf4qad.onion",
+		"testebbxturu56qaxvlr7dqbrdjigga7mlmjanq4suc7j5h77h5iszyd.onion",
+		"testob7j77x3qmy6dd6ja6wvofhbedzloxae6rrxrf7hv5fpi2aotayd.onion",
+		"testgy24eidqv7wgaqtsucvqnagcyohpmzdmox2cpztd5eukmm6ubkid.onion",
+		"testtdslb2etamcxo7pklesyqxnidy6m5b5qu3yzcfhafajrnm5rotyd.onion",
+		"testha6wehnus7v4qb5cxbuf232fomz7ge6idrrenjewvmcl2fneffid.onion",
+		"testmp7u2cxnnjqsjcfz3ydd6gpiqbym5r5rxykqhz3h6ks6nsnthuad.onion",
+		"tests3xay2zjfkzzpfzl7s3kpnjftfwxmo7e3v5p657pfxbuqxt5e3id.onion",
+		"test6zfam4nauxtjkckvkd6fp55bjuikaj5wevftsfhdromu7wuj2pyd.onion",
+		"testssyxuohidxfvtma4wxpiot5qqkmukqcrjw7t2ngfltidzxo6eyid.onion",
+		"testmcfwamtj4adtz46izavwrddkp7fbu2swtapuyt5eyfupnztsd6qd.onion",
+		"testcycabwxf7em7hu2css5aax7up3opds6twra7hmpjnxi6fdmgs3yd.onion",
+		"testaev2vumiarnfrr4x4japjc2xtvvlp65gt4vwwqf3q4zolvprs5id.onion",
+		"testkynjqkj65t6wvuwajm55xzninrap4piqek5ao6jiwewvqwezalqd.onion",
+		"testnfxt6eemmiwhlme7ys7rj647jv46razwdf6whiwyjoruw4xceyad.onion",
+		"testrbutgvilidnf55thbo4pye4jn322ugmepc37celxvazal5uugoid.onion",
+		"test7xcn36xbr6raxldgh3kf2xk36gyor3hx3gzy2guhxzntxlvf3iid.onion",
+		"testsdjiq77anfffxus3utsmykucoqexpeojaklbmzhab3vow3ozfdqd.onion",
+		"testggm7oruqsw3sr2fd4nq4b3nh2fdd7rgw76p6gpz6pu6nsffv6byd.onion",
+		"testk5b5gjpsc5jkvqnd24aujh25ksvorjrcw457eremkynzoaxjrhad.onion",
+		"testc6mexahgqsbqkxoso5t77nitwwumqn5ucdzbsntgkvuwpxzv4mqd.onion",
+		"testcbsvi6v7h2avabs74osdnifiszdlygi4sljxohvuugf24hadjvid.onion",
+		"testfbhecs2llswxsgjuuqvq5boo6se3gni7ygjtbnagt4x5qt7sppid.onion",
+		"test7gjc7xb7ynoa5nzqrceqvo3fsotmtw2k5tj7ie2okvkmxuejobad.onion",
+		"testmskkbp3ikvsfvtfekm5hmjc4ou4hqlerx45qchm5yrwd56m6stad.onion",
+		"testv52txxzvdmi5kuuhwbzyrbzrhqnxr6ltvycgavt3wb5uyxcbrqqd.onion",
+		"test7nsiyeg2hsmuvi7uhqbaoygf4lfa6ysihaqicrkzwulp7shsh3ad.onion",
+		"testu2p6psiaw7qnhvi3v7tjgawbf6zpmjajmbfdofimv3wpniaqleyd.onion",
+		"testkqcq6qg3yibtnwxgm2qceti2k74suvgqet2wdqmcoluzu4b3fkqd.onion",
+		"test2i4762wcfcl5wgjf7ofnkorsq6l6buuet7ldddezeqgd372sysyd.onion",
+		"testftqmujq6h5rhey73mmqlhpuh5zs5cipqqxwbzihiqgw6gnfpp6id.onion",
+		"test5hua7kwnsnv3uiwathv3khq4nmhbwsayl6uzj2gs6pmimork2iid.onion",
+		"test7tdanour43exhioddlji7jgsgiibi5hg3jhu47wxaszbvtwat2ad.onion",
+		"testd26wxq4q44wmvplnngh5onomax5f3brjrocazz56mj7qylogy6id.onion",
+		"testyuwguibjovaw2mmzvpxqh2r3dhjddeaez6242pmro37gxivknrqd.onion",
+		"testi5lokj4wrawmihfqmic74wac6a4asy6o7erzxjosuyedzsscdeid.onion",
+		"testbuwdono434jdgv76u7jjczd7sweu36ga55vo66tdcsjscov5dfad.onion",
+		"testor6cqxswpeomtnsqhc73knjftqchalz5whatqddaxguwm5s2fhad.onion",
+		"test2tz52bpiib5zbxt2bfg77ika54cfvz3p6ovkqbqiyu6d5ecaetyd.onion",
+		"testc5wvnm55zfk3ihkebuf4kxkhaandcqwizkehb6fpfgs2f4tfxvqd.onion",
+		"testpxuiq5dgkvhwynsyzrtdsxtthrt4lhjtb2egs34ypwzcvsrgbhqd.onion",
+		"testgpc7h7f6tmo6lrz6to5svh6gw2mxgelbo5du6kakuuco5oyu2pad.onion",
+		"test7vlusiy2t5e2dpwf4ttlajpefxqpbj274l25iml3ltjf6dwgzhyd.onion",
+		"testcaq5d3ehqqwdkdcux4db57lbbcfcl5wfebg7jxwl5gpv7aavxfyd.onion",
+		"testaqtkrclsz3ehn4i3i4maqoxniivmdl5gnefelzva6ts2yrx5vyyd.onion",
+		"testgkfz4a2ir44r6pacf3fvyrldjk6n4u3odbyveseo2jatze6euxyd.onion",
+		"testsrinaqfbsh22gjlkabcwn4rbypsb3nmtutqnjr37tvqmhdc2ysqd.onion",
+		"testyo5bximqrzkkeppmr5mopciote6wx6wcnus6wnuanl5c2zztuwad.onion",
+		"testmgjjfxt5frdpvfqchrgmoohxnba63q6wt3spva7kvgiae36jjuqd.onion",
+		"testn2qrokp2v4vtjjdrrlzosa6iz2v322ntsrguj6t4d2hguouhpzad.onion",
+		"test3njq3v3rp4sy5uhyulvl3eus34hev4cybkernrgvlmqonadxalid.onion",
+		"testylx25ok4zwlm5myjgvlbudigeqxyvxy2hhk7kvwub4uqsfaawbyd.onion",
+		"test4zcne6f7w6xstprxyhwp2gbl4exvvltewrnjhtsss4bu74faokqd.onion",
+		"testddleenrfxcbpsqrugj3ugnpjgd2xeneznzopzcndqebmavo65sqd.onion",
+		"testoq3eqrragrjpwiegwokzukqd2p73ffy6dcgnc6nerxtodsfotkad.onion",
+		"testyivcoaauwqekzux66r2ao4j2hizka4kdeyb5lyvmdzsrw3uybeid.onion",
+		"testz5tgehn7i3myjdobvjlnbax7yd2e3ra27gyiprzicvksm5r6i5yd.onion",
+		"testc4vbagkuxee3pkgvlb7w2pqgdq3rlaru2ipgpox5xzssejhfizad.onion",
+		"testq4ryujfitfcxabcjde6m7uqdztdep6mzd32e4wbtqna4jyponaad.onion",
+		"test2muitbvopcoducxb6d5bqry5dmxdatupvh34anzjdeav6xiigead.onion",
+		"test76ais6k5t4bmap4uyl2eleh6o4g423cxuvifcoke4gtgd6pjtpqd.onion",
+		"TEST76ais6k5t4bmap4uyl2eleh6o4g423cxuvifcoke4gtgd6pjtpqd.onion",
+	};
+
+	for (const std::string& address : tests) {
+		const hash h = from_onion_v3(address);
+		ASSERT_TRUE(!h.empty());
+
+		const std::string s1 = to_onion_v3(h);
+
+		std::string s2 = address;
+		for (char& c : s2) {
+			c = std::tolower(c);
+		}
+
+		ASSERT_EQ(s1, s2);
+	}
+
+	ASSERT_TRUE(from_onion_v3("tooshort.onion").empty());
+	ASSERT_TRUE(from_onion_v3("inval1dcharacter777777777777777777777777777777777777777d.onion").empty());
+	ASSERT_TRUE(from_onion_v3("wrongchecksum777777777777777777777777777777777777777777d.onion").empty());
+	ASSERT_TRUE(from_onion_v3("yucmgsbw7nknw7oi3bkuwudvc657g2xcqahhbjyewazusyytapqo4xid.xnion").empty());
+
+	// Invalid pubkey
+	ASSERT_TRUE(from_onion_v3("civ5tgldg3yx73ytse6hvvk3nm6q3zctbqvytpszihm35b33ze73kxad.onion").empty());
+}
+
 }

tests/src/wallet_tests.cpp

@@ -17,6 +17,7 @@
 
 #include "common.h"
 #include "wallet.h"
+#include "keccak.h"
 #include "gtest/gtest.h"
 
 namespace p2pool {
@@ -26,31 +27,64 @@ TEST(wallet, input_output)
 	// No data
 	{
 		Wallet w(nullptr);
-		ASSERT_EQ(w.valid(), false);
+		ASSERT_FALSE(w.valid());
 	}
 
 	// Wrong length
 	{
 		Wallet w("456");
-		ASSERT_EQ(w.valid(), false);
+		ASSERT_FALSE(w.valid());
 	}
 
 	// Symbol '0' is not from base-58
 	{
 		Wallet w("40ccoSmrBTPJd5yf8VYCULh4J5rHQaXP1TeC8Cnqhd5H9Y2cMwkJ9w42euLmMghKtCiQcgZEiGYW1K6Ae4biZ7w1HLSexS6");
-		ASSERT_EQ(w.valid(), false);
+		ASSERT_FALSE(w.valid());
 	}
 
 	// Invalid checksum
 	{
 		Wallet w("49ccoSmrBTPJd5yf8VYCULh4J5rHQaXP1TeC8Cnqhd5H9Y2cMwkJ9w42euLmMghKtCiQcgZEiGYW1K6Ae4biZ7w1HLSexS7");
-		ASSERT_EQ(w.valid(), false);
+		ASSERT_FALSE(w.valid());
 	}
 
 	// 64-bit overflow
 	{
 		Wallet w("49ccoSmrBTPzzzzzzzzzzzh4J5rHQaXP1TeC8Cnqhd5H9Y2cMwkJ9w42euLmMghKtCiQcgZEiGYW1K6Ae4biZ7w1HLSexS6");
-		ASSERT_EQ(w.valid(), false);
+		ASSERT_FALSE(w.valid());
+	}
+
+	// Invalid pubkey
+	{
+		Wallet w("47wU9Pe8Ez8anN3jf2XjqfXQfxmoqT4Pw1h4msNWyynMBiwjCtkQFAvBoR7sQJR4Khhcq8Nmgufa6JKLm8yWEu9R1g6B9jj");
+		ASSERT_FALSE(w.valid());
+	}
+
+	// Invalid pubkeys
+	{
+		Wallet w(nullptr);
+
+		constexpr hash invalid_spend_pub = keccak("invalid spend pub key 1");
+		constexpr hash valid_spend_pub = keccak("valid spend pub key 2");
+
+		constexpr hash invalid_view_pub = keccak("invalid view pub key 3");
+		constexpr hash valid_view_pub = keccak("valid view pub key 1");
+
+		ASSERT_TRUE(w.assign(valid_spend_pub, valid_view_pub, NetworkType::Mainnet, false));
+		ASSERT_FALSE(w.assign(invalid_spend_pub, valid_view_pub, NetworkType::Mainnet, false));
+		ASSERT_FALSE(w.assign(valid_spend_pub, invalid_view_pub, NetworkType::Mainnet, false));
+		ASSERT_FALSE(w.assign(invalid_spend_pub, invalid_view_pub, NetworkType::Mainnet, false));
+	}
+
+	// Invalid prefix
+	{
+		Wallet w1("4KKHpFbLniuJd5yf8VYCULh4J5rHQaXP1TeC8Cnqhd5H9Y2cMwkJ9w42euLmMghKtCiQcgZEiGYW1K6Ae4biZ7w1HLSexS6");
+		Wallet w2("49ccoSmrBTPJd5yf8VYCULh4J5rHQaXP1TeC8Cnqhd5H9Y2cMwkJ9w42euLmMghKtCiQcgZEiGYW1K6Ae4biZ7w1HLSexS6");
+
+		ASSERT_TRUE(w2.assign(w2.spend_public_key(), w2.view_public_key(), NetworkType::Invalid, false));
+
+		ASSERT_FALSE(w1.valid());
+		ASSERT_FALSE(w2.valid());
 	}
 
 	auto check = [](NetworkType t, bool subaddress, uint64_t prefix, uint32_t checksum, const char* address, const char* spendkey, const char* viewkey)
@@ -85,7 +119,7 @@ TEST(wallet, input_output)
 
 		// Test Wallet::assign()
 		Wallet w2(nullptr);
-		w2.assign(w.spend_public_key(), w.view_public_key(), w.type(), w.is_subaddress());
+		ASSERT_TRUE(w2.assign(w.spend_public_key(), w.view_public_key(), w.type(), w.is_subaddress()));
 
 		ASSERT_EQ(w2.prefix(),           w.prefix());
 		ASSERT_EQ(w2.spend_public_key(), w.spend_public_key());