chore: Merge develop into release/2.8.0 (#3071)

Co-authored-by: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>
Co-authored-by: Alex Kremer <akremer@ripple.com>

.clang-tidy

@@ -169,7 +169,7 @@ CheckOptions:
   readability-identifier-naming.EnumCase: CamelCase
   readability-identifier-naming.EnumConstantCase: CamelCase
   readability-identifier-naming.ScopedEnumConstantCase: CamelCase
-  readability-identifier-naming.GlobalConstantCase: CamelCase
+  readability-identifier-naming.GlobalConstantCase: UPPER_CASE
   readability-identifier-naming.GlobalConstantPrefix: "k"
   readability-identifier-naming.GlobalVariableCase: CamelCase
   readability-identifier-naming.GlobalVariablePrefix: "g"
@@ -177,23 +177,22 @@ CheckOptions:
   readability-identifier-naming.ConstexprMethodCase: camelBack
   readability-identifier-naming.ClassMethodCase: camelBack
   readability-identifier-naming.ClassMemberCase: camelBack
-  readability-identifier-naming.ClassConstantCase: CamelCase
+  readability-identifier-naming.ClassConstantCase: UPPER_CASE
   readability-identifier-naming.ClassConstantPrefix: "k"
-  readability-identifier-naming.StaticConstantCase: CamelCase
+  readability-identifier-naming.StaticConstantCase: UPPER_CASE
   readability-identifier-naming.StaticConstantPrefix: "k"
-  readability-identifier-naming.StaticVariableCase: camelBack
-  readability-identifier-naming.ConstexprVariableCase: camelBack
+  readability-identifier-naming.StaticVariableCase: UPPER_CASE
+  readability-identifier-naming.StaticVariablePrefix: "k"
+  readability-identifier-naming.ConstexprVariableCase: UPPER_CASE
+  readability-identifier-naming.ConstexprVariablePrefix: "k"
   readability-identifier-naming.LocalConstantCase: camelBack
   readability-identifier-naming.LocalVariableCase: camelBack
   readability-identifier-naming.TemplateParameterCase: CamelCase
   readability-identifier-naming.ParameterCase: camelBack
   readability-identifier-naming.FunctionCase: camelBack
   readability-identifier-naming.MemberCase: camelBack
-  readability-identifier-naming.PrivateMemberCase: camelBack
   readability-identifier-naming.PrivateMemberSuffix: _
-  readability-identifier-naming.ProtectedMemberCase: camelBack
   readability-identifier-naming.ProtectedMemberSuffix: _
-  readability-identifier-naming.PublicMemberCase: camelBack
   readability-identifier-naming.PublicMemberSuffix: ""
   readability-identifier-naming.FunctionIgnoredRegexp: ".*tag_invoke.*"
 

.gersemi/definitions.cmake

@@ -17,6 +17,3 @@ endfunction()
 
 function(append_coverage_compiler_flags_to_target name mode)
 endfunction()
-
-function(patch_nix_binary target)
-endfunction()

.github/actions/build-clio/action.yml

@@ -26,6 +26,6 @@ runs:
       run: |
         cd build
         cmake \
-            --build . \
-            --parallel "${{ steps.nproc.outputs.nproc }}" \
-            --target ${CMAKE_TARGETS}
+          --build . \
+          --parallel "${{ steps.nproc.outputs.nproc }}" \
+          --target ${CMAKE_TARGETS}

.github/actions/build-docker-image/action.yml

@@ -34,32 +34,32 @@ runs:
   steps:
     - name: Login to DockerHub
       if: ${{ inputs.push_image == 'true' && inputs.dockerhub_repo != '' }}
-      uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+      uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
       with:
         username: ${{ env.DOCKERHUB_USER }}
         password: ${{ env.DOCKERHUB_PW }}
 
     - name: Login to GitHub Container Registry
       if: ${{ inputs.push_image == 'true' }}
-      uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+      uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
       with:
         registry: ghcr.io
         username: ${{ github.repository_owner }}
         password: ${{ env.GITHUB_TOKEN }}
 
-    - uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
+    - uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
       with:
         cache-image: false
-    - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
+    - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
 
-    - uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
+    - uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
       id: meta
       with:
         images: ${{ inputs.images }}
         tags: ${{ inputs.tags }}
 
     - name: Build and push
-      uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
+      uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
       with:
         context: ${{ inputs.directory }}
         platforms: ${{ inputs.platforms }}

.github/actions/build-identifier/action.yml

@@ -1,53 +0,0 @@
-name: Build identifier
-description: Generate a unique build identifier and the ccache key derived from it
-
-inputs:
-  build_type:
-    description: Current build type (e.g. Release, Debug)
-    required: true
-  compiler:
-    description: Compiler used for the build (e.g. gcc, clang)
-    required: true
-  code_coverage:
-    description: Whether code coverage is on
-    required: true
-  sanitizers:
-    description: Sanitizer to enable, read by the 'sanitizers' conan profile (e.g. 'address', 'thread', 'undefinedbehavior')
-    required: true
-
-outputs:
-  build_identifier:
-    description: Unique identifier for the build configuration (without commit)
-    value: ${{ steps.build_identifier.outputs.build_identifier }}
-  cache_key:
-    description: ccache key, the build identifier suffixed with the common ancestor commit
-    value: ${{ steps.build_identifier.outputs.build_identifier }}-${{ steps.git_common_ancestor.outputs.commit }}
-
-runs:
-  using: composite
-  steps:
-    - name: Find common commit
-      id: git_common_ancestor
-      uses: ./.github/actions/git-common-ancestor
-
-    - name: Build identifier
-      id: build_identifier
-      shell: bash
-      env:
-        RUNNER_OS: ${{ runner.os }}
-        BUILD_TYPE: ${{ inputs.build_type }}
-        COMPILER: ${{ inputs.compiler }}
-        CODE_COVERAGE: ${{ inputs.code_coverage }}
-        SANITIZERS: ${{ inputs.sanitizers }}
-      run: |
-        # Keep the legacy "<os>_<build_type>_<compiler>" layout so standard artifact
-        # names (e.g. clio_server_Linux_Release_gcc) stay backwards compatible.
-        # Sanitizer/coverage builds get extra suffixes and may differ from old names.
-        BUILD_IDENTIFIER="${RUNNER_OS}_${BUILD_TYPE}_${COMPILER}"
-        if [ "${CODE_COVERAGE}" == "true" ]; then
-            BUILD_IDENTIFIER+="_code_coverage"
-        fi
-        if [ -n "${SANITIZERS}" ]; then
-            BUILD_IDENTIFIER+="_${SANITIZERS}"
-        fi
-        echo "build_identifier=${BUILD_IDENTIFIER}" >>"${GITHUB_OUTPUT}"

.github/actions/cache-key/action.yml

@@ -0,0 +1,41 @@
+name: Cache key
+description: Generate cache key for ccache
+
+inputs:
+  conan_profile:
+    description: Conan profile name
+    required: true
+  build_type:
+    description: Current build type (e.g. Release, Debug)
+    required: true
+    default: Release
+  code_coverage:
+    description: Whether code coverage is on
+    required: true
+    default: "false"
+
+outputs:
+  key:
+    description: Generated cache key for ccache
+    value: ${{ steps.key_without_commit.outputs.key }}-${{ steps.git_common_ancestor.outputs.commit }}
+  restore_keys:
+    description: Cache restore keys for fallback
+    value: ${{ steps.key_without_commit.outputs.key }}
+
+runs:
+  using: composite
+  steps:
+    - name: Find common commit
+      id: git_common_ancestor
+      uses: ./.github/actions/git-common-ancestor
+
+    - name: Set cache key without commit
+      id: key_without_commit
+      shell: bash
+      env:
+        RUNNER_OS: ${{ runner.os }}
+        BUILD_TYPE: ${{ inputs.build_type }}
+        CODE_COVERAGE: ${{ inputs.code_coverage == 'true' && '-code_coverage' || '' }}
+        CONAN_PROFILE: ${{ inputs.conan_profile }}
+      run: |
+        echo "key=clio-ccache-${RUNNER_OS}-${BUILD_TYPE}${CODE_COVERAGE}-${CONAN_PROFILE}-develop" >> "${GITHUB_OUTPUT}"

.github/actions/cmake/action.yml

@@ -6,6 +6,9 @@ inputs:
     description: Build directory
     required: false
     default: "build"
+  conan_profile:
+    description: Conan profile name
+    required: true
   build_type:
     description: Build type for third-party libraries and clio. Could be 'Release', 'Debug'
     required: true
@@ -22,6 +25,10 @@ inputs:
     description: Whether to enable code coverage
     required: true
     default: "false"
+  static:
+    description: Whether Clio is to be statically linked
+    required: true
+    default: "false"
   time_trace:
     description: Whether to enable compiler trace reports
     required: true
@@ -43,9 +50,15 @@ runs:
       env:
         BUILD_DIR: "${{ inputs.build_dir }}"
         BUILD_TYPE: "${{ inputs.build_type }}"
+        SANITIZER_OPTION: |-
+          ${{ endsWith(inputs.conan_profile, '.asan') && '-Dsan=address' ||
+              endsWith(inputs.conan_profile, '.tsan') && '-Dsan=thread' ||
+              endsWith(inputs.conan_profile, '.ubsan') && '-Dsan=undefined' ||
+              '' }}
         INTEGRATION_TESTS: "${{ inputs.integration_tests == 'true' && 'ON' || 'OFF' }}"
         BENCHMARK: "${{ inputs.benchmark == 'true' && 'ON' || 'OFF' }}"
         COVERAGE: "${{ inputs.code_coverage == 'true' && 'ON' || 'OFF' }}"
+        STATIC: "${{ inputs.static == 'true' && 'ON' || 'OFF' }}"
         TIME_TRACE: "${{ inputs.time_trace == 'true' && 'ON' || 'OFF' }}"
         PACKAGE: "${{ inputs.package == 'true' && 'ON' || 'OFF' }}"
         # GitHub creates a merge commit for a PR
@@ -63,14 +76,16 @@ runs:
         FORCE_CLIO_VERSION: ${{ inputs.version }}
       run: |
         cmake \
-            -B "${BUILD_DIR}" \
-            -S . \
-            -G Ninja \
-            -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake \
-            -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \
-            -Dtests=ON \
-            -Dintegration_tests="${INTEGRATION_TESTS}" \
-            -Dbenchmark="${BENCHMARK}" \
-            -Dcoverage="${COVERAGE}" \
-            -Dtime_trace="${TIME_TRACE}" \
-            -Dpackage="${PACKAGE}"
+          -B "${BUILD_DIR}" \
+          -S . \
+          -G Ninja \
+          -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake \
+          -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \
+          "${SANITIZER_OPTION}" \
+          -Dtests=ON \
+          -Dintegration_tests="${INTEGRATION_TESTS}" \
+          -Dbenchmark="${BENCHMARK}" \
+          -Dcoverage="${COVERAGE}" \
+          -Dstatic="${STATIC}" \
+          -Dtime_trace="${TIME_TRACE}" \
+          -Dpackage="${PACKAGE}"

.github/actions/code-coverage/action.yml

@@ -15,13 +15,13 @@ runs:
       shell: bash
       run: |
         gcovr \
-            -e benchmarks \
-            -e tests \
-            -e src/data/cassandra \
-            -e src/data/CassandraBackend.hpp \
-            -e 'src/data/BackendFactory.*' \
-            --xml build/coverage_report.xml \
-            -j8 --exclude-throw-branches
+          -e benchmarks \
+          -e tests \
+          -e src/data/cassandra \
+          -e src/data/CassandraBackend.hpp \
+          -e 'src/data/BackendFactory.*' \
+          --xml build/coverage_report.xml \
+          -j8 --exclude-throw-branches
 
     - name: Archive coverage report
       uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1

.github/actions/conan/action.yml

@@ -6,6 +6,9 @@ inputs:
     description: Build directory
     required: false
     default: "build"
+  conan_profile:
+    description: Conan profile name
+    required: true
   force_conan_source_build:
     description: Whether conan should build all dependencies from source
     required: true
@@ -14,10 +17,6 @@ inputs:
     description: Build type for third-party libraries and clio. Could be 'Release', 'Debug'
     required: true
     default: "Release"
-  sanitizers:
-    description: Sanitizer to enable, read by the 'sanitizers' conan profile (e.g. 'address', 'thread', 'undefinedbehavior')
-    required: false
-    default: ""
 
 runs:
   using: composite
@@ -28,11 +27,11 @@ runs:
         BUILD_DIR: "${{ inputs.build_dir }}"
         CONAN_BUILD_OPTION: "${{ inputs.force_conan_source_build == 'true' && '*' || 'missing' }}"
         BUILD_TYPE: "${{ inputs.build_type }}"
-        SANITIZERS: "${{ inputs.sanitizers }}"
+        CONAN_PROFILE: "${{ inputs.conan_profile }}"
       run: |
         conan \
-            install . \
-            -of "${BUILD_DIR}" \
-            -b "${CONAN_BUILD_OPTION}" \
-            -s "build_type=${BUILD_TYPE}" \
-            --profile:all ci
+          install . \
+          -of "${BUILD_DIR}" \
+          -b "${CONAN_BUILD_OPTION}" \
+          -s "build_type=${BUILD_TYPE}" \
+          --profile:all "${CONAN_PROFILE}"

.github/actions/git-common-ancestor/action.yml

@@ -13,4 +13,4 @@ runs:
       id: find_common_ancestor
       shell: bash
       run: |
-        echo "commit=\"$(git merge-base --fork-point origin/develop)\"" >>$GITHUB_OUTPUT
+        echo "commit=\"$(git merge-base --fork-point origin/develop)\"" >> $GITHUB_OUTPUT

.github/actions/set-compiler-env/action.yml

@@ -1,34 +0,0 @@
-name: Set compiler environment
-description: "Set CC and CXX environment variables for the given compiler."
-
-inputs:
-  compiler:
-    description: 'The compiler to use ("gcc" or "clang").'
-    required: true
-
-runs:
-  using: composite
-
-  steps:
-    - name: Set CC and CXX for gcc
-      if: ${{ inputs.compiler == 'gcc' }}
-      shell: bash
-      run: |
-        echo "CC=gcc" >>"${GITHUB_ENV}"
-        echo "CXX=g++" >>"${GITHUB_ENV}"
-
-    - name: Set CC and CXX for clang
-      if: ${{ inputs.compiler == 'clang' }}
-      shell: bash
-      run: |
-        echo "CC=clang" >>"${GITHUB_ENV}"
-        echo "CXX=clang++" >>"${GITHUB_ENV}"
-
-    - name: Fail on unknown compiler
-      if: ${{ inputs.compiler != 'gcc' && inputs.compiler != 'clang' }}
-      shell: bash
-      env:
-        COMPILER: ${{ inputs.compiler }}
-      run: |
-        echo "Unknown compiler: $COMPILER" >&2
-        exit 1

.github/dependabot.yml

@@ -1,16 +1,98 @@
 version: 2
 updates:
   - package-ecosystem: github-actions
-    directories:
-      - /
-      - .github/actions/build-clio/
-      - .github/actions/build-docker-image/
-      - .github/actions/build-identifier/
-      - .github/actions/cmake/
-      - .github/actions/code-coverage/
-      - .github/actions/conan/
-      - .github/actions/git-common-ancestor/
-      - .github/actions/set-compiler-env/
+    directory: /
+    schedule:
+      interval: weekly
+      day: monday
+      time: "04:00"
+      timezone: Etc/GMT
+    reviewers:
+      - XRPLF/clio-dev-team
+    commit-message:
+      prefix: "ci: [DEPENDABOT] "
+    target-branch: develop
+
+  - package-ecosystem: github-actions
+    directory: .github/actions/build-clio/
+    schedule:
+      interval: weekly
+      day: monday
+      time: "04:00"
+      timezone: Etc/GMT
+    reviewers:
+      - XRPLF/clio-dev-team
+    commit-message:
+      prefix: "ci: [DEPENDABOT] "
+    target-branch: develop
+
+  - package-ecosystem: github-actions
+    directory: .github/actions/build-docker-image/
+    schedule:
+      interval: weekly
+      day: monday
+      time: "04:00"
+      timezone: Etc/GMT
+    reviewers:
+      - XRPLF/clio-dev-team
+    commit-message:
+      prefix: "ci: [DEPENDABOT] "
+    target-branch: develop
+
+  - package-ecosystem: github-actions
+    directory: .github/actions/cmake/
+    schedule:
+      interval: weekly
+      day: monday
+      time: "04:00"
+      timezone: Etc/GMT
+    reviewers:
+      - XRPLF/clio-dev-team
+    commit-message:
+      prefix: "ci: [DEPENDABOT] "
+    target-branch: develop
+
+  - package-ecosystem: github-actions
+    directory: .github/actions/code-coverage/
+    schedule:
+      interval: weekly
+      day: monday
+      time: "04:00"
+      timezone: Etc/GMT
+    reviewers:
+      - XRPLF/clio-dev-team
+    commit-message:
+      prefix: "ci: [DEPENDABOT] "
+    target-branch: develop
+
+  - package-ecosystem: github-actions
+    directory: .github/actions/conan/
+    schedule:
+      interval: weekly
+      day: monday
+      time: "04:00"
+      timezone: Etc/GMT
+    reviewers:
+      - XRPLF/clio-dev-team
+    commit-message:
+      prefix: "ci: [DEPENDABOT] "
+    target-branch: develop
+
+  - package-ecosystem: github-actions
+    directory: .github/actions/git-common-ancestor/
+    schedule:
+      interval: weekly
+      day: monday
+      time: "04:00"
+      timezone: Etc/GMT
+    reviewers:
+      - XRPLF/clio-dev-team
+    commit-message:
+      prefix: "ci: [DEPENDABOT] "
+    target-branch: develop
+
+  - package-ecosystem: github-actions
+    directory: .github/actions/cache-key/
     schedule:
       interval: weekly
       day: monday

.github/scripts/conan/generate_matrix.py

@@ -3,7 +3,9 @@ import itertools
 import json
 
 LINUX_OS = ["heavy", "heavy-arm64"]
-LINUX_CONTAINERS = ['{ "image": "ghcr.io/xrplf/xrpld/nix-ubuntu:sha-cb2642b" }']
+LINUX_CONTAINERS = [
+    '{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }'
+]
 LINUX_COMPILERS = ["gcc", "clang"]
 
 MACOS_OS = ["macos15"]
@@ -11,10 +13,7 @@ MACOS_CONTAINERS = [""]
 MACOS_COMPILERS = ["apple-clang"]
 
 BUILD_TYPES = ["Release", "Debug"]
-
-# Values of the `SANITIZERS` environment variable read by the `sanitizers` conan
-# profile. An empty string builds without any sanitizers.
-SANITIZERS = ["address", "thread", "undefinedbehavior", ""]
+SANITIZER_EXT = [".asan", ".tsan", ".ubsan", ""]
 
 
 def generate_matrix():
@@ -24,13 +23,13 @@ def generate_matrix():
         itertools.product(LINUX_OS, LINUX_CONTAINERS, LINUX_COMPILERS),
         itertools.product(MACOS_OS, MACOS_CONTAINERS, MACOS_COMPILERS),
     ):
-        for sanitizers, build_type in itertools.product(SANITIZERS, BUILD_TYPES):
+        for sanitizer_ext, build_type in itertools.product(SANITIZER_EXT, BUILD_TYPES):
             configurations.append(
                 {
                     "os": os,
                     "container": container,
                     "compiler": compiler,
-                    "sanitizers": sanitizers,
+                    "sanitizer_ext": sanitizer_ext,
                     "build_type": build_type,
                 }
             )

.github/scripts/conan/init.sh

@@ -0,0 +1,48 @@
+#!/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"
+
+# When developers' compilers are updated, these profiles might be different
+if [[ -z "$CI" ]]; then
+    APPLE_CLANG_PROFILE="$CURRENT_DIR/apple-clang-17.profile"
+else
+    APPLE_CLANG_PROFILE="$CURRENT_DIR/apple-clang-17.profile"
+fi
+
+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 xrplf https://conan.ripplex.io
+
+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

.github/scripts/conan/regenerate_lockfile.sh

@@ -22,4 +22,4 @@ rm -f conan.lock
 # Create a new lockfile that is compatible with macOS.
 # It should also work on Linux.
 conan lock create . \
-    --profile:all=./conan/profiles/apple-clang-17.profile
+    --profile:all=.github/scripts/conan/apple-clang-17.profile

.github/workflows/build-clio-docker-image.yml

@@ -14,9 +14,9 @@ on:
         type: boolean
         description: Whether to strip clio binary
         default: true
-      push_image:
+      publish_image:
         type: boolean
-        description: Whether to push docker image
+        description: Whether to publish docker image
         required: true
 
   workflow_dispatch:
@@ -43,12 +43,12 @@ defaults:
     shell: bash
 
 jobs:
-  build_and_push_image:
+  build_and_publish_image:
     name: Build and publish image
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Download Clio binary from artifact
         if: ${{ inputs.artifact_name != null }}
@@ -65,8 +65,8 @@ jobs:
         run: |
           wget "${BINARY_URL}" -P ./docker/clio/artifact/
           if [ "$(sha256sum ./docker/clio/clio_server | awk '{print $1}')" != "${BINARY_SHA256}" ]; then
-              echo "Binary sha256 sum doesn't match"
-              exit 1
+            echo "Binary sha256 sum doesn't match"
+            exit 1
           fi
       - name: Unpack binary
         run: |
@@ -74,9 +74,9 @@ jobs:
           cd docker/clio/artifact
           artifact=$(find . -type f)
           if [[ $artifact == *.zip ]]; then
-              unzip $artifact
+            unzip $artifact
           elif [[ $artifact == *.tar.gz ]]; then
-              tar -xvf $artifact
+            tar -xvf $artifact
           fi
           chmod +x ./clio_server
           mv ./clio_server ../
@@ -90,7 +90,7 @@ jobs:
       - name: Set GHCR_REPO
         id: set-ghcr-repo
         run: |
-          echo "GHCR_REPO=$(echo ghcr.io/${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" >>${GITHUB_OUTPUT}
+          echo "GHCR_REPO=$(echo ghcr.io/${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" >> ${GITHUB_OUTPUT}
 
       - name: Build Docker image
         uses: ./.github/actions/build-docker-image
