Merge branch 'develop' into vault

2026-08-21 14:20:56 +00:00 · 2025-03-11 23:23:02 +00:00
parent 3715d7e2e4 2406b28e64
commit 4c586eb4b0
767 changed files with 1467 additions and 1080 deletions
--- a/Builds/levelization/results/loops.txt
+++ b/Builds/levelization/results/loops.txt
@@ -14,10 +14,10 @@ Loop: xrpld.app xrpld.net
  xrpld.app > xrpld.net

 Loop: xrpld.app xrpld.overlay
-  xrpld.overlay == xrpld.app
+  xrpld.overlay > xrpld.app

 Loop: xrpld.app xrpld.peerfinder
-  xrpld.app > xrpld.peerfinder
+  xrpld.peerfinder ~= xrpld.app

 Loop: xrpld.app xrpld.rpc
  xrpld.rpc > xrpld.app
--- a/Builds/levelization/results/ordering.txt
+++ b/Builds/levelization/results/ordering.txt
@@ -6,6 +6,7 @@ libxrpl.protocol > xrpl.basics
 libxrpl.protocol > xrpl.json
 libxrpl.protocol > xrpl.protocol
 libxrpl.resource > xrpl.basics
+libxrpl.resource > xrpl.json
 libxrpl.resource > xrpl.resource
 libxrpl.server > xrpl.basics
 libxrpl.server > xrpl.json
@@ -58,7 +59,6 @@ test.json > test.jtx
 test.json > xrpl.json
 test.jtx > xrpl.basics
 test.jtx > xrpld.app
-test.jtx > xrpld.consensus
 test.jtx > xrpld.core
 test.jtx > xrpld.ledger
 test.jtx > xrpld.net
@@ -158,7 +158,6 @@ xrpld.core > xrpl.basics
 xrpld.core > xrpl.json
 xrpld.core > xrpl.protocol
 xrpld.ledger > xrpl.basics
-xrpld.ledger > xrpld.core
 xrpld.ledger > xrpl.json
 xrpld.ledger > xrpl.protocol
 xrpld.net > xrpl.basics
@@ -183,7 +182,6 @@ xrpld.peerfinder > xrpld.core
 xrpld.peerfinder > xrpl.protocol
 xrpld.perflog > xrpl.basics
 xrpld.perflog > xrpl.json
-xrpld.perflog > xrpl.protocol
 xrpld.rpc > xrpl.basics
 xrpld.rpc > xrpld.core
 xrpld.rpc > xrpld.ledger
--- a/include/xrpl/basics/BasicConfig.h
+++ b/include/xrpl/basics/BasicConfig.h
@@ -27,7 +27,6 @@

 #include <algorithm>
 #include <optional>
-#include <ostream>
 #include <string>
 #include <unordered_map>
 #include <vector>
--- a/include/xrpl/basics/Buffer.h
+++ b/include/xrpl/basics/Buffer.h
@@ -22,10 +22,9 @@

 #include <xrpl/basics/Slice.h>
 #include <xrpl/beast/utility/instrumentation.h>
+
 #include <cstdint>
 #include <cstring>
