Merge branch 'develop' into chore/environment-build-doc-update

.clang-format

@@ -58,6 +58,7 @@ IncludeCategories:
 IncludeIsMainRegex: '$'
 IndentCaseLabels: true
 IndentFunctionDeclarationAfterType: false
+IndentRequiresClause: true
 IndentWidth: 4
 IndentWrappedFunctionNames: false
 KeepEmptyLinesAtTheStartOfBlocks: false
@@ -73,6 +74,7 @@ PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
 ReflowComments: true
+RequiresClausePosition: OwnLine
 SortIncludes: true
 SpaceAfterCStyleCast: false
 SpaceBeforeAssignmentOperators: true

.git-blame-ignore-revs

@@ -10,3 +10,4 @@ e2384885f5f630c8f0ffe4bf21a169b433a16858
 b9d007813378ad0ff45660dc07285b823c7e9855
 fe9a5365b8a52d4acc42eb27369247e6f238a4f9
 9a93577314e6a8d4b4a8368cc9d2b15a5d8303e8
+552377c76f55b403a1c876df873a23d780fcc81c

.github/workflows/clang-format.yml

@@ -4,9 +4,9 @@ on: [push, pull_request]
 
 jobs:
  check:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-24.04
  env:
- CLANG_VERSION: 10
+ CLANG_VERSION: 18
  steps:
  - uses: actions/checkout@v4
  - name: Install clang-format
@@ -19,8 +19,8 @@ jobs:
  wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add
  sudo apt-get update
  sudo apt-get install clang-format-${CLANG_VERSION}
- - name: Format sources
- run: find include src -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.ipp' \) -exec clang-format-${CLANG_VERSION} -i {} +
+ - name: Format first-party sources
+ run: find include src -type f \( -name '*.cpp' -o -name '*.hpp' -o -name '*.h' -o -name '*.ipp' \) -exec clang-format-${CLANG_VERSION} -i {} +
  - name: Check for differences
  id: assert
  run: |
@@ -50,7 +50,7 @@ jobs:
  To fix it, you can do one of two things:
  1. Download and apply the patch generated as an artifact of this
  job to your repo, commit, and push.
- 2. Run 'git-clang-format --extensions c,cpp,h,cxx,ipp develop'
+ 2. Run 'git-clang-format --extensions cpp,h,hpp,ipp develop'
  in your repo, commit, and push.
  run: |
  echo "${PREAMBLE}"

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 # .pre-commit-config.yaml
 repos:
 - repo: https:/pre-commit/mirrors-clang-format
- rev: v10.0.1
+ rev: v18.1.3
  hooks:
  - id: clang-format

include/xrpl/basics/Expected.h

@@ -136,67 +136,76 @@ class [[nodiscard]] Expected
 
 public:
  template <typename U>
- requires std::convertible_to<U, T> constexpr Expected(U && r)
-   : Base(T(std::forward<U>(r)))
+  requires std::convertible_to<U, T>
+ constexpr Expected(U&& r) : Base(T(std::forward<U>(r)))
  {
  }
 
  template <typename U>
- requires std::convertible_to<U, E> &&
- (!std::is_reference_v<U>)constexpr Expected(Unexpected<U> e)
- : Base(E(std::move(e.value())))
+ requires std::convertible_to<U, E> && (!std::is_reference_v<U>)
+ constexpr Expected(Unexpected<U> e) : Base(E(std::move(e.value())))
  {
  }
 
- constexpr bool has_value() const
+ constexpr bool
+ has_value() const
  {
  return Base::has_value();
  }
 
- constexpr T const& value() const
+ constexpr T const&
+ value() const
  {
  return Base::value();
  }
 
- constexpr T& value()
+ constexpr T&
+ value()
  {
  return Base::value();
  }
 
- constexpr E const& error() const
+ constexpr E const&
+ error() const
  {
  return Base::error();
  }
 
- constexpr E& error()
+ constexpr E&
+ error()
  {
  return Base::error();
  }
 
- constexpr explicit operator bool() const
+ constexpr explicit
+ operator bool() const
  {
  return has_value();
  }
 
  // Add operator* and operator-> so the Expected API looks a bit more like
  // what std::expected is likely to look like. See:
  // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2021/p0323r10.html
- [[nodiscard]] constexpr T& operator*()
+ [[nodiscard]] constexpr T&
+ operator*()
  {
  return this->value();
  }
 
- [[nodiscard]] constexpr T const& operator*() const
+ [[nodiscard]] constexpr T const&
+ operator*() const
  {
  return this->value();
  }
 
- [[nodiscard]] constexpr T* operator->()
+ [[nodiscard]] constexpr T*
+ operator->()
  {
  return &this->value();
  }
 
- [[nodiscard]] constexpr T const* operator->() const
+ [[nodiscard]] constexpr T const*
+ operator->() const
  {
  return &this->value();
  }