@@ -102,7 +102,7 @@ jobs:
           images: |
             ghcr.io/${{ steps.set-ghcr-repo.outputs.GHCR_REPO }}/clio
             ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio' || '' }}
-          push_image: ${{ inputs.push_image }}
+          push_image: ${{ inputs.publish_image }}
           directory: docker/clio
           tags: ${{ inputs.tags }}
           platforms: linux/amd64

.github/workflows/build.yml

@@ -45,24 +45,30 @@ jobs:
       fail-fast: false
       matrix:
         os: [heavy]
-        compiler: [gcc, clang]
+        conan_profile: [gcc, clang]
         build_type: [Release, Debug]
-        container: ['{ "image": "ghcr.io/xrplf/xrpld/nix-ubuntu:sha-cb2642b" }']
+        container:
+          [
+            '{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }',
+          ]
+        static: [true]
 
         include:
           - os: macos15
-            compiler: apple-clang
+            conan_profile: apple-clang
             build_type: Release
             container: ""
+            static: false
 
     uses: ./.github/workflows/reusable-build-test.yml
     with:
       runs_on: ${{ matrix.os }}
       container: ${{ matrix.container }}
-      compiler: ${{ matrix.compiler }}
+      conan_profile: ${{ matrix.conan_profile }}
       build_type: ${{ matrix.build_type }}
       download_ccache: true
       upload_ccache: true
+      static: ${{ matrix.static }}
       run_unit_tests: true
       run_integration_tests: false
       upload_clio_server: true
@@ -73,12 +79,13 @@ jobs:
     uses: ./.github/workflows/reusable-build.yml
     with:
       runs_on: heavy
-      container: '{ "image": "ghcr.io/xrplf/xrpld/nix-ubuntu:sha-cb2642b" }'
-      compiler: gcc
+      container: '{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }'
+      conan_profile: gcc
       build_type: Debug
       download_ccache: true
       upload_ccache: true
       code_coverage: true
+      static: true
       upload_clio_server: false
       targets: all
       analyze_build_time: false
@@ -90,10 +97,10 @@ jobs:
     needs: build-and-test
     runs-on: heavy
     container:
-      image: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-cb2642b
+      image: ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696
 
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:

.github/workflows/check-libxrpl.yml

@@ -10,7 +10,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  COMPILER: gcc
+  CONAN_PROFILE: gcc
 
 defaults:
   run:
@@ -21,10 +21,10 @@ jobs:
     name: Build Clio / `libXRPL ${{ github.event.client_payload.version }}`
     runs-on: heavy
     container:
-      image: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-cb2642b
+      image: ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696
 
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
 
@@ -36,14 +36,6 @@ jobs:
       - name: Print build environment
         uses: XRPLF/actions/print-build-env@59dec886e4afb05a1724443af08baccbc045b574
 
-      - name: Set compiler environment
-        uses: ./.github/actions/set-compiler-env
-        with:
-          compiler: ${{ env.COMPILER }}
-
-      - name: Setup conan
-        run: conan/init.sh
-
       - name: Update libXRPL version requirement
         run: |
           sed -i.bak -E "s|'xrpl/[a-zA-Z0-9\\.\\-]+'|'xrpl/${{ github.event.client_payload.conan_ref }}'|g" conanfile.py
@@ -51,13 +43,17 @@ jobs:
 
       - name: Update conan lockfile
         run: |
-          conan lock create . --profile:all ci
+          conan lock create . --profile:all ${{ env.CONAN_PROFILE }}
 
       - name: Run conan
         uses: ./.github/actions/conan
+        with:
+          conan_profile: ${{ env.CONAN_PROFILE }}
 
       - name: Run CMake
         uses: ./.github/actions/cmake
+        with:
+          conan_profile: ${{ env.CONAN_PROFILE }}
 
       - name: Build Clio
         uses: ./.github/actions/build-clio
@@ -76,7 +72,7 @@ jobs:
     needs: build
     runs-on: heavy
     container:
-      image: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-cb2642b
+      image: ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696
 
     steps:
       - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
@@ -99,10 +95,10 @@ jobs:
       issues: write
 
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Create an issue
-        uses: XRPLF/actions/create-issue@2b8bc36af85b88bca0dd7bfac2e2dc05f94ad712
+        uses: XRPLF/actions/create-issue@fbcc16eb7f20dc3199eaf1aed0d3523a5ba9008c
         with:
           title: "Proposed libXRPL check failed"
           body: >

.github/workflows/check-pr-title.yml

@@ -7,4 +7,4 @@ on:
 
 jobs:
   check_title:
-    uses: XRPLF/actions/.github/workflows/check-pr-title.yml@cba1f0891650baf1a9c88624dc2d72573be2eb81
+    uses: XRPLF/actions/.github/workflows/check-pr-title.yml@a5d8dd35be543365e90a11358447130c8763871d

.github/workflows/clang-tidy.yml

@@ -28,12 +28,12 @@ env:
   BUILD_DIR: build
   BUILD_TYPE: Debug # Debug so that ASSERTS and such participate in clang-tidy check
 
-  OUTPUT_FILE: /tmp/clang-tidy-output.txt
-  FILTERED_OUTPUT_FILE: /tmp/clang-tidy-filtered-output.txt
-  DIFF_FILE: /tmp/clang-tidy-git-diff.txt
-  ISSUE_FILE: /tmp/clang-tidy-issue.md
+  OUTPUT_FILE: clang-tidy-output.txt
+  DIFF_FILE: clang-tidy-git-diff.txt
+  ISSUE_FILE: clang-tidy-issue.md
 
-  COMPILER: clang
+  CONAN_PROFILE: clang
+  LLVM_TOOLS_VERSION: 21
 
 defaults:
   run:
@@ -44,7 +44,7 @@ jobs:
     if: ${{ github.event_name == 'pull_request' }}
     permissions:
       contents: read
-    uses: XRPLF/actions/.github/workflows/determine-tidy-files.yml@224f3c48d3014d082a1129237b8291ff0b0a331f
+    uses: XRPLF/actions/.github/workflows/determine-tidy-files.yml@12f5dbc98a2260259a66970e57fa4d26fb7f285c
 
   run-clang-tidy:
     name: Run clang tidy
@@ -52,7 +52,7 @@ jobs:
     if: ${{ always() && !cancelled() && (github.event_name != 'pull_request' || needs.determine-files.outputs.cpp_changed_files != '' || needs.determine-files.outputs.clang_tidy_config_changed == 'true') }}
     runs-on: heavy
     container:
-      image: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-cb2642b
+      image: ghcr.io/xrplf/clio-ci:f174b47f4909ae41b80406d836ab52adc39eacc6
 
     permissions:
       contents: write
@@ -60,7 +60,7 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Prepare runner
         uses: XRPLF/actions/prepare-runner@90f11ee655d1687824fb8793db770477d52afbab
@@ -70,24 +70,18 @@ jobs:
       - name: Print build environment
         uses: XRPLF/actions/print-build-env@59dec886e4afb05a1724443af08baccbc045b574
 
-      - name: Set compiler environment
-        uses: ./.github/actions/set-compiler-env
-        with:
-          compiler: ${{ env.COMPILER }}
-
-      - name: Setup conan
-        run: conan/init.sh
-
       - name: Run conan
         uses: ./.github/actions/conan
         with:
           build_dir: ${{ env.BUILD_DIR }}
+          conan_profile: ${{ env.CONAN_PROFILE }}
           build_type: ${{ env.BUILD_TYPE }}
 
       - name: Run CMake
         uses: ./.github/actions/cmake
         with:
           build_dir: ${{ env.BUILD_DIR }}
+          conan_profile: ${{ env.CONAN_PROFILE }}
           build_type: ${{ env.BUILD_TYPE }}
 
       - name: Get number of processors
@@ -101,7 +95,7 @@ jobs:
           TARGETS: ${{ (needs.determine-files.outputs.clang_tidy_config_changed != 'true' && github.event_name == 'pull_request') && needs.determine-files.outputs.cpp_changed_files || 'benchmarks src tests' }}
         run: |
           set -o pipefail
-          run-clang-tidy -j ${{ steps.nproc.outputs.nproc }} -p "${BUILD_DIR}" -quiet -fix -allow-no-checks ${TARGETS} 2>&1 | tee "${OUTPUT_FILE}"
+          run-clang-tidy-${{ env.LLVM_TOOLS_VERSION }} -j ${{ steps.nproc.outputs.nproc }} -p "${BUILD_DIR}" -quiet -fix -allow-no-checks ${TARGETS} 2>&1 | tee "${OUTPUT_FILE}"
 
       - name: Print errors
         if: ${{ steps.run_clang_tidy.outcome != 'success' }}
@@ -143,7 +137,7 @@ jobs:
       - name: Write issue header
         if: ${{ steps.run_clang_tidy.outcome != 'success' }}
         run: |
-          cat >"${ISSUE_FILE}" <<EOF
+          cat > "${ISSUE_FILE}" <<EOF
           ## Clang-tidy Check Failed
 
           ### Clang-tidy Output:
@@ -154,30 +148,30 @@ jobs:
         if: ${{ steps.run_clang_tidy.outcome != 'success' }}
         run: |
           if [ -f "${OUTPUT_FILE}" ]; then
-              # Extract lines containing 'error:', 'warning:', or 'note:'
-              grep -E '(error:|warning:|note:)' "${OUTPUT_FILE}" >"${FILTERED_OUTPUT_FILE}" || true
+            # Extract lines containing 'error:', 'warning:', or 'note:'
+            grep -E '(error:|warning:|note:)' "${OUTPUT_FILE}" > filtered-output.txt || true
 
-              # If filtered output is empty, use original (might be a different error format)
-              if [ ! -s "${FILTERED_OUTPUT_FILE}" ]; then
-                  cp "${OUTPUT_FILE}" "${FILTERED_OUTPUT_FILE}"
-              fi
+            # If filtered output is empty, use original (might be a different error format)
+            if [ ! -s filtered-output.txt ]; then
+              cp "${OUTPUT_FILE}" filtered-output.txt
+            fi
 
-              # Truncate if too large
-              head -c 60000 "${FILTERED_OUTPUT_FILE}" >>"${ISSUE_FILE}"
-              if [ "$(wc -c <"${FILTERED_OUTPUT_FILE}")" -gt 60000 ]; then
-                  echo "" >>"${ISSUE_FILE}"
-                  echo "... (output truncated, see artifacts for full output)" >>"${ISSUE_FILE}"
-              fi
+            # Truncate if too large
+            head -c 60000 filtered-output.txt >> "${ISSUE_FILE}"
+            if [ "$(wc -c < filtered-output.txt)" -gt 60000 ]; then
+              echo "" >> "${ISSUE_FILE}"
+              echo "... (output truncated, see artifacts for full output)" >> "${ISSUE_FILE}"
+            fi
 
-              rm "${FILTERED_OUTPUT_FILE}"
+            rm filtered-output.txt
           else
-              echo "No output file found" >>"${ISSUE_FILE}"
+            echo "No output file found" >> "${ISSUE_FILE}"
           fi
 
       - name: Append issue footer
         if: ${{ steps.run_clang_tidy.outcome != 'success' }}
         run: |
