From a7bafb3e05045e4079690b508b2fff6defdb2cff Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Fri, 1 Aug 2025 12:07:26 +0100 Subject: [PATCH 1/2] refactor: Use immediate lambda to work around GCC bug 117966 --- src/musig.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/musig.h b/src/musig.h index d46a67f65ec..69c82ddda37 100644 --- a/src/musig.h +++ b/src/musig.h @@ -14,7 +14,12 @@ struct secp256k1_musig_keyagg_cache; //! MuSig2 chaincode as defined by BIP 328 using namespace util::hex_literals; -constexpr uint256 MUSIG_CHAINCODE{"868087ca02a6f974c4598924c36b57762d32cb45717167e300622c7167e38965"_hex_u8}; +constexpr uint256 MUSIG_CHAINCODE{ + // Use immediate lambda to work around GCC-14 bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117966 + []() consteval { return uint256{"868087ca02a6f974c4598924c36b57762d32cb45717167e300622c7167e38965"_hex_u8}; }(), +}; + + //! Create a secp256k1_musig_keyagg_cache from the pubkeys in their current order. This is necessary for most MuSig2 operations bool GetMuSig2KeyAggCache(const std::vector& pubkeys, secp256k1_musig_keyagg_cache& keyagg_cache); From c7a24c3052557c4747eb8be7c40ee0a30e6b137d Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Fri, 1 Aug 2025 17:14:03 +0100 Subject: [PATCH 2/2] ci: Re-enable DEBUG=1 in centos task This reverts the workaround in commit fa079538e32d20aec6786c93e1117da1e8ea0cab, as it is no longer needed. --- ci/test/00_setup_env_native_centos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/test/00_setup_env_native_centos.sh b/ci/test/00_setup_env_native_centos.sh index 25b9923dc7c..94002b63493 100755 --- a/ci/test/00_setup_env_native_centos.sh +++ b/ci/test/00_setup_env_native_centos.sh @@ -10,11 +10,11 @@ export CONTAINER_NAME=ci_native_centos export CI_IMAGE_NAME_TAG="quay.io/centos/centos:stream10" export CI_BASE_PACKAGES="gcc-c++ glibc-devel libstdc++-devel ccache make ninja-build git python3 python3-pip which patch xz procps-ng ksh rsync coreutils bison e2fsprogs cmake" export PIP_PACKAGES="pyzmq" +export DEP_OPTS="DEBUG=1" export GOAL="install" export BITCOIN_CONFIG="\ -DWITH_ZMQ=ON \ -DBUILD_GUI=ON \ -DREDUCE_EXPORTS=ON \ - -DAPPEND_CPPFLAGS='-D_GLIBCXX_ASSERTIONS' \ -DCMAKE_BUILD_TYPE=Debug \ "