chore: Commits for 2.5.0-b3 (#2197 )

chore: Commits for 2.5.0-b2 (#2146 )
2026-06-17 15:46:50 +00:00 · 2025-06-09 11:48:12 +01:00 · 2025-05-20 16:53:06 +01:00
1034 changed files with 50709 additions and 62392 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -22,7 +22,7 @@ BreakBeforeBinaryOperators: false
 BreakBeforeBraces: WebKit
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: true
-ColumnLimit: 100
+ColumnLimit: 120
 CommentPragmas: "^ IWYU pragma:"
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 4
@@ -49,7 +49,6 @@ IndentFunctionDeclarationAfterType: false
 IndentWidth: 4
 IndentWrappedFunctionNames: false
 IndentRequiresClause: true
-InsertNewlineAtEOF: true
 RequiresClausePosition: OwnLine
 KeepEmptyLinesAtTheStartOfBlocks: false
 MaxEmptyLinesToKeep: 1
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -4,7 +4,6 @@ Checks: "-*,
  bugprone-assert-side-effect,
  bugprone-bad-signal-to-kill-thread,
  bugprone-bool-pointer-implicit-conversion,
-  bugprone-capturing-this-in-member-variable,
  bugprone-casting-through-void,
  bugprone-chained-comparison,
  bugprone-compare-pointer-to-member-virtual-function,
@@ -24,7 +23,6 @@ Checks: "-*,
  bugprone-lambda-function-name,
  bugprone-macro-parentheses,
  bugprone-macro-repeated-side-effects,
-  bugprone-misleading-setter-of-reference,
  bugprone-misplaced-operator-in-strlen-in-alloc,
  bugprone-misplaced-pointer-arithmetic-in-alloc,
  bugprone-misplaced-widening-cast,
@@ -66,7 +64,6 @@ Checks: "-*,
  bugprone-terminating-continue,
  bugprone-throw-keyword-missing,
  bugprone-too-small-loop-variable,
-  bugprone-unchecked-optional-access,
  bugprone-undefined-memory-manipulation,
  bugprone-undelegated-constructor,
  bugprone-unhandled-exception-at-new,
@@ -85,7 +82,6 @@ Checks: "-*,
  cppcoreguidelines-pro-type-static-cast-downcast,
  cppcoreguidelines-rvalue-reference-param-not-moved,
  cppcoreguidelines-use-default-member-init,
-  cppcoreguidelines-use-enum-class,
  cppcoreguidelines-virtual-class-destructor,
  hicpp-ignored-remove-result,
  llvm-namespace-comment,
@@ -109,10 +105,8 @@ Checks: "-*,
  modernize-use-emplace,
  modernize-use-equals-default,
  modernize-use-equals-delete,
-  modernize-use-nodiscard,
  modernize-use-override,
  modernize-use-ranges,
-  modernize-use-scoped-lock,
  modernize-use-starts-ends-with,
  modernize-use-std-numbers,
  modernize-use-using,
@@ -124,7 +118,6 @@ Checks: "-*,
  performance-move-constructor-init,
  performance-no-automatic-move,
  performance-trivially-destructible,
-  readability-ambiguous-smartptr-reset-call,
  readability-avoid-nested-conditional-operator,
  readability-avoid-return-with-void-value,
  readability-braces-around-statements,
@@ -135,9 +128,9 @@ Checks: "-*,
  readability-duplicate-include,
  readability-else-after-return,
  readability-enum-initial-value,
-  readability-identifier-naming,
  readability-implicit-bool-conversion,
  readability-inconsistent-declaration-parameter-name,
+  readability-identifier-naming,
  readability-make-member-function-const,
  readability-math-missing-parentheses,
  readability-misleading-indentation,
@@ -156,11 +149,6 @@ Checks: "-*,
  "

 CheckOptions:
-  bugprone-unsafe-functions.ReportMoreUnsafeFunctions: true
-  bugprone-unused-return-value.CheckedReturnTypes: ::std::error_code;::std::error_condition;::std::errc
-
-  misc-include-cleaner.IgnoreHeaders: '.*/(detail|impl)/.*;.*(expected|unexpected).*;.*ranges_lower_bound\.h;time.h;stdlib.h;__chrono/.*;fmt/chrono.h;boost/uuid/uuid_hash.hpp'
-
  readability-braces-around-statements.ShortStatementLines: 2
  readability-identifier-naming.MacroDefinitionCase: UPPER_CASE
  readability-identifier-naming.ClassCase: CamelCase
@@ -169,7 +157,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,25 +165,27 @@ 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.*"
+  bugprone-unsafe-functions.ReportMoreUnsafeFunctions: true
+  bugprone-unused-return-value.CheckedReturnTypes: ::std::error_code;::std::error_condition;::std::errc
+  misc-include-cleaner.IgnoreHeaders: '.*/(detail|impl)/.*;.*(expected|unexpected).*;.*ranges_lower_bound\.h;time.h;stdlib.h;__chrono/.*;fmt/chrono.h;boost/uuid/uuid_hash.hpp'

 HeaderFilterRegex: '^.*/(src|tests)/.*\.(h|hpp)$'
 WarningsAsErrors: "*"
--- a/.cmake-format.yaml
+++ b/.cmake-format.yaml
@@ -0,0 +1,245 @@
+_help_parse: Options affecting listfile parsing
+parse:
+  _help_additional_commands:
+    - Specify structure for custom cmake functions
+  additional_commands:
+    foo:
+      flags:
+        - BAR
+        - BAZ
+      kwargs:
+        HEADERS: "*"
+        SOURCES: "*"
+        DEPENDS: "*"
+  _help_override_spec:
+    - Override configurations per-command where available
+  override_spec: {}
+  _help_vartags:
+    - Specify variable tags.
+  vartags: []
+  _help_proptags:
+    - Specify property tags.
+  proptags: []
+_help_format: Options affecting formatting.
+format:
+  _help_disable:
+    - Disable formatting entirely, making cmake-format a no-op
+  disable: false
+  _help_line_width:
+    - How wide to allow formatted cmake files
+  line_width: 120
+  _help_tab_size:
+    - How many spaces to tab for indent
+  tab_size: 2
+  _help_use_tabchars:
+    - If true, lines are indented using tab characters (utf-8
+    - 0x09) instead of <tab_size> space characters (utf-8 0x20).
+    - In cases where the layout would require a fractional tab
+    - character, the behavior of the  fractional indentation is
+    - governed by <fractional_tab_policy>
+  use_tabchars: false
+  _help_fractional_tab_policy:
+    - If <use_tabchars> is True, then the value of this variable
+    - indicates how fractional indentions are handled during
+    - whitespace replacement. If set to 'use-space', fractional
+    - indentation is left as spaces (utf-8 0x20). If set to
+    - "`round-up` fractional indentation is replaced with a single"
+    - tab character (utf-8 0x09) effectively shifting the column
+    - to the next tabstop
+  fractional_tab_policy: use-space
+  _help_max_subgroups_hwrap:
+    - If an argument group contains more than this many sub-groups
+    - (parg or kwarg groups) then force it to a vertical layout.
+  max_subgroups_hwrap: 4
+  _help_max_pargs_hwrap:
+    - If a positional argument group contains more than this many
+    - arguments, then force it to a vertical layout.
+  max_pargs_hwrap: 6
+  _help_max_rows_cmdline:
+    - If a cmdline positional group consumes more than this many
+    - lines without nesting, then invalidate the layout (and nest)
+  max_rows_cmdline: 2
+  _help_separate_ctrl_name_with_space:
+    - If true, separate flow control names from their parentheses
+    - with a space
+  separate_ctrl_name_with_space: true
+  _help_separate_fn_name_with_space:
+    - If true, separate function names from parentheses with a
+    - space
+  separate_fn_name_with_space: false
+  _help_dangle_parens:
+    - If a statement is wrapped to more than one line, than dangle
+    - the closing parenthesis on its own line.
+  dangle_parens: true
+  _help_dangle_align:
+    - If the trailing parenthesis must be 'dangled' on its on
+    - "line, then align it to this reference: `prefix`: the start"
+    - "of the statement,  `prefix-indent`: the start of the"
+    - "statement, plus one indentation  level, `child`: align to"
+    - the column of the arguments
+  dangle_align: prefix
+  _help_min_prefix_chars:
+    - If the statement spelling length (including space and
+    - parenthesis) is smaller than this amount, then force reject
+    - nested layouts.
+  min_prefix_chars: 4
+  _help_max_prefix_chars:
+    - If the statement spelling length (including space and
+    - parenthesis) is larger than the tab width by more than this
+    - amount, then force reject un-nested layouts.
+  max_prefix_chars: 10
+  _help_max_lines_hwrap:
+    - If a candidate layout is wrapped horizontally but it exceeds
+    - this many lines, then reject the layout.
+  max_lines_hwrap: 2
+  _help_line_ending:
+    - What style line endings to use in the output.
+  line_ending: unix
+  _help_command_case:
+    - Format command names consistently as 'lower' or 'upper' case
+  command_case: canonical
+  _help_keyword_case:
+    - Format keywords consistently as 'lower' or 'upper' case
+  keyword_case: unchanged
+  _help_always_wrap:
+    - A list of command names which should always be wrapped
+  always_wrap: []
+  _help_enable_sort:
+    - If true, the argument lists which are known to be sortable
+    - will be sorted lexicographicall
+  enable_sort: true
+  _help_autosort:
+    - If true, the parsers may infer whether or not an argument
+    - list is sortable (without annotation).
+  autosort: true
+  _help_require_valid_layout:
+    - By default, if cmake-format cannot successfully fit
+    - everything into the desired linewidth it will apply the
+    - last, most aggressive attempt that it made. If this flag is
+    - True, however, cmake-format will print error, exit with non-
+    - zero status code, and write-out nothing
+  require_valid_layout: false
+  _help_layout_passes:
+    - A dictionary mapping layout nodes to a list of wrap
+    - decisions. See the documentation for more information.
+  layout_passes: {}
+_help_markup: Options affecting comment reflow and formatting.
+markup:
+  _help_bullet_char:
+    - What character to use for bulleted lists
+  bullet_char: "*"
+  _help_enum_char:
+    - What character to use as punctuation after numerals in an
+    - enumerated list
+  enum_char: .
+  _help_first_comment_is_literal:
+    - If comment markup is enabled, don't reflow the first comment
+    - block in each listfile. Use this to preserve formatting of
+    - your copyright/license statements.
+  first_comment_is_literal: false
+  _help_literal_comment_pattern:
+    - If comment markup is enabled, don't reflow any comment block
+    - which matches this (regex) pattern. Default is `None`
+    - (disabled).
+  literal_comment_pattern: null
+  _help_fence_pattern:
+    - Regular expression to match preformat fences in comments
+    - default= ``r'^\s*([`~]{3}[`~]*)(.*)$'``
+  fence_pattern: ^\s*([`~]{3}[`~]*)(.*)$
+  _help_ruler_pattern:
+    - Regular expression to match rulers in comments default=
+    - '``r''^\s*[^\w\s]{3}.*[^\w\s]{3}$''``'
+  ruler_pattern: ^\s*[^\w\s]{3}.*[^\w\s]{3}$
+  _help_explicit_trailing_pattern:
+    - If a comment line matches starts with this pattern then it
+    - is explicitly a trailing comment for the preceding
+    - argument. Default is '#<'
+  explicit_trailing_pattern: "#<"
+  _help_hashruler_min_length:
+    - If a comment line starts with at least this many consecutive
+    - hash characters, then don't lstrip() them off. This allows
+    - for lazy hash rulers where the first hash char is not
+    - separated by space
+  hashruler_min_length: 10
+  _help_canonicalize_hashrulers:
+    - If true, then insert a space between the first hash char and
+    - remaining hash chars in a hash ruler, and normalize its
+    - length to fill the column
+  canonicalize_hashrulers: true
+  _help_enable_markup:
+    - enable comment markup parsing and reflow
+  enable_markup: true
+_help_lint: Options affecting the linter
+lint:
+  _help_disabled_codes:
+    - a list of lint codes to disable
+  disabled_codes: []
+  _help_function_pattern:
+    - regular expression pattern describing valid function names
+  function_pattern: "[0-9a-z_]+"
+  _help_macro_pattern:
+    - regular expression pattern describing valid macro names
+  macro_pattern: "[0-9A-Z_]+"
+  _help_global_var_pattern:
+    - regular expression pattern describing valid names for
+    - variables with global (cache) scope
+  global_var_pattern: "[A-Z][0-9A-Z_]+"
+  _help_internal_var_pattern:
+    - regular expression pattern describing valid names for
+    - variables with global scope (but internal semantic)
+  internal_var_pattern: _[A-Z][0-9A-Z_]+
+  _help_local_var_pattern:
+    - regular expression pattern describing valid names for
+    - variables with local scope
+  local_var_pattern: "[a-z][a-z0-9_]+"
+  _help_private_var_pattern:
+    - regular expression pattern describing valid names for
+    - privatedirectory variables
+  private_var_pattern: _[0-9a-z_]+
+  _help_public_var_pattern:
+    - regular expression pattern describing valid names for public
+    - directory variables
+  public_var_pattern: "[A-Z][0-9A-Z_]+"
+  _help_argument_var_pattern:
+    - regular expression pattern describing valid names for
+    - function/macro arguments and loop variables.
+  argument_var_pattern: "[a-z][a-z0-9_]+"
+  _help_keyword_pattern:
+    - regular expression pattern describing valid names for
+    - keywords used in functions or macros
+  keyword_pattern: "[A-Z][0-9A-Z_]+"
+  _help_max_conditionals_custom_parser:
+    - In the heuristic for C0201, how many conditionals to match
+    - within a loop in before considering the loop a parser.
+  max_conditionals_custom_parser: 2
+  _help_min_statement_spacing:
+    - Require at least this many newlines between statements
+  min_statement_spacing: 1
+  _help_max_statement_spacing:
+    - Require no more than this many newlines between statements
+  max_statement_spacing: 2
+  max_returns: 6
+  max_branches: 12
+  max_arguments: 5
+  max_localvars: 15
+  max_statements: 50
+_help_encode: Options affecting file encoding
+encode:
+  _help_emit_byteorder_mark:
+    - If true, emit the unicode byte-order mark (BOM) at the start
+    - of the file
+  emit_byteorder_mark: false
+  _help_input_encoding:
+    - Specify the encoding of the input file. Defaults to utf-8
+  input_encoding: utf-8
+  _help_output_encoding:
+    - Specify the encoding of the output file. Defaults to utf-8.
+    - Note that cmake only claims to support utf-8 so be careful
+    - when using anything else
+  output_encoding: utf-8
+_help_misc: Miscellaneous configurations options.
+misc:
+  _help_per_command:
+    - A dictionary containing any per-command configuration
+    - overrides. Currently only `command_case` is supported.
+  per_command: {}
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -16,7 +16,6 @@ coverage:
 #
 # More info: https://github.com/XRPLF/clio/pull/2066
 ignore:
-  - "benchmarks"
  - "tests"
  - "src/data/cassandra/"
  - "src/data/CassandraBackend.hpp"
--- a/.gersemi/definitions.cmake
+++ b/.gersemi/definitions.cmake
@@ -1,22 +0,0 @@
-# Custom CMake command definitions for gersemi formatting.
-# These stubs teach gersemi the signatures of project-specific commands
-# so it can format their invocations correctly.
-
-function(setup_target_for_coverage_gcovr)
-    set(options NONE)
-    set(oneValueArgs BASE_DIRECTORY NAME FORMAT)
-    set(multiValueArgs EXCLUDE EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
-    cmake_parse_arguments(
-        THIS_FUNCTION_PREFIX
-        "${options}"
-        "${oneValueArgs}"
-        "${multiValueArgs}"
-        ${ARGN}
-    )
-endfunction()
-
-function(append_coverage_compiler_flags_to_target name mode)
-endfunction()
-
-function(patch_nix_binary target)
-endfunction()
--- a/.gersemirc
+++ b/.gersemirc
@@ -1 +0,0 @@
-definitions: [.gersemi]
--- a/.github/actions/build-clio/action.yml
+++ b/.github/actions/build-clio/action.yml
@@ -1,31 +0,0 @@
-name: Build clio
-description: Build clio in build directory
-
-inputs:
-  targets:
-    description: Space-separated build target names
-    default: all
-  nproc_subtract:
-    description: The number of processors to subtract when calculating parallelism.
-    required: true
-    default: "0"
-
-runs:
-  using: composite
-  steps:
-    - name: Get number of processors
-      uses: XRPLF/actions/get-nproc@cf0433aa74563aead044a1e395610c96d65a37cf
-      id: nproc
-      with:
-        subtract: ${{ inputs.nproc_subtract }}
-
-    - name: Build targets
-      shell: bash
-      env:
-        CMAKE_TARGETS: ${{ inputs.targets }}
-      run: |
-        cd build
-        cmake \
-            --build . \
-            --parallel "${{ steps.nproc.outputs.nproc }}" \
-            --target ${CMAKE_TARGETS}
--- a/.github/actions/build-identifier/action.yml
+++ b/.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}"
--- a/.github/actions/build_clio/action.yml
+++ b/.github/actions/build_clio/action.yml
@@ -0,0 +1,29 @@
+name: Build clio
+description: Build clio in build directory
+
+inputs:
+  targets:
+    description: Space-separated build target names
+    default: all
+  subtract_threads:
+    description: An option for the action get_number_of_threads. See get_number_of_threads
+    required: true
+    default: "0"
+
+runs:
+  using: composite
+  steps:
+    - name: Get number of threads
+      uses: ./.github/actions/get_number_of_threads
+      id: number_of_threads
+      with:
+        subtract_threads: ${{ inputs.subtract_threads }}
+
+    - name: Build targets
+      shell: bash
+      run: |
+        cd build
+        cmake \
+          --build . \
+          --parallel "${{ steps.number_of_threads.outputs.threads_number }}" \
+          --target ${{ inputs.targets }}
--- a/.github/actions/build_docker_image/action.yml
+++ b/.github/actions/build_docker_image/action.yml
@@ -17,14 +17,10 @@ inputs:
  platforms:
    description: Platforms to build the image for (e.g. linux/amd64,linux/arm64)
    required: true
-  build_args:
-    description: List of build-time variables
-    required: false

  dockerhub_repo:
    description: DockerHub repository name
    required: false
-    default: ""
  dockerhub_description:
    description: Short description of the image
    required: false
@@ -34,35 +30,44 @@ 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@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.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@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.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@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
      with:
        cache-image: false
-    - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
+    - uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0

-    - uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
+    - uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.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@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
      with:
        context: ${{ inputs.directory }}
        platforms: ${{ inputs.platforms }}
        push: ${{ inputs.push_image == 'true' }}
        tags: ${{ steps.meta.outputs.tags }}
-        build-args: ${{ inputs.build_args }}
+
+    - name: Update DockerHub description
+      if: ${{ inputs.push_image == 'true' && inputs.dockerhub_repo != '' }}
+      uses: peter-evans/dockerhub-description@432a30c9e07499fd01da9f8a49f0faf9e0ca5b77 # v4.0.2
+      with:
+        username: ${{ env.DOCKERHUB_USER }}
+        password: ${{ env.DOCKERHUB_PW }}
+        repository: ${{ inputs.dockerhub_repo }}
+        short-description: ${{ inputs.dockerhub_description }}
+        readme-filepath: ${{ inputs.directory }}/README.md
--- a/.github/actions/cmake/action.yml
+++ b/.github/actions/cmake/action.yml
@@ -1,76 +0,0 @@
-name: Run CMake
-description: Run CMake to generate build files
-
-inputs:
-  build_dir:
-    description: Build directory
-    required: false
-    default: "build"
-  build_type:
-    description: Build type for third-party libraries and clio. Could be 'Release', 'Debug'
-    required: true
-    default: "Release"
-  integration_tests:
-    description: Whether to generate target integration tests
-    required: true
-    default: "true"
-  benchmark:
-    description: Whether to generate targets for benchmarks
-    required: true
-    default: "true"
-  code_coverage:
-    description: Whether to enable code coverage
-    required: true
-    default: "false"
-  time_trace:
-    description: Whether to enable compiler trace reports
-    required: true
-    default: "false"
-  package:
-    description: Whether to generate Debian package
-    required: true
-    default: "false"
-  version:
-    description: Version of the clio_server binary
-    required: false
-    default: ""
-
-runs:
-  using: composite
-  steps:
-    - name: Run cmake
-      shell: bash
-      env:
-        BUILD_DIR: "${{ inputs.build_dir }}"
-        BUILD_TYPE: "${{ inputs.build_type }}"
-        INTEGRATION_TESTS: "${{ inputs.integration_tests == 'true' && 'ON' || 'OFF' }}"
-        BENCHMARK: "${{ inputs.benchmark == 'true' && 'ON' || 'OFF' }}"
-        COVERAGE: "${{ inputs.code_coverage == 'true' && 'ON' || 'OFF' }}"
-        TIME_TRACE: "${{ inputs.time_trace == 'true' && 'ON' || 'OFF' }}"
-        PACKAGE: "${{ inputs.package == 'true' && 'ON' || 'OFF' }}"
-        # GitHub creates a merge commit for a PR
-        # https://www.kenmuse.com/blog/the-many-shas-of-a-github-pull-request/
-        #
-        # We:
-        # - explicitly provide branch name
-        # - use `github.head_ref` to get the SHA of last commit in the PR branch
-        #
-        # This way it works both for PRs and pushes to branches.
-        GITHUB_BRANCH_NAME: "${{ github.head_ref || github.ref_name }}"
-        GITHUB_HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
-        #
-        # If tag is being pushed, or it's a nightly release, we use that version.
-        FORCE_CLIO_VERSION: ${{ inputs.version }}
-      run: |
-        cmake \
-            -B "${BUILD_DIR}" \
-            -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}"
--- a/.github/actions/code_coverage/action.yml
+++ b/.github/actions/code_coverage/action.yml
@@ -15,16 +15,15 @@ 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 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
+      uses: actions/upload-artifact@v4
      with:
        name: coverage-report.xml
        path: build/coverage_report.xml
--- a/.github/actions/conan/action.yml
+++ b/.github/actions/conan/action.yml
@@ -1,38 +0,0 @@
-name: Run Conan
-description: Run conan to install dependencies
-
-inputs:
-  build_dir:
-    description: Build directory
-    required: false
-    default: "build"
-  force_conan_source_build:
-    description: Whether conan should build all dependencies from source
-    required: true
-    default: "false"
-  build_type:
-    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
-  steps:
-    - name: Run conan
-      shell: bash
-      env:
-        BUILD_DIR: "${{ inputs.build_dir }}"
-        CONAN_BUILD_OPTION: "${{ inputs.force_conan_source_build == 'true' && '*' || 'missing' }}"
-        BUILD_TYPE: "${{ inputs.build_type }}"
-        SANITIZERS: "${{ inputs.sanitizers }}"
-      run: |
-        conan \
-            install . \
-            -of "${BUILD_DIR}" \
-            -b "${CONAN_BUILD_OPTION}" \
-            -s "build_type=${BUILD_TYPE}" \
-            --profile:all ci
--- a/.github/actions/create_issue/action.yml
+++ b/.github/actions/create_issue/action.yml
@@ -0,0 +1,41 @@
+name: Create an issue
+description: Create an issue
+
+inputs:
+  title:
+    description: Issue title
+    required: true
+  body:
+    description: Issue body
+    required: true
+  labels:
+    description: Comma-separated list of labels
+    required: true
+    default: "bug"
+  assignees:
+    description: Comma-separated list of assignees
+    required: true
+    default: "godexsoft,kuznetsss,PeterChen13579,mathbunnyru"
+
+outputs:
+  created_issue_id:
+    description: Created issue id
+    value: ${{ steps.create_issue.outputs.created_issue }}
+
+runs:
+  using: composite
+  steps:
+    - name: Create an issue
+      id: create_issue
+      shell: bash
+      run: |
+        echo -e '${{ inputs.body }}' > issue.md
+        gh issue create \
+          --assignee '${{ inputs.assignees }}' \
+          --label '${{ inputs.labels }}' \
+          --title '${{ inputs.title }}' \
+          --body-file ./issue.md \
+          > create_issue.log
+        created_issue="$(sed 's|.*/||' create_issue.log)"
+        echo "created_issue=$created_issue" >> $GITHUB_OUTPUT
+        rm create_issue.log issue.md
--- a/.github/actions/generate/action.yml
+++ b/.github/actions/generate/action.yml
@@ -0,0 +1,88 @@
+name: Run conan and cmake
+description: Run conan and cmake
+
+inputs:
+  conan_profile:
+    description: Conan profile name
+    required: true
+  conan_cache_hit:
+    description: Whether conan cache has been downloaded
+    required: true
+    default: "false"
+  build_type:
+    description: Build type for third-party libraries and clio. Could be 'Release', 'Debug'
+    required: true
+    default: "Release"
+  build_integration_tests:
+    description: Whether to build integration tests
+    required: true
+    default: "true"
+  code_coverage:
+    description: Whether conan's coverage option should be on or not
+    required: true
+    default: "false"
+  static:
+    description: Whether Clio is to be statically linked
+    required: true
+    default: "false"
+  sanitizer:
+    description: Sanitizer to use
+    required: true
+    default: "false"
+    choices:
+      - "false"
+      - "tsan"
+      - "asan"
+      - "ubsan"
+  time_trace:
+    description: Whether to enable compiler trace reports
+    required: true
+    default: "false"
+
+runs:
+  using: composite
+  steps:
+    - name: Create build directory
+      shell: bash
+      run: mkdir -p build
+
+    - name: Run conan
+      shell: bash
+      env:
+        BUILD_OPTION: "${{ inputs.conan_cache_hit == 'true' && 'missing' || '*' }}"
+        CODE_COVERAGE: "${{ inputs.code_coverage == 'true' && 'True' || 'False' }}"
+        STATIC_OPTION: "${{ inputs.static == 'true' && 'True' || 'False' }}"
+        INTEGRATION_TESTS_OPTION: "${{ inputs.build_integration_tests == 'true' && 'True' || 'False' }}"
+        TIME_TRACE: "${{ inputs.time_trace == 'true' && 'True' || 'False' }}"
+      run: |
+        cd build
+        conan \
+          install .. \
+          -of . \
+          -b "$BUILD_OPTION" \
+          -s "build_type=${{ inputs.build_type }}" \
+          -o "&:static=${STATIC_OPTION}" \
+          -o "&:tests=True" \
+          -o "&:integration_tests=${INTEGRATION_TESTS_OPTION}" \
+          -o "&:lint=False" \
+          -o "&:coverage=${CODE_COVERAGE}" \
+          -o "&:time_trace=${TIME_TRACE}" \
+          --profile:all "${{ inputs.conan_profile }}"
+
+    - name: Run cmake
+      shell: bash
+      env:
+        BUILD_TYPE: "${{ inputs.build_type }}"
+        SANITIZER_OPTION: |-
+          ${{ inputs.sanitizer == 'tsan' && '-Dsan=thread' ||
+              inputs.sanitizer == 'ubsan' && '-Dsan=undefined' ||
+              inputs.sanitizer == 'asan' && '-Dsan=address' ||
+              '' }}
+      run: |
+        cd build
+        cmake \
+          -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake \
+          -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \
+          "${SANITIZER_OPTION}" \
+          .. \
+          -G Ninja
--- a/.github/actions/get_number_of_threads/action.yml
+++ b/.github/actions/get_number_of_threads/action.yml
@@ -0,0 +1,36 @@
+name: Get number of threads
+description: Determines number of threads to use on macOS and Linux
+
+inputs:
+  subtract_threads:
+    description: How many threads to subtract from the calculated number
+    required: true
+    default: "0"
+outputs:
+  threads_number:
+    description: Number of threads to use
+    value: ${{ steps.number_of_threads_export.outputs.num }}
+
+runs:
+  using: composite
+  steps:
+    - name: Get number of threads on mac
+      id: mac_threads
+      if: ${{ runner.os == 'macOS' }}
+      shell: bash
+      run: echo "num=$(($(sysctl -n hw.logicalcpu) - 2))" >> $GITHUB_OUTPUT
+
+    - name: Get number of threads on Linux
+      id: linux_threads
+      if: ${{ runner.os == 'Linux' }}
+      shell: bash
+      run: echo "num=$(($(nproc) - 2))" >> $GITHUB_OUTPUT
+
+    - name: Shift and export number of threads
+      id: number_of_threads_export
+      shell: bash
+      run: |
+        num_of_threads="${{ steps.mac_threads.outputs.num || steps.linux_threads.outputs.num }}"
+        shift_by="${{ inputs.subtract_threads }}"
+        shifted="$((num_of_threads - shift_by))"
+        echo "num=$(( shifted > 1 ? shifted : 1 ))" >> $GITHUB_OUTPUT
--- a/.github/actions/git_common_ancestor/action.yml
+++ b/.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
--- a/.github/actions/prepare_runner/action.yml
+++ b/.github/actions/prepare_runner/action.yml
@@ -0,0 +1,77 @@
+name: Prepare runner
+description: Install packages, set environment variables, create directories
+
+inputs:
+  disable_ccache:
+    description: Whether ccache should be disabled
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Install packages on mac
+      if: ${{ runner.os == 'macOS' }}
+      shell: bash
+      run: |
+        brew install \
+          bison \
+          ca-certificates \
+          ccache \
+          clang-build-analyzer \
+          conan \
+          gh \
+          jq \
+          llvm@14 \
+          ninja \
+          pkg-config
+        echo "/opt/homebrew/opt/conan@2/bin" >> $GITHUB_PATH
+
+    - name: Install CMake 3.31.6 on mac
+      if: ${{ runner.os == 'macOS' }}
+      shell: bash
+      run: |
+        # Uninstall any existing cmake
+        brew uninstall cmake --ignore-dependencies || true
+
+        # Download specific cmake formula
+        FORMULA_URL="https://raw.githubusercontent.com/Homebrew/homebrew-core/b4e46db74e74a8c1650b38b1da222284ce1ec5ce/Formula/c/cmake.rb"
+        FORMULA_EXPECTED_SHA256="c7ec95d86f0657638835441871e77541165e0a2581b53b3dd657cf13ad4228d4"
+
+        mkdir -p /tmp/homebrew-formula
+        curl -s -L "$FORMULA_URL" -o /tmp/homebrew-formula/cmake.rb
+
+        echo "$FORMULA_EXPECTED_SHA256  /tmp/homebrew-formula/cmake.rb" | shasum -a 256 -c
+
+        # Install cmake from the specific formula with force flag
+        brew install --formula --force /tmp/homebrew-formula/cmake.rb
+
+    - name: Fix git permissions on Linux
+      if: ${{ runner.os == 'Linux' }}
+      shell: bash
+      run: git config --global --add safe.directory "$PWD"
+
+    - name: Set env variables for macOS
+      if: ${{ runner.os == 'macOS' }}
+      shell: bash
+      run: |
+        echo "CCACHE_DIR=${{ github.workspace }}/.ccache" >> $GITHUB_ENV
+        echo "CONAN_HOME=${{ github.workspace }}/.conan2" >> $GITHUB_ENV
+
+    - name: Set env variables for Linux
+      if: ${{ runner.os == 'Linux' }}
+      shell: bash
+      run: |
+        echo "CCACHE_DIR=/root/.ccache" >> $GITHUB_ENV
+        echo "CONAN_HOME=/root/.conan2" >> $GITHUB_ENV
+
+    - name: Set CCACHE_DISABLE=1
+      if: ${{ inputs.disable_ccache == 'true' }}
+      shell: bash
+      run: |
+        echo "CCACHE_DISABLE=1" >> $GITHUB_ENV
+
+    - name: Create directories
+      shell: bash
+      run: |
+        mkdir -p "$CCACHE_DIR"
+        mkdir -p "$CONAN_HOME"
--- a/.github/actions/restore_cache/action.yml
+++ b/.github/actions/restore_cache/action.yml
@@ -0,0 +1,64 @@
+name: Restore cache
+description: Find and restores conan and ccache cache
+
+inputs:
+  conan_dir:
+    description: Path to Conan directory
+    required: true
+  conan_profile:
+    description: Conan profile name
+    required: true
+  ccache_dir:
+    description: Path to .ccache directory
+    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:
+  conan_hash:
+    description: Hash to use as a part of conan cache key
+    value: ${{ steps.conan_hash.outputs.hash }}
+  conan_cache_hit:
+    description: True if conan cache has been downloaded
+    value: ${{ steps.conan_cache.outputs.cache-hit }}
+  ccache_cache_hit:
+    description: True if ccache cache has been downloaded
+    value: ${{ steps.ccache_cache.outputs.cache-hit }}
+
+runs:
+  using: composite
+  steps:
+    - name: Find common commit
+      id: git_common_ancestor
+      uses: ./.github/actions/git_common_ancestor
+
+    - name: Calculate conan hash
+      id: conan_hash
+      shell: bash
+      run: |
+        conan graph info . --format json --out-file info.json -o '&:tests=True' --profile:all ${{ inputs.conan_profile }}
+        packages_info="$(cat info.json | jq -r '.graph.nodes[]?.ref' | grep -v 'clio')"
+        echo "$packages_info"
+        hash="$(echo "$packages_info" | shasum -a 256 | cut -d ' ' -f 1)"
+        rm info.json
+        echo "hash=$hash" >> $GITHUB_OUTPUT
+
+    - name: Restore conan cache
+      uses: actions/cache/restore@v4
+      id: conan_cache
+      with:
+        path: ${{ inputs.conan_dir }}/p
+        key: clio-conan_data-${{ runner.os }}-${{ inputs.build_type }}-${{ inputs.conan_profile }}-develop-${{ steps.conan_hash.outputs.hash }}
+
+    - name: Restore ccache cache
+      uses: actions/cache/restore@v4
+      id: ccache_cache
+      if: ${{ env.CCACHE_DISABLE != '1' }}
+      with:
+        path: ${{ inputs.ccache_dir }}
+        key: clio-ccache-${{ runner.os }}-${{ inputs.build_type }}${{ inputs.code_coverage == 'true' && '-code_coverage' || '' }}-${{ inputs.conan_profile }}-develop-${{ steps.git_common_ancestor.outputs.commit }}
--- a/.github/actions/save_cache/action.yml
+++ b/.github/actions/save_cache/action.yml
@@ -0,0 +1,59 @@
+name: Save cache
+description: Save conan and ccache cache for develop branch
+
+inputs:
+  conan_dir:
+    description: Path to .conan directory
+    required: true
+  conan_profile:
+    description: Conan profile name
+    required: true
+  conan_hash:
+    description: Hash to use as a part of conan cache key
+    required: true
+  conan_cache_hit:
+    description: Whether conan cache has been downloaded
+    required: true
+  ccache_dir:
+    description: Path to .ccache directory
+    required: true
+  ccache_cache_hit:
+    description: Whether conan cache has been downloaded
+    required: true
+  ccache_cache_miss_rate:
+    description: How many cache misses happened
+  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"
+
+runs:
+  using: composite
+  steps:
+    - name: Find common commit
+      id: git_common_ancestor
+      uses: ./.github/actions/git_common_ancestor
+
+    - name: Cleanup conan directory from extra data
+      if: ${{ inputs.conan_cache_hit != 'true' }}
+      shell: bash
+      run: |
+        conan cache clean --source --build --temp
+
+    - name: Save conan cache
+      if: ${{ inputs.conan_cache_hit != 'true' }}
+      uses: actions/cache/save@v4
+      with:
+        path: ${{ inputs.conan_dir }}/p
+        key: clio-conan_data-${{ runner.os }}-${{ inputs.build_type }}-${{ inputs.conan_profile }}-develop-${{ inputs.conan_hash }}
+
+    - name: Save ccache cache
+      if: ${{ inputs.ccache_cache_hit != 'true' || inputs.ccache_cache_miss_rate == '100.0' }}
+      uses: actions/cache/save@v4
+      with:
+        path: ${{ inputs.ccache_dir }}
+        key: clio-ccache-${{ runner.os }}-${{ inputs.build_type }}${{ inputs.code_coverage == 'true' && '-code_coverage' || '' }}-${{ inputs.conan_profile }}-develop-${{ steps.git_common_ancestor.outputs.commit }}
--- a/.github/actions/set-compiler-env/action.yml
+++ b/.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
--- a/.github/actions/setup_conan/action.yml
+++ b/.github/actions/setup_conan/action.yml
@@ -0,0 +1,22 @@
+name: Setup conan
+description: Setup conan profile and artifactory
+
+inputs:
+  conan_profile:
+    description: Conan profile name
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Create conan profile on macOS
+      if: ${{ runner.os == 'macOS' }}
+      shell: bash
+      run: |
+        conan profile detect --name "${{ inputs.conan_profile }}" --force
+        sed -i '' 's/compiler.cppstd=[^ ]*/compiler.cppstd=20/' "${{ env.CONAN_HOME }}/profiles/${{ inputs.conan_profile }}"
+
+    - name: Add artifactory remote
+      shell: bash
+      run: |
+        conan remote add --index 0 --force ripple http://18.143.149.228:8081/artifactory/api/conan/dev
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,16 +1,150 @@
 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/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/create_issue/
+    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/generate/
+    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/get_number_of_threads/
+    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/prepare_runner/
+    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/restore_cache/
+    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/save_cache/
+    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/setup_conan/
    schedule:
      interval: weekly
      day: monday
--- a/.github/scripts/conan/generate_matrix.py
+++ b/.github/scripts/conan/generate_matrix.py
@@ -1,42 +0,0 @@
-#!/usr/bin/env python3
-import itertools
-import json
-
-LINUX_OS = ["heavy", "heavy-arm64"]
-LINUX_CONTAINERS = ['{ "image": "ghcr.io/xrplf/xrpld/nix-ubuntu:sha-7b9d553" }']
-LINUX_COMPILERS = ["gcc", "clang"]
-
-MACOS_OS = ["macos15"]
-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", ""]
-
-
-def generate_matrix():
-    configurations = []
-
-    for os, container, compiler in itertools.chain(
-        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):
-            configurations.append(
-                {
-                    "os": os,
-                    "container": container,
-                    "compiler": compiler,
-                    "sanitizers": sanitizers,
-                    "build_type": build_type,
-                }
-            )
-
-    return {"include": configurations}
-
-
-if __name__ == "__main__":
-    print(f"matrix={json.dumps(generate_matrix())}")
--- a/.github/scripts/conan/regenerate_lockfile.sh
+++ b/.github/scripts/conan/regenerate_lockfile.sh
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-TEMP_DIR=$(mktemp -d)
-trap "rm -rf $TEMP_DIR" EXIT
-
-echo "Using temporary CONAN_HOME: $TEMP_DIR"
-
-# We use a temporary Conan home to avoid polluting the user's existing Conan
-# configuration and to not use local cache (which leads to non-reproducible lockfiles).
-export CONAN_HOME="$TEMP_DIR"
-
-# Ensure that the xrplf remote is the first to be consulted, so any recipes we
-# patched are used. We also add it there to not created huge diff when the
-# official Conan Center Index is updated.
-conan remote add --force --index 0 xrplf https://conan.ripplex.io
-
-# Delete any existing lockfile.
-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
--- a/.github/scripts/execute-tests-under-sanitizer
+++ b/.github/scripts/execute-tests-under-sanitizer
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+set -o pipefail
+
+# Note: This script is intended to be run from the root of the repository.
+#
+# This script runs each unit-test separately and generates reports from the currently active sanitizer.
+# Output is saved in ./.sanitizer-report in the root of the repository
+
+if [[ -z "$1" ]]; then
+    cat <<EOF
+
+                                    ERROR
+-----------------------------------------------------------------------------
+     Path to clio_tests should be passed as first argument to the script.
+-----------------------------------------------------------------------------
+
+EOF
+    exit 1
+fi
+
+TEST_BINARY=$1
+
+if [[ ! -f "$TEST_BINARY" ]]; then
+  echo "Test binary not found: $TEST_BINARY"
+  exit 1
+fi
+
+TESTS=$($TEST_BINARY --gtest_list_tests | awk '/^  / {print suite $1} !/^  / {suite=$1}')
+
+OUTPUT_DIR="./.sanitizer-report"
+mkdir -p "$OUTPUT_DIR"
+
+for TEST in $TESTS; do
+  OUTPUT_FILE="$OUTPUT_DIR/${TEST//\//_}"
+  export TSAN_OPTIONS="log_path=\"$OUTPUT_FILE\" die_after_fork=0"
+  export ASAN_OPTIONS="log_path=\"$OUTPUT_FILE\""
+  export UBSAN_OPTIONS="log_path=\"$OUTPUT_FILE\""
+  export MallocNanoZone='0' # for MacOSX
+  $TEST_BINARY --gtest_filter="$TEST" > /dev/null 2>&1
+
+  if [ $? -ne 0 ]; then
+    echo "'$TEST' failed a sanitizer check."
+  fi
+done
--- a/.github/scripts/prepare-release-artifacts.sh
+++ b/.github/scripts/prepare-release-artifacts.sh
@@ -20,5 +20,5 @@ for artifact_name in $(ls); do
    rm "${artifact_name}/${BINARY_NAME}"
    rm -r "${artifact_name}"

-    sha256sum "./${artifact_name}.zip" >"./${artifact_name}.zip.sha256sum"
+    sha256sum "./${artifact_name}.zip" > "./${artifact_name}.zip.sha256sum"
 done
--- a/.github/scripts/update-libxrpl-version
+++ b/.github/scripts/update-libxrpl-version
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Note: This script is intended to be run from the root of the repository.
+#
+# This script modifies conanfile.py such that the specified version of libXRPL is used.
+
+if [[ -z "$1" ]]; then
+    cat <<EOF
+
+                                    ERROR
+-----------------------------------------------------------------------------
+            Version should be passed as first argument to the script.
+-----------------------------------------------------------------------------
+
+EOF
+    exit 1
+fi
+
+VERSION=$1
+GNU_SED=$(sed --version 2>&1 | grep -q 'GNU' && echo true || echo false)
+
+echo "+ Updating required libXRPL version to $VERSION"
+
+if [[ "$GNU_SED" == "false" ]]; then
+    sed -i '' -E "s|'xrpl/[a-zA-Z0-9\\.\\-]+'|'xrpl/$VERSION'|g" conanfile.py
+else
+    sed -i -E "s|'xrpl/[a-zA-Z0-9\\.\\-]+'|'xrpl/$VERSION'|g" conanfile.py
+fi
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,41 +2,35 @@ name: Build

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

-      - .github/workflows/reusable-build-test.yml
-      - .github/workflows/reusable-build.yml
-      - .github/workflows/reusable-test.yml
-      - .github/workflows/reusable-upload-coverage-report.yml
+      - .github/workflows/build_and_test.yml
+      - .github/workflows/build_impl.yml
+      - .github/workflows/test_impl.yml
+      - .github/workflows/upload_coverage_report.yml

      - ".github/actions/**"
-      - "!.github/actions/build-docker-image/**"
+      - "!.github/actions/build_docker_image/**"
+      - "!.github/actions/create_issue/**"

      - CMakeLists.txt
      - conanfile.py
-      - conan.lock
      - "cmake/**"
      - "src/**"
      - "tests/**"
-      - "benchmarks/**"

      - docs/config-description.md
  workflow_dispatch:

 concurrency:
-  # Develop branch: Each run gets unique group (using run_number) for parallel execution
-  # Other branches: Shared group with cancel-in-progress to stop old runs when new commits are pushed
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.ref == 'refs/heads/develop' && github.run_number || 'branch' }}
+  # Only cancel in-progress jobs or runs for the current workflow - matches against branch & tags
+  group: ${{ github.workflow }}-${{ github.ref }}
  cancel-in-progress: true

