From 08dcd0a640f641b2a867964de159f78559554045 Mon Sep 17 00:00:00 2001 From: Matt Hess Date: Sat, 27 Dec 2025 18:05:29 +0000 Subject: [PATCH] release.yml: - Fixed alpine builds (shell: alpine.sh --root for apk) - Added proper dependencies and comprehensive curl cmake options - Disabled gRPC for all release builds (not used by Salvium) - Updated macOS runners to macos-15-intel/macos-15 CMakeLists.txt: - Changed WITH_GRPC default to OFF (merge mining not used) side_chain.cpp: - Cleaned up chain_recovery log formatting --- .github/workflows/release.yml | 102 ++++++++++++++++++++++------------ CMakeLists.txt | 2 +- src/side_chain.cpp | 29 ++++++---- 3 files changed, 84 insertions(+), 49 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b822faa..420f059 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,30 +13,40 @@ jobs: build-linux-x64: runs-on: ubuntu-22.04 steps: + - name: Install dependencies + run: | + sudo apt update + sudo apt install -y git build-essential cmake libgss-dev xz-utils + - uses: actions/checkout@v4 with: submodules: recursive - - - name: Build static binary + + - name: Build libcurl run: | - sudo apt update - sudo apt install -y build-essential cmake cd external/src/curl - cmake . -DCMAKE_BUILD_TYPE=Release -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF + cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Os -flto=auto -ffunction-sections" -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) - cd ../libuv + + - name: Build libuv + run: | + cd external/src/libuv mkdir build && cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DLIBUV_BUILD_TESTS=OFF + cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Os -flto=auto -ffunction-sections" -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF make -j$(nproc) - cd ../../libzmq + + - name: Build libzmq + run: | + cd external/src/libzmq mkdir build && cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DWITH_LIBSODIUM=OFF -DBUILD_TESTS=OFF + cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_C_FLAGS="-Os -flto=auto -ffunction-sections" -DCMAKE_CXX_FLAGS="-Os -flto=auto -ffunction-sections" -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF make -j$(nproc) - cd ../../.. + + - name: Build p2pool + run: | mkdir build && cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DSTATIC_BINARY=ON -DWITH_LTO=OFF + cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_C_FLAGS="-ffunction-sections -Wl,-s -Wl,--gc-sections" -DCMAKE_CXX_FLAGS="-ffunction-sections -Wl,-s -Wl,--gc-sections" -DWITH_GRPC=OFF -DSTATIC_LIBS=ON make -j$(nproc) p2pool-salvium - strip p2pool-salvium ./p2pool-salvium --test - name: Package @@ -57,34 +67,44 @@ jobs: arch: aarch64 branch: latest-stable - - name: Install dependencies and build - shell: alpine.sh {0} + - name: Install dependencies + shell: alpine.sh --root {0} run: | apk add git cmake gcc g++ make linux-headers xz - + - uses: actions/checkout@v4 with: submodules: recursive - - name: Build + - name: Build libcurl shell: alpine.sh {0} run: | cd external/src/curl - cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Os -flto=auto" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF + cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Os -flto=auto -ffunction-sections" -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) - cd ../libuv + + - name: Build libuv + shell: alpine.sh {0} + run: | + cd external/src/libuv mkdir build && cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Os -flto=auto" -DBUILD_SHARED_LIBS=OFF -DLIBUV_BUILD_TESTS=OFF + cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Os -flto=auto -ffunction-sections" -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF make -j$(nproc) - cd ../../libzmq + + - name: Build libzmq + shell: alpine.sh {0} + run: | + cd external/src/libzmq mkdir build && cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-Os -flto=auto" -DBUILD_SHARED_LIBS=OFF -DWITH_LIBSODIUM=OFF -DBUILD_TESTS=OFF + cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_C_FLAGS="-Os -flto=auto -ffunction-sections" -DCMAKE_CXX_FLAGS="-Os -flto=auto -ffunction-sections" -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF make -j$(nproc) - cd ../../.. + + - name: Build p2pool + shell: alpine.sh {0} + run: | mkdir build && cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DSTATIC_BINARY=ON -DWITH_LTO=OFF + cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_C_FLAGS="-ffunction-sections -Wl,-s -Wl,--gc-sections" -DCMAKE_CXX_FLAGS="-ffunction-sections -Wl,-s -Wl,--gc-sections" -DWITH_GRPC=OFF -DSTATIC_BINARY=ON -DARCH_ID=aarch64 make -j$(nproc) p2pool-salvium - strip p2pool-salvium ./p2pool-salvium --test tar -czf p2pool-salvium-v${{ inputs.version }}-linux-aarch64.tar.gz p2pool-salvium @@ -109,25 +129,35 @@ jobs: with: submodules: recursive - - name: Build + - name: Build libcurl shell: alpine.sh {0} run: | cd external/src/curl - cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Os" -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_DISABLE_INSTALL=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF + cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Os -ffunction-sections" -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) - cd ../libuv + + - name: Build libuv + shell: alpine.sh {0} + run: | + cd external/src/libuv mkdir build && cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Os" -DBUILD_SHARED_LIBS=OFF -DLIBUV_BUILD_TESTS=OFF + cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Os -ffunction-sections" -DBUILD_TESTING=OFF -DLIBUV_BUILD_SHARED=OFF make -j$(nproc) - cd ../../libzmq + + - name: Build libzmq + shell: alpine.sh {0} + run: | + cd external/src/libzmq mkdir build && cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-Os" -DBUILD_SHARED_LIBS=OFF -DWITH_LIBSODIUM=OFF -DBUILD_TESTS=OFF + cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_C_FLAGS="-Os -ffunction-sections" -DCMAKE_CXX_FLAGS="-Os -ffunction-sections" -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DBUILD_SHARED=OFF make -j$(nproc) - cd ../../.. + + - name: Build p2pool + shell: alpine.sh {0} + run: | mkdir build && cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DSTATIC_BINARY=ON -DWITH_LTO=OFF + cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -DCMAKE_C_FLAGS="-ffunction-sections -Wl,-s -Wl,--gc-sections" -DCMAKE_CXX_FLAGS="-ffunction-sections -Wl,-s -Wl,--gc-sections" -DWITH_GRPC=OFF -DSTATIC_BINARY=ON -DARCH_ID=riscv64 make -j$(nproc) p2pool-salvium - strip p2pool-salvium ./p2pool-salvium --test tar -czf p2pool-salvium-v${{ inputs.version }}-linux-riscv64.tar.gz p2pool-salvium @@ -151,7 +181,7 @@ jobs: make -j$(sysctl -n hw.ncpu) cd ../../.. mkdir build && cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DSTATIC_LIBS=ON -DWITH_LTO=OFF + cmake .. -DCMAKE_BUILD_TYPE=Release -DWITH_GRPC=OFF -DSTATIC_LIBS=ON -DWITH_LTO=OFF make -j$(sysctl -n hw.ncpu) p2pool-salvium strip p2pool-salvium ./p2pool-salvium --test @@ -177,7 +207,7 @@ jobs: make -j$(sysctl -n hw.ncpu) cd ../../.. mkdir build && cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DSTATIC_LIBS=ON -DWITH_LTO=OFF + cmake .. -DCMAKE_BUILD_TYPE=Release -DWITH_GRPC=OFF -DSTATIC_LIBS=ON -DWITH_LTO=OFF make -j$(sysctl -n hw.ncpu) p2pool-salvium strip p2pool-salvium ./p2pool-salvium --test @@ -211,7 +241,7 @@ jobs: make -j$(nproc) cd ../../.. mkdir build && cd build - cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DSTATIC_LIBS=ON -DOPENSSL_NO_ASM=ON -DWITH_LTO=OFF + cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DWITH_GRPC=OFF -DSTATIC_LIBS=ON -DOPENSSL_NO_ASM=ON -DWITH_LTO=OFF make -j$(nproc) p2pool-salvium strip p2pool-salvium.exe ./p2pool-salvium.exe --test diff --git a/CMakeLists.txt b/CMakeLists.txt index dd335dd..cad1301 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ option(STATIC_LIBS "Link libuv and libzmq statically" OFF) option(WITH_RANDOMX "Include the RandomX library in the build. If this is turned off, p2pool will rely on monerod for verifying RandomX hashes" ON) option(WITH_LTO "Use link-time compiler optimization (if linking fails for you, run cmake with -DWITH_LTO=OFF)" ON) option(WITH_UPNP "Include UPnP support. If this is turned off, p2pool will not be able to configure port forwarding on UPnP-enabled routers." ON) -option(WITH_GRPC "Include gRPC support. If this is turned off, p2pool will not be able to merge mine with Tari." ON) +option(WITH_GRPC "Include gRPC support for merge mining (not used by Salvium)." OFF) 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) diff --git a/src/side_chain.cpp b/src/side_chain.cpp index 942e79b..ae3e14e 100644 --- a/src/side_chain.cpp +++ b/src/side_chain.cpp @@ -3224,12 +3224,14 @@ void SideChain::on_block_rejected(const PoolBlock* block, const char* reason) << ", reason: " << reason); if (m_externalBlockFailures >= DIVERGENCE_THRESHOLD && !m_recoveryMode.load()) { - LOGERR(0, "\n========================================"); - LOGERR(0, "CONSENSUS FAILURE DETECTED"); - LOGERR(0, m_externalBlockFailures << " consecutive blocks rejected"); - LOGERR(0, "Failure around height " << block->m_sidechainHeight); - LOGERR(0, "Initiating recovery..."); - LOGERR(0, "========================================\n"); + LOGERR(0, ""); + LOGERR(0, "================================================"); + LOGERR(0, " CONSENSUS FAILURE DETECTED"); + LOGERR(0, " " << m_externalBlockFailures << " consecutive blocks rejected"); + LOGERR(0, " Failure around height " << block->m_sidechainHeight); + LOGERR(0, " Initiating recovery..."); + LOGERR(0, "================================================"); + LOGERR(0, ""); trigger_recovery(block->m_sidechainHeight); } } @@ -3275,9 +3277,10 @@ void SideChain::request_checkpoint_validation() void SideChain::reset_to_checkpoint(uint64_t checkpoint_height) { - LOGINFO(0, "\n========================================"); - LOGINFO(0, "RESETTING TO CHECKPOINT " << checkpoint_height); - LOGINFO(0, "========================================\n"); + LOGINFO(0, ""); + LOGINFO(0, "================================================"); + LOGINFO(0, " RESETTING TO CHECKPOINT " << checkpoint_height); + LOGINFO(0, "================================================"); WriteLock lock(m_sidechainLock); @@ -3370,9 +3373,11 @@ void SideChain::reset_to_checkpoint(uint64_t checkpoint_height) m_pendingRecoveryHeight = 0; m_recoveryMode = false; - LOGINFO(0, "\n========================================"); - LOGINFO(0, "RESET COMPLETE - RESYNCING FROM " << checkpoint_height); - LOGINFO(0, "========================================\n"); + LOGINFO(0, ""); + LOGINFO(0, "================================================"); + LOGINFO(0, " RESET COMPLETE - RESYNCING FROM " << checkpoint_height); + LOGINFO(0, "================================================"); + LOGINFO(0, ""); // Mining will be re-enabled after resync completes }