From 27dfd4788bb25fe6335cd76e6c4a3faa7c60850b Mon Sep 17 00:00:00 2001 From: Matt Hess Date: Wed, 17 Dec 2025 03:28:41 +0000 Subject: [PATCH] fixing C/C++ CI errors --- .github/workflows/c-cpp.yml | 8 ++++---- .github/workflows/msvc-analysis.yml | 4 ++++ CMakeLists.txt | 6 +++--- src/block_template.cpp | 4 ---- src/carrot_crypto.cpp | 2 +- src/wallet.cpp | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index a101e40..b3896ed 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -540,20 +540,20 @@ jobs: mkdir build cd build cmake .. -G "${{ matrix.config.vs }}" -DCMAKE_SYSTEM_VERSION="10.0" -DWITH_RANDOMX=${{ matrix.config.rx }} -DWITH_UPNP=${{ matrix.config.upnp }} -DWITH_GRPC=${{ matrix.config.grpc }} -DWITH_TLS=${{ matrix.config.tls }} -DCMAKE_POLICY_VERSION_MINIMUM="3.5" - & "${{ matrix.config.vspath }}\\MSBuild\\Current\\Bin\\amd64\\msbuild" -v:m /m /p:Configuration=Release p2pool.vcxproj + & "${{ matrix.config.vspath }}\\MSBuild\\Current\\Bin\\amd64\\msbuild" -v:m /m /p:Configuration=Release p2pool-salvium.vcxproj - name: Check Windows 7 compatibility shell: cmd run: | call "${{ matrix.config.vspath }}\\VC\\Auxiliary\\Build\\vcvarsall.bat" amd64 - dumpbin /IMPORTS build/Release/p2pool.exe > 1.txt + dumpbin /IMPORTS build/Release/p2pool-salvium.exe > 1.txt findstr /R /C:"^ *[0-9A-F][0-9A-F]* [a-zA-Z][a-zA-Z0-9]*$" 1.txt > 2.txt python tests/src/check_win7.py 2.txt - name: Run RandomX tests if: matrix.config.rx == 'ON' run: | - build/Release/p2pool.exe --test + build/Release/p2pool-salvium.exe --test cd build/external/src/RandomX & "${{ matrix.config.vspath }}\\MSBuild\\Current\\Bin\\amd64\\msbuild" -v:m /m /p:Configuration=Release randomx-tests.vcxproj Release/randomx-tests.exe @@ -578,7 +578,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: p2pool-vs-${{ matrix.config.os }}-randomx-${{ matrix.config.rx }}-upnp-${{ matrix.config.upnp }}-grpc-${{ matrix.config.grpc }}-tls-${{ matrix.config.tls }}.exe - path: build/Release/p2pool.exe + path: build/Release/p2pool-salvium.exe build-macos: diff --git a/.github/workflows/msvc-analysis.yml b/.github/workflows/msvc-analysis.yml index 04c10ff..a8d0c5b 100644 --- a/.github/workflows/msvc-analysis.yml +++ b/.github/workflows/msvc-analysis.yml @@ -26,6 +26,10 @@ env: build: '${{ github.workspace }}/build' config: 'Release' +permissions: + contents: read + security-events: write + jobs: analyze: name: Analyze diff --git a/CMakeLists.txt b/CMakeLists.txt index 68bfece..8c4ea75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,7 @@ option(DEV_CLANG_TIDY "[Developer only] Compile for clang-tidy" OFF) option(DEV_TRACK_MEMORY "[Developer only] Track memory allocations" OFF) option(DEV_DEBUG "[Developer only] Compile a debug build" OFF) -set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT p2pool) +set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT p2pool-salvium) set(BUILD_TESTING OFF CACHE BOOL "CMake's CTest module") @@ -424,10 +424,10 @@ if (STATIC_BINARY OR STATIC_LIBS) endif() endif() - set(STATIC_LIBS "") + set(STATIC_LIBS "mx25519") if (WITH_RANDOMX) - set(STATIC_LIBS randomx) + set(STATIC_LIBS ${STATIC_LIBS} randomx) endif() if (WITH_UPNP) diff --git a/src/block_template.cpp b/src/block_template.cpp index 5a5055c..9de1222 100644 --- a/src/block_template.cpp +++ b/src/block_template.cpp @@ -1246,10 +1246,6 @@ int BlockTemplate::create_miner_tx(const MinerData& data, const std::vectorm_amountBurnt = amount_burnt; diff --git a/src/carrot_crypto.cpp b/src/carrot_crypto.cpp index 39b8922..4ba3535 100644 --- a/src/carrot_crypto.cpp +++ b/src/carrot_crypto.cpp @@ -82,7 +82,7 @@ static void debug_hex(const char* label, const uint8_t* data, size_t len) static constexpr char log_category_prefix[] = "CarrotCrypto "; char hex[130] = {0}; for (size_t i = 0; i < len && i < 64; ++i) { - sprintf(hex + i*2, "%02x", data[i]); + snprintf(hex + i*2, 3, "%02x", data[i]); } LOGINFO(6, label << ": " << static_cast(hex)); } diff --git a/src/wallet.cpp b/src/wallet.cpp index d4c5047..a47faca 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -179,7 +179,7 @@ bool Wallet::decode(const char* address) } char hex_buf[32]; - snprintf(hex_buf, sizeof(hex_buf), "0x%lx", tag); + snprintf(hex_buf, sizeof(hex_buf), "0x%llx", static_cast(tag)); m_prefix = tag; @@ -211,7 +211,7 @@ bool Wallet::decode(const char* address) for (int i = 0; i < std::min(data_index, 80); i++) { sprintf(data_hex + i*2, "%02x", data[i]); } - sprintf(prefix_hex, "0x%lx", m_prefix); + sprintf(prefix_hex, "0x%llx", static_cast(m_prefix)); LOGINFO(6, "decode varint_len=" << varint_len << " data_index=" << data_index << " prefix=" << static_cast(prefix_hex)); LOGINFO(6, "decode raw_data: " << static_cast(data_hex)); LOGINFO(6, "decode spend: " << static_cast(spend_hex));