Merge branch 'ripple/smart-escrow' into ripple/se/supported

Conflict resolution:

- features.macro: kept fixCleanup3_4_0 from develop and kept SmartEscrow at
  Supported::Yes, which is the only thing this branch changes.

.cspell.config.yaml

@@ -7,6 +7,8 @@ ignorePaths:
   - cmake/**
   - LICENSE.md
   - .clang-tidy
+  - src/test/app/wasm_fixtures/**/*.wat
+  - src/test/app/wasm_fixtures/*.c
 language: en
 allowCompoundWords: true # TODO (#6334)
 ignoreRandomStrings: true
@@ -67,6 +69,7 @@ words:
   - Btrfs
   - Buildx
   - canonicality
+  - cdylib
   - canonicalised
   - changespq
   - checkme
@@ -297,6 +300,7 @@ words:
   - STATSDCOLLECTOR
   - stissue
   - stnum
+  - stnumber
   - stobj
   - stobject
   - stpath
@@ -363,9 +367,9 @@ words:
   - wthread
   - xbridge
   - xchain
+  - xfloat
   - ximinez
   - XMACRO
-  - xored
   - xrpkuwait
   - xrpl
   - xrpld

.envrc

@@ -1,7 +1,3 @@
 watch_file nix/*.nix
 
-# The dev shell derivation includes all of conan/ (see nix/devshell.nix), so any
-# change in there has to invalidate direnv's cached environment.
-watch_dir conan
-
 use flake

API-CHANGELOG.md

@@ -54,8 +54,6 @@ This section contains changes targeting a future version.
 - `submit`: The `fail_hard` field now returns an error if the value is not a boolean. [#6529](https://github.com/XRPLF/rippled/pull/6529)
 - `subscribe`: The `taker` field in the `books` array now returns `actMalformed` instead of `badIssuer` if the value is not a valid account. [#6529](https://github.com/XRPLF/rippled/pull/6529)
 - Fixed a bug in `Forwarded` HTTP header parsing where the extracted IP address could be incorrect when no comma or semicolon delimiter follows the address. This could cause the server to misidentify a client's IP address when operating behind a reverse proxy. [#6529](https://github.com/XRPLF/rippled/pull/6529)
-- `gateway_balances`: The `account` and `ident` fields now return an `invalidParams` error if the value is not a string, instead of an `internal` error. [#7655](https://github.com/XRPLF/rippled/pull/7655)
-- `account_lines`: The `peer` field now returns an error if the value is not a string. [#7728](https://github.com/XRPLF/rippled/pull/7728)
 
 ## XRP Ledger server version 3.1.0
 

BUILD.md

@@ -4,14 +4,34 @@
 
 ## Minimum Requirements
 
-For the hardware needed to run a node, see
-[System Requirements](https://xrpl.org/system-requirements.html).
+See [System Requirements](https://xrpl.org/system-requirements.html).
 
-For the software needed to build xrpld, see the
-[environment setup guide](./docs/build/environment.md).
+Building xrpld generally requires Git, Python, Conan, CMake, and a C++
+compiler.
+
+- [Python](https://www.python.org/downloads/)
+- [Conan](https://conan.io/downloads.html)
+- [CMake](https://cmake.org/download/)
+
+You can verify that the required tools are installed and runnable with:
+
+```bash
+./bin/check-tools.sh
+```
+
+`xrpld` is written in the C++23 dialect. The [tested compiler versions][cpp23-support] are:
+
+| Compiler    | Version         |
+| ----------- | --------------- |
+| GCC         | 15.2            |
+| Clang       | 22              |
+| Apple Clang | 21              |
+| MSVC        | 19.44[^windows] |
 
 ## Operating Systems
 
+Please see the [environment setup guide](./docs/build/environment.md) for detailed instructions for all platforms.
+
 ### Linux
 
 The Ubuntu Linux distribution has received the highest level of quality
@@ -27,8 +47,9 @@ CI testing is done in macOS 26 (Tahoe), but the build defaults `CMAKE_OSX_DEPLOY
 
 ### Windows
 
-Windows is used by some engineers for development only, and is not recommended
-for production use.
+Windows is used by some engineers for development only.
+
+[^windows]: Windows is not recommended for production use.
 
 ## Steps
 
@@ -53,25 +74,37 @@ releases](https://github.com/XRPLF/rippled/releases).
 
 ### Set Up Conan
 
-Once your [development environment](./docs/build/environment.md) is ready, set
-Conan up for this repository:
+After you have a [C++ development environment](./docs/build/environment.md) ready with Git, Python,
+Conan, CMake, and a C++ compiler, you may need to set up your Conan profile.
+
+These instructions assume a basic familiarity with Conan and CMake. If you are
+unfamiliar with Conan, then please read [this crash course](./docs/build/conan.md) or the official
+[Getting Started][conan-getting-started] walkthrough.
+
+#### Profiles
+
+We recommend that you install our Conan profiles:
 
 ```bash
-./conan/init.sh
+conan config install conan/profiles/ -tf $(conan config home)/profiles/
 ```
 
-That installs our [`global.conf`](./conan/global.conf), our Conan
-[profiles](./conan/profiles), and the `xrplf` remote that hosts some of our
-dependencies. It honours `CONAN_HOME` and never deletes an existing Conan home,
-so it is safe to re-run — it only overwrites the files it manages.
+You can check your Conan profile by running:
 
-> [!TIP]
-> In the [Nix development shell](./docs/build/nix.md#conan-configuration) this is
-> already done for you: the script runs on entry.
+```bash
+conan profile show
+```
 
-You can inspect the resulting profile with `conan profile show`. If it is not
-suitable for your environment, create a custom profile and pass it to Conan — see
-[Advanced Conan configuration](./docs/build/advanced_conan.md).
+If the default profile is not suitable for your environment, you can create a custom profile and pass it to Conan.
+More information on customizing Conan can be found in the [Advanced Conan configuration](./docs/build/advanced_conan.md).
+
+#### Add xrplf remote
+
+Run the following command to add the `xrplf` remote, which hosts some of our dependencies:
+
+```bash
+conan remote add --index 0 --force xrplf https://conan.xrplf.org/repository/conan/
+```
 
 ### Set Up Ccache
 
@@ -236,14 +269,10 @@ which is only enabled when the `coverage` option is set, e.g. with
 Prerequisites for the coverage report:
 
 - [gcovr tool][gcovr] (can be installed e.g. with [pip][python-pip])
-- `gcov` for GCC or `llvm-cov` for Clang, usually installed with the compiler
+- `gcov` for GCC (installed with the compiler by default) or
+- `llvm-cov` for Clang (installed with the compiler by default)
 - `Debug` build type
 
-> [!NOTE]
-> Clang coverage is not available in the [Nix development shell](./docs/build/nix.md#building-xrpld-in-the-nix-shell):
-> its `clang` shells do not ship `llvm-cov`. Use a `gcc` shell instead (`.#gcc`,
-> or `.#gcc-plain` on Linux), which provides a `gcov` matching its compiler.
-
 A coverage report is created when the following steps are completed, in order:
 
 1. `xrpld` binary built with instrumentation data, enabled by the `coverage`
@@ -360,14 +389,10 @@ After any updates or changes to dependencies, you may need to do the following:
 4. [Regenerate lockfile](./docs/build/advanced_conan.md#conan-lockfile).
 5. Re-run [conan install](#build-and-test).
 
-If you are using the Nix development shell, whether prebuilt Conan binaries apply
-depends on your platform — see
-[Prebuilt packages](./docs/build/nix.md#prebuilt-packages).
-
 #### ERROR: Package not resolved
 
 If you're seeing an error like `ERROR: Package 'snappy/1.1.10' not resolved: Unable to find 'snappy/1.1.10#968fef506ff261592ec30c574d4a7809%1756234314.246' in remotes.`,
-please [set Conan up](#set-up-conan) so the `xrplf` remote is configured, or re-run `conan export` for [patched recipes](./docs/build/advanced_conan.md#patched-recipes).
+please [add `xrplf` remote](#add-xrplf-remote) or re-run `conan export` for [patched recipes](./docs/build/advanced_conan.md#patched-recipes).
 
 ### `protobuf/port_def.inc` file not found
 
@@ -387,6 +412,7 @@ For example, if you want to build Debug:
 1. For conan install, pass `--settings build_type=Debug`
 2. For cmake, pass `-DCMAKE_BUILD_TYPE=Debug`
 
+[cpp23-support]: https://en.cppreference.com/w/cpp/compiler_support/23
 [conan-getting-started]: https://docs.conan.io/en/latest/getting_started.html
 [unity-build]: https://en.wikipedia.org/wiki/Unity_build
 [gcovr]: https://gcovr.com/en/stable/getting-started.html

CMakeLists.txt

@@ -114,6 +114,7 @@ find_package(OpenSSL REQUIRED)
 find_package(secp256k1 REQUIRED)
 find_package(SOCI REQUIRED)
 find_package(SQLite3 REQUIRED)
+find_package(wasmi REQUIRED)
 find_package(xxHash REQUIRED)
 
 target_link_libraries(

cfg/xrpld-example.cfg

@@ -1348,6 +1348,39 @@
 #       Example:
 #           owner_reserve = 200000      # 0.2 XRP
 #
+#   gas_limit = <gas>
+#
+#       The gas limit is the maximum amount of gas that can be
+#       consumed by a single transaction. The gas limit is used to prevent
+#       transactions from consuming too many resources.
+#
+#       If this parameter is unspecified, xrpld will use an internal
+#       default. Don't change this without understanding the consequences.
+#
+#       Example:
+#           gas_limit = 1000000      # 1 million gas
+#
+#   bytecode_size_limit = <bytes>
+#
+#       The bytecode size limit is the maximum size of a WASM extension in
+#       bytes. The size limit is used to prevent extensions from consuming
+#       too many resources.
+#
+#       If this parameter is unspecified, xrpld will use an internal
+#       default. Don't change this without understanding the consequences.
+#
+#       Example:
+#           bytecode_size_limit = 100000      # 100 kb
+#
+#   gas_price = <micro-drops>
+#
+#       The gas price is the conversion between WASM gas and its price in drops.
+#
+#       If this parameter is unspecified, xrpld will use an internal
+#       default. Don't change this without understanding the consequences.
+#
+#       Example:
+#           gas_price = 1000000      # 1 drop per gas
 #-------------------------------------------------------------------------------
 #
 # 9. Misc Settings

cmake/XrplCompiler.cmake

@@ -266,50 +266,10 @@ elseif(use_lld)
     )
     if("${LD_VERSION}" MATCHES "LLD")
         target_link_libraries(common INTERFACE -fuse-ld=lld)
-        # remembered for the linker flag probe below
-        set(fuse_ld_flag "-fuse-ld=lld")
     endif()
     unset(LD_VERSION)
 endif()
 
-# Linker warnings are errors where we control the toolchain and the dependencies: CI and the Nix dev shell.
-# On non-Nix macOS we suppress the deployment target warning: an old Conan profile may not pin os.version.
-# Only the new Apple linker understands the flag, so probe the actual linker (lld may be selected above).
-if(is_macos OR is_linux)
-    if(is_ci OR is_nix_compiler)
-        if(is_macos)
-            set(fatal_warnings_flag "-Wl,-fatal_warnings")
-        else()
-            set(fatal_warnings_flag "-Wl,--fatal-warnings")
-        endif()
-        message(
-            STATUS
-            "Treating all linker warnings as errors (${fatal_warnings_flag})"
-        )
-        target_link_options(common INTERFACE "${fatal_warnings_flag}")
-        unset(fatal_warnings_flag)
-    elseif(is_macos)
-        set(silence_flag "-Wl,-deployment_target_mismatches,suppress")
-        set(probe_flags ${fuse_ld_flag} "${silence_flag}")
-        include(CheckLinkerFlag)
-        check_linker_flag(
-            CXX
-            "${probe_flags}"
-            have_deployment_target_mismatches
-        )
-        if(have_deployment_target_mismatches)
-            message(
-                STATUS
-                "Silencing macOS deployment target mismatch warnings (${silence_flag})"
-            )
-            target_link_options(common INTERFACE "${silence_flag}")
-        endif()
-        unset(probe_flags)
-        unset(silence_flag)
-    endif()
-endif()
-unset(fuse_ld_flag)
-
 if(assert)
     foreach(var_ CMAKE_C_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELEASE)
         string(REGEX REPLACE "[-/]DNDEBUG" "" ${var_} "${${var_}}")

cmake/XrplCore.cmake

@@ -67,6 +67,7 @@ target_link_libraries(
         Xrpl::opts
         Xrpl::syslibs
         secp256k1::secp256k1
+        wasmi::wasmi
         xrpl.libpb
         xxHash::xxhash
         $<$<BOOL:${voidstar}>:antithesis-sdk-cpp>

cmake/XrplCov.cmake

@@ -44,7 +44,6 @@ setup_target_for_coverage_gcovr(
     EXCLUDE
         "src/test"
         "src/tests"
-        "src/benchmarks"
         "include/xrpl/beast/test"
         "include/xrpl/beast/unit_test"
         "${CMAKE_BINARY_DIR}/pb-xrpl.libpb"

conan.lock

@@ -3,6 +3,7 @@
     "requires": [
         "zlib/1.3.2#1cb806da49011867778ffb6ac7190fcb%1782392402.122708",
         "xxhash/0.8.3#681d36a0a6111fc56e5e45ea182c19cc%1782392402.420688",
+        "wasmi/1.0.9#1fecdab9b90c96698eb35ea99ca4f5cb%1782307153.343419",
         "sqlite3/3.53.0#324ada52333108388a9a6108bfa96734%1782392403.185447",
         "soci/4.0.3#e726491a03468795453f7c83fc924a96%1782392402.679521",
         "snappy/1.1.10#968fef506ff261592ec30c574d4a7809%1782307151.633168",

conan/init.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-# Install our Conan configuration, profiles and the xrplf remote into CONAN_HOME.
-# Safe to re-run; never deletes the Conan home.
-
-set -euo pipefail
-
-SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
-CONAN_DIR="$(conan config home)"
-
-echo "Installing Conan configuration into ${CONAN_DIR}"
-conan config install "${SCRIPT_DIR}/global.conf"
-conan config install "${SCRIPT_DIR}/profiles" -tf "${CONAN_DIR}/profiles"
-# This script manages these files, so make them read-only - Conan does not
-# preserve the source mode. Only the files: the directories must stay writable
-# for `conan config install` to replace them.
-chmod a-w "${CONAN_DIR}/global.conf"
-find "${CONAN_DIR}/profiles" -type f -exec chmod a-w {} +
-
-echo "Adding the xrplf Conan remote"
-# --index 0: our patched recipes must win over Conan Center.
-conan remote add --index 0 --force xrplf https://conan.xrplf.org/repository/conan/

conan/profiles/default

@@ -1,7 +1,10 @@
 {% set os = detect_api.detect_os() %}
 {% set arch = detect_api.detect_arch() %}
 {% set compiler, version, compiler_exe = detect_api.detect_default_compiler() %}
+{% set compiler_version = version %}
+{% if os == "Linux" %}
 {% set compiler_version = detect_api.default_compiler_version(compiler, version) %}
+{% endif %}
 {% if os == "Macos" %}
 {# Minimum macOS the dependencies target. #}
 {# Without this, Conan builds each dependency against the (possibly newer) host SDK, so the #}

conanfile.py

@@ -35,6 +35,7 @@ class Xrpl(ConanFile):
         "nudb/2.0.9",
         "openssl/3.6.3",
         "soci/4.0.3",
+        "wasmi/1.0.9",
         "zlib/1.3.2",
     ]
 
@@ -223,6 +224,7 @@ class Xrpl(ConanFile):
             "soci::soci",
             "secp256k1::secp256k1",
             "sqlite3::sqlite",
+            "wasmi::wasmi",
             "xxhash::xxhash",
             "zlib::zlib",
         ]

docs/build/environment.md

@@ -6,52 +6,22 @@ This document explains how to set one up.
 
 ## Tested compiler versions
 
-`xrpld` is built in the **C++23** dialect by default, so your toolchain has to
-support it — see [compiler support for C++23][cpp23-support].
-The versions currently tested in CI are:
+`xrpld` is built in the **C++23** dialect by default.
+Make sure your toolchain is recent enough — the compiler versions currently tested in CI are:
 
-| Compiler    | Version            |
-| ----------- | ------------------ |
-| GCC         | 15.2               |
-| Clang       | 22                 |
-| Apple Clang | 21                 |
-| MSVC        | Visual Studio 2026 |
+| Compiler    | Version |
+| ----------- | ------- |
+| GCC         | 15.2    |
+| Clang       | 22      |
+| Apple Clang | 17      |
+| MSVC        | 19.44   |
 
 LLVM tools (`clang-tidy` and `clang-format`) are also pinned to version 22.
 
-### Older compilers
-
 Older compilers may fail to build the latest `develop` code: the codebase now
 relies on C++23 features and has been adjusted for `clang-tidy`.
 If the latest code doesn't build for you, update your build toolchain first.
 
-If updating isn't an option for you, we do accept pull requests that fix builds
-on older compilers, as long as the change is small and doesn't make the code
-harder to read. What we can't promise is that older compilers will keep working:
-only the versions in the table above are tested in CI, and we won't hold back
-the use of C++23 features or add invasive workarounds to keep an untested
-compiler building. Treat support for anything outside the table as best-effort.
-
-## Required tools
-
-Besides a compiler, building `xrpld` requires:
-
-| Tool                                        | Minimum version |
-| ------------------------------------------- | --------------- |
-| [Git](https://git-scm.com/downloads)        | any recent      |
-| [Python](https://www.python.org/downloads/) | 3.11            |
-| [Conan](https://conan.io/downloads.html)    | 2.17            |
-| [CMake](https://cmake.org/download/)        | 3.16            |
-
-On Linux and macOS, the [Nix development shell](./nix.md) provides all of them
-(see below). On Windows they have to be installed manually.
-
-Once they are in place, verify that everything is installed and runnable with:
-
-```bash
-./bin/check-tools.sh
-```
-
 ## Linux and macOS
 
 The **recommended way** to get a development environment on Linux and macOS is
@@ -69,15 +39,20 @@ Clang. If you instead opt to use your system-wide Apple Clang (via
 below).
 
 See [Using the Nix development shell](./nix.md) for installation and usage
-details, including how to select a different compiler and why we recommend Nix
-over a hand-maintained environment.
+details, including how to select a different compiler.
+
+> [!NOTE]
+> Using Nix is not mandatory. Any custom environment (Homebrew packages or
+> anything else) will continue to work, but then it is up to you to keep it in
+> sync with the environment used in CI. Nix unifies the development environment
+> for everyone and synchronizes updates, which is why we recommend it.
 
 ### macOS: managing the Apple Clang version
 
 If you use your system-wide Apple Clang on macOS (via `nix develop .#apple-clang`),
 the compiler version is whatever your installed Xcode (or Command Line Tools)
 provides. The following command should return a version greater than or equal to
-the [tested one](#tested-compiler-versions):
+the [minimum required](#tested-compiler-versions):
 
 ```bash
 clang --version
@@ -114,23 +89,23 @@ building xrpld. You may want to install and pin a specific version of Xcode:
 Nix is not available on Windows, so the required tools have to be installed
 manually:
 
-- [Visual Studio 2026](https://visualstudio.microsoft.com/) with the
+- [Visual Studio 2022](https://visualstudio.microsoft.com/) with the
   **"Desktop development with C++"** workload — this provides MSVC and the
-  "x64 Native Tools Command Prompt". CI configures CMake with the
-  `Visual Studio 18 2026` generator.
+  "x64 Native Tools Command Prompt".
 - [Git for Windows](https://git-scm.com/download/win)
-- Python, Conan, and CMake, at the versions listed in
-  [Required tools](#required-tools).
+- [Python 3.11](https://www.python.org/downloads/), or higher
+- [Conan 2.17](https://conan.io/downloads.html), or higher
+- [CMake 3.22](https://cmake.org/download/), or higher
+
+> [!NOTE]
+> Windows is used for development only and is not recommended for production.
 
 ## Clang-tidy
 
 `clang-tidy` is required to run static analysis checks locally (see
 [CONTRIBUTING.md](../../CONTRIBUTING.md)). It is not required to build the
-project. The version this project uses is listed in
-[Tested compiler versions](#tested-compiler-versions).
+project. This project currently uses `clang-tidy` version 22.
 
-On Linux and macOS, the [Nix development shell](./nix.md) provides that exact
-version out of the box — run it via `run-clang-tidy`. No separate installation
-is needed.
-
-[cpp23-support]: https://en.cppreference.com/w/cpp/compiler_support/23
+On Linux and macOS, the [Nix development shell](./nix.md) provides `clang-tidy`
+22 out of the box — run it via `run-clang-tidy`. No separate installation is
+needed.

docs/build/nix.md

@@ -120,7 +120,7 @@ nix develop -c "$SHELL"
 >
 > If it doesn't, either adjust your shell configuration so it doesn't override `$PATH`, or use [direnv](#automatic-activation-with-direnv) (below), which loads the environment _after_ your shell config and so takes precedence regardless of the shell you use.
 
-## Building xrpld in the Nix shell
+## Building xrpld with Nix
 
 Once inside the Nix development shell, follow the standard [build instructions](../../BUILD.md#steps). The Nix shell provides all necessary tools (CMake, Ninja, Conan, etc.).
 
@@ -128,28 +128,6 @@ Coverage builds (`-Dcoverage=ON`) work in the `gcc` shell (and `gcc-plain` on Li
 each ships a `gcov` matching its compiler, since Nix's cc-wrapper does not expose one.
 The `clang` shells do not include `llvm-cov`, so use a `gcc` shell for coverage.
 
-## Conan configuration
-
-The shell runs [`conan/init.sh`](../../conan/init.sh) on entry, so
-[Set Up Conan](../../BUILD.md#set-up-conan) is already done for you. It installs
-into the shell's own Conan home: `CONAN_HOME=~/.conan2-nix`.
-
-### Prebuilt packages
-
-On **Linux**, the binaries on the `xrplf` remote are built in this same Nix
-environment — CI runs in Docker images that bundle the dev shell's toolchain (see
-[`nix/docker`](../../nix/docker)) — so `.#gcc` and `.#clang` can reuse them. The
-`-plain` shells do not match that toolchain's glibc, so binaries from the remote
-are not a reliable match there.
-
-On **macOS**, CI builds with Apple Clang, so the remote holds nothing for the Nix
-`clang` toolchain and dependencies are compiled locally. We do not publish
-Nix-built macOS binaries because a Conan package ID records the compiler version
-but not the nixpkgs revision.
-
-To compile everything from source, add `--build '*'` to the `conan install`
-command.
-
 ## Automatic Activation with direnv
 
 [direnv](https://direnv.net/) or [nix-direnv](https://github.com/nix-community/nix-direnv) can automatically activate the Nix development shell when you enter the repository directory.
@@ -164,6 +142,14 @@ The repository already ships an `.envrc` at its root that activates the Nix flak
 > [!NOTE]
 > direnv only caches the `.direnv` directory (already listed in `.gitignore`); no other repository files are affected.
 
+## Conan and Prebuilt Packages
+
+Please note that there is no guarantee that binaries from conan cache will work when using nix. If you encounter any errors, please use `--build '*'` to force conan to compile everything from source:
+
+```bash
+conan install .. --output-folder . --build '*' --settings build_type=Release
+```
+
 ## Updating `flake.lock` file
 
 To update `flake.lock` to the latest revision use `nix flake update` command.

docs/sample_chart.doc

@@ -0,0 +1,24 @@
+/*!
+    \page somestatechart Example state diagram
+
+    \startuml SomeState "my state diagram"
+    scale 600 width
+
+    [*] -> State1
+    State1 --> State2 : Succeeded
+    State1 --> [*] : Aborted
+    State2 --> State3 : Succeeded
+    State2 --> [*] : Aborted
+    state State3 {
+      state "Accumulate Enough Data\nLong State Name" as long1
+      long1 : Just a test
+      [*] --> long1
+      long1 --> long1 : New Data
+      long1 --> ProcessData : Enough Data
+    }
+    State3 --> State3 : Failed
+    State3 --> [*] : Succeeded / Save Result
+    State3 --> [*] : Aborted
+
+    \enduml
+*/