-defaults:
-  run:
-    shell: bash
-
 jobs:
  build-and-test:
    name: Build and Test
@@ -45,24 +39,25 @@ 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-7b9d553" }']
+        container: ['{ "image": "ghcr.io/xrplf/clio-ci:latest" }']
+        static: [true]

        include:
          - os: macos15
-            compiler: apple-clang
+            conan_profile: default_apple_clang
            build_type: Release
            container: ""
+            static: false

-    uses: ./.github/workflows/reusable-build-test.yml
+    uses: ./.github/workflows/build_and_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
@@ -70,17 +65,18 @@ jobs:
  code_coverage:
    name: Run Code Coverage

-    uses: ./.github/workflows/reusable-build.yml
+    uses: ./.github/workflows/build_impl.yml
    with:
      runs_on: heavy
-      container: '{ "image": "ghcr.io/xrplf/xrpld/nix-ubuntu:sha-7b9d553" }'
-      compiler: gcc
+      container: '{ "image": "ghcr.io/xrplf/clio-ci:latest" }'
+      conan_profile: gcc
      build_type: Debug
-      download_ccache: true
-      upload_ccache: true
+      disable_cache: false
      code_coverage: true
+      static: true
      upload_clio_server: false
      targets: all
+      sanitizer: "false"
      analyze_build_time: false
    secrets:
      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
@@ -90,21 +86,36 @@ jobs:
    needs: build-and-test
    runs-on: heavy
    container:
-      image: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-7b9d553
+      image: ghcr.io/xrplf/clio-ci:latest

    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@v4

-      - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+      - uses: actions/download-artifact@v4
        with:
          name: clio_server_Linux_Release_gcc

      - name: Compare Config Description
+        shell: bash
        run: |
          repoConfigFile=docs/config-description.md
-          configDescriptionFile=config_description_new.md
+          if ! [ -f "${repoConfigFile}" ]; then
+            echo "Config Description markdown file is missing in docs folder"
+            exit 1
+          fi

          chmod +x ./clio_server
+          configDescriptionFile=config_description_new.md
          ./clio_server -d "${configDescriptionFile}"

-          diff -u "${repoConfigFile}" "${configDescriptionFile}"
+          configDescriptionHash=$(sha256sum "${configDescriptionFile}" | cut -d' ' -f1)
+          repoConfigHash=$(sha256sum "${repoConfigFile}" | cut -d' ' -f1)
+
+          if [ "${configDescriptionHash}" != "${repoConfigHash}" ]; then
+            echo "Markdown file is not up to date"
+            diff -u "${repoConfigFile}" "${configDescriptionFile}"
+            rm -f "${configDescriptionFile}"
+            exit 1
+          fi
+          rm -f "${configDescriptionFile}"
+          exit 0
--- a/.github/workflows/reusable-build-test.yml
+++ b/.github/workflows/reusable-build-test.yml
@@ -13,34 +13,28 @@ 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
        type: string

-      download_ccache:
-        description: Whether to download ccache from the cache
-        required: false
-        type: boolean
-        default: true
-
-      upload_ccache:
-        description: Whether to upload ccache to the cache
+      disable_cache:
+        description: Whether ccache and conan cache should be disabled
        required: false
        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
@@ -63,44 +57,36 @@ on:
        type: string
        default: all

-      package:
-        description: Whether to generate Debian package
-        required: false
-        type: boolean
-        default: false
-
-      version:
-        description: Version of the clio_server binary
+      sanitizer:
+        description: Sanitizer to use
        required: false
        type: string
-        default: ""
+        default: "false"

 jobs:
  build:
-    uses: ./.github/workflows/reusable-build.yml
+    uses: ./.github/workflows/build_impl.yml
    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 }}
+      disable_cache: ${{ inputs.disable_cache }}
      code_coverage: false
+      static: ${{ inputs.static }}
      upload_clio_server: ${{ inputs.upload_clio_server }}
      targets: ${{ inputs.targets }}
+      sanitizer: ${{ inputs.sanitizer }}
      analyze_build_time: false
-      package: ${{ inputs.package }}
-      version: ${{ inputs.version }}

  test:
    needs: build
-    uses: ./.github/workflows/reusable-test.yml
+    uses: ./.github/workflows/test_impl.yml
    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 }}
+      sanitizer: ${{ inputs.sanitizer }}
--- a/.github/workflows/build_clio_docker_image.yml
+++ b/.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:
@@ -38,73 +38,63 @@ on:
        description: Whether to strip clio binary
        default: true

-defaults:
-  run:
-    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@v4

      - name: Download Clio binary from artifact
        if: ${{ inputs.artifact_name != null }}
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@v4
        with:
          name: ${{ inputs.artifact_name }}
          path: ./docker/clio/artifact/

      - name: Download Clio binary from url
        if: ${{ inputs.clio_server_binary_url != null }}
-        env:
-          BINARY_URL: ${{ inputs.clio_server_binary_url }}
-          BINARY_SHA256: ${{ inputs.binary_sha256 }}
+        shell: bash
        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
+          wget "${{inputs.clio_server_binary_url}}" -P ./docker/clio/artifact/
+          if [ "$(sha256sum ./docker/clio/clio_server | awk '{print $1}')" != "${{inputs.binary_sha256}}" ]; then
+            echo "Binary sha256 sum doesn't match"
+            exit 1
          fi
      - name: Unpack binary
+        shell: bash
        run: |
          sudo apt update && sudo apt install -y tar unzip
          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 ../
+          mv clio_server ../
          cd ../
          rm -rf ./artifact

      - name: Strip binary
        if: ${{ inputs.strip_binary }}
+        shell: bash
        run: strip ./docker/clio/clio_server

-      - name: Set GHCR_REPO
-        id: set-ghcr-repo
-        run: |
-          echo "GHCR_REPO=$(echo ghcr.io/${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" >>${GITHUB_OUTPUT}
-
      - name: Build Docker image
-        uses: ./.github/actions/build-docker-image
+        uses: ./.github/actions/build_docker_image
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
          DOCKERHUB_PW: ${{ secrets.DOCKERHUB_PW }}
        with:
          images: |
-            ghcr.io/${{ steps.set-ghcr-repo.outputs.GHCR_REPO }}/clio
-            ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio' || '' }}
-          push_image: ${{ inputs.push_image }}
+            ghcr.io/xrplf/clio
+            rippleci/clio
+          push_image: ${{ inputs.publish_image }}
          directory: docker/clio
          tags: ${{ inputs.tags }}
          platforms: linux/amd64
-          dockerhub_repo: ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio' || '' }}
+          dockerhub_repo: rippleci/clio
          dockerhub_description: Clio is an XRP Ledger API server.
