Merge branch 'dev' into self-hosted

This reverts commit c42cb0df62.

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

@@ -75,17 +75,37 @@ 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.gha_cache_enabled == 'true' && 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.gha_cache_enabled == 'true' && 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-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
+        mkdir -p ~/.ccache-main ~/.ccache-current
 
         # Keep config separate from cache_dir so configs aren't swapped when CCACHE_DIR changes between steps
         mkdir -p ~/.config/ccache
@@ -96,9 +116,20 @@ runs:
         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"
-        echo "CCACHE_DIR=$HOME/.ccache-cache" >> $GITHUB_ENV
-        echo "📦 using ~/.ccache-cache as ccache cache directory"
+
+        # Determine if we're on the main branch
+        if [ "${{ steps.safe-branch.outputs.name }}" = "${{ inputs.main_branch }}" ]; then
+          # 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 ==="
@@ -213,3 +244,17 @@ runs:
       if: inputs.ccache_enabled == 'true'
       shell: bash
       run: ccache -s
+
+    - name: Save ccache directory for main branch
+      if: success() && inputs.gha_cache_enabled == 'true' && 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.gha_cache_enabled == 'true' && 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,6 +17,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'
   main_branch:
     description: 'Main branch name for restore keys'
     required: false
@@ -59,14 +63,18 @@ outputs:
 runs:
   using: 'composite'
   steps:
-    - name: Configure Conan cache paths
-      if: inputs.os == 'Linux'
-      shell: bash
-      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: Restore Conan cache
+      if: inputs.gha_cache_enabled == 'true'
+      id: cache-restore-conan
+      uses: ./.github/actions/xahau-ga-cache-restore
+      with:
+        path: ~/.conan2
+        # Note: compiler-id format is compiler-version-stdlib[-gccversion]
+        key: ${{ runner.os }}-conan-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-${{ hashFiles('**/conanfile.py') }}-${{ inputs.configuration }}
+        restore-keys: |
+          ${{ runner.os }}-conan-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-${{ hashFiles('**/conanfile.py') }}-
+          ${{ runner.os }}-conan-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-
+        cache-type: Conan
 
     - name: Configure Conan cache paths
       if: inputs.gha_cache_enabled == 'false'
@@ -153,3 +161,10 @@ runs:
           --build missing \
           --settings build_type=${{ inputs.configuration }} \
           ..
+
+    - name: Save Conan cache
+      if: success() && inputs.gha_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/xahau-ga-macos.yml

@@ -20,7 +20,7 @@ jobs:
           - Ninja
         configuration:
           - Debug
-    runs-on: [self-hosted, macOS]
+    runs-on: macos-15
     env:
       build_dir: .build
       # Bump this number to invalidate all caches globally.
@@ -30,29 +30,61 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Add Homebrew to PATH
+      - 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 Conan
         run: |
-          echo "/opt/homebrew/bin" >> "$GITHUB_PATH"
-          echo "/opt/homebrew/sbin" >> "$GITHUB_PATH"
+          brew install conan
+          # Verify Conan 2 is installed
+          conan --version
 
       - name: Install Coreutils
         run: |
           brew install coreutils
           echo "Num proc: $(nproc)"
 
-      # To isolate environments for each Runner, instead of installing globally with brew, 
-      # use mise to isolate environments for each Runner directory.
-      - name: Setup toolchain (mise)
-        uses: jdx/mise-action@v2
-        with:
-          install: true
+      - name: Install Ninja
+        if: matrix.generator == 'Ninja'
+        run: brew install ninja
 
-      - name: Install tools via mise
+      - name: Install Python
         run: |
-          mise install
-          mise use cmake@3.23.1 python@3.12 pipx@latest conan@2 ninja@latest ccache@latest
-          mise reshim
-          echo "$HOME/.local/share/mise/shims" >> "$GITHUB_PATH"
+          if which python3 > /dev/null 2>&1; then
+              echo "Python 3 executable exists"
+              python3 --version
+          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: |
@@ -66,14 +98,6 @@ 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: |
@@ -105,7 +129,6 @@ 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

@@ -181,7 +181,8 @@ jobs:
       image: ubuntu:24.04
       volumes:
         - /home/runner/.conan-cache:/.conan-cache