include/xrpl/basics/Archive.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <filesystem>
+#include <boost/filesystem.hpp>
 
 namespace xrpl {
 
@@ -13,6 +13,6 @@ namespace xrpl {
  * @throws runtime_error
  */
 void
-extractTarLz4(std::filesystem::path const& src, std::filesystem::path const& dst);
+extractTarLz4(boost::filesystem::path const& src, boost::filesystem::path const& dst);
 
 }  // namespace xrpl

include/xrpl/basics/Buffer.h

@@ -3,7 +3,6 @@
 #include <xrpl/basics/Slice.h>
 #include <xrpl/beast/utility/instrumentation.h>
 
-#include <algorithm>
 #include <cstdint>
 #include <cstring>
 #include <memory>
@@ -157,19 +156,6 @@ public:
     }
     /** @} */
 
-    /**
-     * Set every byte in the buffer to the given value.
-     *
-     * The size is unchanged, and this is a no-op on an empty buffer.
-     *
-     * @param value the byte to write to every position.
-     */
-    void
-    fill(std::uint8_t value) noexcept
-    {
-        std::fill_n(p_.get(), size_, value);
-    }
-
     /**
      * Reset the buffer.
      * All memory is deallocated. The resulting size is 0.
@@ -240,4 +226,10 @@ operator==(Buffer const& lhs, Buffer const& rhs) noexcept
     return std::memcmp(lhs.data(), rhs.data(), lhs.size()) == 0;
 }
 
+inline bool
+operator!=(Buffer const& lhs, Buffer const& rhs) noexcept
+{
+    return !(lhs == rhs);
+}
+
 }  // namespace xrpl

include/xrpl/basics/FileUtilities.h

@@ -1,79 +1,24 @@
 #pragma once
 
+#include <boost/filesystem.hpp>
+#include <boost/system/error_code.hpp>
+
 #include <cstddef>
-#include <filesystem>
 #include <optional>
 #include <string>
-#include <system_error>
 
 namespace xrpl {
 
 std::string
 getFileContents(
-    std::error_code& ec,
-    std::filesystem::path const& sourcePath,
+    boost::system::error_code& ec,
+    boost::filesystem::path const& sourcePath,
     std::optional<std::size_t> maxSize = std::nullopt);
 
 void
 writeFileContents(
-    std::error_code& ec,
-    std::filesystem::path const& destPath,
+    boost::system::error_code& ec,
+    boost::filesystem::path const& destPath,
     std::string const& contents);
 
-/**
- * Generate a unique, non-existing path under @p base whose filename starts with
- * @p prefix and ends with a random hex suffix.
- *
- * Attempts up to @p maxAttempts paths. Throws `std::runtime_error` if a unique
- * path cannot be found or if the filesystem returns an error while checking for
- * existence.
- */
-std::filesystem::path
-uniqueRandomPath(
-    std::filesystem::path const& base,
-    std::string const& prefix = "",
-    std::size_t maxAttempts = 100);
-
-/**
- * RAII temporary directory.
- *
- * The directory and all its contents are deleted when
- * the instance of `TempDir` is destroyed.
- */
-class TempDir
-{
-    std::filesystem::path path_;
-
-public:
-#if !GENERATING_DOCS
-    TempDir(TempDir const&) = delete;
-    TempDir&
-    operator=(TempDir const&) = delete;
-#endif
-
-    /**
-     * Construct a temporary directory.
-     */
-    TempDir();
-
-    /**
-     * Destroy a temporary directory.
-     */
-    ~TempDir();
-
-    /**
-     * Get the native path for the temporary directory.
-     */
-    [[nodiscard]] std::string
-    path() const;
-
-    /**
-     * Get the native path for a file.
-     *
-     * The file does not need to exist.
-     */
-    [[nodiscard]] std::string
-    file(std::string const& name) const;
-};
-
 }  // namespace xrpl

include/xrpl/basics/IntrusivePointer.h

@@ -96,6 +96,9 @@ public:
     SharedIntrusive&
     operator=(SharedIntrusive const& rhs);
 
+    bool
+    operator!=(std::nullptr_t) const;
+
     bool
     operator==(std::nullptr_t) const;
 

include/xrpl/basics/IntrusivePointer.ipp

@@ -111,6 +111,13 @@ SharedIntrusive<T>::operator=(SharedIntrusive<TT>&& rhs)
     return *this;
 }
 
+template <class T>
+bool
+SharedIntrusive<T>::operator!=(std::nullptr_t) const
+{
+    return this->get() != nullptr;
+}
+
 template <class T>
 bool
 SharedIntrusive<T>::operator==(std::nullptr_t) const

include/xrpl/basics/Log.h

@@ -3,8 +3,8 @@
 #include <xrpl/beast/utility/Journal.h>
 
 #include <boost/beast/core/string.hpp>
+#include <boost/filesystem.hpp>
 
-#include <filesystem>
 #include <fstream>
 #include <map>
 #include <memory>
@@ -84,7 +84,7 @@ private:
          * @return `true` if the file was opened.
          */
         bool
