[CI] clang-tidy auto fixes

.clang-format

@@ -1,5 +1,5 @@
 ---
-Language: Cpp
+Language:        Cpp
 AccessModifierOffset: -4
 AlignAfterOpenBracket: BlockIndent
 AlignConsecutiveAssignments: false
@@ -22,31 +22,31 @@ BreakBeforeBinaryOperators: false
 BreakBeforeBraces: WebKit
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: true
-ColumnLimit: 120
+ColumnLimit:     120
-CommentPragmas: "^ IWYU pragma:"
+CommentPragmas:  '^ IWYU pragma:'
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
 DerivePointerAlignment: false
-DisableFormat: false
+DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
-ForEachMacros: [Q_FOREACH, BOOST_FOREACH]
+ForEachMacros:   [ Q_FOREACH,  BOOST_FOREACH ]
 IncludeBlocks: Regroup
 IncludeCategories:
-  - Regex: '^".*"$'
+  - Regex:           '^".*"$'
-    Priority: 1
+    Priority:        1
-  - Regex: '^<.*\.(h|hpp)>$'
+  - Regex:           '^<.*\.(h|hpp)>$'
-    Priority: 2
+    Priority:        2
-  - Regex: "^<.*>$"
+  - Regex:           '^<.*>$'
-    Priority: 3
+    Priority:        3
-  - Regex: ".*"
+  - Regex:           '.*'
-    Priority: 4
+    Priority:        4
-IncludeIsMainRegex: "$"
+IncludeIsMainRegex: '$'
 IndentCaseLabels: true
 IndentFunctionDeclarationAfterType: false
-IndentWidth: 4
+IndentWidth:     4
 IndentWrappedFunctionNames: false
 IndentRequiresClause: true
 RequiresClausePosition: OwnLine
@@ -63,18 +63,18 @@ PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
 QualifierAlignment: Right
-ReflowComments: true
+ReflowComments:  true
-SortIncludes: true
+SortIncludes:    true
 SpaceAfterCStyleCast: false
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: ControlStatements
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 2
-SpacesInAngles: false
+SpacesInAngles:  false
 SpacesInContainerLiterals: true
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard: Cpp11
+Standard:        Cpp11
-TabWidth: 8
+TabWidth:        8
-UseTab: Never
+UseTab:          Never

.clang-tidy

@@ -1,5 +1,5 @@
 ---
-Checks: "-*,
+Checks: '-*,
   bugprone-argument-comment,
   bugprone-assert-side-effect,
   bugprone-bad-signal-to-kill-thread,
@@ -146,7 +146,7 @@ Checks: "-*,
   readability-static-definition-in-anonymous-namespace,
   readability-suspicious-call-argument,
   readability-use-std-min-max
-  "
+  '
 
 CheckOptions:
   readability-braces-around-statements.ShortStatementLines: 2
@@ -158,21 +158,21 @@ CheckOptions:
   readability-identifier-naming.EnumConstantCase: CamelCase
   readability-identifier-naming.ScopedEnumConstantCase: CamelCase
   readability-identifier-naming.GlobalConstantCase: UPPER_CASE
-  readability-identifier-naming.GlobalConstantPrefix: "k"
+  readability-identifier-naming.GlobalConstantPrefix: 'k'
   readability-identifier-naming.GlobalVariableCase: CamelCase
-  readability-identifier-naming.GlobalVariablePrefix: "g"
+  readability-identifier-naming.GlobalVariablePrefix: 'g'
   readability-identifier-naming.ConstexprFunctionCase: camelBack
   readability-identifier-naming.ConstexprMethodCase: camelBack
   readability-identifier-naming.ClassMethodCase: camelBack
   readability-identifier-naming.ClassMemberCase: camelBack
   readability-identifier-naming.ClassConstantCase: UPPER_CASE
-  readability-identifier-naming.ClassConstantPrefix: "k"
+  readability-identifier-naming.ClassConstantPrefix: 'k'
   readability-identifier-naming.StaticConstantCase: UPPER_CASE
-  readability-identifier-naming.StaticConstantPrefix: "k"
+  readability-identifier-naming.StaticConstantPrefix: 'k'
   readability-identifier-naming.StaticVariableCase: UPPER_CASE
-  readability-identifier-naming.StaticVariablePrefix: "k"
+  readability-identifier-naming.StaticVariablePrefix: 'k'
   readability-identifier-naming.ConstexprVariableCase: UPPER_CASE
-  readability-identifier-naming.ConstexprVariablePrefix: "k"
+  readability-identifier-naming.ConstexprVariablePrefix: 'k'
   readability-identifier-naming.LocalConstantCase: camelBack
   readability-identifier-naming.LocalVariableCase: camelBack
   readability-identifier-naming.TemplateParameterCase: CamelCase
@@ -181,11 +181,11 @@ CheckOptions:
   readability-identifier-naming.MemberCase: camelBack
   readability-identifier-naming.PrivateMemberSuffix: _
   readability-identifier-naming.ProtectedMemberSuffix: _
-  readability-identifier-naming.PublicMemberSuffix: ""
+  readability-identifier-naming.PublicMemberSuffix: ''
-  readability-identifier-naming.FunctionIgnoredRegexp: ".*tag_invoke.*"
+  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: "*"
+WarningsAsErrors: '*'

.cmake-format.yaml

@@ -1,222 +1,222 @@
 _help_parse: Options affecting listfile parsing
 parse:
   _help_additional_commands:
-    - Specify structure for custom cmake functions
+  - Specify structure for custom cmake functions
   additional_commands:
     foo:
       flags:
-        - BAR
+      - BAR
-        - BAZ
+      - BAZ
       kwargs:
-        HEADERS: "*"
+        HEADERS: '*'
-        SOURCES: "*"
+        SOURCES: '*'
-        DEPENDS: "*"
+        DEPENDS: '*'
   _help_override_spec:
-    - Override configurations per-command where available
+  - Override configurations per-command where available
   override_spec: {}
   _help_vartags:
-    - Specify variable tags.
+  - Specify variable tags.
   vartags: []
   _help_proptags:
-    - Specify property tags.
+  - Specify property tags.
   proptags: []
 _help_format: Options affecting formatting.
 format:
   _help_disable:
-    - Disable formatting entirely, making cmake-format a no-op
+  - Disable formatting entirely, making cmake-format a no-op
   disable: false
   _help_line_width:
-    - How wide to allow formatted cmake files
+  - How wide to allow formatted cmake files
   line_width: 120
   _help_tab_size:
-    - How many spaces to tab for indent
+  - How many spaces to tab for indent
   tab_size: 2
   _help_use_tabchars:
-    - If true, lines are indented using tab characters (utf-8
+  - If true, lines are indented using tab characters (utf-8
-    - 0x09) instead of <tab_size> space characters (utf-8 0x20).
+  - 0x09) instead of <tab_size> space characters (utf-8 0x20).
-    - In cases where the layout would require a fractional tab
+  - In cases where the layout would require a fractional tab
-    - character, the behavior of the  fractional indentation is
+  - character, the behavior of the  fractional indentation is
-    - governed by <fractional_tab_policy>
+  - governed by <fractional_tab_policy>
   use_tabchars: false
   _help_fractional_tab_policy:
-    - If <use_tabchars> is True, then the value of this variable
+  - If <use_tabchars> is True, then the value of this variable
-    - indicates how fractional indentions are handled during
+  - indicates how fractional indentions are handled during
-    - whitespace replacement. If set to 'use-space', fractional
+  - whitespace replacement. If set to 'use-space', fractional
-    - indentation is left as spaces (utf-8 0x20). If set to
+  - indentation is left as spaces (utf-8 0x20). If set to
-    - "`round-up` fractional indentation is replaced with a single"
+  - '`round-up` fractional indentation is replaced with a single'
-    - tab character (utf-8 0x09) effectively shifting the column
+  - tab character (utf-8 0x09) effectively shifting the column
-    - to the next tabstop
+  - to the next tabstop
   fractional_tab_policy: use-space
   _help_max_subgroups_hwrap:
-    - If an argument group contains more than this many sub-groups
+  - If an argument group contains more than this many sub-groups
-    - (parg or kwarg groups) then force it to a vertical layout.
+  - (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
+  - If a positional argument group contains more than this many
-    - arguments, then force it to a vertical layout.
+  - 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
+  - If a cmdline positional group consumes more than this many
-    - lines without nesting, then invalidate the layout (and nest)
+  - 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
+  - If true, separate flow control names from their parentheses
-    - with a space
+  - with a space
   separate_ctrl_name_with_space: true
   _help_separate_fn_name_with_space:
-    - If true, separate function names from parentheses with a
+  - If true, separate function names from parentheses with a
-    - space
+  - space
   separate_fn_name_with_space: false
   _help_dangle_parens:
-    - If a statement is wrapped to more than one line, than dangle
+  - If a statement is wrapped to more than one line, than dangle
-    - the closing parenthesis on its own line.
+  - the closing parenthesis on its own line.
   dangle_parens: true
   _help_dangle_align:
-    - If the trailing parenthesis must be 'dangled' on its on
+  - If the trailing parenthesis must be 'dangled' on its on
-    - "line, then align it to this reference: `prefix`: the start"
+  - 'line, then align it to this reference: `prefix`: the start'
-    - "of the statement,  `prefix-indent`: the start of the"
+  - 'of the statement,  `prefix-indent`: the start of the'
-    - "statement, plus one indentation  level, `child`: align to"
+  - 'statement, plus one indentation  level, `child`: align to'
-    - the column of the arguments
+  - the column of the arguments
   dangle_align: prefix
   _help_min_prefix_chars:
-    - If the statement spelling length (including space and
+  - If the statement spelling length (including space and
-    - parenthesis) is smaller than this amount, then force reject
+  - parenthesis) is smaller than this amount, then force reject
-    - nested layouts.
+  - nested layouts.
   min_prefix_chars: 4
   _help_max_prefix_chars:
-    - If the statement spelling length (including space and
+  - If the statement spelling length (including space and
-    - parenthesis) is larger than the tab width by more than this
+  - parenthesis) is larger than the tab width by more than this
-    - amount, then force reject un-nested layouts.
+  - 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
+  - If a candidate layout is wrapped horizontally but it exceeds
-    - this many lines, then reject the layout.
+  - this many lines, then reject the layout.
   max_lines_hwrap: 2
   _help_line_ending:
-    - What style line endings to use in the output.
+  - What style line endings to use in the output.
   line_ending: unix
   _help_command_case:
-    - Format command names consistently as 'lower' or 'upper' case
+  - Format command names consistently as 'lower' or 'upper' case
   command_case: canonical
   _help_keyword_case:
-    - Format keywords consistently as 'lower' or 'upper' 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
+  - 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
+  - If true, the argument lists which are known to be sortable
-    - will be sorted lexicographicall
+  - will be sorted lexicographicall
   enable_sort: true
   _help_autosort:
-    - If true, the parsers may infer whether or not an argument
+  - If true, the parsers may infer whether or not an argument
-    - list is sortable (without annotation).
+  - list is sortable (without annotation).
   autosort: true
   _help_require_valid_layout:
-    - By default, if cmake-format cannot successfully fit
+  - By default, if cmake-format cannot successfully fit
-    - everything into the desired linewidth it will apply the
+  - everything into the desired linewidth it will apply the
-    - last, most aggressive attempt that it made. If this flag is
+  - last, most agressive attempt that it made. If this flag is
-    - True, however, cmake-format will print error, exit with non-
+  - True, however, cmake-format will print error, exit with non-
-    - zero status code, and write-out nothing
+  - zero status code, and write-out nothing
   require_valid_layout: false
   _help_layout_passes:
-    - A dictionary mapping layout nodes to a list of wrap
+  - A dictionary mapping layout nodes to a list of wrap
-    - decisions. See the documentation for more information.
+  - 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
+  - What character to use for bulleted lists
-  bullet_char: "*"
+  bullet_char: '*'
   _help_enum_char:
-    - What character to use as punctuation after numerals in an
+  - What character to use as punctuation after numerals in an
-    - enumerated list
+  - enumerated list
   enum_char: .
   _help_first_comment_is_literal:
-    - If comment markup is enabled, don't reflow the first comment
+  - If comment markup is enabled, don't reflow the first comment
-    - block in each listfile. Use this to preserve formatting of
+  - block in each listfile. Use this to preserve formatting of
-    - your copyright/license statements.
+  - your copyright/license statements.
   first_comment_is_literal: false
   _help_literal_comment_pattern:
-    - If comment markup is enabled, don't reflow any comment block
+  - If comment markup is enabled, don't reflow any comment block
-    - which matches this (regex) pattern. Default is `None`
+  - which matches this (regex) pattern. Default is `None`
-    - (disabled).
+  - (disabled).
   literal_comment_pattern: null
   _help_fence_pattern:
-    - Regular expression to match preformat fences in comments
+  - Regular expression to match preformat fences in comments
-    - default= ``r'^\s*([`~]{3}[`~]*)(.*)$'``
+  - default= ``r'^\s*([`~]{3}[`~]*)(.*)$'``
   fence_pattern: ^\s*([`~]{3}[`~]*)(.*)$
   _help_ruler_pattern:
-    - Regular expression to match rulers in comments default=
+  - Regular expression to match rulers in comments default=
-    - '``r''^\s*[^\w\s]{3}.*[^\w\s]{3}$''``'
+  - '``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
+  - If a comment line matches starts with this pattern then it
-    - is explicitly a trailing comment for the preceding
+  - is explicitly a trailing comment for the preceeding
-    - argument. Default is '#<'
+  - argument. Default is '#<'
-  explicit_trailing_pattern: "#<"
+  explicit_trailing_pattern: '#<'
   _help_hashruler_min_length:
-    - If a comment line starts with at least this many consecutive
+  - If a comment line starts with at least this many consecutive
-    - hash characters, then don't lstrip() them off. This allows
+  - hash characters, then don't lstrip() them off. This allows
-    - for lazy hash rulers where the first hash char is not
+  - for lazy hash rulers where the first hash char is not
-    - separated by space
+  - separated by space
   hashruler_min_length: 10
   _help_canonicalize_hashrulers:
-    - If true, then insert a space between the first hash char and
+  - If true, then insert a space between the first hash char and
-    - remaining hash chars in a hash ruler, and normalize its
+  - remaining hash chars in a hash ruler, and normalize its
-    - length to fill the column
+  - length to fill the column
   canonicalize_hashrulers: true
   _help_enable_markup:
-    - enable comment markup parsing and reflow
+  - 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
+  - a list of lint codes to disable
   disabled_codes: []
   _help_function_pattern:
-    - regular expression pattern describing valid function names
+  - regular expression pattern describing valid function names
-  function_pattern: "[0-9a-z_]+"
+  function_pattern: '[0-9a-z_]+'
   _help_macro_pattern:
-    - regular expression pattern describing valid macro names
+  - regular expression pattern describing valid macro names
-  macro_pattern: "[0-9A-Z_]+"
+  macro_pattern: '[0-9A-Z_]+'
   _help_global_var_pattern:
-    - regular expression pattern describing valid names for
+  - regular expression pattern describing valid names for
-    - variables with global (cache) scope
+  - variables with global (cache) scope
-  global_var_pattern: "[A-Z][0-9A-Z_]+"
+  global_var_pattern: '[A-Z][0-9A-Z_]+'
   _help_internal_var_pattern:
-    - regular expression pattern describing valid names for
+  - regular expression pattern describing valid names for
-    - variables with global scope (but internal semantic)
+  - 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
+  - regular expression pattern describing valid names for
-    - variables with local scope
+  - variables with local scope
-  local_var_pattern: "[a-z][a-z0-9_]+"
+  local_var_pattern: '[a-z][a-z0-9_]+'
   _help_private_var_pattern:
-    - regular expression pattern describing valid names for
+  - regular expression pattern describing valid names for
-    - privatedirectory variables
+  - privatedirectory variables
   private_var_pattern: _[0-9a-z_]+
   _help_public_var_pattern:
-    - regular expression pattern describing valid names for public
+  - regular expression pattern describing valid names for public
-    - directory variables
+  - directory variables
-  public_var_pattern: "[A-Z][0-9A-Z_]+"
+  public_var_pattern: '[A-Z][0-9A-Z_]+'
   _help_argument_var_pattern:
-    - regular expression pattern describing valid names for
+  - regular expression pattern describing valid names for
-    - function/macro arguments and loop variables.
+  - function/macro arguments and loop variables.
-  argument_var_pattern: "[a-z][a-z0-9_]+"
+  argument_var_pattern: '[a-z][a-z0-9_]+'
   _help_keyword_pattern:
-    - regular expression pattern describing valid names for
+  - regular expression pattern describing valid names for
-    - keywords used in functions or macros
+  - keywords used in functions or macros
-  keyword_pattern: "[A-Z][0-9A-Z_]+"
+  keyword_pattern: '[A-Z][0-9A-Z_]+'
   _help_max_conditionals_custom_parser:
-    - In the heuristic for C0201, how many conditionals to match
+  - In the heuristic for C0201, how many conditionals to match
-    - within a loop in before considering the loop a parser.
+  - 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
+  - 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
+  - Require no more than this many newlines between statements
   max_statement_spacing: 2
   max_returns: 6
   max_branches: 12
@@ -226,20 +226,20 @@ lint:
 _help_encode: Options affecting file encoding
 encode:
   _help_emit_byteorder_mark:
-    - If true, emit the unicode byte-order mark (BOM) at the start
+  - If true, emit the unicode byte-order mark (BOM) at the start
-    - of the file
+  - of the file
   emit_byteorder_mark: false
   _help_input_encoding:
-    - Specify the encoding of the input file. Defaults to utf-8
+  - 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.
+  - Specify the encoding of the output file. Defaults to utf-8.
-    - Note that cmake only claims to support utf-8 so be careful
+  - Note that cmake only claims to support utf-8 so be careful
-    - when using anything else
+  - when using anything else
   output_encoding: utf-8
 _help_misc: Miscellaneous configurations options.
 misc:
   _help_per_command:
-    - A dictionary containing any per-command configuration
+  - A dictionary containing any per-command configuration
-    - overrides. Currently only `command_case` is supported.
+  - overrides. Currently only `command_case` is supported.
   per_command: {}

.codecov.yml

@@ -9,14 +9,3 @@ coverage:
       default:
         target: 20% # Need to bump this number https://docs.codecov.com/docs/commit-status#patch-status
         threshold: 2%
-
-# `codecov/codecov-action` reruns `gcovr` if build files present
-# That's why we run it in a separate workflow
-# This ignore list is not currently used
-#
-# More info: https://github.com/XRPLF/clio/pull/2066
-ignore:
-  - "tests"
-  - "src/data/cassandra/"
-  - "src/data/CassandraBackend.hpp"
-  - "src/data/BackendFactory.*"

.githooks/check-docs

@@ -2,7 +2,7 @@
 
 # Note: This script is intended to be run from the root of the repository.
 #
-# Not really a hook but should be used to check the completeness of documentation for added code, otherwise CI will come for you.
+# Not really a hook but should be used to check the completness of documentation for added code, otherwise CI will come for you.
 # It's good to have /tmp as the output so that consecutive runs are fast but no clutter in the repository.
 
 echo "+ Checking documentation..."
@@ -15,18 +15,12 @@ DOCDIR=${TMPDIR}/out
 
 # Check doxygen is at all installed
 if [ -z "$DOXYGEN" ]; then
-    if [[ "${CI}" == "true" ]]; then
-        # If we are in CI, we should fail the check
-        echo "doxygen not found in CI, please install it"
-        exit 1
-    fi
-
     # No hard error if doxygen is not installed yet
     cat <<EOF
 
                                    WARNING
 -----------------------------------------------------------------------------
-        'doxygen' is required to check documentation.
+        'doxygen' is required to check documentation. 
         Please install it for next time.
 
         Your changes may fail to pass CI once pushed.
@@ -61,7 +55,6 @@ pushd ${DOCDIR} > /dev/null 2>&1
 cat ${ROOT}/docs/Doxyfile | \
 sed \
     -e "s/\${LINT}/YES/" \
-    -e "s/\${WARN_AS_ERROR}/NO/" \
     -e "s!\${SOURCE}!${ROOT}!" \
     -e "s/\${USE_DOT}/NO/" \
     -e "s/\${EXCLUDES}/impl/" \

.githooks/check-format

@@ -0,0 +1,119 @@
+#!/bin/bash
+
+# Note: This script is intended to be run from the root of the repository.
+#
+# This script checks the format of the code and cmake files.
+# In many cases it will automatically fix the issues and abort the commit.
+
+no_formatted_directories_staged() {
+    staged_directories=$(git diff-index --cached --name-only HEAD | awk -F/ '{print $1}')
+    for sd in $staged_directories; do
+        if [[ "$sd" =~ ^(benchmark|cmake|src|tests)$ ]]; then
+            return 1
+        fi
+    done
+    return 0
+}
+
+if no_formatted_directories_staged ; then
+    exit 0
+fi
+
+echo "+ Checking code format..."
+
+# paths to check and re-format
+sources="src tests"
+formatter="clang-format -i"
+version=$($formatter --version | grep -o '[0-9\.]*')
+
+if [[ "19.0.0" > "$version" ]]; then
+    cat <<EOF
+
+                                    ERROR
+-----------------------------------------------------------------------------
+            A minimum of version 19 of `which clang-format` is required.
+            Your version is $version.
+            Please fix paths and run again.
+-----------------------------------------------------------------------------
+
+EOF
+    exit 3
+fi
+
+# check there is no .h headers, only .hpp
+wrong_headers=$(find $sources -name "*.h" | sed 's/^/        - /')
+if [[ ! -z "$wrong_headers" ]]; then
+    cat <<EOF
+
+                                    ERROR
+-----------------------------------------------------------------------------
+       Found .h headers in the source code. Please rename them to .hpp:
+
+$wrong_headers
+-----------------------------------------------------------------------------
+
+EOF
+    exit 2
+fi
+
+if ! command -v cmake-format &> /dev/null; then
+    cat <<EOF
+
+                                    ERROR
+-----------------------------------------------------------------------------
+        'cmake-format' is required to run this script.
+        Please install it and run again.
+-----------------------------------------------------------------------------
+
+EOF
+    exit 3
+fi
+
+function grep_code {
+    grep -l "${1}" ${sources} -r --include \*.hpp --include \*.cpp
+}
+
+GNU_SED=$(sed --version 2>&1 | grep -q 'GNU' && echo true || echo false)
+
+if [[ "$GNU_SED" == "false" ]]; then # macOS sed
+    # make all includes to be <...> style
+    grep_code '#include ".*"' | xargs sed -i '' -E 's|#include "(.*)"|#include <\1>|g'
+
+    # make local includes to be "..." style
+    main_src_dirs=$(find ./src -maxdepth 1 -type d -exec basename {} \; | tr '\n' '|' | sed 's/|$//' | sed 's/|/\\|/g')
+    grep_code "#include <\($main_src_dirs\)/.*>" | xargs sed -i '' -E "s|#include <(($main_src_dirs)/.*)>|#include \"\1\"|g"
+else
+    # make all includes to be <...> style
+    grep_code '#include ".*"' | xargs sed -i -E 's|#include "(.*)"|#include <\1>|g'
+
+    # make local includes to be "..." style
+    main_src_dirs=$(find ./src -maxdepth 1 -type d  -exec basename {} \; | paste -sd '|' | sed 's/|/\\|/g')
+    grep_code "#include <\($main_src_dirs\)/.*>" | xargs sed -i -E "s|#include <(($main_src_dirs)/.*)>|#include \"\1\"|g"
+fi
+
+cmake_dirs=$(echo cmake $sources)
+cmake_files=$(find $cmake_dirs -type f \( -name "CMakeLists.txt" -o -name "*.cmake" \))
+cmake_files=$(echo $cmake_files ./CMakeLists.txt)
+
+first=$(git diff $sources $cmake_files)
+find $sources -type f \( -name '*.cpp' -o -name '*.hpp' -o -name '*.ipp' \) -print0 | xargs -0 $formatter
+cmake-format -i $cmake_files
+second=$(git diff $sources $cmake_files)
+changes=$(diff <(echo "$first") <(echo "$second"))
+changes_number=$(echo -n "$changes" | wc -l | sed -e 's/^[[:space:]]*//')
+
+if [ "$changes_number" != "0" ]; then
+    cat <<\EOF
+
+                                   WARNING
+-----------------------------------------------------------------------------
+  Automatically re-formatted code with 'clang-format' - commit was aborted.
+  Please manually add any updated files and commit again.
+-----------------------------------------------------------------------------
+
+EOF
+    if [[ "$1" == "--diff" ]]; then
+        echo "$changes"
+    fi
+    exit 1
+fi

.githooks/post-checkout

@@ -0,0 +1,3 @@
+#!/bin/sh
+command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting the 'post-checkout' file in the hooks directory (set by 'core.hookspath'; usually '.git/hooks').\n"; exit 2; }
+git lfs post-checkout "$@"

.githooks/post-commit

@@ -0,0 +1,3 @@
+#!/bin/sh
+command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting the 'post-commit' file in the hooks directory (set by 'core.hookspath'; usually '.git/hooks').\n"; exit 2; }
+git lfs post-commit "$@"

.githooks/post-merge

@@ -0,0 +1,3 @@
+#!/bin/sh
+command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting the 'post-merge' file in the hooks directory (set by 'core.hookspath'; usually '.git/hooks').\n"; exit 2; }
+git lfs post-merge "$@"

.githooks/pre-commit

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# This script is intended to be run from the root of the repository.
+
+source .githooks/check-format
+source .githooks/check-docs
+

.githooks/pre-push

@@ -39,14 +39,20 @@ verify_tag_signed() {
     fi
 }
 
-# Check some things if we're pushing a branch called "release/"
+while read local_ref local_oid remote_ref remote_oid; do
-if echo "$PRE_COMMIT_REMOTE_BRANCH" | grep ^refs\/heads\/release\/ &> /dev/null ; then
+    # Check some things if we're pushing a branch called "release/"
-    version=$(git tag --points-at HEAD)
+    if echo "$remote_ref" | grep ^refs\/heads\/release\/ &> /dev/null ; then
-    echo "Looks like you're trying to push a $version release..."
+        version=$(git tag --points-at HEAD)
-    echo "Making sure you've signed and tagged it."
+        echo "Looks like you're trying to push a $version release..."
-    if verify_commit_signed && verify_tag && verify_tag_signed ; then
+        echo "Making sure you've signed and tagged it."
-        : # Ok, I guess you can push
+        if verify_commit_signed && verify_tag && verify_tag_signed ; then
-    else
+            : # Ok, I guess you can push
-        exit 1
+        else
+            exit 1
+        fi
     fi
-fi
+done
+
+command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting the 'pre-push' file in the hooks directory (set by 'core.hookspath'; usually '.git/hooks').\n"; exit 2; }
+
+git lfs pre-push "$@"

.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,34 +3,29 @@ name: Bug report
 about: Create a report to help us improve
 title: "[Title with short description] (Version: [Clio version])"
 labels: bug
-assignees: ""
+assignees: ''
+
 ---
 
 <!-- Please search existing issues to avoid creating duplicates. -->
 <!-- Kindly refrain from posting any credentials or sensitive information in this issue -->
 
 ## Issue Description
-
 <!-- Provide a summary for your issue/bug. -->
 
 ## Steps to Reproduce
-
 <!-- List in detail the exact steps to reproduce the unexpected behavior of the software. -->
 
 ## Expected Result
-
 <!-- Explain in detail what behavior you expected to happen. -->
 
 ## Actual Result
-
 <!-- Explain in detail what behavior actually happened. -->
 
 ## Environment
-
 <!-- Please describe your environment setup (such as Ubuntu 20.04.2 with Boost 1.82). -->
 <!-- Please use the version returned by './clio_server --version' as the version number -->
 
 ## Supporting Files
-
 <!-- If you have supporting files such as a log, feel free to post a link here using Github Gist. -->
 <!-- Consider adding configuration files with private information removed via Github Gist. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -3,24 +3,21 @@ name: Feature request
 about: Suggest an idea for this project
 title: "[Title with short description] (Version: [Clio version])"
 labels: enhancement
-assignees: ""
+assignees: ''
+
 ---
 
 <!-- Please search existing issues to avoid creating duplicates. -->
 <!-- Kindly refrain from posting any credentials or sensitive information in this issue -->
 
 ## Summary
-
 <!-- Provide a summary to the feature request -->
 
 ## Motivation
-
 <!-- Why do we need this feature? -->
 
 ## Solution
-
 <!-- What is the solution? -->
 
 ## Paths Not Taken
-
 <!-- What other alternatives have been considered? -->

.github/ISSUE_TEMPLATE/question.md

@@ -3,7 +3,8 @@ name: Question
 about: A question in form of an issue
 title: "[Title with short description] (Version: Clio version)"
 labels: question
-assignees: ""
+assignees: ''
+
 ---
 
 <!-- Please search existing issues to avoid creating duplicates. -->
@@ -11,9 +12,7 @@ assignees: ""
 <!-- Kindly refrain from posting any credentials or sensitive information in this issue -->
 
 ## Question
-
 <!-- Your question -->
 
 ## Paths Not Taken
-
 <!-- If applicable, what other alternatives have been considered? -->

.github/actions/build_clio/action.yml

@@ -1,15 +1,13 @@
 name: Build clio
 description: Build clio in build directory
-
 inputs:
-  targets:
+  target:
-    description: Space-separated build target names
+    description: Build target name
     default: all
-  subtract_threads:
+  substract_threads:
-    description: An option for the action get_number_of_threads. See get_number_of_threads
+    description: An option for the action get_number_of_threads. See get_number_of_threads 
     required: true
-    default: "0"
+    default: '0'
-
 runs:
   using: composite
   steps:
@@ -17,13 +15,10 @@ runs:
       uses: ./.github/actions/get_number_of_threads
       id: number_of_threads
       with:
-        subtract_threads: ${{ inputs.subtract_threads }}
+        substract_threads: ${{ inputs.substract_threads }}
 
-    - name: Build targets
+    - name: Build Clio
       shell: bash
       run: |
         cd build
-        cmake \
+        cmake --build . --parallel ${{ steps.number_of_threads.outputs.threads_number }} --target ${{ inputs.target }}
-          --build . \
-          --parallel "${{ steps.number_of_threads.outputs.threads_number }}" \
-          --target ${{ inputs.targets }}

.github/actions/build_docker_image/action.yml

@@ -1,9 +1,8 @@
 name: Build and push Docker image
 description: Build and push Docker image to DockerHub and GitHub Container Registry
-
 inputs:
-  images:
+  image_name:
-    description: Name of the images to use as a base name
+    description: Name of the image to build
     required: true
   push_image:
     description: Whether to push the image to the registry (true/false)
@@ -17,51 +16,51 @@ inputs:
   platforms:
     description: Platforms to build the image for (e.g. linux/amd64,linux/arm64)
     required: true
-  build_args:
+  description:
-    description: List of build-time variables
-    required: false
-
-  dockerhub_repo:
-    description: DockerHub repository name
-    required: false
-  dockerhub_description:
     description: Short description of the image
-    required: false
+    required: true
-
 runs:
   using: composite
   steps:
-    - name: Login to DockerHub
+      - name: Login to DockerHub
-      if: ${{ inputs.push_image == 'true' && inputs.dockerhub_repo != '' }}
+        if: ${{ inputs.push_image == 'true' }}
-      uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
+        uses: docker/login-action@v3
-      with:
+        with:
-        username: ${{ env.DOCKERHUB_USER }}
+          username: ${{ env.DOCKERHUB_USER }}
-        password: ${{ env.DOCKERHUB_PW }}
+          password: ${{ env.DOCKERHUB_PW }}
 
-    - name: Login to GitHub Container Registry
+      - name: Login to GitHub Container Registry
-      if: ${{ inputs.push_image == 'true' }}
+        if: ${{ inputs.push_image == 'true' }}
-      uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
+        uses: docker/login-action@v3
-      with:
+        with:
-        registry: ghcr.io
+          registry: ghcr.io
-        username: ${{ github.repository_owner }}
+          username: ${{ github.repository_owner }}
-        password: ${{ env.GITHUB_TOKEN }}
+          password: ${{ env.GITHUB_TOKEN }}
 
-    - uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
+      - uses: docker/setup-qemu-action@v3
-      with:
+      - uses: docker/setup-buildx-action@v3
-        cache-image: false
-    - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
-    - uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
+      - uses: docker/metadata-action@v5
-      id: meta
+        id: meta
-      with:
+        with:
-        images: ${{ inputs.images }}
+          images: ${{ inputs.image_name }}
-        tags: ${{ inputs.tags }}
+          tags: ${{ inputs.tags }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: ${{ inputs.directory }}
+          platforms: ${{ inputs.platforms }}
+          push: ${{ inputs.push_image == 'true' }}
+          tags: ${{ steps.meta.outputs.tags }}
+
+      - name: Update DockerHub description
+        if: ${{ inputs.push_image == 'true' }}
+        uses: peter-evans/dockerhub-description@v4
+        with:
+          username: ${{ env.DOCKERHUB_USER }}
+          password: ${{ env.DOCKERHUB_PW }}
+          repository: ${{ inputs.image_name }}
+          short-description: ${{ inputs.description }}
+          readme-filepath: ${{ inputs.directory }}/README.md
 
-    - name: Build and push
-      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 }}