@@ -218,23 +227,25 @@ class [[nodiscard]] Expected<void, E>
  }
 
  template <typename U>
- requires std::convertible_to<U, E> &&
- (!std::is_reference_v<U>)constexpr Expected(Unexpected<U> e)
- : Base(E(std::move(e.value())))
+ requires std::convertible_to<U, E> && (!std::is_reference_v<U>)
+ constexpr Expected(Unexpected<U> e) : Base(E(std::move(e.value())))
  {
  }
 
- constexpr E const& error() const
+ constexpr E const&
+ error() const
  {
  return Base::error();
  }
 
- constexpr E& error()
+ constexpr E&
+ error()
  {
  return Base::error();
  }
 
- constexpr explicit operator bool() const
+ constexpr explicit
+ operator bool() const
  {
  return Base::has_value();
  }

include/xrpl/basics/FeeUnits.h

@@ -84,13 +84,13 @@ class TaggedFee : private boost::totally_ordered<TaggedFee<UnitTag, T>>,
 protected:
  template <class Other>
  static constexpr bool is_compatible_v =
- std::is_arithmetic_v<Other>&& std::is_arithmetic_v<value_type>&&
-  std::is_convertible_v<Other, value_type>;
+ std::is_arithmetic_v<Other> && std::is_arithmetic_v<value_type> &&
+ std::is_convertible_v<Other, value_type>;
 
  template <class OtherFee, class = enable_if_unit_t<OtherFee>>
  static constexpr bool is_compatiblefee_v =
- is_compatible_v<typename OtherFee::value_type>&&
-  std::is_same_v<UnitTag, typename OtherFee::unit_type>;
+ is_compatible_v<typename OtherFee::value_type> &&
+ std::is_same_v<UnitTag, typename OtherFee::unit_type>;
 
  template <class Other>
  using enable_if_compatible_t =
@@ -110,7 +110,8 @@ class TaggedFee : private boost::totally_ordered<TaggedFee<UnitTag, T>>,
  {
  }
 
- constexpr TaggedFee& operator=(beast::Zero)
+ constexpr TaggedFee&
+ operator=(beast::Zero)
  {
  fee_ = 0;
  return *this;
@@ -250,7 +251,8 @@ class TaggedFee : private boost::totally_ordered<TaggedFee<UnitTag, T>>,
  }
 
  /** Returns true if the amount is not zero */
- explicit constexpr operator bool() const noexcept
+ explicit constexpr
+ operator bool() const noexcept
  {
  return fee_ != 0;
  }
@@ -344,8 +346,8 @@ constexpr bool can_muldiv_source_v =
 
 template <class Dest, class = enable_if_unit_t<Dest>>
 constexpr bool can_muldiv_dest_v =
- can_muldiv_source_v<Dest>&& // Dest is also a source
-  std::is_convertible_v<std::uint64_t, typename Dest::value_type> &&
+ can_muldiv_source_v<Dest> && // Dest is also a source
+ std::is_convertible_v<std::uint64_t, typename Dest::value_type> &&
  sizeof(typename Dest::value_type) >= sizeof(std::uint64_t);
 
 template <
@@ -354,8 +356,8 @@ template <
  class = enable_if_unit_t<Source1>,
  class = enable_if_unit_t<Source2>>
 constexpr bool can_muldiv_sources_v =
- can_muldiv_source_v<Source1>&& can_muldiv_source_v<Source2>&& std::
-  is_same_v<typename Source1::unit_type, typename Source2::unit_type>;
+ can_muldiv_source_v<Source1> && can_muldiv_source_v<Source2> &&
+ std::is_same_v<typename Source1::unit_type, typename Source2::unit_type>;
 
 template <
  class Source1,
@@ -365,7 +367,7 @@ template <
  class = enable_if_unit_t<Source2>,
  class = enable_if_unit_t<Dest>>
 constexpr bool can_muldiv_v =
- can_muldiv_sources_v<Source1, Source2>&& can_muldiv_dest_v<Dest>;
+ can_muldiv_sources_v<Source1, Source2> && can_muldiv_dest_v<Dest>;
 // Source and Dest can be the same by default
 
 template <

include/xrpl/basics/IOUAmount.h

@@ -82,7 +82,8 @@ class IOUAmount : private boost::totally_ordered<IOUAmount>,
  operator<(IOUAmount const& other) const;
 
  /** Returns true if the amount is not zero */
- explicit operator bool() const noexcept;
+ explicit
+ operator bool() const noexcept;
 
  /** Return the sign of the amount */
  int
@@ -109,7 +110,8 @@ inline IOUAmount::IOUAmount(std::int64_t mantissa, int exponent)
  normalize();
 }
 
