Merge branch 'develop' into pratik/Fix_asan_lsan_flagged_issues

Signed-off-by: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com>

.config/cspell.config.yaml

@@ -89,6 +89,7 @@ words:
   - endmacro
   - exceptioned
   - Falco
+  - fcontext
   - finalizers
   - firewalled
   - fmtdur
@@ -101,6 +102,7 @@ words:
   - gpgcheck
   - gpgkey
   - hotwallet
+  - hwaddress
   - hwrap
   - ifndef
   - inequation
@@ -217,6 +219,7 @@ words:
   - soci
   - socidb
   - sslws
+  - stackful
   - statsd
   - STATSDCOLLECTOR
   - stissue

.github/scripts/rename/include.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Exit the script as soon as an error occurs.
+set -e
+
+# This script checks whether there are no new include guards introduced by a new
+# PR, as header files should use "#pragma once" instead. The script assumes any
+# include guards will use "XRPL_" as prefix.
+# Usage: .github/scripts/rename/include.sh <repository directory>
+
+if [ "$#" -ne 1 ]; then
+    echo "Usage: $0 <repository directory>"
+    exit 1
+fi
+
+DIRECTORY=$1
+echo "Processing directory: ${DIRECTORY}"
+if [ ! -d "${DIRECTORY}" ]; then
+    echo "Error: Directory '${DIRECTORY}' does not exist."
+    exit 1
+fi
+
+find "${DIRECTORY}" -type f \( -name "*.h" -o -name "*.hpp" -o -name "*.ipp" \) | while read -r FILE; do
+    echo "Processing file: ${FILE}"
+    if grep -q "#ifndef XRPL_" "${FILE}"; then
+      echo "Please replace all include guards by #pragma once."
+      exit 1
+    fi
+done
+echo "Checking complete."

.github/scripts/strategy-matrix/generate.py

@@ -223,10 +223,12 @@ def generate_strategy_matrix(all: bool, config: Config) -> list:
         # names get truncated.
         # Add Address and Thread (both coupled with UB) sanitizers for specific bookworm distros.
         # GCC-Asan rippled-embedded tests are failing because of https://github.com/google/sanitizers/issues/856