-        open(std::filesystem::path const& path);
+        open(boost::filesystem::path const& path);
 
         /**
          * Close and re-open the system file associated with the log
@@ -133,7 +133,7 @@ private:
 
     private:
         std::unique_ptr<std::ofstream> stream_;
-        std::filesystem::path path_;
+        boost::filesystem::path path_;
     };
 
     std::mutex mutable mutex_;
@@ -152,7 +152,7 @@ public:
     virtual ~Logs() = default;
 
     bool
-    open(std::filesystem::path const& pathToLogFile);
+    open(boost::filesystem::path const& pathToLogFile);
 
     beast::Journal::Sink&
     get(std::string const& name);

include/xrpl/basics/Number.h

@@ -304,7 +304,7 @@ concept Integral64 = std::is_same_v<T, std::int64_t> || std::is_same_v<T, std::u
  *      on-ledger are non-negative. This is due to implementation details of
  *      several operations which use unsigned arithmetic internally. This is
  *      sufficient to represent all valid XRP values (where the absolute value
- *      can not exceed kInitialXRP: 10^17), and MPT values (where the absolute
+ *      can not exceed INITIAL_XRP: 10^17), and MPT values (where the absolute
  *      value can not exceed maxMPTokenAmount: 2^63-1).
  *
  * ---- Mantissa Range Switching ----
@@ -449,6 +449,12 @@ public:
             x.exponent_ == y.exponent_;
     }
 
+    friend constexpr bool
+    operator!=(Number const& x, Number const& y) noexcept
+    {
+        return !(x == y);
+    }
+
     friend constexpr bool
     operator<(Number const& l, Number const& r) noexcept
     {
@@ -543,8 +549,21 @@ public:
     setround(RoundingMode inMode);
 
     /**
-     * Returns which mantissa scale is currently in use for normalization.
+     * Convert an integer to a RoundingMode, validating that it is in range.
      *
+     * Returns std::nullopt if the value does not correspond to a valid
+     * RoundingMode.
+     */
+    static std::optional<RoundingMode>
+    checkedRoundingMode(int mode) noexcept
+    {
+        if (mode < static_cast<int>(RoundingMode::ToNearest) ||
+            mode > static_cast<int>(RoundingMode::Upward))
+            return std::nullopt;
+        return static_cast<RoundingMode>(mode);
+    }
+
+    /**
      * If you think you need to call this outside of unit tests, no you don't.
      */
     static MantissaRange::MantissaScale

include/xrpl/basics/SHAMapHash.h

@@ -85,6 +85,12 @@ public:
     }
 };
 
+inline bool
+operator!=(SHAMapHash const& x, SHAMapHash const& y)
+{
+    return !(x == y);
+}
+
 template <>
 inline std::size_t
 extract(SHAMapHash const& key)

include/xrpl/basics/Slice.h

@@ -208,6 +208,12 @@ operator==(Slice const& lhs, Slice const& rhs) noexcept
     return std::memcmp(lhs.data(), rhs.data(), lhs.size()) == 0;
 }
 
+inline bool
+operator!=(Slice const& lhs, Slice const& rhs) noexcept
+{
+    return !(lhs == rhs);
+}
+
 inline bool
 operator<(Slice const& lhs, Slice const& rhs) noexcept
 {

include/xrpl/basics/StringUtilities.h

@@ -125,31 +125,9 @@ struct ParsedUrl
 bool
 parseUrl(ParsedUrl& pUrl, std::string const& strUrl);
 
-/**
- * Remove leading and trailing ASCII whitespace.
- *
- * Whitespace is the fixed set " \t\n\v\f\r"; the current locale is not
- * consulted, so the result depends only on the input.
- *
- * @param str The string to trim.
- * @return @p str without leading or trailing whitespace.
- */
 std::string
 trimWhitespace(std::string str);
 
-/**
- * Fold ASCII upper case letters to lower case.
- *
- * Only 'A' through 'Z' are remapped; every other byte is left alone and the
- * current locale is not consulted, so the result depends only on the input.
- *
- * @param str The string to fold.
- * @return @p str with each ASCII upper case letter replaced by its lower case
- *         equivalent.
- */
-std::string
-toLower(std::string str);
-
 std::optional<std::uint64_t>
 toUInt64(std::string const& s);
 

include/xrpl/basics/partitioned_unordered_map.h

@@ -116,6 +116,12 @@ public:
         {
             return lhs.map == rhs.map && lhs.ait == rhs.ait && lhs.mit == rhs.mit;
         }
+
+        friend bool
+        operator!=(Iterator const& lhs, Iterator const& rhs)
+        {
+            return !(lhs == rhs);
+        }
     };
 
     struct ConstIterator
@@ -183,6 +189,12 @@ public:
         {
             return lhs.map == rhs.map && lhs.ait == rhs.ait && lhs.mit == rhs.mit;
         }
+
+        friend bool
+        operator!=(ConstIterator const& lhs, ConstIterator const& rhs)
+        {
+            return !(lhs == rhs);
+        }
     };
 
 private:

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

@@ -1038,6 +1038,25 @@ public:
                Compare,
                OtherAllocator> const& other) const;
 
+    template <
+        bool OtherIsMulti,
+        bool OtherIsMap,
+        class OtherT,
+        class OtherDuration,
+        class OtherAllocator>
+    bool
+    operator!=(AgedOrderedContainer<
+               OtherIsMulti,
+               OtherIsMap,
+               Key,
+               OtherT,
+               OtherDuration,
+               Compare,
+               OtherAllocator> const& other) const
+    {
+        return !(this->operator==(other));
+    }
+
     template <
         bool OtherIsMulti,
         bool OtherIsMap,

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

@@ -1340,6 +1340,28 @@ public:
                OtherAllocator> const& other) const
         requires MaybeMulti;
 
+    template <
+        bool OtherIsMulti,
+        bool OtherIsMap,
+        class OtherKey,
+        class OtherT,
+        class OtherDuration,
+        class OtherHash,
+        class OtherAllocator>
+    bool
+    operator!=(AgedUnorderedContainer<
+               OtherIsMulti,
+               OtherIsMap,
+               OtherKey,
+               OtherT,
+               OtherDuration,
+               OtherHash,
+               KeyEqual,
+               OtherAllocator> const& other) const
+    {
+        return !(this->operator==(other));
+    }
+
 private:
     bool
     wouldExceed(size_type additional) const

include/xrpl/beast/core/List.h

@@ -82,6 +82,13 @@ public:
         return node_ == other.node_;
     }
 
+    template <typename M>
+    bool
+    operator!=(ListIterator<M> const& other) const noexcept
+    {
+        return !((*this) == other);
+    }
+
     reference
     operator*() const noexcept
     {

include/xrpl/beast/net/IPEndpoint.h

@@ -110,6 +110,12 @@ public:
     operator==(Endpoint const& lhs, Endpoint const& rhs);
     friend bool
     operator<(Endpoint const& lhs, Endpoint const& rhs);
+
+    friend bool
+    operator!=(Endpoint const& lhs, Endpoint const& rhs)
+    {
+        return !(lhs == rhs);
+    }
     friend bool
     operator>(Endpoint const& lhs, Endpoint const& rhs)
     {

include/xrpl/beast/rfc2616.h

@@ -229,6 +229,12 @@ public:
         return other.it_ == it_ && other.end_ == end_ && other.value_.size() == value_.size();
     }
 
+    bool
+    operator!=(ListIterator const& other) const
+    {
+        return !(*this == other);
+    }
+
     reference
     operator*() const
     {

include/xrpl/beast/unit_test/reporter.h

@@ -8,6 +8,7 @@
 #include <xrpl/beast/unit_test/runner.h>
 #include <xrpl/beast/unit_test/suite_info.h>
 
+#include <boost/lexical_cast.hpp>
 #include <boost/optional.hpp>
 
 #include <algorithm>
@@ -187,7 +188,7 @@ Reporter<Unused>::fmtdur(clock_type::duration const& d)
     using namespace std::chrono;
     auto const ms = duration_cast<milliseconds>(d);
     if (ms < seconds{1})
-        return std::to_string(ms.count()) + "ms";
+        return boost::lexical_cast<std::string>(ms.count()) + "ms";
     std::stringstream ss;
     ss << std::fixed << std::setprecision(1) << (ms.count() / 1000.) << "s";
     return ss.str();

include/xrpl/beast/unit_test/suite.h

@@ -6,10 +6,11 @@
 
 #include <xrpl/beast/unit_test/runner.h>
 
+#include <boost/filesystem.hpp>
+#include <boost/lexical_cast.hpp>
 #include <boost/throw_exception.hpp>
 
 #include <exception>
-#include <filesystem>
 #include <memory>
 #include <ostream>
 #include <sstream>
@@ -26,10 +27,10 @@ makeReason(String const& reason, char const* file, int line)
     std::string s(reason);
     if (!s.empty())
         s.append(": ");
-    namespace fs = std::filesystem;
+    namespace fs = boost::filesystem;
     s.append(fs::path{file}.filename().string());
     s.append("(");
-    s.append(std::to_string(line));
+    s.append(boost::lexical_cast<std::string>(line));
     s.append(")");
     return s;
 }

include/xrpl/beast/utility/temp_dir.h

@@ -0,0 +1,71 @@
+#pragma once
+
+#include <boost/filesystem.hpp>
+
+#include <string>
+
+namespace beast {
+
+/**
+ * RAII temporary directory.
+ *
+ * The directory and all its contents are deleted when
+ * the instance of `temp_dir` is destroyed.
+ */
+class TempDir
+{
+    boost::filesystem::path path_;
+
+public:
+#if !GENERATING_DOCS
+    TempDir(TempDir const&) = delete;
+    TempDir&
+    operator=(TempDir const&) = delete;
+#endif
+
+    /**
+     * Construct a temporary directory.
+     */
+    TempDir()
+    {
+        auto const dir = boost::filesystem::temp_directory_path();
+        do
+        {
+            path_ = dir / boost::filesystem::unique_path();
+        } while (boost::filesystem::exists(path_));
+        boost::filesystem::create_directory(path_);
+    }
+
+    /**
+     * Destroy a temporary directory.
+     */
+    ~TempDir()
+    {
+        // use non-throwing calls in the destructor
+        boost::system::error_code ec;
+        boost::filesystem::remove_all(path_, ec);
+        // TODO: warn/notify if ec set ?
+    }
+
+    /**
+     * Get the native path for the temporary directory
+     */
+    [[nodiscard]] std::string
+    path() const
+    {
+        return path_.string();
+    }
+
+    /**
+     * Get the native path for the a file.
+     *
+     * The file does not need to exist.
+     */
+    [[nodiscard]] std::string
+    file(std::string const& name) const
+    {
+        return (path_ / name).string();
+    }
+};
+
+}  // namespace beast

include/xrpl/conditions/Condition.h

@@ -92,4 +92,10 @@ operator==(Condition const& lhs, Condition const& rhs)
         lhs.fingerprint == rhs.fingerprint;
 }
 
+inline bool
+operator!=(Condition const& lhs, Condition const& rhs)
+{
+    return !(lhs == rhs);
+}
+
 }  // namespace xrpl::cryptoconditions

include/xrpl/conditions/Fulfillment.h

@@ -93,6 +93,12 @@ operator==(Fulfillment const& lhs, Fulfillment const& rhs)
         lhs.fingerprint() == rhs.fingerprint();
 }
 
+inline bool
+operator!=(Fulfillment const& lhs, Fulfillment const& rhs)
+{
+    return !(lhs == rhs);
+}
+
 /**
  * Determine whether the given fulfillment and condition match
  */

include/xrpl/config/Constants.h

@@ -94,6 +94,7 @@ struct Keys
     static constexpr auto kBbtOptions = "bbt_options";
     static constexpr auto kBgThreads = "bg_threads";
     static constexpr auto kBlockSize = "block_size";
+    static constexpr auto kBytecodeSizeLimit = "bytecode_size_limit";
     static constexpr auto kCacheAge = "cache_age";
     static constexpr auto kCacheMb = "cache_mb";
     static constexpr auto kCacheSize = "cache_size";
@@ -108,6 +109,8 @@ struct Keys
     static constexpr auto kFileSizeMult = "file_size_mult";
     static constexpr auto kFilterBits = "filter_bits";
     static constexpr auto kFilterFull = "filter_full";
+    static constexpr auto kGasLimit = "gas_limit";
+    static constexpr auto kGasPrice = "gas_price";
     static constexpr auto kHardSet = "hard_set";
     static constexpr auto kHighThreads = "high_threads";
     static constexpr auto kHoldTime = "hold_time";

include/xrpl/core/PerfLog.h

@@ -4,9 +4,10 @@
 #include <xrpl/core/Job.h>
 #include <xrpl/json/json_value.h>
 
+#include <boost/filesystem.hpp>
+
 #include <chrono>
 #include <cstdint>
-#include <filesystem>
 #include <functional>
 #include <memory>
 #include <string>
@@ -43,7 +44,7 @@ public:
      */
     struct Setup
     {
-        std::filesystem::path perfLog;
+        boost::filesystem::path perfLog;
         // log_interval is in milliseconds to support faster testing.
         milliseconds logInterval{seconds(1)};
     };
@@ -148,7 +149,7 @@ public:
 };
 
 PerfLog::Setup
-setupPerfLog(Section const& section, std::filesystem::path const& configDir);
+setupPerfLog(Section const& section, boost::filesystem::path const& configDir);
 
 std::unique_ptr<PerfLog>
 makePerfLog(

include/xrpl/core/ServiceRegistry.h

@@ -6,6 +6,7 @@
 #include <xrpl/basics/TaggedCache.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/utility/Journal.h>
+#include <xrpl/protocol/Fees.h>
 
 #include <boost/asio.hpp>
 
@@ -246,6 +247,9 @@ public:
     virtual DatabaseCon&
     getWalletDB() = 0;
 
+    [[nodiscard]] virtual Fees
+    getFees() const = 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&

include/xrpl/json/json_value.h

@@ -4,7 +4,6 @@
 #include <xrpl/json/json_forwards.h>
 
 #include <cstring>
-#include <iterator>
 #include <limits>
 #include <map>
 #include <string>
@@ -73,18 +72,36 @@ operator==(StaticString x, StaticString y)
     return strcmp(x.cStr(), y.cStr()) == 0;
 }
 
+inline bool
+operator!=(StaticString x, StaticString y)
+{
+    return !(x == y);
+}
+
 inline bool
 operator==(std::string const& x, StaticString y)
 {
     return strcmp(x.c_str(), y.cStr()) == 0;
 }
 
+inline bool
+operator!=(std::string const& x, StaticString y)
+{
+    return !(x == y);
+}
+
 inline bool
 operator==(StaticString x, std::string const& y)
 {
     return y == x;
 }
 