--- a/.github/workflows/build_impl.yml
+++ b/.github/workflows/build_impl.yml
@@ -0,0 +1,206 @@
+name: Reusable build
+
+on:
+  workflow_call:
+    inputs:
+      runs_on:
+        description: Runner to run the job on
+        required: true
+        type: string
+
+      container:
+        description: "The container object as a JSON string (leave empty to run natively)"
+        required: true
+        type: string
+
+      conan_profile:
+        description: Conan profile to use
+        required: true
+        type: string
+
+      build_type:
+        description: Build type
+        required: true
+        type: string
+
+      disable_cache:
+        description: Whether ccache and conan cache should be disabled
+        required: false
+        type: boolean
+
+      code_coverage:
+        description: Whether to enable code coverage
+        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
+        type: boolean
+
+      targets:
+        description: Space-separated build target names
+        required: true
+        type: string
+
+      sanitizer:
+        description: Sanitizer to use
+        required: true
+        type: string
+
+      analyze_build_time:
+        description: Whether to enable build time analysis
+        required: true
+        type: boolean
+
+    secrets:
+      CODECOV_TOKEN:
+        required: false
+
+jobs:
+  build:
+    name: Build ${{ inputs.container != '' && 'in container' || 'natively' }}
+    runs-on: ${{ inputs.runs_on }}
+    container: ${{ inputs.container != '' && fromJson(inputs.container) || null }}
+
+    steps:
+      - name: Clean workdir
+        if: ${{ runner.os == 'macOS' }}
+        uses: kuznetsss/workspace-cleanup@80b9863b45562c148927c3d53621ef354e5ae7ce # v1.0
+
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Prepare runner
+        uses: ./.github/actions/prepare_runner
+        with:
+          disable_ccache: ${{ inputs.disable_cache }}
+
+      - name: Setup conan
+        uses: ./.github/actions/setup_conan
+        with:
+          conan_profile: ${{ inputs.conan_profile }}
+
+      - name: Restore cache
+        if: ${{ !inputs.disable_cache }}
+        uses: ./.github/actions/restore_cache
+        id: restore_cache
+        with:
+          conan_dir: ${{ env.CONAN_HOME }}
+          conan_profile: ${{ inputs.conan_profile }}
+          ccache_dir: ${{ env.CCACHE_DIR }}
+          build_type: ${{ inputs.build_type }}
+          code_coverage: ${{ inputs.code_coverage }}
+
+      - name: Run conan and cmake
+        uses: ./.github/actions/generate
+        with:
+          conan_profile: ${{ inputs.conan_profile }}
+          conan_cache_hit: ${{ !inputs.disable_cache && steps.restore_cache.outputs.conan_cache_hit }}
+          build_type: ${{ inputs.build_type }}
+          code_coverage: ${{ inputs.code_coverage }}
+          static: ${{ inputs.static }}
+          sanitizer: ${{ inputs.sanitizer }}
+          time_trace: ${{ inputs.analyze_build_time }}
+
+      - name: Build Clio
+        uses: ./.github/actions/build_clio
+        with:
+          targets: ${{ inputs.targets }}
+
+      - name: Show build time analyze report
+        if: ${{ inputs.analyze_build_time }}
+        run: |
+          ClangBuildAnalyzer --all build/ build_time_report.bin
+          ClangBuildAnalyzer --analyze build_time_report.bin > build_time_report.txt
+          cat build_time_report.txt
+        shell: bash
+
+      - name: Upload build time analyze report
+        if: ${{ inputs.analyze_build_time }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: build_time_report_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
+          path: build_time_report.txt
+
+      - name: Show ccache's statistics
+        if: ${{ !inputs.disable_cache }}
+        shell: bash
+        id: ccache_stats
+        run: |
+          ccache -s > /tmp/ccache.stats
+          miss_rate=$(cat /tmp/ccache.stats | grep 'Misses' | head -n1 | sed 's/.*(\(.*\)%).*/\1/')
+          echo "miss_rate=${miss_rate}" >> $GITHUB_OUTPUT
+          cat /tmp/ccache.stats
+
+      - name: Strip unit_tests
+        if: inputs.sanitizer == 'false' && !inputs.code_coverage && !inputs.analyze_build_time
+        run: strip build/clio_tests
+
+      - name: Strip integration_tests
+        if: inputs.sanitizer == 'false' && !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@v4
+        with:
+          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 }}
+        uses: actions/upload-artifact@v4
+        with:
+          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 }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: clio_integration_tests_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
+          path: build/clio_integration_tests
+
+      - name: Save cache
+        if: ${{ !inputs.disable_cache && github.ref == 'refs/heads/develop' }}
+        uses: ./.github/actions/save_cache
+        with:
+          conan_dir: ${{ env.CONAN_HOME }}
+          conan_hash: ${{ steps.restore_cache.outputs.conan_hash }}
+          conan_cache_hit: ${{ steps.restore_cache.outputs.conan_cache_hit }}
+          ccache_dir: ${{ env.CCACHE_DIR }}
+          ccache_cache_hit: ${{ steps.restore_cache.outputs.ccache_cache_hit }}
+          ccache_cache_miss_rate: ${{ steps.ccache_stats.outputs.miss_rate }}
+          build_type: ${{ inputs.build_type }}
+          code_coverage: ${{ inputs.code_coverage }}
+          conan_profile: ${{ inputs.conan_profile }}
+
+      # This is run as part of the build job, because it requires the following:
+      # - source code
+      # - generated source code (Build.cpp)
+      # - conan packages
+      # - .gcno files in build directory
+      #
+      # It's all available in the build job, but not in the test job
+      - name: Run code coverage
+        if: ${{ inputs.code_coverage }}
+        uses: ./.github/actions/code_coverage
+
+  # `codecov/codecov-action` will rerun `gcov` if it's available and build directory is present
+  # To prevent this from happening, we run this action in a separate workflow
+  #
+  # More info: https://github.com/XRPLF/clio/pull/2066
+  upload_coverage_report:
+    if: ${{ inputs.code_coverage }}
+    name: Codecov
+    needs: build
+    uses: ./.github/workflows/upload_coverage_report.yml
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
--- a/.github/workflows/check-libxrpl.yml
+++ b/.github/workflows/check-libxrpl.yml
@@ -1,113 +0,0 @@
-name: Check new libXRPL
-
-on:
-  repository_dispatch:
-    types: [check_libxrpl]
-
-concurrency:
-  # Only cancel in-progress jobs or runs for the current workflow - matches against branch & tags
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  COMPILER: gcc
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  build:
-    name: Build Clio / `libXRPL ${{ github.event.client_payload.version }}`
-    runs-on: heavy
-    container:
-      image: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-7b9d553
-
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-        with:
-          fetch-depth: 0
-
-      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@90f11ee655d1687824fb8793db770477d52afbab
-        with:
-          enable_ccache: false
-
-      - 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
-          rm -f conanfile.py.bak
-
-      - name: Update conan lockfile
-        run: |
-          conan lock create . --profile:all ci
-
-      - name: Run conan
-        uses: ./.github/actions/conan
-
-      - name: Run CMake
-        uses: ./.github/actions/cmake
-
-      - name: Build Clio
-        uses: ./.github/actions/build-clio
-
-      - name: Strip tests
-        run: strip build/clio_tests
-
-      - name: Upload clio_tests
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        with:
-          name: clio_tests_check_libxrpl
-          path: build/clio_tests
-
-  run_tests:
-    name: Run tests
-    needs: build
-    runs-on: heavy
-    container:
-      image: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-7b9d553
-
-    steps:
-      - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: clio_tests_check_libxrpl
-
-      - name: Run clio_tests
-        run: |
-          chmod +x ./clio_tests
-          ./clio_tests
-
-  create_issue_on_failure:
-    name: Create an issue on failure
-    needs: [build, run_tests]
-    if: ${{ always() && contains(needs.*.result, 'failure') }}
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: write
-      issues: write
-
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-
-      - name: Create an issue
-        uses: XRPLF/actions/create-issue@2b8bc36af85b88bca0dd7bfac2e2dc05f94ad712
-        with:
-          title: "Proposed libXRPL check failed"
-          body: >
-            Clio build or tests failed against `libXRPL ${{ github.event.client_payload.conan_ref }}`.
-
-            PR: ${{ github.event.client_payload.pr_url }}
-          labels: "compatibility,bug"
-          assignees: "godexsoft,kuznetsss,mathbunnyru"
--- a/.github/workflows/check-pr-title.yml
+++ b/.github/workflows/check-pr-title.yml
@@ -1,10 +0,0 @@
-name: Check PR title
-
-on:
-  pull_request:
-    types: [opened, edited, reopened, synchronize]
-    branches: [develop]
-
-jobs:
-  check_title:
-    uses: XRPLF/actions/.github/workflows/check-pr-title.yml@cba1f0891650baf1a9c88624dc2d72573be2eb81
--- a/.github/workflows/check_libxrpl.yml
+++ b/.github/workflows/check_libxrpl.yml
@@ -0,0 +1,101 @@
+name: Check new libXRPL
+
+on:
+  repository_dispatch:
+    types: [check_libxrpl]
+
+concurrency:
+  # Only cancel in-progress jobs or runs for the current workflow - matches against branch & tags
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  CONAN_PROFILE: gcc
+
+jobs:
+  build:
+    name: Build Clio / `libXRPL ${{ github.event.client_payload.version }}`
+    runs-on: [self-hosted, heavy]
+    container:
+      image: ghcr.io/xrplf/clio-ci:latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Update libXRPL version requirement
+        shell: bash
+        run: |
+          ./.github/scripts/update-libxrpl-version ${{ github.event.client_payload.version }}
+
+      - name: Prepare runner
+        uses: ./.github/actions/prepare_runner
+        with:
+          disable_ccache: true
+
+      - name: Setup conan
+        uses: ./.github/actions/setup_conan
+        with:
+          conan_profile: ${{ env.CONAN_PROFILE }}
+
+      - name: Run conan and cmake
+        uses: ./.github/actions/generate
+        with:
+          conan_profile: ${{ env.CONAN_PROFILE }}
+          conan_cache_hit: ${{ steps.restore_cache.outputs.conan_cache_hit }}
+          build_type: Release
+
+      - name: Build Clio
+        uses: ./.github/actions/build_clio
+
+      - name: Strip tests
+        run: strip build/clio_tests
+
+      - name: Upload clio_tests
+        uses: actions/upload-artifact@v4
+        with:
+          name: clio_tests_check_libxrpl
+          path: build/clio_tests
+
+  run_tests:
+    name: Run tests
+    needs: build
+    runs-on: [self-hosted, heavy]
+    container:
+      image: ghcr.io/xrplf/clio-ci:latest
+
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: clio_tests_check_libxrpl
+
+      - name: Run clio_tests
+        run: |
+          chmod +x ./clio_tests
+          ./clio_tests
+
+  create_issue_on_failure:
+    name: Create an issue on failure
+    needs: [build, run_tests]
+    if: ${{ always() && contains(needs.*.result, 'failure') }}
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      issues: write
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Create an issue
+        uses: ./.github/actions/create_issue
+        env:
+          GH_TOKEN: ${{ github.token }}
+        with:
+          labels: "compatibility,bug"
+          title: "Proposed libXRPL check failed"
+          body: >
+            Clio build or tests failed against `libXRPL ${{ github.event.client_payload.version }}`.
+
+            Workflow: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/
--- a/.github/workflows/check_pr_title.yml
+++ b/.github/workflows/check_pr_title.yml
@@ -0,0 +1,17 @@
+name: Check PR title
+
+on:
+  pull_request:
+    types: [opened, edited, reopened, synchronize]
+    branches: [develop]
+
+jobs:
+  check_title:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: ytanikin/pr-conventional-commits@8267db1bacc237419f9ed0228bb9d94e94271a1d # v1.4.1
+        with:
+          task_types: '["build","feat","fix","docs","test","ci","style","refactor","perf","chore"]'
+          add_label: false
+          custom_labels: '{"build":"build", "feat":"enhancement", "fix":"bug", "docs":"documentation", "test":"testability", "ci":"ci", "style":"refactoring", "refactor":"refactoring", "perf":"performance", "chore":"tooling"}'
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -1,22 +1,14 @@
-name: Run clang-tidy on files
+name: Clang-tidy check

 on:
-  push:
-    branches: [develop]
+  schedule:
+    - cron: "0 9 * * 1-5"
  workflow_dispatch:
  pull_request:
    branches: [develop]
    paths:
      - .github/workflows/clang-tidy.yml

-      - CMakeLists.txt
-      - conanfile.py
-      - conan.lock
-      - "cmake/**"
-      - "src/**"
-      - "tests/**"
-      - "benchmarks/**"
-
      - .clang_tidy

 concurrency:
@@ -25,33 +17,13 @@ concurrency:
  cancel-in-progress: true

 env:
-  BUILD_DIR: build
-  BUILD_TYPE: Debug # Debug so that ASSERTS and such participate in clang-tidy check
-
-  OUTPUT_FILE: clang-tidy-output.txt
-  DIFF_FILE: clang-tidy-git-diff.txt
-  ISSUE_FILE: clang-tidy-issue.md
-
-  COMPILER: clang
-
-defaults:
-  run:
-    shell: bash
+  CONAN_PROFILE: clang

 jobs:
-  determine-files:
-    if: ${{ github.event_name == 'pull_request' }}
-    permissions:
-      contents: read
-    uses: XRPLF/actions/.github/workflows/determine-tidy-files.yml@224f3c48d3014d082a1129237b8291ff0b0a331f
-
-  run-clang-tidy:
-    name: Run clang tidy
-    needs: [determine-files]
-    if: ${{ always() && !cancelled() && (github.event_name != 'pull_request' || needs.determine-files.outputs.cpp_changed_files != '' || needs.determine-files.outputs.clang_tidy_config_changed == 'true') }}
+  clang_tidy:
    runs-on: heavy
    container:
-      image: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-7b9d553
+      image: ghcr.io/xrplf/clio-ci:latest

    permissions:
      contents: write
@@ -59,141 +31,76 @@ jobs:
      pull-requests: write

    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0

      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@90f11ee655d1687824fb8793db770477d52afbab
+        uses: ./.github/actions/prepare_runner
        with:
-          enable_ccache: false
-
-      - 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 }}
+          disable_ccache: true

      - name: Setup conan
-        run: conan/init.sh
-
-      - name: Run conan
-        uses: ./.github/actions/conan
+        uses: ./.github/actions/setup_conan
        with:
-          build_dir: ${{ env.BUILD_DIR }}
-          build_type: ${{ env.BUILD_TYPE }}
+          conan_profile: ${{ env.CONAN_PROFILE }}

-      - name: Run CMake
-        uses: ./.github/actions/cmake
+      - name: Restore cache
+        uses: ./.github/actions/restore_cache
+        id: restore_cache
        with:
-          build_dir: ${{ env.BUILD_DIR }}
-          build_type: ${{ env.BUILD_TYPE }}
+          conan_dir: ${{ env.CONAN_HOME }}
+          ccache_dir: ${{ env.CCACHE_DIR }}
+          conan_profile: ${{ env.CONAN_PROFILE }}

-      - name: Get number of processors
-        uses: XRPLF/actions/get-nproc@cf0433aa74563aead044a1e395610c96d65a37cf
-        id: nproc
+      - name: Run conan and cmake
+        uses: ./.github/actions/generate
+        with:
+          conan_profile: ${{ env.CONAN_PROFILE }}
+          conan_cache_hit: ${{ steps.restore_cache.outputs.conan_cache_hit }}
+          build_type: Release

-      - name: Run clang tidy
+      - name: Get number of threads
+        uses: ./.github/actions/get_number_of_threads
+        id: number_of_threads
+
+      - name: Run clang-tidy
        continue-on-error: true
+        shell: bash
        id: run_clang_tidy
-        env:
-          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-19 -p build -j "${{ steps.number_of_threads.outputs.threads_number }}" -fix -quiet 1>output.txt

-      - name: Print errors
+      - name: Fix local includes and clang-format style
        if: ${{ steps.run_clang_tidy.outcome != 'success' }}
+        shell: bash
        run: |
-          sed '/error\||/!d' "${OUTPUT_FILE}"
+          pre-commit run --all-files fix-local-includes || true
+          pre-commit run --all-files clang-format || true

-      - name: Upload clang-tidy output
-        if: ${{ github.event.repository.visibility == 'public' && steps.run_clang_tidy.outcome != 'success' }}
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        with:
-          path: ${{ env.OUTPUT_FILE }}
-          archive: false
-          retention-days: 30
-
-      - name: Check for changes
-        id: files_changed
-        continue-on-error: true
-        run: |
-          git diff --exit-code
-
-      - name: Fix style
-        if: ${{ steps.files_changed.outcome != 'success' }}
-        run: |
-          pre-commit run --all-files || true
-
-      - name: Generate git diff
-        if: ${{ steps.files_changed.outcome != 'success' }}
-        run: |
-          git diff | tee "${DIFF_FILE}"
-
-      - name: Upload clang-tidy diff output
-        if: ${{ github.event.repository.visibility == 'public' && steps.files_changed.outcome != 'success' }}
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        with:
-          path: ${{ env.DIFF_FILE }}
-          archive: false
-          retention-days: 30
-
-      - name: Write issue header
+      - name: Print issues found
        if: ${{ steps.run_clang_tidy.outcome != 'success' }}
+        shell: bash
        run: |
-          cat >"${ISSUE_FILE}" <<EOF
-          ## Clang-tidy Check Failed
+          sed -i '/error\||/!d' ./output.txt
+          cat output.txt
+          rm output.txt