.github/actions/code_coverage/action.yml

@@ -1,26 +1,21 @@
 name: Generate code coverage report
 description: Run tests, generate code coverage report and upload it to codecov.io
-
 runs:
   using: composite
-
   steps:
     - name: Run tests
       shell: bash
       run: |
         build/clio_tests
 
-    # Please keep exclude list in sync with .codecov.yml
     - name: Run gcovr
       shell: bash
       run: |
-        gcovr \
+        gcovr -e tests \
-          -e tests \
           -e src/data/cassandra \
           -e src/data/CassandraBackend.hpp \
           -e 'src/data/BackendFactory.*' \
-          --xml build/coverage_report.xml \
+          --xml build/coverage_report.xml -j8 --exclude-throw-branches
-          -j8 --exclude-throw-branches
 
     - name: Archive coverage report
       uses: actions/upload-artifact@v4

.github/actions/create_issue/action.yml

@@ -1,6 +1,5 @@
 name: Create an issue
 description: Create an issue
-
 inputs:
   title:
     description: Issue title
@@ -11,31 +10,24 @@ inputs:
   labels:
     description: Comma-separated list of labels
     required: true
-    default: "bug"
+    default: 'bug'
   assignees:
     description: Comma-separated list of assignees
     required: true
-    default: "godexsoft,kuznetsss,PeterChen13579,mathbunnyru"
+    default: 'godexsoft,kuznetsss,PeterChen13579'
-
 outputs:
   created_issue_id:
     description: Created issue id
     value: ${{ steps.create_issue.outputs.created_issue }}
-
 runs:
   using: composite
   steps:
-    - name: Create an issue
+      - name: Create an issue
-      id: create_issue
+        id: create_issue
-      shell: bash
+        shell: bash
-      run: |
+        run: |
-        echo -e '${{ inputs.body }}' > issue.md
+          echo -e '${{ inputs.body }}' > issue.md
-        gh issue create \
+          gh issue create --assignee '${{ inputs.assignees }}' --label '${{ inputs.labels }}' --title '${{ inputs.title }}' --body-file ./issue.md > create_issue.log
-          --assignee '${{ inputs.assignees }}' \
+          created_issue=$(cat create_issue.log | sed 's|.*/||')
-          --label '${{ inputs.labels }}' \
+          echo "created_issue=$created_issue" >> $GITHUB_OUTPUT
-          --title '${{ inputs.title }}' \
+          rm create_issue.log issue.md
-          --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

.github/actions/generate/action.yml

@@ -1,35 +1,33 @@
 name: Run conan and cmake
 description: Run conan and cmake
-
 inputs:
   conan_profile:
     description: Conan profile name
     required: true
-  force_conan_source_build:
+  conan_cache_hit:
-    description: Whether conan should build all dependencies from source
+    description: Whether conan cache has been downloaded
     required: true
-    default: "false"
+    default: 'false'
   build_type:
     description: Build type for third-party libraries and clio. Could be 'Release', 'Debug'
     required: true
-    default: "Release"
+    default: 'Release'
   build_integration_tests:
     description: Whether to build integration tests
     required: true
-    default: "true"
+    default: 'true'
   code_coverage:
     description: Whether conan's coverage option should be on or not
     required: true
-    default: "false"
+    default: 'false'
   static:
     description: Whether Clio is to be statically linked
     required: true
-    default: "false"
+    default: 'false'
-  time_trace:
+  sanitizer:
-    description: Whether to enable compiler trace reports
+    description: Sanitizer to use
     required: true
-    default: "false"
+    default: 'false' # false, tsan, asan or ubsan
-
 runs:
   using: composite
   steps:
@@ -40,40 +38,23 @@ runs:
     - name: Run conan
       shell: bash
       env:
-        CONAN_BUILD_OPTION: "${{ inputs.force_conan_source_build == 'true' && '*' || 'missing' }}"
+        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 \
+        conan install .. -of . -b $BUILD_OPTION -s build_type=${{ inputs.build_type }} -o clio:static="${STATIC_OPTION}" -o clio:tests=True -o clio:integration_tests="${INTEGRATION_TESTS_OPTION}" -o clio:lint=False -o clio:coverage="${CODE_COVERAGE}" --profile ${{ inputs.conan_profile }}
-          install .. \
+    
-          -of . \
-          -b "$CONAN_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: |-
+        SANITIZER_OPTION: |
-          ${{ endsWith(inputs.conan_profile, '.asan') && '-Dsan=address' ||
+          ${{ inputs.sanitizer == 'tsan' && '-Dsan=thread' ||
-              endsWith(inputs.conan_profile, '.tsan') && '-Dsan=thread' ||
+              inputs.sanitizer == 'ubsan' && '-Dsan=undefined' ||
-              endsWith(inputs.conan_profile, '.ubsan') && '-Dsan=undefined' ||
+              inputs.sanitizer == 'asan' && '-Dsan=address' ||
               '' }}
       run: |
         cd build
-        cmake \
+        cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" ${SANITIZER_OPTION} .. -G Ninja
-          -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake \
-          -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \
-          "${SANITIZER_OPTION}" \
-          .. \
-          -G Ninja

.github/actions/get_number_of_threads/action.yml

@@ -1,16 +1,14 @@
 name: Get number of threads
 description: Determines number of threads to use on macOS and Linux
-
 inputs:
-  subtract_threads:
+  substract_threads:
-    description: How many threads to subtract from the calculated number
+    description: How many threads to substract from the calculated number 
     required: true
-    default: "0"
+    default: '0'
 outputs:
   threads_number:
     description: Number of threads to use
     value: ${{ steps.number_of_threads_export.outputs.num }}
-
 runs:
   using: composite
   steps:
@@ -30,7 +28,7 @@ runs:
       id: number_of_threads_export
       shell: bash
       run: |
-        num_of_threads="${{ steps.mac_threads.outputs.num || steps.linux_threads.outputs.num }}"
+        num_of_threads=${{ steps.mac_threads.outputs.num || steps.linux_threads.outputs.num }}
-        shift_by="${{ inputs.subtract_threads }}"
+        shift_by=${{ inputs.substract_threads }}
-        shifted="$((num_of_threads - shift_by))"
+        shifted=$((num_of_threads - shift_by))
         echo "num=$(( shifted > 1 ? shifted : 1 ))" >> $GITHUB_OUTPUT

.github/actions/git_common_ancestor/action.yml

@@ -1,11 +1,9 @@
 name: Git common ancestor
 description: Find the closest common commit
-
 outputs:
   commit:
     description: Hash of commit
     value: ${{ steps.find_common_ancestor.outputs.commit }}
-
 runs:
   using: composite
   steps:
@@ -13,4 +11,4 @@ runs:
       id: find_common_ancestor
       shell: bash
       run: |
-        echo "commit=\"$(git merge-base --fork-point origin/develop)\"" >> $GITHUB_OUTPUT
+        echo "commit=$(git merge-base --fork-point origin/develop)" >> $GITHUB_OUTPUT

.github/actions/prepare_runner/action.yml

@@ -1,11 +1,9 @@
 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:
@@ -13,56 +11,53 @@ runs:
       if: ${{ runner.os == 'macOS' }}
       shell: bash
       run: |
-        brew install --quiet \
+          brew install llvm@14 pkg-config ninja bison ccache jq gh conan@1 ca-certificates
-          bison \
+          echo "/opt/homebrew/opt/conan@1/bin" >> $GITHUB_PATH
-          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
+          # Uninstall any existing cmake
-        brew uninstall --formula cmake --ignore-dependencies || true
+          brew uninstall cmake --ignore-dependencies || true
-
+          
-        # Download specific cmake formula
+          # Download specific cmake formula
-        FORMULA_URL="https://raw.githubusercontent.com/Homebrew/homebrew-core/b4e46db74e74a8c1650b38b1da222284ce1ec5ce/Formula/c/cmake.rb"
+          FORMULA_URL="https://raw.githubusercontent.com/Homebrew/homebrew-core/b4e46db74e74a8c1650b38b1da222284ce1ec5ce/Formula/c/cmake.rb"
-        FORMULA_EXPECTED_SHA256="c7ec95d86f0657638835441871e77541165e0a2581b53b3dd657cf13ad4228d4"
+          FORMULA_EXPECTED_SHA256="c7ec95d86f0657638835441871e77541165e0a2581b53b3dd657cf13ad4228d4"
-
+          
-        mkdir -p /tmp/homebrew-formula
+          mkdir -p /tmp/homebrew-formula
-        curl -s -L "$FORMULA_URL" -o /tmp/homebrew-formula/cmake.rb
+          curl -s -L $FORMULA_URL -o /tmp/homebrew-formula/cmake.rb
-
+          
-        echo "$FORMULA_EXPECTED_SHA256  /tmp/homebrew-formula/cmake.rb" | shasum -a 256 -c
+          # Verify the downloaded formula
-
+          ACTUAL_SHA256=$(shasum -a 256 /tmp/homebrew-formula/cmake.rb | cut -d ' ' -f 1)
-        # Install cmake from the specific formula with force flag
+          if [ "$ACTUAL_SHA256" != "$FORMULA_EXPECTED_SHA256" ]; then
-        brew install --formula --quiet --force /tmp/homebrew-formula/cmake.rb
+            echo "Error: Formula checksum mismatch"
+            echo "Expected: $FORMULA_EXPECTED_SHA256"
+            echo "Actual: $ACTUAL_SHA256"
+            exit 1
+          fi
+          
+          # Install cmake from the specific formula with force flag
+          brew install --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"
+      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
+        echo "CONAN_USER_HOME=${{ github.workspace }}" >> $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
+        echo "CONAN_USER_HOME=/root/" >> $GITHUB_ENV
 
     - name: Set CCACHE_DISABLE=1
       if: ${{ inputs.disable_ccache == 'true' }}
@@ -73,5 +68,7 @@ runs:
     - name: Create directories
       shell: bash
       run: |
-        mkdir -p "$CCACHE_DIR"
+        mkdir -p $CCACHE_DIR
-        mkdir -p "$CONAN_HOME"
+        mkdir -p $CONAN_USER_HOME/.conan
+
+

.github/actions/restore_cache/action.yml

@@ -1,7 +1,9 @@
 name: Restore cache
-description: Find and restores ccache 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
@@ -15,13 +17,17 @@ inputs:
   code_coverage:
     description: Whether code coverage is on
     required: true
-    default: "false"
+    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:
@@ -29,6 +35,24 @@ runs:
       id: git_common_ancestor
       uses: ./.github/actions/git_common_ancestor
 
+    - name: Calculate conan hash
+      id: conan_hash
+      shell: bash
+      run: |
+        conan info . -j info.json -o clio:tests=True
+        packages_info=$(cat info.json | jq '.[] | "\(.display_name): \(.id)"' | 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 }}/data
+        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

.github/actions/save_cache/action.yml

@@ -1,13 +1,26 @@
 name: Save cache
-description: Save ccache cache for develop branch
+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
@@ -15,14 +28,7 @@ inputs:
   code_coverage:
     description: Whether code coverage is on
     required: true
-    default: "false"
+    default: 'false'
-
-  ccache_cache_hit:
-    description: Whether ccache cache has been downloaded
-    required: true
-  ccache_cache_miss_rate:
-    description: How many ccache cache misses happened
-
 runs:
   using: composite
   steps:
@@ -30,9 +36,24 @@ runs:
       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 remove "*" -s -b -f
+
+    - name: Save conan cache
+      if: ${{ inputs.conan_cache_hit != 'true' }}
+      uses: actions/cache/save@v4
+      with:
+        path: ${{ inputs.conan_dir }}/data
+        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 }}
+
+

