chore: Remove unnecessary version number and options in cmake find_package

This change adds some basic tests for all the `ledger_entry` helper functions, so each ledger entry type is covered. There are further some minor refactors in `parseAMM` to provide better error messages. Finally, to improve readability, alphabetization was applied in the helper functions.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,7 +1,7 @@
 ---
 name: Bug Report
-about: Create a report to help us improve rippled
-title: "[Title with short description] (Version: [rippled version])"
+about: Create a report to help us improve xrpld
+title: "[Title with short description] (Version: [xrpld version])"
 labels: ""
 assignees: ""
 ---
@@ -27,7 +27,7 @@ assignees: ""
 ## Environment
 
 <!--Please describe your environment setup (such as Ubuntu 18.04 with Boost 1.70).-->
-<!-- If you are using a formal release, please use the version returned by './rippled --version' as the version number-->
+<!-- If you are using a formal release, please use the version returned by './xrpld --version' as the version number-->
 <!-- If you are working off of develop, please add the git hash via 'git rev-parse HEAD'-->
 
 ## Supporting Files

.github/actions/build-deps/action.yml

@@ -4,9 +4,6 @@ description: "Install Conan dependencies, optionally forcing a rebuild of all de
 # Note that actions do not support 'type' and all inputs are strings, see
 # https://docs.github.com/en/actions/reference/workflows-and-actions/metadata-syntax#inputs.
 inputs:
-  build_dir:
-    description: "The directory where to build."
-    required: true
   build_type:
     description: 'The build type to use ("Debug", "Release").'
     required: true
@@ -28,17 +25,13 @@ runs:
     - name: Install Conan dependencies
       shell: bash
       env:
-        BUILD_DIR: ${{ inputs.build_dir }}
         BUILD_NPROC: ${{ inputs.build_nproc }}
         BUILD_OPTION: ${{ inputs.force_build == 'true' && '*' || 'missing' }}
         BUILD_TYPE: ${{ inputs.build_type }}
         LOG_VERBOSITY: ${{ inputs.log_verbosity }}
       run: |
         echo 'Installing dependencies.'
-        mkdir -p "${BUILD_DIR}"
-        cd "${BUILD_DIR}"
         conan install \
-          --output-folder . \
           --build="${BUILD_OPTION}" \
           --options:host='&:tests=True' \
           --options:host='&:xrpld=True' \
@@ -46,4 +39,4 @@ runs:
           --conf:all tools.build:jobs=${BUILD_NPROC} \
           --conf:all tools.build:verbosity="${LOG_VERBOSITY}" \
           --conf:all tools.compilation:verbosity="${LOG_VERBOSITY}" \
-          ..
+          .

.github/scripts/levelization/README.md

@@ -3,21 +3,26 @@
 Levelization is the term used to describe efforts to prevent rippled from
 having or creating cyclic dependencies.
 
-rippled code is organized into directories under `src/rippled` (and
+rippled code is organized into directories under `src/xrpld`, `src/libxrpl` (and
 `src/test`) representing modules. The modules are intended to be
 organized into "tiers" or "levels" such that a module from one level can
 only include code from lower levels. Additionally, a module
-in one level should never include code in an `impl` folder of any level
+in one level should never include code in an `impl` or `detail` folder of any level
 other than it's own.
 
+The codebase is split into two main areas:
+
+- **libxrpl** (`src/libxrpl`, `include/xrpl`): Reusable library modules with public interfaces
+- **xrpld** (`src/xrpld`): Application-specific implementation code
+
 Unfortunately, over time, enforcement of levelization has been
 inconsistent, so the current state of the code doesn't necessarily
 reflect these rules. Whenever possible, developers should refactor any
 levelization violations they find (by moving files or individual
 classes). At the very least, don't make things worse.
 
-The table below summarizes the _desired_ division of modules, based on the
-state of the rippled code when it was created. The levels are numbered from
+The table below summarizes the _desired_ division of modules, based on the current
+state of the rippled code. The levels are numbered from
 the bottom up with the lower level, lower numbered, more independent
 modules listed first, and the higher level, higher numbered modules with
 more dependencies listed later.
@@ -25,18 +30,33 @@ more dependencies listed later.
 **tl;dr:** The modules listed first are more independent than the modules
 listed later.
 
+## libxrpl Modules (Reusable Libraries)
+
+| Level / Tier | Module(s)                           |
+| ------------ | ----------------------------------- |
+| 01           | xrpl/beast                          |
+| 02           | xrpl/basics                         |
+| 03           | xrpl/json xrpl/crypto               |
+| 04           | xrpl/protocol                       |
+| 05           | xrpl/core xrpl/resource xrpl/server |
+| 06           | xrpl/ledger xrpl/nodestore xrpl/net |
+| 07           | xrpl/shamap                         |
+
+## xrpld Modules (Application Implementation)
+
+| Level / Tier | Module(s)                        |
+| ------------ | -------------------------------- |
+| 05           | xrpld/conditions xrpld/consensus |
+| 06           | xrpld/core xrpld/peerfinder      |
+| 07           | xrpld/shamap xrpld/overlay       |
+| 08           | xrpld/app                        |
+| 09           | xrpld/rpc                        |
+| 10           | xrpld/perflog                    |
+
+## Test Modules
+
 | Level / Tier | Module(s)                                                                                                |
 | ------------ | -------------------------------------------------------------------------------------------------------- |
-| 01           | ripple/beast ripple/unity                                                                                |
-| 02           | ripple/basics                                                                                            |
-| 03           | ripple/json ripple/crypto                                                                                |
-| 04           | ripple/protocol                                                                                          |
-| 05           | ripple/core ripple/conditions ripple/consensus ripple/resource ripple/server                             |
-| 06           | ripple/peerfinder ripple/ledger ripple/nodestore ripple/net                                              |
-| 07           | ripple/shamap ripple/overlay                                                                             |
-| 08           | ripple/app                                                                                               |
-| 09           | ripple/rpc                                                                                               |
-| 10           | ripple/perflog                                                                                           |
 | 11           | test/jtx test/beast test/csf                                                                             |
 | 12           | test/unit_test                                                                                           |
 | 13           | test/crypto test/conditions test/json test/resource test/shamap test/peerfinder test/basics test/overlay |
@@ -45,8 +65,8 @@ listed later.
 | 16           | test/rpc test/app                                                                                        |
 
 (Note that `test` levelization is _much_ less important and _much_ less
-strictly enforced than `ripple` levelization, other than the requirement
-that `test` code should _never_ be included in `ripple` code.)
+strictly enforced than `xrpl`/`xrpld` levelization, other than the requirement
+that `test` code should _never_ be included in `xrpl` or `xrpld` code.)
 
 ## Validation
 

.github/scripts/levelization/results/loops.txt

@@ -19,12 +19,6 @@ Loop: xrpld.app xrpld.rpc
 Loop: xrpld.app xrpld.shamap
   xrpld.shamap ~= xrpld.app
 
-Loop: xrpld.core xrpld.perflog
-  xrpld.perflog == xrpld.core
-
 Loop: xrpld.overlay xrpld.rpc
   xrpld.rpc ~= xrpld.overlay
 
-Loop: xrpld.perflog xrpld.rpc
-  xrpld.rpc ~= xrpld.perflog
-

.github/scripts/levelization/results/ordering.txt

@@ -1,4 +1,6 @@
 libxrpl.basics > xrpl.basics
+libxrpl.core > xrpl.basics
+libxrpl.core > xrpl.core
 libxrpl.crypto > xrpl.basics
 libxrpl.json > xrpl.basics
 libxrpl.json > xrpl.json
@@ -30,6 +32,7 @@ test.app > test.rpc
 test.app > test.toplevel
 test.app > test.unit_test
 test.app > xrpl.basics
+test.app > xrpl.core
 test.app > xrpld.app
 test.app > xrpld.core
 test.app > xrpld.overlay
@@ -42,7 +45,7 @@ test.app > xrpl.resource
 test.basics > test.jtx
 test.basics > test.unit_test
 test.basics > xrpl.basics
-test.basics > xrpld.perflog
+test.basics > xrpl.core
 test.basics > xrpld.rpc
 test.basics > xrpl.json
 test.basics > xrpl.protocol
@@ -61,8 +64,8 @@ test.core > test.jtx
 test.core > test.toplevel
 test.core > test.unit_test
 test.core > xrpl.basics
+test.core > xrpl.core
 test.core > xrpld.core
-test.core > xrpld.perflog
 test.core > xrpl.json
 test.core > xrpl.server
 test.csf > xrpl.basics
@@ -119,6 +122,7 @@ test.resource > xrpl.resource
 test.rpc > test.jtx
 test.rpc > test.toplevel
 test.rpc > xrpl.basics
+test.rpc > xrpl.core
 test.rpc > xrpld.app
 test.rpc > xrpld.core
 test.rpc > xrpld.overlay
@@ -146,6 +150,8 @@ test.unit_test > xrpl.basics
 tests.libxrpl > xrpl.basics
 tests.libxrpl > xrpl.json
 tests.libxrpl > xrpl.net
+xrpl.core > xrpl.basics
+xrpl.core > xrpl.json
 xrpl.json > xrpl.basics
 xrpl.ledger > xrpl.basics
 xrpl.ledger > xrpl.protocol
@@ -165,9 +171,9 @@ xrpl.shamap > xrpl.nodestore
 xrpl.shamap > xrpl.protocol
 xrpld.app > test.unit_test
 xrpld.app > xrpl.basics
+xrpld.app > xrpl.core
 xrpld.app > xrpld.conditions
 xrpld.app > xrpld.consensus
-xrpld.app > xrpld.perflog
 xrpld.app > xrpl.json
 xrpld.app > xrpl.ledger
 xrpld.app > xrpl.net
@@ -181,13 +187,14 @@ xrpld.consensus > xrpl.basics
 xrpld.consensus > xrpl.json
 xrpld.consensus > xrpl.protocol
 xrpld.core > xrpl.basics
+xrpld.core > xrpl.core
 xrpld.core > xrpl.json
 xrpld.core > xrpl.net
 xrpld.core > xrpl.protocol
 xrpld.overlay > xrpl.basics
+xrpld.overlay > xrpl.core
 xrpld.overlay > xrpld.core
 xrpld.overlay > xrpld.peerfinder
-xrpld.overlay > xrpld.perflog
 xrpld.overlay > xrpl.json
 xrpld.overlay > xrpl.protocol
 xrpld.overlay > xrpl.resource
@@ -196,8 +203,11 @@ xrpld.peerfinder > xrpl.basics
 xrpld.peerfinder > xrpld.core
 xrpld.peerfinder > xrpl.protocol
 xrpld.perflog > xrpl.basics
+xrpld.perflog > xrpl.core
+xrpld.perflog > xrpld.rpc
 xrpld.perflog > xrpl.json
 xrpld.rpc > xrpl.basics
+xrpld.rpc > xrpl.core
 xrpld.rpc > xrpld.core
 xrpld.rpc > xrpl.json
 xrpld.rpc > xrpl.ledger

.github/scripts/rename/README.md

@@ -26,6 +26,14 @@ 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`.
+6. `.github/scripts/rename/config.sh`: This script will rename the config from
+   `rippled.cfg` to `xrpld.cfg`, and updating the code accordingly. The old
+   filename will still be accepted.
 
 You can run all these scripts from the repository root as follows:
 
@@ -33,4 +41,7 @@ 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/config.sh .
 ```

.github/scripts/rename/binary.sh