-inline IOUAmount& IOUAmount::operator=(beast::Zero)
+inline IOUAmount&
+IOUAmount::operator=(beast::Zero)
 {
  // The -100 is used to allow 0 to sort less than small positive values
  // which will have a large negative exponent.

include/xrpl/basics/Number.h

@@ -88,8 +88,10 @@ class Number
  static constexpr Number
  lowest() noexcept;
 
- explicit operator XRPAmount() const; // round to nearest, even on tie
- explicit operator rep() const; // round to nearest, even on tie
+ explicit
+ operator XRPAmount() const; // round to nearest, even on tie
+ explicit
+ operator rep() const; // round to nearest, even on tie
 
  friend constexpr bool
  operator==(Number const& x, Number const& y) noexcept

include/xrpl/basics/XRPAmount.h

@@ -65,7 +65,8 @@ class XRPAmount : private boost::totally_ordered<XRPAmount>,
  {
  }
 
- constexpr XRPAmount& operator=(beast::Zero)
+ constexpr XRPAmount&
+ operator=(beast::Zero)
  {
  drops_ = 0;
  return *this;
@@ -155,7 +156,8 @@ class XRPAmount : private boost::totally_ordered<XRPAmount>,
  }
 
  /** Returns true if the amount is not zero */
- explicit constexpr operator bool() const noexcept
+ explicit constexpr
+ operator bool() const noexcept
  {
  return drops_ != 0;
  }

include/xrpl/basics/base_uint.h

@@ -521,7 +521,8 @@ class base_uint
  return bytes;
  }
 
- base_uint<Bits, Tag>& operator=(beast::Zero)
+ base_uint<Bits, Tag>&
+ operator=(beast::Zero)
  {
  data_.fill(0);
  return *this;

include/xrpl/basics/safe_cast.h

@@ -30,8 +30,8 @@ namespace ripple {
 
 template <class Dest, class Src>
 static constexpr bool is_safetocasttovalue_v =
- (std::is_integral_v<Src> && std::is_integral_v<Dest>)&&(
-  std::is_signed<Src>::value || std::is_unsigned<Dest>::value) &&
+ (std::is_integral_v<Src> && std::is_integral_v<Dest>) &&
+ (std::is_signed<Src>::value || std::is_unsigned<Dest>::value) &&
  (std::is_signed<Src>::value != std::is_signed<Dest>::value
  ? sizeof(Dest) > sizeof(Src)
  : sizeof(Dest) >= sizeof(Src));

include/xrpl/basics/tagged_integer.h

@@ -187,7 +187,8 @@ class tagged_integer
  return *this;
  }
 
- explicit operator Int() const noexcept
+ explicit
+ operator Int() const noexcept
  {
  return m_value;
  }

include/xrpl/beast/container/detail/aged_ordered_container.h

@@ -846,8 +846,9 @@ class aged_ordered_container
  // set
  template <bool maybe_multi = IsMulti, bool maybe_map = IsMap>
  auto
- insert(value_type&& value) -> typename std::
- enable_if<!maybe_multi && !maybe_map, std::pair<iterator, bool>>::type;
+ insert(value_type&& value) -> typename std::enable_if<
+ !maybe_multi && !maybe_map,
+ std::pair<iterator, bool>>::type;
 
  // multiset
  template <bool maybe_multi = IsMulti, bool maybe_map = IsMap>
@@ -1795,7 +1796,8 @@ template <
 template <bool maybe_multi, bool maybe_map>
 auto
 aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::
- insert(value_type&& value) -> typename std::
+ insert(value_type&& value) ->
+ typename std::
  enable_if<!maybe_multi && !maybe_map, std::pair<iterator, bool>>::type
 {
  typename cont_type::insert_commit_data d;

include/xrpl/beast/container/detail/aged_unordered_container.h

@@ -1057,8 +1057,9 @@ class aged_unordered_container
  // map, set
  template <bool maybe_multi = IsMulti, bool maybe_map = IsMap>
  auto
- insert(value_type&& value) -> typename std::
- enable_if<!maybe_multi && !maybe_map, std::pair<iterator, bool>>::type;
+ insert(value_type&& value) -> typename std::enable_if<
+ !maybe_multi && !maybe_map,
+ std::pair<iterator, bool>>::type;
 
  // multimap, multiset
  template <bool maybe_multi = IsMulti, bool maybe_map = IsMap>
@@ -2799,8 +2800,9 @@ aged_unordered_container<
  Clock,
  Hash,
  KeyEqual,
- Allocator>::insert(value_type&& value) -> typename std::
- enable_if<!maybe_multi && !maybe_map, std::pair<iterator, bool>>::type
+ Allocator>::insert(value_type&& value) ->
+ typename std::
+ enable_if<!maybe_multi && !maybe_map, std::pair<iterator, bool>>::type
 {
  maybe_rehash(1);
  typename cont_type::insert_commit_data d;

include/xrpl/beast/hash/xxhasher.h

@@ -90,7 +90,8 @@ class xxhasher
  XXH3_64bits_update(state_, key, len);
  }
 
- explicit operator std::size_t() noexcept
+ explicit
+ operator std::size_t() noexcept
  {
  return XXH3_64bits_digest(state_);
  }