Up build

fix: Don't cancel ci image builds
2026-01-09 01:05:31 +00:00 · 2025-06-23 22:11:37 +00:00 · 2025-06-23 21:40:56 +01:00
255 changed files with 5867 additions and 8470 deletions
--- a/.github/actions/build_docker_image/action.yml
+++ b/.github/actions/build_docker_image/action.yml
@@ -17,9 +17,6 @@ inputs:
  platforms:
    description: Platforms to build the image for (e.g. linux/amd64,linux/arm64)
    required: true
-  build_args:
-    description: List of build-time variables
-    required: false

  dockerhub_repo:
    description: DockerHub repository name
@@ -64,4 +61,13 @@ runs:
        platforms: ${{ inputs.platforms }}
        push: ${{ inputs.push_image == 'true' }}
        tags: ${{ steps.meta.outputs.tags }}
-        build-args: ${{ inputs.build_args }}
+
+    - name: Update DockerHub description
+      if: ${{ inputs.push_image == 'true' && inputs.dockerhub_repo != '' }}
+      uses: peter-evans/dockerhub-description@432a30c9e07499fd01da9f8a49f0faf9e0ca5b77 # v4.0.2
+      with:
+        username: ${{ env.DOCKERHUB_USER }}
+        password: ${{ env.DOCKERHUB_PW }}
+        repository: ${{ inputs.dockerhub_repo }}
+        short-description: ${{ inputs.dockerhub_description }}
+        readme-filepath: ${{ inputs.directory }}/README.md
--- a/.github/actions/setup_conan_macos/action.yml
+++ b/.github/actions/setup_conan_macos/action.yml
@@ -0,0 +1,39 @@
+name: Setup conan
+description: Setup conan profiles and artifactory on macOS runner
+
+inputs:
+  conan_files_dir:
+    description: Directory with conan files
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Fail on non-macOS
+      if: runner.os != 'macOS'
+      shell: bash
+      run: exit 1
+
+    - name: Copy global.conf
+      shell: bash
+      run: |
+        cp "${{ inputs.conan_files_dir }}/global.conf" "${{ env.CONAN_HOME }}/global.conf"
+
+    - name: Create apple-clang conan profile
+      shell: bash
+      run: |
+        mkdir -p "${{ env.CONAN_HOME }}/profiles"
+        cp .github/actions/setup_conan_macos/apple-clang.profile "${{ env.CONAN_HOME }}/profiles/apple-clang"
+
+    - name: Create conan profiles for sanitizers
+      shell: bash
+      working-directory: ${{ inputs.conan_files_dir }}
+      run: |
+        cp ./sanitizer_template.profile "${{ env.CONAN_HOME }}/profiles/apple-clang.asan"
+        cp ./sanitizer_template.profile "${{ env.CONAN_HOME }}/profiles/apple-clang.tsan"
+        cp ./sanitizer_template.profile "${{ env.CONAN_HOME }}/profiles/apple-clang.ubsan"
+
+    - name: Add artifactory remote
+      shell: bash
+      run: |
+        conan remote add --index 0 ripple http://18.143.149.228:8081/artifactory/api/conan/dev
--- a/.github/actions/setup_conan_macos/apple-clang.profile
+++ b/.github/actions/setup_conan_macos/apple-clang.profile
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -142,3 +142,16 @@ updates:
    commit-message:
      prefix: "ci: [DEPENDABOT] "
    target-branch: develop
+
+  - package-ecosystem: github-actions
+    directory: .github/actions/setup_conan_macos/
+    schedule:
+      interval: weekly
+      day: monday
+      time: "04:00"
+      timezone: Etc/GMT
+    reviewers:
+      - XRPLF/clio-dev-team
+    commit-message:
+      prefix: "ci: [DEPENDABOT] "
+    target-branch: develop
--- a/.github/scripts/conan/init.sh
+++ b/.github/scripts/conan/init.sh
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-CURRENT_DIR="$(cd "$(dirname "$0")" && pwd)"
-REPO_DIR="$(cd "$CURRENT_DIR/../../../" && pwd)"
-
-CONAN_DIR="${CONAN_HOME:-$HOME/.conan2}"
-PROFILES_DIR="$CONAN_DIR/profiles"
-
-APPLE_CLANG_PROFILE="$CURRENT_DIR/apple-clang.profile"
-
-GCC_PROFILE="$REPO_DIR/docker/ci/conan/gcc.profile"
-CLANG_PROFILE="$REPO_DIR/docker/ci/conan/clang.profile"
-
-SANITIZER_TEMPLATE_FILE="$REPO_DIR/docker/ci/conan/sanitizer_template.profile"
-
-rm -rf "$CONAN_DIR"
-
-conan remote add --index 0 ripple http://18.143.149.228:8081/artifactory/api/conan/dev
-
-cp "$REPO_DIR/docker/ci/conan/global.conf" "$CONAN_DIR/global.conf"
-
-create_profile_with_sanitizers() {
-    profile_name="$1"
-    profile_source="$2"
-
-    cp "$profile_source" "$PROFILES_DIR/$profile_name"
-    cp "$SANITIZER_TEMPLATE_FILE" "$PROFILES_DIR/$profile_name.asan"
-    cp "$SANITIZER_TEMPLATE_FILE" "$PROFILES_DIR/$profile_name.tsan"
-    cp "$SANITIZER_TEMPLATE_FILE" "$PROFILES_DIR/$profile_name.ubsan"
-}
-
-mkdir -p "$PROFILES_DIR"
-
-if [[ "$(uname)" == "Darwin" ]]; then
-    create_profile_with_sanitizers "apple-clang" "$APPLE_CLANG_PROFILE"
-    echo "include(apple-clang)" > "$PROFILES_DIR/default"
-else
-    create_profile_with_sanitizers "clang" "$CLANG_PROFILE"
-    create_profile_with_sanitizers "gcc" "$GCC_PROFILE"
-    echo "include(gcc)" > "$PROFILES_DIR/default"
-fi
--- a/.github/scripts/generate_conan_matrix.py
+++ b/.github/scripts/generate_conan_matrix.py
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,9 +2,9 @@ name: Build

 on:
  push:
-    branches: [release/*, develop]
+    branches: [master, release/*, develop]
  pull_request:
-    branches: [release/*, develop]
+    branches: [master, release/*, develop]
    paths:
      - .github/workflows/build.yml

--- a/.github/workflows/build_impl.yml
+++ b/.github/workflows/build_impl.yml
@@ -77,10 +77,11 @@ jobs:
        with:
          disable_ccache: ${{ inputs.disable_cache }}

-      - name: Setup conan on macOS
+      - name: Setup conan
        if: runner.os == 'macOS'
-        shell: bash
-        run: ./.github/scripts/conan/init.sh
+        uses: ./.github/actions/setup_conan_macos
+        with:
+          conan_files_dir: docker/ci/conan/

      - name: Restore cache
        if: ${{ !inputs.disable_cache }}
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -18,7 +18,6 @@ concurrency:

 env:
  CONAN_PROFILE: clang
-  LLVM_TOOLS_VERSION: 20

 jobs:
  clang_tidy:
@@ -62,7 +61,7 @@ jobs:
        shell: bash
        id: run_clang_tidy
        run: |
-          run-clang-tidy-${{ env.LLVM_TOOLS_VERSION }} -p build -j "${{ steps.number_of_threads.outputs.threads_number }}" -fix -quiet 1>output.txt
+          run-clang-tidy-19 -p build -j "${{ steps.number_of_threads.outputs.threads_number }}" -fix -quiet 1>output.txt

      - name: Fix local includes and clang-format style
        if: ${{ steps.run_clang_tidy.outcome != 'success' }}
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -22,11 +22,6 @@ jobs:
        with:
          lfs: true

-      - name: Prepare runner
-        uses: ./.github/actions/prepare_runner
-        with:
-          disable_ccache: true
-
      - name: Create build directory
        run: mkdir build_docs

--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -96,7 +96,6 @@ jobs:
    uses: ./.github/workflows/release_impl.yml
    with:
      overwrite_release: true
-      prerelease: true
      title: "Clio development (nightly) build"
      version: nightly
      header: >
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -26,25 +26,14 @@ jobs:
      - run: pre-commit autoupdate --freeze
      - run: pre-commit run --all-files || true

-      - uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec # v6.3.0
-        if: github.event_name != 'pull_request'
-        with:
-          gpg_private_key: ${{ secrets.ACTIONS_GPG_PRIVATE_KEY }}
-          passphrase: ${{ secrets.ACTIONS_GPG_PASSPHRASE }}
-          git_user_signingkey: true
-          git_commit_gpgsign: true
-
      - uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
        if: always()
        env:
          GH_REPO: ${{ github.repository }}
          GH_TOKEN: ${{ github.token }}
        with:
-          commit-message: "style: Update pre-commit hooks"
-          committer: Clio CI <skuznetsov@ripple.com>
          branch: update/pre-commit-hooks
-          branch-suffix: timestamp
-          delete-branch: true
          title: "style: Update pre-commit hooks"
+          commit-message: "style: Update pre-commit hooks"
          body: Update versions of pre-commit hooks to latest version.
          reviewers: "godexsoft,kuznetsss,PeterChen13579,mathbunnyru"
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -3,7 +3,8 @@ name: Run pre-commit hooks
 on:
  pull_request:
  push:
-    branches: [develop]
+    branches:
+      - develop
  workflow_dispatch:

 jobs:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -48,7 +48,6 @@ jobs:
    uses: ./.github/workflows/release_impl.yml
    with:
      overwrite_release: false
-      prerelease: ${{ contains(github.ref_name, '-') }}
      title: "${{ github.ref_name}}"
      version: "${{ github.ref_name }}"
      header: >
--- a/.github/workflows/release_impl.yml
+++ b/.github/workflows/release_impl.yml
@@ -8,11 +8,6 @@ on:
        required: true
        type: boolean

-      prerelease:
-        description: "Create a prerelease"
-        required: true
-        type: boolean
-
      title:
        description: "Release title"
        required: true
@@ -30,12 +25,12 @@ on:

      generate_changelog:
        description: "Generate changelog"
-        required: true
+        required: false
        type: boolean

      draft:
        description: "Create a draft release"
-        required: true
+        required: false
        type: boolean

 jobs:
@@ -74,9 +69,9 @@ jobs:
        shell: bash
        if: ${{ inputs.generate_changelog }}
        run: |
-          LAST_TAG="$(gh release view --json tagName -q .tagName)"
-          LAST_TAG_COMMIT="$(git rev-parse $LAST_TAG)"
-          BASE_COMMIT="$(git merge-base HEAD $LAST_TAG_COMMIT)"
+          LAST_TAG=$(gh release view --json tagName -q .tagName)
+          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"
          cat CHANGELOG.md >> "${RUNNER_TEMP}/release_notes.md"

@@ -113,10 +108,10 @@ jobs:
        if: ${{ github.event_name != 'pull_request' }}
        shell: bash
        run: |
-          gh release create "${{ inputs.version }}" \
-            ${{ inputs.prerelease && '--prerelease' || '' }} \
+          gh release create ${{ inputs.version }} \
+            ${{ inputs.overwrite_release && '--prerelease' || '' }} \
            --title "${{ inputs.title }}" \
-            --target "${GITHUB_SHA}" \
+            --target $GITHUB_SHA \
            ${{ inputs.draft && '--draft' || '' }} \
            --notes-file "${RUNNER_TEMP}/release_notes.md" \
            ./release_artifacts/clio_server*
--- a/.github/workflows/sanitizers.yml
+++ b/.github/workflows/sanitizers.yml
@@ -37,17 +37,12 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        compiler: [gcc, clang]
-        sanitizer_ext: [.asan, .tsan, .ubsan]
-        build_type: [Release, Debug]
+        compiler: ["gcc", "clang"]
+        sanitizer_ext: [".asan", ".tsan", ".ubsan"]
        exclude:
          # Currently, clang.tsan unit tests hang
          - compiler: clang
            sanitizer_ext: .tsan
-            build_type: Release
-          - compiler: clang
-            sanitizer_ext: .tsan
-            build_type: Debug

    uses: ./.github/workflows/build_and_test.yml
    with:
@@ -55,7 +50,7 @@ jobs:
      container: '{ "image": "ghcr.io/xrplf/clio-ci:latest" }'
      disable_cache: true
      conan_profile: ${{ matrix.compiler }}${{ matrix.sanitizer_ext }}
-      build_type: ${{ matrix.build_type }}
+      build_type: Release
      static: false
      run_unit_tests: true
      run_integration_tests: false
--- a/.github/workflows/test_impl.yml
+++ b/.github/workflows/test_impl.yml
@@ -85,7 +85,7 @@ jobs:
        if: env.SANITIZER_IGNORE_ERRORS == 'true' && steps.check_report.outputs.found_report == 'true'
        uses: actions/upload-artifact@v4
        with:
-          name: sanitizer_report_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
+          name: ${{ inputs.conan_profile }}_report
          path: .sanitizer-report/*
          include-hidden-files: true

--- a/.github/workflows/update_docker_ci.yml
+++ b/.github/workflows/update_docker_ci.yml
@@ -23,16 +23,12 @@ on:
  workflow_dispatch:

 concurrency:
-  # Only matches runs for the current workflow - matches against branch & tags
+  # Only cancel in-progress jobs or runs for the current workflow - matches against branch & tags
  group: ${{ github.workflow }}-${{ github.ref }}
  # We want to execute all builds sequentially in develop
  cancel-in-progress: false

 env:
-  CLANG_MAJOR_VERSION: 19
-  GCC_MAJOR_VERSION: 12
-  GCC_VERSION: 12.3.0
-
  GHCR_REPO: ghcr.io/${{ github.repository_owner }}

 jobs:
@@ -63,13 +59,10 @@ jobs:
          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-12
+            type=raw,value=amd64-12.3.0
            type=raw,value=amd64-${{ github.sha }}
          platforms: linux/amd64
-          build_args: |
-            GCC_MAJOR_VERSION=${{ env.GCC_MAJOR_VERSION }}
-            GCC_VERSION=${{ env.GCC_VERSION }}
          dockerhub_repo: rippleci/clio_gcc
          dockerhub_description: GCC compiler for XRPLF/clio.

@@ -100,13 +93,10 @@ jobs:
          directory: docker/compilers/gcc
          tags: |
            type=raw,value=arm64-latest
-            type=raw,value=arm64-${{ env.GCC_MAJOR_VERSION }}
-            type=raw,value=arm64-${{ env.GCC_VERSION }}
+            type=raw,value=arm64-12
+            type=raw,value=arm64-12.3.0
            type=raw,value=arm64-${{ github.sha }}
          platforms: linux/arm64
-          build_args: |
-            GCC_MAJOR_VERSION=${{ env.GCC_MAJOR_VERSION }}
-            GCC_VERSION=${{ env.GCC_VERSION }}
          dockerhub_repo: rippleci/clio_gcc
          dockerhub_description: GCC compiler for XRPLF/clio.

@@ -152,8 +142,8 @@ jobs:
          for image in ${{ env.GHCR_REPO_LC }}/clio-gcc rippleci/clio_gcc; do
            docker buildx imagetools create \
              -t $image:latest \
-              -t $image:${{ env.GCC_MAJOR_VERSION }} \
-              -t $image:${{ env.GCC_VERSION }} \
+              -t $image:12 \
+              -t $image:12.3.0 \
              -t $image:${{ github.sha }} \
              $image:arm64-latest \
              $image:amd64-latest
@@ -186,18 +176,15 @@ jobs:
          directory: docker/compilers/clang
          tags: |
            type=raw,value=latest
-            type=raw,value=${{ env.CLANG_MAJOR_VERSION }}
+            type=raw,value=16
            type=raw,value=${{ github.sha }}
          platforms: linux/amd64,linux/arm64
-          build_args: |
-            CLANG_MAJOR_VERSION=${{ env.CLANG_MAJOR_VERSION }}
          dockerhub_repo: rippleci/clio_clang
          dockerhub_description: Clang compiler for XRPLF/clio.

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

    steps:
      - uses: actions/checkout@v4
@@ -218,85 +205,14 @@ jobs:
          push_image: ${{ github.event_name != 'pull_request' }}
          directory: docker/tools
          tags: |
-            type=raw,value=amd64-latest
-            type=raw,value=amd64-${{ github.sha }}
-          platforms: linux/amd64
-          build_args: |
-            GCC_VERSION=${{ env.GCC_VERSION }}
-
-  tools-arm64:
-    name: Build and push tools docker image (arm64)
-    runs-on: heavy-arm64
-    needs: [gcc-merge]
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
-        with:
-          files: "docker/tools/**"
-
-      - uses: ./.github/actions/build_docker_image
-        if: steps.changed-files.outputs.any_changed == 'true'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          images: |
-            ${{ env.GHCR_REPO }}/clio-tools
-          push_image: ${{ github.event_name != 'pull_request' }}
-          directory: docker/tools
-          tags: |
-            type=raw,value=arm64-latest
-            type=raw,value=arm64-${{ github.sha }}
-          platforms: linux/arm64
-          build_args: |
-            GCC_VERSION=${{ env.GCC_VERSION }}
-
-  tools-merge:
-    name: Merge and push multi-arch tools docker image
-    runs-on: heavy
-    needs: [tools-amd64, tools-arm64]
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
-        with:
-          files: "docker/tools/**"
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to GitHub Container Registry
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Make GHCR_REPO lowercase
-        run: |
-          echo "GHCR_REPO_LC=$(echo ${{env.GHCR_REPO}} | tr '[:upper:]' '[:lower:]')" >> ${GITHUB_ENV}
-
-      - name: Create and push multi-arch manifest
-        if: github.event_name != 'pull_request' && steps.changed-files.outputs.any_changed == 'true'
-        run: |
-          image=${{ env.GHCR_REPO_LC }}/clio-tools
-          docker buildx imagetools create \
-            -t $image:latest \
-            -t $image:${{ github.sha }} \
-            $image:arm64-latest \
-            $image:amd64-latest
+            type=raw,value=latest
+            type=raw,value=${{ github.sha }}
+          platforms: linux/amd64,linux/arm64

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

    steps:
      - uses: actions/checkout@v4
@@ -313,11 +229,8 @@ jobs:
          directory: docker/ci
          tags: |
            type=raw,value=latest
-            type=raw,value=gcc_${{ env.GCC_MAJOR_VERSION }}_clang_${{ env.CLANG_MAJOR_VERSION }}
+            type=raw,value=gcc_12_clang_16
            type=raw,value=${{ github.sha }}
          platforms: linux/amd64,linux/arm64
-          build_args: |
-            CLANG_MAJOR_VERSION=${{ env.CLANG_MAJOR_VERSION }}
-            GCC_VERSION=${{ env.GCC_VERSION }}
          dockerhub_repo: rippleci/clio_ci
          dockerhub_description: CI image for XRPLF/clio.
--- a/.github/workflows/upload_conan_deps.yml
+++ b/.github/workflows/upload_conan_deps.yml
@@ -11,27 +11,19 @@ on:
        default: false
        type: boolean
  pull_request:
-    branches: [develop]
+    branches:
+      - develop
    paths:
      - .github/workflows/upload_conan_deps.yml
-
-      - .github/actions/generate/action.yml
-      - .github/actions/prepare_runner/action.yml
-      - .github/scripts/conan/generate_matrix.py
-      - .github/scripts/conan/init.sh
-
+      - .github/scripts/generate_conan_matrix.py
      - conanfile.py
      - conan.lock
  push:
-    branches: [develop]
+    branches:
+      - develop
    paths:
      - .github/workflows/upload_conan_deps.yml
-
-      - .github/actions/generate/action.yml
-      - .github/actions/prepare_runner/action.yml
-      - .github/scripts/conan/generate_matrix.py
-      - .github/scripts/conan/init.sh
-
+      - .github/scripts/generate_conan_matrix.py
      - conanfile.py
      - conan.lock

@@ -49,7 +41,7 @@ jobs:

      - name: Calculate conan matrix
        id: set-matrix
-        run: .github/scripts/conan/generate_matrix.py >> "${GITHUB_OUTPUT}"
+        run: .github/scripts/generate_conan_matrix.py >> "${GITHUB_OUTPUT}"

  upload-conan-deps:
    name: Build ${{ matrix.compiler }}${{ matrix.sanitizer_ext }} ${{ matrix.build_type }}
@@ -74,10 +66,11 @@ jobs:
        with:
          disable_ccache: true

-      - name: Setup conan on macOS
+      - name: Setup conan
        if: runner.os == 'macOS'
-        shell: bash
-        run: ./.github/scripts/conan/init.sh
+        uses: ./.github/actions/setup_conan_macos
+        with:
+          conan_files_dir: docker/ci/conan/

      - name: Show conan profile
        run: conan profile show --profile:all ${{ env.CONAN_PROFILE }}
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -26,12 +26,12 @@ repos:

  # Autoformat: YAML, JSON, Markdown, etc.
  - repo: https://github.com/rbubley/mirrors-prettier
-    rev: 5ba47274f9b181bce26a5150a725577f3c336011 # frozen: v3.6.2
+    rev: 787fb9f542b140ba0b2aced38e6a3e68021647a3 # frozen: v3.5.3
    hooks:
      - id: prettier

  - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: 192ad822316c3a22fb3d3cc8aa6eafa0b8488360 # frozen: v0.45.0
+    rev: 586c3ea3f51230da42bab657c6a32e9e66c364f0 # frozen: v0.44.0
    hooks:
      - id: markdownlint-fix
        exclude: LICENSE.md
@@ -55,32 +55,17 @@ repos:
            --ignore-words=pre-commit-hooks/codespell_ignore.txt,
          ]

-  # Running some C++ hooks before clang-format
-  # to ensure that the style is consistent.
+  # Running fix-local-includes before clang-format
+  # to ensure that the include order is correct.
  - repo: local
    hooks:
-      - id: json-in-cpp
-        name: Fix JSON style in C++
-        entry: pre-commit-hooks/json_in_cpp.py
-        types: [c++]
-        language: python
-        exclude: |
-          (?x)^(
-            tests/unit/etl/SubscriptionSourceTests.cpp|
-            tests/unit/web/ServerTests.cpp|
-            tests/unit/web/impl/ErrorHandlingTests.cpp|
-            tests/unit/web/ng/ServerTests.cpp|
-            tests/unit/web/ng/impl/ErrorHandlingTests.cpp
-          )$
-
      - id: fix-local-includes
        name: Fix Local Includes
        entry: pre-commit-hooks/fix-local-includes.sh
        types: [c++]
        language: script
-
  - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: 6b9072cd80691b1b48d80046d884409fb1d962d1 # frozen: v20.1.7
+    rev: f9a52e87b6cdcb01b0a62b8611d9ba9f2dad0067 # frozen: v19.1.7
    hooks:
      - id: clang-format
        args: [--style=file]
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,17 +69,15 @@ endif ()
 # Enable selected sanitizer if enabled via `san`
 if (san)
  set(SUPPORTED_SANITIZERS "address" "thread" "memory" "undefined")
-  if (NOT san IN_LIST SUPPORTED_SANITIZERS)
+  list(FIND SUPPORTED_SANITIZERS "${san}" INDEX)
+  if (INDEX EQUAL -1)
    message(FATAL_ERROR "Error: Unsupported sanitizer '${san}'. Supported values are: ${SUPPORTED_SANITIZERS}.")
  endif ()

-  # Sanitizers recommend minimum of -O1 for reasonable performance so we enable it for debug builds
-  set(SAN_OPTIMIZATION_FLAG "")
-  if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(SAN_OPTIMIZATION_FLAG -O1)
-  endif ()
-  target_compile_options(clio_options INTERFACE ${SAN_OPTIMIZATION_FLAG} ${SAN_FLAG} -fno-omit-frame-pointer)
-
+  target_compile_options(
+    clio_options INTERFACE # Sanitizers recommend minimum of -O1 for reasonable performance
+                           $<$<CONFIG:Debug>:-O1> ${SAN_FLAG} -fno-omit-frame-pointer
+  )
  target_compile_definitions(
    clio_options INTERFACE $<$<STREQUAL:${san},address>:SANITIZER=ASAN> $<$<STREQUAL:${san},thread>:SANITIZER=TSAN>
                           $<$<STREQUAL:${san},memory>:SANITIZER=MSAN> $<$<STREQUAL:${san},undefined>:SANITIZER=UBSAN>
--- a/cmake/ClangTidy.cmake
+++ b/cmake/ClangTidy.cmake
@@ -8,7 +8,7 @@ if (lint)
    endif ()
    message(STATUS "Using clang-tidy from CLIO_CLANG_TIDY_BIN")
  else ()
-    find_program(_CLANG_TIDY_BIN NAMES "clang-tidy-20" "clang-tidy" REQUIRED)
+    find_program(_CLANG_TIDY_BIN NAMES "clang-tidy-19" "clang-tidy" REQUIRED)
  endif ()

  if (NOT _CLANG_TIDY_BIN)
--- a/cmake/ClioVersion.cmake
+++ b/cmake/ClioVersion.cmake
@@ -4,42 +4,39 @@

 find_package(Git REQUIRED)

-set(GIT_COMMAND describe --tags --exact-match)
+set(GIT_COMMAND rev-parse --short HEAD)
 execute_process(
-  COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND}
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  OUTPUT_VARIABLE TAG
-  RESULT_VARIABLE RC
+  COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE REV
  OUTPUT_STRIP_TRAILING_WHITESPACE
 )

-if (RC EQUAL 0)
-  # if we are on a tag, use the tag name
-  set(CLIO_VERSION "${TAG}")
-  set(DOC_CLIO_VERSION "${TAG}")
-else ()
-  # if not, use YYYYMMDDHMS-<branch>-<git-rev>
+set(GIT_COMMAND branch --show-current)
+execute_process(
+  COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE BRANCH
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)

+if (BRANCH STREQUAL "")
+  set(BRANCH "dev")
+endif ()
+
+if (NOT (BRANCH MATCHES master OR BRANCH MATCHES release/*)) # for develop and any other branch name
+                                                             # YYYYMMDDHMS-<branch>-<git-rev>
  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
+    COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE DATE
+    OUTPUT_STRIP_TRAILING_WHITESPACE
  )
-
-  set(GIT_COMMAND branch --show-current)
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE BRANCH
-    OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ERROR_IS_FATAL ANY
-  )
-
-  set(GIT_COMMAND rev-parse --short HEAD)
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE REV
-    OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ERROR_IS_FATAL ANY
-  )
-
  set(CLIO_VERSION "${DATE}-${BRANCH}-${REV}")
  set(DOC_CLIO_VERSION "develop")
+else ()
+  set(GIT_COMMAND describe --tags)
+  execute_process(
+    COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE CLIO_TAG_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  set(CLIO_VERSION "${CLIO_TAG_VERSION}")
+  set(DOC_CLIO_VERSION "${CLIO_TAG_VERSION}")
 endif ()

 if (CMAKE_BUILD_TYPE MATCHES Debug)
--- a/conan.lock
+++ b/conan.lock
@@ -1,46 +1,46 @@
 {
    "version": "0.5",
    "requires": [
-        "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1752006674.465",
-        "xxhash/0.8.2#7856c968c985b2981b707ee8f2413b2b%1752006674.334",
-        "xrpl/2.5.0#7880d1696f11fceb1d498570f1a184c8%1752006708.218",
-        "sqlite3/3.47.0#7a0904fd061f5f8a2366c294f9387830%1752006674.338",
-        "soci/4.0.3#a9f8d773cd33e356b5879a4b0564f287%1752006674.465",
-        "re2/20230301#dfd6e2bf050eb90ddd8729cfb4c844a4%1752006674.077",
-        "rapidjson/cci.20220822#1b9d8c2256876a154172dc5cfbe447c6%1752006673.227",
-        "protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1752006673.172",
-        "openssl/1.1.1v#216374e4fb5b2e0f5ab1fb6f27b5b434%1752006673.069",
-        "nudb/2.0.8#63990d3e517038e04bf529eb8167f69f%1752006673.862",
-        "minizip/1.2.13#9e87d57804bd372d6d1e32b1871517a3%1752006672.983",
-        "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504%1752006672.825",
-        "libuv/1.46.0#78565d142ac7102776256328a26cdf60%1752006672.827",
-        "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1752006672.826",
-        "libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1752006672.822",
-        "libarchive/3.7.6#e0453864b2a4d225f06b3304903cb2b7%1752006672.917",
-        "http_parser/2.9.4#98d91690d6fd021e9e624218a85d9d97%1752006672.658",
-        "gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1752006671.555",
-        "grpc/1.50.1#02291451d1e17200293a409410d1c4e1%1752006671.777",
-        "fmt/11.2.0#579bb2cdf4a7607621beea4eb4651e0f%1752006671.557",
-        "date/3.0.3#cf28fe9c0aab99fe12da08aa42df65e1%1752006671.553",
-        "cassandra-cpp-driver/2.17.0#e50919efac8418c26be6671fd702540a%1752006671.654",
-        "c-ares/1.34.5#b78b91e7cfb1f11ce777a285bbf169c6%1752006671.554",
-        "bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1752006671.549",
-        "boost/1.83.0#5bcb2a14a35875e328bf312e080d3562%1752006671.557",
-        "benchmark/1.8.3#1a2ce62c99e2b3feaa57b1f0c15a8c46%1752006671.408",
-        "abseil/20230802.1#f0f91485b111dc9837a68972cb19ca7b%1752006671.555"
+        "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1750263732.782",
+        "xxhash/0.8.2#7856c968c985b2981b707ee8f2413b2b%1750263730.908",
+        "xrpl/2.5.0-rc1#e5897e048ea5712d2c71561c507d949d%1750263725.455",
+        "sqlite3/3.47.0#7a0904fd061f5f8a2366c294f9387830%1750263721.79",
+        "soci/4.0.3#a9f8d773cd33e356b5879a4b0564f287%1750263717.455",
+        "re2/20230301#dfd6e2bf050eb90ddd8729cfb4c844a4%1750263715.145",
+        "rapidjson/cci.20220822#1b9d8c2256876a154172dc5cfbe447c6%1750263713.526",
+        "protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1750263698.841",
+        "openssl/1.1.1v#216374e4fb5b2e0f5ab1fb6f27b5b434%1750263685.885",
+        "nudb/2.0.8#63990d3e517038e04bf529eb8167f69f%1750263683.814",
+        "minizip/1.2.13#9e87d57804bd372d6d1e32b1871517a3%1750263681.745",
+        "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504%1750263679.891",
+        "libuv/1.46.0#78565d142ac7102776256328a26cdf60%1750263677.819",
+        "libiconv/1.17#1ae2f60ab5d08de1643a22a81b360c59%1750257497.552",
+        "libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1750263675.748",
+        "libarchive/3.7.6#e0453864b2a4d225f06b3304903cb2b7%1750263671.05",
+        "http_parser/2.9.4#98d91690d6fd021e9e624218a85d9d97%1750263668.751",
+        "gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1750263666.833",
+        "grpc/1.50.1#02291451d1e17200293a409410d1c4e1%1750263646.614",
+        "fmt/10.1.1#021e170cf81db57da82b5f737b6906c1%1750263644.741",
+        "date/3.0.3#cf28fe9c0aab99fe12da08aa42df65e1%1750263643.099",
+        "cassandra-cpp-driver/2.17.0#e50919efac8418c26be6671fd702540a%1750263632.157",
+        "c-ares/1.34.5#b78b91e7cfb1f11ce777a285bbf169c6%1750263630.06",
+        "bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1750263627.95",
+        "boost/1.83.0#8eb22f36ddfb61f54bbc412c4555bd66%1750263616.444",
+        "benchmark/1.8.3#1a2ce62c99e2b3feaa57b1f0c15a8c46%1724323740.181",
+        "abseil/20230802.1#f0f91485b111dc9837a68972cb19ca7b%1750263609.776"
    ],
    "build_requires": [
-        "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1752006674.465",
-        "protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1752006673.172",
-        "protobuf/3.21.9#64ce20e1d9ea24f3d6c504015d5f6fa8%1752006673.173",
-        "cmake/3.31.7#57c3e118bcf267552c0ea3f8bee1e7d5%1752006671.64",
-        "b2/5.3.2#7b5fabfe7088ae933fb3e78302343ea0%1752006671.407"
+        "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1750263732.782",
+        "protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1750263698.841",
+        "protobuf/3.21.9#64ce20e1d9ea24f3d6c504015d5f6fa8%1750263690.822",
+        "cmake/3.31.6#ed0e6c1d49bd564ce6fed1a19653b86d%1750263636.055",
+        "b2/5.3.2#7b5fabfe7088ae933fb3e78302343ea0%1750263614.565"
    ],
    "python_requires": [],
    "overrides": {
        "boost/1.83.0": [
            null,
-            "boost/1.83.0#5bcb2a14a35875e328bf312e080d3562"
+            "boost/1.83.0#8eb22f36ddfb61f54bbc412c4555bd66"
        ],
        "protobuf/3.21.9": [
            null,
--- a/conanfile.py
+++ b/conanfile.py
@@ -26,11 +26,11 @@ class ClioConan(ConanFile):
    requires = [
        'boost/1.83.0',
        'cassandra-cpp-driver/2.17.0',
-        'fmt/11.2.0',
+        'fmt/10.1.1',
        'protobuf/3.21.12',
        'grpc/1.50.1',
        'openssl/1.1.1v',
-        'xrpl/2.5.0',
+        'xrpl/2.5.0-rc1',
        'zlib/1.3.1',
        'libbacktrace/cci.20210118'
    ]
--- a/docker/ci/Dockerfile
+++ b/docker/ci/Dockerfile
@@ -1,10 +1,7 @@
-ARG CLANG_MAJOR_VERSION=invalid
-ARG GCC_VERSION=invalid
-
-FROM ghcr.io/xrplf/clio-gcc:${GCC_VERSION} AS clio-gcc
+FROM ghcr.io/xrplf/clio-gcc:12.3.0 AS clio-gcc
 FROM ghcr.io/xrplf/clio-tools:latest AS clio-tools

-FROM ghcr.io/xrplf/clio-clang:${CLANG_MAJOR_VERSION}
+FROM ghcr.io/xrplf/clio-clang:16

 ARG DEBIAN_FRONTEND=noninteractive

@@ -19,7 +16,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 USER root
 WORKDIR /root

-ARG LLVM_TOOLS_VERSION=20
+ARG LLVM_TOOLS_VERSION=19

 # Add repositories
 RUN apt-get update \
@@ -48,10 +45,6 @@ RUN apt-get update \
        zip \
    && pip3 install -q --upgrade --no-cache-dir pip \
    && pip3 install -q --no-cache-dir \
-        # TODO: Remove this once we switch to newer Ubuntu base image
-        # lxml 6.0.0 is not compatible with our image
-        'lxml<6.0.0' \
-        \
        cmake==3.31.6 \
        conan==2.17.0 \
        gcovr \
@@ -82,8 +75,6 @@ RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 100 \
    && update-alternatives --install /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-12 100

 COPY --from=clio-tools \
-    /usr/local/bin/mold \
-    /usr/local/bin/ld.mold \
    /usr/local/bin/ccache \
    /usr/local/bin/doxygen \
    /usr/local/bin/ClangBuildAnalyzer \
--- a/docker/ci/README.md
+++ b/docker/ci/README.md
@@ -6,14 +6,13 @@ It is used in [Clio Github Actions](https://github.com/XRPLF/clio/actions) but c
 The image is based on Ubuntu 20.04 and contains:

 - ccache 4.11.3
- Clang 19
+- clang 16.0.6
 - ClangBuildAnalyzer 1.6.0
- Conan 2.17.0
- Doxygen 1.12
- GCC 12.3.0
+- conan 2.17.0
+- doxygen 1.12
+- gcc 12.3.0
 - gh 2.74
 - git-cliff 2.9.1
- mold 2.40.1
 - and some other useful tools

 Conan is set up to build Clio without any additional steps.
--- a/docker/ci/conan/clang.profile
+++ b/docker/ci/conan/clang.profile
@@ -4,9 +4,8 @@ build_type=Release
 compiler=clang
 compiler.cppstd=20
 compiler.libcxx=libc++
-compiler.version=19
+compiler.version=16
 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"]
+tools.build:compiler_executables={'c': '/usr/bin/clang-16', 'cpp': '/usr/bin/clang++-16'}
--- a/docker/ci/conan/gcc.profile
+++ b/docker/ci/conan/gcc.profile
@@ -8,4 +8,4 @@ compiler.version=12
 os=Linux

 [conf]
-tools.build:compiler_executables={"c": "/usr/bin/gcc-12", "cpp": "/usr/bin/g++-12"}
+tools.build:compiler_executables={'c': '/usr/bin/gcc-12', 'cpp': '/usr/bin/g++-12'}
--- a/docker/ci/conan/global.conf
+++ b/docker/ci/conan/global.conf
@@ -1,2 +1,3 @@
 core.download:parallel={{os.cpu_count()}}
 core.upload:parallel={{os.cpu_count()}}
+tools.info.package_id:confs = ["tools.build:cflags", "tools.build:cxxflags", "tools.build:exelinkflags", "tools.build:sharedlinkflags"]
--- a/docker/ci/conan/sanitizer_template.profile
+++ b/docker/ci/conan/sanitizer_template.profile
@@ -1,8 +1,7 @@
 {% set compiler, sani = profile_name.split('.') %}

-{% set sanitizer_opt_map = {"asan": "address", "tsan": "thread", "ubsan": "undefined"} %}
+{% set sanitizer_opt_map = {'asan': 'address', 'tsan': 'thread', 'ubsan': 'undefined'} %}
 {% set sanitizer = sanitizer_opt_map[sani] %}
-
 {% set sanitizer_build_flags_str = "-fsanitize=" ~ sanitizer ~ " -g -O1 -fno-omit-frame-pointer" %}
 {% set sanitizer_build_flags = sanitizer_build_flags_str.split(' ') %}
 {% set sanitizer_link_flags_str = "-fsanitize=" ~ sanitizer %}
@@ -11,13 +10,11 @@
 include({{ compiler }})

 [options]
-boost/*:extra_b2_flags="cxxflags=\"{{ sanitizer_build_flags_str }}\" linkflags=\"{{ sanitizer_link_flags_str }}\""
-boost/*:without_stacktrace=True
+boost/*:extra_b2_flags = "cxxflags=\"{{ sanitizer_build_flags_str }}\" linkflags=\"{{ sanitizer_link_flags_str }}\""
+boost/*:without_stacktrace = True

 [conf]
-tools.build:cflags+={{ sanitizer_build_flags }}
-tools.build:cxxflags+={{ sanitizer_build_flags }}
-tools.build:exelinkflags+={{ sanitizer_link_flags }}
-tools.build:sharedlinkflags+={{ sanitizer_link_flags }}
-
-tools.info.package_id:confs+=["tools.build:cflags", "tools.build:cxxflags", "tools.build:exelinkflags", "tools.build:sharedlinkflags"]
+tools.build:cflags += {{ sanitizer_build_flags }}
+tools.build:cxxflags += {{ sanitizer_build_flags }}
+tools.build:exelinkflags += {{ sanitizer_link_flags }}
+tools.build:sharedlinkflags += {{ sanitizer_link_flags }}
--- a/docker/compilers/clang/Dockerfile
+++ b/docker/compilers/clang/Dockerfile
@@ -8,6 +8,8 @@ SHELL ["/bin/bash", "-c"]
 USER root
 WORKDIR /root

+ARG CLANG_VERSION=16
+
 RUN apt-get update \
    && apt-get install -y --no-install-recommends --no-install-suggests \
        wget \
@@ -16,17 +18,13 @@ RUN apt-get update \
    && apt-get clean \
    && rm -rf /var/lib/apt/lists/*

-ARG CLANG_MAJOR_VERSION=invalid
-# Bump this version to force rebuild of the image
-ARG BUILD_VERSION=0
-
 RUN wget --progress=dot:giga https://apt.llvm.org/llvm.sh \
    && chmod +x llvm.sh \
-    && ./llvm.sh ${CLANG_MAJOR_VERSION} \
+    && ./llvm.sh ${CLANG_VERSION} \
    && rm -rf llvm.sh \
    && apt-get update \
    && apt-get install -y --no-install-recommends --no-install-suggests \
-        libc++-${CLANG_MAJOR_VERSION}-dev \
-        libc++abi-${CLANG_MAJOR_VERSION}-dev \
+        libc++-${CLANG_VERSION}-dev \
+        libc++abi-${CLANG_VERSION}-dev \
    && apt-get clean \
    && rm -rf /var/lib/apt/lists/*
--- a/docker/compilers/gcc/Dockerfile
+++ b/docker/compilers/gcc/Dockerfile
@@ -1,14 +1,16 @@
 ARG UBUNTU_VERSION=20.04

-ARG GCC_MAJOR_VERSION=invalid
+ARG GCC_MAJOR_VERSION=12

 FROM ubuntu:$UBUNTU_VERSION AS build

 ARG UBUNTU_VERSION

 ARG GCC_MAJOR_VERSION
-
-ARG BUILD_VERSION=7
+ARG GCC_MINOR_VERSION=3
+ARG GCC_PATCH_VERSION=0
+ARG GCC_VERSION=${GCC_MAJOR_VERSION}.${GCC_MINOR_VERSION}.${GCC_PATCH_VERSION}
+ARG BUILD_VERSION=6

 ARG DEBIAN_FRONTEND=noninteractive
 ARG TARGETARCH
@@ -25,8 +27,6 @@ RUN apt-get update \
    && apt-get clean \
    && rm -rf /var/lib/apt/lists/*

-ARG GCC_VERSION
-
 WORKDIR /
 RUN wget --progress=dot:giga https://gcc.gnu.org/pub/gcc/releases/gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.gz \
    && tar xf gcc-$GCC_VERSION.tar.gz
--- a/docker/tools/Dockerfile
+++ b/docker/tools/Dockerfile
@@ -1,40 +1,24 @@
-ARG GCC_VERSION=invalid
-
-FROM ghcr.io/xrplf/clio-gcc:${GCC_VERSION}
+FROM ubuntu:20.04

 ARG DEBIAN_FRONTEND=noninteractive
 ARG TARGETARCH

 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

-ARG BUILD_VERSION=1
-
 RUN apt-get update \
    && apt-get install -y --no-install-recommends --no-install-suggests \
        bison \
+        build-essential \
+        cmake \
        flex \
        ninja-build \
-        python3 \
-        python3-pip \
        software-properties-common \
        wget \
-    && pip3 install -q --no-cache-dir \
-        cmake==3.31.6 \
    && apt-get clean \
    && rm -rf /var/lib/apt/lists/*

 WORKDIR /tmp

-ARG MOLD_VERSION=2.40.1
-RUN wget --progress=dot:giga "https://github.com/rui314/mold/archive/refs/tags/v${MOLD_VERSION}.tar.gz" \
-    && tar xf "v${MOLD_VERSION}.tar.gz" \
-    && cd "mold-${MOLD_VERSION}" \
-    && mkdir build \
-    && cd build \
-    && cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. \
-    && ninja install \
-    && rm -rf /tmp/* /var/tmp/*
-
 ARG CCACHE_VERSION=4.11.3
 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" \
@@ -42,7 +26,7 @@ RUN wget --progress=dot:giga "https://github.com/ccache/ccache/releases/download
    && mkdir build \
    && cd build \
    && cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=False .. \
-    && ninja install \
+    && cmake --build . --target install \
    && rm -rf /tmp/* /var/tmp/*

 ARG DOXYGEN_VERSION=1.12.0
@@ -52,7 +36,7 @@ RUN wget --progress=dot:giga "https://github.com/doxygen/doxygen/releases/downlo
    && mkdir build \
    && cd build \
    && cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. \
-    && ninja install \
+    && cmake --build . --target install \
    && rm -rf /tmp/* /var/tmp/*

 ARG CLANG_BUILD_ANALYZER_VERSION=1.6.0
@@ -62,7 +46,7 @@ RUN wget --progress=dot:giga "https://github.com/aras-p/ClangBuildAnalyzer/archi
    && mkdir build \
    && cd build \
    && cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. \
-    && ninja install \
+    && cmake --build . --target install \
    && rm -rf /tmp/* /var/tmp/*

 ARG GIT_CLIFF_VERSION=2.9.1
--- a/docs/build-clio.md
+++ b/docs/build-clio.md
@@ -6,7 +6,7 @@
 ## Minimum Requirements

 - [Python 3.7](https://www.python.org/downloads/)
- [Conan 2.17.0](https://conan.io/downloads.html)
+- [Conan 1.55, <2.0](https://conan.io/downloads.html)
 - [CMake 3.20, <4.0](https://cmake.org/download/)
 - [**Optional**] [GCovr](https://gcc.gnu.org/onlinedocs/gcc/Gcov.html): needed for code coverage generation
 - [**Optional**] [CCache](https://ccache.dev/): speeds up compilation if you are going to compile Clio often
@@ -19,21 +19,10 @@

 ### Conan Configuration

-By default, Conan uses `~/.conan2` as it's home folder.
-You can change it by using `$CONAN_HOME` env variable.
-[More info about Conan home](https://docs.conan.io/2/reference/environment.html#conan-home).
+Clio requires `compiler.cppstd=20` in your Conan profile (`~/.conan2/profiles/default`).

-> [!TIP]
-> To setup Conan automatically, you can run `.github/scripts/conan/init.sh`.
-> This will delete Conan home directory (if it exists), set up profiles and add Artifactory remote.
-
-The instruction below assumes that `$CONAN_HOME` is not set.
-
-#### Profiles
-
-The default profile is the file in `~/.conan2/profiles/default`.
-
-Here are some examples of possible profiles:
+> [!NOTE]
+> Although Clio is built using C++23, it's required to set `compiler.cppstd=20` for the time being as some of Clio's dependencies are not yet capable of building under C++23.

 **Mac apple-clang 16 example**:

@@ -64,19 +53,13 @@ compiler.version=12
 os=Linux

 [conf]
-tools.build:compiler_executables={"c": "/usr/bin/gcc-12", "cpp": "/usr/bin/g++-12"}
+tools.build:compiler_executables={'c': '/usr/bin/gcc-12', 'cpp': '/usr/bin/g++-12'}
 ```

-> [!NOTE]
-> Although Clio is built using C++23, it's required to set `compiler.cppstd=20` in your profile for the time being as some of Clio's dependencies are not yet capable of building under C++23.
-
-#### global.conf file
-
-To increase the speed of downloading and uploading packages, add the following to the `~/.conan2/global.conf` file:
+Add the following to the `~/.conan2/global.conf` file:

 ```text
-core.download:parallel={{os.cpu_count()}}
-core.upload:parallel={{os.cpu_count()}}
+tools.info.package_id:confs = ["tools.build:cflags", "tools.build:cxxflags", "tools.build:exelinkflags", "tools.build:sharedlinkflags"]
 ```

 #### Artifactory
@@ -87,7 +70,16 @@ Make sure artifactory is setup with Conan.
 conan remote add --index 0 ripple http://18.143.149.228:8081/artifactory/api/conan/dev
 ```

-Now you should be able to download the prebuilt dependencies (including `xrpl` package) on supported platforms.
+Now you should be able to download the prebuilt `xrpl` package on some platforms.
+
+> [!NOTE]
+> You may need to edit the `~/.conan2/remotes.json` file to ensure that this newly added artifactory is listed last. Otherwise, you could see compilation errors when building the project with gcc version 13 (or newer).
+
+Remove old packages you may have cached interactively.
+
+```sh
+conan remove xrpl
+```

 #### Conan lockfile

@@ -110,7 +102,6 @@ Navigate to Clio's root directory and run:

 ```sh
 mkdir build && cd build
-# You can also specify profile explicitly by adding `--profile:all <PROFILE_NAME>`
 conan install .. --output-folder . --build missing --settings build_type=Release -o '&:tests=True'
 # You can also add -GNinja to use Ninja build system instead of Make
 cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release ..
@@ -222,16 +213,18 @@ Sometimes, during development, you need to build against a custom version of `li

 ## Using `clang-tidy` for static analysis

+The minimum [clang-tidy](https://clang.llvm.org/extra/clang-tidy/) version required is 19.0.
+
 Clang-tidy can be run by CMake when building the project.
 To achieve this, you just need to provide the option `-o '&:lint=True'` for the `conan install` command:

 ```sh
-conan install .. --output-folder . --build missing --settings build_type=Release -o '&:tests=True' -o '&:lint=True' --profile:all clang
+conan install .. --output-folder . --build missing --settings build_type=Release -o '&:tests=True' -o '&:lint=True'
 ```

 By default CMake will try to find `clang-tidy` automatically in your system.
 To force CMake to use your desired binary, set the `CLIO_CLANG_TIDY_BIN` environment variable to the path of the `clang-tidy` binary. For example:

 ```sh
-export CLIO_CLANG_TIDY_BIN=/opt/homebrew/opt/llvm/bin/clang-tidy
+export CLIO_CLANG_TIDY_BIN=/opt/homebrew/opt/llvm@19/bin/clang-tidy
 ```
--- a/docs/configure-clio.md
+++ b/docs/configure-clio.md
@@ -5,6 +5,7 @@
 Clio needs access to a `rippled` server in order to work. The following configurations are required for Clio and `rippled` to communicate:

 1. In the Clio config file, provide the following:
+
   - The IP of the `rippled` server

   - The port on which `rippled` is accepting unencrypted WebSocket connections
@@ -12,6 +13,7 @@ Clio needs access to a `rippled` server in order to work. The following configur
   - The port on which `rippled` is handling gRPC requests

 2. In the `rippled` config file, you need to open:
+
   - A port to accept unencrypted WebSocket connections

   - A port to handle gRPC requests, with the IP(s) of Clio specified in the `secure_gateway` entry
--- a/pre-commit-hooks/json_in_cpp.py
+++ b/pre-commit-hooks/json_in_cpp.py
@@ -1,76 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import re
-from pathlib import Path
-
-
-def fix_json_style(cpp_content: str) -> str:
-    cpp_content = cpp_content.replace('R"json(', 'R"JSON(').replace(')json"', ')JSON"')
-
-    pattern = r'R"JSON\((.*?)\)JSON"'
-
-    def replace_json(match):
-        raw_json = match.group(1)
-
-        raw_json = (
-            raw_json.replace(" :", ":")
-            .replace(" ,", ",")
-            .replace(" null", "null")
-            .replace(':"', ': "')
-            .replace(',"', ', "')
-            .replace('":{', '": {')
-            .replace('":[', '": [')
-            .replace('":true', '": true')
-            .replace('":false', '": false')
-            .replace('":null', '": null')
-        )
-        for digit in range(10):
-            raw_json = raw_json.replace(f'":{digit}', f'": {digit}')
-        return f'R"JSON({raw_json})JSON"'
-
-    return re.sub(pattern, replace_json, cpp_content, flags=re.DOTALL)
-
-
-def process_file(file_path: Path, dry_run: bool) -> bool:
-    content = file_path.read_text(encoding="utf-8")
-    new_content = fix_json_style(content)
-
-    if new_content != content:
-        print(f"Processing file: {file_path}")
-        if dry_run:
-            print("Dry run: changes won't be written to the file.")
-        else:
-            print("Writing changes to file.")
-            file_path.write_text(new_content, encoding="utf-8")
-    return new_content == content
-
-
-def main():
-    parser = argparse.ArgumentParser(
-        description="Fix JSON style in C++ files",
-    )
-    parser.add_argument(
-        "--dry-run",
-        default=False,
-        action="store_true",
-        help="Don't modify files, just print what would be changed",
-    )
-    parser.add_argument(
-        "files",
-        nargs="*",
-        help="Specific files to process",
-    )
-
-    args = parser.parse_args()
-
-    success = True
-    for file in args.files:
-        success = success and process_file(Path(file), dry_run=args.dry_run)
-    if not success:
-        print("Errors occurred while processing files.")
-        exit(1)
-
-
-if __name__ == "__main__":
-    main()
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -10,5 +10,4 @@ target_link_libraries(
         clio_web
         clio_rpc
         clio_migration
-  PRIVATE Boost::program_options
 )
--- a/src/app/CliArgs.cpp
+++ b/src/app/CliArgs.cpp
@@ -60,17 +60,17 @@ CliArgs::parse(int argc, char const* argv[])
    po::store(po::command_line_parser(argc, argv).options(description).positional(positional).run(), parsed);
    po::notify(parsed);

-    if (parsed.contains("help")) {
+    if (parsed.count("help") != 0u) {
        std::cout << "Clio server " << util::build::getClioFullVersionString() << "\n\n" << description;
        return Action{Action::Exit{EXIT_SUCCESS}};
    }

-    if (parsed.contains("version")) {
+    if (parsed.count("version") != 0u) {
        std::cout << util::build::getClioFullVersionString() << '\n';
        return Action{Action::Exit{EXIT_SUCCESS}};
    }

-    if (parsed.contains("config-description")) {
+    if (parsed.count("config-description") != 0u) {
        std::filesystem::path const filePath = parsed["config-description"].as<std::string>();

        auto const res = util::config::ClioConfigDescription::generateConfigDescriptionToFile(filePath);
@@ -83,17 +83,18 @@ CliArgs::parse(int argc, char const* argv[])

    auto configPath = parsed["conf"].as<std::string>();

-    if (parsed.contains("migrate")) {
+    if (parsed.count("migrate") != 0u) {
        auto const opt = parsed["migrate"].as<std::string>();
        if (opt == "status")
            return Action{Action::Migrate{.configPath = std::move(configPath), .subCmd = MigrateSubCmd::status()}};
        return Action{Action::Migrate{.configPath = std::move(configPath), .subCmd = MigrateSubCmd::migration(opt)}};
    }

-    if (parsed.contains("verify"))
+    if (parsed.count("verify") != 0u)
        return Action{Action::VerifyConfig{.configPath = std::move(configPath)}};

-    return Action{Action::Run{.configPath = std::move(configPath), .useNgWebServer = parsed.contains("ng-web-server")}};
+    return Action{Action::Run{.configPath = std::move(configPath), .useNgWebServer = parsed.count("ng-web-server") != 0}
+    };
 }

 }  // namespace app
--- a/src/app/WebHandlers.cpp
+++ b/src/app/WebHandlers.cpp
@@ -97,7 +97,7 @@ HealthCheckHandler::operator()(
    boost::asio::yield_context
 )
 {
-    static constexpr auto kHEALTH_CHECK_HTML = R"html(
+    static auto constexpr kHEALTH_CHECK_HTML = R"html(
    <!DOCTYPE html>
    <html>
        <head><title>Test page for Clio</title></head>
--- a/src/data/AmendmentCenter.cpp
+++ b/src/data/AmendmentCenter.cpp
@@ -78,20 +78,17 @@ WritingAmendmentKey::WritingAmendmentKey(std::string amendmentName) : AmendmentK

 }  // namespace impl

-AmendmentKey::
-operator std::string const&() const
+AmendmentKey::operator std::string const&() const
 {
    return name;
 }

-AmendmentKey::
-operator std::string_view() const
+AmendmentKey::operator std::string_view() const
 {
    return name;
 }

-AmendmentKey::
-operator ripple::uint256() const
+AmendmentKey::operator ripple::uint256() const
 {
    return Amendment::getAmendmentId(name);
 }
--- a/src/data/BackendCounters.cpp
+++ b/src/data/BackendCounters.cpp
@@ -49,45 +49,35 @@ durationInMillisecondsSince(std::chrono::steady_clock::time_point const startTim
 using namespace util::prometheus;

 BackendCounters::BackendCounters()
-    : tooBusyCounter_(
-          PrometheusService::counterInt(
-              "backend_too_busy_total_number",
-              Labels(),
-              "The total number of times the backend was too busy to process a request"
-          )
-      )
-    , writeSyncCounter_(
-          PrometheusService::counterInt(
-              "backend_operations_total_number",
-              Labels({Label{"operation", "write_sync"}}),
-              "The total number of times the backend had to write synchronously"
-          )
-      )
-    , writeSyncRetryCounter_(
-          PrometheusService::counterInt(
-              "backend_operations_total_number",
-              Labels({Label{"operation", "write_sync_retry"}}),
-              "The total number of times the backend had to retry a synchronous write"
-          )
-      )
+    : tooBusyCounter_(PrometheusService::counterInt(
+          "backend_too_busy_total_number",
+          Labels(),
+          "The total number of times the backend was too busy to process a request"
+      ))
+    , writeSyncCounter_(PrometheusService::counterInt(
+          "backend_operations_total_number",
+          Labels({Label{"operation", "write_sync"}}),
+          "The total number of times the backend had to write synchronously"
+      ))
+    , writeSyncRetryCounter_(PrometheusService::counterInt(
+          "backend_operations_total_number",
+          Labels({Label{"operation", "write_sync_retry"}}),
+          "The total number of times the backend had to retry a synchronous write"
+      ))
    , asyncWriteCounters_{"write_async"}
    , asyncReadCounters_{"read_async"}
-    , readDurationHistogram_(
-          PrometheusService::histogramInt(
-              "backend_duration_milliseconds_histogram",
-              Labels({Label{"operation", "read"}}),
-              kHISTOGRAM_BUCKETS,
-              "The duration of backend read operations including retries"
-          )
-      )
-    , writeDurationHistogram_(
-          PrometheusService::histogramInt(
-              "backend_duration_milliseconds_histogram",
-              Labels({Label{"operation", "write"}}),
-              kHISTOGRAM_BUCKETS,
-              "The duration of backend write operations including retries"
-          )
-      )
+    , readDurationHistogram_(PrometheusService::histogramInt(
+          "backend_duration_milliseconds_histogram",
+          Labels({Label{"operation", "read"}}),
+          kHISTOGRAM_BUCKETS,
+          "The duration of backend read operations including retries"
+      ))
+    , writeDurationHistogram_(PrometheusService::histogramInt(
+          "backend_duration_milliseconds_histogram",
+          Labels({Label{"operation", "write"}}),
+          kHISTOGRAM_BUCKETS,
+          "The duration of backend write operations including retries"
+      ))
 {
 }

@@ -180,34 +170,26 @@ BackendCounters::report() const

 BackendCounters::AsyncOperationCounters::AsyncOperationCounters(std::string name)
    : name_(std::move(name))
-    , pendingCounter_(
-          PrometheusService::gaugeInt(
-              "backend_operations_current_number",
-              Labels({{"operation", name_}, {"status", "pending"}}),
-              "The current number of pending " + name_ + " operations"
-          )
-      )
-    , completedCounter_(
-          PrometheusService::counterInt(
-              "backend_operations_total_number",
-              Labels({{"operation", name_}, {"status", "completed"}}),
-              "The total number of completed " + name_ + " operations"
-          )
-      )
-    , retryCounter_(
-          PrometheusService::counterInt(
-              "backend_operations_total_number",
-              Labels({{"operation", name_}, {"status", "retry"}}),
-              "The total number of retried " + name_ + " operations"
-          )
-      )
-    , errorCounter_(
-          PrometheusService::counterInt(
-              "backend_operations_total_number",
-              Labels({{"operation", name_}, {"status", "error"}}),
-              "The total number of errored " + name_ + " operations"
-          )
-      )
+    , pendingCounter_(PrometheusService::gaugeInt(
+          "backend_operations_current_number",
+          Labels({{"operation", name_}, {"status", "pending"}}),
+          "The current number of pending " + name_ + " operations"
+      ))
+    , completedCounter_(PrometheusService::counterInt(
+          "backend_operations_total_number",
+          Labels({{"operation", name_}, {"status", "completed"}}),
+          "The total number of completed " + name_ + " operations"
+      ))
+    , retryCounter_(PrometheusService::counterInt(
+          "backend_operations_total_number",
+          Labels({{"operation", name_}, {"status", "retry"}}),
+          "The total number of retried " + name_ + " operations"
+      ))
+    , errorCounter_(PrometheusService::counterInt(
+          "backend_operations_total_number",
+          Labels({{"operation", name_}, {"status", "error"}}),
+          "The total number of errored " + name_ + " operations"
+      ))
 {
 }

--- a/src/data/BackendInterface.hpp
+++ b/src/data/BackendInterface.hpp
@@ -234,12 +234,8 @@ public:
     * @return A vector of ripple::uint256 representing the account roots
     */
    virtual std::vector<ripple::uint256>
-    fetchAccountRoots(
-        std::uint32_t number,
-        std::uint32_t pageSize,
-        std::uint32_t seq,
-        boost::asio::yield_context yield
-    ) const = 0;
+    fetchAccountRoots(std::uint32_t number, std::uint32_t pageSize, std::uint32_t seq, boost::asio::yield_context yield)
+        const = 0;

    /**
     * @brief Updates the range of sequences that are stored in the DB.
@@ -463,11 +459,8 @@ public:
     * @return The sequence in unit32_t on success; nullopt otherwise
     */
    virtual std::optional<std::uint32_t>
-    doFetchLedgerObjectSeq(
-        ripple::uint256 const& key,
-        std::uint32_t sequence,
-        boost::asio::yield_context yield
-    ) const = 0;
+    doFetchLedgerObjectSeq(ripple::uint256 const& key, std::uint32_t sequence, boost::asio::yield_context yield)
+        const = 0;

    /**
     * @brief The database-specific implementation for fetching ledger objects.
--- a/src/data/CassandraBackend.hpp
+++ b/src/data/CassandraBackend.hpp
@@ -40,7 +40,7 @@
 #include <boost/uuid/string_generator.hpp>
 #include <boost/uuid/uuid.hpp>
 #include <cassandra.h>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <xrpl/basics/Blob.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/basics/strHex.h>
@@ -361,10 +361,8 @@ public:
    }

    std::vector<ripple::uint256>
-    fetchAllTransactionHashesInLedger(
-        std::uint32_t const ledgerSequence,
-        boost::asio::yield_context yield
-    ) const override
+    fetchAllTransactionHashesInLedger(std::uint32_t const ledgerSequence, boost::asio::yield_context yield)
+        const override
    {
        auto start = std::chrono::system_clock::now();
        auto const res = executor_.read(yield, schema_->selectAllTransactionHashesInLedger, ledgerSequence);
@@ -394,11 +392,8 @@ public:
    }

    std::optional<NFT>
-    fetchNFT(
-        ripple::uint256 const& tokenID,
-        std::uint32_t const ledgerSequence,
-        boost::asio::yield_context yield
-    ) const override
+    fetchNFT(ripple::uint256 const& tokenID, std::uint32_t const ledgerSequence, boost::asio::yield_context yield)
+        const override
    {
        auto const res = executor_.read(yield, schema_->selectNFT, tokenID, ledgerSequence);
        if (not res)
@@ -559,9 +554,10 @@ public:
        selectNFTStatements.reserve(nftIDs.size());

        std::transform(
-            std::cbegin(nftIDs), std::cend(nftIDs), std::back_inserter(selectNFTStatements), [&](auto const& nftID) {
-                return schema_->selectNFT.bind(nftID, ledgerSequence);
-            }
+            std::cbegin(nftIDs),
+            std::cend(nftIDs),
+            std::back_inserter(selectNFTStatements),
+            [&](auto const& nftID) { return schema_->selectNFT.bind(nftID, ledgerSequence); }
        );

        auto const nftInfos = executor_.readEach(yield, selectNFTStatements);
@@ -570,9 +566,10 @@ public:
        selectNFTURIStatements.reserve(nftIDs.size());

        std::transform(
-            std::cbegin(nftIDs), std::cend(nftIDs), std::back_inserter(selectNFTURIStatements), [&](auto const& nftID) {
-                return schema_->selectNFTURI.bind(nftID, ledgerSequence);
-            }
+            std::cbegin(nftIDs),
+            std::cend(nftIDs),
+            std::back_inserter(selectNFTURIStatements),
+            [&](auto const& nftID) { return schema_->selectNFTURI.bind(nftID, ledgerSequence); }
        );

        auto const nftUris = executor_.readEach(yield, selectNFTURIStatements);
@@ -629,11 +626,8 @@ public:
    }

    std::optional<Blob>
-    doFetchLedgerObject(
-        ripple::uint256 const& key,
-        std::uint32_t const sequence,
-        boost::asio::yield_context yield
-    ) const override
+    doFetchLedgerObject(ripple::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);
        if (auto const res = executor_.read(yield, schema_->selectObject, key, sequence); res) {
@@ -651,11 +645,8 @@ public:
    }

    std::optional<std::uint32_t>
-    doFetchLedgerObjectSeq(
-        ripple::uint256 const& key,
-        std::uint32_t const sequence,
-        boost::asio::yield_context yield
-    ) const override
+    doFetchLedgerObjectSeq(ripple::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);
        if (auto const res = executor_.read(yield, schema_->selectObject, key, sequence); res) {
@@ -689,11 +680,8 @@ public:
    }

    std::optional<ripple::uint256>
-    doFetchSuccessorKey(
-        ripple::uint256 key,
-        std::uint32_t const ledgerSequence,
-        boost::asio::yield_context yield
-    ) const override
+    doFetchSuccessorKey(ripple::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) {
@@ -726,9 +714,10 @@ public:
        auto const timeDiff = util::timed([this, yield, &results, &hashes, &statements]() {
            // TODO: seems like a job for "hash IN (list of hashes)" instead?
            std::transform(
-                std::cbegin(hashes), std::cend(hashes), std::back_inserter(statements), [this](auto const& hash) {
-                    return schema_->selectTransaction.bind(hash);
-                }
+                std::cbegin(hashes),
+                std::cend(hashes),
+                std::back_inserter(statements),
+                [this](auto const& hash) { return schema_->selectTransaction.bind(hash); }
            );

            auto const entries = executor_.readEach(yield, statements);
@@ -772,14 +761,18 @@ public:

        // TODO: seems like a job for "key IN (list of keys)" instead?
        std::transform(
-            std::cbegin(keys), std::cend(keys), std::back_inserter(statements), [this, &sequence](auto const& key) {
-                return schema_->selectObject.bind(key, sequence);
-            }
+            std::cbegin(keys),
+            std::cend(keys),
+            std::back_inserter(statements),
+            [this, &sequence](auto const& key) { return schema_->selectObject.bind(key, sequence); }
        );

        auto const entries = executor_.readEach(yield, statements);
        std::transform(
-            std::cbegin(entries), std::cend(entries), std::back_inserter(results), [](auto const& res) -> Blob {
+            std::cbegin(entries),
+            std::cend(entries),
+            std::back_inserter(results),
+            [](auto const& res) -> Blob {
                if (auto const maybeValue = res.template get<Blob>(); maybeValue)
                    return *maybeValue;

@@ -792,12 +785,8 @@ public:
    }

    std::vector<ripple::uint256>
-    fetchAccountRoots(
-        std::uint32_t number,
-        std::uint32_t pageSize,
-        std::uint32_t seq,
-        boost::asio::yield_context yield
-    ) const override
+    fetchAccountRoots(std::uint32_t number, std::uint32_t pageSize, std::uint32_t seq, boost::asio::yield_context yield)
+        const override
    {
        std::vector<ripple::uint256> liveAccounts;
        std::optional<ripple::AccountID> lastItem;
--- a/src/data/DBHelpers.hpp
+++ b/src/data/DBHelpers.hpp
@@ -198,6 +198,39 @@ struct MPTHolderData {
    ripple::AccountID holder;
 };

+/**
+ * @brief Check whether the supplied object is an offer.
+ *
+ * @param object The object to check
+ * @return true if the object is an offer; false otherwise
+ */
+template <typename T>
+inline bool
+isOffer(T const& object)
+{
+    static constexpr short kOFFER_OFFSET = 0x006f;
+    static constexpr short kSHIFT = 8;
+
+    short offerBytes = (object[1] << kSHIFT) | object[2];
+    return offerBytes == kOFFER_OFFSET;
+}
+
+/**
+ * @brief Check whether the supplied hex represents an offer object.
+ *
+ * @param object The object to check
+ * @return true if the object is an offer; false otherwise
+ */
+template <typename T>
+inline bool
+isOfferHex(T const& object)
+{
+    auto blob = ripple::strUnHex(4, object.begin(), object.begin() + 4);
+    if (blob)
+        return isOffer(*blob);
+    return false;
+}
+
 /**
 * @brief Check whether the supplied object is a dir node.
 *
@@ -208,10 +241,6 @@ template <typename T>
 inline bool
 isDirNode(T const& object)
 {
-    static constexpr auto kMIN_SIZE_REQUIRED = 3;
-    if (std::size(object) < kMIN_SIZE_REQUIRED)
-        return false;
-
    static constexpr short kDIR_NODE_SPACE_KEY = 0x0064;
    short const spaceKey = (object.data()[1] << 8) | object.data()[2];
    return spaceKey == kDIR_NODE_SPACE_KEY;
@@ -235,6 +264,23 @@ isBookDir(T const& key, R const& object)
    return !sle[~ripple::sfOwner].has_value();
 }

+/**
+ * @brief Get the book out of an offer object.
+ *
+ * @param offer The offer to get the book for
+ * @return Book as ripple::uint256
+ */
+template <typename T>
+inline ripple::uint256
+getBook(T const& offer)
+{
+    ripple::SerialIter it{offer.data(), offer.size()};
+    ripple::SLE const sle{it, {}};
+    ripple::uint256 book = sle.getFieldH256(ripple::sfBookDirectory);
+
+    return book;
+}
+
 /**
 * @brief Get the book base.
 *
--- a/src/data/README.md
+++ b/src/data/README.md
@@ -6,7 +6,7 @@ To support additional database types, you can create new classes that implement

 ## Data Model

-The data model used by Clio to read and write ledger data is different from what `rippled` uses. `rippled` uses a novel data structure named [_SHAMap_](https://github.com/XRPLF/rippled/blob/develop/src/xrpld/shamap/README.md), which is a combination of a Merkle Tree and a Radix Trie. In a SHAMap, ledger objects are stored in the root vertices of the tree. Thus, looking up a record located at the leaf node of the SHAMap executes a tree search, where the path from the root node to the leaf node is the key of the record.
+The data model used by Clio to read and write ledger data is different from what `rippled` uses. `rippled` uses a novel data structure named [_SHAMap_](https://github.com/ripple/rippled/blob/master/src/ripple/shamap/README.md), which is a combination of a Merkle Tree and a Radix Trie. In a SHAMap, ledger objects are stored in the root vertices of the tree. Thus, looking up a record located at the leaf node of the SHAMap executes a tree search, where the path from the root node to the leaf node is the key of the record.

 `rippled` nodes can also generate a proof-tree by forming a subtree with all the path nodes and their neighbors, which can then be used to prove the existence of the leaf node data to other `rippled` nodes. In short, the main purpose of the SHAMap data structure is to facilitate the fast validation of data integrity between different decentralized `rippled` nodes.

--- a/src/data/cassandra/Handle.hpp
+++ b/src/data/cassandra/Handle.hpp
@@ -99,7 +99,7 @@ public:
    connect() const;

    /**
-     * @brief Connect to the specified keyspace asynchronously.
+     * @brief Connect to the the specified keyspace asynchronously.
     *
     * @param keyspace The keyspace to use
     * @return A future
@@ -137,7 +137,7 @@ public:
    disconnect() const;

    /**
-     * @brief Reconnect to the specified keyspace asynchronously.
+     * @brief Reconnect to the the specified keyspace asynchronously.
     *
     * @param keyspace The keyspace to use
     * @return A future
--- a/src/data/cassandra/Schema.hpp
+++ b/src/data/cassandra/Schema.hpp
--- a/src/data/cassandra/impl/Cluster.cpp
+++ b/src/data/cassandra/impl/Cluster.cpp
@@ -25,7 +25,7 @@
 #include "util/log/Logger.hpp"

 #include <cassandra.h>
-#include <fmt/format.h>
+#include <fmt/core.h>

 #include <stdexcept>
 #include <string>
@@ -45,8 +45,7 @@ Cluster::Cluster(Settings const& settings) : ManagedObject{cass_cluster_new(), k

    cass_cluster_set_token_aware_routing(*this, cass_true);
    if (auto const rc = cass_cluster_set_protocol_version(*this, CASS_PROTOCOL_VERSION_V4); rc != CASS_OK) {
-        throw std::runtime_error(
-            fmt::format("Error setting cassandra protocol version to v4: {}", cass_error_desc(rc))
+        throw std::runtime_error(fmt::format("Error setting cassandra protocol version to v4: {}", cass_error_desc(rc))
        );
    }

--- a/src/data/cassandra/impl/RetryPolicy.hpp
+++ b/src/data/cassandra/impl/RetryPolicy.hpp
@@ -45,13 +45,11 @@ public:
     * @brief Create a new retry policy instance with the io_context provided
     */
    ExponentialBackoffRetryPolicy(boost::asio::io_context& ioc)
-        : retry_(
-              util::makeRetryExponentialBackoff(
-                  std::chrono::milliseconds(1),
-                  std::chrono::seconds(1),
-                  boost::asio::make_strand(ioc)
-              )
-          )
+        : retry_(util::makeRetryExponentialBackoff(
+              std::chrono::milliseconds(1),
+              std::chrono::seconds(1),
+              boost::asio::make_strand(ioc)
+          ))
    {
    }

--- a/src/data/cassandra/impl/Statement.hpp
+++ b/src/data/cassandra/impl/Statement.hpp
@@ -28,7 +28,7 @@
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_io.hpp>
 #include <cassandra.h>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/STAccount.h>
--- a/src/etl/ETLService.cpp
+++ b/src/etl/ETLService.cpp
@@ -171,11 +171,9 @@ ETLService::runETLPipeline(uint32_t startSequence, uint32_t numExtractors)
    auto pipe = DataPipeType{numExtractors, startSequence};

    for (auto i = 0u; i < numExtractors; ++i) {
-        extractors.push_back(
-            std::make_unique<ExtractorType>(
-                pipe, networkValidatedLedgers_, ledgerFetcher_, startSequence + i, finishSequence_, state_
-            )
-        );
+        extractors.push_back(std::make_unique<ExtractorType>(
+            pipe, networkValidatedLedgers_, ledgerFetcher_, startSequence + i, finishSequence_, state_
+        ));
    }

    auto transformer =
--- a/src/etl/LoadBalancer.cpp
+++ b/src/etl/LoadBalancer.cpp
@@ -44,7 +44,7 @@
 #include <boost/json/object.hpp>
 #include <boost/json/value.hpp>
 #include <boost/json/value_to.hpp>
-#include <fmt/format.h>
+#include <fmt/core.h>

 #include <algorithm>
 #include <chrono>
@@ -57,6 +57,7 @@
 #include <string>
 #include <thread>
 #include <utility>
+#include <variant>
 #include <vector>

 using namespace util::config;
@@ -183,14 +184,11 @@ LoadBalancer::LoadBalancer(
            LOG(log_.warn()) << "Failed to fetch ETL state from source = " << source->toString()
                             << " Please check the configuration and network";
        } else if (etlState_ && etlState_->networkID != stateOpt->networkID) {
-            checkOnETLFailure(
-                fmt::format(
-                    "ETL sources must be on the same network. Source network id = {} does not match others network id "
-                    "= {}",
-                    stateOpt->networkID,
-                    etlState_->networkID
-                )
-            );
+            checkOnETLFailure(fmt::format(
+                "ETL sources must be on the same network. Source network id = {} does not match others network id = {}",
+                stateOpt->networkID,
+                etlState_->networkID
+            ));
        } else {
            etlState_ = stateOpt;
        }
@@ -277,46 +275,42 @@ LoadBalancer::forwardToRippled(
        return std::unexpected{rpc::ClioError::RpcCommandIsMissing};

    auto const cmd = boost::json::value_to<std::string>(request.at("command"));
-    if (forwardingCache_) {
-        if (auto cachedResponse = forwardingCache_->get(cmd); cachedResponse) {
-            forwardingCounters_.cacheHit.get() += 1;
-            return std::move(cachedResponse).value();
+
+    if (forwardingCache_ and forwardingCache_->shouldCache(cmd)) {
+        bool servedFromCache = true;
+        auto updater =
+            [this, &request, &clientIp, &servedFromCache, isAdmin](boost::asio::yield_context yield
+            ) -> std::expected<util::ResponseExpirationCache::EntryData, util::ResponseExpirationCache::Error> {
+            servedFromCache = false;
+            auto result = forwardToRippledImpl(request, clientIp, isAdmin, yield);
+            if (result.has_value()) {
+                return util::ResponseExpirationCache::EntryData{
+                    .lastUpdated = std::chrono::steady_clock::now(), .response = std::move(result).value()
+                };
+            }
+            return std::unexpected{
+                util::ResponseExpirationCache::Error{.status = rpc::Status{result.error()}, .warnings = {}}
+            };
+        };
+
+        auto result = forwardingCache_->getOrUpdate(
+            yield,
+            cmd,
+            std::move(updater),
+            [](util::ResponseExpirationCache::EntryData const& entry) { return not entry.response.contains("error"); }
+        );
+        if (servedFromCache) {
+            ++forwardingCounters_.cacheHit.get();
        }
-    }
-    forwardingCounters_.cacheMiss.get() += 1;
-
-    ASSERT(not sources_.empty(), "ETL sources must be configured to forward requests.");
-    std::size_t sourceIdx = randomGenerator_->uniform(0ul, sources_.size() - 1);
-
-    auto numAttempts = 0u;
-
-    auto xUserValue = isAdmin ? kADMIN_FORWARDING_X_USER_VALUE : kUSER_FORWARDING_X_USER_VALUE;
-
-    std::optional<boost::json::object> response;
-    rpc::ClioError error = rpc::ClioError::EtlConnectionError;
-    while (numAttempts < sources_.size()) {
-        auto [res, duration] =
-            util::timed([&]() { return sources_[sourceIdx]->forwardToRippled(request, clientIp, xUserValue, yield); });
-        if (res) {
-            forwardingCounters_.successDuration.get() += duration;
-            response = std::move(res).value();
-            break;
+        if (result.has_value()) {
+            return std::move(result).value();
        }
-        forwardingCounters_.failDuration.get() += duration;
-        ++forwardingCounters_.retries.get();
-        error = std::max(error, res.error());  // Choose the best result between all sources
-
-        sourceIdx = (sourceIdx + 1) % sources_.size();
-        ++numAttempts;
+        auto const combinedError = result.error().status.code;
+        ASSERT(std::holds_alternative<rpc::ClioError>(combinedError), "There could be only ClioError here");
+        return std::unexpected{std::get<rpc::ClioError>(combinedError)};
    }

-    if (response) {
-        if (forwardingCache_ and not response->contains("error"))
-            forwardingCache_->put(cmd, *response);
-        return std::move(response).value();
-    }
-
-    return std::unexpected{error};
+    return forwardToRippledImpl(request, clientIp, isAdmin, yield);
 }

 boost::json::value
@@ -407,4 +401,47 @@ LoadBalancer::chooseForwardingSource()
    }
 }

+std::expected<boost::json::object, rpc::CombinedError>
+LoadBalancer::forwardToRippledImpl(
+    boost::json::object const& request,
+    std::optional<std::string> const& clientIp,
+    bool const isAdmin,
+    boost::asio::yield_context yield
+)
+{
+    ++forwardingCounters_.cacheMiss.get();
+
+    ASSERT(not sources_.empty(), "ETL sources must be configured to forward requests.");
+    std::size_t sourceIdx = randomGenerator_->uniform(0ul, sources_.size() - 1);
+
+    auto numAttempts = 0u;
+
+    auto xUserValue = isAdmin ? kADMIN_FORWARDING_X_USER_VALUE : kUSER_FORWARDING_X_USER_VALUE;
+
+    std::optional<boost::json::object> response;
+    rpc::ClioError error = rpc::ClioError::EtlConnectionError;
+    while (numAttempts < sources_.size()) {
+        auto [res, duration] =
+            util::timed([&]() { return sources_[sourceIdx]->forwardToRippled(request, clientIp, xUserValue, yield); });
+
+        if (res) {
+            forwardingCounters_.successDuration.get() += duration;
+            response = std::move(res).value();
+            break;
+        }
+        forwardingCounters_.failDuration.get() += duration;
+        ++forwardingCounters_.retries.get();
+        error = std::max(error, res.error());  // Choose the best result between all sources
+
+        sourceIdx = (sourceIdx + 1) % sources_.size();
+        ++numAttempts;
+    }
+
+    if (response.has_value()) {
+        return std::move(response).value();
+    }
+
+    return std::unexpected{error};
+}
+
 }  // namespace etl
--- a/src/etl/LoadBalancer.hpp
+++ b/src/etl/LoadBalancer.hpp
@@ -49,7 +49,6 @@
 #include <concepts>
 #include <cstdint>
 #include <expected>
-#include <functional>
 #include <memory>
 #include <optional>
 #include <string>
@@ -173,10 +172,8 @@ public:
     * @return A std::vector<std::string> The ledger data
     */
    std::vector<std::string>
-    loadInitialLedger(
-        uint32_t sequence,
-        std::chrono::steady_clock::duration retryAfter = std::chrono::seconds{2}
-    ) override;
+    loadInitialLedger(uint32_t sequence, std::chrono::steady_clock::duration retryAfter = std::chrono::seconds{2})
+        override;

    /**
     * @brief Load the initial ledger, writing data to the queue.
@@ -282,6 +279,14 @@ private:
     */
    void
    chooseForwardingSource();
+
+    std::expected<boost::json::object, rpc::CombinedError>
+    forwardToRippledImpl(
+        boost::json::object const& request,
+        std::optional<std::string> const& clientIp,
+        bool isAdmin,
+        boost::asio::yield_context yield
+    );
 };

 }  // namespace etl