@@ -0,0 +1,54 @@
+#!/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
+
+# Rename references to the binary.
+${SED_COMMAND} -i -E 's@rippled@xrpld@g' BUILD.md
+${SED_COMMAND} -i -E 's@rippled@xrpld@g' CONTRIBUTING.md
+${SED_COMMAND} -i -E 's@rippled@xrpld@g' .github/ISSUE_TEMPLATE/bug_report.md
+
+# Restore and/or fix certain renames. The pre-commit hook will update the
+# formatting upon saving/committing.
+${SED_COMMAND} -i -E 's@ripple/xrpld@XRPLF/rippled@g' BUILD.md
+${SED_COMMAND} -i -E 's@XRPLF/xrpld@XRPLF/rippled@g' BUILD.md
+${SED_COMMAND} -i -E 's@xrpld \(`xrpld`\)@xrpld@g' BUILD.md
+${SED_COMMAND} -i -E 's@XRPLF/xrpld@XRPLF/rippled@g' CONTRIBUTING.md
+
+popd
+echo "Processing complete."

.github/scripts/rename/config.sh

@@ -0,0 +1,72 @@
+#!/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 config from `rippled.cfg` to `xrpld.cfg`, and updates
+# the code accordingly. The old filename will still be accepted.
+# Usage: .github/scripts/rename/config.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}
+
+# Add the xrpld.cfg to the .gitignore.
+if ! grep -q 'xrpld.cfg' .gitignore; then
+  ${SED_COMMAND} -i '/rippled.cfg/a\
+/xrpld.cfg' .gitignore
+fi
+
+# Rename the files.
+if [ -e rippled.cfg ]; then
+  mv rippled.cfg xrpld.cfg
+fi
+if [ -e cfg/rippled-example.cfg ]; then
+  mv cfg/rippled-example.cfg cfg/xrpld-example.cfg
+fi
+
+# Rename inside the files.
+DIRECTORIES=("cfg" "cmake" "include" "src")
+for DIRECTORY in "${DIRECTORIES[@]}"; do
+  echo "Processing directory: ${DIRECTORY}"
+
+  find "${DIRECTORY}" -type f \( -name "*.h" -o -name "*.hpp" -o -name "*.ipp" -o -name "*.cpp" -o -name "*.cmake" -o -name "*.txt" -o -name "*.cfg" -o -name "*.md" \) | while read -r FILE; do
+      echo "Processing file: ${FILE}"
+      ${SED_COMMAND} -i -E 's/rippled(-example)?[ .]cfg/xrpld\1.cfg/g' "${FILE}"
+  done
+done
+${SED_COMMAND} -i 's/rippled/xrpld/g' cfg/xrpld-example.cfg
+${SED_COMMAND} -i 's/rippled/xrpld/g' src/test/core/Config_test.cpp
+${SED_COMMAND} -i 's/ripplevalidators/xrplvalidators/g' src/test/core/Config_test.cpp
+${SED_COMMAND} -i 's/rippleConfig/xrpldConfig/g' src/test/core/Config_test.cpp
+${SED_COMMAND} -i 's@ripple/@xrpld/@g' src/test/core/Config_test.cpp
+${SED_COMMAND} -i 's/Rippled/File/g' src/test/core/Config_test.cpp
+
+
+# Restore the old config file name in the code that maintains support for now.
+${SED_COMMAND} -i 's/configLegacyName = "xrpld.cfg"/configLegacyName = "rippled.cfg"/g' src/xrpld/core/detail/Config.cpp
+
+# Restore an URL.
+${SED_COMMAND} -i 's/connect-your-xrpld-to-the-xrp-test-net.html/connect-your-rippled-to-the-xrp-test-net.html/g' cfg/xrpld-example.cfg
+
+popd
+echo "Renaming complete."

.github/scripts/rename/namespace.sh

@@ -0,0 +1,58 @@
+#!/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. It also renames them in the test suites.
+# 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}"
+      ${SED_COMMAND} -i -E 's/(BEAST_DEFINE_TESTSUITE.+)ripple(.+)/\1xrpl\2/g' "${FILE}"
+  done
+done
+
+# Special case for NuDBFactory that has ripple twice in the test suite name.
+${SED_COMMAND} -i -E 's/(BEAST_DEFINE_TESTSUITE.+)ripple(.+)/\1xrpl\2/g' src/test/nodestore/NuDBFactory_test.cpp
+
+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/publish-docs.yml

@@ -22,7 +22,7 @@ defaults:
     shell: bash
 
 env:
-  BUILD_DIR: .build
+  BUILD_DIR: build
   NPROC_SUBTRACT: 2
 
 jobs:
@@ -36,7 +36,7 @@ jobs:
         uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
 
       - name: Get number of processors
-        uses: XRPLF/actions/.github/actions/get-nproc@046b1620f6bfd6cd0985dc82c3df02786801fe0a
+        uses: XRPLF/actions/get-nproc@2ece4ec6ab7de266859a6f053571425b2bd684b6
         id: nproc
         with:
           subtract: ${{ env.NPROC_SUBTRACT }}

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

@@ -3,11 +3,6 @@ name: Build and test configuration
 on:
   workflow_call:
     inputs:
-      build_dir:
-        description: "The directory where to build."
-        required: true
-        type: string
-
       build_only:
         description: 'Whether to only build or to build and test the code ("true", "false").'
         required: true
@@ -59,6 +54,11 @@ defaults:
   run:
     shell: bash
 
+env:
+  # Conan installs the generators in the build/generators directory, see the
+  # layout() method in conanfile.py. We then run CMake from the build directory.
+  BUILD_DIR: build
+
 jobs:
   build-and-test:
     name: ${{ inputs.config_name }}
@@ -71,13 +71,13 @@ jobs:
     steps:
       - name: Cleanup workspace (macOS and Windows)
         if: ${{ runner.os == 'macOS' || runner.os == 'Windows' }}
-        uses: XRPLF/actions/.github/actions/cleanup-workspace@01b244d2718865d427b499822fbd3f15e7197fcc
+        uses: XRPLF/actions/cleanup-workspace@2ece4ec6ab7de266859a6f053571425b2bd684b6
 
       - name: Checkout repository
         uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
 
       - name: Prepare runner
-        uses: XRPLF/actions/.github/actions/prepare-runner@99685816bb60a95a66852f212f382580e180df3a
+        uses: XRPLF/actions/prepare-runner@2ece4ec6ab7de266859a6f053571425b2bd684b6
         with:
           disable_ccache: false
 
@@ -85,7 +85,7 @@ jobs:
         uses: ./.github/actions/print-env
 
       - name: Get number of processors
-        uses: XRPLF/actions/.github/actions/get-nproc@046b1620f6bfd6cd0985dc82c3df02786801fe0a
+        uses: XRPLF/actions/get-nproc@2ece4ec6ab7de266859a6f053571425b2bd684b6
         id: nproc
         with:
           subtract: ${{ inputs.nproc_subtract }}
@@ -96,7 +96,6 @@ jobs:
       - name: Build dependencies
         uses: ./.github/actions/build-deps
         with:
-          build_dir: ${{ inputs.build_dir }}
           build_nproc: ${{ steps.nproc.outputs.nproc }}
           build_type: ${{ inputs.build_type }}
           # Set the verbosity to "quiet" for Windows to avoid an excessive
@@ -104,7 +103,7 @@ jobs:
           log_verbosity: ${{ runner.os == 'Windows' && 'quiet' || 'verbose' }}
 
       - name: Configure CMake
-        working-directory: ${{ inputs.build_dir }}
+        working-directory: ${{ env.BUILD_DIR }}
         env:
           BUILD_TYPE: ${{ inputs.build_type }}
           CMAKE_ARGS: ${{ inputs.cmake_args }}
@@ -117,7 +116,7 @@ jobs:
             ..
 
       - name: Build the binary
-        working-directory: ${{ inputs.build_dir }}
+        working-directory: ${{ env.BUILD_DIR }}
         env:
           BUILD_NPROC: ${{ steps.nproc.outputs.nproc }}
           BUILD_TYPE: ${{ inputs.build_type }}
@@ -129,23 +128,21 @@ jobs:
             --parallel "${BUILD_NPROC}" \
             --target "${CMAKE_TARGET}"
 
-      - name: Upload rippled artifact (Linux)
+      - name: Upload the binary (Linux)
         if: ${{ github.repository_owner == 'XRPLF' && runner.os == 'Linux' }}
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        env:
-          BUILD_DIR: ${{ inputs.build_dir }}
         with:
-          name: rippled-${{ inputs.config_name }}
-          path: ${{ env.BUILD_DIR }}/rippled
+          name: xrpld-${{ inputs.config_name }}
+          path: ${{ env.BUILD_DIR }}/xrpld
           retention-days: 3
           if-no-files-found: error
 
       - name: Check linking (Linux)
         if: ${{ runner.os == 'Linux' }}
-        working-directory: ${{ inputs.build_dir }}
+        working-directory: ${{ env.BUILD_DIR }}
         run: |
-          ldd ./rippled
-          if [ "$(ldd ./rippled | grep -E '(libstdc\+\+|libgcc)' | wc -l)" -eq 0 ]; then
+          ldd ./xrpld
+          if [ "$(ldd ./xrpld | grep -E '(libstdc\+\+|libgcc)' | wc -l)" -eq 0 ]; then
             echo 'The binary is statically linked.'
           else
             echo 'The binary is dynamically linked.'
@@ -154,13 +151,13 @@ jobs:
 
       - name: Verify presence of instrumentation (Linux)
         if: ${{ runner.os == 'Linux' && env.ENABLED_VOIDSTAR == 'true' }}
-        working-directory: ${{ inputs.build_dir }}
+        working-directory: ${{ env.BUILD_DIR }}
         run: |
-          ./rippled --version | grep libvoidstar
+          ./xrpld --version | grep libvoidstar
 
       - name: Run the separate tests
         if: ${{ !inputs.build_only }}
-        working-directory: ${{ inputs.build_dir }}
+        working-directory: ${{ env.BUILD_DIR }}
         # Windows locks some of the build files while running tests, and parallel jobs can collide
         env:
           BUILD_TYPE: ${{ inputs.build_type }}
@@ -173,11 +170,11 @@ jobs:
 
       - name: Run the embedded tests
         if: ${{ !inputs.build_only }}
-        working-directory: ${{ runner.os == 'Windows' && format('{0}/{1}', inputs.build_dir, inputs.build_type) || inputs.build_dir }}
+        working-directory: ${{ runner.os == 'Windows' && format('{0}/{1}', env.BUILD_DIR, inputs.build_type) || env.BUILD_DIR }}
         env:
           BUILD_NPROC: ${{ steps.nproc.outputs.nproc }}
         run: |
-          ./rippled --unittest --unittest-jobs "${BUILD_NPROC}"
+          ./xrpld --unittest --unittest-jobs "${BUILD_NPROC}"
 
       - name: Debug failure (Linux)
         if: ${{ failure() && runner.os == 'Linux' && !inputs.build_only }}
@@ -189,7 +186,7 @@ jobs:
 
       - name: Prepare coverage report
         if: ${{ !inputs.build_only && env.ENABLED_COVERAGE == 'true' }}
-        working-directory: ${{ inputs.build_dir }}
+        working-directory: ${{ env.BUILD_DIR }}
         env:
           BUILD_NPROC: ${{ steps.nproc.outputs.nproc }}
           BUILD_TYPE: ${{ inputs.build_type }}
@@ -207,7 +204,7 @@ jobs:
           disable_search: true
           disable_telem: true
           fail_ci_if_error: true
-          files: ${{ inputs.build_dir }}/coverage.xml
+          files: ${{ env.BUILD_DIR }}/coverage.xml
           plugins: noop
           token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true

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

@@ -8,11 +8,6 @@ name: Build and test
 on:
   workflow_call:
     inputs:
-      build_dir:
-        description: "The directory where to build."
-        required: false
-        type: string
-        default: ".build"
       os:
         description: 'The operating system to use for the build ("linux", "macos", "windows").'
         required: true
@@ -46,7 +41,6 @@ jobs:
       matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
       max-parallel: 10
     with:
-      build_dir: ${{ inputs.build_dir }}
       build_only: ${{ matrix.build_only }}
       build_type: ${{ matrix.build_type }}
       cmake_args: ${{ matrix.cmake_args }}

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

@@ -25,7 +25,7 @@ jobs:
         env:
           MESSAGE: |
 
