Merge remote-tracking branch 'upstream/dev' into self-hosted-macos

This reverts commit 786e7575f7.

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

@@ -134,17 +134,10 @@ runs:
     - name: Export custom recipes
       shell: bash
       run: |
-        # Export snappy if not already exported
-        conan list snappy/1.1.10@xahaud/stable 2>/dev/null | (grep -q "not found" && exit 1 || exit 0) || \
-          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
+        conan export external/snappy --version 1.1.10 --user xahaud --channel stable
+        conan export external/soci --version 4.0.3 --user xahaud --channel stable
+        conan export external/wasmedge --version 0.11.2 --user xahaud --channel stable
+
     - name: Install dependencies
       shell: bash
       env:

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)

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