-#include <memory>
-#include <utility>

 namespace ripple {

--- a/include/xrpl/basics/CompressionAlgorithms.h
+++ b/include/xrpl/basics/CompressionAlgorithms.h
@@ -21,9 +21,11 @@
 #define RIPPLED_COMPRESSIONALGORITHMS_H_INCLUDED

 #include <xrpl/basics/contract.h>
+
+#include <lz4.h>
+
 #include <algorithm>
 #include <cstdint>
-#include <lz4.h>
 #include <stdexcept>
 #include <vector>

--- a/include/xrpl/basics/CountedObject.h
+++ b/include/xrpl/basics/CountedObject.h
@@ -21,6 +21,7 @@
 #define RIPPLE_BASICS_COUNTEDOBJECT_H_INCLUDED

 #include <xrpl/beast/type_name.h>
+
 #include <atomic>
 #include <string>
 #include <utility>
--- a/include/xrpl/basics/Expected.h
+++ b/include/xrpl/basics/Expected.h
@@ -24,9 +24,7 @@

 #include <boost/outcome.hpp>

-#include <concepts>
 #include <stdexcept>
-#include <type_traits>

 namespace ripple {

--- a/include/xrpl/basics/LocalValue.h
+++ b/include/xrpl/basics/LocalValue.h
@@ -21,6 +21,7 @@
 #define RIPPLE_BASICS_LOCALVALUE_H_INCLUDED

 #include <boost/thread/tss.hpp>
+
 #include <memory>
 #include <unordered_map>

--- a/include/xrpl/basics/Log.h
+++ b/include/xrpl/basics/Log.h
@@ -22,8 +22,10 @@

 #include <xrpl/basics/UnorderedContainers.h>
 #include <xrpl/beast/utility/Journal.h>
+
 #include <boost/beast/core/string.hpp>
 #include <boost/filesystem.hpp>
+
 #include <map>
 #include <memory>
 #include <mutex>
--- a/include/xrpl/basics/Resolver.h
+++ b/include/xrpl/basics/Resolver.h
@@ -20,11 +20,11 @@
 #ifndef RIPPLE_BASICS_RESOLVER_H_INCLUDED
 #define RIPPLE_BASICS_RESOLVER_H_INCLUDED

+#include <xrpl/beast/net/IPEndpoint.h>
+
 #include <functional>
 #include <vector>

-#include <xrpl/beast/net/IPEndpoint.h>
-
 namespace ripple {

 class Resolver
--- a/include/xrpl/basics/ResolverAsio.h
+++ b/include/xrpl/basics/ResolverAsio.h
@@ -22,6 +22,7 @@

 #include <xrpl/basics/Resolver.h>
 #include <xrpl/beast/utility/Journal.h>
+
 #include <boost/asio/io_service.hpp>

 namespace ripple {
--- a/include/xrpl/basics/Slice.h
+++ b/include/xrpl/basics/Slice.h
@@ -23,6 +23,7 @@
 #include <xrpl/basics/contract.h>
 #include <xrpl/basics/strHex.h>
 #include <xrpl/beast/utility/instrumentation.h>
+
 #include <algorithm>
 #include <array>
 #include <cstdint>
--- a/include/xrpl/basics/TaggedCache.h
+++ b/include/xrpl/basics/TaggedCache.h
@@ -25,6 +25,7 @@
 #include <xrpl/basics/hardened_hash.h>
 #include <xrpl/beast/clock/abstract_clock.h>
 #include <xrpl/beast/insight/Insight.h>
+
 #include <atomic>
 #include <functional>
 #include <mutex>
--- a/include/xrpl/basics/UnorderedContainers.h
+++ b/include/xrpl/basics/UnorderedContainers.h
@@ -25,6 +25,7 @@
 #include <xrpl/beast/hash/hash_append.h>
 #include <xrpl/beast/hash/uhash.h>
 #include <xrpl/beast/hash/xxhasher.h>
+
 #include <unordered_map>
 #include <unordered_set>

--- a/include/xrpl/basics/base_uint.h
+++ b/include/xrpl/basics/base_uint.h
@@ -33,12 +33,13 @@
 #include <xrpl/basics/strHex.h>
 #include <xrpl/beast/utility/Zero.h>
 #include <xrpl/beast/utility/instrumentation.h>
+
 #include <boost/endian/conversion.hpp>
 #include <boost/functional/hash.hpp>
+
 #include <algorithm>
 #include <array>
 #include <cstring>
-#include <functional>
 #include <type_traits>

 namespace ripple {
--- a/include/xrpl/basics/chrono.h
+++ b/include/xrpl/basics/chrono.h
@@ -20,17 +20,16 @@
 #ifndef RIPPLE_BASICS_CHRONO_H_INCLUDED
 #define RIPPLE_BASICS_CHRONO_H_INCLUDED

-#include <date/date.h>
-
 #include <xrpl/beast/clock/abstract_clock.h>
 #include <xrpl/beast/clock/basic_seconds_clock.h>
 #include <xrpl/beast/clock/manual_clock.h>

+#include <date/date.h>
+
 #include <chrono>
 #include <cstdint>
 #include <ratio>
 #include <string>
-#include <type_traits>

 namespace ripple {

--- a/include/xrpl/basics/contract.h
+++ b/include/xrpl/basics/contract.h
@@ -21,9 +21,9 @@
 #define RIPPLE_BASICS_CONTRACT_H_INCLUDED

 #include <xrpl/beast/type_name.h>
+
 #include <exception>
 #include <string>
-#include <typeinfo>
 #include <utility>

 namespace ripple {
--- a/include/xrpl/basics/make_SSLContext.h
+++ b/include/xrpl/basics/make_SSLContext.h
@@ -21,6 +21,7 @@
 #define RIPPLE_BASICS_MAKE_SSLCONTEXT_H_INCLUDED

 #include <boost/asio/ssl/context.hpp>
+
 #include <string>

 namespace ripple {
--- a/include/xrpl/basics/partitioned_unordered_map.h
+++ b/include/xrpl/basics/partitioned_unordered_map.h
@@ -22,6 +22,7 @@

 #include <xrpl/beast/hash/uhash.h>
 #include <xrpl/beast/utility/instrumentation.h>
+
 #include <functional>
 #include <optional>
 #include <string>
--- a/include/xrpl/basics/random.h
+++ b/include/xrpl/basics/random.h
@@ -22,9 +22,9 @@

 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/beast/xor_shift_engine.h>
+
 #include <cstddef>
 #include <cstdint>
-#include <cstring>
 #include <limits>
 #include <mutex>
 #include <random>
--- a/include/xrpl/basics/spinlock.h
+++ b/include/xrpl/basics/spinlock.h
@@ -19,6 +19,7 @@
 #define RIPPLE_BASICS_SPINLOCK_H_INCLUDED

 #include <xrpl/beast/utility/instrumentation.h>
+
 #include <atomic>
 #include <limits>
 #include <type_traits>
--- a/include/xrpl/basics/tagged_integer.h
+++ b/include/xrpl/basics/tagged_integer.h
@@ -21,7 +21,9 @@
 #define BEAST_UTILITY_TAGGED_INTEGER_H_INCLUDED

 #include <xrpl/beast/hash/hash_append.h>
+
 #include <boost/operators.hpp>
+
 #include <functional>
 #include <iostream>
 #include <type_traits>
--- a/include/xrpl/beast/asio/io_latency_probe.h
+++ b/include/xrpl/beast/asio/io_latency_probe.h
@@ -21,6 +21,7 @@
 #define BEAST_ASIO_IO_LATENCY_PROBE_H_INCLUDED

 #include <xrpl/beast/utility/instrumentation.h>
+
 #include <boost/asio/basic_waitable_timer.hpp>
 #include <boost/asio/io_service.hpp>

--- a/include/xrpl/beast/container/detail/aged_ordered_container.h
+++ b/include/xrpl/beast/container/detail/aged_ordered_container.h
@@ -25,9 +25,11 @@
 #include <xrpl/beast/container/detail/aged_associative_container.h>
 #include <xrpl/beast/container/detail/aged_container_iterator.h>
 #include <xrpl/beast/container/detail/empty_base_optimization.h>
+
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/set.hpp>
 #include <boost/version.hpp>
+
 #include <algorithm>
 #include <functional>
 #include <initializer_list>
--- a/include/xrpl/beast/container/detail/aged_unordered_container.h
+++ b/include/xrpl/beast/container/detail/aged_unordered_container.h
@@ -25,8 +25,10 @@
 #include <xrpl/beast/container/detail/aged_associative_container.h>
 #include <xrpl/beast/container/detail/aged_container_iterator.h>
 #include <xrpl/beast/container/detail/empty_base_optimization.h>
+
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/unordered_set.hpp>
+
 #include <algorithm>
 #include <cmath>
 #include <functional>
--- a/include/xrpl/beast/container/detail/empty_base_optimization.h
+++ b/include/xrpl/beast/container/detail/empty_base_optimization.h
@@ -11,6 +11,7 @@
 #define BEAST_CONTAINER_DETAIL_EMPTY_BASE_OPTIMIZATION_H_INCLUDED

 #include <boost/type_traits/is_final.hpp>
+
 #include <type_traits>
 #include <utility>

--- a/include/xrpl/beast/core/LexicalCast.h
+++ b/include/xrpl/beast/core/LexicalCast.h
@@ -23,6 +23,7 @@
 #include <xrpl/beast/utility/instrumentation.h>

 #include <boost/core/detail/string_view.hpp>
+
 #include <algorithm>
 #include <cerrno>
 #include <charconv>
--- a/include/xrpl/beast/core/List.h
+++ b/include/xrpl/beast/core/List.h
@@ -21,7 +21,6 @@
 #define BEAST_INTRUSIVE_LIST_H_INCLUDED

 #include <iterator>
-#include <type_traits>

 namespace beast {

--- a/include/xrpl/beast/hash/hash_append.h
+++ b/include/xrpl/beast/hash/hash_append.h
@@ -23,6 +23,7 @@

 #include <boost/container/flat_set.hpp>
 #include <boost/endian/conversion.hpp>
+
 #include <array>
 #include <chrono>
 #include <cstdint>
--- a/include/xrpl/beast/insight/Meter.h
+++ b/include/xrpl/beast/insight/Meter.h
@@ -20,10 +20,10 @@
 #ifndef BEAST_INSIGHT_METER_H_INCLUDED
 #define BEAST_INSIGHT_METER_H_INCLUDED

-#include <memory>
-
 #include <xrpl/beast/insight/MeterImpl.h>

+#include <memory>
+
 namespace beast {
 namespace insight {

--- a/include/xrpl/beast/insight/StatsDCollector.h
+++ b/include/xrpl/beast/insight/StatsDCollector.h
@@ -21,7 +21,6 @@
 #define BEAST_INSIGHT_STATSDCOLLECTOR_H_INCLUDED

 #include <xrpl/beast/insight/Collector.h>
-
 #include <xrpl/beast/net/IPEndpoint.h>
 #include <xrpl/beast/utility/Journal.h>

--- a/include/xrpl/beast/net/IPAddress.h
+++ b/include/xrpl/beast/net/IPAddress.h
@@ -25,8 +25,10 @@
 #include <xrpl/beast/net/IPAddressV4.h>
 #include <xrpl/beast/net/IPAddressV6.h>
 #include <xrpl/beast/utility/instrumentation.h>
+
 #include <boost/asio/ip/address.hpp>
 #include <boost/functional/hash.hpp>
+
 #include <cstdint>
 #include <ios>
 #include <sstream>
--- a/include/xrpl/beast/net/IPAddressConversion.h
+++ b/include/xrpl/beast/net/IPAddressConversion.h
@@ -22,8 +22,6 @@

 #include <xrpl/beast/net/IPEndpoint.h>

-#include <sstream>
-
 #include <boost/asio.hpp>

 namespace beast {
--- a/include/xrpl/beast/net/IPAddressV4.h
+++ b/include/xrpl/beast/net/IPAddressV4.h
@@ -21,7 +21,9 @@
 #define BEAST_NET_IPADDRESSV4_H_INCLUDED

 #include <xrpl/beast/hash/hash_append.h>
+
 #include <boost/asio/ip/address_v4.hpp>
+
 #include <cstdint>
 #include <functional>
 #include <ios>
--- a/include/xrpl/beast/net/IPAddressV6.h
+++ b/include/xrpl/beast/net/IPAddressV6.h
@@ -21,7 +21,9 @@
 #define BEAST_NET_IPADDRESSV6_H_INCLUDED

 #include <xrpl/beast/utility/instrumentation.h>
+
 #include <boost/asio/ip/address_v6.hpp>
+
 #include <cstdint>
 #include <functional>
 #include <ios>
--- a/include/xrpl/beast/rfc2616.h
+++ b/include/xrpl/beast/rfc2616.h
@@ -20,10 +20,6 @@
 #ifndef BEAST_RFC2616_HPP
 #define BEAST_RFC2616_HPP

-// TODO: This include <cstdint> is a workaround for beast compilation bug.
-// Remove when fix https://github.com/boostorg/beast/pull/2682/ is available.
-#include <cstdint>
-
 #include <boost/beast/http/message.hpp>
 #include <boost/beast/http/rfc7230.hpp>
 #include <boost/range/algorithm/equal.hpp>
@@ -32,6 +28,7 @@

 #include <algorithm>
 #include <cctype>
+#include <cstdint>
 #include <iterator>
 #include <string>
 #include <utility>
--- a/include/xrpl/beast/test/yield_to.h
+++ b/include/xrpl/beast/test/yield_to.h
@@ -11,6 +11,7 @@
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/spawn.hpp>
 #include <boost/optional.hpp>
+
 #include <condition_variable>
 #include <functional>
 #include <mutex>
--- a/include/xrpl/beast/unit_test/match.h
+++ b/include/xrpl/beast/unit_test/match.h
@@ -9,6 +9,7 @@
 #define BEAST_UNIT_TEST_MATCH_HPP

 #include <xrpl/beast/unit_test/suite_info.h>
+
 #include <string>

 namespace beast {
--- a/include/xrpl/beast/unit_test/reporter.h
+++ b/include/xrpl/beast/unit_test/reporter.h
@@ -10,8 +10,10 @@

 #include <xrpl/beast/unit_test/amount.h>
 #include <xrpl/beast/unit_test/recorder.h>
+
 #include <boost/lexical_cast.hpp>
 #include <boost/optional.hpp>
+
 #include <algorithm>
 #include <chrono>
 #include <functional>
--- a/include/xrpl/beast/unit_test/runner.h
+++ b/include/xrpl/beast/unit_test/runner.h
@@ -9,7 +9,9 @@
 #define BEAST_UNIT_TEST_RUNNER_H_INCLUDED

 #include <xrpl/beast/unit_test/suite_info.h>
+
 #include <boost/assert.hpp>
+
 #include <mutex>
 #include <ostream>
 #include <string>
--- a/include/xrpl/beast/unit_test/suite.h
+++ b/include/xrpl/beast/unit_test/suite.h
@@ -9,9 +9,11 @@
 #define BEAST_UNIT_TEST_SUITE_HPP

 #include <xrpl/beast/unit_test/runner.h>
+
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/throw_exception.hpp>
+
 #include <ostream>
 #include <sstream>
 #include <string>
--- a/include/xrpl/beast/unit_test/suite_list.h
+++ b/include/xrpl/beast/unit_test/suite_list.h
@@ -10,7 +10,9 @@

 #include <xrpl/beast/unit_test/detail/const_container.h>
 #include <xrpl/beast/unit_test/suite_info.h>
+
 #include <boost/assert.hpp>
+
 #include <set>
 #include <typeindex>
 #include <unordered_set>
--- a/include/xrpl/beast/unit_test/thread.h
+++ b/include/xrpl/beast/unit_test/thread.h
@@ -9,6 +9,7 @@
 #define BEAST_UNIT_TEST_THREAD_HPP

 #include <xrpl/beast/unit_test/suite.h>
+
 #include <functional>
 #include <thread>
 #include <utility>
--- a/include/xrpl/beast/utility/Journal.h
+++ b/include/xrpl/beast/utility/Journal.h
@@ -21,6 +21,7 @@
 #define BEAST_UTILITY_JOURNAL_H_INCLUDED

 #include <xrpl/beast/utility/instrumentation.h>
+
 #include <sstream>

 namespace beast {
--- a/include/xrpl/beast/utility/PropertyStream.h
+++ b/include/xrpl/beast/utility/PropertyStream.h
@@ -22,11 +22,9 @@

 #include <xrpl/beast/core/List.h>

-#include <cstdint>
 #include <mutex>
 #include <sstream>
 #include <string>
-#include <utility>

 namespace beast {

--- a/include/xrpl/beast/utility/rngfill.h
+++ b/include/xrpl/beast/utility/rngfill.h
@@ -21,6 +21,7 @@
 #define BEAST_RANDOM_RNGFILL_H_INCLUDED

 #include <xrpl/beast/utility/instrumentation.h>
+
 #include <array>
 #include <cstdint>
 #include <cstring>
--- a/include/xrpl/beast/utility/temp_dir.h
+++ b/include/xrpl/beast/utility/temp_dir.h
@@ -21,6 +21,7 @@
 #define BEAST_UTILITY_TEMP_DIR_H_INCLUDED

 #include <boost/filesystem.hpp>
+
 #include <string>

 namespace beast {
--- a/include/xrpl/crypto/csprng.h
+++ b/include/xrpl/crypto/csprng.h
@@ -21,8 +21,6 @@
 #define RIPPLE_CRYPTO_RANDOM_H_INCLUDED

 #include <mutex>
-#include <string>
-#include <type_traits>

 namespace ripple {

--- a/include/xrpl/json/Object.h
+++ b/include/xrpl/json/Object.h
@@ -21,6 +21,7 @@
 #define RIPPLE_JSON_OBJECT_H_INCLUDED

 #include <xrpl/json/Writer.h>
+
 #include <memory>

 namespace Json {
--- a/include/xrpl/json/Output.h
+++ b/include/xrpl/json/Output.h
@@ -21,6 +21,7 @@
 #define RIPPLE_JSON_OUTPUT_H_INCLUDED

 #include <boost/beast/core/string.hpp>
+
 #include <functional>
 #include <string>

--- a/include/xrpl/json/Writer.h
+++ b/include/xrpl/json/Writer.h
@@ -24,6 +24,7 @@
 #include <xrpl/basics/contract.h>
 #include <xrpl/json/Output.h>
 #include <xrpl/json/json_value.h>
+
 #include <memory>

 namespace Json {
--- a/include/xrpl/json/detail/json_assert.h
+++ b/include/xrpl/json/detail/json_assert.h
@@ -20,6 +20,7 @@
 #ifndef RIPPLE_JSON_JSON_ASSERT_H_INCLUDED
 #define RIPPLE_JSON_JSON_ASSERT_H_INCLUDED

+#include <xrpl/basics/contract.h>
 #include <xrpl/json/json_errors.h>

 #define JSON_ASSERT_MESSAGE(condition, message) \
--- a/include/xrpl/json/json_reader.h
+++ b/include/xrpl/json/json_reader.h
@@ -24,7 +24,9 @@

 #include <xrpl/json/json_forwards.h>
 #include <xrpl/json/json_value.h>
+
 #include <boost/asio/buffer.hpp>
+
 #include <stack>

 namespace Json {
--- a/include/xrpl/json/json_value.h
+++ b/include/xrpl/json/json_value.h
@@ -22,6 +22,7 @@

 #include <xrpl/basics/Number.h>
 #include <xrpl/json/json_forwards.h>
+
 #include <cstring>
 #include <map>
 #include <string>
--- a/include/xrpl/json/json_writer.h
+++ b/include/xrpl/json/json_writer.h
@@ -22,6 +22,7 @@

 #include <xrpl/json/json_forwards.h>
 #include <xrpl/json/json_value.h>
+
 #include <ostream>
 #include <vector>

--- a/include/xrpl/protocol/Book.h
+++ b/include/xrpl/protocol/Book.h
@@ -22,6 +22,7 @@

 #include <xrpl/basics/CountedObject.h>
 #include <xrpl/protocol/Issue.h>
+
 #include <boost/utility/base_from_member.hpp>

 namespace ripple {
--- a/include/xrpl/protocol/Feature.h
+++ b/include/xrpl/protocol/Feature.h
@@ -21,7 +21,9 @@
 #define RIPPLE_PROTOCOL_FEATURE_H_INCLUDED

 #include <xrpl/basics/base_uint.h>
+
 #include <boost/container/flat_map.hpp>
+
 #include <array>
 #include <bitset>
 #include <map>
--- a/include/xrpl/protocol/FeeUnits.h
+++ b/include/xrpl/protocol/FeeUnits.h
@@ -23,6 +23,7 @@
 #include <xrpl/beast/utility/Zero.h>
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/json/json_value.h>
+
 #include <boost/multiprecision/cpp_int.hpp>
 #include <boost/operators.hpp>

--- a/include/xrpl/protocol/HashPrefix.h
+++ b/include/xrpl/protocol/HashPrefix.h
@@ -21,6 +21,7 @@
 #define RIPPLE_PROTOCOL_HASHPREFIX_H_INCLUDED

 #include <xrpl/beast/hash/hash_append.h>
+
 #include <cstdint>

 namespace ripple {
--- a/include/xrpl/protocol/IOUAmount.h
+++ b/include/xrpl/protocol/IOUAmount.h
@@ -23,7 +23,9 @@
 #include <xrpl/basics/LocalValue.h>
 #include <xrpl/basics/Number.h>
 #include <xrpl/beast/utility/Zero.h>
+
 #include <boost/operators.hpp>
+
 #include <cstdint>
 #include <string>

--- a/include/xrpl/protocol/KnownFormats.h
+++ b/include/xrpl/protocol/KnownFormats.h
@@ -23,7 +23,9 @@
 #include <xrpl/basics/contract.h>
 #include <xrpl/beast/type_name.h>
 #include <xrpl/protocol/SOTemplate.h>
+
 #include <boost/container/flat_map.hpp>
+
 #include <algorithm>
 #include <forward_list>

--- a/include/xrpl/protocol/MultiApiJson.h
+++ b/include/xrpl/protocol/MultiApiJson.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_JSON_MULTIAPIJSON_H_INCLUDED
 #define RIPPLE_JSON_MULTIAPIJSON_H_INCLUDED

+#include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/ApiVersion.h>

-#include <xrpl/beast/utility/instrumentation.h>
 #include <array>
 #include <concepts>
 #include <cstdlib>
--- a/include/xrpl/protocol/Protocol.h
+++ b/include/xrpl/protocol/Protocol.h
@@ -23,6 +23,7 @@
 #include <xrpl/basics/ByteUtilities.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/basics/partitioned_unordered_map.h>
+
 #include <cstdint>

 namespace ripple {
--- a/include/xrpl/protocol/Rate.h
+++ b/include/xrpl/protocol/Rate.h
@@ -22,7 +22,9 @@

 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/protocol/STAmount.h>
+
 #include <boost/operators.hpp>
+
 #include <cstdint>
 #include <ostream>

--- a/include/xrpl/protocol/SOTemplate.h
+++ b/include/xrpl/protocol/SOTemplate.h
@@ -22,6 +22,7 @@

 #include <xrpl/basics/contract.h>
 #include <xrpl/protocol/SField.h>
+
 #include <functional>
 #include <initializer_list>
 #include <memory>
--- a/include/xrpl/protocol/STBase.h
+++ b/include/xrpl/protocol/STBase.h
@@ -23,12 +23,14 @@
 #include <xrpl/basics/contract.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/Serializer.h>
+
 #include <memory>
 #include <ostream>
 #include <string>
 #include <type_traits>
 #include <typeinfo>
 #include <utility>
+
 namespace ripple {

 /// Note, should be treated as flags that can be | and &
--- a/include/xrpl/protocol/STExchange.h
+++ b/include/xrpl/protocol/STExchange.h
@@ -28,6 +28,7 @@
 #include <xrpl/protocol/STBlob.h>
 #include <xrpl/protocol/STInteger.h>
 #include <xrpl/protocol/STObject.h>
+
 #include <memory>
 #include <optional>
 #include <stdexcept>
--- a/include/xrpl/protocol/STObject.h
+++ b/include/xrpl/protocol/STObject.h
@@ -35,7 +35,9 @@
 #include <xrpl/protocol/STPathSet.h>
 #include <xrpl/protocol/STVector256.h>
 #include <xrpl/protocol/detail/STVar.h>
+
 #include <boost/iterator/transform_iterator.hpp>
+
 #include <optional>
 #include <stdexcept>
 #include <type_traits>
--- a/include/xrpl/protocol/STParsedJSON.h
+++ b/include/xrpl/protocol/STParsedJSON.h
@@ -21,6 +21,7 @@
 #define RIPPLE_PROTOCOL_STPARSEDJSON_H_INCLUDED

 #include <xrpl/protocol/STArray.h>
+
 #include <optional>

 namespace ripple {
--- a/include/xrpl/protocol/STPathSet.h
+++ b/include/xrpl/protocol/STPathSet.h
@@ -26,6 +26,7 @@
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/STBase.h>
 #include <xrpl/protocol/UintTypes.h>
+
 #include <cstddef>
 #include <optional>

--- a/include/xrpl/protocol/STTx.h
+++ b/include/xrpl/protocol/STTx.h
@@ -28,6 +28,7 @@
 #include <xrpl/protocol/SecretKey.h>
 #include <xrpl/protocol/SeqProxy.h>
 #include <xrpl/protocol/TxFormats.h>
+
 #include <boost/container/flat_set.hpp>

 #include <functional>
--- a/include/xrpl/protocol/STValidation.h
+++ b/include/xrpl/protocol/STValidation.h
@@ -26,6 +26,7 @@
 #include <xrpl/protocol/PublicKey.h>
 #include <xrpl/protocol/STObject.h>
 #include <xrpl/protocol/SecretKey.h>
+
 #include <cstdint>
 #include <functional>
 #include <memory>
@@ -146,8 +147,7 @@ public:
    render() const
    {
        std::stringstream ss;
-        ss << "validation: "
-           << " ledger_hash: " << getLedgerHash()
+        ss << "validation: " << " ledger_hash: " << getLedgerHash()
           << " consensus_hash: " << getConsensusHash()
           << " sign_time: " << to_string(getSignTime())
           << " seen_time: " << to_string(getSeenTime())
--- a/include/xrpl/protocol/SecretKey.h
+++ b/include/xrpl/protocol/SecretKey.h
@@ -26,6 +26,7 @@
 #include <xrpl/protocol/PublicKey.h>
 #include <xrpl/protocol/Seed.h>
 #include <xrpl/protocol/tokens.h>
+
 #include <array>
 #include <cstring>
 #include <string>
--- a/include/xrpl/protocol/Seed.h
+++ b/include/xrpl/protocol/Seed.h
@@ -23,6 +23,7 @@
 #include <xrpl/basics/Slice.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/protocol/tokens.h>
+
 #include <array>
 #include <optional>

--- a/include/xrpl/protocol/Serializer.h
+++ b/include/xrpl/protocol/Serializer.h
@@ -30,6 +30,7 @@
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/SField.h>
+
 #include <cstdint>
 #include <cstring>
 #include <iomanip>
--- a/include/xrpl/protocol/Sign.h
+++ b/include/xrpl/protocol/Sign.h
@@ -24,6 +24,7 @@
 #include <xrpl/protocol/PublicKey.h>
 #include <xrpl/protocol/STObject.h>
 #include <xrpl/protocol/SecretKey.h>
+
 #include <utility>

 namespace ripple {
--- a/include/xrpl/protocol/SystemParameters.h
+++ b/include/xrpl/protocol/SystemParameters.h
@@ -22,6 +22,7 @@

 #include <xrpl/basics/chrono.h>
 #include <xrpl/protocol/XRPAmount.h>
+
 #include <cstdint>
 #include <string>

--- a/include/xrpl/protocol/TxFlags.h
+++ b/include/xrpl/protocol/TxFlags.h
@@ -20,10 +20,10 @@
 #ifndef RIPPLE_PROTOCOL_TXFLAGS_H_INCLUDED
 #define RIPPLE_PROTOCOL_TXFLAGS_H_INCLUDED

-#include <cstdint>
-
 #include <xrpl/protocol/LedgerFormats.h>

+#include <cstdint>
+
 namespace ripple {

 /** Transaction flags.
--- a/include/xrpl/protocol/TxMeta.h
+++ b/include/xrpl/protocol/TxMeta.h
@@ -24,7 +24,9 @@
 #include <xrpl/protocol/STArray.h>
 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol/TER.h>
+
 #include <boost/container/flat_set.hpp>
+
 #include <optional>

 namespace ripple {
--- a/include/xrpl/protocol/detail/STVar.h
+++ b/include/xrpl/protocol/detail/STVar.h
@@ -23,12 +23,9 @@
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/STBase.h>
 #include <xrpl/protocol/Serializer.h>
-#include <concepts>
+
 #include <cstddef>
-#include <cstdint>
 #include <type_traits>
-#include <typeinfo>
-#include <utility>

 namespace ripple {
 namespace detail {
--- a/include/xrpl/protocol/digest.h
+++ b/include/xrpl/protocol/digest.h
@@ -22,7 +22,9 @@

 #include <xrpl/basics/base_uint.h>
 #include <xrpl/crypto/secure_erase.h>
+
 #include <boost/endian/conversion.hpp>
+
 #include <algorithm>
 #include <array>

--- a/include/xrpl/protocol/nftPageMask.h
+++ b/include/xrpl/protocol/nftPageMask.h
@@ -21,6 +21,7 @@
 #define RIPPLE_PROTOCOL_NFT_PAGE_MASK_H_INCLUDED

 #include <xrpl/basics/base_uint.h>
+
 #include <string_view>

 namespace ripple {
--- a/include/xrpl/resource/ResourceManager.h
+++ b/include/xrpl/resource/ResourceManager.h
@@ -27,6 +27,7 @@
 #include <xrpl/json/json_value.h>
 #include <xrpl/resource/Consumer.h>
 #include <xrpl/resource/Gossip.h>
+
 #include <boost/utility/string_view.hpp>

 namespace ripple {
--- a/include/xrpl/resource/detail/Logic.h
+++ b/include/xrpl/resource/detail/Logic.h
@@ -32,6 +32,7 @@
 #include <xrpl/resource/Fees.h>
 #include <xrpl/resource/Gossip.h>
 #include <xrpl/resource/detail/Import.h>
+
 #include <mutex>

 namespace ripple {
--- a/include/xrpl/server/Handoff.h
+++ b/include/xrpl/server/Handoff.h
@@ -21,8 +21,10 @@
 #define RIPPLE_SERVER_HANDOFF_H_INCLUDED

 #include <xrpl/server/Writer.h>
+
 #include <boost/beast/http/dynamic_body.hpp>
 #include <boost/beast/http/message.hpp>
+
 #include <memory>

 namespace ripple {
--- a/include/xrpl/server/Port.h
+++ b/include/xrpl/server/Port.h
@@ -22,17 +22,18 @@

 #include <xrpl/basics/BasicConfig.h>
 #include <xrpl/beast/net/IPEndpoint.h>
+
 #include <boost/asio/ip/address.hpp>
 #include <boost/asio/ip/network_v4.hpp>
 #include <boost/asio/ip/network_v6.hpp>
 #include <boost/beast/core/string.hpp>
 #include <boost/beast/websocket/option.hpp>
+
 #include <cstdint>
 #include <memory>
 #include <optional>
 #include <set>
 #include <string>
-#include <variant>

 namespace boost {
 namespace asio {
--- a/include/xrpl/server/Server.h
+++ b/include/xrpl/server/Server.h
@@ -24,6 +24,7 @@
 #include <xrpl/beast/utility/PropertyStream.h>
 #include <xrpl/server/Port.h>
 #include <xrpl/server/detail/ServerImpl.h>
+
 #include <boost/asio/io_service.hpp>

 namespace ripple {
--- a/include/xrpl/server/Session.h
+++ b/include/xrpl/server/Session.h
@@ -24,7 +24,9 @@
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/server/WSSession.h>
 #include <xrpl/server/Writer.h>
+
 #include <boost/beast/http/message.hpp>
+
 #include <functional>
 #include <memory>
 #include <ostream>
--- a/include/xrpl/server/SimpleWriter.h
+++ b/include/xrpl/server/SimpleWriter.h
@@ -21,10 +21,12 @@
 #define RIPPLE_SERVER_SIMPLEWRITER_H_INCLUDED

 #include <xrpl/server/Writer.h>
+
 #include <boost/beast/core/multi_buffer.hpp>
 #include <boost/beast/core/ostream.hpp>
 #include <boost/beast/http/message.hpp>
 #include <boost/beast/http/write.hpp>
+
 #include <utility>

 namespace ripple {
--- a/include/xrpl/server/Writer.h
+++ b/include/xrpl/server/Writer.h
@@ -21,6 +21,7 @@
 #define RIPPLE_SERVER_WRITER_H_INCLUDED

 #include <boost/asio/buffer.hpp>
+
 #include <functional>
 #include <vector>

--- a/include/xrpl/server/detail/BaseHTTPPeer.h
+++ b/include/xrpl/server/detail/BaseHTTPPeer.h
@@ -25,6 +25,7 @@
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/server/Session.h>
 #include <xrpl/server/detail/io_list.h>
+
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/spawn.hpp>
 #include <boost/asio/ssl/stream.hpp>
@@ -34,6 +35,7 @@
 #include <boost/beast/http/message.hpp>
 #include <boost/beast/http/parser.hpp>
 #include <boost/beast/http/read.hpp>
+
 #include <atomic>
 #include <chrono>
 #include <functional>
--- a/include/xrpl/server/detail/BasePeer.h
+++ b/include/xrpl/server/detail/BasePeer.h
@@ -25,7 +25,9 @@
 #include <xrpl/server/Port.h>
 #include <xrpl/server/detail/LowestLayer.h>
 #include <xrpl/server/detail/io_list.h>
+
 #include <boost/asio.hpp>
+
 #include <atomic>
 #include <functional>
 #include <string>
--- a/include/xrpl/server/detail/Door.h
+++ b/include/xrpl/server/detail/Door.h
@@ -25,6 +25,7 @@
 #include <xrpl/server/detail/PlainHTTPPeer.h>
 #include <xrpl/server/detail/SSLHTTPPeer.h>
 #include <xrpl/server/detail/io_list.h>
+
 #include <boost/asio/basic_waitable_timer.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/io_context.hpp>
@@ -34,6 +35,7 @@
 #include <boost/beast/core/multi_buffer.hpp>
 #include <boost/beast/core/tcp_stream.hpp>
 #include <boost/container/flat_map.hpp>
+
 #include <chrono>
 #include <condition_variable>
 #include <functional>
--- a/include/xrpl/server/detail/JSONRPCUtil.h
+++ b/include/xrpl/server/detail/JSONRPCUtil.h
@@ -20,6 +20,7 @@
 #ifndef RIPPLE_SERVER_JSONRPCUTIL_H_INCLUDED
 #define RIPPLE_SERVER_JSONRPCUTIL_H_INCLUDED

+#include <xrpl/beast/utility/Journal.h>
 #include <xrpl/json/Output.h>
 #include <xrpl/json/json_value.h>

--- a/include/xrpl/server/detail/PlainHTTPPeer.h
+++ b/include/xrpl/server/detail/PlainHTTPPeer.h
@@ -23,7 +23,9 @@
 #include <xrpl/beast/rfc2616.h>
 #include <xrpl/server/detail/BaseHTTPPeer.h>
 #include <xrpl/server/detail/PlainWSPeer.h>
+
 #include <boost/beast/core/tcp_stream.hpp>
+
 #include <memory>

 namespace ripple {
--- a/include/xrpl/server/detail/PlainWSPeer.h
+++ b/include/xrpl/server/detail/PlainWSPeer.h
@@ -21,7 +21,9 @@
 #define RIPPLE_SERVER_PLAINWSPEER_H_INCLUDED

 #include <xrpl/server/detail/BaseWSPeer.h>
+
 #include <boost/beast/core/tcp_stream.hpp>
+
 #include <memory>

 namespace ripple {
--- a/include/xrpl/server/detail/SSLHTTPPeer.h
+++ b/include/xrpl/server/detail/SSLHTTPPeer.h
@@ -22,11 +22,13 @@

 #include <xrpl/server/detail/BaseHTTPPeer.h>
 #include <xrpl/server/detail/SSLWSPeer.h>
+
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/context.hpp>
 #include <boost/asio/ssl/stream.hpp>
 #include <boost/beast/core/tcp_stream.hpp>
 #include <boost/beast/ssl/ssl_stream.hpp>
+
 #include <memory>

 namespace ripple {
--- a/include/xrpl/server/detail/SSLWSPeer.h
+++ b/include/xrpl/server/detail/SSLWSPeer.h
@@ -22,12 +22,14 @@

 #include <xrpl/server/WSSession.h>
 #include <xrpl/server/detail/BaseHTTPPeer.h>
+
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/context.hpp>
 #include <boost/asio/ssl/stream.hpp>
 #include <boost/beast/core/tcp_stream.hpp>
 #include <boost/beast/ssl/ssl_stream.hpp>
 #include <boost/beast/websocket/ssl.hpp>
+
 #include <memory>

 namespace ripple {
--- a/include/xrpl/server/detail/io_list.h
+++ b/include/xrpl/server/detail/io_list.h
@@ -21,6 +21,7 @@
 #define RIPPLE_SERVER_IO_LIST_H_INCLUDED

 #include <boost/container/flat_map.hpp>
+
 #include <condition_variable>
 #include <functional>
 #include <memory>
--- a/src/libxrpl/basics/Archive.cpp
+++ b/src/libxrpl/basics/Archive.cpp
@@ -20,10 +20,14 @@
 #include <xrpl/basics/Archive.h>
 #include <xrpl/basics/contract.h>

+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
+
 #include <archive.h>
 #include <archive_entry.h>
-
+#include <cstddef>
 #include <memory>
+#include <stdexcept>

 namespace ripple {

--- a/Show More
+++ b/Show More