-            The dependency relationships between the modules in rippled have
+            The dependency relationships between the modules in xrpld 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,6 +25,12 @@ 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 config name
+        run: .github/scripts/rename/config.sh .
       - name: Check for differences
         env:
           MESSAGE: |

.github/workflows/upload-conan-deps.yml

@@ -64,13 +64,13 @@ jobs:
     steps:
       - name: Cleanup workspace (macOS and Windows)
         if: ${{ runner.os == 'macOS' || runner.os == 'Windows' }}
-        uses: XRPLF/actions/.github/actions/cleanup-workspace@01b244d2718865d427b499822fbd3f15e7197fcc
+        uses: XRPLF/actions/cleanup-workspace@2ece4ec6ab7de266859a6f053571425b2bd684b6
 
       - name: Checkout repository
         uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
 
       - name: Prepare runner
-        uses: XRPLF/actions/.github/actions/prepare-runner@99685816bb60a95a66852f212f382580e180df3a
+        uses: XRPLF/actions/prepare-runner@2ece4ec6ab7de266859a6f053571425b2bd684b6
         with:
           disable_ccache: false
 
@@ -78,7 +78,7 @@ jobs:
         uses: ./.github/actions/print-env
 
       - name: Get number of processors
-        uses: XRPLF/actions/.github/actions/get-nproc@046b1620f6bfd6cd0985dc82c3df02786801fe0a
+        uses: XRPLF/actions/get-nproc@2ece4ec6ab7de266859a6f053571425b2bd684b6
         id: nproc
         with:
           subtract: ${{ env.NPROC_SUBTRACT }}
@@ -92,7 +92,6 @@ jobs:
       - name: Build dependencies
         uses: ./.github/actions/build-deps
         with:
-          build_dir: .build
           build_nproc: ${{ steps.nproc.outputs.nproc }}
           build_type: ${{ matrix.build_type }}
           force_build: ${{ github.event_name == 'schedule' || github.event.inputs.force_source_build == 'true' }}

.gitignore

@@ -35,6 +35,7 @@ gmon.out
 
 # Customized configs.
 /rippled.cfg
+/xrpld.cfg
 /validators.txt
 
 # Locally patched Conan recipes

BUILD.md