+inline bool
+operator!=(StaticString x, std::string const& y)
+{
+    return !(y == x);
+}
+
 /**
  * @brief Represents a <a HREF="http://www.json.org">JSON</a> value.
  *
@@ -472,6 +489,12 @@ toJson(xrpl::Number const& number)
 bool
 operator==(Value const&, Value const&);
 
+inline bool
+operator!=(Value const& x, Value const& y)
+{
+    return !(x == y);
+}
+
 bool
 operator<(Value const&, Value const&);
 
@@ -525,7 +548,6 @@ public:
 class ValueIteratorBase
 {
 public:
-    using iterator_category = std::bidirectional_iterator_tag;
     using size_t = unsigned int;
     using difference_type = int;
     using SelfType = ValueIteratorBase;
@@ -540,6 +562,12 @@ public:
         return isEqual(other);
     }
 
+    bool
+    operator!=(SelfType const& other) const
+    {
+        return !isEqual(other);
+    }
+
     /**
      * Return either the index or the member name of the referenced value as a
      * Value.

include/xrpl/ledger/ApplyViewImpl.h

@@ -13,6 +13,7 @@
 #include <xrpl/protocol/TxMeta.h>
 
 #include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <optional>
 
@@ -68,6 +69,18 @@ public:
         deliver_ = amount;
     }
 
+    void
+    setGasUsed(std::optional<std::uint32_t> const gasUsed)
+    {
+        gasUsed_ = gasUsed;
+    }
+
+    void
+    setVMReturnCode(std::int32_t const vmReturnCode)
+    {
+        vmReturnCode_ = vmReturnCode;
+    }
+
     /**
      * Get the number of modified entries
      */
@@ -88,6 +101,8 @@ public:
 
 private:
     std::optional<STAmount> deliver_;
+    std::optional<std::uint32_t> gasUsed_;
+    std::optional<std::int32_t> vmReturnCode_;
 };
 
 }  // namespace xrpl

include/xrpl/ledger/BookDirs.h

@@ -49,6 +49,12 @@ public:
     bool
     operator==(const_iterator const& other) const;
 
+    bool
+    operator!=(const_iterator const& other) const
+    {
+        return !(*this == other);
+    }
+
     reference
     operator*() const;
 

include/xrpl/ledger/CanonicalTXSet.h

@@ -59,6 +59,12 @@ private:
             return lhs.txId_ == rhs.txId_;
         }
 
+        friend bool
+        operator!=(Key const& lhs, Key const& rhs)
+        {
+            return !(lhs == rhs);
+        }
+
         [[nodiscard]] uint256 const&
         getAccount() const
         {

include/xrpl/ledger/Dir.h

@@ -59,6 +59,12 @@ public:
     bool
     operator==(ConstIterator const& other) const;
 
+    bool
+    operator!=(ConstIterator const& other) const
+    {
+        return !(*this == other);
+    }
+
     reference
     operator*() const;
 

include/xrpl/ledger/View.h

@@ -35,11 +35,6 @@ enum class SkipEntry : bool { No = false, Yes };
 //
 //------------------------------------------------------------------------------
 
-/**
- * Whether an expiration check should be inclusive or exclusive.
- */
-enum class ExpiryComparison { Inclusive, Exclusive };
-
 /**
  * Determines whether the given expiration time has passed.
  *
@@ -59,16 +54,11 @@ enum class ExpiryComparison { Inclusive, Exclusive };
  *
  * @param view The ledger whose parent time is used as the clock.
  * @param exp The optional expiration time we want to check.
- * @param comparison Whether the boundary is inclusive (`now >= exp`, the
- *                   default) or exclusive (`now > exp`).
  *
  * @return `true` if `exp` is in the past; `false` otherwise.
  */
 [[nodiscard]] bool
-hasExpired(
-    ReadView const& view,
-    std::optional<std::uint32_t> const& exp,
-    ExpiryComparison comparison = ExpiryComparison::Inclusive);
+hasExpired(ReadView const& view, std::optional<std::uint32_t> const& exp);
 
 // Note, depth parameter is used to limit the recursion depth
 [[nodiscard]] bool

include/xrpl/ledger/detail/ApplyStateTable.h

@@ -16,6 +16,7 @@
 #include <xrpl/protocol/XRPAmount.h>
 
 #include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <map>
 #include <optional>
@@ -62,6 +63,8 @@ public:
         TER ter,
         std::optional<STAmount> const& deliver,
         std::optional<uint256 const> const& parentBatchId,
+        std::optional<std::uint32_t> const& gasUsed,
+        std::optional<std::int32_t> const& vmReturnCode,
         bool isDryRun,
         beast::Journal j);
 

include/xrpl/ledger/detail/ReadViewFwdRange.h

@@ -85,6 +85,9 @@ public:
         bool
         operator==(Iterator const& other) const;
 
+        bool
+        operator!=(Iterator const& other) const;
+
         // Can throw
         reference
         operator*() const;

include/xrpl/ledger/detail/ReadViewFwdRange.ipp

@@ -64,6 +64,13 @@ ReadViewFwdRange<ValueType>::Iterator::operator==(Iterator const& other) const
     return impl_ == other.impl_;
 }
 
+template <class ValueType>
+bool
+ReadViewFwdRange<ValueType>::Iterator::operator!=(Iterator const& other) const
+{
+    return !(*this == other);
+}
+
 template <class ValueType>
 auto
 ReadViewFwdRange<ValueType>::Iterator::operator*() const -> reference

include/xrpl/ledger/helpers/AMMHelpers.h

