chore: Use released libxrpl 3.2.0 (#3105 )

fix: Proxy support (#3103 )
Port of two changes onto release/2.7.1: - #3006 (d3381a1d): resolve proxy ip before processing any request - #3043 (d7bcf6e7): re-resolve client ip when a proxy reuses a TCP connection for different clients (resolveClientIp now returns std::optional; extractClientIp made public; isProxyConnection_ tracked)
2026-06-17 23:56:45 +00:00 · 2026-06-16 17:31:10 +01:00 · 2026-06-09 16:25:02 +01:00 · 2026-06-08 15:16:50 +01:00 · 2026-06-08 14:01:33 +01:00 · 2026-06-05 17:48:07 +01:00
314 changed files with 7863 additions and 6369 deletions
--- a/.github/actions/build-docker-image/action.yml
+++ b/.github/actions/build-docker-image/action.yml
@@ -34,32 +34,32 @@ runs:
  steps:
    - name: Login to DockerHub
      if: ${{ inputs.push_image == 'true' && inputs.dockerhub_repo != '' }}
-      uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+      uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
      with:
        username: ${{ env.DOCKERHUB_USER }}
        password: ${{ env.DOCKERHUB_PW }}

    - name: Login to GitHub Container Registry
      if: ${{ inputs.push_image == 'true' }}
-      uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+      uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
      with:
        registry: ghcr.io
        username: ${{ github.repository_owner }}
        password: ${{ env.GITHUB_TOKEN }}

-    - uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
+    - uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
      with:
        cache-image: false
-    - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+    - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0

-    - uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
+    - uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
      id: meta
      with:
        images: ${{ inputs.images }}
        tags: ${{ inputs.tags }}

    - name: Build and push
-      uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+      uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
      with:
        context: ${{ inputs.directory }}
        platforms: ${{ inputs.platforms }}
--- a/.github/actions/cmake/action.yml
+++ b/.github/actions/cmake/action.yml
@@ -37,6 +37,10 @@ inputs:
    description: Whether to generate Debian package
    required: true
    default: "false"
+  version:
+    description: Version of the clio_server binary
+    required: false
+    default: ""

 runs:
  using: composite
@@ -57,6 +61,19 @@ runs:
        STATIC: "${{ inputs.static == 'true' && 'ON' || 'OFF' }}"
        TIME_TRACE: "${{ inputs.time_trace == 'true' && 'ON' || 'OFF' }}"
        PACKAGE: "${{ inputs.package == 'true' && 'ON' || 'OFF' }}"
+        # GitHub creates a merge commit for a PR
+        # https://www.kenmuse.com/blog/the-many-shas-of-a-github-pull-request/
+        #
+        # We:
+        # - explicitly provide branch name
+        # - use `github.head_ref` to get the SHA of last commit in the PR branch
+        #
+        # This way it works both for PRs and pushes to branches.
+        GITHUB_BRANCH_NAME: "${{ github.head_ref || github.ref_name }}"
+        GITHUB_HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
+        #
+        # If tag is being pushed, or it's a nightly release, we use that version.
+        FORCE_CLIO_VERSION: ${{ inputs.version }}
      run: |
        cmake \
          -B "${BUILD_DIR}" \
--- a/.github/scripts/conan/generate_matrix.py
+++ b/.github/scripts/conan/generate_matrix.py
@@ -4,7 +4,7 @@ import json

 LINUX_OS = ["heavy", "heavy-arm64"]
 LINUX_CONTAINERS = [
-    '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
+    '{ "image": "ghcr.io/xrplf/clio-ci:94da8459ddc30e2f0d88a98cba63a57b2cda3031" }'
 ]
 LINUX_COMPILERS = ["gcc", "clang"]

--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,7 +49,7 @@ jobs:
        build_type: [Release, Debug]
        container:
          [
-            '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }',
+            '{ "image": "ghcr.io/xrplf/clio-ci:94da8459ddc30e2f0d88a98cba63a57b2cda3031" }',
          ]
        static: [true]

@@ -79,7 +79,7 @@ jobs:
    uses: ./.github/workflows/reusable-build.yml
    with:
      runs_on: heavy
-      container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
+      container: '{ "image": "ghcr.io/xrplf/clio-ci:94da8459ddc30e2f0d88a98cba63a57b2cda3031" }'
      conan_profile: gcc
      build_type: Debug
      download_ccache: true
@@ -97,7 +97,7 @@ jobs:
    needs: build-and-test
    runs-on: heavy
    container:
-      image: ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f
+      image: ghcr.io/xrplf/clio-ci:94da8459ddc30e2f0d88a98cba63a57b2cda3031

    steps:
      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
--- a/.github/workflows/check-libxrpl.yml
+++ b/.github/workflows/check-libxrpl.yml
@@ -21,7 +21,7 @@ jobs:
    name: Build Clio / `libXRPL ${{ github.event.client_payload.version }}`
    runs-on: heavy
    container:
-      image: ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f
+      image: ghcr.io/xrplf/clio-ci:94da8459ddc30e2f0d88a98cba63a57b2cda3031

    steps:
      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -29,9 +29,9 @@ jobs:
          fetch-depth: 0

      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@2ece4ec6ab7de266859a6f053571425b2bd684b6
+        uses: XRPLF/actions/prepare-runner@90f11ee655d1687824fb8793db770477d52afbab
        with:
-          disable_ccache: true
+          enable_ccache: false

      - name: Update libXRPL version requirement
        run: |
@@ -69,7 +69,7 @@ jobs:
    needs: build
    runs-on: heavy
    container:
-      image: ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f
+      image: ghcr.io/xrplf/clio-ci:94da8459ddc30e2f0d88a98cba63a57b2cda3031

    steps:
      - uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -31,7 +31,7 @@ jobs:
    if: github.event_name != 'push' || contains(github.event.head_commit.message, 'clang-tidy auto fixes')
    runs-on: heavy
    container:
-      image: ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f
+      image: ghcr.io/xrplf/clio-ci:94da8459ddc30e2f0d88a98cba63a57b2cda3031

    permissions:
      contents: write
@@ -44,9 +44,9 @@ jobs:
          fetch-depth: 0

      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@2ece4ec6ab7de266859a6f053571425b2bd684b6
+        uses: XRPLF/actions/prepare-runner@90f11ee655d1687824fb8793db770477d52afbab
        with:
-          disable_ccache: true
+          enable_ccache: false

      - name: Run conan
        uses: ./.github/actions/conan
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -18,7 +18,7 @@ jobs:
  build:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f
+      image: ghcr.io/xrplf/clio-ci:94da8459ddc30e2f0d88a98cba63a57b2cda3031

    steps:
      - name: Checkout
@@ -27,9 +27,9 @@ jobs:
          lfs: true

      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@2ece4ec6ab7de266859a6f053571425b2bd684b6
+        uses: XRPLF/actions/prepare-runner@90f11ee655d1687824fb8793db770477d52afbab
        with:
-          disable_ccache: true
+          enable_ccache: false

      - name: Create build directory
        run: mkdir build_docs
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -28,8 +28,20 @@ defaults:
    shell: bash

 jobs:
+  get_date:
+    name: Get Date
+    runs-on: ubuntu-latest
+    outputs:
+      date: ${{ steps.get_date.outputs.date }}
+    steps:
+      - name: Get current date
+        id: get_date
+        run: |
+          echo "date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
+
  build-and-test:
    name: Build and Test
+    needs: get_date

    strategy:
      fail-fast: false
@@ -43,17 +55,17 @@ jobs:
            conan_profile: gcc
            build_type: Release
            static: true
-            container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
+            container: '{ "image": "ghcr.io/xrplf/clio-ci:94da8459ddc30e2f0d88a98cba63a57b2cda3031" }'
          - os: heavy
            conan_profile: gcc
            build_type: Debug
            static: true
-            container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
+            container: '{ "image": "ghcr.io/xrplf/clio-ci:94da8459ddc30e2f0d88a98cba63a57b2cda3031" }'
          - os: heavy
            conan_profile: gcc.ubsan
            build_type: Release
            static: false
-            container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
+            container: '{ "image": "ghcr.io/xrplf/clio-ci:94da8459ddc30e2f0d88a98cba63a57b2cda3031" }'

    uses: ./.github/workflows/reusable-build-test.yml
    with:
@@ -67,14 +79,16 @@ jobs:
      upload_clio_server: true
      download_ccache: false
      upload_ccache: false
+      version: nightly-${{ needs.get_date.outputs.date }}

  package:
    name: Build debian package
+    needs: get_date

    uses: ./.github/workflows/reusable-build.yml
    with:
      runs_on: heavy
-      container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
+      container: '{ "image": "ghcr.io/xrplf/clio-ci:94da8459ddc30e2f0d88a98cba63a57b2cda3031" }'
      conan_profile: gcc
      build_type: Release
      download_ccache: false
@@ -83,11 +97,13 @@ jobs:
      static: true
      upload_clio_server: false
      package: true
+      version: nightly-${{ needs.get_date.outputs.date }}
      targets: package
      analyze_build_time: false

  analyze_build_time:
    name: Analyze Build Time
+    needs: get_date

    strategy:
      fail-fast: false
@@ -95,7 +111,7 @@ jobs:
        include:
          - os: heavy
            conan_profile: clang
-            container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
+            container: '{ "image": "ghcr.io/xrplf/clio-ci:94da8459ddc30e2f0d88a98cba63a57b2cda3031" }'
            static: true
          - os: macos15
            conan_profile: apple-clang
@@ -114,17 +130,7 @@ jobs:
      upload_clio_server: false
      targets: all
      analyze_build_time: true
-
-  get_date:
-    name: Get Date
-    runs-on: ubuntu-latest
-    outputs:
-      date: ${{ steps.get_date.outputs.date }}
-    steps:
-      - name: Get current date
-        id: get_date
-        run: |
-          echo "date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
+      version: nightly-${{ needs.get_date.outputs.date }}

  nightly_release:
    needs: [build-and-test, package, get_date]
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -12,7 +12,7 @@ on:

 jobs:
  auto-update:
-    uses: XRPLF/actions/.github/workflows/pre-commit-autoupdate.yml@afbcbdafbe0ce5439492fb87eda6441371086386
+    uses: XRPLF/actions/.github/workflows/pre-commit-autoupdate.yml@ad4ab1ae5a54a4bab0e87294c31fc0729f788b2b
    with:
      sign_commit: true
      committer: "Clio CI <skuznetsov@ripple.com>"
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -8,7 +8,7 @@ on:

 jobs:
  run-hooks:
-    uses: XRPLF/actions/.github/workflows/pre-commit.yml@34790936fae4c6c751f62ec8c06696f9c1a5753a
+    uses: XRPLF/actions/.github/workflows/pre-commit.yml@282890f46d6921249d5659dd38babcb0bd8aef48
    with:
      runs_on: heavy
-      container: '{ "image": "ghcr.io/xrplf/clio-pre-commit:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
+      container: '{ "image": "ghcr.io/xrplf/clio-pre-commit:94da8459ddc30e2f0d88a98cba63a57b2cda3031" }'
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
            conan_profile: gcc
            build_type: Release
            static: true
-            container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
+            container: '{ "image": "ghcr.io/xrplf/clio-ci:94da8459ddc30e2f0d88a98cba63a57b2cda3031" }'

    uses: ./.github/workflows/reusable-build-test.yml
    with:
@@ -43,7 +43,7 @@ jobs:
      upload_clio_server: true
      download_ccache: false
      upload_ccache: false
-      expected_version: ${{ github.event_name == 'push' && github.ref_name || '' }}
+      version: ${{ github.event_name == 'push' && github.ref_name || '' }}

  package:
    name: Build debian package
@@ -51,7 +51,7 @@ jobs:
    uses: ./.github/workflows/reusable-build.yml
    with:
      runs_on: heavy
-      container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
+      container: '{ "image": "ghcr.io/xrplf/clio-ci:94da8459ddc30e2f0d88a98cba63a57b2cda3031" }'
      conan_profile: gcc
      build_type: Release
      download_ccache: false
@@ -60,6 +60,7 @@ jobs:
      static: true
      upload_clio_server: false
      package: true
+      version: ${{ github.event_name == 'push' && github.ref_name || '' }}
      targets: package
      analyze_build_time: false

--- a/.github/workflows/reusable-build-test.yml
+++ b/.github/workflows/reusable-build-test.yml
@@ -63,18 +63,18 @@ on:
        type: string
        default: all

-      expected_version:
-        description: Expected version of the clio_server binary
-        required: false
-        type: string
-        default: ""
-
      package:
        description: Whether to generate Debian package
        required: false
        type: boolean
        default: false

+      version:
+        description: Version of the clio_server binary
+        required: false
+        type: string
+        default: ""
+
 jobs:
  build:
    uses: ./.github/workflows/reusable-build.yml
@@ -90,8 +90,8 @@ jobs:
      upload_clio_server: ${{ inputs.upload_clio_server }}
      targets: ${{ inputs.targets }}
      analyze_build_time: false
-      expected_version: ${{ inputs.expected_version }}
      package: ${{ inputs.package }}
+      version: ${{ inputs.version }}

  test:
    needs: build
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -60,17 +60,17 @@ on:
        required: true
        type: boolean

-      expected_version:
-        description: Expected version of the clio_server binary
-        required: false
-        type: string
-        default: ""
-
      package:
        description: Whether to generate Debian package
        required: false
        type: boolean

+      version:
+        description: Version of the clio_server binary
+        required: false
+        type: string
+        default: ""
+
    secrets:
      CODECOV_TOKEN:
        required: false
@@ -93,15 +93,11 @@ jobs:
      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          fetch-depth: 0
-          # We need to fetch tags to have correct version in the release
-          # The workaround is based on https://github.com/actions/checkout/issues/1467
-          fetch-tags: true
-          ref: ${{ github.ref }}

      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@2ece4ec6ab7de266859a6f053571425b2bd684b6
+        uses: XRPLF/actions/prepare-runner@90f11ee655d1687824fb8793db770477d52afbab
        with:
-          disable_ccache: ${{ !inputs.download_ccache }}
+          enable_ccache: ${{ inputs.download_ccache }}

      - name: Setup conan on macOS
        if: ${{ runner.os == 'macOS' }}
@@ -117,7 +113,7 @@ jobs:

      - name: Restore ccache cache
        if: ${{ inputs.download_ccache && github.ref != 'refs/heads/develop' }}
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: ${{ env.CCACHE_DIR }}
          key: ${{ steps.cache_key.outputs.key }}
@@ -139,6 +135,7 @@ jobs:
          static: ${{ inputs.static }}
          time_trace: ${{ inputs.analyze_build_time }}
          package: ${{ inputs.package }}
+          version: ${{ inputs.version }}

      - name: Build Clio
        uses: ./.github/actions/build-clio
@@ -162,12 +159,12 @@ jobs:
      - name: Show ccache's statistics and zero it
        if: ${{ inputs.download_ccache }}
        run: |
-          ccache --show-stats
+          ccache --show-stats -vv
          ccache --zero-stats

      - name: Save ccache cache
        if: ${{ inputs.upload_ccache && github.ref == 'refs/heads/develop' }}
-        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: ${{ env.CCACHE_DIR }}
          key: ${{ steps.cache_key.outputs.key }}
@@ -218,15 +215,20 @@ jobs:
        if: ${{ inputs.code_coverage }}
        uses: ./.github/actions/code-coverage

-      - name: Verify expected version
-        if: ${{ inputs.expected_version != '' }}
+      - name: Verify version is expected
+        if: ${{ inputs.version != '' }}
        env:
-          INPUT_EXPECTED_VERSION: ${{ inputs.expected_version }}
+          INPUT_VERSION: ${{ inputs.version }}
+          BUILD_TYPE: ${{ inputs.build_type }}
        run: |
          set -e
-          EXPECTED_VERSION="clio-${INPUT_EXPECTED_VERSION}"
-          actual_version=$(./build/clio_server --version)
-          if [[ "$actual_version" != "$EXPECTED_VERSION" ]]; then
+          EXPECTED_VERSION="clio-${INPUT_VERSION}"
+          if [[ "${BUILD_TYPE}" == "Debug" ]]; then
+            EXPECTED_VERSION="${EXPECTED_VERSION}+DEBUG"
+          fi
+
+          actual_version=$(./build/clio_server --version | head -n 1)
+          if [[ "${actual_version}" != "${EXPECTED_VERSION}" ]]; then
            echo "Expected version '${EXPECTED_VERSION}', but got '${actual_version}'"
            exit 1
          fi
--- a/.github/workflows/reusable-release.yml
+++ b/.github/workflows/reusable-release.yml
@@ -46,7 +46,7 @@ jobs:
  release:
    runs-on: heavy
    container:
-      image: ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f
+      image: ghcr.io/xrplf/clio-ci:94da8459ddc30e2f0d88a98cba63a57b2cda3031
    env:
      GH_REPO: ${{ github.repository }}
      GH_TOKEN: ${{ github.token }}
@@ -60,9 +60,9 @@ jobs:
          fetch-depth: 0

      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@2ece4ec6ab7de266859a6f053571425b2bd684b6
+        uses: XRPLF/actions/prepare-runner@90f11ee655d1687824fb8793db770477d52afbab
        with:
-          disable_ccache: true
+          enable_ccache: false

      - uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
        with:
@@ -91,8 +91,7 @@ jobs:
          LAST_TAG="$(gh release view --json tagName -q .tagName --repo XRPLF/clio)"
          LAST_TAG_COMMIT="$(git rev-parse $LAST_TAG)"
          BASE_COMMIT="$(git merge-base HEAD $LAST_TAG_COMMIT)"
-          git-cliff "${BASE_COMMIT}..HEAD" --ignore-tags "nightly|-b|-rc"
-          cat CHANGELOG.md >> "${RUNNER_TEMP}/release_notes.md"
+          git-cliff "${BASE_COMMIT}..HEAD" --ignore-tags "nightly|-b|-rc" >> "${RUNNER_TEMP}/release_notes.md"

      - name: Upload release notes
        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
--- a/.github/workflows/reusable-test.yml
+++ b/.github/workflows/reusable-test.yml
@@ -126,6 +126,12 @@ jobs:
        if: ${{ runner.os == 'macOS' }}
        uses: XRPLF/actions/cleanup-workspace@cf0433aa74563aead044a1e395610c96d65a37cf

+      - name: Restart colima
+        if: ${{ runner.os == 'macOS' }}
+        run: |
+          colima delete --force
+          colima start
+
      - name: Spin up scylladb
        if: ${{ runner.os == 'macOS' }}
        timeout-minutes: 3
--- a/.github/workflows/reusable-upload-coverage-report.yml
+++ b/.github/workflows/reusable-upload-coverage-report.yml
@@ -28,7 +28,7 @@ jobs:

      - name: Upload coverage report
        if: ${{ hashFiles('build/coverage_report.xml') != '' }}
-        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
+        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
        with:
          files: build/coverage_report.xml
          fail_ci_if_error: true
--- a/.github/workflows/sanitizers.yml
+++ b/.github/workflows/sanitizers.yml
@@ -44,7 +44,7 @@ jobs:
    uses: ./.github/workflows/reusable-build-test.yml
    with:
      runs_on: heavy
-      container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
+      container: '{ "image": "ghcr.io/xrplf/clio-ci:94da8459ddc30e2f0d88a98cba63a57b2cda3031" }'
      download_ccache: false
      upload_ccache: false
      conan_profile: ${{ matrix.compiler }}${{ matrix.sanitizer_ext }}
--- a/.github/workflows/update-docker-ci.yml
+++ b/.github/workflows/update-docker-ci.yml
@@ -77,10 +77,10 @@ jobs:
          push_image: ${{ github.event_name != 'pull_request' }}
          directory: docker/compilers/gcc
          tags: |
-            type=raw,value=amd64-latest
-            type=raw,value=amd64-${{ env.GCC_MAJOR_VERSION }}
-            type=raw,value=amd64-${{ env.GCC_VERSION }}
-            type=raw,value=amd64-${{ github.sha }}
+            type=raw,value=latest
+            type=raw,value=${{ env.GCC_MAJOR_VERSION }}
+            type=raw,value=${{ env.GCC_VERSION }}
+            type=raw,value=${{ github.sha }}
          platforms: linux/amd64
          build_args: |
            GCC_MAJOR_VERSION=${{ env.GCC_MAJOR_VERSION }}
@@ -89,6 +89,7 @@ jobs:
          dockerhub_description: GCC compiler for XRPLF/clio.

  gcc-arm64:
+    if: false
    name: Build and push GCC docker image (arm64)
    runs-on: heavy-arm64
    needs: repo
@@ -127,6 +128,7 @@ jobs:
          dockerhub_description: GCC compiler for XRPLF/clio.

  gcc-merge:
+    if: false
    name: Merge and push multi-arch GCC docker image
    runs-on: heavy
    needs: [repo, gcc-amd64, gcc-arm64]
@@ -141,11 +143,11 @@ jobs:
          files: "docker/compilers/gcc/**"

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0

      - name: Login to GitHub Container Registry
        if: ${{ github.event_name != 'pull_request' }}
-        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -153,7 +155,7 @@ jobs:

      - name: Login to DockerHub
        if: ${{ github.repository_owner == 'XRPLF' && github.event_name != 'pull_request' }}
-        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
        with:
          username: ${{ secrets.DOCKERHUB_USER }}
          password: ${{ secrets.DOCKERHUB_PW }}
@@ -174,7 +176,7 @@ jobs:
          }
          push_image ${{ needs.repo.outputs.GHCR_REPO }}/clio-gcc
          if [[ ${{ github.repository_owner }} == 'XRPLF' ]]; then
-            push_image rippleci/clio_clang
+            push_image rippleci/clio_gcc
          fi

  clang:
@@ -207,7 +209,8 @@ jobs:
            type=raw,value=latest
            type=raw,value=${{ env.CLANG_MAJOR_VERSION }}
            type=raw,value=${{ github.sha }}
-          platforms: linux/amd64,linux/arm64
+          # platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
          build_args: |
            CLANG_MAJOR_VERSION=${{ env.CLANG_MAJOR_VERSION }}
          dockerhub_repo: ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_clang' || '' }}
@@ -216,7 +219,7 @@ jobs:
  tools-amd64:
    name: Build and push tools docker image (amd64)
    runs-on: heavy
-    needs: [repo, gcc-merge]
+    needs: [repo, gcc-amd64]

    steps:
      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -237,17 +240,18 @@ jobs:
          push_image: ${{ github.event_name != 'pull_request' }}
          directory: docker/tools
          tags: |
-            type=raw,value=amd64-latest
-            type=raw,value=amd64-${{ github.sha }}
+            type=raw,value=latest
+            type=raw,value=${{ github.sha }}
          platforms: linux/amd64
          build_args: |
            GHCR_REPO=${{ needs.repo.outputs.GHCR_REPO }}
            GCC_VERSION=${{ env.GCC_VERSION }}

  tools-arm64:
+    if: false
    name: Build and push tools docker image (arm64)
    runs-on: heavy-arm64
-    needs: [repo, gcc-merge]
+    needs: [repo, gcc-amd64]

    steps:
      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -276,6 +280,7 @@ jobs:
            GCC_VERSION=${{ env.GCC_VERSION }}

  tools-merge:
+    if: false
    name: Merge and push multi-arch tools docker image
    runs-on: heavy
    needs: [repo, tools-amd64, tools-arm64]
@@ -290,11 +295,11 @@ jobs:
          files: "docker/tools/**"

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0

      - name: Login to GitHub Container Registry
        if: ${{ github.event_name != 'pull_request' }}
-        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -313,7 +318,7 @@ jobs:
  pre-commit:
    name: Build and push pre-commit docker image
    runs-on: heavy
-    needs: [repo, tools-merge]
+    needs: [repo, tools-amd64]

    steps:
      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -328,14 +333,15 @@ jobs:
          tags: |
            type=raw,value=latest
            type=raw,value=${{ github.sha }}
-          platforms: linux/amd64,linux/arm64
+          # platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
          build_args: |
            GHCR_REPO=${{ needs.repo.outputs.GHCR_REPO }}

  ci:
    name: Build and push CI docker image
    runs-on: heavy
-    needs: [repo, gcc-merge, clang, tools-merge]
+    needs: [repo, gcc-amd64, clang, tools-amd64]

    steps:
      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -354,7 +360,8 @@ jobs:
            type=raw,value=latest
            type=raw,value=gcc_${{ env.GCC_MAJOR_VERSION }}_clang_${{ env.CLANG_MAJOR_VERSION }}
            type=raw,value=${{ github.sha }}
-          platforms: linux/amd64,linux/arm64
+          # platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
          build_args: |
            GHCR_REPO=${{ needs.repo.outputs.GHCR_REPO }}
            CLANG_MAJOR_VERSION=${{ env.CLANG_MAJOR_VERSION }}
--- a/.github/workflows/upload-conan-deps.yml
+++ b/.github/workflows/upload-conan-deps.yml
@@ -78,9 +78,9 @@ jobs:
      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1

      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@2ece4ec6ab7de266859a6f053571425b2bd684b6
+        uses: XRPLF/actions/prepare-runner@90f11ee655d1687824fb8793db770477d52afbab
        with:
-          disable_ccache: true
+          enable_ccache: false

      - name: Setup conan on macOS
        if: ${{ runner.os == 'macOS' }}
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -29,12 +29,12 @@ repos:

  # Autoformat: YAML, JSON, Markdown, etc.
  - repo: https://github.com/rbubley/mirrors-prettier
-    rev: 3c603eae8faac85303ae675fd33325cff699a797 # frozen: v3.7.3
+    rev: 14abee445aea04b39069c19b4bd54efff6775819 # frozen: v3.7.4
    hooks:
      - id: prettier

  - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: c8fd5003603dd6f12447314ecd935ba87c09aff5 # frozen: v0.46.0
+    rev: 76b3d32d3f4b965e1d6425253c59407420ae2c43 # frozen: v0.47.0
    hooks:
      - id: markdownlint-fix
        exclude: LICENSE.md
@@ -59,7 +59,7 @@ repos:
          ]

  - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 2892f1f81088477370d4fbc56545c05d33d2493f # frozen: 25.11.0
+    rev: 831207fd435b47aeffdf6af853097e64322b4d44 # frozen: 25.12.0
    hooks:
      - id: black

@@ -94,7 +94,7 @@ repos:
        language: script

  - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: 4c26f99731e7c22a047c35224150ee9e43d7c03e # frozen: v21.1.6
+    rev: 75ca4ad908dc4a99f57921f29b7e6c1521e10b26 # frozen: v21.1.8
    hooks:
      - id: clang-format
        args: [--style=file]
--- a/benchmarks/rpc/WorkQueueBenchmarks.cpp
+++ b/benchmarks/rpc/WorkQueueBenchmarks.cpp
@@ -28,19 +28,19 @@
 #include "util/prometheus/Prometheus.hpp"

 #include <benchmark/benchmark.h>
-#include <boost/asio.hpp>
-#include <boost/asio/spawn.hpp>
 #include <boost/asio/steady_timer.hpp>
 #include <boost/asio/thread_pool.hpp>
-#include <boost/json.hpp>
 #include <boost/json/object.hpp>

+#include <algorithm>
 #include <atomic>
 #include <cassert>
 #include <chrono>
 #include <cstddef>
 #include <cstdint>
 #include <mutex>
+#include <thread>
+#include <vector>

 using namespace rpc;
 using namespace util::config;