@@ -10,7 +10,7 @@
 ## Branches
 
 For a stable release, choose the `master` branch or one of the [tagged
-releases](https://github.com/ripple/rippled/releases).
+releases](https://github.com/XRPLF/rippled/releases).
 
 ```bash
 git checkout master
@@ -33,7 +33,7 @@ git checkout develop
 
 See [System Requirements](https://xrpl.org/system-requirements.html).
 
-Building rippled generally requires git, Python, Conan, CMake, and a C++
+Building xrpld generally requires git, Python, Conan, CMake, and a C++
 compiler. Some guidance on setting up such a [C++ development environment can be
 found here](./docs/build/environment.md).
 
@@ -45,7 +45,7 @@ found here](./docs/build/environment.md).
     It is possible to build with Conan 1.60+, but the instructions are
     significantly different, which is why we are not recommending it.
 
-`rippled` is written in the C++20 dialect and includes the `<concepts>` header.
+`xrpld` is written in the C++20 dialect and includes the `<concepts>` header.
 The [minimum compiler versions][2] required are:
 
 | Compiler    | Version   |
@@ -66,7 +66,7 @@ Linux](./docs/build/environment.md#linux).
 
 ### Mac
 
-Many rippled engineers use macOS for development.
+Many xrpld engineers use macOS for development.
 
 Here are [sample instructions for setting up a C++ development environment on
 macOS](./docs/build/environment.md#macos).
@@ -126,7 +126,7 @@ default profile.
 ### Patched recipes
 
 The recipes in Conan Center occasionally need to be patched for compatibility
-with the latest version of `rippled`. We maintain a fork of the Conan Center
+with the latest version of `xrpld`. We maintain a fork of the Conan Center
 [here](https://github.com/XRPLF/conan-center-index/) containing the patches.
 
 To ensure our patched recipes are used, you must add our Conan remote at a
@@ -292,7 +292,7 @@ sed -i.bak -e 's|^compiler\.libcxx=.*$|compiler.libcxx=libstdc++11|' $(conan con
 to do that is to run the shortcut "x64 Native Tools Command Prompt" for the
 version of Visual Studio that you have installed.
 
-Windows developers must also build `rippled` and its dependencies for the x64
+Windows developers must also build `xrpld` and its dependencies for the x64
 architecture:
 
 ```bash
@@ -422,9 +422,9 @@ tools.build:cxxflags=['-DBOOST_ASIO_DISABLE_CONCEPTS']
    cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake -Dxrpld=ON -Dtests=ON  ..
    ```
 
-   **Note:** You can pass build options for `rippled` in this step.
+   **Note:** You can pass build options for `xrpld` in this step.
 
-4. Build `rippled`.
+4. Build `xrpld`.
 
    For a single-configuration generator, it will build whatever configuration
    you passed for `CMAKE_BUILD_TYPE`. For a multi-configuration generator, you
@@ -443,26 +443,26 @@ tools.build:cxxflags=['-DBOOST_ASIO_DISABLE_CONCEPTS']
    cmake --build . --config Debug
    ```
 
-5. Test rippled.
+5. Test xrpld.
 
    Single-config generators:
 
    ```
-   ./rippled --unittest --unittest-jobs N
+   ./xrpld --unittest --unittest-jobs N
    ```
 
    Multi-config generators:
 
    ```
-   ./Release/rippled --unittest --unittest-jobs N
-   ./Debug/rippled --unittest --unittest-jobs N
+   ./Release/xrpld --unittest --unittest-jobs N
+   ./Debug/xrpld --unittest --unittest-jobs N
    ```
 
    Replace the `--unittest-jobs` parameter N with the desired unit tests
    concurrency. Recommended setting is half of the number of available CPU
    cores.
 
-   The location of `rippled` binary in your build directory depends on your
+   The location of `xrpld` binary in your build directory depends on your
    CMake generator. Pass `--help` to see the rest of the command line options.
 
 ## Coverage report
@@ -481,18 +481,18 @@ Prerequisites for the coverage report:
 
 A coverage report is created when the following steps are completed, in order:
 
-1. `rippled` binary built with instrumentation data, enabled by the `coverage`
+1. `xrpld` binary built with instrumentation data, enabled by the `coverage`
    option mentioned above
 2. completed one or more run of the unit tests, which populates coverage capture data
 3. completed run of the `gcovr` tool (which internally invokes either `gcov` or `llvm-cov`)
    to assemble both instrumentation data and the coverage capture data into a coverage report
 
 The last step of the above is automated into a single target `coverage`. The instrumented
-`rippled` binary can also be used for regular development or testing work, at
+`xrpld` binary can also be used for regular development or testing work, at
 the cost of extra disk space utilization and a small performance hit
-(to store coverage capture data). Since `rippled` binary is simply a dependency of the
+(to store coverage capture data). Since `xrpld` binary is simply a dependency of the
 coverage report target, it is possible to re-run the `coverage` target without
-rebuilding the `rippled` binary. Note, running of the unit tests before the `coverage`
+rebuilding the `xrpld` binary. Note, running of the unit tests before the `coverage`
 target is left to the developer. Each such run will append to the coverage data
 collected in the build directory.
 
@@ -520,16 +520,16 @@ stored inside the build directory, as either of:
 
 ## Options
 
-| Option     | Default Value | Description                                                                |
-| ---------- | ------------- | -------------------------------------------------------------------------- |
-| `assert`   | OFF           | Enable assertions.                                                         |
-| `coverage` | OFF           | Prepare the coverage report.                                               |
-| `san`      | N/A           | Enable a sanitizer with Clang. Choices are `thread` and `address`.         |
-| `tests`    | OFF           | Build tests.                                                               |
-| `unity`    | OFF           | Configure a unity build.                                                   |
-| `xrpld`    | OFF           | Build the xrpld (`rippled`) application, and not just the libxrpl library. |
-| `werr`     | OFF           | Treat compilation warnings as errors                                       |
-| `wextra`   | OFF           | Enable additional compilation warnings                                     |
+| Option     | Default Value | Description                                                        |
+| ---------- | ------------- | ------------------------------------------------------------------ |
+| `assert`   | OFF           | Enable assertions.                                                 |
+| `coverage` | OFF           | Prepare the coverage report.                                       |
+| `san`      | N/A           | Enable a sanitizer with Clang. Choices are `thread` and `address`. |
+| `tests`    | OFF           | Build tests.                                                       |
+| `unity`    | OFF           | Configure a unity build.                                           |
+| `xrpld`    | OFF           | Build the xrpld application, and not just the libxrpl library.     |
+| `werr`     | OFF           | Treat compilation warnings as errors                               |
+| `wextra`   | OFF           | Enable additional compilation warnings                             |
 
 [Unity builds][5] may be faster for the first build
 (at the cost of much more memory) since they concatenate sources into fewer
@@ -573,7 +573,7 @@ you might have generated CMake files for a different `build_type` than the
 `CMAKE_BUILD_TYPE` you passed to Conan.
 
 ```
-/rippled/.build/pb-xrpl.libpb/xrpl/proto/xrpl.pb.h:10:10: fatal error: 'google/protobuf/port_def.inc' file not found
+/xrpld/.build/pb-xrpl.libpb/xrpl/proto/xrpl.pb.h:10:10: fatal error: 'google/protobuf/port_def.inc' file not found
    10 | #include <google/protobuf/port_def.inc>
       |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 1 error generated.

CMakeLists.txt

@@ -85,34 +85,18 @@ endif()
 ###
 
 include(deps/Boost)
-find_package(OpenSSL 1.1.1 REQUIRED)
-set_target_properties(OpenSSL::SSL PROPERTIES
-  INTERFACE_COMPILE_DEFINITIONS OPENSSL_NO_SSL2
-)
 
 add_subdirectory(external/antithesis-sdk)
-find_package(gRPC REQUIRED)
-find_package(lz4 REQUIRED)
-# Target names with :: are not allowed in a generator expression.
-# We need to pull the include directories and imported location properties
-# from separate targets.
-find_package(LibArchive REQUIRED)
-find_package(SOCI REQUIRED)
-find_package(SQLite3 REQUIRED)
-
-option(rocksdb "Enable RocksDB" ON)
-if(rocksdb)
-  find_package(RocksDB REQUIRED)
-  set_target_properties(RocksDB::rocksdb PROPERTIES
-    INTERFACE_COMPILE_DEFINITIONS XRPL_ROCKSDB_AVAILABLE=1
-  )
-  target_link_libraries(xrpl_libs INTERFACE RocksDB::rocksdb)
-endif()
-
 find_package(date REQUIRED)
 find_package(ed25519 REQUIRED)
+find_package(gRPC REQUIRED)
+find_package(LibArchive REQUIRED)
+find_package(lz4 REQUIRED)
 find_package(nudb REQUIRED)
+find_package(OpenSSL REQUIRED)
 find_package(secp256k1 REQUIRED)
+find_package(SOCI REQUIRED)
+find_package(SQLite3 REQUIRED)
 find_package(xxHash REQUIRED)
 
 target_link_libraries(xrpl_libs INTERFACE
@@ -125,6 +109,15 @@ target_link_libraries(xrpl_libs INTERFACE
   SQLite::SQLite3
 )
 
+option(rocksdb "Enable RocksDB" ON)
+if(rocksdb)
+    find_package(RocksDB REQUIRED)
+    set_target_properties(RocksDB::rocksdb PROPERTIES
+            INTERFACE_COMPILE_DEFINITIONS XRPL_ROCKSDB_AVAILABLE=1
+    )
+    target_link_libraries(xrpl_libs INTERFACE RocksDB::rocksdb)
+endif()
+
 # Work around changes to Conan recipe for now.
 if(TARGET nudb::core)
   set(nudb nudb::core)

CONTRIBUTING.md

@@ -24,7 +24,7 @@ your verifying key. Please set up [signature verification][signing].
 
 In general, external contributions should be developed in your personal
 [fork][forking]. Contributions from developers with write permissions
-should be done in [the main repository][rippled] in a branch with
+should be done in [the main repository][xrpld] in a branch with
 a permitted prefix. Permitted prefixes are:
 
 - XLS-[a-zA-Z0-9]+/.+
@@ -73,7 +73,7 @@ Ensure that your code compiles according to the build instructions in
 
 Please write tests for your code.
 If your test can be run offline, in under 60 seconds, then it can be an
-automatic test run by `rippled --unittest`.
+automatic test run by `xrpld --unittest`.
 Otherwise, it must be a manual test.
 
 If you create new source files, they must be organized as follows:
@@ -256,13 +256,13 @@ pre-commit install
 We are using [Antithesis](https://antithesis.com/) for continuous fuzzing,
 and keep a copy of [Antithesis C++ SDK](https://github.com/antithesishq/antithesis-sdk-cpp/)
 in `external/antithesis-sdk`. One of the aims of fuzzing is to identify bugs
-by finding external conditions which cause contracts violations inside `rippled`.
+by finding external conditions which cause contracts violations inside `xrpld`.
 The contracts are expressed as `XRPL_ASSERT` or `UNREACHABLE` (defined in
 `include/xrpl/beast/utility/instrumentation.h`), which are effectively (outside
 of Antithesis) wrappers for `assert(...)` with added name. The purpose of name
 is to provide contracts with stable identity which does not rely on line numbers.
 
-When `rippled` is built with the Antithesis instrumentation enabled
+When `xrpld` is built with the Antithesis instrumentation enabled
 (using `voidstar` CMake option) and ran on the Antithesis platform, the
 contracts become
 [test properties](https://antithesis.com/docs/using_antithesis/properties.html);
@@ -304,7 +304,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: `"ripple::RFC1751::insert : minimum length"`.
+  Good name: `"xrpl::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
@@ -318,7 +318,7 @@ For this reason:
 
 To execute all unit tests:
 
-`rippled --unittest --unittest-jobs=<number of cores>`
+`xrpld --unittest --unittest-jobs=<number of cores>`
 
 (Note: Using multiple cores on a Mac M1 can cause spurious test failures. The
 cause is still under investigation. If you observe this problem, try specifying fewer jobs.)
@@ -326,7 +326,7 @@ cause is still under investigation. If you observe this problem, try specifying
 To run a specific set of test suites:
 
 ```
-rippled --unittest TestSuiteName
+xrpld --unittest TestSuiteName
 ```
 
 Note: In this example, all tests with prefix `TestSuiteName` will be run, so if
@@ -1075,7 +1075,7 @@ git fetch upstreams
 [contrib]: https://docs.github.com/en/get-started/quickstart/contributing-to-projects
 [squash]: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges#squash-and-merge-your-commits
 [forking]: https://github.com/XRPLF/rippled/fork
-[rippled]: https://github.com/XRPLF/rippled
+[xrpld]: https://github.com/XRPLF/rippled
 [signing]: https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification
 [setup-upstreams]: ./bin/git/setup-upstreams.sh
 [squash-branches]: ./bin/git/squash-branches.sh

cfg/validators-example.txt

@@ -1,7 +1,7 @@
 #
 # Default validators.txt
 #
-# This file is located in the same folder as your rippled.cfg file
+# This file is located in the same folder as your xrpld.cfg file
 # and defines which validators your server trusts not to collude.
 #
 # This file is UTF-8 with DOS, UNIX, or Mac style line endings.

cfg/xrpld-example.cfg

@@ -29,18 +29,18 @@
 #
 # Purpose
 #
-#   This file documents and provides examples of all rippled server process
-#   configuration options. When the rippled server instance is launched, it
+#   This file documents and provides examples of all xrpld server process
+#   configuration options. When the xrpld server instance is launched, it
 #   looks for a file with the following name:
 #
-#     rippled.cfg
+#     xrpld.cfg
 #
-#   For more information on where the rippled server instance searches for the
+#   For more information on where the xrpld server instance searches for the
 #   file, visit:
 #
 #     https://xrpl.org/commandline-usage.html#generic-options
 #
-#   This file should be named rippled.cfg. This file is UTF-8 with DOS, UNIX,
+#   This file should be named xrpld.cfg. This file is UTF-8 with DOS, UNIX,
 #   or Mac style end of lines. Blank lines and lines beginning with '#' are
 #   ignored. Undefined sections are reserved. No escapes are currently defined.
 #
@@ -89,8 +89,8 @@
 #
 #
 #
-#   rippled offers various server protocols to clients making inbound
-#   connections. The listening ports rippled uses are "universal" ports
+#   xrpld offers various server protocols to clients making inbound
+#   connections. The listening ports xrpld uses are "universal" ports
 #   which may be configured to handshake in one or more of the available
 #   supported protocols. These universal ports simplify administration:
 #   A single open port can be used for multiple protocols.
@@ -103,7 +103,7 @@
 #
 #   A list of port names and key/value pairs. A port name must start with a
 #   letter and contain only letters and numbers. The name is not case-sensitive.
-#   For each name in this list, rippled will look for a configuration file
+#   For each name in this list, xrpld will look for a configuration file
 #   section with the same name and use it to create a listening port. The
 #   name is informational only; the choice of name does not affect the function
 #   of the listening port.
@@ -134,7 +134,7 @@
 #       ip = 127.0.0.1
 #       protocol = http
 #
-#   When rippled is used as a command line client (for example, issuing a
+#   When xrpld is used as a command line client (for example, issuing a
 #   server stop command), the first port advertising the http or https
 #   protocol will be used to make the connection.
 #
@@ -175,7 +175,7 @@
 #       same time. It is possible have both Websockets and Secure Websockets
 #       together in one port.
 #
-#       NOTE    If no ports support the peer protocol, rippled cannot
+#       NOTE    If no ports support the peer protocol, xrpld cannot
 #               receive incoming peer connections or become a superpeer.
 #
 #   limit = <number>
@@ -194,7 +194,7 @@
 #       required. IP address restrictions, if any, will be checked in addition
 #       to the credentials specified here.
 #
-#       When acting in the client role, rippled will supply these credentials
+#       When acting in the client role, xrpld will supply these credentials
 #       using HTTP's Basic Authentication headers when making outbound HTTP/S
 #       requests.
 #
@@ -237,7 +237,7 @@
 #       WS, or WSS protocol interfaces. If administrative commands are
 #       disabled for a port, these credentials have no effect.
 #
-#       When acting in the client role, rippled will supply these credentials
+#       When acting in the client role, xrpld will supply these credentials
 #       in the submitted JSON for any administrative command requests when
 #       invoking JSON-RPC commands on remote servers.
 #
@@ -258,7 +258,7 @@
 #       resource controls will default to those for non-administrative users.
 #
 #       The secure_gateway IP addresses are intended to represent
-#       proxies. Since rippled trusts these hosts, they must be
+#       proxies. Since xrpld trusts these hosts, they must be
 #       responsible for properly authenticating the remote user.
 #
 #       If some IP addresses are included for both "admin" and
@@ -272,7 +272,7 @@
 #       Use the specified files when configuring SSL on the port.
 #
 #       NOTE    If no files are specified and secure protocols are selected,
-#               rippled will generate an internal self-signed certificate.
+#               xrpld will generate an internal self-signed certificate.
 #
 #       The files have these meanings:
 #
@@ -297,12 +297,12 @@
 #       Control the ciphers which the server will support over SSL on the port,
 #       specified using the OpenSSL "cipher list format".
 #
-#       NOTE    If unspecified, rippled will automatically configure a modern
+#       NOTE    If unspecified, xrpld will automatically configure a modern
 #               cipher suite. This default suite should be widely supported.
 #
 #               You should not modify this string unless you have a specific
 #               reason and cryptographic expertise. Incorrect modification may
-#               keep rippled from connecting to other instances of rippled or
+#               keep xrpld from connecting to other instances of xrpld or
 #               prevent RPC and WebSocket clients from connecting.
 #
 #   send_queue_limit = [1..65535]
@@ -382,7 +382,7 @@
 #-----------------
 #
 #   These settings control security and access attributes of the Peer to Peer
-#   server section of the rippled process. Peer Protocol implements the
+#   server section of the xrpld process. Peer Protocol implements the
 #   Ripple Payment protocol. It is over peer connections that transactions
 #   and validations are passed from to machine to machine, to determine the
 #   contents of validated ledgers.
@@ -396,7 +396,7 @@
 #   true - enables compression
 #   false - disables compression [default].
 #
-#   The rippled server can save bandwidth by compressing its peer-to-peer communications,
+#   The xrpld server can save bandwidth by compressing its peer-to-peer communications,
 #   at a cost of greater CPU usage. If you enable link compression,
 #   the server automatically compresses communications with peer servers
 #   that also have link compression enabled.
@@ -432,7 +432,7 @@
 #
 # [ips_fixed]
 #
-#   List of IP addresses or hostnames to which rippled should always attempt to
+#   List of IP addresses or hostnames to which xrpld should always attempt to
 #   maintain peer connections with. This is useful for manually forming private
 #   networks, for example to configure a validation server that connects to the
 #   Ripple network through a public-facing server, or for building a set
@@ -573,7 +573,7 @@
 #
 #   minimum_txn_in_ledger_standalone = <number>
 #
-#       Like minimum_txn_in_ledger when rippled is running in standalone
+#       Like minimum_txn_in_ledger when xrpld is running in standalone
 #       mode. Default: 1000.
 #
 #   target_txn_in_ledger = <number>
@@ -710,7 +710,7 @@
 #
 # [validator_token]
 #
-#   This is an alternative to [validation_seed] that allows rippled to perform
+#   This is an alternative to [validation_seed] that allows xrpld to perform
 #   validation without having to store the validator keys on the network
 #   connected server. The field should contain a single token in the form of a
 #   base64-encoded blob.
@@ -745,7 +745,7 @@
 #
 #   Specify the file by its name or path.
 #   Unless an absolute path is specified, it will be considered relative to
-#   the folder in which the rippled.cfg file is located.
+#   the folder in which the xrpld.cfg file is located.
 #
 #   Examples:
 #    /home/ripple/validators.txt
@@ -840,7 +840,7 @@
 #
 #   0: Disable the ledger replay feature [default]
 #   1: Enable the ledger replay feature. With this feature enabled, when
-#      acquiring a ledger from the network, a rippled node only downloads
+#      acquiring a ledger from the network, a xrpld node only downloads
 #      the ledger header and the transactions instead of the whole ledger.
 #      And the ledger is built by applying the transactions to the parent
 #      ledger.
@@ -851,7 +851,7 @@
 #
 #----------------
 #
-#   The rippled server instance uses HTTPS GET requests in a variety of
+#   The xrpld server instance uses HTTPS GET requests in a variety of
 #   circumstances, including but not limited to contacting trusted domains to
 #   fetch information such as mapping an email address to a Ripple Payment
 #   Network address.
@@ -891,7 +891,7 @@
 #
 #------------
 #
-#   rippled creates 4 SQLite database to hold bookkeeping information
+#   xrpld creates 4 SQLite database to hold bookkeeping information
 #   about transactions, local credentials, and various other things.
 #   It also creates the NodeDB, which holds all the objects that
 #   make up the current and historical ledgers.
@@ -902,7 +902,7 @@
 #   the performance of the server.
 #
 #   Partial pathnames will be considered relative to the location of
-#   the rippled.cfg file.
+#   the xrpld.cfg file.
 #
 #   [node_db]               Settings for the Node Database (required)
 #
@@ -920,11 +920,11 @@
 #   type = NuDB
 #
 #       NuDB is a high-performance database written by Ripple Labs and optimized
-#       for rippled and solid-state drives.
+#       for xrpld and solid-state drives.
 #
 #       NuDB maintains its high speed regardless of the amount of history
 #       stored. Online delete may be selected, but is not required. NuDB is
-#       available on all platforms that rippled runs on.
+#       available on all platforms that xrpld runs on.
 #
 #   type = RocksDB
 #
@@ -1049,7 +1049,7 @@
 #
 #       recovery_wait_seconds
 #                           The online delete process checks periodically
-#                           that rippled is still in sync with the network,
+#                           that xrpld is still in sync with the network,
 #                           and that the validated ledger is less than
 #                           'age_threshold_seconds' old. If not, then continue
 #                           sleeping for this number of seconds and
@@ -1069,8 +1069,8 @@
 #   The server creates and maintains 4 to 5 bookkeeping SQLite databases in
 #   the 'database_path' location. If you omit this configuration setting,
 #   the server creates a directory called "db" located in the same place as
-#   your rippled.cfg file.
-#   Partial pathnames are relative to the location of the rippled executable.
+#   your xrpld.cfg file.
+#   Partial pathnames are relative to the location of the xrpld executable.
 #
 #   [sqlite]       Tuning settings for the SQLite databases (optional)
 #
@@ -1120,7 +1120,7 @@
 #                           The default is "wal", which uses a write-ahead
 #                           log to implement database transactions.
 #                           Alternately, "memory" saves disk I/O, but if
-#                           rippled crashes during a transaction, the
+#                           xrpld crashes during a transaction, the
 #                           database is likely to be corrupted.
 #                           See https://www.sqlite.org/pragma.html#pragma_journal_mode
 #                           for more details about the available options.
@@ -1130,7 +1130,7 @@
 #       synchronous         Valid values: off, normal, full, extra
 #                           The default is "normal", which works well with
 #                           the "wal" journal mode. Alternatively, "off"
-#                           allows rippled to continue as soon as data is
+#                           allows xrpld to continue as soon as data is
 #                           passed to the OS, which can significantly
 #                           increase speed, but risks data corruption if
 #                           the host computer crashes before writing that
@@ -1144,7 +1144,7 @@
 #                           The default is "file", which will use files
 #                           for temporary database tables and indices.
 #                           Alternatively, "memory" may save I/O, but
-#                           rippled does not currently use many, if any,
+#                           xrpld does not currently use many, if any,
 #                           of these temporary objects.
 #                           See https://www.sqlite.org/pragma.html#pragma_temp_store
 #                           for more details about the available options.
@@ -1173,7 +1173,7 @@
 #
 #   These settings are designed to help server administrators diagnose
 #   problems, and obtain detailed information about the activities being
-#   performed by the rippled process.
+#   performed by the xrpld process.
 #
 #
 #
@@ -1190,7 +1190,7 @@
 #
 #   Configuration parameters for the Beast. Insight stats collection module.
 #
-#   Insight is a module that collects information from the areas of rippled
+#   Insight is a module that collects information from the areas of xrpld
 #   that have instrumentation. The configuration parameters control where the
 #   collection metrics are sent. The parameters are expressed as key = value
 #   pairs with no white space. The main parameter is the choice of server:
@@ -1199,7 +1199,7 @@
 #
 #       Choice of server to send metrics to. Currently the only choice is
 #       "statsd" which sends UDP packets to a StatsD daemon, which must be
-#       running while rippled is running. More information on StatsD is
+#       running while xrpld is running. More information on StatsD is
 #       available here:
 #           https://github.com/b/statsd_spec
 #
@@ -1209,7 +1209,7 @@
 #                 in the format, n.n.n.n:port.
 #
 #       "prefix"  A string prepended to each collected metric. This is used
-#                 to distinguish between different running instances of rippled.
+#                 to distinguish between different running instances of xrpld.
 #
 #     If this section is missing, or the server type is unspecified or unknown,
 #     statistics are not collected or reported.
@@ -1236,7 +1236,7 @@
 #
 #   Example:
 #     [perf]
-#     perf_log=/var/log/rippled/perf.log
+#     perf_log=/var/log/xrpld/perf.log
 #     log_interval=2
 #
 #-------------------------------------------------------------------------------
@@ -1246,7 +1246,7 @@
 #----------
 #
 #   The vote settings configure settings for the entire Ripple network.
-#   While a single instance of rippled cannot unilaterally enforce network-wide
+#   While a single instance of xrpld cannot unilaterally enforce network-wide
 #   settings, these choices become part of the instance's vote during the
 #   consensus process for each voting ledger.
 #
@@ -1260,7 +1260,7 @@
 #       The reference transaction is the simplest form of transaction.
 #       It represents an XRP payment between two parties.
 #
-#       If this parameter is unspecified, rippled will use an internal
+#       If this parameter is unspecified, xrpld will use an internal
 #       default. Don't change this without understanding the consequences.
 #
 #       Example:
@@ -1272,7 +1272,7 @@
 #       account's XRP balance that is at or below the reserve may only be
 #       spent on transaction fees, and not transferred out of the account.
 #
-#       If this parameter is unspecified, rippled will use an internal
+#       If this parameter is unspecified, xrpld will use an internal
 #       default. Don't change this without understanding the consequences.
 #
 #       Example:
@@ -1284,7 +1284,7 @@
 #       each ledger item owned by the account. Ledger items an account may
 #       own include trust lines, open orders, and tickets.
 #
-#       If this parameter is unspecified, rippled will use an internal
+#       If this parameter is unspecified, xrpld will use an internal
 #       default. Don't change this without understanding the consequences.
 #
 #       Example:
@@ -1326,7 +1326,7 @@
 #   tool instead.
 #
 #   This flag has no effect on the "sign" and "sign_for" command line options
-#   that rippled makes available.
+#   that xrpld makes available.
 #
 #   The default value of this field is "false"
 #
@@ -1405,7 +1405,7 @@
 #--------------------
 #
 #   Administrators can use these values as a starting point for configuring
-#   their instance of rippled, but each value should be checked to make sure
+#   their instance of xrpld, but each value should be checked to make sure
 #   it meets the business requirements for the organization.
 #
 # Server
@@ -1415,7 +1415,7 @@
 #   "peer"
 #
 #       Peer protocol open to everyone. This is required to accept
-#       incoming rippled connections. This does not affect automatic
+#       incoming xrpld connections. This does not affect automatic
 #       or manual outgoing Peer protocol connections.
 #
 #   "rpc"
@@ -1432,7 +1432,7 @@
 #
 #       ETL commands for Clio. We recommend setting secure_gateway
 #       in this section to a comma-separated list of the addresses
-#       of your Clio servers, in order to bypass rippled's rate limiting.
+#       of your Clio servers, in order to bypass xrpld's rate limiting.
 #
 #   This port is commented out but can be enabled by removing
 #   the '#' from each corresponding line including the entry under [server]
@@ -1449,8 +1449,8 @@
 #   NOTE
 #
 #       To accept connections on well known ports such as 80 (HTTP) or
-#       443 (HTTPS), most operating systems will require rippled to
-#       run with administrator privileges, or else rippled will not start.
+#       443 (HTTPS), most operating systems will require xrpld to
+#       run with administrator privileges, or else xrpld will not start.
 
 [server]
 port_rpc_admin_local
@@ -1496,7 +1496,7 @@ secure_gateway = 127.0.0.1
 
 #-------------------------------------------------------------------------------
 
-# This is primary persistent datastore for rippled.  This includes transaction
+# This is primary persistent datastore for xrpld.  This includes transaction
 # metadata, account states, and ledger headers.  Helpful information can be
 # found at https://xrpl.org/capacity-planning.html#node-db-type
 # type=NuDB is recommended for non-validators with fast SSDs. Validators or
@@ -1511,19 +1511,19 @@ secure_gateway = 127.0.0.1
 #    deletion.
 [node_db]
 type=NuDB
-path=/var/lib/rippled/db/nudb
+path=/var/lib/xrpld/db/nudb
 nudb_block_size=4096
 online_delete=512
 advisory_delete=0
 
 [database_path]
-/var/lib/rippled/db
+/var/lib/xrpld/db
 
 
 # This needs to be an absolute directory reference, not a relative one.
 # Modify this value as required.
 [debug_logfile]
-/var/log/rippled/debug.log
+/var/log/xrpld/debug.log
 
 # To use the XRP test network
 # (see https://xrpl.org/connect-your-rippled-to-the-xrp-test-net.html),
@@ -1533,7 +1533,7 @@ advisory_delete=0
 
 # File containing trusted validator keys or validator list publishers.
 # Unless an absolute path is specified, it will be considered relative to the
-# folder in which the rippled.cfg file is located.
+# folder in which the xrpld.cfg file is located.
 [validators_file]
 validators.txt
 

cmake/XrplCore.cmake

@@ -94,10 +94,18 @@ target_link_libraries(xrpl.libxrpl.protocol PUBLIC
 )
 
 # Level 05
+add_module(xrpl core)
+target_link_libraries(xrpl.libxrpl.core PUBLIC
+  xrpl.libxrpl.basics
+  xrpl.libxrpl.json
+  xrpl.libxrpl.protocol
+)
+
+# Level 06
 add_module(xrpl resource)
 target_link_libraries(xrpl.libxrpl.resource PUBLIC xrpl.libxrpl.protocol)
 
-# Level 06
+# Level 07
 add_module(xrpl net)
 target_link_libraries(xrpl.libxrpl.net PUBLIC
   xrpl.libxrpl.basics
@@ -144,6 +152,7 @@ target_sources(xrpl.libxrpl PRIVATE ${sources})
 target_link_modules(xrpl PUBLIC
   basics
   beast
+  core
   crypto
   json
   protocol
@@ -223,6 +232,4 @@ 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

@@ -16,6 +16,7 @@ install (
     xrpl.libxrpl
     xrpl.libxrpl.basics
     xrpl.libxrpl.beast
+    xrpl.libxrpl.core
     xrpl.libxrpl.crypto
     xrpl.libxrpl.json
     xrpl.libxrpl.ledger
@@ -61,14 +62,14 @@ if (is_root_project AND TARGET xrpld)
         message (\"-- Skipping : \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${DEST}/\${NEWNAME}\")
       endif ()
     endmacro()
-    copy_if_not_exists(\"${CMAKE_CURRENT_SOURCE_DIR}/cfg/rippled-example.cfg\" etc rippled.cfg)
+    copy_if_not_exists(\"${CMAKE_CURRENT_SOURCE_DIR}/cfg/xrpld-example.cfg\" etc xrpld.cfg)
     copy_if_not_exists(\"${CMAKE_CURRENT_SOURCE_DIR}/cfg/validators-example.txt\" etc validators.txt)
   ")
   install(CODE "
     set(CMAKE_MODULE_PATH \"${CMAKE_MODULE_PATH}\")
     include(create_symbolic_link)
-    create_symbolic_link(rippled${suffix} \
-       \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/xrpld${suffix})
+    create_symbolic_link(xrpld${suffix} \
+       \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/rippled${suffix})
   ")
 endif ()
 

cmake/deps/Boost.cmake

@@ -1,4 +1,4 @@
-find_package(Boost 1.82 REQUIRED
+find_package(Boost REQUIRED
   COMPONENTS
     chrono
     container

conanfile.py

@@ -182,12 +182,10 @@ class Xrpl(ConanFile):
         libxrpl.libs = [
             "xrpl",
             "xrpl.libpb",
-            "ed25519",
-            "secp256k1",
         ]
         # TODO: Fix the protobufs to include each other relative to
-        # `include/`, not `include/ripple/proto/`.
-        libxrpl.includedirs = ["include", "include/ripple/proto"]
+        # `include/`, not `include/xrpl/proto/`.
+        libxrpl.includedirs = ["include", "include/xrpl/proto"]
         libxrpl.requires = [
             "boost::headers",
             "boost::chrono",

include/xrpl/basics/Archive.h

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

include/xrpl/basics/BasicConfig.h

@@ -12,7 +12,7 @@
 #include <unordered_map>
 #include <vector>
 
-namespace ripple {
+namespace xrpl {
 
 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 ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/basics/Blob.h

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

include/xrpl/basics/Buffer.h

@@ -8,7 +8,7 @@
 #include <cstring>
 #include <memory>
 
-namespace ripple {
+namespace xrpl {
 
 /** 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_,
-            "ripple::Buffer::operator=(Slice) : input not a subset");
+            "xrpl::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 ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/basics/ByteUtilities.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_BASICS_BYTEUTILITIES_H_INCLUDED
 #define XRPL_BASICS_BYTEUTILITIES_H_INCLUDED
 
-namespace ripple {
+namespace xrpl {
 
 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 ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/basics/CompressionAlgorithms.h

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

include/xrpl/basics/CountedObject.h

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

include/xrpl/basics/DecayingSample.h

@@ -4,7 +4,7 @@
 #include <chrono>
 #include <cmath>
 
-namespace ripple {
+namespace xrpl {
 
 /** 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 ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/basics/Expected.h

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

include/xrpl/basics/FileUtilities.h

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

include/xrpl/basics/IntrusivePointer.h

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

include/xrpl/basics/IntrusivePointer.ipp

@@ -6,7 +6,7 @@
 
 #include <utility>
 
-namespace ripple {
+namespace xrpl {
 
 template <class T>
 template <CAdoptTag TAdoptTag>
@@ -608,7 +608,7 @@ SharedWeakUnion<T>::convertToStrong()
         [[maybe_unused]] auto action = p->releaseWeakRef();
         XRPL_ASSERT(
             (action == ReleaseWeakRefAction::noop),
-            "ripple::SharedWeakUnion::convertToStrong : "
+            "xrpl::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(
-                "ripple::SharedWeakUnion::convertToWeak : destroying freshly "
+                "xrpl::SharedWeakUnion::convertToWeak : destroying freshly "
                 "added ref");
             delete p;
             unsafeSetRawPtr(nullptr);
@@ -719,5 +719,5 @@ SharedWeakUnion<T>::unsafeReleaseNoStore()
     }
 }
 
-}  // namespace ripple
+}  // namespace xrpl
 #endif

include/xrpl/basics/IntrusiveRefCounts.h

@@ -6,7 +6,7 @@
 #include <atomic>
 #include <cstdint>
 
-namespace ripple {
+namespace xrpl {
 
 /** 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 ripple::IntrusivePointer by
+    A class can satisfy the requirements of a xrpl::IntrusivePointer by
     inheriting from this class.
   */
 struct IntrusiveRefCounts
@@ -257,7 +257,7 @@ IntrusiveRefCounts::releaseStrongRef() const
         RefCountPair const prevVal{prevIntVal};
         XRPL_ASSERT(
             (prevVal.strong >= strongDelta),
-            "ripple::IntrusiveRefCounts::releaseStrongRef : previous ref "
+            "xrpl::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),
-                "ripple::IntrusiveRefCounts::releaseStrongRef : not in partial "
+                "xrpl::IntrusiveRefCounts::releaseStrongRef : not in partial "
                 "destroy");
             return action;
         }
@@ -314,7 +314,7 @@ IntrusiveRefCounts::addWeakReleaseStrongRef() const
         // can't happen twice.
         XRPL_ASSERT(
             (!prevVal.partialDestroyStartedBit),
-            "ripple::IntrusiveRefCounts::addWeakReleaseStrongRef : not in "
+            "xrpl::IntrusiveRefCounts::addWeakReleaseStrongRef : not in "
             "partial destroy");
 
         auto nextIntVal = prevIntVal + delta;
@@ -336,7 +336,7 @@ IntrusiveRefCounts::addWeakReleaseStrongRef() const
         {
             XRPL_ASSERT(
                 (!(prevIntVal & partialDestroyStartedMask)),
-                "ripple::IntrusiveRefCounts::addWeakReleaseStrongRef : not "
+                "xrpl::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)),
-        "ripple::IntrusiveRefCounts::~IntrusiveRefCounts : count must be zero");
+        "xrpl::IntrusiveRefCounts::~IntrusiveRefCounts : count must be zero");
     auto t = v & tagMask;
     XRPL_ASSERT(
         (!t || t == tagMask),
-        "ripple::IntrusiveRefCounts::~IntrusiveRefCounts : valid tag");
+        "xrpl::IntrusiveRefCounts::~IntrusiveRefCounts : valid tag");
 #endif
 }
 
@@ -427,7 +427,7 @@ inline IntrusiveRefCounts::RefCountPair::RefCountPair(
 {
     XRPL_ASSERT(
         (strong < checkStrongMaxValue && weak < checkWeakMaxValue),
-        "ripple::IntrusiveRefCounts::RefCountPair(FieldType) : inputs inside "
+        "xrpl::IntrusiveRefCounts::RefCountPair(FieldType) : inputs inside "
         "range");
 }
 
@@ -438,7 +438,7 @@ inline IntrusiveRefCounts::RefCountPair::RefCountPair(
 {
     XRPL_ASSERT(
         (strong < checkStrongMaxValue && weak < checkWeakMaxValue),
-        "ripple::IntrusiveRefCounts::RefCountPair(CountType, CountType) : "
+        "xrpl::IntrusiveRefCounts::RefCountPair(CountType, CountType) : "
         "inputs inside range");
 }
 
@@ -447,7 +447,7 @@ IntrusiveRefCounts::RefCountPair::combinedValue() const noexcept
 {
     XRPL_ASSERT(
         (strong < checkStrongMaxValue && weak < checkWeakMaxValue),
-        "ripple::IntrusiveRefCounts::RefCountPair::combinedValue : inputs "
+        "xrpl::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),
-        "ripple::partialDestructorFinished : not a weak ref");
+        "xrpl::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 ripple
+}  // namespace xrpl
 #endif

include/xrpl/basics/KeyCache.h

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

include/xrpl/basics/LocalValue.h

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

include/xrpl/basics/Log.h

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

include/xrpl/basics/MathUtilities.h

@@ -5,7 +5,7 @@
 #include <cassert>
 #include <cstddef>
 
-namespace ripple {
+namespace xrpl {
 
 /** 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 ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/basics/Number.h

@@ -6,7 +6,7 @@
 #include <ostream>
 #include <string>
 
-namespace ripple {
+namespace xrpl {
 
 class Number;
 
@@ -402,6 +402,6 @@ public:
     operator=(NumberRoundModeGuard const&) = delete;
 };
 
-}  // namespace ripple
+}  // namespace xrpl
 
 #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.
 
-- `ripple::hash_set`
+- `xrpl::hash_set`
   - Where inserts and contains need to be O(1).
   - For "small" sets, `std::set` might be faster and smaller.
 
-- `ripple::hardened_hash_set`
+- `xrpl::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 `ripple::hash_set` instead, which uses a better hashing algorithm.
-- Or use `ripple::hardened_hash_set` to prevent algorithmic complexity attacks.
+- Use `xrpl::hash_set` instead, which uses a better hashing algorithm.
+- Or use `xrpl::hardened_hash_set` to prevent algorithmic complexity attacks.

include/xrpl/basics/RangeSet.h

@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-namespace ripple {
+namespace xrpl {
 
 /** 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 += ripple::to_string(interval) + ",";
+        s += xrpl::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 ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/basics/Resolver.h

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

include/xrpl/basics/ResolverAsio.h

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

include/xrpl/basics/SHAMapHash.h

@@ -6,7 +6,7 @@
 
 #include <ostream>
 
-namespace ripple {
+namespace xrpl {
 
 // 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 ripple
+}  // namespace xrpl
 
 #endif  // XRPL_BASICS_SHAMAP_HASH_H_INCLUDED

include/xrpl/basics/SharedWeakCachePointer.h

@@ -4,7 +4,7 @@
 #include <memory>
 #include <variant>
 
-namespace ripple {
+namespace xrpl {
 
 /** 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 ripple
+}  // namespace xrpl
 #endif

include/xrpl/basics/SharedWeakCachePointer.ipp

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

include/xrpl/basics/SlabAllocator.h

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

include/xrpl/basics/Slice.h

@@ -15,7 +15,7 @@
 #include <type_traits>
 #include <vector>
 
-namespace ripple {
+namespace xrpl {
 
 /** An immutable linear range of bytes.
 
@@ -87,7 +87,7 @@ public:
     {
         XRPL_ASSERT(
             i < size_,
-            "ripple::Slice::operator[](std::size_t) const : valid input");
+            "xrpl::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 ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/basics/StringUtilities.h

@@ -12,7 +12,7 @@
 #include <optional>
 #include <string>
 
-namespace ripple {
+namespace xrpl {
 
 /** 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 ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/basics/TaggedCache.h

@@ -16,7 +16,7 @@
 #include <type_traits>
 #include <vector>
 
-namespace ripple {
+namespace xrpl {
 
 /** 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 ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/basics/TaggedCache.ipp

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

include/xrpl/basics/ToString.h

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

include/xrpl/basics/UnorderedContainers.h

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

include/xrpl/basics/UptimeClock.h

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

include/xrpl/basics/algorithm.h

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

include/xrpl/basics/base64.h

@@ -38,7 +38,7 @@
 #include <cstdint>
 #include <string>
 
-namespace ripple {
+namespace xrpl {
 
 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 ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/basics/base_uint.h

@@ -23,7 +23,7 @@
 #include <cstring>
 #include <type_traits>
 
-namespace ripple {
+namespace xrpl {
 
 namespace detail {
 
@@ -275,7 +275,7 @@ public:
     {
         XRPL_ASSERT(
             c.size() * sizeof(typename Container::value_type) == size(),
-            "ripple::base_uint::base_uint(Container auto) : input size match");
+            "xrpl::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(),
-            "ripple::base_uint::operator=(Container auto) : input size match");
+            "xrpl::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 ripple
+}  // namespace xrpl
 
 namespace beast {
 
 template <std::size_t Bits, class Tag>
-struct is_uniquely_represented<ripple::base_uint<Bits, Tag>>
+struct is_uniquely_represented<xrpl::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 ripple {
+namespace xrpl {
 
 // A few handy aliases
 
@@ -104,6 +104,6 @@ stopwatch()
     return beast::get_abstract_clock<Facade, Clock>();
 }
 
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/basics/comparators.h

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

include/xrpl/basics/contract.h

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

include/xrpl/basics/hardened_hash.h

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

include/xrpl/basics/join.h

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

include/xrpl/basics/make_SSLContext.h

@@ -5,7 +5,7 @@
 
 #include <string>
 
-namespace ripple {
+namespace xrpl {
 
 /** 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 ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/basics/mulDiv.h

@@ -5,7 +5,7 @@
 #include <limits>
 #include <optional>
 
-namespace ripple {
+namespace xrpl {
 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 ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/basics/partitioned_unordered_map.h

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

include/xrpl/basics/random.h

@@ -11,7 +11,7 @@
 #include <random>
 #include <type_traits>
 
-namespace ripple {
+namespace xrpl {
 
 #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, "ripple::rand_int : max over min inputs");
+    XRPL_ASSERT(max > min, "xrpl::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 ripple
+}  // namespace xrpl
 
 #endif  // XRPL_BASICS_RANDOM_H_INCLUDED

include/xrpl/basics/safe_cast.h

@@ -3,7 +3,7 @@
 
 #include <type_traits>
 
-namespace ripple {
+namespace xrpl {
 
 // 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 ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/basics/scope.h

@@ -8,7 +8,7 @@
 #include <type_traits>
 #include <utility>
 
-namespace ripple {
+namespace xrpl {
 
 // 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(),
-            "ripple::scope_unlock::scope_unlock : mutex must be locked");
+            "xrpl::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 ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/basics/spinlock.h

@@ -13,7 +13,7 @@
 #include <immintrin.h>
 #endif
 
-namespace ripple {
+namespace xrpl {
 
 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),
-            "ripple::packed_spinlock::packed_spinlock : valid index and mask");
+            "xrpl::packed_spinlock::packed_spinlock : valid index and mask");
     }
 
     [[nodiscard]] bool
@@ -206,6 +206,6 @@ public:
 };
 /** @} */
 
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/basics/strHex.h

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

include/xrpl/basics/tagged_integer.h

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

include/xrpl/core/ClosureCounter.h

@@ -8,7 +8,7 @@
 #include <mutex>
 #include <optional>
 
-namespace ripple {
+namespace xrpl {
 
 /**
  * The role of a `ClosureCounter` is to assist in shutdown by letting callers
@@ -202,6 +202,6 @@ public:
     }
 };
 
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif  // XRPL_CORE_CLOSURE_COUNTER_H_INCLUDED

include/xrpl/core/Coro.ipp

@@ -3,7 +3,7 @@
 
 #include <xrpl/basics/ByteUtilities.h>
 
-namespace ripple {
+namespace xrpl {
 
 template <class F>
 JobQueue::Coro::Coro(
@@ -34,7 +34,7 @@ JobQueue::Coro::Coro(
 inline JobQueue::Coro::~Coro()
 {
 #ifndef NDEBUG
-    XRPL_ASSERT(finished_, "ripple::JobQueue::Coro::~Coro : is finished");
+    XRPL_ASSERT(finished_, "xrpl::JobQueue::Coro::~Coro : is finished");
 #endif
 }
 
@@ -85,8 +85,7 @@ JobQueue::Coro::resume()
     detail::getLocalValues().reset(&lvs_);
     std::lock_guard lock(mutex_);
     XRPL_ASSERT(
-        static_cast<bool>(coro_),
-        "ripple::JobQueue::Coro::resume : is runnable");
+        static_cast<bool>(coro_), "xrpl::JobQueue::Coro::resume : is runnable");
     coro_();
     detail::getLocalValues().release();
     detail::getLocalValues().reset(saved);
@@ -129,6 +128,6 @@ JobQueue::Coro::join()
     cv_.wait(lk, [this]() { return running_ == false; });
 }
 
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/core/Job.h

@@ -1,14 +1,13 @@
 #ifndef XRPL_CORE_JOB_H_INCLUDED
 #define XRPL_CORE_JOB_H_INCLUDED
 
-#include <xrpld/core/ClosureCounter.h>
-#include <xrpld/core/LoadMonitor.h>
-
 #include <xrpl/basics/CountedObject.h>
+#include <xrpl/core/ClosureCounter.h>
+#include <xrpl/core/LoadMonitor.h>
 
 #include <functional>
 
-namespace ripple {
+namespace xrpl {
 
 // Note that this queue should only be used for CPU-bound jobs
 // It is primarily intended for signature checking
@@ -132,6 +131,6 @@ private:
 
 using JobCounter = ClosureCounter<void>;
 
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/core/JobQueue.h

@@ -1,19 +1,18 @@
 #ifndef XRPL_CORE_JOBQUEUE_H_INCLUDED
 #define XRPL_CORE_JOBQUEUE_H_INCLUDED
 
-#include <xrpld/core/ClosureCounter.h>
-#include <xrpld/core/JobTypeData.h>
-#include <xrpld/core/JobTypes.h>
-#include <xrpld/core/detail/Workers.h>
-
 #include <xrpl/basics/LocalValue.h>
+#include <xrpl/core/ClosureCounter.h>
+#include <xrpl/core/JobTypeData.h>
+#include <xrpl/core/JobTypes.h>
+#include <xrpl/core/detail/Workers.h>
 #include <xrpl/json/json_value.h>
 
 #include <boost/coroutine/all.hpp>
 
 #include <set>
 
-namespace ripple {
+namespace xrpl {
 
 namespace perf {
 class PerfLog;
@@ -383,11 +382,11 @@ private:
             lock is released which only happens after the coroutine completes.
 */
 
-}  // namespace ripple
+}  // namespace xrpl
 
-#include <xrpld/core/Coro.ipp>
+#include <xrpl/core/Coro.ipp>
 
-namespace ripple {
+namespace xrpl {
 
 template <class F>
 std::shared_ptr<JobQueue::Coro>
@@ -409,6 +408,6 @@ JobQueue::postCoro(JobType t, std::string const& name, F&& f)
     return coro;
 }
 
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/core/JobTypeData.h

@@ -1,12 +1,11 @@
 #ifndef XRPL_CORE_JOBTYPEDATA_H_INCLUDED
 #define XRPL_CORE_JOBTYPEDATA_H_INCLUDED
 
-#include <xrpld/core/JobTypeInfo.h>
-
 #include <xrpl/basics/Log.h>
 #include <xrpl/beast/insight/Collector.h>
+#include <xrpl/core/JobTypeInfo.h>
 
-namespace ripple {
+namespace xrpl {
 
 struct JobTypeData
 {
@@ -84,6 +83,6 @@ public:
     }
 };
 
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/core/JobTypeInfo.h

@@ -1,9 +1,9 @@
 #ifndef XRPL_CORE_JOBTYPEINFO_H_INCLUDED
 #define XRPL_CORE_JOBTYPEINFO_H_INCLUDED
 
-#include <xrpld/core/Job.h>
+#include <xrpl/core/Job.h>
 
-namespace ripple {
+namespace xrpl {
 
 /** Holds all the 'static' information about a job, which does not change */
 class JobTypeInfo
@@ -78,6 +78,6 @@ public:
     }
 };
 
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/core/JobTypes.h

@@ -1,13 +1,13 @@
 #ifndef XRPL_CORE_JOBTYPES_H_INCLUDED
 #define XRPL_CORE_JOBTYPES_H_INCLUDED
 
-#include <xrpld/core/Job.h>
-#include <xrpld/core/JobTypeInfo.h>
+#include <xrpl/core/Job.h>
+#include <xrpl/core/JobTypeInfo.h>
 
 #include <map>
 #include <string>
 
-namespace ripple {
+namespace xrpl {
 
 class JobTypes
 {
@@ -35,7 +35,7 @@ private:
                        std::chrono::milliseconds peakLatency) {
             XRPL_ASSERT(
                 m_map.find(jt) == m_map.end(),
-                "ripple::JobTypes::JobTypes::add : unique job type input");
+                "xrpl::JobTypes::JobTypes::add : unique job type input");
 
             [[maybe_unused]] auto const inserted =
                 m_map
@@ -48,7 +48,7 @@ private:
 
             XRPL_ASSERT(
                 inserted == true,
-                "ripple::JobTypes::JobTypes::add : input is inserted");
+                "xrpl::JobTypes::JobTypes::add : input is inserted");
         };
 
         // clang-format off
@@ -122,7 +122,7 @@ public:
     get(JobType jt) const
     {
         Map::const_iterator const iter(m_map.find(jt));
-        XRPL_ASSERT(iter != m_map.end(), "ripple::JobTypes::get : valid input");
+        XRPL_ASSERT(iter != m_map.end(), "xrpl::JobTypes::get : valid input");
 
         if (iter != m_map.end())
             return iter->second;
@@ -170,6 +170,6 @@ public:
     Map m_map;
 };
 
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/core/LoadEvent.h

@@ -4,7 +4,7 @@
 #include <chrono>
 #include <string>
 
-namespace ripple {
+namespace xrpl {
 
 class LoadMonitor;
 
@@ -65,6 +65,6 @@ private:
     std::chrono::steady_clock::duration timeRunning_;
 };
 
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/core/LoadMonitor.h

@@ -1,15 +1,14 @@
 #ifndef XRPL_CORE_LOADMONITOR_H_INCLUDED
 #define XRPL_CORE_LOADMONITOR_H_INCLUDED
 
-#include <xrpld/core/LoadEvent.h>
-
 #include <xrpl/basics/UptimeClock.h>
 #include <xrpl/beast/utility/Journal.h>
+#include <xrpl/core/LoadEvent.h>
 
 #include <chrono>
 #include <mutex>
 
-namespace ripple {
+namespace xrpl {
 
 // Monitors load levels and response times
 
@@ -68,6 +67,6 @@ private:
     beast::Journal const j_;
 };
 
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/core/PerfLog.h

@@ -1,9 +1,8 @@
-#ifndef XRPL_BASICS_PERFLOG_H
-#define XRPL_BASICS_PERFLOG_H
-
-#include <xrpld/core/Config.h>
-#include <xrpld/core/JobTypes.h>
+#ifndef XRPL_CORE_PERFLOG_H
+#define XRPL_CORE_PERFLOG_H
 
+#include <xrpl/basics/BasicConfig.h>
+#include <xrpl/core/JobTypes.h>
 #include <xrpl/json/json_value.h>
 
 #include <boost/filesystem.hpp>
@@ -18,7 +17,7 @@ namespace beast {
 class Journal;
 }
 
-namespace ripple {
+namespace xrpl {
 class Application;
 namespace perf {
 
@@ -41,7 +40,7 @@ public:
     using microseconds = std::chrono::microseconds;
 
     /**
-     * Configuration from [perf] section of rippled.cfg.
+     * Configuration from [perf] section of xrpld.cfg.
      */
     struct Setup
     {
@@ -188,6 +187,6 @@ measureDurationAndLog(
 }
 
 }  // namespace perf
-}  // namespace ripple
+}  // namespace xrpl
 
-#endif  // XRPL_BASICS_PERFLOG_H
+#endif  // XRPL_CORE_PERFLOG_H

include/xrpl/core/detail/Workers.h

@@ -1,9 +1,8 @@
 #ifndef XRPL_CORE_WORKERS_H_INCLUDED
 #define XRPL_CORE_WORKERS_H_INCLUDED
 
-#include <xrpld/core/detail/semaphore.h>
-
 #include <xrpl/beast/core/LockFreeStack.h>
+#include <xrpl/core/detail/semaphore.h>
 
 #include <atomic>
 #include <condition_variable>
@@ -11,7 +10,7 @@
 #include <string>
 #include <thread>
 
-namespace ripple {
+namespace xrpl {
 
 namespace perf {
 class PerfLog;
@@ -215,6 +214,6 @@ private:
         m_paused;  // holds just paused workers
 };
 
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/core/detail/semaphore.h

@@ -1,6 +1,6 @@
 /**
  *
- * TODO: Remove ripple::basic_semaphore (and this file) and use
+ * TODO: Remove xrpl::basic_semaphore (and this file) and use
  * std::counting_semaphore.
  *
  * Background:
@@ -32,7 +32,7 @@
 #include <condition_variable>
 #include <mutex>
 
-namespace ripple {
+namespace xrpl {
 
 template <class Mutex, class CondVar>
 class basic_semaphore
@@ -87,6 +87,6 @@ public:
 
 using semaphore = basic_semaphore<std::mutex, std::condition_variable>;
 
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/crypto/RFC1751.h

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

include/xrpl/crypto/csprng.h

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

include/xrpl/crypto/secure_erase.h

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

include/xrpl/json/JsonPropertyStream.h

@@ -4,7 +4,7 @@
 #include <xrpl/beast/utility/PropertyStream.h>
 #include <xrpl/json/json_value.h>
 
-namespace ripple {
+namespace xrpl {
 
 /** 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 ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/json/Object.h

@@ -1,445 +0,0 @@
-#ifndef XRPL_JSON_OBJECT_H_INCLUDED
-#define XRPL_JSON_OBJECT_H_INCLUDED
-
-#include <xrpl/json/Writer.h>
-
-#include <memory>
-
-namespace Json {
-
-/**
-    Collection is a base class for Array and Object, classes which provide the
-    facade of JSON collections for the O(1) JSON writer, while still using no
-    heap memory and only a very small amount of stack.
-
-    From http://json.org, JSON has two types of collection: array, and object.
-    Everything else is a *scalar* - a number, a string, a boolean, the special
-    value null, or a legacy Json::Value.
-
-    Collections must write JSON "as-it-goes" in order to get the strong
-    performance guarantees.  This puts restrictions upon API users:
-
-    1. Only one collection can be open for change at any one time.
-
-       This condition is enforced automatically and a std::logic_error thrown if
-   it is violated.
-
-    2. A tag may only be used once in an Object.
-
-       Some objects have many tags, so this condition might be a little
-       expensive. Enforcement of this condition is turned on in debug builds and
-       a std::logic_error is thrown when the tag is added for a second time.
-
-    Code samples:
-
-        Writer writer;
-
-        // An empty object.
-        {
-            Object::Root (writer);
-        }
-        // Outputs {}
-
-        // An object with one scalar value.
-        {
-            Object::Root root (writer);
-            write["hello"] = "world";
-        }
-        // Outputs {"hello":"world"}
-
-        // Same, using chaining.
-        {
-            Object::Root (writer)["hello"] = "world";
-        }
-        // Output is the same.
-
-        // Add several scalars, with chaining.
-        {
-            Object::Root (writer)
-                .set ("hello", "world")
-                .set ("flag", false)
-                .set ("x", 42);
-        }
-        // Outputs {"hello":"world","flag":false,"x":42}
-
-        // Add an array.
-        {
-            Object::Root root (writer);
-            {
-               auto array = root.setArray ("hands");
-               array.append ("left");
-               array.append ("right");
-            }
-        }
-        // Outputs {"hands":["left", "right"]}
-
-        // Same, using chaining.
-        {
-            Object::Root (writer)
-                .setArray ("hands")
-                .append ("left")
-                .append ("right");
-        }
-        // Output is the same.
-
-        // Add an object.
-        {
-            Object::Root root (writer);
-            {
-               auto object = root.setObject ("hands");
-               object["left"] = false;
-               object["right"] = true;
-            }
-        }
-        // Outputs {"hands":{"left":false,"right":true}}
-
-        // Same, using chaining.
-        {
-            Object::Root (writer)
-                .setObject ("hands")
-                .set ("left", false)
-                .set ("right", true);
-            }
-        }
-        // Outputs {"hands":{"left":false,"right":true}}
-
-
-   Typical ways to make mistakes and get a std::logic_error:
-
-        Writer writer;
-        Object::Root root (writer);
-
-        // Repeat a tag.
-        {
-            root ["hello"] = "world";
-            root ["hello"] = "there";  // THROWS! in a debug build.
-        }
-
-        // Open a subcollection, then set something else.
-        {
-            auto object = root.setObject ("foo");
-            root ["hello"] = "world";  // THROWS!
-        }
-
-        // Open two subcollections at a time.
-        {
-            auto object = root.setObject ("foo");
-            auto array = root.setArray ("bar");  // THROWS!!
-        }
-
-   For more examples, check the unit tests.
- */
-
-class Collection
-{
-public:
-    Collection(Collection&& c) noexcept;
-    Collection&
-    operator=(Collection&& c) noexcept;
-    Collection() = delete;
-
-    ~Collection();
-
-protected:
-    // A null parent means "no parent at all".
-    // Writers cannot be null.
-    Collection(Collection* parent, Writer*);
-    void
-    checkWritable(std::string const& label);
-
-    Collection* parent_;
-    Writer* writer_;
-    bool enabled_;
-};
-
-class Array;
-
-//------------------------------------------------------------------------------
-
-/** Represents a JSON object being written to a Writer. */
-class Object : protected Collection
-{
-public:
-    /** Object::Root is the only Collection that has a public constructor. */
-    class Root;
-
-    /** Set a scalar value in the Object for a key.
-
-        A JSON scalar is a single value - a number, string, boolean, nullptr or
-        a Json::Value.
-
-        `set()` throws an exception if this object is disabled (which means that
-        one of its children is enabled).
-
-        In a debug build, `set()` also throws an exception if the key has
-        already been set() before.
-
-        An operator[] is provided to allow writing `object["key"] = scalar;`.
-     */
-    template <typename Scalar>
-    void
-    set(std::string const& key, Scalar const&);
-
-    void
-    set(std::string const& key, Json::Value const&);
-
-    // Detail class and method used to implement operator[].
-    class Proxy;
-
-    Proxy
-    operator[](std::string const& key);
-    Proxy
-    operator[](Json::StaticString const& key);
-
-    /** Make a new Object at a key and return it.
-
-        This Object is disabled until that sub-object is destroyed.
-        Throws an exception if this Object was already disabled.
-     */
-    Object
-    setObject(std::string const& key);
-
-    /** Make a new Array at a key and return it.
-
-        This Object is disabled until that sub-array is destroyed.
-        Throws an exception if this Object was already disabled.
-     */
-    Array
-    setArray(std::string const& key);
-
-protected:
-    friend class Array;
-    Object(Collection* parent, Writer* w) : Collection(parent, w)
-    {
-    }
-};
-
-class Object::Root : public Object
-{
-public:
-    /** Each Object::Root must be constructed with its own unique Writer. */
-    Root(Writer&);
-};
-
-//------------------------------------------------------------------------------
-
-/** Represents a JSON array being written to a Writer. */
-class Array : private Collection
-{
-public:
-    /** Append a scalar to the Arrary.
-
-        Throws an exception if this array is disabled (which means that one of
-        its sub-collections is enabled).
-    */
-    template <typename Scalar>
-    void
-    append(Scalar const&);
-
-    /**
-       Appends a Json::Value to an array.
-       Throws an exception if this Array was disabled.
-     */
-    void
-    append(Json::Value const&);
-
-    /** Append a new Object and return it.
-
-        This Array is disabled until that sub-object is destroyed.
-        Throws an exception if this Array was disabled.
-     */
-    Object
-    appendObject();
-
-    /** Append a new Array and return it.
-
-        This Array is disabled until that sub-array is destroyed.
-        Throws an exception if this Array was already disabled.
-     */
-    Array
-    appendArray();
-
-protected:
-    friend class Object;
-    Array(Collection* parent, Writer* w) : Collection(parent, w)
-    {
-    }
-};
-
-//------------------------------------------------------------------------------
-
-// Generic accessor functions to allow Json::Value and Collection to
-// interoperate.
-
-/** Add a new subarray at a named key in a Json object. */
-Json::Value&
-setArray(Json::Value&, Json::StaticString const& key);
-
-/** Add a new subarray at a named key in a Json object. */
-Array
-setArray(Object&, Json::StaticString const& key);
-
-/** Add a new subobject at a named key in a Json object. */
-Json::Value&
-addObject(Json::Value&, Json::StaticString const& key);
-
-/** Add a new subobject at a named key in a Json object. */
-Object
-addObject(Object&, Json::StaticString const& key);
-
-/** Append a new subarray to a Json array. */
-Json::Value&
-appendArray(Json::Value&);
-
-/** Append a new subarray to a Json array. */
-Array
-appendArray(Array&);
-
-/** Append a new subobject to a Json object. */
-Json::Value&
-appendObject(Json::Value&);
-
-/** Append a new subobject to a Json object. */
-Object
-appendObject(Array&);
-
-/** Copy all the keys and values from one object into another. */
-void
-copyFrom(Json::Value& to, Json::Value const& from);
-
-/** Copy all the keys and values from one object into another. */
-void
-copyFrom(Object& to, Json::Value const& from);
-
-/** An Object that contains its own Writer. */
-class WriterObject
-{
-public:
-    WriterObject(Output const& output)
-        : writer_(std::make_unique<Writer>(output))
-        , object_(std::make_unique<Object::Root>(*writer_))
-    {
-    }
-
-    WriterObject(WriterObject&& other) = default;
-
-    Object*
-    operator->()
-    {
-        return object_.get();
-    }
-
-    Object&
-    operator*()
-    {
-        return *object_;
-    }
-
-private:
-    std::unique_ptr<Writer> writer_;
-    std::unique_ptr<Object::Root> object_;
-};
-
-WriterObject
-stringWriterObject(std::string&);
-
-//------------------------------------------------------------------------------
-// Implementation details.
-
-// Detail class for Object::operator[].
-class Object::Proxy
-{
-private:
-    Object& object_;
-    std::string const key_;
-
-public:
-    Proxy(Object& object, std::string const& key);
-
-    template <class T>
-    void
-    operator=(T const& t)
-    {
-        object_.set(key_, t);
-        // Note: This function shouldn't return *this, because it's a trap.
-        //
-        // In Json::Value, foo[jss::key] returns a reference to a
-        // mutable Json::Value contained _inside_ foo.  But in the case of
-        // Json::Object, where we write once only, there isn't any such
-        // reference that can be returned.  Returning *this would return an
-        // object "a level higher" than in Json::Value, leading to obscure bugs,
-        // particularly in generic code.
-    }
-};
-
-//------------------------------------------------------------------------------
-
-template <typename Scalar>
-void
-Array::append(Scalar const& value)
-{
-    checkWritable("append");
-    if (writer_)
-        writer_->append(value);
-}
-
-template <typename Scalar>
-void
-Object::set(std::string const& key, Scalar const& value)
-{
-    checkWritable("set");
-    if (writer_)
-        writer_->set(key, value);
-}
-
-inline Json::Value&
-setArray(Json::Value& json, Json::StaticString const& key)
-{
-    return (json[key] = Json::arrayValue);
-}
-
-inline Array
-setArray(Object& json, Json::StaticString const& key)
-{
-    return json.setArray(std::string(key));
-}
-
-inline Json::Value&
-addObject(Json::Value& json, Json::StaticString const& key)
-{
-    return (json[key] = Json::objectValue);
-}
-
-inline Object
-addObject(Object& object, Json::StaticString const& key)
-{
-    return object.setObject(std::string(key));
-}
-
-inline Json::Value&
-appendArray(Json::Value& json)
-{
-    return json.append(Json::arrayValue);
-}
-
-inline Array
-appendArray(Array& json)
-{
-    return json.appendArray();
-}
-
-inline Json::Value&
-appendObject(Json::Value& json)
-{
-    return json.append(Json::objectValue);
-}
-
-inline Object
-appendObject(Array& json)
-{
-    return json.appendObject();
-}
-
-}  // namespace Json
-
-#endif

include/xrpl/json/Writer.h

@@ -234,7 +234,7 @@ inline void
 check(bool condition, std::string const& message)
 {
     if (!condition)
-        ripple::Throw<std::logic_error>(message);
+        xrpl::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))                           \
-        ripple::Throw<Json::error>(message);
+        xrpl::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(ripple::Number const& value);
+    Value(xrpl::Number const& value);
     /** \brief Constructs a value from a static string.
 
      * Like other value string constructor but do not duplicate the string for
@@ -430,7 +430,7 @@ private:
 };
 
 inline Value
-to_json(ripple::Number const& number)
+to_json(xrpl::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 ripple {
+namespace xrpl {
 
 enum ApplyFlags : std::uint32_t {
     tapNONE = 0x00,
@@ -267,7 +267,7 @@ public:
         {
             // LCOV_EXCL_START
             UNREACHABLE(
-                "ripple::ApplyView::dirAppend : only Offers are appended to "
+                "xrpl::ApplyView::dirAppend : only Offers are appended to "
                 "book directories");
             // Only Offers are appended to book directories. Call dirInsert()
             // instead
@@ -407,6 +407,6 @@ insertPage(
     std::function<void(std::shared_ptr<SLE> const&)> const& describe);
 
 }  // namespace directory
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif

include/xrpl/ledger/ApplyViewImpl.h

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

include/xrpl/ledger/BookDirs.h

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

include/xrpl/ledger/CachedSLEs.h

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

include/xrpl/ledger/CachedView.h

@@ -8,7 +8,7 @@
 #include <mutex>
 #include <type_traits>
 
-namespace ripple {
+namespace xrpl {
 
 namespace detail {
 
@@ -47,10 +47,10 @@ public:
         return base_.open();
     }
 
-    LedgerInfo const&
-    info() const override
+    LedgerHeader const&
+    header() const override
     {
-        return base_.info();
+        return base_.header();
     }
 
     Fees const&
@@ -164,6 +164,6 @@ public:
     }
 };
 
-}  // namespace ripple
+}  // namespace xrpl
 
 #endif