-        if (
-            os["distro_version"] == "bookworm"
-            and f"{os['compiler_name']}-{os['compiler_version']}" == "clang-20"
-        ):
+        if os[
+            "distro_version"
+        ] == "bookworm" and f"{os['compiler_name']}-{os['compiler_version']}" in [
+            "clang-20",
+            "gcc-13",
+        ]:
             # Add ASAN + UBSAN configuration.
             configurations.append(
                 {

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

@@ -205,14 +205,18 @@ jobs:
       - name: Set sanitizer options
         if: ${{ !inputs.build_only && env.SANITIZERS_ENABLED == 'true' }}
         run: |
-          echo "ASAN_OPTIONS=print_stacktrace=1:detect_container_overflow=0:suppressions=${GITHUB_WORKSPACE}/sanitizers/suppressions/asan.supp" >> ${GITHUB_ENV}
-          echo "TSAN_OPTIONS=second_deadlock_stack=1:halt_on_error=0:suppressions=${GITHUB_WORKSPACE}/sanitizers/suppressions/tsan.supp" >> ${GITHUB_ENV}
-          echo "UBSAN_OPTIONS=suppressions=${GITHUB_WORKSPACE}/sanitizers/suppressions/ubsan.supp" >> ${GITHUB_ENV}
-          echo "LSAN_OPTIONS=suppressions=${GITHUB_WORKSPACE}/sanitizers/suppressions/lsan.supp" >> ${GITHUB_ENV}
+          echo "ASAN_OPTIONS=include=${GITHUB_WORKSPACE}/sanitizers/suppressions/runtime-asan-options.txt:suppressions=${GITHUB_WORKSPACE}/sanitizers/suppressions/asan.supp" >> ${GITHUB_ENV}
+          echo "TSAN_OPTIONS=include=${GITHUB_WORKSPACE}/sanitizers/suppressions/runtime-tsan-options.txt:suppressions=${GITHUB_WORKSPACE}/sanitizers/suppressions/tsan.supp" >> ${GITHUB_ENV}
+          echo "UBSAN_OPTIONS=include=${GITHUB_WORKSPACE}/sanitizers/suppressions/runtime-ubsan-options.txt:suppressions=${GITHUB_WORKSPACE}/sanitizers/suppressions/ubsan.supp" >> ${GITHUB_ENV}
+          echo "LSAN_OPTIONS=include=${GITHUB_WORKSPACE}/sanitizers/suppressions/runtime-lsan-options.txt:suppressions=${GITHUB_WORKSPACE}/sanitizers/suppressions/lsan.supp" >> ${GITHUB_ENV}
 
       - name: Run the separate tests
+        # We continue on error here because we want to try the Embedded tests before
+        # failing. This will give us details on all the failures at once.
+        continue-on-error: true
         if: ${{ !inputs.build_only }}
         working-directory: ${{ env.BUILD_DIR }}
+        id: separate_tests
         # Windows locks some of the build files while running tests, and parallel jobs can collide
         env:
           BUILD_TYPE: ${{ inputs.build_type }}
@@ -228,8 +232,14 @@ jobs:
         working-directory: ${{ runner.os == 'Windows' && format('{0}/{1}', env.BUILD_DIR, inputs.build_type) || env.BUILD_DIR }}
         env:
           BUILD_NPROC: ${{ steps.nproc.outputs.nproc }}
+          PARALLELISM: ${{ env.SANITIZERS_ENABLED == 'true' && '1' || steps.nproc.outputs.nproc }}
         run: |
-          ./xrpld --unittest --unittest-jobs "${BUILD_NPROC}"
+          ./xrpld --unittest --unittest-jobs "${PARALLELISM}"
+
+        # Pipeline should fail if the separate tests failed.
+      - name: Check results of the SeparateTests
+        if: ${{ !inputs.build_only && steps.separate_tests.outcome == 'failure' }}
+        run: exit 1
 
       - name: Debug failure (Linux)
         if: ${{ failure() && runner.os == 'Linux' && !inputs.build_only }}

.github/workflows/reusable-check-rename.yml

@@ -31,6 +31,8 @@ jobs:
         run: .github/scripts/rename/namespace.sh .
       - name: Check config name
         run: .github/scripts/rename/config.sh .
+      - name: Check include guards
+        run: .github/scripts/rename/include.sh .
       - name: Check for differences
         env:
           MESSAGE: |

cmake/deps/Boost.cmake

@@ -32,13 +32,13 @@ target_link_libraries(
 if (Boost_COMPILER)
     target_link_libraries(xrpl_boost INTERFACE Boost::disable_autolinking)
 endif ()
-if (SANITIZERS_ENABLED AND is_clang)
-    # TODO: gcc does not support -fsanitize-blacklist...can we do something else for gcc ?
-    if (NOT Boost_INCLUDE_DIRS AND TARGET Boost::headers)
-        get_target_property(Boost_INCLUDE_DIRS Boost::headers INTERFACE_INCLUDE_DIRECTORIES)
-    endif ()
-    message(STATUS "Adding [${Boost_INCLUDE_DIRS}] to sanitizer blacklist")
-    file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/san_bl.txt "src:${Boost_INCLUDE_DIRS}/*")
-    target_compile_options(opts INTERFACE # ignore boost headers for sanitizing
-                                          -fsanitize-blacklist=${CMAKE_CURRENT_BINARY_DIR}/san_bl.txt)
-endif ()
+# if (SANITIZERS_ENABLED AND is_clang)
+#     # TODO: gcc does not support -fsanitize-blacklist...can we do something else for gcc ?
+#     if (NOT Boost_INCLUDE_DIRS AND TARGET Boost::headers)
+#         get_target_property(Boost_INCLUDE_DIRS Boost::headers INTERFACE_INCLUDE_DIRECTORIES)
+#     endif ()
+#     message(STATUS "Adding [${Boost_INCLUDE_DIRS}] to sanitizer blacklist")
+#     file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/san_bl.txt "src:${Boost_INCLUDE_DIRS}/*")
+#     target_compile_options(opts INTERFACE # ignore boost headers for sanitizing
+#                                           -fsanitize-blacklist=${CMAKE_CURRENT_BINARY_DIR}/san_bl.txt)
+# endif ()

conan.lock

@@ -6,11 +6,11 @@
         "sqlite3/3.49.1#8631739a4c9b93bd3d6b753bac548a63%1765850149.926",
         "soci/4.0.3#a9f8d773cd33e356b5879a4b0564f287%1765850149.46",
         "snappy/1.1.10#968fef506ff261592ec30c574d4a7809%1765850147.878",
-        "secp256k1/0.7.0#9c4ab67bdc3860c16ea5b36aed8f74ea%1765850147.928",
+        "secp256k1/0.7.0#0fda78daa3b864deb8a2fbc083398356%1770226294.524",
         "rocksdb/10.5.1#4a197eca381a3e5ae8adf8cffa5aacd0%1765850186.86",
         "re2/20230301#ca3b241baec15bd31ea9187150e0b333%1765850148.103",
         "protobuf/6.32.1#f481fd276fc23a33b85a3ed1e898b693%1765850161.038",
-        "openssl/3.5.4#1b986e61b38fdfda3b40bebc1b234393%1768312656.257",
+        "openssl/3.5.5#05a4ac5b7323f7a329b2db1391d9941f%1769599205.414",
         "nudb/2.0.9#0432758a24204da08fee953ec9ea03cb%1769436073.32",
         "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504%1765850143.914",
         "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1765842973.492",
@@ -23,7 +23,7 @@
         "date/3.0.4#862e11e80030356b53c2c38599ceb32b%1765850143.772",
         "c-ares/1.34.5#5581c2b62a608b40bb85d965ab3ec7c8%1765850144.336",
         "bzip2/1.0.8#c470882369c2d95c5c77e970c0c7e321%1765850143.837",
-        "boost/1.90.0#d5e8defe7355494953be18524a7f135b%1765955095.179",
+        "boost/1.90.0#d5e8defe7355494953be18524a7f135b%1769454080.269",
         "abseil/20250127.0#99262a368bd01c0ccca8790dfced9719%1766517936.993"
     ],
     "build_requires": [
@@ -31,7 +31,7 @@
         "strawberryperl/5.32.1.1#707032463aa0620fa17ec0d887f5fe41%1765850165.196",
         "protobuf/6.32.1#f481fd276fc23a33b85a3ed1e898b693%1765850161.038",
         "nasm/2.16.01#31e26f2ee3c4346ecd347911bd126904%1765850144.707",
-        "msys2/cci.latest#1996656c3c98e5765b25b60ff5cf77b4%1764840888.758",
+        "msys2/cci.latest#eea83308ad7e9023f7318c60d5a9e6cb%1770199879.083",
         "m4/1.4.19#70dc8bbb33e981d119d2acc0175cf381%1763158052.846",
         "cmake/4.2.0#ae0a44f44a1ef9ab68fd4b3e9a1f8671%1765850153.937",
         "cmake/3.31.10#313d16a1aa16bbdb2ca0792467214b76%1765850153.479",

conanfile.py

@@ -1,4 +1,5 @@
 import re
+import os
 
 from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
 
@@ -31,7 +32,7 @@ class Xrpl(ConanFile):
         "grpc/1.72.0",
         "libarchive/3.8.1",
         "nudb/2.0.9",
-        "openssl/3.5.4",
+        "openssl/3.5.5",
         "secp256k1/0.7.0",
         "soci/4.0.3",
         "zlib/1.3.1",
@@ -124,6 +125,12 @@ class Xrpl(ConanFile):
         if self.settings.compiler in ["clang", "gcc"]:
             self.options["boost"].without_cobalt = True
 
+        # Check if environment variable exists
+        if "SANITIZERS" in os.environ:
+            sanitizers = os.environ["SANITIZERS"]
+            if "Address" in sanitizers:
+                self.default_options["fPIC"] = False
+
     def requirements(self):
         # Conan 2 requires transitive headers to be specified
         transitive_headers_opt = (

docs/build/sanitizers.md

@@ -89,8 +89,8 @@ cmake --build . --parallel 4
 **IMPORTANT**: ASAN with Boost produces many false positives. Use these options:
 
 ```bash
-export ASAN_OPTIONS="print_stacktrace=1:detect_container_overflow=0:suppressions=path/to/asan.supp:halt_on_error=0:log_path=asan.log"
-export LSAN_OPTIONS="suppressions=path/to/lsan.supp:halt_on_error=0:log_path=lsan.log"
+export ASAN_OPTIONS="include=sanitizers/suppressions/runtime-asan-options.txt:suppressions=sanitizers/suppressions/asan.supp"
+export LSAN_OPTIONS="include=sanitizers/suppressions/runtime-lsan-options.txt:suppressions=sanitizers/suppressions/lsan.supp"
 
 # Run tests
 ./xrpld --unittest --unittest-jobs=5
@@ -108,7 +108,7 @@ export LSAN_OPTIONS="suppressions=path/to/lsan.supp:halt_on_error=0:log_path=lsa
 ### ThreadSanitizer (TSan)
 
 ```bash
-export TSAN_OPTIONS="suppressions=path/to/tsan.supp halt_on_error=0 log_path=tsan.log"
+export TSAN_OPTIONS="include=sanitizers/suppressions/runtime-tsan-options.txt:suppressions=sanitizers/suppressions/tsan.supp"
 
 # Run tests
 ./xrpld --unittest --unittest-jobs=5
@@ -129,7 +129,7 @@ More details [here](https://github.com/google/sanitizers/wiki/AddressSanitizerLe
 ### UndefinedBehaviorSanitizer (UBSan)
 
 ```bash
-export UBSAN_OPTIONS="suppressions=path/to/ubsan.supp:print_stacktrace=1:halt_on_error=0:log_path=ubsan.log"
+export UBSAN_OPTIONS="include=sanitizers/suppressions/runtime-ubsan-options.txt:suppressions=sanitizers/suppressions/ubsan.supp"
 
 # Run tests
 ./xrpld --unittest --unittest-jobs=5

include/xrpl/basics/Archive.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_ARCHIVE_H_INCLUDED
-#define XRPL_BASICS_ARCHIVE_H_INCLUDED
+#pragma once
 
 #include <boost/filesystem.hpp>
 
@@ -16,5 +15,3 @@ void
 extractTarLz4(boost::filesystem::path const& src, boost::filesystem::path const& dst);
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/BasicConfig.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_BASICCONFIG_H_INCLUDED
-#define XRPL_BASICS_BASICCONFIG_H_INCLUDED
+#pragma once
 
 #include <xrpl/basics/contract.h>
 
@@ -369,5 +368,3 @@ get_if_exists<bool>(Section const& section, std::string const& name, bool& v)
 }
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/Blob.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_BLOB_H_INCLUDED
-#define XRPL_BASICS_BLOB_H_INCLUDED
+#pragma once
 
 #include <vector>
 
@@ -11,5 +10,3 @@ namespace xrpl {
 using Blob = std::vector<unsigned char>;
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/Buffer.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_BUFFER_H_INCLUDED
-#define XRPL_BASICS_BUFFER_H_INCLUDED
+#pragma once
 
 #include <xrpl/basics/Slice.h>
 #include <xrpl/beast/utility/instrumentation.h>
@@ -213,5 +212,3 @@ operator!=(Buffer const& lhs, Buffer const& rhs) noexcept
 }
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/ByteUtilities.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_BYTEUTILITIES_H_INCLUDED
-#define XRPL_BASICS_BYTEUTILITIES_H_INCLUDED
+#pragma once
 
 namespace xrpl {
 
@@ -20,5 +19,3 @@ megabytes(T value) noexcept
 static_assert(kilobytes(2) == 2048, "kilobytes(2) == 2048");
 static_assert(megabytes(3) == 3145728, "megabytes(3) == 3145728");
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/CompressionAlgorithms.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_COMPRESSIONALGORITHMS_H_INCLUDED
-#define XRPL_COMPRESSIONALGORITHMS_H_INCLUDED
+#pragma once
 
 #include <xrpl/basics/contract.h>
 
@@ -133,5 +132,3 @@ lz4Decompress(InputStream& in, std::size_t inSize, std::uint8_t* decompressed, s
 }  // namespace compression_algorithms
 
 }  // namespace xrpl
-
-#endif  // XRPL_COMPRESSIONALGORITHMS_H_INCLUDED

include/xrpl/basics/CountedObject.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_COUNTEDOBJECT_H_INCLUDED
-#define XRPL_BASICS_COUNTEDOBJECT_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/type_name.h>
 
@@ -134,5 +133,3 @@ public:
 };
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/DecayingSample.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_DECAYINGSAMPLE_H_INCLUDED
-#define XRPL_BASICS_DECAYINGSAMPLE_H_INCLUDED
+#pragma once
 
 #include <chrono>
 #include <cmath>
@@ -130,5 +129,3 @@ private:
 };
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/Expected.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_EXPECTED_H_INCLUDED
-#define XRPL_BASICS_EXPECTED_H_INCLUDED
+#pragma once
 
 #include <xrpl/basics/contract.h>
 
@@ -229,5 +228,3 @@ public:
 };
 
 }  // namespace xrpl
-
-#endif  // XRPL_BASICS_EXPECTED_H_INCLUDED

include/xrpl/basics/FileUtilities.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_FILEUTILITIES_H_INCLUDED
-#define XRPL_BASICS_FILEUTILITIES_H_INCLUDED
+#pragma once
 
 #include <boost/filesystem.hpp>
 #include <boost/system/error_code.hpp>
@@ -18,5 +17,3 @@ void
 writeFileContents(boost::system::error_code& ec, boost::filesystem::path const& destPath, std::string const& contents);
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/IntrusivePointer.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_INTRUSIVEPOINTER_H_INCLUDED
-#define XRPL_BASICS_INTRUSIVEPOINTER_H_INCLUDED
+#pragma once
 
 #include <concepts>
 #include <cstdint>
@@ -485,4 +484,3 @@ dynamic_pointer_cast(TT const& v)
 }
 }  // namespace intr_ptr
 }  // namespace xrpl
-#endif

include/xrpl/basics/IntrusivePointer.ipp

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_INTRUSIVEPOINTER_IPP_INCLUDED
-#define XRPL_BASICS_INTRUSIVEPOINTER_IPP_INCLUDED
+#pragma once
 
 #include <xrpl/basics/IntrusivePointer.h>
 #include <xrpl/basics/IntrusiveRefCounts.h>
@@ -703,4 +702,3 @@ SharedWeakUnion<T>::unsafeReleaseNoStore()
 }
 
 }  // namespace xrpl
-#endif

include/xrpl/basics/IntrusiveRefCounts.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_INTRUSIVEREFCOUNTS_H_INCLUDED
-#define XRPL_BASICS_INTRUSIVEREFCOUNTS_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/utility/instrumentation.h>
 
@@ -461,4 +460,3 @@ partialDestructorFinished(T** o)
 //------------------------------------------------------------------------------
 
 }  // namespace xrpl
-#endif

include/xrpl/basics/KeyCache.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_KEYCACHE_H
-#define XRPL_BASICS_KEYCACHE_H
+#pragma once
 
 #include <xrpl/basics/TaggedCache.h>
 #include <xrpl/basics/base_uint.h>
@@ -9,5 +8,3 @@ namespace xrpl {
 using KeyCache = TaggedCache<uint256, int, true>;
 
 }  // namespace xrpl
-
-#endif  // XRPL_BASICS_KEYCACHE_H

include/xrpl/basics/LocalValue.h

@@ -1,7 +1,4 @@
-#ifndef XRPL_BASICS_LOCALVALUE_H_INCLUDED
-#define XRPL_BASICS_LOCALVALUE_H_INCLUDED
-
-#include <boost/thread/tss.hpp>
+#pragma once
 
 #include <memory>
 #include <unordered_map>
@@ -42,21 +39,59 @@ struct LocalValues
 
     // Keys are the address of a LocalValue.
     std::unordered_map<void const*, std::unique_ptr<BasicValue>> values;
+};
 
-    static inline void
-    cleanup(LocalValues* lvs)
+// Wrapper to ensure proper cleanup when thread exits
+struct LocalValuesHolder
+{
+    LocalValues* ptr = nullptr;
+
+    ~LocalValuesHolder()
     {
-        if (lvs && !lvs->onCoro)
-            delete lvs;
+        if (ptr && !ptr->onCoro)
+            delete ptr;
     }
 };
 
-template <class = void>
-boost::thread_specific_ptr<detail::LocalValues>&
-getLocalValues()
+LocalValuesHolder&
+getLocalValuesHolder();
+
+inline LocalValues*&
+getLocalValuesPtr()
 {
-    static boost::thread_specific_ptr<detail::LocalValues> tsp(&detail::LocalValues::cleanup);
-    return tsp;
+    return getLocalValuesHolder().ptr;
+}
+
+inline LocalValues*
+getOrCreateLocalValues()
+{
+    auto& ptr = getLocalValuesPtr();
+    if (!ptr)
+    {
+        ptr = new LocalValues();
+        ptr->onCoro = false;
+    }
+    return ptr;
+}
+
+// For coroutine support, we need explicit swap functions
+inline LocalValues*
+releaseLocalValues()
+{
+    auto& ptr = getLocalValuesPtr();
+    auto* result = ptr;
+    ptr = nullptr;
+    return result;
+}
+
+inline void
+resetLocalValues(LocalValues* lvs)
+{
+    auto& ptr = getLocalValuesPtr();
+    // Clean up old value if it's not a coroutine's LocalValues
+    if (ptr && !ptr->onCoro)
+        delete ptr;
+    ptr = lvs;
 }
 
 }  // namespace detail
@@ -89,23 +124,12 @@ template <class T>
 T&
 LocalValue<T>::operator*()
 {
-    auto lvs = detail::getLocalValues().get();
-    if (!lvs)
-    {
-        lvs = new detail::LocalValues();
-        lvs->onCoro = false;
-        detail::getLocalValues().reset(lvs);
-    }
-    else
-    {
-        auto const iter = lvs->values.find(this);
-        if (iter != lvs->values.end())
-            return *reinterpret_cast<T*>(iter->second->get());
-    }
+    auto lvs = detail::getOrCreateLocalValues();
+    auto const iter = lvs->values.find(this);
+    if (iter != lvs->values.end())
+        return *reinterpret_cast<T*>(iter->second->get());
 
     return *reinterpret_cast<T*>(
         lvs->values.emplace(this, std::make_unique<detail::LocalValues::Value<T>>(t_)).first->second->get());
 }
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/Log.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_LOG_H_INCLUDED
-#define XRPL_BASICS_LOG_H_INCLUDED
+#pragma once
 
 #include <xrpl/basics/UnorderedContainers.h>
 #include <xrpl/beast/utility/Journal.h>
@@ -258,5 +257,3 @@ beast::Journal
 debugLog();
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/MathUtilities.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_MATHUTILITIES_H_INCLUDED
-#define XRPL_BASICS_MATHUTILITIES_H_INCLUDED
+#pragma once
 
 #include <algorithm>
 #include <cassert>
@@ -45,5 +44,3 @@ static_assert(calculatePercent(50'000'001, 100'000'000) == 51);
 static_assert(calculatePercent(99'999'999, 100'000'000) == 100);
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/Number.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_NUMBER_H_INCLUDED
-#define XRPL_BASICS_NUMBER_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/utility/instrumentation.h>
 
@@ -699,8 +698,12 @@ Number::normalizeToRange(T minMantissa, T maxMantissa) const
         XRPL_ASSERT_PARTS(!negative, "xrpl::Number::normalizeToRange", "Number is non-negative for unsigned range.");
     Number::normalize(negative, mantissa, exponent, minMantissa, maxMantissa);
 
-    auto const sign = negative ? -1 : 1;
-    return std::make_pair(static_cast<T>(sign * mantissa), exponent);
+    // Cast mantissa to signed type first to avoid unsigned integer overflow
+    // when multiplying by negative sign
+    T signedMantissa = static_cast<T>(mantissa);
+    if (negative)
+        signedMantissa = -signedMantissa;
+    return std::make_pair(signedMantissa, exponent);
 }
 
 inline constexpr Number
@@ -819,5 +822,3 @@ public:
 };
 
 }  // namespace xrpl
-
-#endif  // XRPL_BASICS_NUMBER_H_INCLUDED

include/xrpl/basics/RangeSet.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_RANGESET_H_INCLUDED
-#define XRPL_BASICS_RANGESET_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/core/LexicalCast.h>
 
@@ -173,5 +172,3 @@ prevMissing(RangeSet<T> const& rs, T t, T minVal = 0)
 }
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/Resolver.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_RESOLVER_H_INCLUDED
-#define XRPL_BASICS_RESOLVER_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/net/IPEndpoint.h>
 
@@ -45,5 +44,3 @@ public:
 };
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/ResolverAsio.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_RESOLVERASIO_H_INCLUDED
-#define XRPL_BASICS_RESOLVERASIO_H_INCLUDED
+#pragma once
 
 #include <xrpl/basics/Resolver.h>
 #include <xrpl/beast/utility/Journal.h>
@@ -18,5 +17,3 @@ public:
 };
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/SHAMapHash.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_SHAMAP_HASH_H_INCLUDED
-#define XRPL_BASICS_SHAMAP_HASH_H_INCLUDED
+#pragma once
 
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/basics/partitioned_unordered_map.h>
@@ -98,5 +97,3 @@ extract(SHAMapHash const& key)
 }
 
 }  // namespace xrpl
-
-#endif  // XRPL_BASICS_SHAMAP_HASH_H_INCLUDED

include/xrpl/basics/SharedWeakCachePointer.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_SHAREDWEAKCACHEPOINTER_H_INCLUDED
-#define XRPL_BASICS_SHAREDWEAKCACHEPOINTER_H_INCLUDED
+#pragma once
 
 #include <memory>
 #include <variant>
@@ -113,4 +112,3 @@ private:
     std::variant<std::shared_ptr<T>, std::weak_ptr<T>> combo_;
 };
 }  // namespace xrpl
-#endif

include/xrpl/basics/SharedWeakCachePointer.ipp

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_SHAREDWEAKCACHEPOINTER_IPP_INCLUDED
-#define XRPL_BASICS_SHAREDWEAKCACHEPOINTER_IPP_INCLUDED
+#pragma once
 
 #include <xrpl/basics/SharedWeakCachePointer.h>
 
@@ -164,4 +163,3 @@ SharedWeakCachePointer<T>::convertToWeak()
     return false;
 }
 }  // namespace xrpl
-#endif

include/xrpl/basics/SlabAllocator.h

@@ -1,7 +1,6 @@
 // Copyright (c) 2022, Nikolaos D. Bougalis <nikb@bougalis.net>
 
-#ifndef XRPL_BASICS_SLABALLOCATOR_H_INCLUDED
-#define XRPL_BASICS_SLABALLOCATOR_H_INCLUDED
+#pragma once
 
 #include <xrpl/basics/ByteUtilities.h>
 #include <xrpl/beast/type_name.h>
@@ -386,5 +385,3 @@ public:
 };
 
 }  // namespace xrpl
-
-#endif  // XRPL_BASICS_SLABALLOCATOR_H_INCLUDED

include/xrpl/basics/Slice.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_SLICE_H_INCLUDED
-#define XRPL_BASICS_SLICE_H_INCLUDED
+#pragma once
 
 #include <xrpl/basics/contract.h>
 #include <xrpl/basics/strHex.h>
@@ -231,5 +230,3 @@ makeSlice(std::basic_string<char, Traits, Alloc> const& s)
 }
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/StringUtilities.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_STRINGUTILITIES_H_INCLUDED
-#define XRPL_BASICS_STRINGUTILITIES_H_INCLUDED
+#pragma once
 
 #include <xrpl/basics/Blob.h>
 #include <xrpl/basics/strHex.h>
@@ -132,5 +131,3 @@ bool
 isProperlyFormedTomlDomain(std::string_view domain);
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/TaggedCache.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_TAGGEDCACHE_H_INCLUDED
-#define XRPL_BASICS_TAGGEDCACHE_H_INCLUDED
+#pragma once
 
 #include <xrpl/basics/IntrusivePointer.h>
 #include <xrpl/basics/Log.h>
@@ -298,5 +297,3 @@ private:
 };
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/TaggedCache.ipp

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_TAGGEDCACHE_IPP_INCLUDED
-#define XRPL_BASICS_TAGGEDCACHE_IPP_INCLUDED
+#pragma once
 
 #include <xrpl/basics/IntrusivePointer.ipp>
 #include <xrpl/basics/TaggedCache.h>
@@ -784,5 +783,3 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
 }
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/ToString.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_TOSTRING_H_INCLUDED
-#define XRPL_BASICS_TOSTRING_H_INCLUDED
+#pragma once
 
 #include <string>
 #include <type_traits>
@@ -44,5 +43,3 @@ to_string(char const* s)
 }
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/UnorderedContainers.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_UNORDEREDCONTAINERS_H_INCLUDED
-#define XRPL_BASICS_UNORDEREDCONTAINERS_H_INCLUDED
+#pragma once
 
 #include <xrpl/basics/hardened_hash.h>
 #include <xrpl/basics/partitioned_unordered_map.h>
@@ -99,5 +98,3 @@ template <
 using hardened_hash_multiset = std::unordered_multiset<Value, Hash, Pred, Allocator>;
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/UptimeClock.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_UPTIMETIMER_H_INCLUDED
-#define XRPL_BASICS_UPTIMETIMER_H_INCLUDED
+#pragma once
 
 #include <atomic>
 #include <chrono>
@@ -46,5 +45,3 @@ private:
 };
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/algorithm.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_ALGORITHM_H_INCLUDED
-#define XRPL_ALGORITHM_H_INCLUDED
+#pragma once
 
 #include <utility>
 
@@ -90,5 +89,3 @@ remove_if_intersect_or_match(FwdIter1 first1, FwdIter1 last1, InputIter2 first2,
 }
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/base64.h

@@ -32,8 +32,7 @@
 
 */
 
-#ifndef XRPL_BASICS_BASE64_H_INCLUDED
-#define XRPL_BASICS_BASE64_H_INCLUDED
+#pragma once
 
 #include <cstdint>
 #include <string>
@@ -53,5 +52,3 @@ std::string
 base64_decode(std::string_view data);
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/base_uint.h

@@ -3,8 +3,7 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file license.txt or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef XRPL_BASICS_BASE_UINT_H_INCLUDED
-#define XRPL_BASICS_BASE_UINT_H_INCLUDED
+#pragma once
 
 #include <xrpl/basics/Expected.h>
 #include <xrpl/basics/Slice.h>
@@ -358,6 +357,7 @@ public:
     base_uint&
     operator&=(base_uint const& b)
     {
+        XRPL_ASSERT(WIDTH == b.WIDTH, "input size mismatch");
         for (int i = 0; i < WIDTH; i++)
             data_[i] &= b.data_[i];
 
@@ -644,5 +644,3 @@ struct is_uniquely_represented<xrpl::base_uint<Bits, Tag>> : public std::true_ty
 };
 
 }  // namespace beast
-
-#endif

include/xrpl/basics/chrono.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_CHRONO_H_INCLUDED
-#define XRPL_BASICS_CHRONO_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/clock/abstract_clock.h>
 #include <xrpl/beast/clock/basic_seconds_clock.h>
@@ -99,5 +98,3 @@ stopwatch()
 }
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/comparators.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_COMPARATORS_H_INCLUDED
-#define XRPL_BASICS_COMPARATORS_H_INCLUDED
+#pragma once
 
 #include <functional>
 
@@ -53,5 +52,3 @@ using equal_to = std::equal_to<T>;
 #endif
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/contract.h

@@ -1,6 +1,6 @@
-#ifndef XRPL_BASICS_CONTRACT_H_INCLUDED
-#define XRPL_BASICS_CONTRACT_H_INCLUDED
+#pragma once
 
+#include <xrpl/basics/sanitizers.h>
 #include <xrpl/beast/type_name.h>
 
 #include <exception>
@@ -25,7 +25,7 @@ LogThrow(std::string const& title);
     control to the next matching exception handler, if any.
     Otherwise, std::terminate will be called.
 */
-[[noreturn]] inline void
+[[noreturn]] XRPL_NO_SANITIZE_ADDRESS inline void
 Rethrow()
 {
     LogThrow("Re-throwing exception");
@@ -33,7 +33,7 @@ Rethrow()
 }
 
 template <class E, class... Args>
-[[noreturn]] inline void
+[[noreturn]] XRPL_NO_SANITIZE_ADDRESS inline void
 Throw(Args&&... args)
 {
     static_assert(std::is_convertible<E*, std::exception*>::value, "Exception must derive from std::exception.");
@@ -48,5 +48,3 @@ Throw(Args&&... args)
 LogicError(std::string const& how) noexcept;
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/hardened_hash.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_HARDENED_HASH_H_INCLUDED
-#define XRPL_BASICS_HARDENED_HASH_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/hash/hash_append.h>
 #include <xrpl/beast/hash/xxhasher.h>
@@ -93,5 +92,3 @@ public:
 };
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/join.h

@@ -1,5 +1,4 @@
-#ifndef JOIN_H_INCLUDED
-#define JOIN_H_INCLUDED
+#pragma once
 
 #include <string>
 
@@ -80,5 +79,3 @@ public:
 };
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/make_SSLContext.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_MAKE_SSLCONTEXT_H_INCLUDED
-#define XRPL_BASICS_MAKE_SSLCONTEXT_H_INCLUDED
+#pragma once
 
 #include <boost/asio/ssl/context.hpp>
 
@@ -20,5 +19,3 @@ make_SSLContextAuthed(
     std::string const& cipherList);
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/mulDiv.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_MULDIV_H_INCLUDED
-#define XRPL_BASICS_MULDIV_H_INCLUDED
+#pragma once
 
 #include <cstdint>
 #include <limits>
@@ -22,5 +21,3 @@ std::optional<std::uint64_t>
 mulDiv(std::uint64_t value, std::uint64_t mul, std::uint64_t div);
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/partitioned_unordered_map.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_PARTITIONED_UNORDERED_MAP_H
-#define XRPL_BASICS_PARTITIONED_UNORDERED_MAP_H
+#pragma once
 
 #include <xrpl/beast/hash/uhash.h>
 #include <xrpl/beast/utility/instrumentation.h>
@@ -393,5 +392,3 @@ private:
 };
 
 }  // namespace xrpl
-
-#endif  // XRPL_BASICS_PARTITIONED_UNORDERED_MAP_H

include/xrpl/basics/random.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_RANDOM_H_INCLUDED
-#define XRPL_BASICS_RANDOM_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/beast/xor_shift_engine.h>
@@ -174,5 +173,3 @@ rand_bool()
 /** @} */
 
 }  // namespace xrpl
-
-#endif  // XRPL_BASICS_RANDOM_H_INCLUDED

include/xrpl/basics/rocksdb.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_ROCKSDB_H_INCLUDED
-#define XRPL_BASICS_ROCKSDB_H_INCLUDED
+#pragma once
 
 #if XRPL_ROCKSDB_AVAILABLE
 // #include <rocksdb2/port/port_posix.h>
@@ -28,5 +27,3 @@
 #include <rocksdb/write_batch.h>
 
 #endif
-
-#endif

include/xrpl/basics/safe_cast.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_SAFE_CAST_H_INCLUDED
-#define XRPL_BASICS_SAFE_CAST_H_INCLUDED
+#pragma once
 
 #include <type_traits>
 
@@ -69,5 +68,3 @@ unsafe_cast(Src s) noexcept
 }
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/sanitizers.h

@@ -0,0 +1,6 @@
+// Helper to disable ASan/HwASan for specific functions
+#if defined(__GNUC__) || defined(__clang__)
+#define XRPL_NO_SANITIZE_ADDRESS __attribute__((no_sanitize("address", "hwaddress")))
+#else
+#define XRPL_NO_SANITIZE_ADDRESS
+#endif

include/xrpl/basics/scope.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_SCOPE_H_INCLUDED
-#define XRPL_BASICS_SCOPE_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/utility/instrumentation.h>
 
@@ -220,5 +219,3 @@ template <class Mutex>
 scope_unlock(std::unique_lock<Mutex>&) -> scope_unlock<Mutex>;
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/spinlock.h

@@ -1,7 +1,6 @@
 // Copyright (c) 2022, Nikolaos D. Bougalis <nikb@bougalis.net>
 
-#ifndef XRPL_BASICS_SPINLOCK_H_INCLUDED
-#define XRPL_BASICS_SPINLOCK_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/utility/instrumentation.h>
 
@@ -201,5 +200,3 @@ public:
 /** @} */
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/strHex.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_STRHEX_H_INCLUDED
-#define XRPL_BASICS_STRHEX_H_INCLUDED
+#pragma once
 
 #include <boost/algorithm/hex.hpp>
 #include <boost/endian/conversion.hpp>
@@ -27,5 +26,3 @@ strHex(T const& from)
 }
 
 }  // namespace xrpl
-
-#endif

include/xrpl/basics/tagged_integer.h

@@ -1,7 +1,6 @@
 // Copyright (c) 2014, Nikolaos D. Bougalis <nikb@bougalis.net>
 
-#ifndef BEAST_UTILITY_TAGGED_INTEGER_H_INCLUDED
-#define BEAST_UTILITY_TAGGED_INTEGER_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/hash/hash_append.h>
 
@@ -202,4 +201,3 @@ struct is_contiguously_hashable<xrpl::tagged_integer<Int, Tag>, HashAlgorithm>
 };
 
 }  // namespace beast
-#endif

include/xrpl/beast/asio/io_latency_probe.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_ASIO_IO_LATENCY_PROBE_H_INCLUDED
-#define BEAST_ASIO_IO_LATENCY_PROBE_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/utility/instrumentation.h>
 
@@ -226,5 +225,3 @@ private:
 };
 
 }  // namespace beast
-
-#endif

include/xrpl/beast/clock/abstract_clock.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_CHRONO_ABSTRACT_CLOCK_H_INCLUDED
-#define BEAST_CHRONO_ABSTRACT_CLOCK_H_INCLUDED
+#pragma once
 
 namespace beast {
 
@@ -89,5 +88,3 @@ get_abstract_clock()
 }
 
 }  // namespace beast
-
-#endif

include/xrpl/beast/clock/basic_seconds_clock.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_CHRONO_BASIC_SECONDS_CLOCK_H_INCLUDED
-#define BEAST_CHRONO_BASIC_SECONDS_CLOCK_H_INCLUDED
+#pragma once
 
 #include <chrono>
 
@@ -33,5 +32,3 @@ public:
 };
 
 }  // namespace beast
-
-#endif

include/xrpl/beast/clock/manual_clock.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_CHRONO_MANUAL_CLOCK_H_INCLUDED
-#define BEAST_CHRONO_MANUAL_CLOCK_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/clock/abstract_clock.h>
 #include <xrpl/beast/utility/instrumentation.h>
@@ -75,5 +74,3 @@ public:
 };
 
 }  // namespace beast
-
-#endif

include/xrpl/beast/container/aged_container.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_CONTAINER_AGED_CONTAINER_H_INCLUDED
-#define BEAST_CONTAINER_AGED_CONTAINER_H_INCLUDED
+#pragma once
 
 #include <type_traits>
 
@@ -12,5 +11,3 @@ struct is_aged_container : std::false_type
 };
 
 }  // namespace beast
-
-#endif

include/xrpl/beast/container/aged_container_utility.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_CONTAINER_AGED_CONTAINER_UTILITY_H_INCLUDED
-#define BEAST_CONTAINER_AGED_CONTAINER_UTILITY_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/container/aged_container.h>
 
@@ -24,5 +23,3 @@ expire(AgedContainer& c, std::chrono::duration<Rep, Period> const& age)
 }
 
 }  // namespace beast
-
-#endif

include/xrpl/beast/container/aged_map.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_CONTAINER_AGED_MAP_H_INCLUDED
-#define BEAST_CONTAINER_AGED_MAP_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/container/detail/aged_ordered_container.h>
 
@@ -18,5 +17,3 @@ template <
 using aged_map = detail::aged_ordered_container<false, true, Key, T, Clock, Compare, Allocator>;
 
 }
-
-#endif

include/xrpl/beast/container/aged_multimap.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_CONTAINER_AGED_MULTIMAP_H_INCLUDED
-#define BEAST_CONTAINER_AGED_MULTIMAP_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/container/detail/aged_ordered_container.h>
 
@@ -18,5 +17,3 @@ template <
 using aged_multimap = detail::aged_ordered_container<true, true, Key, T, Clock, Compare, Allocator>;
 
 }
-
-#endif

include/xrpl/beast/container/aged_multiset.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_CONTAINER_AGED_MULTISET_H_INCLUDED
-#define BEAST_CONTAINER_AGED_MULTISET_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/container/detail/aged_ordered_container.h>
 
@@ -17,5 +16,3 @@ template <
 using aged_multiset = detail::aged_ordered_container<true, false, Key, void, Clock, Compare, Allocator>;
 
 }
-
-#endif

include/xrpl/beast/container/aged_set.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_CONTAINER_AGED_SET_H_INCLUDED
-#define BEAST_CONTAINER_AGED_SET_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/container/detail/aged_ordered_container.h>
 
@@ -17,5 +16,3 @@ template <
 using aged_set = detail::aged_ordered_container<false, false, Key, void, Clock, Compare, Allocator>;
 
 }
-
-#endif

include/xrpl/beast/container/aged_unordered_map.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_CONTAINER_AGED_UNORDERED_MAP_H_INCLUDED
-#define BEAST_CONTAINER_AGED_UNORDERED_MAP_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/container/detail/aged_unordered_container.h>
 
@@ -19,5 +18,3 @@ template <
 using aged_unordered_map = detail::aged_unordered_container<false, true, Key, T, Clock, Hash, KeyEqual, Allocator>;
 
 }
-
-#endif

include/xrpl/beast/container/aged_unordered_multimap.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_CONTAINER_AGED_UNORDERED_MULTIMAP_H_INCLUDED
-#define BEAST_CONTAINER_AGED_UNORDERED_MULTIMAP_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/container/detail/aged_unordered_container.h>
 
@@ -19,5 +18,3 @@ template <
 using aged_unordered_multimap = detail::aged_unordered_container<true, true, Key, T, Clock, Hash, KeyEqual, Allocator>;
 
 }
-
-#endif

include/xrpl/beast/container/aged_unordered_multiset.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_CONTAINER_AGED_UNORDERED_MULTISET_H_INCLUDED
-#define BEAST_CONTAINER_AGED_UNORDERED_MULTISET_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/container/detail/aged_unordered_container.h>
 
@@ -19,5 +18,3 @@ using aged_unordered_multiset =
     detail::aged_unordered_container<true, false, Key, void, Clock, Hash, KeyEqual, Allocator>;
 
 }
-
-#endif

include/xrpl/beast/container/aged_unordered_set.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_CONTAINER_AGED_UNORDERED_SET_H_INCLUDED
-#define BEAST_CONTAINER_AGED_UNORDERED_SET_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/container/detail/aged_unordered_container.h>
 
@@ -18,5 +17,3 @@ template <
 using aged_unordered_set = detail::aged_unordered_container<false, false, Key, void, Clock, Hash, KeyEqual, Allocator>;
 
 }
-
-#endif

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

@@ -1,5 +1,4 @@
-#ifndef BEAST_CONTAINER_DETAIL_AGED_ASSOCIATIVE_CONTAINER_H_INCLUDED
-#define BEAST_CONTAINER_DETAIL_AGED_ASSOCIATIVE_CONTAINER_H_INCLUDED
+#pragma once
 
 namespace beast {
 namespace detail {
@@ -33,5 +32,3 @@ struct aged_associative_container_extract_t<false>
 
 }  // namespace detail
 }  // namespace beast
-
-#endif

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

@@ -1,5 +1,4 @@
-#ifndef BEAST_CONTAINER_DETAIL_AGED_CONTAINER_ITERATOR_H_INCLUDED
-#define BEAST_CONTAINER_DETAIL_AGED_CONTAINER_ITERATOR_H_INCLUDED
+#pragma once
 
 #include <iterator>
 #include <type_traits>
@@ -146,5 +145,3 @@ private:
 }  // namespace detail
 
 }  // namespace beast
-
-#endif

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

@@ -1,5 +1,4 @@
-#ifndef BEAST_CONTAINER_DETAIL_AGED_ORDERED_CONTAINER_H_INCLUDED
-#define BEAST_CONTAINER_DETAIL_AGED_ORDERED_CONTAINER_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/clock/abstract_clock.h>
 #include <xrpl/beast/container/aged_container.h>
@@ -1687,5 +1686,3 @@ expire(
 }
 
 }  // namespace beast
-
-#endif

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

@@ -1,5 +1,4 @@
-#ifndef BEAST_CONTAINER_DETAIL_AGED_UNORDERED_CONTAINER_H_INCLUDED
-#define BEAST_CONTAINER_DETAIL_AGED_UNORDERED_CONTAINER_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/clock/abstract_clock.h>
 #include <xrpl/beast/container/aged_container.h>
@@ -2226,5 +2225,3 @@ expire(
 }
 
 }  // namespace beast
-
-#endif

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

@@ -4,8 +4,7 @@
 // Official repository: https://github.com/boostorg/beast
 //
 
-#ifndef BEAST_CONTAINER_DETAIL_EMPTY_BASE_OPTIMIZATION_H_INCLUDED
-#define BEAST_CONTAINER_DETAIL_EMPTY_BASE_OPTIMIZATION_H_INCLUDED
+#pragma once
 
 #include <boost/type_traits/is_final.hpp>
 
@@ -89,5 +88,3 @@ public:
 
 }  // namespace detail
 }  // namespace beast
-
-#endif

include/xrpl/beast/core/CurrentThreadName.h

@@ -2,8 +2,7 @@
 // Copyright (c) 2013 - Raw Material Software Ltd.
 // Please visit http://www.juce.com
 
-#ifndef BEAST_CORE_CURRENT_THREAD_NAME_H_INCLUDED
-#define BEAST_CORE_CURRENT_THREAD_NAME_H_INCLUDED
+#pragma once
 
 #include <boost/predef.h>
 
@@ -53,5 +52,3 @@ std::string
 getCurrentThreadName();
 
 }  // namespace beast
-
-#endif

include/xrpl/beast/core/LexicalCast.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_MODULE_CORE_TEXT_LEXICALCAST_H_INCLUDED
-#define BEAST_MODULE_CORE_TEXT_LEXICALCAST_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/utility/instrumentation.h>
 
@@ -208,5 +207,3 @@ lexicalCast(In in, Out defaultValue = Out())
 }
 
 }  // namespace beast
-
-#endif

include/xrpl/beast/core/List.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_INTRUSIVE_LIST_H_INCLUDED
-#define BEAST_INTRUSIVE_LIST_H_INCLUDED
+#pragma once
 
 #include <iterator>
 
@@ -574,5 +573,3 @@ private:
 };
 
 }  // namespace beast
-
-#endif

include/xrpl/beast/core/LockFreeStack.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_INTRUSIVE_LOCKFREESTACK_H_INCLUDED
-#define BEAST_INTRUSIVE_LOCKFREESTACK_H_INCLUDED
+#pragma once
 
 #include <atomic>
 #include <iterator>
@@ -268,5 +267,3 @@ private:
 };
 
 }  // namespace beast
-
-#endif

include/xrpl/beast/core/SemanticVersion.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_MODULE_CORE_DIAGNOSTIC_SEMANTICVERSION_H_INCLUDED
-#define BEAST_MODULE_CORE_DIAGNOSTIC_SEMANTICVERSION_H_INCLUDED
+#pragma once
 
 #include <string>
 #include <vector>
@@ -95,5 +94,3 @@ operator<(SemanticVersion const& lhs, SemanticVersion const& rhs)
 }
 
 }  // namespace beast
-
-#endif

include/xrpl/beast/hash/hash_append.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_HASH_HASH_APPEND_H_INCLUDED
-#define BEAST_HASH_HASH_APPEND_H_INCLUDED
+#pragma once
 
 #include <boost/container/flat_set.hpp>
 #include <boost/endian/conversion.hpp>
@@ -440,5 +439,3 @@ hash_append(HashAlgorithm& h, std::error_code const& ec)
 }
 
 }  // namespace beast
-
-#endif

include/xrpl/beast/hash/uhash.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_HASH_UHASH_H_INCLUDED
-#define BEAST_HASH_UHASH_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/hash/hash_append.h>
 #include <xrpl/beast/hash/xxhasher.h>
@@ -25,5 +24,3 @@ struct uhash
 };
 
 }  // namespace beast
-
-#endif

include/xrpl/beast/hash/xxhasher.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_HASH_XXHASHER_H_INCLUDED
-#define BEAST_HASH_XXHASHER_H_INCLUDED
+#pragma once
 
 #include <boost/endian/conversion.hpp>
 
@@ -152,5 +151,3 @@ public:
 };
 
 }  // namespace beast
-
-#endif

include/xrpl/beast/insight/Collector.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_INSIGHT_COLLECTOR_H_INCLUDED
-#define BEAST_INSIGHT_COLLECTOR_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/insight/Counter.h>
 #include <xrpl/beast/insight/Event.h>
@@ -120,5 +119,3 @@ public:
 
 }  // namespace insight
 }  // namespace beast
-
-#endif

include/xrpl/beast/insight/Counter.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_INSIGHT_COUNTER_H_INCLUDED
-#define BEAST_INSIGHT_COUNTER_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/insight/CounterImpl.h>
 
@@ -94,5 +93,3 @@ private:
 
 }  // namespace insight
 }  // namespace beast
-
-#endif

include/xrpl/beast/insight/CounterImpl.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_INSIGHT_COUNTERIMPL_H_INCLUDED
-#define BEAST_INSIGHT_COUNTERIMPL_H_INCLUDED
+#pragma once
 
 #include <cstdint>
 #include <memory>
@@ -21,5 +20,3 @@ public:
 
 }  // namespace insight
 }  // namespace beast
-
-#endif

include/xrpl/beast/insight/Event.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_INSIGHT_EVENT_H_INCLUDED
-#define BEAST_INSIGHT_EVENT_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/insight/EventImpl.h>
 
@@ -61,5 +60,3 @@ private:
 
 }  // namespace insight
 }  // namespace beast
-
-#endif

include/xrpl/beast/insight/EventImpl.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_INSIGHT_EVENTIMPL_H_INCLUDED
-#define BEAST_INSIGHT_EVENTIMPL_H_INCLUDED
+#pragma once
 
 #include <chrono>
 #include <memory>
@@ -21,5 +20,3 @@ public:
 
 }  // namespace insight
 }  // namespace beast
-
-#endif

include/xrpl/beast/insight/Gauge.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_INSIGHT_GAUGE_H_INCLUDED
-#define BEAST_INSIGHT_GAUGE_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/insight/GaugeImpl.h>
 
@@ -124,5 +123,3 @@ private:
 
 }  // namespace insight
 }  // namespace beast
-
-#endif

include/xrpl/beast/insight/GaugeImpl.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_INSIGHT_GAUGEIMPL_H_INCLUDED
-#define BEAST_INSIGHT_GAUGEIMPL_H_INCLUDED
+#pragma once
 
 #include <cstdint>
 #include <memory>
@@ -24,5 +23,3 @@ public:
 
 }  // namespace insight
 }  // namespace beast
-
-#endif

include/xrpl/beast/insight/Group.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_INSIGHT_GROUP_H_INCLUDED
-#define BEAST_INSIGHT_GROUP_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/insight/Collector.h>
 
@@ -22,5 +21,3 @@ public:
 
 }  // namespace insight
 }  // namespace beast
-
-#endif

include/xrpl/beast/insight/Groups.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_INSIGHT_GROUPS_H_INCLUDED
-#define BEAST_INSIGHT_GROUPS_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/insight/Collector.h>
 #include <xrpl/beast/insight/Group.h>
@@ -35,5 +34,3 @@ make_Groups(Collector::ptr const& collector);
 
 }  // namespace insight
 }  // namespace beast
-
-#endif

include/xrpl/beast/insight/Hook.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_INSIGHT_HOOK_H_INCLUDED
-#define BEAST_INSIGHT_HOOK_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/insight/HookImpl.h>
 
@@ -40,5 +39,3 @@ private:
 
 }  // namespace insight
 }  // namespace beast
-
-#endif

include/xrpl/beast/insight/HookImpl.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_INSIGHT_HOOKIMPL_H_INCLUDED
-#define BEAST_INSIGHT_HOOKIMPL_H_INCLUDED
+#pragma once
 
 #include <functional>
 #include <memory>
@@ -17,5 +16,3 @@ public:
 
 }  // namespace insight
 }  // namespace beast
-
-#endif

include/xrpl/beast/insight/Insight.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_INSIGHT_H_INCLUDED
-#define BEAST_INSIGHT_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/insight/Collector.h>
 #include <xrpl/beast/insight/Counter.h>
@@ -14,5 +13,3 @@
 #include <xrpl/beast/insight/HookImpl.h>
 #include <xrpl/beast/insight/NullCollector.h>
 #include <xrpl/beast/insight/StatsDCollector.h>
-
-#endif

include/xrpl/beast/insight/Meter.h

@@ -1,5 +1,4 @@
-#ifndef BEAST_INSIGHT_METER_H_INCLUDED
-#define BEAST_INSIGHT_METER_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/insight/MeterImpl.h>
 
@@ -79,5 +78,3 @@ private:
 
 }  // namespace insight
 }  // namespace beast
-
-#endif