@@ -226,7 +226,7 @@ getAMMOfferStartWithTakerGets(
 
     auto getAmounts = [&pool, &tfee](Number const& nTakerGetsProposed) {
         // Round downward to minimize the offer and to maximize the quality.
-        // This has the most impact when takerGets is integral.
+        // This has the most impact when takerGets is XRP.
         auto const takerGets =
             toAmount<TOut>(getAsset(pool.out), nTakerGetsProposed, Number::RoundingMode::Downward);
         return TAmounts<TIn, TOut>{swapAssetOut(pool, takerGets, tfee), takerGets};
@@ -294,7 +294,7 @@ getAMMOfferStartWithTakerPays(
 
     auto getAmounts = [&pool, &tfee](Number const& nTakerPaysProposed) {
         // Round downward to minimize the offer and to maximize the quality.
-        // This has the most impact when takerPays is integral.
+        // This has the most impact when takerPays is XRP.
         auto const takerPays =
             toAmount<TIn>(getAsset(pool.in), nTakerPaysProposed, Number::RoundingMode::Downward);
         return TAmounts<TIn, TOut>{takerPays, swapAssetIn(pool, takerPays, tfee)};
@@ -313,11 +313,11 @@ getAMMOfferStartWithTakerPays(
  * is equal to LOB quality (in this case AMM offer quality is
  * better than LOB quality) or AMM offer is equal to LOB quality
  * (in this case SPQ is better than LOB quality).
- * Pre-amendment code calculates takerPays first. If takerGets is the
- * economically coarser integral side, it is rounded down, which results in
- * worse offer quality than LOB quality, and the offer might fail to generate.
- * Post-amendment code calculates the economically coarser integral offer side
- * first. The result is rounded down, which makes the offer quality better.
+ * Pre-amendment code calculates takerPays first. If takerGets is XRP,
+ * it is rounded down, which results in worse offer quality than
+ * LOB quality, and the offer might fail to generate.
+ * Post-amendment code calculates the XRP offer side first. The result
+ * is rounded down, which makes the offer quality better.
  *   It might not be possible to match either SPQ or AMM offer to LOB
  * quality. This generally happens at higher fees.
  * @param pool AMM pool balances
@@ -396,18 +396,10 @@ changeSpotPriceQuality(
         return std::nullopt;
     }
 
+    // Generate the offer starting with XRP side. Return seated offer amounts
+    // if the offer can be generated, otherwise nullopt.
     auto amounts = [&]() {
-        bool const inIntegral = getAsset(pool.in).integral();
-        bool const outIntegral = getAsset(pool.out).integral();
-
-        // Preserve historical behavior for fractional pairs and XRP/IOU-style
-        // one-integral-side pairs. For two integral assets, pick the side whose
-        // minimum unit is economically coarser at this quality.
-        //
-        // Quality::rate() is input units per output unit, so one output unit is
-        // coarser when it costs at least one input unit. Ties use takerGets,
-        // matching the historical XRP-output behavior.
-        if (outIntegral && (!inIntegral || Number(quality.rate()) >= 1))
+        if (isXRP(getAsset(pool.out)))
             return getAMMOfferStartWithTakerGets(pool, quality, tfee);
         return getAMMOfferStartWithTakerPays(pool, quality, tfee);
     }();

include/xrpl/ledger/helpers/CredentialHelpers.h

@@ -7,7 +7,6 @@
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Rules.h>
 #include <xrpl/protocol/STArray.h>
 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol/STTx.h>
@@ -35,7 +34,7 @@ deleteSLE(ApplyView& view, SLE::ref sleCredential, beast::Journal j);
 
 // Amendment and parameters checks for sfCredentialIDs field
 NotTEC
-checkFields(STTx const& tx, Rules const& rules, beast::Journal j);
+checkFields(STTx const& tx, beast::Journal j);
 
 // Accessing the ledger to check if provided credentials are valid. Do not use
 // in doApply (only in preclaim) since it does not remove expired credentials.

include/xrpl/ledger/helpers/EscrowHelpers.h

@@ -25,6 +25,8 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/UintTypes.h>
 
+#include <cstdint>
+
 namespace xrpl {
 
 template <ValidIssueType T>
@@ -272,4 +274,15 @@ escrowUnlockApplyHelper<MPTIssue>(
         journal);
 }
 
+template <class T>
+static int32_t
+calculateAdditionalReserve(T const& finishFunction)
+{
+    if (!finishFunction)
+        return 1;
+    // First 500 bytes included in the normal reserve
+    // Each additional 500 bytes requires an additional reserve
+    return 1 + (finishFunction->size() / 500);
+}
+
 }  // namespace xrpl

include/xrpl/ledger/helpers/MPTokenHelpers.h

@@ -261,14 +261,6 @@ checkCreateMPT(
     xrpl::MPTIssue const& mptIssue,
     xrpl::AccountID const& holder,
     SLE::ref sponsorSle,
-    std::uint32_t flags,
-    beast::Journal j);
-
-TER
-checkCreateMPT(
-    xrpl::ApplyView& view,
-    xrpl::MPTIssue const& mptIssue,
-    xrpl::AccountID const& holder,
     beast::Journal j);
 
 //------------------------------------------------------------------------------

include/xrpl/ledger/helpers/VaultHelpers.h

@@ -6,13 +6,10 @@
 #include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/STLedgerEntry.h>
 
-#include <cstdint>
 #include <optional>
 
 namespace xrpl {
 
-class STTx;
-
 /**
  * From the perspective of a vault, return the number of shares to give
  * depositor when they offer a fixed amount of assets. Note, since shares are
@@ -126,82 +123,4 @@ isSoleShareholder(ReadView const& view, AccountID const& account, SLE::const_ref
 [[nodiscard]] VaultVersion
 getVaultVersion(SLE::const_ref vault);
 
-/**
- * Resolves the VaultKind of a vault SLE. Returns VaultKind::ClosedEnded when
- * sfVaultKind is present and equal to that value; anything else (including an
- * absent field or an unrecognised value) is treated as VaultKind::OpenEnded.
- *
- * @param vault The vault SLE.
- */
-[[nodiscard]] VaultKind
-getVaultKind(SLE::const_ref vault);
-
-/**
- * Reads sfVaultKind from a transaction. An absent field resolves to
- * VaultKind::OpenEnded (matching the on-ledger default); any unrecognised
- * value is also treated as VaultKind::OpenEnded, mirroring the SLE overload.
- * Callers that need to reject out-of-range values (e.g. preflight) should
- * gate on isValidVaultKind() first.
- *
- * @param tx The transaction.
- */
-[[nodiscard]] VaultKind
-getVaultKind(STTx const& tx);
-
-/**
- * Returns true iff sfVaultKind is either absent from @p tx or is present and
- * equal to a recognised VaultKind enumerator. Intended for use in preflight
- * to reject malformed transactions before decoding with getVaultKind().
- *
- * @param tx The transaction.
- */
-[[nodiscard]] bool
-isValidVaultKind(STTx const& tx);
-
-/**
- * Returns true iff the (SubscriptionDate, RedemptionDate) gap of a
- * closed-ended vault satisfies
- * kMinInvestmentPeriod <= (red - sub) < kMaxInvestmentPeriod. The arithmetic
- * is performed in std::int64_t so that @p sub near UINT32_MAX does not
- * overflow. Shared by VaultCreate::preflight and the ValidVault invariant.
- *
- * @param sub The value of sfSubscriptionDate.
- * @param red The value of sfRedemptionDate.
- */
-[[nodiscard]] bool
-isValidClosedEndedGap(std::uint32_t sub, std::uint32_t red);
-
-/**
- * Returns the current lifecycle phase of a vault. Open-ended
- * vaults are always NoPhase. For closed-ended vaults the phase is derived
- * from the parent ledger close time and the vault's immutable
- * SubscriptionDate and RedemptionDate.
- *
- * @param view The ledger view whose parent close time is used as the clock.
- * @param vault The vault SLE.
- */
-[[nodiscard]] VaultPhase
-getVaultPhase(ReadView const& view, SLE::const_ref vault);
-
-/**
- * Raw-fields overload of getVaultPhase. Derives the phase from an already
- * decomposed vault snapshot: an absent or non-ClosedEnded @p vaultKind
- * resolves to VaultPhase::NoPhase; otherwise the phase is computed from
- * @p subscriptionDate and @p redemptionDate against the view's parent
- * close time using the same boundary semantics as the SLE overload
- * (Subscription is inclusive of now == SubscriptionDate; Investment starts
- * strictly after).
- *
- * @param view The ledger view whose parent close time is used as the clock.
- * @param vaultKind The value of sfVaultKind, or nullopt if absent.
- * @param subscriptionDate The value of sfSubscriptionDate, or nullopt if absent.
- * @param redemptionDate The value of sfRedemptionDate, or nullopt if absent.
- */
-[[nodiscard]] VaultPhase
-getVaultPhase(
-    ReadView const& view,
-    std::optional<std::uint8_t> vaultKind,
-    std::optional<std::uint32_t> subscriptionDate,
-    std::optional<std::uint32_t> redemptionDate);
-
 }  // namespace xrpl

include/xrpl/protocol/AMMCore.h

@@ -47,7 +47,7 @@ ammLPTIssue(Asset const& asset1, Asset const& asset2, AccountID const& ammAccoun
 
 /**
  * Validate the amount.
- * If validZero is false and amount is beast::kZero then invalid amount.
+ * If validZero is false and amount is beast::zero then invalid amount.
  * Return error code if invalid amount.
  * If pair then validate amount's issue matches one of the pair's issue.
  */

include/xrpl/protocol/AmountConversions.h

@@ -154,7 +154,7 @@ T
 toAmount(Asset const& asset, Number const& n, Number::RoundingMode mode = Number::getround())
 {
     SaveNumberRoundMode const rm(Number::getround());
-    if (asset.integral())
+    if (isXRP(asset))
         Number::setround(mode);
 
     if constexpr (std::is_same_v<IOUAmount, T>)

include/xrpl/protocol/Fees.h

@@ -10,6 +10,15 @@ namespace xrpl {
 // This was the reference fee units used in the old fee calculation.
 inline constexpr std::uint32_t kFeeUnitsDeprecated = 10;
 
+// Number of micro-drops in one drop.
+constexpr std::uint32_t microDropsPerDrop{1'000'000};
+
+/**
+ * Maximum Feature Extension fee settings.
+ */
+inline constexpr std::uint32_t kMaxGasLimit{2'000'000};
+inline constexpr std::uint32_t kMaxBytecodeSizeLimit{200'000};
+
 /**
  * Reflects the fee settings for a particular ledger.
  *
@@ -33,6 +42,21 @@ struct Fees
      */
     XRPAmount increment{0};
 
+    /**
+     * @brief Gas limit for Feature Extensions (instructions).
+     */
+    std::uint32_t gasLimit{0};
+
+    /**
+     * @brief Bytecode size limit for Feature Extensions (bytes).
+     */
+    std::uint32_t bytecodeSizeLimit{0};
+
+    /**
+     * @brief Price of WASM gas (micro-drops).
+     */
+    std::uint32_t gasPrice{0};
+
     explicit Fees() = default;
     Fees(Fees const&) = default;
     Fees&

include/xrpl/protocol/Indexes.h

@@ -237,6 +237,12 @@ page(Keylet const& root, std::uint64_t const index = 0) noexcept
 Keylet
 escrow(AccountID const& src, SeqProxy const& seq) noexcept;
 
+inline Keylet
+escrow(uint256 const& key) noexcept
+{
+    return {ltESCROW, key};
+}
+
 /**
  * A PaymentChannel
  */

include/xrpl/protocol/Protocol.h

@@ -9,7 +9,6 @@
 #include <mpt_protocol.h>
 #include <secp256k1_mpt.h>
 
-#include <chrono>
 #include <cstddef>
 #include <cstdint>
 
@@ -328,42 +327,22 @@ enum class VaultVersion : uint8_t {
     CashBasis,
 };
 
-/**
- * Vault kind. Distinguishes closed-ended vaults from the default open-ended
- * kind. Persisted as sfVaultKind (UINT8); absent means OpenEnded.
- */
-enum class VaultKind : std::uint8_t {
-    OpenEnded = 0,
-    ClosedEnded = 1,
-};
-
-/**
- * Lifecycle phase of a vault. Open-ended vaults are always NoPhase; the other
- * three values are the phases of a closed-ended vault.
- */
-enum class VaultPhase : std::uint8_t {
-    NoPhase = 0,
-    Subscription,
-    Investment,
-    Redemption,
-};
-
-/**
- * Bounds on the length of a closed-ended vault's Investment phase
- * (RedemptionDate - SubscriptionDate). At vault creation the gap must satisfy
- * kMinInvestmentPeriod <= gap < kMaxInvestmentPeriod.
- */
-constexpr std::uint32_t kMinInvestmentPeriod =
-    std::chrono::seconds{std::chrono::minutes{1}}.count();
-// This is 946708560 seconds which 30 x 365.2425 days (the average length of a Gregorian year).
-constexpr std::uint32_t kMaxInvestmentPeriod = std::chrono::seconds{std::chrono::years{30}}.count();
-
 /**
  * Maximum recursion depth for vault shares being put as an asset inside
  * another vault; counted from 0
  */
 constexpr std::uint8_t kMaxAssetCheckDepth = 5;
 
+/**
+ * Maximum length of a Data field in Escrow object that can be updated by WASM code.
+ */
+constexpr std::size_t kMaxWasmDataLength = 1 * 1024;  // 1KB
+
+/**
+ * Maximum amount of data transfer across hostfunction<->wasm border.
+ */
+constexpr std::size_t kWasmTransferLimit = 1 << 20;  // 1MB
+
 /**
  * A ledger index.
  */

include/xrpl/protocol/Quality.h

@@ -75,6 +75,13 @@ operator==(TAmounts<In, Out> const& lhs, TAmounts<In, Out> const& rhs) noexcept
     return lhs.in == rhs.in && lhs.out == rhs.out;
 }
 
+template <class In, class Out>
+bool
+operator!=(TAmounts<In, Out> const& lhs, TAmounts<In, Out> const& rhs) noexcept
+{
+    return !(lhs == rhs);
+}
+
 //------------------------------------------------------------------------------
 
 // XRPL specific constant used for parsing qualities and other things
@@ -264,6 +271,12 @@ public:
         return lhs.value_ == rhs.value_;
     }
 
+    friend bool
+    operator!=(Quality const& lhs, Quality const& rhs) noexcept
+    {
+        return !(lhs == rhs);
+    }
+
     friend std::ostream&
     operator<<(std::ostream& os, Quality const& quality)
     {

include/xrpl/protocol/QualityFunction.h

@@ -60,15 +60,6 @@ public:
     std::optional<Number>
     outFromAvgQ(Quality const& quality);
 
-    /**
-     * Return whether `out` produces at least the requested
-     * average quality.
-     * @param quality requested average quality (quality limit)
-     * @param out output amount to test
-     */
-    [[nodiscard]] bool
-    satisfiesAvgQ(Quality const& quality, Number const& out) const;
-
     /**
      * Return true if the quality function is constant
      */

include/xrpl/protocol/Rules.h

@@ -98,6 +98,9 @@ public:
      */
     bool
     operator==(Rules const&) const;
+
+    bool
+    operator!=(Rules const& other) const;
 };
 
 std::optional<Rules> const&

include/xrpl/protocol/STAmount.h

@@ -642,6 +642,12 @@ operator==(STAmount const& lhs, STAmount const& rhs);
 bool
 operator<(STAmount const& lhs, STAmount const& rhs);
 
+inline bool
+operator!=(STAmount const& lhs, STAmount const& rhs)
+{
+    return !(lhs == rhs);
+}
+
 inline bool
 operator>(STAmount const& lhs, STAmount const& rhs)
 {

include/xrpl/protocol/STArray.h

@@ -133,6 +133,9 @@ public:
     bool
     operator==(STArray const& s) const;
 
+    bool
+    operator!=(STArray const& s) const;
+
     iterator
     erase(iterator pos);
 
@@ -280,6 +283,12 @@ STArray::operator==(STArray const& s) const
     return v_ == s.v_;
 }
 
+inline bool
+STArray::operator!=(STArray const& s) const
+{
+    return v_ != s.v_;
+}
+
 inline STArray::iterator
 STArray::erase(iterator pos)
 {

include/xrpl/protocol/STBase.h

@@ -140,6 +140,8 @@ public:
 
     bool
     operator==(STBase const& t) const;
+    bool
+    operator!=(STBase const& t) const;
 
     template <class D>
     D&

include/xrpl/protocol/STCurrency.h

@@ -93,6 +93,12 @@ operator==(STCurrency const& lhs, STCurrency const& rhs)
     return lhs.currency() == rhs.currency();
 }
 
+inline bool
+operator!=(STCurrency const& lhs, STCurrency const& rhs)
+{
+    return !operator==(lhs, rhs);
+}
+
 inline bool
 operator<(STCurrency const& lhs, STCurrency const& rhs)
 {

include/xrpl/protocol/STObject.h

@@ -432,6 +432,8 @@ public:
 
     bool
     operator==(STObject const& o) const;
+    bool
+    operator!=(STObject const& o) const;
 
     class FieldErr;
 
@@ -665,6 +667,36 @@ public:
         return !lhs.engaged() || *lhs == *rhs;
     }
 
+    friend bool
+    operator!=(OptionalProxy const& lhs, std::nullopt_t) noexcept
+    {
+        return !(lhs == std::nullopt);
+    }
+
+    friend bool
+    operator!=(std::nullopt_t, OptionalProxy const& rhs) noexcept
+    {
+        return !(rhs == std::nullopt);
+    }
+
+    friend bool
+    operator!=(OptionalProxy const& lhs, optional_type const& rhs) noexcept
+    {
+        return !(lhs == rhs);
+    }
+
+    friend bool
+    operator!=(optional_type const& lhs, OptionalProxy const& rhs) noexcept
+    {
+        return !(lhs == rhs);
+    }
+
+    friend bool
+    operator!=(OptionalProxy const& lhs, OptionalProxy const& rhs) noexcept
+    {
+        return !(lhs == rhs);
+    }
+
     // Emulate std::optional::value_or
     [[nodiscard]] value_type
     valueOr(value_type val) const;
@@ -1170,6 +1202,12 @@ STObject::setFieldH160(SField const& field, BaseUInt<160, Tag> const& v)
     }
 }
 
+inline bool
+STObject::operator!=(STObject const& o) const
+{
+    return !(*this == o);
+}
+
 template <typename T, typename V>
 V
 STObject::getFieldByValue(SField const& field) const

include/xrpl/protocol/STPathSet.h

@@ -115,6 +115,9 @@ public:
     bool
     operator==(STPathElement const& t) const;
 
+    bool
+    operator!=(STPathElement const& t) const;
+
 private:
     static std::size_t
     getHash(STPathElement const& element);
@@ -429,6 +432,12 @@ STPathElement::operator==(STPathElement const& t) const
         accountID_ == t.accountID_ && assetID_ == t.assetID_ && issuerID_ == t.issuerID_;
 }
 
+inline bool
+STPathElement::operator!=(STPathElement const& t) const
+{
+    return !operator==(t);
+}
+
 // ------------ STPath ------------
 
 inline STPath::STPath(std::vector<STPathElement> p) : path_(std::move(p))

include/xrpl/protocol/SeqProxy.h

@@ -123,6 +123,12 @@ public:
         return (lhs.value() == rhs.value());
     }
 
+    friend constexpr bool
+    operator!=(SeqProxy lhs, SeqProxy rhs)
+    {
+        return !(lhs == rhs);
+    }
+
     friend constexpr bool
     operator<(SeqProxy lhs, SeqProxy rhs)
     {

include/xrpl/protocol/Serializer.h

@@ -265,10 +265,20 @@ public:
         return v == data_;
     }
     bool
+    operator!=(Blob const& v) const
+    {
+        return v != data_;
+    }
+    bool
     operator==(Serializer const& v) const
     {
         return v.data_ == data_;
     }
+    bool
+    operator!=(Serializer const& v) const
+    {
+        return v.data_ != data_;
+    }
 
     static int
     decodeLengthLength(int b1);

include/xrpl/protocol/TER.h

@@ -129,8 +129,12 @@ enum TEMcodes : TERUnderlyingType {
     temARRAY_TOO_LARGE,
     temBAD_TRANSFER_FEE,
     temINVALID_INNER_BATCH,
+
     temBAD_MPT,
     temBAD_CIPHERTEXT,
+    temBAD_WASM,
+    temINVALID_BYTECODE,
+    temTEMP_DISABLED,
 };
 
 //------------------------------------------------------------------------------
@@ -179,6 +183,8 @@ enum TEFcodes : TERUnderlyingType {
     tefINVALID_LEDGER_FIX_TYPE,
     tefNO_DST_PARTIAL,
     tefBAD_PATH_COUNT,
+    tefNO_BYTECODE,
+    tefBYTECODE_NOT_INCLUDED,
 };
 
 //------------------------------------------------------------------------------
@@ -370,6 +376,8 @@ enum TECcodes : TERUnderlyingType {
     tecNO_DELEGATE_PERMISSION = 198,
     tecBAD_PROOF = 199,
     tecNO_SPONSOR_PERMISSION = 200,
+    tecOUT_OF_GAS = 201,
+    tecBYTECODE_REJECTED = 202,
 };
 
 //------------------------------------------------------------------------------

include/xrpl/protocol/TxFlags.h

@@ -425,7 +425,8 @@ inline constexpr FlagValue tfDepositSubTx =
     ASF_FLAG(asfDefaultRipple, 8)                 \
     ASF_FLAG(asfDepositAuth, 9)                   \
     ASF_FLAG(asfAuthorizedNFTokenMinter, 10)      \
-    /*  11 is unused */                           \
+    /*  11 is reserved for Hooks amendment */     \
+    /* ASF_FLAG(asfTshCollect, 11) */             \
     ASF_FLAG(asfDisallowIncomingNFTokenOffer, 12) \
     ASF_FLAG(asfDisallowIncomingCheck, 13)        \
     ASF_FLAG(asfDisallowIncomingPayChan, 14)      \

include/xrpl/protocol/TxMeta.h

@@ -95,6 +95,12 @@ public:
 
         if (obj.isFieldPresent(sfParentBatchID))
             parentBatchID_ = obj.getFieldH256(sfParentBatchID);
+
+        if (obj.isFieldPresent(sfGasUsed))
+            gasUsed_ = obj.getFieldU32(sfGasUsed);
+
+        if (obj.isFieldPresent(sfVMReturnCode))
+            vmReturnCode_ = obj.getFieldI32(sfVMReturnCode);
     }
 
     [[nodiscard]] std::optional<STAmount> const&
@@ -115,6 +121,30 @@ public:
         parentBatchID_ = id;
     }
 
+    void
+    setGasUsed(std::optional<std::uint32_t> const gasUsed)
+    {
+        gasUsed_ = gasUsed;
+    }
+
+    [[nodiscard]] std::optional<std::uint32_t> const&
+    getGasUsed() const
+    {
+        return gasUsed_;
+    }
+
+    void
+    setVMReturnCode(std::optional<std::int32_t> const vmReturnCode)
+    {
+        vmReturnCode_ = vmReturnCode;
+    }
+
+    [[nodiscard]] std::optional<std::int32_t> const&
+    getVMReturnCode() const
+    {
+        return vmReturnCode_;
+    }
+
 private:
     uint256 transactionID_;
     std::uint32_t ledgerSeq_;
@@ -123,6 +153,8 @@ private:
 
     std::optional<STAmount> deliveredAmount_;
     std::optional<uint256> parentBatchID_;
+    std::optional<std::uint32_t> gasUsed_;
+    std::optional<std::int32_t> vmReturnCode_;
 
     STArray nodes_;
 };

include/xrpl/protocol/Units.h

@@ -258,6 +258,13 @@ public:
         return value_ == other;
     }
 
+    template <Compatible<ValueUnit> Other>
+    constexpr bool
+    operator!=(ValueUnit<unit_type, Other> const& other) const
+    {
+        return !operator==(other);
+    }
+
     constexpr bool
     operator<(ValueUnit const& other) const
     {

include/xrpl/protocol/detail/STVar.h

@@ -152,4 +152,10 @@ operator==(STVar const& lhs, STVar const& rhs)
     return lhs.get().isEquivalent(rhs.get());
 }
 
+inline bool
+operator!=(STVar const& lhs, STVar const& rhs)
+{
+    return !(lhs == rhs);
+}
+
 }  // namespace xrpl::detail

include/xrpl/protocol/detail/features.macro