-          ### Clang-tidy Output:
-          \`\`\`
-          EOF
-
-      - name: Append clang-tidy output to issue body (filter for errors and warnings)
-        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.txt || true
-
-              # 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.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.txt
-          else
-              echo "No output file found" >>"${ISSUE_FILE}"
-          fi
-
-      - name: Append issue footer
-        if: ${{ steps.run_clang_tidy.outcome != 'success' }}
-        run: |
-          cat >>"${ISSUE_FILE}" <<EOF
-          \`\`\`
-
-          ---
-          *This issue was automatically created by the clang-tidy workflow.*
-          EOF
-
-      - name: Create issue
+      - name: Create an issue
        if: ${{ steps.run_clang_tidy.outcome != 'success' && github.event_name != 'pull_request' }}
-        uses: XRPLF/actions/create-issue@2b8bc36af85b88bca0dd7bfac2e2dc05f94ad712
+        id: create_issue
+        uses: ./.github/actions/create_issue
+        env:
+          GH_TOKEN: ${{ github.token }}
        with:
-          title: "Clang-tidy check failed"
-          body_file: ${{ env.ISSUE_FILE }}
-          labels: "bug"
-          assignees: "godexsoft,mathbunnyru"
+          title: "Clang-tidy found bugs in code 🐛"
+          body: >
+            Clang-tidy found issues in the code:

-      - uses: crazy-max/ghaction-import-gpg@2dc316deee8e90f13e1a351ab510b4d5bc0c82cd # v7.0.0
-        if: ${{ steps.files_changed.outcome != 'success' && github.event_name != 'pull_request' }}
+            List of the issues found: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/
+
+      - uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec # v6.3.0
+        if: ${{ steps.run_clang_tidy.outcome != 'success' && github.event_name != 'pull_request' }}
        with:
          gpg_private_key: ${{ secrets.ACTIONS_GPG_PRIVATE_KEY }}
          passphrase: ${{ secrets.ACTIONS_GPG_PASSPHRASE }}
@@ -201,8 +108,8 @@ jobs:
          git_commit_gpgsign: true

      - name: Create PR with fixes
-        if: ${{ steps.files_changed.outcome != 'success' && github.event_name != 'pull_request' }}
-        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
+        if: ${{ steps.run_clang_tidy.outcome != 'success' && github.event_name != 'pull_request' }}
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
        env:
          GH_REPO: ${{ github.repository }}
          GH_TOKEN: ${{ github.token }}
@@ -213,14 +120,10 @@ jobs:
          branch-suffix: timestamp
          delete-branch: true
          title: "style: clang-tidy auto fixes"
-          body: >
-            Fixes #${{ steps.create_issue.outputs.issue_number }}.
-
-            Please review and commit clang-tidy fixes.
-          reviewers: "godexsoft,kuznetsss,mathbunnyru"
+          body: "Fixes #${{ steps.create_issue.outputs.created_issue_id }}. Please review and commit clang-tidy fixes."
+          reviewers: "godexsoft,kuznetsss,PeterChen13579,mathbunnyru"

      - name: Fail the job
        if: ${{ steps.run_clang_tidy.outcome != 'success' }}
-        run: |
-          echo "Clang-tidy check failed!"
-          exit 1
+        shell: bash
+        run: exit 1
--- a/.github/workflows/clang-tidy_on_fix_merged.yml
+++ b/.github/workflows/clang-tidy_on_fix_merged.yml
@@ -0,0 +1,30 @@
+name: Restart clang-tidy workflow
+
+on:
+  push:
+    branches: [develop]
+  workflow_dispatch:
+
+jobs:
+  restart_clang_tidy:
+    runs-on: ubuntu-latest
+
+    permissions:
+      actions: write
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Check last commit matches clang-tidy auto fixes
+        id: check
+        shell: bash
+        run: |
+          passed=$(if [[ "$(git log -1 --pretty=format:%s | grep 'style: clang-tidy auto fixes')" ]]; then echo 'true' ; else echo 'false' ; fi)
+          echo "passed=\"$passed\"" >> $GITHUB_OUTPUT
+
+      - name: Run clang-tidy workflow
+        if: ${{ contains(steps.check.outputs.passed, 'true') }}
+        shell: bash
+        env:
+          GH_TOKEN: ${{ github.token }}
+          GH_REPO: ${{ github.repository }}
+        run: gh workflow run clang-tidy.yml
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -10,30 +10,18 @@ concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
  cancel-in-progress: true

-defaults:
-  run:
-    shell: bash
-
 jobs:
  build:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-7b9d553
+      image: ghcr.io/xrplf/clio-ci:latest

    steps:
      - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@v4
        with:
          lfs: true

-      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@90f11ee655d1687824fb8793db770477d52afbab
-        with:
-          enable_ccache: false
-
-      - name: Print build environment
-        uses: XRPLF/actions/print-build-env@59dec886e4afb05a1724443af08baccbc045b574
-
      - name: Create build directory
        run: mkdir build_docs

@@ -46,17 +34,15 @@ 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
+        uses: actions/configure-pages@v5

      - name: Upload artifact
-        uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0
+        uses: actions/upload-pages-artifact@v3
        with:
          path: build_docs/html
          name: docs-develop

  deploy:
-    if: ${{ github.repository == 'XRPLF/clio' && github.event_name == 'push' }}
    needs: build
    permissions:
      pages: write
@@ -71,6 +57,6 @@ jobs:
    steps:
      - name: Deploy to GitHub Pages
        id: deployment
-        uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # v5.0.0
+        uses: actions/deploy-pages@v4
        with:
          artifact_name: docs-develop
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -8,14 +8,14 @@ on:
    paths:
      - .github/workflows/nightly.yml

-      - .github/workflows/reusable-release.yml
-      - .github/workflows/reusable-build-test.yml
-      - .github/workflows/reusable-build.yml
-      - .github/workflows/reusable-test.yml
-      - .github/workflows/build-clio-docker-image.yml
+      - .github/workflows/release_impl.yml
+      - .github/workflows/build_and_test.yml
+      - .github/workflows/build_impl.yml
+      - .github/workflows/test_impl.yml
+      - .github/workflows/build_clio_docker_image.yml

      - ".github/actions/**"
-      - "!.github/actions/code-coverage/**"
+      - "!.github/actions/code_coverage/**"
      - .github/scripts/prepare-release-artifacts.sh

 concurrency:
@@ -23,125 +23,98 @@ concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
  cancel-in-progress: true

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

    strategy:
      fail-fast: false
      matrix:
        include:
          - os: macos15
-            compiler: apple-clang
+            conan_profile: default_apple_clang
            build_type: Release
+            static: false
+            sanitizer: "false"
          - os: heavy
-            compiler: gcc
+            conan_profile: gcc
            build_type: Release
-            container: '{ "image": "ghcr.io/xrplf/xrpld/nix-ubuntu:sha-7b9d553" }'
+            static: true
+            container: '{ "image": "ghcr.io/xrplf/clio-ci:latest" }'
+            sanitizer: "false"
          - os: heavy
-            compiler: gcc
+            conan_profile: gcc
            build_type: Debug
-            container: '{ "image": "ghcr.io/xrplf/xrpld/nix-ubuntu:sha-7b9d553" }'
+            static: true
+            container: '{ "image": "ghcr.io/xrplf/clio-ci:latest" }'
+            sanitizer: "false"
          - os: heavy
-            compiler: gcc
-            sanitizers: undefinedbehavior
+            conan_profile: gcc.ubsan
            build_type: Release
-            container: '{ "image": "ghcr.io/xrplf/xrpld/nix-ubuntu:sha-7b9d553" }'
+            static: false
+            container: '{ "image": "ghcr.io/xrplf/clio-ci:latest" }'
+            sanitizer: "ubsan"

-    uses: ./.github/workflows/reusable-build-test.yml
+    uses: ./.github/workflows/build_and_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
-      download_ccache: false
-      upload_ccache: false
-      version: nightly-${{ needs.get_date.outputs.date }}
-
-  package:
-    name: Build debian package
-    needs: get_date
-
-    uses: ./.github/workflows/reusable-build.yml
-    with:
-      runs_on: heavy
-      container: '{ "image": "ghcr.io/xrplf/xrpld/nix-ubuntu:sha-7b9d553" }'
-      compiler: gcc
-      build_type: Release
-      download_ccache: false
-      upload_ccache: false
-      code_coverage: false
-      upload_clio_server: false
-      package: true
-      version: nightly-${{ needs.get_date.outputs.date }}
-      targets: package
-      analyze_build_time: false
+      disable_cache: true
+      sanitizer: ${{ matrix.sanitizer }}

  analyze_build_time:
    name: Analyze Build Time
-    needs: get_date

    strategy:
      fail-fast: false
      matrix:
        include:
          - os: heavy
-            compiler: clang
-            container: '{ "image": "ghcr.io/xrplf/xrpld/nix-ubuntu:sha-7b9d553" }'
+            conan_profile: clang
+            container: '{ "image": "ghcr.io/xrplf/clio-ci:latest" }'
+            static: true
          - os: macos15
-            compiler: apple-clang
+            conan_profile: default_apple_clang
            container: ""
-    uses: ./.github/workflows/reusable-build.yml
+            static: false
+    uses: ./.github/workflows/build_impl.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
+      disable_cache: true
      code_coverage: false
+      static: ${{ matrix.static }}
      upload_clio_server: false
      targets: all
+      sanitizer: "false"
      analyze_build_time: true
-      version: nightly-${{ needs.get_date.outputs.date }}

  nightly_release:
-    needs: [build-and-test, package, get_date]
-    uses: ./.github/workflows/reusable-release.yml
+    needs: build-and-test
+    uses: ./.github/workflows/release_impl.yml
    with:
-      delete_pattern: "nightly-*"
-      prerelease: true
-      title: "Clio development build (nightly-${{ needs.get_date.outputs.date }})"
-      version: nightly-${{ needs.get_date.outputs.date }}
+      overwrite_release: true
+      title: "Clio development (nightly) build"
+      version: nightly
      header: >
+        # Release notes
+
        > **Note:** Please remember that this is a development release and it is not recommended for production use.

-        Changelog (including previous releases): <https://github.com/XRPLF/clio/commits/nightly-${{ needs.get_date.outputs.date }}>
+        Changelog (including previous releases): <https://github.com/XRPLF/clio/commits/nightly>
      generate_changelog: false
      draft: false

  build_and_publish_docker_image:
-    uses: ./.github/workflows/build-clio-docker-image.yml
+    uses: ./.github/workflows/build_clio_docker_image.yml
    needs: build-and-test
    secrets: inherit
    with:
@@ -150,7 +123,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,12 +135,15 @@ jobs:
      issues: write

    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@v4

      - name: Create an issue
-        uses: XRPLF/actions/create-issue@2b8bc36af85b88bca0dd7bfac2e2dc05f94ad712
+        uses: ./.github/actions/create_issue
+        env:
+          GH_TOKEN: ${{ github.token }}
        with:
          title: "Nightly release failed 🌙"
-          body: ""
-          labels: "bug"
-          assignees: "godexsoft,kuznetsss,mathbunnyru"
+          body: >
+            Nightly release failed:
+
+            Workflow: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -1,22 +1,39 @@
 name: Pre-commit auto-update

 on:
+  # every first day of the month
  schedule:
-    # every first day of the month
    - cron: "0 0 1 * *"
-  pull_request:
-    branches: [release/*, develop]
-    paths:
-      - ".pre-commit-config.yaml"
+  # on demand
  workflow_dispatch:

 jobs:
  auto-update:
-    uses: XRPLF/actions/.github/workflows/pre-commit-autoupdate.yml@5e942d61bf32f7557a7c159cfac4712a687b3e3a
-    with:
-      sign_commit: true
-      committer: "Clio CI <skuznetsov@ripple.com>"
-      reviewers: "godexsoft,kuznetsss,mathbunnyru"
-    secrets:
-      GPG_PRIVATE_KEY: ${{ secrets.ACTIONS_GPG_PRIVATE_KEY }}
-      GPG_PASSPHRASE: ${{ secrets.ACTIONS_GPG_PASSPHRASE }}
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      pull-requests: write
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+
+      - run: pip install pre-commit
+      - run: pre-commit autoupdate --freeze
+      - run: pre-commit run --all-files || true
+
+      - uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
+        if: always()
+        env:
+          GH_REPO: ${{ github.repository }}
+          GH_TOKEN: ${{ github.token }}
+        with:
+          branch: update/pre-commit-hooks
+          title: "style: Update pre-commit hooks"
+          commit-message: "style: Update pre-commit hooks"
+          body: Update versions of pre-commit hooks to latest version.
+          reviewers: "godexsoft,kuznetsss,PeterChen13579,mathbunnyru"
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -3,12 +3,26 @@ name: Run pre-commit hooks
 on:
  pull_request:
  push:
-    branches: [develop]
+    branches:
+      - develop
  workflow_dispatch:

 jobs:
  run-hooks:
-    uses: XRPLF/actions/.github/workflows/pre-commit.yml@cba1f0891650baf1a9c88624dc2d72573be2eb81
-    with:
-      runs_on: heavy
-      container: '{ "image": "ghcr.io/xrplf/clio-pre-commit:14342e087ceb8b593027198bf9ef06a43833c696" }'
+    runs-on: heavy
+    container:
+      image: ghcr.io/xrplf/clio-ci:latest
+
+    steps:
+      - name: Checkout Repo ⚡️
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Prepare runner
+        uses: ./.github/actions/prepare_runner
+        with:
+          disable_ccache: true
+
+      - name: Run pre-commit ✅
+        run: pre-commit run --all-files
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,53 +22,35 @@ jobs:
      matrix:
        include:
          - os: macos15
-            compiler: apple-clang
+            conan_profile: default_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-7b9d553" }'
+            static: true
+            container: '{ "image": "ghcr.io/xrplf/clio-ci:latest" }'

-    uses: ./.github/workflows/reusable-build-test.yml
+    uses: ./.github/workflows/build_and_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
-      download_ccache: false
-      upload_ccache: false
-      version: ${{ github.event_name == 'push' && github.ref_name || '' }}
-
-  package:
-    name: Build debian package
-
-    uses: ./.github/workflows/reusable-build.yml
-    with:
-      runs_on: heavy
-      container: '{ "image": "ghcr.io/xrplf/xrpld/nix-ubuntu:sha-7b9d553" }'
-      compiler: gcc
-      build_type: Release
-      download_ccache: false
-      upload_ccache: false
-      code_coverage: false
-      upload_clio_server: false
-      package: true
-      version: ${{ github.event_name == 'push' && github.ref_name || '' }}
-      targets: package
-      analyze_build_time: false
+      disable_cache: true

  release:
-    needs: [build-and-test, package]
-    uses: ./.github/workflows/reusable-release.yml
+    needs: build-and-test
+    uses: ./.github/workflows/release_impl.yml
    with:
-      delete_pattern: ""
-      prerelease: ${{ contains(github.ref_name, '-') }}
-      title: "${{ github.ref_name }}"
+      overwrite_release: false
+      title: "${{ github.ref_name}}"
      version: "${{ github.ref_name }}"
      header: >
-        ${{ contains(github.ref_name, '-') && '> **Note:** Please remember that this is a release candidate and it is not recommended for production use.' || '' }}
-      generate_changelog: ${{ !contains(github.ref_name, '-') }}
-      draft: ${{ !contains(github.ref_name, '-') }}
+        # Introducing Clio version ${{ github.ref_name }}
+      generate_changelog: true
+      draft: true
--- a/.github/workflows/release_impl.yml
+++ b/.github/workflows/release_impl.yml
@@ -0,0 +1,117 @@
+name: Make release
+
+on:
+  workflow_call:
+    inputs:
+      overwrite_release:
+        description: "Overwrite the current release and tag"
+        required: true
+        type: boolean
+
+      title:
+        description: "Release title"
+        required: true
+        type: string
+
+      version:
+        description: "Release version"
+        required: true
+        type: string
+
+      header:
+        description: "Release notes header"
+        required: true
+        type: string
+
+      generate_changelog:
+        description: "Generate changelog"
+        required: false
+        type: boolean
+
+      draft:
+        description: "Create a draft release"
+        required: false
+        type: boolean
+
+jobs:
+  release:
+    runs-on: heavy
+    container:
+      image: ghcr.io/xrplf/clio-ci:latest
+    env:
+      GH_REPO: ${{ github.repository }}
+      GH_TOKEN: ${{ github.token }}
+
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Prepare runner
+        uses: ./.github/actions/prepare_runner
+        with:
+          disable_ccache: true
+
+      - uses: actions/download-artifact@v4
+        with:
+          path: release_artifacts
+          pattern: clio_server_*
+
+      - name: Create release notes
+        shell: bash
+        run: |
+          printf '%s\n' "${{ inputs.header }}" > "${RUNNER_TEMP}/release_notes.md"
+
+      - name: Generate changelog
+        shell: bash
+        if: ${{ inputs.generate_changelog }}
+        run: |
+          LAST_TAG=$(gh release view --json tagName -q .tagName)
+          LAST_TAG_COMMIT=$(git rev-parse $LAST_TAG)
+          BASE_COMMIT=$(git merge-base HEAD $LAST_TAG_COMMIT)
+          git-cliff "${BASE_COMMIT}..HEAD" --ignore-tags "nightly|-b"
+          cat CHANGELOG.md >> "${RUNNER_TEMP}/release_notes.md"
+
+      - name: Prepare release artifacts
+        shell: bash
+        run: .github/scripts/prepare-release-artifacts.sh release_artifacts
+
+      - name: Append sha256 checksums
+        shell: bash
+        working-directory: release_artifacts
+        run: |
+          {
+            echo '## SHA256 checksums'
+            echo
+            echo '```'
+            cat *.sha256sum
+            echo '```'
+          } >> "${RUNNER_TEMP}/release_notes.md"
+
+      - name: Upload release notes
+        uses: actions/upload-artifact@v4
+        with:
+          name: release_notes_${{ inputs.version }}
+          path: "${RUNNER_TEMP}/release_notes.md"
+
+      - name: Remove current release and tag
+        if: ${{ github.event_name != 'pull_request' && inputs.overwrite_release }}
+        shell: bash
+        run: |
+          gh release delete ${{ inputs.version }} --yes || true
+          git push origin :${{ inputs.version }} || true
+
+      - name: Publish release
+        if: ${{ github.event_name != 'pull_request' }}
+        shell: bash
+        run: |
+          gh release create ${{ inputs.version }} \
+            ${{ inputs.overwrite_release && '--prerelease' || '' }} \
+            --title "${{ inputs.title }}" \
+            --target $GITHUB_SHA \
+            ${{ inputs.draft && '--draft' || '' }} \
+            --notes-file "${RUNNER_TEMP}/release_notes.md" \
+            ./release_artifacts/clio_server*
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -1,254 +0,0 @@
-name: Reusable build
-
-on:
-  workflow_call:
-    inputs:
-      runs_on:
-        description: Runner to run the job on
-        required: true
-        type: string
-
-      container:
-        description: "The container object as a JSON string (leave empty to run natively)"
-        required: true
-        type: string
-
-      compiler:
-        description: 'Compiler to build with ("gcc", "clang" or "apple-clang")'
-        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
-        type: string
-
-      download_ccache:
-        description: Whether to download ccache from the cache
-        required: false
-        type: boolean
-        default: true
-
-      upload_ccache:
-        description: Whether to upload ccache to the cache
-        required: false
-        type: boolean
-        default: false
-
-      code_coverage:
-        description: Whether to enable code coverage
-        required: true
-        type: boolean
-
-      upload_clio_server:
-        description: Whether to upload clio_server
-        required: true
-        type: boolean
-
-      targets:
-        description: Space-separated build target names
-        required: true
-        type: string
-
-      analyze_build_time:
-        description: Whether to enable build time analysis
-        required: true
-        type: boolean
-
-      package:
-        description: Whether to generate Debian package
-        required: false
-        type: boolean
-
-      version:
-        description: Version of the clio_server binary
-        required: false
-        type: string
-        default: ""
-
-    secrets:
-      CODECOV_TOKEN:
-        required: false
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  build:
-    name: Build
-    runs-on: ${{ inputs.runs_on }}
-    container: ${{ inputs.container != '' && fromJson(inputs.container) || null }}
-
-    steps:
-      - name: Cleanup workspace
-        if: ${{ runner.os == 'macOS' }}
-        uses: XRPLF/actions/cleanup-workspace@c7d9ce5ebb03c752a354889ecd870cadfc2b1cd4
-
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-        with:
-          fetch-depth: 0
-
-      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@90f11ee655d1687824fb8793db770477d52afbab
-        with:
-          enable_ccache: ${{ inputs.download_ccache }}
-
-      - 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
-        run: conan/init.sh
-
-      - name: Generate build identifier
-        uses: ./.github/actions/build-identifier
-        id: build_identifier
-        with:
-          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 }}
-          restore-keys: |
-            ${{ steps.build_identifier.outputs.build_identifier }}
-
-      - name: Run conan
-        uses: ./.github/actions/conan
-        with:
-          build_type: ${{ inputs.build_type }}
-          sanitizers: ${{ inputs.sanitizers }}
-
-      - name: Run CMake
-        uses: ./.github/actions/cmake
-        with:
-          build_type: ${{ inputs.build_type }}
-          code_coverage: ${{ inputs.code_coverage }}
-          time_trace: ${{ inputs.analyze_build_time }}
-          package: ${{ inputs.package }}
-          version: ${{ inputs.version }}
-
-      - name: Build Clio
-        uses: ./.github/actions/build-clio
-        with:
-          targets: ${{ inputs.targets }}
-
-      - name: Show build time analyze report
-        if: ${{ inputs.analyze_build_time }}
-        run: |
-          ClangBuildAnalyzer --all build/ build_time_report.bin
-          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 }}
-          path: build_time_report.txt
-
-      - name: Show ccache's statistics and zero it
-        if: ${{ inputs.download_ccache }}
-        run: |
-          ccache --show-stats -vv
-          ccache --zero-stats
-
-      - name: Save ccache cache
-        if: ${{ inputs.upload_ccache && github.ref == 'refs/heads/develop' }}
-        uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
-        with:
-          path: ${{ env.CCACHE_DIR }}
-          key: ${{ steps.build_identifier.outputs.cache_key }}
-
-      - name: Strip unit_tests
-        if: ${{ inputs.sanitizers == '' && !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 }}
-        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 }}
-          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 }}
-          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 }}
-          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 }}
-          path: build/*.deb
-
-      # This is run as part of the build job, because it requires the following:
-      # - source code
-      # - conan packages
-      # - .gcno files in build directory
-      #
-      # It's all available in the build job, but not in the test job
-      - name: Run code coverage
-        if: ${{ inputs.code_coverage }}
-        uses: ./.github/actions/code-coverage
-
-      - name: Verify version is expected
-        if: ${{ inputs.version != '' }}
-        env:
-          INPUT_VERSION: ${{ inputs.version }}
-          BUILD_TYPE: ${{ inputs.build_type }}
-        run: |
-          set -e
-          EXPECTED_VERSION="clio-${INPUT_VERSION}"
-          if [[ "${BUILD_TYPE}" == "Debug" ]]; then
-              EXPECTED_VERSION="${EXPECTED_VERSION}+DEBUG"
-          fi
-
-          actual_version=$(./build/clio_server --version | head -n 1)
-          if [[ "${actual_version}" != "${EXPECTED_VERSION}" ]]; then
-              echo "Expected version '${EXPECTED_VERSION}', but got '${actual_version}'"
-              exit 1
-          fi
-
-  # `codecov/codecov-action` will rerun `gcov` if it's available and build directory is present
-  # To prevent this from happening, we run this action in a separate workflow
-  #
-  # More info: https://github.com/XRPLF/clio/pull/2066
-  upload_coverage_report:
-    if: ${{ inputs.code_coverage }}
-    name: Codecov
-    needs: build
-    uses: ./.github/workflows/reusable-upload-coverage-report.yml
-    secrets:
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
--- a/.github/workflows/reusable-release.yml
+++ b/.github/workflows/reusable-release.yml
@@ -1,129 +0,0 @@
-name: Make release
-
-on:
-  workflow_call:
-    inputs:
-      delete_pattern:
-        description: "Pattern to delete previous releases"
-        required: true
-        type: string
-
-      prerelease:
-        description: "Create a prerelease"
-        required: true
-        type: boolean
-
-      title:
-        description: "Release title"
-        required: true
-        type: string
-
-      version:
-        description: "Release version"
-        required: true
-        type: string
-
-      header:
-        description: "Release notes header"
-        required: true
-        type: string
-
-      generate_changelog:
-        description: "Generate changelog"
-        required: true
-        type: boolean
-
-      draft:
-        description: "Create a draft release"
-        required: true
-        type: boolean
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  release:
-    runs-on: heavy
-    container:
-      image: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-7b9d553
-    env:
-      GH_REPO: ${{ github.repository }}
-      GH_TOKEN: ${{ github.token }}
-
-    permissions:
-      contents: write
-
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-        with:
-          fetch-depth: 0
-
-      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@90f11ee655d1687824fb8793db770477d52afbab
-        with:
-          enable_ccache: false
-
-      - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          path: release_artifacts
-          pattern: clio_server_*
-
-      - name: Prepare release artifacts
-        run: .github/scripts/prepare-release-artifacts.sh release_artifacts
-
-      - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          path: release_artifacts
-          pattern: clio_deb_package_*
-
-      - name: Create release notes
-        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"
-
-      - name: Generate changelog
-        if: ${{ inputs.generate_changelog }}
-        run: |
-          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"
-
-      - name: Upload release notes
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        with:
-          name: release_notes_${{ inputs.version }}
-          path: "${RUNNER_TEMP}/release_notes.md"
-
-      - name: Remove previous release with a pattern
-        if: ${{ github.event_name != 'pull_request' && inputs.delete_pattern != '' }}
-        env:
-          DELETE_PATTERN: ${{ inputs.delete_pattern }}
-        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
-          fi
-
-      - name: Publish release
-        if: ${{ github.event_name != 'pull_request' }}
-        env:
-          RELEASE_VERSION: ${{ inputs.version }}
-          PRERELEASE_OPTION: ${{ inputs.prerelease && '--prerelease' || '' }}
-          RELEASE_TITLE: ${{ inputs.title }}
-          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_*
--- a/.github/workflows/reusable-test.yml
+++ b/.github/workflows/reusable-test.yml
@@ -1,182 +0,0 @@
-name: Reusable test
-
-on:
-  workflow_call:
-    inputs:
-      runs_on:
-        description: Runner to run the job on
-        required: true
-        type: string
-
-      container:
-        description: "The container object as a JSON string (leave empty to run natively)"
-        required: true
-        type: string
-
-      compiler:
-        description: 'Compiler the binaries were built with ("gcc", "clang" or "apple-clang")'
-        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
-        type: string
-
-      run_unit_tests:
-        description: Whether to run unit tests
-        required: true
-        type: boolean
-
-      run_integration_tests:
-        description: Whether to run integration tests
-        required: true
-        type: boolean
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  unit_tests:
-    name: Unit testing
-    runs-on: ${{ inputs.runs_on }}
-    container: ${{ inputs.container != '' && fromJson(inputs.container) || null }}
-
-    if: ${{ inputs.run_unit_tests }}
-
-    steps:
-      - name: Cleanup workspace
-        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 }}
-
-      - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: clio_tests_${{ steps.build_identifier.outputs.build_identifier }}
-
-      - name: Make clio_tests executable
-        run: chmod +x ./clio_tests
-
-      - name: Run clio_tests
-        continue-on-error: true
-        id: run_clio_tests
-        run: ./clio_tests
-
-      - name: Create an issue
-        if: ${{ steps.run_clio_tests.outcome == 'failure' && inputs.sanitizers != '' }}
-        uses: XRPLF/actions/create-issue@2b8bc36af85b88bca0dd7bfac2e2dc05f94ad712
-        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."
-          labels: "bug"
-          assignees: "godexsoft,kuznetsss,mathbunnyru"
-
-      - name: Fail the job if clio_tests failed
-        if: ${{ steps.run_clio_tests.outcome == 'failure' }}
-        run: exit 1
-
-  integration_tests:
-    name: Integration testing
-    runs-on: ${{ inputs.runs_on }}
-    container: ${{ inputs.container != '' && fromJson(inputs.container) || null }}
-
-    if: ${{ inputs.run_integration_tests }}
-
-    services:
-      scylladb:
-        image: ${{ inputs.container != '' && 'scylladb/scylla' || '' }}
-        options: >-
-          --health-cmd "cqlsh -e 'describe cluster'"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-
-    steps:
-      - name: Cleanup workspace
-        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' }}
-        run: |
-          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
-
-      - 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
-          done
-
-      - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: clio_integration_tests_${{ steps.build_identifier.outputs.build_identifier }}
-
-      - name: Run clio_integration_tests
-        run: |
-          chmod +x ./clio_integration_tests
-          ./clio_integration_tests ${{ runner.os != 'macOS' && '--backend_host=scylladb' || '' }}
-
-      - name: Show docker logs and stop scylladb
-        if: ${{ always() && runner.os == 'macOS' }}
-        run: |
-          docker logs scylladb
-          docker rm --force scylladb || true
--- a/.github/workflows/sanitizers.yml
+++ b/.github/workflows/sanitizers.yml
@@ -8,18 +8,19 @@ on:
    paths:
      - .github/workflows/sanitizers.yml

-      - .github/workflows/reusable-build-test.yml
-      - .github/workflows/reusable-build.yml
-      - .github/workflows/reusable-test.yml
+      - .github/workflows/build_and_test.yml
+      - .github/workflows/build_impl.yml
+      - .github/workflows/test_impl.yml

      - ".github/actions/**"
-      - "!.github/actions/build-docker-image/**"
+      - "!.github/actions/build_docker_image/**"
+      - "!.github/actions/create_issue/**"
+      - .github/scripts/execute-tests-under-sanitizer

      - CMakeLists.txt
      - 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/**"

@@ -35,20 +36,24 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        compiler: [gcc, clang]
-        sanitizers: [address, thread, undefinedbehavior]
-        build_type: [Release, Debug]
+        include:
+          - sanitizer: tsan
+            compiler: gcc
+          - sanitizer: asan
+            compiler: gcc
+          - sanitizer: ubsan
+            compiler: gcc

-    uses: ./.github/workflows/reusable-build-test.yml
+    uses: ./.github/workflows/build_and_test.yml
    with:
      runs_on: heavy
-      container: '{ "image": "ghcr.io/xrplf/xrpld/nix-ubuntu:sha-7b9d553" }'
-      download_ccache: false
-      upload_ccache: false
-      compiler: ${{ matrix.compiler }}
-      sanitizers: ${{ matrix.sanitizers }}
-      build_type: ${{ matrix.build_type }}
+      container: '{ "image": "ghcr.io/xrplf/clio-ci:latest" }'
+      disable_cache: true
+      conan_profile: ${{ matrix.compiler }}.${{ matrix.sanitizer }}
+      build_type: Release
+      static: false
      run_unit_tests: true
      run_integration_tests: false
      upload_clio_server: false
      targets: clio_tests clio_integration_tests
+      sanitizer: ${{ matrix.sanitizer }}
--- a/.github/workflows/test_impl.yml
+++ b/.github/workflows/test_impl.yml
@@ -0,0 +1,165 @@
+name: Reusable test
+
+on:
+  workflow_call:
+    inputs:
+      runs_on:
+        description: Runner to run the job on
+        required: true
+        type: string
+
+      container:
+        description: "The container object as a JSON string (leave empty to run natively)"
+        required: true
+        type: string
+
+      conan_profile:
+        description: Conan profile to use
+        required: true
+        type: string
+
+      build_type:
+        description: Build type
+        required: true
+        type: string
+
+      run_unit_tests:
+        description: Whether to run unit tests
+        required: true
+        type: boolean
+
+      run_integration_tests:
+        description: Whether to run integration tests
+        required: true
+        type: boolean
+
+      sanitizer:
+        description: Sanitizer to use
+        required: true
+        type: string
+
+jobs:
+  unit_tests:
+    name: Unit testing ${{ inputs.container != '' && 'in container' || 'natively' }}
+    runs-on: ${{ inputs.runs_on }}
+    container: ${{ inputs.container != '' && fromJson(inputs.container) || null }}
+
+    if: inputs.run_unit_tests
+
+    env:
+      # TODO: remove when we have fixed all currently existing issues from sanitizers
+      SANITIZER_IGNORE_ERRORS: ${{ inputs.sanitizer != 'false' && inputs.sanitizer != 'ubsan' }}
+
+    steps:
+      - name: Clean workdir
+        if: ${{ runner.os == 'macOS' }}
+        uses: kuznetsss/workspace-cleanup@80b9863b45562c148927c3d53621ef354e5ae7ce # v1.0
+
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: clio_tests_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
+
+      - name: Make clio_tests executable
+        shell: bash
+        run: chmod +x ./clio_tests
+
+      - name: Run clio_tests (regular)
+        if: env.SANITIZER_IGNORE_ERRORS == 'false'
+        run: ./clio_tests
+
+      - name: Run clio_tests (sanitizer errors ignored)
+        if: env.SANITIZER_IGNORE_ERRORS == 'true'
+        run: ./.github/scripts/execute-tests-under-sanitizer ./clio_tests
+
+      - name: Check for sanitizer report
+        if: env.SANITIZER_IGNORE_ERRORS == 'true'
+        shell: bash
+        id: check_report
+        run: |
+          if ls .sanitizer-report/* 1> /dev/null 2>&1; then
+            echo "found_report=true" >> $GITHUB_OUTPUT
+          else
+            echo "found_report=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Upload sanitizer report
+        if: env.SANITIZER_IGNORE_ERRORS == 'true' && steps.check_report.outputs.found_report == 'true'
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ inputs.conan_profile }}_report
+          path: .sanitizer-report/*
+          include-hidden-files: true
+
+      - name: Create an issue
+        if: false && env.SANITIZER_IGNORE_ERRORS == 'true' && steps.check_report.outputs.found_report == 'true'
+        uses: ./.github/actions/create_issue
+        env:
+          GH_TOKEN: ${{ github.token }}
+        with:
+          labels: "bug"
+          title: "[${{ inputs.conan_profile }}] reported issues"
+          body: >
+            Clio tests failed one or more sanitizer checks when built with ${{ inputs.conan_profile }}`.
+
+            Workflow: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/
+            Reports are available as artifacts.
+
+  integration_tests:
+    name: Integration testing ${{ inputs.container != '' && 'in container' || 'natively' }}
+    runs-on: ${{ inputs.runs_on }}
+    container: ${{ inputs.container != '' && fromJson(inputs.container) || null }}
+
+    if: inputs.run_integration_tests
+
+    services:
+      scylladb:
+        image: ${{ inputs.container != '' && 'scylladb/scylla' || '' }}
+        options: >-
+          --health-cmd "cqlsh -e 'describe cluster'"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    steps:
+      - name: Clean workdir
+        if: ${{ runner.os == 'macOS' }}
+        uses: kuznetsss/workspace-cleanup@80b9863b45562c148927c3d53621ef354e5ae7ce # v1.0
+
+      - name: Spin up scylladb
+        if: ${{ runner.os == 'macOS' }}
+        timeout-minutes: 3
+        run: |
+          docker rm --force scylladb || true
+          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
+
+          until [ "$(docker inspect -f '{{.State.Health.Status}}' scylladb)" == "healthy" ]; do
+            sleep 5
+          done
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: clio_integration_tests_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
+
+      - name: Run clio_integration_tests
+        run: |
+          chmod +x ./clio_integration_tests
+          ./clio_integration_tests ${{ runner.os != 'macOS' && '--backend_host=scylladb' || '' }}
+
+      - name: Show docker logs and stop scylladb
+        if: ${{ always() && runner.os == 'macOS' }}
+        run: |
+          docker logs scylladb
+          docker rm --force scylladb || true
--- a/.github/workflows/update_docker_ci.yml
+++ b/.github/workflows/update_docker_ci.yml
@@ -0,0 +1,150 @@
+name: Update CI docker image
+
+on:
+  pull_request:
+    paths:
+      - .github/workflows/update_docker_ci.yml
+
+      - ".github/actions/build_docker_image/**"
+
+      - "docker/ci/**"
+      - "docker/compilers/**"
+      - "docker/tools/**"
+  push:
+    branches: [develop]
+    paths:
+      - .github/workflows/update_docker_ci.yml
+
+      - ".github/actions/build_docker_image/**"
+
+      - "docker/ci/**"
+      - "docker/compilers/**"
+      - "docker/tools/**"
+  workflow_dispatch:
+
+concurrency:
+  # Only cancel in-progress jobs or runs for the current workflow - matches against branch & tags
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  gcc:
+    name: Build and push GCC docker image
+    runs-on: [self-hosted, heavy]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
+        with:
+          files: "docker/compilers/gcc/**"
+
+      - uses: ./.github/actions/build_docker_image
+        # Skipping this build for now, because CI environment is not stable
+        if: false && 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: |
+            ghcr.io/xrplf/clio-gcc
+            rippleci/clio_gcc
+          push_image: ${{ github.event_name != 'pull_request' }}
+          directory: docker/compilers/gcc
+          tags: |
+            type=raw,value=latest
+            type=raw,value=12
+            type=raw,value=12.3.0
+            type=raw,value=${{ github.sha }}
+          platforms: linux/amd64,linux/arm64
+          dockerhub_repo: rippleci/clio_gcc
+          dockerhub_description: GCC compiler for XRPLF/clio.
+
+  clang:
+    name: Build and push Clang docker image
+    runs-on: [self-hosted, heavy]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
+        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: |
+            ghcr.io/xrplf/clio-clang
+            rippleci/clio_clang
+          push_image: ${{ github.event_name != 'pull_request' }}
+          directory: docker/compilers/clang
+          tags: |
+            type=raw,value=latest
+            type=raw,value=16
+            type=raw,value=${{ github.sha }}
+          platforms: linux/amd64,linux/arm64
+          dockerhub_repo: rippleci/clio_clang
+          dockerhub_description: Clang compiler for XRPLF/clio.
+
+  tools:
+    name: Build and push tools docker image
+    runs-on: [self-hosted, heavy]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
+        with:
+          files: "docker/tools/**"
+
+      - uses: ./.github/actions/build_docker_image
+        if: steps.changed-files.outputs.any_changed == 'true'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          images: |
+            ghcr.io/xrplf/clio-tools
+          push_image: ${{ github.event_name != 'pull_request' }}
+          directory: docker/tools
+          tags: |
+            type=raw,value=latest
+            type=raw,value=${{ github.sha }}
+          platforms: linux/amd64,linux/arm64
+
+  ci:
+    name: Build and push CI docker image
+    runs-on: [self-hosted, heavy]
+    needs: [gcc, clang, tools]
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/build_docker_image
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
+          DOCKERHUB_PW: ${{ secrets.DOCKERHUB_PW }}
+        with:
+          images: |
+            rippleci/clio_ci
+            ghcr.io/xrplf/clio-ci
+          push_image: ${{ github.event_name != 'pull_request' }}
+          directory: docker/ci
+          tags: |
+            type=raw,value=latest
+            type=raw,value=gcc_12_clang_16
+            type=raw,value=${{ github.sha }}
+          platforms: linux/amd64,linux/arm64
+          dockerhub_repo: rippleci/clio_ci
+          dockerhub_description: CI image for XRPLF/clio.
--- a/.github/workflows/upload-conan-deps.yml
+++ b/.github/workflows/upload-conan-deps.yml
@@ -1,116 +0,0 @@
-name: Upload Conan Dependencies
-
-on:
-  schedule:
-    - cron: "0 9 * * 1-5"
-  workflow_dispatch:
-    inputs:
-      force_source_build:
-        description: "Force source build of all dependencies"
-        required: false
-        default: false
-        type: boolean
-      force_upload:
-        description: "Force upload of all dependencies"
-        required: false
-        default: false
-        type: boolean
-  pull_request:
-    branches: [develop]
-    paths:
-      - .github/workflows/upload-conan-deps.yml
-
-      - .github/actions/conan/action.yml
-      - ".github/scripts/conan/**"
-      - "!.github/scripts/conan/regenerate_lockfile.sh"
-
-      - conanfile.py
-      - conan.lock
-  push:
-    branches: [develop]
-    paths:
-      - .github/workflows/upload-conan-deps.yml
-
-      - .github/actions/conan/action.yml
-      - ".github/scripts/conan/**"
-      - "!.github/scripts/conan/regenerate_lockfile.sh"
-
-      - conanfile.py
-      - conan.lock
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  generate-matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-
-      - name: Calculate conan matrix
-        id: set-matrix
-        run: .github/scripts/conan/generate_matrix.py >>"${GITHUB_OUTPUT}"
-
-  upload-conan-deps:
-    name: Build ${{ matrix.compiler }} ${{ matrix.sanitizers }} ${{ matrix.build_type }}
-
-    needs: generate-matrix
-
-    strategy:
-      fail-fast: false
-      matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
-      max-parallel: 10
-
-    runs-on: ${{ matrix.os }}
-    container: ${{ matrix.container != '' && fromJson(matrix.container) || null }}
-
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-
-      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@90f11ee655d1687824fb8793db770477d52afbab
-        with:
-          enable_ccache: false
-
-      - 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: Show conan profile
-        env:
-          SANITIZERS: ${{ matrix.sanitizers }}
-        run: conan profile show --profile:all ci
-
-      - name: Run conan
-        uses: ./.github/actions/conan
-        with:
-          sanitizers: ${{ matrix.sanitizers }}
-          # 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' }}
-        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' }}
-        env:
-          FORCE_OPTION: ${{ github.event.inputs.force_upload == 'true' && '--force' || '' }}
-        run: conan upload "*" -r=xrplf --confirm ${FORCE_OPTION}
--- a/.github/workflows/reusable-upload-coverage-report.yml
+++ b/.github/workflows/reusable-upload-coverage-report.yml
@@ -1,34 +1,31 @@
 name: Upload report

 on:
+  workflow_dispatch:
  workflow_call:
    secrets:
      CODECOV_TOKEN:
        required: true

-defaults:
-  run:
-    shell: bash
-
 jobs:
  upload_report:
    name: Upload report
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@v4
        with:
          fetch-depth: 0

      - name: Download report artifact
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@v4
        with:
          name: coverage-report.xml
          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@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
        with:
          files: build/coverage_report.xml
          fail_ci_if_error: true
--- a/.gitignore
+++ b/.gitignore
@@ -4,13 +4,9 @@
 .build
 .cache
 .vscode
-.zed
 .python-version
 .DS_Store
 .sanitizer-report
 CMakeUserPresets.json
 config.json
-CLAUDE.md
-.claude/**
-.agents/**
-.augment/**
+src/util/build/Build.cpp
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -11,15 +11,12 @@
 #
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
-exclude: |
-  (?x)^(
-    docs/doxygen-awesome-theme/.*
-  )$
+exclude: ^docs/doxygen-awesome-theme/

 repos:
  # `pre-commit sample-config` default hooks
  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c # frozen: v6.0.0
+    rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # frozen: v5.0.0
    hooks:
      - id: check-added-large-files
      - id: check-executables-have-shebangs
@@ -29,27 +26,27 @@ repos:

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

  - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: e72a3ca1632f0b11a07d171449fe447a7ff6795e # frozen: v0.48.0
+    rev: 586c3ea3f51230da42bab657c6a32e9e66c364f0 # frozen: v0.44.0
    hooks:
      - id: markdownlint-fix
        exclude: LICENSE.md

  - repo: https://github.com/hadolint/hadolint
-    rev: 57e1618d78fd469a92c1e584e8c9313024656623 # frozen: v2.14.0
+    rev: c3dc18df7a501f02a560a2cc7ba3c69a85ca01d3 # frozen: v2.13.1-beta
    hooks:
      - id: hadolint-docker
        # hadolint-docker is a special hook that runs hadolint in a Docker container
        # Docker is not installed in the environment where pre-commit is run
        stages: [manual]
-        entry: hadolint/hadolint:v2.14.0 hadolint
+        entry: hadolint/hadolint:v2.12.1-beta hadolint

  - repo: https://github.com/codespell-project/codespell
-    rev: 2ccb47ff45ad361a21071a7eedda4c37e6ae8c5a # frozen: v2.4.2
+    rev: 63c8f8312b7559622c0d82815639671ae42132ac # frozen: v2.4.1
    hooks:
      - id: codespell
        args:
@@ -58,52 +55,27 @@ repos:
            --ignore-words=pre-commit-hooks/codespell_ignore.txt,
          ]

-  - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 4160603246a6b365d4a2af661c6d71b0a0f50478 # frozen: 26.5.1
-    hooks:
-      - id: black
-
-  - repo: https://github.com/scop/pre-commit-shfmt
-    rev: 05c1426671b9237fb5e1444dd63aa5731bec0dfb # frozen: v3.13.1-1
-    hooks:
-      - id: shfmt
-        args: [--write, --indent=4, --case-indent=true]
-
-  # Running some C++ hooks before clang-format
-  # to ensure that the style is consistent.
+  # Running fix-local-includes before clang-format
+  # to ensure that the include order is correct.
  - repo: local
    hooks:
-      - id: json-in-cpp
-        name: Fix JSON style in C++
-        entry: pre-commit-hooks/json_in_cpp.py
-        types: [c++]
-        language: python
-        exclude: |
-          (?x)^(
-            tests/unit/etl/SubscriptionSourceTests.cpp|
-            tests/unit/web/ServerTests.cpp|
-            tests/unit/web/impl/ErrorHandlingTests.cpp|
-            tests/unit/web/ng/ServerTests.cpp|
-            tests/unit/web/ng/impl/ErrorHandlingTests.cpp
-          )$
-
      - id: fix-local-includes
        name: Fix Local Includes
        entry: pre-commit-hooks/fix-local-includes.sh
        types: [c++]
        language: script
-
  - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: dd18dad857d6133e90bbe478f4f2f22ec0030269 # frozen: v22.1.5
+    rev: f9a52e87b6cdcb01b0a62b8611d9ba9f2dad0067 # frozen: v19.1.7
    hooks:
      - id: clang-format
        args: [--style=file]
        types: [c++]

-  - repo: https://github.com/BlankSpruce/gersemi-pre-commit
-    rev: e98930bdc210d3387007f9252d8c1694ea7e410f # frozen: 0.27.7
+  - repo: https://github.com/cheshirekow/cmake-format-precommit
+    rev: e2c2116d86a80e72e7146a06e68b7c228afc6319 # frozen: v0.6.13
    hooks:
-      - id: gersemi
+      - id: cmake-format
+        additional_dependencies: [PyYAML]

  - repo: local
    hooks:
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,9 @@
 cmake_minimum_required(VERSION 3.20)

-project(
-    clio
-    VERSION ${CLIO_VERSION}
-    HOMEPAGE_URL "https://github.com/XRPLF/clio"
-    DESCRIPTION "An XRP Ledger API Server"
+set(CMAKE_PROJECT_INCLUDE_BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/ClioVersion.cmake)
+
+project(clio VERSION ${CLIO_VERSION} HOMEPAGE_URL "https://github.com/XRPLF/clio"
+        DESCRIPTION "An XRP Ledger API Server"
 )

 # =========================== Options ====================================== #
@@ -14,17 +13,17 @@ option(integration_tests "Build integration tests" FALSE)
 option(benchmark "Build benchmarks" FALSE)
 option(docs "Generate doxygen docs" FALSE)
 option(coverage "Build test coverage report" FALSE)
-option(package "Create distribution packages" FALSE)
+option(packaging "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
-    "Build using -ftime-trace to create compiler trace reports"
-    FALSE
-)
+option(time_trace "Build using -ftime-trace to create compiler trace reports" FALSE)

 # ========================================================================== #
+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})

@@ -32,36 +31,24 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 include(Ccache)
 include(CheckCXXCompilerFlag)
 include(ClangTidy)
-include(Linker)

 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()
+if (verbose)
+  set(CMAKE_VERBOSE_MAKEFILE TRUE)
+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()
+if (packaging)
+  add_definitions(-DPKG=1)
+  target_compile_definitions(clio_options INTERFACE PKG=1)
+endif ()

 # Clio tweaks and checks
 include(CheckCompiler)
 include(Settings)
 include(SourceLocation)
-include(PatchNixBinary)

 # Clio deps
 include(deps/libxrpl)
@@ -71,25 +58,43 @@ include(deps/Threads)
 include(deps/libfmt)
 include(deps/cassandra)
 include(deps/libbacktrace)
-include(deps/spdlog)

 add_subdirectory(src)
 add_subdirectory(tests)

-if(benchmark)
-    add_subdirectory(benchmarks)
-endif()
+if (benchmark)
+  add_subdirectory(benchmarks)
+endif ()
+
+# Enable selected sanitizer if enabled via `san`
+if (san)
+  set(SUPPORTED_SANITIZERS "address" "thread" "memory" "undefined")
+  list(FIND SUPPORTED_SANITIZERS "${san}" INDEX)
+  if (INDEX EQUAL -1)
+    message(FATAL_ERROR "Error: Unsupported sanitizer '${san}'. Supported values are: ${SUPPORTED_SANITIZERS}.")
+  endif ()
+
+  target_compile_options(
+    clio_options INTERFACE # Sanitizers recommend minimum of -O1 for reasonable performance
+                           $<$<CONFIG:Debug>:-O1> ${SAN_FLAG} -fno-omit-frame-pointer
+  )
+  target_compile_definitions(
+    clio_options INTERFACE $<$<STREQUAL:${san},address>:SANITIZER=ASAN> $<$<STREQUAL:${san},thread>:SANITIZER=TSAN>
+                           $<$<STREQUAL:${san},memory>:SANITIZER=MSAN> $<$<STREQUAL:${san},undefined>:SANITIZER=UBSAN>
+  )
+  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)
-endif()
+if (docs)
+  add_subdirectory(docs)
+endif ()

 include(install/install)
-if(package)
-    include(ClioPackage)
-endif()
+if (packaging)
+  include(cmake/packaging.cmake) # This file exists only in build runner
+endif ()

-if(snapshot)
-    add_subdirectory(tools/snapshot)
-endif()
+if (snapshot)
+  add_subdirectory(tools/snapshot)
+endif ()
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -133,7 +133,7 @@ This is a non-exhaustive list of recommended style guidelines. These are not alw

 Code must conform to `clang-format`, unless the result is unreasonably difficult to read or maintain.
 In most cases the `pre-commit` hook takes care of formatting and fixes any issues automatically.
-To manually format your code, run `pre-commit run clang-format --files <your changed files>` for C++ files, and `pre-commit run gersemi --files <your changed files>` for CMake files.
+To manually format your code, run `pre-commit run clang-format --files <your changed files>` for C++ files, and `pre-commit run cmake-format --files <your changed files>` for CMake files.

 ### Documentation

@@ -180,7 +180,6 @@ Existing maintainers can resign, or be subject to a vote for removal at the behe
 - [kuznetsss](https://github.com/kuznetsss) (Ripple)
 - [legleux](https://github.com/legleux) (Ripple)
 - [PeterChen13579](https://github.com/PeterChen13579) (Ripple)
- [mathbunnyru](https://github.com/mathbunnyru) (Ripple)

 ### Honorable ex-Maintainers

--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 ISC License

-Copyright (c) 2022-present, the clio developers
+Copyright (c) 2022, the clio developers

 Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.

--- a/README.md
+++ b/README.md
@@ -34,6 +34,7 @@ Below are some useful docs to learn more about Clio.

 - [How to configure Clio and rippled](./docs/configure-clio.md)
 - [How to run Clio](./docs/run-clio.md)
+- [Logging](./docs/logging.md)
 - [Troubleshooting guide](./docs/trouble_shooting.md)

 **General reference material:**
--- a/benchmarks/CMakeLists.txt
+++ b/benchmarks/CMakeLists.txt
@@ -1,27 +1,16 @@
 add_executable(clio_benchmark)

 target_sources(
-    clio_benchmark
-    PRIVATE
-        # Common
-        Main.cpp
-        Playground.cpp
-        # ExecutionContext
-        util/async/ExecutionContextBenchmarks.cpp
-        # Logger
-        util/log/LoggerBenchmark.cpp
-        # WorkQueue
-        rpc/WorkQueueBenchmarks.cpp
+  clio_benchmark
+  PRIVATE # Common
+          Main.cpp
+          Playground.cpp
+          # ExecutionContext
+          util/async/ExecutionContextBenchmarks.cpp
 )

 include(deps/gbench)

 target_include_directories(clio_benchmark PRIVATE .)
-target_link_libraries(
-    clio_benchmark
-    PRIVATE clio_rpc clio_util benchmark::benchmark_main spdlog::spdlog
-)
-set_target_properties(
-    clio_benchmark
-    PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
-)
+target_link_libraries(clio_benchmark PUBLIC clio_etl benchmark::benchmark_main)
+set_target_properties(clio_benchmark PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
--- a/benchmarks/Main.cpp
+++ b/benchmarks/Main.cpp
@@ -1,3 +1,22 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of clio: https://github.com/XRPLF/clio
+    Copyright (c) 2023, the clio developers.
+
+    Permission to use, copy, modify, and distribute this software for any
+    purpose with or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL,  DIRECT,  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
 #include <benchmark/benchmark.h>

 BENCHMARK_MAIN();
--- a/benchmarks/Playground.cpp
+++ b/benchmarks/Playground.cpp
@@ -1,3 +1,22 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of clio: https://github.com/XRPLF/clio
+    Copyright (c) 2023, the clio developers.
+
+    Permission to use, copy, modify, and distribute this software for any
+    purpose with or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL,  DIRECT,  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
 /*
 * Use this file for temporary benchmarks and implementations.
 * Usage example:
--- a/benchmarks/rpc/WorkQueueBenchmarks.cpp
+++ b/benchmarks/rpc/WorkQueueBenchmarks.cpp
@@ -1,134 +0,0 @@
-#include "rpc/WorkQueue.hpp"
-#include "util/Assert.hpp"
-#include "util/config/Array.hpp"
-#include "util/config/ConfigConstraints.hpp"
-#include "util/config/ConfigDefinition.hpp"
-#include "util/config/ConfigValue.hpp"
-#include "util/config/Types.hpp"
-#include "util/log/Logger.hpp"
-#include "util/prometheus/Prometheus.hpp"
-
-#include <benchmark/benchmark.h>
-#include <boost/asio/steady_timer.hpp>
-
-#include <algorithm>
-#include <atomic>
-#include <cassert>
-#include <chrono>
-#include <cstddef>
-#include <cstdint>
-#include <mutex>
-#include <thread>
-#include <vector>
-
-using namespace rpc;
-using namespace util::config;
-
-namespace {
-
-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}}},
-    {"log.channels.[].level", Array{ConfigValue{ConfigType::String}}},
-    {"log.level", ConfigValue{ConfigType::String}.defaultValue("info")},
-    {"log.format",
-     ConfigValue{ConfigType::String}.defaultValue(R"(%Y-%m-%d %H:%M:%S.%f %^%3!l:%n%$ - %v)")},
-    {"log.is_async", ConfigValue{ConfigType::Boolean}.defaultValue(false)},
-    {"log.enable_console", ConfigValue{ConfigType::Boolean}.defaultValue(false)},
-    {"log.directory", ConfigValue{ConfigType::String}.optional()},
-    {"log.rotation_size",
-     ConfigValue{ConfigType::Integer}.defaultValue(2048).withConstraint(gValidateUint32)},
-    {"log.directory_max_files",
-     ConfigValue{ConfigType::Integer}.defaultValue(25).withConstraint(gValidateUint32)},
-    {"log.tag_style", ConfigValue{ConfigType::String}.defaultValue("none")},
-};
-
-// this should be a fixture but it did not work with Args very well
-void
-init()
-{
-    static std::once_flag kOnce;
-    std::call_once(kOnce, [] {
-        PrometheusService::init(kConfig);
-        (void)util::LogService::init(kConfig);
-    });
-}
-
-}  // namespace
-
-static void
-benchmarkWorkQueue(benchmark::State& state)
-{
-    init();
-
-    auto const wqThreads = static_cast<uint32_t>(state.range(0));
-    auto const maxQueueSize = static_cast<uint32_t>(state.range(1));
-    auto const clientThreads = static_cast<uint32_t>(state.range(2));
-    auto const itemsPerClient = static_cast<uint32_t>(state.range(3));
-    auto const clientProcessingMs = static_cast<uint32_t>(state.range(4));
-
-    for (auto _ : state) {
-        std::atomic_size_t totalExecuted = 0uz;
-        std::atomic_size_t totalQueued = 0uz;
-
-        state.PauseTiming();
-        WorkQueue queue(wqThreads, maxQueueSize);
-        state.ResumeTiming();
-
-        std::vector<std::thread> threads;
-        threads.reserve(clientThreads);
-
-        for (auto t = 0uz; t < clientThreads; ++t) {
-            threads.emplace_back([&] {
-                for (auto i = 0uz; i < itemsPerClient; ++i) {
-                    totalQueued += static_cast<std::size_t>(queue.postCoro(
-                        [&clientProcessingMs, &totalExecuted](auto yield) {
-                            ++totalExecuted;
-
-                            boost::asio::steady_timer timer(
-                                yield.get_executor(), std::chrono::milliseconds{clientProcessingMs}
-                            );
-                            timer.async_wait(yield);
-
-                            std::this_thread::sleep_for(std::chrono::microseconds{10});
-                        },
-                        /* isWhiteListed = */ false
-                    ));
-                }
-            });
-        }
-
-        for (auto& t : threads)
-            t.join();
-
-        queue.stop();
-
-        ASSERT(totalExecuted == totalQueued, "Totals don't match");
-        ASSERT(totalQueued <= itemsPerClient * clientThreads, "Queued more than requested");
-
-        if (maxQueueSize == 0) {
-            ASSERT(
-                totalQueued == itemsPerClient * clientThreads, "Queued exactly the expected amount"
-            );
-        } else {
-            ASSERT(
-                totalQueued >= std::min(maxQueueSize, itemsPerClient * clientThreads),
-                "Queued less than expected"
-            );
-        }
-    }
-}
-
-// Usage example:
-/*
-  ./clio_benchmark \
-    --benchmark_repetitions=10 \
-    --benchmark_display_aggregates_only=true \
-    --benchmark_min_time=1x \
-    --benchmark_filter="WorkQueue"
-*/
-// TODO: figure out what happens on 1 thread
-BENCHMARK(benchmarkWorkQueue)
-    ->ArgsProduct({{2, 4, 8, 16}, {0, 5'000}, {4, 8, 16}, {1'000, 10'000}, {10, 100, 250}})
-    ->Unit(benchmark::kMillisecond);
--- a/benchmarks/util/async/ExecutionContextBenchmarks.cpp
+++ b/benchmarks/util/async/ExecutionContextBenchmarks.cpp
@@ -1,3 +1,22 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of clio: https://github.com/XRPLF/clio
+    Copyright (c) 2024, the clio developers.
+
+    Permission to use, copy, modify, and distribute this software for any
+    purpose with or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL,  DIRECT,  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
 #include "etl/ETLHelpers.hpp"
 #include "util/Random.hpp"
 #include "util/async/AnyExecutionContext.hpp"
@@ -169,11 +188,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;
--- a/benchmarks/util/log/LoggerBenchmark.cpp
+++ b/benchmarks/util/log/LoggerBenchmark.cpp
@@ -1,138 +0,0 @@
-#include "util/config/ConfigDefinition.hpp"
-#include "util/log/Logger.hpp"
-#include "util/prometheus/Prometheus.hpp"
-
-#include <benchmark/benchmark.h>
-#include <fmt/format.h>
-#include <spdlog/async.h>
-#include <spdlog/async_logger.h>
-#include <spdlog/spdlog.h>
-
-#include <barrier>
-#include <chrono>
-#include <cstddef>
-#include <cstdint>
-#include <filesystem>
-#include <memory>
-#include <string>
-#include <thread>
-#include <utility>
-#include <vector>
-
-using namespace util;
-
-static constexpr auto kLogFormat = "%Y-%m-%d %H:%M:%S.%f %^%3!l:%n%$ - %v";
-
-struct BenchmarkLoggingInitializer {
-    [[nodiscard]] static std::shared_ptr<spdlog::sinks::sink>
-    createFileSink(std::string const& logDir, uint32_t sizeMB, uint32_t maxFiles)
-    {
-        return LogService::createFileSink(
-            LogService::FileLoggingParams{
-                .logDir = logDir,
-                .rotation = LogService::RotationParams{.sizeMB = sizeMB, .maxFiles = maxFiles},
-            },
-            kLogFormat
-        );
-    }
-
-    static Logger
-    getLogger(std::shared_ptr<spdlog::logger> logger)
-    {
-        return Logger(std::move(logger));
-    }
-};
-
-namespace {
-
-std::string
-uniqueLogDir()
-{
-    auto const epochTime = std::chrono::high_resolution_clock::now().time_since_epoch();
-    auto const tmpDir = std::filesystem::temp_directory_path();
-    std::string const dirName = fmt::format(
-        "logs_{}", std::chrono::duration_cast<std::chrono::microseconds>(epochTime).count()
-    );
-    return tmpDir / "clio_benchmark" / dirName;
-}
-
-}  // anonymous namespace
-
-static void
-benchmarkConcurrentFileLogging(benchmark::State& state)
-{
-    auto const numThreads = static_cast<size_t>(state.range(0));
-    auto const messagesPerThread = static_cast<size_t>(state.range(1));
-
-    PrometheusService::init(config::getClioConfig());
-
-    auto const logDir = uniqueLogDir();
-    for (auto _ : 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);
-
-        auto fileSink = BenchmarkLoggingInitializer::createFileSink(logDir, 5, 25);
-
-        std::vector<std::thread> threads;
-        threads.reserve(numThreads);
-
-        std::chrono::high_resolution_clock::time_point start;
-        std::barrier barrier(numThreads, [&state, &start]() {
-            state.ResumeTiming();
-            start = std::chrono::high_resolution_clock::now();
-        });
-
-        for (size_t threadNum = 0; threadNum < numThreads; ++threadNum) {
-            threads.emplace_back([threadNum, messagesPerThread, fileSink, &barrier]() {
-                std::string const channel = fmt::format("Thread_{}", threadNum);
-                auto logger = std::make_shared<spdlog::async_logger>(
-                    channel, fileSink, spdlog::thread_pool(), spdlog::async_overflow_policy::block
-                );
-                spdlog::register_logger(logger);
-                Logger const threadLogger =
-                    BenchmarkLoggingInitializer::getLogger(std::move(logger));
-
-                barrier.arrive_and_wait();
-
-                for (size_t messageNum = 0; messageNum < messagesPerThread; ++messageNum) {
-                    LOG(threadLogger.info()) << "Test log message #" << messageNum;
-                }
-            });
-        }
-
-        for (auto& thread : threads) {
-            thread.join();
-        }
-        spdlog::shutdown();
-
-        auto const end = std::chrono::high_resolution_clock::now();
-        state.SetIterationTime(
-            std::chrono::duration_cast<std::chrono::duration<double>>(end - start).count()
-        );
-
-        std::filesystem::remove_all(logDir);
-    }
-
-    auto const totalMessages = numThreads * messagesPerThread;
-    state.counters["TotalMessagesRate"] =
-        benchmark::Counter(totalMessages, benchmark::Counter::kIsRate);
-    state.counters["Threads"] = numThreads;
-    state.counters["MessagesPerThread"] = messagesPerThread;
-}
-
-// One line of log message is around 110 bytes
-// So, 100K messages is around 10.5MB
-
-BENCHMARK(benchmarkConcurrentFileLogging)
-    ->ArgsProduct({
-        // Number of threads
-        {1, 2, 4, 8},
-        // Messages per thread
-        {10'000, 100'000, 500'000, 1'000'000, 10'000'000},
-    })
-    ->UseManualTime()
-    ->Unit(benchmark::kMillisecond);
--- a/cliff.toml
+++ b/cliff.toml
@@ -49,6 +49,8 @@ postprocessors = [
 ]
 # render body even when there are no releases to process
 # render_always = true
+# output file path
+output = "CHANGELOG.md"

 [git]
 # parse the commits based on https://www.conventionalcommits.org
--- a/cmake/Build.cpp.in
+++ b/cmake/Build.cpp.in
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of clio: https://github.com/XRPLF/clio
+    Copyright (c) 2022, the clio developers.
+
+    Permission to use, copy, modify, and distribute this software for any
+    purpose with or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL,  DIRECT,  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "util/build/Build.hpp"
+
+#include <string>
+
+namespace util::build {
+
+static constexpr char versionString[] = "@CLIO_VERSION@"; // NOLINT(readability-identifier-naming)
+
+std::string const&
+getClioVersionString()
+{
+    static std::string const value = versionString; // NOLINT(readability-identifier-naming)
+    return value;
+}
+
+std::string const&
+getClioFullVersionString()
+{
+    static std::string const value = "clio-" + getClioVersionString(); // NOLINT(readability-identifier-naming)
+    return value;
+}
+
+}  // namespace util::build
--- a/cmake/Ccache.cmake
+++ b/cmake/Ccache.cmake
@@ -1,5 +1,5 @@
 find_program(CCACHE_PATH "ccache")
-if(CCACHE_PATH)
-    set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PATH}")
-    message(STATUS "Using ccache: ${CCACHE_PATH}")
-endif()
+if (CCACHE_PATH)
+  set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PATH}")
+  message(STATUS "Using ccache: ${CCACHE_PATH}")
+endif ()
--- a/cmake/CheckCompiler.cmake
+++ b/cmake/CheckCompiler.cmake
@@ -1,21 +1,42 @@
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
-        message(FATAL_ERROR "Clang 16+ required for building clio")
-    endif()
-    set(is_clang TRUE)
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15)
-        message(FATAL_ERROR "AppleClang 15+ required for building clio")
-    endif()
-    set(is_appleclang TRUE)
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12)
-        message(FATAL_ERROR "GCC 12+ required for building clio")
-    endif()
-    set(is_gcc TRUE)
-else()
-    message(
-        FATAL_ERROR
-        "Supported compilers: AppleClang 15+, Clang 16+, GCC 12+"
-    )
-endif()
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
+    message(FATAL_ERROR "Clang 16+ required for building clio")
+  endif ()
+  set(is_clang TRUE)
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+  if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15)
+    message(FATAL_ERROR "AppleClang 15+ required for building clio")
+  endif ()
+  set(is_appleclang TRUE)
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12)
+    message(FATAL_ERROR "GCC 12+ required for building clio")
+  endif ()
+  set(is_gcc TRUE)
+else ()
+  message(FATAL_ERROR "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 ()
--- a/cmake/ClangTidy.cmake
+++ b/cmake/ClangTidy.cmake
@@ -1,41 +1,33 @@
-if(lint)
-    # Find clang-tidy binary
-    if(DEFINED ENV{CLIO_CLANG_TIDY_BIN})
-        set(_CLANG_TIDY_BIN $ENV{CLIO_CLANG_TIDY_BIN})
-        if((NOT EXISTS ${_CLANG_TIDY_BIN}) OR IS_DIRECTORY ${_CLANG_TIDY_BIN})
-            message(
-                FATAL_ERROR
-                "$ENV{CLIO_CLANG_TIDY_BIN} no such file. Check CLIO_CLANG_TIDY_BIN env variable"
-            )
-        endif()
-        message(STATUS "Using clang-tidy from CLIO_CLANG_TIDY_BIN")
-    else()
-        find_program(
-            _CLANG_TIDY_BIN
-            NAMES "clang-tidy-20" "clang-tidy"
-            REQUIRED
-        )
-    endif()
+if (lint)

-    if(NOT _CLANG_TIDY_BIN)
-        message(
-            FATAL_ERROR
-            "clang-tidy binary not found. Please set the CLIO_CLANG_TIDY_BIN environment variable or install clang-tidy."
-        )
-    endif()
+  # Find clang-tidy binary
+  if (DEFINED ENV{CLIO_CLANG_TIDY_BIN})
+    set(_CLANG_TIDY_BIN $ENV{CLIO_CLANG_TIDY_BIN})
+    if ((NOT EXISTS ${_CLANG_TIDY_BIN}) OR IS_DIRECTORY ${_CLANG_TIDY_BIN})
+      message(FATAL_ERROR "$ENV{CLIO_CLANG_TIDY_BIN} no such file. Check CLIO_CLANG_TIDY_BIN env variable")
+    endif ()
+    message(STATUS "Using clang-tidy from CLIO_CLANG_TIDY_BIN")
+  else ()
+    find_program(_CLANG_TIDY_BIN NAMES "clang-tidy-19" "clang-tidy" REQUIRED)
+  endif ()

-    # Support for https://github.com/matus-chochlik/ctcache
-    find_program(CLANG_TIDY_CACHE_PATH NAMES "clang-tidy-cache")
-    if(CLANG_TIDY_CACHE_PATH)
-        set(_CLANG_TIDY_CMD
-            "${CLANG_TIDY_CACHE_PATH};${_CLANG_TIDY_BIN}"
-            CACHE STRING
-            "A combined command to run clang-tidy with caching wrapper"
-        )
-    else()
-        set(_CLANG_TIDY_CMD "${_CLANG_TIDY_BIN}")
-    endif()
+  if (NOT _CLANG_TIDY_BIN)
+    message(
+      FATAL_ERROR
+        "clang-tidy binary not found. Please set the CLIO_CLANG_TIDY_BIN environment variable or install clang-tidy."
+    )
+  endif ()

-    set(CMAKE_CXX_CLANG_TIDY "${_CLANG_TIDY_CMD};--quiet")
-    message(STATUS "Using clang-tidy: ${CMAKE_CXX_CLANG_TIDY}")
-endif()
+  # Support for https://github.com/matus-chochlik/ctcache
+  find_program(CLANG_TIDY_CACHE_PATH NAMES "clang-tidy-cache")
+  if (CLANG_TIDY_CACHE_PATH)
+    set(_CLANG_TIDY_CMD "${CLANG_TIDY_CACHE_PATH};${_CLANG_TIDY_BIN}"
+        CACHE STRING "A combined command to run clang-tidy with caching wrapper"
+    )
+  else ()
+    set(_CLANG_TIDY_CMD "${_CLANG_TIDY_BIN}")
+  endif ()
+
+  set(CMAKE_CXX_CLANG_TIDY "${_CLANG_TIDY_CMD};--quiet")
+  message(STATUS "Using clang-tidy: ${CMAKE_CXX_CLANG_TIDY}")
+endif ()
--- a/cmake/ClioPackage.cmake
+++ b/cmake/ClioPackage.cmake
@@ -1,8 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/ClioVersion.cmake")
-
-set(CPACK_PACKAGING_INSTALL_PREFIX "/opt/clio")
-set(CPACK_PACKAGE_VERSION "${CLIO_VERSION}")
-set(CPACK_STRIP_FILES TRUE)
-
-include(pkg/deb)
-include(CPack)
--- a/cmake/ClioVersion.cmake
+++ b/cmake/ClioVersion.cmake
@@ -1,67 +1,48 @@
+#[===================================================================[
+   write version to source
+#]===================================================================]
+
 find_package(Git REQUIRED)

-if(DEFINED ENV{GITHUB_BRANCH_NAME})
-    set(GIT_BUILD_BRANCH $ENV{GITHUB_BRANCH_NAME})
-    set(GIT_COMMIT_HASH $ENV{GITHUB_HEAD_SHA})
-else()
-    set(GIT_COMMAND branch --show-current)
-    execute_process(
-        COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND}
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        OUTPUT_VARIABLE GIT_BUILD_BRANCH
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-
-    set(GIT_COMMAND rev-parse HEAD)
-    execute_process(
-        COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND}
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        OUTPUT_VARIABLE GIT_COMMIT_HASH
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-endif()
-
+set(GIT_COMMAND rev-parse --short HEAD)
 execute_process(
-    COMMAND date +%Y%m%d%H%M%S
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE BUILD_DATE
+  COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE REV
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+set(GIT_COMMAND branch --show-current)
+execute_process(
+  COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE BRANCH
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+if (BRANCH STREQUAL "")
+  set(BRANCH "dev")
+endif ()
+
+if (NOT (BRANCH MATCHES master OR BRANCH MATCHES release/*)) # for develop and any other branch name
+                                                             # YYYYMMDDHMS-<branch>-<git-rev>
+  set(GIT_COMMAND show -s --date=format:%Y%m%d%H%M%S --format=%cd)
+  execute_process(
+    COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE DATE
    OUTPUT_STRIP_TRAILING_WHITESPACE
-    COMMAND_ERROR_IS_FATAL ANY
-)
+  )
+  set(CLIO_VERSION "${DATE}-${BRANCH}-${REV}")
+  set(DOC_CLIO_VERSION "develop")
+else ()
+  set(GIT_COMMAND describe --tags)
+  execute_process(
+    COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE CLIO_TAG_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  set(CLIO_VERSION "${CLIO_TAG_VERSION}")
+  set(DOC_CLIO_VERSION "${CLIO_TAG_VERSION}")
+endif ()

-message(STATUS "Git branch: ${GIT_BUILD_BRANCH}")
-message(STATUS "Git commit hash: ${GIT_COMMIT_HASH}")
-message(STATUS "Build date: ${BUILD_DATE}")
-
-if(
-    DEFINED ENV{FORCE_CLIO_VERSION}
-    AND NOT "$ENV{FORCE_CLIO_VERSION}" STREQUAL ""
-)
-    message(
-        STATUS
-        "Using explicitly provided '${FORCE_CLIO_VERSION}' as Clio version"
-    )
-
-    set(CLIO_VERSION "$ENV{FORCE_CLIO_VERSION}")
-    set(DOC_CLIO_VERSION "$ENV{FORCE_CLIO_VERSION}")
-else()
-    message(
-        STATUS
-        "Using 'YYYYMMDDHMS-<branch>-<git short rev>' as Clio version"
-    )
-
-    string(SUBSTRING ${GIT_COMMIT_HASH} 0 7 GIT_COMMIT_HASH_SHORT)
-
-    set(CLIO_VERSION
-        "${BUILD_DATE}-${GIT_BUILD_BRANCH}-${GIT_COMMIT_HASH_SHORT}"
-    )
-    set(DOC_CLIO_VERSION "develop")
-endif()
-
-if(CMAKE_BUILD_TYPE MATCHES Debug)
-    set(CLIO_VERSION "${CLIO_VERSION}+DEBUG")
-endif()
+if (CMAKE_BUILD_TYPE MATCHES Debug)
+  set(CLIO_VERSION "${CLIO_VERSION}+DEBUG")
+endif ()

 message(STATUS "Build version: ${CLIO_VERSION}")
+
+configure_file(${CMAKE_CURRENT_LIST_DIR}/Build.cpp.in ${CMAKE_CURRENT_LIST_DIR}/../src/util/build/Build.cpp)
--- a/cmake/CodeCoverage.cmake
+++ b/cmake/CodeCoverage.cmake
@@ -106,120 +106,78 @@ option(CODE_COVERAGE_VERBOSE "Verbose information" FALSE)
 # Check prereqs
 find_program(GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/scripts/test)

-if(DEFINED CODE_COVERAGE_GCOV_TOOL)
-    set(GCOV_TOOL "${CODE_COVERAGE_GCOV_TOOL}")
-elseif(DEFINED ENV{CODE_COVERAGE_GCOV_TOOL})
-    set(GCOV_TOOL "$ENV{CODE_COVERAGE_GCOV_TOOL}")
-elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang")
-    if(APPLE)
-        execute_process(
-            COMMAND xcrun -f llvm-cov
-            OUTPUT_VARIABLE LLVMCOV_PATH
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-        )
-    else()
-        find_program(LLVMCOV_PATH llvm-cov)
-    endif()
-    if(LLVMCOV_PATH)
-        set(GCOV_TOOL "${LLVMCOV_PATH} gcov")
-    endif()
-elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-    find_program(GCOV_PATH gcov)
-    set(GCOV_TOOL "${GCOV_PATH}")
-endif()
+if (DEFINED CODE_COVERAGE_GCOV_TOOL)
+  set(GCOV_TOOL "${CODE_COVERAGE_GCOV_TOOL}")
+elseif (DEFINED ENV{CODE_COVERAGE_GCOV_TOOL})
+  set(GCOV_TOOL "$ENV{CODE_COVERAGE_GCOV_TOOL}")
+elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang")
+  if (APPLE)
+    execute_process(COMMAND xcrun -f llvm-cov OUTPUT_VARIABLE LLVMCOV_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
+  else ()
+    find_program(LLVMCOV_PATH llvm-cov)
+  endif ()
+  if (LLVMCOV_PATH)
+    set(GCOV_TOOL "${LLVMCOV_PATH} gcov")
+  endif ()
+elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+  find_program(GCOV_PATH gcov)
+  set(GCOV_TOOL "${GCOV_PATH}")
+endif ()

 # Check supported compiler (Clang, GNU and Flang)
 get_property(LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES)
-foreach(LANG ${LANGUAGES})
-    if("${CMAKE_${LANG}_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang")
-        if("${CMAKE_${LANG}_COMPILER_VERSION}" VERSION_LESS 3)
-            message(
-                FATAL_ERROR
-                "Clang version must be 3.0.0 or greater! Aborting..."
-            )
-        endif()
-    elseif(
-        NOT "${CMAKE_${LANG}_COMPILER_ID}" MATCHES "GNU"
-        AND NOT "${CMAKE_${LANG}_COMPILER_ID}" MATCHES "(LLVM)?[Ff]lang"
-    )
-        message(FATAL_ERROR "Compiler is not GNU or Flang! Aborting...")
-    endif()
-endforeach()
+foreach (LANG ${LANGUAGES})
+  if ("${CMAKE_${LANG}_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang")
+    if ("${CMAKE_${LANG}_COMPILER_VERSION}" VERSION_LESS 3)
+      message(FATAL_ERROR "Clang version must be 3.0.0 or greater! Aborting...")
+    endif ()
+  elseif (NOT "${CMAKE_${LANG}_COMPILER_ID}" MATCHES "GNU" AND NOT "${CMAKE_${LANG}_COMPILER_ID}" MATCHES
+                                                               "(LLVM)?[Ff]lang"
+  )
+    message(FATAL_ERROR "Compiler is not GNU or Flang! Aborting...")
+  endif ()
+endforeach ()

 set(COVERAGE_COMPILER_FLAGS "-g --coverage" CACHE INTERNAL "")
-if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
-    include(CheckCXXCompilerFlag)
-    check_cxx_compiler_flag(-fprofile-abs-path HAVE_cxx_fprofile_abs_path)
-    if(HAVE_cxx_fprofile_abs_path)
-        set(COVERAGE_CXX_COMPILER_FLAGS
-            "${COVERAGE_COMPILER_FLAGS} -fprofile-abs-path"
-        )
-    endif()
-    include(CheckCCompilerFlag)
-    check_c_compiler_flag(-fprofile-abs-path HAVE_c_fprofile_abs_path)
-    if(HAVE_c_fprofile_abs_path)
-        set(COVERAGE_C_COMPILER_FLAGS
-            "${COVERAGE_COMPILER_FLAGS} -fprofile-abs-path"
-        )
-    endif()
-endif()
+if (CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
+  include(CheckCXXCompilerFlag)
+  check_cxx_compiler_flag(-fprofile-abs-path HAVE_cxx_fprofile_abs_path)
+  if (HAVE_cxx_fprofile_abs_path)
+    set(COVERAGE_CXX_COMPILER_FLAGS "${COVERAGE_COMPILER_FLAGS} -fprofile-abs-path")
+  endif ()
+  include(CheckCCompilerFlag)
+  check_c_compiler_flag(-fprofile-abs-path HAVE_c_fprofile_abs_path)
+  if (HAVE_c_fprofile_abs_path)
+    set(COVERAGE_C_COMPILER_FLAGS "${COVERAGE_COMPILER_FLAGS} -fprofile-abs-path")
+  endif ()
+endif ()

-set(CMAKE_Fortran_FLAGS_COVERAGE
-    ${COVERAGE_COMPILER_FLAGS}
-    CACHE STRING
-    "Flags used by the Fortran compiler during coverage builds."
-    FORCE
+set(CMAKE_Fortran_FLAGS_COVERAGE ${COVERAGE_COMPILER_FLAGS}
+    CACHE STRING "Flags used by the Fortran compiler during coverage builds." FORCE
 )
-set(CMAKE_CXX_FLAGS_COVERAGE
-    ${COVERAGE_COMPILER_FLAGS}
-    CACHE STRING
-    "Flags used by the C++ compiler during coverage builds."
-    FORCE
+set(CMAKE_CXX_FLAGS_COVERAGE ${COVERAGE_COMPILER_FLAGS}
+    CACHE STRING "Flags used by the C++ compiler during coverage builds." FORCE
 )
-set(CMAKE_C_FLAGS_COVERAGE
-    ${COVERAGE_COMPILER_FLAGS}
-    CACHE STRING
-    "Flags used by the C compiler during coverage builds."
-    FORCE
+set(CMAKE_C_FLAGS_COVERAGE ${COVERAGE_COMPILER_FLAGS}
+    CACHE STRING "Flags used by the C compiler during coverage builds." FORCE
 )
-set(CMAKE_EXE_LINKER_FLAGS_COVERAGE
-    ""
-    CACHE STRING
-    "Flags used for linking binaries during coverage builds."
-    FORCE
-)
-set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE
-    ""
-    CACHE STRING
-    "Flags used by the shared libraries linker during coverage builds."
-    FORCE
+set(CMAKE_EXE_LINKER_FLAGS_COVERAGE "" CACHE STRING "Flags used for linking binaries during coverage builds." FORCE)
+set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE ""
+    CACHE STRING "Flags used by the shared libraries linker during coverage builds." FORCE
 )
 mark_as_advanced(
-    CMAKE_Fortran_FLAGS_COVERAGE
-    CMAKE_CXX_FLAGS_COVERAGE
-    CMAKE_C_FLAGS_COVERAGE
-    CMAKE_EXE_LINKER_FLAGS_COVERAGE
-    CMAKE_SHARED_LINKER_FLAGS_COVERAGE
+  CMAKE_Fortran_FLAGS_COVERAGE CMAKE_CXX_FLAGS_COVERAGE CMAKE_C_FLAGS_COVERAGE CMAKE_EXE_LINKER_FLAGS_COVERAGE
+  CMAKE_SHARED_LINKER_FLAGS_COVERAGE
 )

-get_property(
-    GENERATOR_IS_MULTI_CONFIG
-    GLOBAL
-    PROPERTY GENERATOR_IS_MULTI_CONFIG
-)
-if(NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR GENERATOR_IS_MULTI_CONFIG))
-    message(
-        WARNING
-        "Code coverage results with an optimised (non-Debug) build may be misleading"
-    )
-endif() # NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR GENERATOR_IS_MULTI_CONFIG)
+get_property(GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+if (NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR GENERATOR_IS_MULTI_CONFIG))
+  message(WARNING "Code coverage results with an optimised (non-Debug) build may be misleading")
+endif () # NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR GENERATOR_IS_MULTI_CONFIG)

-if(
-    CMAKE_C_COMPILER_ID STREQUAL "GNU"
-    OR CMAKE_Fortran_COMPILER_ID STREQUAL "GNU"
-)
-    link_libraries(gcov)
-endif()
+if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
+  link_libraries(gcov)
+endif ()

 # Defines a target for running and collection code coverage information Builds dependencies, runs the given executable
 # and outputs reports. NOTE! The executable should always have a ZERO as exit code otherwise the coverage generation
@@ -233,236 +191,171 @@ endif()
 # defaults to xml) EXCLUDE "src/dir1/*" "src/dir2/*"      # Patterns to exclude (can be relative #  to BASE_DIRECTORY,
 # with CMake 3.4+) ) The user can set the variable GCOVR_ADDITIONAL_ARGS to supply additional flags to the GCVOR
 # command.
-function(setup_target_for_coverage_gcovr)
-    set(options NONE)
-    set(oneValueArgs BASE_DIRECTORY NAME FORMAT)
-    set(multiValueArgs EXCLUDE EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
-    cmake_parse_arguments(
-        Coverage
-        "${options}"
-        "${oneValueArgs}"
-        "${multiValueArgs}"
-        ${ARGN}
-    )
+function (setup_target_for_coverage_gcovr)
+  set(options NONE)
+  set(oneValueArgs BASE_DIRECTORY NAME FORMAT)
+  set(multiValueArgs EXCLUDE EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
+  cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})

-    if(NOT GCOV_TOOL)
-        message(FATAL_ERROR "Could not find gcov or llvm-cov tool! Aborting...")
-    endif()
+  if (NOT GCOV_TOOL)
+    message(FATAL_ERROR "Could not find gcov or llvm-cov tool! Aborting...")
+  endif ()

-    if(NOT GCOVR_PATH)
-        message(FATAL_ERROR "Could not find gcovr tool! Aborting...")
-    endif()
+  if (NOT GCOVR_PATH)
+    message(FATAL_ERROR "Could not find gcovr tool! Aborting...")
+  endif ()

-    # Set base directory (as absolute path), or default to PROJECT_SOURCE_DIR
-    if(DEFINED Coverage_BASE_DIRECTORY)
-        get_filename_component(BASEDIR ${Coverage_BASE_DIRECTORY} ABSOLUTE)
-    else()
-        set(BASEDIR ${PROJECT_SOURCE_DIR})
-    endif()
+  # Set base directory (as absolute path), or default to PROJECT_SOURCE_DIR
+  if (DEFINED Coverage_BASE_DIRECTORY)
+    get_filename_component(BASEDIR ${Coverage_BASE_DIRECTORY} ABSOLUTE)
+  else ()
+    set(BASEDIR ${PROJECT_SOURCE_DIR})
+  endif ()

-    if(NOT DEFINED Coverage_FORMAT)
-        set(Coverage_FORMAT xml)
-    endif()
+  if (NOT DEFINED Coverage_FORMAT)
+    set(Coverage_FORMAT xml)
+  endif ()

-    if("--output" IN_LIST GCOVR_ADDITIONAL_ARGS)
-        message(
-            FATAL_ERROR
-            "Unsupported --output option detected in GCOVR_ADDITIONAL_ARGS! Aborting..."
-        )
-    else()
-        if(
-            (Coverage_FORMAT STREQUAL "html-details")
-            OR (Coverage_FORMAT STREQUAL "html-nested")
-        )
-            set(GCOVR_OUTPUT_FILE
-                ${PROJECT_BINARY_DIR}/${Coverage_NAME}/index.html
-            )
-            set(GCOVR_CREATE_FOLDER ${PROJECT_BINARY_DIR}/${Coverage_NAME})
-        elseif(Coverage_FORMAT STREQUAL "html-single")
-            set(GCOVR_OUTPUT_FILE ${Coverage_NAME}.html)
-        elseif(
-            (Coverage_FORMAT STREQUAL "json-summary")
-            OR (Coverage_FORMAT STREQUAL "json-details")
+  if ("--output" IN_LIST GCOVR_ADDITIONAL_ARGS)
+    message(FATAL_ERROR "Unsupported --output option detected in GCOVR_ADDITIONAL_ARGS! Aborting...")
+  else ()
+    if ((Coverage_FORMAT STREQUAL "html-details") OR (Coverage_FORMAT STREQUAL "html-nested"))
+      set(GCOVR_OUTPUT_FILE ${PROJECT_BINARY_DIR}/${Coverage_NAME}/index.html)
+      set(GCOVR_CREATE_FOLDER ${PROJECT_BINARY_DIR}/${Coverage_NAME})
+    elseif (Coverage_FORMAT STREQUAL "html-single")
+      set(GCOVR_OUTPUT_FILE ${Coverage_NAME}.html)
+    elseif ((Coverage_FORMAT STREQUAL "json-summary") OR (Coverage_FORMAT STREQUAL "json-details")
            OR (Coverage_FORMAT STREQUAL "coveralls")
-        )
-            set(GCOVR_OUTPUT_FILE ${Coverage_NAME}.json)
-        elseif(Coverage_FORMAT STREQUAL "txt")
-            set(GCOVR_OUTPUT_FILE ${Coverage_NAME}.txt)
-        elseif(Coverage_FORMAT STREQUAL "csv")
-            set(GCOVR_OUTPUT_FILE ${Coverage_NAME}.csv)
-        else()
-            set(GCOVR_OUTPUT_FILE ${Coverage_NAME}.xml)
-        endif()
-    endif()
-
-    if(
-        (Coverage_FORMAT STREQUAL "cobertura")
-        OR (Coverage_FORMAT STREQUAL "xml")
    )
-        list(APPEND GCOVR_ADDITIONAL_ARGS --cobertura "${GCOVR_OUTPUT_FILE}")
-        list(APPEND GCOVR_ADDITIONAL_ARGS --cobertura-pretty)
-        set(Coverage_FORMAT cobertura) # overwrite xml
-    elseif(Coverage_FORMAT STREQUAL "sonarqube")
-        list(APPEND GCOVR_ADDITIONAL_ARGS --sonarqube "${GCOVR_OUTPUT_FILE}")
-    elseif(Coverage_FORMAT STREQUAL "json-summary")
-        list(APPEND GCOVR_ADDITIONAL_ARGS --json-summary "${GCOVR_OUTPUT_FILE}")
-        list(APPEND GCOVR_ADDITIONAL_ARGS --json-summary-pretty)
-    elseif(Coverage_FORMAT STREQUAL "json-details")
-        list(APPEND GCOVR_ADDITIONAL_ARGS --json "${GCOVR_OUTPUT_FILE}")
-        list(APPEND GCOVR_ADDITIONAL_ARGS --json-pretty)
-    elseif(Coverage_FORMAT STREQUAL "coveralls")
-        list(APPEND GCOVR_ADDITIONAL_ARGS --coveralls "${GCOVR_OUTPUT_FILE}")
-        list(APPEND GCOVR_ADDITIONAL_ARGS --coveralls-pretty)
-    elseif(Coverage_FORMAT STREQUAL "csv")
-        list(APPEND GCOVR_ADDITIONAL_ARGS --csv "${GCOVR_OUTPUT_FILE}")
-    elseif(Coverage_FORMAT STREQUAL "txt")
-        list(APPEND GCOVR_ADDITIONAL_ARGS --txt "${GCOVR_OUTPUT_FILE}")
-    elseif(Coverage_FORMAT STREQUAL "html-single")
-        list(APPEND GCOVR_ADDITIONAL_ARGS --html "${GCOVR_OUTPUT_FILE}")
-        list(APPEND GCOVR_ADDITIONAL_ARGS --html-self-contained)
-    elseif(Coverage_FORMAT STREQUAL "html-nested")
-        list(APPEND GCOVR_ADDITIONAL_ARGS --html-nested "${GCOVR_OUTPUT_FILE}")
-    elseif(Coverage_FORMAT STREQUAL "html-details")
-        list(APPEND GCOVR_ADDITIONAL_ARGS --html-details "${GCOVR_OUTPUT_FILE}")
-    else()
-        message(
-            FATAL_ERROR
-            "Unsupported output style ${Coverage_FORMAT}! Aborting..."
-        )
-    endif()
+      set(GCOVR_OUTPUT_FILE ${Coverage_NAME}.json)
+    elseif (Coverage_FORMAT STREQUAL "txt")
+      set(GCOVR_OUTPUT_FILE ${Coverage_NAME}.txt)
+    elseif (Coverage_FORMAT STREQUAL "csv")
+      set(GCOVR_OUTPUT_FILE ${Coverage_NAME}.csv)
+    else ()
+      set(GCOVR_OUTPUT_FILE ${Coverage_NAME}.xml)
+    endif ()
+  endif ()

-    # Collect excludes (CMake 3.4+: Also compute absolute paths)
-    set(GCOVR_EXCLUDES "")
-    foreach(
-        EXCLUDE
-        ${Coverage_EXCLUDE}
-        ${COVERAGE_EXCLUDES}
-        ${COVERAGE_GCOVR_EXCLUDES}
-    )
-        if(CMAKE_VERSION VERSION_GREATER 3.4)
-            get_filename_component(
-                EXCLUDE
-                ${EXCLUDE}
-                ABSOLUTE
-                BASE_DIR ${BASEDIR}
-            )
-        endif()
-        list(APPEND GCOVR_EXCLUDES "${EXCLUDE}")
-    endforeach()
-    list(REMOVE_DUPLICATES GCOVR_EXCLUDES)
+  if ((Coverage_FORMAT STREQUAL "cobertura") OR (Coverage_FORMAT STREQUAL "xml"))
+    list(APPEND GCOVR_ADDITIONAL_ARGS --cobertura "${GCOVR_OUTPUT_FILE}")
+    list(APPEND GCOVR_ADDITIONAL_ARGS --cobertura-pretty)
+    set(Coverage_FORMAT cobertura) # overwrite xml
+  elseif (Coverage_FORMAT STREQUAL "sonarqube")
+    list(APPEND GCOVR_ADDITIONAL_ARGS --sonarqube "${GCOVR_OUTPUT_FILE}")
+  elseif (Coverage_FORMAT STREQUAL "json-summary")
+    list(APPEND GCOVR_ADDITIONAL_ARGS --json-summary "${GCOVR_OUTPUT_FILE}")
+    list(APPEND GCOVR_ADDITIONAL_ARGS --json-summary-pretty)
+  elseif (Coverage_FORMAT STREQUAL "json-details")
+    list(APPEND GCOVR_ADDITIONAL_ARGS --json "${GCOVR_OUTPUT_FILE}")
+    list(APPEND GCOVR_ADDITIONAL_ARGS --json-pretty)
+  elseif (Coverage_FORMAT STREQUAL "coveralls")
+    list(APPEND GCOVR_ADDITIONAL_ARGS --coveralls "${GCOVR_OUTPUT_FILE}")
+    list(APPEND GCOVR_ADDITIONAL_ARGS --coveralls-pretty)
+  elseif (Coverage_FORMAT STREQUAL "csv")
+    list(APPEND GCOVR_ADDITIONAL_ARGS --csv "${GCOVR_OUTPUT_FILE}")
+  elseif (Coverage_FORMAT STREQUAL "txt")
+    list(APPEND GCOVR_ADDITIONAL_ARGS --txt "${GCOVR_OUTPUT_FILE}")
+  elseif (Coverage_FORMAT STREQUAL "html-single")
+    list(APPEND GCOVR_ADDITIONAL_ARGS --html "${GCOVR_OUTPUT_FILE}")
+    list(APPEND GCOVR_ADDITIONAL_ARGS --html-self-contained)
+  elseif (Coverage_FORMAT STREQUAL "html-nested")
+    list(APPEND GCOVR_ADDITIONAL_ARGS --html-nested "${GCOVR_OUTPUT_FILE}")
+  elseif (Coverage_FORMAT STREQUAL "html-details")
+    list(APPEND GCOVR_ADDITIONAL_ARGS --html-details "${GCOVR_OUTPUT_FILE}")
+  else ()
+    message(FATAL_ERROR "Unsupported output style ${Coverage_FORMAT}! Aborting...")
+  endif ()

-    # Combine excludes to several -e arguments
-    set(GCOVR_EXCLUDE_ARGS "")
-    foreach(EXCLUDE ${GCOVR_EXCLUDES})
-        list(APPEND GCOVR_EXCLUDE_ARGS "-e")
-        list(APPEND GCOVR_EXCLUDE_ARGS "${EXCLUDE}")
-    endforeach()
+  # Collect excludes (CMake 3.4+: Also compute absolute paths)
+  set(GCOVR_EXCLUDES "")
+  foreach (EXCLUDE ${Coverage_EXCLUDE} ${COVERAGE_EXCLUDES} ${COVERAGE_GCOVR_EXCLUDES})
+    if (CMAKE_VERSION VERSION_GREATER 3.4)
+      get_filename_component(EXCLUDE ${EXCLUDE} ABSOLUTE BASE_DIR ${BASEDIR})
+    endif ()
+    list(APPEND GCOVR_EXCLUDES "${EXCLUDE}")
+  endforeach ()
+  list(REMOVE_DUPLICATES GCOVR_EXCLUDES)

-    # Set up commands which will be run to generate coverage data Run tests
-    set(GCOVR_EXEC_TESTS_CMD ${Coverage_EXECUTABLE} ${Coverage_EXECUTABLE_ARGS})
+  # Combine excludes to several -e arguments
+  set(GCOVR_EXCLUDE_ARGS "")
+  foreach (EXCLUDE ${GCOVR_EXCLUDES})
+    list(APPEND GCOVR_EXCLUDE_ARGS "-e")
+    list(APPEND GCOVR_EXCLUDE_ARGS "${EXCLUDE}")
+  endforeach ()

-    # Create folder
-    if(DEFINED GCOVR_CREATE_FOLDER)
-        set(GCOVR_FOLDER_CMD
-            ${CMAKE_COMMAND}
-            -E
-            make_directory
-            ${GCOVR_CREATE_FOLDER}
-        )
-    else()
-        set(GCOVR_FOLDER_CMD echo) # dummy
-    endif()
+  # Set up commands which will be run to generate coverage data Run tests
+  set(GCOVR_EXEC_TESTS_CMD ${Coverage_EXECUTABLE} ${Coverage_EXECUTABLE_ARGS})

-    # Running gcovr
-    set(GCOVR_CMD
-        ${GCOVR_PATH}
-        --gcov-executable
-        ${GCOV_TOOL}
-        --gcov-ignore-parse-errors=negative_hits.warn_once_per_file
-        -r
-        ${BASEDIR}
-        ${GCOVR_ADDITIONAL_ARGS}
-        ${GCOVR_EXCLUDE_ARGS}
-        --object-directory=${PROJECT_BINARY_DIR}
-    )
+  # Create folder
+  if (DEFINED GCOVR_CREATE_FOLDER)
+    set(GCOVR_FOLDER_CMD ${CMAKE_COMMAND} -E make_directory ${GCOVR_CREATE_FOLDER})
+  else ()
+    set(GCOVR_FOLDER_CMD echo) # dummy
+  endif ()

-    if(CODE_COVERAGE_VERBOSE)
-        message(STATUS "Executed command report")
+  # Running gcovr
+  set(GCOVR_CMD
+      ${GCOVR_PATH}
+      --gcov-executable
+      ${GCOV_TOOL}
+      --gcov-ignore-parse-errors=negative_hits.warn_once_per_file
+      -r
+      ${BASEDIR}
+      ${GCOVR_ADDITIONAL_ARGS}
+      ${GCOVR_EXCLUDE_ARGS}
+      --object-directory=${PROJECT_BINARY_DIR}
+  )

-        message(STATUS "Command to run tests: ")
-        string(
-            REPLACE ";"
-            " "
-            GCOVR_EXEC_TESTS_CMD_SPACED
-            "${GCOVR_EXEC_TESTS_CMD}"
-        )
-        message(STATUS "${GCOVR_EXEC_TESTS_CMD_SPACED}")
+  if (CODE_COVERAGE_VERBOSE)
+    message(STATUS "Executed command report")

-        if(NOT GCOVR_FOLDER_CMD STREQUAL "echo")
-            message(STATUS "Command to create a folder: ")
-            string(
-                REPLACE ";"
-                " "
-                GCOVR_FOLDER_CMD_SPACED
-                "${GCOVR_FOLDER_CMD}"
-            )
-            message(STATUS "${GCOVR_FOLDER_CMD_SPACED}")
-        endif()
+    message(STATUS "Command to run tests: ")
+    string(REPLACE ";" " " GCOVR_EXEC_TESTS_CMD_SPACED "${GCOVR_EXEC_TESTS_CMD}")
+    message(STATUS "${GCOVR_EXEC_TESTS_CMD_SPACED}")

-        message(STATUS "Command to generate gcovr coverage data: ")
-        string(REPLACE ";" " " GCOVR_CMD_SPACED "${GCOVR_CMD}")
-        message(STATUS "${GCOVR_CMD_SPACED}")
-    endif()
+    if (NOT GCOVR_FOLDER_CMD STREQUAL "echo")
+      message(STATUS "Command to create a folder: ")
+      string(REPLACE ";" " " GCOVR_FOLDER_CMD_SPACED "${GCOVR_FOLDER_CMD}")
+      message(STATUS "${GCOVR_FOLDER_CMD_SPACED}")
+    endif ()

-    add_custom_target(
-        ${Coverage_NAME}
-        COMMAND ${GCOVR_EXEC_TESTS_CMD}
-        COMMAND ${GCOVR_FOLDER_CMD}
-        COMMAND ${GCOVR_CMD}
-        BYPRODUCTS ${GCOVR_OUTPUT_FILE}
-        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-        DEPENDS ${Coverage_DEPENDENCIES}
-        VERBATIM # Protect arguments to commands
-        COMMENT "Running gcovr to produce code coverage report."
-    )
+    message(STATUS "Command to generate gcovr coverage data: ")
+    string(REPLACE ";" " " GCOVR_CMD_SPACED "${GCOVR_CMD}")
+    message(STATUS "${GCOVR_CMD_SPACED}")
+  endif ()

-    # Show info where to find the report
-    add_custom_command(
-        TARGET ${Coverage_NAME}
-        POST_BUILD
-        COMMAND ;
-        COMMENT
-            "Code coverage report saved in ${GCOVR_OUTPUT_FILE} formatted as ${Coverage_FORMAT}"
-    )
-endfunction() # setup_target_for_coverage_gcovr
+  add_custom_target(
+    ${Coverage_NAME}
+    COMMAND ${GCOVR_EXEC_TESTS_CMD}
+    COMMAND ${GCOVR_FOLDER_CMD}
+    COMMAND ${GCOVR_CMD}
+    BYPRODUCTS ${GCOVR_OUTPUT_FILE}
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+    DEPENDS ${Coverage_DEPENDENCIES}
+    VERBATIM # Protect arguments to commands
+    COMMENT "Running gcovr to produce code coverage report."
+  )

-function(append_coverage_compiler_flags)
-    set(CMAKE_C_FLAGS
-        "${CMAKE_C_FLAGS} ${COVERAGE_COMPILER_FLAGS}"
-        PARENT_SCOPE
-    )
-    set(CMAKE_CXX_FLAGS
-        "${CMAKE_CXX_FLAGS} ${COVERAGE_COMPILER_FLAGS}"
-        PARENT_SCOPE
-    )
-    set(CMAKE_Fortran_FLAGS
-        "${CMAKE_Fortran_FLAGS} ${COVERAGE_COMPILER_FLAGS}"
-        PARENT_SCOPE
-    )
-    message(
-        STATUS
-        "Appending code coverage compiler flags: ${COVERAGE_COMPILER_FLAGS}"
-    )
-endfunction() # append_coverage_compiler_flags
+  # Show info where to find the report
+  add_custom_command(
+    TARGET ${Coverage_NAME} POST_BUILD COMMAND ;
+    COMMENT "Code coverage report saved in ${GCOVR_OUTPUT_FILE} formatted as ${Coverage_FORMAT}"
+  )
+endfunction () # setup_target_for_coverage_gcovr
+
+function (append_coverage_compiler_flags)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
+  message(STATUS "Appending code coverage compiler flags: ${COVERAGE_COMPILER_FLAGS}")
+endfunction () # append_coverage_compiler_flags

 # Setup coverage for specific library
-function(append_coverage_compiler_flags_to_target name mode)
-    separate_arguments(_flag_list NATIVE_COMMAND "${COVERAGE_COMPILER_FLAGS}")
-    target_compile_options(${name} ${mode} ${_flag_list})
-    if(
-        CMAKE_C_COMPILER_ID STREQUAL "GNU"
-        OR CMAKE_Fortran_COMPILER_ID STREQUAL "GNU"
-    )
-        target_link_libraries(${name} ${mode} gcov)
-    endif()
-endfunction()
+function (append_coverage_compiler_flags_to_target name mode)
+  separate_arguments(_flag_list NATIVE_COMMAND "${COVERAGE_COMPILER_FLAGS}")
+  target_compile_options(${name} ${mode} ${_flag_list})
+  if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
+    target_link_libraries(${name} ${mode} gcov)
+  endif ()
+endfunction ()
--- a/cmake/Docs.cmake
+++ b/cmake/Docs.cmake
@@ -12,9 +12,9 @@ set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)

 configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT})
 add_custom_target(
-    docs
-    COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    COMMENT "Generating API documentation with Doxygen"
-    VERBATIM
+  docs
+  COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+  COMMENT "Generating API documentation with Doxygen"
+  VERBATIM
 )
--- a/cmake/Linker.cmake
+++ b/cmake/Linker.cmake
@@ -1,11 +0,0 @@
-if(DEFINED CMAKE_LINKER_TYPE)
-    message(STATUS "Custom linker is already set: ${CMAKE_LINKER_TYPE}")
-    return()
-endif()
-
-find_program(MOLD_PATH mold)
-
-if(MOLD_PATH AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    message(STATUS "Using Mold linker: ${MOLD_PATH}")
-    set(CMAKE_LINKER_TYPE MOLD)
-endif()
--- a/cmake/PatchNixBinary.cmake
+++ b/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()
--- a/cmake/Sanitizers.cmake
+++ b/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})
--- a/cmake/Settings.cmake
+++ b/cmake/Settings.cmake
@@ -1,22 +1,21 @@
 set(COMPILER_FLAGS
-    -pedantic
    -Wall
    -Wcast-align
    -Wdouble-promotion
-    -Werror
    -Wextra
+    -Werror
    -Wformat=2
    -Wimplicit-fallthrough
    -Wmisleading-indentation
-    -Wno-dangling-else
-    -Wno-deprecated-declarations
    -Wno-narrowing
+    -Wno-deprecated-declarations
+    -Wno-dangling-else
    -Wno-unused-but-set-variable
    -Wnon-virtual-dtor
    -Wnull-dereference
    -Wold-style-cast
+    -pedantic
    -Wpedantic
-    -Wunreachable-code
    -Wunused
    # FIXME: The following bunch are needed for gcc12 atm.
    -Wno-missing-requires
@@ -30,77 +29,53 @@ set(COMPILER_FLAGS
 # TODO: re-enable when we change CI #884 if (is_gcc AND NOT lint) list(APPEND COMPILER_FLAGS -Wduplicated-branches
 # -Wduplicated-cond -Wlogical-op -Wuseless-cast ) endif ()

-if(is_clang)
-    # gcc is too aggressive with shadowing
-    # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78147
-    list(APPEND COMPILER_FLAGS -Wshadow)
-endif()
+if (is_clang)
+  list(APPEND COMPILER_FLAGS -Wshadow # gcc is to aggressive with shadowing
+                                      # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78147
+  )
+endif ()

-if(is_appleclang)
-    list(APPEND COMPILER_FLAGS -Wreorder-init-list)
-endif()
+if (is_appleclang)
+  list(APPEND COMPILER_FLAGS -Wreorder-init-list)
+endif ()

-if(SANITIZERS_ENABLED)
-    # 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
-    # are reported from deep inside libraries like boost or libxrpl.
-    #
-    # TODO: Address in https://github.com/XRPLF/clio/issues/1885
-    list(
-        APPEND COMPILER_FLAGS
-        -Wno-error=tsan # Disables treating TSAN warnings as errors
-        -Wno-tsan # Disables TSAN warnings (thread-safety analysis)
-        -Wno-uninitialized # Disables warnings about uninitialized variables (AddressSanitizer,
-        # UndefinedBehaviorSanitizer, etc.)
-        -Wno-stringop-overflow # Disables warnings about potential string operation overflows (AddressSanitizer)
-        -Wno-unsafe-buffer-usage # Disables warnings about unsafe memory operations (AddressSanitizer)
-        -Wno-frame-larger-than # Disables warnings about stack frame size being too large (AddressSanitizer)
-        -Wno-unused-function # Disables warnings about unused functions (LeakSanitizer, memory-related issues)
-        -Wno-unused-but-set-variable # Disables warnings about unused variables (MemorySanitizer)
-        -Wno-thread-safety-analysis # Disables warnings related to thread safety usage (ThreadSanitizer)
-        -Wno-thread-safety # Disables warnings related to thread safety usage (ThreadSanitizer)
-        -Wno-sign-compare # Disables warnings about signed/unsigned comparison (UndefinedBehaviorSanitizer)
-        -Wno-nonnull # Disables warnings related to null pointer dereferencing (UndefinedBehaviorSanitizer)
-        -Wno-address # Disables warnings about address-related issues (UndefinedBehaviorSanitizer)
-        -Wno-array-bounds # Disables array bounds checks (UndefinedBehaviorSanitizer)
-    )
-endif()
+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 are
+  # reported from deep inside libraries like boost or libxrpl.
+  #
+  # TODO: Address in https://github.com/XRPLF/clio/issues/1885
+  list(
+    APPEND
+    COMPILER_FLAGS
+    -Wno-error=tsan # Disables treating TSAN warnings as errors
+    -Wno-tsan # Disables TSAN warnings (thread-safety analysis)
+    -Wno-uninitialized # Disables warnings about uninitialized variables (AddressSanitizer, UndefinedBehaviorSanitizer,
+                       # etc.)
+    -Wno-stringop-overflow # Disables warnings about potential string operation overflows (AddressSanitizer)
+    -Wno-unsafe-buffer-usage # Disables warnings about unsafe memory operations (AddressSanitizer)
+    -Wno-frame-larger-than # Disables warnings about stack frame size being too large (AddressSanitizer)
+    -Wno-unused-function # Disables warnings about unused functions (LeakSanitizer, memory-related issues)
+    -Wno-unused-but-set-variable # Disables warnings about unused variables (MemorySanitizer)
+    -Wno-thread-safety-analysis # Disables warnings related to thread safety usage (ThreadSanitizer)
+    -Wno-thread-safety # Disables warnings related to thread safety usage (ThreadSanitizer)
+    -Wno-sign-compare # Disables warnings about signed/unsigned comparison (UndefinedBehaviorSanitizer)
+    -Wno-nonnull # Disables warnings related to null pointer dereferencing (UndefinedBehaviorSanitizer)
+    -Wno-address # Disables warnings about address-related issues (UndefinedBehaviorSanitizer)
+    -Wno-array-bounds # Disables array bounds checks (UndefinedBehaviorSanitizer)
+  )
+endif ()

 # See https://github.com/cpp-best-practices/cppbestpractices/blob/master/02-Use_the_Tools_Available.md#gcc--clang for
 # the flags description

-if(time_trace)
-    if(is_clang OR is_appleclang)
-        list(APPEND COMPILER_FLAGS -ftime-trace)
-    else()
-        message(
-            FATAL_ERROR
-            "Clang or AppleClang is required to use `-ftime-trace`"
-        )
-    endif()
-endif()
+if (time_trace)
+  if (is_clang OR is_appleclang)
+    list(APPEND COMPILER_FLAGS -ftime-trace)
+  else ()
+    message(FATAL_ERROR "Clang or AppleClang is required to use `-ftime-trace`")
+  endif ()
+endif ()

 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()
--- a/cmake/SourceLocation.cmake
+++ b/cmake/SourceLocation.cmake
@@ -1,17 +1,11 @@
 include(CheckIncludeFileCXX)

 check_include_file_cxx("source_location" SOURCE_LOCATION_AVAILABLE)
-if(SOURCE_LOCATION_AVAILABLE)
-    target_compile_definitions(clio_options INTERFACE "HAS_SOURCE_LOCATION")
-endif()
+if (SOURCE_LOCATION_AVAILABLE)
+  target_compile_definitions(clio_options INTERFACE "HAS_SOURCE_LOCATION")
+endif ()

-check_include_file_cxx(
-    "experimental/source_location"
-    EXPERIMENTAL_SOURCE_LOCATION_AVAILABLE
-)
-if(EXPERIMENTAL_SOURCE_LOCATION_AVAILABLE)
-    target_compile_definitions(
-        clio_options
-        INTERFACE "HAS_EXPERIMENTAL_SOURCE_LOCATION"
-    )
-endif()
+check_include_file_cxx("experimental/source_location" EXPERIMENTAL_SOURCE_LOCATION_AVAILABLE)
+if (EXPERIMENTAL_SOURCE_LOCATION_AVAILABLE)
+  target_compile_definitions(clio_options INTERFACE "HAS_EXPERIMENTAL_SOURCE_LOCATION")
+endif ()
--- a/cmake/deps/Boost.cmake
+++ b/cmake/deps/Boost.cmake
@@ -1,10 +1,4 @@
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_STATIC_RUNTIME ON)

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

-set_target_properties(
-    OpenSSL::SSL
-    PROPERTIES INTERFACE_COMPILE_DEFINITIONS OPENSSL_NO_SSL2
-)
+set_target_properties(OpenSSL::SSL PROPERTIES INTERFACE_COMPILE_DEFINITIONS OPENSSL_NO_SSL2)
--- a/cmake/deps/libbacktrace.cmake
+++ b/cmake/deps/libbacktrace.cmake
@@ -1,14 +1,11 @@
-if(NOT SANITIZERS_ENABLED)
-    target_compile_definitions(clio_options INTERFACE BOOST_STACKTRACE_LINK)
-    target_compile_definitions(
-        clio_options
-        INTERFACE BOOST_STACKTRACE_USE_BACKTRACE
-    )
-    find_package(libbacktrace REQUIRED CONFIG)
-else()
-    # Some sanitizers (TSAN and ASAN for sure) can't be used with libbacktrace because they have their own backtracing
-    # capabilities and there are conflicts. In any case, this makes sure Clio code knows that backtrace is not
-    # available. See relevant conan profiles for sanitizers where we disable stacktrace in Boost explicitly.
-    target_compile_definitions(clio_options INTERFACE CLIO_WITHOUT_STACKTRACE)
-    message(STATUS "Sanitizer enabled, disabling stacktrace")
-endif()
+if ("${san}" STREQUAL "")
+  target_compile_definitions(clio_options INTERFACE BOOST_STACKTRACE_LINK)
+  target_compile_definitions(clio_options INTERFACE BOOST_STACKTRACE_USE_BACKTRACE)
+  find_package(libbacktrace REQUIRED CONFIG)
+else ()
+  # Some sanitizers (TSAN and ASAN for sure) can't be used with libbacktrace because they have their own backtracing
+  # capabilities and there are conflicts. In any case, this makes sure Clio code knows that backtrace is not available.
+  # See relevant conan profiles for sanitizers where we disable stacktrace in Boost explicitly.
+  target_compile_definitions(clio_options INTERFACE CLIO_WITHOUT_STACKTRACE)
+  message(STATUS "Sanitizer enabled, disabling stacktrace")
+endif ()
--- a/cmake/deps/spdlog.cmake
+++ b/cmake/deps/spdlog.cmake
@@ -1,5 +0,0 @@
-find_package(spdlog REQUIRED)
-
-if(NOT TARGET spdlog::spdlog)
-    message(FATAL_ERROR "spdlog::spdlog target not found")
-endif()
--- a/cmake/install/install.cmake
+++ b/cmake/install/install.cmake
@@ -1,31 +1,13 @@
 set(CLIO_INSTALL_DIR "/opt/clio")
-set(CMAKE_INSTALL_PREFIX
-    "${CLIO_INSTALL_DIR}"
-    CACHE PATH
-    "Install prefix"
-    FORCE
-)
+set(CMAKE_INSTALL_PREFIX ${CLIO_INSTALL_DIR})

-set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-
-include(GNUInstallDirs)
-
-install(TARGETS clio_server DESTINATION "${CMAKE_INSTALL_BINDIR}")
+install(TARGETS clio_server DESTINATION bin)

 file(READ docs/examples/config/example-config.json config)
 string(REGEX REPLACE "./clio_log" "/var/log/clio/" config "${config}")
 file(WRITE ${CMAKE_BINARY_DIR}/install-config.json "${config}")
-install(
-    FILES ${CMAKE_BINARY_DIR}/install-config.json
-    DESTINATION etc
-    RENAME config.json
-)
+install(FILES ${CMAKE_BINARY_DIR}/install-config.json DESTINATION etc RENAME config.json)

-configure_file(
-    "${CMAKE_SOURCE_DIR}/cmake/install/clio.service.in"
-    "${CMAKE_BINARY_DIR}/clio.service"
-)
-install(
-    FILES "${CMAKE_BINARY_DIR}/clio.service"
-    DESTINATION /lib/systemd/system
-)
+configure_file("${CMAKE_SOURCE_DIR}/cmake/install/clio.service.in" "${CMAKE_BINARY_DIR}/clio.service")
+
+install(FILES "${CMAKE_BINARY_DIR}/clio.service" DESTINATION /lib/systemd/system)
--- a/cmake/pkg/deb.cmake
+++ b/cmake/pkg/deb.cmake
@@ -1,12 +0,0 @@
-set(CPACK_GENERATOR "DEB")
-set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/XRPLF/clio")
-set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Ripple Labs Inc. <support@ripple.com>")
-
-set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
-
-set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-
-set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA ${CMAKE_SOURCE_DIR}/cmake/pkg/postinst)
-
-# We must replace "-" with "~" otherwise dpkg will sort "X.Y.Z-b1" as greater than "X.Y.Z"
-string(REPLACE "-" "~" git "${CPACK_PACKAGE_VERSION}")
--- a/cmake/pkg/postinst
+++ b/cmake/pkg/postinst
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-set -e
-
-USER_NAME=clio
-GROUP_NAME="${USER_NAME}"
-CLIO_EXECUTABLE="clio_server"
-CLIO_PREFIX="/opt/clio"
-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
-
-        install -d -o "$USER_NAME" -g "$GROUP_NAME" /var/log/clio
-
-        if [ -f "$CLIO_CONFIG" ]; then
-            chown "$USER_NAME:$GROUP_NAME" "$CLIO_CONFIG"
-        fi
-
-        chown -R "$USER_NAME:$GROUP_NAME" "$CLIO_PREFIX"
-
-        ln -sf "$CLIO_BIN" "/usr/bin/${CLIO_EXECUTABLE}"
-
-        ;;
-    abort-upgrade | abort-remove | abort-deconfigure) ;;
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-        ;;
-esac
-
-exit 0
--- a/conan.lock
+++ b/conan.lock
@@ -1,62 +0,0 @@
-{
-    "version": "0.5",
-    "requires": [
-        "zlib/1.3.1#cac0f6daea041b0ccf42934163defb20%1774439233.809",
-        "xxhash/0.8.3#681d36a0a6111fc56e5e45ea182c19cc%1765850149.987",
-        "xrpl/3.1.3#eabc6838b4553671bdde4b3aa1f8e3e6%1778495466.414",
-        "sqlite3/3.49.1#8631739a4c9b93bd3d6b753bac548a63%1765850149.926",
-        "spdlog/1.17.0#bcbaaf7147bda6ad24ffbd1ac3d7142c%1768312128.781",
-        "soci/4.0.3#fe32b9ad5eb47e79ab9e45a68f363945%1774450067.231",
-        "re2/20230301#ca3b241baec15bd31ea9187150e0b333%1765850148.103",
-        "rapidjson/cci.20220822#1b9d8c2256876a154172dc5cfbe447c6%1754325007.656",
-        "protobuf/3.21.12#44ee56c0a6eea0c19aeeaca680370b88%1764175361.456",
-        "openssl/1.1.1w#a8f0792d7c5121b954578a7149d23e03%1756223730.729",
-        "nudb/2.0.9#11149c73f8f2baff9a0198fe25971fc7%1775040983.408",
-        "minizip/1.2.13#9e87d57804bd372d6d1e32b1871517a3%1754325004.374",
-        "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504%1765850143.914",
-        "libuv/1.46.0#dc28c1f653fa197f00db5b577a6f6011%1754325003.592",
-        "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1765842973.492",
-        "libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1765842973.03",
-        "libarchive/3.8.1#ffee18995c706e02bf96e7a2f7042e0d%1765850144.736",
-        "http_parser/2.9.4#98d91690d6fd021e9e624218a85d9d97%1754325001.385",
-        "gtest/1.17.0#5224b3b3ff3b4ce1133cbdd27d53ee7d%1768312129.152",
-        "grpc/1.50.1#02291451d1e17200293a409410d1c4e1%1756234248.958",
-        "fmt/12.1.0#50abab23274d56bb8f42c94b3b9a40c7%1763984116.926",
-        "doctest/2.4.11#a4211dfc329a16ba9f280f9574025659%1756234220.819",
-        "date/3.0.4#862e11e80030356b53c2c38599ceb32b%1765850143.772",
-        "cassandra-cpp-driver/2.17.0#bd3934138689482102c265d01288a316%1764175359.611",
-        "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",
-        "abseil/20230802.1#90ba607d4ee8fb5fb157c3db540671fc%1764175359.429"
-    ],
-    "build_requires": [
-        "zlib/1.3.1#cac0f6daea041b0ccf42934163defb20%1774439233.809",
-        "protobuf/3.21.12#44ee56c0a6eea0c19aeeaca680370b88%1764175361.456",
-        "cmake/4.3.0#b939a42e98f593fb34d3a8c5cc860359%1774439249.183",
-        "cmake/3.31.11#f325c933f618a1fcebc1e1c0babfd1ba%1774439246.719",
-        "b2/5.4.2#ffd6084a119587e70f11cd45d1a386e2%1774439233.447"
-    ],
-    "python_requires": [],
-    "overrides": {
-        "protobuf/3.21.12#44ee56c0a6eea0c19aeeaca680370b88": [
-            null,
-            "protobuf/3.21.12"
-        ],
-        "boost/1.83.0#91d8b1572534d2c334d6790e3c34d0c1": [
-            null,
-            "boost/1.83.0#91d8b1572534d2c334d6790e3c34d0c1"
-        ],
-        "lz4/1.9.4": [
-            "lz4/1.10.0"
-        ],
-        "boost/[>=1.83.0 <1.91.0]": [
-            "boost/1.83.0"
-        ],
-        "sqlite3/[>=3.44 <4]": [
-            "sqlite3/3.49.1"
-        ]
-    },
-    "config_requires": []
-}
--- a/conan/global.conf
+++ b/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
--- a/conan/init.sh
+++ b/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
--- a/conan/profiles/apple-clang-17.profile
+++ b/conan/profiles/apple-clang-17.profile
@@ -1,11 +0,0 @@
-[settings]
-arch={{detect_api.detect_arch()}}
-build_type=Release
-compiler=apple-clang
-compiler.cppstd=20
-compiler.libcxx=libc++
-compiler.version=17.0
-os=Macos
-
-[conf]
-grpc/1.50.1:tools.build:cxxflags+=["-Wno-missing-template-arg-list-after-template-kw"]
--- a/conan/profiles/ci
+++ b/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 %}
--- a/conan/profiles/default
+++ b/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 %}
--- a/conan/profiles/sanitizers
+++ b/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 %}
--- a/conanfile.py
+++ b/conanfile.py
@@ -1,66 +1,109 @@
-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):
-    name = "clio"
-    license = "ISC"
-    author = "Alex Kremer <akremer@ripple.com>, John Freeman <jfreeman@ripple.com>, Ayaz Salikhov <asalikhov@ripple.com>"
-    url = "https://github.com/xrplf/clio"
-    description = "Clio RPC server"
-    settings = "os", "compiler", "build_type", "arch"
-    options = {}
+    name = 'clio'
+    license = 'ISC'
+    author = 'Alex Kremer <akremer@ripple.com>, John Freeman <jfreeman@ripple.com>, Ayaz Salikhov <asalikhov@ripple.com>'
+    url = 'https://github.com/xrplf/clio'
+    description = 'Clio RPC server'
+    settings = 'os', 'compiler', 'build_type', 'arch'
+    options = {
+        'static': [True, False],              # static linkage
+        'fPIC': [True, False],                # unused?
+        'verbose': [True, False],
+        'tests': [True, False],               # build unit tests; create `clio_tests` binary
+        'integration_tests': [True, False],   # build integration tests; create `clio_integration_tests` binary
+        'benchmark': [True, False],           # build benchmarks; create `clio_benchmarks` binary
+        'docs': [True, False],                # doxygen API docs; create custom target 'docs'
+        'packaging': [True, False],           # create distribution packages
+        'coverage': [True, False],            # build for test coverage report; create custom target `clio_tests-ccov`
+        'lint': [True, False],                # run clang-tidy checks during compilation
+        'snapshot': [True, False],            # build export/import snapshot tool
+        'time_trace': [True, False]           # build using -ftime-trace to create compiler trace reports
+    }

    requires = [
-        "cassandra-cpp-driver/2.17.0",
-        "fmt/12.1.0",
-        "grpc/1.50.1",
-        "libbacktrace/cci.20210118",
-        "openssl/1.1.1w",
-        "protobuf/3.21.12",
-        "spdlog/1.17.0",
-        "xrpl/3.1.3",
-        "zlib/1.3.1",
+        'boost/1.83.0',
+        'cassandra-cpp-driver/2.17.0',
+        'fmt/10.1.1',
+        'protobuf/3.21.12',
+        'grpc/1.50.1',
+        'openssl/1.1.1v',
+        'xrpl/2.5.0-rc1',
+        'zlib/1.3.1',
+        'libbacktrace/cci.20210118'
    ]

    default_options = {
-        "cassandra-cpp-driver/*:shared": False,
-        "date/*:header_only": True,
-        "grpc/*:secure": True,
-        "grpc/*:shared": False,
-        "gtest/*:no_main": True,
-        "libpq/*:shared": False,
-        "lz4/*:shared": False,
-        "openssl/*:shared": False,
-        "protobuf/*:shared": False,
-        "protobuf/*:with_zlib": True,
-        "snappy/*:shared": False,
-        "xrpl/*:rocksdb": False,
-        "xrpl/*:tests": False,
+        'static': False,
+        'fPIC': True,
+        'verbose': False,
+        'tests': False,
+        'integration_tests': False,
+        'benchmark': False,
+        'packaging': False,
+        'coverage': False,
+        'lint': False,
+        'docs': False,
+        'snapshot': False,
+        'time_trace': False,
+
+        'xrpl/*:tests': False,
+        'xrpl/*:rocksdb': False,
+        'cassandra-cpp-driver/*:shared': False,
+        'date/*:header_only': True,
+        'grpc/*:shared': False,
+        'grpc/*:secure': True,
+        'libpq/*:shared': False,
+        'lz4/*:shared': False,
+        'openssl/*:shared': False,
+        'protobuf/*:shared': False,
+        'protobuf/*:with_zlib': True,
+        'snappy/*:shared': False,
+        'gtest/*:no_main': True,
    }

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

    def requirements(self):
-        self.requires("boost/1.83.0", force=True)
-        self.requires("gtest/1.17.0")
-        self.requires("benchmark/1.9.5")
+        if self.options.tests or self.options.integration_tests:
+            self.requires('gtest/1.14.0')
+        if self.options.benchmark:
+            self.requires('benchmark/1.8.3')

    def configure(self):
-        if self.settings.compiler == "apple-clang":
-            self.options["boost"].visibility = "global"
+        if self.settings.compiler == 'apple-clang':
+            self.options['boost'].visibility = 'global'

    def layout(self):
        cmake_layout(self)
        # Fix this setting to follow the default introduced in Conan 1.48
        # to align with our build instructions.
-        self.folders.generators = "build/generators"
+        self.folders.generators = 'build/generators'

-    generators = "CMakeDeps"
+    generators = 'CMakeDeps'

    def generate(self):
        tc = CMakeToolchain(self)
+        tc.variables['verbose'] = self.options.verbose
+        tc.variables['static'] = self.options.static
+        tc.variables['tests'] = self.options.tests
+        tc.variables['integration_tests'] = self.options.integration_tests
+        tc.variables['coverage'] = self.options.coverage
+        tc.variables['lint'] = self.options.lint
+        tc.variables['docs'] = self.options.docs
+        tc.variables['packaging'] = self.options.packaging
+        tc.variables['benchmark'] = self.options.benchmark
+        tc.variables['snapshot'] = self.options.snapshot
+        tc.variables['time_trace'] = self.options.time_trace
+
+        if self.settings.compiler == 'clang' and self.settings.compiler.version == 16:
+            tc.extra_cxxflags = ["-DBOOST_ASIO_DISABLE_CONCEPTS"]
+
        tc.generate()

    def build(self):
--- a/docker/ci/Dockerfile
+++ b/docker/ci/Dockerfile
@@ -0,0 +1,105 @@
+# TODO: change this when we are able to push gcc image to ghcr.io
+FROM rippleci/clio_gcc:12.3.0 AS clio-gcc
+FROM ghcr.io/xrplf/clio-tools:latest AS clio-tools
+
+FROM ghcr.io/xrplf/clio-clang:16
+
+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
+
+ARG LLVM_TOOLS_VERSION=19
+
+# Add repositories
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+        curl \
+        gnupg \
+        wget \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && 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 -
+
+# Install packages
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+        bison \
+        clang-tidy-${LLVM_TOOLS_VERSION} \
+        clang-tools-${LLVM_TOOLS_VERSION} \
+        flex \
+        git \
+        git-lfs \
+        graphviz \
+        jq \
+        make \
+        ninja-build \
+        python3 \
+        python3-pip \
+        zip \
+    && pip3 install -q --upgrade --no-cache-dir pip \
+    && pip3 install -q --no-cache-dir \
+        cmake==3.31.6 \
+        conan==2.17.0 \
+        gcovr \
+        pre-commit \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install gcc-12 and make ldconfig aware of the new libstdc++ location (for gcc)
+# Note: Clang is using libc++ instead
+COPY --from=clio-gcc /gcc12.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 /gcc12.deb \
+    && rm -rf /gcc12.deb \
+    && ldconfig
+
+# Rewire to use gcc-12 as default compiler
+RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 100 \
+    && update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-12 100 \
+    && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100 \
+    && update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-12 100 \
+    && update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-12 100 \
+    && update-alternatives --install /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-12 100 \
+    && update-alternatives --install /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-12 100
+
+COPY --from=clio-tools \
+    /usr/local/bin/ccache \
+    /usr/local/bin/doxygen \
+    /usr/local/bin/ClangBuildAnalyzer \
+    /usr/local/bin/git-cliff \
+    /usr/local/bin/gh \
+    /usr/local/bin/
+
+WORKDIR /root
+
+# Setup conan
+RUN conan remote add --index 0 ripple http://18.143.149.228:8081/artifactory/api/conan/dev
+
+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
--- a/docker/ci/README.md
+++ b/docker/ci/README.md
@@ -0,0 +1,21 @@
+# 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.11.3
+- clang 16.0.6
+- ClangBuildAnalyzer 1.6.0
+- conan 2.17.0
+- doxygen 1.12
+- gcc 12.3.0
+- gh 2.74
+- git-cliff 2.9.1
+- 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`).
--- a/docker/ci/conan/clang.profile
+++ b/docker/ci/conan/clang.profile
@@ -0,0 +1,11 @@
+[settings]
+arch=x86_64
+build_type=Release
+compiler=clang
+compiler.cppstd=20
+compiler.libcxx=libc++
+compiler.version=16
+os=Linux
+
+[conf]
+tools.build:compiler_executables={'c': '/usr/bin/clang-16', 'cpp': '/usr/bin/clang++-16'}
--- a/docker/ci/conan/gcc.profile
+++ b/docker/ci/conan/gcc.profile
@@ -0,0 +1,11 @@
+[settings]
+arch=x86_64
+build_type=Release
+compiler=gcc
+compiler.cppstd=20
+compiler.libcxx=libstdc++11
+compiler.version=12
+os=Linux
+
+[conf]
+tools.build:compiler_executables={'c': '/usr/bin/gcc-12', 'cpp': '/usr/bin/g++-12'}
--- a/docker/ci/conan/sanitizer_template.profile
+++ b/docker/ci/conan/sanitizer_template.profile
@@ -0,0 +1,15 @@
+{% set compiler, sani = profile_name.split('.') %}
+
+{% set sanitizer_opt_map = {'asan': 'address', 'tsan': 'thread', 'ubsan': 'undefined'} %}
+{% set sanitizer = sanitizer_opt_map[sani] %}
+
+include({{ compiler }})
+
+[options]
+boost/*:extra_b2_flags="cxxflags=\"-fsanitize={{ sanitizer }}\" linkflags=\"-fsanitize={{ sanitizer }}\""
+boost/*:without_stacktrace=True
+
+[conf]
+tools.build:cflags+=["-fsanitize={{ sanitizer }}"]
+tools.build:cxxflags+=["-fsanitize={{ sanitizer }}"]
+tools.build:exelinkflags+=["-fsanitize={{ sanitizer }}"]
--- a/docker/clio/Dockerfile
+++ b/docker/clio/Dockerfile
@@ -1,20 +1,18 @@
 FROM ubuntu:22.04

-RUN apt-get update \
-    && apt-get install -y --no-install-recommends --no-install-suggests \
-        libatomic1 \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN groupadd -g 10001 clio \
-    && useradd -u 10000 -g 10001 -s /bin/bash clio
-
 COPY ./clio_server /opt/clio/bin/clio_server

 RUN ln -s /opt/clio/bin/clio_server /usr/local/bin/clio_server \
    && mkdir -p /opt/clio/etc/ \
    && mkdir -p /opt/clio/log/ \
-    && chown clio:clio /opt/clio/log
+    && groupadd -g 10001 clio \
+    && useradd -u 10000 -g 10001 -s /bin/bash clio \
+    && chown clio:clio /opt/clio/log \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+        libatomic1 \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*

 USER clio
 ENTRYPOINT ["/opt/clio/bin/clio_server"]
--- a/docker/clio/README.md
+++ b/docker/clio/README.md
@@ -13,8 +13,8 @@ Clio repository provides an [example](https://github.com/XRPLF/clio/blob/develop

 Config file recommendations:

- Set `log.enable_console` to `false` if you want to avoid logs being written to `stdout`.
- Set `log.directory` to `/opt/clio/log` to store logs in a volume.
+- Set `log_to_console` to `false` if you want to avoid logs being written to `stdout`.
+- Set `log_directory` to `/opt/clio/log` to store logs in a volume.

 ## Usage

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sergey Kuznetsov	b8b82e5dd9	chore: Commits for 2.5.0-b3 (#2197 )	2025-06-09 11:48:12 +01:00
Sergey Kuznetsov	764601e7fc	chore: Commits for 2.5.0-b2 (#2146 )	2025-05-20 16:53:06 +01:00