Merge branch 'dev' into fix-workflow-conan

[ci-nix-full-matrix]

.github/actions/xahau-ga-build/action.yml

@@ -28,6 +28,10 @@ inputs:
     description: 'Cache version for invalidation'
     required: false
     default: '1'
+  gha_cache_enabled:
+    description: 'Whether to use actions/cache (disable for self-hosted with volume mounts)'
+    required: false
+    default: 'true'
   ccache_enabled:
     description: 'Whether to use ccache'
     required: false
@@ -71,56 +75,30 @@ runs:
         SAFE_BRANCH=$(echo "${{ github.ref_name }}" | tr -c 'a-zA-Z0-9_.-' '-')
         echo "name=${SAFE_BRANCH}" >> $GITHUB_OUTPUT
 
-    - name: Restore ccache directory for main branch
-      if: inputs.ccache_enabled == 'true'
-      id: ccache-restore
-      uses: ./.github/actions/xahau-ga-cache-restore
-      with:
-        path: ~/.ccache-main
-        key: ${{ runner.os }}-ccache-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-${{ inputs.configuration }}-${{ inputs.main_branch }}
-        restore-keys: |
-          ${{ runner.os }}-ccache-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-${{ inputs.configuration }}-
-          ${{ runner.os }}-ccache-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-
-        cache-type: ccache-main
-
-    - name: Restore ccache directory for current branch
-      if: inputs.ccache_enabled == 'true' && steps.safe-branch.outputs.name != inputs.main_branch
-      id: ccache-restore-current-branch
-      uses: ./.github/actions/xahau-ga-cache-restore
-      with:
-        path: ~/.ccache-current
-        key: ${{ runner.os }}-ccache-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-${{ inputs.configuration }}-${{ steps.safe-branch.outputs.name }}
-        restore-keys: |
-          ${{ runner.os }}-ccache-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-${{ inputs.configuration }}-${{ inputs.main_branch }}
-          ${{ runner.os }}-ccache-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-${{ inputs.configuration }}-
-          ${{ runner.os }}-ccache-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-
-        cache-type: ccache-current
-
     - name: Configure ccache
       if: inputs.ccache_enabled == 'true'
       shell: bash
       run: |
         # Create cache directories
-        mkdir -p ~/.ccache-main ~/.ccache-current
+        mkdir -p ~/.ccache-cache
+
+        # Keep config separate from cache_dir so configs aren't swapped when CCACHE_DIR changes between steps
+        mkdir -p ~/.config/ccache
+        export CCACHE_CONFIGPATH="$HOME/.config/ccache/ccache.conf"
+        echo "CCACHE_CONFIGPATH=$CCACHE_CONFIGPATH" >> $GITHUB_ENV
+
+        # Keep config separate from cache_dir so configs aren't swapped when CCACHE_DIR changes between steps
+        mkdir -p ~/.config/ccache
+        export CCACHE_CONFIGPATH="$HOME/.config/ccache/ccache.conf"
+        echo "CCACHE_CONFIGPATH=$CCACHE_CONFIGPATH" >> $GITHUB_ENV
 
         # Configure ccache settings AFTER cache restore (prevents stale cached config)
         ccache --set-config=max_size=${{ inputs.ccache_max_size }}
         ccache --set-config=hash_dir=${{ inputs.ccache_hash_dir }}
         ccache --set-config=compiler_check=${{ inputs.ccache_compiler_check }}
-
+        ccache --set-config=cache_dir="$HOME/.ccache-cache"
-        # Determine if we're on the main branch
+        echo "CCACHE_DIR=$HOME/.ccache-cache" >> $GITHUB_ENV
-        if [ "${{ steps.safe-branch.outputs.name }}" = "${{ inputs.main_branch }}" ]; then
+        echo "📦 using ~/.ccache-cache as ccache cache directory"
-          # Main branch: use main branch cache only
-          ccache --set-config=cache_dir="$HOME/.ccache-main"
-          echo "CCACHE_DIR=$HOME/.ccache-main" >> $GITHUB_ENV
-          echo "📦 Main branch: using ~/.ccache-main"
-        else
-          # Feature branch: use current branch cache with main as secondary (read-only fallback)
-          ccache --set-config=cache_dir="$HOME/.ccache-current"
-          ccache --set-config=secondary_storage="file:$HOME/.ccache-main"
-          echo "CCACHE_DIR=$HOME/.ccache-current" >> $GITHUB_ENV
-          echo "📦 Feature branch: using ~/.ccache-current with ~/.ccache-main as secondary"
-        fi
 
         # Print config for verification
         echo "=== ccache configuration ==="
@@ -235,17 +213,3 @@ runs:
       if: inputs.ccache_enabled == 'true'
       shell: bash
       run: ccache -s
-
-    - name: Save ccache directory for main branch
-      if: success() && inputs.ccache_enabled == 'true' && steps.safe-branch.outputs.name == inputs.main_branch
-      uses: actions/cache/save@v4
-      with:
-        path: ~/.ccache-main
-        key: ${{ steps.ccache-restore.outputs.cache-primary-key }}
-
-    - name: Save ccache directory for current branch
-      if: success() && inputs.ccache_enabled == 'true' && steps.safe-branch.outputs.name != inputs.main_branch
-      uses: actions/cache/save@v4
-      with:
-        path: ~/.ccache-current
-        key: ${{ steps.ccache-restore-current-branch.outputs.cache-primary-key }}

