Merge branch 'dev' into nd-allow-multi-threaded-writes-to-suite-log-2025-08-15

std::endl triggers flush() which calls sync() on the shared log buffer.
Multiple threads racing in sync() cause str()/str("") operations to
corrupt buffer state, leading to crashes and double frees.

Added mutex to serialize access to suite.log, preventing concurrent
sync() calls on the same buffer.

.github/actions/xahau-configure-ccache/action.yml

@@ -14,18 +14,6 @@ inputs:
     description: 'How to check compiler for changes'
     required: false
     default: 'content'
-  is_main_branch:
-    description: 'Whether the current branch is the main branch'
-    required: false
-    default: 'false'
-  main_cache_dir:
-    description: 'Path to the main branch cache directory'
-    required: false
-    default: '~/.ccache-main'
-  current_cache_dir:
-    description: 'Path to the current branch cache directory'
-    required: false
-    default: '~/.ccache-current'
 
 runs:
   using: 'composite'
@@ -33,31 +21,11 @@ runs:
     - name: Configure ccache
       shell: bash
       run: |
-        # Create cache directories
-        mkdir -p ${{ inputs.main_cache_dir }} ${{ inputs.current_cache_dir }}
-        
-        # Set compiler check globally
-        ccache -o compiler_check=${{ inputs.compiler_check }}
-        
-        # Use a single config file location
         mkdir -p ~/.ccache
-        export CONF_PATH="$HOME/.ccache/ccache.conf"
-        
-        # Apply common settings
+        export CONF_PATH="${CCACHE_CONFIGPATH:-${CCACHE_DIR:-$HOME/.ccache}/ccache.conf}"
+        mkdir -p $(dirname "$CONF_PATH")
         echo "max_size = ${{ inputs.max_size }}" > "$CONF_PATH"
         echo "hash_dir = ${{ inputs.hash_dir }}" >> "$CONF_PATH"
         echo "compiler_check = ${{ inputs.compiler_check }}" >> "$CONF_PATH"
-        
-        if [ "${{ inputs.is_main_branch }}" == "true" ]; then
-          # Main branch: use main branch cache
-          ccache --set-config=cache_dir="${{ inputs.main_cache_dir }}"
-          echo "CCACHE_DIR=${{ inputs.main_cache_dir }}" >> $GITHUB_ENV
-        else
-          # Feature branch: use current branch cache with main as secondary
-          ccache --set-config=cache_dir="${{ inputs.current_cache_dir }}"
-          ccache --set-config=secondary_storage="file:${{ inputs.main_cache_dir }}"
-          echo "CCACHE_DIR=${{ inputs.current_cache_dir }}" >> $GITHUB_ENV
-        fi
-        
         ccache -p # Print config for verification
         ccache -z # Zero statistics before the build

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

@@ -48,23 +48,12 @@ runs:
         SAFE_BRANCH=$(echo "${{ github.ref_name }}" | tr -c 'a-zA-Z0-9_.-' '-')
         echo "name=${SAFE_BRANCH}" >> $GITHUB_OUTPUT
 
-    - name: Restore ccache directory for default branch
+    - name: Restore ccache directory
       if: inputs.ccache_enabled == 'true'
       id: ccache-restore
       uses: actions/cache/restore@v4
       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 }}-
-
-    - 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: actions/cache/restore@v4
-      with:
-        path: ~/.ccache-current
+        path: ~/.ccache
         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 }}
@@ -86,7 +75,6 @@ runs:
           export CXX="${{ inputs.cxx }}"
         fi
         
-        
         # Configure ccache launcher args
         CCACHE_ARGS=""
         if [ "${{ inputs.ccache_enabled }}" = "true" ]; then
@@ -94,10 +82,6 @@ runs:
         fi
         
         # Run CMake configure