--- a/src/etl/NFTHelpers.cpp
+++ b/src/etl/NFTHelpers.cpp
@@ -18,9 +18,8 @@
 //==============================================================================

 #include "data/DBHelpers.hpp"
-#include "util/Assert.hpp"

-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/basics/strHex.h>
 #include <xrpl/protocol/AccountID.h>
@@ -139,8 +138,7 @@ getNFTokenMintData(ripple::TxMeta const& txMeta, ripple::STTx const& sttx)
    // There should always be a difference so the returned finalIDs
    // iterator should never be end().  But better safe than sorry.
    if (finalIDs.size() != prevIDs.size() + 1 || diff.first == finalIDs.end() || !owner) {
-        throw std::runtime_error(
-            fmt::format(" - unexpected NFTokenMint data in tx {}", strHex(sttx.getTransactionID()))
+        throw std::runtime_error(fmt::format(" - unexpected NFTokenMint data in tx {}", strHex(sttx.getTransactionID()))
        );
    }

@@ -360,18 +358,14 @@ getNFTDataFromTx(ripple::TxMeta const& txMeta, ripple::STTx const& sttx)
 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");
-
-    auto const sle =
+    std::vector<NFTsData> nfts;
+    ripple::STLedgerEntry const sle =
        ripple::STLedgerEntry(ripple::SerialIter{blob.data(), blob.size()}, ripple::uint256::fromVoid(key.data()));

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

    auto const owner = ripple::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));