.github/actions/xahau-ga-dependencies/action.yml

@@ -17,10 +17,6 @@ inputs:
     description: 'Cache version for invalidation'
     required: false
     default: '1'
-  cache_enabled:
-    description: 'Whether to use caching'
-    required: false
-    default: 'true'
   main_branch:
     description: 'Main branch name for restore keys'
     required: false
@@ -63,18 +59,25 @@ outputs:
 runs:
   using: 'composite'
   steps:
-    - name: Restore Conan cache
+    - name: Configure Conan cache paths
-      if: inputs.cache_enabled == 'true'
+      if: inputs.os == 'Linux'
-      id: cache-restore-conan
+      shell: bash
-      uses: ./.github/actions/xahau-ga-cache-restore
+      run: |
-      with:
+        mkdir -p /.conan-cache/conan2 /.conan-cache/conan2_download /.conan-cache/conan2_sources
-        path: ~/.conan2
+        echo 'core.cache:storage_path=/.conan-cache/conan2' > ~/.conan2/global.conf
-        # Note: compiler-id format is compiler-version-stdlib[-gccversion]
+        echo 'core.download:download_cache=/.conan-cache/conan2_download' >> ~/.conan2/global.conf
-        key: ${{ runner.os }}-conan-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-${{ hashFiles('**/conanfile.py') }}-${{ inputs.configuration }}
+        echo 'core.sources:download_cache=/.conan-cache/conan2_sources' >> ~/.conan2/global.conf
-        restore-keys: |
+
-          ${{ runner.os }}-conan-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-${{ hashFiles('**/conanfile.py') }}-
+    - name: Configure Conan cache paths
-          ${{ runner.os }}-conan-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-
+      if: inputs.gha_cache_enabled == 'false'
-        cache-type: Conan
+      shell: bash
+      # For self-hosted runners, register cache paths to be used as volumes
+      # This allows the cache to be shared between containers
+      run: |
+        mkdir -p /.conan-cache/conan2 /.conan-cache/conan2_download /.conan-cache/conan2_sources
+        echo 'core.cache:storage_path=/.conan-cache/conan2' > ~/.conan2/global.conf
+        echo 'core.download:download_cache=/.conan-cache/conan2_download' >> ~/.conan2/global.conf
+        echo 'core.sources:download_cache=/.conan-cache/conan2_sources' >> ~/.conan2/global.conf
 
     - name: Configure Conan
       shell: bash
@@ -131,10 +134,17 @@ runs:
     - name: Export custom recipes
       shell: bash
       run: |
-        conan export external/snappy --version 1.1.10 --user xahaud --channel stable
+        # Export snappy if not already exported
-        conan export external/soci --version 4.0.3 --user xahaud --channel stable
+        conan list snappy/1.1.10@xahaud/stable 2>/dev/null | (grep -q "not found" && exit 1 || exit 0) || \
-        conan export external/wasmedge --version 0.11.2 --user xahaud --channel stable
+          conan export external/snappy --version 1.1.10 --user xahaud --channel stable
-
+        
+        # Export soci if not already exported
+        conan list soci/4.0.3@xahaud/stable 2>/dev/null | (grep -q "not found" && exit 1 || exit 0) || \
+          conan export external/soci --version 4.0.3 --user xahaud --channel stable
+        
+        # Export wasmedge if not already exported
+        conan list wasmedge/0.11.2@xahaud/stable 2>/dev/null | (grep -q "not found" && exit 1 || exit 0) || \
+          conan export external/wasmedge --version 0.11.2 --user xahaud --channel stable
     - name: Install dependencies
       shell: bash
       env:
@@ -150,10 +160,3 @@ runs:
           --build missing \
           --settings build_type=${{ inputs.configuration }} \
           ..
-
-    - name: Save Conan cache
-      if: success() && inputs.cache_enabled == 'true' && steps.cache-restore-conan.outputs.cache-hit != 'true'
-      uses: actions/cache/save@v4
-      with:
-        path: ~/.conan2
-        key: ${{ steps.cache-restore-conan.outputs.cache-primary-key }}

.github/workflows/build-in-docker.yml

@@ -33,7 +33,7 @@ jobs:
           fetch-depth: 2 # Only get the last 2 commits, to avoid fetching all history
 
   build:
-    runs-on: [self-hosted, vanity]
+    runs-on: [self-hosted, xahaud-build]
     needs: [checkout]
     defaults:
       run:
@@ -74,7 +74,7 @@ jobs:
           fi
 
   tests:
-    runs-on: [self-hosted, vanity]
+    runs-on: [self-hosted, xahaud-build]
     needs: [build, checkout]
     defaults:
       run:
@@ -84,7 +84,7 @@ jobs:
         run: /bin/bash docker-unit-tests.sh
 
   cleanup:
-    runs-on: [self-hosted, vanity]
+    runs-on: [self-hosted, xahaud-build]
     needs: [tests, checkout]
     if: always()
     steps:

.github/workflows/xahau-ga-macos.yml

@@ -20,7 +20,7 @@ jobs:
           - Ninja
         configuration:
           - Debug
-    runs-on: macos-15
+    runs-on: [self-hosted, macOS]
     env:
       build_dir: .build
       # Bump this number to invalidate all caches globally.
@@ -30,61 +30,37 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Get commit message
+      - name: Add Homebrew to PATH
-        id: get-commit-message
-        uses: ./.github/actions/xahau-ga-get-commit-message
-        with:
-          event-name: ${{ github.event_name }}
-          head-commit-message: ${{ github.event.head_commit.message }}
-          pr-head-sha: ${{ github.event.pull_request.head.sha }}
-
-      - name: Install Conan
         run: |
-          brew install conan
+          echo "/opt/homebrew/bin" >> "$GITHUB_PATH"
-          # Verify Conan 2 is installed
+          echo "/opt/homebrew/sbin" >> "$GITHUB_PATH"
-          conan --version
 
       - name: Install Coreutils
         run: |
           brew install coreutils
           echo "Num proc: $(nproc)"
 
-      - name: Install Ninja
+      # To isolate environments for each Runner, instead of installing globally with brew, 
-        if: matrix.generator == 'Ninja'
+      # use mise to isolate environments for each Runner directory.
-        run: brew install ninja
+      - name: Setup toolchain (mise)
+        uses: jdx/mise-action@v3.6.1
+        with:
+          cache: false
+          install: true
+          mise_toml: |
+            [tools]
+            cmake = "3.23.1"
+            python = "3.12"
+            pipx = "latest"
+            conan = "2"
+            ninja = "latest"
+            ccache = "latest"
 
-      - name: Install Python
+      - name: Install tools via mise
         run: |
-          if which python3 > /dev/null 2>&1; then
+          mise install
-              echo "Python 3 executable exists"
+          mise reshim
-              python3 --version
+          echo "$HOME/.local/share/mise/shims" >> "$GITHUB_PATH"
-          else
-              brew install python@3.12
-          fi
-          # Create 'python' symlink if it doesn't exist (for tools expecting 'python')
-          if ! which python > /dev/null 2>&1; then
-              sudo ln -sf $(which python3) /usr/local/bin/python
-          fi
-
-      - name: Install CMake
-        run: |
-          # Install CMake 3.x to match local dev environments
-          # With Conan 2 and the policy args passed to CMake, newer versions
-          # can have issues with dependencies that require cmake_minimum_required < 3.5
-          brew uninstall cmake --ignore-dependencies 2>/dev/null || true
-
-          # Download and install CMake 3.31.7 directly
-          curl -L https://github.com/Kitware/CMake/releases/download/v3.31.7/cmake-3.31.7-macos-universal.tar.gz -o cmake.tar.gz
-          tar -xzf cmake.tar.gz
-
-          # Move the entire CMake.app to /Applications
-          sudo mv cmake-3.31.7-macos-universal/CMake.app /Applications/
-
-          echo "/Applications/CMake.app/Contents/bin" >> $GITHUB_PATH
-          /Applications/CMake.app/Contents/bin/cmake --version
-
-      - name: Install ccache
-        run: brew install ccache
 
       - name: Check environment
         run: |
@@ -98,6 +74,14 @@ jobs:
           echo "---- Full Environment ----"
           env
 
+      - name: Get commit message
+        id: get-commit-message
+        uses: ./.github/actions/xahau-ga-get-commit-message
+        with:
+          event-name: ${{ github.event_name }}
+          head-commit-message: ${{ github.event.head_commit.message }}
+          pr-head-sha: ${{ github.event.pull_request.head.sha }}
+
       - name: Detect compiler version
         id: detect-compiler
         run: |
@@ -129,6 +113,7 @@ jobs:
           cache_version: ${{ env.CACHE_VERSION }}
           main_branch: ${{ env.MAIN_BRANCH_NAME }}
           stdlib: libcxx
+          ccache_max_size: '100G'
 
       - name: Test
         run: |

.github/workflows/xahau-ga-nix.yml

@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   matrix-setup:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, generic, 20.04]
     container: python:3-slim
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
@@ -176,7 +176,15 @@ jobs:
 
   build:
     needs: matrix-setup
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, generic, 20.04]
+    container:
+      image: ubuntu:24.04
+      volumes:
+        - /home/runner/.conan-cache:/.conan-cache
+        - /home/runner/.ccache-cache:/github/home/.ccache-cache
+    defaults:
+      run:
+        shell: bash
     outputs:
       artifact_name: ${{ steps.set-artifact-name.outputs.artifact_name }}
     strategy:
@@ -191,23 +199,22 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Get commit message
-        id: get-commit-message
-        uses: ./.github/actions/xahau-ga-get-commit-message
-        with:
-          event-name: ${{ github.event_name }}
-          head-commit-message: ${{ github.event.head_commit.message }}
-          pr-head-sha: ${{ github.event.pull_request.head.sha }}
-
       - name: Install build dependencies
         run: |