-        # Note: conanfile.py hardcodes 'build/generators' as the output path.
-        # If we're in a 'build' folder, Conan detects this and uses just 'generators/'
-        # If we're in '.build' (non-standard), Conan adds the full 'build/generators/'
-        # So we get: .build/build/generators/ with our non-standard folder name
         cmake .. \
           -G "${{ inputs.generator }}" \
           $CCACHE_ARGS \
@@ -115,16 +99,9 @@ runs:
       shell: bash
       run: ccache -s
 
-    - name: Save ccache directory for default branch
-      if: always() && inputs.ccache_enabled == 'true' && steps.safe-branch.outputs.name == inputs.main_branch
+    - name: Save ccache directory
+      if: inputs.ccache_enabled == 'true'
       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: always() && 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 }}
+        path: ~/.ccache
+        key: ${{ steps.ccache-restore.outputs.cache-primary-key }}

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

@@ -42,26 +42,6 @@ runs:
         SAFE_BRANCH=$(echo "${{ github.ref_name }}" | tr -c 'a-zA-Z0-9_.-' '-')
         echo "name=${SAFE_BRANCH}" >> $GITHUB_OUTPUT
 
-    - name: Check conanfile changes
-      if: inputs.cache_enabled == 'true'
-      id: check-conanfile-changes
-      shell: bash
-      run: |
-        # Check if we're on the main branch
-        if [ "${{ github.ref_name }}" == "${{ inputs.main_branch }}" ]; then
-          echo "should-save-conan-cache=true" >> $GITHUB_OUTPUT
-        else
-          # Fetch main branch for comparison
-          git fetch origin ${{ inputs.main_branch }}
-          
-          # Check if conanfile.txt or conanfile.py has changed compared to main branch
-          if git diff --quiet origin/${{ inputs.main_branch }}..HEAD -- '**/conanfile.txt' '**/conanfile.py'; then
-            echo "should-save-conan-cache=false" >> $GITHUB_OUTPUT
-          else
-            echo "should-save-conan-cache=true" >> $GITHUB_OUTPUT
-          fi
-        fi
-
     - name: Restore Conan cache
       if: inputs.cache_enabled == 'true'
       id: cache-restore-conan
@@ -78,9 +58,8 @@ runs:
     - name: Export custom recipes
       shell: bash
       run: |
-        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
+        conan export external/snappy snappy/1.1.10@xahaud/stable
+        conan export external/soci soci/4.0.3@xahaud/stable
 
     - name: Install dependencies
       shell: bash
@@ -97,7 +76,7 @@ runs:
           ..
 
     - name: Save Conan cache
-      if: always() && inputs.cache_enabled == 'true' && steps.cache-restore-conan.outputs.cache-hit != 'true' && steps.check-conanfile-changes.outputs.should-save-conan-cache == 'true'
+      if: inputs.cache_enabled == 'true' && steps.cache-restore-conan.outputs.cache-hit != 'true'
       uses: actions/cache/save@v4
       with:
         path: |

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

@@ -5,8 +5,6 @@ on:
     branches: ["dev", "candidate", "release"]
   pull_request:
     branches: ["dev", "candidate", "release"]
-  schedule:
-    - cron: '0 0 * * *'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -32,9 +30,9 @@ jobs:
 
       - name: Install Conan
         run: |
-          brew install conan
-          # Verify Conan 2 is installed
-          conan --version
+          brew install conan@1
+          # Add Conan 1 to the PATH for this job
+          echo "$(brew --prefix conan@1)/bin" >> $GITHUB_PATH
 
       - name: Install Coreutils
         run: |
@@ -60,20 +58,12 @@ jobs:
 
       - 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
+          if which cmake > /dev/null 2>&1; then
+              echo "cmake executable exists"
+              cmake --version
+          else
+              brew install cmake
+          fi
 
       - name: Install ccache
         run: brew install ccache
@@ -84,7 +74,6 @@ jobs:
           max_size: 2G
           hash_dir: true
           compiler_check: content
-          is_main_branch: ${{ github.ref_name == env.MAIN_BRANCH_NAME }}
 
       - name: Check environment
         run: |
