Merge branch 'dev' into server-definitions-feature-aware

enabled is what this server applies; ledger_enabled is the on-ledger
flag. Config-forced is enabled && !ledger_enabled.

build-core.sh

@@ -55,8 +55,10 @@ sed -i s/\"0.0.0\"/\"$(date +%Y).$(date +%-m).$(date +%-d)-$(git rev-parse --abb
 conan export external/snappy --version 1.1.10 --user xahaud --channel stable &&
 conan export external/soci --version 4.0.3 --user xahaud --channel stable &&
 cd release-build &&
-# Install dependencies. The Conan profile tags package_ids with the glibc
-# baseline, so tools like b2/protoc are built locally instead of downloaded.
+# Install dependencies - tool_requires in conanfile.py handles glibc 2.28 compatibility
+# for build tools (protoc, grpc plugins, b2) in HBB environment
+# The tool_requires('b2/5.3.2') in conanfile.py should force b2 to build from source
+# with the correct toolchain, avoiding the GLIBCXX_3.4.29 issue
 echo "=== Installing dependencies ===" &&
 conan install .. --output-folder . --build missing --settings build_type=$BUILD_TYPE \
   -o with_wasmedge=False -o tool_requires_b2=True &&
@@ -76,10 +78,8 @@ strip -s rippled &&
 mv rippled xahaud &&
 echo "=== Full ldd output ===" &&
 ldd xahaud &&
-echo "=== Checking GLIBC requirement (must be <= 2.28) ===" &&
-GLIBC_MAX=$(objdump -T xahaud | grep -o 'GLIBC_[0-9.]*' | sort -uV | tail -1) &&
-echo "Max required: $GLIBC_MAX" &&
-[ "$(printf '%s\n' GLIBC_2.28 "$GLIBC_MAX" | sort -V | tail -1)" = "GLIBC_2.28" ] &&
+echo "=== Running libcheck ===" &&
+libcheck xahaud &&
 echo "Build host: `hostname`" > release.info &&
 echo "Build date: `date`" >> release.info &&
 echo "Build md5: `md5sum xahaud`" >> release.info &&
@@ -88,11 +88,9 @@ git remote -v >> release.info &&
 echo "Git status:" >> release.info &&
 git status -v >> release.info &&
 echo "Git log [last 20]:" >> release.info &&
-git log -n 20 >> release.info || BUILD_FAILED=1
+git log -n 20 >> release.info;
 
-if [[ -n "${BUILD_FAILED:-}" ]]; then
-  echo "ERR build failed, not publishing"
-elif [[ "$4" == "" ]]; then
+if [[ "$4" == "" ]]; then
   # Non GH, local building
   echo "Non GH, local building, no Action runner magic"
 else
@@ -111,7 +109,7 @@ else
   echo $(date +%Y).$(date +%-m).$(date +%-d)-$(git rev-parse --abbrev-ref HEAD)+$4
 fi
 
-cd /io;
+cd ..;
 
 mv src/xrpld/net/detail/RegisterSSLCerts.cpp.old src/xrpld/net/detail/RegisterSSLCerts.cpp;
 mv cmake/deps/WasmEdge.old cmake/deps/WasmEdge.cmake;
@@ -119,5 +117,3 @@ rm src/certs/certbundle.h;
 git checkout src/libxrpl/protocol/BuildInfo.cpp;
 
 echo "END INSIDE CONTAINER - CORE"
-
-[[ -z "${BUILD_FAILED:-}" ]] || exit 1

build-full.sh