-          cat >>"${ISSUE_FILE}" <<EOF
+          cat >> "${ISSUE_FILE}" <<EOF
           \`\`\`
 
           ---
@@ -185,9 +179,8 @@ jobs:
           EOF
 
       - name: Create issue
-        id: create_issue
         if: ${{ steps.run_clang_tidy.outcome != 'success' && github.event_name != 'pull_request' }}
-        uses: XRPLF/actions/create-issue@2b8bc36af85b88bca0dd7bfac2e2dc05f94ad712
+        uses: XRPLF/actions/create-issue@fbcc16eb7f20dc3199eaf1aed0d3523a5ba9008c
         with:
           title: "Clang-tidy check failed"
           body_file: ${{ env.ISSUE_FILE }}
@@ -214,7 +207,7 @@ jobs:
           branch: "clang_tidy/autofix"
           branch-suffix: timestamp
           delete-branch: true
-          title: "style: Apply clang-tidy auto fixes"
+          title: "style: clang-tidy auto fixes"
           body: >
             Fixes #${{ steps.create_issue.outputs.issue_number }}.
 

.github/workflows/docs.yml

@@ -4,18 +4,6 @@ on:
   push:
     branches: [develop]
   workflow_dispatch:
-  pull_request:
-    branches: [release/*, develop]
-    paths:
-      - .github/workflows/docs.yml
-
-      - CMakeLists.txt
-      - conanfile.py
-      - conan.lock
-      - "cmake/**"
-      - "docs/**"
-      - "src/**"
-      - "tests/**"
 
 concurrency:
   # Only cancel in-progress jobs or runs for the current workflow - matches against branch & tags
@@ -30,11 +18,11 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-cb2642b
+      image: ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696
 
     steps:
       - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           lfs: true
 
@@ -58,7 +46,6 @@ jobs:
         run: cmake --build . --target docs
 
       - name: Setup Pages
-        if: ${{ github.repository == 'XRPLF/clio' && github.event_name == 'push' }}
         uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d # v6.0.0
 
       - name: Upload artifact
@@ -68,7 +55,6 @@ jobs:
           name: docs-develop
 
   deploy:
-    if: ${{ github.repository == 'XRPLF/clio' && github.event_name == 'push' }}
     needs: build
     permissions:
       pages: write

.github/workflows/nightly.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Get current date
         id: get_date
         run: |
-          echo "date=$(date +'%Y%m%d')" >>$GITHUB_OUTPUT
+          echo "date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
 
   build-and-test:
     name: Build and Test
@@ -48,29 +48,32 @@ jobs:
       matrix:
         include:
           - os: macos15
-            compiler: apple-clang
+            conan_profile: apple-clang
             build_type: Release
+            static: false
           - os: heavy
-            compiler: gcc
+            conan_profile: gcc
             build_type: Release
-            container: '{ "image": "ghcr.io/xrplf/xrpld/nix-ubuntu:sha-cb2642b" }'
+            static: true
+            container: '{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }'
           - os: heavy
-            compiler: gcc
+            conan_profile: gcc
             build_type: Debug
-            container: '{ "image": "ghcr.io/xrplf/xrpld/nix-ubuntu:sha-cb2642b" }'
+            static: true
+            container: '{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }'
           - os: heavy
-            compiler: gcc
-            sanitizers: undefinedbehavior
+            conan_profile: gcc.ubsan
             build_type: Release
-            container: '{ "image": "ghcr.io/xrplf/xrpld/nix-ubuntu:sha-cb2642b" }'
+            static: false
+            container: '{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }'
 
     uses: ./.github/workflows/reusable-build-test.yml
     with:
       runs_on: ${{ matrix.os }}
       container: ${{ matrix.container }}
-      compiler: ${{ matrix.compiler }}
-      sanitizers: ${{ matrix.sanitizers }}
+      conan_profile: ${{ matrix.conan_profile }}
       build_type: ${{ matrix.build_type }}
+      static: ${{ matrix.static }}
       run_unit_tests: true
       run_integration_tests: true
       upload_clio_server: true
@@ -85,12 +88,13 @@ jobs:
     uses: ./.github/workflows/reusable-build.yml
     with:
       runs_on: heavy
-      container: '{ "image": "ghcr.io/xrplf/xrpld/nix-ubuntu:sha-cb2642b" }'
-      compiler: gcc
+      container: '{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }'
+      conan_profile: gcc
       build_type: Release
       download_ccache: false
       upload_ccache: false
       code_coverage: false
+      static: true
       upload_clio_server: false
       package: true
       version: nightly-${{ needs.get_date.outputs.date }}
@@ -106,20 +110,23 @@ jobs:
       matrix:
         include:
           - os: heavy
-            compiler: clang
-            container: '{ "image": "ghcr.io/xrplf/xrpld/nix-ubuntu:sha-cb2642b" }'
+            conan_profile: clang
+            container: '{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }'
+            static: true
           - os: macos15
-            compiler: apple-clang
+            conan_profile: apple-clang
             container: ""
+            static: false
     uses: ./.github/workflows/reusable-build.yml
     with:
       runs_on: ${{ matrix.os }}
       container: ${{ matrix.container }}
-      compiler: ${{ matrix.compiler }}
+      conan_profile: ${{ matrix.conan_profile }}
       build_type: Release
       download_ccache: false
       upload_ccache: false
       code_coverage: false
+      static: ${{ matrix.static }}
       upload_clio_server: false
       targets: all
       analyze_build_time: true
@@ -150,7 +157,7 @@ jobs:
         type=raw,value=${{ github.sha }}
       artifact_name: clio_server_Linux_Release_gcc
       strip_binary: true
-      push_image: ${{ github.repository == 'XRPLF/clio' && github.event_name != 'pull_request' }}
+      publish_image: ${{ github.event_name != 'pull_request' }}
 
   create_issue_on_failure:
     needs: [build-and-test, nightly_release, build_and_publish_docker_image]
@@ -162,10 +169,10 @@ jobs:
       issues: write
 
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Create an issue
-        uses: XRPLF/actions/create-issue@2b8bc36af85b88bca0dd7bfac2e2dc05f94ad712
+        uses: XRPLF/actions/create-issue@fbcc16eb7f20dc3199eaf1aed0d3523a5ba9008c
         with:
           title: "Nightly release failed 🌙"
           body: ""

.github/workflows/pre-commit.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   run-hooks:
-    uses: XRPLF/actions/.github/workflows/pre-commit.yml@cba1f0891650baf1a9c88624dc2d72573be2eb81
+    uses: XRPLF/actions/.github/workflows/pre-commit.yml@5e942d61bf32f7557a7c159cfac4712a687b3e3a
     with:
       runs_on: heavy
       container: '{ "image": "ghcr.io/xrplf/clio-pre-commit:14342e087ceb8b593027198bf9ef06a43833c696" }'

.github/workflows/release.yml

@@ -22,19 +22,22 @@ jobs:
       matrix:
         include:
           - os: macos15
-            compiler: apple-clang
+            conan_profile: apple-clang
             build_type: Release
+            static: false
           - os: heavy
-            compiler: gcc
+            conan_profile: gcc
             build_type: Release
-            container: '{ "image": "ghcr.io/xrplf/xrpld/nix-ubuntu:sha-cb2642b" }'
+            static: true
+            container: '{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }'
 
     uses: ./.github/workflows/reusable-build-test.yml
     with:
       runs_on: ${{ matrix.os }}
       container: ${{ matrix.container }}
-      compiler: ${{ matrix.compiler }}
+      conan_profile: ${{ matrix.conan_profile }}
       build_type: ${{ matrix.build_type }}
+      static: ${{ matrix.static }}
       run_unit_tests: true
       run_integration_tests: true
       upload_clio_server: true
@@ -48,12 +51,13 @@ jobs:
     uses: ./.github/workflows/reusable-build.yml
     with:
       runs_on: heavy
-      container: '{ "image": "ghcr.io/xrplf/xrpld/nix-ubuntu:sha-cb2642b" }'
-      compiler: gcc
+      container: '{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }'
+      conan_profile: gcc
       build_type: Release
       download_ccache: false
       upload_ccache: false
       code_coverage: false
+      static: true
       upload_clio_server: false
       package: true
       version: ${{ github.event_name == 'push' && github.ref_name || '' }}

.github/workflows/reusable-build-test.yml

@@ -13,17 +13,11 @@ on:
         required: true
         type: string
 
-      compiler:
-        description: 'Compiler to build with ("gcc", "clang" or "apple-clang")'
+      conan_profile:
+        description: Conan profile to use
         required: true
         type: string
 
-      sanitizers:
-        description: 'Sanitizers to enable ("address", "thread", "undefinedbehavior" or empty)'
-        required: false
-        type: string
-        default: ""
-
       build_type:
         description: Build type
         required: true
@@ -41,6 +35,12 @@ on:
         type: boolean
         default: false
 
+      static:
+        description: Whether to build static binaries
+        required: true
+        type: boolean
+        default: true
+
       run_unit_tests:
         description: Whether to run unit tests
         required: true
@@ -81,12 +81,12 @@ jobs:
     with:
       runs_on: ${{ inputs.runs_on }}
       container: ${{ inputs.container }}
-      compiler: ${{ inputs.compiler }}
-      sanitizers: ${{ inputs.sanitizers }}
+      conan_profile: ${{ inputs.conan_profile }}
       build_type: ${{ inputs.build_type }}
       download_ccache: ${{ inputs.download_ccache }}
       upload_ccache: ${{ inputs.upload_ccache }}
       code_coverage: false
+      static: ${{ inputs.static }}
       upload_clio_server: ${{ inputs.upload_clio_server }}
       targets: ${{ inputs.targets }}
       analyze_build_time: false
@@ -99,8 +99,7 @@ jobs:
     with:
       runs_on: ${{ inputs.runs_on }}
       container: ${{ inputs.container }}
-      compiler: ${{ inputs.compiler }}
-      sanitizers: ${{ inputs.sanitizers }}
+      conan_profile: ${{ inputs.conan_profile }}
       build_type: ${{ inputs.build_type }}
       run_unit_tests: ${{ inputs.run_unit_tests }}
       run_integration_tests: ${{ inputs.run_integration_tests }}

.github/workflows/reusable-build.yml

@@ -13,17 +13,11 @@ on:
         required: true
         type: string
 
-      compiler:
-        description: 'Compiler to build with ("gcc", "clang" or "apple-clang")'
+      conan_profile:
+        description: Conan profile to use
         required: true
         type: string
 
-      sanitizers:
-        description: 'Sanitizers to enable ("address", "thread", "undefinedbehavior" or empty)'
-        required: false
-        type: string
-        default: ""
-
       build_type:
         description: Build type
         required: true
@@ -46,6 +40,11 @@ on:
         required: true
         type: boolean
 
+      static:
+        description: Whether to build static binaries
+        required: true
+        type: boolean
+
       upload_clio_server:
         description: Whether to upload clio_server
         required: true
@@ -91,7 +90,7 @@ jobs:
         if: ${{ runner.os == 'macOS' }}
         uses: XRPLF/actions/cleanup-workspace@c7d9ce5ebb03c752a354889ecd870cadfc2b1cd4
 
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
 
@@ -103,44 +102,40 @@ jobs:
       - name: Print build environment
         uses: XRPLF/actions/print-build-env@59dec886e4afb05a1724443af08baccbc045b574
 
-      - name: Set compiler environment
-        if: ${{ runner.os == 'Linux' }}
-        uses: ./.github/actions/set-compiler-env
-        with:
-          compiler: ${{ inputs.compiler }}
+      - name: Setup conan on macOS
+        if: ${{ runner.os == 'macOS' }}
+        run: ./.github/scripts/conan/init.sh
 
-      - name: Setup conan
-        run: conan/init.sh
-
-      - name: Generate build identifier
-        uses: ./.github/actions/build-identifier
-        id: build_identifier
+      - name: Generate cache key
+        uses: ./.github/actions/cache-key
+        id: cache_key
         with:
+          conan_profile: ${{ inputs.conan_profile }}
           build_type: ${{ inputs.build_type }}
-          compiler: ${{ inputs.compiler }}
           code_coverage: ${{ inputs.code_coverage }}
-          sanitizers: ${{ inputs.sanitizers }}
 
       - name: Restore ccache cache
         if: ${{ inputs.download_ccache && github.ref != 'refs/heads/develop' }}
         uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: ${{ env.CCACHE_DIR }}
-          key: ${{ steps.build_identifier.outputs.cache_key }}
+          key: ${{ steps.cache_key.outputs.key }}
           restore-keys: |
-            ${{ steps.build_identifier.outputs.build_identifier }}
+            ${{ steps.cache_key.outputs.restore_keys }}
 
       - name: Run conan
         uses: ./.github/actions/conan
         with:
+          conan_profile: ${{ inputs.conan_profile }}
           build_type: ${{ inputs.build_type }}
-          sanitizers: ${{ inputs.sanitizers }}
 
       - name: Run CMake
         uses: ./.github/actions/cmake
         with:
+          conan_profile: ${{ inputs.conan_profile }}
           build_type: ${{ inputs.build_type }}
           code_coverage: ${{ inputs.code_coverage }}
+          static: ${{ inputs.static }}
           time_trace: ${{ inputs.analyze_build_time }}
           package: ${{ inputs.package }}
           version: ${{ inputs.version }}
@@ -154,14 +149,14 @@ jobs:
         if: ${{ inputs.analyze_build_time }}
         run: |
           ClangBuildAnalyzer --all build/ build_time_report.bin
-          ClangBuildAnalyzer --analyze build_time_report.bin >build_time_report.txt
+          ClangBuildAnalyzer --analyze build_time_report.bin > build_time_report.txt
           cat build_time_report.txt
 
       - name: Upload build time analyze report
         if: ${{ inputs.analyze_build_time }}
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
-          name: build_time_report_${{ steps.build_identifier.outputs.build_identifier }}
+          name: build_time_report_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
           path: build_time_report.txt
 
       - name: Show ccache's statistics and zero it
@@ -175,42 +170,42 @@ jobs:
         uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: ${{ env.CCACHE_DIR }}
-          key: ${{ steps.build_identifier.outputs.cache_key }}
+          key: ${{ steps.cache_key.outputs.key }}
 
       - name: Strip unit_tests
-        if: ${{ inputs.sanitizers == '' && !inputs.code_coverage && !inputs.analyze_build_time }}
+        if: ${{ !endsWith(inputs.conan_profile, 'san') && !inputs.code_coverage && !inputs.analyze_build_time }}
         run: strip build/clio_tests
 
       - name: Strip integration_tests
-        if: ${{ inputs.sanitizers == '' && !inputs.code_coverage && !inputs.analyze_build_time }}
+        if: ${{ !endsWith(inputs.conan_profile, 'san') && !inputs.code_coverage && !inputs.analyze_build_time }}
         run: strip build/clio_integration_tests
 
       - name: Upload clio_server
         if: ${{ inputs.upload_clio_server && !inputs.code_coverage && !inputs.analyze_build_time }}
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
-          name: clio_server_${{ steps.build_identifier.outputs.build_identifier }}
+          name: clio_server_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
           path: build/clio_server
 
       - name: Upload clio_tests
         if: ${{ !inputs.code_coverage && !inputs.analyze_build_time && !inputs.package }}
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
-          name: clio_tests_${{ steps.build_identifier.outputs.build_identifier }}
+          name: clio_tests_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
           path: build/clio_tests
 
       - name: Upload clio_integration_tests
         if: ${{ !inputs.code_coverage && !inputs.analyze_build_time && !inputs.package }}
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
-          name: clio_integration_tests_${{ steps.build_identifier.outputs.build_identifier }}
+          name: clio_integration_tests_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
           path: build/clio_integration_tests
 
       - name: Upload Clio Linux package
         if: ${{ inputs.package }}
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
-          name: clio_deb_package_${{ steps.build_identifier.outputs.build_identifier }}
+          name: clio_deb_package_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
           path: build/*.deb
 
       # This is run as part of the build job, because it requires the following:
@@ -232,13 +227,13 @@ jobs:
           set -e
           EXPECTED_VERSION="clio-${INPUT_VERSION}"
           if [[ "${BUILD_TYPE}" == "Debug" ]]; then
-              EXPECTED_VERSION="${EXPECTED_VERSION}+DEBUG"
+            EXPECTED_VERSION="${EXPECTED_VERSION}+DEBUG"
           fi
 
           actual_version=$(./build/clio_server --version | head -n 1)
           if [[ "${actual_version}" != "${EXPECTED_VERSION}" ]]; then
-              echo "Expected version '${EXPECTED_VERSION}', but got '${actual_version}'"
-              exit 1
+            echo "Expected version '${EXPECTED_VERSION}', but got '${actual_version}'"
+            exit 1
           fi
 
   # `codecov/codecov-action` will rerun `gcov` if it's available and build directory is present

.github/workflows/reusable-release.yml

@@ -46,7 +46,7 @@ jobs:
   release:
     runs-on: heavy
     container:
-      image: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-cb2642b
+      image: ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696
     env:
       GH_REPO: ${{ github.repository }}
       GH_TOKEN: ${{ github.token }}
@@ -55,7 +55,7 @@ jobs:
       contents: write
 
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
 
@@ -81,9 +81,9 @@ jobs:
         env:
           RELEASE_HEADER: ${{ inputs.header }}
         run: |
-          echo "# Release notes" >"${RUNNER_TEMP}/release_notes.md"
-          echo "" >>"${RUNNER_TEMP}/release_notes.md"
-          printf '%s\n' "${RELEASE_HEADER}" >>"${RUNNER_TEMP}/release_notes.md"
+          echo "# Release notes" > "${RUNNER_TEMP}/release_notes.md"
+          echo "" >> "${RUNNER_TEMP}/release_notes.md"
+          printf '%s\n' "${RELEASE_HEADER}" >> "${RUNNER_TEMP}/release_notes.md"
 
       - name: Generate changelog
         if: ${{ inputs.generate_changelog }}
@@ -91,7 +91,7 @@ jobs:
           LAST_TAG="$(gh release view --json tagName -q .tagName --repo XRPLF/clio)"
           LAST_TAG_COMMIT="$(git rev-parse $LAST_TAG)"
           BASE_COMMIT="$(git merge-base HEAD $LAST_TAG_COMMIT)"
-          git-cliff "${BASE_COMMIT}..HEAD" --ignore-tags "nightly|-b|-rc" >>"${RUNNER_TEMP}/release_notes.md"
+          git-cliff "${BASE_COMMIT}..HEAD" --ignore-tags "nightly|-b|-rc" >> "${RUNNER_TEMP}/release_notes.md"
 
       - name: Upload release notes
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
@@ -106,10 +106,10 @@ jobs:
         run: |
           RELEASES_TO_DELETE=$(gh release list --limit 50 --repo "${GH_REPO}" | grep -E "${DELETE_PATTERN}" | awk -F'\t' '{print $3}' || true)
           if [ -n "$RELEASES_TO_DELETE" ]; then
-              for RELEASE in $RELEASES_TO_DELETE; do
-                  echo "Deleting release: $RELEASE"
-                  gh release delete "$RELEASE" --repo "${GH_REPO}" --yes --cleanup-tag
-              done
+            for RELEASE in $RELEASES_TO_DELETE; do
+              echo "Deleting release: $RELEASE"
+              gh release delete "$RELEASE" --repo "${GH_REPO}" --yes --cleanup-tag
+            done
           fi
 
       - name: Publish release
@@ -121,9 +121,9 @@ jobs:
           DRAFT_OPTION: ${{ inputs.draft && '--draft' || '' }}
         run: |
           gh release create "${RELEASE_VERSION}" \
-              ${PRERELEASE_OPTION} \
-              --title "${RELEASE_TITLE}" \
-              --target "${GITHUB_SHA}" \
-              ${DRAFT_OPTION} \
-              --notes-file "${RUNNER_TEMP}/release_notes.md" \
-              ./release_artifacts/clio_*
+            ${PRERELEASE_OPTION} \
+            --title "${RELEASE_TITLE}" \
+            --target "${GITHUB_SHA}" \
+            ${DRAFT_OPTION} \
+            --notes-file "${RUNNER_TEMP}/release_notes.md" \
+            ./release_artifacts/clio_*

.github/workflows/reusable-test.yml

@@ -13,17 +13,11 @@ on:
         required: true
         type: string
 
-      compiler:
-        description: 'Compiler the binaries were built with ("gcc", "clang" or "apple-clang")'
+      conan_profile:
+        description: Conan profile to use
         required: true
         type: string
 
-      sanitizers:
-        description: 'Sanitizers the binaries were built with ("address", "thread", "undefinedbehavior" or empty)'
-        required: false
-        type: string
-        default: ""
-
       build_type:
         description: Build type
         required: true
@@ -56,23 +50,13 @@ jobs:
         if: ${{ runner.os == 'macOS' }}
         uses: XRPLF/actions/cleanup-workspace@c7d9ce5ebb03c752a354889ecd870cadfc2b1cd4
 
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
 
-      - name: Generate build identifier
-        uses: ./.github/actions/build-identifier
-        id: build_identifier
-        with:
-          build_type: ${{ inputs.build_type }}
-          compiler: ${{ inputs.compiler }}
-          # code_coverage is run inside build environment
-          code_coverage: false
-          sanitizers: ${{ inputs.sanitizers }}
-
       - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
-          name: clio_tests_${{ steps.build_identifier.outputs.build_identifier }}
+          name: clio_tests_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
 
       - name: Make clio_tests executable
         run: chmod +x ./clio_tests
@@ -83,11 +67,11 @@ jobs:
         run: ./clio_tests
 
       - name: Create an issue
-        if: ${{ steps.run_clio_tests.outcome == 'failure' && inputs.sanitizers != '' }}
-        uses: XRPLF/actions/create-issue@2b8bc36af85b88bca0dd7bfac2e2dc05f94ad712
+        if: ${{ steps.run_clio_tests.outcome == 'failure' && endsWith(inputs.conan_profile, 'san') }}
+        uses: XRPLF/actions/create-issue@fbcc16eb7f20dc3199eaf1aed0d3523a5ba9008c
         with:
-          title: "[${{ inputs.compiler }} ${{ inputs.sanitizers }}] reported issues"
-          body: "Clio tests failed one or more sanitizers checks when built with `${{ inputs.compiler }}` and the `${{ inputs.sanitizers }}` sanitizers."
+          title: "[${{ inputs.conan_profile }}] reported issues"
+          body: "Clio tests failed one or more sanitizer checks when built with `${{ inputs.conan_profile }}`."
           labels: "bug"
           assignees: "godexsoft,kuznetsss,mathbunnyru"
 
@@ -116,20 +100,6 @@ jobs:
         if: ${{ runner.os == 'macOS' }}
         uses: XRPLF/actions/cleanup-workspace@c7d9ce5ebb03c752a354889ecd870cadfc2b1cd4
 
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-        with:
-          fetch-depth: 0
-
-      - name: Generate build identifier
-        uses: ./.github/actions/build-identifier
-        id: build_identifier
-        with:
-          build_type: ${{ inputs.build_type }}
-          compiler: ${{ inputs.compiler }}
-          # code_coverage is run inside build environment
-          code_coverage: false
-          sanitizers: ${{ inputs.sanitizers }}
-
       - name: Delete and start colima (macOS)
         # This is a temporary workaround for colima issues on macOS runners
         if: ${{ runner.os == 'macOS' }}
@@ -137,38 +107,32 @@ jobs:
           colima delete --force
           colima start
 
-      - name: Remove leftover scylladb container (macOS)
-        # A previous run that didn't clean up (e.g. a cancelled job) can leave the
-        # container behind, otherwise the name is still taken on the persistent runner.
-        if: ${{ runner.os == 'macOS' }}
-        run: docker rm --force scylladb || true
-
       - name: Spin up scylladb (macOS)
         if: ${{ runner.os == 'macOS' }}
         timeout-minutes: 1
         run: |
           docker run \
-              --detach \
-              --name scylladb \
-              --health-cmd "cqlsh -e 'describe cluster'" \
-              --health-interval 10s \
-              --health-timeout 5s \
-              --health-retries 5 \
-              --publish 9042:9042 \
-              --memory 16G \
-              scylladb/scylla
+            --detach \
+            --name scylladb \
+            --health-cmd "cqlsh -e 'describe cluster'" \
+            --health-interval 10s \
+            --health-timeout 5s \
+            --health-retries 5 \
+            --publish 9042:9042 \
+            --memory 16G \
+            scylladb/scylla
 
       - name: Wait for scylladb container to be healthy (macOS)
         if: ${{ runner.os == 'macOS' }}
         timeout-minutes: 1
         run: |
           until [ "$(docker inspect -f '{{.State.Health.Status}}' scylladb)" == "healthy" ]; do
-              sleep 1
+            sleep 1
           done
 
       - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
-          name: clio_integration_tests_${{ steps.build_identifier.outputs.build_identifier }}
+          name: clio_integration_tests_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
 
       - name: Run clio_integration_tests
         run: |

.github/workflows/reusable-upload-coverage-report.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
 
@@ -27,8 +27,8 @@ jobs:
           path: build
 
       - name: Upload coverage report
-        if: ${{ github.repository == 'XRPLF/clio' && hashFiles('build/coverage_report.xml') != '' }}
-        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
+        if: ${{ hashFiles('build/coverage_report.xml') != '' }}
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
         with:
           files: build/coverage_report.xml
           fail_ci_if_error: true

.github/workflows/sanitizers.yml

@@ -19,7 +19,7 @@ on:
       - conanfile.py
       - conan.lock
       - "cmake/**"
-      # We don't run sanitizers on code change, because it takes too long
+      # We don't run sanitizer on code change, because it takes too long
       # - "src/**"
       # - "tests/**"
 
@@ -36,18 +36,18 @@ jobs:
       fail-fast: false
       matrix:
         compiler: [gcc, clang]
-        sanitizers: [address, thread, undefinedbehavior]
+        sanitizer_ext: [.asan, .tsan, .ubsan]
         build_type: [Release, Debug]
 
     uses: ./.github/workflows/reusable-build-test.yml
     with:
       runs_on: heavy
-      container: '{ "image": "ghcr.io/xrplf/xrpld/nix-ubuntu:sha-cb2642b" }'
+      container: '{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }'
       download_ccache: false
       upload_ccache: false
-      compiler: ${{ matrix.compiler }}
-      sanitizers: ${{ matrix.sanitizers }}
+      conan_profile: ${{ matrix.compiler }}${{ matrix.sanitizer_ext }}
       build_type: ${{ matrix.build_type }}
+      static: false
       run_unit_tests: true
       run_integration_tests: false
       upload_clio_server: false

.github/workflows/update-docker-ci.yml

@@ -0,0 +1,364 @@
+name: Update CI docker image
+
+on:
+  pull_request:
+    paths:
+      - .github/workflows/update-docker-ci.yml
+
+      - ".github/actions/build-docker-image/**"
+
+      - "docker/**"
+      - "!docker/clio/**"
+      - "!docker/develop/**"
+  push:
+    branches: [develop]
+    paths:
+      - .github/workflows/update-docker-ci.yml
+
+      - ".github/actions/build-docker-image/**"
+
+      - "docker/**"
+      - "!docker/clio/**"
+      - "!docker/develop/**"
+  workflow_dispatch:
+
+concurrency:
+  # Only matches 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: 15
+  GCC_VERSION: 15.2.0
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  repo:
+    name: Calculate repo name
+    runs-on: ubuntu-latest
+    outputs:
+      GHCR_REPO: ${{ steps.set-ghcr-repo.outputs.GHCR_REPO }}
+
+    steps:
+      - name: Set GHCR_REPO
+        id: set-ghcr-repo
+        run: |
+          echo "GHCR_REPO=$(echo ghcr.io/${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" >> ${GITHUB_OUTPUT}
+
+  gcc-amd64:
+    name: Build and push GCC docker image (amd64)
+    runs-on: heavy
+    needs: repo
+
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@9426d40962ed5378910ee2e21d5f8c6fcbf2dd96 # v47.0.6
+        with:
+          files: "docker/compilers/gcc/**"
+
+      - uses: ./.github/actions/build-docker-image
+        if: ${{ steps.changed-files.outputs.any_changed == 'true' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
+          DOCKERHUB_PW: ${{ secrets.DOCKERHUB_PW }}
+        with:
+          images: |
+            ${{ needs.repo.outputs.GHCR_REPO }}/clio-gcc
+            ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_gcc' || '' }}
+          push_image: ${{ github.event_name != 'pull_request' }}
+          directory: docker/compilers/gcc
+          tags: |
+            type=raw,value=amd64-latest
+            type=raw,value=amd64-${{ env.GCC_MAJOR_VERSION }}
+            type=raw,value=amd64-${{ env.GCC_VERSION }}
+            type=raw,value=amd64-${{ github.sha }}
+          platforms: linux/amd64
+          build_args: |
+            GCC_MAJOR_VERSION=${{ env.GCC_MAJOR_VERSION }}
+            GCC_VERSION=${{ env.GCC_VERSION }}
+          dockerhub_repo: ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_gcc' || '' }}
+          dockerhub_description: GCC compiler for XRPLF/clio.
+
+  gcc-arm64:
+    name: Build and push GCC docker image (arm64)
+    runs-on: heavy-arm64
+    needs: repo
+
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@9426d40962ed5378910ee2e21d5f8c6fcbf2dd96 # v47.0.6
+        with:
+          files: "docker/compilers/gcc/**"
+
+      - uses: ./.github/actions/build-docker-image
+        if: ${{ steps.changed-files.outputs.any_changed == 'true' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
+          DOCKERHUB_PW: ${{ secrets.DOCKERHUB_PW }}
+        with:
+          images: |
+            ${{ needs.repo.outputs.GHCR_REPO }}/clio-gcc
+            ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_gcc' || '' }}
+          push_image: ${{ github.event_name != 'pull_request' }}
+          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-${{ github.sha }}
+          platforms: linux/arm64
+          build_args: |
+            GCC_MAJOR_VERSION=${{ env.GCC_MAJOR_VERSION }}
+            GCC_VERSION=${{ env.GCC_VERSION }}
+          dockerhub_repo: ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_gcc' || '' }}
+          dockerhub_description: GCC compiler for XRPLF/clio.
+
+  gcc-merge:
+    name: Merge and push multi-arch GCC docker image
+    runs-on: heavy
+    needs: [repo, gcc-amd64, gcc-arm64]
+
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@9426d40962ed5378910ee2e21d5f8c6fcbf2dd96 # v47.0.6
+        with:
+          files: "docker/compilers/gcc/**"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
+
+      - name: Login to GitHub Container Registry
+        if: ${{ github.event_name != 'pull_request' }}
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Login to DockerHub
+        if: ${{ github.repository_owner == 'XRPLF' && github.event_name != 'pull_request' }}
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_PW }}
+
+      - name: Create and push multi-arch manifest
+        if: ${{ github.event_name != 'pull_request' && steps.changed-files.outputs.any_changed == 'true' }}
+        run: |
+          push_image() {
+            image=$1
+
+            docker buildx imagetools create \
+                -t $image:latest \
+                -t $image:${{ env.GCC_MAJOR_VERSION }} \
+                -t $image:${{ env.GCC_VERSION }} \
+                -t $image:${{ github.sha }} \
+                $image:arm64-latest \
+                $image:amd64-latest
+          }
+          push_image ${{ needs.repo.outputs.GHCR_REPO }}/clio-gcc
+          if [[ ${{ github.repository_owner }} == 'XRPLF' ]]; then
+            push_image rippleci/clio_clang
+          fi
+
+  clang:
+    name: Build and push Clang docker image
+    runs-on: heavy
+    needs: repo
+
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@9426d40962ed5378910ee2e21d5f8c6fcbf2dd96 # v47.0.6
+        with:
+          files: "docker/compilers/clang/**"
+
+      - uses: ./.github/actions/build-docker-image
+        if: ${{ steps.changed-files.outputs.any_changed == 'true' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
+          DOCKERHUB_PW: ${{ secrets.DOCKERHUB_PW }}
+        with:
+          images: |
+            ${{ needs.repo.outputs.GHCR_REPO }}/clio-clang
+            ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_clang' || '' }}
+          push_image: ${{ github.event_name != 'pull_request' }}
+          directory: docker/compilers/clang
+          tags: |
+            type=raw,value=latest
+            type=raw,value=${{ env.CLANG_MAJOR_VERSION }}
+            type=raw,value=${{ github.sha }}
+          platforms: linux/amd64,linux/arm64
+          build_args: |
+            CLANG_MAJOR_VERSION=${{ env.CLANG_MAJOR_VERSION }}
+          dockerhub_repo: ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_clang' || '' }}
+          dockerhub_description: Clang compiler for XRPLF/clio.
+
+  tools-amd64:
+    name: Build and push tools docker image (amd64)
+    runs-on: heavy
+    needs: [repo, gcc-merge]
+
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@9426d40962ed5378910ee2e21d5f8c6fcbf2dd96 # v47.0.6
+        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: |
+            ${{ needs.repo.outputs.GHCR_REPO }}/clio-tools
+          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: |
+            GHCR_REPO=${{ needs.repo.outputs.GHCR_REPO }}
+            GCC_VERSION=${{ env.GCC_VERSION }}
+
+  tools-arm64:
+    name: Build and push tools docker image (arm64)
+    runs-on: heavy-arm64
+    needs: [repo, gcc-merge]
+
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@9426d40962ed5378910ee2e21d5f8c6fcbf2dd96 # v47.0.6
+        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: |
+            ${{ needs.repo.outputs.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: |
+            GHCR_REPO=${{ needs.repo.outputs.GHCR_REPO }}
+            GCC_VERSION=${{ env.GCC_VERSION }}
+
+  tools-merge:
+    name: Merge and push multi-arch tools docker image
+    runs-on: heavy
+    needs: [repo, tools-amd64, tools-arm64]
+
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@9426d40962ed5378910ee2e21d5f8c6fcbf2dd96 # v47.0.6
+        with:
+          files: "docker/tools/**"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
+
+      - name: Login to GitHub Container Registry
+        if: ${{ github.event_name != 'pull_request' }}
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create and push multi-arch manifest
+        if: ${{ github.event_name != 'pull_request' && steps.changed-files.outputs.any_changed == 'true' }}
+        run: |
+          image=${{ needs.repo.outputs.GHCR_REPO }}/clio-tools
+          docker buildx imagetools create \
+            -t $image:latest \
+            -t $image:${{ github.sha }} \
+            $image:arm64-latest \
+            $image:amd64-latest
+
+  pre-commit:
+    name: Build and push pre-commit docker image
+    runs-on: heavy
+    needs: [repo, tools-merge]
+
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: ./.github/actions/build-docker-image
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          images: |
+            ${{ needs.repo.outputs.GHCR_REPO }}/clio-pre-commit
+          push_image: ${{ github.event_name != 'pull_request' }}
+          directory: docker/pre-commit
+          tags: |
+            type=raw,value=latest
+            type=raw,value=${{ github.sha }}
+          platforms: linux/amd64,linux/arm64
+          build_args: |
+            GHCR_REPO=${{ needs.repo.outputs.GHCR_REPO }}
+
+  ci:
+    name: Build and push CI docker image
+    runs-on: heavy
+    needs: [repo, gcc-merge, clang, tools-merge]
+
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: ./.github/actions/build-docker-image
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
+          DOCKERHUB_PW: ${{ secrets.DOCKERHUB_PW }}
+        with:
+          images: |
+            ${{ needs.repo.outputs.GHCR_REPO }}/clio-ci
+            ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_ci' || '' }}
+          push_image: ${{ github.event_name != 'pull_request' }}
+          directory: docker/ci
+          tags: |
+            type=raw,value=latest
+            type=raw,value=gcc_${{ env.GCC_MAJOR_VERSION }}_clang_${{ env.CLANG_MAJOR_VERSION }}
+            type=raw,value=${{ github.sha }}
+          platforms: linux/amd64,linux/arm64
+          build_args: |
+            GHCR_REPO=${{ needs.repo.outputs.GHCR_REPO }}
+            CLANG_MAJOR_VERSION=${{ env.CLANG_MAJOR_VERSION }}
+            GCC_MAJOR_VERSION=${{ env.GCC_MAJOR_VERSION }}
+            GCC_VERSION=${{ env.GCC_VERSION }}
+          dockerhub_repo: ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_ci' || '' }}
+          dockerhub_description: CI image for XRPLF/clio.

.github/workflows/upload-conan-deps.yml

@@ -52,14 +52,14 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Calculate conan matrix
         id: set-matrix
-        run: .github/scripts/conan/generate_matrix.py >>"${GITHUB_OUTPUT}"
+        run: .github/scripts/conan/generate_matrix.py >> "${GITHUB_OUTPUT}"
 
   upload-conan-deps:
-    name: Build ${{ matrix.compiler }} ${{ matrix.sanitizers }} ${{ matrix.build_type }}
+    name: Build ${{ matrix.compiler }}${{ matrix.sanitizer_ext }} ${{ matrix.build_type }}
 
     needs: generate-matrix
 
@@ -71,8 +71,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     container: ${{ matrix.container != '' && fromJson(matrix.container) || null }}
 
+    env:
+      CONAN_PROFILE: ${{ matrix.compiler }}${{ matrix.sanitizer_ext }}
+
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Prepare runner
         uses: XRPLF/actions/prepare-runner@90f11ee655d1687824fb8793db770477d52afbab
@@ -82,35 +85,28 @@ jobs:
       - name: Print build environment
         uses: XRPLF/actions/print-build-env@59dec886e4afb05a1724443af08baccbc045b574
 
-      - name: Set compiler environment
-        if: ${{ runner.os == 'Linux' }}
-        uses: ./.github/actions/set-compiler-env
-        with:
-          compiler: ${{ matrix.compiler }}
-
-      - name: Setup conan
-        run: conan/init.sh
+      - name: Setup conan on macOS
+        if: ${{ runner.os == 'macOS' }}
+        run: ./.github/scripts/conan/init.sh
 
       - name: Show conan profile
-        env:
-          SANITIZERS: ${{ matrix.sanitizers }}
-        run: conan profile show --profile:all ci
+        run: conan profile show --profile:all ${{ env.CONAN_PROFILE }}
 
       - name: Run conan
         uses: ./.github/actions/conan
         with:
-          sanitizers: ${{ matrix.sanitizers }}
+          conan_profile: ${{ env.CONAN_PROFILE }}
           # We check that everything builds fine from source on scheduled runs
           # But we do build and upload packages with build=missing by default
           force_conan_source_build: ${{ github.event_name == 'schedule' || github.event.inputs.force_source_build == 'true' }}
           build_type: ${{ matrix.build_type }}
 
-      - name: Log into Conan remote
-        if: ${{ github.repository == 'XRPLF/clio' && github.event_name != 'pull_request' }}
+      - name: Login to Conan
+        if: ${{ github.repository_owner == 'XRPLF' && github.event_name != 'pull_request' }}
         run: conan remote login -p ${{ secrets.CONAN_PASSWORD }} xrplf ${{ secrets.CONAN_USERNAME }}
 
       - name: Upload Conan packages
-        if: ${{ github.repository == 'XRPLF/clio' && github.event_name != 'pull_request' && github.event_name != 'schedule' }}
+        if: ${{ github.repository_owner == 'XRPLF' && github.event_name != 'pull_request' && github.event_name != 'schedule' }}
         env:
           FORCE_OPTION: ${{ github.event.inputs.force_upload == 'true' && '--force' || '' }}
         run: conan upload "*" -r=xrplf --confirm ${FORCE_OPTION}

.pre-commit-config.yaml

@@ -59,7 +59,7 @@ repos:
           ]
 
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 4160603246a6b365d4a2af661c6d71b0a0f50478 # frozen: 26.5.1
+    rev: fa505ab9c3e0fedafe1709fd7ac2b5f8996c670d # frozen: 26.3.1
     hooks:
       - id: black
 
@@ -67,7 +67,7 @@ repos:
     rev: 05c1426671b9237fb5e1444dd63aa5731bec0dfb # frozen: v3.13.1-1
     hooks:
       - id: shfmt
-        args: [--write, --indent=4, --case-indent=true]
+        args: ["-i", "4", "--write"]
 
   # Running some C++ hooks before clang-format
   # to ensure that the style is consistent.
@@ -94,14 +94,14 @@ repos:
         language: script
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: dd18dad857d6133e90bbe478f4f2f22ec0030269 # frozen: v22.1.5
+    rev: 39233709be54124a7371a50cbfc5325bd4fb9d90 # frozen: v22.1.4
     hooks:
       - id: clang-format
         args: [--style=file]
         types: [c++]
 
   - repo: https://github.com/BlankSpruce/gersemi-pre-commit
-    rev: e98930bdc210d3387007f9252d8c1694ea7e410f # frozen: 0.27.7
+    rev: fc2d0aefdd73b719180177a2d4a7a56cef4d3ab6 # frozen: 0.27.2
     hooks:
       - id: gersemi
 

CMakeLists.txt

@@ -16,6 +16,7 @@ option(docs "Generate doxygen docs" FALSE)
 option(coverage "Build test coverage report" FALSE)
 option(package "Create distribution packages" FALSE)
 option(lint "Run clang-tidy checks during compilation" FALSE)
+option(static "Statically linked Clio" FALSE)
 option(snapshot "Build snapshot tool" FALSE)
 option(
     time_trace
@@ -24,7 +25,10 @@ option(
 )
 
 # ========================================================================== #
+set(san "" CACHE STRING "Add sanitizer instrumentation")
 set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
+set_property(CACHE san PROPERTY STRINGS ";undefined;memory;address;thread")
+# ========================================================================== #
 
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 
@@ -38,21 +42,6 @@ add_library(clio_options INTERFACE)
 target_compile_features(clio_options INTERFACE cxx_std_23) # Clio needs c++23 but deps can remain c++20 for now
 target_include_directories(clio_options INTERFACE ${CMAKE_SOURCE_DIR}/src)
 
-if(
-    CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
-    OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
-)
-    # Note: -static-libstdc++ can statically link both libstdc++ and libc++
-    target_link_libraries(
-        clio_options
-        INTERFACE -static-libstdc++ -static-libgcc
-    )
-endif()
-
-# Apply sanitizer instrumentation if requested and define SANITIZERS_ENABLED.
-# Must come before the modules and subdirectories below that key off it.
-include(Sanitizers)
-
 if(verbose)
     set(CMAKE_VERBOSE_MAKEFILE TRUE)
 endif()
@@ -61,7 +50,6 @@ endif()
 include(CheckCompiler)
 include(Settings)
 include(SourceLocation)
-include(PatchNixBinary)
 
 # Clio deps
 include(deps/libxrpl)
@@ -80,6 +68,29 @@ if(benchmark)
     add_subdirectory(benchmarks)
 endif()
 
+# Enable selected sanitizer if enabled via `san`
+if(san)
+    set(SUPPORTED_SANITIZERS "address" "thread" "memory" "undefined")
+    if(NOT san IN_LIST SUPPORTED_SANITIZERS)
+        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_link_libraries(clio_options INTERFACE ${SAN_FLAG} ${SAN_LIB})
+endif()
+
 # Generate `docs` target for doxygen documentation if enabled Note: use `make docs` to generate the documentation
 if(docs)
     add_subdirectory(docs)

benchmarks/rpc/WorkQueueBenchmarks.cpp

@@ -26,7 +26,7 @@ using namespace util::config;
 
 namespace {
 
-auto const kConfig = ClioConfigDefinition{
+auto const kCONFIG = ClioConfigDefinition{
     {"prometheus.compress_reply", ConfigValue{ConfigType::Boolean}.defaultValue(true)},
     {"prometheus.enabled", ConfigValue{ConfigType::Boolean}.defaultValue(true)},
     {"log.channels.[].channel", Array{ConfigValue{ConfigType::String}}},
@@ -48,10 +48,10 @@ auto const kConfig = ClioConfigDefinition{
 void
 init()
 {
-    static std::once_flag kOnce;
-    std::call_once(kOnce, [] {
-        PrometheusService::init(kConfig);
-        (void)util::LogService::init(kConfig);
+    static std::once_flag kONCE;
+    std::call_once(kONCE, [] {
+        PrometheusService::init(kCONFIG);
+        (void)util::LogService::init(kCONFIG);
     });
 }
 

benchmarks/util/async/ExecutionContextBenchmarks.cpp

@@ -169,11 +169,11 @@ public:
 static auto
 generateData()
 {
-    constexpr auto kTotal = 10'000;
+    constexpr auto kTOTAL = 10'000;
     std::vector<uint64_t> data;
-    data.reserve(kTotal);
+    data.reserve(kTOTAL);
     util::MTRandomGenerator randomGenerator;
-    for (auto i = 0; i < kTotal; ++i)
+    for (auto i = 0; i < kTOTAL; ++i)
         data.push_back(randomGenerator.uniform(1, 100'000'000));
 
     return data;

benchmarks/util/log/LoggerBenchmark.cpp

@@ -21,7 +21,7 @@
 
 using namespace util;
 
-static constexpr auto kLogFormat = "%Y-%m-%d %H:%M:%S.%f %^%3!l:%n%$ - %v";
+static constexpr auto kLOG_FORMAT = "%Y-%m-%d %H:%M:%S.%f %^%3!l:%n%$ - %v";
 
 struct BenchmarkLoggingInitializer {
     [[nodiscard]] static std::shared_ptr<spdlog::sinks::sink>
@@ -32,7 +32,7 @@ struct BenchmarkLoggingInitializer {
                 .logDir = logDir,
                 .rotation = LogService::RotationParams{.sizeMB = sizeMB, .maxFiles = maxFiles},
             },
-            kLogFormat
+            kLOG_FORMAT
         );
     }
 
@@ -71,9 +71,9 @@ benchmarkConcurrentFileLogging(benchmark::State& state)
         state.PauseTiming();
 
         std::filesystem::create_directories(logDir);
-        static constexpr size_t kQueueSize = 8192;
-        static constexpr size_t kThreadCount = 1;
-        spdlog::init_thread_pool(kQueueSize, kThreadCount);
+        static constexpr size_t kQUEUE_SIZE = 8192;
+        static constexpr size_t kTHREAD_COUNT = 1;
+        spdlog::init_thread_pool(kQUEUE_SIZE, kTHREAD_COUNT);
 
         auto fileSink = BenchmarkLoggingInitializer::createFileSink(logDir, 5, 25);
 

cmake/CheckCompiler.cmake

@@ -19,3 +19,30 @@ else()
         "Supported compilers: AppleClang 15+, Clang 16+, GCC 12+"
     )
 endif()
+
+if(san)
+    string(TOLOWER ${san} san)
+    set(SAN_FLAG "-fsanitize=${san}")
+    set(SAN_LIB "")
+    if(is_gcc)
+        if(san STREQUAL "address")
+            set(SAN_LIB "asan")
+        elseif(san STREQUAL "thread")
+            set(SAN_LIB "tsan")
+        elseif(san STREQUAL "memory")
+            set(SAN_LIB "msan")
+        elseif(san STREQUAL "undefined")
+            set(SAN_LIB "ubsan")
+        endif()
+    endif()
+    set(_saved_CRL ${CMAKE_REQUIRED_LIBRARIES})
+    set(CMAKE_REQUIRED_LIBRARIES "${SAN_FLAG};${SAN_LIB}")
+    check_cxx_compiler_flag(${SAN_FLAG} COMPILER_SUPPORTS_SAN)
+    set(CMAKE_REQUIRED_LIBRARIES ${_saved_CRL})
+    if(NOT COMPILER_SUPPORTS_SAN)
+        message(
+            FATAL_ERROR
+            "${san} sanitizer does not seem to be supported by your compiler"
+        )
+    endif()
+endif()

cmake/PatchNixBinary.cmake

@@ -1,55 +0,0 @@
-#[===================================================================[
-   Patch executables to run in non-Nix environments.
-
-   The Nix-based CI image links binaries against an ELF interpreter (loader)
-   that lives in the Nix store, so the resulting binaries don't run elsewhere
-   (including once installed from the .deb package). `patch_nix_binary` adds a
-   POST_BUILD step that resets the interpreter to the system default loader and
-   drops the rpath.
-
-   This is only active inside the Nix-based image, detected by the presence of
-   /tmp/loader-path.sh (shipped by that image, resolves the default loader). It
-   is skipped for sanitizer builds, whose runtime libraries are resolved through
-   the rpath. Everywhere else `patch_nix_binary` is a no-op.
-#]===================================================================]
-
-include_guard(GLOBAL)
-
-# Provided by the Nix-based CI image; prints the system default ELF loader path.
-set(_loader_path_script "/tmp/loader-path.sh")
-
-if(
-    CMAKE_SYSTEM_NAME STREQUAL "Linux"
-    AND NOT SANITIZERS_ENABLED
-    AND EXISTS "${_loader_path_script}"
-)
-    execute_process(
-        COMMAND "${_loader_path_script}"
-        OUTPUT_VARIABLE DEFAULT_LOADER_PATH
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    find_program(PATCHELF_COMMAND patchelf REQUIRED)
-    set(PATCH_NIX_BINARIES TRUE)
-    message(
-        STATUS
-        "Binaries will be patched to use loader '${DEFAULT_LOADER_PATH}'"
-    )
-else()
-    set(PATCH_NIX_BINARIES FALSE)
-endif()
-
-function(patch_nix_binary target)
-    if(NOT PATCH_NIX_BINARIES)
-        return()
-    endif()
-    add_custom_command(
-        TARGET ${target}
-        POST_BUILD
-        COMMAND
-            "${PATCHELF_COMMAND}" --set-interpreter "${DEFAULT_LOADER_PATH}"
-            --remove-rpath "$<TARGET_FILE:${target}>"
-        COMMENT "Patching ${target}: set default loader, remove rpath"
-        VERBATIM
-    )
-endfunction()

cmake/Sanitizers.cmake

@@ -1,47 +0,0 @@
-#[===================================================================[
-   Apply sanitizer flags built by the Conan profile.
-
-   Parsing, validation, and flag construction are performed in
-   conan/profiles/sanitizers. This module reads the following CMake variables
-   injected by the Conan toolchain via extra_variables:
-
-   - SANITIZERS:                The active sanitizers (e.g. "address").
-   - SANITIZERS_COMPILER_FLAGS: Space-separated compiler flags.
-   - SANITIZERS_LINKER_FLAGS:   Space-separated linker flags.
-
-   It defines SANITIZERS_ENABLED for the rest of the build to key off, and
-   applies the flags to the 'clio_options' interface library.
-#]===================================================================]
-
-include_guard(GLOBAL)
-
-if(NOT DEFINED SANITIZERS)
-    set(SANITIZERS_ENABLED FALSE)
-    return()
-endif()
-set(SANITIZERS_ENABLED TRUE)
-
-message(STATUS "=== Configuring sanitizers ===")
-message(STATUS "  SANITIZERS: ${SANITIZERS}")
-message(STATUS "  Compile flags: ${SANITIZERS_COMPILER_FLAGS}")
-message(STATUS "  Link flags: ${SANITIZERS_LINKER_FLAGS}")
-
-# Flags arrive as space-separated strings; split into CMake lists before use
-separate_arguments(
-    sanitizers_compiler_flags
-    UNIX_COMMAND
-    "${SANITIZERS_COMPILER_FLAGS}"
-)
-separate_arguments(
-    sanitizers_linker_flags
-    UNIX_COMMAND
-    "${SANITIZERS_LINKER_FLAGS}"
-)
-
-target_compile_options(
-    clio_options
-    INTERFACE
-        $<$<COMPILE_LANGUAGE:CXX>:${sanitizers_compiler_flags}>
-        $<$<COMPILE_LANGUAGE:C>:${sanitizers_compiler_flags}>
-)
-target_link_options(clio_options INTERFACE ${sanitizers_linker_flags})

cmake/Settings.cmake

@@ -40,7 +40,7 @@ if(is_appleclang)
     list(APPEND COMPILER_FLAGS -Wreorder-init-list)
 endif()
 
-if(SANITIZERS_ENABLED)
+if(san)
     # When building with sanitizers some compilers will actually produce extra warnings/errors. We don't want this yet,
     # at least not until we have fixed all runtime issues reported by the sanitizers. Once that is done we can start
     # removing some of these and trying to fix it in our codebase. We can never remove all of below because most of them
@@ -85,22 +85,3 @@ target_compile_options(clio_options INTERFACE ${COMPILER_FLAGS})
 
 # Add debug symbols for all builds, including Release. This is needed to get useful stack traces in production.
 target_compile_options(clio_options INTERFACE -g)
-
-# Keep -stdlib=libstdc++ off the compile commands, but preserve it for linking.
-#
-# Conan turns `compiler.libcxx=libstdc++` into `-stdlib=libstdc++` and puts it in CMAKE_CXX_FLAGS, which CMake passes to
-# BOTH compile and link steps. On a normal Clang the compile step consumes it while choosing the C++ stdlib include
-# paths. The Nixpkgs Clang wrapper (used by our CI image) supplies those paths itself (via -nostdinc++), so at compile
-# time the flag is unused -> Clang errors under our -Werror. At link time the flag IS consumed (it selects the C++
-# runtime), so we move it there instead of dropping it entirely.
-get_filename_component(_cxx_real "${CMAKE_CXX_COMPILER}" REALPATH)
-if(
-    _cxx_real MATCHES "^/nix/store/"
-    AND CMAKE_SYSTEM_NAME STREQUAL "Linux"
-    AND is_clang
-    AND CMAKE_CXX_FLAGS MATCHES "stdlib=libstdc"
-)
-    string(REPLACE "-stdlib=libstdc++" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    string(STRIP "${CMAKE_CXX_FLAGS}" CMAKE_CXX_FLAGS)
-    add_link_options($<$<LINK_LANGUAGE:CXX>:-stdlib=libstdc++>)
-endif()

cmake/deps/libbacktrace.cmake

@@ -1,4 +1,4 @@
-if(NOT SANITIZERS_ENABLED)
+if("${san}" STREQUAL "")
     target_compile_definitions(clio_options INTERFACE BOOST_STACKTRACE_LINK)
     target_compile_definitions(
         clio_options

cmake/pkg/postinst

@@ -10,36 +10,36 @@ CLIO_BIN="$CLIO_PREFIX/bin/${CLIO_EXECUTABLE}"
 CLIO_CONFIG="$CLIO_PREFIX/etc/config.json"
 
 case "$1" in
-    configure)
-        if ! id -u "$USER_NAME" >/dev/null 2>&1; then
-            # Users who should not have a home directory should have their home directory set to /nonexistent
-            # https://www.debian.org/doc/debian-policy/ch-opersys.html#non-existent-home-directories
-            useradd \
-                --system \
-                --home-dir /nonexistent \
-                --no-create-home \
-                --shell /usr/sbin/nologin \
-                --comment "system user for ${CLIO_EXECUTABLE}" \
-                --user-group \
-                ${USER_NAME}
-        fi
+configure)
+    if ! id -u "$USER_NAME" >/dev/null 2>&1; then
+        # Users who should not have a home directory should have their home directory set to /nonexistent
+        # https://www.debian.org/doc/debian-policy/ch-opersys.html#non-existent-home-directories
+        useradd \
+            --system \
+            --home-dir /nonexistent \
+            --no-create-home \
+            --shell /usr/sbin/nologin \
+            --comment "system user for ${CLIO_EXECUTABLE}" \
+            --user-group \
+            ${USER_NAME}
+    fi
 
-        install -d -o "$USER_NAME" -g "$GROUP_NAME" /var/log/clio
+    install -d -o "$USER_NAME" -g "$GROUP_NAME" /var/log/clio
 
-        if [ -f "$CLIO_CONFIG" ]; then
-            chown "$USER_NAME:$GROUP_NAME" "$CLIO_CONFIG"
-        fi
+    if [ -f "$CLIO_CONFIG" ]; then
+        chown "$USER_NAME:$GROUP_NAME" "$CLIO_CONFIG"
+    fi
 
-        chown -R "$USER_NAME:$GROUP_NAME" "$CLIO_PREFIX"
+    chown -R "$USER_NAME:$GROUP_NAME" "$CLIO_PREFIX"
 
-        ln -sf "$CLIO_BIN" "/usr/bin/${CLIO_EXECUTABLE}"
+    ln -sf "$CLIO_BIN" "/usr/bin/${CLIO_EXECUTABLE}"
 
-        ;;
-    abort-upgrade | abort-remove | abort-deconfigure) ;;
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-        ;;
+    ;;
+abort-upgrade | abort-remove | abort-deconfigure) ;;
+*)
+    echo "postinst called with unknown argument \`$1'" >&2
+    exit 1
+    ;;
 esac
 
 exit 0

conan.lock

@@ -28,7 +28,7 @@
         "c-ares/1.34.6#545240bb1c40e2cacd4362d6b8967650%1774439234.681",
         "bzip2/1.0.8#c470882369c2d95c5c77e970c0c7e321%1765850143.837",
         "boost/1.83.0#91d8b1572534d2c334d6790e3c34d0c1%1764175359.61",
-        "benchmark/1.9.5#b885dc73ad67b40a55d45684d1c88ad1%1774363287.434",
+        "benchmark/1.9.4#ce4403f7a24d3e1f907cd9da4b678be4%1754578869.672",
         "abseil/20230802.1#90ba607d4ee8fb5fb157c3db540671fc%1764175359.429"
     ],
     "build_requires": [

conan/global.conf

@@ -1,7 +0,0 @@
-# Global configuration for Conan. This is used to set the number of parallel
-# downloads and uploads.
-core:non_interactive=True
-core.download:parallel={{ os.cpu_count() }}
-core.upload:parallel={{ os.cpu_count() }}
-tools.files.download:retry=5
-tools.files.download:retry_wait=10

conan/init.sh

@@ -1,30 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-CURRENT_DIR="$(cd "$(dirname "$0")" && pwd)"
-PROFILES_SRC_DIR="$CURRENT_DIR/profiles"
-
-CONAN_DIR="${CONAN_HOME:-$HOME/.conan2}"
-PROFILES_DIR="$CONAN_DIR/profiles"
-
-rm -rf "$CONAN_DIR"
-
-conan remote add --index 0 --force xrplf https://conan.ripplex.io
-
-cp "$CURRENT_DIR/global.conf" "$CONAN_DIR/global.conf"
-
-mkdir -p "$PROFILES_DIR"
-
-# The compiler is selected via the `CC`/`CXX` environment variables (see
-# `.github/actions/set-compiler-env`) and the sanitizers via the `SANITIZERS`
-# environment variable. Builds always use the `ci` profile, which includes
-# `sanitizers` and `default`.
-cp "$PROFILES_SRC_DIR/ci" "$PROFILES_DIR/ci"
-cp "$PROFILES_SRC_DIR/sanitizers" "$PROFILES_DIR/sanitizers"
-
-if [[ "$(uname)" == "Darwin" ]]; then
-    cp "$PROFILES_SRC_DIR/apple-clang-17.profile" "$PROFILES_DIR/default"
-else
-    cp "$PROFILES_SRC_DIR/default" "$PROFILES_DIR/default"
-fi

conan/profiles/ci

@@ -1,8 +0,0 @@
-{% set os = detect_api.detect_os() %}
-include(sanitizers)
-
-[conf]
-{% if os == "Linux" %}
-user.package:libc_version=2.31
-tools.info.package_id:confs+=["user.package:libc_version"]
-{% endif %}

conan/profiles/default

@@ -1,28 +0,0 @@
-{% set os = detect_api.detect_os() %}
-{% set arch = detect_api.detect_arch() %}
-{% set compiler, version, compiler_exe = detect_api.detect_default_compiler() %}
-{% set compiler_version = version %}
-{% if os == "Linux" %}
-{% set compiler_version = detect_api.default_compiler_version(compiler, version) %}
-{% endif %}
-
-[settings]
-os={{ os }}
-arch={{ arch }}
-build_type=Debug
-compiler={{compiler}}
-compiler.version={{ compiler_version }}
-compiler.cppstd=20
-{% if os == "Windows" %}
-compiler.runtime=static
-{% else %}
-compiler.libcxx={{detect_api.detect_libcxx(compiler, version, compiler_exe)}}
-{% endif %}
-
-[conf]
-{% if compiler == "gcc" and compiler_version < 13 %}
-tools.build:cxxflags+=['-Wno-restrict']
-{% endif %}
-{% if compiler == "clang" %}
-grpc/1.50.1:tools.build:cxxflags+=['-Wno-missing-template-arg-list-after-template-kw']
-{% endif %}

conan/profiles/sanitizers

@@ -1,120 +0,0 @@
-include(default)
-{% set compiler, version, compiler_exe = detect_api.detect_default_compiler() %}
-{% set arch = detect_api.detect_arch() %}
-{% set sanitizers = os.getenv("SANITIZERS") %}
-
-{% if not sanitizers %}
-{# Sanitizers not configured; no additional settings needed #}
-{% else %}
-
-{% if compiler == "msvc" %}
-    {{ "Sanitizers are not supported on Windows/MSVC. Please unset the SANITIZERS environment variable." }}
-{% endif %}
-
-{% set known_sanitizers = ["address", "thread", "undefinedbehavior"] %}
-{% set provided_sanitizers = [] %}
-{% for san in sanitizers.split(",") %}
-    {% set san = san.strip() %}
-    {% if san not in known_sanitizers %}
-        {{ "Unknown sanitizer in SANITIZERS: " ~ san }}
-    {% endif %}
-    {% set _ = provided_sanitizers.append(san) %}
-{% endfor %}
-
-{% set enable_asan = "address" in provided_sanitizers %}
-{% set enable_tsan = "thread" in provided_sanitizers %}
-{% set enable_ubsan = "undefinedbehavior" in provided_sanitizers %}
-
-{% if enable_asan and enable_tsan %}
-    {{ "AddressSanitizer and ThreadSanitizer are incompatible and cannot be enabled simultaneously." }}
-{% endif %}
-
-{% set sanitizer_types = [] %}
-{% set defines = [] %}
-
-{% if enable_asan %}
-    {% set _ = sanitizer_types.append("address") %}
-    {% set _ = defines.append("BOOST_USE_ASAN") %}
-    {% set _ = defines.append("BOOST_USE_UCONTEXT") %}
-{% elif enable_tsan %}
-    {% set _ = sanitizer_types.append("thread") %}
-    {% set _ = defines.append("BOOST_USE_TSAN") %}
-    {% set _ = defines.append("BOOST_USE_UCONTEXT") %}
-{% endif %}
-
-{% if enable_ubsan %}
-    {% set _ = sanitizer_types.append("undefined") %}
-    {% set _ = sanitizer_types.append("float-divide-by-zero") %}
-    {# Clang supports additional UB checks beyond the GCC baseline #}
-    {% if compiler == "clang" or compiler == "apple-clang" %}
-        {% set _ = sanitizer_types.append("unsigned-integer-overflow") %}
-    {% endif %}
-{% endif %}
-
-{# Frame pointer required for meaningful stack traces; -O1 for reasonable performance #}
-{% set sanitizer_compiler_flags = ["-fno-omit-frame-pointer", "-O1"] %}
-
-{% if compiler == "gcc" %}
-    {# Suppress false positive warnings with GCC #}
-    {% set _ = sanitizer_compiler_flags.append("-Wno-stringop-overflow") %}
-
-    {% set relocation_flags = [] %}
-
-    {% if arch == "x86_64" and enable_asan %}
-        {# Large code model prevents relocation errors in instrumented ASAN binaries #}
-        {% set _ = sanitizer_compiler_flags.append("-mcmodel=large") %}
-        {% set _ = relocation_flags.append("-mcmodel=large") %}
-    {% elif enable_tsan %}
-        {# GCC doesn't support atomic_thread_fence with TSAN; suppress warnings #}
-        {% set _ = sanitizer_compiler_flags.append("-Wno-tsan") %}
-        {% if arch == "x86_64" %}
-            {# Medium code model for TSAN; large is incompatible #}
-            {% set _ = sanitizer_compiler_flags.append("-mcmodel=medium") %}
-            {% set _ = relocation_flags.append("-mcmodel=medium") %}
-        {% endif %}
-    {% endif %}
-
-    {% set fsanitize = "-fsanitize=" ~ ",".join(sanitizer_types) %}
-    {% set _ = sanitizer_compiler_flags.append(fsanitize) %}
-    {% set _ = relocation_flags.append(fsanitize) %}
-
-    {% set sanitizer_linker_flags = relocation_flags %}
-{% elif compiler == "clang" or compiler == "apple-clang" %}
-    {% set fsanitize = "-fsanitize=" ~ ",".join(sanitizer_types) %}
-    {% set _ = sanitizer_compiler_flags.append(fsanitize) %}
-
-    {% set sanitizer_linker_flags = [fsanitize] %}
-{% endif %}
-
-[conf]
-tools.build:defines+={{defines}}
-tools.build:cxxflags+={{sanitizer_compiler_flags}}
-tools.build:sharedlinkflags+={{sanitizer_linker_flags}}
-tools.build:exelinkflags+={{sanitizer_linker_flags}}
-
-tools.info.package_id:confs+=["tools.build:cxxflags", "tools.build:exelinkflags", "tools.build:sharedlinkflags", "tools.build:defines"]
-
-# &: means "apply only to the consumer/root package"
-&:tools.cmake.cmaketoolchain:extra_variables={"SANITIZERS": "{{sanitizers}}", "SANITIZERS_COMPILER_FLAGS": "{{sanitizer_compiler_flags | join(' ')}}", "SANITIZERS_LINKER_FLAGS": "{{sanitizer_linker_flags | join(' ')}}"}
-
-[options]
-{% if enable_asan %}
-    # Build Boost.Context with ucontext backend (not fcontext) so that
-    # ASAN fiber-switching annotations (__sanitizer_start/finish_switch_fiber)
-    # are compiled into the library. fcontext (assembly) has no ASAN support.
-    # define=BOOST_USE_ASAN=1 is critical: it must be defined when building
-    # Boost.Context itself so the ucontext backend compiles in the ASAN annotations.
-    boost/*:extra_b2_flags=context-impl=ucontext address-sanitizer=on define=BOOST_USE_ASAN=1
-    boost/*:without_context=False
-    # Boost stacktrace fails to build with some sanitizers
-    boost/*:without_stacktrace=True
-{% elif enable_tsan %}
-    # Build Boost.Context with ucontext backend for TSAN. fcontext (assembly)
-    # has no TSAN annotations, so without this the BOOST_USE_TSAN/BOOST_USE_UCONTEXT
-    # defines in [conf] would be ineffective.
-    boost/*:extra_b2_flags=context-impl=ucontext thread-sanitizer=on define=BOOST_USE_TSAN=1
-    boost/*:without_context=False
-    boost/*:without_stacktrace=True
-{% endif %}
-
-{% endif %}

conanfile.py

@@ -1,6 +1,5 @@
-from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
-
 from conan import ConanFile
+from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
 
 
 class ClioConan(ConanFile):
@@ -45,7 +44,7 @@ class ClioConan(ConanFile):
     def requirements(self):
         self.requires("boost/1.83.0", force=True)
         self.requires("gtest/1.17.0")
-        self.requires("benchmark/1.9.5")
+        self.requires("benchmark/1.9.4")
 
     def configure(self):
         if self.settings.compiler == "apple-clang":

docker/ci/Dockerfile

@@ -0,0 +1,132 @@
+ARG GHCR_REPO=invalid
+ARG CLANG_MAJOR_VERSION=invalid
+ARG GCC_VERSION=invalid
+
+FROM ${GHCR_REPO}/clio-gcc:${GCC_VERSION} AS clio-gcc
+FROM ${GHCR_REPO}/clio-tools:latest AS clio-tools
+
+FROM ${GHCR_REPO}/clio-clang:${CLANG_MAJOR_VERSION}
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+# Using root by default is not very secure but github checkout action doesn't work with any other user
+# https://github.com/actions/checkout/issues/956
+# And Github Actions doc recommends using root
+# https://docs.github.com/en/actions/sharing-automations/creating-actions/dockerfile-support-for-github-actions#user
+
+# hadolint ignore=DL3002
+USER root
+WORKDIR /root
+
+# Install common tools and dependencies
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+        curl \
+        dpkg-dev \
+        file \
+        git \
+        git-lfs \
+        gnupg \
+        graphviz \
+        jq \
+        # libgmp, libmpfr and libncurses are gdb dependencies
+        libgmp-dev \
+        libmpfr-dev \
+        libncurses-dev \
+        make \
+        wget \
+        zip \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Python tools
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+        python3 \
+        python3-pip \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN pip 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 \
+        conan==2.24.0 \
+        gcovr \
+        # We're adding pre-commit to this image as well,
+        # because clang-tidy workflow requires it
+        pre-commit
+
+# Install LLVM tools
+ARG LLVM_TOOLS_VERSION=21
+
+RUN echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-${LLVM_TOOLS_VERSION} main" >> /etc/apt/sources.list \
+    && wget --progress=dot:giga -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+        clang-tidy-${LLVM_TOOLS_VERSION} \
+        clang-tools-${LLVM_TOOLS_VERSION} \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ARG GCC_MAJOR_VERSION=invalid
+
+# Install custom-built gcc and make ldconfig aware of the new libstdc++ location (for gcc)
+# Note: Clang is using libc++ instead
+COPY --from=clio-gcc /gcc${GCC_MAJOR_VERSION}.deb /
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+        binutils \
+        libc6-dev \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && dpkg -i /gcc${GCC_MAJOR_VERSION}.deb \
+    && rm -rf /gcc${GCC_MAJOR_VERSION}.deb \
+    && ldconfig
+
+# Rewire to use our custom-built gcc as default compiler
+RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_MAJOR_VERSION} 100 \
+    && update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-${GCC_MAJOR_VERSION} 100 \
+    && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_MAJOR_VERSION} 100 \
+    && update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-${GCC_MAJOR_VERSION} 100 \
+    && update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-${GCC_MAJOR_VERSION} 100 \
+    && update-alternatives --install /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-${GCC_MAJOR_VERSION} 100 \
+    && update-alternatives --install /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-${GCC_MAJOR_VERSION} 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 \
+    /usr/local/bin/git-cliff \
+    /usr/local/bin/gh \
+    /usr/local/bin/gdb \
+    /usr/local/bin/ninja \
+    /usr/local/bin/
+
+WORKDIR /root
+
+# Setup conan
+RUN conan remote add --index 0 xrplf https://conan.ripplex.io
+
+WORKDIR /root/.conan2
+COPY conan/global.conf ./global.conf
+
+WORKDIR /root/.conan2/profiles
+
+COPY conan/clang.profile ./clang
+COPY conan/sanitizer_template.profile ./clang.asan
+COPY conan/sanitizer_template.profile ./clang.tsan
+COPY conan/sanitizer_template.profile ./clang.ubsan
+
+COPY conan/gcc.profile ./gcc
+COPY conan/sanitizer_template.profile ./gcc.asan
+COPY conan/sanitizer_template.profile ./gcc.tsan
+COPY conan/sanitizer_template.profile ./gcc.ubsan
+
+WORKDIR /root

docker/ci/README.md

@@ -0,0 +1,26 @@
+# CI image for XRPLF/clio
+
+This image contains an environment to build [Clio](https://github.com/XRPLF/clio), check code and documentation.
+It is used in [Clio Github Actions](https://github.com/XRPLF/clio/actions) but can also be used to compile Clio locally.
+
+The image is based on Ubuntu 20.04 and contains:
+
+- ccache 4.12.2
+- Clang 19
+- ClangBuildAnalyzer 1.6.0
+- Conan 2.24.0
+- Doxygen 1.16.1
+- GCC 15.2.0
+- GDB 17.1
+- gh 2.83.2
+- git-cliff 2.11.0
+- LLVM Tools 21
+- mold 2.40.4
+- Ninja 1.13.2
+- Python 3.8
+- and some other useful tools
+
+Conan is set up to build Clio without any additional steps.
+There are two preset conan profiles: `clang` and `gcc` to use corresponding compiler.
+`ASan`, `TSan` and `UBSan` sanitizer builds are enabled via conan profiles for each of the supported compilers.
+These can be selected using the following pattern (all lowercase): `[compiler].[sanitizer]` (e.g. `--profile:all gcc.tsan`).

docker/ci/conan/clang.profile

@@ -0,0 +1,12 @@
+[settings]
+arch={{detect_api.detect_arch()}}
+build_type=Release
+compiler=clang
+compiler.cppstd=20
+compiler.libcxx=libc++
+compiler.version=19
+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"]

docker/ci/conan/gcc.profile

@@ -0,0 +1,11 @@
+[settings]
+arch={{detect_api.detect_arch()}}
+build_type=Release
+compiler=gcc
+compiler.cppstd=20
+compiler.libcxx=libstdc++11
+compiler.version=15
+os=Linux
+
+[conf]
+tools.build:compiler_executables={"c": "/usr/bin/gcc-15", "cpp": "/usr/bin/g++-15"}

docker/ci/conan/global.conf

@@ -0,0 +1,2 @@
+core.download:parallel={{os.cpu_count()}}
+core.upload:parallel={{os.cpu_count()}}

docker/ci/conan/sanitizer_template.profile

@@ -0,0 +1,37 @@
+{% set compiler, sani = profile_name.split('.') %}
+
+{% set sanitizer_opt_map = {"asan": "address", "tsan": "thread", "ubsan": "undefined"} %}
+{% set sanitizer = sanitizer_opt_map[sani] %}
+
+{% set sanitizer_b2_flags_map = {
+    "address": "context-impl=ucontext address-sanitizer=norecover",
+    "thread": "context-impl=ucontext thread-sanitizer=norecover",
+    "undefined": "undefined-sanitizer=norecover"
+} %}
+{% set sanitizer_b2_flags_str = sanitizer_b2_flags_map[sanitizer] %}
+
+{% 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 %}
+{% set sanitizer_link_flags = sanitizer_link_flags_str.split(' ') %}
+
+include({{ compiler }})
+
+[options]
+boost/*:extra_b2_flags="{{ sanitizer_b2_flags_str }}"
+boost/*:without_context=False
+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 }}
+
+{% if sanitizer == "address" %}
+    tools.build:defines+=["BOOST_USE_ASAN", "BOOST_USE_UCONTEXT"]
+{% elif sanitizer == "thread" %}
+    tools.build:defines+=["BOOST_USE_TSAN", "BOOST_USE_UCONTEXT"]
+{% endif %}
+
+tools.info.package_id:confs+=["tools.build:cflags", "tools.build:cxxflags", "tools.build:exelinkflags", "tools.build:sharedlinkflags", "tools.build:defines"]

docker/compilers/clang/Dockerfile

@@ -0,0 +1,32 @@
+FROM ubuntu:20.04
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+SHELL ["/bin/bash", "-c"]
+
+# hadolint ignore=DL3002
+USER root
+WORKDIR /root
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+        wget \
+        software-properties-common \
+        gnupg \
+    && 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=1
+
+RUN wget --progress=dot:giga https://apt.llvm.org/llvm.sh \
+    && chmod +x llvm.sh \
+    && ./llvm.sh ${CLANG_MAJOR_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 \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*

docker/compilers/clang/README.md

@@ -0,0 +1,3 @@
+# Clang compiler
+
+This image contains clang compiler to build <https://github.com/XRPLF/clio>.

docker/compilers/gcc/Dockerfile

@@ -0,0 +1,120 @@
+ARG UBUNTU_VERSION=20.04
+
+ARG GCC_MAJOR_VERSION=invalid
+
+FROM ubuntu:$UBUNTU_VERSION AS build
+
+ARG UBUNTU_VERSION
+
+ARG GCC_MAJOR_VERSION
+
+ARG BUILD_VERSION=0
+
+ARG DEBIAN_FRONTEND=noninteractive
+ARG TARGETARCH
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+        build-essential \
+        file \
+        flex \
+        libz-dev \
+        libzstd-dev \
+        software-properties-common \
+        wget \
+    && 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
+
+WORKDIR /gcc-$GCC_VERSION
+RUN ./contrib/download_prerequisites
+
+# hadolint ignore=DL3059
+RUN mkdir /gcc-build
+WORKDIR /gcc-build
+RUN /gcc-$GCC_VERSION/configure \
+        --with-pkgversion="clio-build-$BUILD_VERSION https://github.com/XRPLF/clio" \
+        --enable-languages=c,c++ \
+        --prefix=/usr \
+        --with-gcc-major-version-only \
+        --program-suffix=-${GCC_MAJOR_VERSION} \
+        --enable-shared \
+        --enable-linker-build-id \
+        --libexecdir=/usr/lib \
+        --without-included-gettext \
+        --enable-threads=posix \
+        --libdir=/usr/lib \
+        --disable-nls \
+        --enable-clocale=gnu \
+        --enable-libstdcxx-backtrace=yes \
+        --enable-libstdcxx-debug \
+        --enable-libstdcxx-time=yes \
+        --with-default-libstdcxx-abi=new \
+        --enable-gnu-unique-object \
+        --disable-vtable-verify \
+        --enable-plugin \
+        --enable-default-pie \
+        --with-system-zlib \
+        --enable-libphobos-checking=release \
+        --with-target-system-zlib=auto \
+        --disable-werror \
+        --enable-cet \
+        --disable-multilib \
+        --without-cuda-driver \
+        --enable-checking=release
+
+RUN make -j "$(nproc)"
+RUN make install-strip DESTDIR=/gcc-$GCC_VERSION-$BUILD_VERSION-ubuntu-$UBUNTU_VERSION
+
+RUN export GDB_AUTOLOAD_DIR="/gcc-$GCC_VERSION-$BUILD_VERSION-ubuntu-$UBUNTU_VERSION/usr/share/gdb/auto-load/usr/lib64" \
+    && mkdir -p "$GDB_AUTOLOAD_DIR" \
+    && mv \
+        /gcc-$GCC_VERSION-$BUILD_VERSION-ubuntu-$UBUNTU_VERSION/usr/lib64/libstdc++.so.*-gdb.py \
+        $GDB_AUTOLOAD_DIR/
+
+# Generate deb
+WORKDIR /
+COPY control.m4 /
+COPY ld.so.conf /gcc-$GCC_VERSION-$BUILD_VERSION-ubuntu-$UBUNTU_VERSION/etc/ld.so.conf.d/1-gcc-${GCC_MAJOR_VERSION}.conf
+
+RUN mkdir /gcc-$GCC_VERSION-$BUILD_VERSION-ubuntu-$UBUNTU_VERSION/DEBIAN \
+    && m4 \
+        -P \
+        -DUBUNTU_VERSION=$UBUNTU_VERSION \
+        -DVERSION=$GCC_VERSION-$BUILD_VERSION \
+        -DTARGETARCH=$TARGETARCH \
+        control.m4 > /gcc-$GCC_VERSION-$BUILD_VERSION-ubuntu-$UBUNTU_VERSION/DEBIAN/control \
+    && dpkg-deb \
+        --build \
+        --root-owner-group \
+        /gcc-$GCC_VERSION-$BUILD_VERSION-ubuntu-$UBUNTU_VERSION \
+        /gcc${GCC_MAJOR_VERSION}.deb
+
+# Create final image
+FROM ubuntu:$UBUNTU_VERSION
+
+ARG GCC_MAJOR_VERSION
+
+COPY --from=build /gcc${GCC_MAJOR_VERSION}.deb /
+
+# Install gcc-${GCC_MAJOR_VERSION}, but also leave gcc${GCC_MAJOR_VERSION}.deb for others to copy if needed
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+        binutils \
+        libc6-dev \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && dpkg -i /gcc${GCC_MAJOR_VERSION}.deb
+
+RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_MAJOR_VERSION} 100 \
+    && update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-${GCC_MAJOR_VERSION} 100 \
+    && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_MAJOR_VERSION} 100 \
+    && update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-${GCC_MAJOR_VERSION} 100 \
+    && update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-${GCC_MAJOR_VERSION} 100 \
+    && update-alternatives --install /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-${GCC_MAJOR_VERSION} 100 \
+    && update-alternatives --install /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-${GCC_MAJOR_VERSION} 100

docker/compilers/gcc/README.md

@@ -0,0 +1,3 @@
+# GCC compiler
+
+This image contains GCC compiler to build <https://github.com/XRPLF/clio>.

docker/compilers/gcc/control.m4

@@ -0,0 +1,7 @@
+Package: gcc-15-ubuntu-UBUNTUVERSION
+Version: VERSION
+Architecture: TARGETARCH
+Maintainer: Alex Kremer <akremer@ripple.com>
+Uploaders: Ayaz Salikhov <asalikhov@ripple.com>
+Description: GCC VERSION build for ubuntu UBUNTUVERSION
+Depends: binutils, libc6-dev

docker/compilers/gcc/ld.so.conf

@@ -0,0 +1,2 @@
+# Path to the directory containing libstdc++.so.6
+/usr/lib64

docker/develop/compose.yaml

@@ -1,6 +1,6 @@
 services:
   clio_develop:
-    image: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-cb2642b
+    image: ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696
     volumes:
       - clio_develop_conan_data:/root/.conan2/p
       - clio_develop_ccache:/root/.ccache

docker/develop/run

@@ -41,26 +41,26 @@ EOF
 }
 
 case $1 in
-    -h | --help)
-        print_help
-        ;;
+-h | --help)
+    print_help
+    ;;
 
-    -t | --terminal)
-        open_terminal
-        ;;
+-t | --terminal)
+    open_terminal
+    ;;
 
-    -s | --stop)
-        stop_container
-        ;;
+-s | --stop)
+    stop_container
+    ;;
 
-    -*)
-        echo "Unknown option: $1"
-        print_help
-        ;;
+-*)
+    echo "Unknown option: $1"
+    print_help
+    ;;
 
-    *)
-        run "$@"
-        ;;
+*)
+    run "$@"
+    ;;
 esac
 
 popd >/dev/null

docker/tools/Dockerfile

@@ -0,0 +1,112 @@
+ARG GHCR_REPO=invalid
+ARG GCC_VERSION=invalid
+
+FROM ${GHCR_REPO}/clio-gcc:${GCC_VERSION}
+
+ARG DEBIAN_FRONTEND=noninteractive
+ARG TARGETARCH
+
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+ARG BUILD_VERSION=0
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+        python3 \
+        python3-pip \
+        software-properties-common \
+        wget \
+    && pip3 install -q --no-cache-dir \
+        cmake \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /tmp
+
+ARG NINJA_VERSION=1.13.2
+
+RUN wget --progress=dot:giga "https://github.com/ninja-build/ninja/archive/refs/tags/v${NINJA_VERSION}.tar.gz" \
+    && tar xf "v${NINJA_VERSION}.tar.gz" \
+    && cd "ninja-${NINJA_VERSION}" \
+    && ./configure.py --bootstrap \
+    && mv ninja /usr/local/bin/ninja \
+    && rm -rf /tmp/* /var/tmp/*
+
+ARG MOLD_VERSION=2.40.4
+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.12.2
+RUN wget --progress=dot:giga "https://github.com/ccache/ccache/releases/download/v${CCACHE_VERSION}/ccache-${CCACHE_VERSION}.tar.gz" \
+    && tar xf "ccache-${CCACHE_VERSION}.tar.gz" \
+    && cd "ccache-${CCACHE_VERSION}" \
+    && mkdir build \
+    && cd build \
+    && cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=False .. \
+    && ninja install \
+    && rm -rf /tmp/* /var/tmp/*
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+        bison \
+        flex \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ARG DOXYGEN_VERSION=1.16.1
+RUN wget --progress=dot:giga "https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/doxygen-${DOXYGEN_VERSION}.src.tar.gz" \
+    && tar xf "doxygen-${DOXYGEN_VERSION}.src.tar.gz" \
+    && cd "doxygen-${DOXYGEN_VERSION}" \
+    && mkdir build \
+    && cd build \
+    && cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. \
+    && ninja install \
+    && rm -rf /tmp/* /var/tmp/*
+
+ARG CLANG_BUILD_ANALYZER_VERSION=1.6.0
+RUN wget --progress=dot:giga "https://github.com/aras-p/ClangBuildAnalyzer/archive/refs/tags/v${CLANG_BUILD_ANALYZER_VERSION}.tar.gz" \
+    && tar xf "v${CLANG_BUILD_ANALYZER_VERSION}.tar.gz" \
+    && cd "ClangBuildAnalyzer-${CLANG_BUILD_ANALYZER_VERSION}" \
+    && mkdir build \
+    && cd build \
+    && cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. \
+    && ninja install \
+    && rm -rf /tmp/* /var/tmp/*
+
+ARG GIT_CLIFF_VERSION=2.11.0
+RUN wget --progress=dot:giga "https://github.com/orhun/git-cliff/releases/download/v${GIT_CLIFF_VERSION}/git-cliff-${GIT_CLIFF_VERSION}-x86_64-unknown-linux-musl.tar.gz" \
+    && tar xf git-cliff-${GIT_CLIFF_VERSION}-x86_64-unknown-linux-musl.tar.gz \
+    && mv git-cliff-${GIT_CLIFF_VERSION}/git-cliff /usr/local/bin/git-cliff \
+    && rm -rf /tmp/* /var/tmp/*
+
+ARG GH_VERSION=2.83.2
+RUN wget --progress=dot:giga "https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_${TARGETARCH}.tar.gz" \
+    && tar xf gh_${GH_VERSION}_linux_${TARGETARCH}.tar.gz \
+    && mv gh_${GH_VERSION}_linux_${TARGETARCH}/bin/gh /usr/local/bin/gh \
+    && rm -rf /tmp/* /var/tmp/*
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+        libgmp-dev \
+        libmpfr-dev \
+        libncurses-dev \
+        make \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ARG GDB_VERSION=17.1
+RUN wget --progress=dot:giga "https://sourceware.org/pub/gdb/releases/gdb-${GDB_VERSION}.tar.gz" \
+    && tar xf "gdb-${GDB_VERSION}.tar.gz" \
+    && cd "gdb-${GDB_VERSION}" \
+    && ./configure --prefix=/usr/local \
+    && make -j "$(nproc)" \
+    && make install-gdb \
+    && rm -rf /tmp/* /var/tmp/*
+
+WORKDIR /root

docs/build-clio.md

@@ -11,8 +11,8 @@
 - [**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
 
-We use the Nix-based Docker image `ghcr.io/xrplf/xrpld/nix-ubuntu` to build `Clio`, see [Building Clio with Docker](#building-clio-with-docker).
-This image is produced by [rippled](https://github.com/XRPLF/rippled) and ships the compilers and tools listed below.
+We use our Docker image `ghcr.io/XRPLF/clio-ci` to build `Clio`, see [Building Clio with Docker](#building-clio-with-docker).
+You can find information about exact compiler versions and tools in the [image's README](https://github.com/XRPLF/clio/blob/develop/docker/ci/README.md).
 
 The following compiler version are guaranteed to work.
 Any compiler with lower version may not be able to build Clio:
@@ -30,7 +30,7 @@ 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).
 
 > [!TIP]
-> To setup Conan automatically, you can run `conan/init.sh`.
+> 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.
@@ -175,7 +175,7 @@ Open the `index.html` file in your browser to see the documentation pages.
 It is also possible to build Clio using [Docker](https://www.docker.com/) if you don't want to install all the dependencies on your machine.
 
 ```sh