@@ -100,30 +89,8 @@ jobs:
 
       - name: Configure Conan
         run: |
-          # Create the default profile directory if it doesn't exist
-          mkdir -p ~/.conan2/profiles
-
-          # Detect compiler version
-          COMPILER_VERSION=$(clang --version | grep -oE 'version [0-9]+' | grep -oE '[0-9]+')
-
-          # Create profile with our specific settings
-          cat > ~/.conan2/profiles/default <<EOF
-          [settings]
-          arch=armv8
-          build_type=Release
-          compiler=apple-clang
-          compiler.cppstd=20
-          compiler.libcxx=libc++
-          compiler.version=${COMPILER_VERSION}
-          os=Macos
-
-          [conf]
-          # Workaround for gRPC with newer Apple Clang
-          tools.build:cxxflags=["-Wno-missing-template-arg-list-after-template-kw"]
-          EOF
-
-          # Display profile for verification
-          conan profile show
+          conan profile new default --detect || true # Ignore error if profile exists
+          conan profile update settings.compiler.cppstd=20 default
 
       - name: Install dependencies
         uses: ./.github/actions/xahau-ga-dependencies
@@ -146,4 +113,4 @@ jobs:
 
       - name: Test
         run: |
-          ${{ env.build_dir }}/rippled --unittest --unittest-jobs $(nproc)
+          ${{ env.build_dir }}/rippled --unittest --unittest-jobs $(nproc)

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

@@ -5,8 +5,6 @@ on:
     branches: ["dev", "candidate", "release"]
   pull_request:
     branches: ["dev", "candidate", "release"]
-  schedule:
-    - cron: '0 0 * * *'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -41,8 +39,8 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y ninja-build ${{ matrix.cc }} ${{ matrix.cxx }} ccache
-          # Install Conan 2
-          pip install --upgrade "conan>=2.0"
+          # Install specific Conan version needed
+          pip install --upgrade "conan<2"
 
       - name: Configure ccache
         uses: ./.github/actions/xahau-configure-ccache
@@ -50,34 +48,21 @@ jobs:
           max_size: 2G
           hash_dir: true
           compiler_check: content
-          is_main_branch: ${{ github.ref_name == env.MAIN_BRANCH_NAME }}
 
       - name: Configure Conan
         run: |
-          # Create the default profile directory if it doesn't exist
-          mkdir -p ~/.conan2/profiles
-
-          # Create profile with our specific settings
-          cat > ~/.conan2/profiles/default <<EOF
-          [settings]
-          arch=x86_64
-          build_type=Release
-          compiler=${{ matrix.compiler }}
-          compiler.cppstd=20
-          compiler.libcxx=libstdc++11
-          compiler.version=${{ matrix.compiler_version }}
-          os=Linux
-
-          [buildenv]
-          CC=/usr/bin/${{ matrix.cc }}
-          CXX=/usr/bin/${{ matrix.cxx }}
-
-          [conf]
-          tools.build:compiler_executables={"c": "/usr/bin/${{ matrix.cc }}", "cpp": "/usr/bin/${{ matrix.cxx }}"}
-          EOF
+          conan profile new default --detect || true # Ignore error if profile exists
+          conan profile update settings.compiler.cppstd=20 default
+          conan profile update settings.compiler=${{ matrix.compiler }} default
+          conan profile update settings.compiler.libcxx=libstdc++11 default
+          conan profile update env.CC=/usr/bin/${{ matrix.cc }} default
+          conan profile update env.CXX=/usr/bin/${{ matrix.cxx }} default
+          conan profile update conf.tools.build:compiler_executables='{"c": "/usr/bin/${{ matrix.cc }}", "cpp": "/usr/bin/${{ matrix.cxx }}"}' default
 
+          # Set compiler version from matrix
+          conan profile update settings.compiler.version=${{ matrix.compiler_version }} default
           # Display profile for verification
-          conan profile show
+          conan profile show default
 
       - name: Check environment
         run: |