.github/actions/setup_conan/action.yml

@@ -0,0 +1,52 @@
+name: Setup conan
+description: Setup conan profile and artifactory
+inputs:
+  conan_profile:
+    description: Conan profile name
+    required: true
+outputs:
+  conan_profile:
+    description: Created conan profile name
+    value: ${{ steps.conan_export_output.outputs.conan_profile }}
+runs:
+  using: composite
+  steps:
+    - name: On mac
+      if: ${{ runner.os == 'macOS' }}
+      shell: bash
+      env:
+        CONAN_PROFILE: apple_clang_16
+      id: conan_setup_mac
+      run: |
+        echo "Creating $CONAN_PROFILE conan profile"
+        conan profile new $CONAN_PROFILE --detect --force
+        conan profile update settings.compiler.libcxx=libc++ $CONAN_PROFILE
+        conan profile update settings.compiler.cppstd=20 $CONAN_PROFILE
+        conan profile update env.CXXFLAGS=-DBOOST_ASIO_DISABLE_CONCEPTS $CONAN_PROFILE
+        conan profile update "conf.tools.build:cxxflags+=[\"-DBOOST_ASIO_DISABLE_CONCEPTS\"]" $CONAN_PROFILE
+        echo "created_conan_profile=$CONAN_PROFILE" >> $GITHUB_OUTPUT
+
+    - name: On linux
+      if: ${{ runner.os == 'Linux' }}
+      shell: bash
+      id: conan_setup_linux
+      run: |
+        echo "created_conan_profile=${{ inputs.conan_profile }}" >> $GITHUB_OUTPUT
+
+    - name: Export output variable
+      shell: bash
+      id: conan_export_output
+      run: |
+        echo "conan_profile=${{ steps.conan_setup_mac.outputs.created_conan_profile || steps.conan_setup_linux.outputs.created_conan_profile }}" >> $GITHUB_OUTPUT
+
+    - name: Add conan-non-prod artifactory
+      shell: bash
+      run: |
+        if [[ -z $(conan remote list | grep conan-non-prod) ]]; then
+            echo "Adding conan-non-prod"
+            conan remote add --insert 0 conan-non-prod http://18.143.149.228:8081/artifactory/api/conan/conan-non-prod
+        else
+            echo "Conan-non-prod is available"
+        fi
+
+

.github/actions/test/Dockerfile

@@ -0,0 +1,6 @@
+FROM cassandra:4.0.4
+
+RUN apt-get update && apt-get install -y postgresql
+COPY entrypoint.sh /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]

.github/actions/test/entrypoint.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+pg_ctlcluster 12 main start
+su postgres -c"psql -c\"alter user postgres with password 'postgres'\""
+su cassandra -c "/opt/cassandra/bin/cassandra -R"
+sleep 90
+chmod +x ./clio_tests
+./clio_tests

.github/dependabot.yml

@@ -1,144 +1,16 @@
 version: 2
 updates:
-  - package-ecosystem: github-actions
+  - package-ecosystem: "github-actions"
-    directory: /
+    directory: "/"
     schedule:
-      interval: weekly
+      interval: "weekly"
-      day: monday
+      day: "monday"
       time: "04:00"
-      timezone: Etc/GMT
+      timezone: "Etc/GMT"
     reviewers:
-      - XRPLF/clio-dev-team
+      - "godexsoft"
+      - "kuznetsss"
+      - "PeterChen13579"
     commit-message:
-      prefix: "ci: [DEPENDABOT] "
+      prefix: "[CI] "
-    target-branch: develop
+    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

.github/scripts/conan/apple-clang-ci.profile

@@ -1,8 +0,0 @@
-[settings]
-arch={{detect_api.detect_arch()}}
-build_type=Release
-compiler=apple-clang
-compiler.cppstd=20
-compiler.libcxx=libc++
-compiler.version=16
-os=Macos

.github/scripts/conan/apple-clang-local.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
-os=Macos
-
-[conf]
-grpc/1.50.1:tools.build:cxxflags+=["-Wno-missing-template-arg-list-after-template-kw"]

.github/scripts/conan/generate_matrix.py

@@ -1,39 +0,0 @@
-#!/usr/bin/env python3
-import itertools
-import json
-
-LINUX_OS = ["heavy", "heavy-arm64"]
-LINUX_CONTAINERS = ['{ "image": "ghcr.io/xrplf/clio-ci:latest" }']
-LINUX_COMPILERS = ["gcc", "clang"]
-
-MACOS_OS = ["macos15"]
-MACOS_CONTAINERS = [""]
-MACOS_COMPILERS = ["apple-clang"]
-
-BUILD_TYPES = ["Release", "Debug"]
-SANITIZER_EXT = [".asan", ".tsan", ".ubsan", ""]
-
-
-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 sanitizer_ext, build_type in itertools.product(SANITIZER_EXT, BUILD_TYPES):
-            configurations.append(
-                {
-                    "os": os,
-                    "container": container,
-                    "compiler": compiler,
-                    "sanitizer_ext": sanitizer_ext,
-                    "build_type": build_type,
-                }
-            )
-
-    return {"include": configurations}
-
-
-if __name__ == "__main__":
-    print(f"matrix={json.dumps(generate_matrix())}")

.github/scripts/conan/init.sh

@@ -1,47 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-CURRENT_DIR="$(cd "$(dirname "$0")" && pwd)"
-REPO_DIR="$(cd "$CURRENT_DIR/../../../" && pwd)"
-
-CONAN_DIR="${CONAN_HOME:-$HOME/.conan2}"
-PROFILES_DIR="$CONAN_DIR/profiles"
-
-if [[ -z "$CI" ]]; then
-    APPLE_CLANG_PROFILE="$CURRENT_DIR/apple-clang-local.profile"
-else
-    APPLE_CLANG_PROFILE="$CURRENT_DIR/apple-clang-ci.profile"
-fi
-
-GCC_PROFILE="$REPO_DIR/docker/ci/conan/gcc.profile"
-CLANG_PROFILE="$REPO_DIR/docker/ci/conan/clang.profile"
-
-SANITIZER_TEMPLATE_FILE="$REPO_DIR/docker/ci/conan/sanitizer_template.profile"
-
-rm -rf "$CONAN_DIR"
-
-conan remote add --index 0 ripple http://18.143.149.228:8081/artifactory/api/conan/dev
-
-cp "$REPO_DIR/docker/ci/conan/global.conf" "$CONAN_DIR/global.conf"
-
-create_profile_with_sanitizers() {
-    profile_name="$1"
-    profile_source="$2"
-
-    cp "$profile_source" "$PROFILES_DIR/$profile_name"
-    cp "$SANITIZER_TEMPLATE_FILE" "$PROFILES_DIR/$profile_name.asan"
-    cp "$SANITIZER_TEMPLATE_FILE" "$PROFILES_DIR/$profile_name.tsan"
-    cp "$SANITIZER_TEMPLATE_FILE" "$PROFILES_DIR/$profile_name.ubsan"
-}
-
-mkdir -p "$PROFILES_DIR"
-
-if [[ "$(uname)" == "Darwin" ]]; then
-    create_profile_with_sanitizers "apple-clang" "$APPLE_CLANG_PROFILE"
-    echo "include(apple-clang)" > "$PROFILES_DIR/default"
-else
-    create_profile_with_sanitizers "clang" "$CLANG_PROFILE"
-    create_profile_with_sanitizers "gcc" "$GCC_PROFILE"
-    echo "include(gcc)" > "$PROFILES_DIR/default"
-fi

.github/scripts/prepare-release-artifacts.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-set -ex -o pipefail
-
-BINARY_NAME="clio_server"
-
-ARTIFACTS_DIR="$1"
-if [ -z "${ARTIFACTS_DIR}" ]; then
-    echo "Usage: $0 <artifacts_directory>"
-    exit 1
-fi
-
-cd "${ARTIFACTS_DIR}" || exit 1
-
-for artifact_name in $(ls); do
-    pushd "${artifact_name}" || exit 1
-    zip -r "../${artifact_name}.zip" ./${BINARY_NAME}
-    popd || exit 1
-
-    rm "${artifact_name}/${BINARY_NAME}"
-    rm -r "${artifact_name}"
-
-    sha256sum "./${artifact_name}.zip" > "./${artifact_name}.zip.sha256sum"
-done

.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

.github/workflows/build.yml