-        - /home/runner/.ccache-cache:/github/home/.ccache-cache
+        - /home/runner/.ccache-main:/github/home/.ccache-main
+        - /home/runner/.ccache-current:/github/home/.ccache-current
     defaults:
       run:
         shell: bash
@@ -324,6 +325,7 @@ jobs:
           main_branch: ${{ env.MAIN_BRANCH_NAME }}
           stdlib: ${{ matrix.stdlib }}
           clang_gcc_toolchain: ${{ matrix.clang_gcc_toolchain || '' }}
+          gha_cache_enabled: 'false' # Disable caching for self hosted runner
           ccache_max_size: '100G'
 
       - name: Set artifact name

Builds/CMake/RippledCore.cmake

@@ -48,9 +48,13 @@ 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
-  # Enhanced logging - compiles to empty when BEAST_ENHANCED_LOGGING is not defined
-  src/ripple/beast/utility/src/beast_EnhancedLogging.cpp)
+  src/ripple/beast/utility/src/beast_PropertyStream.cpp)
+
+# Conditionally add enhanced logging source when BEAST_ENHANCED_LOGGING is enabled
+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
@@ -158,16 +162,12 @@ target_link_libraries (xrpl_core
     date::date
     Ripple::opts)
 
-# date-tz for enhanced logging (always linked, code is #ifdef guarded)
-if(TARGET date::date-tz)
-  target_link_libraries(xrpl_core PUBLIC date::date-tz)
+# Link date-tz library when enhanced logging is enabled
+if(DEFINED BEAST_ENHANCED_LOGGING AND BEAST_ENHANCED_LOGGING)
+  if(TARGET 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,11 +37,20 @@ endif() #git
 set(SOURCE_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/")
 add_definitions(-DSOURCE_ROOT_PATH="${SOURCE_ROOT_PATH}")
 
-# BEAST_ENHANCED_LOGGING - adds file:line numbers and formatting to logs
-# Automatically enabled for Debug builds via generator expression
-# Can be explicitly controlled with -DBEAST_ENHANCED_LOGGING=ON/OFF
-option(BEAST_ENHANCED_LOGGING "Include file and line numbers in log messages (auto: Debug=ON, Release=OFF)" OFF)
-message(STATUS "BEAST_ENHANCED_LOGGING option: ${BEAST_ENHANCED_LOGGING}")
+# BEAST_ENHANCED_LOGGING option - adds file:line numbers and formatting to logs
+# Default to ON for Debug builds, OFF for Release
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    option(BEAST_ENHANCED_LOGGING "Include file and line numbers in log messages" ON)
+else()
+    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 100G && \
+RUN /hbb_exe/activate-exec bash -c "ccache -M 10G && \
     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/misc/impl/Manifest.cpp

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

src/ripple/beast/utility/EnhancedLogging.h

@@ -41,14 +41,6 @@ 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,8 +17,6 @@
 */
 //==============================================================================
 
-#ifdef BEAST_ENHANCED_LOGGING
-
 #include <ripple/beast/utility/EnhancedLogging.h>
 #include <cstdlib>
 #include <cstring>
@@ -114,5 +112,3 @@ 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,43 +155,14 @@ Journal::ScopedStream::~ScopedStream()
 
 #ifdef BEAST_ENHANCED_LOGGING
     // Add suffix if location is enabled
-    if (file_ && detail::should_show_location() && !s.empty())
+    if (file_ && detail::should_show_location() && !s.empty() && s != "\n")
     {
-        // Single optimized scan from the end
-        size_t const lastNonWhitespace = s.find_last_not_of(" \n\r\t");
-
-        // Skip if message is only whitespace (e.g., just "\n" or "  \n\n")
-        if (lastNonWhitespace != std::string::npos)
-        {
-            // 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
-        }
+        std::ostringstream combined;
+        combined << s;
+        if (!s.empty() && s.back() != ' ')
+            combined << " ";
+        detail::log_write_location_string(combined, file_, line_);
+        s = combined.str();
     }
 #endif
 

src/ripple/overlay/impl/OverlayImpl.cpp

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