Merge branch 'dev' into nd-use-github-actions-cache-with-bug-fixes-from-s3-implementation-2025-11-24

The matrix-setup job was using github.event.head_commit.message which
is empty for PR events. Now fetches via API using the PR head SHA.

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

@@ -20,7 +20,7 @@ jobs:
           - Ninja
         configuration:
           - Debug
-    runs-on: macos-15
+    runs-on: macos-15-xlarge
     env:
       build_dir: .build
       # Bump this number to invalidate all caches globally.

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

@@ -19,14 +19,6 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - name: escape double quotes
-        id: escape
-        shell: bash
-        env:
-          PR_TITLE: ${{ github.event.pull_request.title }}
-        run: |
-          ESCAPED_PR_TITLE="${PR_TITLE//\"/\\\"}"
-          echo "title=${ESCAPED_PR_TITLE}" >> "$GITHUB_OUTPUT"
       - name: Generate build matrix
         id: set-matrix
         shell: python
@@ -110,7 +102,7 @@ jobs:
           ref = "${{ github.ref }}"
           base_ref = "${{ github.base_ref }}"  # For PRs, this is the target branch
           event_name = "${{ github.event_name }}"
-          pr_title = """${{ steps.escape.outputs.title }}"""
+          pr_title = """${{ github.event.pull_request.title }}"""
           pr_head_sha = "${{ github.event.pull_request.head.sha }}"
 
           # Get commit message - for PRs, fetch via API since head_commit.message is empty

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())
+            JLOG(j.trace()) << "Found boostrap IP: " << ip;
-                << "Found " << (fixed ? "fixed" : "bootstrap") << " IP: " << ip;
         }
 
         m_resolver.resolve(
-            ips,
+            bootstrapIps,
-            [this, fixed](
+            [&](std::string const& name,
-                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)
+                    std::string addrStr = addr.port() == 0
-                                               : addr;
+                        ? to_string(addr.at_port(DEFAULT_PEER_PORT))
-                    JLOG(j.trace())
+                        : to_string(addr);
-                        << "Parsed " << (fixed ? "fixed" : "bootstrap")
+                    JLOG(j.trace()) << "Parsed boostrap IP: " << addrStr;
-                        << " IP: " << ep;
+                    ips.push_back(addrStr);
-                    eps.push_back(ep);
                 }
 
-                if (eps.empty())
+                std::string const base("config: ");
-                    return;
+                if (!ips.empty())
-
+                    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, 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_);