-          sudo apt-get update
+          apt-get update
-          sudo apt-get install -y ninja-build ${{ matrix.cc }} ${{ matrix.cxx }} ccache
+          apt-get install -y software-properties-common
+          add-apt-repository ppa:ubuntu-toolchain-r/test -y
+          apt-get update
+          apt-get install -y python3 python-is-python3 pipx
+          pipx ensurepath
+          apt-get install -y cmake ninja-build ${{ matrix.cc }} ${{ matrix.cxx }} ccache
+          apt-get install -y perl # for openssl build
+          apt-get install -y libsqlite3-dev # for xahaud build
 
           # Install the specific GCC version needed for Clang
           if [ -n "${{ matrix.clang_gcc_toolchain }}" ]; then
             echo "=== Installing GCC ${{ matrix.clang_gcc_toolchain }} for Clang ==="
-            sudo apt-get install -y gcc-${{ matrix.clang_gcc_toolchain }} g++-${{ matrix.clang_gcc_toolchain }} libstdc++-${{ matrix.clang_gcc_toolchain }}-dev
+            apt-get install -y gcc-${{ matrix.clang_gcc_toolchain }} g++-${{ matrix.clang_gcc_toolchain }} libstdc++-${{ matrix.clang_gcc_toolchain }}-dev
 
             echo "=== GCC versions available after installation ==="
             ls -la /usr/lib/gcc/x86_64-linux-gnu/ | grep -E "^d"
@@ -238,7 +245,7 @@ jobs:
                   echo "Hiding GCC $version -> renaming to $counter (will be seen as GCC version $counter)"
                   # Safety check: ensure target doesn't already exist
                   if [ ! -e "/usr/lib/gcc/x86_64-linux-gnu/$counter" ]; then
-                    sudo mv "$dir" "/usr/lib/gcc/x86_64-linux-gnu/$counter"
+                    mv "$dir" "/usr/lib/gcc/x86_64-linux-gnu/$counter"
                   else
                     echo "ERROR: Cannot rename GCC $version - /usr/lib/gcc/x86_64-linux-gnu/$counter already exists"
                     exit 1
@@ -262,11 +269,12 @@ jobs:
 
           # Install libc++ dev packages if using libc++ (not needed for libstdc++)
           if [ "${{ matrix.stdlib }}" = "libcxx" ]; then
-            sudo apt-get install -y libc++-${{ matrix.compiler_version }}-dev libc++abi-${{ matrix.compiler_version }}-dev
+            apt-get install -y libc++-${{ matrix.compiler_version }}-dev libc++abi-${{ matrix.compiler_version }}-dev
           fi
 
           # Install Conan 2
-          pip install --upgrade "conan>=2.0,<3"
+          pipx install "conan>=2.0,<3"
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
 
       - name: Check environment
         run: |
@@ -280,6 +288,14 @@ jobs:
           echo "---- Full Environment ----"
           env
 
+      - name: Get commit message
+        id: get-commit-message
+        uses: ./.github/actions/xahau-ga-get-commit-message
+        with:
+          event-name: ${{ github.event_name }}
+          head-commit-message: ${{ github.event.head_commit.message }}
+          pr-head-sha: ${{ github.event.pull_request.head.sha }}
+
       - name: Install dependencies
         uses: ./.github/actions/xahau-ga-dependencies
         with:
@@ -293,6 +309,7 @@ jobs:
           cc: ${{ matrix.cc }}
           cxx: ${{ matrix.cxx }}
           stdlib: ${{ matrix.stdlib }}
+          gha_cache_enabled: 'false' # Disable caching for self hosted runner
 
       - name: Build
         uses: ./.github/actions/xahau-ga-build
@@ -307,6 +324,7 @@ jobs:
           main_branch: ${{ env.MAIN_BRANCH_NAME }}
           stdlib: ${{ matrix.stdlib }}
           clang_gcc_toolchain: ${{ matrix.clang_gcc_toolchain || '' }}
+          ccache_max_size: '100G'
 
       - name: Set artifact name
         id: set-artifact-name

Builds/CMake/RippledCore.cmake

@@ -48,13 +48,9 @@ target_sources (xrpl_core PRIVATE
   src/ripple/beast/net/impl/IPAddressV6.cpp
   src/ripple/beast/net/impl/IPEndpoint.cpp
   src/ripple/beast/utility/src/beast_Journal.cpp
-  src/ripple/beast/utility/src/beast_PropertyStream.cpp)
+  src/ripple/beast/utility/src/beast_PropertyStream.cpp
-
+  # Enhanced logging - compiles to empty when BEAST_ENHANCED_LOGGING is not defined
-# Conditionally add enhanced logging source when BEAST_ENHANCED_LOGGING is enabled
+  src/ripple/beast/utility/src/beast_EnhancedLogging.cpp)
-if(DEFINED BEAST_ENHANCED_LOGGING AND BEAST_ENHANCED_LOGGING)
-  target_sources(xrpl_core PRIVATE
-    src/ripple/beast/utility/src/beast_EnhancedLogging.cpp)
-endif()
 
 #[===============================[
     core sources
@@ -162,12 +158,16 @@ target_link_libraries (xrpl_core
     date::date
     Ripple::opts)
 