@@ -64,7 +64,7 @@ if [ "$(grep certbundle.h src/xrpld/net/detail/RegisterSSLCerts.cpp | wc -l)" -e
     sed -i "s/#include <xrpld\/net\/RegisterSSLCerts.h>/\0\n#include <certs\/certbundle.h>/g" src/xrpld/net/detail/RegisterSSLCerts.cpp
 fi
 # Environment setup moved to Dockerfile in release-builder.sh
-source /opt/rh/gcc-toolset-13/enable
+source /opt/rh/gcc-toolset-11/enable
 export PATH=/usr/local/bin:$PATH
 export CC='/usr/lib64/ccache/gcc' &&
   export CXX='/usr/lib64/ccache/g++' &&

release-builder.sh

@@ -12,12 +12,10 @@ echo "Cleaning previously built binary"
 rm -f release-build/xahaud
 
 BUILD_CORES=$(echo "scale=0 ; $(nproc) / 1.337" | bc)
-OUT_DIR="/data/builds"
 
 if [[ "$GITHUB_REPOSITORY" == "" ]]; then
   #Default
   BUILD_CORES=${BUILD_CORES:-8}
-  OUT_DIR="./data/builds"
 fi
 
 # Ensure still works outside of GH Actions by setting these to /dev/null
@@ -53,7 +51,7 @@ CACHE_VOLUME_NAME="xahau-release-builder-cache"
 if false; then
   echo "Static container, execute in static container to have max. cache"
   docker start $CONTAINER_NAME
-  docker exec -i $CONTAINER_NAME bash -c "source /opt/rh/gcc-toolset-13/enable && bash -x /io/build-core.sh '$GITHUB_REPOSITORY' '$GITHUB_SHA' '$BUILD_CORES' '$GITHUB_RUN_NUMBER'"
+  docker exec -i $CONTAINER_NAME /hbb_exe/activate-exec bash -c "source /opt/rh/gcc-toolset-11/enable && bash -x /io/build-core.sh '$GITHUB_REPOSITORY' '$GITHUB_SHA' '$BUILD_CORES' '$GITHUB_RUN_NUMBER'"
   docker stop $CONTAINER_NAME
 else
   echo "No static container, build on temp container"
@@ -65,29 +63,24 @@ else
   # Create inline Dockerfile with environment setup for build-full.sh
   DOCKERFILE_CONTENT=$(
     cat <<'DOCKERFILE_EOF'
-FROM --platform=linux/amd64 almalinux:8
+FROM ghcr.io/phusion/holy-build-box:4.0.1-amd64
 
 ARG BUILD_CORES=8
 
-# AlmaLinux 8 keeps the glibc 2.28 baseline (same as holy-build-box 4).
-# The devel repo (disabled by default, like in holy-build-box) provides ncurses-static.
-# gcc-toolset-13 builds everything: Boost/LLD/WasmEdge below, Conan deps and xahaud.
-RUN dnf install -y dnf-plugins-core epel-release && \
-    dnf config-manager --set-enabled powertools && \
-    printf "%s\n" "[devel]" "name=AlmaLinux 8 - Devel" \
-        "baseurl=https://repo.almalinux.org/almalinux/8/devel/\$basearch/os/" \
-        "gpgcheck=1" "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux" "enabled=0" \
-        > /etc/yum.repos.d/almalinux-devel.repo && \
+# Enable repositories and install dependencies
+RUN /hbb_exe/activate-exec bash -c "dnf install -y epel-release && \
+    dnf config-manager --set-enabled powertools || dnf config-manager --set-enabled crb && \
     dnf install -y --enablerepo=devel \
-        wget git unzip xz perl hostname make \
-        gcc-toolset-13-gcc-c++ gcc-toolset-13-binutils gcc-toolset-13-libatomic-devel \
+        wget git \
+        gcc-toolset-11-gcc-c++ gcc-toolset-11-binutils gcc-toolset-11-libatomic-devel \
         lz4 lz4-devel \
         ncurses-static ncurses-devel \
         snappy snappy-devel \
         zlib zlib-devel zlib-static \
-        sqlite-devel \
-        python3.11 python3.11-pip \
+        libasan \
+        python3 python3-pip \
         ccache \
+        ninja-build \
         mold \
         patch \
         glibc-devel glibc-static \
@@ -97,15 +90,16 @@ RUN dnf install -y dnf-plugins-core epel-release && \
         texinfo \
         libtool \
         llvm14-static llvm14-devel && \
-    dnf clean all
+    dnf clean all"
 
 # Install Conan 2 and CMake
-RUN python3.11 -m pip install "conan>=2.0,<3.0" "ninja>=1.13,<1.14" && \
-    wget -q https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-linux-x86_64.tar.gz -O cmake.tar.gz && \
-    tar -xzf cmake.tar.gz --strip-components=1 -C /usr/local && \
+RUN /hbb_exe/activate-exec pip3 install "conan>=2.0,<3.0" && \
+    /hbb_exe/activate-exec wget -q https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-linux-x86_64.tar.gz -O cmake.tar.gz && \
+    mkdir cmake && \
+    tar -xzf cmake.tar.gz --strip-components=1 -C cmake && \
     rm cmake.tar.gz
 
-# Dual Boost configuration:
+# Dual Boost configuration in HBB environment:
 # - Manual Boost in /usr/local (minimal: for WasmEdge which is pre-built in Docker)
 # - Conan Boost (full: for the application and all dependencies via toolchain)
 #
@@ -115,8 +109,7 @@ RUN python3.11 -m pip install "conan>=2.0,<3.0" "ninja>=1.13,<1.14" && \
 #   - link=static: Creates static Boost libraries (.a files) instead of shared (.so files)
 #   - runtime-link=shared: Links Boost libraries against shared libc (glibc)
 # WasmEdge only needs boost::filesystem and boost::system
-RUN echo 'Boost cache bust: v5-minimal' && \
-    source /opt/rh/gcc-toolset-13/enable && \
+RUN /hbb_exe/activate-exec bash -c "echo 'Boost cache bust: v5-minimal' && \
     rm -rf /usr/local/lib/libboost* /usr/local/include/boost && \
     cd /tmp && \
     wget -q https://archives.boost.io/release/1.86.0/source/boost_1_86_0.tar.gz -O boost.tar.gz && \
@@ -128,7 +121,7 @@ RUN echo 'Boost cache bust: v5-minimal' && \
         link=static runtime-link=shared -j${BUILD_CORES} \
         --with-filesystem --with-system && \
     cd /tmp && \
-    rm -rf boost boost.tar.gz
+    rm -rf boost boost.tar.gz"
 
 ENV CMAKE_EXE_LINKER_FLAGS="-static-libstdc++"
 
@@ -138,10 +131,8 @@ ENV WasmEdge_LIB=/usr/local/lib64/libwasmedge.a
 ENV CC='ccache gcc'
 ENV CXX='ccache g++'
 
-# LLVM 14 headers rely on <cstdint> being included transitively, which gcc 13 no longer does
 # Install LLD
-RUN source /opt/rh/gcc-toolset-13/enable && \
-    export CXXFLAGS="-include cstdint" && \
+RUN /hbb_exe/activate-exec bash -c "source /opt/rh/gcc-toolset-11/enable && \
     cd /tmp && \
     wget -q https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.3/lld-14.0.3.src.tar.xz && \
     wget -q https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.3/libunwind-14.0.3.src.tar.xz && \
@@ -154,11 +145,11 @@ RUN source /opt/rh/gcc-toolset-13/enable && \
         -DLLVM_LIBRARY_DIR=/usr/lib64/llvm14/lib/ \
         -DCMAKE_INSTALL_PREFIX=/usr/lib64/llvm14/ \
         -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_EXE_LINKER_FLAGS="$CMAKE_EXE_LINKER_FLAGS" && \
+        -DCMAKE_EXE_LINKER_FLAGS=\"\$CMAKE_EXE_LINKER_FLAGS\" && \
     make -j${BUILD_CORES} install && \
     ln -s /usr/lib64/llvm14/lib/include/lld /usr/include/lld && \
     cp /usr/lib64/llvm14/lib/liblld*.a /usr/local/lib/ && \
-    cd /tmp && rm -rf lld-* libunwind-*
+    cd /tmp && rm -rf lld-* libunwind-*"
 
 # Build and install WasmEdge (static version)
 # Note: Conan only provides WasmEdge with shared library linking.
@@ -170,14 +161,11 @@ RUN source /opt/rh/gcc-toolset-13/enable && \
 RUN cd /tmp && \
     ( wget -nc -q https://github.com/WasmEdge/WasmEdge/archive/refs/tags/0.11.2.zip; unzip -o 0.11.2.zip; ) && \
     cd WasmEdge-0.11.2 && \
-    sed -i "/^ *-Werror$/d" cmake/Helper.cmake && \
-    sed -i "s/\[\[noreturn\]\] inline void Fault::emitFault/[[noreturn]] void Fault::emitFault/" lib/system/fault.cpp && \
     ( mkdir -p build; echo "" ) && \
     cd build && \
-    source /opt/rh/gcc-toolset-13/enable && \
-    export CXXFLAGS="-include cstdint" && \
-    ln -sf /opt/rh/gcc-toolset-13/root/usr/bin/ar /usr/bin/ar && \
-    ln -sf /opt/rh/gcc-toolset-13/root/usr/bin/ranlib /usr/bin/ranlib && \
+    /hbb_exe/activate-exec bash -c "source /opt/rh/gcc-toolset-11/enable && \
+    ln -sf /opt/rh/gcc-toolset-11/root/usr/bin/ar /usr/bin/ar && \
+    ln -sf /opt/rh/gcc-toolset-11/root/usr/bin/ranlib /usr/bin/ranlib && \
     echo '=== Binutils version check ===' && \
     ar --version | head -1 && \
     ranlib --version | head -1 && \
@@ -193,9 +181,9 @@ RUN cd /tmp && \
         -DWASMEDGE_BUILD_PLUGINS=OFF \
         -DWASMEDGE_LINK_TOOLS_STATIC=ON \
         -DBoost_NO_BOOST_CMAKE=ON \
-        -DCMAKE_EXE_LINKER_FLAGS="$CMAKE_EXE_LINKER_FLAGS" \
+        -DCMAKE_EXE_LINKER_FLAGS=\"\$CMAKE_EXE_LINKER_FLAGS\" \
         && \
-    make -j${BUILD_CORES} install && \
+    make -j${BUILD_CORES} install" && \
     cp -r include/api/wasmedge /usr/include/ && \
     cd /tmp && rm -rf WasmEdge* 0.11.2.zip
 
@@ -204,7 +192,7 @@ ENV PATH=/usr/local/bin:$PATH
 
 # Configure ccache and Conan 2
 # NOTE: Using echo commands instead of heredocs because heredocs in Docker RUN commands are finnicky
-RUN ccache -M 100G && \
+RUN /hbb_exe/activate-exec bash -c "ccache -M 100G && \
     ccache -o cache_dir=/cache/ccache && \
     ccache -o compiler_check=content && \
     ccache -o direct_mode=true && \
@@ -219,23 +207,14 @@ RUN ccache -M 100G && \
     echo 'compiler=gcc' >> ~/.conan2/profiles/default && \
     echo 'compiler.cppstd=20' >> ~/.conan2/profiles/default && \
     echo 'compiler.libcxx=libstdc++11' >> ~/.conan2/profiles/default && \
-    echo 'compiler.version=13' >> ~/.conan2/profiles/default && \
+    echo 'compiler.version=11' >> ~/.conan2/profiles/default && \
     echo 'os=Linux' >> ~/.conan2/profiles/default && \
     echo '' >> ~/.conan2/profiles/default && \
     echo '[conf]' >> ~/.conan2/profiles/default && \
     echo '# Force building from source for packages with binary compatibility issues' >> ~/.conan2/profiles/default && \
     echo '*:tools.system.package_manager:mode=build' >> ~/.conan2/profiles/default && \
-    echo '# Tag every package_id with the glibc baseline so ConanCenter binaries (built on a' >> ~/.conan2/profiles/default && \
-    echo '# newer glibc, e.g. protoc/b2) never match; everything is built locally and cached' >> ~/.conan2/profiles/default && \
-    echo 'user.xahaud:glibc=2.28' >> ~/.conan2/profiles/default && \
-    echo 'tools.info.package_id:confs=["user.xahaud:glibc"]' >> ~/.conan2/profiles/default && \
-    echo "" >> ~/.conan2/profiles/default && \
-    echo "# ninja is provided by pip (manylinux wheel); building it in Conan hits a gcc-13 LTO ICE" >> ~/.conan2/profiles/default && \
-    echo "[platform_tool_requires]" >> ~/.conan2/profiles/default && \
-    echo "ninja/1.13.2" >> ~/.conan2/profiles/default && \
-    ln -sf ../../bin/ccache /usr/lib64/ccache/gcc && \
-    ln -sf ../../bin/ccache /usr/lib64/ccache/g++ && \
-    ln -sf ../../bin/ccache /usr/lib64/ccache/c++
+    ln -s ../../bin/ccache /usr/lib64/ccache/g++ && \
+    ln -s ../../bin/ccache /usr/lib64/ccache/c++"
 
 DOCKERFILE_EOF
   )
@@ -248,15 +227,15 @@ DOCKERFILE_EOF
   if [[ "$GITHUB_REPOSITORY" == "" ]]; then
     # Non GH, local building
     echo "Non-GH runner, local building, temp container"
-    docker run -i --user 0:$(id -g) --rm -v $OUT_DIR:/data/builds -v $(pwd):/io -v "$CACHE_VOLUME_NAME":/cache --network host "$IMAGE_NAME" bash -c "source /opt/rh/gcc-toolset-13/enable && bash -x /io/build-full.sh '$GITHUB_REPOSITORY' '$GITHUB_SHA' '$BUILD_CORES' '$GITHUB_RUN_NUMBER'"
+    docker run -i --user 0:$(id -g) --rm -v /data/builds:/data/builds -v $(pwd):/io -v "$CACHE_VOLUME_NAME":/cache --network host "$IMAGE_NAME" /hbb_exe/activate-exec bash -c "source /opt/rh/gcc-toolset-11/enable && bash -x /io/build-full.sh '$GITHUB_REPOSITORY' '$GITHUB_SHA' '$BUILD_CORES' '$GITHUB_RUN_NUMBER'"
   else
     # GH Action, runner
     echo "GH Action, runner, clean & re-create create persistent container"
     docker rm -f $CONTAINER_NAME
     echo "echo 'Stopping container: $CONTAINER_NAME'" >>"$JOB_CLEANUP_SCRIPT"
     echo "docker stop --time=15 \"$CONTAINER_NAME\" || echo 'Failed to stop container or container not running'" >>"$JOB_CLEANUP_SCRIPT"
-    docker run -di --user 0:$(id -g) --name $CONTAINER_NAME -v $OUT_DIR:/data/builds -v $(pwd):/io -v "$CACHE_VOLUME_NAME":/cache --network host "$IMAGE_NAME" bash
-    docker exec -i $CONTAINER_NAME bash -c "source /opt/rh/gcc-toolset-13/enable && bash -x /io/build-full.sh '$GITHUB_REPOSITORY' '$GITHUB_SHA' '$BUILD_CORES' '$GITHUB_RUN_NUMBER'"
+    docker run -di --user 0:$(id -g) --name $CONTAINER_NAME -v /data/builds:/data/builds -v $(pwd):/io -v "$CACHE_VOLUME_NAME":/cache --network host "$IMAGE_NAME" /hbb_exe/activate-exec bash
+    docker exec -i $CONTAINER_NAME /hbb_exe/activate-exec bash -c "source /opt/rh/gcc-toolset-11/enable && bash -x /io/build-full.sh '$GITHUB_REPOSITORY' '$GITHUB_SHA' '$BUILD_CORES' '$GITHUB_RUN_NUMBER'"
     docker stop $CONTAINER_NAME
   fi
 fi