Move app/tx to libxrpl

Signed-off-by: JCW <a1q123456@users.noreply.github.com>

.github/scripts/rename/README.md

@@ -31,6 +31,9 @@ run from the repository root.
    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:
 
@@ -40,4 +43,5 @@ You can run all these scripts from the repository root as follows:
 ./.github/scripts/rename/cmake.sh .
 ./.github/scripts/rename/binary.sh .
 ./.github/scripts/rename/namespace.sh .
+./.github/scripts/rename/config.sh .
 ```

.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/workflows/reusable-check-rename.yml

@@ -29,6 +29,8 @@ jobs:
         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: |

.gitignore

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

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

@@ -114,22 +114,46 @@ target_link_libraries(xrpl.libxrpl.net PUBLIC
   xrpl.libxrpl.resource
 )
 
-add_module(xrpl server)
-target_link_libraries(xrpl.libxrpl.server PUBLIC xrpl.libxrpl.protocol)
-
 add_module(xrpl nodestore)
 target_link_libraries(xrpl.libxrpl.nodestore PUBLIC
-        xrpl.libxrpl.basics
-        xrpl.libxrpl.json
-        xrpl.libxrpl.protocol
+  xrpl.libxrpl.basics
+  xrpl.libxrpl.json
+  xrpl.libxrpl.protocol
 )
 
 add_module(xrpl shamap)
 target_link_libraries(xrpl.libxrpl.shamap PUBLIC
-        xrpl.libxrpl.basics
-        xrpl.libxrpl.crypto
-        xrpl.libxrpl.protocol
-        xrpl.libxrpl.nodestore
+  xrpl.libxrpl.basics
+  xrpl.libxrpl.crypto
+  xrpl.libxrpl.protocol
+  xrpl.libxrpl.nodestore
+)
+
+add_module(xrpl rdb)
+target_link_libraries(xrpl.libxrpl.rdb PUBLIC
+  xrpl.libxrpl.basics
+  xrpl.libxrpl.core
+)
+
+add_module(xrpl server)
+target_link_libraries(xrpl.libxrpl.server PUBLIC
+  xrpl.libxrpl.protocol
+  xrpl.libxrpl.core
+  xrpl.libxrpl.rdb
+  xrpl.libxrpl.resource
+)
+
+add_module(xrpl overlay)
+target_link_libraries(xrpl.libxrpl.overlay PUBLIC
+  xrpl.libxrpl.basics
+  xrpl.libxrpl.json
+  xrpl.libxrpl.protocol
+  xrpl.libxrpl.rdb
+)
+
+add_module(xrpl conditions)
+target_link_libraries(xrpl.libxrpl.conditions PUBLIC
+  xrpl.libxrpl.overlay
 )
 
 add_module(xrpl ledger)
@@ -137,6 +161,15 @@ target_link_libraries(xrpl.libxrpl.ledger PUBLIC
   xrpl.libxrpl.basics
   xrpl.libxrpl.json
   xrpl.libxrpl.protocol
+  xrpl.libxrpl.rdb
+  xrpl.libxrpl.shamap
+  xrpl.libxrpl.server
+  xrpl.libxrpl.conditions
+)
+
+add_module(xrpl tx)
+target_link_libraries(xrpl.libxrpl.tx PUBLIC
+  xrpl.libxrpl.ledger
 )
 
 add_library(xrpl.libxrpl)
@@ -157,11 +190,15 @@ target_link_modules(xrpl PUBLIC
   json
   protocol
   resource
+  rdb
   server
   nodestore
   shamap
   net
+  overlay
+  conditions
   ledger
+  tx
 )
 
 # All headers in libxrpl are in modules.

cmake/XrplInstall.cmake

@@ -19,9 +19,13 @@ install (
     xrpl.libxrpl.core
     xrpl.libxrpl.crypto
     xrpl.libxrpl.json
-    xrpl.libxrpl.ledger
-    xrpl.libxrpl.net
+    xrpl.libxrpl.rdb
+    xrpl.libxrpl.overlay
     xrpl.libxrpl.nodestore
+    xrpl.libxrpl.ledger
+    xrpl.libxrpl.tx
+    xrpl.libxrpl.conditions
+    xrpl.libxrpl.net
     xrpl.libxrpl.protocol
     xrpl.libxrpl.resource
     xrpl.libxrpl.server
@@ -62,7 +66,7 @@ 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 "

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/conditions/Condition.h

@@ -1,10 +1,9 @@
 #ifndef XRPL_CONDITIONS_CONDITION_H
 #define XRPL_CONDITIONS_CONDITION_H
 
-#include <xrpld/conditions/detail/utils.h>
-
 #include <xrpl/basics/Buffer.h>
 #include <xrpl/basics/Slice.h>
+#include <xrpl/conditions/detail/utils.h>
 
 #include <cstdint>
 #include <set>

include/xrpl/conditions/Fulfillment.h

@@ -1,10 +1,9 @@
 #ifndef XRPL_CONDITIONS_FULFILLMENT_H
 #define XRPL_CONDITIONS_FULFILLMENT_H
 
-#include <xrpld/conditions/Condition.h>
-
 #include <xrpl/basics/Buffer.h>
 #include <xrpl/basics/Slice.h>
+#include <xrpl/conditions/Condition.h>
 
 namespace xrpl {
 namespace cryptoconditions {

include/xrpl/conditions/detail/PreimageSha256.h

@@ -1,12 +1,11 @@
 #ifndef XRPL_CONDITIONS_PREIMAGE_SHA256_H
 #define XRPL_CONDITIONS_PREIMAGE_SHA256_H
 
-#include <xrpld/conditions/Condition.h>
-#include <xrpld/conditions/Fulfillment.h>
-#include <xrpld/conditions/detail/error.h>
-
 #include <xrpl/basics/Buffer.h>
 #include <xrpl/basics/Slice.h>
+#include <xrpl/conditions/Condition.h>
+#include <xrpl/conditions/Fulfillment.h>
+#include <xrpl/conditions/detail/error.h>
 #include <xrpl/protocol/digest.h>
 
 #include <memory>

include/xrpl/conditions/detail/utils.h

@@ -1,10 +1,9 @@
 #ifndef XRPL_CONDITIONS_UTILS_H
 #define XRPL_CONDITIONS_UTILS_H
 
-#include <xrpld/conditions/detail/error.h>
-
 #include <xrpl/basics/Buffer.h>
 #include <xrpl/basics/Slice.h>
+#include <xrpl/conditions/detail/error.h>
 
 #include <boost/dynamic_bitset.hpp>
 

include/xrpl/core/FeatureSetService.h

@@ -0,0 +1,29 @@
+#ifndef XRPL_LEDGER_FEATURESETSERVICE_H_INCLUDED
+#define XRPL_LEDGER_FEATURESETSERVICE_H_INCLUDED
+
+#include <xrpl/beast/hash/uhash.h>
+
+#include <unordered_set>
+
+namespace xrpl {
+
+/** Service that provides access to enabled features/amendments.
+
+    This service provides read-only access to the set of enabled features
+    (amendments) that are active in the ledger. Components can use this
+    service to check which features are enabled without depending on the
+    full application Config class.
+*/
+class FeatureSetService
+{
+public:
+    virtual ~FeatureSetService() = default;
+
+    /** Get the set of enabled features/amendments */
+    virtual std::unordered_set<uint256, beast::uhash<>> const&
+    features() const = 0;
+};
+
+}  // namespace xrpl
+
+#endif

include/xrpl/core/HashRouter.h

@@ -267,9 +267,6 @@ private:
         suppressionMap_;
 };
 
-HashRouter::Setup
-setup_HashRouter(Config const&);
-
 }  // namespace xrpl
 
 #endif

include/xrpl/core/NetworkIDService.h

@@ -0,0 +1,36 @@
+#ifndef XRPL_CORE_NETWORKIDSERVICE_H_INCLUDED
+#define XRPL_CORE_NETWORKIDSERVICE_H_INCLUDED
+
+#include <cstdint>
+
+namespace xrpl {
+
+/** Service that provides access to the network ID.
+
+    This service provides read-only access to the network ID configured
+    for this server. The network ID identifies which network (mainnet,
+    testnet, devnet, or custom network) this server is configured to
+    connect to.
+
+    Well-known network IDs:
+    - 0: Mainnet
+    - 1: Testnet
+    - 2: Devnet
+    - 1025+: Custom networks (require NetworkID field in transactions)
+*/
+class NetworkIDService
+{
+public:
+    virtual ~NetworkIDService() = default;
+
+    /** Get the configured network ID
+     *
+     * @return The network ID this server is configured for
+     */
+    virtual std::uint32_t
+    getNetworkID() const = 0;
+};
+
+}  // namespace xrpl
+
+#endif

include/xrpl/core/PerfLog.h

@@ -40,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
     {

include/xrpl/core/ServiceRegistry.h

@@ -0,0 +1,249 @@
+#ifndef XRPL_CORE_SERVICEREGISTRY_H_INCLUDED
+#define XRPL_CORE_SERVICEREGISTRY_H_INCLUDED
+
+#include <xrpl/basics/Blob.h>
+#include <xrpl/basics/SHAMapHash.h>
+#include <xrpl/basics/TaggedCache.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/ledger/CachedSLEs.h>
+#include <xrpl/protocol/Protocol.h>
+
+#include <boost/asio/io_context.hpp>
+
+#include <cstdint>
+#include <memory>
+
+namespace xrpl {
+
+// Forward declarations
+namespace NodeStore {
+class Database;
+}
+namespace Resource {
+class Manager;
+}
+namespace perf {
+class PerfLog;
+}
+
+class AcceptedLedger;
+class AmendmentTable;
+class Application;
+class Cluster;
+class CollectorManager;
+class Config;
+class DatabaseCon;
+class Family;
+class FeatureSetService;
+class HashRouter;
+class InboundLedgers;
+class InboundTransactions;
+class JobQueue;
+class LedgerCleaner;
+class LedgerConfigService;
+class LedgerMaster;
+class LedgerReplayer;
+class LoadFeeTrack;
+class LoadManager;
+class ManifestCache;
+class NetworkOPs;
+class NetworkIDService;
+class OpenLedger;
+class OrderBookDB;
+class Overlay;
+class PathRequests;
+class PeerReservationTable;
+class PendingSaves;
+class RelationalDatabase;
+class ServerHandler;
+class SHAMapStore;
+class TimeKeeper;
+class TransactionMaster;
+class TxQ;
+class ValidatorList;
+class ValidatorSite;
+
+template <class Adaptor>
+class Validations;
+class RCLValidationsAdaptor;
+using RCLValidations = Validations<RCLValidationsAdaptor>;
+
+using NodeCache = TaggedCache<SHAMapHash, Blob>;
+
+/** Service registry for dependency injection.
+
+    This abstract interface provides access to various services and components
+    used throughout the application. It separates the service locator pattern
+    from the Application lifecycle management.
+
+    Components that need access to services can hold a reference to
+    ServiceRegistry rather than Application when they only need service
+    access and not lifecycle management.
+
+    The implementation (ServiceRegistryImpl) is provided in xrpld.
+*/
+class ServiceRegistry
+{
+public:
+    ServiceRegistry() = default;
+    virtual ~ServiceRegistry() = default;
+
+    // Core infrastructure services
+    virtual CollectorManager&
+    getCollectorManager() = 0;
+
+    virtual Family&
+    getNodeFamily() = 0;
+
+    virtual TimeKeeper&
+    timeKeeper() = 0;
+
+    virtual JobQueue&
+    getJobQueue() = 0;
+
+    virtual NodeCache&
+    getTempNodeCache() = 0;
+
+    virtual CachedSLEs&
+    cachedSLEs() = 0;
+
+    virtual FeatureSetService&
+    getFeatureSetService() = 0;
+
+    virtual LedgerConfigService&
+    getLedgerConfigService() = 0;
+
+    virtual NetworkIDService&
+    getNetworkIDService() = 0;
+
+    // Protocol and validation services
+    virtual AmendmentTable&
+    getAmendmentTable() = 0;
+
+    virtual HashRouter&
+    getHashRouter() = 0;
+
+    virtual LoadFeeTrack&
+    getFeeTrack() = 0;
+
+    virtual LoadManager&
+    getLoadManager() = 0;
+
+    virtual RCLValidations&
+    getValidations() = 0;
+
+    virtual ValidatorList&
+    validators() = 0;
+
+    virtual ValidatorSite&
+    validatorSites() = 0;
+
+    virtual ManifestCache&
+    validatorManifests() = 0;
+
+    virtual ManifestCache&
+    publisherManifests() = 0;
+
+    // Network services
+    virtual Overlay&
+    overlay() = 0;
+
+    virtual Cluster&
+    cluster() = 0;
+
+    virtual PeerReservationTable&
+    peerReservations() = 0;
+
+    virtual Resource::Manager&
+    getResourceManager() = 0;
+
+    // Storage services
+    virtual NodeStore::Database&
+    getNodeStore() = 0;
+
+    virtual SHAMapStore&
+    getSHAMapStore() = 0;
+
+    virtual RelationalDatabase&
+    getRelationalDatabase() = 0;
+
+    // Ledger services
+    virtual InboundLedgers&
+    getInboundLedgers() = 0;
+
+    virtual InboundTransactions&
+    getInboundTransactions() = 0;
+
+    virtual TaggedCache<uint256, AcceptedLedger>&
+    getAcceptedLedgerCache() = 0;
+
+    virtual LedgerMaster&
+    getLedgerMaster() = 0;
+
+    virtual LedgerCleaner&
+    getLedgerCleaner() = 0;
+
+    virtual LedgerReplayer&
+    getLedgerReplayer() = 0;
+
+    virtual PendingSaves&
+    pendingSaves() = 0;
+
+    virtual OpenLedger&
+    openLedger() = 0;
+
+    virtual OpenLedger const&
+    openLedger() const = 0;
+
+    // Transaction and operation services
+    virtual NetworkOPs&
+    getOPs() = 0;
+
+    virtual OrderBookDB&
+    getOrderBookDB() = 0;
+
+    virtual TransactionMaster&
+    getMasterTransaction() = 0;
+
+    virtual TxQ&
+    getTxQ() = 0;
+
+    virtual PathRequests&
+    getPathRequests() = 0;
+
+    // Server services
+    virtual ServerHandler&
+    getServerHandler() = 0;
+
+    virtual perf::PerfLog&
+    getPerfLog() = 0;
+
+    // Configuration and state
+    virtual bool
+    isStopping() const = 0;
+
+    virtual beast::Journal
+    journal(std::string const& name) = 0;
+
+    virtual boost::asio::io_context&
+    getIOContext() = 0;
+
+    virtual Logs&
+    logs() = 0;
+
+    virtual std::optional<uint256> const&
+    trapTxID() const = 0;
+
+    /** Retrieve the "wallet database" */
+    virtual DatabaseCon&
+    getWalletDB() = 0;
+
+    // Temporary: Get the underlying Application for functions that haven't
+    // been migrated yet. This should be removed once all code is migrated.
+    virtual Application&
+    app() = 0;
+};
+
+}  // namespace xrpl
+
+#endif

include/xrpl/core/StartUpType.h

@@ -0,0 +1,22 @@
+//
+// Created by Jingchen Wu on 07/01/2026.
+//
+
+#ifndef XRPL_STARTUPTYPE_H
+#define XRPL_STARTUPTYPE_H
+#include <iosfwd>
+#include <type_traits>
+
+namespace xrpl {
+
+enum class StartUpType { FRESH, NORMAL, LOAD, LOAD_FILE, REPLAY, NETWORK };
+
+inline std::ostream&
+operator<<(std::ostream& os, StartUpType const& type)
+{
+    return os << static_cast<std::underlying_type_t<StartUpType>>(type);
+}
+
+}  // namespace xrpl
+
+#endif  // XRPL_STARTUPTYPE_H

include/xrpl/ledger/AcceptedLedgerTx.h

@@ -1,16 +1,16 @@
-#ifndef XRPL_APP_LEDGER_ACCEPTEDLEDGERTX_H_INCLUDED
-#define XRPL_APP_LEDGER_ACCEPTEDLEDGERTX_H_INCLUDED
-
-#include <xrpld/app/ledger/Ledger.h>
+#ifndef XRPL_LEDGER_ACCEPTEDLEDGERTX_H_INCLUDED
+#define XRPL_LEDGER_ACCEPTEDLEDGERTX_H_INCLUDED
 
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/ledger/ReadView.h>
 #include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/TxMeta.h>
 
 #include <boost/container/flat_set.hpp>
 
 namespace xrpl {
 
-class Logs;
-
 /**
     A transaction that is in a closed ledger.
 

include/xrpl/ledger/AmendmentTable.h

@@ -1,12 +1,12 @@
 #ifndef XRPL_APP_MISC_AMENDMENTTABLE_H_INCLUDED
 #define XRPL_APP_MISC_AMENDMENTTABLE_H_INCLUDED
 
-#include <xrpld/app/ledger/Ledger.h>
-#include <xrpld/core/ConfigSections.h>
-
+#include <xrpl/ledger/ReadView.h>
+#include <xrpl/ledger/View.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Protocol.h>
 #include <xrpl/protocol/STValidation.h>
+#include <xrpl/shamap/SHAMap.h>
 
 #include <optional>
 
@@ -170,7 +170,7 @@ public:
 
 std::unique_ptr<AmendmentTable>
 make_AmendmentTable(
-    Application& app,
+    ServiceRegistry& registry,
     std::chrono::seconds majorityTime,
     std::vector<AmendmentTable::FeatureInfo> const& supported,
     Section const& enabled,

include/xrpl/ledger/BookListeners.h

@@ -1,9 +1,9 @@
-#ifndef XRPL_APP_LEDGER_BOOKLISTENERS_H_INCLUDED
-#define XRPL_APP_LEDGER_BOOKLISTENERS_H_INCLUDED
-
-#include <xrpld/rpc/InfoSub.h>
+#ifndef XRPL_LEDGER_BOOKLISTENERS_H_INCLUDED
+#define XRPL_LEDGER_BOOKLISTENERS_H_INCLUDED
 
+#include <xrpl/basics/UnorderedContainers.h>
 #include <xrpl/protocol/MultiApiJson.h>
+#include <xrpl/server/InfoSub.h>
 
 #include <memory>
 #include <mutex>

include/xrpl/ledger/LedgerConfig.h

@@ -0,0 +1,27 @@
+#ifndef XRPL_LEDGER_LEDGERCONFIG_H_INCLUDED
+#define XRPL_LEDGER_LEDGERCONFIG_H_INCLUDED
+
+#include <xrpl/protocol/XRPAmount.h>
+
+namespace xrpl {
+
+/** Configuration for creating Ledger objects.
+
+    This struct contains the minimal configuration needed to construct
+    a Ledger object.
+*/
+struct LedgerConfig
+{
+    /** Reference transaction fee */
+    XRPAmount reference_fee;
+
+    /** Base account reserve */
+    XRPAmount account_reserve;
+
+    /** Incremental owner reserve */
+    XRPAmount owner_reserve;
+};
+
+}  // namespace xrpl
+
+#endif

include/xrpl/ledger/LedgerConfigService.h

@@ -0,0 +1,36 @@
+#ifndef XRPL_LEDGER_LEDGERCONFIGSERVICE_H_INCLUDED
+#define XRPL_LEDGER_LEDGERCONFIGSERVICE_H_INCLUDED
+
+#include <xrpl/ledger/LedgerConfig.h>
+
+namespace xrpl {
+
+// Forward declaration
+class FeatureSetService;
+
+/** Service that provides ledger configuration.
+
+    This service creates LedgerConfig objects that contain the configuration
+    values needed to create and manage ledgers.
+
+    This is a service interface that can be accessed through ServiceRegistry,
+    allowing components to get ledger configuration without depending on
+    the full application Config class.
+*/
+class LedgerConfigService
+{
+public:
+    virtual ~LedgerConfigService() = default;
+
+    /** Get a LedgerConfig object with current configuration */
+    virtual LedgerConfig
+    getLedgerConfig() const = 0;
+
+    /** Get the FeatureSetService */
+    virtual FeatureSetService&
+    getFeatureSetService() = 0;
+};
+
+}  // namespace xrpl
+
+#endif

include/xrpl/ledger/OrderBookDB.h

@@ -0,0 +1,102 @@
+#ifndef XRPL_LEDGER_ORDERBOOKDB_H_INCLUDED
+#define XRPL_LEDGER_ORDERBOOKDB_H_INCLUDED
+
+#include <xrpl/ledger/AcceptedLedgerTx.h>
+#include <xrpl/ledger/BookListeners.h>
+#include <xrpl/ledger/ReadView.h>
+#include <xrpl/protocol/Book.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/MultiApiJson.h>
+#include <xrpl/protocol/UintTypes.h>
+
+#include <memory>
+#include <optional>
+#include <vector>
+
+namespace xrpl {
+
+/** Tracks order books in the ledger.
+
+    This interface provides access to order book information, including:
+    - Which order books exist in the ledger
+    - Querying order books by issue
+    - Managing order book subscriptions
+
+    The order book database is updated as ledgers are accepted and provides
+    efficient lookup of order book information for pathfinding and client
+    subscriptions.
+*/
+class OrderBookDB
+{
+public:
+    virtual ~OrderBookDB() = default;
+
+    /** Initialize or update the order book database with a new ledger.
+
+        This method should be called when a new ledger is accepted to update
+        the order book database with the current state of all order books.
+
+        @param ledger The ledger to scan for order books
+    */
+    virtual void
+    setup(std::shared_ptr<ReadView const> const& ledger) = 0;
+
+    /** Add an order book to track.
+
+        @param book The order book to add
+    */
+    virtual void
+    addOrderBook(Book const& book) = 0;
+
+    /** Get all order books that want a specific issue.
+
+        Returns a list of all order books where the taker pays the specified
+        issue. This is useful for pathfinding to find all possible next hops
+        from a given currency.
+
+        @param issue The issue to search for
+        @param domain Optional domain restriction for the order book
+        @return Vector of books that want this issue
+    */
+    virtual std::vector<Book>
+    getBooksByTakerPays(
+        Issue const& issue,
+        std::optional<Domain> const& domain = std::nullopt) = 0;
+
+    /** Get the count of order books that want a specific issue.
+
+        @param issue The issue to search for
+        @param domain Optional domain restriction for the order book
+        @return Number of books that want this issue
+    */
+    virtual int
+    getBookSize(
+        Issue const& issue,
+        std::optional<Domain> const& domain = std::nullopt) = 0;
+
+    /** Check if an order book to XRP exists for the given issue.
+
+        @param issue The issue to check
+        @param domain Optional domain restriction for the order book
+        @return true if a book from this issue to XRP exists
+    */
+    virtual bool
+    isBookToXRP(
+        Issue const& issue,
+        std::optional<Domain> domain = std::nullopt) = 0;
+
+    virtual void
+    processTxn(
+        std::shared_ptr<ReadView const> const& ledger,
+        AcceptedLedgerTx const& alTx,
+        MultiApiJson const& jvObj) = 0;
+
+    virtual BookListeners::pointer
+    getBookListeners(Book const&) = 0;
+    virtual BookListeners::pointer
+    makeBookListeners(Book const&) = 0;
+};
+
+}  // namespace xrpl
+
+#endif

include/xrpl/nodestore/README.md

@@ -130,7 +130,7 @@ newer versions of RocksDB (TBD).
 ## Discussion
 
 RocksDBQuickFactory is intended to provide a testbed for comparing potential
-rocksdb performance with the existing recommended configuration in rippled.cfg.
+rocksdb performance with the existing recommended configuration in xrpld.cfg.
 Through various executions and profiling some conclusions are presented below.
 
 - If the write ahead log is enabled, insert speed soon clogs up under load. The

include/xrpl/overlay/Message.h

@@ -1,9 +1,8 @@
 #ifndef XRPL_OVERLAY_MESSAGE_H_INCLUDED
 #define XRPL_OVERLAY_MESSAGE_H_INCLUDED
 
-#include <xrpld/overlay/Compression.h>
-
 #include <xrpl/basics/ByteUtilities.h>
+#include <xrpl/overlay/Compression.h>
 #include <xrpl/protocol/PublicKey.h>
 #include <xrpl/protocol/messages.h>
 

include/xrpl/overlay/Overlay.h

@@ -1,10 +1,9 @@
 #ifndef XRPL_OVERLAY_OVERLAY_H_INCLUDED
 #define XRPL_OVERLAY_OVERLAY_H_INCLUDED
 
-#include <xrpld/overlay/Peer.h>
-
 #include <xrpl/beast/utility/PropertyStream.h>
 #include <xrpl/json/json_value.h>
+#include <xrpl/overlay/Peer.h>
 #include <xrpl/server/Handoff.h>
 
 #include <boost/asio/ip/tcp.hpp>

include/xrpl/overlay/Peer.h

@@ -1,11 +1,10 @@
 #ifndef XRPL_OVERLAY_PEER_H_INCLUDED
 #define XRPL_OVERLAY_PEER_H_INCLUDED
 
-#include <xrpld/overlay/Message.h>
-
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/net/IPEndpoint.h>
 #include <xrpl/json/json_value.h>
+#include <xrpl/overlay/Message.h>
 #include <xrpl/protocol/PublicKey.h>
 
 namespace xrpl {

include/xrpl/overlay/PeerSet.h

@@ -2,9 +2,10 @@
 #define XRPL_APP_PEERS_PEERSET_H_INCLUDED
 
 #include <xrpld/app/main/Application.h>
-#include <xrpld/overlay/Peer.h>
 #include <xrpld/overlay/detail/ProtocolMessage.h>
 
+#include <xrpl/overlay/Peer.h>
+
 namespace xrpl {
 
 /** Supports data retrieval by managing a set of peers.
@@ -62,17 +63,6 @@ public:
     build() = 0;
 };
 
-std::unique_ptr<PeerSetBuilder>
-make_PeerSetBuilder(Application& app);
-
-/**
- * Make a dummy PeerSet that does not do anything.
- * @note For the use case of InboundLedger in ApplicationImp::loadOldLedger(),
- *       where a real PeerSet is not needed.
- */
-std::unique_ptr<PeerSet>
-make_DummyPeerSet(Application& app);
-
 }  // namespace xrpl
 
 #endif

include/xrpl/protocol/LedgerShortcut.h

@@ -0,0 +1,25 @@
+#ifndef XRPL_PROTOCOL_LEDGERSHORTCUT_H_INCLUDED
+#define XRPL_PROTOCOL_LEDGERSHORTCUT_H_INCLUDED
+
+namespace xrpl {
+
+/**
+ * @brief Enumeration of ledger shortcuts for specifying which ledger to use.
+ *
+ * These shortcuts provide a convenient way to reference commonly used ledgers
+ * without needing to specify their exact hash or sequence number.
+ */
+enum class LedgerShortcut {
+    /** The current working ledger (open, not yet closed) */
+    Current,
+
+    /** The most recently closed ledger (may not be validated) */
+    Closed,
+
+    /** The most recently validated ledger */
+    Validated
+};
+
+}  // namespace xrpl
+
+#endif

include/xrpl/protocol/Protocol.h

@@ -254,6 +254,14 @@ std::uint8_t constexpr maxAssetCheckDepth = 5;
 /** A ledger index. */
 using LedgerIndex = std::uint32_t;
 
+std::uint32_t constexpr FLAG_LEDGER_INTERVAL = 256;
+/** Returns true if the given ledgerIndex is a voting ledgerIndex */
+bool
+isVotingLedger(LedgerIndex seq);
+/** Returns true if the given ledgerIndex is a flag ledgerIndex */
+bool
+isFlagLedger(LedgerIndex seq);
+
 /** A transaction identifier.
     The value is computed as the hash of the
     canonicalized, serialized transaction object.

include/xrpl/protocol/detail/transactions.macro

@@ -8,11 +8,11 @@
  * To ease maintenance, you may replace any unneeded values with "..."
  * e.g. #define TRANSACTION(tag, value, name, ...)
  *
- * You must define a transactor class in the `ripple` namespace named `name`,
+ * You must define a transactor class in the `xrpl` namespace named `name`,
  * and include its header alongside the TRANSACTOR definition using this
  * format:
  * #if TRANSACTION_INCLUDE
- * #   include <xrpld/app/tx/detail/HEADER.h>
+ * #   include <xrpl/tx/transactors/HEADER.h>
  * #endif
  *
  * The `privileges` parameter of the TRANSACTION macro is a bitfield
@@ -22,7 +22,7 @@
 
 /** This transaction type executes a payment. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/Payment.h>
+#   include <xrpl/tx/transactors/Payment.h>
 #endif
 TRANSACTION(ttPAYMENT, 0, Payment,
     Delegation::delegatable,
@@ -42,7 +42,7 @@ TRANSACTION(ttPAYMENT, 0, Payment,
 
 /** This transaction type creates an escrow object. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/Escrow.h>
+#   include <xrpl/tx/transactors/Escrow.h>
 #endif
 TRANSACTION(ttESCROW_CREATE, 1, EscrowCreate,
     Delegation::delegatable,
@@ -73,7 +73,7 @@ TRANSACTION(ttESCROW_FINISH, 2, EscrowFinish,
 
 /** This transaction type adjusts various account settings. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/SetAccount.h>
+#   include <xrpl/tx/transactors/SetAccount.h>
 #endif
 TRANSACTION(ttACCOUNT_SET, 3, AccountSet,
     Delegation::notDelegatable,
@@ -94,7 +94,7 @@ TRANSACTION(ttACCOUNT_SET, 3, AccountSet,
 
 /** This transaction type cancels an existing escrow. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/Escrow.h>
+#   include <xrpl/tx/transactors/Escrow.h>
 #endif
 TRANSACTION(ttESCROW_CANCEL, 4, EscrowCancel,
     Delegation::delegatable,
@@ -107,7 +107,7 @@ TRANSACTION(ttESCROW_CANCEL, 4, EscrowCancel,
 
 /** This transaction type sets or clears an account's "regular key". */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/SetRegularKey.h>
+#   include <xrpl/tx/transactors/SetRegularKey.h>
 #endif
 TRANSACTION(ttREGULAR_KEY_SET, 5, SetRegularKey,
     Delegation::notDelegatable,
@@ -121,7 +121,7 @@ TRANSACTION(ttREGULAR_KEY_SET, 5, SetRegularKey,
 
 /** This transaction type creates an offer to trade one asset for another. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/CreateOffer.h>
+#   include <xrpl/tx/transactors/Offer/CreateOffer.h>
 #endif
 TRANSACTION(ttOFFER_CREATE, 7, OfferCreate,
     Delegation::delegatable,
@@ -137,7 +137,7 @@ TRANSACTION(ttOFFER_CREATE, 7, OfferCreate,
 
 /** This transaction type cancels existing offers to trade one asset for another. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/CancelOffer.h>
+#   include <xrpl/tx/transactors/Offer/CancelOffer.h>
 #endif
 TRANSACTION(ttOFFER_CANCEL, 8, OfferCancel,
     Delegation::delegatable,
@@ -151,7 +151,7 @@ TRANSACTION(ttOFFER_CANCEL, 8, OfferCancel,
 
 /** This transaction type creates a new set of tickets. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/CreateTicket.h>
+#   include <xrpl/tx/transactors/CreateTicket.h>
 #endif
 TRANSACTION(ttTICKET_CREATE, 10, TicketCreate,
     Delegation::delegatable,
@@ -167,7 +167,7 @@ TRANSACTION(ttTICKET_CREATE, 10, TicketCreate,
 // The SignerEntries are optional because a SignerList is deleted by
 // setting the SignerQuorum to zero and omitting SignerEntries.
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/SetSignerList.h>
+#   include <xrpl/tx/transactors/SetSignerList.h>
 #endif
 TRANSACTION(ttSIGNER_LIST_SET, 12, SignerListSet,
     Delegation::notDelegatable,
@@ -180,7 +180,7 @@ TRANSACTION(ttSIGNER_LIST_SET, 12, SignerListSet,
 
 /** This transaction type creates a new unidirectional XRP payment channel. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/PayChan.h>
+#   include <xrpl/tx/transactors/PayChan.h>
 #endif
 TRANSACTION(ttPAYCHAN_CREATE, 13, PaymentChannelCreate,
     Delegation::delegatable,
@@ -222,7 +222,7 @@ TRANSACTION(ttPAYCHAN_CLAIM, 15, PaymentChannelClaim,
 
 /** This transaction type creates a new check. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/CreateCheck.h>
+#   include <xrpl/tx/transactors/Check/CreateCheck.h>
 #endif
 TRANSACTION(ttCHECK_CREATE, 16, CheckCreate,
     Delegation::delegatable,
@@ -238,7 +238,7 @@ TRANSACTION(ttCHECK_CREATE, 16, CheckCreate,
 
 /** This transaction type cashes an existing check. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/CashCheck.h>
+#   include <xrpl/tx/transactors/Check/CashCheck.h>
 #endif
 TRANSACTION(ttCHECK_CASH, 17, CheckCash,
     Delegation::delegatable,
@@ -252,7 +252,7 @@ TRANSACTION(ttCHECK_CASH, 17, CheckCash,
 
 /** This transaction type cancels an existing check. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/CancelCheck.h>
+#   include <xrpl/tx/transactors/Check/CancelCheck.h>
 #endif
 TRANSACTION(ttCHECK_CANCEL, 18, CheckCancel,
     Delegation::delegatable,
@@ -264,7 +264,7 @@ TRANSACTION(ttCHECK_CANCEL, 18, CheckCancel,
 
 /** This transaction type grants or revokes authorization to transfer funds. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/DepositPreauth.h>
+#   include <xrpl/tx/transactors/DepositPreauth.h>
 #endif
 TRANSACTION(ttDEPOSIT_PREAUTH, 19, DepositPreauth,
     Delegation::delegatable,
@@ -279,7 +279,7 @@ TRANSACTION(ttDEPOSIT_PREAUTH, 19, DepositPreauth,
 
 /** This transaction type modifies a trustline between two accounts. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/SetTrust.h>
+#   include <xrpl/tx/transactors/SetTrust.h>
 #endif
 TRANSACTION(ttTRUST_SET, 20, TrustSet,
     Delegation::delegatable,
@@ -293,7 +293,7 @@ TRANSACTION(ttTRUST_SET, 20, TrustSet,
 
 /** This transaction type deletes an existing account. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/DeleteAccount.h>
+#   include <xrpl/tx/transactors/DeleteAccount.h>
 #endif
 TRANSACTION(ttACCOUNT_DELETE, 21, AccountDelete,
     Delegation::notDelegatable,
@@ -309,7 +309,7 @@ TRANSACTION(ttACCOUNT_DELETE, 21, AccountDelete,
 
 /** This transaction mints a new NFT. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/NFTokenMint.h>
+#   include <xrpl/tx/transactors/NFT/NFTokenMint.h>
 #endif
 TRANSACTION(ttNFTOKEN_MINT, 25, NFTokenMint,
     Delegation::delegatable,
@@ -327,7 +327,7 @@ TRANSACTION(ttNFTOKEN_MINT, 25, NFTokenMint,
 
 /** This transaction burns (i.e. destroys) an existing NFT. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/NFTokenBurn.h>
+#   include <xrpl/tx/transactors/NFT/NFTokenBurn.h>
 #endif
 TRANSACTION(ttNFTOKEN_BURN, 26, NFTokenBurn,
     Delegation::delegatable,
@@ -340,7 +340,7 @@ TRANSACTION(ttNFTOKEN_BURN, 26, NFTokenBurn,
 
 /** This transaction creates a new offer to buy or sell an NFT. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/NFTokenCreateOffer.h>
+#   include <xrpl/tx/transactors/NFT/NFTokenCreateOffer.h>
 #endif
 TRANSACTION(ttNFTOKEN_CREATE_OFFER, 27, NFTokenCreateOffer,
     Delegation::delegatable,
@@ -356,7 +356,7 @@ TRANSACTION(ttNFTOKEN_CREATE_OFFER, 27, NFTokenCreateOffer,
 
 /** This transaction cancels an existing offer to buy or sell an existing NFT. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/NFTokenCancelOffer.h>
+#   include <xrpl/tx/transactors/NFT/NFTokenCancelOffer.h>
 #endif
 TRANSACTION(ttNFTOKEN_CANCEL_OFFER, 28, NFTokenCancelOffer,
     Delegation::delegatable,
@@ -368,7 +368,7 @@ TRANSACTION(ttNFTOKEN_CANCEL_OFFER, 28, NFTokenCancelOffer,
 
 /** This transaction accepts an existing offer to buy or sell an existing  NFT. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/NFTokenAcceptOffer.h>
+#   include <xrpl/tx/transactors/NFT/NFTokenAcceptOffer.h>
 #endif
 TRANSACTION(ttNFTOKEN_ACCEPT_OFFER, 29, NFTokenAcceptOffer,
     Delegation::delegatable,
@@ -382,7 +382,7 @@ TRANSACTION(ttNFTOKEN_ACCEPT_OFFER, 29, NFTokenAcceptOffer,
 
 /** This transaction claws back issued tokens. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/Clawback.h>
+#   include <xrpl/tx/transactors/Clawback.h>
 #endif
 TRANSACTION(ttCLAWBACK, 30, Clawback,
     Delegation::delegatable,
@@ -395,7 +395,7 @@ TRANSACTION(ttCLAWBACK, 30, Clawback,
 
 /** This transaction claws back tokens from an AMM pool. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/AMMClawback.h>
+#   include <xrpl/tx/transactors/AMM/AMMClawback.h>
 #endif
 TRANSACTION(ttAMM_CLAWBACK, 31, AMMClawback,
     Delegation::delegatable,
@@ -410,7 +410,7 @@ TRANSACTION(ttAMM_CLAWBACK, 31, AMMClawback,
 
 /** This transaction type creates an AMM instance */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/AMMCreate.h>
+#   include <xrpl/tx/transactors/AMM/AMMCreate.h>
 #endif
 TRANSACTION(ttAMM_CREATE, 35, AMMCreate,
     Delegation::delegatable,
@@ -424,7 +424,7 @@ TRANSACTION(ttAMM_CREATE, 35, AMMCreate,
 
 /** This transaction type deposits into an AMM instance */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/AMMDeposit.h>
+#   include <xrpl/tx/transactors/AMM/AMMDeposit.h>
 #endif
 TRANSACTION(ttAMM_DEPOSIT, 36, AMMDeposit,
     Delegation::delegatable,
@@ -442,7 +442,7 @@ TRANSACTION(ttAMM_DEPOSIT, 36, AMMDeposit,
 
 /** This transaction type withdraws from an AMM instance */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/AMMWithdraw.h>
+#   include <xrpl/tx/transactors/AMM/AMMWithdraw.h>
 #endif
 TRANSACTION(ttAMM_WITHDRAW, 37, AMMWithdraw,
     Delegation::delegatable,
@@ -459,7 +459,7 @@ TRANSACTION(ttAMM_WITHDRAW, 37, AMMWithdraw,
 
 /** This transaction type votes for the trading fee */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/AMMVote.h>
+#   include <xrpl/tx/transactors/AMM/AMMVote.h>
 #endif
 TRANSACTION(ttAMM_VOTE, 38, AMMVote,
     Delegation::delegatable,
@@ -473,7 +473,7 @@ TRANSACTION(ttAMM_VOTE, 38, AMMVote,
 
 /** This transaction type bids for the auction slot */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/AMMBid.h>
+#   include <xrpl/tx/transactors/AMM/AMMBid.h>
 #endif
 TRANSACTION(ttAMM_BID, 39, AMMBid,
     Delegation::delegatable,
@@ -489,7 +489,7 @@ TRANSACTION(ttAMM_BID, 39, AMMBid,
 
 /** This transaction type deletes AMM in the empty state */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/AMMDelete.h>
+#   include <xrpl/tx/transactors/AMM/AMMDelete.h>
 #endif
 TRANSACTION(ttAMM_DELETE, 40, AMMDelete,
     Delegation::delegatable,
@@ -502,7 +502,7 @@ TRANSACTION(ttAMM_DELETE, 40, AMMDelete,
 
 /** This transactions creates a crosschain sequence number */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/XChainBridge.h>
+#   include <xrpl/tx/transactors/XChainBridge.h>
 #endif
 TRANSACTION(ttXCHAIN_CREATE_CLAIM_ID, 41, XChainCreateClaimID,
     Delegation::delegatable,
@@ -617,7 +617,7 @@ TRANSACTION(ttXCHAIN_CREATE_BRIDGE, 48, XChainCreateBridge,
 
 /** This transaction type creates or updates a DID */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/DID.h>
+#   include <xrpl/tx/transactors/DID.h>
 #endif
 TRANSACTION(ttDID_SET, 49, DIDSet,
     Delegation::delegatable,
@@ -638,7 +638,7 @@ TRANSACTION(ttDID_DELETE, 50, DIDDelete,
 
 /** This transaction type creates an Oracle instance */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/SetOracle.h>
+#   include <xrpl/tx/transactors/SetOracle.h>
 #endif
 TRANSACTION(ttORACLE_SET, 51, OracleSet,
     Delegation::delegatable,
@@ -655,7 +655,7 @@ TRANSACTION(ttORACLE_SET, 51, OracleSet,
 
 /** This transaction type deletes an Oracle instance */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/DeleteOracle.h>
+#   include <xrpl/tx/transactors/DeleteOracle.h>
 #endif
 TRANSACTION(ttORACLE_DELETE, 52, OracleDelete,
     Delegation::delegatable,
@@ -667,7 +667,7 @@ TRANSACTION(ttORACLE_DELETE, 52, OracleDelete,
 
 /** This transaction type fixes a problem in the ledger state */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/LedgerStateFix.h>
+#   include <xrpl/tx/transactors/LedgerStateFix.h>
 #endif
 TRANSACTION(ttLEDGER_STATE_FIX, 53, LedgerStateFix,
     Delegation::delegatable,
@@ -680,7 +680,7 @@ TRANSACTION(ttLEDGER_STATE_FIX, 53, LedgerStateFix,
 
 /** This transaction type creates a MPTokensIssuance instance */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/MPTokenIssuanceCreate.h>
+#   include <xrpl/tx/transactors/MPT/MPTokenIssuanceCreate.h>
 #endif
 TRANSACTION(ttMPTOKEN_ISSUANCE_CREATE, 54, MPTokenIssuanceCreate,
     Delegation::delegatable,
@@ -697,7 +697,7 @@ TRANSACTION(ttMPTOKEN_ISSUANCE_CREATE, 54, MPTokenIssuanceCreate,
 
 /** This transaction type destroys a MPTokensIssuance instance */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/MPTokenIssuanceDestroy.h>
+#   include <xrpl/tx/transactors/MPT/MPTokenIssuanceDestroy.h>
 #endif
 TRANSACTION(ttMPTOKEN_ISSUANCE_DESTROY, 55, MPTokenIssuanceDestroy,
     Delegation::delegatable,
@@ -709,7 +709,7 @@ TRANSACTION(ttMPTOKEN_ISSUANCE_DESTROY, 55, MPTokenIssuanceDestroy,
 
 /** This transaction type sets flags on a MPTokensIssuance or MPToken instance */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/MPTokenIssuanceSet.h>
+#   include <xrpl/tx/transactors/MPT/MPTokenIssuanceSet.h>
 #endif
 TRANSACTION(ttMPTOKEN_ISSUANCE_SET, 56, MPTokenIssuanceSet,
     Delegation::delegatable,
@@ -726,7 +726,7 @@ TRANSACTION(ttMPTOKEN_ISSUANCE_SET, 56, MPTokenIssuanceSet,
 
 /** This transaction type authorizes a MPToken instance */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/MPTokenAuthorize.h>
+#   include <xrpl/tx/transactors/MPT/MPTokenAuthorize.h>
 #endif
 TRANSACTION(ttMPTOKEN_AUTHORIZE, 57, MPTokenAuthorize,
     Delegation::delegatable,
@@ -739,7 +739,7 @@ TRANSACTION(ttMPTOKEN_AUTHORIZE, 57, MPTokenAuthorize,
 
 /** This transaction type create an Credential instance */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/Credentials.h>
+#   include <xrpl/tx/transactors/Credentials.h>
 #endif
 TRANSACTION(ttCREDENTIAL_CREATE, 58, CredentialCreate,
     Delegation::delegatable,
@@ -775,7 +775,7 @@ TRANSACTION(ttCREDENTIAL_DELETE, 60, CredentialDelete,
 
 /** This transaction type modify a NFToken */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/NFTokenModify.h>
+#   include <xrpl/tx/transactors/NFT/NFTokenModify.h>
 #endif
 TRANSACTION(ttNFTOKEN_MODIFY, 61, NFTokenModify,
     Delegation::delegatable,
@@ -789,7 +789,7 @@ TRANSACTION(ttNFTOKEN_MODIFY, 61, NFTokenModify,
 
 /** This transaction type creates or modifies a Permissioned Domain */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/PermissionedDomainSet.h>
+#   include <xrpl/tx/transactors/PermissionedDomain/PermissionedDomainSet.h>
 #endif
 TRANSACTION(ttPERMISSIONED_DOMAIN_SET, 62, PermissionedDomainSet,
     Delegation::delegatable,
@@ -802,7 +802,7 @@ TRANSACTION(ttPERMISSIONED_DOMAIN_SET, 62, PermissionedDomainSet,
 
 /** This transaction type deletes a Permissioned Domain */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/PermissionedDomainDelete.h>
+#   include <xrpl/tx/transactors/PermissionedDomain/PermissionedDomainDelete.h>
 #endif
 TRANSACTION(ttPERMISSIONED_DOMAIN_DELETE, 63, PermissionedDomainDelete,
     Delegation::delegatable,
@@ -814,7 +814,7 @@ TRANSACTION(ttPERMISSIONED_DOMAIN_DELETE, 63, PermissionedDomainDelete,
 
 /** This transaction type delegates authorized account specified permissions */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/DelegateSet.h>
+#   include <xrpl/tx/transactors/Delegate/DelegateSet.h>
 #endif
 TRANSACTION(ttDELEGATE_SET, 64, DelegateSet,
     Delegation::notDelegatable,
@@ -827,7 +827,7 @@ TRANSACTION(ttDELEGATE_SET, 64, DelegateSet,
 
 /** This transaction creates a single asset vault. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/VaultCreate.h>
+#   include <xrpl/tx/transactors/Vault/VaultCreate.h>
 #endif
 TRANSACTION(ttVAULT_CREATE, 65, VaultCreate,
     Delegation::delegatable,
@@ -845,7 +845,7 @@ TRANSACTION(ttVAULT_CREATE, 65, VaultCreate,
 
 /** This transaction updates a single asset vault. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/VaultSet.h>
+#   include <xrpl/tx/transactors/Vault/VaultSet.h>
 #endif
 TRANSACTION(ttVAULT_SET, 66, VaultSet,
     Delegation::delegatable,
@@ -860,7 +860,7 @@ TRANSACTION(ttVAULT_SET, 66, VaultSet,
 
 /** This transaction deletes a single asset vault. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/VaultDelete.h>
+#   include <xrpl/tx/transactors/Vault/VaultDelete.h>
 #endif
 TRANSACTION(ttVAULT_DELETE, 67, VaultDelete,
     Delegation::delegatable,
@@ -872,7 +872,7 @@ TRANSACTION(ttVAULT_DELETE, 67, VaultDelete,
 
 /** This transaction trades assets for shares with a vault. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/VaultDeposit.h>
+#   include <xrpl/tx/transactors/Vault/VaultDeposit.h>
 #endif
 TRANSACTION(ttVAULT_DEPOSIT, 68, VaultDeposit,
     Delegation::delegatable,
@@ -885,7 +885,7 @@ TRANSACTION(ttVAULT_DEPOSIT, 68, VaultDeposit,
 
 /** This transaction trades shares for assets with a vault. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/VaultWithdraw.h>
+#   include <xrpl/tx/transactors/Vault/VaultWithdraw.h>
 #endif
 TRANSACTION(ttVAULT_WITHDRAW, 69, VaultWithdraw,
     Delegation::delegatable,
@@ -900,7 +900,7 @@ TRANSACTION(ttVAULT_WITHDRAW, 69, VaultWithdraw,
 
 /** This transaction claws back tokens from a vault. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/VaultClawback.h>
+#   include <xrpl/tx/transactors/Vault/VaultClawback.h>
 #endif
 TRANSACTION(ttVAULT_CLAWBACK, 70, VaultClawback,
     Delegation::delegatable,
@@ -914,7 +914,7 @@ TRANSACTION(ttVAULT_CLAWBACK, 70, VaultClawback,
 
 /** This transaction type batches together transactions. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/Batch.h>
+#   include <xrpl/tx/transactors/Batch.h>
 #endif
 TRANSACTION(ttBATCH, 71, Batch,
     Delegation::notDelegatable,
@@ -929,7 +929,7 @@ TRANSACTION(ttBATCH, 71, Batch,
 
 /** This transaction creates and updates a Loan Broker */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/LoanBrokerSet.h>
+#   include <xrpl/tx/transactors/Lending/LoanBrokerSet.h>
 #endif
 TRANSACTION(ttLOAN_BROKER_SET, 74, LoanBrokerSet,
     Delegation::delegatable,
@@ -946,7 +946,7 @@ TRANSACTION(ttLOAN_BROKER_SET, 74, LoanBrokerSet,
 
 /** This transaction deletes a Loan Broker */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/LoanBrokerDelete.h>
+#   include <xrpl/tx/transactors/Lending/LoanBrokerDelete.h>
 #endif
 TRANSACTION(ttLOAN_BROKER_DELETE, 75, LoanBrokerDelete,
     Delegation::delegatable,
@@ -957,7 +957,7 @@ TRANSACTION(ttLOAN_BROKER_DELETE, 75, LoanBrokerDelete,
 
 /** This transaction deposits First Loss Capital into a Loan Broker */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/LoanBrokerCoverDeposit.h>
+#   include <xrpl/tx/transactors/Lending/LoanBrokerCoverDeposit.h>
 #endif
 TRANSACTION(ttLOAN_BROKER_COVER_DEPOSIT, 76, LoanBrokerCoverDeposit,
     Delegation::delegatable,
@@ -969,7 +969,7 @@ TRANSACTION(ttLOAN_BROKER_COVER_DEPOSIT, 76, LoanBrokerCoverDeposit,
 
 /** This transaction withdraws First Loss Capital from a Loan Broker */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/LoanBrokerCoverWithdraw.h>
+#   include <xrpl/tx/transactors/Lending/LoanBrokerCoverWithdraw.h>
 #endif
 TRANSACTION(ttLOAN_BROKER_COVER_WITHDRAW, 77, LoanBrokerCoverWithdraw,
     Delegation::delegatable,
@@ -984,7 +984,7 @@ TRANSACTION(ttLOAN_BROKER_COVER_WITHDRAW, 77, LoanBrokerCoverWithdraw,
 /** This transaction claws back First Loss Capital from a Loan Broker to
     the issuer of the capital */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/LoanBrokerCoverClawback.h>
+#   include <xrpl/tx/transactors/Lending/LoanBrokerCoverClawback.h>
 #endif
 TRANSACTION(ttLOAN_BROKER_COVER_CLAWBACK, 78, LoanBrokerCoverClawback,
     Delegation::delegatable,
@@ -996,7 +996,7 @@ TRANSACTION(ttLOAN_BROKER_COVER_CLAWBACK, 78, LoanBrokerCoverClawback,
 
 /** This transaction creates a Loan */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/LoanSet.h>
+#   include <xrpl/tx/transactors/Lending/LoanSet.h>
 #endif
 TRANSACTION(ttLOAN_SET, 80, LoanSet,
     Delegation::delegatable,
@@ -1023,7 +1023,7 @@ TRANSACTION(ttLOAN_SET, 80, LoanSet,
 
 /** This transaction deletes an existing Loan */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/LoanDelete.h>
+#   include <xrpl/tx/transactors/Lending/LoanDelete.h>
 #endif
 TRANSACTION(ttLOAN_DELETE, 81, LoanDelete,
     Delegation::delegatable,
@@ -1034,7 +1034,7 @@ TRANSACTION(ttLOAN_DELETE, 81, LoanDelete,
 
 /** This transaction is used to change the delinquency status of an existing Loan */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/LoanManage.h>
+#   include <xrpl/tx/transactors/Lending/LoanManage.h>
 #endif
 TRANSACTION(ttLOAN_MANAGE, 82, LoanManage,
     Delegation::delegatable,
@@ -1048,7 +1048,7 @@ TRANSACTION(ttLOAN_MANAGE, 82, LoanManage,
 
 /** The Borrower uses this transaction to make a Payment on the Loan. */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/LoanPay.h>
+#   include <xrpl/tx/transactors/Lending/LoanPay.h>
 #endif
 TRANSACTION(ttLOAN_PAY, 84, LoanPay,
     Delegation::delegatable,
@@ -1063,7 +1063,7 @@ TRANSACTION(ttLOAN_PAY, 84, LoanPay,
     For details, see: https://xrpl.org/amendments.html
  */
 #if TRANSACTION_INCLUDE
-#   include <xrpld/app/tx/detail/Change.h>
+#   include <xrpl/tx/transactors/Change.h>
 #endif
 TRANSACTION(ttAMENDMENT, 100, EnableAmendment,
     Delegation::notDelegatable,

include/xrpl/rdb/DatabaseCon.h

@@ -1,11 +1,10 @@
 #ifndef XRPL_APP_DATA_DATABASECON_H_INCLUDED
 #define XRPL_APP_DATA_DATABASECON_H_INCLUDED
 
-#include <xrpld/app/main/DBInit.h>
-#include <xrpld/core/Config.h>
-#include <xrpld/core/SociDB.h>
-
 #include <xrpl/core/PerfLog.h>
+#include <xrpl/core/StartUpType.h>
+#include <xrpl/rdb/DBInit.h>
+#include <xrpl/rdb/SociDB.h>
 
 #include <boost/filesystem/path.hpp>
 
@@ -71,7 +70,7 @@ public:
     {
         explicit Setup() = default;
 
-        Config::StartUpType startUp = Config::NORMAL;
+        StartUpType startUp = StartUpType::NORMAL;
         bool standAlone = false;
         boost::filesystem::path dataDir;
         // Indicates whether or not to return the `globalPragma`
@@ -109,9 +108,9 @@ public:
         beast::Journal journal)
         // Use temporary files or regular DB files?
         : DatabaseCon(
-              setup.standAlone && setup.startUp != Config::LOAD &&
-                      setup.startUp != Config::LOAD_FILE &&
-                      setup.startUp != Config::REPLAY
+              setup.standAlone && setup.startUp != StartUpType::LOAD &&
+                      setup.startUp != StartUpType::LOAD_FILE &&
+                      setup.startUp != StartUpType::REPLAY
                   ? ""
                   : (setup.dataDir / dbName),
               setup.commonPragma(),
@@ -237,11 +236,6 @@ private:
 std::shared_ptr<Checkpointer>
 checkpointerFromId(std::uintptr_t id);
 
-DatabaseCon::Setup
-setup_DatabaseCon(
-    Config const& c,
-    std::optional<beast::Journal> j = std::nullopt);
-
 }  // namespace xrpl
 
 #endif

include/xrpl/rdb/RelationalDatabase.h

@@ -0,0 +1,483 @@
+#ifndef XRPL_APP_RDB_RELATIONALDATABASE_H_INCLUDED
+#define XRPL_APP_RDB_RELATIONALDATABASE_H_INCLUDED
+
+#include <xrpld/app/misc/Transaction.h>
+#include <xrpld/core/Config.h>
+
+#include <xrpl/beast/utility/instrumentation.h>
+#include <xrpl/core/ServiceRegistry.h>
+#include <xrpl/protocol/LedgerShortcut.h>
+#include <xrpl/rdb/DatabaseCon.h>
+
+#include <boost/filesystem.hpp>
+#include <boost/variant.hpp>
+
+namespace xrpl {
+
+struct LedgerHashPair
+{
+    uint256 ledgerHash;
+    uint256 parentHash;
+};
+
+struct LedgerRange
+{
+    uint32_t min;
+    uint32_t max;
+};
+
+class RelationalDatabase
+{
+public:
+    struct CountMinMax
+    {
+        std::size_t numberOfRows;
+        LedgerIndex minLedgerSequence;
+        LedgerIndex maxLedgerSequence;
+    };
+
+    struct AccountTxMarker
+    {
+        std::uint32_t ledgerSeq = 0;
+        std::uint32_t txnSeq = 0;
+    };
+
+    struct AccountTxOptions
+    {
+        AccountID const& account;
+        std::uint32_t minLedger;
+        std::uint32_t maxLedger;
+        std::uint32_t offset;
+        std::uint32_t limit;
+        bool bUnlimited;
+    };
+
+    struct AccountTxPageOptions
+    {
+        AccountID const& account;
+        std::uint32_t minLedger;
+        std::uint32_t maxLedger;
+        std::optional<AccountTxMarker> marker;
+        std::uint32_t limit;
+        bool bAdmin;
+    };
+
+    using AccountTx =
+        std::pair<std::shared_ptr<Transaction>, std::shared_ptr<TxMeta>>;
+    using AccountTxs = std::vector<AccountTx>;
+    using txnMetaLedgerType = std::tuple<Blob, Blob, std::uint32_t>;
+    using MetaTxsList = std::vector<txnMetaLedgerType>;
+
+    using LedgerSequence = uint32_t;
+    using LedgerHash = uint256;
+    using LedgerSpecifier =
+        std::variant<LedgerRange, LedgerShortcut, LedgerSequence, LedgerHash>;
+
+    struct AccountTxArgs
+    {
+        AccountID account;
+        std::optional<LedgerSpecifier> ledger;
+        bool binary = false;
+        bool forward = false;
+        uint32_t limit = 0;
+        std::optional<AccountTxMarker> marker;
+    };
+
+    struct AccountTxResult
+    {
+        std::variant<AccountTxs, MetaTxsList> transactions;
+        LedgerRange ledgerRange;
+        uint32_t limit;
+        std::optional<AccountTxMarker> marker;
+    };
+
+    virtual ~RelationalDatabase() = default;
+
+    /**
+     * @brief getMinLedgerSeq Returns the minimum ledger sequence in the Ledgers
+     *        table.
+     * @return Ledger sequence or no value if no ledgers exist.
+     */
+    virtual std::optional<LedgerIndex>
+    getMinLedgerSeq() = 0;
+
+    /**
+     * @brief getMaxLedgerSeq Returns the maximum ledger sequence in the Ledgers
+     *        table.
+     * @return Ledger sequence or none if no ledgers exist.
+     */
+    virtual std::optional<LedgerIndex>
+    getMaxLedgerSeq() = 0;
+
+    /**
+     * @brief getLedgerInfoByIndex Returns a ledger by its sequence.
+     * @param ledgerSeq Ledger sequence.
+     * @return The ledger if found, otherwise no value.
+     */
+    virtual std::optional<LedgerHeader>
+    getLedgerInfoByIndex(LedgerIndex ledgerSeq) = 0;
+
+    /**
+     * @brief getNewestLedgerInfo Returns the info of the newest saved ledger.
+     * @return Ledger info if found, otherwise no value.
+     */
+    virtual std::optional<LedgerHeader>
+    getNewestLedgerInfo() = 0;
+
+    /**
+     * @brief getLedgerInfoByHash Returns the info of the ledger with given
+     *        hash.
+     * @param ledgerHash Hash of the ledger.
+     * @return Ledger if found, otherwise no value.
+     */
+    virtual std::optional<LedgerHeader>
+    getLedgerInfoByHash(uint256 const& ledgerHash) = 0;
+
+    /**
+     * @brief getHashByIndex Returns the hash of the ledger with the given
+     *        sequence.
+     * @param ledgerIndex Ledger sequence.
+     * @return Hash of the ledger.
+     */
+    virtual uint256
+    getHashByIndex(LedgerIndex ledgerIndex) = 0;
+
+    /**
+     * @brief getHashesByIndex Returns the hashes of the ledger and its parent
+     *        as specified by the ledgerIndex.
+     * @param ledgerIndex Ledger sequence.
+     * @return Struct LedgerHashPair which contains hashes of the ledger and
+     *         its parent.
+     */
+    virtual std::optional<LedgerHashPair>
+    getHashesByIndex(LedgerIndex ledgerIndex) = 0;
+
+    /**
+     * @brief getHashesByIndex Returns hashes of each ledger and its parent for
+     *        all ledgers within the provided range.
+     * @param minSeq Minimum ledger sequence.
+     * @param maxSeq Maximum ledger sequence.
+     * @return Container that maps the sequence number of a found ledger to the
+     *         struct LedgerHashPair which contains the hashes of the ledger and
+     *         its parent.
+     */
+    virtual std::map<LedgerIndex, LedgerHashPair>
+    getHashesByIndex(LedgerIndex minSeq, LedgerIndex maxSeq) = 0;
+
+    /**
+     * @brief getTxHistory Returns the 20 most recent transactions starting from
+     *        the given number.
+     * @param startIndex First number of returned entry.
+     * @return Vector of shared pointers to transactions sorted in
+     *         descending order by ledger sequence.
+     */
+    virtual std::vector<std::shared_ptr<Transaction>>
+    getTxHistory(LedgerIndex startIndex) = 0;
+
+    /**
+     * @brief getTransactionsMinLedgerSeq Returns the minimum ledger sequence
+     *        stored in the Transactions table.
+     * @return Ledger sequence or no value if no ledgers exist.
+     */
+    virtual std::optional<LedgerIndex>
+    getTransactionsMinLedgerSeq() = 0;
+
+    /**
+     * @brief getAccountTransactionsMinLedgerSeq Returns the minimum ledger
+     *        sequence stored in the AccountTransactions table.
+     * @return Ledger sequence or no value if no ledgers exist.
+     */
+    virtual std::optional<LedgerIndex>
+    getAccountTransactionsMinLedgerSeq() = 0;
+
+    /**
+     * @brief deleteTransactionByLedgerSeq Deletes transactions from the ledger
+     *        with the given sequence.
+     * @param ledgerSeq Ledger sequence.
+     */
+    virtual void
+    deleteTransactionByLedgerSeq(LedgerIndex ledgerSeq) = 0;
+
+    /**
+     * @brief deleteBeforeLedgerSeq Deletes all ledgers with a sequence number
+     *        less than or equal to the given ledger sequence.
+     * @param ledgerSeq Ledger sequence.
+     */
+    virtual void
+    deleteBeforeLedgerSeq(LedgerIndex ledgerSeq) = 0;
+
+    /**
+     * @brief deleteTransactionsBeforeLedgerSeq Deletes all transactions with
+     *        a sequence number less than or equal to the given ledger
+     *        sequence.
+     * @param ledgerSeq Ledger sequence.
+     */
+    virtual void
+    deleteTransactionsBeforeLedgerSeq(LedgerIndex ledgerSeq) = 0;
+
+    /**
+     * @brief deleteAccountTransactionsBeforeLedgerSeq Deletes all account
+     *        transactions with a sequence number less than or equal to the
+     *        given ledger sequence.
+     * @param ledgerSeq Ledger sequence.
+     */
+    virtual void
+    deleteAccountTransactionsBeforeLedgerSeq(LedgerIndex ledgerSeq) = 0;
+
+    /**
+     * @brief getTransactionCount Returns the number of transactions.
+     * @return Number of transactions.
+     */
+    virtual std::size_t
+    getTransactionCount() = 0;
+
+    /**
+     * @brief getAccountTransactionCount Returns the number of account
+     *        transactions.
+     * @return Number of account transactions.
+     */
+    virtual std::size_t
+    getAccountTransactionCount() = 0;
+
+    /**
+     * @brief getLedgerCountMinMax Returns the minimum ledger sequence,
+     *        maximum ledger sequence and total number of saved ledgers.
+     * @return Struct CountMinMax which contains the minimum sequence,
+     *         maximum sequence and number of ledgers.
+     */
+    virtual struct CountMinMax
+    getLedgerCountMinMax() = 0;
+
+    /**
+     * @brief saveValidatedLedger Saves a ledger into the database.
+     * @param ledger The ledger.
+     * @param current True if the ledger is current.
+     * @return True if saving was successful.
+     */
+    virtual bool
+    saveValidatedLedger(
+        std::shared_ptr<Ledger const> const& ledger,
+        bool current) = 0;
+
+    /**
+     * @brief getLimitedOldestLedgerInfo Returns the info of the oldest ledger
+     *        whose sequence number is greater than or equal to the given
+     *        sequence number.
+     * @param ledgerFirstIndex Minimum ledger sequence.
+     * @return Ledger info if found, otherwise no value.
+     */
+    virtual std::optional<LedgerHeader>
+    getLimitedOldestLedgerInfo(LedgerIndex ledgerFirstIndex) = 0;
+
+    /**
+     * @brief getLimitedNewestLedgerInfo Returns the info of the newest ledger
+     *        whose sequence number is greater than or equal to the given
+     *        sequence number.
+     * @param ledgerFirstIndex Minimum ledger sequence.
+     * @return Ledger info if found, otherwise no value.
+     */
+    virtual std::optional<LedgerHeader>
+    getLimitedNewestLedgerInfo(LedgerIndex ledgerFirstIndex) = 0;
+
+    /**
+     * @brief getOldestAccountTxs Returns the oldest transactions for the
+     *        account that matches the given criteria starting from the provided
+     *        offset.
+     * @param options Struct AccountTxOptions which contains the criteria to
+     *        match: the account, ledger search range, the offset of the first
+     *        entry to return, the number of transactions to return, a flag if
+     *        this number is unlimited.
+     * @return Vector of pairs of found transactions and their metadata
+     *         sorted in ascending order by account sequence.
+     */
+    virtual AccountTxs
+    getOldestAccountTxs(AccountTxOptions const& options) = 0;
+
+    /**
+     * @brief getNewestAccountTxs Returns the newest transactions for the
+     *        account that matches the given criteria starting from the provided
+     *        offset.
+     * @param options Struct AccountTxOptions which contains the criteria to
+     *        match: the account, the ledger search range, the offset of  the
+     *        first entry to return, the number of transactions to return, a
+     *        flag if this number unlimited.
+     * @return Vector of pairs of found transactions and their metadata
+     *         sorted in descending order by account sequence.
+     */
+    virtual AccountTxs
+    getNewestAccountTxs(AccountTxOptions const& options) = 0;
+
+    /**
+     * @brief getOldestAccountTxsB Returns the oldest transactions in binary
+     *        form for the account that matches the given criteria starting from
+     *        the provided offset.
+     * @param options Struct AccountTxOptions which contains the criteria to
+     *        match: the account, the ledger search range, the offset of the
+     *        first entry to return, the number of transactions to return, a
+     *        flag if this number unlimited.
+     * @return Vector of tuples of found transactions, their metadata and
+     *         account sequences sorted in ascending order by account sequence.
+     */
+    virtual MetaTxsList
+    getOldestAccountTxsB(AccountTxOptions const& options) = 0;
+
+    /**
+     * @brief getNewestAccountTxsB Returns the newest transactions in binary
+     *        form for the account that matches the given criteria starting from
+     *        the provided offset.
+     * @param options Struct AccountTxOptions which contains the criteria to
+     *        match: the account, the ledger search range, the offset of the
+     *        first entry to return, the number of transactions to return, a
+     *        flag if this number is unlimited.
+     * @return Vector of tuples of found transactions, their metadata and
+     *         account sequences sorted in descending order by account
+     *         sequence.
+     */
+    virtual MetaTxsList
+    getNewestAccountTxsB(AccountTxOptions const& options) = 0;
+
+    /**
+     * @brief oldestAccountTxPage Returns the oldest transactions for the
+     *        account that matches the given criteria starting from the
+     *        provided marker.
+     * @param options Struct AccountTxPageOptions which contains the criteria to
+     *        match: the account, the ledger search range, the marker of first
+     *        returned entry, the number of transactions to return, a flag if
+     *        this number is unlimited.
+     * @return Vector of pairs of found transactions and their metadata
+     *         sorted in ascending order by account sequence and a marker
+     *         for the next search if the search was not finished.
+     */
+    virtual std::pair<AccountTxs, std::optional<AccountTxMarker>>
+    oldestAccountTxPage(AccountTxPageOptions const& options) = 0;
+
+    /**
+     * @brief newestAccountTxPage Returns the newest transactions for the
+     *        account that matches the given criteria starting from the provided
+     *        marker.
+     * @param options Struct AccountTxPageOptions which contains the criteria to
+     *        match: the account, the ledger search range, the marker of the
+     *        first returned entry, the number of transactions to return, a flag
+     *        if this number unlimited.
+     * @return Vector of pairs of found transactions and their metadata
+     *         sorted in descending order by account sequence and a marker
+     *         for the next search if the search was not finished.
+     */
+    virtual std::pair<AccountTxs, std::optional<AccountTxMarker>>
+    newestAccountTxPage(AccountTxPageOptions const& options) = 0;
+
+    /**
+     * @brief oldestAccountTxPageB Returns the oldest transactions in binary
+     *        form for the account that matches the given criteria starting from
+     *        the provided marker.
+     * @param options Struct AccountTxPageOptions which contains criteria to
+     *        match: the account, the ledger search range, the marker of the
+     *        first returned entry, the number of transactions to return, a flag
+     *        if this number unlimited.
+     * @return Vector of tuples of found transactions, their metadata and
+     *         account sequences sorted in ascending order by account
+     *         sequence and a marker for the next search if the search was not
+     *         finished.
+     */
+    virtual std::pair<MetaTxsList, std::optional<AccountTxMarker>>
+    oldestAccountTxPageB(AccountTxPageOptions const& options) = 0;
+
+    /**
+     * @brief newestAccountTxPageB Returns the newest transactions in binary
+     *        form for the account that matches the given criteria starting from
+     *        the provided marker.
+     * @param options Struct AccountTxPageOptions which contains the criteria to
+     *        match: the account, the ledger search range, the marker of the
+     *        first returned entry, the number of transactions to return, a flag
+     *        if this number is unlimited.
+     * @return Vector of tuples of found transactions, their metadata and
+     *         account sequences sorted in descending order by account
+     *         sequence and a marker for the next search if the search was not
+     *         finished.
+     */
+    virtual std::pair<MetaTxsList, std::optional<AccountTxMarker>>
+    newestAccountTxPageB(AccountTxPageOptions const& options) = 0;
+
+    /**
+     * @brief getTransaction Returns the transaction with the given hash. If a
+     *        range is provided but the transaction is not found, then check if
+     *        all ledgers in the range are present in the database.
+     * @param id Hash of the transaction.
+     * @param range Range of ledgers to check, if present.
+     * @param ec Default error code value.
+     * @return Transaction and its metadata if found, otherwise TxSearched::all
+     *         if a range is provided and all ledgers from the range are present
+     *         in the database, TxSearched::some if a range is provided and not
+     *         all ledgers are present, TxSearched::unknown if the range is not
+     *         provided or a deserializing error occurred. In the last case the
+     *         error code is returned via the ec parameter, in other cases the
+     *         default error code is not changed.
+     */
+    virtual std::variant<AccountTx, TxSearched>
+    getTransaction(
+        uint256 const& id,
+        std::optional<ClosedInterval<uint32_t>> const& range,
+        error_code_i& ec) = 0;
+
+    /**
+     * @brief getKBUsedAll Returns the amount of space used by all databases.
+     * @return Space in kilobytes.
+     */
+    virtual uint32_t
+    getKBUsedAll() = 0;
+
+    /**
+     * @brief getKBUsedLedger Returns the amount of space space used by the
+     *        ledger database.
+     * @return Space in kilobytes.
+     */
+    virtual uint32_t
+    getKBUsedLedger() = 0;
+
+    /**
+     * @brief getKBUsedTransaction Returns the amount of space used by the
+     *        transaction database.
+     * @return Space in kilobytes.
+     */
+    virtual uint32_t
+    getKBUsedTransaction() = 0;
+
+    /**
+     * @brief Closes the ledger database
+     */
+    virtual void
+    closeLedgerDB() = 0;
+
+    /**
+     * @brief Closes the transaction database
+     */
+    virtual void
+    closeTransactionDB() = 0;
+};
+
+template <class T, class C>
+T
+rangeCheckedCast(C c)
+{
+    if ((c > std::numeric_limits<T>::max()) ||
+        (!std::numeric_limits<T>::is_signed && c < 0) ||
+        (std::numeric_limits<T>::is_signed &&
+         std::numeric_limits<C>::is_signed &&
+         c < std::numeric_limits<T>::lowest()))
+    {
+        // This should never happen
+        // LCOV_EXCL_START
+        UNREACHABLE("xrpl::rangeCheckedCast : domain error");
+        JLOG(debugLog().error())
+            << "rangeCheckedCast domain error:"
+            << " value = " << c << " min = " << std::numeric_limits<T>::lowest()
+            << " max: " << std::numeric_limits<T>::max();
+        // LCOV_EXCL_STOP
+    }
+
+    return static_cast<T>(c);
+}
+
+}  // namespace xrpl
+
+#endif

include/xrpl/server/InfoSub.h

@@ -1,13 +1,12 @@
-#ifndef XRPL_NET_INFOSUB_H_INCLUDED
-#define XRPL_NET_INFOSUB_H_INCLUDED
-
-#include <xrpld/app/misc/Manifest.h>
+#ifndef XRPL_SERVER_INFOSUB_H_INCLUDED
+#define XRPL_SERVER_INFOSUB_H_INCLUDED
 
 #include <xrpl/basics/CountedObject.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/Book.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/resource/Consumer.h>
+#include <xrpl/server/Manifest.h>
 
 namespace xrpl {
 
@@ -148,6 +147,7 @@ public:
 
         virtual bool
         subPeerStatus(ref ispListener) = 0;
+
         virtual bool
         unsubPeerStatus(std::uint64_t uListener) = 0;
         virtual void

include/xrpl/server/NetworkOPs.h

@@ -1,14 +1,14 @@
-#ifndef XRPL_APP_MISC_NETWORKOPS_H_INCLUDED
-#define XRPL_APP_MISC_NETWORKOPS_H_INCLUDED
-
-#include <xrpld/app/consensus/RCLCxPeerPos.h>
-#include <xrpld/app/ledger/Ledger.h>
-#include <xrpld/rpc/InfoSub.h>
+#ifndef XRPL_SERVER_NETWORKOPS_H_INCLUDED
+#define XRPL_SERVER_NETWORKOPS_H_INCLUDED
 
 #include <xrpl/core/JobQueue.h>
+#include <xrpl/core/ServiceRegistry.h>
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/protocol/STValidation.h>
+#include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/messages.h>
+#include <xrpl/server/InfoSub.h>
+#include <xrpl/shamap/SHAMap.h>
 
 #include <boost/asio.hpp>
 
@@ -24,6 +24,7 @@ class LedgerMaster;
 class Transaction;
 class ValidatorKeys;
 class CanonicalTXSet;
+class RCLCxPeerPos;
 
 // This is the primary interface into the "client" portion of the program.
 // Code that wants to do normal operations on the network such as
@@ -259,22 +260,6 @@ public:
     stateAccounting(Json::Value& obj) = 0;
 };
 
-//------------------------------------------------------------------------------
-
-std::unique_ptr<NetworkOPs>
-make_NetworkOPs(
-    Application& app,
-    NetworkOPs::clock_type& clock,
-    bool standalone,
-    std::size_t minPeerCount,
-    bool start_valid,
-    JobQueue& job_queue,
-    LedgerMaster& ledgerMaster,
-    ValidatorKeys const& validatorKeys,
-    boost::asio::io_context& io_svc,
-    beast::Journal journal,
-    beast::insight::Collector::ptr const& collector);
-
 }  // namespace xrpl
 
 #endif

include/xrpl/server/State.h

@@ -1,11 +1,9 @@
 #ifndef XRPL_APP_RDB_STATE_H_INCLUDED
 #define XRPL_APP_RDB_STATE_H_INCLUDED
 
-#include <xrpld/app/ledger/Ledger.h>
-#include <xrpld/app/misc/Manifest.h>
-#include <xrpld/core/Config.h>
-#include <xrpld/core/DatabaseCon.h>
-#include <xrpld/peerfinder/detail/Store.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/rdb/DatabaseCon.h>
+#include <xrpl/server/Manifest.h>
 
 #include <boost/filesystem.hpp>
 

include/xrpl/server/Vacuum.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_APP_RDB_VACUUM_H_INCLUDED
 #define XRPL_APP_RDB_VACUUM_H_INCLUDED
 
-#include <xrpld/core/DatabaseCon.h>
+#include <xrpl/rdb/DatabaseCon.h>
 
 namespace xrpl {
 

include/xrpl/server/Wallet.h

@@ -1,10 +1,11 @@
 #ifndef XRPL_APP_RDB_WALLET_H_INCLUDED
 #define XRPL_APP_RDB_WALLET_H_INCLUDED
 
-#include <xrpld/app/misc/Manifest.h>
-#include <xrpld/core/Config.h>
-#include <xrpld/core/DatabaseCon.h>
-#include <xrpld/overlay/PeerReservationTable.h>
+// TODO: We should rename this file
+
+#include <xrpl/core/PeerReservationTable.h>
+#include <xrpl/rdb/DatabaseCon.h>
+#include <xrpl/server/Manifest.h>
 
 namespace xrpl {
 

include/xrpl/tx/ApplyContext.h

@@ -1,10 +1,8 @@
 #ifndef XRPL_TX_APPLYCONTEXT_H_INCLUDED
 #define XRPL_TX_APPLYCONTEXT_H_INCLUDED
 
-#include <xrpld/app/main/Application.h>
-#include <xrpld/core/Config.h>
-
 #include <xrpl/beast/utility/Journal.h>
+#include <xrpl/core/ServiceRegistry.h>
 #include <xrpl/ledger/ApplyViewImpl.h>
 #include <xrpl/protocol/STTx.h>
 #include <xrpl/protocol/XRPAmount.h>
@@ -18,7 +16,7 @@ class ApplyContext
 {
 public:
     explicit ApplyContext(
-        Application& app,
+        ServiceRegistry& registry,
         OpenView& base,
         std::optional<uint256 const> const& parentBatchId,
         STTx const& tx,
@@ -28,7 +26,7 @@ public:
         beast::Journal journal = beast::Journal{beast::Journal::getNullSink()});
 
     explicit ApplyContext(
-        Application& app,
+        ServiceRegistry& registry,
         OpenView& base,
         STTx const& tx,
         TER preclaimResult,
@@ -36,7 +34,7 @@ public:
         ApplyFlags flags,
         beast::Journal journal = beast::Journal{beast::Journal::getNullSink()})
         : ApplyContext(
-              app,
+              registry,
               base,
               std::nullopt,
               tx,
@@ -49,7 +47,7 @@ public:
             (flags & tapBATCH) == 0, "Batch apply flag should not be set");
     }
 
-    Application& app;
+    ServiceRegistry& registry;
     STTx const& tx;
     TER const preclaimResult;
     XRPAmount const baseFee;

include/xrpl/tx/InvariantCheck.h

@@ -1,5 +1,5 @@
-#ifndef XRPL_APP_TX_INVARIANTCHECK_H_INCLUDED
-#define XRPL_APP_TX_INVARIANTCHECK_H_INCLUDED
+#ifndef XRPL_TX_INVARIANTCHECK_H_INCLUDED
+#define XRPL_TX_INVARIANTCHECK_H_INCLUDED
 
 #include <xrpl/basics/Number.h>
 #include <xrpl/basics/base_uint.h>

include/xrpl/tx/SignerEntries.h

@@ -1,12 +1,11 @@
-#ifndef XRPL_TX_IMPL_SIGNER_ENTRIES_H_INCLUDED
-#define XRPL_TX_IMPL_SIGNER_ENTRIES_H_INCLUDED
-
-#include <xrpld/app/tx/detail/Transactor.h>  // NotTEC
+#ifndef XRPL_TX_SIGNERENTRIES_H_INCLUDED
+#define XRPL_TX_SIGNERENTRIES_H_INCLUDED
 
 #include <xrpl/basics/Expected.h>        //
 #include <xrpl/beast/utility/Journal.h>  // beast::Journal
 #include <xrpl/protocol/TER.h>           // temMALFORMED
 #include <xrpl/protocol/UintTypes.h>     // AccountID
+#include <xrpl/tx/Transactor.h>          // NotTEC
 
 #include <optional>
 #include <string_view>

include/xrpl/tx/Transactor.h

@@ -1,13 +1,12 @@
-#ifndef XRPL_APP_TX_TRANSACTOR_H_INCLUDED
-#define XRPL_APP_TX_TRANSACTOR_H_INCLUDED
-
-#include <xrpld/app/tx/applySteps.h>
-#include <xrpld/app/tx/detail/ApplyContext.h>
+#ifndef XRPL_TX_TRANSACTOR_H_INCLUDED
+#define XRPL_TX_TRANSACTOR_H_INCLUDED
 
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/beast/utility/WrappedSink.h>
 #include <xrpl/protocol/Permissions.h>
 #include <xrpl/protocol/XRPAmount.h>
+#include <xrpl/tx/ApplyContext.h>
+#include <xrpl/tx/applySteps.h>
 
 namespace xrpl {
 
@@ -15,7 +14,7 @@ namespace xrpl {
 struct PreflightContext
 {
 public:
-    Application& app;
+    ServiceRegistry& registry;
     STTx const& tx;
     Rules const rules;
     ApplyFlags flags;
@@ -23,13 +22,13 @@ public:
     beast::Journal const j;
 
     PreflightContext(
-        Application& app_,
+        ServiceRegistry& registry_,
         STTx const& tx_,
         uint256 parentBatchId_,
         Rules const& rules_,
         ApplyFlags flags_,
         beast::Journal j_ = beast::Journal{beast::Journal::getNullSink()})
-        : app(app_)
+        : registry(registry_)
         , tx(tx_)
         , rules(rules_)
         , flags(flags_)
@@ -41,12 +40,12 @@ public:
     }
 
     PreflightContext(
-        Application& app_,
+        ServiceRegistry& registry_,
         STTx const& tx_,
         Rules const& rules_,
         ApplyFlags flags_,
         beast::Journal j_ = beast::Journal{beast::Journal::getNullSink()})
-        : app(app_), tx(tx_), rules(rules_), flags(flags_), j(j_)
+        : registry(registry_), tx(tx_), rules(rules_), flags(flags_), j(j_)
     {
         XRPL_ASSERT(
             (flags_ & tapBATCH) == 0, "Batch apply flag should not be set");
@@ -60,7 +59,7 @@ public:
 struct PreclaimContext
 {
 public:
-    Application& app;
+    ServiceRegistry& registry;
     ReadView const& view;
     TER preflightResult;
     ApplyFlags flags;
@@ -69,14 +68,14 @@ public:
     beast::Journal const j;
 
     PreclaimContext(
-        Application& app_,
+        ServiceRegistry& registry_,
         ReadView const& view_,
         TER preflightResult_,
         STTx const& tx_,
         ApplyFlags flags_,
         std::optional<uint256> parentBatchId_,
         beast::Journal j_ = beast::Journal{beast::Journal::getNullSink()})
-        : app(app_)
+        : registry(registry_)
         , view(view_)
         , preflightResult(preflightResult_)
         , flags(flags_)
@@ -90,14 +89,14 @@ public:
     }
 
     PreclaimContext(
-        Application& app_,
+        ServiceRegistry& registry_,
         ReadView const& view_,
         TER preflightResult_,
         STTx const& tx_,
         ApplyFlags flags_,
         beast::Journal j_ = beast::Journal{beast::Journal::getNullSink()})
         : PreclaimContext(
-              app_,
+              registry_,
               view_,
               preflightResult_,
               tx_,
@@ -245,7 +244,7 @@ protected:
     /** Compute the minimum fee required to process a transaction
         with a given baseFee based on the current server load.
 
-        @param app The application hosting the server
+        @param registry The service registry.
         @param baseFee The base fee of a candidate transaction
             @see xrpl::calculateBaseFee
         @param fees Fee settings from the current ledger
@@ -253,7 +252,7 @@ protected:
      */
     static XRPAmount
     minimumFee(
-        Application& app,
+        ServiceRegistry& registry,
         XRPAmount baseFee,
         Fees const& fees,
         ApplyFlags flags);

include/xrpl/tx/apply.h

@@ -1,19 +1,17 @@
 #ifndef XRPL_TX_APPLY_H_INCLUDED
 #define XRPL_TX_APPLY_H_INCLUDED
 
-#include <xrpld/app/tx/applySteps.h>
-#include <xrpld/core/Config.h>
-
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/View.h>
 #include <xrpl/protocol/STTx.h>
+#include <xrpl/tx/applySteps.h>
 
 #include <utility>
 
 namespace xrpl {
 
-class Application;
 class HashRouter;
+class ServiceRegistry;
 
 /** Describes the pre-processing validity of a transaction.
 
@@ -42,11 +40,7 @@ enum class Validity {
     @see Validity
 */
 std::pair<Validity, std::string>
-checkValidity(
-    HashRouter& router,
-    STTx const& tx,
-    Rules const& rules,
-    Config const& config);
+checkValidity(HashRouter& router, STTx const& tx, Rules const& rules);
 
 /** Sets the validity of a given transaction in the cache.
 
@@ -103,7 +97,7 @@ forceValidity(HashRouter& router, uint256 const& txid, Validity validity);
 */
 ApplyResult
 apply(
-    Application& app,
+    ServiceRegistry& registry,
     OpenView& view,
     STTx const& tx,
     ApplyFlags flags,
@@ -131,7 +125,7 @@ enum class ApplyTransactionResult {
 */
 ApplyTransactionResult
 applyTransaction(
-    Application& app,
+    ServiceRegistry& registry,
     OpenView& view,
     STTx const& tx,
     bool retryAssured,

include/xrpl/tx/applySteps.h

@@ -6,7 +6,7 @@
 
 namespace xrpl {
 
-class Application;
+class ServiceRegistry;
 class STTx;
 class TxQ;
 
@@ -245,7 +245,7 @@ public:
 /** @{ */
 PreflightResult
 preflight(
-    Application& app,
+    ServiceRegistry& registry,
     Rules const& rules,
     STTx const& tx,
     ApplyFlags flags,
@@ -253,7 +253,7 @@ preflight(
 
 PreflightResult
 preflight(
-    Application& app,
+    ServiceRegistry& registry,
     Rules const& rules,
     uint256 const& parentBatchId,
     STTx const& tx,
@@ -292,7 +292,7 @@ preflight(
 PreclaimResult
 preclaim(
     PreflightResult const& preflightResult,
-    Application& app,
+    ServiceRegistry& registry,
     OpenView const& view);
 
 /** Compute only the expected base fee for a transaction.
@@ -335,7 +335,7 @@ calculateDefaultBaseFee(ReadView const& view, STTx const& tx);
 
     @param preclaimResult The result of a previous
     call to `preclaim` for the transaction.
-    @param app The current running `Application`.
+    @param registry The service registry.
     @param view The open ledger that the transaction
     will attempt to be applied to.
 
@@ -345,7 +345,10 @@ calculateDefaultBaseFee(ReadView const& view, STTx const& tx);
     whether or not the transaction was applied.
 */
 ApplyResult
-doApply(PreclaimResult const& preclaimResult, Application& app, OpenView& view);
+doApply(
+    PreclaimResult const& preclaimResult,
+    ServiceRegistry& registry,
+    OpenView& view);
 
 }  // namespace xrpl
 

include/xrpl/tx/paths/BookTip.h

@@ -1,5 +1,5 @@
-#ifndef XRPL_APP_BOOK_BOOKTIP_H_INCLUDED
-#define XRPL_APP_BOOK_BOOKTIP_H_INCLUDED
+#ifndef XRPL_TX_PATHS_BOOKTIP_H_INCLUDED
+#define XRPL_TX_PATHS_BOOKTIP_H_INCLUDED
 
 #include <xrpl/ledger/View.h>
 #include <xrpl/protocol/Indexes.h>

include/xrpl/tx/paths/Flow.h

@@ -1,10 +1,9 @@
 #ifndef XRPL_APP_PATHS_FLOW_H_INCLUDED
 #define XRPL_APP_PATHS_FLOW_H_INCLUDED
 
-#include <xrpld/app/paths/RippleCalc.h>
-#include <xrpld/app/paths/detail/Steps.h>
-
 #include <xrpl/protocol/Quality.h>
+#include <xrpl/tx/paths/RippleCalc.h>
+#include <xrpl/tx/paths/detail/Steps.h>
 
 namespace xrpl {
 

include/xrpl/tx/paths/OfferStream.h

@@ -1,13 +1,12 @@
-#ifndef XRPL_APP_BOOK_OFFERSTREAM_H_INCLUDED
-#define XRPL_APP_BOOK_OFFERSTREAM_H_INCLUDED
-
-#include <xrpld/app/tx/detail/BookTip.h>
-#include <xrpld/app/tx/detail/Offer.h>
+#ifndef XRPL_TX_PATHS_OFFERSTREAM_H_INCLUDED
+#define XRPL_TX_PATHS_OFFERSTREAM_H_INCLUDED
 
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/chrono.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/View.h>
+#include <xrpl/tx/paths/BookTip.h>
+#include <xrpl/tx/paths/Offer.h>
 
 #include <boost/container/flat_set.hpp>
 

include/xrpl/tx/paths/detail/FlowDebugInfo.h

@@ -1,11 +1,10 @@
 #ifndef XRPL_PATH_IMPL_FLOWDEBUGINFO_H_INCLUDED
 #define XRPL_PATH_IMPL_FLOWDEBUGINFO_H_INCLUDED
 
-#include <xrpld/app/paths/detail/AmountSpec.h>
-
 #include <xrpl/ledger/PaymentSandbox.h>
 #include <xrpl/protocol/IOUAmount.h>
 #include <xrpl/protocol/XRPAmount.h>
+#include <xrpl/tx/paths/detail/AmountSpec.h>
 
 #include <boost/container/flat_map.hpp>
 

include/xrpl/tx/paths/detail/Steps.h

@@ -1,14 +1,13 @@
 #ifndef XRPL_APP_PATHS_IMPL_PAYSTEPS_H_INCLUDED
 #define XRPL_APP_PATHS_IMPL_PAYSTEPS_H_INCLUDED
 
-#include <xrpld/app/paths/detail/AmountSpec.h>
-
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/protocol/Quality.h>
 #include <xrpl/protocol/QualityFunction.h>
 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol/TER.h>
+#include <xrpl/tx/paths/detail/AmountSpec.h>
 
 #include <boost/container/flat_set.hpp>
 

include/xrpl/tx/paths/detail/StrandFlow.h

@@ -1,19 +1,18 @@
 #ifndef XRPL_APP_PATHS_IMPL_STRANDFLOW_H_INCLUDED
 #define XRPL_APP_PATHS_IMPL_STRANDFLOW_H_INCLUDED
 
-#include <xrpld/app/misc/AMMHelpers.h>
-#include <xrpld/app/paths/AMMContext.h>
-#include <xrpld/app/paths/Credit.h>
-#include <xrpld/app/paths/Flow.h>
-#include <xrpld/app/paths/detail/AmountSpec.h>
-#include <xrpld/app/paths/detail/FlatSets.h>
-#include <xrpld/app/paths/detail/FlowDebugInfo.h>
-#include <xrpld/app/paths/detail/Steps.h>
-
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/IOUAmount.h>
 #include <xrpl/protocol/XRPAmount.h>
+#include <xrpl/tx/paths/Credit.h>
+#include <xrpl/tx/paths/Flow.h>
+#include <xrpl/tx/paths/detail/AmountSpec.h>
+#include <xrpl/tx/paths/detail/FlatSets.h>
+#include <xrpl/tx/paths/detail/FlowDebugInfo.h>
+#include <xrpl/tx/paths/detail/Steps.h>
+#include <xrpl/tx/transactors/AMM/AMMContext.h>
+#include <xrpl/tx/transactors/AMM/AMMHelpers.h>
 
 #include <boost/container/flat_set.hpp>
 

include/xrpl/tx/transactors/AMM/AMMBid.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_AMMBID_H_INCLUDED
 #define XRPL_TX_AMMBID_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/AMM/AMMClawback.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_AMMCLAWBACK_H_INCLUDED
 #define XRPL_TX_AMMCLAWBACK_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 class Sandbox;

include/xrpl/tx/transactors/AMM/AMMCreate.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_AMMCREATE_H_INCLUDED
 #define XRPL_TX_AMMCREATE_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/AMM/AMMDelete.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_AMMDELETE_H_INCLUDED
 #define XRPL_TX_AMMDELETE_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/AMM/AMMDeposit.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_AMMDEPOSIT_H_INCLUDED
 #define XRPL_TX_AMMDEPOSIT_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/AMM/AMMVote.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_AMMVOTE_H_INCLUDED
 #define XRPL_TX_AMMVOTE_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/AMM/AMMWithdraw.h

@@ -1,9 +1,8 @@
 #ifndef XRPL_TX_AMMWITHDRAW_H_INCLUDED
 #define XRPL_TX_AMMWITHDRAW_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
-
 #include <xrpl/ledger/View.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/Batch.h

@@ -1,11 +1,9 @@
 #ifndef XRPL_TX_BATCH_H_INCLUDED
 #define XRPL_TX_BATCH_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
-#include <xrpld/core/Config.h>
-
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/Change.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_CHANGE_H_INCLUDED
 #define XRPL_TX_CHANGE_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/Check/CancelCheck.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_CANCELCHECK_H_INCLUDED
 #define XRPL_TX_CANCELCHECK_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/Check/CashCheck.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_CASHCHECK_H_INCLUDED
 #define XRPL_TX_CASHCHECK_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/Check/CreateCheck.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_CREATECHECK_H_INCLUDED
 #define XRPL_TX_CREATECHECK_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/Clawback.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_CLAWBACK_H_INCLUDED
 #define XRPL_TX_CLAWBACK_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/CreateTicket.h

@@ -1,8 +1,7 @@
 #ifndef XRPL_TX_CREATETICKET_H_INCLUDED
 #define XRPL_TX_CREATETICKET_H_INCLUDED
 
-#include <xrpld/app/ledger/Ledger.h>
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/Credentials.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_CREDENTIALS_H_INCLUDED
 #define XRPL_TX_CREDENTIALS_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/DID.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_DID_H_INCLUDED
 #define XRPL_TX_DID_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/Delegate/DelegateSet.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_DELEGATESET_H_INCLUDED
 #define XRPL_TX_DELEGATESET_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/DeleteAccount.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_DELETEACCOUNT_H_INCLUDED
 #define XRPL_TX_DELETEACCOUNT_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/DeleteOracle.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_DELETEORACLE_H_INCLUDED
 #define XRPL_TX_DELETEORACLE_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/DepositPreauth.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_DEPOSIT_PREAUTH_H_INCLUDED
 #define XRPL_TX_DEPOSIT_PREAUTH_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/Escrow.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_ESCROW_H_INCLUDED
 #define XRPL_TX_ESCROW_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/LedgerStateFix.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_LEDGER_STATE_FIX_H_INCLUDED
 #define XRPL_TX_LEDGER_STATE_FIX_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/Lending/LoanBrokerCoverClawback.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_LOANBROKERCOVERCLAWBACK_H_INCLUDED
 #define XRPL_TX_LOANBROKERCOVERCLAWBACK_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/Lending/LoanBrokerCoverDeposit.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_LOANBROKERCOVERDEPOSIT_H_INCLUDED
 #define XRPL_TX_LOANBROKERCOVERDEPOSIT_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/Lending/LoanBrokerCoverWithdraw.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_LOANBROKERCOVERWITHDRAW_H_INCLUDED
 #define XRPL_TX_LOANBROKERCOVERWITHDRAW_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/Lending/LoanBrokerDelete.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_LOANBROKERDELETE_H_INCLUDED
 #define XRPL_TX_LOANBROKERDELETE_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/Lending/LoanBrokerSet.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_LOANBROKERSET_H_INCLUDED
 #define XRPL_TX_LOANBROKERSET_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/Lending/LoanDelete.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_LOANDELETE_H_INCLUDED
 #define XRPL_TX_LOANDELETE_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
 

include/xrpl/tx/transactors/Lending/LoanManage.h

@@ -1,7 +1,7 @@
 #ifndef XRPL_TX_LOANMANAGE_H_INCLUDED
 #define XRPL_TX_LOANMANAGE_H_INCLUDED
 
-#include <xrpld/app/tx/detail/Transactor.h>
+#include <xrpl/tx/Transactor.h>
 
 namespace xrpl {