--- a/src/etl/impl/Extractor.hpp
+++ b/src/etl/impl/Extractor.hpp
@@ -94,8 +94,8 @@ private:
        double totalTime = 0.0;
        auto currentSequence = startSequence_;

-        while (!shouldFinish(currentSequence) &&
-               networkValidatedLedgers_->waitUntilValidatedByNetwork(currentSequence)) {
+        while (!shouldFinish(currentSequence) && networkValidatedLedgers_->waitUntilValidatedByNetwork(currentSequence)
+        ) {
            auto [fetchResponse, time] = ::util::timed<std::chrono::duration<double>>([this, currentSequence]() {
                return ledgerFetcher_.get().fetchDataAndDiff(currentSequence);
            });
--- a/src/etl/impl/ForwardingSource.cpp
+++ b/src/etl/impl/ForwardingSource.cpp
@@ -28,7 +28,7 @@
 #include <boost/json/object.hpp>
 #include <boost/json/parse.hpp>
 #include <boost/json/serialize.hpp>
-#include <fmt/format.h>
+#include <fmt/core.h>

 #include <chrono>
 #include <exception>
--- a/src/etl/impl/GrpcSource.cpp
+++ b/src/etl/impl/GrpcSource.cpp
@@ -26,7 +26,7 @@

 #include <boost/asio/io_context.hpp>
 #include <boost/asio/ip/tcp.hpp>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/support/channel_arguments.h>
--- a/src/etl/impl/LedgerLoader.hpp
+++ b/src/etl/impl/LedgerLoader.hpp
@@ -209,49 +209,47 @@ public:
            size_t numWrites = 0;
            backend_->cache().setFull();

-            auto seconds =
-                ::util::timed<std::chrono::seconds>([this, keys = std::move(edgeKeys), sequence, &numWrites]() mutable {
-                    for (auto& key : keys) {
-                        LOG(log_.debug()) << "Writing edge key = " << ripple::strHex(key);
-                        auto succ = backend_->cache().getSuccessor(*ripple::uint256::fromVoidChecked(key), sequence);
-                        if (succ)
-                            backend_->writeSuccessor(std::move(key), sequence, uint256ToString(succ->key));
-                    }
+            auto seconds = ::util::timed<std::chrono::seconds>([this, keys = std::move(edgeKeys), sequence, &numWrites](
+                                                               ) mutable {
+                for (auto& key : keys) {
+                    LOG(log_.debug()) << "Writing edge key = " << ripple::strHex(key);
+                    auto succ = backend_->cache().getSuccessor(*ripple::uint256::fromVoidChecked(key), sequence);
+                    if (succ)
+                        backend_->writeSuccessor(std::move(key), sequence, uint256ToString(succ->key));
+                }

-                    ripple::uint256 prev = data::kFIRST_KEY;
-                    while (auto cur = backend_->cache().getSuccessor(prev, sequence)) {
-                        ASSERT(cur.has_value(), "Successor for key {} must exist", ripple::strHex(prev));
-                        if (prev == data::kFIRST_KEY)
-                            backend_->writeSuccessor(uint256ToString(prev), sequence, uint256ToString(cur->key));
+                ripple::uint256 prev = data::kFIRST_KEY;
+                while (auto cur = backend_->cache().getSuccessor(prev, sequence)) {
+                    ASSERT(cur.has_value(), "Successor for key {} must exist", ripple::strHex(prev));
+                    if (prev == data::kFIRST_KEY)
+                        backend_->writeSuccessor(uint256ToString(prev), sequence, uint256ToString(cur->key));

-                        if (isBookDir(cur->key, cur->blob)) {
-                            auto base = getBookBase(cur->key);
-                            // make sure the base is not an actual object
-                            if (!backend_->cache().get(base, sequence)) {
-                                auto succ = backend_->cache().getSuccessor(base, sequence);
-                                ASSERT(succ.has_value(), "Book base {} must have a successor", ripple::strHex(base));
-                                if (succ->key == cur->key) {
-                                    LOG(log_.debug()) << "Writing book successor = " << ripple::strHex(base) << " - "
-                                                      << ripple::strHex(cur->key);
+                    if (isBookDir(cur->key, cur->blob)) {
+                        auto base = getBookBase(cur->key);
+                        // make sure the base is not an actual object
+                        if (!backend_->cache().get(base, sequence)) {
+                            auto succ = backend_->cache().getSuccessor(base, sequence);
+                            ASSERT(succ.has_value(), "Book base {} must have a successor", ripple::strHex(base));
+                            if (succ->key == cur->key) {
+                                LOG(log_.debug()) << "Writing book successor = " << ripple::strHex(base) << " - "
+                                                  << ripple::strHex(cur->key);

-                                    backend_->writeSuccessor(
-                                        uint256ToString(base), sequence, uint256ToString(cur->key)
-                                    );
-                                }
+                                backend_->writeSuccessor(uint256ToString(base), sequence, uint256ToString(cur->key));
                            }
-
-                            ++numWrites;
                        }

-                        prev = cur->key;
-                        static constexpr std::size_t kLOG_STRIDE = 100000;
-                        if (numWrites % kLOG_STRIDE == 0 && numWrites != 0)
-                            LOG(log_.info()) << "Wrote " << numWrites << " book successors";
+                        ++numWrites;
                    }

-                    backend_->writeSuccessor(uint256ToString(prev), sequence, uint256ToString(data::kLAST_KEY));
-                    ++numWrites;
-                });
+                    prev = cur->key;
+                    static constexpr std::size_t kLOG_STRIDE = 100000;
+                    if (numWrites % kLOG_STRIDE == 0 && numWrites != 0)
+                        LOG(log_.info()) << "Wrote " << numWrites << " book successors";
+                }
+
+                backend_->writeSuccessor(uint256ToString(prev), sequence, uint256ToString(data::kLAST_KEY));
+                ++numWrites;
+            });

            LOG(log_.info()) << "Looping through cache and submitting all writes took " << seconds
                             << " seconds. numWrites = " << std::to_string(numWrites);
--- a/src/etl/impl/LedgerPublisher.hpp
+++ b/src/etl/impl/LedgerPublisher.hpp
@@ -249,9 +249,8 @@ public:
    std::chrono::time_point<std::chrono::system_clock>
    getLastPublish() const override
    {
-        return std::chrono::time_point<std::chrono::system_clock>{
-            std::chrono::seconds{lastPublishSeconds_.get().value()}
-        };
+        return std::chrono::time_point<std::chrono::system_clock>{std::chrono::seconds{lastPublishSeconds_.get().value()
+        }};
    }

    /**
--- a/src/etl/impl/SubscriptionSource.cpp
+++ b/src/etl/impl/SubscriptionSource.cpp
@@ -40,7 +40,7 @@
 #include <boost/json/parse.hpp>
 #include <boost/json/serialize.hpp>
 #include <boost/json/value_to.hpp>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <xrpl/protocol/jss.h>

 #include <algorithm>
@@ -79,13 +79,11 @@ SubscriptionSource::SubscriptionSource(
    , onConnect_(std::move(onConnect))
    , onDisconnect_(std::move(onDisconnect))
    , onLedgerClosed_(std::move(onLedgerClosed))
-    , lastMessageTimeSecondsSinceEpoch_(
-          PrometheusService::gaugeInt(
-              "subscription_source_last_message_time",
-              util::prometheus::Labels({{"source", fmt::format("{}:{}", ip, wsPort)}}),
-              "Seconds since epoch of the last message received from rippled subscription streams"
-          )
-      )
+    , lastMessageTimeSecondsSinceEpoch_(PrometheusService::gaugeInt(
+          "subscription_source_last_message_time",
+          util::prometheus::Labels({{"source", fmt::format("{}:{}", ip, wsPort)}}),
+          "Seconds since epoch of the last message received from rippled subscription streams"
+      ))
 {
    wsConnectionBuilder_.addHeader({boost::beast::http::field::user_agent, "clio-client"})
        .addHeader({"X-User", "clio-client"})
@@ -331,13 +329,9 @@ SubscriptionSource::setValidatedRange(std::string range)
            pairs.emplace_back(sequence, sequence);
        } else {
            if (minAndMax.size() != 2) {
-                throw std::runtime_error(
-                    fmt::format(
-                        "Error parsing range: {}.Min and max should be of size 2. Got size = {}",
-                        range,
-                        minAndMax.size()
-                    )
-                );
+                throw std::runtime_error(fmt::format(
+                    "Error parsing range: {}.Min and max should be of size 2. Got size = {}", range, minAndMax.size()
+                ));
            }
            uint32_t const min = std::stoll(minAndMax[0]);
            uint32_t const max = std::stoll(minAndMax[1]);
--- a/src/etl/impl/SubscriptionSource.hpp
+++ b/src/etl/impl/SubscriptionSource.hpp
@@ -34,7 +34,7 @@
 #include <boost/asio/spawn.hpp>
 #include <boost/asio/strand.hpp>
 #include <boost/beast/http/field.hpp>
-#include <fmt/format.h>
+#include <fmt/core.h>

 #include <atomic>
 #include <chrono>
--- a/src/etlng/ETLService.cpp
+++ b/src/etlng/ETLService.cpp
@@ -56,6 +56,7 @@

 #include <boost/json/object.hpp>
 #include <boost/signals2/connection.hpp>
+#include <fmt/core.h>
 #include <xrpl/protocol/LedgerHeader.h>

 #include <chrono>
--- a/src/etlng/ETLService.hpp
+++ b/src/etlng/ETLService.hpp
@@ -58,7 +58,7 @@
 #include <boost/asio/io_context.hpp>
 #include <boost/json/object.hpp>
 #include <boost/signals2/connection.hpp>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <xrpl/basics/Blob.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/basics/strHex.h>
--- a/src/etlng/LoadBalancer.cpp
+++ b/src/etlng/LoadBalancer.cpp
@@ -45,7 +45,7 @@
 #include <boost/json/object.hpp>
 #include <boost/json/value.hpp>
 #include <boost/json/value_to.hpp>
-#include <fmt/format.h>
+#include <fmt/core.h>

 #include <algorithm>
 #include <chrono>
@@ -58,6 +58,7 @@
 #include <string>
 #include <thread>
 #include <utility>
+#include <variant>
 #include <vector>

 using namespace util::config;
@@ -183,14 +184,11 @@ LoadBalancer::LoadBalancer(
            LOG(log_.warn()) << "Failed to fetch ETL state from source = " << source->toString()
                             << " Please check the configuration and network";
        } else if (etlState_ && etlState_->networkID != stateOpt->networkID) {
-            checkOnETLFailure(
-                fmt::format(
-                    "ETL sources must be on the same network. Source network id = {} does not match others network id "
-                    "= {}",
-                    stateOpt->networkID,
-                    etlState_->networkID
-                )
-            );
+            checkOnETLFailure(fmt::format(
+                "ETL sources must be on the same network. Source network id = {} does not match others network id = {}",
+                stateOpt->networkID,
+                etlState_->networkID
+            ));
        } else {
            etlState_ = stateOpt;
        }
@@ -283,46 +281,42 @@ LoadBalancer::forwardToRippled(
        return std::unexpected{rpc::ClioError::RpcCommandIsMissing};

    auto const cmd = boost::json::value_to<std::string>(request.at("command"));
-    if (forwardingCache_) {
-        if (auto cachedResponse = forwardingCache_->get(cmd); cachedResponse) {
-            forwardingCounters_.cacheHit.get() += 1;
-            return std::move(cachedResponse).value();
+
+    if (forwardingCache_ and forwardingCache_->shouldCache(cmd)) {
+        bool servedFromCache = true;
+        auto updater =
+            [this, &request, &clientIp, &servedFromCache, isAdmin](boost::asio::yield_context yield
+            ) -> std::expected<util::ResponseExpirationCache::EntryData, util::ResponseExpirationCache::Error> {
+            servedFromCache = false;
+            auto result = forwardToRippledImpl(request, clientIp, isAdmin, yield);
+            if (result.has_value()) {
+                return util::ResponseExpirationCache::EntryData{
+                    .lastUpdated = std::chrono::steady_clock::now(), .response = std::move(result).value()
+                };
+            }
+            return std::unexpected{
+                util::ResponseExpirationCache::Error{.status = rpc::Status{result.error()}, .warnings = {}}
+            };
+        };
+
+        auto result = forwardingCache_->getOrUpdate(
+            yield,
+            cmd,
+            std::move(updater),
+            [](util::ResponseExpirationCache::EntryData const& entry) { return not entry.response.contains("error"); }
+        );
+        if (servedFromCache) {
+            ++forwardingCounters_.cacheHit.get();
        }
-    }
-    forwardingCounters_.cacheMiss.get() += 1;
-
-    ASSERT(not sources_.empty(), "ETL sources must be configured to forward requests.");
-    std::size_t sourceIdx = randomGenerator_->uniform(0ul, sources_.size() - 1);
-
-    auto numAttempts = 0u;
-
-    auto xUserValue = isAdmin ? kADMIN_FORWARDING_X_USER_VALUE : kUSER_FORWARDING_X_USER_VALUE;
-
-    std::optional<boost::json::object> response;
-    rpc::ClioError error = rpc::ClioError::EtlConnectionError;
-    while (numAttempts < sources_.size()) {
-        auto [res, duration] =
-            util::timed([&]() { return sources_[sourceIdx]->forwardToRippled(request, clientIp, xUserValue, yield); });
-        if (res) {
-            forwardingCounters_.successDuration.get() += duration;
-            response = std::move(res).value();
-            break;
+        if (result.has_value()) {
+            return std::move(result).value();
        }
-        forwardingCounters_.failDuration.get() += duration;
-        ++forwardingCounters_.retries.get();
-        error = std::max(error, res.error());  // Choose the best result between all sources
-
-        sourceIdx = (sourceIdx + 1) % sources_.size();
-        ++numAttempts;
+        auto const combinedError = result.error().status.code;
+        ASSERT(std::holds_alternative<rpc::ClioError>(combinedError), "There could be only ClioError here");
+        return std::unexpected{std::get<rpc::ClioError>(combinedError)};
    }

-    if (response) {
-        if (forwardingCache_ and not response->contains("error"))
-            forwardingCache_->put(cmd, *response);
-        return std::move(response).value();
-    }
-
-    return std::unexpected{error};
+    return forwardToRippledImpl(request, clientIp, isAdmin, yield);
 }

 boost::json::value
@@ -413,4 +407,47 @@ LoadBalancer::chooseForwardingSource()
    }
 }

+std::expected<boost::json::object, rpc::CombinedError>
+LoadBalancer::forwardToRippledImpl(
+    boost::json::object const& request,
+    std::optional<std::string> const& clientIp,
+    bool isAdmin,
+    boost::asio::yield_context yield
+)
+{
+    ++forwardingCounters_.cacheMiss.get();
+
+    ASSERT(not sources_.empty(), "ETL sources must be configured to forward requests.");
+    std::size_t sourceIdx = randomGenerator_->uniform(0ul, sources_.size() - 1);
+
+    auto numAttempts = 0u;
+
+    auto xUserValue = isAdmin ? kADMIN_FORWARDING_X_USER_VALUE : kUSER_FORWARDING_X_USER_VALUE;
+
+    std::optional<boost::json::object> response;
+    rpc::ClioError error = rpc::ClioError::EtlConnectionError;
+    while (numAttempts < sources_.size()) {
+        auto [res, duration] =
+            util::timed([&]() { return sources_[sourceIdx]->forwardToRippled(request, clientIp, xUserValue, yield); });
+
+        if (res) {
+            forwardingCounters_.successDuration.get() += duration;
+            response = std::move(res).value();
+            break;
+        }
+        forwardingCounters_.failDuration.get() += duration;
+        ++forwardingCounters_.retries.get();
+        error = std::max(error, res.error());  // Choose the best result between all sources
+
+        sourceIdx = (sourceIdx + 1) % sources_.size();
+        ++numAttempts;
+    }
+
+    if (response.has_value()) {
+        return std::move(response).value();
+    }
+
+    return std::unexpected{error};
+}
+
 }  // namespace etlng
--- a/src/etlng/LoadBalancer.hpp
+++ b/src/etlng/LoadBalancer.hpp
@@ -282,6 +282,14 @@ private:
     */
    void
    chooseForwardingSource();
+
+    std::expected<boost::json::object, rpc::CombinedError>
+    forwardToRippledImpl(
+        boost::json::object const& request,
+        std::optional<std::string> const& clientIp,
+        bool isAdmin,
+        boost::asio::yield_context yield
+    );
 };

 }  // namespace etlng
--- a/src/etlng/Models.hpp
+++ b/src/etlng/Models.hpp
@@ -22,7 +22,7 @@
 #include "util/Concepts.hpp"

 #include <boost/json/object.hpp>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <xrpl/basics/Blob.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/proto/org/xrpl/rpc/v1/get_ledger.pb.h>
--- a/src/etlng/impl/ForwardingSource.cpp
+++ b/src/etlng/impl/ForwardingSource.cpp
@@ -28,7 +28,7 @@
 #include <boost/json/object.hpp>
 #include <boost/json/parse.hpp>
 #include <boost/json/serialize.hpp>
-#include <fmt/format.h>
+#include <fmt/core.h>

 #include <chrono>
 #include <exception>
--- a/src/etlng/impl/GrpcSource.cpp
+++ b/src/etlng/impl/GrpcSource.cpp
@@ -27,7 +27,7 @@
 #include "web/Resolver.hpp"

 #include <boost/asio/spawn.hpp>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/support/channel_arguments.h>
--- a/src/etlng/impl/LedgerPublisher.hpp
+++ b/src/etlng/impl/LedgerPublisher.hpp
@@ -34,7 +34,7 @@
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/post.hpp>
 #include <boost/asio/strand.hpp>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <xrpl/basics/chrono.h>
 #include <xrpl/protocol/Fees.h>
 #include <xrpl/protocol/LedgerHeader.h>
@@ -227,9 +227,8 @@ public:
    std::chrono::time_point<std::chrono::system_clock>
    getLastPublish() const override
    {
-        return std::chrono::time_point<std::chrono::system_clock>{
-            std::chrono::seconds{lastPublishSeconds_.get().value()}
-        };
+        return std::chrono::time_point<std::chrono::system_clock>{std::chrono::seconds{lastPublishSeconds_.get().value()
+        }};
    }

    /**
--- a/src/feed/SubscriptionManager.hpp
+++ b/src/feed/SubscriptionManager.hpp
@@ -159,10 +159,8 @@ public:
     * @param transactions The transactions in the current ledger.
     */
    void
-    pubBookChanges(
-        ripple::LedgerHeader const& lgrInfo,
-        std::vector<data::TransactionAndMetadata> const& transactions
-    ) final;
+    pubBookChanges(ripple::LedgerHeader const& lgrInfo, std::vector<data::TransactionAndMetadata> const& transactions)
+        final;

    /**
     * @brief Subscribe to the proposed transactions feed.
--- a/src/feed/impl/ProposedTransactionFeed.cpp
+++ b/src/feed/impl/ProposedTransactionFeed.cpp
@@ -57,7 +57,9 @@ ProposedTransactionFeed::sub(ripple::AccountID const& account, SubscriberSharedP
 {
    auto const weakPtr = std::weak_ptr(subscriber);
    auto const added = accountSignal_.connectTrackableSlot(
-        subscriber, account, [this, weakPtr](std::shared_ptr<std::string> const& msg) {
+        subscriber,
+        account,
+        [this, weakPtr](std::shared_ptr<std::string> const& msg) {
            if (auto connectionPtr = weakPtr.lock()) {
                // Check if this connection already sent
                if (notified_.contains(connectionPtr.get()))
--- a/src/feed/impl/ProposedTransactionFeed.hpp
+++ b/src/feed/impl/ProposedTransactionFeed.hpp
@@ -31,7 +31,7 @@
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/strand.hpp>
 #include <boost/json/object.hpp>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Book.h>
 #include <xrpl/protocol/LedgerHeader.h>
--- a/src/feed/impl/TransactionFeed.cpp
+++ b/src/feed/impl/TransactionFeed.cpp
@@ -280,7 +280,7 @@ TransactionFeed::pub(
                        data->getFieldAmount(ripple::sfTakerPays).issue(),
                        (*data)[~ripple::sfDomainID]
                    };
-                    if (!affectedBooks.contains(book)) {
+                    if (affectedBooks.find(book) == affectedBooks.end()) {
                        affectedBooks.insert(book);
                    }
                }
--- a/src/feed/impl/TransactionFeed.hpp
+++ b/src/feed/impl/TransactionFeed.hpp
@@ -33,7 +33,7 @@

 #include <boost/asio/io_context.hpp>
 #include <boost/asio/strand.hpp>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Book.h>
 #include <xrpl/protocol/LedgerHeader.h>
--- a/src/feed/impl/Util.hpp
+++ b/src/feed/impl/Util.hpp
@@ -23,7 +23,7 @@
 #include "util/prometheus/Label.hpp"
 #include "util/prometheus/Prometheus.hpp"

-#include <fmt/format.h>
+#include <fmt/core.h>

 #include <string>

--- a/src/migration/MigrationManagerInterface.hpp
+++ b/src/migration/MigrationManagerInterface.hpp
@@ -32,7 +32,7 @@ namespace migration {
 */
 struct MigrationManagerInterface : virtual public MigrationInspectorInterface {
    /**
-     * @brief Run the migration according to the given migrator's name
+     * @brief Run the the migration according to the given migrator's name
     */
    virtual void
    runMigration(std::string const&) = 0;
--- a/src/migration/README.md
+++ b/src/migration/README.md
@@ -60,6 +60,7 @@ Most indexes are based on either ledger states or transactions. We provide the `
 If you need to do full scan against other table, you can follow below steps:

 - Describe the table which needs full scan in a struct. It has to satisfy the `TableSpec`(cassandra/Spec.hpp) concept, containing static member:
+
  - Tuple type `Row`, it's the type of each field in a row. The order of types should match what database will return in a row. Key types should come first, followed by other field types sorted in alphabetical order.
  - `kPARTITION_KEY`, it's the name of the partition key of the table.
  - `kTABLE_NAME`
--- a/src/migration/cassandra/impl/CassandraMigrationSchema.hpp
+++ b/src/migration/cassandra/impl/CassandraMigrationSchema.hpp
@@ -24,7 +24,7 @@
 #include "data/cassandra/SettingsProvider.hpp"
 #include "data/cassandra/Types.hpp"

-#include <fmt/format.h>
+#include <fmt/core.h>

 #include <functional>
 #include <string>
@@ -63,18 +63,16 @@ public:
        std::string const& key
    )
    {
-        return handler.prepare(
-            fmt::format(
-                R"(
+        return handler.prepare(fmt::format(
+            R"(
            SELECT *
              FROM {}
             WHERE TOKEN({}) >= ? AND TOKEN({}) <= ?
            )",
-                data::cassandra::qualifiedTableName<SettingsProviderType>(settingsProvider_.get(), tableName),
-                key,
-                key
-            )
-        );
+            data::cassandra::qualifiedTableName<SettingsProviderType>(settingsProvider_.get(), tableName),
+            key,
+            key
+        ));
    }

    /**
@@ -86,16 +84,14 @@ public:
    data::cassandra::PreparedStatement const&
    getPreparedInsertMigratedMigrator(data::cassandra::Handle const& handler)
    {
-        static auto kPREPARED = handler.prepare(
-            fmt::format(
-                R"(
+        static auto kPREPARED = handler.prepare(fmt::format(
+            R"(
            INSERT INTO {}
                   (migrator_name, status)
            VALUES (?, ?)
            )",
-                data::cassandra::qualifiedTableName<SettingsProviderType>(settingsProvider_.get(), "migrator_status")
-            )
-        );
+            data::cassandra::qualifiedTableName<SettingsProviderType>(settingsProvider_.get(), "migrator_status")
+        ));
        return kPREPARED;
    }
 };
--- a/src/migration/impl/MigrationManagerBase.hpp
+++ b/src/migration/impl/MigrationManagerBase.hpp
@@ -56,7 +56,7 @@ public:
    }

    /**
-     * @brief Run the migration according to the given migrator's name
+     * @brief Run the the migration according to the given migrator's name
     *
     * @param name The name of the migrator
     */
--- a/src/rpc/CMakeLists.txt
+++ b/src/rpc/CMakeLists.txt
@@ -2,7 +2,6 @@
 add_library(clio_rpc_center)
 target_sources(clio_rpc_center PRIVATE RPCCenter.cpp)
 target_include_directories(clio_rpc_center PUBLIC "${CMAKE_SOURCE_DIR}/src")
-target_link_libraries(clio_rpc_center PUBLIC clio_options)

 add_library(clio_rpc)

@@ -52,7 +51,6 @@ target_sources(
          handlers/Subscribe.cpp
          handlers/TransactionEntry.cpp
          handlers/Unsubscribe.cpp
-          handlers/VaultInfo.cpp
 )

 target_link_libraries(clio_rpc PRIVATE clio_util)
--- a/src/rpc/Counters.cpp
+++ b/src/rpc/Counters.cpp
@@ -25,7 +25,7 @@
 #include "util/prometheus/Prometheus.hpp"

 #include <boost/json/object.hpp>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <xrpl/protocol/jss.h>

 #include <chrono>
@@ -40,55 +40,41 @@ using util::prometheus::Label;
 using util::prometheus::Labels;

 Counters::MethodInfo::MethodInfo(std::string const& method)
-    : started(
-          PrometheusService::counterInt(
-              "rpc_method_total_number",
-              Labels{{{"status", "started"}, {"method", method}}},
-              fmt::format("Total number of started calls to the method {}", method)
-          )
-      )
-    , finished(
-          PrometheusService::counterInt(
-              "rpc_method_total_number",
-              Labels{{{"status", "finished"}, {"method", method}}},
-              fmt::format("Total number of finished calls to the method {}", method)
-          )
-      )
-    , failed(
-          PrometheusService::counterInt(
-              "rpc_method_total_number",
-              Labels{{{"status", "failed"}, {"method", method}}},
-              fmt::format("Total number of failed calls to the method {}", method)
-          )
-      )
-    , errored(
-          PrometheusService::counterInt(
-              "rpc_method_total_number",
-              Labels{{{"status", "errored"}, {"method", method}}},
-              fmt::format("Total number of errored calls to the method {}", method)
-          )
-      )
-    , forwarded(
-          PrometheusService::counterInt(
-              "rpc_method_total_number",
-              Labels{{{"status", "forwarded"}, {"method", method}}},
-              fmt::format("Total number of forwarded calls to the method {}", method)
-          )
-      )
-    , failedForward(
-          PrometheusService::counterInt(
-              "rpc_method_total_number",
-              Labels{{{"status", "failed_forward"}, {"method", method}}},
-              fmt::format("Total number of failed forwarded calls to the method {}", method)
-          )
-      )
-    , duration(
-          PrometheusService::counterInt(
-              "rpc_method_duration_us",
-              Labels({util::prometheus::Label{"method", method}}),
-              fmt::format("Total duration of calls to the method {}", method)
-          )
-      )
+    : started(PrometheusService::counterInt(
+          "rpc_method_total_number",
+          Labels{{{"status", "started"}, {"method", method}}},
+          fmt::format("Total number of started calls to the method {}", method)
+      ))
+    , finished(PrometheusService::counterInt(
+          "rpc_method_total_number",
+          Labels{{{"status", "finished"}, {"method", method}}},
+          fmt::format("Total number of finished calls to the method {}", method)
+      ))
+    , failed(PrometheusService::counterInt(
+          "rpc_method_total_number",
+          Labels{{{"status", "failed"}, {"method", method}}},
+          fmt::format("Total number of failed calls to the method {}", method)
+      ))
+    , errored(PrometheusService::counterInt(
+          "rpc_method_total_number",
+          Labels{{{"status", "errored"}, {"method", method}}},
+          fmt::format("Total number of errored calls to the method {}", method)
+      ))
+    , forwarded(PrometheusService::counterInt(
+          "rpc_method_total_number",
+          Labels{{{"status", "forwarded"}, {"method", method}}},
+          fmt::format("Total number of forwarded calls to the method {}", method)
+      ))
+    , failedForward(PrometheusService::counterInt(
+          "rpc_method_total_number",
+          Labels{{{"status", "failed_forward"}, {"method", method}}},
+          fmt::format("Total number of failed forwarded calls to the method {}", method)
+      ))
+    , duration(PrometheusService::counterInt(
+          "rpc_method_duration_us",
+          Labels({util::prometheus::Label{"method", method}}),
+          fmt::format("Total duration of calls to the method {}", method)
+      ))
 {
 }

@@ -103,41 +89,31 @@ Counters::getMethodInfo(std::string const& method)
 }

 Counters::Counters(WorkQueue const& wq)
-    : tooBusyCounter_(
-          PrometheusService::counterInt(
-              "rpc_error_total_number",
-              Labels({Label{"error_type", "too_busy"}}),
-              "Total number of too busy errors"
-          )
-      )
-    , notReadyCounter_(
-          PrometheusService::counterInt(
-              "rpc_error_total_number",
-              Labels({Label{"error_type", "not_ready"}}),
-              "Total number of not ready replyes"
-          )
-      )
-    , badSyntaxCounter_(
-          PrometheusService::counterInt(
-              "rpc_error_total_number",
-              Labels({Label{"error_type", "bad_syntax"}}),
-              "Total number of bad syntax replyes"
-          )
-      )
-    , unknownCommandCounter_(
-          PrometheusService::counterInt(
-              "rpc_error_total_number",
-              Labels({Label{"error_type", "unknown_command"}}),
-              "Total number of unknown command replyes"
-          )
-      )
-    , internalErrorCounter_(
-          PrometheusService::counterInt(
-              "rpc_error_total_number",
-              Labels({Label{"error_type", "internal_error"}}),
-              "Total number of internal errors"
-          )
-      )
+    : tooBusyCounter_(PrometheusService::counterInt(
+          "rpc_error_total_number",
+          Labels({Label{"error_type", "too_busy"}}),
+          "Total number of too busy errors"
+      ))
+    , notReadyCounter_(PrometheusService::counterInt(
+          "rpc_error_total_number",
+          Labels({Label{"error_type", "not_ready"}}),
+          "Total number of not ready replyes"
+      ))
+    , badSyntaxCounter_(PrometheusService::counterInt(
+          "rpc_error_total_number",
+          Labels({Label{"error_type", "bad_syntax"}}),
+          "Total number of bad syntax replyes"
+      ))
+    , unknownCommandCounter_(PrometheusService::counterInt(
+          "rpc_error_total_number",
+          Labels({Label{"error_type", "unknown_command"}}),
+          "Total number of unknown command replyes"
+      ))
+    , internalErrorCounter_(PrometheusService::counterInt(
+          "rpc_error_total_number",
+          Labels({Label{"error_type", "internal_error"}}),
+          "Total number of internal errors"
+      ))
    , workQueue_(std::cref(wq))
    , startupTime_{std::chrono::system_clock::now()}
 {
--- a/src/rpc/Errors.cpp
+++ b/src/rpc/Errors.cpp
@@ -89,7 +89,7 @@ getErrorInfo(ClioError code)
        {.code = ClioError::RpcMalformedAuthorizedCredentials,
         .error = "malformedAuthorizedCredentials",
         .message = "Malformed authorized credentials."},
-        {.code = ClioError::RpcEntryNotFound, .error = "entryNotFound", .message = "Entry Not Found."},
+
        // special system errors
        {.code = ClioError::RpcInvalidApiVersion, .error = JS(invalid_API_version), .message = "Invalid API version."},
        {.code = ClioError::RpcCommandIsMissing,
--- a/src/rpc/Errors.hpp
+++ b/src/rpc/Errors.hpp
@@ -43,7 +43,6 @@ enum class ClioError {
    RpcFieldNotFoundTransaction = 5006,
    RpcMalformedOracleDocumentId = 5007,
    RpcMalformedAuthorizedCredentials = 5008,
-    RpcEntryNotFound = 5009,

    // special system errors start with 6000
    RpcInvalidApiVersion = 6000,
--- a/src/rpc/README.md
+++ b/src/rpc/README.md
@@ -17,6 +17,7 @@ See [tests/unit/rpc](https://github.com/XRPLF/clio/tree/develop/tests/unit/rpc)
 Handlers need to fulfil the requirements specified by the `SomeHandler` concept (see `rpc/common/Concepts.hpp`):

 - Expose types:
+
  - `Input` - The POD struct which acts as input for the handler

  - `Output` - The POD struct which acts as output of a valid handler invocation
--- a/src/rpc/RPCCenter.cpp
+++ b/src/rpc/RPCCenter.cpp
@@ -30,7 +30,6 @@ std::unordered_set<std::string_view> const&
 handledRpcs()
 {
    static std::unordered_set<std::string_view> const kHANDLED_RPCS = {
-        // clang-format off
        "account_channels",
        "account_currencies",
        "account_info",
@@ -65,9 +64,7 @@ handledRpcs()
        "tx",
        "subscribe",
        "unsubscribe",
-        "vault_info",
        "version",
-        // clang-format on
    };
    return kHANDLED_RPCS;
 }
--- a/src/rpc/RPCEngine.hpp
+++ b/src/rpc/RPCEngine.hpp
@@ -37,6 +37,7 @@
 #include <boost/iterator/transform_iterator.hpp>
 #include <boost/json.hpp>
 #include <boost/json/object.hpp>
+#include <fmt/core.h>
 #include <fmt/format.h>
 #include <xrpl/protocol/ErrorCodes.h>

@@ -157,55 +158,49 @@ public:
            return forwardingProxy_.forward(ctx);
        }

-        if (not ctx.isAdmin and responseCache_) {
-            if (auto res = responseCache_->get(ctx.method); res.has_value())
-                return Result{std::move(res).value()};
-        }
+        if (not ctx.isAdmin and responseCache_ and responseCache_->shouldCache(ctx.method)) {
+            auto updater =
+                [this, &ctx](boost::asio::yield_context
+                ) -> std::expected<util::ResponseExpirationCache::EntryData, util::ResponseExpirationCache::Error> {
+                auto result = buildResponseImpl(ctx);

-        if (backend_->isTooBusy()) {
-            LOG(log_.error()) << "Database is too busy. Rejecting request";
-            notifyTooBusy();  // TODO: should we add ctx.method if we have it?
-            return Result{Status{RippledError::rpcTOO_BUSY}};
-        }
+                auto const extracted =
+                    [&result]() -> std::expected<boost::json::object, util::ResponseExpirationCache::Error> {
+                    if (result.response.has_value()) {
+                        return std::move(result.response).value();
+                    }
+                    return std::unexpected{util::ResponseExpirationCache::Error{
+                        .status = std::move(result.response).error(), .warnings = std::move(result.warnings)
+                    }};
+                }();

-        auto const method = handlerProvider_->getHandler(ctx.method);
-        if (!method) {
-            notifyUnknownCommand();
-            return Result{Status{RippledError::rpcUNKNOWN_COMMAND}};
-        }
-
-        try {
-            LOG(perfLog_.debug()) << ctx.tag() << " start executing rpc `" << ctx.method << '`';
-
-            auto const context = Context{
-                .yield = ctx.yield,
-                .session = ctx.session,
-                .isAdmin = ctx.isAdmin,
-                .clientIp = ctx.clientIp,
-                .apiVersion = ctx.apiVersion
+                if (extracted.has_value()) {
+                    return util::ResponseExpirationCache::EntryData{
+                        .lastUpdated = std::chrono::steady_clock::now(), .response = std::move(extracted).value()
+                    };
+                }
+                return std::unexpected{std::move(extracted).error()};
            };
-            auto v = (*method).process(ctx.params, context);

-            LOG(perfLog_.debug()) << ctx.tag() << " finish executing rpc `" << ctx.method << '`';
-
-            if (not v) {
-                notifyErrored(ctx.method);
-            } else if (not ctx.isAdmin and responseCache_) {
-                responseCache_->put(ctx.method, v.result->as_object());
+            auto result = responseCache_->getOrUpdate(
+                ctx.yield,
+                ctx.method,
+                std::move(updater),
+                [&ctx](util::ResponseExpirationCache::EntryData const& entry) {
+                    return not ctx.isAdmin and not entry.response.contains("error");
+                }
+            );
+            if (result.has_value()) {
+                return Result{std::move(result).value()};
            }

-            return Result{std::move(v)};
-        } catch (data::DatabaseTimeout const& t) {
-            LOG(log_.error()) << "Database timeout";
-            notifyTooBusy();
-
-            return Result{Status{RippledError::rpcTOO_BUSY}};
-        } catch (std::exception const& ex) {
-            LOG(log_.error()) << ctx.tag() << "Caught exception: " << ex.what();
-            notifyInternalError();
-
-            return Result{Status{RippledError::rpcINTERNAL}};
+            auto error = std::move(result).error();
+            Result errorResult{std::move(error.status)};
+            errorResult.warnings = std::move(error.warnings);
+            return errorResult;
        }
+
+        return buildResponseImpl(ctx);
    }

    /**
--- a/src/rpc/RPCHelpers.cpp
+++ b/src/rpc/RPCHelpers.cpp
@@ -45,7 +45,7 @@
 #include <boost/json/value_to.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/lexical_cast/bad_lexical_cast.hpp>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <xrpl/basics/Slice.h>
 #include <xrpl/basics/StringUtilities.h>
 #include <xrpl/basics/base_uint.h>
@@ -1283,10 +1283,9 @@ postProcessOrderBook(
            } else {
                saTakerGetsFunded = saOwnerFundsLimit;
                offerJson["taker_gets_funded"] = toBoostJson(saTakerGetsFunded.getJson(ripple::JsonOptions::none));
-                offerJson["taker_pays_funded"] = toBoostJson(
-                    std::min(saTakerPays, ripple::multiply(saTakerGetsFunded, dirRate, saTakerPays.issue()))
-                        .getJson(ripple::JsonOptions::none)
-                );
+                offerJson["taker_pays_funded"] =
+                    toBoostJson(std::min(saTakerPays, ripple::multiply(saTakerGetsFunded, dirRate, saTakerPays.issue()))
+                                    .getJson(ripple::JsonOptions::none));
            }

            ripple::STAmount const saOwnerPays = (ripple::parityRate == offerRate)
--- a/src/rpc/RPCHelpers.hpp
+++ b/src/rpc/RPCHelpers.hpp
@@ -28,7 +28,6 @@
 #include "data/BackendInterface.hpp"
 #include "data/Types.hpp"
 #include "rpc/Errors.hpp"
-#include "rpc/JS.hpp"
 #include "rpc/common/Types.hpp"
 #include "util/JsonUtils.hpp"
 #include "util/Taggable.hpp"
@@ -42,8 +41,7 @@
 #include <boost/regex.hpp>
 #include <boost/regex/v5/regex_fwd.hpp>
 #include <boost/regex/v5/regex_match.hpp>
-#include <fmt/format.h>
-#include <xrpl/basics/Number.h>
+#include <fmt/core.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/AccountID.h>
@@ -52,12 +50,9 @@
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Issue.h>
 #include <xrpl/protocol/Keylet.h>
-#include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/LedgerHeader.h>
-#include <xrpl/protocol/MPTIssue.h>
 #include <xrpl/protocol/PublicKey.h>
 #include <xrpl/protocol/Rate.h>
-#include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/STBase.h>
 #include <xrpl/protocol/STLedgerEntry.h>
@@ -65,11 +60,9 @@
 #include <xrpl/protocol/STTx.h>
 #include <xrpl/protocol/SecretKey.h>
 #include <xrpl/protocol/Seed.h>
-#include <xrpl/protocol/Serializer.h>
 #include <xrpl/protocol/TxMeta.h>
 #include <xrpl/protocol/UintTypes.h>
 #include <xrpl/protocol/XRPAmount.h>
-#include <xrpl/protocol/jss.h>

 #include <chrono>
 #include <cstddef>
--- a/src/rpc/WorkQueue.cpp
+++ b/src/rpc/WorkQueue.cpp
@@ -46,8 +46,7 @@ WorkQueue::OneTimeCallable::operator()()
        called_ = true;
    }
 }
-WorkQueue::OneTimeCallable::
-operator bool() const
+WorkQueue::OneTimeCallable::operator bool() const
 {
    return func_.operator bool();
 }
--- a/src/rpc/common/Checkers.hpp
+++ b/src/rpc/common/Checkers.hpp
@@ -24,7 +24,7 @@

 #include <boost/json/value.hpp>
 #include <boost/json/value_to.hpp>
-#include <fmt/format.h>
+#include <fmt/core.h>

 #include <optional>
 #include <string>
--- a/src/rpc/common/MetaProcessors.hpp
+++ b/src/rpc/common/MetaProcessors.hpp
@@ -25,7 +25,7 @@
 #include "rpc/common/Types.hpp"

 #include <boost/json/value.hpp>
-#include <fmt/format.h>
+#include <fmt/core.h>

 #include <cstddef>
 #include <functional>
@@ -107,8 +107,8 @@ public:
    template <SomeRequirement... Requirements>
    explicit IfType(Requirements&&... requirements)
        : processor_(
-              [... r = std::forward<Requirements>(requirements)](boost::json::value& j, std::string_view key)
-                  -> MaybeError {
+              [... r = std::forward<Requirements>(requirements
+               )](boost::json::value& j, std::string_view key) -> MaybeError {
                  std::optional<Status> firstFailure = std::nullopt;

                  // the check logic is the same as fieldspec
--- a/src/rpc/common/Validators.cpp
+++ b/src/rpc/common/Validators.cpp
@@ -28,7 +28,7 @@
 #include <boost/json/object.hpp>
 #include <boost/json/value.hpp>
 #include <boost/json/value_to.hpp>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <xrpl/basics/StringUtilities.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/protocol/AccountID.h>
--- a/src/rpc/common/Validators.hpp
+++ b/src/rpc/common/Validators.hpp
@@ -26,7 +26,7 @@
 #include <boost/json/array.hpp>
 #include <boost/json/object.hpp>
 #include <boost/json/value.hpp>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/protocol/ErrorCodes.h>

@@ -457,10 +457,7 @@ public:
 checkIsU32Numeric(std::string_view sv);

 template <class HexType>
-    requires(
-        std::is_same_v<HexType, ripple::uint160> || std::is_same_v<HexType, ripple::uint192> ||
-        std::is_same_v<HexType, ripple::uint256>
-    )
+    requires(std::is_same_v<HexType, ripple::uint160> || std::is_same_v<HexType, ripple::uint192> || std::is_same_v<HexType, ripple::uint256>)
 MaybeError
 makeHexStringValidator(boost::json::value const& value, std::string_view key)
 {
--- a/src/rpc/common/impl/APIVersionParser.cpp
+++ b/src/rpc/common/impl/APIVersionParser.cpp
@@ -23,7 +23,7 @@
 #include "util/log/Logger.hpp"

 #include <boost/json/object.hpp>
-#include <fmt/format.h>
+#include <fmt/core.h>

 #include <cstdint>
 #include <expected>
--- a/src/rpc/common/impl/HandlerProvider.cpp
+++ b/src/rpc/common/impl/HandlerProvider.cpp
@@ -60,7 +60,6 @@
 #include "rpc/handlers/TransactionEntry.hpp"
 #include "rpc/handlers/Tx.hpp"
 #include "rpc/handlers/Unsubscribe.hpp"
-#include "rpc/handlers/VaultInfo.hpp"
 #include "rpc/handlers/VersionHandler.hpp"
 #include "util/config/ConfigDefinition.hpp"

@@ -115,7 +114,6 @@ ProductionHandlerProvider::ProductionHandlerProvider(
          {"tx", {.handler = TxHandler{backend, etl}}},
          {"subscribe", {.handler = SubscribeHandler{backend, amendmentCenter, subscriptionManager}}},
          {"unsubscribe", {.handler = UnsubscribeHandler{subscriptionManager}}},
-          {"vault_info", {.handler = VaultInfoHandler{backend}}},
          {"version", {.handler = VersionHandler{config}}},
      }
 {
--- a/src/rpc/handlers/GatewayBalances.cpp
+++ b/src/rpc/handlers/GatewayBalances.cpp
@@ -79,32 +79,7 @@ GatewayBalancesHandler::process(GatewayBalancesHandler::Input input, Context con

    auto output = GatewayBalancesHandler::Output{};

-    auto addEscrow = [&](ripple::SLE const& sle) {
-        if (sle.getType() == ripple::ltESCROW) {
-            auto const& escrow = sle.getFieldAmount(ripple::sfAmount);
-            auto& lockedBalance = output.locked[escrow.getCurrency()];
-            if (lockedBalance == beast::zero) {
-                // This is needed to set the currency code correctly
-                lockedBalance = escrow;
-            } else {
-                try {
-                    lockedBalance += escrow;
-                } catch (std::runtime_error const&) {
-                    // Presumably the exception was caused by overflow.
-                    // On overflow return the largest valid STAmount.
-                    // Very large sums of STAmount are approximations
-                    // anyway.
-                    lockedBalance = ripple::STAmount(
-                        lockedBalance.issue(), ripple::STAmount::cMaxValue, ripple::STAmount::cMaxOffset
-                    );
-                }
-            }
-        }
-    };
-
    auto const addToResponse = [&](ripple::SLE const sle) {
-        addEscrow(sle);
-
        if (sle.getType() == ripple::ltRIPPLE_STATE) {
            ripple::STAmount balance = sle.getFieldAmount(ripple::sfBalance);
            auto const lowLimit = sle.getFieldAmount(ripple::sfLowLimit);
@@ -219,14 +194,6 @@ tag_invoke(boost::json::value_from_tag, boost::json::value& jv, GatewayBalancesH
    if (auto balances = toJson(output.assets); !balances.empty())
        obj[JS(assets)] = balances;

-    if (!output.locked.empty()) {
-        boost::json::object lockedObj;
-        for (auto const& [currency, amount] : output.locked) {
-            lockedObj[ripple::to_string(currency)] = amount.getText();
-        }
-        obj[JS(locked)] = std::move(lockedObj);
-    }
-
    obj[JS(account)] = output.accountID;
    obj[JS(ledger_index)] = output.ledgerIndex;
    obj[JS(ledger_hash)] = output.ledgerHash;
--- a/src/rpc/handlers/GatewayBalances.hpp
+++ b/src/rpc/handlers/GatewayBalances.hpp
@@ -73,7 +73,6 @@ public:
        std::map<ripple::AccountID, std::vector<ripple::STAmount>> hotBalances;
        std::map<ripple::AccountID, std::vector<ripple::STAmount>> assets;
        std::map<ripple::AccountID, std::vector<ripple::STAmount>> frozenBalances;
-        std::map<ripple::Currency, ripple::STAmount> locked;
        // validated should be sent via framework
        bool validated = true;
    };
--- a/src/rpc/handlers/GetAggregatePrice.cpp
+++ b/src/rpc/handlers/GetAggregatePrice.cpp
@@ -108,11 +108,9 @@ GetAggregatePriceHandler::process(GetAggregatePriceHandler::Input input, Context
                auto const scale =
                    iter->isFieldPresent(ripple::sfScale) ? -static_cast<int>(iter->getFieldU8(ripple::sfScale)) : 0;

-                timestampPricesBiMap.insert(
-                    TimestampPricesBiMap::value_type(
-                        node.getFieldU32(ripple::sfLastUpdateTime), ripple::STAmount{ripple::noIssue(), price, scale}
-                    )
-                );
+                timestampPricesBiMap.insert(TimestampPricesBiMap::value_type(
+                    node.getFieldU32(ripple::sfLastUpdateTime), ripple::STAmount{ripple::noIssue(), price, scale}
+                ));
                return true;
            }
            return false;
@@ -265,14 +263,12 @@ tag_invoke(boost::json::value_to_tag<GetAggregatePriceHandler::Input>, boost::js
    }

    for (auto const& oracle : jsonObject.at(JS(oracles)).as_array()) {
-        input.oracles.push_back(
-            GetAggregatePriceHandler::Oracle{
-                .documentId = boost::json::value_to<std::uint64_t>(oracle.as_object().at(JS(oracle_document_id))),
-                .account = *util::parseBase58Wrapper<ripple::AccountID>(
-                    boost::json::value_to<std::string>(oracle.as_object().at(JS(account)))
-                )
-            }
-        );
+        input.oracles.push_back(GetAggregatePriceHandler::Oracle{
+            .documentId = boost::json::value_to<std::uint64_t>(oracle.as_object().at(JS(oracle_document_id))),
+            .account = *util::parseBase58Wrapper<ripple::AccountID>(
+                boost::json::value_to<std::string>(oracle.as_object().at(JS(account)))
+            )
+        });
    }
    input.baseAsset = boost::json::value_to<std::string>(jv.at(JS(base_asset)));
    input.quoteAsset = boost::json::value_to<std::string>(jv.at(JS(quote_asset)));
--- a/src/rpc/handlers/LedgerEntry.cpp
+++ b/src/rpc/handlers/LedgerEntry.cpp
@@ -75,9 +75,9 @@ LedgerEntryHandler::process(LedgerEntryHandler::Input input, Context const& ctx)

        key = expectedkey.value();
    } else if (input.offer) {
-        auto const id = util::parseBase58Wrapper<ripple::AccountID>(
-            boost::json::value_to<std::string>(input.offer->at(JS(account)))
-        );
+        auto const id =
+            util::parseBase58Wrapper<ripple::AccountID>(boost::json::value_to<std::string>(input.offer->at(JS(account)))
+            );
        key = ripple::keylet::offer(*id, boost::json::value_to<std::uint32_t>(input.offer->at(JS(seq)))).key;
    } else if (input.rippleStateAccount) {
        auto const id1 = util::parseBase58Wrapper<ripple::AccountID>(
@@ -91,9 +91,9 @@ LedgerEntryHandler::process(LedgerEntryHandler::Input input, Context const& ctx)

        key = ripple::keylet::line(*id1, *id2, currency).key;
    } else if (input.escrow) {
-        auto const id = util::parseBase58Wrapper<ripple::AccountID>(
-            boost::json::value_to<std::string>(input.escrow->at(JS(owner)))
-        );
+        auto const id =
+            util::parseBase58Wrapper<ripple::AccountID>(boost::json::value_to<std::string>(input.escrow->at(JS(owner)))
+            );
        key = ripple::keylet::escrow(*id, input.escrow->at(JS(seq)).as_int64()).key;
    } else if (input.depositPreauth) {
        auto const owner = util::parseBase58Wrapper<ripple::AccountID>(
@@ -124,9 +124,9 @@ LedgerEntryHandler::process(LedgerEntryHandler::Input input, Context const& ctx)
            key = ripple::keylet::depositPreauth(owner.value(), authCreds).key;
        }
    } else if (input.ticket) {
-        auto const id = util::parseBase58Wrapper<ripple::AccountID>(
-            boost::json::value_to<std::string>(input.ticket->at(JS(account)))
-        );
+        auto const id =
+            util::parseBase58Wrapper<ripple::AccountID>(boost::json::value_to<std::string>(input.ticket->at(JS(account))
+            ));

        key = ripple::getTicketIndex(*id, input.ticket->at(JS(ticket_seq)).as_int64());
    } else if (input.amm) {
@@ -136,9 +136,9 @@ LedgerEntryHandler::process(LedgerEntryHandler::Input input, Context const& ctx)
            if (ripple::isXRP(currency)) {
                return ripple::xrpIssue();
            }
-            auto const issuer = util::parseBase58Wrapper<ripple::AccountID>(
-                boost::json::value_to<std::string>(assetJson.at(JS(issuer)))
-            );
+            auto const issuer =
+                util::parseBase58Wrapper<ripple::AccountID>(boost::json::value_to<std::string>(assetJson.at(JS(issuer)))
+                );
            return ripple::Issue{currency, *issuer};
        };

@@ -174,9 +174,9 @@ LedgerEntryHandler::process(LedgerEntryHandler::Input input, Context const& ctx)
    } else if (input.mptoken) {
        auto const holder =
            ripple::parseBase58<ripple::AccountID>(boost::json::value_to<std::string>(input.mptoken->at(JS(account))));
-        auto const mptIssuanceID = ripple::uint192{
-            std::string_view(boost::json::value_to<std::string>(input.mptoken->at(JS(mpt_issuance_id))))
-        };
+        auto const mptIssuanceID =
+            ripple::uint192{std::string_view(boost::json::value_to<std::string>(input.mptoken->at(JS(mpt_issuance_id))))
+            };
        key = ripple::keylet::mptoken(mptIssuanceID, *holder).key;
    } else if (input.permissionedDomain) {
        auto const account = ripple::parseBase58<ripple::AccountID>(
@@ -184,17 +184,12 @@ LedgerEntryHandler::process(LedgerEntryHandler::Input input, Context const& ctx)
        );
        auto const seq = input.permissionedDomain->at(JS(seq)).as_int64();
        key = ripple::keylet::permissionedDomain(*account, seq).key;
-    } else if (input.vault) {
-        auto const account =
-            ripple::parseBase58<ripple::AccountID>(boost::json::value_to<std::string>(input.vault->at(JS(owner))));
-        auto const seq = input.vault->at(JS(seq)).as_int64();
-        key = ripple::keylet::vault(*account, seq).key;
    } else if (input.delegate) {
        auto const account =
            ripple::parseBase58<ripple::AccountID>(boost::json::value_to<std::string>(input.delegate->at(JS(account))));
-        auto const authorize = ripple::parseBase58<ripple::AccountID>(
-            boost::json::value_to<std::string>(input.delegate->at(JS(authorize)))
-        );
+        auto const authorize =
+            ripple::parseBase58<ripple::AccountID>(boost::json::value_to<std::string>(input.delegate->at(JS(authorize)))
+            );
        key = ripple::keylet::delegate(*account, *authorize).key;
    } else {
        // Must specify 1 of the following fields to indicate what type
@@ -219,13 +214,13 @@ LedgerEntryHandler::process(LedgerEntryHandler::Input input, Context const& ctx)

    if (!ledgerObject || ledgerObject->empty()) {
        if (not input.includeDeleted)
-            return Error{Status{ClioError::RpcEntryNotFound}};
+            return Error{Status{"entryNotFound"}};
        auto const deletedSeq = sharedPtrBackend_->fetchLedgerObjectSeq(key, lgrInfo.seq, ctx.yield);
        if (!deletedSeq)
-            return Error{Status{ClioError::RpcEntryNotFound}};
+            return Error{Status{"entryNotFound"}};
        ledgerObject = sharedPtrBackend_->fetchLedgerObject(key, deletedSeq.value() - 1, ctx.yield);
        if (!ledgerObject || ledgerObject->empty())
-            return Error{Status{ClioError::RpcEntryNotFound}};
+            return Error{Status{"entryNotFound"}};
        output.deletedLedgerIndex = deletedSeq;
    }

@@ -331,7 +326,6 @@ tag_invoke(boost::json::value_to_tag<LedgerEntryHandler::Input>, boost::json::va
        {JS(credential), ripple::ltCREDENTIAL},
        {JS(mptoken), ripple::ltMPTOKEN},
        {JS(permissioned_domain), ripple::ltPERMISSIONED_DOMAIN},
-        {JS(vault), ripple::ltVAULT},
        {JS(delegate), ripple::ltDELEGATE}
    };

@@ -421,8 +415,6 @@ tag_invoke(boost::json::value_to_tag<LedgerEntryHandler::Input>, boost::json::va
        input.mptoken = jv.at(JS(mptoken)).as_object();
    } else if (jsonObject.contains(JS(permissioned_domain))) {
        input.permissionedDomain = jv.at(JS(permissioned_domain)).as_object();
-    } else if (jsonObject.contains(JS(vault))) {
-        input.vault = jv.at(JS(vault)).as_object();
    } else if (jsonObject.contains(JS(delegate))) {
        input.delegate = jv.at(JS(delegate)).as_object();
    }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ayaz Salikhov	b11c1c9987	Up build	2025-06-23 22:11:37 +00:00
Ayaz Salikhov	43a4d15d2d	fix: Don't cancel ci image builds	2025-06-23 21:40:56 +01:00