-docker run -it ghcr.io/xrplf/xrpld/nix-ubuntu:sha-cb2642b
+docker run -it ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696
 git clone https://github.com/XRPLF/clio
 cd clio
 ```

pre-commit-hooks/verify-commits.sh

@@ -1,56 +1,51 @@
 #!/bin/bash
 
-# Annotated tags have object type "tag"; lightweight tags have type "commit".
-# To inspect tags: git for-each-ref refs/tags
-#
-# To always sign commits and tags, configure:
-#   git config --global commit.gpgsign true
-#   git config --global tag.gpgsign true
+# git for-each-ref refs/tags  # see which tags are annotated and which are lightweight. Annotated tags are "tag" objects.
+# # Set these so your commits and tags are always signed
+# git config commit.gpgsign true
+# git config tag.gpgsign true
 
 verify_commit_signed() {
     if git verify-commit HEAD &>/dev/null; then
-        echo "HEAD commit is signed."
+        :
+        # echo "HEAD commit seems signed..."
     else
-        echo "HEAD commit is not signed!"
+        echo "HEAD commit isn't signed!"
         exit 1
     fi
 }
 
-verify_tag_annotated() {
-    local version="$1"
-    # git cat-file -t returns "tag" for annotated tags, "commit" for lightweight.
-    if [[ "$(git cat-file -t "$version")" == "tag" ]]; then
-        echo "Tag '$version' is annotated."
+verify_tag() {
+    if git describe --exact-match --tags HEAD &>/dev/null; then
+        : # You might be ok to push
+        # echo "Tag is annotated."
+        return 0
     else
-        echo "Tag '$version' is not annotated!"
-        echo "Re-create it with: git tag -a -s -m \"$version\" \"$version\""
+        echo "Tag for [$version] not an annotated tag."
         exit 1
     fi
 }
 
 verify_tag_signed() {
-    local version="$1"
     if git verify-tag "$version" &>/dev/null; then
-        echo "Tag '$version' is signed."
+        : # ok, I guess we'll let you push
+        # echo "Tag appears signed"
+        return 0
     else
-        echo "Tag '$version' is not signed!"
-        echo "Sign it with: git tag -a -s -m \"$version\" \"$version\""
+        echo "$version tag isn't signed"
+        echo "Sign it with [git tag -ams\"$version\" $version]"
         exit 1
     fi
 }
 
-# Enforce signing and annotated tags when pushing to a release branch.
-if echo "$PRE_COMMIT_REMOTE_BRANCH" | grep -q "^refs/heads/release/"; then
-    # git describe --exact-match guarantees a single tag; git tag --points-at HEAD
-    # can return multiple newline-separated values, which breaks downstream commands.
-    version=$(git describe --exact-match --tags HEAD 2>/dev/null)
-    if [[ -z "$version" ]]; then
-        echo "No tag found at HEAD — cannot push an untagged release commit!"
+# Check some things if we're pushing a branch called "release/"
+if echo "$PRE_COMMIT_REMOTE_BRANCH" | grep ^refs\/heads\/release\/ &>/dev/null; then
+    version=$(git tag --points-at HEAD)
+    echo "Looks like you're trying to push a $version release..."
+    echo "Making sure you've signed and tagged it."
+    if verify_commit_signed && verify_tag && verify_tag_signed; then
+        : # Ok, I guess you can push
+    else
         exit 1
     fi
-    echo "Looks like you're trying to push a '$version' release..."
-    echo "Verifying the commit is signed and the tag is annotated and signed."
-    verify_commit_signed
-    verify_tag_annotated "$version"
-    verify_tag_signed "$version"
 fi

src/app/CliArgs.cpp

@@ -28,7 +28,7 @@ CliArgs::parse(int argc, char const* argv[])
     description.add_options()
         ("help,h", "Print help message and exit")
         ("version,v", "Print version and exit")
-        ("conf,c", po::value<std::string>()->default_value(kDefaultConfigPath), "Configuration file")
+        ("conf,c", po::value<std::string>()->default_value(kDEFAULT_CONFIG_PATH), "Configuration file")
         ("ng-web-server,w", "Use ng-web-server")
         ("migrate", po::value<std::string>(), "Start migration helper")
         ("verify", "Checks the validity of config values")

src/app/CliArgs.hpp

@@ -16,7 +16,7 @@ public:
     /**
      * @brief Default configuration path.
      */
-    static constexpr char kDefaultConfigPath[] = "/etc/opt/clio/config.json";
+    static constexpr char kDEFAULT_CONFIG_PATH[] = "/etc/opt/clio/config.json";
 
     /**
      * @brief An action parsed from the command line.

src/app/WebHandlers.cpp

@@ -125,7 +125,7 @@ HealthCheckHandler::operator()(
     boost::asio::yield_context
 )
 {
-    static constexpr auto kHealthCheckHtml = R"html(
+    static constexpr auto kHEALTH_CHECK_HTML = R"html(
     <!DOCTYPE html>
     <html>
         <head><title>Test page for Clio</title></head>
@@ -133,7 +133,7 @@ HealthCheckHandler::operator()(
     </html>
 )html";
 
-    return web::ng::Response{boost::beast::http::status::ok, kHealthCheckHtml, request};
+    return web::ng::Response{boost::beast::http::status::ok, kHEALTH_CHECK_HTML, request};
 }
 
 web::ng::Response
@@ -144,7 +144,7 @@ CacheStateHandler::operator()(
     boost::asio::yield_context
 )
 {
-    static constexpr auto kCacheCheckLoadedHtml = R"html(
+    static constexpr auto kCACHE_CHECK_LOADED_HTML = R"html(
     <!DOCTYPE html>
     <html>
         <head><title>Cache state</title></head>
@@ -152,7 +152,7 @@ CacheStateHandler::operator()(
     </html>
 )html";
 
-    static constexpr auto kCacheCheckNotLoadedHtml = R"html(
+    static constexpr auto kCACHE_CHECK_NOT_LOADED_HTML = R"html(
     <!DOCTYPE html>
     <html>
         <head><title>Cache state</title></head>
@@ -161,10 +161,10 @@ CacheStateHandler::operator()(
 )html";
 
     if (cache_.get().isFull())
-        return web::ng::Response{boost::beast::http::status::ok, kCacheCheckLoadedHtml, request};
+        return web::ng::Response{boost::beast::http::status::ok, kCACHE_CHECK_LOADED_HTML, request};
 
     return web::ng::Response{
-        boost::beast::http::status::service_unavailable, kCacheCheckNotLoadedHtml, request
+        boost::beast::http::status::service_unavailable, kCACHE_CHECK_NOT_LOADED_HTML, request
     };
 }
 

src/cluster/Backend.hpp

@@ -119,7 +119,7 @@ public:
      *
      * @return The UUID of this node.
      */
-    [[nodiscard]] ClioNode::CUuid
+    ClioNode::CUuid
     selfId() const;
 
 private:

src/cluster/ClioNode.cpp

@@ -22,11 +22,12 @@ namespace cluster {
 namespace {
 
 struct JsonFields {
-    static constexpr std::string_view const kUpdateTime = "update_time";
-    static constexpr std::string_view const kDbRole = "db_role";
-    static constexpr std::string_view const kEtlStarted = "etl_started";
-    static constexpr std::string_view const kCacheIsFull = "cache_is_full";
-    static constexpr std::string_view const kCacheIsCurrentlyLoading = "cache_is_currently_loading";
+    static constexpr std::string_view const kUPDATE_TIME = "update_time";
+    static constexpr std::string_view const kDB_ROLE = "db_role";
+    static constexpr std::string_view const kETL_STARTED = "etl_started";
+    static constexpr std::string_view const kCACHE_IS_FULL = "cache_is_full";
+    static constexpr std::string_view const kCACHE_IS_CURRENTLY_LOADING =
+        "cache_is_currently_loading";
 };
 
 }  // namespace
@@ -66,11 +67,11 @@ void
 tag_invoke(boost::json::value_from_tag, boost::json::value& jv, ClioNode const& node)
 {
     jv = {
-        {JsonFields::kUpdateTime, util::systemTpToUtcStr(node.updateTime, ClioNode::kTimeFormat)},
-        {JsonFields::kDbRole, static_cast<int64_t>(node.dbRole)},
-        {JsonFields::kEtlStarted, node.etlStarted},
-        {JsonFields::kCacheIsFull, node.cacheIsFull},
-        {JsonFields::kCacheIsCurrentlyLoading, node.cacheIsCurrentlyLoading}
+        {JsonFields::kUPDATE_TIME, util::systemTpToUtcStr(node.updateTime, ClioNode::kTIME_FORMAT)},
+        {JsonFields::kDB_ROLE, static_cast<int64_t>(node.dbRole)},
+        {JsonFields::kETL_STARTED, node.etlStarted},
+        {JsonFields::kCACHE_IS_FULL, node.cacheIsFull},
+        {JsonFields::kCACHE_IS_CURRENTLY_LOADING, node.cacheIsCurrentlyLoading}
     };
 }
 
@@ -78,16 +79,16 @@ ClioNode
 tag_invoke(boost::json::value_to_tag<ClioNode>, boost::json::value const& jv)
 {
     auto const& obj = jv.as_object();
-    auto const& updateTimeStr = obj.at(JsonFields::kUpdateTime).as_string();
+    auto const& updateTimeStr = obj.at(JsonFields::kUPDATE_TIME).as_string();
     auto const updateTime =
-        util::systemTpFromUtcStr(std::string(updateTimeStr), ClioNode::kTimeFormat);
+        util::systemTpFromUtcStr(std::string(updateTimeStr), ClioNode::kTIME_FORMAT);
     if (!updateTime.has_value()) {
         throw std::runtime_error("Failed to parse update time");
     }
 
     // Each field has a default value for backward compatibility
     auto dbRole = ClioNode::DbRole::Fallback;
-    if (auto const* v = obj.if_contains(JsonFields::kDbRole)) {
+    if (auto const* v = obj.if_contains(JsonFields::kDB_ROLE)) {
         auto const dbRoleValue = v->as_int64();
         if (dbRoleValue > static_cast<int64_t>(ClioNode::DbRole::Max))
             throw std::runtime_error("Invalid db_role value");
@@ -95,11 +96,12 @@ tag_invoke(boost::json::value_to_tag<ClioNode>, boost::json::value const& jv)
     }
 
     auto const etlStarted =
-        obj.contains(JsonFields::kEtlStarted) ? obj.at(JsonFields::kEtlStarted).as_bool() : true;
-    auto const cacheIsFull =
-        obj.contains(JsonFields::kCacheIsFull) ? obj.at(JsonFields::kCacheIsFull).as_bool() : true;
-    auto const cacheIsCurrentlyLoading = obj.contains(JsonFields::kCacheIsCurrentlyLoading)
-        ? obj.at(JsonFields::kCacheIsCurrentlyLoading).as_bool()
+        obj.contains(JsonFields::kETL_STARTED) ? obj.at(JsonFields::kETL_STARTED).as_bool() : true;
+    auto const cacheIsFull = obj.contains(JsonFields::kCACHE_IS_FULL)
+        ? obj.at(JsonFields::kCACHE_IS_FULL).as_bool()
+        : true;
+    auto const cacheIsCurrentlyLoading = obj.contains(JsonFields::kCACHE_IS_CURRENTLY_LOADING)
+        ? obj.at(JsonFields::kCACHE_IS_CURRENTLY_LOADING).as_bool()
         : false;
 
     return ClioNode{

src/cluster/ClioNode.hpp

@@ -19,7 +19,7 @@ struct ClioNode {
     /**
      * @brief The format of the time to store in the database.
      */
-    static constexpr char const* kTimeFormat = "%Y-%m-%dT%H:%M:%SZ";
+    static constexpr char const* kTIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ";
 
     /**
      * @brief Database role of a node in the cluster.

src/cluster/ClusterCommunicationService.cpp

@@ -7,6 +7,7 @@
 #include "util/config/ConfigDefinition.hpp"
 
 #include <chrono>
+#include <ctime>
 #include <memory>
 #include <utility>
 

src/cluster/ClusterCommunicationService.hpp

@@ -36,8 +36,8 @@ class ClusterCommunicationService : public ClusterCommunicationServiceTag {
     CacheLoaderDecider cacheLoaderDecider_;
 
 public:
-    static constexpr std::chrono::milliseconds kDefaultReadInterval{1000};
-    static constexpr std::chrono::milliseconds kDefaultWriteInterval{1000};
+    static constexpr std::chrono::milliseconds kDEFAULT_READ_INTERVAL{1000};
+    static constexpr std::chrono::milliseconds kDEFAULT_WRITE_INTERVAL{1000};
 
     /**
      * @brief Construct a new Cluster Communication Service object.
@@ -52,8 +52,8 @@ public:
         std::shared_ptr<data::BackendInterface> backend,
         std::unique_ptr<etl::WriterStateInterface> writerState,
         std::unique_ptr<data::LedgerCacheLoadingStateInterface> cacheLoadingState,
-        std::chrono::steady_clock::duration readInterval = kDefaultReadInterval,
-        std::chrono::steady_clock::duration writeInterval = kDefaultWriteInterval
+        std::chrono::steady_clock::duration readInterval = kDEFAULT_READ_INTERVAL,
+        std::chrono::steady_clock::duration writeInterval = kDEFAULT_WRITE_INTERVAL
     );
 
     ~ClusterCommunicationService() override;

src/cluster/WriterDecider.hpp

@@ -63,7 +63,7 @@ namespace cluster {
  */
 class WriterDecider {
 public:
-    static constexpr std::chrono::steady_clock::duration kRecoveryTime = std::chrono::hours{1};
+    static constexpr std::chrono::steady_clock::duration kRECOVERY_TIME = std::chrono::hours{1};
 
 private:
     /** @brief Thread pool for spawning asynchronous tasks */
@@ -90,12 +90,12 @@ public:
      * @param ctx          Thread pool for executing asynchronous operations
      * @param writerState  Writer state interface for controlling write operations
      * @param recoveryTime How long to wait in Fallback before attempting recovery
-     *                     (defaults to `kRecoveryTime`; pass a short duration in tests)
+     *                     (defaults to `kRECOVERY_TIME`; pass a short duration in tests)
      */
     WriterDecider(
         boost::asio::thread_pool& ctx,
         std::unique_ptr<etl::WriterStateInterface> writerState,
-        std::chrono::steady_clock::duration recoveryTime = kRecoveryTime
+        std::chrono::steady_clock::duration recoveryTime = kRECOVERY_TIME
     );
 
     /**

src/data/AmendmentCenter.cpp

@@ -33,8 +33,8 @@ namespace {
 std::unordered_set<std::string>&
 supportedAmendments()
 {
-    static std::unordered_set<std::string> kAmendments = {};
-    return kAmendments;
+    static std::unordered_set<std::string> kAMENDMENTS = {};
+    return kAMENDMENTS;
 }
 
 bool

src/data/BackendCounters.cpp

@@ -17,7 +17,7 @@ namespace data {
 
 namespace {
 
-std::vector<std::int64_t> const kHistogramBuckets{1, 2, 5, 10, 20, 50, 100, 200, 500, 700, 1000};
+std::vector<std::int64_t> const kHISTOGRAM_BUCKETS{1, 2, 5, 10, 20, 50, 100, 200, 500, 700, 1000};
 
 std::int64_t
 durationInMillisecondsSince(std::chrono::steady_clock::time_point const startTime)
@@ -60,7 +60,7 @@ BackendCounters::BackendCounters()
           PrometheusService::histogramInt(
               "backend_duration_milliseconds_histogram",
               Labels({Label{"operation", "read"}}),
-              kHistogramBuckets,
+              kHISTOGRAM_BUCKETS,
               "The duration of backend read operations including retries"
           )
       )
@@ -68,7 +68,7 @@ BackendCounters::BackendCounters()
           PrometheusService::histogramInt(
               "backend_duration_milliseconds_histogram",
               Labels({Label{"operation", "write"}}),
-              kHistogramBuckets,
+              kHISTOGRAM_BUCKETS,
               "The duration of backend write operations including retries"
           )
       )

src/data/BackendInterface.cpp

@@ -223,7 +223,7 @@ BackendInterface::fetchBookOffers(
                           << " blob = " << ripple::strHex(objs[i])
                           << " ledgerSequence = " << ledgerSequence;
         ASSERT(!objs[i].empty(), "Ledger object can't be empty");
-        page.offers.push_back({.key = keys[i], .blob = objs[i]});
+        page.offers.push_back({keys[i], objs[i]});
     }
     auto end = std::chrono::system_clock::now();
     LOG(log_.debug()) << "Fetching " << std::to_string(keys.size()) << " offers took "
@@ -311,7 +311,7 @@ BackendInterface::fetchLedgerPage(
         ripple::uint256 const& curCursor = [&]() {
             if (!keys.empty())
                 return keys.back();
-            return (cursor ? *cursor : kFirstKey);
+            return (cursor ? *cursor : kFIRST_KEY);
         }();
 
         // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
@@ -328,7 +328,7 @@ BackendInterface::fetchLedgerPage(
     auto objects = fetchLedgerObjects(keys, ledgerSequence, yield);
     for (size_t i = 0; i < objects.size(); ++i) {
         if (!objects[i].empty()) {
-            page.objects.push_back({.key = keys[i], .blob = std::move(objects[i])});
+            page.objects.push_back({keys[i], std::move(objects[i])});
         } else if (!outOfOrder) {
             LOG(log_.error()) << "Deleted or non-existent object in successor table. key = "
                               << ripple::strHex(keys[i]) << " - seq = " << ledgerSequence;

src/data/BackendInterface.hpp

@@ -49,7 +49,7 @@ public:
     }
 };
 
-static constexpr std::size_t kDefaultWaitBetweenRetry = 500;
+static constexpr std::size_t kDEFAULT_WAIT_BETWEEN_RETRY = 500;
 /**
  * @brief A helper function that catches DatabaseTimeout exceptions and retries indefinitely.
  *
@@ -60,7 +60,7 @@ static constexpr std::size_t kDefaultWaitBetweenRetry = 500;
  */
 template <typename FnType>
 auto
-retryOnTimeout(FnType func, size_t waitMs = kDefaultWaitBetweenRetry)
+retryOnTimeout(FnType func, size_t waitMs = kDEFAULT_WAIT_BETWEEN_RETRY)
 {
     static util::Logger const log{"Backend"};  // NOLINT(readability-identifier-naming)
 
@@ -408,60 +408,6 @@ public:
         boost::asio::yield_context yield
     ) const = 0;
 
-    /**
-     * @brief Fetches transactions for a particular MPTokenIssuance ID.
-     *
-     * Returns one page of transactions for this issuance, newest-first (or oldest-first when
-     * @p forward is set). Each row of the mptoken_issuance_transactions table holds only a
-     * transaction hash and its ledger position, not the transaction itself or its type. So the
-     * query cannot filter by type. When a type filter is requested, the handler looks up each full
-     * transaction by hash and drops rows whose type does not match, the same way account_tx does.
-     *
-     * @param mptIssuanceID The 24-byte MPTokenIssuance ID.
-     * @param limit The maximum number of transactions per result page.
-     * @param forward Whether to fetch the page forwards or backwards from the given cursor.
-     * @param cursorIn The cursor to resume fetching from.
-     * @param yield The coroutine context.
-     * @return Results and a cursor to resume from.
-     */
-    virtual TransactionsAndCursor
-    fetchMPTokenIssuanceTransactions(
-        ripple::uint192 const& mptIssuanceID,
-        std::uint32_t limit,
-        bool forward,
-        std::optional<TransactionsCursor> const& cursorIn,
-        boost::asio::yield_context yield
-    ) const = 0;
-
-    /**
-     * @brief Fetches transactions for a particular MPTokenIssuance ID involving a particular
-     * account.
-     *
-     * Returns one page of transactions for this issuance and account, newest-first (or oldest-first
-     * when @p forward is set). Each row of the account_mptoken_issuance_transactions table holds
-     * only a transaction hash and its ledger position, not the transaction itself or its type. So
-     * the query cannot filter by type. When a type filter is requested, the handler looks up each
-     * full transaction by hash and drops rows whose type does not match, the same way account_tx
-     * does.
-     *
-     * @param mptIssuanceID The 24-byte MPTokenIssuance ID.
-     * @param account The account that must be affected by the transaction.
-     * @param limit The maximum number of transactions per result page.
-     * @param forward Whether to fetch the page forwards or backwards from the given cursor.
-     * @param cursorIn The cursor to resume fetching from.
-     * @param yield The coroutine context.
-     * @return Results and a cursor to resume from.
-     */
-    virtual TransactionsAndCursor
-    fetchAccountMPTokenIssuanceTransactions(
-        ripple::uint192 const& mptIssuanceID,
-        ripple::AccountID const& account,
-        std::uint32_t limit,
-        bool forward,
-        std::optional<TransactionsCursor> const& cursorIn,
-        boost::asio::yield_context yield
-    ) const = 0;
-
     /**
      * @brief Fetches a specific ledger object.
      *
@@ -779,28 +725,6 @@ public:
     virtual void
     writeNFTTransactions(std::vector<NFTTransactionsData> const& data) = 0;
 
-    /**
-     * @brief Write MPTokenIssuance transaction index rows to the `mptoken_issuance_transactions`
-     * table.
-     *
-     * @param data A vector of MPTokenIssuanceTransactionsData objects.
-     */
-    virtual void
-    writeMPTokenIssuanceTransactions(std::vector<MPTokenIssuanceTransactionsData> const& data) = 0;
-
-    /**
-     * @brief Write MPTokenIssuance transaction index rows to the
-     * `account_mptoken_issuance_transactions` table.
-     *
-     * One row is written per affected account in each record.
-     *
-     * @param data A vector of MPTokenIssuanceTransactionsData objects.
-     */
-    virtual void
-    writeAccountMPTokenIssuanceTransactions(
-        std::vector<MPTokenIssuanceTransactionsData> const& data
-    ) = 0;
-
     /**
      * @brief Write accounts that started holding onto a MPT.
      *

src/data/DBHelpers.hpp

@@ -199,20 +199,6 @@ struct MPTHolderData {
     ripple::AccountID holder;
 };
 
-/**
- * @brief Represents a transaction link for an MPTokenIssuance.
- *
- * @note Writing one of these records inserts into two tables:
- * mptoken_issuance_transactions and account_mptoken_issuance_transactions.
- */
-struct MPTokenIssuanceTransactionsData {
-    ripple::uint192 mptIssuanceID;
-    boost::container::flat_set<ripple::AccountID> accounts;
-    std::uint32_t ledgerSequence{};
-    std::uint32_t transactionIndex{};
-    ripple::uint256 txHash;
-};
-
 /**
  * @brief Check whether the supplied object is a dir node.
  *
@@ -223,13 +209,13 @@ template <typename T>
 inline bool
 isDirNode(T const& object)
 {
-    static constexpr auto kMinSizeRequired = 3;
-    if (std::size(object) < kMinSizeRequired)
+    static constexpr auto kMIN_SIZE_REQUIRED = 3;
+    if (std::size(object) < kMIN_SIZE_REQUIRED)
         return false;
 
-    static constexpr short kDirNodeSpaceKey = 0x0064;
+    static constexpr short kDIR_NODE_SPACE_KEY = 0x0064;
     short const spaceKey = (object.data()[1] << 8) | object.data()[2];
-    return spaceKey == kDirNodeSpaceKey;
+    return spaceKey == kDIR_NODE_SPACE_KEY;
 }
 
 /**
@@ -260,12 +246,12 @@ template <typename T>
 inline ripple::uint256
 getBookBase(T const& key)
 {
-    static constexpr size_t kEySize = 24;
+    static constexpr size_t kEY_SIZE = 24;
 
     ASSERT(key.size() == ripple::uint256::size(), "Invalid key size {}", key.size());
 
     ripple::uint256 ret;
-    for (size_t i = 0; i < kEySize; ++i)
+    for (size_t i = 0; i < kEY_SIZE; ++i)
         ret.data()[i] = key.data()[i];
 
     return ret;
@@ -284,4 +270,4 @@ uint256ToString(ripple::uint256 const& input)
 }
 
 /** @brief The ripple epoch start timestamp. Midnight on 1st January 2000. */
-static constexpr std::uint32_t kRippleEpochStart = 946684800;
+static constexpr std::uint32_t kRIPPLE_EPOCH_START = 946684800;

src/data/Types.hpp

@@ -312,13 +312,13 @@ struct AmendmentKey {
     operator<=>(AmendmentKey const& other) const = default;
 };
 
-constexpr ripple::uint256 kFirstKey{
+constexpr ripple::uint256 kFIRST_KEY{
     "0000000000000000000000000000000000000000000000000000000000000000"
 };
-constexpr ripple::uint256 kLastKey{
+constexpr ripple::uint256 kLAST_KEY{
     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 };
-constexpr ripple::uint256 kHi192{
+constexpr ripple::uint256 kHI192{
     "0000000000000000000000000000000000000000000000001111111111111111"
 };
 

src/data/cassandra/CassandraBackendFamily.hpp

@@ -77,13 +77,6 @@ protected:
     // TODO: move to interface level
     mutable FetchLedgerCacheType ledgerCache_{};
 
-    static constexpr std::size_t kTransactionCursorBindIndex = 1;
-    static constexpr std::size_t kTransactionLimitBindIndex = 2;
-    static constexpr std::size_t kMPTokenIssuanceTxCursorBindIndex = 1;
-    static constexpr std::size_t kMPTokenIssuanceTxLimitBindIndex = 2;
-    static constexpr std::size_t kAccountMPTokenIssuanceTxCursorBindIndex = 2;
-    static constexpr std::size_t kAccountMPTokenIssuanceTxLimitBindIndex = 3;
-
 public:
     /**
      * @brief Create a new cassandra/scylla backend instance.
@@ -161,16 +154,14 @@ public:
 
         auto cursor = txnCursor;
         if (cursor) {
-            statement.bindAt(kTransactionCursorBindIndex, cursor->asTuple());
+            statement.bindAt(1, cursor->asTuple());
             LOG(log_.debug()) << "account = " << ripple::strHex(account)
                               << " tuple = " << cursor->ledgerSequence << cursor->transactionIndex;
         } else {
             auto const seq = forward ? rng->minSequence : rng->maxSequence;
             auto const placeHolder = forward ? 0u : std::numeric_limits<std::uint32_t>::max();
 
-            statement.bindAt(
-                kTransactionCursorBindIndex, std::make_tuple(placeHolder, placeHolder)
-            );
+            statement.bindAt(1, std::make_tuple(placeHolder, placeHolder));
             LOG(log_.debug()) << "account = " << ripple::strHex(account) << " idx = " << seq
                               << " tuple = " << placeHolder;
         }
@@ -178,7 +169,7 @@ public:
         // FIXME: Limit is a hack to support uint32_t properly for the time
         // being. Should be removed later and schema updated to use proper
         // types.
-        statement.bindAt(kTransactionLimitBindIndex, Limit{limit});
+        statement.bindAt(2, Limit{limit});
         auto const res = executor_.read(yield, statement);
         auto const& results = res.value();
         if (not results.hasRows()) {
@@ -444,21 +435,19 @@ public:
 
         auto cursor = cursorIn;
         if (cursor) {
-            statement.bindAt(kTransactionCursorBindIndex, cursor->asTuple());
+            statement.bindAt(1, cursor->asTuple());
             LOG(log_.debug()) << "token_id = " << ripple::strHex(tokenID)
                               << " tuple = " << cursor->ledgerSequence << cursor->transactionIndex;
         } else {
             auto const seq = forward ? rng->minSequence : rng->maxSequence;
             auto const placeHolder = forward ? 0 : std::numeric_limits<std::uint32_t>::max();
 
-            statement.bindAt(
-                kTransactionCursorBindIndex, std::make_tuple(placeHolder, placeHolder)
-            );
+            statement.bindAt(1, std::make_tuple(placeHolder, placeHolder));
             LOG(log_.debug()) << "token_id = " << ripple::strHex(tokenID) << " idx = " << seq
                               << " tuple = " << placeHolder;
         }
 
-        statement.bindAt(kTransactionLimitBindIndex, Limit{limit});
+        statement.bindAt(2, Limit{limit});
 
         auto const res = executor_.read(yield, statement);
         auto const& results = res.value();
@@ -496,59 +485,6 @@ public:
         return {txns, {}};
     }
 
-    TransactionsAndCursor
-    fetchMPTokenIssuanceTransactions(
-        ripple::uint192 const& mptIssuanceID,
-        std::uint32_t const limit,
-        bool const forward,
-        std::optional<TransactionsCursor> const& cursorIn,
-        boost::asio::yield_context yield
-    ) const override
-    {
-        auto const statement = [this, forward, &mptIssuanceID]() {
-            if (forward)
-                return schema_->selectMPTokenIssuanceTxForward.bind(mptIssuanceID);
-
-            return schema_->selectMPTokenIssuanceTx.bind(mptIssuanceID);
-        }();
-        return fetchMPTokenIssuanceTransactionsImpl(
-            statement,
-            kMPTokenIssuanceTxCursorBindIndex,
-            kMPTokenIssuanceTxLimitBindIndex,
-            limit,
-            forward,
-            cursorIn,
-            yield
-        );
-    }
-
-    TransactionsAndCursor
-    fetchAccountMPTokenIssuanceTransactions(
-        ripple::uint192 const& mptIssuanceID,
-        ripple::AccountID const& account,
-        std::uint32_t const limit,
-        bool const forward,
-        std::optional<TransactionsCursor> const& cursorIn,
-        boost::asio::yield_context yield
-    ) const override
-    {
-        auto const statement = [this, forward, &mptIssuanceID, &account]() {
-            if (forward)
-                return schema_->selectAccountMPTokenIssuanceTxForward.bind(mptIssuanceID, account);
-
-            return schema_->selectAccountMPTokenIssuanceTx.bind(mptIssuanceID, account);
-        }();
-        return fetchMPTokenIssuanceTransactionsImpl(
-            statement,
-            kAccountMPTokenIssuanceTxCursorBindIndex,
-            kAccountMPTokenIssuanceTxLimitBindIndex,
-            limit,
-            forward,
-            cursorIn,
-            yield
-        );
-    }
-
     MPTHoldersAndCursor
     fetchMPTHolders(
         ripple::uint192 const& mptID,
@@ -667,7 +603,7 @@ public:
         if (auto const res = executor_.read(yield, schema_->selectSuccessor, key, ledgerSequence);
             res) {
             if (auto const result = res->template get<ripple::uint256>(); result) {
-                if (*result == kLastKey)
+                if (*result == kLAST_KEY)
                     return std::nullopt;
                 return result;
             }
@@ -941,55 +877,6 @@ public:
         executor_.write(std::move(statements));
     }
 
-    void
-    writeMPTokenIssuanceTransactions(
-        std::vector<MPTokenIssuanceTransactionsData> const& data
-    ) override
-    {
-        std::vector<Statement> statements;
-        statements.reserve(data.size());
-
-        std::ranges::transform(data, std::back_inserter(statements), [this](auto const& record) {
-            return schema_->insertMPTokenIssuanceTx.bind(
-                record.mptIssuanceID,
-                std::make_tuple(record.ledgerSequence, record.transactionIndex),
-                record.txHash
-            );
-        });
-
-        executor_.write(std::move(statements));
-    }
-
-    void
-    writeAccountMPTokenIssuanceTransactions(
-        std::vector<MPTokenIssuanceTransactionsData> const& data
-    ) override
-    {
-        std::size_t numStatements = 0u;
-        for (auto const& record : data)
-            numStatements += record.accounts.size();
-
-        std::vector<Statement> statements;
-        statements.reserve(numStatements);
-
-        for (auto const& record : data) {
-            std::ranges::transform(
-                record.accounts,
-                std::back_inserter(statements),
-                [this, &record](auto const& account) {
-                    return schema_->insertAccountMPTokenIssuanceTx.bind(
-                        record.mptIssuanceID,
-                        account,
-                        std::make_tuple(record.ledgerSequence, record.transactionIndex),
-                        record.txHash
-                    );
-                }
-            );
-        }
-
-        executor_.write(std::move(statements));
-    }
-
     void
     writeTransaction(
         std::string&& hash,
@@ -1129,86 +1016,6 @@ protected:
 
         return true;
     }
-
-    /**
-     * @brief Shared implementation of the two MPTokenIssuance transaction-index fetchers.
-     *
-     * @note The forward path queries with an inclusive seq_idx >=,
-     * so the returned cursor's transaction index is advanced
-     * by one to avoid re-reading the last row on the next page.
-     *
-     * @param statement The statement already bound with the partition-key columns.
-     * @param cursorIdx The bind index for the `seq_idx` cursor tuple.
-     * @param limitIdx The bind index for the `LIMIT`.
-     * @param limit The maximum number of transactions per result page.
-     * @param forward Whether the page is fetched forwards or backwards.
-     * @param cursorIn The cursor to resume fetching from.
-     * @param yield The coroutine context.
-     * @return Results and a cursor to resume from.
-     */
-    TransactionsAndCursor
-    fetchMPTokenIssuanceTransactionsImpl(
-        Statement const& statement,
-        std::size_t const cursorIdx,
-        std::size_t const limitIdx,
-        std::uint32_t const limit,
-        bool const forward,
-        std::optional<TransactionsCursor> const& cursorIn,
-        boost::asio::yield_context yield
-    ) const
-    {
-        auto rng = fetchLedgerRange();
-        if (!rng)
-            return {.txns = {}, .cursor = {}};
-
-        auto cursor = cursorIn;
-        if (cursor.has_value()) {
-            statement.bindAt(cursorIdx, cursor->asTuple());
-        } else {
-            // Forward uses the nft_history-style inclusive lower bound; reverse starts just past
-            // the latest validated ledger so its exclusive `<` query includes that ledger's rows.
-            auto const ledgerSequence = forward ? rng->minSequence : rng->maxSequence;
-            auto const transactionIndex = forward ? 0u : std::numeric_limits<std::uint32_t>::max();
-            statement.bindAt(cursorIdx, std::make_tuple(ledgerSequence, transactionIndex));
-        }
-
-        statement.bindAt(limitIdx, Limit{limit});
-
-        auto const res = executor_.read(yield, statement);
-        auto const& results = res.value();
-        if (not results.hasRows()) {
-            LOG(log_.debug()) << "No rows returned";
-            return {};
-        }
-
-        std::vector<ripple::uint256> hashes = {};
-        auto numRows = results.numRows();
-
-        for (auto const& [hash, data] :
-             extract<ripple::uint256, std::tuple<uint32_t, uint32_t>>(results)) {
-            hashes.push_back(hash);
-
-            if (--numRows == 0) {
-                LOG(log_.debug()) << "Setting cursor";
-                cursor = data;
-
-                // forward queries by ledger/tx sequence `>=`
-                // so we have to advance the index by one
-                if (forward)
-                    ++cursor->transactionIndex;
-            }
-        }
-
-        auto txns = fetchTransactions(hashes, yield);
-        LOG(log_.debug()) << "MPTokenIssuance Txns = " << txns.size();
-
-        if (txns.size() == limit) {
-            LOG(log_.debug()) << "Returning cursor";
-            return {std::move(txns), cursor};
-        }
-
-        return {std::move(txns), {}};
-    }
 };
 
 }  // namespace data::cassandra

src/data/cassandra/Schema.hpp

@@ -278,42 +278,9 @@ public:
                 R"(
            CREATE TABLE IF NOT EXISTS {}
                   (
-         mptoken_issuance_id blob,
-                     seq_idx tuple<bigint, bigint>,
-                        hash blob,
-                     PRIMARY KEY (mptoken_issuance_id, seq_idx)
-                  )
-             WITH CLUSTERING ORDER BY (seq_idx DESC)
-            )",
-                qualifiedTableName(settingsProvider_.get(), "mptoken_issuance_transactions")
-            )
-        );
-
-        statements.emplace_back(
-            fmt::format(
-                R"(
-           CREATE TABLE IF NOT EXISTS {}
-                  (
-         mptoken_issuance_id blob,
-                     account blob,
-                     seq_idx tuple<bigint, bigint>,
-                        hash blob,
-                     PRIMARY KEY ((mptoken_issuance_id, account), seq_idx)
-                  )
-             WITH CLUSTERING ORDER BY (seq_idx DESC)
-            )",
-                qualifiedTableName(settingsProvider_.get(), "account_mptoken_issuance_transactions")
-            )
-        );
-
-        statements.emplace_back(
-            fmt::format(
-                R"(
-           CREATE TABLE IF NOT EXISTS {}
-                  (
-                      mpt_id blob,
-                      holder blob,
-                     PRIMARY KEY (mpt_id, holder)
+                    mpt_id blob,
+                    holder blob,
+                   PRIMARY KEY (mpt_id, holder)
                   )
              WITH CLUSTERING ORDER BY (holder ASC)
             )",
@@ -507,34 +474,6 @@ public:
             );
         }();
 
-        PreparedStatement insertMPTokenIssuanceTx = [this]() {
-            return handle_.get().prepare(
-                fmt::format(
-                    R"(
-                INSERT INTO {}
-                       (mptoken_issuance_id, seq_idx, hash)
-                VALUES (?, ?, ?)
-                )",
-                    qualifiedTableName(settingsProvider_.get(), "mptoken_issuance_transactions")
-                )
-            );
-        }();
-
-        PreparedStatement insertAccountMPTokenIssuanceTx = [this]() {
-            return handle_.get().prepare(
-                fmt::format(
-                    R"(
-                INSERT INTO {}
-                       (mptoken_issuance_id, account, seq_idx, hash)
-                VALUES (?, ?, ?, ?)
-                )",
-                    qualifiedTableName(
-                        settingsProvider_.get(), "account_mptoken_issuance_transactions"
-                    )
-                )
-            );
-        }();
-
         PreparedStatement insertMPTHolder = [this]() {
             return handle_.get().prepare(
                 fmt::format(
@@ -801,76 +740,6 @@ public:
             );
         }();
 
-        PreparedStatement selectMPTokenIssuanceTx = [this]() {
-            return handle_.get().prepare(
-                fmt::format(
-                    R"(
-                SELECT hash, seq_idx
-                  FROM {}
-                 WHERE mptoken_issuance_id = ?
-                   AND seq_idx < ?
-              ORDER BY seq_idx DESC
-                 LIMIT ?
-                )",
-                    qualifiedTableName(settingsProvider_.get(), "mptoken_issuance_transactions")
-                )
-            );
-        }();
-
-        PreparedStatement selectMPTokenIssuanceTxForward = [this]() {
-            return handle_.get().prepare(
-                fmt::format(
-                    R"(
-                SELECT hash, seq_idx
-                  FROM {}
-                 WHERE mptoken_issuance_id = ?
-                   AND seq_idx >= ?
-              ORDER BY seq_idx ASC
-                 LIMIT ?
-                )",
-                    qualifiedTableName(settingsProvider_.get(), "mptoken_issuance_transactions")
-                )
-            );
-        }();
-
-        PreparedStatement selectAccountMPTokenIssuanceTx = [this]() {
-            return handle_.get().prepare(
-                fmt::format(
-                    R"(
-                SELECT hash, seq_idx
-                  FROM {}
-                 WHERE mptoken_issuance_id = ?
-                   AND account = ?
-                   AND seq_idx < ?
-              ORDER BY seq_idx DESC
-                 LIMIT ?
-                )",
-                    qualifiedTableName(
-                        settingsProvider_.get(), "account_mptoken_issuance_transactions"
-                    )
-                )
-            );
-        }();
-
-        PreparedStatement selectAccountMPTokenIssuanceTxForward = [this]() {
-            return handle_.get().prepare(
-                fmt::format(
-                    R"(
-                SELECT hash, seq_idx
-                  FROM {}
-                 WHERE mptoken_issuance_id = ?
-                   AND account = ?
-                   AND seq_idx >= ?
-              ORDER BY seq_idx ASC
-                 LIMIT ?
-                )",
-                    qualifiedTableName(
-                        settingsProvider_.get(), "account_mptoken_issuance_transactions"
-                    )
-                )
-            );
-        }();
-
         PreparedStatement selectNFTIDsByIssuerTaxon = [this]() {
             return handle_.get().prepare(
                 fmt::format(

src/data/cassandra/SettingsProvider.cpp

@@ -90,13 +90,13 @@ SettingsProvider::parseSettings() const
     if (config_.getValueView("connect_timeout").hasValue()) {
         auto const connectTimeoutSecond = config_.get<uint32_t>("connect_timeout");
         settings.connectionTimeout =
-            std::chrono::milliseconds{connectTimeoutSecond * util::kMillisecondsPerSecond};
+            std::chrono::milliseconds{connectTimeoutSecond * util::kMILLISECONDS_PER_SECOND};
     }
 
     if (config_.getValueView("request_timeout").hasValue()) {
         auto const requestTimeoutSecond = config_.get<uint32_t>("request_timeout");
         settings.requestTimeout =
-            std::chrono::milliseconds{requestTimeoutSecond * util::kMillisecondsPerSecond};
+            std::chrono::milliseconds{requestTimeoutSecond * util::kMILLISECONDS_PER_SECOND};
     }
 
     settings.certificate = parseOptionalCertificate();

src/data/cassandra/impl/Batch.cpp

@@ -12,7 +12,7 @@
 #include <vector>
 
 namespace {
-constexpr auto kBatchDeleter = [](CassBatch* ptr) { cass_batch_free(ptr); };
+constexpr auto kBATCH_DELETER = [](CassBatch* ptr) { cass_batch_free(ptr); };
 }  // namespace
 
 namespace data::cassandra::impl {
@@ -29,7 +29,7 @@ namespace data::cassandra::impl {
  * https://docs.datastax.com/en/developer/cpp-driver-dse/1.10/features/basics/batches/index.html
  */
 Batch::Batch(std::vector<Statement> const& statements)
-    : ManagedObject{cass_batch_new(CASS_BATCH_TYPE_UNLOGGED), kBatchDeleter}
+    : ManagedObject{cass_batch_new(CASS_BATCH_TYPE_UNLOGGED), kBATCH_DELETER}
 {
     cass_batch_set_is_idempotent(*this, cass_true);
 

src/data/cassandra/impl/Cluster.cpp

@@ -14,13 +14,13 @@
 
 namespace {
 
-constexpr auto kClusterDeleter = [](CassCluster* ptr) { cass_cluster_free(ptr); };
+constexpr auto kCLUSTER_DELETER = [](CassCluster* ptr) { cass_cluster_free(ptr); };
 
 };  // namespace
 
 namespace data::cassandra::impl {
 
-Cluster::Cluster(Settings const& settings) : ManagedObject{cass_cluster_new(), kClusterDeleter}
+Cluster::Cluster(Settings const& settings) : ManagedObject{cass_cluster_new(), kCLUSTER_DELETER}
 {
     using std::to_string;
 

src/data/cassandra/impl/Cluster.hpp

@@ -35,11 +35,11 @@ providerFromString(std::string const& provider)
  * @brief Bundles all cassandra settings in one place.
  */
 struct Settings {
-    static constexpr std::size_t kDefaultConnectionTimeout = 10000;
-    static constexpr uint32_t kDefaultMaxWriteRequestsOutstanding = 10'000;
-    static constexpr uint32_t kDefaultMaxReadRequestsOutstanding = 100'000;
-    static constexpr std::size_t kDefaultBatchSize = 20;
-    static constexpr Provider kDefaultProvider = Provider::Cassandra;
+    static constexpr std::size_t kDEFAULT_CONNECTION_TIMEOUT = 10000;
+    static constexpr uint32_t kDEFAULT_MAX_WRITE_REQUESTS_OUTSTANDING = 10'000;
+    static constexpr uint32_t kDEFAULT_MAX_READ_REQUESTS_OUTSTANDING = 100'000;
+    static constexpr std::size_t kDEFAULT_BATCH_SIZE = 20;
+    static constexpr Provider kDEFAULT_PROVIDER = Provider::Cassandra;
 
     /**
      * @brief Represents the configuration of contact points for cassandra.
@@ -61,7 +61,7 @@ struct Settings {
 
     /** @brief Connect timeout specified in milliseconds */
     std::chrono::milliseconds connectionTimeout =
-        std::chrono::milliseconds{kDefaultConnectionTimeout};
+        std::chrono::milliseconds{kDEFAULT_CONNECTION_TIMEOUT};
 
     /** @brief Request timeout specified in milliseconds */
     std::chrono::milliseconds requestTimeout = std::chrono::milliseconds{0};  // no timeout at all
@@ -73,19 +73,19 @@ struct Settings {
     uint32_t threads = std::thread::hardware_concurrency();
 
     /** @brief The maximum number of outstanding write requests at any given moment */
-    uint32_t maxWriteRequestsOutstanding = kDefaultMaxWriteRequestsOutstanding;
+    uint32_t maxWriteRequestsOutstanding = kDEFAULT_MAX_WRITE_REQUESTS_OUTSTANDING;
 
     /** @brief The maximum number of outstanding read requests at any given moment */
-    uint32_t maxReadRequestsOutstanding = kDefaultMaxReadRequestsOutstanding;
+    uint32_t maxReadRequestsOutstanding = kDEFAULT_MAX_READ_REQUESTS_OUTSTANDING;
 
     /** @brief The number of connection per host to always have active */
     uint32_t coreConnectionsPerHost = 3u;
 
     /** @brief Size of batches when writing */
-    std::size_t writeBatchSize = kDefaultBatchSize;
+    std::size_t writeBatchSize = kDEFAULT_BATCH_SIZE;
 
     /** @brief Provider to know if we are using scylladb or keyspace */
-    Provider provider = kDefaultProvider;
+    Provider provider = kDEFAULT_PROVIDER;
 
     /** @brief Size of the IO queue */
     std::optional<uint32_t> queueSizeIO =

src/data/cassandra/impl/Collection.hpp

@@ -14,7 +14,7 @@
 namespace data::cassandra::impl {
 
 class Collection : public ManagedObject<CassCollection> {
-    static constexpr auto kDeleter = [](CassCollection* ptr) { cass_collection_free(ptr); };
+    static constexpr auto kDELETER = [](CassCollection* ptr) { cass_collection_free(ptr); };
 
     static void
     throwErrorIfNeeded(CassError const rc, std::string_view const label)
@@ -30,7 +30,7 @@ public:
 
     template <typename Type>
     explicit Collection(std::vector<Type> const& value)
-        : ManagedObject{cass_collection_new(CASS_COLLECTION_TYPE_LIST, value.size()), kDeleter}
+        : ManagedObject{cass_collection_new(CASS_COLLECTION_TYPE_LIST, value.size()), kDELETER}
     {
         bind(value);
     }

src/data/cassandra/impl/ExecutionStrategy.hpp

@@ -119,7 +119,7 @@ public:
     /**
      * @return true if outstanding read requests allowance is exhausted; false otherwise
      */
-    [[nodiscard]] bool
+    bool
     isTooBusy() const
     {
         bool const result = numReadRequestsOutstanding_ >= maxReadRequestsOutstanding_;
@@ -495,7 +495,7 @@ public:
     /**
      * @brief Get statistics about the backend.
      */
-    [[nodiscard]] boost::json::object
+    boost::json::object
     stats() const
     {
         return counters_->report();
@@ -536,13 +536,13 @@ private:
         }
     }
 
-    [[nodiscard]] bool
+    bool
     canAddWriteRequest() const
     {
         return numWriteRequestsOutstanding_ < maxWriteRequestsOutstanding_;
     }
 
-    [[nodiscard]] bool
+    bool
     finishedAllWriteRequests() const
     {
         return numWriteRequestsOutstanding_ == 0;

src/data/cassandra/impl/Future.cpp

@@ -13,12 +13,12 @@
 #include <utility>
 
 namespace {
-constexpr auto kFutureDeleter = [](CassFuture* ptr) { cass_future_free(ptr); };
+constexpr auto kFUTURE_DELETER = [](CassFuture* ptr) { cass_future_free(ptr); };
 }  // namespace
 
 namespace data::cassandra::impl {
 
-/* implicit */ Future::Future(CassFuture* ptr) : ManagedObject{ptr, kFutureDeleter}
+/* implicit */ Future::Future(CassFuture* ptr) : ManagedObject{ptr, kFUTURE_DELETER}
 {
 }
 

src/data/cassandra/impl/Result.cpp

@@ -7,13 +7,13 @@
 #include <cstddef>
 
 namespace {
-constexpr auto kResultDeleter = [](CassResult const* ptr) { cass_result_free(ptr); };
-constexpr auto kResultIteratorDeleter = [](CassIterator* ptr) { cass_iterator_free(ptr); };
+constexpr auto kRESULT_DELETER = [](CassResult const* ptr) { cass_result_free(ptr); };
+constexpr auto kRESULT_ITERATOR_DELETER = [](CassIterator* ptr) { cass_iterator_free(ptr); };
 }  // namespace
 
 namespace data::cassandra::impl {
 
-/* implicit */ Result::Result(CassResult const* ptr) : ManagedObject{ptr, kResultDeleter}
+/* implicit */ Result::Result(CassResult const* ptr) : ManagedObject{ptr, kRESULT_DELETER}
 {
 }
 
@@ -30,7 +30,7 @@ Result::hasRows() const
 }
 
 /* implicit */ ResultIterator::ResultIterator(CassIterator* ptr)
-    : ManagedObject{ptr, kResultIteratorDeleter}, hasMore_{cass_iterator_next(ptr) != 0u}
+    : ManagedObject{ptr, kRESULT_ITERATOR_DELETER}, hasMore_{cass_iterator_next(ptr) != 0u}
 {
 }
 

src/data/cassandra/impl/Session.hpp

@@ -7,10 +7,10 @@
 namespace data::cassandra::impl {
 
 class Session : public ManagedObject<CassSession> {
-    static constexpr auto kDeleter = [](CassSession* ptr) { cass_session_free(ptr); };
+    static constexpr auto kDELETER = [](CassSession* ptr) { cass_session_free(ptr); };
 
 public:
-    Session() : ManagedObject{cass_session_new(), kDeleter}
+    Session() : ManagedObject{cass_session_new(), kDELETER}
     {
     }
 };

src/data/cassandra/impl/SslContext.cpp

@@ -8,13 +8,13 @@
 #include <string>
 
 namespace {
-constexpr auto kContextDeleter = [](CassSsl* ptr) { cass_ssl_free(ptr); };
+constexpr auto kCONTEXT_DELETER = [](CassSsl* ptr) { cass_ssl_free(ptr); };
 }  // namespace
 
 namespace data::cassandra::impl {
 
 SslContext::SslContext(std::string const& certificate)
-    : ManagedObject{cass_ssl_new(), kContextDeleter}
+    : ManagedObject{cass_ssl_new(), kCONTEXT_DELETER}
 {
     cass_ssl_set_verify_flags(*this, CASS_SSL_VERIFY_NONE);
     if (auto const rc = cass_ssl_add_trusted_cert(*this, certificate.c_str()); rc != CASS_OK) {

src/data/cassandra/impl/Statement.hpp

@@ -26,7 +26,7 @@
 namespace data::cassandra::impl {
 
 class Statement : public ManagedObject<CassStatement> {
-    static constexpr auto kDeleter = [](CassStatement* ptr) { cass_statement_free(ptr); };
+    static constexpr auto kDELETER = [](CassStatement* ptr) { cass_statement_free(ptr); };
 
 public:
     /**
@@ -37,7 +37,7 @@ public:
      */
     template <typename... Args>
     explicit Statement(std::string_view query, Args&&... args)
-        : ManagedObject{cass_statement_new_n(query.data(), query.size(), sizeof...(args)), kDeleter}
+        : ManagedObject{cass_statement_new_n(query.data(), query.size(), sizeof...(args)), kDELETER}
     {
         // TODO: figure out how to set consistency level in config
         // NOTE: Keyspace doesn't support QUORUM at write level
@@ -46,7 +46,7 @@ public:
         bind<Args...>(std::forward<Args>(args)...);
     }
 
-    /* implicit */ Statement(CassStatement* ptr) : ManagedObject{ptr, kDeleter}
+    /* implicit */ Statement(CassStatement* ptr) : ManagedObject{ptr, kDELETER}
     {
         // cass_statement_set_consistency(*this, CASS_CONSISTENCY_LOCAL_QUORUM);
         cass_statement_set_is_idempotent(*this, cass_true);
@@ -157,10 +157,10 @@ public:
  * This is used to produce Statement objects that can be executed.
  */
 class PreparedStatement : public ManagedObject<CassPrepared const> {
-    static constexpr auto kDeleter = [](CassPrepared const* ptr) { cass_prepared_free(ptr); };
+    static constexpr auto kDELETER = [](CassPrepared const* ptr) { cass_prepared_free(ptr); };
 
 public:
-    /* implicit */ PreparedStatement(CassPrepared const* ptr) : ManagedObject{ptr, kDeleter}
+    /* implicit */ PreparedStatement(CassPrepared const* ptr) : ManagedObject{ptr, kDELETER}
     {
     }
 

src/data/cassandra/impl/Tuple.cpp

@@ -5,18 +5,18 @@
 #include <cassandra.h>
 
 namespace {
-constexpr auto kTupleDeleter = [](CassTuple* ptr) { cass_tuple_free(ptr); };
-constexpr auto kTupleIteratorDeleter = [](CassIterator* ptr) { cass_iterator_free(ptr); };
+constexpr auto kTUPLE_DELETER = [](CassTuple* ptr) { cass_tuple_free(ptr); };
+constexpr auto kTUPLE_ITERATOR_DELETER = [](CassIterator* ptr) { cass_iterator_free(ptr); };
 }  // namespace
 
 namespace data::cassandra::impl {
 
-/* implicit */ Tuple::Tuple(CassTuple* ptr) : ManagedObject{ptr, kTupleDeleter}
+/* implicit */ Tuple::Tuple(CassTuple* ptr) : ManagedObject{ptr, kTUPLE_DELETER}
 {
 }
 
 /* implicit */ TupleIterator::TupleIterator(CassIterator* ptr)
-    : ManagedObject{ptr, kTupleIteratorDeleter}
+    : ManagedObject{ptr, kTUPLE_ITERATOR_DELETER}
 {
 }
 

src/data/cassandra/impl/Tuple.hpp

@@ -18,14 +18,14 @@
 namespace data::cassandra::impl {
 
 class Tuple : public ManagedObject<CassTuple> {
-    static constexpr auto kDeleter = [](CassTuple* ptr) { cass_tuple_free(ptr); };
+    static constexpr auto kDELETER = [](CassTuple* ptr) { cass_tuple_free(ptr); };
 
 public:
     /* implicit */ Tuple(CassTuple* ptr);
 
     template <typename... Types>
     explicit Tuple(std::tuple<Types...>&& value)
-        : ManagedObject{cass_tuple_new(std::tuple_size<std::tuple<Types...>>{}), kDeleter}
+        : ManagedObject{cass_tuple_new(std::tuple_size<std::tuple<Types...>>{}), kDELETER}
     {
         std::apply(std::bind_front(&Tuple::bind<Types...>, this), std::move(value));
     }

src/data/impl/LedgerCacheFile.cpp

@@ -19,7 +19,7 @@ namespace data::impl {
 
 using Hash = ripple::uint256;
 using Separator = std::array<char, 16>;
-static constexpr Separator kSeparator = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+static constexpr Separator kSEPARATOR = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
 namespace {
 
@@ -78,7 +78,7 @@ LedgerCacheFile::write(DataView dataView)
         .deletedSize = dataView.deleted.size()
     };
     file.write(header);
-    file.write(kSeparator);
+    file.write(kSEPARATOR);
 
     for (auto const& [k, v] : dataView.map) {
         file.write(k.data(), decltype(k)::bytes);
@@ -86,7 +86,7 @@ LedgerCacheFile::write(DataView dataView)
         file.write(v.blob.size());
         file.writeRaw(reinterpret_cast<char const*>(v.blob.data()), v.blob.size());
     }
-    file.write(kSeparator);
+    file.write(kSEPARATOR);
 
     for (auto const& [k, v] : dataView.deleted) {
         file.write(k.data(), decltype(k)::bytes);
@@ -94,7 +94,7 @@ LedgerCacheFile::write(DataView dataView)
         file.write(v.blob.size());
         file.writeRaw(reinterpret_cast<char const*>(v.blob.data()), v.blob.size());
     }
-    file.write(kSeparator);
+    file.write(kSEPARATOR);
     auto const hash = file.hash();
     file.write(hash.data(), decltype(hash)::bytes);
 
@@ -129,9 +129,9 @@ LedgerCacheFile::read(uint32_t minLatestSequence)
         if (not file.read(header)) {
             return std::unexpected{"Error reading cache header"};
         }
-        if (header.version != kVersion) {
+        if (header.version != kVERSION) {
             return std::unexpected{fmt::format(
-                "Cache has wrong version: expected {} found {}", kVersion, header.version
+                "Cache has wrong version: expected {} found {}", kVERSION, header.version
             )};
         }
         if (header.latestSeq < minLatestSequence) {

src/data/impl/LedgerCacheFile.hpp

@@ -17,14 +17,14 @@ namespace data::impl {
 class LedgerCacheFile {
 public:
     struct Header {
-        uint32_t version = kVersion;
+        uint32_t version = kVERSION;
         uint32_t latestSeq{};
         uint64_t mapSize{};
         uint64_t deletedSize{};
     };
 
 private:
-    static constexpr uint32_t kVersion = 1;
+    static constexpr uint32_t kVERSION = 1;
 
     std::string path_;