@@ -1,107 +1,170 @@
 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/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/create_issue/**"
-
-      - CMakeLists.txt
-      - conanfile.py
-      - conan.lock
-      - "cmake/**"
-      - "src/**"
-      - "tests/**"
-
-      - docs/config-description.md
   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:
-  build-and-test:
+  check_format:
-    name: Build and Test
+    name: Check format
+    runs-on: ubuntu-latest
+    container:
+      image: rippleci/clio_ci:latest
+    steps:
+      - name: Fix git permissions on Linux
+        shell: bash
+        run: git config --global --add safe.directory $PWD
 
+      - uses: actions/checkout@v4
+      - name: Run formatters
+        id: run_formatters
+        run: |
+          ./.githooks/check-format --diff
+        shell: bash
+ 
+  check_docs:
+    name: Check documentation
+    runs-on: ubuntu-latest
+    container:
+      image: rippleci/clio_ci:latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run linter
+        id: run_linter
+        run: |
+          ./.githooks/check-docs
+        shell: bash
+
+  build:
+    name: Build
+    needs:
+      - check_format
+      - check_docs
     strategy:
       fail-fast: false
       matrix:
-        os: [heavy]
-        conan_profile: [gcc, clang]
-        build_type: [Release, Debug]
-        container: ['{ "image": "ghcr.io/xrplf/clio-ci:latest" }']
-        static: [true]
-
         include:
-          - os: macos15
+          - os: heavy
-            conan_profile: apple-clang
+            conan_profile: gcc
             build_type: Release
-            container: ""
+            container: '{ "image": "rippleci/clio_ci:latest" }'
+            code_coverage: false
+            static: true
+          - os: heavy
+            conan_profile: gcc
+            build_type: Debug
+            container: '{ "image": "rippleci/clio_ci:latest" }'
+            code_coverage: true
+            static: true
+          - os: heavy
+            conan_profile: clang
+            build_type: Release
+            container: '{ "image": "rippleci/clio_ci:latest" }'
+            code_coverage: false
+            static: true
+          - os: heavy
+            conan_profile: clang
+            build_type: Debug
+            container: '{ "image": "rippleci/clio_ci:latest" }'
+            code_coverage: false
+            static: true
+          - os: macos15
+            build_type: Release
+            code_coverage: false
             static: false
-
+    uses: ./.github/workflows/build_impl.yml
-    uses: ./.github/workflows/build_and_test.yml
     with:
       runs_on: ${{ matrix.os }}
       container: ${{ matrix.container }}
       conan_profile: ${{ matrix.conan_profile }}
       build_type: ${{ matrix.build_type }}
+      code_coverage: ${{ matrix.code_coverage }}
       static: ${{ matrix.static }}
-      run_unit_tests: true
+      unit_tests: true
-      run_integration_tests: false
+      integration_tests: true
-      upload_clio_server: true
+      clio_server: true
 
-  code_coverage:
+  test:
-    name: Run Code Coverage
+    name: Run Tests
-
+    needs: build
-    uses: ./.github/workflows/build_impl.yml
+    strategy:
-    with:
+      fail-fast: false
-      runs_on: heavy
+      matrix:
-      container: '{ "image": "ghcr.io/xrplf/clio-ci:latest" }'
+        include:
-      conan_profile: gcc
+          - os: heavy
-      build_type: Debug
+            conan_profile: gcc
-      disable_cache: false
+            build_type: Release
-      code_coverage: true
+            container:
-      static: true
+              image: rippleci/clio_ci:latest
-      upload_clio_server: false
+          - os: heavy
-      targets: all
+            conan_profile: clang
-      analyze_build_time: false
+            build_type: Release
-    secrets:
+            container:
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+              image: rippleci/clio_ci:latest
-
+          - os: heavy
-  check_config:
+            conan_profile: clang
-    name: Check Config Description
+            build_type: Debug
-    needs: build-and-test
+            container:
-    runs-on: heavy
+              image: rippleci/clio_ci:latest
-    container:
+          - os: macos15
-      image: ghcr.io/xrplf/clio-ci:latest
+            conan_profile: apple_clang_16
+            build_type: Release
+    runs-on: ${{ matrix.os }}
+    container: ${{ matrix.container }}
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Clean workdir
+        if: ${{ runner.os == 'macOS' }}
+        uses: kuznetsss/workspace-cleanup@1.0
 
       - uses: actions/download-artifact@v4
         with:
-          name: clio_server_Linux_Release_gcc
+          name: clio_tests_${{ runner.os }}_${{ matrix.build_type }}_${{ matrix.conan_profile }}
 
+      - name: Run clio_tests
+        run: |
+          chmod +x ./clio_tests
+          ./clio_tests
+
+  check_config:
+    name: Check Config Description
+    needs: build
+    runs-on: heavy
+    container: 
+      image: rippleci/clio_ci:latest
+    steps:
+      - uses: actions/checkout@v4 
+      - 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
-          ./clio_server -d "${configDescriptionFile}"
+          configDescriptionFile=config_description_new.md
+          ./clio_server -d ${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
+                    
+
+
+
 
-          diff -u "${repoConfigFile}" "${configDescriptionFile}"

.github/workflows/build_and_test.yml

@@ -1,84 +0,0 @@
-name: Reusable build and 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
-
-      disable_cache:
-        description: Whether ccache 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
-        type: boolean
-
-      run_integration_tests:
-        description: Whether to run integration tests
-        required: true
-        type: boolean
-        default: false
-
-      upload_clio_server:
-        description: Whether to upload clio_server
-        required: true
-        type: boolean
-
-      targets:
-        description: Space-separated build target names
-        required: false
-        type: string
-        default: all
-
-jobs:
-  build:
-    uses: ./.github/workflows/build_impl.yml
-    with:
-      runs_on: ${{ inputs.runs_on }}
-      container: ${{ inputs.container }}
-      conan_profile: ${{ inputs.conan_profile }}
-      build_type: ${{ inputs.build_type }}
-      disable_cache: ${{ inputs.disable_cache }}
-      code_coverage: false
-      static: ${{ inputs.static }}
-      upload_clio_server: ${{ inputs.upload_clio_server }}
-      targets: ${{ inputs.targets }}
-      analyze_build_time: false
-
-  test:
-    needs: build
-    uses: ./.github/workflows/test_impl.yml
-    with:
-      runs_on: ${{ inputs.runs_on }}
-      container: ${{ inputs.container }}
-      conan_profile: ${{ inputs.conan_profile }}
-      build_type: ${{ inputs.build_type }}
-      run_unit_tests: ${{ inputs.run_unit_tests }}
-      run_integration_tests: ${{ inputs.run_integration_tests }}

.github/workflows/build_clio_docker_image.yml

@@ -1,5 +1,4 @@
 name: Build and publish Clio docker image
-
 on:
   workflow_call:
     inputs:
@@ -42,7 +41,6 @@ jobs:
   build_and_publish_image:
     name: Build and publish image
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v4
 
@@ -57,7 +55,7 @@ jobs:
         if: ${{ inputs.clio_server_binary_url != null }}
         shell: bash
         run: |
-          wget "${{inputs.clio_server_binary_url}}" -P ./docker/clio/artifact/
+          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
@@ -85,16 +83,13 @@ jobs:
       - name: 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 }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          images: |
+          image_name: rippleci/clio
-            ghcr.io/xrplf/clio
-            rippleci/clio
           push_image: ${{ inputs.publish_image }}
           directory: docker/clio
           tags: ${{ inputs.tags }}
           platforms: linux/amd64
-          dockerhub_repo: rippleci/clio
+          description: Clio is an XRP Ledger API server.
-          dockerhub_description: Clio is an XRP Ledger API server.

.github/workflows/build_impl.yml

@@ -1,5 +1,4 @@
 name: Reusable build
-
 on:
   workflow_call:
     inputs:
@@ -7,11 +6,13 @@ on:
         description: Runner to run the job on
         required: true
         type: string
+        default: heavy
 
       container:
         description: "The container object as a JSON string (leave empty to run natively)"
         required: true
         type: string
+        default: ""
 
       conan_profile:
         description: Conan profile to use
@@ -24,49 +25,63 @@ on:
         type: string
 
       disable_cache:
-        description: Whether ccache should be disabled
+        description: Whether ccache and conan cache should be disabled
         required: false
         type: boolean
+        default: false
 
       code_coverage:
         description: Whether to enable code coverage
         required: true
         type: boolean
+        default: false
 
       static:
         description: Whether to build static binaries
         required: true
         type: boolean
+        default: true
 
-      upload_clio_server:
+      unit_tests:
-        description: Whether to upload clio_server
+        description: Whether to run unit tests
         required: true
         type: boolean
+        default: false
 
-      targets:
+      integration_tests:
-        description: Space-separated build target names
+        description: Whether to run integration tests
-        required: true
-        type: string
-
-      analyze_build_time:
-        description: Whether to enable build time analysis
         required: true
         type: boolean
+        default: false
 
-    secrets:
+      clio_server:
-      CODECOV_TOKEN:
+        description: Whether to build clio_server
+        required: true
+        type: boolean
+        default: true
+
+      target:
+        description: Build target name
         required: false
+        type: string
+        default: all
+
+      sanitizer:
+        description: Sanitizer to use
+        required: false
+        type: string
+        default: 'false'
 
 jobs:
   build:
-    name: Build
+    name: Build ${{ inputs.container != '' && 'in container' || 'natively' }}
-    runs-on: ${{ inputs.runs_on }}
+    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: kuznetsss/workspace-cleanup@1.0
 
       - uses: actions/checkout@v4
         with:
@@ -77,17 +92,19 @@ jobs:
         with:
           disable_ccache: ${{ inputs.disable_cache }}
 
-      - name: Setup conan on macOS
+      - name: Setup conan
-        if: runner.os == 'macOS'
+        uses: ./.github/actions/setup_conan
-        shell: bash
+        id: conan
-        run: ./.github/scripts/conan/init.sh
+        with:
+          conan_profile: ${{ inputs.conan_profile }}
 
       - name: Restore cache
         if: ${{ !inputs.disable_cache }}
         uses: ./.github/actions/restore_cache
         id: restore_cache
         with:
-          conan_profile: ${{ inputs.conan_profile }}
+          conan_dir: ${{ env.CONAN_USER_HOME }}/.conan
+          conan_profile: ${{ steps.conan.outputs.conan_profile }}
           ccache_dir: ${{ env.CCACHE_DIR }}
           build_type: ${{ inputs.build_type }}
           code_coverage: ${{ inputs.code_coverage }}
@@ -95,31 +112,17 @@ jobs:
       - name: Run conan and cmake
         uses: ./.github/actions/generate
         with:
-          conan_profile: ${{ inputs.conan_profile }}
+          conan_profile: ${{ steps.conan.outputs.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 }}
-          time_trace: ${{ inputs.analyze_build_time }}
+          sanitizer: ${{ inputs.sanitizer }}
 
       - name: Build Clio
         uses: ./.github/actions/build_clio
         with:
-          targets: ${{ inputs.targets }}
+          target: ${{ inputs.target }}
-
-      - 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 }}
@@ -132,63 +135,56 @@ jobs:
           cat /tmp/ccache.stats
 
       - name: Strip unit_tests
-        if: ${{ !endsWith(inputs.conan_profile, 'san') && !inputs.code_coverage && !inputs.analyze_build_time }}
+        if: ${{ inputs.unit_tests && !inputs.code_coverage && inputs.sanitizer == 'false' }}
         run: strip build/clio_tests
-
+      
       - name: Strip integration_tests
-        if: ${{ !endsWith(inputs.conan_profile, 'san') && !inputs.code_coverage && !inputs.analyze_build_time }}
+        if: ${{ inputs.integration_tests && !inputs.code_coverage }}
         run: strip build/clio_integration_tests
 
       - name: Upload clio_server
-        if: inputs.upload_clio_server && !inputs.code_coverage && !inputs.analyze_build_time
+        if: ${{ inputs.clio_server }}
         uses: actions/upload-artifact@v4
         with:
-          name: clio_server_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
+          name: clio_server_${{ runner.os }}_${{ inputs.build_type }}_${{ steps.conan.outputs.conan_profile }}
           path: build/clio_server
-
+     
       - name: Upload clio_tests
-        if: ${{ !inputs.code_coverage && !inputs.analyze_build_time }}
+        if: ${{ inputs.unit_tests && !inputs.code_coverage }}
         uses: actions/upload-artifact@v4
         with:
-          name: clio_tests_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
+          name: clio_tests_${{ runner.os }}_${{ inputs.build_type }}_${{ steps.conan.outputs.conan_profile }}
           path: build/clio_tests
-
+      
       - name: Upload clio_integration_tests
-        if: ${{ !inputs.code_coverage && !inputs.analyze_build_time }}
+        if: ${{ inputs.integration_tests && !inputs.code_coverage }}
         uses: actions/upload-artifact@v4
         with:
-          name: clio_integration_tests_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
+          name: clio_integration_tests_${{ runner.os }}_${{ inputs.build_type }}_${{ steps.conan.outputs.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_profile: ${{ inputs.conan_profile }}
+          conan_dir: ${{ env.CONAN_USER_HOME }}/.conan
+          conan_hash: ${{ steps.restore_cache.outputs.conan_hash }}
+          conan_cache_hit: ${{ steps.restore_cache.outputs.conan_cache_hit }}
           ccache_dir: ${{ env.CCACHE_DIR }}
-          build_type: ${{ inputs.build_type }}
-          code_coverage: ${{ inputs.code_coverage }}
-
           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: ${{ steps.conan.outputs.conan_profile }}
 
-      # This is run as part of the build job, because it requires the following:
+      # TODO: This is not a part of build process but it is the easiest way to do it here.
-      # - source code
+      # It will be refactored in https://github.com/XRPLF/clio/issues/1075
-      # - 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 }}
+    if: ${{ inputs.code_coverage }} 
     name: Codecov
     needs: build
     uses: ./.github/workflows/upload_coverage_report.yml

.github/workflows/check_libxrpl.yml

@@ -1,49 +1,42 @@
 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: heavy
+    runs-on: [self-hosted, heavy]
     container:
-      image: ghcr.io/xrplf/clio-ci:latest
+      image: rippleci/clio_ci:latest
 
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 0
+            fetch-depth: 0
 
       - name: Update libXRPL version requirement
         shell: bash
         run: |
-          sed -i.bak -E "s|'xrpl/[a-zA-Z0-9\\.\\-]+'|'xrpl/${{ github.event.client_payload.version }}'|g" conanfile.py
+          ./.github/scripts/update-libxrpl-version ${{ github.event.client_payload.version }}
-          rm -f conanfile.py.bak
-
-      - name: Update conan lockfile
-        shell: bash
-        run: |
-          conan lock create . -o '&:tests=True' -o '&:benchmark=True'
 
       - name: Prepare runner
         uses: ./.github/actions/prepare_runner
         with:
-          disable_ccache: true
+            disable_ccache: true
+
+      - name: Setup conan
+        uses: ./.github/actions/setup_conan
+        id: conan
+        with:
+          conan_profile: gcc
 
       - name: Run conan and cmake
         uses: ./.github/actions/generate
         with:
-          conan_profile: ${{ env.CONAN_PROFILE }}
+          conan_profile: ${{ steps.conan.outputs.conan_profile }}
+          conan_cache_hit: ${{ steps.restore_cache.outputs.conan_cache_hit }}
+          build_type: Release
 
       - name: Build Clio
         uses: ./.github/actions/build_clio
@@ -60,9 +53,9 @@ jobs:
   run_tests:
     name: Run tests
     needs: build
-    runs-on: heavy
+    runs-on: [self-hosted, heavy]
     container:
-      image: ghcr.io/xrplf/clio-ci:latest
+      image: rippleci/clio_ci:latest
 
     steps:
       - uses: actions/download-artifact@v4
@@ -79,11 +72,9 @@ jobs:
     needs: [build, run_tests]
     if: ${{ always() && contains(needs.*.result, 'failure') }}
     runs-on: ubuntu-latest
-
     permissions:
       contents: write
       issues: write
-
     steps:
       - uses: actions/checkout@v4
 
@@ -92,8 +83,8 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         with:
-          labels: "compatibility,bug"
+          labels: 'compatibility,bug'
-          title: "Proposed libXRPL check failed"
+          title: 'Proposed libXRPL check failed'
           body: >
             Clio build or tests failed against `libXRPL ${{ github.event.client_payload.version }}`.
 

.github/workflows/check_pr_title.yml

@@ -1,5 +1,4 @@
 name: Check PR title
-
 on:
   pull_request:
     types: [opened, edited, reopened, synchronize]
@@ -8,10 +7,12 @@ on:
 jobs:
   check_title:
     runs-on: ubuntu-latest
-
+    # permissions:
+    #   pull-requests: write
     steps:
-      - uses: ytanikin/pr-conventional-commits@8267db1bacc237419f9ed0228bb9d94e94271a1d # v1.4.1
+      - uses: ytanikin/PRConventionalCommits@1.3.0
         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"}'
+          # Turned off labelling because it leads to an error, see https://github.com/ytanikin/PRConventionalCommits/issues/19
+          # custom_labels: '{"build":"build", "feat":"enhancement", "fix":"bug", "docs":"documentation", "test":"testability", "ci":"ci", "style":"refactoring", "refactor":"refactoring", "perf":"performance", "chore":"tooling"}'

.github/workflows/clang-tidy.yml

@@ -1,5 +1,4 @@
 name: Clang-tidy check
-
 on:
   schedule:
     - cron: "0 9 * * 1-5"
@@ -7,25 +6,15 @@ on:
   pull_request:
     branches: [develop]
     paths:
-      - .github/workflows/clang-tidy.yml
-
       - .clang_tidy
-
+      - .github/workflows/clang-tidy.yml
-concurrency:
+  workflow_call:
-  # 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: clang
-  LLVM_TOOLS_VERSION: 20
 
 jobs:
   clang_tidy:
     runs-on: heavy
     container:
-      image: ghcr.io/xrplf/clio-ci:latest
+      image: rippleci/clio_ci:latest
-
     permissions:
       contents: write
       issues: write
@@ -41,17 +30,26 @@ jobs:
         with:
           disable_ccache: true
 
+      - name: Setup conan
+        uses: ./.github/actions/setup_conan
+        id: conan
+        with:
+          conan_profile: clang
+
       - name: Restore cache
         uses: ./.github/actions/restore_cache
         id: restore_cache
         with:
-          conan_profile: ${{ env.CONAN_PROFILE }}
+          conan_dir: ${{ env.CONAN_USER_HOME }}/.conan
           ccache_dir: ${{ env.CCACHE_DIR }}
+          conan_profile: ${{ steps.conan.outputs.conan_profile }}
 
       - name: Run conan and cmake
         uses: ./.github/actions/generate
         with:
-          conan_profile: ${{ env.CONAN_PROFILE }}
+          conan_profile: ${{ steps.conan.outputs.conan_profile }}
+          conan_cache_hit: ${{ steps.restore_cache.outputs.conan_cache_hit }}
+          build_type: Release
 
       - name: Get number of threads
         uses: ./.github/actions/get_number_of_threads
@@ -62,14 +60,13 @@ jobs:
         shell: bash
         id: run_clang_tidy
         run: |
-          run-clang-tidy-${{ env.LLVM_TOOLS_VERSION }} -p build -j "${{ steps.number_of_threads.outputs.threads_number }}" -fix -quiet 1>output.txt
+          run-clang-tidy-19 -p build -j ${{ steps.number_of_threads.outputs.threads_number }} -fix -quiet 1>output.txt
 
-      - name: Fix local includes and clang-format style
+      - name: Check format
         if: ${{ steps.run_clang_tidy.outcome != 'success' }}
+        continue-on-error: true
         shell: bash
-        run: |
+        run: ./.githooks/check-format
-          pre-commit run --all-files fix-local-includes || true
-          pre-commit run --all-files clang-format || true
 
       - name: Print issues found
         if: ${{ steps.run_clang_tidy.outcome != 'success' }}
@@ -80,20 +77,20 @@ jobs:
           rm output.txt
 
       - name: Create an issue
-        if: ${{ steps.run_clang_tidy.outcome != 'success' && github.event_name != 'pull_request' }}
+        if: ${{ steps.run_clang_tidy.outcome != 'success' }}
         id: create_issue
         uses: ./.github/actions/create_issue
         env:
           GH_TOKEN: ${{ github.token }}
         with:
-          title: "Clang-tidy found bugs in code 🐛"
+          title: 'Clang-tidy found bugs in code 🐛'
           body: >
             Clang-tidy found issues in the code:
 
             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
+      - uses: crazy-max/ghaction-import-gpg@v6
-        if: ${{ steps.run_clang_tidy.outcome != 'success' && github.event_name != 'pull_request' }}
+        if: ${{ steps.run_clang_tidy.outcome != 'success' }}
         with:
           gpg_private_key: ${{ secrets.ACTIONS_GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.ACTIONS_GPG_PASSPHRASE }}
@@ -101,8 +98,8 @@ jobs:
           git_commit_gpgsign: true
 
       - name: Create PR with fixes
-        if: ${{ steps.run_clang_tidy.outcome != 'success' && github.event_name != 'pull_request' }}
+        if: ${{ steps.run_clang_tidy.outcome != 'success' }}
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
+        uses: peter-evans/create-pull-request@v7
         env:
           GH_REPO: ${{ github.repository }}
           GH_TOKEN: ${{ github.token }}
@@ -114,7 +111,7 @@ jobs:
           delete-branch: true
           title: "style: clang-tidy auto fixes"
           body: "Fixes #${{ steps.create_issue.outputs.created_issue_id }}. Please review and commit clang-tidy fixes."
-          reviewers: "godexsoft,kuznetsss,PeterChen13579,mathbunnyru"
+          reviewers: "godexsoft,kuznetsss,PeterChen13579"
 
       - name: Fail the job
         if: ${{ steps.run_clang_tidy.outcome != 'success' }}

.github/workflows/clang-tidy_on_fix_merged.yml

@@ -1,5 +1,4 @@
 name: Restart clang-tidy workflow
-
 on:
   push:
     branches: [develop]
@@ -18,8 +17,8 @@ jobs:
         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)
+          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
+          echo "passed=$passed" >> $GITHUB_OUTPUT
 
       - name: Run clang-tidy workflow
         if: ${{ contains(steps.check.outputs.passed, 'true') }}

.github/workflows/docs.yml

@@ -1,43 +1,38 @@
 name: Documentation
-
 on:
   push:
     branches: [develop]
   workflow_dispatch:
 
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
 concurrency:
-  # Only cancel in-progress jobs or runs for the current workflow - matches against branch & tags
+  group: "pages"
-  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
-  build:
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
+    continue-on-error: true
     container:
-      image: ghcr.io/xrplf/clio-ci:latest
+      image: rippleci/clio_ci:latest
-
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
+        with: 
           lfs: true
 
-      - name: Prepare runner
+      - name: Build docs
-        uses: ./.github/actions/prepare_runner
+        run: |
-        with:
+          mkdir -p build_docs && cd build_docs
-          disable_ccache: true
+          cmake ../docs && cmake --build . --target docs
-
+      
-      - name: Create build directory
-        run: mkdir build_docs
-
-      - name: Configure CMake
-        working-directory: build_docs
-        run: cmake ../docs
-
-      - name: Build
-        working-directory: build_docs
-        run: cmake --build . --target docs
-
       - name: Setup Pages
         uses: actions/configure-pages@v5
 
@@ -46,20 +41,7 @@ jobs:
         with:
           path: build_docs/html
           name: docs-develop
-
+      
-  deploy:
-    needs: build
-    permissions:
-      pages: write
-      id-token: write
-
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-
-    runs-on: ubuntu-latest
-
-    steps:
       - name: Deploy to GitHub Pages
         id: deployment
         uses: actions/deploy-pages@v4

.github/workflows/nightly.yml

@@ -1,134 +1,167 @@
 name: Nightly release
-
 on:
   schedule:
-    - cron: "0 8 * * 1-5"
+    - cron:  '0 8 * * 1-5'
   workflow_dispatch:
   pull_request:
     paths:
-      - .github/workflows/nightly.yml
+      - '.github/workflows/nightly.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/scripts/prepare-release-artifacts.sh
-
-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:
-  build-and-test:
+  build:
-    name: Build and Test
+    name: Build clio
-
     strategy:
       fail-fast: false
       matrix:
         include:
           - os: macos15
-            conan_profile: apple-clang
             build_type: Release
             static: false
           - os: heavy
-            conan_profile: gcc
             build_type: Release
             static: true
-            container: '{ "image": "ghcr.io/xrplf/clio-ci:latest" }'
+            container: '{ "image": "rippleci/clio_ci:latest" }'
           - os: heavy
-            conan_profile: gcc
             build_type: Debug
             static: true
-            container: '{ "image": "ghcr.io/xrplf/clio-ci:latest" }'
+            container: '{ "image": "rippleci/clio_ci:latest" }'
-          - os: heavy
-            conan_profile: gcc.ubsan
-            build_type: Release
-            static: false
-            container: '{ "image": "ghcr.io/xrplf/clio-ci:latest" }'
-
-    uses: ./.github/workflows/build_and_test.yml
-    with:
-      runs_on: ${{ matrix.os }}
-      container: ${{ matrix.container }}
-      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
-      disable_cache: true
-
-  analyze_build_time:
-    name: Analyze Build Time
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: heavy
-            conan_profile: clang
-            container: '{ "image": "ghcr.io/xrplf/clio-ci:latest" }'
-            static: true
-          - os: macos15
-            conan_profile: apple-clang
-            container: ""
-            static: false
     uses: ./.github/workflows/build_impl.yml
     with:
       runs_on: ${{ matrix.os }}
       container: ${{ matrix.container }}
-      conan_profile: ${{ matrix.conan_profile }}
+      conan_profile: gcc
-      build_type: Release
+      build_type: ${{ matrix.build_type }}
-      disable_cache: true
       code_coverage: false
       static: ${{ matrix.static }}
-      upload_clio_server: false
+      unit_tests: true
-      targets: all
+      integration_tests: true
-      analyze_build_time: true
+      clio_server: true
+      disable_cache: true
+
+  run_tests:
+    needs: build
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: macos15
+            conan_profile: apple_clang_16
+            build_type: Release
+            integration_tests: false
+          - os: heavy
+            conan_profile: gcc
+            build_type: Release
+            container:
+              image: rippleci/clio_ci:latest
+            integration_tests: true  
+          - os: heavy
+            conan_profile: gcc
+            build_type: Debug
+            container:
+              image: rippleci/clio_ci:latest
+            integration_tests: true  
+    runs-on: [self-hosted, "${{ matrix.os }}"]
+    container: ${{ matrix.container }}
+
+    services:
+      scylladb:
+        image: ${{ (matrix.integration_tests) && '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@1.0
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: clio_tests_${{ runner.os }}_${{ matrix.build_type }}_${{ matrix.conan_profile }}
+
+      - name: Run clio_tests
+        run: |
+          chmod +x ./clio_tests
+          ./clio_tests
+  
+      - uses: actions/download-artifact@v4
+        with:
+          name: clio_integration_tests_${{ runner.os }}_${{ matrix.build_type }}_${{ matrix.conan_profile }}
+
+  # To be enabled back once docker in mac runner arrives
+  # https://github.com/XRPLF/clio/issues/1400
+      - name: Run clio_integration_tests
+        if: matrix.integration_tests 
+        run: |
+          chmod +x ./clio_integration_tests
+          ./clio_integration_tests --backend_host=scylladb
 
   nightly_release:
-    needs: build-and-test
+    if: ${{ github.event_name != 'pull_request' }}
-    uses: ./.github/workflows/release_impl.yml
+    needs: run_tests
-    with:
+    runs-on: ubuntu-latest
-      overwrite_release: true
+    env:
-      prerelease: true
+      GH_REPO: ${{ github.repository }}
-      title: "Clio development (nightly) build"
+      GH_TOKEN: ${{ github.token }}
-      version: nightly
+    permissions:
-      header: >
+      contents: write
-        # Release notes
+    steps:
+      - uses: actions/checkout@v4
 
-        > **Note:** Please remember that this is a development release and it is not recommended for production use.
+      - uses: actions/download-artifact@v4
+        with:
+          path: nightly_release
+          pattern: clio_server_*
 
-        Changelog (including previous releases): <https://github.com/XRPLF/clio/commits/nightly>
+      - name: Prepare files
-      generate_changelog: false
+        shell: bash
-      draft: false
+        run: |
+          cp ${{ github.workspace }}/.github/workflows/nightly_notes.md "${RUNNER_TEMP}/nightly_notes.md"
+          cd nightly_release
+          for d in $(ls); do
+            archive_name=$(ls $d)
+            mv ${d}/${archive_name} ./
+            rm -r $d
+            sha256sum ./$archive_name > ./${archive_name}.sha256sum
+            cat ./$archive_name.sha256sum >> "${RUNNER_TEMP}/nightly_notes.md"
+          done
+          echo '```' >> "${RUNNER_TEMP}/nightly_notes.md"
+
+      - name: Remove current nightly release and nightly tag
+        shell: bash
+        run: |
+          gh release delete nightly --yes || true
+          git push origin :nightly || true
+
+      - name: Publish nightly release
+        shell: bash
+        run: |
+          gh release create nightly --prerelease --title "Clio development (nightly) build" \
+            --target $GITHUB_SHA --notes-file "${RUNNER_TEMP}/nightly_notes.md" \
+            ./nightly_release/clio_server*
 
   build_and_publish_docker_image:
     uses: ./.github/workflows/build_clio_docker_image.yml
-    needs: build-and-test
+    needs: run_tests
     secrets: inherit
     with:
       tags: |
-        type=raw,value=nightly
+          type=raw,value=nightly
-        type=raw,value=${{ github.sha }}
+          type=raw,value=${{ github.sha }}
       artifact_name: clio_server_Linux_Release_gcc
       strip_binary: true
       publish_image: ${{ github.event_name != 'pull_request' }}
 
   create_issue_on_failure:
-    needs: [build-and-test, nightly_release, build_and_publish_docker_image]
+    needs: [build, run_tests, nightly_release, build_and_publish_docker_image]
     if: ${{ always() && contains(needs.*.result, 'failure') && github.event_name != 'pull_request' }}
     runs-on: ubuntu-latest
-
     permissions:
       contents: write
       issues: write
-
     steps:
       - uses: actions/checkout@v4
 
@@ -137,7 +170,7 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         with:
-          title: "Nightly release failed 🌙"
+          title: 'Nightly release failed 🌙'
           body: >
             Nightly release failed:
 

.github/workflows/nightly_notes.md

@@ -0,0 +1,6 @@
+> **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
+
+## SHA256 checksums
+```

.github/workflows/pre-commit-autoupdate.yml

@@ -1,50 +0,0 @@
-name: Pre-commit auto-update
-
-on:
-  # every first day of the month
-  schedule:
-    - cron: "0 0 1 * *"
-  # on demand
-  workflow_dispatch:
-
-jobs:
-  auto-update:
-    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: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec # v6.3.0
-        if: github.event_name != 'pull_request'
-        with:
-          gpg_private_key: ${{ secrets.ACTIONS_GPG_PRIVATE_KEY }}
-          passphrase: ${{ secrets.ACTIONS_GPG_PASSPHRASE }}
-          git_user_signingkey: true
-          git_commit_gpgsign: true
-
-      - uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
-        if: always()
-        env:
-          GH_REPO: ${{ github.repository }}
-          GH_TOKEN: ${{ github.token }}
-        with:
-          commit-message: "style: Update pre-commit hooks"
-          committer: Clio CI <skuznetsov@ripple.com>
-          branch: update/pre-commit-hooks
-          branch-suffix: timestamp
-          delete-branch: true
-          title: "style: Update pre-commit hooks"
-          body: Update versions of pre-commit hooks to latest version.
-          reviewers: "godexsoft,kuznetsss,PeterChen13579,mathbunnyru"

.github/workflows/pre-commit.yml

@@ -1,27 +0,0 @@
-name: Run pre-commit hooks
-
-on:
-  pull_request:
-  push:
-    branches: [develop]
-  workflow_dispatch:
-
-jobs:
-  run-hooks:
-    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

.github/workflows/release.yml

@@ -1,57 +0,0 @@
-name: Create release
-
-on:
-  push:
-    tags:
-      - "*.*.*"
-  pull_request:
-    paths:
-      - .github/workflows/release.yml
-
-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:
-  build-and-test:
-    name: Build and Test
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: macos15
-            conan_profile: apple-clang
-            build_type: Release
-            static: false
-          - os: heavy
-            conan_profile: gcc
-            build_type: Release
-            static: true
-            container: '{ "image": "ghcr.io/xrplf/clio-ci:latest" }'
-
-    uses: ./.github/workflows/build_and_test.yml
-    with:
-      runs_on: ${{ matrix.os }}
-      container: ${{ matrix.container }}
-      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
-      disable_cache: true
-
-  release:
-    needs: build-and-test
-    uses: ./.github/workflows/release_impl.yml
-    with:
-      overwrite_release: false
-      prerelease: ${{ contains(github.ref_name, '-') }}
-      title: "${{ github.ref_name}}"
-      version: "${{ github.ref_name }}"
-      header: >
-        # Introducing Clio version ${{ github.ref_name }}
-      generate_changelog: true
-      draft: true

.github/workflows/release_impl.yml

@@ -1,122 +0,0 @@
-name: Make release
-
-on:
-  workflow_call:
-    inputs:
-      overwrite_release:
-        description: "Overwrite the current release and tag"
-        required: true
-        type: boolean
-
-      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
-
-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.prerelease && '--prerelease' || '' }} \
-            --title "${{ inputs.title }}" \
-            --target "${GITHUB_SHA}" \
-            ${{ inputs.draft && '--draft' || '' }} \
-            --notes-file "${RUNNER_TEMP}/release_notes.md" \
-            ./release_artifacts/clio_server*

.github/workflows/sanitizers.yml

@@ -1,56 +1,106 @@
 name: Run tests with sanitizers
-
 on:
   schedule:
     - cron: "0 4 * * 1-5"
   workflow_dispatch:
   pull_request:
     paths:
-      - .github/workflows/sanitizers.yml
+      - '.github/workflows/sanitizers.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/create_issue/**"
-      - .github/scripts/execute-tests-under-sanitizer
-
-      - CMakeLists.txt
-      - conanfile.py
-      - conan.lock
-      - "cmake/**"
-      # We don't run sanitizer on code change, because it takes too long
-      # - "src/**"
-      # - "tests/**"
-
-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:
-  build-and-test:
+  build:
-    name: Build and Test
+    name: Build clio tests
-
     strategy:
       fail-fast: false
       matrix:
-        compiler: [gcc, clang]
+        include:
-        sanitizer_ext: [.asan, .tsan, .ubsan]
+          - sanitizer: tsan
-        build_type: [Release, Debug]
+            compiler: gcc
-
+          - sanitizer: asan
-    uses: ./.github/workflows/build_and_test.yml
+            compiler: gcc
+          # - sanitizer: ubsan # todo: enable when heavy runners are available
+          #   compiler: gcc
+    uses: ./.github/workflows/build_impl.yml
     with:
-      runs_on: heavy
+      runs_on: ubuntu-latest # todo: change to heavy
-      container: '{ "image": "ghcr.io/xrplf/clio-ci:latest" }'
+      container: '{ "image": "rippleci/clio_ci:latest" }'
       disable_cache: true
-      conan_profile: ${{ matrix.compiler }}${{ matrix.sanitizer_ext }}
+      conan_profile: ${{ matrix.compiler }}.${{ matrix.sanitizer }}
-      build_type: ${{ matrix.build_type }}
+      build_type: Release
+      code_coverage: false
       static: false
-      # Currently, both gcc.tsan and clang.tsan unit tests hang
+      unit_tests: true
-      run_unit_tests: ${{ matrix.sanitizer_ext != '.tsan' }}
+      integration_tests: false
-      run_integration_tests: false
+      clio_server: false
-      upload_clio_server: false
+      target: clio_tests
-      targets: clio_tests clio_integration_tests
+      sanitizer: ${{ matrix.sanitizer }}
+
+  # consider combining this with the previous matrix instead
+  run_tests:
+    needs: build
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - sanitizer: tsan
+            compiler: gcc
+          - sanitizer: asan
+            compiler: gcc
+          # - sanitizer: ubsan # todo: enable when heavy runners are available
+          #   compiler: gcc
+    runs-on: ubuntu-latest # todo: change to heavy
+    container:
+      image: rippleci/clio_ci:latest
+    permissions:
+      contents: write
+      issues: write
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: clio_tests_${{ runner.os }}_Release_${{ matrix.compiler }}.${{ matrix.sanitizer }}
+
+      - name: Run clio_tests [${{ matrix.compiler }} / ${{ matrix.sanitizer }}]
+        shell: bash
+        run: |
+          chmod +x ./clio_tests
+          ./.github/scripts/execute-tests-under-sanitizer ./clio_tests
+
+      - name: Check for sanitizer report
+        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 report
+        if: ${{ steps.check_report.outputs.found_report == 'true' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.compiler }}_${{ matrix.sanitizer }}_report
+          path: .sanitizer-report/*
+          include-hidden-files: true
+
+      #
+      # todo: enable when we have fixed all currently existing issues from sanitizers
+      #
+      # - name: Create an issue
+      #   if: ${{ steps.check_report.outputs.found_report == 'true' }}
+      #   uses: ./.github/actions/create_issue
+      #   env:
+      #     GH_TOKEN: ${{ github.token }}
+      #   with:
+      #     labels: 'bug'
+      #     title: '[${{ matrix.sanitizer }}/${{ matrix.compiler }}] reported issues'
+      #     body: >
+      #       Clio tests failed one or more sanitizer checks when built with ${{ matrix.compiler }}`.
+
+      #       Workflow: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/
+      #       Reports are available as artifacts.

.github/workflows/test_impl.yml

@@ -1,160 +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
-
-      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
-
-jobs:
-  unit_tests:
-    name: Unit testing
-    runs-on: ${{ inputs.runs_on }}
-    container: ${{ inputs.container != '' && fromJson(inputs.container) || null }}
-
-    if: inputs.run_unit_tests
-
-    env:
-      # TODO: remove completely when we have fixed all currently existing issues with sanitizers
-      SANITIZER_IGNORE_ERRORS: ${{ endsWith(inputs.conan_profile, '.asan') || endsWith(inputs.conan_profile, '.tsan') }}
-
-    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: sanitizer_report_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
-          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
-    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

.github/workflows/update_docker_ci.yml

@@ -1,332 +1,36 @@
 name: Update CI docker image
-
 on:
   pull_request:
     paths:
+      - 'docker/ci/**'
+      - 'docker/compilers/**'
       - .github/workflows/update_docker_ci.yml
-
-      - ".github/actions/build_docker_image/**"
-
-      - "docker/ci/**"
-      - "docker/compilers/**"
-      - "docker/tools/**"
   push:
     branches: [develop]
     paths:
+      - 'docker/ci/**'        # CI image must update when either its dockerfile changes
+      - 'docker/compilers/**' # or any compilers changed and were pushed by hand
       - .github/workflows/update_docker_ci.yml
-
-      - ".github/actions/build_docker_image/**"
-
-      - "docker/ci/**"
-      - "docker/compilers/**"
-      - "docker/tools/**"
   workflow_dispatch:
 
-concurrency:
-  # Only matches runs for the current workflow - matches against branch & tags
-  group: ${{ github.workflow }}-${{ github.ref }}
-  # We want to execute all builds sequentially in develop
-  cancel-in-progress: false
-
-env:
-  CLANG_MAJOR_VERSION: 19
-  GCC_MAJOR_VERSION: 14
-  GCC_VERSION: 14.3.0
-
 jobs:
-  repo:
+  build_and_push:
-    name: Calculate repo name
+    name: Build and push docker image
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, heavy]
-    outputs:
-      GHCR_REPO: ${{ steps.set-ghcr-repo.outputs.GHCR_REPO }}
-
-    steps:
-      - name: Set GHCR_REPO
-        id: set-ghcr-repo
-        run: |
-          echo "GHCR_REPO=$(echo ghcr.io/${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" >> ${GITHUB_OUTPUT}
-
-  gcc-amd64:
-    name: Build and push GCC docker image (amd64)
-    runs-on: heavy
-    needs: repo
-
     steps:
       - uses: actions/checkout@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
-        if: steps.changed-files.outputs.any_changed == 'true'
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
           DOCKERHUB_PW: ${{ secrets.DOCKERHUB_PW }}
-        with:
-          images: |
-            ${{ needs.repo.outputs.GHCR_REPO }}/clio-gcc
-            rippleci/clio_gcc
-          push_image: ${{ github.event_name != 'pull_request' }}
-          directory: docker/compilers/gcc
-          tags: |
-            type=raw,value=amd64-latest
-            type=raw,value=amd64-${{ env.GCC_MAJOR_VERSION }}
-            type=raw,value=amd64-${{ env.GCC_VERSION }}
-            type=raw,value=amd64-${{ github.sha }}
-          platforms: linux/amd64
-          build_args: |
-            GCC_MAJOR_VERSION=${{ env.GCC_MAJOR_VERSION }}
-            GCC_VERSION=${{ env.GCC_VERSION }}
-          dockerhub_repo: rippleci/clio_gcc
-          dockerhub_description: GCC compiler for XRPLF/clio.
-
-  gcc-arm64:
-    name: Build and push GCC docker image (arm64)
-    runs-on: heavy-arm64
-    needs: repo
-
-    steps:
-      - uses: actions/checkout@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
-        if: steps.changed-files.outputs.any_changed == 'true'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
-          DOCKERHUB_PW: ${{ secrets.DOCKERHUB_PW }}
-        with:
-          images: |
-            ${{ needs.repo.outputs.GHCR_REPO }}/clio-gcc
-            rippleci/clio_gcc
-          push_image: ${{ github.event_name != 'pull_request' }}
-          directory: docker/compilers/gcc
-          tags: |
-            type=raw,value=arm64-latest
-            type=raw,value=arm64-${{ env.GCC_MAJOR_VERSION }}
-            type=raw,value=arm64-${{ env.GCC_VERSION }}
-            type=raw,value=arm64-${{ github.sha }}
-          platforms: linux/arm64
-          build_args: |
-            GCC_MAJOR_VERSION=${{ env.GCC_MAJOR_VERSION }}
-            GCC_VERSION=${{ env.GCC_VERSION }}
-          dockerhub_repo: rippleci/clio_gcc
-          dockerhub_description: GCC compiler for XRPLF/clio.
-
-  gcc-merge:
-    name: Merge and push multi-arch GCC docker image
-    runs-on: heavy
-    needs: [repo, gcc-amd64, gcc-arm64]
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
-        with:
-          files: "docker/compilers/gcc/**"
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to GitHub Container Registry
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Login to DockerHub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USER }}
-          password: ${{ secrets.DOCKERHUB_PW }}
-
-      - name: Create and push multi-arch manifest
-        if: github.event_name != 'pull_request' && steps.changed-files.outputs.any_changed == 'true'
-        run: |
-          for image in ${{ needs.repo.outputs.GHCR_REPO }}/clio-gcc rippleci/clio_gcc; do
-            docker buildx imagetools create \
-              -t $image:latest \
-              -t $image:${{ env.GCC_MAJOR_VERSION }} \
-              -t $image:${{ env.GCC_VERSION }} \
-              -t $image:${{ github.sha }} \
-              $image:arm64-latest \
-              $image:amd64-latest
-          done
-
-  clang:
-    name: Build and push Clang docker image
-    runs-on: heavy
-    needs: repo
-
-    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: |
-            ${{ needs.repo.outputs.GHCR_REPO }}/clio-clang
-            rippleci/clio_clang
-          push_image: ${{ github.event_name != 'pull_request' }}
-          directory: docker/compilers/clang
-          tags: |
-            type=raw,value=latest
-            type=raw,value=${{ env.CLANG_MAJOR_VERSION }}
-            type=raw,value=${{ github.sha }}
-          platforms: linux/amd64,linux/arm64
-          build_args: |
-            CLANG_MAJOR_VERSION=${{ env.CLANG_MAJOR_VERSION }}
-          dockerhub_repo: rippleci/clio_clang
-          dockerhub_description: Clang compiler for XRPLF/clio.
-
-  tools-amd64:
-    name: Build and push tools docker image (amd64)
-    runs-on: heavy
-    needs: [repo, gcc-merge]
-
-    steps:
-      - uses: actions/checkout@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: |
+          image_name: rippleci/clio_ci
-            ${{ needs.repo.outputs.GHCR_REPO }}/clio-tools
-          push_image: ${{ github.event_name != 'pull_request' }}
-          directory: docker/tools
-          tags: |
-            type=raw,value=amd64-latest
-            type=raw,value=amd64-${{ github.sha }}
-          platforms: linux/amd64
-          build_args: |
-            GHCR_REPO=${{ needs.repo.outputs.GHCR_REPO }}
-            GCC_VERSION=${{ env.GCC_VERSION }}
-
-  tools-arm64:
-    name: Build and push tools docker image (arm64)
-    runs-on: heavy-arm64
-    needs: [repo, gcc-merge]
-
-    steps:
-      - uses: actions/checkout@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: |
-            ${{ needs.repo.outputs.GHCR_REPO }}/clio-tools
-          push_image: ${{ github.event_name != 'pull_request' }}
-          directory: docker/tools
-          tags: |
-            type=raw,value=arm64-latest
-            type=raw,value=arm64-${{ github.sha }}
-          platforms: linux/arm64
-          build_args: |
-            GHCR_REPO=${{ needs.repo.outputs.GHCR_REPO }}
-            GCC_VERSION=${{ env.GCC_VERSION }}
-
-  tools-merge:
-    name: Merge and push multi-arch tools docker image
-    runs-on: heavy
-    needs: [repo, tools-amd64, tools-arm64]
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
-        with:
-          files: "docker/tools/**"
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to GitHub Container Registry
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Create and push multi-arch manifest
-        if: github.event_name != 'pull_request' && steps.changed-files.outputs.any_changed == 'true'
-        run: |
-          image=${{ needs.repo.outputs.GHCR_REPO }}/clio-tools
-          docker buildx imagetools create \
-            -t $image:latest \
-            -t $image:${{ github.sha }} \
-            $image:arm64-latest \
-            $image:amd64-latest
-
-  ci:
-    name: Build and push CI docker image
-    runs-on: heavy
-    needs: [repo, gcc-merge, clang, tools-merge]
-
-    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: |
-            ${{ needs.repo.outputs.GHCR_REPO }}/clio-ci
-            rippleci/clio_ci
           push_image: ${{ github.event_name != 'pull_request' }}
           directory: docker/ci
           tags: |
             type=raw,value=latest
-            type=raw,value=gcc_${{ env.GCC_MAJOR_VERSION }}_clang_${{ env.CLANG_MAJOR_VERSION }}
+            type=raw,value=gcc_12_clang_16
             type=raw,value=${{ github.sha }}
           platforms: linux/amd64,linux/arm64
-          build_args: |
+          description: CI image for XRPLF/clio.
-            GHCR_REPO=${{ needs.repo.outputs.GHCR_REPO }}
-            CLANG_MAJOR_VERSION=${{ env.CLANG_MAJOR_VERSION }}
-            GCC_MAJOR_VERSION=${{ env.GCC_MAJOR_VERSION }}
-            GCC_VERSION=${{ env.GCC_VERSION }}
-          dockerhub_repo: rippleci/clio_ci
-          dockerhub_description: CI image for XRPLF/clio.

.github/workflows/upload_conan_deps.yml

@@ -1,100 +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
-  pull_request:
-    branches: [develop]
-    paths:
-      - .github/workflows/upload_conan_deps.yml
-
-      - .github/actions/generate/action.yml
-      - .github/actions/prepare_runner/action.yml
-      - ".github/scripts/conan/**"
-      - "!.github/scripts/conan/apple-clang-local.profile"
-
-      - conanfile.py
-      - conan.lock
-  push:
-    branches: [develop]
-    paths:
-      - .github/workflows/upload_conan_deps.yml
-
-      - .github/actions/generate/action.yml
-      - .github/actions/prepare_runner/action.yml
-      - ".github/scripts/conan/**"
-      - "!.github/scripts/conan/apple-clang-local.profile"
-
-      - conanfile.py
-      - conan.lock
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  generate-matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Calculate conan matrix
-        id: set-matrix
-        run: .github/scripts/conan/generate_matrix.py >> "${GITHUB_OUTPUT}"
-
-  upload-conan-deps:
-    name: Build ${{ matrix.compiler }}${{ matrix.sanitizer_ext }} ${{ matrix.build_type }}
-
-    needs: generate-matrix
-
-    strategy:
-      fail-fast: false
-      matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
-
-    runs-on: ${{ matrix.os }}
-    container: ${{ matrix.container != '' && fromJson(matrix.container) || null }}
-
-    env:
-      CONAN_PROFILE: ${{ matrix.compiler }}${{ matrix.sanitizer_ext }}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Prepare runner
-        uses: ./.github/actions/prepare_runner
-        with:
-          disable_ccache: true
-
-      - name: Setup conan on macOS
-        if: runner.os == 'macOS'
-        shell: bash
-        run: ./.github/scripts/conan/init.sh
-
-      - name: Show conan profile
-        run: conan profile show --profile:all ${{ env.CONAN_PROFILE }}
-
-      - name: Run conan and cmake
-        uses: ./.github/actions/generate
-        with:
-          conan_profile: ${{ env.CONAN_PROFILE }}
-          # We check that everything builds fine from source on scheduled runs
-          # But we do build and upload packages with build=missing by default
-          force_conan_source_build: ${{ github.event_name == 'schedule' || github.event.inputs.force_source_build == 'true' }}
-          build_type: ${{ matrix.build_type }}
-
-      - name: Login to Conan
-        if: github.event_name != 'pull_request'
-        run: conan remote login -p ${{ secrets.CONAN_PASSWORD }} ripple ${{ secrets.CONAN_USERNAME }}
-
-      - name: Upload Conan packages
-        if: github.event_name != 'pull_request' && github.event_name != 'schedule'
-        run: conan upload "*" -r=ripple --confirm

.github/workflows/upload_coverage_report.yml

@@ -1,5 +1,4 @@
 name: Upload report
-
 on:
   workflow_dispatch:
   workflow_call:
@@ -11,7 +10,6 @@ jobs:
   upload_report:
     name: Upload report
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v4
         with:
@@ -25,9 +23,13 @@ jobs:
 
       - name: Upload coverage report
         if: ${{ hashFiles('build/coverage_report.xml') != '' }}
-        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
+        uses: wandalen/wretry.action@v3.7.3
         with:
-          files: build/coverage_report.xml
+          action: codecov/codecov-action@v4
-          fail_ci_if_error: true
+          with: |
-          verbose: true
+            files: build/coverage_report.xml 
-          token: ${{ secrets.CODECOV_TOKEN }}
+            fail_ci_if_error: false
+            verbose: true
+            token: ${{ secrets.CODECOV_TOKEN }}
+          attempt_limit: 5
+          attempt_delay: 10000

.hadolint.yml

@@ -1,6 +0,0 @@
----
-ignored:
-  - DL3003
-  - DL3007
-  - DL3008
-  - DL3013

.markdownlint.yaml

@@ -1,6 +0,0 @@
-# Default state for all rules
-default: true
-
-# MD013/line-length - Line length
-MD013:
-  line_length: 1000

.pre-commit-config.yaml

@@ -1,129 +0,0 @@
----
-# pre-commit is a tool to perform a predefined set of tasks manually and/or
-# automatically before git commits are made.
-#
-# Config reference: https://pre-commit.com/#pre-commit-configyaml---top-level
-#
-# Common tasks
-#
-# - Run on all files:   pre-commit run --all-files
-# - Register git hooks: pre-commit install --hook-type pre-commit --hook-type pre-push
-#
-# See https://pre-commit.com for more information
-# See https://pre-commit.com/hooks.html for more hooks
-exclude: ^(docs/doxygen-awesome-theme/|conan\.lock$)
-
-repos:
-  # `pre-commit sample-config` default hooks
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # frozen: v5.0.0
-    hooks:
-      - id: check-added-large-files
-      - id: check-executables-have-shebangs
-      - id: check-shebang-scripts-are-executable
-      - id: end-of-file-fixer
-      - id: trailing-whitespace
-
-  # Autoformat: YAML, JSON, Markdown, etc.
-  - repo: https://github.com/rbubley/mirrors-prettier
-    rev: 5ba47274f9b181bce26a5150a725577f3c336011 # frozen: v3.6.2
-    hooks:
-      - id: prettier
-
-  - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: 192ad822316c3a22fb3d3cc8aa6eafa0b8488360 # frozen: v0.45.0
-    hooks:
-      - id: markdownlint-fix
-        exclude: LICENSE.md
-
-  - repo: https://github.com/hadolint/hadolint
-    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.12.1-beta hadolint
-
-  - repo: https://github.com/codespell-project/codespell
-    rev: 63c8f8312b7559622c0d82815639671ae42132ac # frozen: v2.4.1
-    hooks:
-      - id: codespell
-        args:
-          [
-            --write-changes,
-            --ignore-words=pre-commit-hooks/codespell_ignore.txt,
-          ]
-
-  - repo: https://github.com/trufflesecurity/trufflehog
-    rev: 6641d4ba5b684fffe195b9820345de1bf19f3181 # frozen: v3.89.2
-    hooks:
-      - id: trufflehog
-        entry: trufflehog git file://. --since-commit HEAD --no-verification --fail
-
-  # Running some C++ hooks before clang-format
-  # to ensure that the style is consistent.
-  - repo: local
-    hooks:
-      - id: json-in-cpp
-        name: Fix JSON style in C++
-        entry: pre-commit-hooks/json_in_cpp.py
-        types: [c++]
-        language: python
-        exclude: |
-          (?x)^(
-            tests/unit/etl/SubscriptionSourceTests.cpp|
-            tests/unit/web/ServerTests.cpp|
-            tests/unit/web/impl/ErrorHandlingTests.cpp|
-            tests/unit/web/ng/ServerTests.cpp|
-            tests/unit/web/ng/impl/ErrorHandlingTests.cpp
-          )$
-
-      - id: fix-local-includes
-        name: Fix Local Includes
-        entry: pre-commit-hooks/fix-local-includes.sh
-        types: [c++]
-        language: script
-
-  - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: 6b9072cd80691b1b48d80046d884409fb1d962d1 # frozen: v20.1.7
-    hooks:
-      - id: clang-format
-        args: [--style=file]
-        types: [c++]
-
-  - repo: https://github.com/cheshirekow/cmake-format-precommit
-    rev: e2c2116d86a80e72e7146a06e68b7c228afc6319 # frozen: v0.6.13
-    hooks:
-      - id: cmake-format
-        additional_dependencies: [PyYAML]
-
-  - repo: local
-    hooks:
-      - id: check-no-h-files
-        name: No .h files
-        entry: There should be no .h files in this repository
-        language: fail
-        files: \.h$
-
-  - repo: local
-    hooks:
-      - id: gofmt
-        name: Go Format
-        entry: pre-commit-hooks/run-go-fmt.sh
-        types: [go]
-        language: golang
-        description: "Runs `gofmt`, requires golang"
-      - id: check-docs
-        name: Check Doxygen Documentation
-        entry: pre-commit-hooks/check-doxygen-docs.sh
-        types: [text]
-        language: script
-        pass_filenames: false
-      - id: verify-commits
-        name: Verify Commits
-        entry: pre-commit-hooks/verify-commits.sh
-        always_run: true
-        stages: [pre-push]
-        language: script
-        pass_filenames: false

CMakeLists.txt

@@ -17,7 +17,6 @@ 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)
 
 # ========================================================================== #
 set(san "" CACHE STRING "Add sanitizer instrumentation")
@@ -69,17 +68,15 @@ endif ()
 # Enable selected sanitizer if enabled via `san`
 if (san)
   set(SUPPORTED_SANITIZERS "address" "thread" "memory" "undefined")
-  if (NOT san IN_LIST SUPPORTED_SANITIZERS)
+  list(FIND SUPPORTED_SANITIZERS "${san}" INDEX)
+  if (INDEX EQUAL -1)
     message(FATAL_ERROR "Error: Unsupported sanitizer '${san}'. Supported values are: ${SUPPORTED_SANITIZERS}.")
   endif ()
 
-  # Sanitizers recommend minimum of -O1 for reasonable performance so we enable it for debug builds
+  target_compile_options(
-  set(SAN_OPTIMIZATION_FLAG "")
+    clio_options INTERFACE # Sanitizers recommend minimum of -O1 for reasonable performance
-  if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+                           $<$<CONFIG:Debug>:-O1> ${SAN_FLAG} -fno-omit-frame-pointer
-    set(SAN_OPTIMIZATION_FLAG -O1)
+  )
-  endif ()
-  target_compile_options(clio_options INTERFACE ${SAN_OPTIMIZATION_FLAG} ${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>

CONTRIBUTING.md

@@ -1,57 +1,39 @@
 # Contributing
-
 Thank you for your interest in contributing to the `clio` project 🙏
 
-## Workflow
-
 To contribute, please:
-
 1. Fork the repository under your own user.
 2. Create a new branch on which to commit/push your changes.
 3. Write and test your code.
 4. Ensure that your code compiles with the provided build engine and update the provided build engine as part of your PR where needed and where appropriate.
 5. Where applicable, write test cases for your code and include those in the relevant subfolder under `tests`.
-6. Ensure your code passes [automated checks](#pre-commit-hooks)
+6. Ensure your code passes automated checks (e.g. clang-format)
 7. Squash your commits (i.e. rebase) into as few commits as is reasonable to describe your changes at a high level (typically a single commit for a small change). See below for more details.
 8. Open a PR to the main repository onto the _develop_ branch, and follow the provided template.
 
 > **Note:** Please read the [Style guide](#style-guide).
 
-### `git lfs` hooks
+## Install git hooks
+Please run the following command in order to use git hooks that are helpful for `clio` development.
 
-Install `git lfs` hooks using the following command:
+``` bash
-
+git config --local core.hooksPath .githooks
-```bash
-git lfs install
 ```
 
-> **Note:** You need to install Git LFS hooks before installing `pre-commit` hooks.
+## Git hooks dependencies
-
+The pre-commit hook requires `clang-format >= 19.0.0` and `cmake-format` to be installed on your machine.
-### `pre-commit` hooks
+`clang-format` can be installed using `brew` on macOS and default package manager on Linux.
-
+`cmake-format` can be installed using `pip`.
-To ensure code quality and style, we use [`pre-commit`](https://pre-commit.com/).
+The hook will also attempt to automatically use `doxygen` to verify that everything public in the codebase is covered by doc comments. If `doxygen` is not installed, the hook will raise a warning suggesting to install `doxygen` for future commits.
-
-Run the following command to enable `pre-commit` hooks that help with Clio development:
-
-```bash
-pip3 install pre-commit
-pre-commit install --hook-type pre-commit --hook-type pre-push
-```
-
-`pre-commit` takes care of running each tool in [`.pre-commit-config.yaml`](https://github.com/XRPLF/clio/blob/develop/.pre-commit-config.yaml) in a separate environment.
-
-`pre-commit` also attempts to automatically use Doxygen to verify that everything public in the codebase has doc comments.
-If Doxygen is not installed, the hook issues a warning and recommends installing Doxygen for future commits.
-
-### Git commands
 
+## Git commands
 This sections offers a detailed look at the git commands you will need to use to get your PR submitted.
 Please note that there are more than one way to do this and these commands are provided for your convenience.
 At this point it's assumed that you have already finished working on your feature/bug.
 
 > **Important:** Before you issue any of the commands below, please hit the `Sync fork` button and make sure your fork's `develop` branch is up-to-date with the main `clio` repository.
 
-```bash
+``` bash
 # Create a backup of your branch
 git branch <your feature branch>_bk
 
@@ -61,20 +43,18 @@ git pull origin develop
 git checkout <your feature branch>
 git rebase -i develop
 ```
-
 For each commit in the list other than the first one, enter `s` to squash.
 After this is done, you will have the opportunity to write a message for the squashed commit.
 
 > **Hint:** Please use **imperative mood** in the commit message, and capitalize the first word.
 
-```bash
+``` bash
 # You should now have a single commit on top of a commit in `develop`
 git log
 ```
-
 > **Note:** If there are merge conflicts, please resolve them now.
 
-```bash
+``` bash
 # Use the same commit message as you did above
 git commit -m 'Your message'
 git rebase --continue
@@ -82,30 +62,27 @@ git rebase --continue
 
 > **Important:** If you have no GPG keys set up, please follow [this tutorial](https://docs.github.com/en/authentication/managing-commit-signature-verification/adding-a-gpg-key-to-your-github-account)
 
-```bash
+``` bash
 # Sign the commit with your GPG key, and push your changes
 git commit --amend -S
 git push --force
 ```
 
-### Use ccache (optional)
+## Use ccache (optional)
-
 Clio uses `ccache` to speed up compilation. If you want to use it, please make sure it is installed on your machine.
 CMake will automatically detect it and use it if it is available.
 
-### Opening a pull request
+## Opening a pull request
-
 When a pull request is open CI will perform checks on the new code.
 Title of the pull request and squashed commit should follow [conventional commits specification](https://www.conventionalcommits.org/en/v1.0.0/).
 
-### Fixing issues found during code review
+## Fixing issues found during code review
-
 While your code is in review, it's possible that some changes will be requested by reviewer(s).
 This section describes the process of adding your fixes.
 
 We assume that you already made the required changes on your feature branch.
 
-```bash
+``` bash
 # Add the changed code
 git add <paths to add>
 
@@ -117,72 +94,63 @@ git commit -S -m "[FOLD] Your commit message"
 git push
 ```
 
-### After code review
+## After code review
-
 When your PR is approved and ready to merge, use `Squash and merge`.
 The button for that is near the bottom of the PR's page on GitHub.
 
 > **Important:** Please leave the automatically-generated mention/link to the PR in the subject line **and** in the description field add `"Fix #ISSUE_ID"` (replacing `ISSUE_ID` with yours) if the PR fixes an issue.
 > **Note:** See [issues](https://github.com/XRPLF/clio/issues) to find the `ISSUE_ID` for the feature/bug you were working on.
 
-## Style guide
+# Style guide
-
 This is a non-exhaustive list of recommended style guidelines. These are not always strictly enforced and serve as a way to keep the codebase coherent.
 
-### Formatting
+## Formatting
-
+Code must conform to `clang-format` version 19, unless the result would be unreasonably difficult to read or maintain.
-Code must conform to `clang-format`, unless the result is unreasonably difficult to read or maintain.
+In most cases the pre-commit hook will take care of formatting and will fix any issues automatically.
-In most cases the `pre-commit` hook takes care of formatting and fixes any issues automatically.
+To manually format your code, use `clang-format -i <your changed files>` for C++ files and `cmake-format -i <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
 
+## Documentation
 All public namespaces, classes and functions must be covered by doc (`doxygen`) comments. Everything that is not within a nested `impl` namespace is considered public.
 
 > **Note:** Keep in mind that this is enforced by Clio's CI and your build will fail if newly added public code lacks documentation.
 
-### Avoid
+## Avoid
+* Proliferation of nearly identical code.
+* Proliferation of new files and classes unless it improves readability or/and compilation time.
+* Unmanaged memory allocation and raw pointers.
+* Macros (unless they add significant value.)
+* Lambda patterns (unless these add significant value.)
+* CPU or architecture-specific code unless there is a good reason to include it, and where it is used guard it with macros and provide explanatory comments.
+* Importing new libraries unless there is a very good reason to do so.
 
-- Proliferation of nearly identical code.
+## Seek to
-- Proliferation of new files and classes unless it improves readability or/and compilation time.
+* Extend functionality of existing code rather than creating new code.
-- Unmanaged memory allocation and raw pointers.
+* Prefer readability over terseness where important logic is concerned.
-- Macros (unless they add significant value.)
+* Inline functions that are not used or are not likely to be used elsewhere in the codebase.
-- Lambda patterns (unless these add significant value.)
+* Use clear and self-explanatory names for functions, variables, structs and classes.
-- CPU or architecture-specific code unless there is a good reason to include it, and where it is used guard it with macros and provide explanatory comments.
+* Use TitleCase for classes, structs and filenames, camelCase for function and variable names, lower case for namespaces and folders.
-- Importing new libraries unless there is a very good reason to do so.
+* Provide as many comments as you feel that a competent programmer would need to understand what your code does.
-
-### Seek to
-
-- Extend functionality of existing code rather than creating new code.
-- Prefer readability over terseness where important logic is concerned.
-- Inline functions that are not used or are not likely to be used elsewhere in the codebase.
-- Use clear and self-explanatory names for functions, variables, structs and classes.
-- Use TitleCase for classes, structs and filenames, camelCase for function and variable names, lower case for namespaces and folders.
-- Provide as many comments as you feel that a competent programmer would need to understand what your code does.
-
-## Maintainers
 
+# Maintainers
 Maintainers are ecosystem participants with elevated access to the repository. They are able to push new code, make decisions on when a release should be made, etc.
 
-### Code Review
+## Code Review
-
 A PR must be reviewed and approved by at least one of the maintainers before it can be merged.
 
-### Adding and Removing
+## Adding and Removing
-
 New maintainers can be proposed by two existing maintainers, subject to a vote by a quorum of the existing maintainers. A minimum of 50% support and a 50% participation is required. In the event of a tie vote, the addition of the new maintainer will be rejected.
 
 Existing maintainers can resign, or be subject to a vote for removal at the behest of two existing maintainers. A minimum of 60% agreement and 50% participation are required. The XRP Ledger Foundation will have the ability, for cause, to remove an existing maintainer without a vote.
 
-### Existing Maintainers
+## Existing Maintainers
 
-- [godexsoft](https://github.com/godexsoft) (Ripple)
+* [godexsoft](https://github.com/godexsoft) (Ripple)
-- [kuznetsss](https://github.com/kuznetsss) (Ripple)
+* [kuznetsss](https://github.com/kuznetsss) (Ripple)
-- [legleux](https://github.com/legleux) (Ripple)
+* [legleux](https://github.com/legleux) (Ripple)
-- [PeterChen13579](https://github.com/PeterChen13579) (Ripple)
+* [PeterChen13579](https://github.com/PeterChen13579) (Ripple)
 
-### Honorable ex-Maintainers
+## Honorable ex-Maintainers
 
-- [cindyyan317](https://github.com/cindyyan317) (ex-Ripple)
+* [cindyyan317](https://github.com/cindyyan317) (ex-Ripple)
-- [cjcobb23](https://github.com/cjcobb23) (ex-Ripple)
+* [cjcobb23](https://github.com/cjcobb23) (ex-Ripple)
-- [natenichols](https://github.com/natenichols) (ex-Ripple)
+* [natenichols](https://github.com/natenichols) (ex-Ripple)

LICENSE.md

@@ -1,7 +1,8 @@
 ISC License
 
-Copyright (c) 2022, 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.
 
 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.
+

README.md

@@ -1,4 +1,4 @@
-# <img src='./docs/img/xrpl-logo.svg' width='40' valign="top" /> Clio <!-- markdownlint-disable-line MD033 MD045 -->
+# <img src='./docs/img/xrpl-logo.svg' width='40' valign="top" /> Clio
 
 [![Build status](https://github.com/XRPLF/clio/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/XRPLF/clio/actions/workflows/build.yml?query=branch%3Adevelop)
 [![Nightly release status](https://github.com/XRPLF/clio/actions/workflows/nightly.yml/badge.svg?branch=develop)](https://github.com/XRPLF/clio/actions/workflows/nightly.yml?query=branch%3Adevelop)
@@ -16,9 +16,9 @@ Multiple Clio nodes can share access to the same dataset, which allows for a hig
 Clio offers the full `rippled` API, with the caveat that Clio by default only returns validated data. This means that `ledger_index` defaults to `validated` instead of `current` for all requests. Other non-validated data, such as information about queued transactions, is also not returned.
 
 Clio retrieves data from a designated group of `rippled` nodes instead of connecting to the peer-to-peer network.
-For requests that require access to the peer-to-peer network, such as `fee` or `submit`, Clio automatically forwards the request to a `rippled` node and propagates the response back to the client. To access non-validated data for _any_ request, simply add `ledger_index: "current"` to the request, and Clio will forward the request to `rippled`.
+For requests that require access to the peer-to-peer network, such as `fee` or `submit`, Clio automatically forwards the request to a `rippled` node and propagates the response back to the client. To access non-validated data for *any* request, simply add `ledger_index: "current"` to the request, and Clio will forward the request to `rippled`.
 
-> [!NOTE]
+> [!NOTE]  
 > Clio requires access to at least one `rippled` node, which can run on the same machine as Clio or separately.
 
 ## 📚 Learn more about Clio

benchmarks/util/async/ExecutionContextBenchmarks.cpp

@@ -191,9 +191,8 @@ generateData()
     constexpr auto kTOTAL = 10'000;
     std::vector<uint64_t> data;
     data.reserve(kTOTAL);
-    util::MTRandomGenerator randomGenerator;
     for (auto i = 0; i < kTOTAL; ++i)
-        data.push_back(randomGenerator.uniform(1, 100'000'000));
+        data.push_back(util::Random::uniform(1, 100'000'000));
 
     return data;
 }

cliff.toml

@@ -8,24 +8,15 @@
 [changelog]
 # template for the changelog header
 header = """
+# Changelog\n
+All notable changes to this project will be documented in this file.\n
 """
 # template for the changelog body
 # https://keats.github.io/tera/docs/#introduction
-
 body = """
 {% if version %}\
-  Version {{ version | trim_start_matches(pat="v") }} of Clio, an XRP Ledger API server optimized for HTTP and WebSocket API calls, is now available.
-{% else %}\
-  Clio, an XRP Ledger API server optimized for HTTP and WebSocket API calls, is under active development.
-{% endif %}\
-
-<!-- Please, remove one of the 2 following lines -->
-This release adds new features and bug fixes.
-This release adds bug fixes.
-\
-{% if version %}
     ## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
-{% else %}
+{% else %}\
     ## [unreleased]
 {% endif %}\
 {% for group, commits in commits | filter(attribute="merge_commit", value=false) | group_by(attribute="group") %}
@@ -33,7 +24,7 @@ This release adds bug fixes.
     {% for commit in commits %}
         - {% if commit.scope %}*({{ commit.scope }})* {% endif %}\
             {% if commit.breaking %}[**breaking**] {% endif %}\
-            {{ commit.message | upper_first }}{% if commit.remote.username %} by @{{ commit.remote.username }}{% endif %}\
+            {{ commit.message | upper_first }} {% if commit.remote.username %}by @{{ commit.remote.username }}{% endif %}\
     {% endfor %}
 {% endfor %}\n
 """

cmake/ClangTidy.cmake

@@ -8,7 +8,7 @@ if (lint)
     endif ()
     message(STATUS "Using clang-tidy from CLIO_CLANG_TIDY_BIN")
   else ()
-    find_program(_CLANG_TIDY_BIN NAMES "clang-tidy-20" "clang-tidy" REQUIRED)
+    find_program(_CLANG_TIDY_BIN NAMES "clang-tidy-19" "clang-tidy" REQUIRED)
   endif ()
 
   if (NOT _CLANG_TIDY_BIN)

cmake/ClioVersion.cmake

@@ -4,42 +4,39 @@
 
 find_package(Git REQUIRED)
 
-set(GIT_COMMAND describe --tags --exact-match)
+set(GIT_COMMAND rev-parse --short HEAD)
 execute_process(
-  COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND}
+  COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE REV
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  OUTPUT_VARIABLE TAG
-  RESULT_VARIABLE RC
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-if (RC EQUAL 0)
+set(GIT_COMMAND branch --show-current)
-  # if we are on a tag, use the tag name
+execute_process(
-  set(CLIO_VERSION "${TAG}")
+  COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE BRANCH
-  set(DOC_CLIO_VERSION "${TAG}")
+  OUTPUT_STRIP_TRAILING_WHITESPACE
-else ()
+)
-  # if not, use YYYYMMDDHMS-<branch>-<git-rev>
 
+if (BRANCH STREQUAL "")
+  set(BRANCH "dev")
+endif ()
+
+if (NOT (BRANCH MATCHES master OR BRANCH MATCHES release/*)) # for develop and any other branch name
+                                                             # YYYYMMDDHMS-<branch>-<git-rev>
   set(GIT_COMMAND show -s --date=format:%Y%m%d%H%M%S --format=%cd)
   execute_process(
-    COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE DATE
+    COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE DATE
-    OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ERROR_IS_FATAL ANY
+    OUTPUT_STRIP_TRAILING_WHITESPACE
   )
-
-  set(GIT_COMMAND branch --show-current)
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE BRANCH
-    OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ERROR_IS_FATAL ANY
-  )
-
-  set(GIT_COMMAND rev-parse --short HEAD)
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE REV
-    OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ERROR_IS_FATAL ANY
-  )
-
   set(CLIO_VERSION "${DATE}-${BRANCH}-${REV}")
   set(DOC_CLIO_VERSION "develop")
+else ()
+  set(GIT_COMMAND describe --tags)
+  execute_process(
+    COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE CLIO_TAG_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  set(CLIO_VERSION "${CLIO_TAG_VERSION}")
+  set(DOC_CLIO_VERSION "${CLIO_TAG_VERSION}")
 endif ()
 
 if (CMAKE_BUILD_TYPE MATCHES Debug)

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
@@ -27,7 +26,7 @@ set(COMPILER_FLAGS
     # TODO: Address these and others in https://github.com/XRPLF/clio/issues/1273
 )
 
-# TODO: re-enable when we change CI #884 if (is_gcc AND NOT lint) list(APPEND COMPILER_FLAGS -Wduplicated-branches
+# TODO: reenable 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)
@@ -71,12 +70,4 @@ 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 ()
-
 target_compile_options(clio_options INTERFACE ${COMPILER_FLAGS})

conan.lock

@@ -1,57 +0,0 @@
-{
-    "version": "0.5",
-    "requires": [
-        "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1752006674.465",
-        "xxhash/0.8.2#7856c968c985b2981b707ee8f2413b2b%1752006674.334",
-        "xrpl/2.5.0#7880d1696f11fceb1d498570f1a184c8%1752006708.218",
-        "sqlite3/3.47.0#7a0904fd061f5f8a2366c294f9387830%1752006674.338",
-        "soci/4.0.3#a9f8d773cd33e356b5879a4b0564f287%1752006674.465",
-        "re2/20230301#dfd6e2bf050eb90ddd8729cfb4c844a4%1752006674.077",
-        "rapidjson/cci.20220822#1b9d8c2256876a154172dc5cfbe447c6%1752006673.227",
-        "protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1752006673.172",
-        "openssl/1.1.1v#216374e4fb5b2e0f5ab1fb6f27b5b434%1752006673.069",
-        "nudb/2.0.8#63990d3e517038e04bf529eb8167f69f%1752006673.862",
-        "minizip/1.2.13#9e87d57804bd372d6d1e32b1871517a3%1752006672.983",
-        "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504%1752006672.825",
-        "libuv/1.46.0#78565d142ac7102776256328a26cdf60%1752006672.827",
-        "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1752006672.826",
-        "libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1752006672.822",
-        "libarchive/3.7.6#e0453864b2a4d225f06b3304903cb2b7%1752006672.917",
-        "http_parser/2.9.4#98d91690d6fd021e9e624218a85d9d97%1752006672.658",
-        "gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1752006671.555",
-        "grpc/1.50.1#02291451d1e17200293a409410d1c4e1%1752006671.777",
-        "fmt/11.2.0#579bb2cdf4a7607621beea4eb4651e0f%1752006671.557",
-        "date/3.0.3#cf28fe9c0aab99fe12da08aa42df65e1%1752006671.553",
-        "cassandra-cpp-driver/2.17.0#e50919efac8418c26be6671fd702540a%1752006671.654",
-        "c-ares/1.34.5#b78b91e7cfb1f11ce777a285bbf169c6%1752006671.554",
-        "bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1752006671.549",
-        "boost/1.83.0#5bcb2a14a35875e328bf312e080d3562%1752006671.557",
-        "benchmark/1.8.3#1a2ce62c99e2b3feaa57b1f0c15a8c46%1752006671.408",
-        "abseil/20230802.1#f0f91485b111dc9837a68972cb19ca7b%1752006671.555"
-    ],
-    "build_requires": [
-        "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1752006674.465",
-        "protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1752006673.172",
-        "protobuf/3.21.9#64ce20e1d9ea24f3d6c504015d5f6fa8%1752006673.173",
-        "cmake/3.31.7#57c3e118bcf267552c0ea3f8bee1e7d5%1752006671.64",
-        "b2/5.3.2#7b5fabfe7088ae933fb3e78302343ea0%1752006671.407"
-    ],
-    "python_requires": [],
-    "overrides": {
-        "boost/1.83.0": [
-            null,
-            "boost/1.83.0#5bcb2a14a35875e328bf312e080d3562"
-        ],
-        "protobuf/3.21.9": [
-            null,
-            "protobuf/3.21.12"
-        ],
-        "lz4/1.9.4": [
-            "lz4/1.10.0"
-        ],
-        "sqlite3/3.44.2": [
-            "sqlite3/3.47.0"
-        ]
-    },
-    "config_requires": []
-}

conanfile.py

@@ -1,16 +1,16 @@
 from conan import ConanFile
 from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
 
-
+class Clio(ConanFile):
-class ClioConan(ConanFile):
     name = 'clio'
     license = 'ISC'
-    author = 'Alex Kremer <akremer@ripple.com>, John Freeman <jfreeman@ripple.com>, Ayaz Salikhov <asalikhov@ripple.com>'
+    author = 'Alex Kremer <akremer@ripple.com>, John Freeman <jfreeman@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
@@ -20,23 +20,23 @@ class ClioConan(ConanFile):
         '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 = [
         'boost/1.83.0',
         'cassandra-cpp-driver/2.17.0',
-        'fmt/11.2.0',
+        'fmt/10.1.1',
-        'protobuf/3.21.12',
+        'protobuf/3.21.9',
         'grpc/1.50.1',
         'openssl/1.1.1v',
-        'xrpl/2.5.0',
+        'xrpl/2.4.0',
         'zlib/1.3.1',
         'libbacktrace/cci.20210118'
     ]
 
     default_options = {
         'static': False,
+        'fPIC': True,
         'verbose': False,
         'tests': False,
         'integration_tests': False,
@@ -46,8 +46,7 @@ class ClioConan(ConanFile):
         'lint': False,
         'docs': False,
         'snapshot': False,
-        'time_trace': False,
+        
-
         'xrpl/*:tests': False,
         'xrpl/*:rocksdb': False,
         'cassandra-cpp-driver/*:shared': False,
@@ -79,16 +78,23 @@ class ClioConan(ConanFile):
 
     def layout(self):
         cmake_layout(self)
-        # Fix this setting to follow the default introduced in Conan 1.48
+        # Fix this setting to follow the default introduced in Conan 1.48 
         # to align with our build instructions.
         self.folders.generators = 'build/generators'
 
     generators = 'CMakeDeps'
-
     def generate(self):
         tc = CMakeToolchain(self)
-        for option_name, option_value in self.options.items():
+        tc.variables['verbose'] = self.options.verbose
-            tc.variables[option_name] = option_value
+        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.generate()
 
     def build(self):

docker/ci/Dockerfile

@@ -1,117 +0,0 @@
-ARG GHCR_REPO=invalid
-ARG CLANG_MAJOR_VERSION=invalid
-ARG GCC_VERSION=invalid
-
-FROM ${GHCR_REPO}/clio-gcc:${GCC_VERSION} AS clio-gcc
-FROM ${GHCR_REPO}/clio-tools:latest AS clio-tools
-
-FROM ${GHCR_REPO}/clio-clang:${CLANG_MAJOR_VERSION}
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-# Using root by default is not very secure but github checkout action doesn't work with any other user
-# https://github.com/actions/checkout/issues/956
-# And Github Actions doc recommends using root
-# https://docs.github.com/en/actions/sharing-automations/creating-actions/dockerfile-support-for-github-actions#user
-
-# hadolint ignore=DL3002
-USER root
-WORKDIR /root
-
-ARG LLVM_TOOLS_VERSION=20
-
-# 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 \
-        clang-tidy-${LLVM_TOOLS_VERSION} \
-        clang-tools-${LLVM_TOOLS_VERSION} \
-        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 \
-        # TODO: Remove this once we switch to newer Ubuntu base image
-        # lxml 6.0.0 is not compatible with our image
-        'lxml<6.0.0' \
-        \
-        cmake==3.31.6 \
-        conan==2.17.0 \
-        gcovr \
-        pre-commit \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-ARG GCC_MAJOR_VERSION=invalid
-
-# Install custom-built gcc and make ldconfig aware of the new libstdc++ location (for gcc)
-# Note: Clang is using libc++ instead
-COPY --from=clio-gcc /gcc${GCC_MAJOR_VERSION}.deb /
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends --no-install-suggests \
-        binutils \
-        libc6-dev \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && dpkg -i /gcc${GCC_MAJOR_VERSION}.deb \
-    && rm -rf /gcc${GCC_MAJOR_VERSION}.deb \
-    && ldconfig
-
-# Rewire to use our custom-built gcc as default compiler
-RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_MAJOR_VERSION} 100 \
-    && update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-${GCC_MAJOR_VERSION} 100 \
-    && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_MAJOR_VERSION} 100 \
-    && update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-${GCC_MAJOR_VERSION} 100 \
-    && update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-${GCC_MAJOR_VERSION} 100 \
-    && update-alternatives --install /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-${GCC_MAJOR_VERSION} 100 \
-    && update-alternatives --install /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-${GCC_MAJOR_VERSION} 100
-
-COPY --from=clio-tools \
-    /usr/local/bin/mold \
-    /usr/local/bin/ld.mold \
-    /usr/local/bin/ccache \
-    /usr/local/bin/doxygen \
-    /usr/local/bin/ClangBuildAnalyzer \
-    /usr/local/bin/git-cliff \
-    /usr/local/bin/gh \
-    /usr/local/bin/
-
-WORKDIR /root
-
-# Setup conan
-RUN conan remote add --index 0 ripple http://18.143.149.228:8081/artifactory/api/conan/dev
-
-WORKDIR /root/.conan2
-COPY conan/global.conf ./global.conf
-
-WORKDIR /root/.conan2/profiles
-
-COPY conan/clang.profile ./clang
-COPY conan/sanitizer_template.profile ./clang.asan
-COPY conan/sanitizer_template.profile ./clang.tsan
-COPY conan/sanitizer_template.profile ./clang.ubsan
-
-COPY conan/gcc.profile ./gcc
-COPY conan/sanitizer_template.profile ./gcc.asan
-COPY conan/sanitizer_template.profile ./gcc.tsan
-COPY conan/sanitizer_template.profile ./gcc.ubsan
-
-WORKDIR /root

docker/ci/README.md

@@ -4,19 +4,13 @@ This image contains an environment to build [Clio](https://github.com/XRPLF/clio
 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:
-
+- clang 16.0.6
-- ccache 4.11.3
+- gcc 12.3
-- Clang 19
+- doxygen 1.12
-- ClangBuildAnalyzer 1.6.0
+- gh 2.40
-- Conan 2.17.0
+- ccache 4.10.2
-- Doxygen 1.12
+- conan 1.62
-- GCC 14.3.0
-- gh 2.74
-- git-cliff 2.9.1
-- mold 2.40.1
 - and some other useful tools
 
-Conan is set up to build Clio without any additional steps.
+Conan is set up to build Clio without any additional steps. There are two preset conan profiles: `clang` and `gcc` to use corresponding compiler. By default conan is setup to use `gcc`.
-There are two preset conan profiles: `clang` and `gcc` to use corresponding compiler.
+Sanitizer builds for `ASAN`, `TSAN` and `UBSAN` 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 gcc.tsan`). 
-`ASan`, `TSan` and `UBSan` sanitizer builds are enabled via conan profiles for each of the supported compilers.
-These can be selected using the following pattern (all lowercase): `[compiler].[sanitizer]` (e.g. `--profile:all gcc.tsan`).

docker/ci/conan/clang.asan

@@ -0,0 +1,9 @@
+include(clang)
+
+[options]
+boost:extra_b2_flags="cxxflags=\"-fsanitize=address\" linkflags=\"-fsanitize=address\""
+boost:without_stacktrace=True
+[env]
+CFLAGS="-fsanitize=address"
+CXXFLAGS="-fsanitize=address"
+LDFLAGS="-fsanitize=address"

docker/ci/conan/clang.profile

@@ -1,12 +0,0 @@
-[settings]
-arch={{detect_api.detect_arch()}}
-build_type=Release
-compiler=clang
-compiler.cppstd=20
-compiler.libcxx=libc++
-compiler.version=19
-os=Linux
-
-[conf]
-tools.build:compiler_executables={"c": "/usr/bin/clang-19", "cpp": "/usr/bin/clang++-19"}
-grpc/1.50.1:tools.build:cxxflags+=["-Wno-missing-template-arg-list-after-template-kw"]

docker/ci/conan/clang.tsan

@@ -0,0 +1,9 @@
+include(clang)
+
+[options]
+boost:extra_b2_flags="cxxflags=\"-fsanitize=thread\" linkflags=\"-fsanitize=thread\""
+boost:without_stacktrace=True
+[env]
+CFLAGS="-fsanitize=thread"
+CXXFLAGS="-fsanitize=thread"
+LDFLAGS="-fsanitize=thread"

docker/ci/conan/clang.ubsan

@@ -0,0 +1,9 @@
+include(clang)
+
+[options]
+boost:extra_b2_flags="cxxflags=\"-fsanitize=undefined\" linkflags=\"-fsanitize=undefined\""
+boost:without_stacktrace=True
+[env]
+CFLAGS="-fsanitize=undefined"
+CXXFLAGS="-fsanitize=undefined"
+LDFLAGS="-fsanitize=undefined"

docker/ci/conan/gcc.asan

@@ -0,0 +1,9 @@
+include(gcc)
+
+[options]
+boost:extra_b2_flags="cxxflags=\"-fsanitize=address\" linkflags=\"-fsanitize=address\""
+boost:without_stacktrace=True
+[env]
+CFLAGS="-fsanitize=address"
+CXXFLAGS="-fsanitize=address"
+LDFLAGS="-fsanitize=address"

docker/ci/conan/gcc.profile

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

docker/ci/conan/gcc.tsan

@@ -0,0 +1,9 @@
+include(gcc)
+
+[options]
+boost:extra_b2_flags="cxxflags=\"-fsanitize=thread\" linkflags=\"-fsanitize=thread\""
+boost:without_stacktrace=True
+[env]
+CFLAGS="-fsanitize=thread"
+CXXFLAGS="-fsanitize=thread"
+LDFLAGS="-fsanitize=thread"

docker/ci/conan/gcc.ubsan

@@ -0,0 +1,9 @@
+include(gcc)
+
+[options]
+boost:extra_b2_flags="cxxflags=\"-fsanitize=undefined\" linkflags=\"-fsanitize=undefined\""
+boost:without_stacktrace=True
+[env]
+CFLAGS="-fsanitize=undefined"
+CXXFLAGS="-fsanitize=undefined"
+LDFLAGS="-fsanitize=undefined"

docker/ci/conan/global.conf

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

docker/ci/conan/sanitizer_template.profile

@@ -1,23 +0,0 @@
-{% set compiler, sani = profile_name.split('.') %}
-
-{% set sanitizer_opt_map = {"asan": "address", "tsan": "thread", "ubsan": "undefined"} %}
-{% set sanitizer = sanitizer_opt_map[sani] %}
-
-{% set sanitizer_build_flags_str = "-fsanitize=" ~ sanitizer ~ " -g -O1 -fno-omit-frame-pointer" %}
-{% set sanitizer_build_flags = sanitizer_build_flags_str.split(' ') %}
-{% set sanitizer_link_flags_str = "-fsanitize=" ~ sanitizer %}
-{% set sanitizer_link_flags = sanitizer_link_flags_str.split(' ') %}
-
-include({{ compiler }})
-
-[options]
-boost/*:extra_b2_flags="cxxflags=\"{{ sanitizer_build_flags_str }}\" linkflags=\"{{ sanitizer_link_flags_str }}\""
-boost/*:without_stacktrace=True
-
-[conf]
-tools.build:cflags+={{ sanitizer_build_flags }}
-tools.build:cxxflags+={{ sanitizer_build_flags }}
-tools.build:exelinkflags+={{ sanitizer_link_flags }}
-tools.build:sharedlinkflags+={{ sanitizer_link_flags }}
-
-tools.info.package_id:confs+=["tools.build:cflags", "tools.build:cxxflags", "tools.build:exelinkflags", "tools.build:sharedlinkflags"]

docker/ci/dockerfile

@@ -0,0 +1,107 @@
+FROM rippleci/clio_clang:16
+ARG DEBIAN_FRONTEND=noninteractive
+ARG TARGETARCH
+
+SHELL ["/bin/bash", "-c"]
+USER root
+WORKDIR /root
+
+ENV CCACHE_VERSION=4.10.2 \
+    LLVM_TOOLS_VERSION=19 \
+    GH_VERSION=2.40.0 \
+    DOXYGEN_VERSION=1.12.0
+ 
+# Add repositories
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends --no-install-suggests gnupg wget curl software-properties-common \
+    && echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-${LLVM_TOOLS_VERSION} main" >> /etc/apt/sources.list \
+    && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
+
+# Install packages
+RUN apt update -qq \
+    && apt install -y --no-install-recommends --no-install-suggests python3 python3-pip git git-lfs make ninja-build flex bison jq graphviz \
+    clang-format-${LLVM_TOOLS_VERSION} clang-tidy-${LLVM_TOOLS_VERSION} clang-tools-${LLVM_TOOLS_VERSION} \
+    && update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-${LLVM_TOOLS_VERSION} 100 \
+    && pip3 install -q --upgrade --no-cache-dir pip && pip3 install -q --no-cache-dir conan==1.62 gcovr cmake cmake-format \
+    && apt-get clean && apt remove -y software-properties-common
+
+# Install gcc-12 and make ldconfig aware of the new libstdc++ location (for gcc)
+# Note: Clang is using libc++ instead
+COPY --from=rippleci/clio_gcc:12.3.0 /gcc12.deb /
+RUN apt update && apt-get install -y binutils libc6-dev \
+    && 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
+
+WORKDIR /tmp
+
+# Install ccache from source
+RUN wget "https://github.com/ccache/ccache/releases/download/v${CCACHE_VERSION}/ccache-${CCACHE_VERSION}.tar.gz" \
+    && tar xf "ccache-${CCACHE_VERSION}.tar.gz" \
+    && cd "ccache-${CCACHE_VERSION}" \
+    && mkdir build && cd build \
+    && cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. \
+    && cmake --build . --target install \
+    && rm -rf /tmp/* /var/tmp/*
+
+# Install doxygen from source
+RUN wget "https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/doxygen-${DOXYGEN_VERSION}.src.tar.gz" \
+    && tar xf "doxygen-${DOXYGEN_VERSION}.src.tar.gz" \
+    && cd "doxygen-${DOXYGEN_VERSION}" \
+    && mkdir build && cd build \
+    && cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. \
+    && cmake --build . --target install \
+    && rm -rf /tmp/* /var/tmp/*
+
+# Install gh
+RUN wget https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_${TARGETARCH}.tar.gz \
+    && tar xf gh_${GH_VERSION}_linux_${TARGETARCH}.tar.gz \
+    && mv gh_${GH_VERSION}_linux_${TARGETARCH}/bin/gh /usr/bin/gh \
+    && rm -rf /tmp/* /var/tmp/*
+
+WORKDIR /root
+# 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/creating-actions/dockerfile-support-for-github-actions#user
+
+# Setup conan
+RUN conan remote add --insert 0 conan-non-prod http://18.143.149.228:8081/artifactory/api/conan/conan-non-prod
+
+# Note: intentionally leaving cppstd=20
+RUN conan profile new gcc --detect \
+    && conan profile update settings.compiler=gcc gcc \
+    && conan profile update settings.compiler.version=12 gcc \
+    && conan profile update settings.compiler.cppstd=20 gcc \
+    && conan profile update settings.compiler.libcxx=libstdc++11 gcc \
+    && conan profile update env.CC=/usr/bin/gcc-12 gcc \
+    && conan profile update env.CXX=/usr/bin/g++-12 gcc \
+    && conan profile update "conf.tools.build:compiler_executables={\"c\": \"/usr/bin/gcc-12\", \"cpp\": \"/usr/bin/g++-12\"}" gcc
+
+RUN conan profile new clang --detect \
+    && conan profile update settings.compiler=clang clang \
+    && conan profile update settings.compiler.version=16 clang \
+    && conan profile update settings.compiler.cppstd=20 clang \
+    && conan profile update settings.compiler.libcxx=libc++ clang \
+    && conan profile update env.CC=/usr/bin/clang-16 clang \
+    && conan profile update env.CXX=/usr/bin/clang++-16 clang \
+    && conan profile update env.CXXFLAGS="-DBOOST_ASIO_DISABLE_CONCEPTS" clang \
+    && conan profile update "conf.tools.build:compiler_executables={\"c\": \"/usr/bin/clang-16\", \"cpp\": \"/usr/bin/clang++-16\"}" clang 
+
+RUN echo "include(gcc)" >> .conan/profiles/default
+
+COPY conan/gcc.asan /root/.conan/profiles
+COPY conan/gcc.tsan /root/.conan/profiles
+COPY conan/gcc.ubsan /root/.conan/profiles
+COPY conan/clang.asan /root/.conan/profiles
+COPY conan/clang.tsan /root/.conan/profiles
+COPY conan/clang.ubsan /root/.conan/profiles

docker/clio/Dockerfile

@@ -1,19 +0,0 @@
-FROM ubuntu:22.04
-
-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/ \
-    && 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"]
-CMD ["--conf", "/opt/clio/etc/config.json"]

docker/clio/README.md

@@ -12,14 +12,12 @@ Your configuration file should be mounted under the path `/opt/clio/etc/config.j
 Clio repository provides an [example](https://github.com/XRPLF/clio/blob/develop/docs/examples/config/example-config.json) of the configuration file.
 
 Config file recommendations:
-
 - 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
 
 The following command can be used to run Clio in docker (assuming server's port is `51233` in your config):
-
 ```bash
 docker run -d -v <path to your config.json>:/opt/clio/etc/config.json -v <path to store logs>:/opt/clio/log -p 51233:51233 rippleci/clio
 ```

docker/clio/dockerfile

@@ -0,0 +1,16 @@
+FROM ubuntu:22.04
+
+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/ && \
+    groupadd -g 10001 clio && \
+    useradd -u 10000 -g 10001 -s /bin/bash clio && \
+    chown clio:clio /opt/clio/log && \
+    apt update && \
+    apt install -y libatomic1
+
+USER clio
+ENTRYPOINT ["/opt/clio/bin/clio_server"]
+CMD ["--conf", "/opt/clio/etc/config.json"]

docker/compilers/clang-16/dockerfile

@@ -0,0 +1,19 @@
+FROM ubuntu:focal 
+ARG DEBIAN_FRONTEND=noninteractive
+ARG TARGETARCH
+
+SHELL ["/bin/bash", "-c"]
+USER root
+WORKDIR /root
+
+ENV CLANG_VERSION=16
+
+RUN apt update -qq \
+    && apt install -qq -y --no-install-recommends --no-install-suggests \
+    wget software-properties-common gnupg
+
+RUN wget https://apt.llvm.org/llvm.sh \
+    && chmod +x llvm.sh \
+    && ./llvm.sh ${CLANG_VERSION} \
+    && rm -rf llvm.sh \
+    && apt-get install -y libc++-16-dev libc++abi-16-dev

docker/compilers/clang/Dockerfile

@@ -1,32 +0,0 @@
-FROM ubuntu:20.04
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-SHELL ["/bin/bash", "-c"]
-
-# hadolint ignore=DL3002
-USER root
-WORKDIR /root
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends --no-install-suggests \
-        wget \
-        software-properties-common \
-        gnupg \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-ARG CLANG_MAJOR_VERSION=invalid
-# Bump this version to force rebuild of the image
-ARG BUILD_VERSION=0
-
-RUN wget --progress=dot:giga https://apt.llvm.org/llvm.sh \
-    && chmod +x llvm.sh \
-    && ./llvm.sh ${CLANG_MAJOR_VERSION} \
-    && rm -rf llvm.sh \
-    && apt-get update \
-    && apt-get install -y --no-install-recommends --no-install-suggests \
-        libc++-${CLANG_MAJOR_VERSION}-dev \
-        libc++abi-${CLANG_MAJOR_VERSION}-dev \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*

docker/compilers/clang/README.md

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

docker/compilers/gcc-12/control.m4

@@ -0,0 +1,6 @@
+Package: gcc-12-ubuntu-UBUNTUVERSION
+Version: VERSION
+Architecture: TARGETARCH
+Maintainer: Alex Kremer <akremer@ripple.com>
+Description: Gcc VERSION build for ubuntu UBUNTUVERSION
+Depends: binutils, libc6-dev

docker/compilers/gcc-12/dockerfile

@@ -0,0 +1,74 @@
+FROM ubuntu:focal as build
+
+ARG DEBIAN_FRONTEND=noninteractive
+ARG TARGETARCH
+ARG UBUNTU_VERSION=20.04
+ARG GCC_VERSION=12.3.0
+ARG BUILD_VERSION=1
+
+RUN apt update && apt install -y wget build-essential file flex libz-dev libzstd-dev
+RUN wget https://gcc.gnu.org/pub/gcc/releases/gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.gz \
+    && tar xf gcc-$GCC_VERSION.tar.gz \
+    && cd /gcc-$GCC_VERSION && ./contrib/download_prerequisites
+
+RUN mkdir /${TARGETARCH}-gcc-12
+WORKDIR /${TARGETARCH}-gcc-12
+RUN /gcc-$GCC_VERSION/configure \
+    --with-pkgversion="clio-build-$BUILD_VERSION https://github.com/XRPLF/clio" \
+    --enable-languages=c,c++ \
+    --prefix=/usr \
+    --with-gcc-major-version-only \
+    --program-suffix=-12 \
+    --enable-shared \
+    --enable-linker-build-id \
+    --libexecdir=/usr/lib \
+    --without-included-gettext \
+    --enable-threads=posix \
+    --libdir=/usr/lib \
+    --disable-nls \
+    --enable-clocale=gnu \
+    --enable-libstdcxx-backtrace=yes \
+    --enable-libstdcxx-debug \
+    --enable-libstdcxx-time=yes \
+    --with-default-libstdcxx-abi=new \
+    --enable-gnu-unique-object \
+    --disable-vtable-verify \
+    --enable-plugin \
+    --enable-default-pie \
+    --with-system-zlib \
+    --enable-libphobos-checking=release \
+    --with-target-system-zlib=auto \
+    --disable-werror \
+    --enable-cet \
+    --disable-multilib \
+    --without-cuda-driver \
+    --enable-checking=release \
+    && make -j`nproc` \
+    && make install-strip DESTDIR=/gcc-$GCC_VERSION-$BUILD_VERSION-ubuntu-$UBUNTU_VERSION \
+    && mkdir -p /gcc-$GCC_VERSION-$BUILD_VERSION-ubuntu-$UBUNTU_VERSION/usr/share/gdb/auto-load/usr/lib64 \
+    && mv /gcc-$GCC_VERSION-$BUILD_VERSION-ubuntu-$UBUNTU_VERSION/usr/lib64/libstdc++.so.6.0.30-gdb.py /gcc-$GCC_VERSION-$BUILD_VERSION-ubuntu-$UBUNTU_VERSION/usr/share/gdb/auto-load/usr/lib64/libstdc++.so.6.0.30-gdb.py
+
+# Generate deb
+WORKDIR /
+COPY control.m4 /
+COPY ld.so.conf /gcc-$GCC_VERSION-$BUILD_VERSION-ubuntu-$UBUNTU_VERSION/etc/ld.so.conf.d/1-gcc-12.conf
+
+RUN mkdir /gcc-$GCC_VERSION-$BUILD_VERSION-ubuntu-$UBUNTU_VERSION/DEBIAN \
+    && m4 -P -DUBUNTU_VERSION=$UBUNTU_VERSION -DVERSION=$GCC_VERSION-$BUILD_VERSION -DTARGETARCH=$TARGETARCH control.m4 > /gcc-$GCC_VERSION-$BUILD_VERSION-ubuntu-$UBUNTU_VERSION/DEBIAN/control \
+    && dpkg-deb --build --root-owner-group /gcc-$GCC_VERSION-$BUILD_VERSION-ubuntu-$UBUNTU_VERSION /gcc12.deb
+
+# Create final image
+FROM ubuntu:focal as gcc
+COPY --from=build /gcc12.deb /
+
+# Make gcc-12 available but also leave gcc12.deb for others to copy if needed
+RUN apt update && apt-get install -y binutils libc6-dev \
+    && dpkg -i /gcc12.deb 
+
+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

docker/compilers/gcc/Dockerfile

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

docker/compilers/gcc/README.md

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

docker/compilers/gcc/control.m4

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

docker/develop/compose.yaml

@@ -1,8 +1,8 @@
 services:
   clio_develop:
-    image: ghcr.io/xrplf/clio-ci:latest
+    image: rippleci/clio_ci:latest
     volumes:
-      - clio_develop_conan_data:/root/.conan2/p
+      - clio_develop_conan_data:/root/.conan/data
       - clio_develop_ccache:/root/.ccache
       - ../../:/root/clio
       - clio_develop_build:/root/clio/build_docker

docker/develop/run

@@ -59,3 +59,4 @@ case $1 in
 esac
 
 popd > /dev/null
+

docker/tools/Dockerfile

@@ -1,81 +0,0 @@
-ARG GHCR_REPO=invalid
-ARG GCC_VERSION=invalid
-
-FROM ${GHCR_REPO}/clio-gcc:${GCC_VERSION}
-
-ARG DEBIAN_FRONTEND=noninteractive
-ARG TARGETARCH
-
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-ARG BUILD_VERSION=1
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends --no-install-suggests \
-        bison \
-        flex \
-        ninja-build \
-        python3 \
-        python3-pip \
-        software-properties-common \
-        wget \
-    && pip3 install -q --no-cache-dir \
-        cmake==3.31.6 \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /tmp
-
-ARG MOLD_VERSION=2.40.1
-RUN wget --progress=dot:giga "https://github.com/rui314/mold/archive/refs/tags/v${MOLD_VERSION}.tar.gz" \
-    && tar xf "v${MOLD_VERSION}.tar.gz" \
-    && cd "mold-${MOLD_VERSION}" \
-    && mkdir build \
-    && cd build \
-    && cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. \
-    && ninja install \
-    && rm -rf /tmp/* /var/tmp/*
-
-ARG CCACHE_VERSION=4.11.3
-RUN wget --progress=dot:giga "https://github.com/ccache/ccache/releases/download/v${CCACHE_VERSION}/ccache-${CCACHE_VERSION}.tar.gz" \
-    && tar xf "ccache-${CCACHE_VERSION}.tar.gz" \
-    && cd "ccache-${CCACHE_VERSION}" \
-    && mkdir build \
-    && cd build \
-    && cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=False .. \
-    && ninja install \
-    && rm -rf /tmp/* /var/tmp/*
-
-ARG DOXYGEN_VERSION=1.12.0
-RUN wget --progress=dot:giga "https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/doxygen-${DOXYGEN_VERSION}.src.tar.gz" \
-    && tar xf "doxygen-${DOXYGEN_VERSION}.src.tar.gz" \
-    && cd "doxygen-${DOXYGEN_VERSION}" \
-    && mkdir build \
-    && cd build \
-    && cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. \
-    && ninja install \
-    && rm -rf /tmp/* /var/tmp/*
-
-ARG CLANG_BUILD_ANALYZER_VERSION=1.6.0
-RUN wget --progress=dot:giga "https://github.com/aras-p/ClangBuildAnalyzer/archive/refs/tags/v${CLANG_BUILD_ANALYZER_VERSION}.tar.gz" \
-    && tar xf "v${CLANG_BUILD_ANALYZER_VERSION}.tar.gz" \
-    && cd "ClangBuildAnalyzer-${CLANG_BUILD_ANALYZER_VERSION}" \
-    && mkdir build \
-    && cd build \
-    && cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. \
-    && ninja install \
-    && rm -rf /tmp/* /var/tmp/*
-
-ARG GIT_CLIFF_VERSION=2.9.1
-RUN wget --progress=dot:giga "https://github.com/orhun/git-cliff/releases/download/v${GIT_CLIFF_VERSION}/git-cliff-${GIT_CLIFF_VERSION}-x86_64-unknown-linux-musl.tar.gz" \
-    && tar xf git-cliff-${GIT_CLIFF_VERSION}-x86_64-unknown-linux-musl.tar.gz \
-    && mv git-cliff-${GIT_CLIFF_VERSION}/git-cliff /usr/local/bin/git-cliff \
-    && rm -rf /tmp/* /var/tmp/*
-
-ARG GH_VERSION=2.74.0
-RUN wget --progress=dot:giga "https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_${TARGETARCH}.tar.gz" \
-    && tar xf gh_${GH_VERSION}_linux_${TARGETARCH}.tar.gz \
-    && mv gh_${GH_VERSION}_linux_${TARGETARCH}/bin/gh /usr/local/bin/gh \
-    && rm -rf /tmp/* /var/tmp/*
-
-WORKDIR /root

docs/CMakeLists.txt

@@ -3,8 +3,6 @@ project(docs)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ClioVersion.cmake)
 
-# cmake-format: off
 # Generate `docs` target for doxygen documentation
 # Note: use `cmake --build . --target docs` from your `build` directory to generate the documentation
-# cmake-format: on
 include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Docs.cmake)

docs/Doxyfile

@@ -22,7 +22,6 @@ WARNINGS               = ${LINT}
 WARN_NO_PARAMDOC       = ${LINT}
 WARN_IF_INCOMPLETE_DOC = ${LINT}
 WARN_IF_UNDOCUMENTED   = ${LINT}
-WARN_AS_ERROR          = ${WARN_AS_ERROR}
 
 GENERATE_LATEX         = NO
 GENERATE_HTML          = YES
@@ -35,7 +34,7 @@ FULL_SIDEBAR           = NO
 HTML_HEADER            = ${SOURCE}/docs/doxygen-awesome-theme/header.html
 HTML_EXTRA_STYLESHEET  = ${SOURCE}/docs/doxygen-awesome-theme/doxygen-awesome.css \
                          ${SOURCE}/docs/doxygen-awesome-theme/doxygen-awesome-sidebar-only.css \
-                         ${SOURCE}/docs/doxygen-awesome-theme/doxygen-awesome-sidebar-only-darkmode-toggle.css
+                         ${SOURCE}/docs/doxygen-awesome-theme/doxygen-awesome-sidebar-only-darkmode-toggle.css 
 HTML_EXTRA_FILES       = ${SOURCE}/docs/doxygen-awesome-theme/doxygen-awesome-darkmode-toggle.js \
                          ${SOURCE}/docs/doxygen-awesome-theme/doxygen-awesome-interactive-toc.js
 

docs/build-clio.md

@@ -1,82 +1,58 @@
 # How to build Clio
 
-`Clio` is built with [CMake](https://cmake.org/) and uses [Conan](https://conan.io/) for managing dependencies.
+Clio is built with [CMake](https://cmake.org/) and uses [Conan](https://conan.io/) for managing dependencies. It is written in C++20 and therefore requires a modern compiler.
-`Clio` is written in C++23 and therefore requires a modern compiler.
 
 ## Minimum Requirements
 
 - [Python 3.7](https://www.python.org/downloads/)
-- [Conan 2.17.0](https://conan.io/downloads.html)
+- [Conan 1.55](https://conan.io/downloads.html)
-- [CMake 3.20, <4.0](https://cmake.org/download/)
+- [CMake 3.20](https://cmake.org/download/)
 - [**Optional**] [GCovr](https://gcc.gnu.org/onlinedocs/gcc/Gcov.html): needed for code coverage generation
 - [**Optional**] [CCache](https://ccache.dev/): speeds up compilation if you are going to compile Clio often
 
 | Compiler    | Version |
-| ----------- | ------- |
+|-------------|---------|
 | GCC         | 12.3    |
 | Clang       | 16      |
 | Apple Clang | 15      |
 
 ### Conan Configuration
 
-By default, Conan uses `~/.conan2` as it's home folder.
+Clio does not require anything other than `compiler.cppstd=20` in your (`~/.conan/profiles/default`) Conan profile.
-You can change it by using `$CONAN_HOME` env variable.
-[More info about Conan home](https://docs.conan.io/2/reference/environment.html#conan-home).
-
-> [!TIP]
-> To setup Conan automatically, you can run `.github/scripts/conan/init.sh`.
-> This will delete Conan home directory (if it exists), set up profiles and add Artifactory remote.
-
-The instruction below assumes that `$CONAN_HOME` is not set.
-
-#### Profiles
-
-The default profile is the file in `~/.conan2/profiles/default`.
-
-Here are some examples of possible profiles:
-
-**Mac apple-clang 17 example**:
-
-```text
-[settings]
-arch={{detect_api.detect_arch()}}
-build_type=Release
-compiler=apple-clang
-compiler.cppstd=20
-compiler.libcxx=libc++
-compiler.version=17
-os=Macos
-
-[conf]
-grpc/1.50.1:tools.build:cxxflags+=["-Wno-missing-template-arg-list-after-template-kw"]
-```
-
-**Linux gcc-12 example**:
-
-```text
-[settings]
-arch={{detect_api.detect_arch()}}
-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"}
-```
 
 > [!NOTE]
-> Although Clio is built using C++23, it's required to set `compiler.cppstd=20` in your profile for the time being as some of Clio's dependencies are not yet capable of building under C++23.
+> Although Clio is built using C++23, it's required to set `compiler.cppstd=20` for the time being as some of Clio's dependencies are not yet capable of building under C++23.
 
-#### global.conf file
+> Mac example:
 
-To increase the speed of downloading and uploading packages, add the following to the `~/.conan2/global.conf` file:
+```
+[settings]
+os=Macos
+os_build=Macos
+arch=armv8
+arch_build=armv8
+compiler=apple-clang
+compiler.version=15
+compiler.libcxx=libc++
+build_type=Release
+compiler.cppstd=20
+[conf]
+tools.build:cxxflags+=["-DBOOST_ASIO_DISABLE_CONCEPTS"]
+```
 
-```text
+> Linux example:
-core.download:parallel={{os.cpu_count()}}
+
-core.upload:parallel={{os.cpu_count()}}
+```
+[settings]
+os=Linux
+os_build=Linux
+arch=x86_64
+arch_build=x86_64
+compiler=gcc
+compiler.version=12
+compiler.libcxx=libstdc++11
+build_type=Release
+compiler.cppstd=20
 ```
 
 #### Artifactory
@@ -84,24 +60,18 @@ core.upload:parallel={{os.cpu_count()}}
 Make sure artifactory is setup with Conan.
 
 ```sh
-conan remote add --index 0 ripple http://18.143.149.228:8081/artifactory/api/conan/dev
+conan remote add --insert 0 conan-non-prod http://18.143.149.228:8081/artifactory/api/conan/conan-non-prod
 ```
 
-Now you should be able to download the prebuilt dependencies (including `xrpl` package) on supported platforms.
+Now you should be able to download the prebuilt `xrpl` package on some platforms.
 
-#### Conan lockfile
+> [!NOTE]
+> You may need to edit the `~/.conan/remotes.json` file to ensure that this newly added artifactory is listed last. Otherwise, you could see compilation errors when building the project with gcc version 13 (or newer).
 
-To achieve reproducible dependencies, we use [Conan lockfile](https://docs.conan.io/2/tutorial/versioning/lockfiles.html).
+Remove old packages you may have cached.
 
-The `conan.lock` file in the repository contains a "snapshot" of the current dependencies.
+```sh
-It is implicitly used when running `conan` commands, you don't need to specify it.
+conan remove -f xrpl
-
-You have to update this file every time you add a new dependency or change a revision or version of an existing dependency.
-
-To do that, run the following command in the repository root:
-
-```bash
-conan lock create . -o '&:tests=True' -o '&:benchmark=True'
 ```
 
 ## Building Clio
@@ -110,40 +80,34 @@ Navigate to Clio's root directory and run:
 
 ```sh
 mkdir build && cd build
-# You can also specify profile explicitly by adding `--profile:all <PROFILE_NAME>`
+conan install .. --output-folder . --build missing --settings build_type=Release -o tests=True -o lint=False
-conan install .. --output-folder . --build missing --settings build_type=Release -o '&:tests=True'
-# You can also add -GNinja to use Ninja build system instead of Make
 cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release ..
 cmake --build . --parallel 8 # or without the number if you feel extra adventurous
 ```
 
 > [!TIP]
-> You can omit the `-o '&:tests=True'` if you don't want to build `clio_tests`.
+> You can omit the `-o tests=True` if you don't want to build `clio_tests`.
 
 If successful, `conan install` will find the required packages and `cmake` will do the rest. You should see `clio_server` and `clio_tests` in the `build` directory (the current directory).
 
 > [!TIP]
-> To generate a Code Coverage report, include `-o '&:coverage=True'` in the `conan install` command above, along with `-o '&:tests=True'` to enable tests.
+> To generate a Code Coverage report, include `-o coverage=True` in the `conan install` command above, along with `-o tests=True` to enable tests. After running the `cmake` commands, execute `make clio_tests-ccov`. The coverage report will be found at `clio_tests-llvm-cov/index.html`.
-> After running the `cmake` commands, execute `make clio_tests-ccov`.
-> The coverage report will be found at `clio_tests-llvm-cov/index.html`.
-
-<!-- markdownlint-disable-line MD028 -->
 
 > [!NOTE]
 > If you've built Clio before and the build is now failing, it's likely due to updated dependencies. Try deleting the build folder and then rerunning the Conan and CMake commands mentioned above.
 
 ### Generating API docs for Clio
 
-The API documentation for Clio is generated by [Doxygen](https://www.doxygen.nl/index.html). If you want to generate the API documentation when building Clio, make sure to install Doxygen 1.12.0 on your system.
+The API documentation for Clio is generated by [Doxygen](https://www.doxygen.nl/index.html). If you want to generate the API documentation when building Clio, make sure to install Doxygen on your system.
 
 To generate the API docs:
 
-1. First, include `-o '&:docs=True'` in the conan install command. For example:
+1. First, include `-o docs=True` in the conan install command. For example:
 
-   ```sh
+    ```sh
-   mkdir build && cd build
+    mkdir build && cd build
-   conan install .. --output-folder . --build missing --settings build_type=Release -o '&:tests=True' -o '&:docs=True'
+    conan install .. --output-folder . --build missing --settings build_type=Release -o tests=True -o lint=False -o docs=True
-   ```
+    ```
 
 2. Once that has completed successfully, run the `cmake` command and add the `--target docs` option:
 
@@ -154,19 +118,19 @@ To generate the API docs:
 
 3. Go to `build/docs/html` to view the generated files.
 
-   Open the `index.html` file in your browser to see the documentation pages.
+    Open the `index.html` file in your browser to see the documentation pages.
 
-   ![API index page](./img/doxygen-docs-output.png "API index page")
+    ![API index page](./img/doxygen-docs-output.png "API index page")
 
 ## Building Clio with Docker
 
 It is also possible to build Clio using [Docker](https://www.docker.com/) if you don't want to install all the dependencies on your machine.
 
 ```sh
-docker run -it ghcr.io/xrplf/clio-ci:latest
+docker run -it rippleci/clio_ci:latest
 git clone https://github.com/XRPLF/clio
 mkdir build && cd build
-conan install .. --output-folder . --build missing --settings build_type=Release -o '&:tests=True'
+conan install .. --output-folder . --build missing --settings build_type=Release -o tests=True -o lint=False
 cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release ..
 cmake --build . --parallel 8 # or without the number if you feel extra adventurous
 ```
@@ -182,56 +146,55 @@ If you wish to develop against a `rippled` instance running in standalone mode t
 
 Sometimes, during development, you need to build against a custom version of `libxrpl`. (For example, you may be developing compatibility for a proposed amendment that is not yet merged to the main `rippled` codebase.) To build Clio with compatibility for a custom fork or branch of `rippled`, follow these steps:
 
-1. First, pull/clone the appropriate `rippled` version and switch to the branch you want to build.
+1. First, pull/clone the appropriate `rippled` fork and switch to the branch you want to build. For example, the following example uses an in-development build with [XLS-33d Multi-Purpose Tokens](https://github.com/XRPLF/XRPL-Standards/tree/master/XLS-0033d-multi-purpose-tokens):
-   The following example uses a `2.5.0-rc1` tag of rippled in the main branch:
 
-   ```sh
+    ```sh
-   git clone https://github.com/XRPLF/rippled/
+    git clone https://github.com/shawnxie999/rippled/
-   cd rippled
+    cd rippled
-   git checkout 2.5.0-rc1
+    git switch mpt-1.1
-   ```
+    ```
 
 2. Export a custom package to your local Conan store using a user/channel:
 
-   ```sh
+    ```sh
-   conan export . --user=my --channel=feature
+    conan export . my/feature
-   ```
+    ```
 
 3. Patch your local Clio build to use the right package.
 
-   Edit `conanfile.py` in the Clio repository root. Replace the `xrpl` requirement with the custom package version from the previous step. This must also include the current version number from your `rippled` branch. For example:
+    Edit `conanfile.py` (from the Clio repository root). Replace the `xrpl` requirement with the custom package version from the previous step. This must also include the current version number from your `rippled` branch. For example:
 
-   ```py
+    ```py
-   # ... (excerpt from conanfile.py)
+    # ... (excerpt from conanfile.py)
-   requires = [
+        requires = [
-       'boost/1.83.0',
+        'boost/1.82.0',
-       'cassandra-cpp-driver/2.17.0',
+        'cassandra-cpp-driver/2.17.0',
-       'fmt/10.1.1',
+        'fmt/10.1.1',
-       'protobuf/3.21.9',
+        'protobuf/3.21.9',
-       'grpc/1.50.1',
+        'grpc/1.50.1',
-       'openssl/1.1.1v',
+        'openssl/1.1.1u',
-       'xrpl/2.5.0-rc1@my/feature', # Use your exported version here
+        'xrpl/2.3.0-b1@my/feature', # Update this line
-       'zlib/1.3.1',
+        'libbacktrace/cci.20210118'
-       'libbacktrace/cci.20210118'
+    ]
-   ]
+    ```
-   ```
 
 4. Build Clio as you would have before.
 
-   See [Building Clio](#building-clio) for details.
+    See [Building Clio](#building-clio) for details.
 
 ## Using `clang-tidy` for static analysis
 
-Clang-tidy can be run by CMake when building the project.
+The minimum [clang-tidy](https://clang.llvm.org/extra/clang-tidy/) version required is 19.0.
-To achieve this, you just need to provide the option `-o '&:lint=True'` for the `conan install` command:
+
+Clang-tidy can be run by Cmake when building the project. To achieve this, you just need to provide the option `-o lint=True` for the `conan install` command:
 
 ```sh
-conan install .. --output-folder . --build missing --settings build_type=Release -o '&:tests=True' -o '&:lint=True' --profile:all clang
+conan install .. --output-folder . --build missing --settings build_type=Release -o tests=True -o lint=True
 ```
 
-By default CMake will try to find `clang-tidy` automatically in your system.
+By default Cmake will try to find `clang-tidy` automatically in your system.
-To force CMake to use your desired binary, set the `CLIO_CLANG_TIDY_BIN` environment variable to the path of the `clang-tidy` binary. For example:
+To force Cmake to use your desired binary, set the `CLIO_CLANG_TIDY_BIN` environment variable to the path of the `clang-tidy` binary. For example:
 
 ```sh
-export CLIO_CLANG_TIDY_BIN=/opt/homebrew/opt/llvm/bin/clang-tidy
+export CLIO_CLANG_TIDY_BIN=/opt/homebrew/opt/llvm@19/bin/clang-tidy
 ```

docs/config-description.md

@@ -381,7 +381,7 @@ This document provides a list of all available Clio configuration properties in
 - **Type**: int
 - **Default value**: `48`
 - **Constraints**: The minimum value is `1`. The maximum value is `65535`.
-- **Description**: Specifies how many markers are placed randomly within the cache. These markers define the positions on the ledger that will be loaded concurrently by the workers. The higher the number, the more places within the cache we potentially cover.
+- **Description**:  Specifies how many markers are placed randomly within the cache. These markers define the positions on the ledger that will be loaded concurrently by the workers. The higher the number, the more places within the cache we potentially cover.
 
 ### cache.num_cursors_from_diff
 
@@ -445,7 +445,7 @@ This document provides a list of all available Clio configuration properties in
 - **Type**: string
 - **Default value**: `%TimeStamp% (%SourceLocation%) [%ThreadID%] %Channel%:%Severity% %Message%`
 - **Constraints**: None
-- **Description**: The format string for log messages. The format is described here: <https://www.boost.org/doc/libs/1_83_0/libs/log/doc/html/log/tutorial/formatters.html>.
+- **Description**: The format string for log messages. The format is described here: https://www.boost.org/doc/libs/1_83_0/libs/log/doc/html/log/tutorial/formatters.html.
 
 ### log_to_console