@@ -80,36 +80,56 @@ benchmarkWorkQueue(benchmark::State& state)
 {
    init();

-    auto const total = static_cast<size_t>(state.range(0));
-    auto const numThreads = static_cast<uint32_t>(state.range(1));
-    auto const maxSize = static_cast<uint32_t>(state.range(2));
-    auto const delayMs = static_cast<uint32_t>(state.range(3));
+    auto const wqThreads = static_cast<uint32_t>(state.range(0));
+    auto const maxQueueSize = static_cast<uint32_t>(state.range(1));
+    auto const clientThreads = static_cast<uint32_t>(state.range(2));
+    auto const itemsPerClient = static_cast<uint32_t>(state.range(3));
+    auto const clientProcessingMs = static_cast<uint32_t>(state.range(4));

    for (auto _ : state) {
        std::atomic_size_t totalExecuted = 0uz;
        std::atomic_size_t totalQueued = 0uz;

        state.PauseTiming();
-        WorkQueue queue(numThreads, maxSize);
+        WorkQueue queue(wqThreads, maxQueueSize);
        state.ResumeTiming();

-        for (auto i = 0uz; i < total; ++i) {
-            totalQueued += static_cast<std::size_t>(queue.postCoro(
-                [&delayMs, &totalExecuted](auto yield) {
-                    ++totalExecuted;
+        std::vector<std::thread> threads;
+        threads.reserve(clientThreads);

-                    boost::asio::steady_timer timer(yield.get_executor(), std::chrono::milliseconds{delayMs});
-                    timer.async_wait(yield);
-                },
-                /* isWhiteListed = */ false
-            ));
+        for (auto t = 0uz; t < clientThreads; ++t) {
+            threads.emplace_back([&] {
+                for (auto i = 0uz; i < itemsPerClient; ++i) {
+                    totalQueued += static_cast<std::size_t>(queue.postCoro(
+                        [&clientProcessingMs, &totalExecuted](auto yield) {
+                            ++totalExecuted;
+
+                            boost::asio::steady_timer timer(
+                                yield.get_executor(), std::chrono::milliseconds{clientProcessingMs}
+                            );
+                            timer.async_wait(yield);
+
+                            std::this_thread::sleep_for(std::chrono::microseconds{10});
+                        },
+                        /* isWhiteListed = */ false
+                    ));
+                }
+            });
        }

+        for (auto& t : threads)
+            t.join();
+
        queue.stop();

        ASSERT(totalExecuted == totalQueued, "Totals don't match");
-        ASSERT(totalQueued <= total, "Queued more than requested");
-        ASSERT(totalQueued >= maxSize, "Queued less than maxSize");
+        ASSERT(totalQueued <= itemsPerClient * clientThreads, "Queued more than requested");
+
+        if (maxQueueSize == 0) {
+            ASSERT(totalQueued == itemsPerClient * clientThreads, "Queued exactly the expected amount");
+        } else {
+            ASSERT(totalQueued >= std::min(maxQueueSize, itemsPerClient * clientThreads), "Queued less than expected");
+        }
    }
 }

@@ -123,5 +143,5 @@ benchmarkWorkQueue(benchmark::State& state)
 */
 // TODO: figure out what happens on 1 thread
 BENCHMARK(benchmarkWorkQueue)
-    ->ArgsProduct({{1'000, 10'000, 100'000}, {2, 4, 8}, {0, 5'000}, {10, 100, 250}})
+    ->ArgsProduct({{2, 4, 8, 16}, {0, 5'000}, {4, 8, 16}, {1'000, 10'000}, {10, 100, 250}})
    ->Unit(benchmark::kMillisecond);
--- a/cliff.toml
+++ b/cliff.toml
@@ -49,8 +49,6 @@ postprocessors = [
 ]
 # render body even when there are no releases to process
 # render_always = true
-# output file path
-output = "CHANGELOG.md"

 [git]
 # parse the commits based on https://www.conventionalcommits.org
--- a/cmake/ClioVersion.cmake
+++ b/cmake/ClioVersion.cmake
@@ -1,42 +1,42 @@
 find_package(Git REQUIRED)

-set(GIT_COMMAND describe --tags --exact-match)
-execute_process(
-  COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND}
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  OUTPUT_VARIABLE TAG
-  RESULT_VARIABLE RC
-  ERROR_VARIABLE ERR
-  OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE
-)
-
-if (RC EQUAL 0)
-  message(STATUS "Found tag '${TAG}' in git. Will use it as Clio version")
-  set(CLIO_VERSION "${TAG}")
-  set(DOC_CLIO_VERSION "${TAG}")
+if (DEFINED ENV{GITHUB_BRANCH_NAME})
+  set(GIT_BUILD_BRANCH $ENV{GITHUB_BRANCH_NAME})
+  set(GIT_COMMIT_HASH $ENV{GITHUB_HEAD_SHA})
 else ()
-  message(STATUS "Error finding tag in git: ${ERR}")
-  message(STATUS "Will use 'YYYYMMDDHMS-<branch>-<git-rev>' as Clio version")
-
-  set(GIT_COMMAND show -s --date=format:%Y%m%d%H%M%S --format=%cd)
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE DATE
-    OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ERROR_IS_FATAL ANY
-  )
-
  set(GIT_COMMAND branch --show-current)
  execute_process(
-    COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE BRANCH
+    COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE GIT_BUILD_BRANCH
    OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ERROR_IS_FATAL ANY
  )

-  set(GIT_COMMAND rev-parse --short HEAD)
+  set(GIT_COMMAND rev-parse HEAD)
  execute_process(
-    COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE REV
+    COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE GIT_COMMIT_HASH
    OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ERROR_IS_FATAL ANY
  )
+endif ()

-  set(CLIO_VERSION "${DATE}-${BRANCH}-${REV}")
+execute_process(
+  COMMAND date +%Y%m%d%H%M%S WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE BUILD_DATE
+  OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ERROR_IS_FATAL ANY
+)
+
+message(STATUS "Git branch: ${GIT_BUILD_BRANCH}")
+message(STATUS "Git commit hash: ${GIT_COMMIT_HASH}")
+message(STATUS "Build date: ${BUILD_DATE}")
+
+if (DEFINED ENV{FORCE_CLIO_VERSION} AND NOT "$ENV{FORCE_CLIO_VERSION}" STREQUAL "")
+  message(STATUS "Using explicitly provided '${FORCE_CLIO_VERSION}' as Clio version")
+
+  set(CLIO_VERSION "$ENV{FORCE_CLIO_VERSION}")
+  set(DOC_CLIO_VERSION "$ENV{FORCE_CLIO_VERSION}")
+else ()
+  message(STATUS "Using 'YYYYMMDDHMS-<branch>-<git short rev>' as Clio version")
+
+  string(SUBSTRING ${GIT_COMMIT_HASH} 0 7 GIT_COMMIT_HASH_SHORT)
+
+  set(CLIO_VERSION "${BUILD_DATE}-${GIT_BUILD_BRANCH}-${GIT_COMMIT_HASH_SHORT}")
  set(DOC_CLIO_VERSION "develop")
 endif ()

--- a/cmake/deps/Boost.cmake
+++ b/cmake/deps/Boost.cmake
@@ -1,4 +1,4 @@
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_STATIC_RUNTIME ON)

-find_package(Boost 1.82 REQUIRED CONFIG COMPONENTS program_options coroutine system log log_setup)
+find_package(Boost 1.82 REQUIRED CONFIG COMPONENTS program_options system log log_setup)
--- a/cmake/deps/OpenSSL.cmake
+++ b/cmake/deps/OpenSSL.cmake
@@ -1,3 +1,3 @@
-find_package(OpenSSL 1.1.1 REQUIRED CONFIG)
+find_package(OpenSSL 3 REQUIRED CONFIG)

 set_target_properties(OpenSSL::SSL PROPERTIES INTERFACE_COMPILE_DEFINITIONS OPENSSL_NO_SSL2)
--- a/conan.lock
+++ b/conan.lock
@@ -1,61 +1,76 @@
 {
    "version": "0.5",
    "requires": [
-        "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1756234269.497",
-        "xxhash/0.8.3#681d36a0a6111fc56e5e45ea182c19cc%1756234289.683",
-        "xrpl/3.0.0#534d3f65a336109eee929b88962bae4e%1765375071.547",
-        "sqlite3/3.49.1#8631739a4c9b93bd3d6b753bac548a63%1756234266.869",
-        "spdlog/1.16.0#942c2c39562ae25ba575d9c8e2bdf3b6%1763984117.108",
-        "soci/4.0.3#a9f8d773cd33e356b5879a4b0564f287%1756234262.318",
-        "re2/20230301#ca3b241baec15bd31ea9187150e0b333%1764175362.029",
+        "zlib/1.3.2#1cb806da49011867778ffb6ac7190fcb%1778091116.056",
+        "xxhash/0.8.3#681d36a0a6111fc56e5e45ea182c19cc%1765850149.987",
+        "xrpl/3.2.0#c3c124909c6461012758a4fab7c90cd5%1781569913.756",
+        "sqlite3/3.53.0#324ada52333108388a9a6108bfa96734%1778091117.311",
+        "spdlog/1.17.0#bcbaaf7147bda6ad24ffbd1ac3d7142c%1768312128.781",
+        "soci/4.0.3#fe32b9ad5eb47e79ab9e45a68f363945%1774450067.231",
+        "snappy/1.1.10#968fef506ff261592ec30c574d4a7809%1765850147.878",
+        "secp256k1/0.7.1#481881709eb0bdd0185a12b912bbe8ad%1770910500.329",
+        "rocksdb/10.5.1#4a197eca381a3e5ae8adf8cffa5aacd0%1765850186.86",
+        "re2/20251105#8579cfd0bda4daf0683f9e3898f964b4%1774398111.888",
        "rapidjson/cci.20220822#1b9d8c2256876a154172dc5cfbe447c6%1754325007.656",
-        "protobuf/3.21.12#44ee56c0a6eea0c19aeeaca680370b88%1764175361.456",
-        "openssl/1.1.1w#a8f0792d7c5121b954578a7149d23e03%1756223730.729",
-        "nudb/2.0.9#fb8dfd1a5557f5e0528114c2da17721e%1763150366.909",
+        "protobuf/6.33.5#d96d52ba5baaaa532f47bda866ad87a5%1774467363.12",
+        "openssl/3.6.2#4789bbf131b77d0515d15e094c8f697f%1778071755.506",
+        "nudb/2.0.9#11149c73f8f2baff9a0198fe25971fc7%1775040983.408",
        "minizip/1.2.13#9e87d57804bd372d6d1e32b1871517a3%1754325004.374",
-        "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504%1756234228.999",
+        "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504%1765850143.914",
        "libuv/1.46.0#dc28c1f653fa197f00db5b577a6f6011%1754325003.592",
-        "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1756223727.64",
-        "libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1756230911.03",
-        "libarchive/3.8.1#ffee18995c706e02bf96e7a2f7042e0d%1764175360.142",
+        "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1765842973.492",
+        "libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1765842973.03",
+        "libarchive/3.8.7#c446109bd1f1d8ba7936c94189bc50e6%1778091117.848",
        "http_parser/2.9.4#98d91690d6fd021e9e624218a85d9d97%1754325001.385",
-        "gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1754325000.842",
-        "grpc/1.50.1#02291451d1e17200293a409410d1c4e1%1756234248.958",
+        "gtest/1.17.0#5224b3b3ff3b4ce1133cbdd27d53ee7d%1768312129.152",
+        "grpc/1.78.1#b1a9e74b145cc471bed4dc64dc6eb2c1%1774467387.342",
        "fmt/12.1.0#50abab23274d56bb8f42c94b3b9a40c7%1763984116.926",
-        "doctest/2.4.11#a4211dfc329a16ba9f280f9574025659%1756234220.819",
-        "date/3.0.4#862e11e80030356b53c2c38599ceb32b%1763584497.32",
+        "ed25519/2015.03#ae761bdc52730a843f0809bdf6c1b1f6%1765850143.772",
+        "date/3.0.4#862e11e80030356b53c2c38599ceb32b%1765850143.772",
        "cassandra-cpp-driver/2.17.0#bd3934138689482102c265d01288a316%1764175359.611",
-        "c-ares/1.34.5#5581c2b62a608b40bb85d965ab3ec7c8%1764175359.429",
-        "bzip2/1.0.8#c470882369c2d95c5c77e970c0c7e321%1764175359.429",
-        "boost/1.83.0#91d8b1572534d2c334d6790e3c34d0c1%1764175359.61",
+        "c-ares/1.34.6#545240bb1c40e2cacd4362d6b8967650%1774439234.681",
+        "bzip2/1.0.8#c470882369c2d95c5c77e970c0c7e321%1765850143.837",
+        "boost/1.91.0#ea540ca2133d831b560036aa24dece3c%1778091165.282",
        "benchmark/1.9.4#ce4403f7a24d3e1f907cd9da4b678be4%1754578869.672",
-        "abseil/20230802.1#90ba607d4ee8fb5fb157c3db540671fc%1764175359.429"
+        "abseil/20250127.0#bb0baf1f362bc4a725a24eddd419b8f7%1774365460.196"
    ],
    "build_requires": [
-        "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1756234269.497",
-        "protobuf/3.21.12#44ee56c0a6eea0c19aeeaca680370b88%1764175361.456",
-        "cmake/4.2.0#ae0a44f44a1ef9ab68fd4b3e9a1f8671%1764175359.44",
-        "cmake/3.31.10#313d16a1aa16bbdb2ca0792467214b76%1764175359.429",
-        "b2/5.3.3#107c15377719889654eb9a162a673975%1756234226.28"
+        "zlib/1.3.2#1cb806da49011867778ffb6ac7190fcb%1778091116.056",
+        "protobuf/6.33.5#d96d52ba5baaaa532f47bda866ad87a5%1774467363.12",
+        "cmake/4.3.0#b939a42e98f593fb34d3a8c5cc860359%1774439249.183",
+        "cmake/3.31.11#f325c933f618a1fcebc1e1c0babfd1ba%1774439246.719",
+        "b2/5.4.2#ffd6084a119587e70f11cd45d1a386e2%1774439233.447",
+        "abseil/20250127.0#bb0baf1f362bc4a725a24eddd419b8f7%1774365460.196"
    ],
    "python_requires": [],
    "overrides": {
-        "boost/1.83.0": [
-            null,
-            "boost/1.83.0#91d8b1572534d2c334d6790e3c34d0c1"
+        "zlib/[>=1.2.11 <2]": [
+            "zlib/1.3.2#1cb806da49011867778ffb6ac7190fcb"
        ],
-        "protobuf/3.21.12": [
+        "zlib/1.3.2": [
            null,
-            "protobuf/3.21.12#44ee56c0a6eea0c19aeeaca680370b88"
+            "zlib/1.3.2#1cb806da49011867778ffb6ac7190fcb"
+        ],
+        "boost/1.91.0": [
+            "boost/1.91.0#ea540ca2133d831b560036aa24dece3c"
+        ],
+        "protobuf/[>=5.27.0 <7]": [
+            "protobuf/6.33.5"
        ],
        "lz4/1.9.4": [
            "lz4/1.10.0"
        ],
-        "sqlite3/3.44.2": [
-            "sqlite3/3.49.1"
+        "boost/[>=1.83.0 <1.91.0]": [
+            "boost/1.91.0"
        ],
-        "fmt/12.0.0": [
-            "fmt/12.1.0"
+        "sqlite3/[>=3.44 <4]": [
+            "sqlite3/3.53.0"
+        ],
+        "boost/1.83.0": [
+            "boost/1.91.0"
+        ],
+        "lz4/[>=1.9.4 <2]": [
+            "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504"
        ]
    },
    "config_requires": []
--- a/conanfile.py
+++ b/conanfile.py
@@ -12,39 +12,47 @@ class ClioConan(ConanFile):
    options = {}

    requires = [
-        "boost/1.83.0",
        "cassandra-cpp-driver/2.17.0",
-        "protobuf/3.21.12",
-        "grpc/1.50.1",
-        "openssl/1.1.1w",
-        "xrpl/3.0.0",
-        "zlib/1.3.1",
+        "fmt/12.1.0",
        "libbacktrace/cci.20210118",
-        "spdlog/1.16.0",
+        "spdlog/1.17.0",
+        "xrpl/3.2.0",
    ]

    default_options = {
-        "xrpl/*:tests": False,
-        "xrpl/*:rocksdb": False,
        "cassandra-cpp-driver/*:shared": False,
        "date/*:header_only": True,
-        "grpc/*:shared": False,
        "grpc/*:secure": True,
+        "grpc/*:shared": False,
+        "gtest/*:no_main": True,
        "libpq/*:shared": False,
        "lz4/*:shared": False,
        "openssl/*:shared": False,
        "protobuf/*:shared": False,
        "protobuf/*:with_zlib": True,
        "snappy/*:shared": False,
-        "gtest/*:no_main": True,
+        "xrpl/*:rocksdb": True,  # TODO: revert to false when includes are fixed in libxrpl
+        "xrpl/*:tests": False,
    }

    exports_sources = ("CMakeLists.txt", "cmake/*", "src/*")

    def requirements(self):
-        self.requires("gtest/1.14.0")
+        self.requires("gtest/1.17.0")
        self.requires("benchmark/1.9.4")
-        self.requires("fmt/12.1.0", force=True)
+        # Clio's own code includes grpc (<grpcpp/...>) and openssl (via
+        # <boost/asio/ssl>) headers directly, but xrpl does not re-export them
+        # (only boost/date/xxhash are required with transitive_headers=True).
+        # So they must be direct requirements of clio to get their include dirs;
+        # the version pins match xrpl's, so this does not change any package_id.
+        self.requires("grpc/1.78.1")
+        self.requires("openssl/3.6.2")
+        # Pin the remaining transitive deps to the exact versions xrpl uses.
+        # override=True only sets the version when the package appears
+        # transitively (it does not make them direct deps), and matches xrpl's
+        # force=True boost pin that overrides nudb's `boost < 1.91.0` cap.
+        self.requires("boost/1.91.0", override=True)
+        self.requires("zlib/1.3.2", override=True)

    def configure(self):
        if self.settings.compiler == "apple-clang":
--- a/docker/ci/Dockerfile
+++ b/docker/ci/Dockerfile
@@ -54,7 +54,7 @@ RUN pip install -q --no-cache-dir \
        # lxml 6.0.0 is not compatible with our image
        'lxml<6.0.0' \
        cmake \
-        conan==2.22.1 \
+        conan==2.24.0 \
        gcovr \
        # We're adding pre-commit to this image as well,
        # because clang-tidy workflow requires it
@@ -63,7 +63,7 @@ RUN pip install -q --no-cache-dir \
 # Install LLVM tools
 ARG LLVM_TOOLS_VERSION=20

-RUN echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-${LLVM_TOOLS_VERSION} main" >> /etc/apt/sources.list \
+RUN echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${LLVM_TOOLS_VERSION} main" >> /etc/apt/sources.list \
    && wget --progress=dot:giga -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -

 RUN apt-get update \
--- a/docker/ci/README.md
+++ b/docker/ci/README.md
@@ -3,17 +3,17 @@
 This image contains an environment to build [Clio](https://github.com/XRPLF/clio), check code and documentation.
 It is used in [Clio Github Actions](https://github.com/XRPLF/clio/actions) but can also be used to compile Clio locally.

-The image is based on Ubuntu 20.04 and contains:
+The image is based on Ubuntu 22.04 and contains:

- ccache 4.12.1
+- ccache 4.12.2
 - Clang 19
 - ClangBuildAnalyzer 1.6.0
- Conan 2.22.1
- Doxygen 1.15.0
+- Conan 2.24.0
+- Doxygen 1.16.1
 - GCC 15.2.0
- GDB 16.3
- gh 2.82.1
- git-cliff 2.10.1
+- GDB 17.1
+- gh 2.83.2
+- git-cliff 2.11.0
 - mold 2.40.4
 - Ninja 1.13.2
 - Python 3.8
--- a/docker/ci/conan/clang.profile
+++ b/docker/ci/conan/clang.profile
@@ -10,3 +10,5 @@ os=Linux
 [conf]
 tools.build:compiler_executables={"c": "/usr/bin/clang-19", "cpp": "/usr/bin/clang++-19"}
 grpc/1.50.1:tools.build:cxxflags+=["-Wno-missing-template-arg-list-after-template-kw"]
+user.package:libc_version=2.32
+tools.info.package_id:confs+=["user.package:libc_version"]
--- a/docker/ci/conan/gcc.profile
+++ b/docker/ci/conan/gcc.profile
@@ -9,3 +9,5 @@ os=Linux

 [conf]
 tools.build:compiler_executables={"c": "/usr/bin/gcc-15", "cpp": "/usr/bin/g++-15"}
+user.package:libc_version=2.32
+tools.info.package_id:confs+=["user.package:libc_version"]
--- a/docker/compilers/clang/Dockerfile
+++ b/docker/compilers/clang/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04

 ARG DEBIAN_FRONTEND=noninteractive

--- a/docker/compilers/gcc/Dockerfile
+++ b/docker/compilers/gcc/Dockerfile
@@ -1,4 +1,4 @@
-ARG UBUNTU_VERSION=20.04
+ARG UBUNTU_VERSION=22.04

 ARG GCC_MAJOR_VERSION=invalid

--- a/docker/develop/compose.yaml
+++ b/docker/develop/compose.yaml
@@ -1,6 +1,6 @@
 services:
  clio_develop:
-    image: ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f
+    image: ghcr.io/xrplf/clio-ci:94da8459ddc30e2f0d88a98cba63a57b2cda3031
    volumes:
      - clio_develop_conan_data:/root/.conan2/p
      - clio_develop_ccache:/root/.ccache
--- a/docker/tools/Dockerfile
+++ b/docker/tools/Dockerfile
@@ -42,7 +42,7 @@ RUN wget --progress=dot:giga "https://github.com/rui314/mold/archive/refs/tags/v
    && ninja install \
    && rm -rf /tmp/* /var/tmp/*

-ARG CCACHE_VERSION=4.12.1
+ARG CCACHE_VERSION=4.12.2
 RUN wget --progress=dot:giga "https://github.com/ccache/ccache/releases/download/v${CCACHE_VERSION}/ccache-${CCACHE_VERSION}.tar.gz" \
    && tar xf "ccache-${CCACHE_VERSION}.tar.gz" \
    && cd "ccache-${CCACHE_VERSION}" \
@@ -59,7 +59,7 @@ RUN apt-get update \
    && apt-get clean \
    && rm -rf /var/lib/apt/lists/*

-ARG DOXYGEN_VERSION=1.15.0
+ARG DOXYGEN_VERSION=1.16.1
 RUN wget --progress=dot:giga "https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/doxygen-${DOXYGEN_VERSION}.src.tar.gz" \
    && tar xf "doxygen-${DOXYGEN_VERSION}.src.tar.gz" \
    && cd "doxygen-${DOXYGEN_VERSION}" \
@@ -79,13 +79,13 @@ RUN wget --progress=dot:giga "https://github.com/aras-p/ClangBuildAnalyzer/archi
    && ninja install \
    && rm -rf /tmp/* /var/tmp/*

-ARG GIT_CLIFF_VERSION=2.10.1
+ARG GIT_CLIFF_VERSION=2.11.0
 RUN wget --progress=dot:giga "https://github.com/orhun/git-cliff/releases/download/v${GIT_CLIFF_VERSION}/git-cliff-${GIT_CLIFF_VERSION}-x86_64-unknown-linux-musl.tar.gz" \
    && tar xf git-cliff-${GIT_CLIFF_VERSION}-x86_64-unknown-linux-musl.tar.gz \
    && mv git-cliff-${GIT_CLIFF_VERSION}/git-cliff /usr/local/bin/git-cliff \
    && rm -rf /tmp/* /var/tmp/*

-ARG GH_VERSION=2.82.1
+ARG GH_VERSION=2.83.2
 RUN wget --progress=dot:giga "https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_${TARGETARCH}.tar.gz" \
    && tar xf gh_${GH_VERSION}_linux_${TARGETARCH}.tar.gz \
    && mv gh_${GH_VERSION}_linux_${TARGETARCH}/bin/gh /usr/local/bin/gh \
@@ -100,7 +100,7 @@ RUN apt-get update \
    && apt-get clean \
    && rm -rf /var/lib/apt/lists/*

-ARG GDB_VERSION=16.3
+ARG GDB_VERSION=17.1
 RUN wget --progress=dot:giga "https://sourceware.org/pub/gdb/releases/gdb-${GDB_VERSION}.tar.gz" \
    && tar xf "gdb-${GDB_VERSION}.tar.gz" \
    && cd "gdb-${GDB_VERSION}" \
--- a/docs/build-clio.md
+++ b/docs/build-clio.md
@@ -175,7 +175,7 @@ Open the `index.html` file in your browser to see the documentation pages.
 It is also possible to build Clio using [Docker](https://www.docker.com/) if you don't want to install all the dependencies on your machine.

 ```sh
-docker run -it ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f
+docker run -it ghcr.io/xrplf/clio-ci:94da8459ddc30e2f0d88a98cba63a57b2cda3031
 git clone https://github.com/XRPLF/clio
 cd clio
 ```
--- a/docs/config-description.md
+++ b/docs/config-description.md
@@ -457,6 +457,14 @@ This document provides a list of all available Clio configuration properties in
 - **Constraints**: None
 - **Description**: Max allowed difference between the latest sequence in DB and in cache file. If the cache file is too old (contains too low latest sequence) Clio will reject using it.

+### cache.file.async_save
+
+- **Required**: True
+- **Type**: boolean
+- **Default value**: `False`
+- **Constraints**: None
+- **Description**: When false, Clio waits for cache saving to finish before shutting down. When true, cache saving runs in parallel with other shutdown operations.
+
 ### log.channels.[].channel

 - **Required**: False
--- a/src/app/CliArgs.cpp
+++ b/src/app/CliArgs.cpp
@@ -77,7 +77,10 @@ CliArgs::parse(int argc, char const* argv[])
    }

    if (parsed.contains("version")) {
-        std::cout << util::build::getClioFullVersionString() << '\n';
+        std::cout << util::build::getClioFullVersionString() << '\n'
+                  << "Git commit hash: " << util::build::getGitCommitHash() << '\n'
+                  << "Git build branch: " << util::build::getGitBuildBranch() << '\n'
+                  << "Build date: " << util::build::getBuildDate() << '\n';
        return Action{Action::Exit{EXIT_SUCCESS}};
    }

--- a/src/app/WebHandlers.cpp
+++ b/src/app/WebHandlers.cpp
@@ -120,7 +120,7 @@ MetricsHandler::operator()(

    if (!postSuccessful) {
        return web::ng::Response{
-            boost::beast::http::status::too_many_requests, rpc::makeError(rpc::RippledError::rpcTOO_BUSY), request
+            boost::beast::http::status::too_many_requests, rpc::makeError(rpc::RippledError::RpcTooBusy), request
        };
    }

--- a/src/app/WebHandlers.hpp
+++ b/src/app/WebHandlers.hpp
@@ -252,7 +252,7 @@ public:
        } catch (std::exception const&) {
            return web::ng::Response{
                boost::beast::http::status::internal_server_error,
-                rpc::makeError(rpc::RippledError::rpcINTERNAL),
+                rpc::makeError(rpc::RippledError::RpcInternal),
                request
            };
        }
--- a/src/data/AmendmentCenter.cpp
+++ b/src/data/AmendmentCenter.cpp
@@ -57,7 +57,7 @@ supportedAmendments()
 }

 bool
-lookupAmendment(auto const& allAmendments, std::vector<ripple::uint256> const& ledgerAmendments, std::string_view name)
+lookupAmendment(auto const& allAmendments, std::vector<xrpl::uint256> const& ledgerAmendments, std::string_view name)
 {
    namespace rg = std::ranges;
    if (auto const am = rg::find(allAmendments, name, &data::Amendment::name); am != rg::end(allAmendments))
@@ -91,7 +91,7 @@ operator std::string_view() const
 }

 AmendmentKey::
-operator ripple::uint256() const
+operator xrpl::uint256() const
 {
    return Amendment::getAmendmentId(name);
 }
@@ -102,14 +102,14 @@ AmendmentCenter::AmendmentCenter(std::shared_ptr<data::BackendInterface> const&
    namespace vs = std::views;

    rg::copy(
-        ripple::allAmendments() | vs::transform([&](auto const& p) {
+        xrpl::allAmendments() | vs::transform([&](auto const& p) {
            auto const& [name, support] = p;
            return Amendment{
                .name = name,
                .feature = Amendment::getAmendmentId(name),
-                .isSupportedByXRPL = support != ripple::AmendmentSupport::Unsupported,
+                .isSupportedByXRPL = support != xrpl::AmendmentSupport::Unsupported,
                .isSupportedByClio = rg::find(supportedAmendments(), name) != rg::end(supportedAmendments()),
-                .isRetired = support == ripple::AmendmentSupport::Retired
+                .isRetired = support == xrpl::AmendmentSupport::Retired
            };
        }),
        std::back_inserter(all_)
@@ -146,9 +146,12 @@ AmendmentCenter::isEnabled(AmendmentKey const& key, uint32_t seq) const
 bool
 AmendmentCenter::isEnabled(boost::asio::yield_context yield, AmendmentKey const& key, uint32_t seq) const
 {
-    if (auto const listAmendments = fetchAmendmentsList(yield, seq); listAmendments)
-        return lookupAmendment(all_, *listAmendments, key);
-
+    try {
+        if (auto const listAmendments = fetchAmendmentsList(yield, seq); listAmendments)
+            return lookupAmendment(all_, *listAmendments, key);
+    } catch (std::runtime_error const&) {
+        return false;  // Some old ledger does not contain Amendments ledger object so do best we can for now
+    }
    return false;
 }

@@ -157,13 +160,19 @@ AmendmentCenter::isEnabled(boost::asio::yield_context yield, std::vector<Amendme
 {
    namespace rg = std::ranges;

-    if (auto const listAmendments = fetchAmendmentsList(yield, seq); listAmendments) {
-        std::vector<bool> out;
-        rg::transform(keys, std::back_inserter(out), [this, &listAmendments](auto const& key) {
-            return lookupAmendment(all_, *listAmendments, key);
-        });
+    try {
+        if (auto const listAmendments = fetchAmendmentsList(yield, seq); listAmendments) {
+            std::vector<bool> out;
+            rg::transform(keys, std::back_inserter(out), [this, &listAmendments](auto const& key) {
+                return lookupAmendment(all_, *listAmendments, key);
+            });

-        return out;
+            return out;
+        }
+    } catch (std::runtime_error const&) {
+        return std::vector<bool>(
+            keys.size(), false
+        );  // Some old ledger does not contain Amendments ledger object so do best we can for now
    }

    return std::vector<bool>(keys.size(), false);
@@ -182,25 +191,25 @@ AmendmentCenter::operator[](AmendmentKey const& key) const
    return getAmendment(key);
 }

-ripple::uint256
+xrpl::uint256
 Amendment::getAmendmentId(std::string_view name)
 {
-    return ripple::sha512Half(ripple::Slice(name.data(), name.size()));
+    return xrpl::sha512Half(xrpl::Slice(name.data(), name.size()));
 }

-std::optional<std::vector<ripple::uint256>>
+std::optional<std::vector<xrpl::uint256>>
 AmendmentCenter::fetchAmendmentsList(boost::asio::yield_context yield, uint32_t seq) const
 {
    // the amendments should always be present on the ledger
-    auto const amendments = backend_->fetchLedgerObject(ripple::keylet::amendments().key, seq, yield);
+    auto const amendments = backend_->fetchLedgerObject(xrpl::keylet::amendments().key, seq, yield);
    if (not amendments.has_value())
        throw std::runtime_error("Amendments ledger object must be present in the database");

-    ripple::SLE const amendmentsSLE{
-        ripple::SerialIter{amendments->data(), amendments->size()}, ripple::keylet::amendments().key
+    xrpl::SLE const amendmentsSLE{
+        xrpl::SerialIter{amendments->data(), amendments->size()}, xrpl::keylet::amendments().key
    };

-    return amendmentsSLE[~ripple::sfAmendments];
+    return amendmentsSLE[~xrpl::sfAmendments];
 }

 }  // namespace data
--- a/src/data/AmendmentCenter.hpp
+++ b/src/data/AmendmentCenter.hpp
@@ -153,6 +153,11 @@ struct Amendments {
    REGISTER(fixIncludeKeyletFields);
    REGISTER(fixTokenEscrowV1);
    REGISTER(LendingProtocol);
+    REGISTER(MPTokensV2);
+    REGISTER(PermissionDelegationV1_1);
+    REGISTER(fixBatchInnerSigs);
+    REGISTER(fixCleanup3_1_3);
+    REGISTER(fixCleanup3_2_0);

    // Obsolete but supported by libxrpl
    REGISTER(CryptoConditionsSuite);
@@ -276,7 +281,7 @@ public:
    operator[](AmendmentKey const& key) const final;

 private:
-    [[nodiscard]] std::optional<std::vector<ripple::uint256>>
+    [[nodiscard]] std::optional<std::vector<xrpl::uint256>>
    fetchAmendmentsList(boost::asio::yield_context yield, uint32_t seq) const;
 };

--- a/src/data/BackendInterface.cpp
+++ b/src/data/BackendInterface.cpp
@@ -64,7 +64,7 @@ BackendInterface::finishWrites(std::uint32_t const ledgerSequence)
 void
 BackendInterface::writeLedgerObject(std::string&& key, std::uint32_t const seq, std::string&& blob)
 {
-    ASSERT(key.size() == sizeof(ripple::uint256), "Key must be 256 bits");
+    ASSERT(key.size() == sizeof(xrpl::uint256), "Key must be 256 bits");
    doWriteLedgerObject(std::move(key), seq, std::move(blob));
 }

@@ -77,14 +77,14 @@ BackendInterface::hardFetchLedgerRangeNoThrow() const
 // *** state data methods
 std::optional<Blob>
 BackendInterface::fetchLedgerObject(
-    ripple::uint256 const& key,
+    xrpl::uint256 const& key,
    std::uint32_t const sequence,
    boost::asio::yield_context yield
 ) const
 {
    auto obj = cache_.get().get(key, sequence);
    if (obj) {
-        LOG(log_.trace()) << "Cache hit - " << ripple::strHex(key);
+        LOG(log_.trace()) << "Cache hit - " << xrpl::strHex(key);
        return obj;
    }

@@ -99,7 +99,7 @@ BackendInterface::fetchLedgerObject(

 std::optional<std::uint32_t>
 BackendInterface::fetchLedgerObjectSeq(
-    ripple::uint256 const& key,
+    xrpl::uint256 const& key,
    std::uint32_t const sequence,
    boost::asio::yield_context yield
 ) const
@@ -112,14 +112,14 @@ BackendInterface::fetchLedgerObjectSeq(

 std::vector<Blob>
 BackendInterface::fetchLedgerObjects(
-    std::vector<ripple::uint256> const& keys,
+    std::vector<xrpl::uint256> const& keys,
    std::uint32_t const sequence,
    boost::asio::yield_context yield
 ) const
 {
    std::vector<Blob> results;
    results.resize(keys.size());
-    std::vector<ripple::uint256> misses;
+    std::vector<xrpl::uint256> misses;
    for (size_t i = 0; i < keys.size(); ++i) {
        auto obj = cache_.get().get(keys[i], sequence);
        if (obj) {
@@ -144,25 +144,25 @@ BackendInterface::fetchLedgerObjects(
 }

 // Fetches the successor to key/index
-std::optional<ripple::uint256>
+std::optional<xrpl::uint256>
 BackendInterface::fetchSuccessorKey(
-    ripple::uint256 key,
+    xrpl::uint256 key,
    std::uint32_t const ledgerSequence,
    boost::asio::yield_context yield
 ) const
 {
    auto succ = cache_.get().getSuccessor(key, ledgerSequence);
    if (succ) {
-        LOG(log_.trace()) << "Cache hit - " << ripple::strHex(key);
+        LOG(log_.trace()) << "Cache hit - " << xrpl::strHex(key);
    } else {
-        LOG(log_.trace()) << "Cache miss - " << ripple::strHex(key);
+        LOG(log_.trace()) << "Cache miss - " << xrpl::strHex(key);
    }
    return succ ? succ->key : doFetchSuccessorKey(key, ledgerSequence, yield);
 }

 std::optional<LedgerObject>
 BackendInterface::fetchSuccessorObject(
-    ripple::uint256 key,
+    xrpl::uint256 key,
    std::uint32_t const ledgerSequence,
    boost::asio::yield_context yield
 ) const
@@ -180,7 +180,7 @@ BackendInterface::fetchSuccessorObject(

 BookOffersPage
 BackendInterface::fetchBookOffers(
-    ripple::uint256 const& book,
+    xrpl::uint256 const& book,
    std::uint32_t const ledgerSequence,
    std::uint32_t const limit,
    boost::asio::yield_context yield
@@ -189,9 +189,9 @@ BackendInterface::fetchBookOffers(
    // TODO try to speed this up. This can take a few seconds. The goal is
    // to get it down to a few hundred milliseconds.
    BookOffersPage page;
-    ripple::uint256 const bookEnd = ripple::getQualityNext(book);
-    ripple::uint256 uTipIndex = book;
-    std::vector<ripple::uint256> keys;
+    xrpl::uint256 const bookEnd = xrpl::getQualityNext(book);
+    xrpl::uint256 uTipIndex = book;
+    std::vector<xrpl::uint256> keys;
    auto getMillis = [](auto diff) { return std::chrono::duration_cast<std::chrono::milliseconds>(diff).count(); };
    auto begin = std::chrono::system_clock::now();
    std::uint32_t numSucc = 0;
@@ -211,17 +211,17 @@ BackendInterface::fetchBookOffers(
        uTipIndex = offerDir->key;
        while (keys.size() < limit) {
            ++numPages;
-            ripple::STLedgerEntry const sle{
-                ripple::SerialIter{offerDir->blob.data(), offerDir->blob.size()}, offerDir->key
+            xrpl::STLedgerEntry const sle{
+                xrpl::SerialIter{offerDir->blob.data(), offerDir->blob.size()}, offerDir->key
            };
-            auto indexes = sle.getFieldV256(ripple::sfIndexes);
+            auto indexes = sle.getFieldV256(xrpl::sfIndexes);
            keys.insert(keys.end(), indexes.begin(), indexes.end());
-            auto next = sle.getFieldU64(ripple::sfIndexNext);
+            auto next = sle.getFieldU64(xrpl::sfIndexNext);
            if (next == 0u) {
                LOG(log_.trace()) << "Next is empty. breaking";
                break;
            }
-            auto nextKey = ripple::keylet::page(uTipIndex, next);
+            auto nextKey = xrpl::keylet::page(uTipIndex, next);
            auto nextDir = fetchLedgerObject(nextKey.key, ledgerSequence, yield);
            ASSERT(nextDir.has_value(), "Next dir must exist");
            offerDir->blob = *nextDir;
@@ -233,7 +233,7 @@ BackendInterface::fetchBookOffers(
    auto mid = std::chrono::system_clock::now();
    auto objs = fetchLedgerObjects(keys, ledgerSequence, yield);
    for (size_t i = 0; i < keys.size() && i < limit; ++i) {
-        LOG(log_.trace()) << "Key = " << ripple::strHex(keys[i]) << " blob = " << ripple::strHex(objs[i])
+        LOG(log_.trace()) << "Key = " << xrpl::strHex(keys[i]) << " blob = " << xrpl::strHex(objs[i])
                          << " ledgerSequence = " << ledgerSequence;
        ASSERT(!objs[i].empty(), "Ledger object can't be empty");
        page.offers.push_back({keys[i], objs[i]});
@@ -247,7 +247,7 @@ BackendInterface::fetchBookOffers(
                      << ". num pages = " << std::to_string(numPages) << ". Fetching all objects took "
                      << std::to_string(getMillis(end - mid))
                      << " milliseconds. total time = " << std::to_string(getMillis(end - begin)) << " milliseconds"
-                      << " book = " << ripple::strHex(book);
+                      << " book = " << xrpl::strHex(book);

    return page;
 }
@@ -305,7 +305,7 @@ BackendInterface::setRange(uint32_t min, uint32_t max, bool force)

 LedgerPage
 BackendInterface::fetchLedgerPage(
-    std::optional<ripple::uint256> const& cursor,
+    std::optional<xrpl::uint256> const& cursor,
    std::uint32_t const ledgerSequence,
    std::uint32_t const limit,
    bool outOfOrder,
@@ -314,11 +314,11 @@ BackendInterface::fetchLedgerPage(
 {
    LedgerPage page;

-    std::vector<ripple::uint256> keys;
+    std::vector<xrpl::uint256> keys;
    bool reachedEnd = false;

    while (keys.size() < limit && !reachedEnd) {
-        ripple::uint256 const& curCursor = [&]() {
+        xrpl::uint256 const& curCursor = [&]() {
            if (!keys.empty())
                return keys.back();
            return (cursor ? *cursor : kFIRST_KEY);
@@ -339,11 +339,11 @@ BackendInterface::fetchLedgerPage(
        if (!objects[i].empty()) {
            page.objects.push_back({keys[i], std::move(objects[i])});
        } else if (!outOfOrder) {
-            LOG(log_.error()) << "Deleted or non-existent object in successor table. key = " << ripple::strHex(keys[i])
+            LOG(log_.error()) << "Deleted or non-existent object in successor table. key = " << xrpl::strHex(keys[i])
                              << " - seq = " << ledgerSequence;
            std::stringstream msg;
            for (size_t j = 0; j < objects.size(); ++j) {
-                msg << " - " << ripple::strHex(keys[j]);
+                msg << " - " << xrpl::strHex(keys[j]);
            }
            LOG(log_.error()) << msg.str();

@@ -357,12 +357,12 @@ BackendInterface::fetchLedgerPage(
    return page;
 }

-std::optional<ripple::Fees>
+std::optional<xrpl::Fees>
 BackendInterface::fetchFees(std::uint32_t const seq, boost::asio::yield_context yield) const
 {
-    ripple::Fees fees;
+    xrpl::Fees fees;

-    auto key = ripple::keylet::fees().key;
+    auto key = xrpl::keylet::fees().key;
    auto bytes = fetchLedgerObject(key, seq, yield);

    if (!bytes) {
@@ -370,17 +370,17 @@ BackendInterface::fetchFees(std::uint32_t const seq, boost::asio::yield_context
        return {};
    }

-    ripple::SerialIter it(bytes->data(), bytes->size());
-    ripple::SLE const sle{it, key};
+    xrpl::SerialIter it(bytes->data(), bytes->size());
+    xrpl::SLE const sle{it, key};

    // XRPFees amendment introduced new fields for fees calculations.
    // New fields are set and the old fields are removed via `set_fees` tx.
    // Fallback to old fields if `set_fees` was not yet used to update the fields on this tx.
    auto hasNewFields = false;
    {
-        auto const baseFeeXRP = sle.at(~ripple::sfBaseFeeDrops);
-        auto const reserveBaseXRP = sle.at(~ripple::sfReserveBaseDrops);
-        auto const reserveIncrementXRP = sle.at(~ripple::sfReserveIncrementDrops);
+        auto const baseFeeXRP = sle.at(~xrpl::sfBaseFeeDrops);
+        auto const reserveBaseXRP = sle.at(~xrpl::sfReserveBaseDrops);
+        auto const reserveIncrementXRP = sle.at(~xrpl::sfReserveIncrementDrops);

        if (baseFeeXRP)
            fees.base = baseFeeXRP->xrp();
@@ -396,9 +396,9 @@ BackendInterface::fetchFees(std::uint32_t const seq, boost::asio::yield_context

    if (not hasNewFields) {
        // Fallback to old fields
-        auto const baseFee = sle.at(~ripple::sfBaseFee);
-        auto const reserveBase = sle.at(~ripple::sfReserveBase);
-        auto const reserveIncrement = sle.at(~ripple::sfReserveIncrement);
+        auto const baseFee = sle.at(~xrpl::sfBaseFee);
+        auto const reserveBase = sle.at(~xrpl::sfReserveBase);
+        auto const reserveIncrement = sle.at(~xrpl::sfReserveIncrement);

        if (baseFee)
            fees.base = baseFee.value();
--- a/src/data/BackendInterface.hpp
+++ b/src/data/BackendInterface.hpp
@@ -192,9 +192,9 @@ public:
     *
     * @param sequence The sequence number to fetch for
     * @param yield The coroutine context
-     * @return The ripple::LedgerHeader if found; nullopt otherwise
+     * @return The xrpl::LedgerHeader if found; nullopt otherwise
     */
-    virtual std::optional<ripple::LedgerHeader>
+    virtual std::optional<xrpl::LedgerHeader>
    fetchLedgerBySequence(std::uint32_t sequence, boost::asio::yield_context yield) const = 0;

    /**
@@ -202,10 +202,10 @@ public:
     *
     * @param hash The hash to fetch for
     * @param yield The coroutine context
-     * @return The ripple::LedgerHeader if found; nullopt otherwise
+     * @return The xrpl::LedgerHeader if found; nullopt otherwise
     */
-    virtual std::optional<ripple::LedgerHeader>
-    fetchLedgerByHash(ripple::uint256 const& hash, boost::asio::yield_context yield) const = 0;
+    virtual std::optional<xrpl::LedgerHeader>
+    fetchLedgerByHash(xrpl::uint256 const& hash, boost::asio::yield_context yield) const = 0;

    /**
     * @brief Fetches the latest ledger sequence.
@@ -231,9 +231,9 @@ public:
     * @param pageSize The maximum number of accounts per page
     * @param seq The accounts need to exist for this sequence
     * @param yield The coroutine context
-     * @return A vector of ripple::uint256 representing the account roots
+     * @return A vector of xrpl::uint256 representing the account roots
     */
-    virtual std::vector<ripple::uint256>
+    virtual std::vector<xrpl::uint256>
    fetchAccountRoots(
        std::uint32_t number,
        std::uint32_t pageSize,
@@ -275,7 +275,7 @@ public:
     * @param yield The coroutine context
     * @return Fees if fees are found; nullopt otherwise
     */
-    std::optional<ripple::Fees>
+    std::optional<xrpl::Fees>
    fetchFees(std::uint32_t seq, boost::asio::yield_context yield) const;

    /**
@@ -286,7 +286,7 @@ public:
     * @return TransactionAndMetadata if transaction is found; nullopt otherwise
     */
    virtual std::optional<TransactionAndMetadata>
-    fetchTransaction(ripple::uint256 const& hash, boost::asio::yield_context yield) const = 0;
+    fetchTransaction(xrpl::uint256 const& hash, boost::asio::yield_context yield) const = 0;

    /**
     * @brief Fetches multiple transactions.
@@ -296,7 +296,7 @@ public:
     * @return A vector of TransactionAndMetadata matching the given hashes
     */
    virtual std::vector<TransactionAndMetadata>
-    fetchTransactions(std::vector<ripple::uint256> const& hashes, boost::asio::yield_context yield) const = 0;
+    fetchTransactions(std::vector<xrpl::uint256> const& hashes, boost::asio::yield_context yield) const = 0;

    /**
     * @brief Fetches all transactions for a specific account.
@@ -310,7 +310,7 @@ public:
     */
    virtual TransactionsAndCursor
    fetchAccountTransactions(
-        ripple::AccountID const& account,
+        xrpl::AccountID const& account,
        std::uint32_t limit,
        bool forward,
        std::optional<TransactionsCursor> const& txnCursor,
@@ -332,9 +332,9 @@ public:
     *
     * @param ledgerSequence The ledger sequence to fetch for
     * @param yield The coroutine context
-     * @return Hashes as ripple::uint256 in a vector
+     * @return Hashes as xrpl::uint256 in a vector
     */
-    virtual std::vector<ripple::uint256>
+    virtual std::vector<xrpl::uint256>
    fetchAllTransactionHashesInLedger(std::uint32_t ledgerSequence, boost::asio::yield_context yield) const = 0;

    /**
@@ -346,7 +346,7 @@ public:
     * @return NFT object on success; nullopt otherwise
     */
    virtual std::optional<NFT>
-    fetchNFT(ripple::uint256 const& tokenID, std::uint32_t ledgerSequence, boost::asio::yield_context yield) const = 0;
+    fetchNFT(xrpl::uint256 const& tokenID, std::uint32_t ledgerSequence, boost::asio::yield_context yield) const = 0;

    /**
     * @brief Fetches all transactions for a specific NFT.
@@ -360,7 +360,7 @@ public:
     */
    virtual TransactionsAndCursor
    fetchNFTTransactions(
-        ripple::uint256 const& tokenID,
+        xrpl::uint256 const& tokenID,
        std::uint32_t limit,
        bool forward,
        std::optional<TransactionsCursor> const& cursorIn,
@@ -380,11 +380,11 @@ public:
     */
    virtual NFTsAndCursor
    fetchNFTsByIssuer(
-        ripple::AccountID const& issuer,
+        xrpl::AccountID const& issuer,
        std::optional<std::uint32_t> const& taxon,
        std::uint32_t ledgerSequence,
        std::uint32_t limit,
-        std::optional<ripple::uint256> const& cursorIn,
+        std::optional<xrpl::uint256> const& cursorIn,
        boost::asio::yield_context yield
    ) const = 0;

@@ -400,9 +400,9 @@ public:
     */
    virtual MPTHoldersAndCursor
    fetchMPTHolders(
-        ripple::uint192 const& mptID,
+        xrpl::uint192 const& mptID,
        std::uint32_t const limit,
-        std::optional<ripple::AccountID> const& cursorIn,
+        std::optional<xrpl::AccountID> const& cursorIn,
        std::uint32_t const ledgerSequence,
        boost::asio::yield_context yield
    ) const = 0;
@@ -419,7 +419,7 @@ public:
     * @return The object as a Blob on success; nullopt otherwise
     */
    std::optional<Blob>
-    fetchLedgerObject(ripple::uint256 const& key, std::uint32_t sequence, boost::asio::yield_context yield) const;
+    fetchLedgerObject(xrpl::uint256 const& key, std::uint32_t sequence, boost::asio::yield_context yield) const;

    /**
     * @brief Fetches a specific ledger object sequence.
@@ -432,7 +432,7 @@ public:
     * @return The sequence in unit32_t on success; nullopt otherwise
     */
    std::optional<std::uint32_t>
-    fetchLedgerObjectSeq(ripple::uint256 const& key, std::uint32_t sequence, boost::asio::yield_context yield) const;
+    fetchLedgerObjectSeq(xrpl::uint256 const& key, std::uint32_t sequence, boost::asio::yield_context yield) const;

    /**
     * @brief Fetches all ledger objects by their keys.
@@ -447,7 +447,7 @@ public:
     */
    std::vector<Blob>
    fetchLedgerObjects(
-        std::vector<ripple::uint256> const& keys,
+        std::vector<xrpl::uint256> const& keys,
        std::uint32_t sequence,
        boost::asio::yield_context yield
    ) const;
@@ -461,7 +461,7 @@ public:
     * @return The object as a Blob on success; nullopt otherwise
     */
    virtual std::optional<Blob>
-    doFetchLedgerObject(ripple::uint256 const& key, std::uint32_t sequence, boost::asio::yield_context yield) const = 0;
+    doFetchLedgerObject(xrpl::uint256 const& key, std::uint32_t sequence, boost::asio::yield_context yield) const = 0;

    /**
     * @brief The database-specific implementation for fetching a ledger object sequence.
@@ -473,7 +473,7 @@ public:
     */
    virtual std::optional<std::uint32_t>
    doFetchLedgerObjectSeq(
-        ripple::uint256 const& key,
+        xrpl::uint256 const& key,
        std::uint32_t sequence,
        boost::asio::yield_context yield
    ) const = 0;
@@ -488,7 +488,7 @@ public:
     */
    virtual std::vector<Blob>
    doFetchLedgerObjects(
-        std::vector<ripple::uint256> const& keys,
+        std::vector<xrpl::uint256> const& keys,
        std::uint32_t sequence,
        boost::asio::yield_context yield
    ) const = 0;
@@ -515,7 +515,7 @@ public:
     */
    LedgerPage
    fetchLedgerPage(
-        std::optional<ripple::uint256> const& cursor,
+        std::optional<xrpl::uint256> const& cursor,
        std::uint32_t ledgerSequence,
        std::uint32_t limit,
        bool outOfOrder,
@@ -531,7 +531,7 @@ public:
     * @return The successor on success; nullopt otherwise
     */
    std::optional<LedgerObject>
-    fetchSuccessorObject(ripple::uint256 key, std::uint32_t ledgerSequence, boost::asio::yield_context yield) const;
+    fetchSuccessorObject(xrpl::uint256 key, std::uint32_t ledgerSequence, boost::asio::yield_context yield) const;

    /**
     * @brief Fetches the successor key.
@@ -544,8 +544,8 @@ public:
     * @param yield The coroutine context
     * @return The successor key on success; nullopt otherwise
     */
-    std::optional<ripple::uint256>
-    fetchSuccessorKey(ripple::uint256 key, std::uint32_t ledgerSequence, boost::asio::yield_context yield) const;
+    std::optional<xrpl::uint256>
+    fetchSuccessorKey(xrpl::uint256 key, std::uint32_t ledgerSequence, boost::asio::yield_context yield) const;

    /**
     * @brief Database-specific implementation of fetching the successor key
@@ -555,8 +555,8 @@ public:
     * @param yield The coroutine context
     * @return The successor on success; nullopt otherwise
     */
-    virtual std::optional<ripple::uint256>
-    doFetchSuccessorKey(ripple::uint256 key, std::uint32_t ledgerSequence, boost::asio::yield_context yield) const = 0;
+    virtual std::optional<xrpl::uint256>
+    doFetchSuccessorKey(xrpl::uint256 key, std::uint32_t ledgerSequence, boost::asio::yield_context yield) const = 0;

    /**
     * @brief Fetches book offers.
@@ -569,7 +569,7 @@ public:
     */
    BookOffersPage
    fetchBookOffers(
-        ripple::uint256 const& book,
+        xrpl::uint256 const& book,
        std::uint32_t ledgerSequence,
        std::uint32_t limit,
        boost::asio::yield_context yield
@@ -632,7 +632,7 @@ public:
     * @param blob r-value string serialization of ledger header.
     */
    virtual void
-    writeLedger(ripple::LedgerHeader const& ledgerHeader, std::string&& blob) = 0;
+    writeLedger(xrpl::LedgerHeader const& ledgerHeader, std::string&& blob) = 0;

    /**
     * @brief Writes a new ledger object.
--- a/src/data/CassandraBackend.hpp
+++ b/src/data/CassandraBackend.hpp
@@ -116,11 +116,11 @@ public:

    NFTsAndCursor
    fetchNFTsByIssuer(
-        ripple::AccountID const& issuer,
+        xrpl::AccountID const& issuer,
        std::optional<std::uint32_t> const& taxon,
        std::uint32_t const ledgerSequence,
        std::uint32_t const limit,
-        std::optional<ripple::uint256> const& cursorIn,
+        std::optional<xrpl::uint256> const& cursorIn,
        boost::asio::yield_context yield
    ) const override
    {
@@ -130,7 +130,7 @@ public:
            if (taxon.has_value()) {
                auto r = schema_->selectNFTIDsByIssuerTaxon.bind(issuer);
                r.bindAt(1, *taxon);
-                r.bindAt(2, cursorIn.value_or(ripple::uint256(0)));
+                r.bindAt(2, cursorIn.value_or(xrpl::uint256(0)));
                r.bindAt(3, Limit{limit});
                return r;
            }
@@ -139,8 +139,8 @@ public:
            r.bindAt(
                1,
                std::make_tuple(
-                    cursorIn.has_value() ? ripple::nft::toUInt32(ripple::nft::getTaxon(*cursorIn)) : 0,
-                    cursorIn.value_or(ripple::uint256(0))
+                    cursorIn.has_value() ? xrpl::nft::toUInt32(xrpl::nft::getTaxon(*cursorIn)) : 0,
+                    cursorIn.value_or(xrpl::uint256(0))
                )
            );
            r.bindAt(2, Limit{limit});
@@ -156,8 +156,8 @@ public:
            return {};
        }

-        std::vector<ripple::uint256> nftIDs;
-        for (auto const [nftID] : extract<ripple::uint256>(idQueryResults))
+        std::vector<xrpl::uint256> nftIDs;
+        for (auto const [nftID] : extract<xrpl::uint256>(idQueryResults))
            nftIDs.push_back(nftID);

        if (nftIDs.empty())
@@ -189,11 +189,11 @@ public:
        auto const nftUris = executor_.readEach(yield, selectNFTURIStatements);

        for (auto i = 0u; i < nftIDs.size(); i++) {
-            if (auto const maybeRow = nftInfos[i].template get<uint32_t, ripple::AccountID, bool>();
+            if (auto const maybeRow = nftInfos[i].template get<uint32_t, xrpl::AccountID, bool>();
                maybeRow.has_value()) {
                auto [seq, owner, isBurned] = *maybeRow;
                NFT nft(nftIDs[i], seq, owner, isBurned);
-                if (auto const maybeUri = nftUris[i].template get<ripple::Blob>(); maybeUri.has_value())
+                if (auto const maybeUri = nftUris[i].template get<xrpl::Blob>(); maybeUri.has_value())
                    nft.uri = *maybeUri;
                ret.nfts.push_back(nft);
            }
@@ -201,7 +201,7 @@ public:
        return ret;
    }

-    std::vector<ripple::uint256>
+    std::vector<xrpl::uint256>
    fetchAccountRoots(
        std::uint32_t number,
        std::uint32_t pageSize,
@@ -209,8 +209,8 @@ public:
        boost::asio::yield_context yield
    ) const override
    {
-        std::vector<ripple::uint256> liveAccounts;
-        std::optional<ripple::AccountID> lastItem;
+        std::vector<xrpl::uint256> liveAccounts;
+        std::optional<xrpl::AccountID> lastItem;

        while (liveAccounts.size() < number) {
            Statement const statement = lastItem ? schema_->selectAccountFromToken.bind(*lastItem, Limit{pageSize})
@@ -224,9 +224,9 @@ public:
                    break;
                }
                // The results should not contain duplicates, we just filter out deleted accounts
-                std::vector<ripple::uint256> fullAccounts;
-                for (auto [account] : extract<ripple::AccountID>(results)) {
-                    fullAccounts.push_back(ripple::keylet::account(account).key);
+                std::vector<xrpl::uint256> fullAccounts;
+                for (auto [account] : extract<xrpl::AccountID>(results)) {
+                    fullAccounts.push_back(xrpl::keylet::account(account).key);
                    lastItem = account;
                }
                auto const objs = this->doFetchLedgerObjects(fullAccounts, seq, yield);
--- a/src/data/DBHelpers.hpp
+++ b/src/data/DBHelpers.hpp
@@ -43,10 +43,10 @@
 * @brief Struct used to keep track of what to write to account_transactions/account_tx tables.
 */
 struct AccountTransactionsData {
-    boost::container::flat_set<ripple::AccountID> accounts;
+    boost::container::flat_set<xrpl::AccountID> accounts;
    std::uint32_t ledgerSequence{};
    std::uint32_t transactionIndex{};
-    ripple::uint256 txHash;
+    xrpl::uint256 txHash;

    /**
     * @brief Construct a new AccountTransactionsData object
@@ -54,7 +54,7 @@ struct AccountTransactionsData {
     * @param meta The transaction metadata
     * @param txHash The transaction hash
     */
-    AccountTransactionsData(ripple::TxMeta const& meta, ripple::uint256 const& txHash)
+    AccountTransactionsData(xrpl::TxMeta const& meta, xrpl::uint256 const& txHash)
        : accounts(meta.getAffectedAccounts())
        , ledgerSequence(meta.getLgrSeq())
        , transactionIndex(meta.getIndex())
@@ -71,10 +71,10 @@ struct AccountTransactionsData {
 * Gets written to nf_token_transactions table and the like.
 */
 struct NFTTransactionsData {
-    ripple::uint256 tokenID;
+    xrpl::uint256 tokenID;
    std::uint32_t ledgerSequence;
    std::uint32_t transactionIndex;
-    ripple::uint256 txHash;
+    xrpl::uint256 txHash;

    /**
     * @brief Construct a new NFTTransactionsData object
@@ -83,7 +83,7 @@ struct NFTTransactionsData {
     * @param meta The transaction metadata
     * @param txHash The transaction hash
     */
-    NFTTransactionsData(ripple::uint256 const& tokenID, ripple::TxMeta const& meta, ripple::uint256 const& txHash)
+    NFTTransactionsData(xrpl::uint256 const& tokenID, xrpl::TxMeta const& meta, xrpl::uint256 const& txHash)
        : tokenID(tokenID), ledgerSequence(meta.getLgrSeq()), transactionIndex(meta.getIndex()), txHash(txHash)
    {
    }
@@ -101,11 +101,11 @@ struct NFTTransactionsData {
 * We only set the uri if this is a mint tx, or if we are loading initial state from NFTokenPage objects.
 */
 struct NFTsData {
-    ripple::uint256 tokenID;
+    xrpl::uint256 tokenID;
    std::uint32_t ledgerSequence;
    std::optional<std::uint32_t> transactionIndex;
-    ripple::AccountID owner;
-    std::optional<ripple::Blob> uri;
+    xrpl::AccountID owner;
+    std::optional<xrpl::Blob> uri;
    bool isBurned = false;
    bool onlyUriChanged = false;  // Whether only the URI was changed

@@ -122,10 +122,10 @@ struct NFTsData {
     * @param meta The transaction metadata
     */
    NFTsData(
-        ripple::uint256 const& tokenID,
-        ripple::AccountID const& owner,
-        ripple::Blob const& uri,
-        ripple::TxMeta const& meta
+        xrpl::uint256 const& tokenID,
+        xrpl::AccountID const& owner,
+        xrpl::Blob const& uri,
+        xrpl::TxMeta const& meta
    )
        : tokenID(tokenID), ledgerSequence(meta.getLgrSeq()), transactionIndex(meta.getIndex()), owner(owner), uri(uri)
    {
@@ -141,7 +141,7 @@ struct NFTsData {
     * @param meta The transaction metadata
     * @param isBurned Whether the NFT is burned
     */
-    NFTsData(ripple::uint256 const& tokenID, ripple::AccountID const& owner, ripple::TxMeta const& meta, bool isBurned)
+    NFTsData(xrpl::uint256 const& tokenID, xrpl::AccountID const& owner, xrpl::TxMeta const& meta, bool isBurned)
        : tokenID(tokenID)
        , ledgerSequence(meta.getLgrSeq())
        , transactionIndex(meta.getIndex())
@@ -163,10 +163,10 @@ struct NFTsData {
     * @param uri The URI
     */
    NFTsData(
-        ripple::uint256 const& tokenID,
+        xrpl::uint256 const& tokenID,
        std::uint32_t const ledgerSequence,
-        ripple::AccountID const& owner,
-        ripple::Blob const& uri
+        xrpl::AccountID const& owner,
+        xrpl::Blob const& uri
    )
        : tokenID(tokenID), ledgerSequence(ledgerSequence), owner(owner), uri(uri)
    {
@@ -180,7 +180,7 @@ struct NFTsData {
     * @param uri The new URI
     *
     */
-    NFTsData(ripple::uint256 const& tokenID, ripple::TxMeta const& meta, ripple::Blob const& uri)
+    NFTsData(xrpl::uint256 const& tokenID, xrpl::TxMeta const& meta, xrpl::Blob const& uri)
        : tokenID(tokenID)
        , ledgerSequence(meta.getLgrSeq())
        , transactionIndex(meta.getIndex())
@@ -194,8 +194,8 @@ struct NFTsData {
 * @brief Represents an MPT and holder pair
 */
 struct MPTHolderData {
-    ripple::uint192 mptID;
-    ripple::AccountID holder;
+    xrpl::uint192 mptID;
+    xrpl::AccountID holder;
 };

 /**
@@ -231,25 +231,25 @@ isBookDir(T const& key, R const& object)
    if (!isDirNode(object))
        return false;

-    ripple::STLedgerEntry const sle{ripple::SerialIter{object.data(), object.size()}, key};
-    return !sle[~ripple::sfOwner].has_value();
+    xrpl::STLedgerEntry const sle{xrpl::SerialIter{object.data(), object.size()}, key};
+    return !sle[~xrpl::sfOwner].has_value();
 }

 /**
 * @brief Get the book base.
 *
 * @param key The key to get the book base out of
- * @return Book base as ripple::uint256
+ * @return Book base as xrpl::uint256
 */
 template <typename T>
-inline ripple::uint256
+inline xrpl::uint256
 getBookBase(T const& key)
 {
    static constexpr size_t kEY_SIZE = 24;

-    ASSERT(key.size() == ripple::uint256::size(), "Invalid key size {}", key.size());
+    ASSERT(key.size() == xrpl::uint256::size(), "Invalid key size {}", key.size());

-    ripple::uint256 ret;
+    xrpl::uint256 ret;
    for (size_t i = 0; i < kEY_SIZE; ++i)
        ret.data()[i] = key.data()[i];

@@ -257,15 +257,15 @@ getBookBase(T const& key)
 }

 /**
- * @brief Stringify a ripple::uint256.
+ * @brief Stringify a xrpl::uint256.
 *
 * @param input The input value
 * @return The input value as a string
 */
 inline std::string
-uint256ToString(ripple::uint256 const& input)
+uint256ToString(xrpl::uint256 const& input)
 {
-    return {reinterpret_cast<char const*>(input.data()), ripple::uint256::size()};
+    return {reinterpret_cast<char const*>(input.data()), xrpl::uint256::size()};
 }

 /** @brief The ripple epoch start timestamp. Midnight on 1st January 2000. */
--- a/src/data/KeyspaceBackend.hpp
+++ b/src/data/KeyspaceBackend.hpp
@@ -117,22 +117,22 @@ public:

    NFTsAndCursor
    fetchNFTsByIssuer(
-        ripple::AccountID const& issuer,
+        xrpl::AccountID const& issuer,
        std::optional<std::uint32_t> const& taxon,
        std::uint32_t const ledgerSequence,
        std::uint32_t const limit,
-        std::optional<ripple::uint256> const& cursorIn,
+        std::optional<xrpl::uint256> const& cursorIn,
        boost::asio::yield_context yield
    ) const override
    {
-        std::vector<ripple::uint256> nftIDs;
+        std::vector<xrpl::uint256> nftIDs;
        if (taxon.has_value()) {
            // Keyspace and ScyllaDB uses the same logic for taxon-filtered queries
            nftIDs = fetchNFTIDsByTaxon(issuer, *taxon, limit, cursorIn, yield);
        } else {
            // Amazon Keyspaces Workflow for non-taxon queries
-            auto const startTaxon = cursorIn.has_value() ? ripple::nft::toUInt32(ripple::nft::getTaxon(*cursorIn)) : 0;
-            auto const startTokenID = cursorIn.value_or(ripple::uint256(0));
+            auto const startTaxon = cursorIn.has_value() ? xrpl::nft::toUInt32(xrpl::nft::getTaxon(*cursorIn)) : 0;
+            auto const startTokenID = cursorIn.value_or(xrpl::uint256(0));

            Statement const firstQuery = schema_->selectNFTIDsByIssuerTaxon.bind(issuer);
            firstQuery.bindAt(1, startTaxon);
@@ -141,7 +141,7 @@ public:

            auto const firstRes = executor_.read(yield, firstQuery);
            if (firstRes.has_value()) {
-                for (auto const [nftID] : extract<ripple::uint256>(*firstRes))
+                for (auto const [nftID] : extract<xrpl::uint256>(*firstRes))
                    nftIDs.push_back(nftID);
            }

@@ -153,7 +153,7 @@ public:

                auto const secondRes = executor_.read(yield, secondQuery);
                if (secondRes.has_value()) {
-                    for (auto const [nftID] : extract<ripple::uint256>(*secondRes))
+                    for (auto const [nftID] : extract<xrpl::uint256>(*secondRes))
                        nftIDs.push_back(nftID);
                }
            }
@@ -172,9 +172,9 @@ public:
     * @param pageSize The maximum number of accounts per page.
     * @param seq The accounts need to exist at this ledger sequence.
     * @param yield The coroutine context.
-     * @return A vector of ripple::uint256 representing the account root hashes.
+     * @return A vector of xrpl::uint256 representing the account root hashes.
     */
-    std::vector<ripple::uint256>
+    std::vector<xrpl::uint256>
    fetchAccountRoots(
        [[maybe_unused]] std::uint32_t number,
        [[maybe_unused]] std::uint32_t pageSize,
@@ -187,41 +187,41 @@ public:
    }

 private:
-    std::vector<ripple::uint256>
+    std::vector<xrpl::uint256>
    fetchNFTIDsByTaxon(
-        ripple::AccountID const& issuer,
+        xrpl::AccountID const& issuer,
        std::uint32_t const taxon,
        std::uint32_t const limit,
-        std::optional<ripple::uint256> const& cursorIn,
+        std::optional<xrpl::uint256> const& cursorIn,
        boost::asio::yield_context yield
    ) const
    {
-        std::vector<ripple::uint256> nftIDs;
+        std::vector<xrpl::uint256> nftIDs;
        Statement const statement = schema_->selectNFTIDsByIssuerTaxon.bind(issuer);
        statement.bindAt(1, taxon);
-        statement.bindAt(2, cursorIn.value_or(ripple::uint256(0)));
+        statement.bindAt(2, cursorIn.value_or(xrpl::uint256(0)));
        statement.bindAt(3, Limit{limit});

        auto const res = executor_.read(yield, statement);
        if (res.has_value() && res->hasRows()) {
-            for (auto const [nftID] : extract<ripple::uint256>(*res))
+            for (auto const [nftID] : extract<xrpl::uint256>(*res))
                nftIDs.push_back(nftID);
        }
        return nftIDs;
    }

-    std::vector<ripple::uint256>
+    std::vector<xrpl::uint256>
    fetchNFTIDsWithoutTaxon(
-        ripple::AccountID const& issuer,
+        xrpl::AccountID const& issuer,
        std::uint32_t const limit,
-        std::optional<ripple::uint256> const& cursorIn,
+        std::optional<xrpl::uint256> const& cursorIn,
        boost::asio::yield_context yield
    ) const
    {
-        std::vector<ripple::uint256> nftIDs;
+        std::vector<xrpl::uint256> nftIDs;

-        auto const startTaxon = cursorIn.has_value() ? ripple::nft::toUInt32(ripple::nft::getTaxon(*cursorIn)) : 0;
-        auto const startTokenID = cursorIn.value_or(ripple::uint256(0));
+        auto const startTaxon = cursorIn.has_value() ? xrpl::nft::toUInt32(xrpl::nft::getTaxon(*cursorIn)) : 0;
+        auto const startTokenID = cursorIn.value_or(xrpl::uint256(0));

        Statement firstQuery = schema_->selectNFTIDsByIssuerTaxon.bind(issuer);
        firstQuery.bindAt(1, startTaxon);
@@ -230,7 +230,7 @@ private:

        auto const firstRes = executor_.read(yield, firstQuery);
        if (firstRes.has_value()) {
-            for (auto const [nftID] : extract<ripple::uint256>(*firstRes))
+            for (auto const [nftID] : extract<xrpl::uint256>(*firstRes))
                nftIDs.push_back(nftID);
        }

@@ -242,7 +242,7 @@ private:

            auto const secondRes = executor_.read(yield, secondQuery);
            if (secondRes.has_value()) {
-                for (auto const [nftID] : extract<ripple::uint256>(*secondRes))
+                for (auto const [nftID] : extract<xrpl::uint256>(*secondRes))
                    nftIDs.push_back(nftID);
            }
        }
@@ -254,7 +254,7 @@ private:
     */
    NFTsAndCursor
    populateNFTsAndCreateCursor(
-        std::vector<ripple::uint256> const& nftIDs,
+        std::vector<xrpl::uint256> const& nftIDs,
        std::uint32_t const ledgerSequence,
        std::uint32_t const limit,
        boost::asio::yield_context yield
@@ -291,11 +291,11 @@ private:

        // Combine the results into final NFT objects.
        for (auto i = 0u; i < nftIDs.size(); ++i) {
-            if (auto const maybeRow = nftInfos[i].template get<uint32_t, ripple::AccountID, bool>();
+            if (auto const maybeRow = nftInfos[i].template get<uint32_t, xrpl::AccountID, bool>();
                maybeRow.has_value()) {
                auto [seq, owner, isBurned] = *maybeRow;
                NFT nft(nftIDs[i], seq, owner, isBurned);
-                if (auto const maybeUri = nftUris[i].template get<ripple::Blob>(); maybeUri.has_value())
+                if (auto const maybeUri = nftUris[i].template get<xrpl::Blob>(); maybeUri.has_value())
                    nft.uri = *maybeUri;
                ret.nfts.push_back(nft);
            }
--- a/src/data/LedgerCache.cpp
+++ b/src/data/LedgerCache.cpp
@@ -131,7 +131,7 @@ LedgerCache::update(std::vector<etl::model::Object> const& objs, uint32_t seq)
 }

 std::optional<LedgerObject>
-LedgerCache::getSuccessor(ripple::uint256 const& key, uint32_t seq) const
+LedgerCache::getSuccessor(xrpl::uint256 const& key, uint32_t seq) const
 {
    if (disabled_ or not full_)
        return {};
@@ -148,7 +148,7 @@ LedgerCache::getSuccessor(ripple::uint256 const& key, uint32_t seq) const
 }

 std::optional<LedgerObject>
-LedgerCache::getPredecessor(ripple::uint256 const& key, uint32_t seq) const
+LedgerCache::getPredecessor(xrpl::uint256 const& key, uint32_t seq) const
 {
    if (disabled_ or not full_)
        return {};
@@ -164,7 +164,7 @@ LedgerCache::getPredecessor(ripple::uint256 const& key, uint32_t seq) const
 }

 std::optional<Blob>
-LedgerCache::get(ripple::uint256 const& key, uint32_t seq) const
+LedgerCache::get(xrpl::uint256 const& key, uint32_t seq) const
 {
    if (disabled_)
        return {};
@@ -183,7 +183,7 @@ LedgerCache::get(ripple::uint256 const& key, uint32_t seq) const
 }

 std::optional<Blob>
-LedgerCache::getDeleted(ripple::uint256 const& key, uint32_t seq) const
+LedgerCache::getDeleted(xrpl::uint256 const& key, uint32_t seq) const
 {
    if (disabled_)
        return std::nullopt;
--- a/src/data/LedgerCache.hpp
+++ b/src/data/LedgerCache.hpp
@@ -54,7 +54,7 @@ public:
        Blob blob;
    };

-    using CacheMap = std::map<ripple::uint256, CacheEntry>;
+    using CacheMap = std::map<xrpl::uint256, CacheEntry>;

 private:
    // counters for fetchLedgerObject(s) hit rate
@@ -97,7 +97,7 @@ private:
    )};

    // temporary set to prevent background thread from writing already deleted data. not used when cache is full
-    std::unordered_set<ripple::uint256, ripple::hardened_hash<>> deletes_;
+    std::unordered_set<xrpl::uint256, xrpl::HardenedHash<>> deletes_;

 public:
    void
@@ -107,16 +107,16 @@ public:
    update(std::vector<etl::model::Object> const& objs, uint32_t seq) override;

    std::optional<Blob>
-    get(ripple::uint256 const& key, uint32_t seq) const override;
+    get(xrpl::uint256 const& key, uint32_t seq) const override;

    std::optional<Blob>
-    getDeleted(ripple::uint256 const& key, uint32_t seq) const override;
+    getDeleted(xrpl::uint256 const& key, uint32_t seq) const override;

    std::optional<LedgerObject>
-    getSuccessor(ripple::uint256 const& key, uint32_t seq) const override;
+    getSuccessor(xrpl::uint256 const& key, uint32_t seq) const override;

    std::optional<LedgerObject>
-    getPredecessor(ripple::uint256 const& key, uint32_t seq) const override;
+    getPredecessor(xrpl::uint256 const& key, uint32_t seq) const override;

    void
    setDisabled() override;
--- a/src/data/LedgerCacheInterface.hpp
+++ b/src/data/LedgerCacheInterface.hpp
@@ -75,7 +75,7 @@ public:
     * @return If found in cache, will return the cached Blob; otherwise nullopt is returned
     */
    virtual std::optional<Blob>
-    get(ripple::uint256 const& key, uint32_t seq) const = 0;
+    get(xrpl::uint256 const& key, uint32_t seq) const = 0;

    /**
     * @brief Fetch a recently deleted object by its key and sequence number.
@@ -85,7 +85,7 @@ public:
     * @return If found in deleted cache, will return the cached Blob; otherwise nullopt is returned
     */
    virtual std::optional<Blob>
-    getDeleted(ripple::uint256 const& key, uint32_t seq) const = 0;
+    getDeleted(xrpl::uint256 const& key, uint32_t seq) const = 0;

    /**
     * @brief Gets a cached successor.
@@ -97,7 +97,7 @@ public:
     * @return If found in cache, will return the cached successor; otherwise nullopt is returned
     */
    virtual std::optional<LedgerObject>
-    getSuccessor(ripple::uint256 const& key, uint32_t seq) const = 0;
+    getSuccessor(xrpl::uint256 const& key, uint32_t seq) const = 0;

    /**
     * @brief Gets a cached predcessor.
@@ -109,7 +109,7 @@ public:
     * @return If found in cache, will return the cached predcessor; otherwise nullopt is returned
     */
    virtual std::optional<LedgerObject>
-    getPredecessor(ripple::uint256 const& key, uint32_t seq) const = 0;
+    getPredecessor(xrpl::uint256 const& key, uint32_t seq) const = 0;

    /**
     * @brief Disables the cache.
--- a/src/data/LedgerCacheSaver.cpp
+++ b/src/data/LedgerCacheSaver.cpp
@@ -30,7 +30,9 @@
 namespace data {

 LedgerCacheSaver::LedgerCacheSaver(util::config::ClioConfigDefinition const& config, LedgerCacheInterface const& cache)
-    : cacheFilePath_(config.maybeValue<std::string>("cache.file.path")), cache_(cache)
+    : cacheFilePath_(config.maybeValue<std::string>("cache.file.path"))
+    , cache_(cache)
+    , isAsync_(config.get<bool>("cache.file.async_save"))
 {
 }

@@ -56,6 +58,9 @@ LedgerCacheSaver::save()
            LOG(util::LogService::error()) << "Error saving LedgerCache to file: " << success.error();
        }
    });
+    if (not isAsync_) {
+        waitToFinish();
+    }
 }

 void
--- a/src/data/LedgerCacheSaver.hpp
+++ b/src/data/LedgerCacheSaver.hpp
@@ -53,6 +53,7 @@ class LedgerCacheSaver {
    std::optional<std::string> cacheFilePath_;
    std::reference_wrapper<LedgerCacheInterface const> cache_;
    std::optional<std::thread> savingThread_;
+    bool isAsync_;

 public:
    /**
--- a/src/data/LedgerHeaderCache.hpp
+++ b/src/data/LedgerHeaderCache.hpp
@@ -30,7 +30,7 @@
 namespace data {

 /**
- * @brief A simple cache holding one `ripple::LedgerHeader` to reduce DB lookups.
+ * @brief A simple cache holding one `xrpl::LedgerHeader` to reduce DB lookups.
 *
 * Used internally by backend implementations. When a ledger header is
 * fetched via `FetchLedgerBySeq` (often triggered by RPC commands),
@@ -46,7 +46,7 @@ public:
     * @brief Struct to store ledger header cache entry and the sequence it belongs to
     */
    struct CacheEntry {
-        ripple::LedgerHeader ledger;
+        xrpl::LedgerHeader ledger;
        uint32_t seq{};

        /**
--- a/src/data/Types.hpp
+++ b/src/data/Types.hpp
@@ -39,7 +39,7 @@ using Blob = std::vector<unsigned char>;
 * @brief Represents an object in the ledger.
 */
 struct LedgerObject {
-    ripple::uint256 key;
+    xrpl::uint256 key;
    Blob blob;

    bool
@@ -51,7 +51,7 @@ struct LedgerObject {
 */
 struct LedgerPage {
    std::vector<LedgerObject> objects;
-    std::optional<ripple::uint256> cursor;
+    std::optional<xrpl::uint256> cursor;
 };

 /**
@@ -59,7 +59,7 @@ struct LedgerPage {
 */
 struct BookOffersPage {
    std::vector<LedgerObject> offers;
-    std::optional<ripple::uint256> cursor;
+    std::optional<xrpl::uint256> cursor;
 };

 /**
@@ -170,9 +170,9 @@ struct TransactionsAndCursor {
 * @brief Represents a NFToken.
 */
 struct NFT {
-    ripple::uint256 tokenID;
+    xrpl::uint256 tokenID;
    std::uint32_t ledgerSequence{};
-    ripple::AccountID owner;
+    xrpl::AccountID owner;
    Blob uri;
    bool isBurned{};

@@ -187,9 +187,9 @@ struct NFT {
     * @param uri The URI
     * @param isBurned Whether the token is burned
     */
-    NFT(ripple::uint256 const& tokenID,
+    NFT(xrpl::uint256 const& tokenID,
        std::uint32_t ledgerSequence,
-        ripple::AccountID const& owner,
+        xrpl::AccountID const& owner,
        Blob uri,
        bool isBurned)
        : tokenID{tokenID}, ledgerSequence{ledgerSequence}, owner{owner}, uri{std::move(uri)}, isBurned{isBurned}
@@ -204,7 +204,7 @@ struct NFT {
     * @param owner The owner
     * @param isBurned Whether the token is burned
     */
-    NFT(ripple::uint256 const& tokenID, std::uint32_t ledgerSequence, ripple::AccountID const& owner, bool isBurned)
+    NFT(xrpl::uint256 const& tokenID, std::uint32_t ledgerSequence, xrpl::AccountID const& owner, bool isBurned)
        : NFT(tokenID, ledgerSequence, owner, {}, isBurned)
    {
    }
@@ -230,7 +230,7 @@ struct NFT {
 */
 struct NFTsAndCursor {
    std::vector<NFT> nfts;
-    std::optional<ripple::uint256> cursor;
+    std::optional<xrpl::uint256> cursor;
 };

 /**
@@ -238,7 +238,7 @@ struct NFTsAndCursor {
 */
 struct MPTHoldersAndCursor {
    std::vector<Blob> mptokens;
-    std::optional<ripple::AccountID> cursor;
+    std::optional<xrpl::AccountID> cursor;
 };

 /**
@@ -257,7 +257,7 @@ struct LedgerRange {
 */
 struct Amendment {
    std::string name;
-    ripple::uint256 feature;
+    xrpl::uint256 feature;
    bool isSupportedByXRPL = false;
    bool isSupportedByClio = false;
    bool isRetired = false;
@@ -268,7 +268,7 @@ struct Amendment {
     * @param name The name of the amendment
     * @return The amendment Id as uint256
     */
-    static ripple::uint256
+    static xrpl::uint256
    getAmendmentId(std::string_view const name);

    /**
@@ -304,7 +304,7 @@ struct AmendmentKey {
    operator std::string_view() const;

    /** @brief Conversion to uint256 */
-    operator ripple::uint256() const;
+    operator xrpl::uint256() const;

    /**
     * @brief Comparison operators
@@ -315,8 +315,8 @@ struct AmendmentKey {
    operator<=>(AmendmentKey const& other) const = default;
 };

-constexpr ripple::uint256 kFIRST_KEY{"0000000000000000000000000000000000000000000000000000000000000000"};
-constexpr ripple::uint256 kLAST_KEY{"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"};
-constexpr ripple::uint256 kHI192{"0000000000000000000000000000000000000000000000001111111111111111"};
+constexpr xrpl::uint256 kFIRST_KEY{"0000000000000000000000000000000000000000000000000000000000000000"};
+constexpr xrpl::uint256 kLAST_KEY{"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"};
+constexpr xrpl::uint256 kHI192{"0000000000000000000000000000000000000000000000001111111111111111"};

 }  // namespace data
--- a/src/data/cassandra/CassandraBackendFamily.hpp
+++ b/src/data/cassandra/CassandraBackendFamily.hpp
@@ -148,7 +148,7 @@ public:

    TransactionsAndCursor
    fetchAccountTransactions(
-        ripple::AccountID const& account,
+        xrpl::AccountID const& account,
        std::uint32_t const limit,
        bool forward,
        std::optional<TransactionsCursor> const& txnCursor,
@@ -169,14 +169,14 @@ public:
        auto cursor = txnCursor;
        if (cursor) {
            statement.bindAt(1, cursor->asTuple());
-            LOG(log_.debug()) << "account = " << ripple::strHex(account) << " tuple = " << cursor->ledgerSequence
+            LOG(log_.debug()) << "account = " << xrpl::strHex(account) << " tuple = " << cursor->ledgerSequence
                              << cursor->transactionIndex;
        } else {
            auto const seq = forward ? rng->minSequence : rng->maxSequence;
            auto const placeHolder = forward ? 0u : std::numeric_limits<std::uint32_t>::max();

            statement.bindAt(1, std::make_tuple(placeHolder, placeHolder));
-            LOG(log_.debug()) << "account = " << ripple::strHex(account) << " idx = " << seq
+            LOG(log_.debug()) << "account = " << xrpl::strHex(account) << " idx = " << seq
                              << " tuple = " << placeHolder;
        }

@@ -191,11 +191,11 @@ public:
            return {};
        }

-        std::vector<ripple::uint256> hashes = {};
+        std::vector<xrpl::uint256> hashes = {};
        auto numRows = results.numRows();
        LOG(log_.info()) << "num_rows = " << numRows;

-        for (auto [hash, data] : extract<ripple::uint256, std::tuple<uint32_t, uint32_t>>(results)) {
+        for (auto [hash, data] : extract<xrpl::uint256, std::tuple<uint32_t, uint32_t>>(results)) {
            hashes.push_back(hash);
            if (--numRows == 0) {
                LOG(log_.debug()) << "Setting cursor";
@@ -221,7 +221,7 @@ public:
    }

    void
-    writeLedger(ripple::LedgerHeader const& ledgerHeader, std::string&& blob) override
+    writeLedger(xrpl::LedgerHeader const& ledgerHeader, std::string&& blob) override
    {
        executor_.write(schema_->insertLedgerHeader, ledgerHeader.seq, std::move(blob));

@@ -250,7 +250,7 @@ public:
        return std::nullopt;
    }

-    std::optional<ripple::LedgerHeader>
+    std::optional<xrpl::LedgerHeader>
    fetchLedgerBySequence(std::uint32_t const sequence, boost::asio::yield_context yield) const override
    {
        if (auto const lock = ledgerCache_.get(); lock.has_value() && lock->seq == sequence)
@@ -260,7 +260,7 @@ public:
        if (res) {
            if (auto const& result = res.value(); result) {
                if (auto const maybeValue = result.template get<std::vector<unsigned char>>(); maybeValue) {
-                    auto const header = util::deserializeHeader(ripple::makeSlice(*maybeValue));
+                    auto const header = util::deserializeHeader(xrpl::makeSlice(*maybeValue));
                    ledgerCache_.put(FetchLedgerCache::CacheEntry{header, sequence});
                    return header;
                }
@@ -277,8 +277,8 @@ public:
        return std::nullopt;
    }

-    std::optional<ripple::LedgerHeader>
-    fetchLedgerByHash(ripple::uint256 const& hash, boost::asio::yield_context yield) const override
+    std::optional<xrpl::LedgerHeader>
+    fetchLedgerByHash(xrpl::uint256 const& hash, boost::asio::yield_context yield) const override
    {
        if (auto const res = executor_.read(yield, schema_->selectLedgerByHash, hash); res) {
            if (auto const& result = res.value(); result) {
@@ -342,7 +342,7 @@ public:
        return fetchTransactions(hashes, yield);
    }

-    std::vector<ripple::uint256>
+    std::vector<xrpl::uint256>
    fetchAllTransactionHashesInLedger(
        std::uint32_t const ledgerSequence,
        boost::asio::yield_context yield
@@ -363,8 +363,8 @@ public:
            return {};
        }

-        std::vector<ripple::uint256> hashes;
-        for (auto [hash] : extract<ripple::uint256>(result))
+        std::vector<xrpl::uint256> hashes;
+        for (auto [hash] : extract<xrpl::uint256>(result))
            hashes.push_back(std::move(hash));

        auto end = std::chrono::system_clock::now();
@@ -377,7 +377,7 @@ public:

    std::optional<NFT>
    fetchNFT(
-        ripple::uint256 const& tokenID,
+        xrpl::uint256 const& tokenID,
        std::uint32_t const ledgerSequence,
        boost::asio::yield_context yield
    ) const override
@@ -386,7 +386,7 @@ public:
        if (not res)
            return std::nullopt;

-        if (auto const maybeRow = res->template get<uint32_t, ripple::AccountID, bool>(); maybeRow) {
+        if (auto const maybeRow = res->template get<uint32_t, xrpl::AccountID, bool>(); maybeRow) {
            auto [seq, owner, isBurned] = *maybeRow;
            auto result = std::make_optional<NFT>(tokenID, seq, owner, isBurned);

@@ -403,7 +403,7 @@ public:
            // one.
            auto uriRes = executor_.read(yield, schema_->selectNFTURI, tokenID, ledgerSequence);
            if (uriRes) {
-                if (auto const maybeUri = uriRes->template get<ripple::Blob>(); maybeUri)
+                if (auto const maybeUri = uriRes->template get<xrpl::Blob>(); maybeUri)
                    result->uri = *maybeUri;
            }

@@ -416,7 +416,7 @@ public:

    TransactionsAndCursor
    fetchNFTTransactions(
-        ripple::uint256 const& tokenID,
+        xrpl::uint256 const& tokenID,
        std::uint32_t const limit,
        bool const forward,
        std::optional<TransactionsCursor> const& cursorIn,
@@ -437,14 +437,14 @@ public:
        auto cursor = cursorIn;
        if (cursor) {
            statement.bindAt(1, cursor->asTuple());
-            LOG(log_.debug()) << "token_id = " << ripple::strHex(tokenID) << " tuple = " << cursor->ledgerSequence
+            LOG(log_.debug()) << "token_id = " << xrpl::strHex(tokenID) << " tuple = " << cursor->ledgerSequence
                              << cursor->transactionIndex;
        } else {
            auto const seq = forward ? rng->minSequence : rng->maxSequence;
            auto const placeHolder = forward ? 0 : std::numeric_limits<std::uint32_t>::max();

            statement.bindAt(1, std::make_tuple(placeHolder, placeHolder));
-            LOG(log_.debug()) << "token_id = " << ripple::strHex(tokenID) << " idx = " << seq
+            LOG(log_.debug()) << "token_id = " << xrpl::strHex(tokenID) << " idx = " << seq
                              << " tuple = " << placeHolder;
        }

@@ -457,11 +457,11 @@ public:
            return {};
        }

-        std::vector<ripple::uint256> hashes = {};
+        std::vector<xrpl::uint256> hashes = {};
        auto numRows = results.numRows();
        LOG(log_.info()) << "num_rows = " << numRows;

-        for (auto [hash, data] : extract<ripple::uint256, std::tuple<uint32_t, uint32_t>>(results)) {
+        for (auto [hash, data] : extract<xrpl::uint256, std::tuple<uint32_t, uint32_t>>(results)) {
            hashes.push_back(hash);
            if (--numRows == 0) {
                LOG(log_.debug()) << "Setting cursor";
@@ -487,15 +487,15 @@ public:

    MPTHoldersAndCursor
    fetchMPTHolders(
-        ripple::uint192 const& mptID,
+        xrpl::uint192 const& mptID,
        std::uint32_t const limit,
-        std::optional<ripple::AccountID> const& cursorIn,
+        std::optional<xrpl::AccountID> const& cursorIn,
        std::uint32_t const ledgerSequence,
        boost::asio::yield_context yield
    ) const override
    {
        auto const holderEntries = executor_.read(
-            yield, schema_->selectMPTHolders, mptID, cursorIn.value_or(ripple::AccountID(0)), Limit{limit}
+            yield, schema_->selectMPTHolders, mptID, cursorIn.value_or(xrpl::AccountID(0)), Limit{limit}
        );

        auto const& holderResults = holderEntries.value();
@@ -504,10 +504,10 @@ public:
            return {};
        }

-        std::vector<ripple::uint256> mptKeys;
-        std::optional<ripple::AccountID> cursor;
-        for (auto const [holder] : extract<ripple::AccountID>(holderResults)) {
-            mptKeys.push_back(ripple::keylet::mptoken(mptID, holder).key);
+        std::vector<xrpl::uint256> mptKeys;
+        std::optional<xrpl::AccountID> cursor;
+        for (auto const [holder] : extract<xrpl::AccountID>(holderResults)) {
+            mptKeys.push_back(xrpl::keylet::mptoken(mptID, holder).key);
            cursor = holder;
        }

@@ -526,12 +526,12 @@ public:

    std::optional<Blob>
    doFetchLedgerObject(
-        ripple::uint256 const& key,
+        xrpl::uint256 const& key,
        std::uint32_t const sequence,
        boost::asio::yield_context yield
    ) const override
    {
-        LOG(log_.debug()) << "Fetching ledger object for seq " << sequence << ", key = " << ripple::to_string(key);
+        LOG(log_.debug()) << "Fetching ledger object for seq " << sequence << ", key = " << xrpl::to_string(key);
        if (auto const res = executor_.read(yield, schema_->selectObject, key, sequence); res) {
            if (auto const result = res->template get<Blob>(); result) {
                if (result->size())
@@ -548,12 +548,12 @@ public:

    std::optional<std::uint32_t>
    doFetchLedgerObjectSeq(
-        ripple::uint256 const& key,
+        xrpl::uint256 const& key,
        std::uint32_t const sequence,
        boost::asio::yield_context yield
    ) const override
    {
-        LOG(log_.debug()) << "Fetching ledger object for seq " << sequence << ", key = " << ripple::to_string(key);
+        LOG(log_.debug()) << "Fetching ledger object for seq " << sequence << ", key = " << xrpl::to_string(key);
        if (auto const res = executor_.read(yield, schema_->selectObject, key, sequence); res) {
            if (auto const result = res->template get<Blob, std::uint32_t>(); result) {
                auto [_, seq] = result.value();
@@ -568,7 +568,7 @@ public:
    }

    std::optional<TransactionAndMetadata>
-    fetchTransaction(ripple::uint256 const& hash, boost::asio::yield_context yield) const override
+    fetchTransaction(xrpl::uint256 const& hash, boost::asio::yield_context yield) const override
    {
        if (auto const res = executor_.read(yield, schema_->selectTransaction, hash); res) {
            if (auto const maybeValue = res->template get<Blob, Blob, uint32_t, uint32_t>(); maybeValue) {
@@ -584,15 +584,15 @@ public:
        return std::nullopt;
    }

-    std::optional<ripple::uint256>
+    std::optional<xrpl::uint256>
    doFetchSuccessorKey(
-        ripple::uint256 key,
+        xrpl::uint256 key,
        std::uint32_t const ledgerSequence,
        boost::asio::yield_context yield
    ) const override
    {
        if (auto const res = executor_.read(yield, schema_->selectSuccessor, key, ledgerSequence); res) {
-            if (auto const result = res->template get<ripple::uint256>(); result) {
+            if (auto const result = res->template get<xrpl::uint256>(); result) {
                if (*result == kLAST_KEY)
                    return std::nullopt;
                return result;
@@ -607,7 +607,7 @@ public:
    }

    std::vector<TransactionAndMetadata>
-    fetchTransactions(std::vector<ripple::uint256> const& hashes, boost::asio::yield_context yield) const override
+    fetchTransactions(std::vector<xrpl::uint256> const& hashes, boost::asio::yield_context yield) const override
    {
        if (hashes.empty())
            return {};
@@ -649,7 +649,7 @@ public:

    std::vector<Blob>
    doFetchLedgerObjects(
-        std::vector<ripple::uint256> const& keys,
+        std::vector<xrpl::uint256> const& keys,
        std::uint32_t const sequence,
        boost::asio::yield_context yield
    ) const override
@@ -690,7 +690,7 @@ public:
    std::vector<LedgerObject>
    fetchLedgerDiff(std::uint32_t const ledgerSequence, boost::asio::yield_context yield) const override
    {
-        auto const [keys, timeDiff] = util::timed([this, &ledgerSequence, yield]() -> std::vector<ripple::uint256> {
+        auto const [keys, timeDiff] = util::timed([this, &ledgerSequence, yield]() -> std::vector<xrpl::uint256> {
            auto const res = executor_.read(yield, schema_->selectDiff, ledgerSequence);
            if (not res) {
                LOG(log_.error()) << "Could not fetch ledger diff: " << res.error() << "; ledger = " << ledgerSequence;
@@ -703,8 +703,8 @@ public:
                return {};
            }

-            std::vector<ripple::uint256> resultKeys;
-            for (auto [key] : extract<ripple::uint256>(results))
+            std::vector<xrpl::uint256> resultKeys;
+            for (auto [key] : extract<xrpl::uint256>(results))
                resultKeys.push_back(key);

            return resultKeys;
@@ -877,8 +877,8 @@ public:
                // to record the URI and link to the issuer_nf_tokens table.
                if (record.uri) {
                    statements.push_back(schema_->insertIssuerNFT.bind(
-                        ripple::nft::getIssuer(record.tokenID),
-                        static_cast<uint32_t>(ripple::nft::getTaxon(record.tokenID)),
+                        xrpl::nft::getIssuer(record.tokenID),
+                        static_cast<uint32_t>(xrpl::nft::getTaxon(record.tokenID)),
                        record.tokenID
                    ));
                    statements.push_back(
--- a/src/data/cassandra/impl/Collection.hpp
+++ b/src/data/cassandra/impl/Collection.hpp
@@ -77,14 +77,14 @@ public:
    }

    void
-    append(ripple::uint256 const& value) const
+    append(xrpl::uint256 const& value) const
    {
        auto const rc = cass_collection_append_bytes(
            *this,
            static_cast<cass_byte_t const*>(static_cast<unsigned char const*>(value.data())),
-            ripple::uint256::size()
+            xrpl::uint256::size()
        );
-        throwErrorIfNeeded(rc, "Bind ripple::uint256");
+        throwErrorIfNeeded(rc, "Bind xrpl::uint256");
    }
 };
 }  // namespace data::cassandra::impl
--- a/src/data/cassandra/impl/Result.hpp
+++ b/src/data/cassandra/impl/Result.hpp
@@ -62,18 +62,18 @@ extractColumn(CassRow const* row, std::size_t idx)
    using UintTupleType = std::tuple<uint32_t, uint32_t>;
    using UCharVectorType = std::vector<unsigned char>;

-    if constexpr (std::is_same_v<DecayedType, ripple::uint256>) {
+    if constexpr (std::is_same_v<DecayedType, xrpl::uint256>) {
        cass_byte_t const* buf = nullptr;
        std::size_t bufSize = 0;
        auto const rc = cass_value_get_bytes(cass_row_get_column(row, idx), &buf, &bufSize);
-        throwErrorIfNeeded(rc, "Extract ripple::uint256");
-        output = ripple::uint256::fromVoid(buf);
-    } else if constexpr (std::is_same_v<DecayedType, ripple::AccountID>) {
+        throwErrorIfNeeded(rc, "Extract xrpl::uint256");
+        output = xrpl::uint256::fromVoid(buf);
+    } else if constexpr (std::is_same_v<DecayedType, xrpl::AccountID>) {
        cass_byte_t const* buf = nullptr;
        std::size_t bufSize = 0;
        auto const rc = cass_value_get_bytes(cass_row_get_column(row, idx), &buf, &bufSize);
-        throwErrorIfNeeded(rc, "Extract ripple::AccountID");
-        output = ripple::AccountID::fromVoid(buf);
+        throwErrorIfNeeded(rc, "Extract xrpl::AccountID");
+        output = xrpl::AccountID::fromVoid(buf);
    } else if constexpr (std::is_same_v<DecayedType, UCharVectorType>) {
        cass_byte_t const* buf = nullptr;
        std::size_t bufSize = 0;
--- a/src/data/cassandra/impl/Statement.hpp
+++ b/src/data/cassandra/impl/Statement.hpp
@@ -107,15 +107,15 @@ public:
        using DecayedType = std::decay_t<Type>;
        using UCharVectorType = std::vector<unsigned char>;
        using UintTupleType = std::tuple<uint32_t, uint32_t>;
-        using UintByteTupleType = std::tuple<uint32_t, ripple::uint256>;
-        using ByteVectorType = std::vector<ripple::uint256>;
+        using UintByteTupleType = std::tuple<uint32_t, xrpl::uint256>;
+        using ByteVectorType = std::vector<xrpl::uint256>;

-        if constexpr (std::is_same_v<DecayedType, ripple::uint256> || std::is_same_v<DecayedType, ripple::uint192>) {
+        if constexpr (std::is_same_v<DecayedType, xrpl::uint256> || std::is_same_v<DecayedType, xrpl::uint192>) {
            auto const rc = bindBytes(value.data(), value.size());
-            throwErrorIfNeeded(rc, "Bind ripple::base_uint");
-        } else if constexpr (std::is_same_v<DecayedType, ripple::AccountID>) {
+            throwErrorIfNeeded(rc, "Bind xrpl::BaseUInt");
+        } else if constexpr (std::is_same_v<DecayedType, xrpl::AccountID>) {
            auto const rc = bindBytes(value.data(), value.size());
-            throwErrorIfNeeded(rc, "Bind ripple::AccountID");
+            throwErrorIfNeeded(rc, "Bind xrpl::AccountID");
        } else if constexpr (std::is_same_v<DecayedType, UCharVectorType>) {
            auto const rc = bindBytes(value.data(), value.size());
            throwErrorIfNeeded(rc, "Bind vector<unsigned char>");
@@ -129,7 +129,7 @@ public:
        } else if constexpr (std::is_same_v<DecayedType, UintTupleType> ||
                             std::is_same_v<DecayedType, UintByteTupleType>) {
            auto const rc = cass_statement_bind_tuple(*this, idx, Tuple{std::forward<Type>(value)});
-            throwErrorIfNeeded(rc, "Bind tuple<uint32, uint32> or <uint32_t, ripple::uint256>");
+            throwErrorIfNeeded(rc, "Bind tuple<uint32, uint32> or <uint32_t, xrpl::uint256>");
        } else if constexpr (std::is_same_v<DecayedType, ByteVectorType>) {
            auto const rc = cass_statement_bind_collection(*this, idx, Collection{std::forward<Type>(value)});
            throwErrorIfNeeded(rc, "Bind collection");
--- a/src/data/cassandra/impl/Tuple.hpp
+++ b/src/data/cassandra/impl/Tuple.hpp
@@ -79,14 +79,14 @@ public:
        else if constexpr (std::is_convertible_v<DecayedType, int64_t>) {
            auto const rc = cass_tuple_set_int64(*this, idx, std::forward<Type>(value));
            throwErrorIfNeeded(rc, "Bind int64");
-        } else if constexpr (std::is_same_v<DecayedType, ripple::uint256>) {
+        } else if constexpr (std::is_same_v<DecayedType, xrpl::uint256>) {
            auto const rc = cass_tuple_set_bytes(
                *this,
                idx,
                static_cast<cass_byte_t const*>(static_cast<unsigned char const*>(value.data())),
                value.size()
            );
-            throwErrorIfNeeded(rc, "Bind ripple::uint256");
+            throwErrorIfNeeded(rc, "Bind xrpl::uint256");
        } else {
            // type not supported for binding
            static_assert(util::Unsupported<DecayedType>);
--- a/src/data/impl/InputFile.cpp
+++ b/src/data/impl/InputFile.cpp
@@ -48,7 +48,7 @@ InputFile::readRaw(char* data, size_t size)
    return not file_.fail();
 }

-ripple::uint256
+xrpl::uint256
 InputFile::hash() const
 {
    auto sum = shasum_;
--- a/src/data/impl/InputFile.hpp
+++ b/src/data/impl/InputFile.hpp
@@ -51,7 +51,7 @@ public:
    bool
    readRaw(char* data, size_t size);

-    ripple::uint256
+    xrpl::uint256
    hash() const;
 };
 }  // namespace data::impl
--- a/src/data/impl/LedgerCacheFile.cpp
+++ b/src/data/impl/LedgerCacheFile.cpp
@@ -36,17 +36,17 @@

 namespace data::impl {

-using Hash = ripple::uint256;
+using Hash = xrpl::uint256;
 using Separator = std::array<char, 16>;
 static constexpr Separator kSEPARATOR = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};

 namespace {

-std::expected<std::pair<ripple::uint256, LedgerCache::CacheEntry>, std::string>
+std::expected<std::pair<xrpl::uint256, LedgerCache::CacheEntry>, std::string>
 readCacheEntry(InputFile& file, size_t i)
 {
-    ripple::uint256 key;
-    if (not file.readRaw(reinterpret_cast<char*>(key.data()), ripple::base_uint<256>::bytes)) {
+    xrpl::uint256 key;
+    if (not file.readRaw(reinterpret_cast<char*>(key.data()), xrpl::BaseUInt<256>::kBytes)) {
        return std::unexpected(fmt::format("Failed to read key at index {}", i));
    }

@@ -98,7 +98,7 @@ LedgerCacheFile::write(DataView dataView)
    file.write(kSEPARATOR);

    for (auto const& [k, v] : dataView.map) {
-        file.write(k.data(), decltype(k)::bytes);
+        file.write(k.data(), decltype(k)::kBytes);
        file.write(v.seq);
        file.write(v.blob.size());
        file.writeRaw(reinterpret_cast<char const*>(v.blob.data()), v.blob.size());
@@ -106,14 +106,14 @@ LedgerCacheFile::write(DataView dataView)
    file.write(kSEPARATOR);

    for (auto const& [k, v] : dataView.deleted) {
-        file.write(k.data(), decltype(k)::bytes);
+        file.write(k.data(), decltype(k)::kBytes);
        file.write(v.seq);
        file.write(v.blob.size());
        file.writeRaw(reinterpret_cast<char const*>(v.blob.data()), v.blob.size());
    }
    file.write(kSEPARATOR);
    auto const hash = file.hash();
-    file.write(hash.data(), decltype(hash)::bytes);
+    file.write(hash.data(), decltype(hash)::kBytes);

    try {
        std::filesystem::rename(newFilePath, path_);
@@ -190,8 +190,8 @@ LedgerCacheFile::read(uint32_t minLatestSequence)
        }

        auto const dataHash = file.hash();
-        ripple::uint256 hashFromFile{};
-        if (not file.readRaw(reinterpret_cast<char*>(hashFromFile.data()), decltype(hashFromFile)::bytes)) {
+        xrpl::uint256 hashFromFile{};
+        if (not file.readRaw(reinterpret_cast<char*>(hashFromFile.data()), decltype(hashFromFile)::kBytes)) {
            return std::unexpected{"Error reading hash"};
        }

--- a/src/data/impl/OutputFile.cpp
+++ b/src/data/impl/OutputFile.cpp
@@ -52,7 +52,7 @@ OutputFile::writeToFile(char const* data, size_t size)
    shasum_.update(data, size);
 }

-ripple::uint256
+xrpl::uint256
 OutputFile::hash() const
 {
    auto sum = shasum_;
--- a/src/data/impl/OutputFile.hpp
+++ b/src/data/impl/OutputFile.hpp
@@ -57,7 +57,7 @@ public:
    void
    writeRaw(char const* data, size_t size);

-    ripple::uint256
+    xrpl::uint256
    hash() const;

 private:
--- a/src/etl/ETLHelpers.cpp
+++ b/src/etl/ETLHelpers.cpp
@@ -27,16 +27,16 @@
 #include <vector>

 namespace etl {
-std::vector<ripple::uint256>
+std::vector<xrpl::uint256>
 getMarkers(size_t numMarkers)
 {
    ASSERT(numMarkers <= 256, "Number of markers must be <= 256. Got: {}", numMarkers);

    unsigned char const incr = 256 / numMarkers;

-    std::vector<ripple::uint256> markers;
+    std::vector<xrpl::uint256> markers;
    markers.reserve(numMarkers);
-    ripple::uint256 base{0};
+    xrpl::uint256 base{0};
    for (size_t i = 0; i < numMarkers; ++i) {
        markers.push_back(base);
        base.data()[0] += incr;
--- a/src/etl/ETLHelpers.hpp
+++ b/src/etl/ETLHelpers.hpp
@@ -148,7 +148,7 @@ public:
 * @param numMarkers Total markers to partition for
 * @return The markers
 */
-std::vector<ripple::uint256>
+std::vector<xrpl::uint256>
 getMarkers(size_t numMarkers);

 }  // namespace etl
--- a/src/etl/ETLService.cpp
+++ b/src/etl/ETLService.cpp
@@ -303,7 +303,7 @@ ETLService::loadInitialLedgerIfNeeded()

            auto [ledger, timeDiff] = ::util::timed<std::chrono::duration<double>>([this, seq]() {
                return extractor_->extractLedgerOnly(seq).and_then(
-                    [this, seq](auto&& data) -> std::optional<ripple::LedgerHeader> {
+                    [this, seq](auto&& data) -> std::optional<xrpl::LedgerHeader> {
                        // TODO: loadInitialLedger in balancer should be called fetchEdgeKeys or similar
                        auto res = balancer_->loadInitialLedger(seq, *initialLoadObserver_);
                        if (not res.has_value() and res.error() == InitialLedgerLoadError::Cancelled) {
--- a/src/etl/LoaderInterface.hpp
+++ b/src/etl/LoaderInterface.hpp
@@ -55,7 +55,7 @@ struct LoaderInterface {
     * @param data The data to load
     * @return Optional ledger header
     */
-    [[nodiscard]] virtual std::optional<ripple::LedgerHeader>
+    [[nodiscard]] virtual std::optional<xrpl::LedgerHeader>
    loadInitialLedger(model::LedgerData const& data) = 0;
 };

--- a/src/etl/MPTHelpers.cpp
+++ b/src/etl/MPTHelpers.cpp
@@ -20,17 +20,17 @@
 #include "data/DBHelpers.hpp"
 #include "util/Assert.hpp"

-#include <ripple/protocol/STBase.h>
-#include <ripple/protocol/STTx.h>
-#include <ripple/protocol/TxMeta.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STBase.h>
 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/STTx.h>
 #include <xrpl/protocol/Serializer.h>
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxFormats.h>
+#include <xrpl/protocol/TxMeta.h>

 #include <optional>
 #include <string>
@@ -44,16 +44,16 @@ namespace etl {
 * @return MPT and holder account pair
 */
 std::optional<MPTHolderData>
-getMPTokenAuthorize(ripple::TxMeta const& txMeta)
+getMPTokenAuthorize(xrpl::TxMeta const& txMeta)
 {
-    for (ripple::STObject const& node : txMeta.getNodes()) {
-        if (node.getFieldU16(ripple::sfLedgerEntryType) != ripple::ltMPTOKEN)
+    for (xrpl::STObject const& node : txMeta.getNodes()) {
+        if (node.getFieldU16(xrpl::sfLedgerEntryType) != xrpl::ltMPTOKEN)
            continue;

-        if (node.getFName() == ripple::sfCreatedNode) {
-            auto const& newMPT = node.peekAtField(ripple::sfNewFields).downcast<ripple::STObject>();
+        if (node.getFName() == xrpl::sfCreatedNode) {
+            auto const& newMPT = node.peekAtField(xrpl::sfNewFields).downcast<xrpl::STObject>();
            return MPTHolderData{
-                .mptID = newMPT[ripple::sfMPTokenIssuanceID], .holder = newMPT.getAccountID(ripple::sfAccount)
+                .mptID = newMPT[xrpl::sfMPTokenIssuanceID], .holder = newMPT.getAccountID(xrpl::sfAccount)
            };
        }
    }
@@ -61,9 +61,9 @@ getMPTokenAuthorize(ripple::TxMeta const& txMeta)
 }

 std::optional<MPTHolderData>
-getMPTHolderFromTx(ripple::TxMeta const& txMeta, ripple::STTx const& sttx)
+getMPTHolderFromTx(xrpl::TxMeta const& txMeta, xrpl::STTx const& sttx)
 {
-    if (txMeta.getResultTER() != ripple::tesSUCCESS || sttx.getTxnType() != ripple::TxType::ttMPTOKEN_AUTHORIZE)
+    if (txMeta.getResultTER() != xrpl::tesSUCCESS || sttx.getTxnType() != xrpl::TxType::ttMPTOKEN_AUTHORIZE)
        return {};

    return getMPTokenAuthorize(txMeta);
@@ -73,16 +73,16 @@ std::optional<MPTHolderData>
 getMPTHolderFromObj(std::string const& key, std::string const& blob)
 {
    // https://github.com/XRPLF/XRPL-Standards/tree/master/XLS-0033-multi-purpose-tokens#2121-mptoken-ledger-identifier
-    ASSERT(key.size() == ripple::uint256::size(), "The size of the key is expected to fit uint256 exactly");
+    ASSERT(key.size() == xrpl::uint256::size(), "The size of the key is expected to fit uint256 exactly");

-    ripple::STLedgerEntry const sle =
-        ripple::STLedgerEntry(ripple::SerialIter{blob.data(), blob.size()}, ripple::uint256::fromVoid(key.data()));
+    xrpl::STLedgerEntry const sle =
+        xrpl::STLedgerEntry(xrpl::SerialIter{blob.data(), blob.size()}, xrpl::uint256::fromVoid(key.data()));

-    if (sle.getFieldU16(ripple::sfLedgerEntryType) != ripple::ltMPTOKEN)
+    if (sle.getFieldU16(xrpl::sfLedgerEntryType) != xrpl::ltMPTOKEN)
        return {};

-    auto const mptIssuanceID = sle[ripple::sfMPTokenIssuanceID];
-    auto const holder = sle.getAccountID(ripple::sfAccount);
+    auto const mptIssuanceID = sle[xrpl::sfMPTokenIssuanceID];
+    auto const holder = sle.getAccountID(xrpl::sfAccount);

    return MPTHolderData{.mptID = mptIssuanceID, .holder = holder};
 }
--- a/src/etl/MPTHelpers.hpp
+++ b/src/etl/MPTHelpers.hpp
@@ -22,8 +22,8 @@

 #include "data/DBHelpers.hpp"

-#include <ripple/protocol/STTx.h>
-#include <ripple/protocol/TxMeta.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/TxMeta.h>

 namespace etl {

@@ -35,7 +35,7 @@ namespace etl {
 * @return The MPTIssuanceID and holder pair as a optional
 */
 std::optional<MPTHolderData>
-getMPTHolderFromTx(ripple::TxMeta const& txMeta, ripple::STTx const& sttx);
+getMPTHolderFromTx(xrpl::TxMeta const& txMeta, xrpl::STTx const& sttx);

 /**
 * @brief Pull MPT data from ledger object via loadInitialLedger.
--- a/src/etl/Models.hpp
+++ b/src/etl/Models.hpp
@@ -47,7 +47,7 @@ namespace etl::model {
 * the Registry for its `onTransaction` and `onInitialTransaction` hooks.
 * It's a compilation error to list the same transaction type more than once.
 */
-template <ripple::TxType... Types>
+template <xrpl::TxType... Types>
    requires(util::hasNoDuplicates(Types...))
 struct Spec {
    static constexpr bool kSPEC_TAG = true;
@@ -59,7 +59,7 @@ struct Spec {
     * @return true if the transaction was requested; false otherwise
     */
    [[nodiscard]] static constexpr bool
-    wants(ripple::TxType type) noexcept
+    wants(xrpl::TxType type) noexcept
    {
        return ((Types == type) || ...);
    }
@@ -73,13 +73,13 @@ struct Transaction {
    std::string metaRaw;

    // unpacked blob and meta
-    ripple::STTx sttx;
-    ripple::TxMeta meta;
+    xrpl::STTx sttx;
+    xrpl::TxMeta meta;

    // commonly used stuff
-    ripple::uint256 id;
+    xrpl::uint256 id;
    std::string key;  // key is the above id as a string of 32 characters
-    ripple::TxType type;
+    xrpl::TxType type;

    /**
     * @brief Compares Transaction objects to each other without considering sttx and meta fields
@@ -113,9 +113,9 @@ struct Object {
        Deleted = 3,
    };

-    ripple::uint256 key;
+    xrpl::uint256 key;
    std::string keyRaw;
-    ripple::Blob data;
+    xrpl::Blob data;
    std::string dataRaw;
    std::string successor;
    std::string predecessor;
@@ -146,7 +146,7 @@ struct LedgerData {
    std::optional<std::vector<BookSuccessor>> successors;
    std::optional<std::vector<std::string>> edgeKeys;

-    ripple::LedgerHeader header;
+    xrpl::LedgerHeader header;
    std::string rawHeader;
    uint32_t seq;

@@ -159,8 +159,8 @@ struct LedgerData {
    operator==(LedgerData const& other) const
    {
        auto const serialized = [](auto const& hdr) {
-            ripple::Serializer ser;
-            ripple::addRaw(hdr, ser);
+            xrpl::Serializer ser;
+            xrpl::addRaw(hdr, ser);
            return ser.getString();
        };

--- a/src/etl/NFTHelpers.cpp
+++ b/src/etl/NFTHelpers.cpp
@@ -49,47 +49,47 @@
 namespace etl {

 std::pair<std::vector<NFTTransactionsData>, std::optional<NFTsData>>
-getNftokenModifyData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx)
+getNftokenModifyData(xrpl::TxMeta const& txMeta, xrpl::STTx const& sttx)
 {
-    auto const tokenID = sttx.getFieldH256(ripple::sfNFTokenID);
+    auto const tokenID = sttx.getFieldH256(xrpl::sfNFTokenID);
    // note: sfURI is optional, if it is absent, we will update the uri as empty string
    return {
-        {NFTTransactionsData(sttx.getFieldH256(ripple::sfNFTokenID), txMeta, sttx.getTransactionID())},
-        NFTsData(tokenID, txMeta, sttx.getFieldVL(ripple::sfURI))
+        {NFTTransactionsData(sttx.getFieldH256(xrpl::sfNFTokenID), txMeta, sttx.getTransactionID())},
+        NFTsData(tokenID, txMeta, sttx.getFieldVL(xrpl::sfURI))
    };
 }

 std::pair<std::vector<NFTTransactionsData>, std::optional<NFTsData>>
-getNFTokenMintData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx)
+getNFTokenMintData(xrpl::TxMeta const& txMeta, xrpl::STTx const& sttx)
 {
    // To find the minted token ID, we put all tokenIDs referenced in the
    // metadata from prior to the tx application into one vector, then all
    // tokenIDs referenced in the metadata from after the tx application into
    // another, then find the one tokenID that was added by this tx
    // application.
-    std::vector<ripple::uint256> prevIDs;
-    std::vector<ripple::uint256> finalIDs;
+    std::vector<xrpl::uint256> prevIDs;
+    std::vector<xrpl::uint256> finalIDs;

    // The owner is not necessarily the issuer, if using authorized minter
    // flow. Determine owner from the ledger object ID of the NFTokenPages
    // that were changed.
-    std::optional<ripple::AccountID> owner;
+    std::optional<xrpl::AccountID> owner;

-    for (ripple::STObject const& node : txMeta.getNodes()) {
-        if (node.getFieldU16(ripple::sfLedgerEntryType) != ripple::ltNFTOKEN_PAGE)
+    for (xrpl::STObject const& node : txMeta.getNodes()) {
+        if (node.getFieldU16(xrpl::sfLedgerEntryType) != xrpl::ltNFTOKEN_PAGE)
            continue;

        if (!owner)
-            owner = ripple::AccountID::fromVoid(node.getFieldH256(ripple::sfLedgerIndex).data());
+            owner = xrpl::AccountID::fromVoid(node.getFieldH256(xrpl::sfLedgerIndex).data());

-        if (node.getFName() == ripple::sfCreatedNode) {
-            ripple::STArray const& toAddNFTs =
-                node.peekAtField(ripple::sfNewFields).downcast<ripple::STObject>().getFieldArray(ripple::sfNFTokens);
+        if (node.getFName() == xrpl::sfCreatedNode) {
+            xrpl::STArray const& toAddNFTs =
+                node.peekAtField(xrpl::sfNewFields).downcast<xrpl::STObject>().getFieldArray(xrpl::sfNFTokens);
            std::ranges::transform(
                toAddNFTs,

                std::back_inserter(finalIDs),
-                [](ripple::STObject const& nft) { return nft.getFieldH256(ripple::sfNFTokenID); }
+                [](xrpl::STObject const& nft) { return nft.getFieldH256(xrpl::sfNFTokenID); }
            );
        }
        // Else it's modified, as there should never be a deleted NFToken page
@@ -104,26 +104,25 @@ getNFTokenMintData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx)
            // However, there will always be NFTs listed in the final fields,
            // as rippled outputs all fields in final fields even if they were
            // not changed.
-            ripple::STObject const& previousFields =
-                node.peekAtField(ripple::sfPreviousFields).downcast<ripple::STObject>();
-            if (!previousFields.isFieldPresent(ripple::sfNFTokens))
+            xrpl::STObject const& previousFields = node.peekAtField(xrpl::sfPreviousFields).downcast<xrpl::STObject>();
+            if (!previousFields.isFieldPresent(xrpl::sfNFTokens))
                continue;

-            ripple::STArray const& toAddNFTs = previousFields.getFieldArray(ripple::sfNFTokens);
+            xrpl::STArray const& toAddNFTs = previousFields.getFieldArray(xrpl::sfNFTokens);
            std::ranges::transform(
                toAddNFTs,

                std::back_inserter(prevIDs),
-                [](ripple::STObject const& nft) { return nft.getFieldH256(ripple::sfNFTokenID); }
+                [](xrpl::STObject const& nft) { return nft.getFieldH256(xrpl::sfNFTokenID); }
            );

-            ripple::STArray const& toAddFinalNFTs =
-                node.peekAtField(ripple::sfFinalFields).downcast<ripple::STObject>().getFieldArray(ripple::sfNFTokens);
+            xrpl::STArray const& toAddFinalNFTs =
+                node.peekAtField(xrpl::sfFinalFields).downcast<xrpl::STObject>().getFieldArray(xrpl::sfNFTokens);
            std::ranges::transform(
                toAddFinalNFTs,

                std::back_inserter(finalIDs),
-                [](ripple::STObject const& nft) { return nft.getFieldH256(ripple::sfNFTokenID); }
+                [](xrpl::STObject const& nft) { return nft.getFieldH256(xrpl::sfNFTokenID); }
            );
        }
    }
@@ -146,22 +145,21 @@ getNFTokenMintData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx)

    return {
        {NFTTransactionsData(*diff.first, txMeta, sttx.getTransactionID())},
-        NFTsData(*diff.first, *owner, sttx.getFieldVL(ripple::sfURI), txMeta)
+        NFTsData(*diff.first, *owner, sttx.getFieldVL(xrpl::sfURI), txMeta)
    };
 }

 std::pair<std::vector<NFTTransactionsData>, std::optional<NFTsData>>
-getNFTokenBurnData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx)
+getNFTokenBurnData(xrpl::TxMeta const& txMeta, xrpl::STTx const& sttx)
 {
-    ripple::uint256 const tokenID = sttx.getFieldH256(ripple::sfNFTokenID);
+    xrpl::uint256 const tokenID = sttx.getFieldH256(xrpl::sfNFTokenID);
    std::vector<NFTTransactionsData> const txs = {NFTTransactionsData(tokenID, txMeta, sttx.getTransactionID())};

    // Determine who owned the token when it was burned by finding an
    // NFTokenPage that was deleted or modified that contains this
    // tokenID.
-    for (ripple::STObject const& node : txMeta.getNodes()) {
-        if (node.getFieldU16(ripple::sfLedgerEntryType) != ripple::ltNFTOKEN_PAGE ||
-            node.getFName() == ripple::sfCreatedNode)
+    for (xrpl::STObject const& node : txMeta.getNodes()) {
+        if (node.getFieldU16(xrpl::sfLedgerEntryType) != xrpl::ltNFTOKEN_PAGE || node.getFName() == xrpl::sfCreatedNode)
            continue;

        // NFT burn can result in an NFTokenPage being modified to no longer
@@ -172,30 +170,27 @@ getNFTokenBurnData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx)
        // deleted. In this case, we need to look in the PreviousFields.
        // Otherwise, the page was not modified prior to deleting and we
        // need to look in the FinalFields.
-        std::optional<ripple::STArray> prevNFTs;
+        std::optional<xrpl::STArray> prevNFTs;

-        if (node.isFieldPresent(ripple::sfPreviousFields)) {
-            ripple::STObject const& previousFields =
-                node.peekAtField(ripple::sfPreviousFields).downcast<ripple::STObject>();
-            if (previousFields.isFieldPresent(ripple::sfNFTokens))
-                prevNFTs = previousFields.getFieldArray(ripple::sfNFTokens);
-        } else if (node.getFName() == ripple::sfDeletedNode) {
-            prevNFTs =
-                node.peekAtField(ripple::sfFinalFields).downcast<ripple::STObject>().getFieldArray(ripple::sfNFTokens);
+        if (node.isFieldPresent(xrpl::sfPreviousFields)) {
+            xrpl::STObject const& previousFields = node.peekAtField(xrpl::sfPreviousFields).downcast<xrpl::STObject>();
+            if (previousFields.isFieldPresent(xrpl::sfNFTokens))
+                prevNFTs = previousFields.getFieldArray(xrpl::sfNFTokens);
+        } else if (node.getFName() == xrpl::sfDeletedNode) {
+            prevNFTs = node.peekAtField(xrpl::sfFinalFields).downcast<xrpl::STObject>().getFieldArray(xrpl::sfNFTokens);
        }

        if (!prevNFTs)
            continue;

-        auto const nft =
-            std::find_if(prevNFTs->begin(), prevNFTs->end(), [&tokenID](ripple::STObject const& candidate) {
-                return candidate.getFieldH256(ripple::sfNFTokenID) == tokenID;
-            });
+        auto const nft = std::find_if(prevNFTs->begin(), prevNFTs->end(), [&tokenID](xrpl::STObject const& candidate) {
+            return candidate.getFieldH256(xrpl::sfNFTokenID) == tokenID;
+        });
        if (nft != prevNFTs->end()) {
            return std::make_pair(
                txs,
                NFTsData(
-                    tokenID, ripple::AccountID::fromVoid(node.getFieldH256(ripple::sfLedgerIndex).data()), txMeta, true
+                    tokenID, xrpl::AccountID::fromVoid(node.getFieldH256(xrpl::sfLedgerIndex).data()), txMeta, true
                )
            );
        }
@@ -207,15 +202,15 @@ getNFTokenBurnData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx)
 }

 std::pair<std::vector<NFTTransactionsData>, std::optional<NFTsData>>
-getNFTokenAcceptOfferData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx)
+getNFTokenAcceptOfferData(xrpl::TxMeta const& txMeta, xrpl::STTx const& sttx)
 {
    // If we have the buy offer from this tx, we can determine the owner
    // more easily by just looking at the owner of the accepted NFTokenOffer
    // object.
-    if (sttx.isFieldPresent(ripple::sfNFTokenBuyOffer)) {
+    if (sttx.isFieldPresent(xrpl::sfNFTokenBuyOffer)) {
        auto const affectedBuyOffer =
-            std::find_if(txMeta.getNodes().begin(), txMeta.getNodes().end(), [&sttx](ripple::STObject const& node) {
-                return node.getFieldH256(ripple::sfLedgerIndex) == sttx.getFieldH256(ripple::sfNFTokenBuyOffer);
+            std::find_if(txMeta.getNodes().begin(), txMeta.getNodes().end(), [&sttx](xrpl::STObject const& node) {
+                return node.getFieldH256(xrpl::sfLedgerIndex) == sttx.getFieldH256(xrpl::sfNFTokenBuyOffer);
            });
        if (affectedBuyOffer == txMeta.getNodes().end()) {
            std::stringstream msg;
@@ -223,13 +218,12 @@ getNFTokenAcceptOfferData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx
            throw std::runtime_error(msg.str());
        }

-        ripple::uint256 const tokenID = affectedBuyOffer->peekAtField(ripple::sfFinalFields)
-                                            .downcast<ripple::STObject>()
-                                            .getFieldH256(ripple::sfNFTokenID);
+        xrpl::uint256 const tokenID = affectedBuyOffer->peekAtField(xrpl::sfFinalFields)
+                                          .downcast<xrpl::STObject>()
+                                          .getFieldH256(xrpl::sfNFTokenID);

-        ripple::AccountID const owner = affectedBuyOffer->peekAtField(ripple::sfFinalFields)
-                                            .downcast<ripple::STObject>()
-                                            .getAccountID(ripple::sfOwner);
+        xrpl::AccountID const owner =
+            affectedBuyOffer->peekAtField(xrpl::sfFinalFields).downcast<xrpl::STObject>().getAccountID(xrpl::sfOwner);
        return {
            {NFTTransactionsData(tokenID, txMeta, sttx.getTransactionID())}, NFTsData(tokenID, owner, txMeta, false)
        };
@@ -237,8 +231,8 @@ getNFTokenAcceptOfferData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx

    // Otherwise we have to infer the new owner from the affected nodes.
    auto const affectedSellOffer =
-        std::find_if(txMeta.getNodes().begin(), txMeta.getNodes().end(), [&sttx](ripple::STObject const& node) {
-            return node.getFieldH256(ripple::sfLedgerIndex) == sttx.getFieldH256(ripple::sfNFTokenSellOffer);
+        std::find_if(txMeta.getNodes().begin(), txMeta.getNodes().end(), [&sttx](xrpl::STObject const& node) {
+            return node.getFieldH256(xrpl::sfLedgerIndex) == sttx.getFieldH256(xrpl::sfNFTokenSellOffer);
        });
    if (affectedSellOffer == txMeta.getNodes().end()) {
        std::stringstream msg;
@@ -246,37 +240,29 @@ getNFTokenAcceptOfferData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx
        throw std::runtime_error(msg.str());
    }

-    ripple::uint256 const tokenID = affectedSellOffer->peekAtField(ripple::sfFinalFields)
-                                        .downcast<ripple::STObject>()
-                                        .getFieldH256(ripple::sfNFTokenID);
+    xrpl::uint256 const tokenID =
+        affectedSellOffer->peekAtField(xrpl::sfFinalFields).downcast<xrpl::STObject>().getFieldH256(xrpl::sfNFTokenID);

-    ripple::AccountID const seller = affectedSellOffer->peekAtField(ripple::sfFinalFields)
-                                         .downcast<ripple::STObject>()
-                                         .getAccountID(ripple::sfOwner);
+    xrpl::AccountID const seller =
+        affectedSellOffer->peekAtField(xrpl::sfFinalFields).downcast<xrpl::STObject>().getAccountID(xrpl::sfOwner);

-    for (ripple::STObject const& node : txMeta.getNodes()) {
-        if (node.getFieldU16(ripple::sfLedgerEntryType) != ripple::ltNFTOKEN_PAGE ||
-            node.getFName() == ripple::sfDeletedNode)
+    for (xrpl::STObject const& node : txMeta.getNodes()) {
+        if (node.getFieldU16(xrpl::sfLedgerEntryType) != xrpl::ltNFTOKEN_PAGE || node.getFName() == xrpl::sfDeletedNode)
            continue;

-        ripple::AccountID const nodeOwner =
-            ripple::AccountID::fromVoid(node.getFieldH256(ripple::sfLedgerIndex).data());
+        xrpl::AccountID const nodeOwner = xrpl::AccountID::fromVoid(node.getFieldH256(xrpl::sfLedgerIndex).data());
        if (nodeOwner == seller)
            continue;

-        ripple::STArray const& nfts = [&node] {
-            if (node.getFName() == ripple::sfCreatedNode) {
-                return node.peekAtField(ripple::sfNewFields)
-                    .downcast<ripple::STObject>()
-                    .getFieldArray(ripple::sfNFTokens);
+        xrpl::STArray const& nfts = [&node] {
+            if (node.getFName() == xrpl::sfCreatedNode) {
+                return node.peekAtField(xrpl::sfNewFields).downcast<xrpl::STObject>().getFieldArray(xrpl::sfNFTokens);
            }
-            return node.peekAtField(ripple::sfFinalFields)
-                .downcast<ripple::STObject>()
-                .getFieldArray(ripple::sfNFTokens);
+            return node.peekAtField(xrpl::sfFinalFields).downcast<xrpl::STObject>().getFieldArray(xrpl::sfNFTokens);
        }();

-        auto const nft = std::ranges::find_if(nfts, [&tokenID](ripple::STObject const& candidate) {
-            return candidate.getFieldH256(ripple::sfNFTokenID) == tokenID;
+        auto const nft = std::ranges::find_if(nfts, [&tokenID](xrpl::STObject const& candidate) {
+            return candidate.getFieldH256(xrpl::sfNFTokenID) == tokenID;
        });
        if (nft != nfts.end()) {
            return {
@@ -296,15 +282,15 @@ getNFTokenAcceptOfferData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx
 // transaction using this feature. This transaction also never returns an
 // NFTsData because it does not change the state of an NFT itself.
 std::pair<std::vector<NFTTransactionsData>, std::optional<NFTsData>>
-getNFTokenCancelOfferData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx)
+getNFTokenCancelOfferData(xrpl::TxMeta const& txMeta, xrpl::STTx const& sttx)
 {
    std::vector<NFTTransactionsData> txs;
-    for (ripple::STObject const& node : txMeta.getNodes()) {
-        if (node.getFieldU16(ripple::sfLedgerEntryType) != ripple::ltNFTOKEN_OFFER)
+    for (xrpl::STObject const& node : txMeta.getNodes()) {
+        if (node.getFieldU16(xrpl::sfLedgerEntryType) != xrpl::ltNFTOKEN_OFFER)
            continue;

-        ripple::uint256 const tokenID =
-            node.peekAtField(ripple::sfFinalFields).downcast<ripple::STObject>().getFieldH256(ripple::sfNFTokenID);
+        xrpl::uint256 const tokenID =
+            node.peekAtField(xrpl::sfFinalFields).downcast<xrpl::STObject>().getFieldH256(xrpl::sfNFTokenID);
        txs.emplace_back(tokenID, txMeta, sttx.getTransactionID());
    }

@@ -322,34 +308,34 @@ getNFTokenCancelOfferData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx
 // This transaction never returns an NFTokensData because it does not
 // change the state of an NFT itself.
 std::pair<std::vector<NFTTransactionsData>, std::optional<NFTsData>>
-getNFTokenCreateOfferData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx)
+getNFTokenCreateOfferData(xrpl::TxMeta const& txMeta, xrpl::STTx const& sttx)
 {
-    return {{NFTTransactionsData(sttx.getFieldH256(ripple::sfNFTokenID), txMeta, sttx.getTransactionID())}, {}};
+    return {{NFTTransactionsData(sttx.getFieldH256(xrpl::sfNFTokenID), txMeta, sttx.getTransactionID())}, {}};
 }

 std::pair<std::vector<NFTTransactionsData>, std::optional<NFTsData>>
-getNFTDataFromTx(ripple::TxMeta const& txMeta, ripple::STTx const& sttx)
+getNFTDataFromTx(xrpl::TxMeta const& txMeta, xrpl::STTx const& sttx)
 {
-    if (txMeta.getResultTER() != ripple::tesSUCCESS)
+    if (txMeta.getResultTER() != xrpl::tesSUCCESS)
        return {{}, {}};

    switch (sttx.getTxnType()) {
-        case ripple::TxType::ttNFTOKEN_MINT:
+        case xrpl::TxType::ttNFTOKEN_MINT:
            return getNFTokenMintData(txMeta, sttx);

-        case ripple::TxType::ttNFTOKEN_BURN:
+        case xrpl::TxType::ttNFTOKEN_BURN:
            return getNFTokenBurnData(txMeta, sttx);

-        case ripple::TxType::ttNFTOKEN_ACCEPT_OFFER:
+        case xrpl::TxType::ttNFTOKEN_ACCEPT_OFFER:
            return getNFTokenAcceptOfferData(txMeta, sttx);

-        case ripple::TxType::ttNFTOKEN_CANCEL_OFFER:
+        case xrpl::TxType::ttNFTOKEN_CANCEL_OFFER:
            return getNFTokenCancelOfferData(txMeta, sttx);

-        case ripple::TxType::ttNFTOKEN_CREATE_OFFER:
+        case xrpl::TxType::ttNFTOKEN_CREATE_OFFER:
            return getNFTokenCreateOfferData(txMeta, sttx);

-        case ripple::TxType::ttNFTOKEN_MODIFY:
+        case xrpl::TxType::ttNFTOKEN_MODIFY:
            return getNftokenModifyData(txMeta, sttx);

        default:
@@ -361,19 +347,19 @@ std::vector<NFTsData>
 getNFTDataFromObj(std::uint32_t const seq, std::string const& key, std::string const& blob)
 {
    // https://github.com/XRPLF/XRPL-Standards/tree/master/XLS-0020-non-fungible-tokens#tokenpage-id-format
-    ASSERT(key.size() == ripple::uint256::size(), "The size of the key (token) is expected to fit uint256 exactly");
+    ASSERT(key.size() == xrpl::uint256::size(), "The size of the key (token) is expected to fit uint256 exactly");

    auto const sle =
-        ripple::STLedgerEntry(ripple::SerialIter{blob.data(), blob.size()}, ripple::uint256::fromVoid(key.data()));
+        xrpl::STLedgerEntry(xrpl::SerialIter{blob.data(), blob.size()}, xrpl::uint256::fromVoid(key.data()));

-    if (sle.getFieldU16(ripple::sfLedgerEntryType) != ripple::ltNFTOKEN_PAGE)
+    if (sle.getFieldU16(xrpl::sfLedgerEntryType) != xrpl::ltNFTOKEN_PAGE)
        return {};

-    auto const owner = ripple::AccountID::fromVoid(key.data());
+    auto const owner = xrpl::AccountID::fromVoid(key.data());
    std::vector<NFTsData> nfts;

-    for (ripple::STObject const& node : sle.getFieldArray(ripple::sfNFTokens))
-        nfts.emplace_back(node.getFieldH256(ripple::sfNFTokenID), seq, owner, node.getFieldVL(ripple::sfURI));
+    for (xrpl::STObject const& node : sle.getFieldArray(xrpl::sfNFTokens))
+        nfts.emplace_back(node.getFieldH256(xrpl::sfNFTokenID), seq, owner, node.getFieldVL(xrpl::sfURI));

    return nfts;
 }
--- a/src/etl/NFTHelpers.hpp
+++ b/src/etl/NFTHelpers.hpp
@@ -41,7 +41,7 @@ namespace etl {
 * @return NFT URI change data as a pair of transactions and optional NFTsData
 */
 std::pair<std::vector<NFTTransactionsData>, std::optional<NFTsData>>
-getNftokenModifyData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx);
+getNftokenModifyData(xrpl::TxMeta const& txMeta, xrpl::STTx const& sttx);

 /**
 * @brief Get the NFT Token mint data from a transaction
@@ -51,7 +51,7 @@ getNftokenModifyData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx);
 * @return NFT Token mint data as a pair of transactions and optional NFTsData
 */
 std::pair<std::vector<NFTTransactionsData>, std::optional<NFTsData>>
-getNFTokenMintData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx);
+getNFTokenMintData(xrpl::TxMeta const& txMeta, xrpl::STTx const& sttx);

 /**
 * @brief Get the NFT Token burn data from a transaction
@@ -61,7 +61,7 @@ getNFTokenMintData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx);
 * @return NFT Token burn data as a pair of transactions and optional NFTsData
 */
 std::pair<std::vector<NFTTransactionsData>, std::optional<NFTsData>>
-getNFTokenBurnData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx);
+getNFTokenBurnData(xrpl::TxMeta const& txMeta, xrpl::STTx const& sttx);

 /**
 * @brief Get the NFT Token accept offer data from a transaction
@@ -71,7 +71,7 @@ getNFTokenBurnData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx);
 * @return NFT Token accept offer data as a pair of transactions and optional NFTsData
 */
 std::pair<std::vector<NFTTransactionsData>, std::optional<NFTsData>>
-getNFTokenAcceptOfferData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx);
+getNFTokenAcceptOfferData(xrpl::TxMeta const& txMeta, xrpl::STTx const& sttx);

 /**
 * @brief Get the NFT Token cancel offer data from a transaction
@@ -81,7 +81,7 @@ getNFTokenAcceptOfferData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx
 * @return NFT Token cancel offer data as a pair of transactions and optional NFTsData
 */
 std::pair<std::vector<NFTTransactionsData>, std::optional<NFTsData>>
-getNFTokenCancelOfferData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx);
+getNFTokenCancelOfferData(xrpl::TxMeta const& txMeta, xrpl::STTx const& sttx);

 /**
 * @brief Get the NFT Token create offer data from a transaction
@@ -91,7 +91,7 @@ getNFTokenCancelOfferData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx
 * @return NFT Token create offer data as a pair of transactions and optional NFTsData
 */
 std::pair<std::vector<NFTTransactionsData>, std::optional<NFTsData>>
-getNFTokenCreateOfferData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx);
+getNFTokenCreateOfferData(xrpl::TxMeta const& txMeta, xrpl::STTx const& sttx);

 /**
 * @brief Pull NFT data from TX via ETLService.
@@ -101,7 +101,7 @@ getNFTokenCreateOfferData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx
 * @return NFT transactions data as a pair of transactions and optional NFTsData
 */
 std::pair<std::vector<NFTTransactionsData>, std::optional<NFTsData>>
-getNFTDataFromTx(ripple::TxMeta const& txMeta, ripple::STTx const& sttx);
+getNFTDataFromTx(xrpl::TxMeta const& txMeta, xrpl::STTx const& sttx);

 /**
 * @brief Pull NFT data from ledger object via loadInitialLedger.
--- a/src/etl/RegistryInterface.hpp
+++ b/src/etl/RegistryInterface.hpp
@@ -58,11 +58,11 @@ namespace etl {
 * @code{.cpp}
 * struct Ext {
 *   using spec = etl::model::Spec<
- *     ripple::TxType::ttNFTOKEN_BURN,
- *     ripple::TxType::ttNFTOKEN_ACCEPT_OFFER,
- *     ripple::TxType::ttNFTOKEN_CREATE_OFFER,
- *     ripple::TxType::ttNFTOKEN_CANCEL_OFFER,
- *     ripple::TxType::ttNFTOKEN_MINT>;
+ *     xrpl::TxType::ttNFTOKEN_BURN,
+ *     xrpl::TxType::ttNFTOKEN_ACCEPT_OFFER,
+ *     xrpl::TxType::ttNFTOKEN_CREATE_OFFER,
+ *     xrpl::TxType::ttNFTOKEN_CANCEL_OFFER,
+ *     xrpl::TxType::ttNFTOKEN_MINT>;
 *
 *   static void
 *   onInitialTransaction(uint32_t, etl::model::Transaction const&);
--- a/src/etl/impl/AsyncGrpcCall.cpp
+++ b/src/etl/impl/AsyncGrpcCall.cpp
@@ -43,24 +43,20 @@

 namespace etl::impl {

-AsyncGrpcCall::AsyncGrpcCall(
-    uint32_t seq,
-    ripple::uint256 const& marker,
-    std::optional<ripple::uint256> const& nextMarker
-)
+AsyncGrpcCall::AsyncGrpcCall(uint32_t seq, xrpl::uint256 const& marker, std::optional<xrpl::uint256> const& nextMarker)
 {
    request_.set_user("ETL");
    request_.mutable_ledger()->set_sequence(seq);

    if (marker.isNonZero())
-        request_.set_marker(marker.data(), ripple::uint256::size());
+        request_.set_marker(marker.data(), xrpl::uint256::size());

    nextPrefix_ = nextMarker ? nextMarker->data()[0] : 0x00;
    auto const prefix = marker.data()[0];

-    LOG(log_.debug()) << "Setting up AsyncGrpcCall. marker = " << ripple::strHex(marker)
-                      << ". prefix = " << ripple::strHex(std::string(1, prefix))
-                      << ". nextPrefix_ = " << ripple::strHex(std::string(1, nextPrefix_));
+    LOG(log_.debug()) << "Setting up AsyncGrpcCall. marker = " << xrpl::strHex(marker)
+                      << ". prefix = " << xrpl::strHex(std::string(1, prefix))
+                      << ". nextPrefix_ = " << xrpl::strHex(std::string(1, nextPrefix_));

    ASSERT(
        nextPrefix_ > prefix or nextPrefix_ == 0x00,
@@ -157,7 +153,7 @@ AsyncGrpcCall::call(std::unique_ptr<org::xrpl::rpc::v1::XRPLedgerAPIService::Stu
 std::string
 AsyncGrpcCall::getMarkerPrefix()
 {
-    return next_->marker().empty() ? std::string{} : ripple::strHex(std::string{next_->marker().data()[0]});
+    return next_->marker().empty() ? std::string{} : xrpl::strHex(std::string{next_->marker().data()[0]});
 }

 // this is used to generate edgeKeys - keys that were the last one in the onInitialObjects list
--- a/src/etl/impl/AsyncGrpcCall.hpp
+++ b/src/etl/impl/AsyncGrpcCall.hpp
@@ -59,7 +59,7 @@ private:
    std::optional<std::string> predecessorKey_;

 public:
-    AsyncGrpcCall(uint32_t seq, ripple::uint256 const& marker, std::optional<ripple::uint256> const& nextMarker);
+    AsyncGrpcCall(uint32_t seq, xrpl::uint256 const& marker, std::optional<xrpl::uint256> const& nextMarker);

    static std::vector<AsyncGrpcCall>
    makeAsyncCalls(uint32_t const sequence, uint32_t const numMarkers);
--- a/src/etl/impl/BaseCursorProvider.hpp
+++ b/src/etl/impl/BaseCursorProvider.hpp
@@ -26,8 +26,8 @@
 namespace etl::impl {

 struct CursorPair {
-    ripple::uint256 start;
-    ripple::uint256 end;
+    xrpl::uint256 start;
+    xrpl::uint256 end;
 };

 struct BaseCursorProvider {
--- a/src/etl/impl/CacheLoader.hpp
+++ b/src/etl/impl/CacheLoader.hpp
@@ -120,7 +120,7 @@ private:
                }

                auto [start, end] = cursor.value();
-                LOG(log_.debug()) << "Starting a cursor: " << ripple::strHex(start);
+                LOG(log_.debug()) << "Starting a cursor: " << xrpl::strHex(start);

                while (not token.isStopRequested() and not cache_.get().isDisabled()) {
                    auto res = data::retryOnTimeout([this, seq, cachePageFetchSize, &start, token]() {
--- a/src/etl/impl/CursorFromAccountProvider.hpp
+++ b/src/etl/impl/CursorFromAccountProvider.hpp
@@ -58,7 +58,7 @@ public:
        }();

        rg::sort(accountRoots);
-        std::vector<ripple::uint256> cursors{data::kFIRST_KEY};
+        std::vector<xrpl::uint256> cursors{data::kFIRST_KEY};
        rg::copy(accountRoots.begin(), accountRoots.end(), std::back_inserter(cursors));
        rg::sort(cursors);
        cursors.push_back(data::kLAST_KEY);
--- a/src/etl/impl/CursorFromDiffProvider.hpp
+++ b/src/etl/impl/CursorFromDiffProvider.hpp
@@ -62,8 +62,8 @@ public:
        auto const range = backend_->fetchLedgerRange();
        ASSERT(range.has_value(), "Ledger range is not available when cache is loading");

-        std::set<ripple::uint256> liveCursors;
-        std::set<ripple::uint256> deletedCursors;
+        std::set<xrpl::uint256> liveCursors;
+        std::set<xrpl::uint256> deletedCursors;
        auto i = 0;
        while (liveCursors.size() < numCursors_ and seq - i >= range->minSequence) {
            auto diffs = fetchDiff(i++);
@@ -85,7 +85,7 @@ public:
            );
        }

-        std::vector<ripple::uint256> cursors{data::kFIRST_KEY};
+        std::vector<xrpl::uint256> cursors{data::kFIRST_KEY};
        rg::copy(liveCursors | vs::take(std::min(liveCursors.size(), numCursors_)), std::back_inserter(cursors));
        rg::sort(cursors);
        cursors.push_back(data::kLAST_KEY);
--- a/src/etl/impl/CursorFromFixDiffNumProvider.hpp
+++ b/src/etl/impl/CursorFromFixDiffNumProvider.hpp
@@ -74,7 +74,7 @@ public:
            rg::unique(diffs, [](auto const& a, auto const& b) { return a.key == b.key; });
        diffs.erase(removalCursor, last);

-        std::vector<ripple::uint256> cursors{data::kFIRST_KEY};
+        std::vector<xrpl::uint256> cursors{data::kFIRST_KEY};
        rg::copy(
            diffs                                                                   //
                | vs::filter([](auto const& obj) { return not obj.blob.empty(); })  //
--- a/src/etl/impl/Extraction.cpp
+++ b/src/etl/impl/Extraction.cpp
@@ -29,6 +29,7 @@
 #include "util/Profiler.hpp"
 #include "util/log/Logger.hpp"

+#include <xrpl/basics/Blob.h>
 #include <xrpl/basics/Slice.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/protocol/STTx.h>
@@ -72,9 +73,10 @@ model::Transaction
 extractTx(PBTxType tx, uint32_t seq)
 {
    auto raw = std::move(*tx.mutable_transaction_blob());
-    ripple::SerialIter it{raw.data(), raw.size()};
-    ripple::STTx const sttx{it};
-    ripple::TxMeta meta{sttx.getTransactionID(), seq, tx.metadata_blob()};
+    xrpl::SerialIter it{raw.data(), raw.size()};
+    xrpl::STTx const sttx{it};
+    auto const& metaBlob = tx.metadata_blob();
+    xrpl::TxMeta meta{sttx.getTransactionID(), seq, xrpl::Blob{metaBlob.begin(), metaBlob.end()}};

    return {
        .raw = std::move(raw),
@@ -104,7 +106,7 @@ extractTxs(PBTxListType transactions, uint32_t seq)
 model::Object
 extractObj(PBObjType obj)
 {
-    auto const key = ripple::uint256::fromVoidChecked(obj.key());
+    auto const key = xrpl::uint256::fromVoidChecked(obj.key());
    ASSERT(key.has_value(), "Failed to deserialize key from void");

    auto const valueOr = [](std::string const& maybe, std::string fallback) -> std::string {
@@ -171,7 +173,7 @@ auto
 Extractor::unpack()
 {
    return [](auto&& data) {
-        auto header = ::util::deserializeHeader(ripple::makeSlice(data.ledger_header()));
+        auto header = ::util::deserializeHeader(xrpl::makeSlice(data.ledger_header()));

        return std::make_optional<model::LedgerData>({
            .transactions =
--- a/src/etl/impl/LedgerPublisher.hpp
+++ b/src/etl/impl/LedgerPublisher.hpp
@@ -80,7 +80,7 @@ class LedgerPublisher : public LedgerPublisherInterface {
    std::shared_ptr<feed::SubscriptionManagerInterface> subscriptions_;
    std::reference_wrapper<SystemState const> state_;  // shared state for ETL

-    util::Mutex<std::chrono::time_point<ripple::NetClock>, std::shared_mutex> lastCloseTime_;
+    util::Mutex<std::chrono::time_point<xrpl::NetClock>, std::shared_mutex> lastCloseTime_;

    std::reference_wrapper<util::prometheus::CounterInt> lastPublishSeconds_ = PrometheusService::counterInt(
        "etl_last_publish_seconds",
@@ -161,7 +161,7 @@ public:
     * @param lgrInfo the ledger to publish
     */
    void
-    publish(ripple::LedgerHeader const& lgrInfo)
+    publish(xrpl::LedgerHeader const& lgrInfo)
    {
        publishStrand_.submit([this, lgrInfo = lgrInfo] {
            LOG(log_.info()) << "Publishing ledger " << std::to_string(lgrInfo.seq);
@@ -172,7 +172,7 @@ public:
            // if the ledger closed over MAX_LEDGER_AGE_SECONDS ago, assume we are still catching up and don't publish
            static constexpr std::uint32_t kMAX_LEDGER_AGE_SECONDS = 600;
            if (age < kMAX_LEDGER_AGE_SECONDS) {
-                std::optional<ripple::Fees> fees = data::synchronousAndRetryOnTimeout([&](auto yield) {
+                std::optional<xrpl::Fees> fees = data::synchronousAndRetryOnTimeout([&](auto yield) {
                    return backend_->fetchFees(lgrInfo.seq, yield);
                });
                ASSERT(fees.has_value(), "Fees must exist for ledger {}", lgrInfo.seq);
@@ -189,12 +189,12 @@ public:

                // order with transaction index
                std::ranges::sort(transactions, [](auto const& t1, auto const& t2) {
-                    ripple::SerialIter iter1{t1.metadata.data(), t1.metadata.size()};
-                    ripple::STObject const object1(iter1, ripple::sfMetadata);
-                    ripple::SerialIter iter2{t2.metadata.data(), t2.metadata.size()};
-                    ripple::STObject const object2(iter2, ripple::sfMetadata);
-                    return object1.getFieldU32(ripple::sfTransactionIndex) <
-                        object2.getFieldU32(ripple::sfTransactionIndex);
+                    xrpl::SerialIter iter1{t1.metadata.data(), t1.metadata.size()};
+                    xrpl::STObject const object1(iter1, xrpl::sfMetadata);
+                    xrpl::SerialIter iter2{t2.metadata.data(), t2.metadata.size()};
+                    xrpl::STObject const object2(iter2, xrpl::sfMetadata);
+                    return object1.getFieldU32(xrpl::sfTransactionIndex) <
+                        object2.getFieldU32(xrpl::sfTransactionIndex);
                });

                for (auto const& txAndMeta : transactions)
@@ -260,7 +260,7 @@ public:

 private:
    void
-    setLastClose(std::chrono::time_point<ripple::NetClock> lastCloseTime)
+    setLastClose(std::chrono::time_point<xrpl::NetClock> lastCloseTime)
    {
        auto closeTime = lastCloseTime_.lock<std::scoped_lock>();
        *closeTime = lastCloseTime;
--- a/src/etl/impl/Loading.cpp
+++ b/src/etl/impl/Loading.cpp
@@ -128,7 +128,7 @@ Loader::onInitialLoadGotMoreObjects(
    }
 }

-std::optional<ripple::LedgerHeader>
+std::optional<xrpl::LedgerHeader>
 Loader::loadInitialLedger(model::LedgerData const& data)
 {
    try {
--- a/src/etl/impl/Loading.hpp
+++ b/src/etl/impl/Loading.hpp
@@ -86,7 +86,7 @@ public:
        std::optional<std::string> lastKey
    ) override;

-    std::optional<ripple::LedgerHeader>
+    std::optional<xrpl::LedgerHeader>
    loadInitialLedger(model::LedgerData const& data) override;
 };

--- a/src/etl/impl/ext/MPT.cpp
+++ b/src/etl/impl/ext/MPT.cpp
@@ -49,7 +49,7 @@ MPTExt::onLedgerData(model::LedgerData const& data)
 void
 MPTExt::onInitialObject(uint32_t, model::Object const& obj)
 {
-    LOG(log_.trace()) << "got initial object with key: " << ripple::strHex(obj.key);
+    LOG(log_.trace()) << "got initial object with key: " << xrpl::strHex(obj.key);
    if (auto const mptHolder = getMPTHolderFromObj(obj.keyRaw, obj.dataRaw); mptHolder.has_value())
        backend_->writeMPTHolders({*mptHolder});
 }
--- a/src/etl/impl/ext/Successor.cpp
+++ b/src/etl/impl/ext/Successor.cpp
@@ -144,7 +144,7 @@ SuccessorExt::updateSuccessorFromCache(uint32_t seq, model::Object const& obj) c

    if (isDeleted) {
        auto const old = cache_.get().getDeleted(obj.key, seq - 1);
-        ASSERT(old.has_value(), "Deleted object {} must be in cache", ripple::strHex(obj.key));
+        ASSERT(old.has_value(), "Deleted object {} must be in cache", xrpl::strHex(obj.key));

        checkBookBase = isBookDir(obj.key, *old);
    } else {
@@ -172,7 +172,7 @@ void
 SuccessorExt::updateBookSuccessor(
    std::optional<data::LedgerObject> const& maybeSuccessor,
    auto seq,
-    ripple::uint256 const& bookBase
+    xrpl::uint256 const& bookBase
 ) const
 {
    if (maybeSuccessor.has_value()) {
@@ -185,7 +185,7 @@ SuccessorExt::updateBookSuccessor(
 void
 SuccessorExt::writeSuccessors(uint32_t seq) const
 {
-    ripple::uint256 prev = data::kFIRST_KEY;
+    xrpl::uint256 prev = data::kFIRST_KEY;
    while (auto cur = cache_.get().getSuccessor(prev, seq)) {
        if (prev == data::kFIRST_KEY)
            backend_->writeSuccessor(uint256ToString(prev), seq, uint256ToString(cur->key));
@@ -196,7 +196,7 @@ SuccessorExt::writeSuccessors(uint32_t seq) const
            // make sure the base is not an actual object
            if (not cache_.get().get(base, seq)) {
                auto succ = cache_.get().getSuccessor(base, seq);
-                ASSERT(succ.has_value(), "Book base {} must have a successor", ripple::strHex(base));
+                ASSERT(succ.has_value(), "Book base {} must have a successor", xrpl::strHex(base));

                if (succ->key == cur->key)
                    backend_->writeSuccessor(uint256ToString(base), seq, uint256ToString(cur->key));
@@ -213,7 +213,7 @@ void
 SuccessorExt::writeEdgeKeys(std::uint32_t seq, auto const& edgeKeys) const
 {
    for (auto const& key : edgeKeys) {
-        auto succ = cache_.get().getSuccessor(*ripple::uint256::fromVoidChecked(key), seq);
+        auto succ = cache_.get().getSuccessor(*xrpl::uint256::fromVoidChecked(key), seq);
        if (succ)
            backend_->writeSuccessor(auto{key}, seq, uint256ToString(succ->key));
    }
--- a/src/etl/impl/ext/Successor.hpp
+++ b/src/etl/impl/ext/Successor.hpp
@@ -69,7 +69,7 @@ private:
    updateBookSuccessor(
        std::optional<data::LedgerObject> const& maybeSuccessor,
        auto seq,
-        ripple::uint256 const& bookBase
+        xrpl::uint256 const& bookBase
    ) const;

    void
--- a/src/feed/SubscriptionManager.cpp
+++ b/src/feed/SubscriptionManager.cpp
@@ -48,7 +48,7 @@ SubscriptionManager::unsubBookChanges(SubscriberSharedPtr const& subscriber)

 void
 SubscriptionManager::pubBookChanges(
-    ripple::LedgerHeader const& lgrInfo,
+    xrpl::LedgerHeader const& lgrInfo,
    std::vector<data::TransactionAndMetadata> const& transactions
 )
 {
@@ -72,7 +72,7 @@ SubscriptionManager::unsubProposedTransactions(SubscriberSharedPtr const& subscr
 }

 void
-SubscriptionManager::subProposedAccount(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber)
+SubscriptionManager::subProposedAccount(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber)
 {
    proposedTransactionFeed_.sub(account, subscriber);
    // Same as proposed_transactions subscribers, proposed_account subscribers also subscribe to the transaction feed to
@@ -81,7 +81,7 @@ SubscriptionManager::subProposedAccount(ripple::AccountID const& account, Subscr
 }

 void
-SubscriptionManager::unsubProposedAccount(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber)
+SubscriptionManager::unsubProposedAccount(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber)
 {
    proposedTransactionFeed_.unsub(account, subscriber);
    transactionFeed_.unsubProposed(account, subscriber);
@@ -107,8 +107,8 @@ SubscriptionManager::unsubLedger(SubscriberSharedPtr const& subscriber)

 void
 SubscriptionManager::pubLedger(
-    ripple::LedgerHeader const& lgrInfo,
-    ripple::Fees const& fees,
+    xrpl::LedgerHeader const& lgrInfo,
+    xrpl::Fees const& fees,
    std::string const& ledgerRange,
    std::uint32_t const txnCount
 )
@@ -165,31 +165,31 @@ SubscriptionManager::unsubTransactions(SubscriberSharedPtr const& subscriber)
 }

 void
-SubscriptionManager::subAccount(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber)
+SubscriptionManager::subAccount(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber)
 {
    transactionFeed_.sub(account, subscriber);
 }

 void
-SubscriptionManager::unsubAccount(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber)
+SubscriptionManager::unsubAccount(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber)
 {
    transactionFeed_.unsub(account, subscriber);
 }

 void
-SubscriptionManager::subBook(ripple::Book const& book, SubscriberSharedPtr const& subscriber)
+SubscriptionManager::subBook(xrpl::Book const& book, SubscriberSharedPtr const& subscriber)
 {
    transactionFeed_.sub(book, subscriber);
 }

 void
-SubscriptionManager::unsubBook(ripple::Book const& book, SubscriberSharedPtr const& subscriber)
+SubscriptionManager::unsubBook(xrpl::Book const& book, SubscriberSharedPtr const& subscriber)
 {
    transactionFeed_.unsub(book, subscriber);
 }

 void
-SubscriptionManager::pubTransaction(data::TransactionAndMetadata const& txMeta, ripple::LedgerHeader const& lgrInfo)
+SubscriptionManager::pubTransaction(data::TransactionAndMetadata const& txMeta, xrpl::LedgerHeader const& lgrInfo)
 {
    transactionFeed_.pub(txMeta, lgrInfo, backend_, amendmentCenter_, networkID_);
 }
--- a/src/feed/SubscriptionManager.hpp
+++ b/src/feed/SubscriptionManager.hpp
@@ -160,7 +160,7 @@ public:
     */
    void
    pubBookChanges(
-        ripple::LedgerHeader const& lgrInfo,
+        xrpl::LedgerHeader const& lgrInfo,
        std::vector<data::TransactionAndMetadata> const& transactions
    ) final;

@@ -184,7 +184,7 @@ public:
     * @param subscriber
     */
    void
-    subProposedAccount(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber) final;
+    subProposedAccount(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber) final;

    /**
     * @brief Unsubscribe to the proposed transactions feed for particular account.
@@ -192,7 +192,7 @@ public:
     * @param subscriber
     */
    void
-    unsubProposedAccount(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber) final;
+    unsubProposedAccount(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber) final;

    /**
     * @brief Forward the proposed transactions feed.
@@ -226,8 +226,8 @@ public:
     */
    void
    pubLedger(
-        ripple::LedgerHeader const& lgrInfo,
-        ripple::Fees const& fees,
+        xrpl::LedgerHeader const& lgrInfo,
+        xrpl::Fees const& fees,
        std::string const& ledgerRange,
        std::uint32_t txnCount
    ) final;
@@ -294,7 +294,7 @@ public:
     * @param subscriber
     */
    void
-    subAccount(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber) final;
+    subAccount(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber) final;

    /**
     * @brief Unsubscribe to the transactions feed for particular account.
@@ -302,7 +302,7 @@ public:
     * @param subscriber The subscriber to unsubscribe
     */
    void
-    unsubAccount(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber) final;
+    unsubAccount(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber) final;

    /**
     * @brief Subscribe to the transactions feed, only receive feed when particular order book is affected.
@@ -310,7 +310,7 @@ public:
     * @param subscriber
     */
    void
-    subBook(ripple::Book const& book, SubscriberSharedPtr const& subscriber) final;
+    subBook(xrpl::Book const& book, SubscriberSharedPtr const& subscriber) final;

    /**
     * @brief Unsubscribe to the transactions feed for particular order book.
@@ -318,7 +318,7 @@ public:
     * @param subscriber
     */
    void
-    unsubBook(ripple::Book const& book, SubscriberSharedPtr const& subscriber) final;
+    unsubBook(xrpl::Book const& book, SubscriberSharedPtr const& subscriber) final;

    /**
     * @brief Forward the transactions feed.
@@ -326,7 +326,7 @@ public:
     * @param lgrInfo The ledger header.
     */
    void
-    pubTransaction(data::TransactionAndMetadata const& txMeta, ripple::LedgerHeader const& lgrInfo) final;
+    pubTransaction(data::TransactionAndMetadata const& txMeta, xrpl::LedgerHeader const& lgrInfo) final;

    /**
     * @brief Get the number of subscribers.
--- a/src/feed/SubscriptionManagerInterface.hpp
+++ b/src/feed/SubscriptionManagerInterface.hpp
@@ -72,7 +72,7 @@ public:
     */
    virtual void
    pubBookChanges(
-        ripple::LedgerHeader const& lgrInfo,
+        xrpl::LedgerHeader const& lgrInfo,
        std::vector<data::TransactionAndMetadata> const& transactions
    ) = 0;

@@ -96,7 +96,7 @@ public:
     * @param subscriber
     */
    virtual void
-    subProposedAccount(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber) = 0;
+    subProposedAccount(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber) = 0;

    /**
     * @brief Unsubscribe to the proposed transactions feed for particular account.
@@ -104,7 +104,7 @@ public:
     * @param subscriber
     */
    virtual void
-    unsubProposedAccount(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber) = 0;
+    unsubProposedAccount(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber) = 0;

    /**
     * @brief Forward the proposed transactions feed.
@@ -139,8 +139,8 @@ public:
     */
    virtual void
    pubLedger(
-        ripple::LedgerHeader const& lgrInfo,
-        ripple::Fees const& fees,
+        xrpl::LedgerHeader const& lgrInfo,
+        xrpl::Fees const& fees,
        std::string const& ledgerRange,
        std::uint32_t txnCount
    ) = 0;
@@ -207,7 +207,7 @@ public:
     * @param subscriber
     */
    virtual void
-    subAccount(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber) = 0;
+    subAccount(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber) = 0;

    /**
     * @brief Unsubscribe to the transactions feed for particular account.
@@ -215,7 +215,7 @@ public:
     * @param subscriber The subscriber to unsubscribe
     */
    virtual void
-    unsubAccount(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber) = 0;
+    unsubAccount(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber) = 0;

    /**
     * @brief Subscribe to the transactions feed, only receive feed when particular order book is affected.
@@ -223,7 +223,7 @@ public:
     * @param subscriber
     */
    virtual void
-    subBook(ripple::Book const& book, SubscriberSharedPtr const& subscriber) = 0;
+    subBook(xrpl::Book const& book, SubscriberSharedPtr const& subscriber) = 0;

    /**
     * @brief Unsubscribe to the transactions feed for particular order book.
@@ -231,7 +231,7 @@ public:
     * @param subscriber
     */
    virtual void
-    unsubBook(ripple::Book const& book, SubscriberSharedPtr const& subscriber) = 0;
+    unsubBook(xrpl::Book const& book, SubscriberSharedPtr const& subscriber) = 0;

    /**
     * @brief Forward the transactions feed.
@@ -239,7 +239,7 @@ public:
     * @param lgrInfo The ledger header.
     */
    virtual void
-    pubTransaction(data::TransactionAndMetadata const& txMeta, ripple::LedgerHeader const& lgrInfo) = 0;
+    pubTransaction(data::TransactionAndMetadata const& txMeta, xrpl::LedgerHeader const& lgrInfo) = 0;

    /**
     * @brief Get the number of subscribers.
--- a/src/feed/impl/BookChangesFeed.hpp
+++ b/src/feed/impl/BookChangesFeed.hpp
@@ -48,7 +48,7 @@ struct BookChangesFeed : public SingleFeedBase {
     * @param transactions The transactions that were included in the ledger.
     */
    void
-    pub(ripple::LedgerHeader const& lgrInfo, std::vector<data::TransactionAndMetadata> const& transactions)
+    pub(xrpl::LedgerHeader const& lgrInfo, std::vector<data::TransactionAndMetadata> const& transactions)
    {
        SingleFeedBase::pub(boost::json::serialize(rpc::computeBookChanges(lgrInfo, transactions)));
    }
--- a/src/feed/impl/LedgerFeed.cpp
+++ b/src/feed/impl/LedgerFeed.cpp
@@ -41,8 +41,8 @@ namespace feed::impl {

 boost::json::object
 LedgerFeed::makeLedgerPubMessage(
-    ripple::LedgerHeader const& lgrInfo,
-    ripple::Fees const& fees,
+    xrpl::LedgerHeader const& lgrInfo,
+    xrpl::Fees const& fees,
    std::string const& ledgerRange,
    uint32_t const txnCount,
    uint32_t const networkID
@@ -93,8 +93,8 @@ LedgerFeed::sub(

 void
 LedgerFeed::pub(
-    ripple::LedgerHeader const& lgrInfo,
-    ripple::Fees const& fees,
+    xrpl::LedgerHeader const& lgrInfo,
+    xrpl::Fees const& fees,
    std::string const& ledgerRange,
    uint32_t const txnCount,
    uint32_t const networkID
--- a/src/feed/impl/LedgerFeed.hpp
+++ b/src/feed/impl/LedgerFeed.hpp
@@ -77,8 +77,8 @@ public:
     * @param networkID The network ID.
     */
    void
-    pub(ripple::LedgerHeader const& lgrInfo,
-        ripple::Fees const& fees,
+    pub(xrpl::LedgerHeader const& lgrInfo,
+        xrpl::Fees const& fees,
        std::string const& ledgerRange,
        uint32_t txnCount,
        uint32_t networkID);
@@ -86,8 +86,8 @@ public:
 private:
    static boost::json::object
    makeLedgerPubMessage(
-        ripple::LedgerHeader const& lgrInfo,
-        ripple::Fees const& fees,
+        xrpl::LedgerHeader const& lgrInfo,
+        xrpl::Fees const& fees,
        std::string const& ledgerRange,
        uint32_t txnCount,
        uint32_t networkID
--- a/src/feed/impl/ProposedTransactionFeed.cpp
+++ b/src/feed/impl/ProposedTransactionFeed.cpp
@@ -53,7 +53,7 @@ ProposedTransactionFeed::sub(SubscriberSharedPtr const& subscriber)
 }

 void
-ProposedTransactionFeed::sub(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber)
+ProposedTransactionFeed::sub(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber)
 {
    auto const weakPtr = std::weak_ptr(subscriber);
    auto const added = accountSignal_.connectTrackableSlot(
@@ -82,7 +82,7 @@ ProposedTransactionFeed::unsub(SubscriberSharedPtr const& subscriber)
 }

 void
-ProposedTransactionFeed::unsub(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber)
+ProposedTransactionFeed::unsub(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber)
 {
    unsubInternal(account, subscriber.get());
 }
@@ -94,7 +94,7 @@ ProposedTransactionFeed::pub(boost::json::object const& receivedTxJson)

    auto const transaction = receivedTxJson.at("transaction").as_object();
    auto const accounts = rpc::getAccountsFromTransaction(transaction);
-    auto affectedAccounts = std::unordered_set<ripple::AccountID>(accounts.cbegin(), accounts.cend());
+    auto affectedAccounts = std::unordered_set<xrpl::AccountID>(accounts.cbegin(), accounts.cend());

    [[maybe_unused]] auto task =
        strand_.execute([this, pubMsg = std::move(pubMsg), affectedAccounts = std::move(affectedAccounts)]() {
@@ -132,7 +132,7 @@ ProposedTransactionFeed::unsubInternal(SubscriberPtr subscriber)
 }

 void
-ProposedTransactionFeed::unsubInternal(ripple::AccountID const& account, SubscriberPtr subscriber)
+ProposedTransactionFeed::unsubInternal(xrpl::AccountID const& account, SubscriberPtr subscriber)
 {
    if (accountSignal_.disconnect(subscriber, account)) {
        LOG(logger_.info()) << subscriber->tag() << "Unsubscribed accounts_proposed " << account;
--- a/src/feed/impl/ProposedTransactionFeed.hpp
+++ b/src/feed/impl/ProposedTransactionFeed.hpp
@@ -57,7 +57,7 @@ class ProposedTransactionFeed {
    std::reference_wrapper<util::prometheus::GaugeInt> subAllCount_;
    std::reference_wrapper<util::prometheus::GaugeInt> subAccountCount_;

-    TrackableSignalMap<ripple::AccountID, Subscriber, std::shared_ptr<std::string>> accountSignal_;
+    TrackableSignalMap<xrpl::AccountID, Subscriber, std::shared_ptr<std::string>> accountSignal_;
    TrackableSignal<Subscriber, std::shared_ptr<std::string>> signal_;

 public:
@@ -86,7 +86,7 @@ public:
     * @param account The account to watch.
     */
    void
-    sub(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber);
+    sub(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber);

    /**
     * @brief Unsubscribe to the proposed transaction feed.
@@ -101,7 +101,7 @@ public:
     * @param account The account to unsubscribe.
     */
    void
-    unsub(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber);
+    unsub(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber);

    /**
     * @brief Publishes the proposed transaction feed.
@@ -127,6 +127,6 @@ private:
    unsubInternal(SubscriberPtr subscriber);

    void
-    unsubInternal(ripple::AccountID const& account, SubscriberPtr subscriber);
+    unsubInternal(xrpl::AccountID const& account, SubscriberPtr subscriber);
 };
 }  // namespace feed::impl
--- a/src/feed/impl/TransactionFeed.cpp
+++ b/src/feed/impl/TransactionFeed.cpp
@@ -37,6 +37,7 @@
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Book.h>
+#include <xrpl/protocol/Issue.h>
 #include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/LedgerHeader.h>
 #include <xrpl/protocol/NFTSyntheticSerializer.h>
@@ -85,7 +86,7 @@ TransactionFeed::sub(SubscriberSharedPtr const& subscriber)
 }

 void
-TransactionFeed::sub(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber)
+TransactionFeed::sub(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber)
 {
    auto const added = accountSignal_.connectTrackableSlot(subscriber, account, TransactionSlot(*this, subscriber));
    if (added) {
@@ -105,7 +106,7 @@ TransactionFeed::subProposed(SubscriberSharedPtr const& subscriber)
 }

 void
-TransactionFeed::subProposed(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber)
+TransactionFeed::subProposed(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber)
 {
    auto const added =
        accountProposedSignal_.connectTrackableSlot(subscriber, account, TransactionSlot(*this, subscriber));
@@ -117,7 +118,7 @@ TransactionFeed::subProposed(ripple::AccountID const& account, SubscriberSharedP
 }

 void
-TransactionFeed::sub(ripple::Book const& book, SubscriberSharedPtr const& subscriber)
+TransactionFeed::sub(xrpl::Book const& book, SubscriberSharedPtr const& subscriber)
 {
    auto const added = bookSignal_.connectTrackableSlot(subscriber, book, TransactionSlot(*this, subscriber));
    if (added) {
@@ -134,7 +135,7 @@ TransactionFeed::unsub(SubscriberSharedPtr const& subscriber)
 }

 void
-TransactionFeed::unsub(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber)
+TransactionFeed::unsub(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber)
 {
    unsubInternal(account, subscriber.get());
 }
@@ -146,13 +147,13 @@ TransactionFeed::unsubProposed(SubscriberSharedPtr const& subscriber)
 }

 void
-TransactionFeed::unsubProposed(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber)
+TransactionFeed::unsubProposed(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber)
 {
    unsubProposedInternal(account, subscriber.get());
 }

 void
-TransactionFeed::unsub(ripple::Book const& book, SubscriberSharedPtr const& subscriber)
+TransactionFeed::unsub(xrpl::Book const& book, SubscriberSharedPtr const& subscriber)
 {
    unsubInternal(book, subscriber.get());
 }
@@ -178,7 +179,7 @@ TransactionFeed::bookSubCount() const
 void
 TransactionFeed::pub(
    data::TransactionAndMetadata const& txMeta,
-    ripple::LedgerHeader const& lgrInfo,
+    xrpl::LedgerHeader const& lgrInfo,
    std::shared_ptr<data::BackendInterface const> const& backend,
    std::shared_ptr<data::AmendmentCenterInterface const> const& amendmentCenter,
    uint32_t const networkID
@@ -186,12 +187,12 @@ TransactionFeed::pub(
 {
    auto [tx, meta] = rpc::deserializeTxPlusMeta(txMeta, lgrInfo.seq);

-    std::optional<ripple::STAmount> ownerFunds;
+    std::optional<xrpl::STAmount> ownerFunds;

-    if (tx->getTxnType() == ripple::ttOFFER_CREATE) {
-        auto const account = tx->getAccountID(ripple::sfAccount);
-        auto const amount = tx->getFieldAmount(ripple::sfTakerGets);
-        if (account != amount.issue().account) {
+    if (tx->getTxnType() == xrpl::ttOFFER_CREATE) {
+        auto const account = tx->getAccountID(xrpl::sfAccount);
+        auto const amount = tx->getFieldAmount(xrpl::sfTakerGets);
+        if (account != amount.get<xrpl::Issue>().account) {
            auto fetchFundsSynchronous = [&]() {
                data::synchronous([&](boost::asio::yield_context yield) {
                    ownerFunds = rpc::accountFunds(*backend, *amendmentCenter, lgrInfo.seq, amount, account, yield);
@@ -213,8 +214,8 @@ TransactionFeed::pub(
        rpc::insertDeliverMaxAlias(txnPubobj, version);
        rpc::insertMPTIssuanceID(txnPubobj, tx, metaPubobj, meta);

-        Json::Value nftJson;
-        ripple::RPC::insertNFTSyntheticInJson(nftJson, tx, *meta);
+        json::Value nftJson;
+        xrpl::RPC::insertNFTSyntheticInJson(nftJson, tx, *meta);
        auto const nftBoostJson = rpc::toBoostJson(nftJson).as_object();
        if (nftBoostJson.contains(JS(meta)) && nftBoostJson.at(JS(meta)).is_object()) {
            auto& metaObjInPub = pubObj.at(JS(meta)).as_object();
@@ -235,10 +236,10 @@ TransactionFeed::pub(
        pubObj[JS(type)] = "transaction";
        pubObj[JS(validated)] = true;
        pubObj[JS(status)] = "closed";
-        pubObj[JS(close_time_iso)] = ripple::to_string_iso(lgrInfo.closeTime);
+        pubObj[JS(close_time_iso)] = xrpl::toStringIso(lgrInfo.closeTime);

        pubObj[JS(ledger_index)] = lgrInfo.seq;
-        pubObj[JS(ledger_hash)] = ripple::strHex(lgrInfo.hash);
+        pubObj[JS(ledger_hash)] = xrpl::strHex(lgrInfo.hash);
        if (version >= 2u) {
            if (pubObj[txKey].as_object().contains(JS(hash))) {
                pubObj[JS(hash)] = pubObj[txKey].as_object()[JS(hash)];
@@ -250,7 +251,7 @@ TransactionFeed::pub(
        pubObj[JS(engine_result_code)] = meta->getResult();
        std::string token;
        std::string human;
-        ripple::transResultInfo(meta->getResultTER(), token, human);
+        xrpl::transResultInfo(meta->getResultTER(), token, human);
        pubObj[JS(engine_result)] = token;
        pubObj[JS(engine_result_message)] = human;

@@ -267,34 +268,34 @@ TransactionFeed::pub(

    auto const affectedAccountsFlat = meta->getAffectedAccounts();
    auto affectedAccounts =
-        std::unordered_set<ripple::AccountID>(affectedAccountsFlat.cbegin(), affectedAccountsFlat.cend());
+        std::unordered_set<xrpl::AccountID>(affectedAccountsFlat.cbegin(), affectedAccountsFlat.cend());

-    std::unordered_set<ripple::Book> affectedBooks;
+    std::unordered_set<xrpl::Book> affectedBooks;

    for (auto const& node : meta->getNodes()) {
-        if (node.getFieldU16(ripple::sfLedgerEntryType) == ripple::ltOFFER) {
-            ripple::SField const* field = nullptr;
+        if (node.getFieldU16(xrpl::sfLedgerEntryType) == xrpl::ltOFFER) {
+            xrpl::SField const* field = nullptr;

            // We need a field that contains the TakerGets and TakerPays
            // parameters.
-            if (node.getFName() == ripple::sfModifiedNode) {
-                field = &ripple::sfPreviousFields;
-            } else if (node.getFName() == ripple::sfCreatedNode) {
-                field = &ripple::sfNewFields;
-            } else if (node.getFName() == ripple::sfDeletedNode) {
-                field = &ripple::sfFinalFields;
+            if (node.getFName() == xrpl::sfModifiedNode) {
+                field = &xrpl::sfPreviousFields;
+            } else if (node.getFName() == xrpl::sfCreatedNode) {
+                field = &xrpl::sfNewFields;
+            } else if (node.getFName() == xrpl::sfDeletedNode) {
+                field = &xrpl::sfFinalFields;
            }

            if (field != nullptr) {
-                auto const data = dynamic_cast<ripple::STObject const*>(node.peekAtPField(*field));
+                auto const data = dynamic_cast<xrpl::STObject const*>(node.peekAtPField(*field));

-                if ((data != nullptr) && data->isFieldPresent(ripple::sfTakerPays) &&
-                    data->isFieldPresent(ripple::sfTakerGets)) {
+                if ((data != nullptr) && data->isFieldPresent(xrpl::sfTakerPays) &&
+                    data->isFieldPresent(xrpl::sfTakerGets)) {
                    // determine the OrderBook
-                    ripple::Book const book{
-                        data->getFieldAmount(ripple::sfTakerGets).issue(),
-                        data->getFieldAmount(ripple::sfTakerPays).issue(),
-                        (*data)[~ripple::sfDomainID]
+                    xrpl::Book const book{
+                        data->getFieldAmount(xrpl::sfTakerGets).get<xrpl::Issue>(),
+                        data->getFieldAmount(xrpl::sfTakerPays).get<xrpl::Issue>(),
+                        (*data)[~xrpl::sfDomainID]
                    };
                    if (!affectedBooks.contains(book)) {
                        affectedBooks.insert(book);
@@ -340,7 +341,7 @@ TransactionFeed::unsubInternal(SubscriberPtr subscriber)
 }

 void
-TransactionFeed::unsubInternal(ripple::AccountID const& account, SubscriberPtr subscriber)
+TransactionFeed::unsubInternal(xrpl::AccountID const& account, SubscriberPtr subscriber)
 {
    if (accountSignal_.disconnect(subscriber, account)) {
        LOG(logger_.info()) << subscriber->tag() << "Unsubscribed account " << account;
@@ -355,13 +356,13 @@ TransactionFeed::unsubProposedInternal(SubscriberPtr subscriber)
 }

 void
-TransactionFeed::unsubProposedInternal(ripple::AccountID const& account, SubscriberPtr subscriber)
+TransactionFeed::unsubProposedInternal(xrpl::AccountID const& account, SubscriberPtr subscriber)
 {
    accountProposedSignal_.disconnect(subscriber, account);
 }

 void
-TransactionFeed::unsubInternal(ripple::Book const& book, SubscriberPtr subscriber)
+TransactionFeed::unsubInternal(xrpl::Book const& book, SubscriberPtr subscriber)
 {
    if (bookSignal_.disconnect(subscriber, book)) {
        LOG(logger_.info()) << subscriber->tag() << "Unsubscribed book " << book;
--- a/src/feed/impl/TransactionFeed.hpp
+++ b/src/feed/impl/TransactionFeed.hpp
@@ -71,12 +71,12 @@ class TransactionFeed {
    std::reference_wrapper<util::prometheus::GaugeInt> subAccountCount_;
    std::reference_wrapper<util::prometheus::GaugeInt> subBookCount_;

-    TrackableSignalMap<ripple::AccountID, Subscriber, AllVersionTransactionsType const&> accountSignal_;
-    TrackableSignalMap<ripple::Book, Subscriber, AllVersionTransactionsType const&> bookSignal_;
+    TrackableSignalMap<xrpl::AccountID, Subscriber, AllVersionTransactionsType const&> accountSignal_;
+    TrackableSignalMap<xrpl::Book, Subscriber, AllVersionTransactionsType const&> bookSignal_;
    TrackableSignal<Subscriber, AllVersionTransactionsType const&> signal_;

    // Signals for proposed tx subscribers
-    TrackableSignalMap<ripple::AccountID, Subscriber, AllVersionTransactionsType const&> accountProposedSignal_;
+    TrackableSignalMap<xrpl::AccountID, Subscriber, AllVersionTransactionsType const&> accountProposedSignal_;
    TrackableSignal<Subscriber, AllVersionTransactionsType const&> txProposedSignal_;

    std::unordered_set<SubscriberPtr>
@@ -113,7 +113,7 @@ public:
     * @param account The account to watch.
     */
    void
-    sub(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber);
+    sub(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber);

    /**
     * @brief Subscribe to the transaction feed, only receive the feed when particular order book is affected.
@@ -121,7 +121,7 @@ public:
     * @param book The order book to watch.
     */
    void
-    sub(ripple::Book const& book, SubscriberSharedPtr const& subscriber);
+    sub(xrpl::Book const& book, SubscriberSharedPtr const& subscriber);

    /**
     * @brief Subscribe to the transaction feed for proposed transaction stream.
@@ -137,7 +137,7 @@ public:
     * @param account The account to watch.
     */
    void
-    subProposed(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber);
+    subProposed(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber);

    /**
     * @brief Unsubscribe to the transaction feed.
@@ -152,7 +152,7 @@ public:
     * @param account The account to unsubscribe.
     */
    void
-    unsub(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber);
+    unsub(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber);

    /**
     * @brief Unsubscribe to the transaction feed for proposed transaction stream.
@@ -167,7 +167,7 @@ public:
     * @param account The account to unsubscribe.
     */
    void
-    unsubProposed(ripple::AccountID const& account, SubscriberSharedPtr const& subscriber);
+    unsubProposed(xrpl::AccountID const& account, SubscriberSharedPtr const& subscriber);

    /**
     * @brief Unsubscribe to the transaction feed for particular order book.
@@ -175,7 +175,7 @@ public:
     * @param book The book to unsubscribe.
     */
    void
-    unsub(ripple::Book const& book, SubscriberSharedPtr const& subscriber);
+    unsub(xrpl::Book const& book, SubscriberSharedPtr const& subscriber);

    /**
     * @brief Publishes the transaction feed.
@@ -186,7 +186,7 @@ public:
     */
    void
    pub(data::TransactionAndMetadata const& txMeta,
-        ripple::LedgerHeader const& lgrInfo,
+        xrpl::LedgerHeader const& lgrInfo,
        std::shared_ptr<data::BackendInterface const> const& backend,
        std::shared_ptr<data::AmendmentCenterInterface const> const& amendmentCenter,
        uint32_t networkID);
@@ -214,15 +214,15 @@ private:
    unsubInternal(SubscriberPtr subscriber);

    void
-    unsubInternal(ripple::AccountID const& account, SubscriberPtr subscriber);
+    unsubInternal(xrpl::AccountID const& account, SubscriberPtr subscriber);

    void
    unsubProposedInternal(SubscriberPtr subscriber);

    void
-    unsubProposedInternal(ripple::AccountID const& account, SubscriberPtr subscriber);
+    unsubProposedInternal(xrpl::AccountID const& account, SubscriberPtr subscriber);

    void
-    unsubInternal(ripple::Book const& book, SubscriberPtr subscriber);
+    unsubInternal(xrpl::Book const& book, SubscriberPtr subscriber);
 };
 }  // namespace feed::impl
--- a/src/migration/cassandra/impl/ObjectsAdapter.cpp
+++ b/src/migration/cassandra/impl/ObjectsAdapter.cpp
@@ -36,7 +36,7 @@ ObjectsAdapter::onRowRead(TableObjectsDesc::Row const& row)
        onStateRead_(ledgerSeq, std::nullopt);
        return;
    }
-    ripple::SLE sle{ripple::SerialIter{blob.data(), blob.size()}, key};
+    xrpl::SLE sle{xrpl::SerialIter{blob.data(), blob.size()}, key};
    onStateRead_(ledgerSeq, std::make_optional(std::move(sle)));
 }

--- a/src/migration/cassandra/impl/ObjectsAdapter.hpp
+++ b/src/migration/cassandra/impl/ObjectsAdapter.hpp
@@ -41,7 +41,7 @@ namespace migration::cassandra::impl {
 * @brief The description of the objects table. It has to be a TableSpec.
 */
 struct TableObjectsDesc {
-    using Row = std::tuple<ripple::uint256, std::uint32_t, data::Blob>;
+    using Row = std::tuple<xrpl::uint256, std::uint32_t, data::Blob>;
    static constexpr char const* kPARTITION_KEY = "key";
    static constexpr char const* kTABLE_NAME = "objects";
 };
@@ -52,7 +52,7 @@ struct TableObjectsDesc {
 */
 class ObjectsAdapter : public impl::FullTableScannerAdapterBase<TableObjectsDesc> {
 public:
-    using OnStateRead = std::function<void(std::uint32_t, std::optional<ripple::SLE>)>;
+    using OnStateRead = std::function<void(std::uint32_t, std::optional<xrpl::SLE>)>;

    /**
     * @brief Construct a new Objects Adapter object
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sergey Kuznetsov	bcc0345c35	chore: Use released libxrpl 3.2.0 (#3105 )	2026-06-16 17:31:10 +01:00
Sergey Kuznetsov	14645e1494	fix: Proxy support (#3103 ) Port of two changes onto release/2.7.1: - #3006 (`d3381a1d`): resolve proxy ip before processing any request - #3043 (`d7bcf6e7`): re-resolve client ip when a proxy reuses a TCP connection for different clients (resolveClientIp now returns std::optional; extractClientIp made public; isProxyConnection_ tracked)	2026-06-09 16:25:02 +01:00
Sergey Kuznetsov	ce44aec245	ci: Use docker images with glibc version in conan (#3100 )	2026-06-08 15:16:50 +01:00
Sergey Kuznetsov	94da8459dd	ci: Use glibc version in conan profile (#3099 )	2026-06-08 14:01:33 +01:00
Sergey Kuznetsov	8f3afd09e6	chore: Use libxrpl 3.2.0 (#3095 )	2026-06-05 17:48:07 +01:00
Sergey Kuznetsov	6bb4953f16	ci: Remove arm (#3094 )	2026-06-05 15:37:58 +01:00
Sergey Kuznetsov	884c1e8cde	ci: Remove arm	2026-06-05 15:33:38 +01:00
Sergey Kuznetsov	7edeb14629	ci: Update docker actions, fix llvm repo (#3093 )	2026-06-05 14:34:51 +01:00
Sergey Kuznetsov	b6241b7c7f	ci: Update actions, fix llvm repo	2026-06-05 13:00:31 +01:00
Sergey Kuznetsov	2c715323a9	ci: Fix docker update ci (#3092 )	2026-06-05 12:18:10 +01:00
Sergey Kuznetsov	b5889e4382	Fix docker update ci	2026-06-05 12:00:42 +01:00
Sergey Kuznetsov	df295ff6ed	ci: Ubuntu 20.04 -> 22.04 (#3090 )	2026-06-05 11:03:06 +01:00
Sergey Kuznetsov	419ab53caa	ci: Ubuntu 20.04 -> 22.04	2026-06-04 17:16:37 +01:00
Ayaz Salikhov	3215e43c11	ci: Restart colima on macOS (#2923 )	2026-01-15 19:03:47 +00:00
Ayaz Salikhov	e8c977e7de	chore: Commits for 2.7.0-rc3 (#2912 )	2026-01-13 16:53:44 +00:00
Ayaz Salikhov	6f6d8cdf25	ci: Change build date format (#2914 )	2026-01-13 16:02:37 +00:00
Ayaz Salikhov	232838862a	ci: Use env for BUILD_TYPE in reusable-build.yml (#2913 )	2026-01-13 15:00:09 +00:00
Ayaz Salikhov	cd93b2a469	chore: Use actual build date instead of date of last commit for `BUILD_DATE` (#2911 )	2026-01-13 14:50:49 +00:00
Ayaz Salikhov	95712c22b1	ci: Use images/actions with new tools / conan / cmake (#2909 )	2026-01-13 14:50:13 +00:00
Ayaz Salikhov	14342e087c	chore: Update tooling in Docker images (#2907 )	2026-01-13 13:54:27 +00:00
Ayaz Salikhov	159024898e	chore: Update gtest and spdlog (#2908 )	2026-01-13 13:44:32 +00:00
Alex Kremer	c6be761f33	fix: Faster implementation of work queue (#2887 )	2026-01-13 12:21:20 +00:00
Alex Kremer	f33f15c02d	fix: Workaround an edge case exception in `AmendmentCenter` (#2897 ) Fixes #2881 Better fix, including removal of exceptions for control flow will be done in #2895	2026-01-13 12:20:13 +00:00
Ayaz Salikhov	e733fadb45	ci: Pass version explicitly and don't rely on tags (#2904 )	2026-01-12 17:31:09 +00:00
Ayaz Salikhov	a7ac7b54a8	ci: Show ccache stats with `-vv` (#2902 )	2026-01-12 17:30:45 +00:00
Sergey Kuznetsov	88866ea6fd	fix: No output from failed asserts in tests (#2905 ) Co-authored-by: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>	2026-01-12 17:29:20 +00:00
Sergey Kuznetsov	bb39bce40b	style: Fix clang-tidy error (#2901 )	2026-01-12 14:31:34 +00:00
Ayaz Salikhov	bb3159bda0	feat: Add build information to `clio_server --version` (#2893 )	2026-01-09 13:59:43 +00:00
Ayaz Salikhov	c0c5c14791	chore: Fix branch name and commit SHA for GitHub PRs (#2888 )	2026-01-09 12:33:32 +00:00
github-actions[bot]	b0abe14057	style: clang-tidy auto fixes (#2891 )	2026-01-09 10:07:21 +00:00
Bart	c9df784c4e	ci: Use updated prepare-runner in actions and worfklows (#2889 )	2026-01-08 20:13:49 +00:00
Alex Kremer	a9787b131e	feat: Basic support for channels (#2859 ) This PR implements go-like channels wrapper (on top of asio experimental channels). In the future this will be integrated into the AsyncFramework. --------- Co-authored-by: Sergey Kuznetsov <skuznetsov@ripple.com>	2026-01-08 14:21:46 +00:00
Sergey Kuznetsov	9f76eabf0a	feat: Option to save cache asyncronously (#2883 ) This PR adds an option to save cache to file asynchronously in parallel with shutting down the rest of Clio services.	2026-01-07 17:20:56 +00:00
github-actions[bot]	79c08fc735	style: Update pre-commit hooks (#2875 ) Co-authored-by: mathbunnyru <12270691+mathbunnyru@users.noreply.github.com>	2026-01-05 01:10:10 +00:00
dependabot[bot]	2c9c5634ad	ci: [DEPENDABOT] Bump actions/cache from 4.3.0 to 5.0.1 (#2871 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>	2025-12-23 01:46:14 +00:00
dependabot[bot]	850333528c	ci: [DEPENDABOT] Bump docker/setup-buildx-action from 3.11.1 to 3.12.0 (#2870 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-12-22 11:52:41 +00:00
github-actions[bot]	8da4194fe2	style: clang-tidy auto fixes (#2874 ) Co-authored-by: godexsoft <385326+godexsoft@users.noreply.github.com>	2025-12-22 11:52:23 +00:00
dependabot[bot]	4dece23ede	ci: [DEPENDABOT] Bump docker/setup-buildx-action from 3.11.1 to 3.12.0 in /.github/actions/build-docker-image (#2872 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-12-22 11:52:04 +00:00