-# Link date-tz library when enhanced logging is enabled
+# date-tz for enhanced logging (always linked, code is #ifdef guarded)
-if(DEFINED BEAST_ENHANCED_LOGGING AND BEAST_ENHANCED_LOGGING)
+if(TARGET date::date-tz)
-  if(TARGET date::date-tz)
+  target_link_libraries(xrpl_core PUBLIC date::date-tz)
-    target_link_libraries(xrpl_core PUBLIC date::date-tz)
-  endif()
 endif()
+
+# BEAST_ENHANCED_LOGGING: enable for Debug builds OR when explicitly requested
+# Uses generator expression so it works with multi-config generators (Xcode, VS, Ninja Multi-Config)
+target_compile_definitions(xrpl_core PUBLIC
+  $<$<OR:$<CONFIG:Debug>,$<BOOL:${BEAST_ENHANCED_LOGGING}>>:BEAST_ENHANCED_LOGGING=1>
+)
 #[=================================[
    main/core headers installation
 #]=================================]

CMakeLists.txt

@@ -37,20 +37,11 @@ endif() #git
 set(SOURCE_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/")
 add_definitions(-DSOURCE_ROOT_PATH="${SOURCE_ROOT_PATH}")
 
-# BEAST_ENHANCED_LOGGING option - adds file:line numbers and formatting to logs
+# BEAST_ENHANCED_LOGGING - adds file:line numbers and formatting to logs
-# Default to ON for Debug builds, OFF for Release
+# Automatically enabled for Debug builds via generator expression
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+# Can be explicitly controlled with -DBEAST_ENHANCED_LOGGING=ON/OFF
-    option(BEAST_ENHANCED_LOGGING "Include file and line numbers in log messages" ON)
+option(BEAST_ENHANCED_LOGGING "Include file and line numbers in log messages (auto: Debug=ON, Release=OFF)" OFF)
-else()
+message(STATUS "BEAST_ENHANCED_LOGGING option: ${BEAST_ENHANCED_LOGGING}")
-    option(BEAST_ENHANCED_LOGGING "Include file and line numbers in log messages" OFF)
-endif()
-
-if(BEAST_ENHANCED_LOGGING)
-    add_definitions(-DBEAST_ENHANCED_LOGGING=1)
-    message(STATUS "Log line numbers enabled")
-else()
-    message(STATUS "Log line numbers disabled")
-endif()
 
 if(thread_safety_analysis)
   add_compile_options(-Wthread-safety -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS -DRIPPLE_ENABLE_THREAD_SAFETY_ANNOTATIONS)

release-builder.sh

@@ -192,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 /hbb_exe/activate-exec bash -c "ccache -M 10G && \
+RUN /hbb_exe/activate-exec bash -c "ccache -M 100G && \
     ccache -o cache_dir=/cache/ccache && \
     ccache -o compiler_check=content && \
     mkdir -p ~/.conan2 /cache/conan2 /cache/conan2_download /cache/conan2_sources && \

src/ripple/app/hook/Enum.h

@@ -367,90 +367,110 @@ const uint8_t max_emit = 255;
 const uint8_t max_params = 16;
 const double fee_base_multiplier = 1.1f;
 
+#define I32 0x7FU
+#define I64 0x7EU
+
+#define HOOK_WRAP_PARAMS(...) __VA_ARGS__
+#define HOOK_API_DEFINITION(RETURN_TYPE, FUNCTION_NAME, PARAMS_TUPLE) \
+    {                                                                 \
+#FUNCTION_NAME,                                               \
+        {                                                             \
+            RETURN_TYPE, HOOK_WRAP_PARAMS PARAMS_TUPLE                \
+        }                                                             \
+    }
+
+using APIWhitelist = std::map<std::string, std::vector<uint8_t>>;
+
 // RH NOTE: Find descriptions of api functions in ./impl/applyHook.cpp and
 // hookapi.h (include for hooks) this is a map of the api name to its return
 // code (vec[0] and its parameters vec[>0]) as wasm type codes
-static const std::map<std::string, std::vector<uint8_t>> import_whitelist{
+static const APIWhitelist import_whitelist{
-    {"_g", {0x7FU, 0x7FU, 0x7FU}},
+    // clang-format off
-    {"accept", {0x7EU, 0x7FU, 0x7FU, 0x7EU}},
+    HOOK_API_DEFINITION(I32, _g, (I32, I32)),
-    {"rollback", {0x7EU, 0x7FU, 0x7FU, 0x7EU}},
+    HOOK_API_DEFINITION(I64, accept, (I32, I32, I64)),
-    {"util_raddr", {0x7EU, 0x7FU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, rollback, (I32, I32, I64)),
-    {"util_accid", {0x7EU, 0x7FU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, util_raddr, (I32, I32, I32, I32)),
-    {"util_verify", {0x7EU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, util_accid, (I32, I32, I32, I32)),
-    {"util_sha512h", {0x7EU, 0x7FU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, util_verify, (I32, I32, I32, I32, I32, I32)),
-    {"util_keylet",
+    HOOK_API_DEFINITION(I64, util_sha512h, (I32, I32, I32, I32)),
-     {0x7EU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, util_keylet, (I32, I32, I32, I32, I32, I32, I32, I32, I32)),
-    {"sto_validate", {0x7EU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, sto_validate, (I32, I32)),
-    {"sto_subfield", {0x7EU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, sto_subfield, (I32, I32, I32)),
-    {"sto_subarray", {0x7EU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, sto_subarray, (I32, I32, I32)),
-    {"sto_emplace", {0x7EU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, sto_emplace, (I32, I32, I32, I32, I32, I32, I32)),
-    {"sto_erase", {0x7EU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, sto_erase, (I32, I32, I32, I32, I32)),
-    {"etxn_burden", {0x7EU}},
+    HOOK_API_DEFINITION(I64, etxn_burden, ()),
-    {"etxn_details", {0x7EU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, etxn_details, (I32, I32)),
-    {"etxn_fee_base", {0x7EU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, etxn_fee_base, (I32, I32)),
-    {"etxn_reserve", {0x7EU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, etxn_reserve, (I32)),
-    {"etxn_generation", {0x7EU}},
+    HOOK_API_DEFINITION(I64, etxn_generation, ()),
-    {"etxn_nonce", {0x7EU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, etxn_nonce, (I32, I32)),
-    {"emit", {0x7EU, 0x7FU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, emit, (I32, I32, I32, I32)),
-    {"float_set", {0x7EU, 0x7FU, 0x7EU}},
+    HOOK_API_DEFINITION(I64, float_set, (I32, I64)),
-    {"float_multiply", {0x7EU, 0x7EU, 0x7EU}},
+    HOOK_API_DEFINITION(I64, float_multiply, (I64, I64)),
-    {"float_mulratio", {0x7EU, 0x7EU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, float_mulratio, (I64, I32, I32, I32)),
-    {"float_negate", {0x7EU, 0x7EU}},
+    HOOK_API_DEFINITION(I64, float_negate, (I64)),
-    {"float_compare", {0x7EU, 0x7EU, 0x7EU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, float_compare, (I64, I64, I32)),
-    {"float_sum", {0x7EU, 0x7EU, 0x7EU}},
+    HOOK_API_DEFINITION(I64, float_sum, (I64, I64)),
-    {"float_sto",
+    HOOK_API_DEFINITION(I64, float_sto, (I32, I32, I32, I32, I32, I32, I64, I32)),
-     {0x7EU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7EU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, float_sto_set, (I32, I32)),
-    {"float_sto_set", {0x7EU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, float_invert, (I64)),
-    {"float_invert", {0x7EU, 0x7EU}},
+    HOOK_API_DEFINITION(I64, float_divide, (I64, I64)),
-    {"float_divide", {0x7EU, 0x7EU, 0x7EU}},
+    HOOK_API_DEFINITION(I64, float_one, ()),
-    {"float_one", {0x7EU}},
+    HOOK_API_DEFINITION(I64, float_mantissa, (I64)),
-    {"float_mantissa", {0x7EU, 0x7EU}},
+    HOOK_API_DEFINITION(I64, float_sign, (I64)),
-    {"float_sign", {0x7EU, 0x7EU}},
+    HOOK_API_DEFINITION(I64, float_int, (I64, I32, I32)),
-    {"float_int", {0x7EU, 0x7EU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, float_log, (I64)),
-    {"float_log", {0x7EU, 0x7EU}},
+    HOOK_API_DEFINITION(I64, float_root, (I64, I32)),
-    {"float_root", {0x7EU, 0x7EU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, fee_base, ()),
-    {"fee_base", {0x7EU}},
+    HOOK_API_DEFINITION(I64, ledger_seq, ()),
-    {"ledger_seq", {0x7EU}},
+    HOOK_API_DEFINITION(I64, ledger_last_time, ()),
-    {"ledger_last_time", {0x7EU}},
+    HOOK_API_DEFINITION(I64, ledger_last_hash, (I32, I32)),
-    {"ledger_last_hash", {0x7EU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, ledger_nonce, (I32, I32)),
-    {"ledger_nonce", {0x7EU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, ledger_keylet, (I32, I32, I32, I32, I32, I32)),
-    {"ledger_keylet", {0x7EU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, hook_account, (I32, I32)),
-    {"hook_account", {0x7EU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, hook_hash, (I32, I32, I32)),
-    {"hook_hash", {0x7EU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, hook_param_set, (I32, I32, I32, I32, I32, I32)),
-    {"hook_param_set", {0x7EU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, hook_param, (I32, I32, I32, I32)),
-    {"hook_param", {0x7EU, 0x7FU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, hook_again, ()),
-    {"hook_again", {0x7EU}},
+    HOOK_API_DEFINITION(I64, hook_skip, (I32, I32, I32)),
-    {"hook_skip", {0x7EU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, hook_pos, ()),
-    {"hook_pos", {0x7EU}},
+    HOOK_API_DEFINITION(I64, slot, (I32, I32, I32)),
-    {"slot", {0x7EU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, slot_clear, (I32)),
-    {"slot_clear", {0x7EU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, slot_count, (I32)),
-    {"slot_count", {0x7EU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, slot_set, (I32, I32, I32)),
-    {"slot_set", {0x7EU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, slot_size, (I32)),
-    {"slot_size", {0x7EU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, slot_subarray, (I32, I32, I32)),
-    {"slot_subarray", {0x7EU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, slot_subfield, (I32, I32, I32)),
-    {"slot_subfield", {0x7EU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, slot_type, (I32, I32)),
-    {"slot_type", {0x7EU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, slot_float, (I32)),
-    {"slot_float", {0x7EU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, state_set, (I32, I32, I32, I32)),
-    {"state_set", {0x7EU, 0x7FU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, state_foreign_set, (I32, I32, I32, I32, I32, I32, I32, I32)),
-    {"state_foreign_set",
+    HOOK_API_DEFINITION(I64, state, (I32, I32, I32, I32)),
-     {0x7EU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, state_foreign, (I32, I32, I32, I32, I32, I32, I32, I32)),
-    {"state", {0x7EU, 0x7FU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, trace, (I32, I32, I32, I32, I32)),
-    {"state_foreign",
+    HOOK_API_DEFINITION(I64, trace_num, (I32, I32, I64)),
-     {0x7EU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, trace_float, (I32, I32, I64)),
-    {"trace", {0x7EU, 0x7FU, 0x7FU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, otxn_burden, ()),
-    {"trace_num", {0x7EU, 0x7FU, 0x7FU, 0x7EU}},
+    HOOK_API_DEFINITION(I64, otxn_field, (I32, I32, I32)),
-    {"trace_float", {0x7EU, 0x7FU, 0x7FU, 0x7EU}},
+    HOOK_API_DEFINITION(I64, otxn_generation, ()),
-    {"otxn_burden", {0x7EU}},
+    HOOK_API_DEFINITION(I64, otxn_id, (I32, I32, I32)),
-    {"otxn_field", {0x7EU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, otxn_type, ()),
-    {"otxn_generation", {0x7EU}},
+    HOOK_API_DEFINITION(I64, otxn_slot, (I32)),
-    {"otxn_id", {0x7EU, 0x7FU, 0x7FU, 0x7FU}},
+    HOOK_API_DEFINITION(I64, otxn_param, (I32, I32, I32, I32)),
-    {"otxn_type", {0x7EU}},
+    HOOK_API_DEFINITION(I64, meta_slot, (I32)),
-    {"otxn_slot", {0x7EU, 0x7FU}},
+    // clang-format on
-    {"otxn_param", {0x7EU, 0x7FU, 0x7FU, 0x7FU, 0x7FU}},
+};
-    {"meta_slot", {0x7EU, 0x7FU}}};
 
 // featureHooks1
-static const std::map<std::string, std::vector<uint8_t>> import_whitelist_1{
+static const APIWhitelist import_whitelist_1{
-    {"xpop_slot", {0x7EU, 0x7FU, 0x7FU}}};
+    // clang-format off
+    HOOK_API_DEFINITION(I64, xpop_slot, (I32, I32)),
+    // clang-format on
+};
+
+#undef HOOK_API_DEFINITION
+#undef I32
+#undef I64
 };  // namespace hook_api
 #endif

src/ripple/app/misc/impl/Manifest.cpp

@@ -471,6 +471,10 @@ ManifestCache::applyManifest(Manifest m)
 
         auto masterKey = m.masterKey;
         map_.emplace(std::move(masterKey), std::move(m));
+
+        // Increment sequence to invalidate cached manifest messages
+        seq_++;
+
         return ManifestDisposition::accepted;
     }
 

src/ripple/basics/impl/Log.cpp

@@ -360,7 +360,8 @@ Logs::format(
     if (!partition.empty())
     {
 #ifdef BEAST_ENHANCED_LOGGING
-        output += beast::detail::get_log_highlight_color();
+        if (beast::detail::should_log_use_colors())
+            output += beast::detail::get_log_highlight_color();
 #endif
         output += partition + ":";
     }
@@ -392,7 +393,8 @@ Logs::format(
     }
 
 #ifdef BEAST_ENHANCED_LOGGING
-    output += "\033[0m";
+    if (beast::detail::should_log_use_colors())
+        output += "\033[0m";
 #endif
 
     output += message;

src/ripple/beast/utility/EnhancedLogging.h

@@ -41,6 +41,14 @@ get_log_highlight_color();
 constexpr const char*
 strip_source_root(const char* file)
 {
+    // Handle relative paths from build/ directory (common with ccache)
+    // e.g., "../src/ripple/..." -> "ripple/..."
+    if (file && file[0] == '.' && file[1] == '.' && file[2] == '/' &&
+        file[3] == 's' && file[4] == 'r' && file[5] == 'c' && file[6] == '/')
+    {
+        return file + 7;  // skip "../src/"
+    }
+
 #ifdef SOURCE_ROOT_PATH
     constexpr const char* sourceRoot = SOURCE_ROOT_PATH;
     constexpr auto strlen_constexpr = [](const char* s) constexpr

src/ripple/beast/utility/src/beast_EnhancedLogging.cpp

@@ -17,6 +17,8 @@
 */
 //==============================================================================
 
+#ifdef BEAST_ENHANCED_LOGGING
+
 #include <ripple/beast/utility/EnhancedLogging.h>
 #include <cstdlib>
 #include <cstring>
@@ -112,3 +114,5 @@ log_write_location_string(std::ostream& os, const char* file, int line)
 
 }  // namespace detail
 }  // namespace beast
+
+#endif  // BEAST_ENHANCED_LOGGING

src/ripple/beast/utility/src/beast_Journal.cpp

@@ -155,14 +155,43 @@ Journal::ScopedStream::~ScopedStream()
 
 #ifdef BEAST_ENHANCED_LOGGING
     // Add suffix if location is enabled
-    if (file_ && detail::should_show_location() && !s.empty() && s != "\n")
+    if (file_ && detail::should_show_location() && !s.empty())
     {
-        std::ostringstream combined;
+        // Single optimized scan from the end
-        combined << s;
+        size_t const lastNonWhitespace = s.find_last_not_of(" \n\r\t");
-        if (!s.empty() && s.back() != ' ')
+
-            combined << " ";
+        // Skip if message is only whitespace (e.g., just "\n" or "  \n\n")
-        detail::log_write_location_string(combined, file_, line_);
+        if (lastNonWhitespace != std::string::npos)
-        s = combined.str();
+        {
+            // Count only the trailing newlines (tiny range)
+            size_t trailingNewlines = 0;
+            for (size_t i = lastNonWhitespace + 1; i < s.length(); ++i)
+            {
+                if (s[i] == '\n')
+                    ++trailingNewlines;
+            }
+
+            // Build location string once
+            std::ostringstream locStream;
+            detail::log_write_location_string(locStream, file_, line_);
+            std::string const location = locStream.str();
+
+            // Pre-allocate exact size → zero reallocations
+            size_t const finalSize = lastNonWhitespace + 1 + 1 +
+                location.length() + trailingNewlines;
+
+            std::string result;
+            result.reserve(finalSize);
+
+            // Direct string ops (no ostringstream overhead)
+            result.append(s, 0, lastNonWhitespace + 1);
+            result.push_back(' ');
+            result += location;
+            if (trailingNewlines > 0)
+                result.append(trailingNewlines, '\n');
+
+            s = std::move(result);  // Move, no copy
+        }
     }
 #endif
 

src/ripple/overlay/impl/OverlayImpl.cpp

@@ -484,44 +484,61 @@ OverlayImpl::start()
     m_peerFinder->setConfig(config);
     m_peerFinder->start();
 
-    auto addIps = [&](std::vector<std::string> bootstrapIps) -> void {
+    auto addIps = [this](std::vector<std::string> ips, bool fixed) {
         beast::Journal const& j = app_.journal("Overlay");
-        for (auto& ip : bootstrapIps)
+        for (auto& ip : ips)
         {
             std::size_t pos = ip.find('#');
             if (pos != std::string::npos)
                 ip.erase(pos);
 
-            JLOG(j.trace()) << "Found boostrap IP: " << ip;
+            JLOG(j.trace())
+                << "Found " << (fixed ? "fixed" : "bootstrap") << " IP: " << ip;
         }
 
         m_resolver.resolve(
-            bootstrapIps,
+            ips,
-            [&](std::string const& name,
+            [this, fixed](
+                std::string const& name,
                 std::vector<beast::IP::Endpoint> const& addresses) {
-                std::vector<std::string> ips;
-                ips.reserve(addresses.size());
                 beast::Journal const& j = app_.journal("Overlay");
+                std::string const base("config: ");
+
+                std::vector<beast::IP::Endpoint> eps;
+                eps.reserve(addresses.size());
                 for (auto const& addr : addresses)
                 {
-                    std::string addrStr = addr.port() == 0
+                    auto ep = addr.port() == 0 ? addr.at_port(DEFAULT_PEER_PORT)
-                        ? to_string(addr.at_port(DEFAULT_PEER_PORT))
+                                               : addr;
-                        : to_string(addr);
+                    JLOG(j.trace())
-                    JLOG(j.trace()) << "Parsed boostrap IP: " << addrStr;
+                        << "Parsed " << (fixed ? "fixed" : "bootstrap")
-                    ips.push_back(addrStr);
+                        << " IP: " << ep;
+                    eps.push_back(ep);
                 }
 
-                std::string const base("config: ");
+                if (eps.empty())
-                if (!ips.empty())
+                    return;
-                    m_peerFinder->addFallbackStrings(base + name, ips);
+
+                if (fixed)
+                {
+                    m_peerFinder->addFixedPeer(base + name, eps);
+                }
+                else
+                {
+                    std::vector<std::string> strs;
+                    strs.reserve(eps.size());
+                    for (auto const& ep : eps)
+                        strs.push_back(to_string(ep));
+                    m_peerFinder->addFallbackStrings(base + name, strs);
+                }
             });
     };
 
     if (!app_.config().IPS.empty())
-        addIps(app_.config().IPS);
+        addIps(app_.config().IPS, false);
 
     if (!app_.config().IPS_FIXED.empty())
-        addIps(app_.config().IPS_FIXED);
+        addIps(app_.config().IPS_FIXED, true);
 
     auto const timer = std::make_shared<Timer>(*this);
     std::lock_guard lock(mutex_);