additional comments

- remove unused method
- rename computeFee to computeManagementFee
- rename calculateRounded to constructRounded
- remove redundancies in LoanDeltas struct
- rename PaymentComponentsPlus to ExtendedPaymentComponents
- additional logging

.github/scripts/rename/README.md

@@ -26,11 +26,6 @@ run from the repository root.
    references to `ripple` and `rippled` (with or without capital letters) to
    `xrpl` and `xrpld`, respectively. The name of the binary will remain as-is,
    and will only be renamed to `xrpld` by a later script.
-4. `.github/scripts/rename/binary.sh`: This script will rename the binary from
-   `rippled` to `xrpld`, and reverses the symlink so that `rippled` points to
-   the `xrpld` binary.
-5. `.github/scripts/rename/namespace.sh`: This script will rename the C++
-   namespaces from `ripple` to `xrpl`.
 
 You can run all these scripts from the repository root as follows:
 
@@ -38,6 +33,4 @@ You can run all these scripts from the repository root as follows:
 ./.github/scripts/rename/definitions.sh .
 ./.github/scripts/rename/copyright.sh .
 ./.github/scripts/rename/cmake.sh .
-./.github/scripts/rename/binary.sh .
-./.github/scripts/rename/namespace.sh .
 ```

.github/scripts/rename/binary.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# Exit the script as soon as an error occurs.
-set -e
-
-# On MacOS, ensure that GNU sed is installed and available as `gsed`.
-SED_COMMAND=sed
-if [[ "${OSTYPE}" == 'darwin'* ]]; then
-  if ! command -v gsed &> /dev/null; then
-      echo "Error: gsed is not installed. Please install it using 'brew install gnu-sed'."
-      exit 1
-  fi
-  SED_COMMAND=gsed
-fi
-
-# This script changes the binary name from `rippled` to `xrpld`, and reverses
-# the symlink that currently points from `xrpld` to `rippled` so that it points
-# from `rippled` to `xrpld` instead.
-# Usage: .github/scripts/rename/binary.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
-pushd ${DIRECTORY}
-
-# Remove the binary name override added by the cmake.sh script.
-${SED_COMMAND} -z -i -E 's@\s+# For the time being.+"rippled"\)@@' cmake/XrplCore.cmake
-
-# Reverse the symlink.
-${SED_COMMAND} -i -E 's@create_symbolic_link\(rippled@create_symbolic_link(xrpld@' cmake/XrplInstall.cmake
-${SED_COMMAND} -i -E 's@/xrpld\$\{suffix\}@/rippled${suffix}@' cmake/XrplInstall.cmake
-
-popd
-echo "Processing complete."

.github/scripts/rename/namespace.sh

@@ -1,54 +0,0 @@
-#!/bin/bash
-
-# Exit the script as soon as an error occurs.
-set -e
-
-# On MacOS, ensure that GNU sed is installed and available as `gsed`.
-SED_COMMAND=sed
-if [[ "${OSTYPE}" == 'darwin'* ]]; then
-  if ! command -v gsed &> /dev/null; then
-      echo "Error: gsed is not installed. Please install it using 'brew install gnu-sed'."
-      exit 1
-  fi
-  SED_COMMAND=gsed
-fi
-
-# This script renames the `ripple` namespace to `xrpl` in this project.
-# Specifically, it renames all occurrences of `namespace ripple` and `ripple::`
-# to `namespace xrpl` and `xrpl::`, respectively, by scanning all header and
-# source files in the specified directory and its subdirectories, as well as any
-# occurrences in the documentation.
-# Usage: .github/scripts/rename/namespace.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
-pushd ${DIRECTORY}
-
-DIRECTORIES=("include" "src" "tests")
-for DIRECTORY in "${DIRECTORIES[@]}"; do
-  echo "Processing directory: ${DIRECTORY}"
-
-  find "${DIRECTORY}" -type f \( -name "*.h" -o -name "*.hpp" -o -name "*.ipp" -o -name "*.cpp" \) | while read -r FILE; do
-      echo "Processing file: ${FILE}"
-      ${SED_COMMAND} -i 's/namespace ripple/namespace xrpl/g' "${FILE}"
-      ${SED_COMMAND} -i 's/ripple::/xrpl::/g' "${FILE}"
-  done
-done
-
-DIRECTORY=$1
-find "${DIRECTORY}" -type f -name "*.md" | while read -r FILE; do
-    echo "Processing file: ${FILE}"
-    ${SED_COMMAND} -i 's/ripple::/xrpl::/g' "${FILE}"
-done
-
-popd
-echo "Renaming complete."

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

@@ -129,14 +129,14 @@ jobs:
             --parallel "${BUILD_NPROC}" \
             --target "${CMAKE_TARGET}"
 
-      - name: Upload the binary (Linux)
+      - name: Upload rippled artifact (Linux)
         if: ${{ runner.os == 'Linux' }}
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         env:
           BUILD_DIR: ${{ inputs.build_dir }}
         with:
-          name: xrpld-${{ inputs.config_name }}
-          path: ${{ env.BUILD_DIR }}/xrpld
+          name: rippled-${{ inputs.config_name }}
+          path: ${{ env.BUILD_DIR }}/rippled
           retention-days: 3
           if-no-files-found: error
 
@@ -144,8 +144,8 @@ jobs:
         if: ${{ runner.os == 'Linux' }}
         working-directory: ${{ inputs.build_dir }}
         run: |
-          ldd ./xrpld
-          if [ "$(ldd ./xrpld | grep -E '(libstdc\+\+|libgcc)' | wc -l)" -eq 0 ]; then
+          ldd ./rippled
+          if [ "$(ldd ./rippled | grep -E '(libstdc\+\+|libgcc)' | wc -l)" -eq 0 ]; then
             echo 'The binary is statically linked.'
           else
             echo 'The binary is dynamically linked.'
@@ -156,7 +156,7 @@ jobs:
         if: ${{ runner.os == 'Linux' && env.ENABLED_VOIDSTAR == 'true' }}
         working-directory: ${{ inputs.build_dir }}
         run: |
-          ./xrpld --version | grep libvoidstar
+          ./rippled --version | grep libvoidstar
 
       - name: Run the separate tests
         if: ${{ !inputs.build_only }}
@@ -177,7 +177,7 @@ jobs:
         env:
           BUILD_NPROC: ${{ steps.nproc.outputs.nproc }}
         run: |
-          ./xrpld --unittest --unittest-jobs "${BUILD_NPROC}"
+          ./rippled --unittest --unittest-jobs "${BUILD_NPROC}"
 
       - name: Debug failure (Linux)
         if: ${{ failure() && runner.os == 'Linux' && !inputs.build_only }}

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

@@ -25,7 +25,7 @@ jobs:
         env:
           MESSAGE: |
 
-            The dependency relationships between the modules in xrpld have
+            The dependency relationships between the modules in rippled have
             changed, which may be an improvement or a regression.
 
             A rule of thumb is that if your changes caused something to be

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

@@ -25,10 +25,6 @@ jobs:
         run: .github/scripts/rename/copyright.sh .
       - name: Check CMake configs
         run: .github/scripts/rename/cmake.sh .
-      - name: Check binary name
-        run: .github/scripts/rename/binary.sh .
-      - name: Check namespaces
-        run: .github/scripts/rename/namespace.sh .
       - name: Check for differences
         env:
           MESSAGE: |

CONTRIBUTING.md

@@ -299,7 +299,7 @@ For this reason:
 - Example **bad** name
   `"RFC1751::insert(char* s, int x, int start, int length) : length is greater than or equal zero"`
   (missing namespace, unnecessary full function signature, description too verbose).
-  Good name: `"xrpl::RFC1751::insert : minimum length"`.
+  Good name: `"ripple::RFC1751::insert : minimum length"`.
 - In **few** well-justified cases a non-standard name can be used, in which case a
   comment should be placed to explain the rationale (example in `contract.cpp`)
 - Do **not** rename a contract without a good reason (e.g. the name no longer

cmake/XrplCore.cmake

@@ -223,4 +223,6 @@ if(xrpld)
       src/test/ledger/Invariants_test.cpp
       PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE)
   endif()
+  # For the time being, we will keep the name of the binary as it was.
+  set_target_properties(xrpld PROPERTIES OUTPUT_NAME "rippled")
 endif()

cmake/XrplInstall.cmake

@@ -67,8 +67,8 @@ if (is_root_project AND TARGET xrpld)
   install(CODE "
     set(CMAKE_MODULE_PATH \"${CMAKE_MODULE_PATH}\")
     include(create_symbolic_link)
-    create_symbolic_link(xrpld${suffix} \
-       \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/rippled${suffix})
+    create_symbolic_link(rippled${suffix} \
+       \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/xrpld${suffix})
   ")
 endif ()
 

include/xrpl/basics/Archive.h

@@ -3,7 +3,7 @@
 
 #include <boost/filesystem.hpp>
 
-namespace xrpl {
+namespace ripple {
 
 /** Extract a tar archive compressed with lz4
 
@@ -17,6 +17,6 @@ extractTarLz4(
     boost::filesystem::path const& src,
     boost::filesystem::path const& dst);
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/BasicConfig.h

@@ -12,7 +12,7 @@
 #include <unordered_map>
 #include <vector>
 
-namespace xrpl {
+namespace ripple {
 
 using IniFileSections =
     std::unordered_map<std::string, std::vector<std::string>>;
@@ -380,6 +380,6 @@ get_if_exists<bool>(Section const& section, std::string const& name, bool& v)
     return stat;
 }
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/Blob.h

@@ -3,13 +3,13 @@
 
 #include <vector>
 
-namespace xrpl {
+namespace ripple {
 
 /** Storage for linear binary data.
     Blocks of binary data appear often in various idioms and structures.
 */
 using Blob = std::vector<unsigned char>;
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/Buffer.h

@@ -8,7 +8,7 @@
 #include <cstring>
 #include <memory>
 
-namespace xrpl {
+namespace ripple {
 
 /** Like std::vector<char> but better.
     Meets the requirements of BufferFactory.
@@ -96,7 +96,7 @@ public:
         XRPL_ASSERT(
             s.size() == 0 || size_ == 0 || s.data() < p_.get() ||
                 s.data() >= p_.get() + size_,
-            "xrpl::Buffer::operator=(Slice) : input not a subset");
+            "ripple::Buffer::operator=(Slice) : input not a subset");
 
         if (auto p = alloc(s.size()))
             std::memcpy(p, s.data(), s.size());
@@ -215,6 +215,6 @@ operator!=(Buffer const& lhs, Buffer const& rhs) noexcept
     return !(lhs == rhs);
 }
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/ByteUtilities.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_BASICS_BYTEUTILITIES_H_INCLUDED
 #define XRPL_BASICS_BYTEUTILITIES_H_INCLUDED
 
-namespace xrpl {
+namespace ripple {
 
 template <class T>
 constexpr auto
@@ -19,6 +19,6 @@ megabytes(T value) noexcept
 
 static_assert(kilobytes(2) == 2048, "kilobytes(2) == 2048");
 static_assert(megabytes(3) == 3145728, "megabytes(3) == 3145728");
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/CompressionAlgorithms.h

@@ -10,7 +10,7 @@
 #include <stdexcept>
 #include <vector>
 
-namespace xrpl {
+namespace ripple {
 
 namespace compression_algorithms {
 
@@ -144,6 +144,6 @@ lz4Decompress(
 
 }  // namespace compression_algorithms
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif  // XRPL_COMPRESSIONALGORITHMS_H_INCLUDED

include/xrpl/basics/CountedObject.h

@@ -8,7 +8,7 @@
 #include <utility>
 #include <vector>
 
-namespace xrpl {
+namespace ripple {
 
 /** Manages all counted object types. */
 class CountedObjects
@@ -133,6 +133,6 @@ public:
     }
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/DecayingSample.h

@@ -4,7 +4,7 @@
 #include <chrono>
 #include <cmath>
 
-namespace xrpl {
+namespace ripple {
 
 /** Sampling function using exponential decay to provide a continuous value.
     @tparam The number of seconds in the decay window.
@@ -131,6 +131,6 @@ private:
     time_point when_;
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/Expected.h

@@ -7,7 +7,7 @@
 
 #include <stdexcept>
 
-namespace xrpl {
+namespace ripple {
 
 /** Expected is an approximation of std::expected (hoped for in C++23)
 
@@ -232,6 +232,6 @@ public:
     }
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif  // XRPL_BASICS_EXPECTED_H_INCLUDED

include/xrpl/basics/FileUtilities.h

@@ -6,7 +6,7 @@
 
 #include <optional>
 
-namespace xrpl {
+namespace ripple {
 
 std::string
 getFileContents(
@@ -20,6 +20,6 @@ writeFileContents(
     boost::filesystem::path const& destPath,
     std::string const& contents);
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/IntrusivePointer.h

@@ -6,7 +6,7 @@
 #include <type_traits>
 #include <utility>
 
-namespace xrpl {
+namespace ripple {
 
 //------------------------------------------------------------------------------
 
@@ -492,5 +492,5 @@ dynamic_pointer_cast(TT const& v)
     return SharedPtr<T>(DynamicCastTagSharedIntrusive{}, v);
 }
 }  // namespace intr_ptr
-}  // namespace xrpl
+}  // namespace ripple
 #endif

include/xrpl/basics/IntrusivePointer.ipp

@@ -6,7 +6,7 @@
 
 #include <utility>
 
-namespace xrpl {
+namespace ripple {
 
 template <class T>
 template <CAdoptTag TAdoptTag>
@@ -608,7 +608,7 @@ SharedWeakUnion<T>::convertToStrong()
         [[maybe_unused]] auto action = p->releaseWeakRef();
         XRPL_ASSERT(
             (action == ReleaseWeakRefAction::noop),
-            "xrpl::SharedWeakUnion::convertToStrong : "
+            "ripple::SharedWeakUnion::convertToStrong : "
             "action is noop");
         unsafeSetRawPtr(p, RefStrength::strong);
         return true;
@@ -637,7 +637,7 @@ SharedWeakUnion<T>::convertToWeak()
             // We just added a weak ref. How could we destroy?
             // LCOV_EXCL_START
             UNREACHABLE(
-                "xrpl::SharedWeakUnion::convertToWeak : destroying freshly "
+                "ripple::SharedWeakUnion::convertToWeak : destroying freshly "
                 "added ref");
             delete p;
             unsafeSetRawPtr(nullptr);
@@ -719,5 +719,5 @@ SharedWeakUnion<T>::unsafeReleaseNoStore()
     }
 }
 
-}  // namespace xrpl
+}  // namespace ripple
 #endif

include/xrpl/basics/IntrusiveRefCounts.h

@@ -6,7 +6,7 @@
 #include <atomic>
 #include <cstdint>
 
-namespace xrpl {
+namespace ripple {
 
 /** Action to perform when releasing a strong pointer.
 
@@ -34,7 +34,7 @@ enum class ReleaseWeakRefAction { noop, destroy };
 /** Implement the strong count, weak count, and bit flags for an intrusive
     pointer.
 
-    A class can satisfy the requirements of a xrpl::IntrusivePointer by
+    A class can satisfy the requirements of a ripple::IntrusivePointer by
     inheriting from this class.
   */
 struct IntrusiveRefCounts
@@ -257,7 +257,7 @@ IntrusiveRefCounts::releaseStrongRef() const
         RefCountPair const prevVal{prevIntVal};
         XRPL_ASSERT(
             (prevVal.strong >= strongDelta),
-            "xrpl::IntrusiveRefCounts::releaseStrongRef : previous ref "
+            "ripple::IntrusiveRefCounts::releaseStrongRef : previous ref "
             "higher than new");
         auto nextIntVal = prevIntVal - strongDelta;
         ReleaseStrongRefAction action = noop;
@@ -282,7 +282,7 @@ IntrusiveRefCounts::releaseStrongRef() const
             // twice.
             XRPL_ASSERT(
                 (action == noop) || !(prevIntVal & partialDestroyStartedMask),
-                "xrpl::IntrusiveRefCounts::releaseStrongRef : not in partial "
+                "ripple::IntrusiveRefCounts::releaseStrongRef : not in partial "
                 "destroy");
             return action;
         }
@@ -314,7 +314,7 @@ IntrusiveRefCounts::addWeakReleaseStrongRef() const
         // can't happen twice.
         XRPL_ASSERT(
             (!prevVal.partialDestroyStartedBit),
-            "xrpl::IntrusiveRefCounts::addWeakReleaseStrongRef : not in "
+            "ripple::IntrusiveRefCounts::addWeakReleaseStrongRef : not in "
             "partial destroy");
 
         auto nextIntVal = prevIntVal + delta;
@@ -336,7 +336,7 @@ IntrusiveRefCounts::addWeakReleaseStrongRef() const
         {
             XRPL_ASSERT(
                 (!(prevIntVal & partialDestroyStartedMask)),
-                "xrpl::IntrusiveRefCounts::addWeakReleaseStrongRef : not "
+                "ripple::IntrusiveRefCounts::addWeakReleaseStrongRef : not "
                 "started partial destroy");
             return action;
         }
@@ -408,11 +408,11 @@ inline IntrusiveRefCounts::~IntrusiveRefCounts() noexcept
     auto v = refCounts.load(std::memory_order_acquire);
     XRPL_ASSERT(
         (!(v & valueMask)),
-        "xrpl::IntrusiveRefCounts::~IntrusiveRefCounts : count must be zero");
+        "ripple::IntrusiveRefCounts::~IntrusiveRefCounts : count must be zero");
     auto t = v & tagMask;
     XRPL_ASSERT(
         (!t || t == tagMask),
-        "xrpl::IntrusiveRefCounts::~IntrusiveRefCounts : valid tag");
+        "ripple::IntrusiveRefCounts::~IntrusiveRefCounts : valid tag");
 #endif
 }
 
@@ -427,7 +427,7 @@ inline IntrusiveRefCounts::RefCountPair::RefCountPair(
 {
     XRPL_ASSERT(
         (strong < checkStrongMaxValue && weak < checkWeakMaxValue),
-        "xrpl::IntrusiveRefCounts::RefCountPair(FieldType) : inputs inside "
+        "ripple::IntrusiveRefCounts::RefCountPair(FieldType) : inputs inside "
         "range");
 }
 
@@ -438,7 +438,7 @@ inline IntrusiveRefCounts::RefCountPair::RefCountPair(
 {
     XRPL_ASSERT(
         (strong < checkStrongMaxValue && weak < checkWeakMaxValue),
-        "xrpl::IntrusiveRefCounts::RefCountPair(CountType, CountType) : "
+        "ripple::IntrusiveRefCounts::RefCountPair(CountType, CountType) : "
         "inputs inside range");
 }
 
@@ -447,7 +447,7 @@ IntrusiveRefCounts::RefCountPair::combinedValue() const noexcept
 {
     XRPL_ASSERT(
         (strong < checkStrongMaxValue && weak < checkWeakMaxValue),
-        "xrpl::IntrusiveRefCounts::RefCountPair::combinedValue : inputs "
+        "ripple::IntrusiveRefCounts::RefCountPair::combinedValue : inputs "
         "inside range");
     return (static_cast<IntrusiveRefCounts::FieldType>(weak)
             << IntrusiveRefCounts::StrongCountNumBits) |
@@ -465,7 +465,7 @@ partialDestructorFinished(T** o)
     XRPL_ASSERT(
         (!p.partialDestroyFinishedBit && p.partialDestroyStartedBit &&
          !p.strong),
-        "xrpl::partialDestructorFinished : not a weak ref");
+        "ripple::partialDestructorFinished : not a weak ref");
     if (!p.weak)
     {
         // There was a weak count before the partial destructor ran (or we would
@@ -479,5 +479,5 @@ partialDestructorFinished(T** o)
 }
 //------------------------------------------------------------------------------
 
-}  // namespace xrpl
+}  // namespace ripple
 #endif

include/xrpl/basics/KeyCache.h

@@ -4,10 +4,10 @@
 #include <xrpl/basics/TaggedCache.h>
 #include <xrpl/basics/base_uint.h>
 
-namespace xrpl {
+namespace ripple {
 
 using KeyCache = TaggedCache<uint256, int, true>;
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif  // XRPL_BASICS_KEYCACHE_H

include/xrpl/basics/LocalValue.h

@@ -6,7 +6,7 @@
 #include <memory>
 #include <unordered_map>
 
-namespace xrpl {
+namespace ripple {
 
 namespace detail {
 
@@ -109,6 +109,6 @@ LocalValue<T>::operator*()
             .emplace(this, std::make_unique<detail::LocalValues::Value<T>>(t_))
             .first->second->get());
 }
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/Log.h

@@ -13,7 +13,7 @@
 #include <mutex>
 #include <utility>
 
-namespace xrpl {
+namespace ripple {
 
 // DEPRECATED use beast::severities::Severity instead
 enum LogSeverity {
@@ -271,6 +271,6 @@ setDebugLogSink(std::unique_ptr<beast::Journal::Sink> sink);
 beast::Journal
 debugLog();
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/MathUtilities.h

@@ -5,7 +5,7 @@
 #include <cassert>
 #include <cstddef>
 
-namespace xrpl {
+namespace ripple {
 
 /** Calculate one number divided by another number in percentage.
  * The result is rounded up to the next integer, and capped in the range [0,100]
@@ -44,6 +44,6 @@ static_assert(calculatePercent(50'000'000, 100'000'000) == 50);
 static_assert(calculatePercent(50'000'001, 100'000'000) == 51);
 static_assert(calculatePercent(99'999'999, 100'000'000) == 100);
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/Number.h

@@ -6,13 +6,22 @@
 #include <ostream>
 #include <string>
 
-namespace xrpl {
+namespace ripple {
 
 class Number;
 
 std::string
 to_string(Number const& amount);
 
+template <typename T>
+constexpr bool
+isPowerOfTen(T value)
+{
+    while (value >= 10 && value % 10 == 0)
+        value /= 10;
+    return value == 1;
+}
+
 class Number
 {
     using rep = std::int64_t;
@@ -22,7 +31,9 @@ class Number
 public:
     // The range for the mantissa when normalized
     constexpr static std::int64_t minMantissa = 1'000'000'000'000'000LL;
-    constexpr static std::int64_t maxMantissa = 9'999'999'999'999'999LL;
+    static_assert(isPowerOfTen(minMantissa));
+    constexpr static std::int64_t maxMantissa = minMantissa * 10 - 1;
+    static_assert(maxMantissa == 9'999'999'999'999'999LL);
 
     // The range for the exponent when normalized
     constexpr static int minExponent = -32768;
@@ -132,22 +143,7 @@ public:
     }
 
     Number
-    truncate() const noexcept
-    {
-        if (exponent_ >= 0 || mantissa_ == 0)
-            return *this;
-
-        Number ret = *this;
-        while (ret.exponent_ < 0 && ret.mantissa_ != 0)
-        {
-            ret.exponent_ += 1;
-            ret.mantissa_ /= rep(10);
-        }
-        // We are guaranteed that normalize() will never throw an exception
-        // because exponent is either negative or zero at this point.
-        ret.normalize();
-        return ret;
-    }
+    truncate() const noexcept;
 
     friend constexpr bool
     operator>(Number const& x, Number const& y) noexcept
@@ -192,6 +188,8 @@ private:
     class Guard;
 };
 
+constexpr static Number numZero{};
+
 inline constexpr Number::Number(rep mantissa, int exponent, unchecked) noexcept
     : mantissa_{mantissa}, exponent_{exponent}
 {
@@ -404,6 +402,6 @@ public:
     operator=(NumberRoundModeGuard const&) = delete;
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif  // XRPL_BASICS_NUMBER_H_INCLUDED

include/xrpl/basics/README.md

@@ -21,11 +21,11 @@ ripple/basic should contain no dependencies on other modules.
 - `std::set`
   - For sorted containers.
 
-- `xrpl::hash_set`
+- `ripple::hash_set`
   - Where inserts and contains need to be O(1).
   - For "small" sets, `std::set` might be faster and smaller.
 
-- `xrpl::hardened_hash_set`
+- `ripple::hardened_hash_set`
   - For data sets where the key could be manipulated by an attacker
     in an attempt to mount an algorithmic complexity attack: see
     http://en.wikipedia.org/wiki/Algorithmic_complexity_attack
@@ -33,5 +33,5 @@ ripple/basic should contain no dependencies on other modules.
 The following container is deprecated
 
 - `std::unordered_set`
-- Use `xrpl::hash_set` instead, which uses a better hashing algorithm.
-- Or use `xrpl::hardened_hash_set` to prevent algorithmic complexity attacks.
+- Use `ripple::hash_set` instead, which uses a better hashing algorithm.
+- Or use `ripple::hardened_hash_set` to prevent algorithmic complexity attacks.

include/xrpl/basics/RangeSet.h

@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-namespace xrpl {
+namespace ripple {
 
 /** A closed interval over the domain T.
 
@@ -85,7 +85,7 @@ to_string(RangeSet<T> const& rs)
 
     std::string s;
     for (auto const& interval : rs)
-        s += xrpl::to_string(interval) + ",";
+        s += ripple::to_string(interval) + ",";
     s.pop_back();
 
     return s;
@@ -172,6 +172,6 @@ prevMissing(RangeSet<T> const& rs, T t, T minVal = 0)
     return boost::icl::last(tgt);
 }
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/Resolver.h

@@ -6,7 +6,7 @@
 #include <functional>
 #include <vector>
 
-namespace xrpl {
+namespace ripple {
 
 class Resolver
 {
@@ -47,6 +47,6 @@ public:
     /** @} */
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/ResolverAsio.h

@@ -6,7 +6,7 @@
 
 #include <boost/asio/io_context.hpp>
 
-namespace xrpl {
+namespace ripple {
 
 class ResolverAsio : public Resolver
 {
@@ -17,6 +17,6 @@ public:
     New(boost::asio::io_context&, beast::Journal);
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/SHAMapHash.h

@@ -6,7 +6,7 @@
 
 #include <ostream>
 
-namespace xrpl {
+namespace ripple {
 
 // A SHAMapHash is the hash of a node in a SHAMap, and also the
 // type of the hash of the entire SHAMap.
@@ -97,6 +97,6 @@ extract(SHAMapHash const& key)
     return *reinterpret_cast<std::size_t const*>(key.as_uint256().data());
 }
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif  // XRPL_BASICS_SHAMAP_HASH_H_INCLUDED

include/xrpl/basics/SharedWeakCachePointer.h

@@ -4,7 +4,7 @@
 #include <memory>
 #include <variant>
 
-namespace xrpl {
+namespace ripple {
 
 /** A combination of a std::shared_ptr and a std::weak_pointer.
 
@@ -112,5 +112,5 @@ public:
 private:
     std::variant<std::shared_ptr<T>, std::weak_ptr<T>> combo_;
 };
-}  // namespace xrpl
+}  // namespace ripple
 #endif

include/xrpl/basics/SharedWeakCachePointer.ipp

@@ -3,7 +3,7 @@
 
 #include <xrpl/basics/SharedWeakCachePointer.h>
 
-namespace xrpl {
+namespace ripple {
 template <class T>
 SharedWeakCachePointer<T>::SharedWeakCachePointer(
     SharedWeakCachePointer const& rhs) = default;
@@ -169,5 +169,5 @@ SharedWeakCachePointer<T>::convertToWeak()
 
     return false;
 }
-}  // namespace xrpl
+}  // namespace ripple
 #endif

include/xrpl/basics/SlabAllocator.h

@@ -22,7 +22,7 @@
 #include <sys/mman.h>
 #endif
 
-namespace xrpl {
+namespace ripple {
 
 template <typename Type>
 class SlabAllocator
@@ -128,7 +128,7 @@ class SlabAllocator
         {
             XRPL_ASSERT(
                 own(ptr),
-                "xrpl::SlabAllocator::SlabBlock::deallocate : own input");
+                "ripple::SlabAllocator::SlabBlock::deallocate : own input");
 
             std::lock_guard l(m_);
 
@@ -173,7 +173,7 @@ public:
     {
         XRPL_ASSERT(
             (itemAlignment_ & (itemAlignment_ - 1)) == 0,
-            "xrpl::SlabAllocator::SlabAllocator : valid alignment");
+            "ripple::SlabAllocator::SlabAllocator : valid alignment");
     }
 
     SlabAllocator(SlabAllocator const& other) = delete;
@@ -285,7 +285,7 @@ public:
     {
         XRPL_ASSERT(
             ptr,
-            "xrpl::SlabAllocator::SlabAllocator::deallocate : non-null "
+            "ripple::SlabAllocator::SlabAllocator::deallocate : non-null "
             "input");
 
         for (auto slab = slabs_.load(); slab != nullptr; slab = slab->next_)
@@ -419,6 +419,6 @@ public:
     }
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif  // XRPL_BASICS_SLABALLOCATOR_H_INCLUDED

include/xrpl/basics/Slice.h

@@ -15,7 +15,7 @@
 #include <type_traits>
 #include <vector>
 
-namespace xrpl {
+namespace ripple {
 
 /** An immutable linear range of bytes.
 
@@ -87,7 +87,7 @@ public:
     {
         XRPL_ASSERT(
             i < size_,
-            "xrpl::Slice::operator[](std::size_t) const : valid input");
+            "ripple::Slice::operator[](std::size_t) const : valid input");
         return data_[i];
     }
 
@@ -243,6 +243,6 @@ makeSlice(std::basic_string<char, Traits, Alloc> const& s)
     return Slice(s.data(), s.size());
 }
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/StringUtilities.h

@@ -12,7 +12,7 @@
 #include <optional>
 #include <string>
 
-namespace xrpl {
+namespace ripple {
 
 /** Format arbitrary binary data as an SQLite "blob literal".
 
@@ -132,6 +132,6 @@ to_uint64(std::string const& s);
 bool
 isProperlyFormedTomlDomain(std::string_view domain);
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/TaggedCache.h

@@ -16,7 +16,7 @@
 #include <type_traits>
 #include <vector>
 
-namespace xrpl {
+namespace ripple {
 
 /** Map/cache combination.
     This class implements a cache and a map. The cache keeps objects alive
@@ -315,6 +315,6 @@ private:
     std::uint64_t m_misses;
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/TaggedCache.ipp

@@ -4,7 +4,7 @@
 #include <xrpl/basics/IntrusivePointer.ipp>
 #include <xrpl/basics/TaggedCache.h>
 
-namespace xrpl {
+namespace ripple {
 
 template <
     class Key,
@@ -1005,6 +1005,6 @@ TaggedCache<
     });
 }
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/ToString.h

@@ -4,7 +4,7 @@
 #include <string>
 #include <type_traits>
 
-namespace xrpl {
+namespace ripple {
 
 /** to_string() generalizes std::to_string to handle bools, chars, and strings.
 
@@ -43,6 +43,6 @@ to_string(char const* s)
     return s;
 }
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/UnorderedContainers.h

@@ -22,7 +22,7 @@
  * what container it is.
  */
 
-namespace xrpl {
+namespace ripple {
 
 // hash containers
 
@@ -102,6 +102,6 @@ template <
 using hardened_hash_multiset =
     std::unordered_multiset<Value, Hash, Pred, Allocator>;
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/UptimeClock.h

@@ -6,7 +6,7 @@
 #include <ratio>
 #include <thread>
 
-namespace xrpl {
+namespace ripple {
 
 /** Tracks program uptime to seconds precision.
 
@@ -45,6 +45,6 @@ private:
     start_clock();
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/algorithm.h

@@ -3,7 +3,7 @@
 
 #include <utility>
 
-namespace xrpl {
+namespace ripple {
 
 // Requires: [first1, last1) and [first2, last2) are ordered ranges according to
 // comp.
@@ -95,6 +95,6 @@ remove_if_intersect_or_match(
     return first1;
 }
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/base64.h

@@ -38,7 +38,7 @@
 #include <cstdint>
 #include <string>
 
-namespace xrpl {
+namespace ripple {
 
 std::string
 base64_encode(std::uint8_t const* data, std::size_t len);
@@ -53,6 +53,6 @@ base64_encode(std::string const& s)
 std::string
 base64_decode(std::string_view data);
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/base_uint.h

@@ -23,7 +23,7 @@
 #include <cstring>
 #include <type_traits>
 
-namespace xrpl {
+namespace ripple {
 
 namespace detail {
 
@@ -275,7 +275,7 @@ public:
     {
         XRPL_ASSERT(
             c.size() * sizeof(typename Container::value_type) == size(),
-            "xrpl::base_uint::base_uint(Container auto) : input size match");
+            "ripple::base_uint::base_uint(Container auto) : input size match");
         std::memcpy(data_.data(), c.data(), size());
     }
 
@@ -288,7 +288,7 @@ public:
     {
         XRPL_ASSERT(
             c.size() * sizeof(typename Container::value_type) == size(),
-            "xrpl::base_uint::operator=(Container auto) : input size match");
+            "ripple::base_uint::operator=(Container auto) : input size match");
         std::memcpy(data_.data(), c.data(), size());
         return *this;
     }
@@ -648,12 +648,12 @@ static_assert(sizeof(uint192) == 192 / 8, "There should be no padding bytes");
 static_assert(sizeof(uint256) == 256 / 8, "There should be no padding bytes");
 #endif
 
-}  // namespace xrpl
+}  // namespace ripple
 
 namespace beast {
 
 template <std::size_t Bits, class Tag>
-struct is_uniquely_represented<xrpl::base_uint<Bits, Tag>>
+struct is_uniquely_represented<ripple::base_uint<Bits, Tag>>
     : public std::true_type
 {
     explicit is_uniquely_represented() = default;

include/xrpl/basics/chrono.h

@@ -12,7 +12,7 @@
 #include <ratio>
 #include <string>
 
-namespace xrpl {
+namespace ripple {
 
 // A few handy aliases
 
@@ -104,6 +104,6 @@ stopwatch()
     return beast::get_abstract_clock<Facade, Clock>();
 }
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/comparators.h

@@ -3,7 +3,7 @@
 
 #include <functional>
 
-namespace xrpl {
+namespace ripple {
 
 #ifdef _MSC_VER
 
@@ -52,6 +52,6 @@ using equal_to = std::equal_to<T>;
 
 #endif
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/contract.h

@@ -7,7 +7,7 @@
 #include <string>
 #include <utility>
 
-namespace xrpl {
+namespace ripple {
 
 /*  Programming By Contract
 
@@ -52,6 +52,6 @@ Throw(Args&&... args)
 [[noreturn]] void
 LogicError(std::string const& how) noexcept;
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/hardened_hash.h

@@ -9,7 +9,7 @@
 #include <random>
 #include <utility>
 
-namespace xrpl {
+namespace ripple {
 
 namespace detail {
 
@@ -92,6 +92,6 @@ public:
     }
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/join.h

@@ -3,7 +3,7 @@
 
 #include <string>
 
-namespace xrpl {
+namespace ripple {
 
 template <class Stream, class Iter>
 Stream&
@@ -85,6 +85,6 @@ public:
     }
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/make_SSLContext.h

@@ -5,7 +5,7 @@
 
 #include <string>
 
-namespace xrpl {
+namespace ripple {
 
 /** Create a self-signed SSL context that allows anonymous Diffie Hellman. */
 std::shared_ptr<boost::asio::ssl::context>
@@ -19,6 +19,6 @@ make_SSLContextAuthed(
     std::string const& chainFile,
     std::string const& cipherList);
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/mulDiv.h

@@ -5,7 +5,7 @@
 #include <limits>
 #include <optional>
 
-namespace xrpl {
+namespace ripple {
 auto constexpr muldiv_max = std::numeric_limits<std::uint64_t>::max();
 
 /** Return value*mul/div accurately.
@@ -21,6 +21,6 @@ auto constexpr muldiv_max = std::numeric_limits<std::uint64_t>::max();
 std::optional<std::uint64_t>
 mulDiv(std::uint64_t value, std::uint64_t mul, std::uint64_t div);
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/partitioned_unordered_map.h

@@ -12,7 +12,7 @@
 #include <utility>
 #include <vector>
 
-namespace xrpl {
+namespace ripple {
 
 template <typename Key>
 static std::size_t
@@ -242,7 +242,7 @@ public:
         map_.resize(partitions_);
         XRPL_ASSERT(
             partitions_,
-            "xrpl::partitioned_unordered_map::partitioned_unordered_map : "
+            "ripple::partitioned_unordered_map::partitioned_unordered_map : "
             "nonzero partitions");
     }
 
@@ -401,6 +401,6 @@ private:
     mutable partition_map_type map_{};
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif  // XRPL_BASICS_PARTITIONED_UNORDERED_MAP_H

include/xrpl/basics/random.h

@@ -11,7 +11,7 @@
 #include <random>
 #include <type_traits>
 
-namespace xrpl {
+namespace ripple {
 
 #ifndef __INTELLISENSE__
 static_assert(
@@ -95,7 +95,7 @@ std::enable_if_t<
     Integral>
 rand_int(Engine& engine, Integral min, Integral max)
 {
-    XRPL_ASSERT(max > min, "xrpl::rand_int : max over min inputs");
+    XRPL_ASSERT(max > min, "ripple::rand_int : max over min inputs");
 
     // This should have no state and constructing it should
     // be very cheap. If that turns out not to be the case
@@ -186,6 +186,6 @@ rand_bool()
 }
 /** @} */
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif  // XRPL_BASICS_RANDOM_H_INCLUDED

include/xrpl/basics/safe_cast.h

@@ -3,7 +3,7 @@
 
 #include <type_traits>
 
-namespace xrpl {
+namespace ripple {
 
 // safe_cast adds compile-time checks to a static_cast to ensure that
 // the destination can hold all values of the source.  This is particularly
@@ -80,6 +80,6 @@ inline constexpr std::
     return unsafe_cast<Dest>(static_cast<std::underlying_type_t<Src>>(s));
 }
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/scope.h

@@ -8,7 +8,7 @@
 #include <type_traits>
 #include <utility>
 
-namespace xrpl {
+namespace ripple {
 
 // RAII scope helpers.  As specified in Library Fundamental, Version 3
 // Basic design of idea:  https://www.youtube.com/watch?v=WjTrfoiB0MQ
@@ -218,7 +218,7 @@ public:
     {
         XRPL_ASSERT(
             plock->owns_lock(),
-            "xrpl::scope_unlock::scope_unlock : mutex must be locked");
+            "ripple::scope_unlock::scope_unlock : mutex must be locked");
         plock->unlock();
     }
 
@@ -236,6 +236,6 @@ public:
 template <class Mutex>
 scope_unlock(std::unique_lock<Mutex>&) -> scope_unlock<Mutex>;
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/spinlock.h

@@ -13,7 +13,7 @@
 #include <immintrin.h>
 #endif
 
-namespace xrpl {
+namespace ripple {
 
 namespace detail {
 /** Inform the processor that we are in a tight spin-wait loop.
@@ -105,7 +105,7 @@ public:
     {
         XRPL_ASSERT(
             index >= 0 && (mask_ != 0),
-            "xrpl::packed_spinlock::packed_spinlock : valid index and mask");
+            "ripple::packed_spinlock::packed_spinlock : valid index and mask");
     }
 
     [[nodiscard]] bool
@@ -206,6 +206,6 @@ public:
 };
 /** @} */
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/strHex.h

@@ -4,7 +4,7 @@
 #include <boost/algorithm/hex.hpp>
 #include <boost/endian/conversion.hpp>
 
-namespace xrpl {
+namespace ripple {
 
 template <class FwdIt>
 std::string
@@ -28,6 +28,6 @@ strHex(T const& from)
     return strHex(from.begin(), from.end());
 }
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/basics/tagged_integer.h

@@ -10,7 +10,7 @@
 #include <iostream>
 #include <type_traits>
 
-namespace xrpl {
+namespace ripple {
 
 /** A type-safe wrap around standard integral types
 
@@ -197,11 +197,11 @@ public:
     }
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 namespace beast {
 template <class Int, class Tag, class HashAlgorithm>
-struct is_contiguously_hashable<xrpl::tagged_integer<Int, Tag>, HashAlgorithm>
+struct is_contiguously_hashable<ripple::tagged_integer<Int, Tag>, HashAlgorithm>
     : public is_contiguously_hashable<Int, HashAlgorithm>
 {
     explicit is_contiguously_hashable() = default;

include/xrpl/beast/utility/instrumentation.h

@@ -13,7 +13,7 @@
 // The duplication is because Visual Studio 2019 cannot compile that header
 // even with the option -Zc:__cplusplus added.
 #define ALWAYS(cond, message, ...) assert((message) && (cond))
-#define ALWAYS_OR_UNREACHABLE(cond, message, ...) assert((message) && (cond))
+#define ALWAYS_OR_UNREACHABLE(cond, message) assert((message) && (cond))
 #define SOMETIMES(cond, message, ...)
 #define REACHABLE(message, ...)
 #define UNREACHABLE(message, ...) assert((message) && false)

include/xrpl/crypto/RFC1751.h

@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-namespace xrpl {
+namespace ripple {
 
 class RFC1751
 {
@@ -42,6 +42,6 @@ private:
     static char const* s_dictionary[];
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/crypto/csprng.h

@@ -3,7 +3,7 @@
 
 #include <mutex>
 
-namespace xrpl {
+namespace ripple {
 
 /** A cryptographically secure random number engine
 
@@ -70,6 +70,6 @@ public:
 csprng_engine&
 crypto_prng();
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/crypto/secure_erase.h

@@ -3,7 +3,7 @@
 
 #include <cstddef>
 
-namespace xrpl {
+namespace ripple {
 
 /** Attempts to clear the given blob of memory.
 
@@ -22,6 +22,6 @@ namespace xrpl {
 void
 secure_erase(void* dest, std::size_t bytes);
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/json/JsonPropertyStream.h

@@ -4,7 +4,7 @@
 #include <xrpl/beast/utility/PropertyStream.h>
 #include <xrpl/json/json_value.h>
 
-namespace xrpl {
+namespace ripple {
 
 /** A PropertyStream::Sink which produces a Json::Value of type objectValue. */
 class JsonPropertyStream : public beast::PropertyStream
@@ -66,6 +66,6 @@ protected:
     add(std::string const& v) override;
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/json/Writer.h

@@ -234,7 +234,7 @@ inline void
 check(bool condition, std::string const& message)
 {
     if (!condition)
-        xrpl::Throw<std::logic_error>(message);
+        ripple::Throw<std::logic_error>(message);
 }
 
 }  // namespace Json

include/xrpl/json/detail/json_assert.h

@@ -6,6 +6,6 @@
 
 #define JSON_ASSERT_MESSAGE(condition, message) \
     if (!(condition))                           \
-        xrpl::Throw<Json::error>(message);
+        ripple::Throw<Json::error>(message);
 
 #endif

include/xrpl/json/json_value.h

@@ -199,7 +199,7 @@ public:
     Value(UInt value);
     Value(double value);
     Value(char const* value);
-    Value(xrpl::Number const& value);
+    Value(ripple::Number const& value);
     /** \brief Constructs a value from a static string.
 
      * Like other value string constructor but do not duplicate the string for
@@ -381,6 +381,9 @@ public:
     /// Return true if the object has a member named key.
     bool
     isMember(std::string const& key) const;
+    /// Return true if the object has a member named key.
+    bool
+    isMember(StaticString const& key) const;
 
     /// \brief Return a list of the member names.
     ///
@@ -427,7 +430,7 @@ private:
 };
 
 inline Value
-to_json(xrpl::Number const& number)
+to_json(ripple::Number const& number)
 {
     return to_string(number);
 }

include/xrpl/ledger/ApplyView.h

@@ -6,7 +6,7 @@
 #include <xrpl/ledger/RawView.h>
 #include <xrpl/ledger/ReadView.h>
 
-namespace xrpl {
+namespace ripple {
 
 enum ApplyFlags : std::uint32_t {
     tapNONE = 0x00,
@@ -267,7 +267,7 @@ public:
         {
             // LCOV_EXCL_START
             UNREACHABLE(
-                "xrpl::ApplyView::dirAppend : only Offers are appended to "
+                "ripple::ApplyView::dirAppend : only Offers are appended to "
                 "book directories");
             // Only Offers are appended to book directories. Call dirInsert()
             // instead
@@ -368,6 +368,45 @@ public:
     emptyDirDelete(Keylet const& directory);
 };
 
-}  // namespace xrpl
+namespace directory {
+/** Helper functions for managing low-level directory operations.
+    These are not part of the ApplyView interface.
+
+    Don't use them unless you really, really know what you're doing.
+    Instead use dirAdd, dirInsert, etc.
+ */
+
+std::uint64_t
+createRoot(
+    ApplyView& view,
+    Keylet const& directory,
+    uint256 const& key,
+    std::function<void(std::shared_ptr<SLE> const&)> const& describe);
+
+auto
+findPreviousPage(ApplyView& view, Keylet const& directory, SLE::ref start);
+
+std::uint64_t
+insertKey(
+    ApplyView& view,
+    SLE::ref node,
+    std::uint64_t page,
+    bool preserveOrder,
+    STVector256& indexes,
+    uint256 const& key);
+
+std::optional<std::uint64_t>
+insertPage(
+    ApplyView& view,
+    std::uint64_t page,
+    SLE::pointer node,
+    std::uint64_t nextPage,
+    SLE::ref next,
+    uint256 const& key,
+    Keylet const& directory,
+    std::function<void(std::shared_ptr<SLE> const&)> const& describe);
+
+}  // namespace directory
+}  // namespace ripple
 
 #endif

include/xrpl/ledger/ApplyViewImpl.h

@@ -6,7 +6,7 @@
 #include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/TER.h>
 
-namespace xrpl {
+namespace ripple {
 
 /** Editable, discardable view that can build metadata for one tx.
 
@@ -75,6 +75,6 @@ private:
     std::optional<STAmount> deliver_;
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/ledger/BookDirs.h

@@ -4,7 +4,7 @@
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ReadView.h>
 
-namespace xrpl {
+namespace ripple {
 
 class BookDirs
 {
@@ -89,6 +89,6 @@ private:
     static beast::Journal j_;
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/ledger/CachedSLEs.h

@@ -5,7 +5,7 @@
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/protocol/STLedgerEntry.h>
 
-namespace xrpl {
+namespace ripple {
 using CachedSLEs = TaggedCache<uint256, SLE const>;
 }
 

include/xrpl/ledger/CachedView.h

@@ -8,7 +8,7 @@
 #include <mutex>
 #include <type_traits>
 
-namespace xrpl {
+namespace ripple {
 
 namespace detail {
 
@@ -164,6 +164,6 @@ public:
     }
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/ledger/CredentialHelpers.h

@@ -11,7 +11,7 @@
 #include <xrpl/protocol/STTx.h>
 #include <xrpl/protocol/TER.h>
 
-namespace xrpl {
+namespace ripple {
 namespace credentials {
 
 // These function will be used by the code that use DepositPreauth / Credentials
@@ -93,6 +93,6 @@ verifyDepositPreauth(
     std::shared_ptr<SLE> const& sleDst,
     beast::Journal j);
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/ledger/Dir.h

@@ -4,7 +4,7 @@
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/protocol/Indexes.h>
 
-namespace xrpl {
+namespace ripple {
 
 /** A class that simplifies iterating ledger directory pages
 
@@ -108,6 +108,6 @@ private:
     std::vector<uint256>::const_iterator it_;
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/ledger/OpenView.h

@@ -13,7 +13,7 @@
 #include <functional>
 #include <utility>
 
-namespace xrpl {
+namespace ripple {
 
 /** Open ledger construction tag.
 
@@ -252,6 +252,6 @@ public:
         std::shared_ptr<Serializer const> const& metaData) override;
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/ledger/PaymentSandbox.h

@@ -8,7 +8,7 @@
 
 #include <map>
 
-namespace xrpl {
+namespace ripple {
 
 namespace detail {
 
@@ -188,6 +188,6 @@ private:
     PaymentSandbox const* ps_ = nullptr;
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/ledger/RawView.h

@@ -5,7 +5,7 @@
 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol/Serializer.h>
 
-namespace xrpl {
+namespace ripple {
 
 /** Interface for ledger entry changes.
 
@@ -87,6 +87,6 @@ public:
         std::shared_ptr<Serializer const> const& metaData) = 0;
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/ledger/ReadView.h

@@ -18,7 +18,7 @@
 #include <optional>
 #include <unordered_set>
 
-namespace xrpl {
+namespace ripple {
 
 //------------------------------------------------------------------------------
 
@@ -258,7 +258,7 @@ makeRulesGivenLedger(
     DigestAwareReadView const& ledger,
     std::unordered_set<uint256, beast::uhash<>> const& presets);
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #include <xrpl/ledger/detail/ReadViewFwdRange.ipp>
 

include/xrpl/ledger/Sandbox.h

@@ -4,7 +4,7 @@
 #include <xrpl/ledger/RawView.h>
 #include <xrpl/ledger/detail/ApplyViewBase.h>
 
-namespace xrpl {
+namespace ripple {
 
 /** Discardable, editable view to a ledger.
 
@@ -39,6 +39,6 @@ public:
     }
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/ledger/View.h

@@ -19,7 +19,7 @@
 #include <map>
 #include <utility>
 
-namespace xrpl {
+namespace ripple {
 
 enum class WaiveTransferFee : bool { No = false, Yes };
 enum class SkipEntry : bool { No = false, Yes };
@@ -223,6 +223,80 @@ isDeepFrozen(
     Currency const& currency,
     AccountID const& issuer);
 
+[[nodiscard]] inline bool
+isDeepFrozen(
+    ReadView const& view,
+    AccountID const& account,
+    Issue const& issue,
+    int = 0 /*ignored*/)
+{
+    return isDeepFrozen(view, account, issue.currency, issue.account);
+}
+
+[[nodiscard]] inline bool
+isDeepFrozen(
+    ReadView const& view,
+    AccountID const& account,
+    MPTIssue const& mptIssue,
+    int depth = 0)
+{
+    // Unlike IOUs, frozen / locked MPTs are not allowed to send or receive
+    // funds, so checking "deep frozen" is the same as checking "frozen".
+    return isFrozen(view, account, mptIssue, depth);
+}
+
+/**
+ *   isFrozen check is recursive for MPT shares in a vault, descending to
+ *   assets in the vault, up to maxAssetCheckDepth recursion depth. This is
+ *   purely defensive, as we currently do not allow such vaults to be created.
+ */
+[[nodiscard]] inline bool
+isDeepFrozen(
+    ReadView const& view,
+    AccountID const& account,
+    Asset const& asset,
+    int depth = 0)
+{
+    return std::visit(
+        [&](auto const& issue) {
+            return isDeepFrozen(view, account, issue, depth);
+        },
+        asset.value());
+}
+
+[[nodiscard]] inline TER
+checkDeepFrozen(
+    ReadView const& view,
+    AccountID const& account,
+    Issue const& issue)
+{
+    return isDeepFrozen(view, account, issue) ? (TER)tecFROZEN
+                                              : (TER)tesSUCCESS;
+}
+
+[[nodiscard]] inline TER
+checkDeepFrozen(
+    ReadView const& view,
+    AccountID const& account,
+    MPTIssue const& mptIssue)
+{
+    return isDeepFrozen(view, account, mptIssue) ? (TER)tecLOCKED
+                                                 : (TER)tesSUCCESS;
+}
+
+[[nodiscard]] inline TER
+checkDeepFrozen(
+    ReadView const& view,
+    AccountID const& account,
+    Asset const& asset)
+{
+    return std::visit(
+        [&](auto const& issue) {
+            return checkDeepFrozen(view, account, issue);
+        },
+        asset.value());
+}
+
 [[nodiscard]] bool
 isLPTokenFrozen(
     ReadView const& view,
@@ -268,6 +342,49 @@ accountHolds(
     AuthHandling zeroIfUnauthorized,
     beast::Journal j);
 
+// Returns the amount an account can spend total.
+//
+// These functions use accountHolds, but unlike accountHolds:
+// * The account can go into debt.
+// * If the account is the asset issuer the only limit is defined by the asset /
+//   issuance.
+//
+// <-- saAmount: amount of currency held by account. May be negative.
+[[nodiscard]] STAmount
+accountCanSend(
+    ReadView const& view,
+    AccountID const& account,
+    Currency const& currency,
+    AccountID const& issuer,
+    FreezeHandling zeroIfFrozen,
+    beast::Journal j);
+
+[[nodiscard]] STAmount
+accountCanSend(
+    ReadView const& view,
+    AccountID const& account,
+    Issue const& issue,
+    FreezeHandling zeroIfFrozen,
+    beast::Journal j);
+
+[[nodiscard]] STAmount
+accountCanSend(
+    ReadView const& view,
+    AccountID const& account,
+    MPTIssue const& mptIssue,
+    FreezeHandling zeroIfFrozen,
+    AuthHandling zeroIfUnauthorized,
+    beast::Journal j);
+
+[[nodiscard]] STAmount
+accountCanSend(
+    ReadView const& view,
+    AccountID const& account,
+    Asset const& asset,
+    FreezeHandling zeroIfFrozen,
+    AuthHandling zeroIfUnauthorized,
+    beast::Journal j);
+
 // Returns the amount an account can spend of the currency type saDefault, or
 // returns saDefault if this account is the issuer of the currency in
 // question. Should be used in favor of accountHolds when questioning how much
@@ -514,7 +631,11 @@ dirNext(
 describeOwnerDir(AccountID const& account);
 
 [[nodiscard]] TER
-dirLink(ApplyView& view, AccountID const& owner, std::shared_ptr<SLE>& object);
+dirLink(
+    ApplyView& view,
+    AccountID const& owner,
+    std::shared_ptr<SLE>& object,
+    SF_UINT64 const& node = sfOwnerNode);
 
 AccountID
 pseudoAccountAddress(ReadView const& view, uint256 const& pseudoOwnerKey);
@@ -533,14 +654,17 @@ createPseudoAccount(
     uint256 const& pseudoOwnerKey,
     SField const& ownerField);
 
-// Returns true iff sleAcct is a pseudo-account.
+// Returns true iff sleAcct is a pseudo-account or specific
+// pseudo-accounts in pseudoFieldFilter.
 //
 // Returns false if sleAcct is
 // * NOT a pseudo-account OR
 // * NOT a ltACCOUNT_ROOT OR
 // * null pointer
 [[nodiscard]] bool
-isPseudoAccount(std::shared_ptr<SLE const> sleAcct);
+isPseudoAccount(
+    std::shared_ptr<SLE const> sleAcct,
+    std::set<SField const*> const& pseudoFieldFilter = {});
 
 // Returns the list of fields that define an ACCOUNT_ROOT as a pseudo-account if
 // set
@@ -554,14 +678,80 @@ isPseudoAccount(std::shared_ptr<SLE const> sleAcct);
 getPseudoAccountFields();
 
 [[nodiscard]] inline bool
-isPseudoAccount(ReadView const& view, AccountID accountId)
+isPseudoAccount(
+    ReadView const& view,
+    AccountID const& accountId,
+    std::set<SField const*> const& pseudoFieldFilter = {})
 {
-    return isPseudoAccount(view.read(keylet::account(accountId)));
+    return isPseudoAccount(
+        view.read(keylet::account(accountId)), pseudoFieldFilter);
 }
 
 [[nodiscard]] TER
 canAddHolding(ReadView const& view, Asset const& asset);
 
+/** Validates that the destination SLE and tag are valid
+
+   - Checks that the SLE is not null.
+   - If the SLE requires a destination tag, checks that there is a tag.
+*/
+[[nodiscard]] TER
+checkDestinationAndTag(SLE::const_ref toSle, bool hasDestinationTag);
+
+/** Checks that can withdraw funds from an object to itself or a destination.
+ *
+ * The receiver may be either the submitting account (sfAccount) or a different
+ * destination account (sfDestination).
+ *
+ *    - Checks that the receiver account exists.
+ *    - If the receiver requires a destination tag, check that one exists, even
+ *      if withdrawing to self.
+ *    - If withdrawing to self, succeed.
+ *    - If not, checks if the receiver requires deposit authorization, and if
+ *      the sender has it.
+ */
+[[nodiscard]] TER
+canWithdraw(
+    AccountID const& from,
+    ReadView const& view,
+    AccountID const& to,
+    SLE::const_ref toSle,
+    bool hasDestinationTag);
+
+/** Checks that can withdraw funds from an object to itself or a destination.
+ *
+ * The receiver may be either the submitting account (sfAccount) or a different
+ * destination account (sfDestination).
+ *
+ *    - Checks that the receiver account exists.
+ *    - If the receiver requires a destination tag, check that one exists, even
+ *      if withdrawing to self.
+ *    - If withdrawing to self, succeed.
+ *    - If not, checks if the receiver requires deposit authorization, and if
+ *      the sender has it.
+ */
+[[nodiscard]] TER
+canWithdraw(
+    AccountID const& from,
+    ReadView const& view,
+    AccountID const& to,
+    bool hasDestinationTag);
+
+/** Checks that can withdraw funds from an object to itself or a destination.
+ *
+ * The receiver may be either the submitting account (sfAccount) or a different
+ * destination account (sfDestination).
+ *
+ *    - Checks that the receiver account exists.
+ *    - If the receiver requires a destination tag, check that one exists, even
+ *      if withdrawing to self.
+ *    - If withdrawing to self, succeed.
+ *    - If not, checks if the receiver requires deposit authorization, and if
+ *      the sender has it.
+ */
+[[nodiscard]] TER
+canWithdraw(ReadView const& view, STTx const& tx);
+
 /// Any transactors that call addEmptyHolding() in doApply must call
 /// canAddHolding() in preflight with the same View and Asset
 [[nodiscard]] TER
@@ -731,6 +921,22 @@ accountSend(
     beast::Journal j,
     WaiveTransferFee waiveFee = WaiveTransferFee::No);
 
+using MultiplePaymentDestinations = std::vector<std::pair<AccountID, Number>>;
+/** Like accountSend, except one account is sending multiple payments (with the
+ *  same asset!) simultaneously
+ *
+ * Calls static accountSendMultiIOU if saAmount represents Issue.
+ * Calls static accountSendMultiMPT if saAmount represents MPTIssue.
+ */
+[[nodiscard]] TER
+accountSendMulti(
+    ApplyView& view,
+    AccountID const& senderID,
+    Asset const& asset,
+    MultiplePaymentDestinations const& receivers,
+    beast::Journal j,
+    WaiveTransferFee waiveFee = WaiveTransferFee::No);
+
 [[nodiscard]] TER
 issueIOU(
     ApplyView& view,
@@ -802,7 +1008,8 @@ requireAuth(
  * purely defensive, as we currently do not allow such vaults to be created.
  *
  * If StrongAuth then return tecNO_AUTH if MPToken doesn't exist or
- * lsfMPTRequireAuth is set and MPToken is not authorized.
+ * lsfMPTRequireAuth is set and MPToken is not authorized. Vault and LoanBroker
+ * pseudo-accounts are implicitly authorized.
  *
  * If WeakAuth then return tecNO_AUTH if lsfMPTRequireAuth is set and MPToken
  * doesn't exist or is not authorized (explicitly or via credentials, if
@@ -958,6 +1165,6 @@ sharesToAssetsWithdraw(
 bool
 after(NetClock::time_point now, std::uint32_t mark);
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/ledger/detail/ApplyStateTable.h

@@ -11,7 +11,7 @@
 
 #include <memory>
 
-namespace xrpl {
+namespace ripple {
 namespace detail {
 
 // Helper class that buffers modifications
@@ -139,6 +139,6 @@ private:
 };
 
 }  // namespace detail
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/ledger/detail/ApplyViewBase.h

@@ -6,7 +6,7 @@
 #include <xrpl/ledger/detail/ApplyStateTable.h>
 #include <xrpl/protocol/XRPAmount.h>
 
-namespace xrpl {
+namespace ripple {
 namespace detail {
 
 class ApplyViewBase : public ApplyView, public RawView
@@ -106,6 +106,6 @@ protected:
 };
 
 }  // namespace detail
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/ledger/detail/RawStateTable.h

@@ -10,7 +10,7 @@
 #include <map>
 #include <utility>
 
-namespace xrpl {
+namespace ripple {
 namespace detail {
 
 // Helper class that buffers raw modifications
@@ -118,6 +118,6 @@ private:
 };
 
 }  // namespace detail
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/ledger/detail/ReadViewFwdRange.h

@@ -5,7 +5,7 @@
 #include <memory>
 #include <optional>
 
-namespace xrpl {
+namespace ripple {
 
 class ReadView;
 
@@ -130,6 +130,6 @@ protected:
 };
 
 }  // namespace detail
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/ledger/detail/ReadViewFwdRange.ipp

@@ -1,7 +1,7 @@
 #ifndef XRPL_LEDGER_READVIEWFWDRANGEINL_H_INCLUDED
 #define XRPL_LEDGER_READVIEWFWDRANGEINL_H_INCLUDED
 
-namespace xrpl {
+namespace ripple {
 namespace detail {
 
 template <class ValueType>
@@ -63,7 +63,7 @@ ReadViewFwdRange<ValueType>::iterator::operator==(iterator const& other) const
 {
     XRPL_ASSERT(
         view_ == other.view_,
-        "xrpl::detail::ReadViewFwdRange::iterator::operator==(iterator) "
+        "ripple::detail::ReadViewFwdRange::iterator::operator==(iterator) "
         "const : input view match");
 
     if (impl_ != nullptr && other.impl_ != nullptr)
@@ -115,6 +115,6 @@ ReadViewFwdRange<ValueType>::iterator::operator++(int) -> iterator
 }
 
 }  // namespace detail
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/net/AutoSocket.h

@@ -269,7 +269,7 @@ protected:
         error_code const& ec,
         size_t bytesTransferred)
     {
-        using namespace xrpl;
+        using namespace ripple;
 
         if (ec)
         {

include/xrpl/net/HTTPClient.h

@@ -12,7 +12,7 @@
 #include <functional>
 #include <string>
 
-namespace xrpl {
+namespace ripple {
 
 /** Provides an asynchronous HTTP client implementation with optional SSL.
  */
@@ -75,6 +75,6 @@ public:
         beast::Journal& j);
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/net/HTTPClientSSLContext.h

@@ -11,7 +11,7 @@
 #include <boost/asio/ssl.hpp>
 #include <boost/format.hpp>
 
-namespace xrpl {
+namespace ripple {
 
 class HTTPClientSSLContext
 {
@@ -176,6 +176,6 @@ private:
     bool const verify_;
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/net/RegisterSSLCerts.h

@@ -5,7 +5,7 @@
 
 #include <boost/asio/ssl/context.hpp>
 
-namespace xrpl {
+namespace ripple {
 /** Register default SSL certificates.
 
     Register the system default SSL root certificates. On linux/mac,
@@ -19,6 +19,6 @@ registerSSLCerts(
     boost::system::error_code&,
     beast::Journal j);
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/nodestore/Backend.h

@@ -5,7 +5,7 @@
 
 #include <cstdint>
 
-namespace xrpl {
+namespace ripple {
 namespace NodeStore {
 
 /** A backend used for the NodeStore.
@@ -143,6 +143,6 @@ public:
 };
 
 }  // namespace NodeStore
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/nodestore/Database.h

@@ -11,7 +11,7 @@
 
 #include <condition_variable>
 
-namespace xrpl {
+namespace ripple {
 
 namespace NodeStore {
 
@@ -230,7 +230,7 @@ protected:
     {
         XRPL_ASSERT(
             count <= sz,
-            "xrpl::NodeStore::Database::storeStats : valid inputs");
+            "ripple::NodeStore::Database::storeStats : valid inputs");
         storeCount_ += count;
         storeSz_ += sz;
     }
@@ -291,6 +291,6 @@ private:
 };
 
 }  // namespace NodeStore
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/nodestore/DatabaseRotating.h

@@ -3,7 +3,7 @@
 
 #include <xrpl/nodestore/Database.h>
 
-namespace xrpl {
+namespace ripple {
 namespace NodeStore {
 
 /* This class has two key-value store Backend objects for persisting SHAMap
@@ -39,6 +39,6 @@ public:
 };
 
 }  // namespace NodeStore
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/nodestore/DummyScheduler.h

@@ -3,7 +3,7 @@
 
 #include <xrpl/nodestore/Scheduler.h>
 
-namespace xrpl {
+namespace ripple {
 namespace NodeStore {
 
 /** Simple NodeStore Scheduler that just peforms the tasks synchronously. */
@@ -21,6 +21,6 @@ public:
 };
 
 }  // namespace NodeStore
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/nodestore/Factory.h

@@ -8,7 +8,7 @@
 
 #include <nudb/store.hpp>
 
-namespace xrpl {
+namespace ripple {
 
 namespace NodeStore {
 
@@ -61,6 +61,6 @@ public:
 };
 
 }  // namespace NodeStore
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/nodestore/Manager.h

@@ -4,7 +4,7 @@
 #include <xrpl/nodestore/DatabaseRotating.h>
 #include <xrpl/nodestore/Factory.h>
 
-namespace xrpl {
+namespace ripple {
 
 namespace NodeStore {
 
@@ -83,6 +83,6 @@ public:
 };
 
 }  // namespace NodeStore
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/nodestore/NodeObject.h

@@ -7,7 +7,7 @@
 
 // VFALCO NOTE Intentionally not in the NodeStore namespace
 
-namespace xrpl {
+namespace ripple {
 
 /** The types of node objects. */
 enum NodeObjectType : std::uint32_t {
@@ -81,6 +81,6 @@ private:
     Blob const mData;
 };
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/nodestore/Scheduler.h

@@ -5,7 +5,7 @@
 
 #include <chrono>
 
-namespace xrpl {
+namespace ripple {
 namespace NodeStore {
 
 enum class FetchType { synchronous, async };
@@ -66,6 +66,6 @@ public:
 };
 
 }  // namespace NodeStore
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/nodestore/Task.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_NODESTORE_TASK_H_INCLUDED
 #define XRPL_NODESTORE_TASK_H_INCLUDED
 
-namespace xrpl {
+namespace ripple {
 namespace NodeStore {
 
 /** Derived classes perform scheduled tasks. */
@@ -17,6 +17,6 @@ struct Task
 };
 
 }  // namespace NodeStore
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/nodestore/Types.h

@@ -5,7 +5,7 @@
 
 #include <vector>
 
-namespace xrpl {
+namespace ripple {
 namespace NodeStore {
 
 enum {
@@ -37,6 +37,6 @@ using Batch = std::vector<std::shared_ptr<NodeObject>>;
 
 }  // namespace NodeStore
 
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif

include/xrpl/nodestore/detail/BatchWriter.h

@@ -8,7 +8,7 @@
 #include <condition_variable>
 #include <mutex>
 
-namespace xrpl {
+namespace ripple {
 namespace NodeStore {
 
 /** Batch-writing assist logic.
@@ -78,6 +78,6 @@ private:
 };
 
 }  // namespace NodeStore
-}  // namespace xrpl
+}  // namespace ripple
 
 #endif