@@ -16,6 +16,7 @@
 // Keep it sorted in reverse chronological order.
 
 XRPL_FIX    (Cleanup3_4_0,                Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(SmartEscrow,                 Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(Sponsor,                     Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(BatchV1_1,                   Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(LendingProtocolV1_1,         Supported::No,  VoteBehavior::DefaultNo)

include/xrpl/protocol/detail/ledger_entries.macro

@@ -309,6 +309,11 @@ LEDGER_ENTRY(ltFEE_SETTINGS, 0x0073, FeeSettings, fee, ({
     {sfBaseFeeDrops,           SoeOptional},
     {sfReserveBaseDrops,       SoeOptional},
     {sfReserveIncrementDrops,  SoeOptional},
+    // Smart Escrow fields
+    {sfGasLimit,               SoeOptional},
+    {sfBytecodeSizeLimit,      SoeOptional},
+    {sfGasPrice,               SoeOptional},
+
     {sfPreviousTxnID,          SoeOptional},
     {sfPreviousTxnLgrSeq,      SoeOptional},
 }))
@@ -339,6 +344,8 @@ LEDGER_ENTRY(ltESCROW, 0x0075, Escrow, escrow, ({
     {sfCondition,            SoeOptional},
     {sfCancelAfter,          SoeOptional},
     {sfFinishAfter,          SoeOptional},
+    {sfBytecode,             SoeOptional},
+    {sfData,                 SoeOptional},
     {sfSourceTag,            SoeOptional},
     {sfDestinationTag,       SoeOptional},
     {sfOwnerNode,            SoeRequired},
@@ -506,9 +513,6 @@ LEDGER_ENTRY(ltVAULT, 0x0084, Vault, vault, ({
     {sfWithdrawalPolicy,     SoeRequired},
     {sfScale,                SoeDefault},
     {sfLEVersion,            SoeDefault},
-    {sfVaultKind,            SoeDefault},
-    {sfSubscriptionDate,     SoeOptional},
-    {sfRedemptionDate,       SoeOptional},
     // no SharesTotal ever (use MPTIssuance.sfOutstandingAmount)
     // no PermissionedDomainID ever (use MPTIssuance.sfDomainID)
 }))

include/xrpl/protocol/detail/sfields.macro

@@ -23,11 +23,9 @@ TYPED_SFIELD(sfLEVersion,                UINT8,      6)
 // 8-bit integers (uncommon)
 TYPED_SFIELD(sfTickSize,                 UINT8,     16)
 TYPED_SFIELD(sfUNLModifyDisabling,       UINT8,     17)
-// 18 unused
+TYPED_SFIELD(sfHookResult,               UINT8,     18)
 TYPED_SFIELD(sfWasLockingChainSend,      UINT8,     19)
 TYPED_SFIELD(sfWithdrawalPolicy,         UINT8,     20)
-TYPED_SFIELD(sfContractResult,           UINT8,     21)
-TYPED_SFIELD(sfVaultKind,                UINT8,     22)
 
 // 16-bit integers (common)
 TYPED_SFIELD(sfLedgerEntryType,          UINT16,     1, SField::kSmdNever)
@@ -39,7 +37,10 @@ TYPED_SFIELD(sfDiscountedFee,            UINT16,     6)
 
 // 16-bit integers (uncommon)
 TYPED_SFIELD(sfVersion,                  UINT16,    16)
-// 17 to 20 unused
+TYPED_SFIELD(sfHookStateChangeCount,     UINT16,    17)
+TYPED_SFIELD(sfHookEmitCount,            UINT16,    18)
+TYPED_SFIELD(sfHookExecutionIndex,       UINT16,    19)
+TYPED_SFIELD(sfHookApiVersion,           UINT16,    20)
 TYPED_SFIELD(sfLedgerFixType,            UINT16,    21)
 TYPED_SFIELD(sfManagementFeeRate,        UINT16,    22) // 1/10 basis points (bips)
 
@@ -90,7 +91,9 @@ TYPED_SFIELD(sfTicketSequence,           UINT32,    41)
 TYPED_SFIELD(sfNFTokenTaxon,             UINT32,    42)
 TYPED_SFIELD(sfMintedNFTokens,           UINT32,    43)
 TYPED_SFIELD(sfBurnedNFTokens,           UINT32,    44)
-// 45 to 47 unused
+TYPED_SFIELD(sfHookStateCount,           UINT32,    45)
+TYPED_SFIELD(sfEmitGeneration,           UINT32,    46)
+//                                                  47 reserved for Hooks
 TYPED_SFIELD(sfVoteWeight,               UINT32,    48)
 TYPED_SFIELD(sfFirstNFTokenSequence,     UINT32,    50)
 TYPED_SFIELD(sfOracleDocumentID,         UINT32,    51)
@@ -117,8 +120,11 @@ TYPED_SFIELD(sfSponsoringOwnerCount,     UINT32,    71)
 TYPED_SFIELD(sfSponsoringAccountCount,   UINT32,    72)
 TYPED_SFIELD(sfRemainingOwnerCount,      UINT32,    73)
 TYPED_SFIELD(sfSponsorFlags,             UINT32,    74)
-TYPED_SFIELD(sfSubscriptionDate,         UINT32,    75)
-TYPED_SFIELD(sfRedemptionDate,           UINT32,    76)
+TYPED_SFIELD(sfGasLimit,                 UINT32,    75)
+TYPED_SFIELD(sfBytecodeSizeLimit,        UINT32,    76)
+TYPED_SFIELD(sfGasPrice,                 UINT32,    77)
+TYPED_SFIELD(sfGas,                      UINT32,    78)
+TYPED_SFIELD(sfGasUsed,                  UINT32,    79)
 
 // 64-bit integers (common)
 TYPED_SFIELD(sfIndexNext,                UINT64,     1)
@@ -136,7 +142,9 @@ TYPED_SFIELD(sfNFTokenOfferNode,         UINT64,    12)
 TYPED_SFIELD(sfEmitBurden,               UINT64,    13)
 
 // 64-bit integers (uncommon)
-// 16 to 18 unused
+TYPED_SFIELD(sfHookOn,                   UINT64,    16)
+TYPED_SFIELD(sfHookInstructionCount,     UINT64,    17)
+TYPED_SFIELD(sfHookReturnCode,           UINT64,    18)
 TYPED_SFIELD(sfReferenceCount,           UINT64,    19)
 TYPED_SFIELD(sfXChainClaimID,            UINT64,    20)
 TYPED_SFIELD(sfXChainAccountCreateCount, UINT64,    21)
@@ -200,7 +208,10 @@ TYPED_SFIELD(sfPreviousPageMin,          UINT256,   26)
 TYPED_SFIELD(sfNextPageMin,              UINT256,   27)
 TYPED_SFIELD(sfNFTokenBuyOffer,          UINT256,   28)
 TYPED_SFIELD(sfNFTokenSellOffer,         UINT256,   29)
-// 30 to 33 unused
+TYPED_SFIELD(sfHookStateKey,             UINT256,   30)
+TYPED_SFIELD(sfHookHash,                 UINT256,   31)
+TYPED_SFIELD(sfHookNamespace,            UINT256,   32)
+TYPED_SFIELD(sfHookSetTxnID,             UINT256,   33)
 TYPED_SFIELD(sfDomainID,                 UINT256,   34)
 TYPED_SFIELD(sfVaultID,                  UINT256,   35,
     SField::kSmdPseudoAccount | SField::kSmdDefault)
@@ -234,6 +245,7 @@ TYPED_SFIELD(sfManagementFeeOutstanding, NUMBER,     17, SField::kSmdNeedsAsset
 // 32-bit signed (common)
 TYPED_SFIELD(sfLoanScale,                INT32,      1)
 TYPED_SFIELD(sfRemainingOwnerCountDelta, INT32,      2)
+TYPED_SFIELD(sfVMReturnCode,             INT32,      3)
 
 // currency amount (common)
 TYPED_SFIELD(sfAmount,                   AMOUNT,     1)
@@ -255,7 +267,9 @@ TYPED_SFIELD(sfMinimumOffer,             AMOUNT,    16)
 TYPED_SFIELD(sfRippleEscrow,             AMOUNT,    17)
 TYPED_SFIELD(sfDeliveredAmount,          AMOUNT,    18)
 TYPED_SFIELD(sfNFTokenBrokerFee,         AMOUNT,    19)
-// 20 to 21 unused
+
+// Reserve 20 & 21 for Hooks.
+
 // currency amount (fees)
 TYPED_SFIELD(sfBaseFeeDrops,             AMOUNT,    22)
 TYPED_SFIELD(sfReserveBaseDrops,         AMOUNT,    23)
@@ -296,7 +310,10 @@ TYPED_SFIELD(sfMasterSignature,          VL,        18, SField::kSmdDefault, SFi
 TYPED_SFIELD(sfUNLModifyValidator,       VL,        19)
 TYPED_SFIELD(sfValidatorToDisable,       VL,        20)
 TYPED_SFIELD(sfValidatorToReEnable,      VL,        21)
-// 22 to 25 unused
+TYPED_SFIELD(sfHookStateData,            VL,        22)
+TYPED_SFIELD(sfHookReturnString,         VL,        23)
+TYPED_SFIELD(sfHookParameterName,        VL,        24)
+TYPED_SFIELD(sfHookParameterValue,       VL,        25)
 TYPED_SFIELD(sfDIDDocument,              VL,        26)
 TYPED_SFIELD(sfData,                     VL,        27)
 TYPED_SFIELD(sfAssetClass,               VL,        28)
@@ -318,6 +335,7 @@ TYPED_SFIELD(sfAuditorEncryptedAmount,      VL,     43)
 TYPED_SFIELD(sfAuditorEncryptionKey,        VL,     44)
 TYPED_SFIELD(sfAmountCommitment,            VL,     45)
 TYPED_SFIELD(sfBalanceCommitment,           VL,     46)
+TYPED_SFIELD(sfBytecode,                    VL,     47)
 
 // account (common)
 TYPED_SFIELD(sfAccount,                  ACCOUNT,    1)
@@ -334,7 +352,7 @@ TYPED_SFIELD(sfHolder,                   ACCOUNT,   11)
 TYPED_SFIELD(sfDelegate,                 ACCOUNT,   12)
 
 // account (uncommon)
-// 16 unused
+TYPED_SFIELD(sfHookAccount,              ACCOUNT,   16)
 TYPED_SFIELD(sfOtherChainSource,         ACCOUNT,   18)
 TYPED_SFIELD(sfOtherChainDestination,    ACCOUNT,   19)
 TYPED_SFIELD(sfAttestationSignerAccount, ACCOUNT,   20)
@@ -387,7 +405,7 @@ UNTYPED_SFIELD(sfMemo,                   OBJECT,    10)
 UNTYPED_SFIELD(sfSignerEntry,            OBJECT,    11)
 UNTYPED_SFIELD(sfNFToken,                OBJECT,    12)
 UNTYPED_SFIELD(sfEmitDetails,            OBJECT,    13)
-// 14 unused
+UNTYPED_SFIELD(sfHook,                   OBJECT,    14)
 UNTYPED_SFIELD(sfPermission,             OBJECT,    15)
 
 // inner object (uncommon)
@@ -395,7 +413,11 @@ UNTYPED_SFIELD(sfSigner,                 OBJECT,    16)
 //                                                  17 unused
 UNTYPED_SFIELD(sfMajority,               OBJECT,    18)
 UNTYPED_SFIELD(sfDisabledValidator,      OBJECT,    19)
-// 20 to 24 unused
+UNTYPED_SFIELD(sfEmittedTxn,             OBJECT,    20)
+UNTYPED_SFIELD(sfHookExecution,          OBJECT,    21)
+UNTYPED_SFIELD(sfHookDefinition,         OBJECT,    22)
+UNTYPED_SFIELD(sfHookParameter,          OBJECT,    23)
+UNTYPED_SFIELD(sfHookGrant,              OBJECT,    24)
 UNTYPED_SFIELD(sfVoteEntry,              OBJECT,    25)
 UNTYPED_SFIELD(sfAuctionSlot,            OBJECT,    26)
 UNTYPED_SFIELD(sfAuthAccount,            OBJECT,    27)
@@ -423,14 +445,16 @@ UNTYPED_SFIELD(sfSufficient,             ARRAY,      7)
 UNTYPED_SFIELD(sfAffectedNodes,          ARRAY,      8)
 UNTYPED_SFIELD(sfMemos,                  ARRAY,      9)
 UNTYPED_SFIELD(sfNFTokens,               ARRAY,     10)
-// 11 unused
+UNTYPED_SFIELD(sfHooks,                  ARRAY,     11)
 UNTYPED_SFIELD(sfVoteSlots,              ARRAY,     12)
 UNTYPED_SFIELD(sfAdditionalBooks,        ARRAY,     13)
 
 // array of objects (uncommon)
 UNTYPED_SFIELD(sfMajorities,             ARRAY,     16)
 UNTYPED_SFIELD(sfDisabledValidators,     ARRAY,     17)
-// 18 to 20 unused
+UNTYPED_SFIELD(sfHookExecutions,         ARRAY,     18)
+UNTYPED_SFIELD(sfHookParameters,         ARRAY,     19)
+UNTYPED_SFIELD(sfHookGrants,             ARRAY,     20)
 UNTYPED_SFIELD(sfXChainClaimAttestations, ARRAY,    21)
 UNTYPED_SFIELD(sfXChainCreateAccountAttestations, ARRAY, 22)
 //                                                  23 unused

include/xrpl/protocol/detail/transactions.macro

@@ -50,11 +50,13 @@ TRANSACTION(ttESCROW_CREATE, 1, EscrowCreate,
     NoPriv,
     ({
     {sfDestination, SoeRequired},
+    {sfDestinationTag, SoeOptional},
     {sfAmount, SoeRequired, SoeMptSupported},
     {sfCondition, SoeOptional},
     {sfCancelAfter, SoeOptional},
     {sfFinishAfter, SoeOptional},
-    {sfDestinationTag, SoeOptional},
+    {sfBytecode, SoeOptional},
+    {sfData,           SoeOptional},
 }))
 
 /** This transaction type completes an existing escrow. */
@@ -71,6 +73,7 @@ TRANSACTION(ttESCROW_FINISH, 2, EscrowFinish,
     {sfFulfillment, SoeOptional},
     {sfCondition, SoeOptional},
     {sfCredentialIDs, SoeOptional},
+    {sfGas, SoeOptional},
 }))
 
 
@@ -862,9 +865,6 @@ TRANSACTION(ttVAULT_CREATE, 65, VaultCreate,
     {sfWithdrawalPolicy, SoeOptional},
     {sfData, SoeOptional},
     {sfScale, SoeOptional},
-    {sfVaultKind, SoeOptional},
-    {sfSubscriptionDate, SoeOptional},
-    {sfRedemptionDate, SoeOptional},
 }))
 
 /** This transaction updates a single asset vault. */
@@ -1231,6 +1231,10 @@ TRANSACTION(ttFEE, 101, SetFee,
     {sfBaseFeeDrops, SoeOptional},
     {sfReserveBaseDrops, SoeOptional},
     {sfReserveIncrementDrops, SoeOptional},
+    // Smart Escrow fields
+    {sfGasLimit, SoeOptional},
+    {sfBytecodeSizeLimit, SoeOptional},
+    {sfGasPrice, SoeOptional},
 }))
 
 /** This system-generated transaction type is used to update the network's negative UNL

include/xrpl/protocol/jss.h

@@ -252,6 +252,9 @@ JSS(expected_date);                  // out: any (warnings)
 JSS(expected_date_UTC);              // out: any (warnings)
 JSS(expected_ledger_size);           // out: TxQ
 JSS(expiration);                     // out: AccountOffers, AccountChannels, ValidatorList, amm_info
+JSS(gas_limit);                      // out: NetworkOPs
+JSS(bytecode_size_limit);            // out: NetworkOPs
+JSS(gas_price);                      // out: NetworkOPs
 JSS(fail_hard);                      // in: Sign, Submit
 JSS(failed);                         // out: InboundLedger
 JSS(feature);                        // in: Feature

include/xrpl/protocol_autogen/ledger_entries/Escrow.h

@@ -174,6 +174,54 @@ public:
         return this->sle_->isFieldPresent(sfFinishAfter);
     }
 
+    /**
+     * @brief Get sfBytecode (SoeOptional)
+     * @return The field value, or std::nullopt if not present.
+     */
+    [[nodiscard]]
+    protocol_autogen::Optional<SF_VL::type::value_type>
+    getBytecode() const
+    {
+        if (hasBytecode())
+            return this->sle_->at(sfBytecode);
+        return std::nullopt;
+    }
+
+    /**
+     * @brief Check if sfBytecode is present.
+     * @return True if the field is present, false otherwise.
+     */
+    [[nodiscard]]
+    bool
+    hasBytecode() const
+    {
+        return this->sle_->isFieldPresent(sfBytecode);
+    }
+
+    /**
+     * @brief Get sfData (SoeOptional)
+     * @return The field value, or std::nullopt if not present.
+     */
+    [[nodiscard]]
+    protocol_autogen::Optional<SF_VL::type::value_type>
+    getData() const
+    {
+        if (hasData())
+            return this->sle_->at(sfData);
+        return std::nullopt;
+    }
+
+    /**
+     * @brief Check if sfData is present.
+     * @return True if the field is present, false otherwise.
+     */
+    [[nodiscard]]
+    bool
+    hasData() const
+    {
+        return this->sle_->isFieldPresent(sfData);
+    }
+
     /**
      * @brief Get sfSourceTag (SoeOptional)
      * @return The field value, or std::nullopt if not present.
@@ -453,6 +501,28 @@ public:
         return *this;
     }
 
+    /**
+     * @brief Set sfBytecode (SoeOptional)
+     * @return Reference to this builder for method chaining.
+     */
+    EscrowBuilder&
+    setBytecode(std::decay_t<typename SF_VL::type::value_type> const& value)
+    {
+        object_[sfBytecode] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfData (SoeOptional)
+     * @return Reference to this builder for method chaining.
+     */
+    EscrowBuilder&
+    setData(std::decay_t<typename SF_VL::type::value_type> const& value)
+    {
+        object_[sfData] = value;
+        return *this;
+    }
+
     /**
      * @brief Set sfSourceTag (SoeOptional)
      * @return Reference to this builder for method chaining.

include/xrpl/protocol_autogen/ledger_entries/FeeSettings.h

@@ -213,6 +213,78 @@ public:
         return this->sle_->isFieldPresent(sfReserveIncrementDrops);
     }
 
+    /**
+     * @brief Get sfGasLimit (SoeOptional)
+     * @return The field value, or std::nullopt if not present.
+     */
+    [[nodiscard]]
+    protocol_autogen::Optional<SF_UINT32::type::value_type>
+    getGasLimit() const
+    {
+        if (hasGasLimit())
+            return this->sle_->at(sfGasLimit);
+        return std::nullopt;
+    }
+
+    /**
+     * @brief Check if sfGasLimit is present.
+     * @return True if the field is present, false otherwise.
+     */
+    [[nodiscard]]
+    bool
+    hasGasLimit() const
+    {
+        return this->sle_->isFieldPresent(sfGasLimit);
+    }
+
+    /**
+     * @brief Get sfBytecodeSizeLimit (SoeOptional)
+     * @return The field value, or std::nullopt if not present.
+     */
+    [[nodiscard]]
+    protocol_autogen::Optional<SF_UINT32::type::value_type>
+    getBytecodeSizeLimit() const
+    {
+        if (hasBytecodeSizeLimit())
+            return this->sle_->at(sfBytecodeSizeLimit);
+        return std::nullopt;
+    }
+
+    /**
+     * @brief Check if sfBytecodeSizeLimit is present.
+     * @return True if the field is present, false otherwise.
+     */
+    [[nodiscard]]
+    bool
+    hasBytecodeSizeLimit() const
+    {
+        return this->sle_->isFieldPresent(sfBytecodeSizeLimit);
+    }
+
+    /**
+     * @brief Get sfGasPrice (SoeOptional)
+     * @return The field value, or std::nullopt if not present.
+     */
+    [[nodiscard]]
+    protocol_autogen::Optional<SF_UINT32::type::value_type>
+    getGasPrice() const
+    {
+        if (hasGasPrice())
+            return this->sle_->at(sfGasPrice);
+        return std::nullopt;
+    }
+
+    /**
+     * @brief Check if sfGasPrice is present.
+     * @return True if the field is present, false otherwise.
+     */
+    [[nodiscard]]
+    bool
+    hasGasPrice() const
+    {
+        return this->sle_->isFieldPresent(sfGasPrice);
+    }
+
     /**
      * @brief Get sfPreviousTxnID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
@@ -375,6 +447,39 @@ public:
         return *this;
     }
 
+    /**
+     * @brief Set sfGasLimit (SoeOptional)
+     * @return Reference to this builder for method chaining.
+     */
+    FeeSettingsBuilder&
+    setGasLimit(std::decay_t<typename SF_UINT32::type::value_type> const& value)
+    {
+        object_[sfGasLimit] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfBytecodeSizeLimit (SoeOptional)
+     * @return Reference to this builder for method chaining.
+     */
+    FeeSettingsBuilder&
+    setBytecodeSizeLimit(std::decay_t<typename SF_UINT32::type::value_type> const& value)
+    {
+        object_[sfBytecodeSizeLimit] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfGasPrice (SoeOptional)
+     * @return Reference to this builder for method chaining.
+     */
+    FeeSettingsBuilder&
+    setGasPrice(std::decay_t<typename SF_UINT32::type::value_type> const& value)
+    {
+        object_[sfGasPrice] = value;
+        return *this;
+    }
+
     /**
      * @brief Set sfPreviousTxnID (SoeOptional)
      * @return Reference to this builder for method chaining.

include/xrpl/protocol_autogen/ledger_entries/Vault.h

@@ -311,78 +311,6 @@ public:
     {
         return this->sle_->isFieldPresent(sfLEVersion);
     }
-
-    /**
-     * @brief Get sfVaultKind (SoeDefault)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT8::type::value_type>
-    getVaultKind() const
-    {
-        if (hasVaultKind())
-            return this->sle_->at(sfVaultKind);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfVaultKind is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasVaultKind() const
-    {
-        return this->sle_->isFieldPresent(sfVaultKind);
-    }
-
-    /**
-     * @brief Get sfSubscriptionDate (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getSubscriptionDate() const
-    {
-        if (hasSubscriptionDate())
-            return this->sle_->at(sfSubscriptionDate);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfSubscriptionDate is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasSubscriptionDate() const
-    {
-        return this->sle_->isFieldPresent(sfSubscriptionDate);
-    }
-
-    /**
-     * @brief Get sfRedemptionDate (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getRedemptionDate() const
-    {
-        if (hasRedemptionDate())
-            return this->sle_->at(sfRedemptionDate);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfRedemptionDate is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasRedemptionDate() const
-    {
-        return this->sle_->isFieldPresent(sfRedemptionDate);
-    }
 };
 
 /**
@@ -615,39 +543,6 @@ public:
         return *this;
     }
 
-    /**
-     * @brief Set sfVaultKind (SoeDefault)
-     * @return Reference to this builder for method chaining.
-     */
-    VaultBuilder&
-    setVaultKind(std::decay_t<typename SF_UINT8::type::value_type> const& value)
-    {
-        object_[sfVaultKind] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfSubscriptionDate (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    VaultBuilder&
-    setSubscriptionDate(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfSubscriptionDate] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfRedemptionDate (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    VaultBuilder&
-    setRedemptionDate(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfRedemptionDate] = value;
-        return *this;
-    }
-
     /**
      * @brief Build and return the completed Vault wrapper.
      * @param index The ledger entry index.

include/xrpl/protocol_autogen/transactions/EscrowCreate.h

@@ -58,6 +58,32 @@ public:
         return this->tx_->at(sfDestination);
     }
 
+    /**
+     * @brief Get sfDestinationTag (SoeOptional)
+     * @return The field value, or std::nullopt if not present.
+     */
+    [[nodiscard]]
+    protocol_autogen::Optional<SF_UINT32::type::value_type>
+    getDestinationTag() const
+    {
+        if (hasDestinationTag())
+        {
+            return this->tx_->at(sfDestinationTag);
+        }
+        return std::nullopt;
+    }
+
+    /**
+     * @brief Check if sfDestinationTag is present.
+     * @return True if the field is present, false otherwise.
+     */
+    [[nodiscard]]
+    bool
+    hasDestinationTag() const
+    {
+        return this->tx_->isFieldPresent(sfDestinationTag);
+    }
+
     /**
      * @brief Get sfAmount (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
@@ -149,29 +175,55 @@ public:
     }
 
     /**
-     * @brief Get sfDestinationTag (SoeOptional)
+     * @brief Get sfBytecode (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getDestinationTag() const
+    protocol_autogen::Optional<SF_VL::type::value_type>
+    getBytecode() const
     {
-        if (hasDestinationTag())
+        if (hasBytecode())
         {
-            return this->tx_->at(sfDestinationTag);
+            return this->tx_->at(sfBytecode);
         }
         return std::nullopt;
     }
 
     /**
-     * @brief Check if sfDestinationTag is present.
+     * @brief Check if sfBytecode is present.
      * @return True if the field is present, false otherwise.
      */
     [[nodiscard]]
     bool
-    hasDestinationTag() const
+    hasBytecode() const
     {
-        return this->tx_->isFieldPresent(sfDestinationTag);
+        return this->tx_->isFieldPresent(sfBytecode);
+    }
+
+    /**
+     * @brief Get sfData (SoeOptional)
+     * @return The field value, or std::nullopt if not present.
+     */
+    [[nodiscard]]
+    protocol_autogen::Optional<SF_VL::type::value_type>
+    getData() const
+    {
+        if (hasData())
+        {
+            return this->tx_->at(sfData);
+        }
+        return std::nullopt;
+    }
+
+    /**
+     * @brief Check if sfData is present.
+     * @return True if the field is present, false otherwise.
+     */
+    [[nodiscard]]
+    bool
+    hasData() const
+    {
+        return this->tx_->isFieldPresent(sfData);
     }
 };
 
@@ -232,6 +284,17 @@ public:
         return *this;
     }
 
+    /**
+     * @brief Set sfDestinationTag (SoeOptional)
+     * @return Reference to this builder for method chaining.
+     */
+    EscrowCreateBuilder&
+    setDestinationTag(std::decay_t<typename SF_UINT32::type::value_type> const& value)
+    {
+        object_[sfDestinationTag] = value;
+        return *this;
+    }
+
     /**
      * @brief Set sfAmount (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
@@ -278,13 +341,24 @@ public:
     }
 
     /**
-     * @brief Set sfDestinationTag (SoeOptional)
+     * @brief Set sfBytecode (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     EscrowCreateBuilder&
-    setDestinationTag(std::decay_t<typename SF_UINT32::type::value_type> const& value)
+    setBytecode(std::decay_t<typename SF_VL::type::value_type> const& value)
     {
-        object_[sfDestinationTag] = value;
+        object_[sfBytecode] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfData (SoeOptional)
+     * @return Reference to this builder for method chaining.
+     */
+    EscrowCreateBuilder&
+    setData(std::decay_t<typename SF_VL::type::value_type> const& value)
+    {
+        object_[sfData] = value;
         return *this;
     }
 

include/xrpl/protocol_autogen/transactions/EscrowFinish.h

@@ -146,6 +146,32 @@ public:
     {
         return this->tx_->isFieldPresent(sfCredentialIDs);
     }
+
+    /**
+     * @brief Get sfGas (SoeOptional)
+     * @return The field value, or std::nullopt if not present.
+     */
+    [[nodiscard]]
+    protocol_autogen::Optional<SF_UINT32::type::value_type>
+    getGas() const
+    {
+        if (hasGas())
+        {
+            return this->tx_->at(sfGas);
+        }
+        return std::nullopt;
+    }
+
+    /**
+     * @brief Check if sfGas is present.
+     * @return True if the field is present, false otherwise.
+     */
+    [[nodiscard]]
+    bool
+    hasGas() const
+    {
+        return this->tx_->isFieldPresent(sfGas);
+    }
 };
 
 /**
@@ -249,6 +275,17 @@ public:
         return *this;
     }
 
+    /**
+     * @brief Set sfGas (SoeOptional)
+     * @return Reference to this builder for method chaining.
+     */
+    EscrowFinishBuilder&
+    setGas(std::decay_t<typename SF_UINT32::type::value_type> const& value)
+    {
+        object_[sfGas] = value;
+        return *this;
+    }
+
     /**
      * @brief Build and return the EscrowFinish wrapper.
      * @param publicKey The public key for signing.

include/xrpl/protocol_autogen/transactions/SetFee.h

@@ -254,6 +254,84 @@ public:
     {
         return this->tx_->isFieldPresent(sfReserveIncrementDrops);
     }
+
+    /**
+     * @brief Get sfGasLimit (SoeOptional)
+     * @return The field value, or std::nullopt if not present.
+     */
+    [[nodiscard]]
+    protocol_autogen::Optional<SF_UINT32::type::value_type>
+    getGasLimit() const
+    {
+        if (hasGasLimit())
+        {
+            return this->tx_->at(sfGasLimit);
+        }
+        return std::nullopt;
+    }
+
+    /**
+     * @brief Check if sfGasLimit is present.
+     * @return True if the field is present, false otherwise.
+     */
+    [[nodiscard]]
+    bool
+    hasGasLimit() const
+    {
+        return this->tx_->isFieldPresent(sfGasLimit);
+    }
+
+    /**
+     * @brief Get sfBytecodeSizeLimit (SoeOptional)
+     * @return The field value, or std::nullopt if not present.
+     */
+    [[nodiscard]]
+    protocol_autogen::Optional<SF_UINT32::type::value_type>
+    getBytecodeSizeLimit() const
+    {
+        if (hasBytecodeSizeLimit())
+        {
+            return this->tx_->at(sfBytecodeSizeLimit);
+        }
+        return std::nullopt;
+    }
+
+    /**
+     * @brief Check if sfBytecodeSizeLimit is present.
+     * @return True if the field is present, false otherwise.
+     */
+    [[nodiscard]]
+    bool
+    hasBytecodeSizeLimit() const
+    {
+        return this->tx_->isFieldPresent(sfBytecodeSizeLimit);
+    }
+
+    /**
+     * @brief Get sfGasPrice (SoeOptional)
+     * @return The field value, or std::nullopt if not present.
+     */
+    [[nodiscard]]
+    protocol_autogen::Optional<SF_UINT32::type::value_type>
+    getGasPrice() const
+    {
+        if (hasGasPrice())
+        {
+            return this->tx_->at(sfGasPrice);
+        }
+        return std::nullopt;
+    }
+
+    /**
+     * @brief Check if sfGasPrice is present.
+     * @return True if the field is present, false otherwise.
+     */
+    [[nodiscard]]
+    bool
+    hasGasPrice() const
+    {
+        return this->tx_->isFieldPresent(sfGasPrice);
+    }
 };
 
 /**
@@ -386,6 +464,39 @@ public:
         return *this;
     }
 
+    /**
+     * @brief Set sfGasLimit (SoeOptional)
+     * @return Reference to this builder for method chaining.
+     */
+    SetFeeBuilder&
+    setGasLimit(std::decay_t<typename SF_UINT32::type::value_type> const& value)
+    {
+        object_[sfGasLimit] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfBytecodeSizeLimit (SoeOptional)
+     * @return Reference to this builder for method chaining.
+     */
+    SetFeeBuilder&
+    setBytecodeSizeLimit(std::decay_t<typename SF_UINT32::type::value_type> const& value)
+    {
+        object_[sfBytecodeSizeLimit] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfGasPrice (SoeOptional)
+     * @return Reference to this builder for method chaining.
+     */
+    SetFeeBuilder&
+    setGasPrice(std::decay_t<typename SF_UINT32::type::value_type> const& value)
+    {
+        object_[sfGasPrice] = value;
+        return *this;
+    }
+
     /**
      * @brief Build and return the SetFee wrapper.
      * @param publicKey The public key for signing.

include/xrpl/protocol_autogen/transactions/VaultCreate.h

@@ -214,84 +214,6 @@ public:
     {
         return this->tx_->isFieldPresent(sfScale);
     }
-
-    /**
-     * @brief Get sfVaultKind (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT8::type::value_type>
-    getVaultKind() const
-    {
-        if (hasVaultKind())
-        {
-            return this->tx_->at(sfVaultKind);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfVaultKind is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasVaultKind() const
-    {
-        return this->tx_->isFieldPresent(sfVaultKind);
-    }
-
-    /**
-     * @brief Get sfSubscriptionDate (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getSubscriptionDate() const
-    {
-        if (hasSubscriptionDate())
-        {
-            return this->tx_->at(sfSubscriptionDate);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfSubscriptionDate is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasSubscriptionDate() const
-    {
-        return this->tx_->isFieldPresent(sfSubscriptionDate);
-    }
-
-    /**
-     * @brief Get sfRedemptionDate (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getRedemptionDate() const
-    {
-        if (hasRedemptionDate())
-        {
-            return this->tx_->at(sfRedemptionDate);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfRedemptionDate is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasRedemptionDate() const
-    {
-        return this->tx_->isFieldPresent(sfRedemptionDate);
-    }
 };
 
 /**
@@ -416,39 +338,6 @@ public:
         return *this;
     }
 
-    /**
-     * @brief Set sfVaultKind (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    VaultCreateBuilder&
-    setVaultKind(std::decay_t<typename SF_UINT8::type::value_type> const& value)
-    {
-        object_[sfVaultKind] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfSubscriptionDate (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    VaultCreateBuilder&
-    setSubscriptionDate(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfSubscriptionDate] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfRedemptionDate (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    VaultCreateBuilder&
-    setRedemptionDate(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfRedemptionDate] = value;
-        return *this;
-    }
-
     /**
      * @brief Build and return the VaultCreate wrapper.
      * @param publicKey The public key for signing.

include/xrpl/rdb/DatabaseCon.h

@@ -6,12 +6,13 @@
 #include <xrpl/core/StartUpType.h>
 #include <xrpl/rdb/SociDB.h>
 
+#include <boost/filesystem/path.hpp>
+
 #include <soci/statement.h>
 
 #include <array>
 #include <cstddef>
 #include <cstdint>
-#include <filesystem>
 #include <functional>
 #include <memory>
 #include <mutex>
@@ -79,7 +80,7 @@ public:
 
         StartUpType startUp = StartUpType::Normal;
         bool standAlone = false;
-        std::filesystem::path dataDir;
+        boost::filesystem::path dataDir;
         // Indicates whether or not to return the `globalPragma`
         // from commonPragma()
         bool useGlobalPragma = false;
@@ -142,7 +143,7 @@ public:
 
     template <std::size_t N, std::size_t M>
     DatabaseCon(
-        std::filesystem::path const& dataDir,
+        boost::filesystem::path const& dataDir,
         std::string const& dbName,
         std::array<std::string, N> const& pragma,
         std::array<char const*, M> const& initSQL,
@@ -154,7 +155,7 @@ public:
     // Use this constructor to setup checkpointing
     template <std::size_t N, std::size_t M>
     DatabaseCon(
-        std::filesystem::path const& dataDir,
+        boost::filesystem::path const& dataDir,
         std::string const& dbName,
         std::array<std::string, N> const& pragma,
         std::array<char const*, M> const& initSQL,
@@ -189,7 +190,7 @@ private:
 
     template <std::size_t N, std::size_t M>
     DatabaseCon(
-        std::filesystem::path const& pPath,
+        boost::filesystem::path const& pPath,
         std::vector<std::string> const* commonPragma,
         std::array<std::string, N> const& pragma,
         std::array<char const*, M> const& initSQL,

include/xrpl/rdb/RelationalDatabase.h

@@ -14,6 +14,7 @@
 #include <xrpl/protocol/TxMeta.h>
 #include <xrpl/protocol/TxSearched.h>
 
+#include <boost/filesystem.hpp>
 #include <boost/variant.hpp>
 
 #include <concepts>

include/xrpl/server/Manifest.h

@@ -306,6 +306,12 @@ operator==(Manifest const& lhs, Manifest const& rhs)
         lhs.serialized == rhs.serialized;
 }
 
+inline bool
+operator!=(Manifest const& lhs, Manifest const& rhs)
+{
+    return !(lhs == rhs);
+}
+
 struct ValidatorToken
 {
     std::string manifest;

include/xrpl/server/State.h

@@ -4,6 +4,8 @@
 #include <xrpl/rdb/DatabaseCon.h>
 #include <xrpl/rdb/SociDB.h>
 
+#include <boost/filesystem.hpp>
+
 #include <string>
 
 namespace xrpl {

include/xrpl/shamap/SHAMap.h

@@ -789,6 +789,12 @@ operator==(SHAMap::ConstIterator const& x, SHAMap::ConstIterator const& y)
     return x.item_ == y.item_;
 }
 
+inline bool
+operator!=(SHAMap::ConstIterator const& x, SHAMap::ConstIterator const& y)
+{
+    return !(x == y);
+}
+
 inline SHAMap::ConstIterator
 SHAMap::begin() const
 {

include/xrpl/shamap/SHAMapNodeID.h

@@ -3,7 +3,6 @@
 #include <xrpl/basics/CountedObject.h>
 #include <xrpl/basics/base_uint.h>
 
-#include <compare>
 #include <cstddef>
 #include <optional>
 #include <ostream>
@@ -66,32 +65,45 @@ public:
     static SHAMapNodeID
     createID(int depth, uint256 const& key);
 
+    // FIXME-C++20: use spaceship and operator synthesis
     /**
      * Comparison operators
-     *
-     * <, >, <= and >= are synthesized from the spaceship. It is written out
-     * rather than defaulted because the ordering is by depth first, and the
-     * members are not declared in that order.
      */
-    std::strong_ordering
-    operator<=>(SHAMapNodeID const& n) const
+    bool
+    operator<(SHAMapNodeID const& n) const
     {
-        return std::tie(depth_, id_) <=> std::tie(n.depth_, n.id_);
+        return std::tie(depth_, id_) < std::tie(n.depth_, n.id_);
+    }
+
+    bool
+    operator>(SHAMapNodeID const& n) const
+    {
+        return n < *this;
+    }
+
+    bool
+    operator<=(SHAMapNodeID const& n) const
+    {
+        return !(n < *this);
+    }
+
+    bool
+    operator>=(SHAMapNodeID const& n) const
+    {
+        return !(*this < n);
     }
 
-    /**
-     * Equality, which the spaceship above does not provide.
-     *
-     * Only a *defaulted* operator<=> implicitly declares a defaulted
-     * operator==; the one above is user-provided, so == has to be written.
-     * It cannot be defaulted either, because a defaulted == would also compare
-     * the CountedObject base, which is not equality comparable.
-     */
     bool
     operator==(SHAMapNodeID const& n) const
     {
         return (depth_ == n.depth_) && (id_ == n.id_);
     }
+
+    bool
+    operator!=(SHAMapNodeID const& n) const
+    {
+        return !(*this == n);
+    }
 };
 
 inline std::string

include/xrpl/tx/ApplyContext.h

@@ -15,6 +15,7 @@
 #include <xrpl/protocol/XRPAmount.h>
 
 #include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <optional>
 #include <utility>
@@ -95,6 +96,24 @@ public:
         view_->deliver(amount);
     }
 
+    /**
+     * Sets the gas used in the metadata
+     */
+    void
+    setGasUsed(std::uint32_t const gasUsed)
+    {
+        gasUsed_ = gasUsed;
+    }
+
+    /**
+     * Sets the gas used in the metadata
+     */
+    void
+    setVMReturnCode(std::int32_t const vmReturnCode)
+    {
+        vmReturnCode_ = vmReturnCode;
+    }
+
     /**
      * Discard changes and start fresh.
      */
@@ -163,6 +182,8 @@ private:
 
     // The ID of the batch transaction we are executing under, if set.
     std::optional<uint256 const> parentBatchId_;
+    std::optional<std::uint32_t> gasUsed_;
+    std::optional<std::int32_t> vmReturnCode_;
 };
 
 }  // namespace xrpl

include/xrpl/tx/invariants/FreezeInvariant.h

@@ -69,8 +69,7 @@ private:
         IssuerChanges const& changes,
         STTx const& tx,
         beast::Journal const& j,
-        bool enforce,
-        bool fixOverrideFreeze);
+        bool enforce);
 
     static bool
     validateFrozenState(
@@ -79,8 +78,7 @@ private:
         STTx const& tx,
         beast::Journal const& j,
         bool enforce,
-        bool globalFreeze,
-        bool fixOverrideFreeze);
+        bool globalFreeze);
 };
 
 }  // namespace xrpl