BUILD.md

@@ -33,7 +33,7 @@ git checkout develop
 ## Minimum Requirements
 
 - [Python 3.7](https://www.python.org/downloads/)
-- [Conan 2.x](https://conan.io/downloads)
+- [Conan 1.55](https://conan.io/downloads.html)
 - [CMake 3.16](https://cmake.org/download/)
 
 `rippled` is written in the C++20 dialect and includes the `<concepts>` header.
@@ -65,24 +65,13 @@ can't build earlier Boost versions.
 1. (Optional) If you've never used Conan, use autodetect to set up a default profile.
 
    ```
-   conan profile detect --force
+   conan profile new default --detect
    ```
 
 2. Update the compiler settings.
 
-   For Conan 2, you can edit the profile directly at `~/.conan2/profiles/default`,
-   or use the Conan CLI. Ensure C++20 is set:
-
    ```
-   conan profile show
-   ```
-
-   Look for `compiler.cppstd=20` in the output. If it's not set, edit the profile:
-
-   ```
-   # Edit ~/.conan2/profiles/default and ensure these settings exist:
-   [settings]
-   compiler.cppstd=20
+   conan profile update settings.compiler.cppstd=20 default
    ```
 
    Linux developers will commonly have a default Conan [profile][] that compiles
@@ -91,9 +80,7 @@ can't build earlier Boost versions.
    then you will need to choose the `libstdc++11` ABI.
 
    ```
-   # In ~/.conan2/profiles/default, ensure:
-   [settings]
-   compiler.libcxx=libstdc++11
+   conan profile update settings.compiler.libcxx=libstdc++11 default
    ```
 
    On Windows, you should use the x64 native build tools.
@@ -104,9 +91,7 @@ can't build earlier Boost versions.
    architecture.
 
    ```
-   # In ~/.conan2/profiles/default, ensure:
-   [settings]
-   arch=x86_64
+   conan profile update settings.arch=x86_64 default
    ```
 
 3. (Optional) If you have multiple compilers installed on your platform,
@@ -115,18 +100,16 @@ can't build earlier Boost versions.
    in the generated CMake toolchain file.
 
    ```
-   # In ~/.conan2/profiles/default, add under [conf] section:
-   [conf]
-   tools.build:compiler_executables={"c": "<path>", "cpp": "<path>"}
+   conan profile update 'conf.tools.build:compiler_executables={"c": "<path>", "cpp": "<path>"}' default
    ```
 
-   For setting environment variables for dependencies:
+   It should choose the compiler for dependencies as well,
+   but not all of them have a Conan recipe that respects this setting (yet).
+   For the rest, you can set these environment variables:
 
    ```
-   # In ~/.conan2/profiles/default, add under [buildenv] section:
-   [buildenv]
-   CC=<path>
-   CXX=<path>
+   conan profile update env.CC=<path> default
+   conan profile update env.CXX=<path> default
    ```
 
 4. Export our [Conan recipe for Snappy](./external/snappy).
@@ -134,20 +117,14 @@ can't build earlier Boost versions.
    which allows you to statically link it with GCC, if you want.
 
    ```
-   conan export external/snappy --version 1.1.10 --user xahaud --channel stable
+   conan export external/snappy snappy/1.1.10@xahaud/stable
    ```
 
 5. Export our [Conan recipe for SOCI](./external/soci).
    It patches their CMake to correctly import its dependencies.
 
    ```
-   conan export external/soci --version 4.0.3 --user xahaud --channel stable
-   ```
-
-6. Export our [Conan recipe for WasmEdge](./external/wasmedge).
-
-   ```
-   conan export external/wasmedge --version 0.11.2 --user xahaud --channel stable
+   conan export external/soci soci/4.0.3@xahaud/stable
    ```
 
 ### Build and Test
@@ -282,26 +259,23 @@ and can be helpful for detecting `#include` omissions.
 If you have trouble building dependencies after changing Conan settings,
 try removing the Conan cache.
 
-For Conan 2:
 ```
-rm -rf ~/.conan2/p
-```
-
-Or clear the entire Conan 2 cache:
-```
-conan cache clean "*"
+rm -rf ~/.conan/data
 ```
 
 
-### macOS compilation with Apple Clang 17+
+### no std::result_of
 
-If you're on macOS with Apple Clang 17 or newer, you need to add a compiler flag to work around a compilation error in gRPC dependencies.
-
-Edit `~/.conan2/profiles/default` and add under the `[conf]` section:
+If your compiler version is recent enough to have removed `std::result_of` as
+part of C++20, e.g. Apple Clang 15.0, then you might need to add a preprocessor
+definition to your build.
 
 ```
-[conf]
-tools.build:cxxflags=["-Wno-missing-template-arg-list-after-template-kw"]
+conan profile update 'options.boost:extra_b2_flags="define=BOOST_ASIO_HAS_STD_INVOKE_RESULT"' default
+conan profile update 'env.CFLAGS="-DBOOST_ASIO_HAS_STD_INVOKE_RESULT"' default
+conan profile update 'env.CXXFLAGS="-DBOOST_ASIO_HAS_STD_INVOKE_RESULT"' default
+conan profile update 'conf.tools.build:cflags+=["-DBOOST_ASIO_HAS_STD_INVOKE_RESULT"]' default
+conan profile update 'conf.tools.build:cxxflags+=["-DBOOST_ASIO_HAS_STD_INVOKE_RESULT"]' default
 ```
 
 

build-core.sh

@@ -12,13 +12,6 @@ echo "-- GITHUB_REPOSITORY: $1"
 echo "-- GITHUB_SHA:        $2"
 echo "-- GITHUB_RUN_NUMBER: $4"
 
-# Use mounted filesystem for temp files to avoid container space limits
-export TMPDIR=/io/tmp
-export TEMP=/io/tmp
-export TMP=/io/tmp
-mkdir -p /io/tmp
-echo "=== Using temp directory: /io/tmp ==="
-
 umask 0000;
 
 cd /io/ &&
@@ -50,17 +43,10 @@ export LDFLAGS="-static-libstdc++"
 git config --global --add safe.directory /io &&
 git checkout src/ripple/protocol/impl/BuildInfo.cpp &&
 sed -i s/\"0.0.0\"/\"$(date +%Y).$(date +%-m).$(date +%-d)-$(git rev-parse --abbrev-ref HEAD)$(if [ -n "$4" ]; then echo "+$4"; fi)\"/g src/ripple/protocol/impl/BuildInfo.cpp &&
-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 &&
+conan export external/snappy snappy/1.1.10@xahaud/stable &&
+conan export external/soci soci/4.0.3@xahaud/stable &&
 cd release-build &&
-# 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 &&
+conan install .. --output-folder . --build missing --settings build_type=$BUILD_TYPE &&
 cmake .. -G Ninja \
   -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
   -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake \
@@ -70,13 +56,10 @@ cmake .. -G Ninja \
   -Dxrpld=TRUE \
   -Dtests=TRUE &&
 ccache -z &&
-ninja -j $3 && echo "=== Re-running final link with verbose output ===" && rm -f rippled && ninja -v rippled &&
+ninja -j $3 &&
 ccache -s &&
-strip -s rippled &&
+strip -s rippled &&	
 mv rippled xahaud &&
-echo "=== Full ldd output ===" &&
-ldd xahaud &&
-echo "=== Running libcheck ===" &&
 libcheck xahaud &&
 echo "Build host: `hostname`" > release.info &&
 echo "Build date: `date`" >> release.info &&

conanfile.py

@@ -21,20 +21,22 @@ class Xrpl(ConanFile):
         'static': [True, False],
         'tests': [True, False],
         'unity': [True, False],
-        'with_wasmedge': [True, False],
-        'tool_requires_b2': [True, False],
     }
 
     requires = [
+        'boost/1.86.0',
         'date/3.0.1',
         'libarchive/3.6.0',
-        'lz4/1.9.4',
+        'lz4/1.9.3',
         'grpc/1.50.1',
         'nudb/2.0.8',
         'openssl/1.1.1u',
-        'protobuf/3.21.12',
+        'protobuf/3.21.9',
+        'snappy/1.1.10@xahaud/stable',
         'soci/4.0.3@xahaud/stable',
-        'zlib/1.3.1',
+        'sqlite3/3.42.0',
+        'zlib/1.2.13',
+        'wasmedge/0.11.2',
     ]
 
     default_options = {
@@ -48,44 +50,42 @@ class Xrpl(ConanFile):
         'static': True,
         'tests': True,
         'unity': False,
-        'with_wasmedge': True,
-        'tool_requires_b2': False,
 
-        'cassandra-cpp-driver/*:shared': False,
-        'date/*:header_only': True,
-        'grpc/*:shared': False,
-        'grpc/*:secure': True,
-        'libarchive/*:shared': False,
-        'libarchive/*:with_acl': False,
-        'libarchive/*:with_bzip2': False,
-        'libarchive/*:with_cng': False,
-        'libarchive/*:with_expat': False,
-        'libarchive/*:with_iconv': False,
-        'libarchive/*:with_libxml2': False,
-        'libarchive/*:with_lz4': True,
-        'libarchive/*:with_lzma': False,
-        'libarchive/*:with_lzo': False,
-        'libarchive/*:with_nettle': False,
-        'libarchive/*:with_openssl': False,
-        'libarchive/*:with_pcreposix': False,
-        'libarchive/*:with_xattr': False,
-        'libarchive/*:with_zlib': False,
-        'libpq/*:shared': False,
-        'lz4/*:shared': False,
-        'openssl/*:shared': False,
-        'protobuf/*:shared': False,
-        'protobuf/*:with_zlib': True,
-        'rocksdb/*:enable_sse': False,
-        'rocksdb/*:lite': False,
-        'rocksdb/*:shared': False,
-        'rocksdb/*:use_rtti': True,
-        'rocksdb/*:with_jemalloc': False,
-        'rocksdb/*:with_lz4': True,
-        'rocksdb/*:with_snappy': True,
-        'snappy/*:shared': False,
-        'soci/*:shared': False,
-        'soci/*:with_sqlite3': True,
-        'soci/*:with_boost': True,
+        'cassandra-cpp-driver:shared': False,
+        'date:header_only': True,
+        'grpc:shared': False,
+        'grpc:secure': True,
+        'libarchive:shared': False,
+        'libarchive:with_acl': False,
+        'libarchive:with_bzip2': False,
+        'libarchive:with_cng': False,
+        'libarchive:with_expat': False,
+        'libarchive:with_iconv': False,
+        'libarchive:with_libxml2': False,
+        'libarchive:with_lz4': True,
+        'libarchive:with_lzma': False,
+        'libarchive:with_lzo': False,
+        'libarchive:with_nettle': False,
+        'libarchive:with_openssl': False,
+        'libarchive:with_pcreposix': False,
+        'libarchive:with_xattr': False,
+        'libarchive:with_zlib': False,
+        'libpq:shared': False,
+        'lz4:shared': False,
+        'openssl:shared': False,
+        'protobuf:shared': False,
+        'protobuf:with_zlib': True,
+        'rocksdb:enable_sse': False,
+        'rocksdb:lite': False,
+        'rocksdb:shared': False,
+        'rocksdb:use_rtti': True,
+        'rocksdb:with_jemalloc': False,
+        'rocksdb:with_lz4': True,
+        'rocksdb:with_snappy': True,
+        'snappy:shared': False,
+        'soci:shared': False,
+        'soci:with_sqlite3': True,
+        'soci:with_boost': True,
     }
 
     def set_version(self):
@@ -96,28 +96,11 @@ class Xrpl(ConanFile):
             match = next(m for m in matches if m)
             self.version = match.group(1)
 
-    def build_requirements(self):
-        # These provide build tools (protoc, grpc plugins) that run during build
-        self.tool_requires('protobuf/3.21.12')
-        self.tool_requires('grpc/1.50.1')
-        # Explicitly require b2 (e.g. for building from source for glibc compatibility)
-        if self.options.tool_requires_b2:
-            self.tool_requires('b2/5.3.2')
-
     def configure(self):
         if self.settings.compiler == 'apple-clang':
-            self.options['boost/*'].visibility = 'global'
+            self.options['boost'].visibility = 'global'
 
     def requirements(self):
-        # Force sqlite3 version to avoid conflicts with soci
-        self.requires('sqlite3/3.42.0', override=True)
-        # Force our custom snappy build for all dependencies
-        self.requires('snappy/1.1.10@xahaud/stable', override=True)
-        # Force boost version for all dependencies to avoid conflicts
-        self.requires('boost/1.86.0', override=True)
-
-        if self.options.with_wasmedge:
-            self.requires('wasmedge/0.11.2@xahaud/stable')
         if self.options.jemalloc:
             self.requires('jemalloc/5.2.1')
         if self.options.reporting:

external/wasmedge/conanfile.py

@@ -38,15 +38,8 @@ class WasmedgeConan(ConanFile):
             raise ConanInvalidConfiguration("Binaries for this combination of version/os/arch/compiler are not available")
 
     def package_id(self):
-        # Make binary compatible across compiler versions (since we're downloading prebuilt)
-        self.info.settings.rm_safe("compiler.version")
-        # Group compilers by their binary compatibility
-        # Note: We must use self.info.settings here, not self.settings (forbidden in Conan 2)
-        compiler_name = str(self.info.settings.compiler)
-        if compiler_name in ["Visual Studio", "msvc"]:
-            self.info.settings.compiler = "Visual Studio"
-        else:
-            self.info.settings.compiler = "gcc"
+        del self.info.settings.compiler.version
+        self.info.settings.compiler = self._compiler_alias
 
     def build(self):
         # This is packaging binaries so the download needs to be in build

release-builder.sh

@@ -1,11 +1,9 @@
-#!/bin/bash
+#!/bin/bash 
 # We use set -e and bash with -u to bail on first non zero exit code of any
 # processes launched or upon any unbound variable.
 # We use set -x to print commands before running them to help with
 # debugging.
 
-set -ex
-
 echo "START BUILDING (HOST)"
 
 echo "Cleaning previously built binary"
@@ -92,37 +90,29 @@ RUN /hbb_exe/activate-exec bash -c "dnf install -y epel-release && \
         llvm14-static llvm14-devel && \
     dnf clean all"
 
-# Install Conan 2 and CMake
-RUN /hbb_exe/activate-exec pip3 install "conan>=2.0,<3.0" && \
+# Install Conan and CMake
+RUN /hbb_exe/activate-exec pip3 install "conan==1.66.0" && \
     /hbb_exe/activate-exec wget -q https://github.com/Kitware/CMake/releases/download/v3.23.1/cmake-3.23.1-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 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)
-#
-# Install minimal Boost 1.86.0 for WasmEdge only (filesystem and its dependencies)
-# The main application will use Conan-provided Boost for all other components
-# IMPORTANT: Understanding Boost linking options:
-#   - 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 /hbb_exe/activate-exec bash -c "echo 'Boost cache bust: v5-minimal' && \
-    rm -rf /usr/local/lib/libboost* /usr/local/include/boost && \
-    cd /tmp && \
+# Install Boost 1.86.0
+RUN /hbb_exe/activate-exec bash -c "cd /tmp && \
     wget -q https://archives.boost.io/release/1.86.0/source/boost_1_86_0.tar.gz -O boost.tar.gz && \
     mkdir boost && \
     tar -xzf boost.tar.gz --strip-components=1 -C boost && \
     cd boost && \
     ./bootstrap.sh && \
-    ./b2 install \
-        link=static runtime-link=shared -j${BUILD_CORES} \
-        --with-filesystem --with-system && \
+    ./b2 link=static -j${BUILD_CORES} && \
+    ./b2 install && \
     cd /tmp && \
     rm -rf boost boost.tar.gz"
 
+ENV BOOST_ROOT=/usr/local/src/boost_1_86_0
+ENV Boost_LIBRARY_DIRS=/usr/local/lib
+ENV BOOST_INCLUDEDIR=/usr/local/src/boost_1_86_0
+
 ENV CMAKE_EXE_LINKER_FLAGS="-static-libstdc++"
 
 ENV LLVM_DIR=/usr/lib64/llvm14/lib/cmake/llvm
@@ -165,10 +155,6 @@ RUN cd /tmp && \
     cd build && \
     /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 && \
     cmake .. \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -190,28 +176,14 @@ RUN cd /tmp && \
 # Set environment variables
 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
+# Configure ccache and Conan
 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 && \
-    echo 'core.cache:storage_path=/cache/conan2' > ~/.conan2/global.conf && \
-    echo 'core.download:download_cache=/cache/conan2_download' >> ~/.conan2/global.conf && \
-    echo 'core.sources:download_cache=/cache/conan2_sources' >> ~/.conan2/global.conf && \
-    conan profile detect --force && \
-    echo '[settings]' > ~/.conan2/profiles/default && \
-    echo 'arch=x86_64' >> ~/.conan2/profiles/default && \
-    echo 'build_type=Release' >> ~/.conan2/profiles/default && \
-    echo 'compiler=gcc' >> ~/.conan2/profiles/default && \
-    echo 'compiler.cppstd=20' >> ~/.conan2/profiles/default && \
-    echo 'compiler.libcxx=libstdc++11' >> ~/.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"
+    conan config set storage.path=/cache/conan && \
+    (conan profile new default --detect || true) && \
+    conan profile update settings.compiler.libcxx=libstdc++11 default && \
+    conan profile update settings.compiler.cppstd=20 default"
 
 DOCKERFILE_EOF
 )

src/ripple/app/hook/impl/applyHook.cpp

@@ -3150,15 +3150,15 @@ DEFINE_HOOK_FUNCTION(
                 if (a == 0 || b == 0 || c == 0 || d == 0 || e == 0 || f == 0)
                     return INVALID_ARGUMENT;
 
-                uint32_t acc1_ptr = a, acc1_len = b, acc2_ptr = c, acc2_len = d,
+                uint32_t hi_ptr = a, hi_len = b, lo_ptr = c, lo_len = d,
                          cu_ptr = e, cu_len = f;
 
-                if (NOT_IN_BOUNDS(acc1_ptr, acc1_len, memory_length) ||
-                    NOT_IN_BOUNDS(acc2_ptr, acc2_len, memory_length) ||
+                if (NOT_IN_BOUNDS(hi_ptr, hi_len, memory_length) ||
+                    NOT_IN_BOUNDS(lo_ptr, lo_len, memory_length) ||
                     NOT_IN_BOUNDS(cu_ptr, cu_len, memory_length))
                     return OUT_OF_BOUNDS;
 
-                if (acc1_len != 20 || acc2_len != 20)
+                if (hi_len != 20 || lo_len != 20)
                     return INVALID_ARGUMENT;
 
                 std::optional<Currency> cur =
@@ -3167,8 +3167,8 @@ DEFINE_HOOK_FUNCTION(
                     return INVALID_ARGUMENT;
 
                 auto kl = ripple::keylet::line(
-                    AccountID::fromVoid(memory + acc1_ptr),
-                    AccountID::fromVoid(memory + acc2_ptr),
+                    AccountID::fromVoid(memory + hi_ptr),
+                    AccountID::fromVoid(memory + lo_ptr),
                     *cur);
                 return serialize_keylet(kl, memory, write_ptr, write_len);
             }