include/xrpl/tx/invariants/InvariantCheck.h

@@ -198,7 +198,7 @@ public:
 
 /**
  * @brief Invariant: An account XRP balance must be in XRP and take a value
- *                   between 0 and kInitialXRP drops, inclusive.
+ *                   between 0 and INITIAL_XRP drops, inclusive.
  *
  * We iterate all account roots modified by the transaction and ensure that
  * their XRP balances are reasonable.
@@ -290,7 +290,7 @@ public:
 
 /**
  * @brief Invariant: an escrow entry must take a value between 0 and
- *                   kInitialXRP drops exclusive.
+ *                   INITIAL_XRP drops exclusive.
  */
 class NoZeroEscrow
 {

include/xrpl/tx/invariants/LoanInvariant.h

@@ -16,8 +16,6 @@ namespace xrpl {
  * @brief Invariants: Loans are internally consistent
  *
  * 1. If `Loan.PaymentRemaining = 0` then `Loan.PrincipalOutstanding = 0`
- * 2. A newly-created Loan against a closed-ended vault must satisfy
- *    `StartDate + PaymentInterval * PaymentRemaining < Vault.RedemptionDate`.
  *
  */
 class ValidLoan

include/xrpl/tx/invariants/VaultInvariant.h

@@ -38,17 +38,7 @@ namespace xrpl {
  * - vault set must not alter the vault assets or shares balance
  * - no vault transaction can change loss unrealized (it's updated by loan
  *   transactions)
- * - a created closed-ended vault must satisfy
- *   MIN_INVESTMENT_PERIOD <= RedemptionDate - SubscriptionDate <
- *   MAX_INVESTMENT_PERIOD
- * - vault deposit may only succeed when the vault phase is NoPhase or
- *   Subscription
- * - vault withdrawal may not succeed when the vault phase is Investment
- * - closed-ended loan origination (ttLOAN_SET) may only succeed when the
- *   vault phase is Investment
  *
- * Immutability of VaultKind, SubscriptionDate and RedemptionDate is enforced
- * by NoModifiedUnmodifiableFields (see InvariantCheck.cpp).
  */
 class ValidVault
 {
@@ -65,9 +55,6 @@ class ValidVault
         Number assetsAvailable = 0;
         Number assetsMaximum = 0;
         Number lossUnrealized = 0;
-        std::optional<std::uint8_t> vaultKind;
-        std::optional<std::uint32_t> subscriptionDate;
-        std::optional<std::uint32_t> redemptionDate;
 
         Vault static make(SLE const&);
     };
@@ -166,17 +153,6 @@ private:
     [[nodiscard]] static bool
     isVaultEmpty(Vault const& vault);
 
-    /**
-     * @brief Invariant check for @c ttLOAN_SET.
-     *
-     * For a closed-ended vault, a loan may only be originated while the vault is in the Investment
-     * phase (strictly past @c SubscriptionDate and before @c RedemptionDate). Open-ended vaults (@c
-     * NoPhase) are unaffected. The complementary maturity bound (final payment strictly precedes @c
-     * RedemptionDate) is enforced by @c ValidLoan.
-     */
-    [[nodiscard]] bool
-    finalizeLoanSet(ReadView const& view, beast::Journal const& j) const;
-
 public:
     // Compute the coarsest scale required to represent all numbers
     [[nodiscard]] static std::int32_t

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

@@ -274,6 +274,19 @@ public:
         return lhs.equal(rhs);
     }
 
+    /**
+     * Return true if lhs != rhs.
+     *
+     * @param lhs Step to compare.
+     * @param rhs Step to compare.
+     * @return true if lhs != rhs.
+     */
+    friend bool
+    operator!=(Step const& lhs, Step const& rhs)
+    {
+        return !(lhs == rhs);
+    }
+
     /**
      * Streaming operator for a Step.
      */