compose: alphanet from XRPLF/rippled@develop @ 94037361 (19 branches)

Multibranch-Builder-Manifest: {"base":"XRPLF/rippled@develop","base_sha":"94037361992ad75b32a6b2659b655ab96b7cb7c2","branches":[{"repo":"XRPLF/rippled","branch":"dangell7/supported-cicd","sha":"48ca26c2a441e0670b4f6bd11af4b25e70c1f0ee","outcome":"merged","rebase":true},{"repo":"XRPLF/rippled","branch":"dangell7/datagram","sha":"6b24a5c32ec372b08615b413bea6b29058df475c","outcome":"merged","rebase":true},{"repo":"XRPLF/rippled","branch":"dangell/smart-contracts","sha":"bcb8fb7d4f5c011940cdbd8b34f6873e1fb3cfbe","outcome":"ai-resolved","rebase":true},{"repo":"Transia-RnD/rippled","branch":"dangell7/escrow-paychan-refactor","sha":"b72ff981593e01d4aab426c647a4decf171880dc","outcome":"ai-resolved","rebase":true},{"repo":"XRPLF/rippled","branch":"token-paychan","sha":"2ba6f4cc68016054de844305bf98a969b1db0c4d","outcome":"ai-resolved","rebase":true},{"repo":"XRPLF/rippled","branch":"dangell7/token-paychan-clawback","sha":"1e5e8ef018c64b70f710466ad24079f25f512b32","outcome":"ai-resolved","rebase":true},{"repo":"Transia-RnD/rippled","branch":"dilithium-full","sha":"e634c6ddc7f69de12f67a87ada18a50252b03f0f","outcome":"ai-resolved","rebase":true},{"repo":"Transia-RnD/rippled","branch":"feature-p256","sha":"b30e9fc369a431ce766b7ae8158479cf236033d5","outcome":"ai-resolved","rebase":true},{"repo":"Transia-RnD/rippled","branch":"dangell7/mpt-structured-data","sha":"3e7af2ab7e05e0b4258627508659af4c073fe824","outcome":"merged","rebase":true},{"repo":"Transia-RnD/rippled","branch":"dangell7/token-issuance","sha":"b045b862223d3a6735161bf0fffa23cffa12b2ed","outcome":"ai-resolved","rebase":true},{"repo":"Transia-RnD/rippled","branch":"dangell7/vault-accrual","sha":"bb60431ebf6ef5d41ef588d8475dbb52f95744b5","outcome":"ai-resolved","rebase":true},{"repo":"Transia-RnD/rippled","branch":"dangell7/coupon-payments","sha":"5af42fc4756fe9bb93552e7a5a294ad97e1c26ed","outcome":"ai-resolved","rebase":true},{"repo":"Transia-RnD/rippled","branch":"dangell7/confidential-voting","sha":"adaae9496ac89c9c015d047bade5b38833ad87bc","outcome":"ai-resolved","rebase":true},{"repo":"Transia-RnD/rippled","branch":"dangell7/amm-curves","sha":"2a11a0f342f207638e6aef2ff070bd935401f39f","outcome":"ai-resolved","rebase":true},{"repo":"Transia-RnD/rippled","branch":"dangell7/offer-qualifiers","sha":"6ad5aae76100ae9e8274a8a84ddca38933f21233","outcome":"ai-resolved","rebase":true},{"repo":"Transia-RnD/rippled","branch":"dangell7/subscriptions","sha":"f3e2670dfa26263526bdac00386f7c78c36a302a","outcome":"ai-resolved","rebase":true},{"repo":"Transia-RnD/rippled","branch":"dangell7/repo-market","sha":"6badf9b5aa3330bf6c8b8c33b47d161df72f7540","outcome":"ai-resolved","rebase":true},{"repo":"Transia-RnD/rippled","branch":"dangell7/beneficiary","sha":"e34711194ce3486a54d1f17b2071aed319b1de8f","outcome":"ai-resolved","rebase":true},{"repo":"Transia-RnD/rippled","branch":"dangell7/firewall","sha":"008643d01cf50c20b2afd324f28dfd9dc771a55e","outcome":"ai-resolved","rebase":true}],"composed_sha":"39341a5b7aafa551ecea78d13cd30ad7aef8c18f","kind":"xrpld","tree_dir":"rippled","target":"XRPLF/rippled@alphanet","options":{"force_supported":"ON"},"prepared":{}}

.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
   - nix/check-tools/*.txt # generated, and full of Nix store hashes
 language: en
 allowCompoundWords: true # TODO (#6334)
@@ -43,6 +45,7 @@ suggestWords:
   - synched->synced
   - synch->sync
 words:
+  - cusip
   - abempty
   - AMMID
   - AMMMPT
@@ -64,13 +67,15 @@ words:
   - blindings
   - bookdir
   - Bougalis
-  - bthomee
   - Britto
   - Btrfs
   - Buildx
   - canonicality
+  - cdylib
   - canonicalised
+  - canonicality
   - cctools
+  - CGNAT
   - changespq
   - checkme
   - choco
@@ -115,7 +120,7 @@ words:
   - dsymutil
   - dxrpl
   - elgamal
-  - enabled
+  - emittance
   - enablerepo
   - endmacro
   - envrc
@@ -178,11 +183,11 @@ words:
   - mathbunnyru
   - mcmodel
   - MEMORYSTATUSEX
-  - MPTAMM
-  - MPTDEX
   - Merkle
   - misprediction
+  - mispricing
   - missingok
+  - MPTAMM
   - mptbalance
   - MPTDEX
   - mptflags
@@ -257,8 +262,8 @@ words:
   - replayer
   - repodata
   - repomd
-  - rerandomize
   - rerandomization
+  - rerandomize
   - rerandomized
   - rerandomizes
   - rerere
@@ -281,8 +286,8 @@ words:
   - rustup
   - sahyadri
   - Satoshi
-  - scons
   - Schnorr
+  - scons
   - secp
   - sendq
   - seqit
@@ -307,7 +312,9 @@ words:
   - statsd
   - STATSDCOLLECTOR
   - stissue
+  - stjson
   - stnum
+  - stnumber
   - stobj
   - stobject
   - stpath
@@ -334,8 +341,8 @@ words:
   - txn
   - txns
   - txs
-  - ubsan
   - UBSAN
+  - ubsan
   - ufdio
   - umant
   - unacquired
@@ -347,7 +354,9 @@ words:
   - unfindable
   - unflatten
   - unfund
+  - ungated
   - unimpair
+  - unmetered
   - unroutable
   - unscalable
   - unserviced
@@ -367,16 +376,17 @@ words:
   - venv
   - vfalco
   - vinnie
-  - vkeylet
   - wasmi
   - wextra
   - wptr
   - writeme
   - wsrch
   - wthread
+  - Xahau
   - xbridge
   - xchain
   - xcrun
+  - xfloat
   - ximinez
   - XMACRO
   - xored
@@ -387,5 +397,3 @@ words:
   - xxhash
   - xxhasher
   - zstdio
-  - CGNAT
-  - ungated

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# Allow anyone to review any change by default.
+*

.github/actions/setup-nix-env/action.yml

@@ -40,10 +40,11 @@ runs:
         # Unlike the Linux nix images, macOS needs no SSL_CERT_FILE: it has its
         # own trust store, and pinning would break TLS to hosts relying on it.
 
-        # Workspace-local, so `cleanup-workspace` clears it, but not the
-        # `.conan2` prepare-runner hands the system toolchain: that Conan is a
-        # different version, and the two would migrate each other's cache.
-        echo "CONAN_HOME=${{ github.workspace }}/.conan2-nix" >>"${GITHUB_ENV}"
+        # In RUNNER_TEMP, which the runner empties per job, like the `.conan2`
+        # prepare-runner hands the system toolchain - but under its own name:
+        # that Conan is a different version, and the two would migrate each
+        # other's cache.
+        echo "CONAN_HOME=${RUNNER_TEMP}/.conan2-nix" >>"${GITHUB_ENV}"
 
     # Config, profiles and remote, exactly as the dev shell sets them up on
     # entry; the `setup-conan` action is skipped for this toolchain.

.github/pull_request_template.md

@@ -18,7 +18,7 @@ If too broad, please consider splitting into multiple PRs.
 If there is a relevant task or issue, please link it here.
 -->
 
-### Context of Change
+## Context of Change
 
 <!--
 Please include the context of a change.
@@ -29,7 +29,7 @@ If a refactor, how is this better than the previous implementation?
 If there is a spec or design document for this feature, please link it here.
 -->
 
-### API Impact
+## API Impact
 
 <!--
 Please check [x] relevant options, delete irrelevant ones.

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

@@ -19,6 +19,7 @@ libxrpl.ledger > xrpl.json
 libxrpl.ledger > xrpl.ledger
 libxrpl.ledger > xrpl.nodestore
 libxrpl.ledger > xrpl.protocol
+libxrpl.ledger > xrpl.server
 libxrpl.ledger > xrpl.shamap
 libxrpl.net > xrpl.basics
 libxrpl.net > xrpl.net
@@ -206,6 +207,7 @@ xrpl.core > xrpl.json
 xrpl.core > xrpl.protocol
 xrpl.json > xrpl.basics
 xrpl.ledger > xrpl.basics
+xrpl.ledger > xrpl.core
 xrpl.ledger > xrpl.json
 xrpl.ledger > xrpl.nodestore
 xrpl.ledger > xrpl.protocol

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

@@ -81,6 +81,8 @@ class LinuxConfig:
     suffix: str = ""
     extra_cmake_args: str = ""
     package: PackageConfig | None = None  # set to also package this config
+    # Flip every amendment to Supported::Yes before building (perf/test only).
+    force_supported: bool = False
 
     def __post_init__(self) -> None:
         if isinstance(self.package, dict):
@@ -168,6 +170,7 @@ class MatrixEntry:
     image: str = ""  # container image; empty for macOS/Windows (runs natively)
     compiler: str = ""  # compiler name ("gcc" or "clang"); empty for macOS/Windows
     toolchain: str = ""  # "nix" for the flake's CI environment; see PlatformConfig
+    force_supported: bool = False  # flip amendments to Supported::Yes before build
 
 
 @dataclasses.dataclass
@@ -233,6 +236,7 @@ def expand_linux_matrix(linux: LinuxFile, minimal: bool) -> list[MatrixEntry]:
                         architecture=arch_info,
                         sanitizers=sanitizer,
                         compiler=compiler,
+                        force_supported=cfg.force_supported,
                     )
                 )
 

.github/scripts/strategy-matrix/linux.json

@@ -1,5 +1,5 @@
 {
-  "image_tag": "sha-473fe44",
+  "image_tag": "sha-060957e",
   "configs": {
     "ubuntu": [
       {
@@ -17,7 +17,6 @@
         "minimal": true,
         "benchmark": true
       },
-
       {
         "compiler": ["gcc"],
         "build_type": ["Release"],
@@ -30,7 +29,6 @@
         "arch": ["arm64"],
         "minimal": false
       },
-
       {
         "compiler": ["gcc", "clang"],
         "build_type": ["Debug", "Release"],
@@ -38,7 +36,6 @@
         "minimal": false,
         "sanitizers": ["address", "undefinedbehavior"]
       },
-
       {
         "compiler": ["clang"],
         "build_type": ["Debug"],
@@ -62,9 +59,21 @@
         "minimal": false,
         "suffix": "unity",
         "extra_cmake_args": "-Dunity=ON"
+      },
+      {
+        "compiler": ["gcc"],
+        "build_type": ["Release"],
+        "arch": ["amd64"],
+        "minimal": false,
+        "suffix": "supported",
+        "force_supported": true,
+        "extra_cmake_args": "-Dvalidator_keys=ON",
+        "package": {
+          "type": "deb",
+          "image": "ghcr.io/xrplf/xrpld/packaging-debian:sha-49cdc10"
+        }
       }
     ],
-
     "debian": [
       {
         "compiler": ["gcc"],
@@ -74,11 +83,10 @@
         "extra_cmake_args": "-Dvalidator_keys=ON",
         "package": {
           "type": "deb",
-          "image": "ghcr.io/xrplf/xrpld/packaging-debian:sha-b6a8995"
+          "image": "ghcr.io/xrplf/xrpld/packaging-debian:sha-49cdc10"
         }
       }
     ],
-
     "rhel": [
       {
         "compiler": ["gcc"],
@@ -88,7 +96,7 @@
         "extra_cmake_args": "-Dvalidator_keys=ON",
         "package": {
           "type": "rpm",
-          "image": "ghcr.io/xrplf/xrpld/packaging-rhel:sha-b6a8995"
+          "image": "ghcr.io/xrplf/xrpld/packaging-rhel:sha-49cdc10"
         }
       }
     ]

.github/workflows/build-nix-images.yml

@@ -5,15 +5,13 @@ on:
     branches:
       - develop
     paths:
-      - ".github/workflows/build-nix-images.yml"
       - "flake.nix"
       - "flake.lock"
       - "rust-toolchain.toml"
       - "nix/**"
       - "!nix/docker/README.md"
       - "!nix/devshell.nix"
-      - "!nix/check-tools/*.txt"
-      - "bin/check-tools.sh"
+      - "!nix/check-tools/**"
       - "bin/default-loader-path.sh"
       - "bin/install-sanitizer-libs.sh"
   pull_request:
@@ -25,7 +23,7 @@ on:
       - "nix/**"
       - "!nix/docker/README.md"
       - "!nix/devshell.nix"
-      - "!nix/check-tools/*.txt"
+      - "!nix/check-tools/**"
       - "bin/check-tools.sh"
       - "bin/default-loader-path.sh"
       - "bin/install-sanitizer-libs.sh"
@@ -60,7 +58,7 @@ jobs:
             base_image: debian:bookworm
           - name: rhel
             base_image: registry.access.redhat.com/ubi9/ubi:latest
-    uses: XRPLF/actions/.github/workflows/build-multiarch-image.yml@65d5a0bd72be4ecea95cff0673a6e0672ab5243a
+    uses: XRPLF/actions/.github/workflows/build-multiarch-image.yml@034e87065fcd0100214cf0672923bd38d193cf78
     with:
       image_name: xrpld/nix-${{ matrix.distro.name }}
       dockerfile: nix/docker/Dockerfile

.github/workflows/build-packaging-images.yml

@@ -41,7 +41,7 @@ jobs:
           # AlmaLinux rather than UBI, which does not ship rpm-sign.
           - name: rhel
             base_image: almalinux:10
-    uses: XRPLF/actions/.github/workflows/build-multiarch-image.yml@65d5a0bd72be4ecea95cff0673a6e0672ab5243a
+    uses: XRPLF/actions/.github/workflows/build-multiarch-image.yml@034e87065fcd0100214cf0672923bd38d193cf78
     with:
       image_name: xrpld/packaging-${{ matrix.distro.name }}
       dockerfile: package/docker/Dockerfile

.github/workflows/build-pre-commit-image.yml

@@ -30,7 +30,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    uses: XRPLF/actions/.github/workflows/build-multiarch-image.yml@65d5a0bd72be4ecea95cff0673a6e0672ab5243a
+    uses: XRPLF/actions/.github/workflows/build-multiarch-image.yml@034e87065fcd0100214cf0672923bd38d193cf78
     with:
       image_name: xrpld/pre-commit
       dockerfile: bin/pre-commit/Dockerfile

.github/workflows/build-supported-image.yml

@@ -0,0 +1,103 @@
+# Package the "all amendments Supported::Yes" build into a runtime Docker image
+# and push it to GHCR, as a drop-in for the rippleci/xrpld image xrpl.js uses
+# for standalone testing -- except every amendment is built Supported::Yes.
+#
+# This does NOT build or package anything: the Trigger workflow already builds
+# the supported binary and the supported .deb (the force_supported build config
+# and the matching supported package config in linux.json). This workflow waits
+# for a successful Trigger run on develop, downloads that run's supported .deb
+# artifact, installs it into a slim base (docker/supported.Dockerfile, which
+# replicates rippleci's layout), and pushes ghcr.io/xrplf/xrpld/supported.
+#
+# Perf/test artifact only -- never run it on a production validator.
+name: Build supported Docker image
+
+on:
+  workflow_run:
+    workflows: ["Trigger"]
+    types: [completed]
+    branches: [develop]
+  # Manual runs: point at a specific completed Trigger run via its run id.
+  workflow_dispatch:
+    inputs:
+      trigger_run_id:
+        description: "Run id of the Trigger workflow whose supported .deb to package."
+        required: true
+        type: string
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: bash
+
+env:
+  IMAGE_NAME: ghcr.io/xrplf/xrpld/supported
+  # The supported .deb artifact uploaded by reusable-package.yml:
+  # <artifact_name>-pkg, where artifact_name carries the -supported suffix.
+  DEB_ARTIFACT: xrpld-ubuntu-gcc-release-amd64-supported-pkg
+  SOURCE_RUN_ID: ${{ github.event.workflow_run.id || github.event.inputs.trigger_run_id }}
+jobs:
+  image:
+    # Only for successful Trigger runs (workflow_run), and only on the canonical
+    # repo where GITHUB_TOKEN can push to ghcr.io/xrplf/*.
+    if: ${{ github.repository == 'XRPLF/rippled' && (github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success') }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      actions: read
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+
+      - name: Download the supported .deb from the Trigger run
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: ${{ env.DEB_ARTIFACT }}
+          path: dl
+          run-id: ${{ env.SOURCE_RUN_ID }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Assemble build context
+        run: |
+          set -euo pipefail
+          mkdir -p docker-context
+          deb="$(find dl -name '*.deb' | head -n1)"
+          [ -n "${deb}" ] || {
+              echo "::error::no supported .deb found in run ${SOURCE_RUN_ID}"
+              exit 1
+          }
+          mv "${deb}" docker-context/xrpld.deb
+          echo "Packaging $(basename "${deb}") into ${IMAGE_NAME}"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Docker metadata
+        id: meta
+        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
+        with:
+          images: ${{ env.IMAGE_NAME }}
+          tags: |
+            type=sha,prefix=sha-,format=short
+            type=raw,value=latest
+
+      - name: Build and push
+        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
+        with:
+          context: docker-context
+          file: docker/supported.Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/cargo-audit.yml

@@ -34,7 +34,7 @@ permissions:
 jobs:
   audit:
     runs-on: ubuntu-latest
-    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-473fe44
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-060957e
     permissions:
       contents: read
       # Needed to open an issue on scheduled failures.

.github/workflows/check-tools.yml

@@ -79,7 +79,7 @@ jobs:
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@7bf7ceca5932114abdd0d43493c3c30c5a654e13
+        uses: XRPLF/actions/prepare-runner@b3e255d74d785d053e4903da8ac90983cd7d9e82
         with:
           enable_ccache: false
 

.github/workflows/pre-commit.yml

@@ -14,7 +14,7 @@ on:
 jobs:
   # Call the workflow in the XRPLF/actions repo that runs the pre-commit hooks.
   run-hooks:
-    uses: XRPLF/actions/.github/workflows/pre-commit.yml@f1952595d212e86169935135efc66294b4574131
+    uses: XRPLF/actions/.github/workflows/pre-commit.yml@279ec358f4a1be4088be3e024b07916fa97c75b6
     with:
       runs_on: ubuntu-latest
       container: '{ "image": "ghcr.io/xrplf/xrpld/pre-commit:sha-473fe44" }'

.github/workflows/publish-docs.yml

@@ -41,13 +41,13 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-473fe44
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-060957e
     steps:
       - name: Checkout repository
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@7bf7ceca5932114abdd0d43493c3c30c5a654e13
+        uses: XRPLF/actions/prepare-runner@b3e255d74d785d053e4903da8ac90983cd7d9e82
         with:
           enable_ccache: false
 
@@ -91,4 +91,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deploy
-        uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # v5.0.0
+        uses: actions/deploy-pages@368f82528645a54fb793d4d04e342629a3f51346 # v5.0.1

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

@@ -74,6 +74,11 @@ on:
         required: false
         type: string
         default: ""
+      force_supported:
+        description: "Flip every amendment to Supported::Yes before building. For perf/test builds only; never for release artifacts."
+        required: false
+        type: boolean
+        default: false
 
     secrets:
       CODECOV_TOKEN:
@@ -128,8 +133,22 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
+      - name: Force all amendments to Supported::Yes
+        if: ${{ inputs.force_supported && runner.os == 'Linux' }}
+        run: |
+          set -euo pipefail
+          MACRO="include/xrpl/protocol/detail/features.macro"
+          echo "Flipping Supported::No -> Supported::Yes in ${MACRO}:"
+          grep -n 'Supported::No,' "${MACRO}" || echo "  (none found)"
+          sed -i 's/Supported::No,/Supported::Yes,/g' "${MACRO}"
+          if grep -q 'Supported::No,' "${MACRO}"; then
+              echo "::error::Supported::No entries remain after sed"
+              exit 1
+          fi
+          git diff -- "${MACRO}" || true
+
       - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@7bf7ceca5932114abdd0d43493c3c30c5a654e13
+        uses: XRPLF/actions/prepare-runner@b3e255d74d785d053e4903da8ac90983cd7d9e82
         with:
           enable_ccache: ${{ inputs.ccache_enabled }}
 

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

@@ -52,5 +52,6 @@ jobs:
       sanitizers: ${{ matrix.sanitizers }}
       compiler: ${{ matrix.compiler || '' }}
       toolchain: ${{ matrix.toolchain || '' }}
+      force_supported: ${{ matrix.force_supported || false }}
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/reusable-clang-tidy.yml

@@ -34,7 +34,7 @@ jobs:
     needs: [determine-files]
     if: ${{ needs.determine-files.outputs.cpp_changed_files != '' || needs.determine-files.outputs.need_full_run == 'true' }}
     runs-on: ["self-hosted", "Linux", "X64", "heavy"]
-    container: "ghcr.io/xrplf/xrpld/nix-debian:sha-473fe44"
+    container: "ghcr.io/xrplf/xrpld/nix-debian:sha-060957e"
     permissions:
       contents: read
       issues: write
@@ -43,7 +43,7 @@ jobs:
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@7bf7ceca5932114abdd0d43493c3c30c5a654e13
+        uses: XRPLF/actions/prepare-runner@b3e255d74d785d053e4903da8ac90983cd7d9e82
         with:
           enable_ccache: false
 

.github/workflows/reusable-package.yml

@@ -1,11 +1,14 @@
-# Build Linux packages from the pre-built xrpld and validator-keys artifacts:
+# Build, verify and publish Linux packages from the pre-built xrpld and
+# validator-keys artifacts, in three stages:
 #
-#   - one job per config that carries a "package" map in linux.json
-#   - that map names the container image and the format it builds there
-#   - every job ends with the image's publish_pkg.py, uploading what it built
-#     with 'publish: true' and doing a --dry-run otherwise
+#   - 'package' builds and signs one format per config that carries a "package"
+#     map in linux.json; that map names the container image and the format
+#   - 'test-install' installs what was built on a range of distros and runs the
+#     binaries there, so a package that cannot be installed never reaches Nexus
+#   - 'publish' uploads with the image's publish_pkg.py, doing a --dry-run
+#     unless 'publish: true'
 #
-# Only linux/amd64 is supported; the runner is hardcoded in the job below.
+# Only linux/amd64 is supported; the runner is hardcoded in the jobs below.
 name: Package
 
 on:
@@ -39,6 +42,7 @@ defaults:
 
 env:
   BUILD_DIR: build
+  PACKAGE_DIR: packages
 
 jobs:
   generate-matrix:
@@ -70,14 +74,14 @@ jobs:
       contents: read
     runs-on: ["self-hosted", "Linux", "X64", "heavy"]
     container: ${{ matrix.image }}
-    timeout-minutes: 30
+    timeout-minutes: 10
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@7bf7ceca5932114abdd0d43493c3c30c5a654e13
+        uses: XRPLF/actions/prepare-runner@b3e255d74d785d053e4903da8ac90983cd7d9e82
         with:
           enable_ccache: false
 
@@ -112,24 +116,184 @@ jobs:
               --pkg-release "${PKG_RELEASE}" \
               --channel "${CHANNEL}"
 
-      # Before the upload, so the artifact and the published package are the
-      # same bytes. DEBs are not signed, so the key is never set on that job.
+      # Before the upload, so the artifact, the tested package and the published
+      # package are the same bytes.
       - name: Sign RPM
         if: ${{ inputs.publish && matrix.package_type == 'rpm' }}
         env:
           PKG_SIGNING_KEY: ${{ secrets.signing_key }}
         run: ./package/sign_rpm.py --package-dir "${BUILD_DIR}"
 
+      # Split from the debug symbols, which are an order of magnitude larger, so
+      # that test-install downloads only what it installs.
       - name: Upload package artifact
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: ${{ matrix.xrpld_artifact_name }}-pkg
           path: |
-            ${{ env.BUILD_DIR }}/debbuild/*.deb
-            ${{ env.BUILD_DIR }}/debbuild/*.ddeb
-            ${{ env.BUILD_DIR }}/rpmbuild/RPMS/**/*.rpm
+            ${{ env.BUILD_DIR }}/debbuild/xrpld_*.deb
+            ${{ env.BUILD_DIR }}/rpmbuild/RPMS/**/xrpld-[0-9]*.rpm
           if-no-files-found: error
 
+      - name: Upload debug symbol artifact
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: ${{ matrix.xrpld_artifact_name }}-pkg-debug
+          path: |
+            ${{ env.BUILD_DIR }}/debbuild/xrpld-dbgsym_*.deb
+            ${{ env.BUILD_DIR }}/debbuild/xrpld-dbgsym_*.ddeb
+            ${{ env.BUILD_DIR }}/rpmbuild/RPMS/**/xrpld-debuginfo-*.rpm
+          if-no-files-found: error
+
+  # Every distro family the packages target, oldest release first, so both ends
+  # of the dependency range they declare are exercised.
+  test-install:
+    needs: [package]
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - package_type: deb
+            image: debian:11
+          - package_type: deb
+            image: debian:12
+          - package_type: deb
+            image: debian:13
+          - package_type: deb
+            image: ubuntu:20.04
+          - package_type: deb
+            image: ubuntu:22.04
+          - package_type: deb
+            image: ubuntu:24.04
+          - package_type: deb
+            image: ubuntu:26.04
+
+          - package_type: rpm
+            image: almalinux:9
+          - package_type: rpm
+            image: almalinux:10
+          - package_type: rpm
+            image: rockylinux/rockylinux:9
+          - package_type: rpm
+            image: rockylinux/rockylinux:10
+          - package_type: rpm
+            image: registry.access.redhat.com/ubi9/ubi
+          - package_type: rpm
+            image: registry.access.redhat.com/ubi10/ubi
+    name: "install ${{ matrix.package_type }} on ${{ matrix.image }}"
+    permissions:
+      contents: read
+    runs-on: ubuntu-latest
+    container: ${{ matrix.image }}
+    timeout-minutes: 5
+
+    steps:
+      # Both formats land in one directory; the step below picks its own by
+      # extension, so this stays independent of the artifact names.
+      - name: Download package artifacts
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          pattern: "*-pkg"
+          merge-multiple: true
+          path: ${{ env.PACKAGE_DIR }}
+
+      - name: Find the package
+        id: find
+        env:
+          PACKAGE_TYPE: ${{ matrix.package_type }}
+        run: |
+          package="$(find "${PACKAGE_DIR}" -type f -name "*.${PACKAGE_TYPE}" -print -quit)"
+          test -n "${package}" || {
+              echo "no .${PACKAGE_TYPE} found in ${PACKAGE_DIR}" >&2
+              exit 1
+          }
+          echo "package=${package}" >>"${GITHUB_OUTPUT}"
+
+      # Debian 11 went end-of-life on 2026-08-31
+      # (https://www.debian.org/News/2026/20260831) and its packages are
+      # already partly gone from deb.debian.org, so switch to the
+      # snapshot.debian.org entries the image ships commented out in its
+      # sources.list: they are pinned to the snapshot the image was built
+      # from, so they serve every version it needs and never go away.
+      # Snapshots keep their original, long-passed Valid-Until, hence the
+      # disabled check; the retries absorb snapshot.debian.org's throttling.
+      - name: Switch Debian 11 to snapshot.debian.org
+        if: ${{ matrix.image == 'debian:11' }}
+        run: |
+          sed -i 's|^deb |# deb |; s|^# deb http://snapshot|deb http://snapshot|' /etc/apt/sources.list
+          printf '%s\n' \
+              'Acquire::Check-Valid-Until "false";' \
+              'Acquire::Retries "3";' \
+              >/etc/apt/apt.conf.d/99snapshot
+
+      - name: Install the DEB
+        if: ${{ matrix.package_type == 'deb' }}
+        env:
+          DEBIAN_FRONTEND: noninteractive
+          PACKAGE: ${{ steps.find.outputs.package }}
+        run: |
+          # Stock Debian and Ubuntu images carry no package lists, so apt has
+          # nothing to resolve the systemd dependency from until it fetches them.
+          apt-get update -qq
+          apt-get install -y "./${PACKAGE}"
+
+      - name: Install the RPM
+        if: ${{ matrix.package_type == 'rpm' }}
+        env:
+          PACKAGE: ${{ steps.find.outputs.package }}
+        run: dnf install -y "./${PACKAGE}"
+
+      - name: Run xrpld
+        run: xrpld --version
+
+      - name: Run validator-keys
+        run: validator-keys --version
+
+      - name: Run rippled, the legacy compatibility symlink
+        run: rippled --version
+
+      - name: Check the service account
+        run: id xrpld
+
+      - name: Check the state directory
+        run: test -d /var/lib/xrpld
+
+      - name: Check the log directory
+        run: test -d /var/log/xrpld
+
+  publish:
+    needs: [generate-matrix, package, test-install]
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
+    name: "publish ${{ matrix.xrpld_artifact_name }}"
+    permissions:
+      contents: read
+    runs-on: ["self-hosted", "Linux", "X64", "heavy"]
+    container: ${{ matrix.image }}
+    timeout-minutes: 30
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+      - name: Prepare runner
+        uses: XRPLF/actions/prepare-runner@b3e255d74d785d053e4903da8ac90983cd7d9e82
+        with:
+          enable_ccache: false
+
+      # Both artifacts, so the debug symbols are published alongside the package.
+      - name: Download package artifacts
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          pattern: ${{ matrix.xrpld_artifact_name }}-pkg*
+          merge-multiple: true
+          path: ${{ env.PACKAGE_DIR }}
+
+      - name: Determine release info
+        id: release_info
+        uses: ./.github/actions/release-info
+
       - name: Publish package
         env:
           CHANNEL: ${{ steps.release_info.outputs.channel }}
@@ -140,6 +304,6 @@ jobs:
         run: |
           publish_pkg.py \
               --channel "${CHANNEL}" \
-              --package-dir "${BUILD_DIR}" \
+              --package-dir "${PACKAGE_DIR}" \
               --nexus-url "${NEXUS_URL}" \
               ${DRY_RUN_OPTION}

.github/workflows/reusable-rust.yml

@@ -1,8 +1,9 @@
 # Clippy, coverage and documentation for the Rust crates in crates/. Each runs
 # as an independent job on a GitHub-hosted runner, but inside the same container
 # image used to build the crates in the C++/Corrosion path, so the toolchain
-# (and therefore the lints, coverage instrumentation and the cargo cache) matches
-# what production builds use.
+# (and therefore the lints and the cargo cache) matches what production builds
+# use. Coverage is the exception: it needs the nightly rustc that honours
+# #[coverage(off)], which the image carries alongside the pinned stable.
 #
 # Rust unit tests are deliberately NOT run here. They run as part of the C++
 # build (reusable-build-test-config.yml), which already compiles the crates on a
@@ -27,7 +28,7 @@ permissions:
 jobs:
   clippy:
     runs-on: ubuntu-latest
-    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-473fe44
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-060957e
     steps:
       - name: Checkout repository
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -40,11 +41,14 @@ jobs:
 
   coverage:
     runs-on: ubuntu-latest
-    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-473fe44
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-060957e
     steps:
       - name: Checkout repository
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
+      - name: Use the nightly Rust toolchain
+        run: rust-nightly path >>"${GITHUB_PATH}"
+
       - name: Use cargo artifacts cache
         uses: ./.github/actions/cargo-cache
 
@@ -66,7 +70,7 @@ jobs:
 
   doc:
     runs-on: ubuntu-latest
-    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-473fe44
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-060957e
     steps:
       - name: Checkout repository
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

.github/workflows/reusable-upload-recipe.yml

@@ -40,7 +40,7 @@ defaults:
 jobs:
   upload:
     runs-on: ubuntu-latest
-    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-473fe44
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-060957e
     env:
       REMOTE_NAME: ${{ inputs.remote_name }}
       CONAN_LOGIN_USERNAME_XRPLF: ${{ secrets.remote_username }}
@@ -50,7 +50,7 @@ jobs:
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@7bf7ceca5932114abdd0d43493c3c30c5a654e13
+        uses: XRPLF/actions/prepare-runner@b3e255d74d785d053e4903da8ac90983cd7d9e82
         with:
           enable_ccache: false
 

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

@@ -68,7 +68,7 @@ jobs:
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@7bf7ceca5932114abdd0d43493c3c30c5a654e13
+        uses: XRPLF/actions/prepare-runner@b3e255d74d785d053e4903da8ac90983cd7d9e82
         with:
           enable_ccache: false
 

.gitignore

@@ -72,11 +72,16 @@ DerivedData
 /.zed/
 
 # AI tools.
+# Shared/committable AI agent config (AGENTS.md, CLAUDE.md, GEMINI.md, .claude/settings.json,
+# tool-specific rules files, etc.) should be checked in — see CONTRIBUTING.md. Only the
+# personal/local variants below are ignored.
 /.agent
 /.agents
 /.augment
-/.claude
-/CLAUDE.md
+/.claude/settings.local.json
+AGENTS.override.md
+CLAUDE.local.md
+GEMINI.local.md
 
 # Python
 __pycache__

.pre-commit-config.yaml

@@ -70,6 +70,11 @@ repos:
         language: system
         types: [rust]
         pass_filenames: false # rustfmt formats the whole workspace
+      - id: check-coverage-attrs
+        name: check Rust coverage attributes
+        entry: ./bin/pre-commit/check_rust_coverage_attrs.py
+        language: python
+        files: ^crates/.*\.rs$
 
   - repo: https://github.com/BlankSpruce/gersemi-pre-commit
     rev: e98930bdc210d3387007f9252d8c1694ea7e410f # frozen: 0.27.7

AGENTS.md

@@ -0,0 +1,42 @@
+# AGENTS.md
+
+This file provides guidance to AI coding agents (Claude Code, and other AGENTS.md-compatible tools) when working with code in this repository.
+
+## Build
+
+Required on Linux/macOS: use the Nix devshell, which sets up the compiler, Conan, ccache, and (optionally) Rust automatically.
+
+```bash
+nix develop
+```
+
+For alternate devshell variants (specific compiler, no-compiler, coverage), see [docs/build/nix.md](./docs/build/nix.md). For the manual build steps, CMake options, and protocol codegen commands, see [BUILD.md](./BUILD.md) (`## Steps`, `## Options`, `## Code generation`).
+
+Rust crate tests (independent of the CMake build): `cargo test --manifest-path crates/Cargo.toml --workspace` (CI uses `cargo nextest`).
+
+## Testing
+
+Unit tests are a custom framework built into the `xrpld` binary itself (not Boost.Test/GTest/Catch); see [CONTRIBUTING.md](./CONTRIBUTING.md#unit-tests) for the basic invocation. Notes not covered there:
+
+- A suite's `--unittest` name is built from the arguments to its `BEAST_DEFINE_TESTSUITE`/`BEAST_DEFINE_TESTSUITE_PRIO` macro (usually at the bottom of the test file), in reverse order and joined with `.`: `BEAST_DEFINE_TESTSUITE(Credentials, app, xrpl)` → `xrpl.app.Credentials`.
+- `--unittest-arg` does nothing — don't use it.
+- Tests that run offline in under a minute should be automatic `--unittest` suites; anything else is a manual/integration test.
+- New tests should be written using `gtest` under `src/tests/` unless that isn't possible, in which case fall back to the legacy Beast framework under `src/test/`. `tests/` (top-level) holds integration tests exercised against `libxrpl`/`xrpld`.
+
+## Lint/Format
+
+See [CONTRIBUTING.md](./CONTRIBUTING.md#pre-commit-hooks) for `pre-commit` setup and [CONTRIBUTING.md](./CONTRIBUTING.md#clang-tidy) for `clang-tidy` (opt-in, needs local `clang-tidy` and generated headers).
+
+## Code Style
+
+New file placement and header levelization: see [CONTRIBUTING.md](./CONTRIBUTING.md#before-making-a-pull-request). Braces, whitespace, member order, and other conventions: see [docs/CodingStyle.md](./docs/CodingStyle.md). `XRPL_ASSERT`/`UNREACHABLE` contracts: see [CONTRIBUTING.md](./CONTRIBUTING.md#contracts-and-instrumentation). Commit messages: see [CONTRIBUTING.md](./CONTRIBUTING.md#good-commit-messages).
+
+## Architecture
+
+Paths below reflect the current layout; update this section if modularization moves a subsystem to a different directory.
+
+- `include/xrpl/` + `src/libxrpl/` — the core protocol library: ledger, shamap, consensus, crypto, json, resource, nodestore, rdb, peerfinder, and `tx/` (transaction application: `Transactor.cpp`, `applySteps.cpp`, invariants, payment paths). `tx/transactors/` has one file per transaction type, grouped by subsystem: `escrow/`, `vault/`, `lending/`, `sponsor/`, `nft/`, `token/` (MPT), `payment_channel/`, `permissioned_domain/`, `dex/`, `oracle/`, `did/`, `credentials/`, `bridge/`, `check/`, `delegate/`, `account/`, `system/`. Any change to transaction-processing behavior must be gated behind an Amendment.
+- `src/xrpld/` — the server application built on top of `libxrpl`: `app`, `core`, `overlay` (P2P networking), `peerfinder`, `perflog`, `rpc`, `shamap`. `main` builds an `ApplicationImp` implementing `Application`; most components hold a reference to it (`app_`), giving broad cross-component access — expect to trace call chains through `Application&`.
+- `src/test/` — unit tests mirroring the subsystems above, plus `jtx/` (the transaction-building test DSL — e.g. `jtx/escrow.h`, `jtx/vault.h`, `jtx/sponsor.h`, `jtx/permissioned_dex.h`) and `unit_test/` (the custom test framework itself, derived from Beast).
+- `src/tests/` — unit tests for `libxrpl` written in `gtest`, gradually replacing the `src/test` equivalents.
+- `crates/` — a Rust workspace (only built with `-Dxrpld -Drust=ON`) bridged into C++ via `cxxbridge`/the `cxx` crate; currently just a `hello_world` interop scaffold. Requires the Rust toolchain pinned in `rust-toolchain.toml` (the Nix devshell provides it automatically).

API-CHANGELOG.md

@@ -22,17 +22,56 @@ API version 2 is available in `xrpld` version 2.0.0 and later. See [API-VERSION-
 
 This version is supported by all `xrpld` versions. For WebSocket and HTTP JSON-RPC requests, it is currently the default API version used when no `api_version` is specified.
 
-## Unreleased
+## XRP Ledger server version 3.4.0
 
-This section contains changes targeting a future version.
+Version 3.4.0 is not yet released. These changes are available in the 3.4.0 beta releases.
 
-### Additions
+### Additions in 3.4.0
+
+- `book_offers`, `account_offers`: With the `OfferQualifiers` amendment, an offer entry may now include `all_or_none: true` (the offer carries the `lsfAllOrNone` flag) and/or `min_quantity` (the offer's `MinQuantity` amount). These mark execution-qualified ("contingent") offers that cannot be taken to arbitrary depth; clients should exclude them from quoted/takeable depth. The `OfferCreate` transaction gains the `tfAllOrNone` and `tfPostOnly` flags and an optional `MinQuantity` field, and a marketable `tfPostOnly` offer is rejected with the new `tecWOULD_CROSS` result.
+
+- `account_tx`: Added an optional `delegate` request object to filter delegated transactions. The object requires `delegate_filter`, which must be either `actor` for transactions owned by the requested account but signed by another account, or `authorizer` for transactions signed by the requested account on behalf of another account. The optional `counter_party` account narrows the results to a specific signer/delegate for `actor` or a specific owner/delegator for `authorizer`. Malformed `delegate`, `delegate_filter`, and `counter_party` values return standard invalid field errors, and invalid account IDs return `actMalformed`.
+  When paginating delegate-filtered queries, a marker from a delegate-filtered query includes a `delegate` flag and is only valid for follow-up requests that also supply `delegate` (mixing marker conventions returns `invalidParams`). Because filtering is applied after the ledger scan, a page may contain fewer results than `limit` (possibly zero) while still returning a marker, so callers must continue until no marker is present.
+- `ledger`: `nftoken_id`, `nftoken_ids`, and `offer_id` are now included in transaction metadata when transactions are expanded (`expand`, or admin-only `full`), matching the `tx`, `account_tx`, and `subscribe` (`transactions` stream) responses. ([#5706](https://github.com/XRPLF/rippled/pull/5706))
+
+### Bugfixes in 3.4.0
+
+- `sign`, `sign_for`, `submit`: `signature_target` now returns `invalidParams` unless it names `CounterpartySignature` or `SponsorSignature`. It previously accepted any inner object field, such as `Book` or `NFToken`, and signed into it.
+- `sign`, `sign_for`, `submit`, `submit_multisigned`: With `fixCleanup3_4_0` enabled, a signature in `CounterpartySignature` or `SponsorSignature` covers a different prefix than the transaction's own signature, so a signature can no longer be moved from one of those roles into another. Clients that build these signatures themselves must use the new prefixes: `CPT` and `CPM` (single- and multi-signing) for `CounterpartySignature`, and `SPN` and `SPM` for `SponsorSignature`.
+- `get_aggregate_price`: Duplicate entries in the `oracles` request array are now ignored. [#6586](https://github.com/XRPLF/rippled/pull/6586)
+- `vault_info`: Errors now identify what the request got wrong instead of reporting every failure as the unregistered token `malformedRequest`, and the `error`, `error_code` and `error_message` fields now agree with each other. An invalid `vault_id` or `seq` returns `invalidParams`, an invalid `owner` returns `actMalformed`, and a request that mixes `vault_id` with `owner`/`seq` or supplies neither returns `invalidParams` with a message naming the accepted combinations. [#8015](https://github.com/XRPLF/rippled/pull/8015)
+- `vault_info`: A well-formed all-zero `vault_id` now returns `entryNotFound` instead of being rejected as malformed, and `entryNotFound` responses now include `error_code` and `error_message`. Clients that request `ripplerpc` 3.0 or above therefore receive HTTP 400 with that error rather than HTTP 200. [#8015](https://github.com/XRPLF/rippled/pull/8015)
+- `vault_info`: `vault_id` and `owner` must now be strings, matching how `ledger_entry` reads the same fields. An object or an array in either field previously produced an internal error, and a number was silently converted to its decimal text; `vault_id` now returns `invalidParams` and `owner` returns `actMalformed`. [#8015](https://github.com/XRPLF/rippled/pull/8015)
+- `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)
+- `ledger`: `delivered_amount` is now included in the metadata of successful `AccountDelete` transactions when transactions are expanded (`expand`, or admin-only `full`). Previously it was only added for `Payment` and `CheckCash`, which made `ledger` inconsistent with `tx` and `account_tx`. [#5706](https://github.com/XRPLF/rippled/pull/5706)
+
+## XRP Ledger server version 3.3.0
+
+[Version 3.3.0](https://github.com/XRPLF/rippled/releases/tag/3.3.0) was released on Aug 6, 2026.
+
+### Additions in 3.3.0
+
+- `account_tx`: Added an optional `delegate` request object to filter delegated transactions. The object requires `delegate_filter`, which must be either `actor` for transactions owned by the requested account but signed by another account, or `authorizer` for transactions signed by the requested account on behalf of another account. The optional `counter_party` account narrows the results to a specific signer/delegate for `actor` or a specific owner/delegator for `authorizer`. Malformed `delegate`, `delegate_filter`, and `counter_party` values return standard invalid field errors, and invalid account IDs return `actMalformed`. When paginating delegate-filtered queries, a marker from a delegate-filtered query includes a `delegate` flag and is only valid for follow-up requests that also supply `delegate` (mixing marker conventions returns `invalidParams`). Because filtering is applied after the ledger scan, a page may contain fewer results than `limit` (possibly zero) while still returning a marker, so callers must continue until no marker is present. ([#6126](https://github.com/XRPLF/rippled/pull/6126))
+
+## XRP Ledger server version 3.2.1
+
+[Version 3.2.1](https://github.com/XRPLF/rippled/releases/tag/3.2.1) was released on Aug 1, 2026.
+
+This release contains bug fixes only and no API changes.
+
+## XRP Ledger server version 3.2.0
+
+[Version 3.2.0](https://github.com/XRPLF/rippled/releases/tag/3.2.0) was released on Jun 16, 2026.
+
+### Additions in 3.2.0
+
+- `ledger_entry`, `account_objects`: Added the `Ballot` and `BallotVote` ledger entry types introduced by the `ConfidentialVoting` amendment. `ledger_entry` accepts a `ballot` request object (`owner` + `seq`) and a `ballot_vote` request object (`ballot_id` + `account`), or a hex object ID for either. `account_objects` returns these entries and accepts them as `type` filters.
 
 - `account_tx`: Added an optional `delegate` request object to filter delegated transactions. The object requires `delegate_filter`, which must be either `actor` for transactions owned by the requested account but signed by another account, or `authorizer` for transactions signed by the requested account on behalf of another account. The optional `counter_party` account narrows the results to a specific signer/delegate for `actor` or a specific owner/delegator for `authorizer`. Malformed `delegate`, `delegate_filter`, and `counter_party` values return standard invalid field errors, and invalid account IDs return `actMalformed`.
   When paginating delegate-filtered queries, a marker from a delegate-filtered query includes a `delegate` flag and is only valid for follow-up requests that also supply `delegate` (mixing marker conventions returns `invalidParams`). Because filtering is applied after the ledger scan, a page may contain fewer results than `limit` (possibly zero) while still returning a marker, so callers must continue until no marker is present.
 
 - `ledger_entry`, `account_objects`: The `Delegate` ledger entry now includes an optional `DestinationNode` field, which stores the index into the authorized account's owner directory. This field is present on entries created after bidirectional directory tracking was introduced and may appear in RPC responses for those entries. ([#6681](https://github.com/XRPLF/rippled/pull/6681))
-
 - `server_definitions`: Added the following new sections to the response ([#6321](https://github.com/XRPLF/rippled/pull/6321)):
   - `TRANSACTION_FORMATS`: Describes the fields and their optionality for each transaction type, including common fields shared across all transactions.
   - `LEDGER_ENTRY_FORMATS`: Describes the fields and their optionality for each ledger entry type, including common fields shared across all ledger entries.
@@ -40,9 +79,8 @@ This section contains changes targeting a future version.
   - `LEDGER_ENTRY_FLAGS`: Maps ledger entry type names to their flags and flag values.
   - `ACCOUNT_SET_FLAGS`: Maps AccountSet flag names (asf flags) to their numeric values.
 
-### Bugfixes
+### Bugfixes in 3.2.0
 
-- `get_aggregate_price`: Duplicate entries in the `oracles` request array are now ignored. [#6586](https://github.com/XRPLF/rippled/pull/6586)
 - Peer Crawler: The `port` field in `overlay.active[]` now consistently returns an integer instead of a string for outbound peers. [#6318](https://github.com/XRPLF/rippled/pull/6318)
 - `ping`: The `ip` field is no longer returned as an empty string for proxied connections without a forwarded-for header. It is now omitted, consistent with the behavior for identified connections. [#6730](https://github.com/XRPLF/rippled/pull/6730)
 - gRPC `GetLedgerDiff`: Fixed error message that incorrectly said "base ledger not validated" when the desired ledger was not validated. [#6730](https://github.com/XRPLF/rippled/pull/6730)
@@ -54,11 +92,24 @@ 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)
-- `vault_info`: Errors now identify what the request got wrong instead of reporting every failure as the unregistered token `malformedRequest`, and the `error`, `error_code` and `error_message` fields now agree with each other. An invalid `vault_id` or `seq` returns `invalidParams`, an invalid `owner` returns `actMalformed`, and a request that mixes `vault_id` with `owner`/`seq` or supplies neither returns `invalidParams` with a message naming the accepted combinations. [#8015](https://github.com/XRPLF/rippled/pull/8015)
-- `vault_info`: A well-formed all-zero `vault_id` now returns `entryNotFound` instead of being rejected as malformed, and `entryNotFound` responses now include `error_code` and `error_message`. Clients that request `ripplerpc` 3.0 or above therefore receive HTTP 400 with that error rather than HTTP 200. [#8015](https://github.com/XRPLF/rippled/pull/8015)
-- `vault_info`: `vault_id` and `owner` must now be strings, matching how `ledger_entry` reads the same fields. An object or an array in either field previously produced an internal error, and a number was silently converted to its decimal text; `vault_id` now returns `invalidParams` and `owner` returns `actMalformed`. [#8015](https://github.com/XRPLF/rippled/pull/8015)
-- `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.3
+
+[Version 3.1.3](https://github.com/XRPLF/rippled/releases/tag/3.1.3) was released on May 8, 2026.
+
+This release contains bug fixes only and no API changes.
+
+## XRP Ledger server version 3.1.2
+
+[Version 3.1.2](https://github.com/XRPLF/rippled/releases/tag/3.1.2) was released on Mar 12, 2026.
+
+This release contains bug fixes only and no API changes.
+
+## XRP Ledger server version 3.1.1
+
+[Version 3.1.1](https://github.com/XRPLF/rippled/releases/tag/3.1.1) was released on Feb 23, 2026.
+
+This release contains bug fixes only and no API changes.
 
 ## XRP Ledger server version 3.1.0
 

CLAUDE.md

@@ -0,0 +1 @@
+AGENTS.md

CMakeLists.txt

@@ -99,6 +99,7 @@ if(only_docs)
     return()
 endif()
 
+include(deps/dilithium)
 include(deps/Boost)
 
 add_subdirectory(external/antithesis-sdk)
@@ -114,6 +115,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(

CONTRIBUTING.md

@@ -59,6 +59,17 @@ to an existing XLS. Neither change will be released (in an amendment's
 case, marked as `Supported::yes`) until the corresponding XLS's status
 is `Final`.
 
+## AI coding agents
+
+[`AGENTS.md`](./AGENTS.md) (and its `CLAUDE.md` symlink, for Claude Code) holds shared, checked-in guidance for AI coding agents working in this repository — build/test/lint commands and architecture notes. Additional `AGENTS.md` files may exist in subdirectories to give agents context specific to that part of the codebase; whenever you add one, also add a `CLAUDE.md` symlink pointing to it (`ln -s AGENTS.md CLAUDE.md`) so Claude Code picks it up too.
+
+If you want to give an agent personal instructions that shouldn't be shared with other contributors (e.g. your own workflow preferences), those are gitignored, not checked in:
+
+- `CLAUDE.local.md` — read by Claude Code alongside `CLAUDE.md`.
+- `AGENTS.override.md` — read by AGENTS.md-compatible tools that support a personal override file layered on top of `AGENTS.md`.
+
+Likewise, `.claude/settings.local.json` is for personal, untracked Claude Code settings, while `.claude/settings.json` is shared.
+
 ## Before making a pull request
 
 (Or marking a draft pull request as ready.)
@@ -82,7 +93,7 @@ If you create new source files, they must be organized as follows:
   under `include/xrpl`, and source (`.cpp`) files must go under
   `src/libxrpl`.
 - All other non-test files must go under `src/xrpld`.
-- All test source files must go under `src/test`.
+- New test source files should use `gtest` and go under `src/tests`, unless that isn't possible, in which case they should use our legacy test framework and go under `src/test`.
 - All benchmark source files must go under `src/benchmarks`.
 
 The source must be formatted according to the style guide below. The easiest

bin/check-tools.sh

@@ -158,6 +158,7 @@ if [ "${os}" = "linux" ] || [ "${os}" = "macos" ]; then
     check cargo-nextest cargo nextest --version
     check clippy-driver
     check rust-analyzer
+    check rust-nightly rust-nightly run rustc --version
     check rustc
     check rustfmt
 fi

bin/install-packaging-tools.sh

@@ -25,7 +25,9 @@ esac
 # Packaging runs in a vanilla distro image, so the tooling comes from the distro's
 # archive rather than from nixpkgs:
 #
-#   - debhelper and dpkg-dev build the DEB
+#   - debhelper and dpkg-dev build the DEB, and lintian checks it
+#   - binutils gives debian/rules the readelf its glibc-floor check runs; it
+#     already arrives via dpkg-dev, but that tool is called directly
 #   - rpm-build builds the RPM, with systemd-rpm-macros and redhat-rpm-config
 #     supplying the systemd and find-debuginfo macros the spec uses
 #   - rpm-sign and gnupg2 sign the built RPM
@@ -37,11 +39,13 @@ function install() {
         debian | ubuntu)
             apt-get update -y
             apt-get install -y --no-install-recommends \
+                binutils \
                 ca-certificates \
                 debhelper \
                 debhelper-compat \
                 dpkg-dev \
                 git \
+                lintian \
                 python3
             ;;
 

bin/pre-commit/check_rust_coverage_attrs.py

@@ -0,0 +1,149 @@
+#!/usr/bin/env python3
+"""
+Check that Rust unit tests stay out of the coverage report.
+
+cargo-llvm-cov instruments the test code along with everything else, so a test
+module that is not excluded counts its own body as covered and inflates the
+reported number. Excluding it takes two attributes:
+
+  * every `#[cfg(test)]` module carries
+    `#[cfg_attr(coverage_nightly, coverage(off))]`;
+  * every crate root (lib.rs, main.rs) carries
+    `#![cfg_attr(coverage_nightly, feature(coverage_attribute))]`, which the
+    attribute above needs in order to compile.
+
+Both are inert outside the coverage job: cargo-llvm-cov defines
+`coverage_nightly` only when it runs on a nightly toolchain.
+
+The crate-root gate is checked even in a crate that has no tests yet, because
+that is what lets the first test module added later carry the attribute without
+a build failure. Missing it is a hard error, so it cannot go unnoticed; a
+missing `coverage(off)` fails open, which is why this check exists.
+
+Matching is on exact attribute text, which works because `cargo fmt` runs over
+the whole workspace in the hook ahead of this one: rustfmt puts every attribute
+on its own line and normalizes what is inside it, turning `#[cfg( test )]`
+and `#[cfg(test,)]` alike into `#[cfg(test)]`. So there is nothing here that
+parses Rust. The price is that a cfg this file does not spell out literally --
+`all(test, ...)`, `any(test, ...)`, `not(test)` -- is reported rather than
+classified, on the grounds that guessing at coverage semantics is how a check
+like this ends up quietly wrong.
+
+Usage: ./bin/pre-commit/check_rust_coverage_attrs.py <file1> <file2> ...
+
+Exit status is non-zero if any violation is found.
+"""
+
+import re
+import sys
+from dataclasses import dataclass
+from pathlib import Path
+
+CRATE_ROOTS = {"lib.rs", "main.rs"}
+
+FEATURE_ATTR = "#![cfg_attr(coverage_nightly, feature(coverage_attribute))]"
+COVERAGE_OFF_ATTR = "#[cfg_attr(coverage_nightly, coverage(off))]"
+CFG_TEST_ATTR = "#[cfg(test)]"
+
+# Any other cfg that mentions `test`. String literals are blanked before this
+# runs, so `feature = "test"` does not read as the `test` cfg.
+RE_CFG_MENTIONS_TEST = re.compile(r"^#\[cfg\(.*\btest\b.*\)\]$")
+RE_STRING = re.compile(r'"(?:[^"\\]|\\.)*"')
+RE_MOD = re.compile(r"^(?:pub(?:\([^)]*\))?\s+)?mod\s+([A-Za-z_]\w*)")
+
+
+@dataclass(frozen=True)
+class Finding:
+    line: int
+    label: str
+    message: str
+
+
+def _check_module(attrs: list[str], line: int, name: str) -> list[Finding]:
+    """Findings for one module, given the attributes attached to it."""
+    if COVERAGE_OFF_ATTR in attrs:
+        return []  # excluded from coverage; which cfg gates it does not matter
+    if CFG_TEST_ATTR in attrs:
+        return [
+            Finding(
+                line,
+                "missing-coverage-off",
+                f"`mod {name}` is #[cfg(test)] but not excluded from coverage; "
+                f"add {COVERAGE_OFF_ATTR}",
+            )
+        ]
+    unclassified = [
+        attr for attr in attrs if RE_CFG_MENTIONS_TEST.match(RE_STRING.sub('""', attr))
+    ]
+    if unclassified:
+        return [
+            Finding(
+                line,
+                "unclassified-cfg",
+                f"`mod {name}` is gated on {unclassified[0]}, which this check "
+                f"cannot tell apart from a module that ships in the library; "
+                f"add {COVERAGE_OFF_ATTR} if it is test-only, or teach this "
+                f"check the cfg if it is not",
+            )
+        ]
+    return []
+
+
+def _check_test_modules(lines: list[str]) -> list[Finding]:
+    """Findings for every test module that is not excluded from coverage."""
+    findings: list[Finding] = []
+    attrs: list[str] = []
+    attrs_line = 0
+    for number, raw in enumerate(lines, start=1):
+        stripped = raw.strip()
+        # Blank lines and comments are allowed between an attribute and its item.
+        if not stripped or stripped.startswith("//"):
+            continue
+        if stripped.startswith("#["):
+            if not attrs:
+                attrs_line = number
+            attrs.append(stripped)
+            continue
+        module = RE_MOD.match(stripped)
+        if module is not None and attrs:
+            findings += _check_module(attrs, attrs_line, module.group(1))
+        attrs = []
+    return findings
+
+
+def _check_crate_root(name: str, lines: list[str]) -> list[Finding]:
+    """A finding if a crate root is missing the coverage_attribute feature gate."""
+    if name not in CRATE_ROOTS:
+        return []
+    if any(line.strip() == FEATURE_ATTR for line in lines):
+        return []
+    return [
+        Finding(
+            1,
+            "missing-feature-gate",
+            f"crate root is missing {FEATURE_ATTR}",
+        )
+    ]
+
+
+def check_source(name: str, text: str) -> list[Finding]:
+    """Findings for one file's contents; `name` is its base name (lib.rs, ...)."""
+    lines = text.splitlines()
+    return _check_crate_root(name, lines) + _check_test_modules(lines)
+
+
+def check_file(path: Path) -> list[Finding]:
+    return check_source(path.name, path.read_text(encoding="utf-8"))
+
+
+def main() -> int:
+    total = 0
+    for path in (Path(name) for name in sys.argv[1:]):
+        for finding in check_file(path):
+            total += 1
+            print(f"{path}:{finding.line}: {finding.label}: {finding.message}")
+    return 1 if total else 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

cfg/xrpld-example.cfg

@@ -1360,6 +1360,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/XrplCore.cmake

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

cmake/deps/dilithium.cmake

@@ -0,0 +1,62 @@
+include(FetchContent)
+
+ExternalProject_Add(
+  dilithium_src
+  PREFIX ${nih_cache_path}
+  # Pin to an explicit commit, not a moving branch ref. Bumping this SHA
+  # is a supply-chain decision that must be reviewed; never revert to a
+  # branch tag here. Upstream:
+  #   https://github.com/Transia-RnD/dilithium/commit/3032292cfd4d94e0df9bd49a0098669ca9166aa1
+  GIT_REPOSITORY https://github.com/Transia-RnD/dilithium.git
+  GIT_TAG 3032292cfd4d94e0df9bd49a0098669ca9166aa1
+  GIT_SHALLOW FALSE
+  CONFIGURE_COMMAND ""
+  LOG_BUILD ON
+  BUILD_IN_SOURCE 0
+  BUILD_COMMAND
+    COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/ref <BINARY_DIR>/ref
+    COMMAND make -C <BINARY_DIR>/ref clean
+    COMMAND /bin/sh -c "CFLAGS='-DDILITHIUM_MODE=2 -DDILITHIUM_RANDOMIZED_SIGNING' make -C <BINARY_DIR>/ref libdilithium2_ref.a libfips202_ref.a"
+  INSTALL_COMMAND ""
+  BUILD_BYPRODUCTS
+      <BINARY_DIR>/ref/libdilithium2_ref.a
+      <BINARY_DIR>/ref/libfips202_ref.a
+)
+
+ExternalProject_Get_Property(dilithium_src SOURCE_DIR BINARY_DIR)
+set(dilithium_src_SOURCE_DIR "${SOURCE_DIR}")
+set(dilithium_src_BINARY_DIR "${BINARY_DIR}")
+
+# Include the reference implementation headers from source
+include_directories("${dilithium_src_SOURCE_DIR}/ref")
+
+# Create imported targets for each static library using BINARY_DIR
+add_library(dilithium::dilithium2_ref STATIC IMPORTED GLOBAL)
+set_target_properties(dilithium::dilithium2_ref PROPERTIES
+  IMPORTED_LOCATION "${dilithium_src_BINARY_DIR}/ref/libdilithium2_ref.a"
+  INTERFACE_INCLUDE_DIRECTORIES "${dilithium_src_SOURCE_DIR}/ref/"
+)
+
+add_library(dilithium::libfips202_ref STATIC IMPORTED GLOBAL)
+set_target_properties(dilithium::libfips202_ref PROPERTIES
+  IMPORTED_LOCATION "${dilithium_src_BINARY_DIR}/ref/libfips202_ref.a"
+  INTERFACE_INCLUDE_DIRECTORIES "${dilithium_src_SOURCE_DIR}/ref/"
+)
+
+# Add dependencies to ensure the external project is built first
+add_dependencies(dilithium::dilithium2_ref dilithium_src)
+add_dependencies(dilithium::libfips202_ref dilithium_src)
+
+# Note: We do NOT link the Dilithium library's randombytes.c because we provide
+# our own thread-safe implementation in src/libxrpl/protocol/SecretKey.cpp
+# that uses xrpld's crypto_prng() instead of direct /dev/urandom access.
+
+# Create an interface library that links to the Dilithium libraries
+# Note: Link order matters - libraries that provide symbols must come AFTER libraries that use them
+target_link_libraries(xrpl_libs INTERFACE
+  dilithium::dilithium2_ref
+  dilithium::libfips202_ref
+)
+
+# Create alias for convenience
+add_library(NIH::dilithium2_ref ALIAS dilithium::dilithium2_ref)

cmake/scripts/codegen/generate_tx_classes.py

@@ -61,6 +61,8 @@ SETTING_DEFAULTS = {
     "delegable": "Delegation::NotDelegable",
     "amendment": "uint256{}",
     "privileges": "Privilege::NoPriv",
+    "emittance": "Emittance::Emitable",
+    "firewall": "FirewallAction::Allow",
 }
 
 

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",

conanfile.py

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

crates/Cargo.toml

@@ -8,6 +8,9 @@ cxx = { version = "1.0.198", features = ["c++20"] }
 [workspace.package]
 edition = "2024"
 
+[workspace.lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = [ 'cfg(coverage)', 'cfg(coverage_nightly)' ] }
+
 [profile.release]
 opt-level = 3
 overflow-checks = true

crates/hello_world/Cargo.toml

@@ -8,3 +8,6 @@ crate-type = ["staticlib"]
 
 [dependencies]
 cxx.workspace = true
+
+[lints]
+workspace = true

crates/hello_world/src/lib.rs

@@ -1,3 +1,5 @@
+#![cfg_attr(coverage_nightly, feature(coverage_attribute))]
+
 #[cxx::bridge(namespace = "rs::hello_world")]
 mod ffi {
     extern "Rust" {
@@ -8,3 +10,14 @@ mod ffi {
 pub fn hello_world() -> String {
     "hello_world".to_string()
 }
+
+#[cfg(test)]
+#[cfg_attr(coverage_nightly, coverage(off))]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn hello_world_returns_hello_world() {
+        assert_eq!(hello_world(), "hello_world")
+    }
+}

docker/supported.Dockerfile

@@ -0,0 +1,25 @@
+# Runtime image for the perf/test xrpld build with all amendments Supported::Yes.
+# Installs the .deb into ubuntu:jammy (matching rippleci/xrpld): gives
+# /usr/bin/xrpld, /etc/xrpld/xrpld.cfg, and the xrpld user.
+# NOT for production validators.
+ARG BASE_IMAGE=ubuntu:jammy
+FROM ${BASE_IMAGE}
+
+# Build context must contain the supported package as xrpld.deb.
+COPY xrpld.deb /tmp/xrpld.deb
+
+RUN set -eux; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends ca-certificates jq /tmp/xrpld.deb; \
+    rm -rf /var/lib/apt/lists/* /tmp/xrpld.deb; \
+    id -u xrpld >/dev/null 2>&1 || \
+        useradd --system --home-dir /var/lib/xrpld --shell /sbin/nologin --user-group xrpld; \
+    mkdir -p /var/log/xrpld /var/lib/xrpld; \
+    chown -R xrpld:xrpld /var/log/xrpld /var/lib/xrpld; \
+    # Symlink for consumers that exec /opt/xrpld/bin/xrpld.
+    mkdir -p /opt/xrpld/bin; \
+    ln -sf /usr/bin/xrpld /opt/xrpld/bin/xrpld
+
+EXPOSE 2459/tcp 5005/tcp 6006/tcp
+USER xrpld
+ENTRYPOINT ["/usr/bin/xrpld"]

docs/AMMCurveTemplate.md

@@ -0,0 +1,279 @@
+# AMM Curve Implementation Template
+
+Guide for adding a new curve type to the XRPL pluggable AMM curve framework.
+
+## Architecture Overview
+
+Each token pair can have **multiple AMM pools**, one per curve type. The keylet
+hash includes `curveType`, so `RLUSD/USD ConstantProduct` and `RLUSD/USD
+StableSwap` are separate ledger entries with separate pseudo-accounts and LP
+tokens. BookStep automatically routes through the deepest-liquidity pool.
+
+### Key Components
+
+| Component             | File                                                | Purpose                                 |
+| --------------------- | --------------------------------------------------- | --------------------------------------- |
+| CurveInterface        | `include/xrpl/ledger/helpers/AMMCurve.h`            | Abstract base for all curves            |
+| Curve implementations | `src/libxrpl/ledger/helpers/AMMCurve.cpp`           | CP, CL, StableSwap, Weighted            |
+| Tick math             | `src/libxrpl/ledger/helpers/AMMTickMath.cpp`        | CL tick/sqrt price conversions          |
+| Fee collection        | `src/libxrpl/tx/transactors/dex/AMMCollectFees.cpp` | CL position fee harvesting              |
+| Multi-curve routing   | `src/libxrpl/tx/paths/BookStep.cpp`                 | Picks best pool per pair                |
+| Keylet hashing        | `src/libxrpl/protocol/Indexes.cpp`                  | `amm(asset1, asset2, curveType)`        |
+| LP token identity     | `src/libxrpl/protocol/AMMCore.cpp`                  | `ammLPTCurrency(cur1, cur2, curveType)` |
+
+## Step 1: Define the Curve Type
+
+Add to `include/xrpl/protocol/AMMCore.h`:
+
+```cpp
+enum CurveType : std::uint8_t
+{
+    ctCONSTANT_PRODUCT = 0,
+    ctCONCENTRATED_LIQUIDITY = 1,
+    ctSTABLE_SWAP = 2,
+    ctWEIGHTED = 3,
+    ctYOUR_CURVE = N,  // next available ID
+};
+```
+
+## Step 2: Define SFields for Curve Parameters
+
+Add to `include/xrpl/protocol/detail/sfields.macro`:
+
+```cpp
+// Use the appropriate type (UINT8, UINT16, UINT32, UINT64, UINT256, AMOUNT, etc.)
+// Check existing field codes to avoid collisions.
+TYPED_SFIELD(sfYourParam, UINT32, <next_available_code>)
+```
+
+## Step 3: Implement the CurveInterface
+
+Add a new class in `src/libxrpl/ledger/helpers/AMMCurve.cpp`:
+
+```cpp
+class YourCurve final : public CurveInterface
+{
+public:
+    Expected<STAmount, TER>
+    swapIn(
+        STAmount const& poolIn,
+        STAmount const& poolOut,
+        STAmount const& assetIn,
+        std::uint16_t tfee,
+        STObject const* curveParams) const override
+    {
+        if (!curveParams)
+            return Unexpected(tecINTERNAL);
+
+        auto const param = curveParams->getFieldU32(sfYourParam);
+
+        auto const f = feeMult(tfee);  // fee multiplier (1 - fee)
+        Number const x = poolIn;       // STAmount -> Number via implicit conversion
+        Number const y = poolOut;
+        Number const dx = Number(assetIn) * f;
+
+        // --- YOUR INVARIANT MATH HERE ---
+        // Compute output amount `dy` from your invariant
+        // F(x, y) = k  =>  F(x + dx, y - dy) = k  =>  solve for dy
+        Number const dy = /* ... */;
+
+        if (dy <= Number{0})
+            return Unexpected(tecAMM_FAILED);
+
+        // Round output DOWN (favorable to pool)
+        NumberRoundModeGuard const mg(Number::downward);
+        return toSTAmount(poolOut.issue(), dy);
+    }
+
+    Expected<STAmount, TER>
+    swapOut(
+        STAmount const& poolIn,
+        STAmount const& poolOut,
+        STAmount const& assetOut,
+        std::uint16_t tfee,
+        STObject const* curveParams) const override
+    {
+        if (!curveParams)
+            return Unexpected(tecINTERNAL);
+
+        auto const param = curveParams->getFieldU32(sfYourParam);
+
+        auto const f = feeMult(tfee);
+        Number const x = poolIn;
+        Number const y = poolOut;
+
+        // --- YOUR INVARIANT MATH (INVERSE) ---
+        // Given desired output, compute required input
+        // F(x, y) = k  =>  F(x + dx, y - assetOut) = k  =>  solve for dx
+        Number const dx = /* ... */ / f;
+
+        if (dx <= Number{0})
+            return Unexpected(tecAMM_FAILED);
+
+        // Round input UP (favorable to pool)
+        NumberRoundModeGuard const mg(Number::upward);
+        return toSTAmount(poolIn.issue(), dx);
+    }
+
+    Expected<Number, TER>
+    spotPrice(
+        STAmount const& poolIn,
+        STAmount const& poolOut,
+        std::uint16_t tfee,
+        STObject const* curveParams) const override
+    {
+        if (!curveParams)
+            return Unexpected(tecINTERNAL);
+
+        auto const param = curveParams->getFieldU32(sfYourParam);
+        auto const f = feeMult(tfee);
+
+        // Marginal price: -dF/dx / dF/dy evaluated at current reserves
+        // Divided by (1 - fee) for the taker-facing price
+        Number const price = /* partial derivatives of your invariant */;
+        return price / f;
+    }
+
+    TER
+    validateParams(STObject const& curveParams) const override
+    {
+        // Validate curve-specific parameters at pool creation
+        if (!curveParams.isFieldPresent(sfYourParam))
+            return temMALFORMED;
+
+        auto const param = curveParams.getFieldU32(sfYourParam);
+        if (param < MIN_YOUR_PARAM || param > MAX_YOUR_PARAM)
+            return temMALFORMED;
+
+        return tesSUCCESS;
+    }
+
+    Expected<STAmount, TER>
+    initialLPTokens(
+        STAmount const& asset1,
+        STAmount const& asset2,
+        Issue const& lptIssue,
+        STObject const* curveParams) const override
+    {
+        if (!curveParams)
+            return Unexpected(tecINTERNAL);
+
+        // Compute initial LP token amount from deposits
+        // For many curves: geometric mean sqrt(asset1 * asset2)
+        // Or curve-specific: D for StableSwap, weighted geometric mean, etc.
+        Number const lp = /* ... */;
+        return toSTAmount(lptIssue, lp);
+    }
+};
+```
+
+## Step 4: Register the Singleton and Dispatch
+
+In `AMMCurve.cpp`, add the singleton and switch case:
+
+```cpp
+// At file scope (inside anonymous namespace)
+static YourCurve const yourCurve_;
+
+// In getCurve():
+case ctYOUR_CURVE:
+    if (rules.enabled(featureAMMCurves))
+        return &yourCurve_;
+    return nullptr;
+```
+
+## Step 5: Update AMMCreate Validation
+
+In `src/libxrpl/tx/transactors/dex/AMMCreate.cpp`:
+
+1. Update the max curve type check: `if (curveType > ctYOUR_CURVE)`
+2. Add params setup in the `applyGuts` section:
+
+```cpp
+else if (curveType == ctYOUR_CURVE)
+{
+    ammSle->setFieldU32(
+        sfYourParam, ctx_.tx.getFieldU32(sfYourParam));
+}
+```
+
+## Step 6: Multi-Curve Routing (BookStep)
+
+BookStep automatically discovers and routes through the best pool for each
+token pair. When a new curve type is added, update the loop upper bound in
+`src/libxrpl/tx/paths/BookStep.cpp`:
+
+```cpp
+for (std::uint8_t ct = 0; ct <= ctYOUR_CURVE; ++ct)
+{
+    auto const ammSle = ctx.view.read(keylet::amm(in, out, ct));
+    if (!ammSle || ammSle->getFieldAmount(sfLPTokenBalance) == beast::zero)
+        continue;
+    if (!bestAmm ||
+        ammSle->getFieldAmount(sfLPTokenBalance) >
+            bestAmm->getFieldAmount(sfLPTokenBalance))
+        bestAmm = ammSle;
+}
+```
+
+The pool with the highest LP token balance wins. Curve-specific swap dispatch
+happens automatically via `getCurve()` in `AMMLiquidity`/`AMMOffer`.
+
+## Step 7: Keylet and LP Token Identity
+
+Each curve type for the same token pair gets a unique ledger key and LP token:
+
+- **Keylet**: `keylet::amm(asset1, asset2, curveType)` hashes `curveType` into
+  the AMM's ledger key (when curveType != 0, for backward compatibility)
+- **LP token**: `ammLPTCurrency(cur1, cur2, curveType)` hashes `curveType` into
+  the LP token currency code
+
+No changes needed here when adding a new curve — the default parameter
+propagates automatically.
+
+## Concentrated Liquidity Extras
+
+The CL curve type uses additional infrastructure not needed by other curves:
+
+- **AMMTickMath** (`AMMTickMath.h/cpp`): `tickToSqrtPrice()`, `sqrtPriceToTick()`,
+  `isValidTick()` for tick-based price representation
+- **AMMCollectFees** (`AMMCollectFees.h/cpp`): Transactor for position owners to
+  collect accumulated swap fees using the Uniswap V3 fee growth formula
+- **Ledger entries**: `ltAMM_POSITION` (per-user tick range + liquidity) and
+  `ltAMM_TICK` (per-tick fee growth and liquidity tracking)
+- **SFields**: `sfFeeGrowthGlobal0/1`, `sfFeeGrowthOutside0/1`,
+  `sfFeeGrowthInsideLast0/1` (UINT256, Q128.128 fixed-point),
+  `sfActiveLiquidity`, `sfPositionLiquidity`, `sfLiquidityGross/Net` (UINT64)
+
+## Math Utilities Available
+
+- `Number`: arbitrary-precision decimal arithmetic (see `include/xrpl/basics/Number.h`)
+- `power(f, n)`: f^n (integer exponent)
+- `power(f, n, d)`: f^(n/d) (rational exponent)
+- `root(f, d)`: f^(1/d)
+- `root2(f)`: sqrt(f)
+- `feeMult(tfee)`: returns `1 - fee` as Number
+- `feeMultHalf(tfee)`: returns `1 - fee/2` as Number
+- `toSTAmount(issue, number)`: convert Number to STAmount
+- `NumberRoundModeGuard`: RAII guard for rounding direction
+
+## Rounding Convention
+
+- `swapIn` output: round DOWN (pool keeps the rounding dust)
+- `swapOut` input: round UP (taker pays the rounding dust)
+- Use `NumberRoundModeGuard` to set the rounding mode before `toSTAmount()`
+
+## Testing
+
+Add tests in `src/test/app/AMMCurves_test.cpp`:
+
+1. `swapIn` and `swapOut` are inverses (within rounding tolerance)
+2. Invariant is preserved: `F(reserves_new) >= F(reserves_old)` after every swap
+3. `spotPrice` matches actual swap rate at infinitesimal amounts
+4. Edge cases: zero input, max input, min reserves
+5. Parameter validation: `validateParams` rejects out-of-range values
+6. Integration: create pool, deposit, swap, withdraw full cycle
+
+E2E tests go in `src/test/app/AMMCurvesE2E_test.cpp` for full transaction
+lifecycle tests (AMMCreate with curve params, swap through payment engine,
+deposit/withdraw).

include/xrpl/basics/Number.h

@@ -543,8 +543,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/base64.h

@@ -82,4 +82,10 @@ base64Encode(std::string_view s)
 std::string
 base64Decode(std::string_view data);
 
+/** Decode a base64url-encoded string (RFC 4648 S5).
+    Converts '-' to '+' and '_' to '/', adds padding, then decodes.
+*/
+std::string
+base64urlDecode(std::string_view data);
+
 }  // namespace xrpl

include/xrpl/config/Constants.h

@@ -11,6 +11,7 @@ struct Sections
     static constexpr auto kCompression = "compression";
     static constexpr auto kCrawl = "crawl";
     static constexpr auto kDatabasePath = "database_path";
+    static constexpr auto kDatagramMonitor = "datagram_monitor";
     static constexpr auto kDebugLogfile = "debug_logfile";
     static constexpr auto kElbSupport = "elb_support";
     static constexpr auto kFeatures = "features";
@@ -67,6 +68,7 @@ struct Sections
     static constexpr auto kValidationSeed = "validation_seed";
     static constexpr auto kValidatorKeys = "validator_keys";
     static constexpr auto kValidatorKeyRevocation = "validator_key_revocation";
+    static constexpr auto kValidatorKeyType = "validator_key_type";
     static constexpr auto kValidatorListKeys = "validator_list_keys";
     static constexpr auto kValidatorListSites = "validator_list_sites";
     static constexpr auto kValidatorListThreshold = "validator_list_threshold";
@@ -94,6 +96,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 +111,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/HashRouter.h

@@ -34,7 +34,10 @@ enum class HashRouterFlags : std::uint16_t {
     PRIVATE4 = 0x0800,
     // Used in EscrowFinish.cpp
     PRIVATE5 = 0x1000,
-    PRIVATE6 = 0x2000
+    PRIVATE6 = 0x2000,
+    // Used in apply.cpp
+    PRIVATE7 = 0x4000,
+    PRIVATE8 = 0x8000
 };
 
 constexpr HashRouterFlags

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

@@ -528,6 +528,7 @@ public:
     using iterator_category = std::bidirectional_iterator_tag;
     using size_t = unsigned int;
     using difference_type = int;
+    using value_type = Value;
     using SelfType = ValueIteratorBase;
 
     ValueIteratorBase();

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/CachedView.h

@@ -78,6 +78,12 @@ public:
         return base_.succ(key, last);
     }
 
+    std::optional<key_type>
+    pred(key_type const& key, std::optional<key_type> const& first = std::nullopt) const override
+    {
+        return base_.pred(key, first);
+    }
+
     std::unique_ptr<SlesType::iter_base>
     slesBegin() const override
     {

include/xrpl/ledger/Ledger.h

@@ -186,6 +186,9 @@ public:
     std::optional<uint256>
     succ(uint256 const& key, std::optional<uint256> const& last = std::nullopt) const override;
 
+    std::optional<uint256>
+    pred(uint256 const& key, std::optional<uint256> const& first = std::nullopt) const override;
+
     SLE::const_pointer
     read(Keylet const& k) const override;
 

include/xrpl/ledger/OpenView.h

@@ -221,6 +221,9 @@ public:
     std::optional<key_type>
     succ(key_type const& key, std::optional<key_type> const& last = std::nullopt) const override;
 
+    std::optional<key_type>
+    pred(key_type const& key, std::optional<key_type> const& first = std::nullopt) const override;
+
     SLE::const_pointer
     read(Keylet const& k) const override;
 

include/xrpl/ledger/OpenViewSandbox.h

@@ -0,0 +1,82 @@
+#pragma once
+
+#include <xrpl/ledger/OpenView.h>
+
+#include <memory>
+
+namespace xrpl {
+
+class OpenViewSandbox
+{
+private:
+    OpenView& parent_;
+    std::unique_ptr<OpenView> sandbox_;
+
+public:
+    using key_type = ReadView::key_type;
+
+    OpenViewSandbox(OpenView& parent)
+        : parent_(parent), sandbox_(std::make_unique<OpenView>(kBatchView, parent))
+    {
+    }
+
+    void
+    rawErase(std::shared_ptr<SLE> const& sle)
+    {
+        sandbox_->rawErase(sle);
+    }
+
+    void
+    rawInsert(std::shared_ptr<SLE> const& sle)
+    {
+        sandbox_->rawInsert(sle);
+    }
+
+    void
+    rawReplace(std::shared_ptr<SLE> const& sle)
+    {
+        sandbox_->rawReplace(sle);
+    }
+
+    void
+    rawDestroyXRP(XRPAmount const& fee)
+    {
+        sandbox_->rawDestroyXRP(fee);
+    }
+
+    void
+    rawTxInsert(
+        key_type const& key,
+        std::shared_ptr<Serializer const> const& txn,
+        std::shared_ptr<Serializer const> const& metaData)
+    {
+        sandbox_->rawTxInsert(key, txn, metaData);
+    }
+
+    void
+    commit()
+    {
+        sandbox_->apply(parent_);
+        sandbox_ = std::make_unique<OpenView>(kBatchView, parent_);
+    }
+
+    void
+    discard()
+    {
+        sandbox_ = std::make_unique<OpenView>(kBatchView, parent_);
+    }
+
+    OpenView const&
+    view() const
+    {
+        return *sandbox_;
+    }
+
+    OpenView&
+    view()
+    {
+        return *sandbox_;
+    }
+};
+
+}  // namespace xrpl

include/xrpl/ledger/ReadView.h

@@ -154,6 +154,19 @@ public:
     [[nodiscard]] virtual std::optional<key_type>
     succ(key_type const& key, std::optional<key_type> const& last = std::nullopt) const = 0;
 
+    /** Return the key of the previous state item.
+
+        This returns the key of the first state item
+        whose key is less than the specified key. If
+        no such key is present, std::nullopt is returned.
+
+        If `first` is engaged, returns std::nullopt when
+        the key returned would be outside the open
+        interval (first, key).
+    */
+    [[nodiscard]] virtual std::optional<key_type>
+    pred(key_type const& key, std::optional<key_type> const& first = std::nullopt) const = 0;
+
     /**
      * Return the state item associated with a key.
      *

include/xrpl/ledger/View.h

@@ -5,6 +5,10 @@
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
+#include <xrpl/ledger/helpers/MPTokenHelpers.h>
+#include <xrpl/ledger/helpers/OfferHelpers.h>
+#include <xrpl/ledger/helpers/RippleStateHelpers.h>
+#include <xrpl/ledger/helpers/TokenHelpers.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Asset.h>
 #include <xrpl/protocol/Keylet.h>
@@ -275,6 +279,27 @@ doWithdraw(
     STAmount const& amount,
     beast::Journal j);
 
+enum class SendIssuerHandling { ihSENDER_NOT_ALLOWED, ihRECEIVER_NOT_ALLOWED, ihIGNORE };
+enum class SendEscrowHandling { ehIGNORE, ehCHECK };
+enum class SendAuthHandling { ahCHECK_SENDER, ahCHECK_RECEIVER, ahBOTH, ahNEITHER };
+enum class SendFreezeHandling { fhCHECK_SENDER, fhCHECK_RECEIVER, fhBOTH, fhNEITHER };
+enum class SendTransferHandling { thIGNORE, thCHECK };
+enum class SendBalanceHandling { bhIGNORE, bhCHECK };
+
+TER
+canTransferFT(
+    ReadView const& view,
+    AccountID const& sender,
+    AccountID const& receiver,
+    STAmount const& amount,
+    beast::Journal j,
+    SendIssuerHandling issuerHandling,
+    SendEscrowHandling escrowHandling,
+    SendAuthHandling authHandling,
+    SendFreezeHandling freezeHandling,
+    SendTransferHandling transferHandling,
+    SendBalanceHandling balanceHandling);
+
 /**
  * Deleter function prototype. Returns the status of the entry deletion
  * (if should not be skipped) and if the entry should be skipped. The status

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);
 
@@ -71,6 +74,9 @@ public:
     [[nodiscard]] std::optional<key_type>
     succ(ReadView const& base, key_type const& key, std::optional<key_type> const& last) const;
 
+    [[nodiscard]] std::optional<key_type>
+    pred(ReadView const& base, key_type const& key, std::optional<key_type> const& first) const;
+
     [[nodiscard]] SLE::const_pointer
     read(ReadView const& base, Keylet const& k) const;
 

include/xrpl/ledger/detail/ApplyViewBase.h

@@ -50,6 +50,9 @@ public:
     [[nodiscard]] std::optional<key_type>
     succ(key_type const& key, std::optional<key_type> const& last = std::nullopt) const override;
 
+    [[nodiscard]] std::optional<key_type>
+    pred(key_type const& key, std::optional<key_type> const& first = std::nullopt) const override;
+
     [[nodiscard]] SLE::const_pointer
     read(Keylet const& k) const override;
 

include/xrpl/ledger/detail/RawStateTable.h

@@ -56,6 +56,9 @@ public:
     [[nodiscard]] std::optional<key_type>
     succ(ReadView const& base, key_type const& key, std::optional<key_type> const& last) const;
 
+    [[nodiscard]] std::optional<key_type>
+    pred(ReadView const& base, key_type const& key, std::optional<key_type> const& first) const;
+
     void
     erase(SLE::ref sle);
 

include/xrpl/ledger/helpers/AMMCurve.h

@@ -0,0 +1,249 @@
+// Pluggable AMM curve architecture.
+// Concentrated liquidity (CurveType 1) based on XRPL-Standards Discussion #427
+// by Roman Thpt (@RomThpt), which adapted Uniswap v3 tick math, fee tier
+// structure, and fee accounting to the XRPL. This implementation extends that
+// work with a pluggable curve interface, StableSwap, and Smart AMM.
+// See: https://github.com/XRPLF/XRPL-Standards/discussions/427
+
+#pragma once
+
+#include <expected>
+#include <xrpl/basics/Number.h>
+#include <xrpl/ledger/helpers/AMMHelpers.h>
+#include <xrpl/protocol/AMMCore.h>
+#include <xrpl/protocol/AmountConversions.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/Quality.h>
+#include <xrpl/protocol/Rules.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/STLedgerEntry.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/TER.h>
+
+namespace xrpl {
+
+class ReadView;
+class ApplyView;
+
+struct CurveContext
+{
+    ReadView const* view = nullptr;
+    uint256 const* ammID = nullptr;
+    // Optional out: set to true if a CL swap-walk terminated because it hit
+    // maxTickCrossings. Callers pass a pointer when they want to detect
+    // the cap (e.g. to emit tecAMM_TICK_CAP_HIT); pass nullptr to ignore.
+    bool* tickCapHit = nullptr;
+};
+
+class CurveInterface
+{
+public:
+    virtual ~CurveInterface() = default;
+
+    virtual std::expected<STAmount, TER>
+    swapIn(
+        STAmount const& poolIn,
+        STAmount const& poolOut,
+        STAmount const& assetIn,
+        std::uint16_t tfee,
+        STObject const* ammSle,
+        CurveContext const& ctx = {}) const = 0;
+
+    virtual std::expected<STAmount, TER>
+    swapOut(
+        STAmount const& poolIn,
+        STAmount const& poolOut,
+        STAmount const& assetOut,
+        std::uint16_t tfee,
+        STObject const* ammSle,
+        CurveContext const& ctx = {}) const = 0;
+
+    virtual std::expected<Number, TER>
+    spotPrice(
+        STAmount const& poolIn,
+        STAmount const& poolOut,
+        std::uint16_t tfee,
+        STObject const* ammSle,
+        CurveContext const& ctx = {}) const = 0;
+
+    [[nodiscard]] virtual TER
+    validateParams(STObject const& tx) const = 0;
+
+    virtual std::expected<STAmount, TER>
+    initialLPTokens(
+        STAmount const& asset1,
+        STAmount const& asset2,
+        Issue const& lptIssue,
+        STObject const* txParams) const = 0;
+
+    virtual bool
+    checkInvariant(
+        STAmount const& oldIn,
+        STAmount const& oldOut,
+        STAmount const& newIn,
+        STAmount const& newOut,
+        STObject const* ammSle) const = 0;
+
+    // Apply a realized swap to the AMM SLE. Trustline balances are updated
+    // by the caller (BookStep). For CP and StableSwap the pool state is fully
+    // implicit in trustline balances, so the default is a no-op. CL must
+    // mutate currentTick/activeLiquidity/feeGrowthGlobal and flip
+    // feeGrowthOutside on crossed ticks, because none of that state is
+    // derivable from the trustlines alone.
+    virtual TER
+    applySwap(
+        ApplyView& /*view*/,
+        uint256 const& /*ammID*/,
+        STAmount const& /*assetIn*/,
+        STAmount const& /*assetOut*/,
+        std::uint16_t /*tfee*/,
+        STObject const* /*curveParams*/) const
+    {
+        return tesSUCCESS;
+    }
+};
+
+CurveInterface const*
+getCurve(std::uint8_t curveType, Rules const& rules);
+
+// Max output the pool can deliver before crossing the next initialised
+// tick boundary in the swap direction. Audit #19: caller (AMMLiquidity's
+// offer generation) uses this to cap an advertised AMM offer at the
+// current tick range, so the offer's quality reflects only the marginal
+// range — not a blended average across multiple tick crossings.
+//
+// Returns std::nullopt if there is no further tick in the swap direction
+// (no cap; offer is bounded only by reserves) or if the pool has no
+// active liquidity. Returns 0 if the swap is already at the boundary.
+// Caller should treat nullopt as "no cap".
+std::optional<Number>
+maxClOutputWithinCurrentRange(
+    ReadView const& view,
+    uint256 const& ammID,
+    STObject const& ammSle,
+    bool zeroForOne);
+
+// Equivalent for CtBinned: cap the advertised AMMOffer output at the
+// active bin's reserve. Without this cap, AMMLiquidity quotes against
+// the pool's aggregate balance — which spans multiple bins at different
+// prices — and BookStep mispricesthe offer's quality vs CLOB. Capping
+// per active bin lets BookStep iterate naturally, getting each bin's
+// marginal price one offer at a time.
+//
+// Returns std::nullopt if no active bin exists (empty pool) or the
+// active bin lacks the output asset.
+std::optional<Number>
+maxBinnedOutputAtActiveBin(
+    ReadView const& view,
+    uint256 const& ammID,
+    STObject const& ammSle,
+    bool inIsAsset0);
+
+// ─── CL tick bitmap ─────────────────────────────────────────────────────
+//
+// Sparse 256-tick-per-word presence bitmap. See spec §3.6.
+
+// Convert a tick to its (wordIndex, bitInWord) position. Offset-binary so
+// arithmetic stays in unsigned domain. Uses kTickBitmapOffset (= -minTick)
+// from AMMCore.h — single source of truth, do NOT duplicate inline.
+inline std::pair<std::uint16_t, std::uint8_t>
+tickToBitmapPos(std::int32_t tick) noexcept
+{
+    auto const offsetT = static_cast<std::uint32_t>(
+        tick + static_cast<std::int32_t>(kTickBitmapOffset));
+    return {static_cast<std::uint16_t>(offsetT >> 8),
+            static_cast<std::uint8_t>(offsetT & 0xFFu)};
+}
+
+inline std::int32_t
+bitmapPosToTick(std::uint16_t wordIndex, std::uint8_t bitInWord) noexcept
+{
+    auto const offsetT =
+        (static_cast<std::uint32_t>(wordIndex) << 8) | bitInWord;
+    return static_cast<std::int32_t>(offsetT) -
+        static_cast<std::int32_t>(kTickBitmapOffset);
+}
+
+// Bit-test for the bitmap word storage. `bits` is the raw `sfBitmapBits`
+// value read off the SLE. Convention: bit i = LSB of byte (i/8), little-
+// endian within bytes. The convention is internal — callers that write
+// bits must use the same scheme (and do, via the maintenance helpers).
+inline bool
+bitmapBitIsSet(uint256 const& bits, std::uint8_t pos) noexcept
+{
+    return ((bits.data()[pos / 8]) >> (pos % 8)) & 1u;
+}
+
+// AMMDeposit and AMMWithdraw call these when a tick crosses the
+// "initialised / uninitialised" boundary (sfLiquidityGross transitioning
+// 0↔>0). Each pool has a sparse set of `ltAMM_TICK_BITMAP` SLEs covering
+// 256 ticks each; setting / clearing creates and deletes those SLEs on
+// demand. Idempotent — calling set on an already-set bit is a no-op.
+//
+// Returns tesSUCCESS on the happy path. The current implementation has
+// no failure path beyond the AMM SLE being missing; reserved as TER for
+// forward compatibility.
+TER
+setTickBitmap(ApplyView& view, uint256 const& ammID, std::int32_t tick, beast::Journal j);
+
+TER
+clearTickBitmap(ApplyView& view, uint256 const& ammID, std::int32_t tick, beast::Journal j);
+
+inline std::uint8_t
+getCurveType(SLE const& ammSle)
+{
+    if (ammSle.isFieldPresent(sfCurveType))
+        return ammSle.getFieldU8(sfCurveType);
+    return CtConstantProduct;
+}
+
+template <typename TIn, typename TOut>
+TOut
+curveSwapIn(
+    TAmounts<TIn, TOut> const& pool,
+    TIn const& assetIn,
+    std::uint16_t tfee,
+    std::uint8_t curveType,
+    STObject const* ammSle,
+    CurveContext const& cctx = {})
+{
+    if (curveType == CtConstantProduct)
+        return swapAssetIn(pool, assetIn, tfee);
+
+    if (auto const* curve = getCurve(curveType, *getCurrentTransactionRules()))
+    {
+        auto const stPoolIn = toSTAmount(pool.in);
+        auto const stPoolOut = toSTAmount(pool.out);
+        auto const stAssetIn = toSTAmount(assetIn);
+        if (auto const result = curve->swapIn(stPoolIn, stPoolOut, stAssetIn, tfee, ammSle, cctx))
+            return get<TOut>(*result);
+    }
+    return toAmount<TOut>(getAsset(pool.out), 0);
+}
+
+template <typename TIn, typename TOut>
+TIn
+curveSwapOut(
+    TAmounts<TIn, TOut> const& pool,
+    TOut const& assetOut,
+    std::uint16_t tfee,
+    std::uint8_t curveType,
+    STObject const* ammSle,
+    CurveContext const& cctx = {})
+{
+    if (curveType == CtConstantProduct)
+        return swapAssetOut(pool, assetOut, tfee);
+
+    if (auto const* curve = getCurve(curveType, *getCurrentTransactionRules()))
+    {
+        auto const stPoolIn = toSTAmount(pool.in);
+        auto const stPoolOut = toSTAmount(pool.out);
+        auto const stAssetOut = toSTAmount(assetOut);
+        if (auto const result = curve->swapOut(stPoolIn, stPoolOut, stAssetOut, tfee, ammSle, cctx))
+            return get<TIn>(*result);
+    }
+    return toMaxAmount<TIn>(getAsset(pool.in));
+}
+
+}  // namespace xrpl

include/xrpl/ledger/helpers/AMMEntry.h

@@ -1,45 +0,0 @@
-#pragma once
-
-#include <xrpl/basics/base_uint.h>
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/Asset.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class AMMEntry : public SLEBase<ViewT, ltAMM>
-{
-public:
-    using Base = SLEBase<ViewT, ltAMM>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit AMMEntry(
-        Asset const& issue1,
-        Asset const& issue2,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::amm(issue1, issue2), view, j)
-    {
-    }
-
-    explicit AMMEntry(
-        uint256 const& ammID,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::amm(ammID), view, j)
-    {
-    }
-};
-
-using AMMEntryR = AMMEntry<ReadView>;
-using AMMEntryW = AMMEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/AMMHelpers.h

@@ -837,7 +837,8 @@ ammLPHolds(
     Asset const& asset2,
     AccountID const& ammAccount,
     AccountID const& lpAccount,
-    beast::Journal const j);
+    beast::Journal const j,
+    std::uint8_t curveType = CtConstantProduct);
 
 STAmount
 ammLPHolds(
@@ -865,7 +866,12 @@ ammAccountHolds(ReadView const& view, AccountID const& ammAccountID, Asset const
  * AMM object and account are deleted. Otherwise tecINCOMPLETE is returned.
  */
 TER
-deleteAMMAccount(Sandbox& view, Asset const& asset, Asset const& asset2, beast::Journal j);
+deleteAMMAccount(
+    Sandbox& view,
+    Asset const& asset,
+    Asset const& asset2,
+    beast::Journal j,
+    std::uint8_t curveType = 0);
 
 /**
  * Initialize Auction and Voting slots and set the trading/discounted fee.

include/xrpl/ledger/helpers/AMMTickMath.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <xrpl/basics/Number.h>
+#include <xrpl/protocol/AMMCore.h>
+
+#include <cstdint>
+
+namespace xrpl {
+
+Number
+tickToSqrtPrice(std::int32_t tick);
+
+std::int32_t
+sqrtPriceToTick(Number const& sqrtPrice);
+
+bool
+isValidTick(std::int32_t tick, std::int32_t tickSpacing);
+
+}  // namespace xrpl

include/xrpl/ledger/helpers/AccountRootEntry.h

@@ -1,35 +0,0 @@
-#pragma once
-
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class AccountRootEntry : public SLEBase<ViewT, ltACCOUNT_ROOT>
-{
-public:
-    using Base = SLEBase<ViewT, ltACCOUNT_ROOT>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit AccountRootEntry(
-        AccountID const& id,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::account(id), view, j)
-    {
-    }
-};
-
-using AccountRootEntryR = AccountRootEntry<ReadView>;
-using AccountRootEntryW = AccountRootEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/AccountRootHelpers.h

@@ -338,6 +338,17 @@ adjustLoanBrokerOwnerCount(
 [[nodiscard]] Rate
 transferRate(ReadView const& view, AccountID const& issuer);
 
+/**
+ * Returns the transfer fee charged for a specific currency of the issuer.
+ * A per-currency TransferFee on the currency's TokenIssuance overrides the
+ * account-wide TransferRate.
+ */
+[[nodiscard]] Rate
+transferRate(ReadView const& view, AccountID const& issuer, Currency const& currency);
+
+[[nodiscard]] Rate
+transferRate(ReadView const& view, Issue const& issue);
+
 /**
  * Generate a pseudo-account address from a pseudo owner key.
  * @param pseudoOwnerKey The key to generate the address from

include/xrpl/ledger/helpers/AmendmentsEntry.h

@@ -1,33 +0,0 @@
-#pragma once
-
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class AmendmentsEntry : public SLEBase<ViewT, ltAMENDMENTS>
-{
-public:
-    using Base = SLEBase<ViewT, ltAMENDMENTS>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit AmendmentsEntry(
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::amendments(), view, j)
-    {
-    }
-};
-
-using AmendmentsEntryR = AmendmentsEntry<ReadView>;
-using AmendmentsEntryW = AmendmentsEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/BridgeEntry.h

@@ -1,36 +0,0 @@
-#pragma once
-
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-#include <xrpl/protocol/STXChainBridge.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class BridgeEntry : public SLEBase<ViewT, ltBRIDGE>
-{
-public:
-    using Base = SLEBase<ViewT, ltBRIDGE>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit BridgeEntry(
-        STXChainBridge const& bridge,
-        STXChainBridge::ChainType chainType,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::bridge(bridge, chainType), view, j)
-    {
-    }
-};
-
-using BridgeEntryR = BridgeEntry<ReadView>;
-using BridgeEntryW = BridgeEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/CheckEntry.h

@@ -1,46 +0,0 @@
-#pragma once
-
-#include <xrpl/basics/base_uint.h>
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-#include <xrpl/protocol/SeqProxy.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class CheckEntry : public SLEBase<ViewT, ltCHECK>
-{
-public:
-    using Base = SLEBase<ViewT, ltCHECK>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit CheckEntry(
-        AccountID const& id,
-        SeqProxy const& seq,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::check(id, seq), view, j)
-    {
-    }
-
-    explicit CheckEntry(
-        uint256 const& checkID,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::check(checkID), view, j)
-    {
-    }
-};
-
-using CheckEntryR = CheckEntry<ReadView>;
-using CheckEntryW = CheckEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/ContractUtils.h

@@ -0,0 +1,102 @@
+#pragma once
+
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/core/ServiceRegistry.h>
+#include <xrpl/ledger/ApplyView.h>
+#include <xrpl/ledger/ReadView.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/STData.h>
+#include <xrpl/protocol/STJson.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/TxFlags.h>
+
+#include <map>
+
+namespace xrpl {
+
+class ContractDataMap : public std::map<xrpl::AccountID, std::pair<bool, STJson>>
+{
+public:
+    uint32_t modifiedCount = 0;
+};
+
+class ContractEventMap : public std::map<std::string, STJson>
+{
+};
+
+namespace contract {
+
+/** The maximum number of data modifications in a single function. */
+int64_t constexpr maxDataModifications = 1000;
+
+/** The maximum number of bytes the data can occupy. */
+int64_t constexpr maxContractDataSize = 1024;
+
+/** The multiplier for contract data size calculations. */
+int64_t constexpr dataByteMultiplier = 512;
+
+/** The cost multiplier of creating a contract in bytes. */
+int64_t constexpr createByteMultiplier = 500ULL;
+
+/** The value to return when the fee calculation failed. */
+int64_t constexpr feeCalculationFailed = 0x7FFFFFFFFFFFFFFFLL;
+
+/** The maximum number of contract parameters that can be in a transaction. */
+std::size_t constexpr maxContractParams = 8;
+
+/** The maximum number of contract functions that can be in a transaction. */
+std::size_t constexpr maxContractFunctions = 32;
+
+int64_t
+contractCreateFee(uint64_t byteCount);
+
+NotTEC
+preflightFunctions(STTx const& tx, beast::Journal j);
+
+NotTEC
+preflightInstanceParameters(STTx const& tx, beast::Journal j);
+
+bool
+validateParameterMapping(STArray const& params, STArray const& values, beast::Journal j);
+
+NotTEC
+preflightInstanceParameterValues(STTx const& tx, beast::Journal j);
+
+NotTEC
+preflightFlagParameters(STArray const& parameters, beast::Journal j);
+
+bool
+isValidParameterFlag(std::uint32_t flags);
+
+TER
+preclaimFlagParameters(
+    ReadView const& view,
+    AccountID const& sourceAccount,
+    AccountID const& contractAccount,
+    STArray const& parameters,
+    beast::Journal j);
+
+TER
+doApplyFlagParameters(
+    ApplyView& view,
+    STTx const& tx,
+    AccountID const& sourceAccount,
+    AccountID const& contractAccount,
+    STArray const& parameters,
+    XRPAmount const& priorBalance,
+    beast::Journal j);
+
+TER
+finalizeContractData(
+    ServiceRegistry& registry,
+    ApplyView& view,
+    AccountID const& contractAccount,
+    ContractDataMap const& dataMap,
+    ContractEventMap const& eventMap,
+    uint256 const& txnID);
+
+}  // namespace contract
+}  // namespace xrpl

include/xrpl/ledger/helpers/CouponHelpers.h

@@ -0,0 +1,49 @@
+#pragma once
+
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/ledger/ApplyView.h>
+#include <xrpl/ledger/ReadView.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/STLedgerEntry.h>
+#include <xrpl/protocol/TER.h>
+
+#include <cstdint>
+
+namespace xrpl {
+
+/**
+ * Settle a holder's accrued coupons on their MPToken.
+ *
+ * Adds units * (AccruedPerUnit - CouponIndex) to CouponAccrued, rounded
+ * once downward to the coupon asset, then advances CouponIndex to
+ * AccruedPerUnit. Units are MPTAmount + LockedAmount. Increments the
+ * schedule's ClaimantCount when CouponAccrued becomes non-zero on a
+ * holder that had none. The caller must view.update() both entries on
+ * tesSUCCESS.
+ */
+[[nodiscard]] TER
+couponSettleMPToken(SLE::ref schedule, SLE::ref mptoken, beast::Journal j);
+
+/**
+ * Settle a holder against the schedule of the issuance their MPToken
+ * belongs to, if that issuance carries lsfMPTCouponSchedule. Does
+ * nothing when the flag is clear, which is the case for every issuance
+ * without a coupon schedule.
+ *
+ * This is the entry point called from the MPT unit-change helpers.
+ */
+[[nodiscard]] TER
+couponSettleIfScheduled(
+    ApplyView& view,
+    SLE::const_ref issuance,
+    SLE::ref mptoken,
+    beast::Journal j);
+
+/**
+ * The units a holder is credited for: MPTAmount + LockedAmount.
+ */
+[[nodiscard]] std::uint64_t
+couponHolderUnits(SLE::const_ref mptoken);
+
+}  // namespace xrpl

include/xrpl/ledger/helpers/CredentialEntry.h

@@ -1,47 +0,0 @@
-#pragma once
-
-#include <xrpl/basics/Slice.h>
-#include <xrpl/basics/base_uint.h>
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class CredentialEntry : public SLEBase<ViewT, ltCREDENTIAL>
-{
-public:
-    using Base = SLEBase<ViewT, ltCREDENTIAL>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit CredentialEntry(
-        AccountID const& subject,
-        AccountID const& issuer,
-        Slice const& credType,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::credential(subject, issuer, credType), view, j)
-    {
-    }
-
-    explicit CredentialEntry(
-        uint256 const& credentialID,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::credential(credentialID), view, j)
-    {
-    }
-};
-
-using CredentialEntryR = CredentialEntry<ReadView>;
-using CredentialEntryW = CredentialEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/CredentialHelpers.h

@@ -14,7 +14,6 @@
 #include <xrpl/protocol/STVector256.h>
 #include <xrpl/protocol/TER.h>
 
-#include <cstdint>
 #include <memory>
 #include <set>
 #include <utility>
@@ -34,32 +33,6 @@ checkExpired(SLE const& sleCredential, NetClock::time_point const& closed);
 [[nodiscard]] TER
 deleteSLE(ApplyView& view, SLE::ref sleCredential, beast::Journal j);
 
-/**
- * @brief Remove credentials pinned to a pseudo-account's owner directory.
- *
- * Cleans up credentials that were linked to a pseudo-account (Vault, LoanBroker,
- * AMM), which such an account can neither accept nor delete. Only credentials
- * are removed; every other object is left in place. The walk visits at most
- * @p maxNodesToDelete directory entries and charges the ones it leaves alone
- * against that budget too, so a directory holding other objects yields fewer
- * than @p maxNodesToDelete deletions. On reaching the bound the result is
- * `tecINCOMPLETE` and the caller must propagate it so a later transaction
- * resumes.
- *
- * @param view Mutable ledger view.
- * @param pseudoAcct The pseudo-account whose directory is cleaned.
- * @param maxNodesToDelete Upper bound on directory entries processed in one call.
- * @param j Journal for diagnostics.
- * @return tesSUCCESS once no credentials remain, tecINCOMPLETE if the bound was
- *         reached, or a deletion error.
- */
-[[nodiscard]] TER
-deletePseudoAccountCredentials(
-    ApplyView& view,
-    AccountID const& pseudoAcct,
-    std::uint16_t maxNodesToDelete,
-    beast::Journal j);
-
 // Amendment and parameters checks for sfCredentialIDs field
 NotTEC
 checkFields(STTx const& tx, Rules const& rules, beast::Journal j);

include/xrpl/ledger/helpers/DIDEntry.h

@@ -1,35 +0,0 @@
-#pragma once
-
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class DIDEntry : public SLEBase<ViewT, ltDID>
-{
-public:
-    using Base = SLEBase<ViewT, ltDID>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit DIDEntry(
-        AccountID const& account,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::did(account), view, j)
-    {
-    }
-};
-
-using DIDEntryR = DIDEntry<ReadView>;
-using DIDEntryW = DIDEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/DelegateEntry.h

@@ -1,36 +0,0 @@
-#pragma once
-
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class DelegateEntry : public SLEBase<ViewT, ltDELEGATE>
-{
-public:
-    using Base = SLEBase<ViewT, ltDELEGATE>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit DelegateEntry(
-        AccountID const& account,
-        AccountID const& authorizedAccount,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::delegate(account, authorizedAccount), view, j)
-    {
-    }
-};
-
-using DelegateEntryR = DelegateEntry<ReadView>;
-using DelegateEntryW = DelegateEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/DepositPreauthEntry.h

@@ -1,58 +0,0 @@
-#pragma once
-
-#include <xrpl/basics/Slice.h>
-#include <xrpl/basics/base_uint.h>
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-
-#include <set>
-#include <utility>
-
-namespace xrpl {
-
-template <typename ViewT>
-class DepositPreauthEntry : public SLEBase<ViewT, ltDEPOSIT_PREAUTH>
-{
-public:
-    using Base = SLEBase<ViewT, ltDEPOSIT_PREAUTH>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit DepositPreauthEntry(
-        AccountID const& owner,
-        AccountID const& preauthorized,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::depositPreauth(owner, preauthorized), view, j)
-    {
-    }
-
-    explicit DepositPreauthEntry(
-        AccountID const& owner,
-        std::set<std::pair<AccountID, Slice>> const& authCreds,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::depositPreauth(owner, authCreds), view, j)
-    {
-    }
-
-    explicit DepositPreauthEntry(
-        uint256 const& preauthID,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::depositPreauth(preauthID), view, j)
-    {
-    }
-};
-
-using DepositPreauthEntryR = DepositPreauthEntry<ReadView>;
-using DepositPreauthEntryW = DepositPreauthEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/DirectoryNodeEntry.h

@@ -1,50 +0,0 @@
-#pragma once
-
-#include <xrpl/basics/base_uint.h>
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-
-#include <cstdint>
-
-namespace xrpl {
-
-template <typename ViewT>
-class DirectoryNodeEntry : public SLEBase<ViewT, ltDIR_NODE>
-{
-public:
-    using Base = SLEBase<ViewT, ltDIR_NODE>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit DirectoryNodeEntry(
-        AccountID const& id,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::ownerDir(id), view, j)
-    {
-    }
-
-    /**
-     * Resolve a specific page of the directory rooted at @p root.
-     */
-    explicit DirectoryNodeEntry(
-        uint256 const& root,
-        std::uint64_t index,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::page(root, index), view, j)
-    {
-    }
-};
-
-using DirectoryNodeEntryR = DirectoryNodeEntry<ReadView>;
-using DirectoryNodeEntryW = DirectoryNodeEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/EscrowEntry.h

@@ -1,37 +0,0 @@
-#pragma once
-
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-#include <xrpl/protocol/SeqProxy.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class EscrowEntry : public SLEBase<ViewT, ltESCROW>
-{
-public:
-    using Base = SLEBase<ViewT, ltESCROW>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit EscrowEntry(
-        AccountID const& src,
-        SeqProxy const& seq,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::escrow(src, seq), view, j)
-    {
-    }
-};
-
-using EscrowEntryR = EscrowEntry<ReadView>;
-using EscrowEntryW = EscrowEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/EscrowHelpers.h

@@ -2,8 +2,10 @@
 
 #include <xrpl/basics/Log.h>
 #include <xrpl/beast/utility/Journal.h>
+#include <xrpl/beast/utility/Zero.h>
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/ledger/ApplyView.h>
+#include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/AccountRootHelpers.h>
 #include <xrpl/ledger/helpers/MPTokenHelpers.h>
 #include <xrpl/ledger/helpers/RippleStateHelpers.h>
@@ -25,8 +27,295 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/UintTypes.h>
 
+#include <cstdint>
+
 namespace xrpl {
 
+/**
+ * Validate that @p account may lock @p amount of a token for later delivery
+ * to @p dest.
+ *
+ * The lock-side counterpart of escrowUnlockPreclaimHelper: every issuer
+ * control (locking opt-in, authorization, freeze/lock, transferability,
+ * spendable balance) that gates locking token value lives here, so any
+ * transactor that locks funds applies the same rules. The signature is
+ * view-based rather than PreclaimContext-based so it can also run from
+ * doApply.
+ */
+template <ValidIssueType T>
+TER
+escrowLockPreclaimHelper(
+    ReadView const& view,
+    AccountID const& account,
+    AccountID const& dest,
+    STAmount const& amount,
+    beast::Journal j);
+
+template <>
+inline TER
+escrowLockPreclaimHelper<Issue>(
+    ReadView const& view,
+    AccountID const& account,
+    AccountID const& dest,
+    STAmount const& amount,
+    beast::Journal j)
+{
+    auto const& issue = amount.get<Issue>();
+    auto const& issuer = amount.getIssuer();
+    // If the issuer is the same as the account, return tecNO_PERMISSION
+    if (issuer == account)
+        return tecNO_PERMISSION;
+
+    // If the lsfAllowTrustLineLocking is not enabled, return tecNO_PERMISSION
+    auto const sleIssuer = view.read(keylet::account(issuer));
+    if (!sleIssuer)
+        return tecNO_ISSUER;
+    if (!sleIssuer->isFlag(lsfAllowTrustLineLocking))
+        return tecNO_PERMISSION;
+
+    // If the account does not have a trustline to the issuer, return tecNO_LINE
+    auto const sleRippleState = view.read(keylet::trustLine(account, issuer, issue.currency));
+    if (!sleRippleState)
+        return tecNO_LINE;
+
+    STAmount const balance = (*sleRippleState)[sfBalance];
+
+    // If balance is positive, issuer must have higher address than account
+    if (balance > beast::kZero && issuer < account)
+        return tecNO_PERMISSION;  // LCOV_EXCL_LINE
+
+    // If balance is negative, issuer must have lower address than account
+    if (balance < beast::kZero && issuer > account)
+        return tecNO_PERMISSION;  // LCOV_EXCL_LINE
+
+    // If the issuer has requireAuth set, check if the account is authorized
+    if (auto const ter = requireAuth(view, issue, account); !isTesSuccess(ter))
+        return ter;
+
+    // If the issuer has requireAuth set, check if the destination is authorized
+    if (auto const ter = requireAuth(view, issue, dest); !isTesSuccess(ter))
+        return ter;
+
+    // If the issuer has frozen the account, return tecFROZEN
+    if (isFrozen(view, account, issue))
+        return tecFROZEN;
+
+    // If the issuer has frozen the destination, return tecFROZEN
+    if (isFrozen(view, dest, issue))
+        return tecFROZEN;
+
+    STAmount const spendableAmount =
+        accountHolds(view, account, issue.currency, issuer, FreezeHandling::IgnoreFreeze, j);
+
+    // If the balance is less than or equal to 0, return tecINSUFFICIENT_FUNDS
+    if (spendableAmount <= beast::kZero)
+        return tecINSUFFICIENT_FUNDS;
+
+    // If the spendable amount is less than the amount, return
+    // tecINSUFFICIENT_FUNDS
+    if (spendableAmount < amount)
+        return tecINSUFFICIENT_FUNDS;
+
+    // If the amount is not addable to the balance, return tecPRECISION_LOSS
+    if (!canAdd(spendableAmount, amount))
+        return tecPRECISION_LOSS;
+
+    return tesSUCCESS;
+}
+
+template <>
+inline TER
+escrowLockPreclaimHelper<MPTIssue>(
+    ReadView const& view,
+    AccountID const& account,
+    AccountID const& dest,
+    STAmount const& amount,
+    beast::Journal j)
+{
+    AccountID const issuer = amount.getIssuer();
+    // If the issuer is the same as the account, return tecNO_PERMISSION
+    if (issuer == account)
+        return tecNO_PERMISSION;
+
+    // If the mpt does not exist, return tecOBJECT_NOT_FOUND
+    auto const issuanceKey = keylet::mptokenIssuance(amount.get<MPTIssue>().getMptID());
+    auto const sleIssuance = view.read(issuanceKey);
+    if (!sleIssuance)
+        return tecOBJECT_NOT_FOUND;
+
+    // If the lsfMPTCanEscrow is not enabled, return tecNO_PERMISSION
+    if (!sleIssuance->isFlag(lsfMPTCanEscrow))
+        return tecNO_PERMISSION;
+
+    // If the issuer is not the same as the issuer of the mpt, return
+    // tecNO_PERMISSION
+    if (sleIssuance->getAccountID(sfIssuer) != issuer)
+        return tecNO_PERMISSION;  // LCOV_EXCL_LINE
+
+    // If the account does not have the mpt, return tecOBJECT_NOT_FOUND
+    if (!view.exists(keylet::mptoken(issuanceKey.key, account)))
+        return tecOBJECT_NOT_FOUND;
+
+    // If the issuer has requireAuth set, check if the account is
+    // authorized
+    auto const& mptIssue = amount.get<MPTIssue>();
+    if (auto const ter = requireAuth(view, mptIssue, account, AuthType::WeakAuth);
+        !isTesSuccess(ter))
+        return ter;
+
+    // If the issuer has requireAuth set, check if the destination is
+    // authorized
+    if (auto const ter = requireAuth(view, mptIssue, dest, AuthType::WeakAuth); !isTesSuccess(ter))
+        return ter;
+
+    // If the issuer has frozen the account, return tecLOCKED
+    if (isFrozen(view, account, *sleIssuance))
+        return tecLOCKED;
+
+    // If the issuer has frozen the destination, return tecLOCKED
+    if (isFrozen(view, dest, *sleIssuance))
+        return tecLOCKED;
+
+    // If the mpt cannot be transferred, return tecNO_AUTH
+    if (auto const ter = canTransfer(view, mptIssue, account, dest); !isTesSuccess(ter))
+        return ter;
+
+    STAmount const spendableAmount = accountHolds(
+        view,
+        account,
+        amount.get<MPTIssue>(),
+        FreezeHandling::IgnoreFreeze,
+        AuthHandling::IgnoreAuth,
+        j);
+
+    // If the balance is less than or equal to 0, return tecINSUFFICIENT_FUNDS
+    if (spendableAmount <= beast::kZero)
+        return tecINSUFFICIENT_FUNDS;
+
+    // If the spendable amount is less than the amount, return
+    // tecINSUFFICIENT_FUNDS
+    if (spendableAmount < amount)
+        return tecINSUFFICIENT_FUNDS;
+
+    return tesSUCCESS;
+}
+
+template <ValidIssueType T>
+TER
+escrowLockApplyHelper(
+    ApplyView& view,
+    AccountID const& issuer,
+    AccountID const& sender,
+    STAmount const& amount,
+    beast::Journal journal);
+
+template <>
+inline TER
+escrowLockApplyHelper<Issue>(
+    ApplyView& view,
+    AccountID const& issuer,
+    AccountID const& sender,
+    STAmount const& amount,
+    beast::Journal journal)
+{
+    // Defensive: Issuer cannot create an escrow
+    if (issuer == sender)
+        return tecINTERNAL;  // LCOV_EXCL_LINE
+
+    auto const ter =
+        directSendNoFee(view, sender, issuer, amount, !amount.holds<MPTIssue>(), journal);
+    if (!isTesSuccess(ter))
+        return ter;  // LCOV_EXCL_LINE
+    return tesSUCCESS;
+}
+
+template <>
+inline TER
+escrowLockApplyHelper<MPTIssue>(
+    ApplyView& view,
+    AccountID const& issuer,
+    AccountID const& sender,
+    STAmount const& amount,
+    beast::Journal journal)
+{
+    // Defensive: Issuer cannot create an escrow
+    if (issuer == sender)
+        return tecINTERNAL;  // LCOV_EXCL_LINE
+
+    auto const ter = lockEscrowMPT(view, sender, amount, journal);
+    if (!isTesSuccess(ter))
+        return ter;  // LCOV_EXCL_LINE
+    return tesSUCCESS;
+}
+
+template <ValidIssueType T>
+TER
+escrowUnlockPreclaimHelper(
+    ReadView const& view,
+    AccountID const& account,
+    STAmount const& amount,
+    bool checkFreeze = true);
+
+template <>
+inline TER
+escrowUnlockPreclaimHelper<Issue>(
+    ReadView const& view,
+    AccountID const& account,
+    STAmount const& amount,
+    bool checkFreeze)
+{
+    AccountID const& issuer = amount.getIssuer();
+    // If the issuer is the same as the account, return tesSUCCESS
+    if (issuer == account)
+        return tesSUCCESS;
+
+    // If the issuer has requireAuth set, check if the destination is authorized
+    if (auto const ter = requireAuth(view, amount.get<Issue>(), account); !isTesSuccess(ter))
+        return ter;
+
+    // If the issuer has deep frozen the destination, return tecFROZEN
+    if (checkFreeze &&
+        isDeepFrozen(view, account, amount.get<Issue>().currency, amount.getIssuer()))
+        return tecFROZEN;
+
+    return tesSUCCESS;
+}
+
+template <>
+inline TER
+escrowUnlockPreclaimHelper<MPTIssue>(
+    ReadView const& view,
+    AccountID const& account,
+    STAmount const& amount,
+    bool checkFreeze)
+{
+    AccountID const& issuer = amount.getIssuer();
+    // If the issuer is the same as the account, return tesSUCCESS
+    if (issuer == account)
+        return tesSUCCESS;
+
+    // If the mpt does not exist, return tecOBJECT_NOT_FOUND
+    auto const issuanceKey = keylet::mptokenIssuance(amount.get<MPTIssue>().getMptID());
+    auto const sleIssuance = view.read(issuanceKey);
+    if (!sleIssuance)
+        return tecOBJECT_NOT_FOUND;
+
+    // If the issuer has requireAuth set, check if the account is
+    // authorized
+    auto const& mptIssue = amount.get<MPTIssue>();
+    if (auto const ter = requireAuth(view, mptIssue, account, AuthType::WeakAuth);
+        !isTesSuccess(ter))
+        return ter;
+
+    // If the issuer has frozen the account, return tecLOCKED
+    if (checkFreeze && isFrozen(view, account, *sleIssuance))
+        return tecLOCKED;
+
+    return tesSUCCESS;
+}
+
+//------------------------------------------------------------------------------
+
 template <ValidIssueType T>
 TER
 escrowUnlockApplyHelper(
@@ -55,9 +344,6 @@ escrowUnlockApplyHelper<Issue>(
     bool createAsset,
     beast::Journal journal)
 {
-    auto const& issue = amount.get<Issue>();
-    Keylet const trustLineKey = keylet::trustLine(receiver, issue);
-    bool const recvLow = issuer > receiver;
     bool const senderIssuer = issuer == sender;
     bool const receiverIssuer = issuer == receiver;
 
@@ -67,6 +353,10 @@ escrowUnlockApplyHelper<Issue>(
     if (receiverIssuer)
         return tesSUCCESS;
 
+    auto const& issue = amount.get<Issue>();
+    Keylet const trustLineKey = keylet::trustLine(receiver, issue);
+    bool const recvLow = issuer > receiver;
+
     if (!ctx.view.exists(trustLineKey) && createAsset)
     {
         // Can the account cover the trust line's reserve?
@@ -272,4 +562,18 @@ escrowUnlockApplyHelper<MPTIssue>(
         journal);
 }
 
+// calculateAdditionalReserve computes the owner count impact of an Escrow.
+// An escrow without a FinishFunction costs 1 reserve. With a FinishFunction,
+// each additional 500 bytes beyond the first 500 adds another reserve slot.
+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/FeeSettingsEntry.h

@@ -1,33 +0,0 @@
-#pragma once
-
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class FeeSettingsEntry : public SLEBase<ViewT, ltFEE_SETTINGS>
-{
-public:
-    using Base = SLEBase<ViewT, ltFEE_SETTINGS>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit FeeSettingsEntry(
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::feeSettings(), view, j)
-    {
-    }
-};
-
-using FeeSettingsEntryR = FeeSettingsEntry<ReadView>;
-using FeeSettingsEntryW = FeeSettingsEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/LedgerHashesEntry.h

@@ -1,33 +0,0 @@
-#pragma once
-
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class LedgerHashesEntry : public SLEBase<ViewT, ltLEDGER_HASHES>
-{
-public:
-    using Base = SLEBase<ViewT, ltLEDGER_HASHES>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit LedgerHashesEntry(
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::skip(), view, j)
-    {
-    }
-};
-
-using LedgerHashesEntryR = LedgerHashesEntry<ReadView>;
-using LedgerHashesEntryW = LedgerHashesEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/LendingHelpers.h

@@ -101,6 +101,24 @@ static constexpr std::uint32_t kSecondsInYear = 365 * 24 * 60 * 60;
 Number
 loanPeriodicRate(TenthBips32 interestRate, std::uint32_t paymentInterval);
 
+/**
+ * Assets a loan earns per second at this principal outstanding.
+ *
+ * Equation (27) of XLS-66 is linear in elapsed time, and sfPaymentInterval
+ * cancels out of it, so a loan's accrual rate depends only on its principal
+ * and interest rate. Principal is flat between payments, which makes the rate
+ * piecewise-constant with breakpoints exactly at the events that update it —
+ * summing it across a vault's loans is therefore exact, not an approximation.
+ */
+inline Number
+loanAccrualRate(Number const& principalOutstanding, TenthBips32 interestRate)
+{
+    if (interestRate == TenthBips32{0} || principalOutstanding <= Number{})
+        return Number{};
+
+    return tenthBipsOfValue(principalOutstanding, interestRate) / Number{kSecondsInYear};
+}
+
 /**
  * Ensure the periodic payment is always rounded consistently
  */

include/xrpl/ledger/helpers/LoanBrokerEntry.h

@@ -1,46 +0,0 @@
-#pragma once
-
-#include <xrpl/basics/base_uint.h>
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-#include <xrpl/protocol/SeqProxy.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class LoanBrokerEntry : public SLEBase<ViewT, ltLOAN_BROKER>
-{
-public:
-    using Base = SLEBase<ViewT, ltLOAN_BROKER>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit LoanBrokerEntry(
-        AccountID const& owner,
-        SeqProxy const& seq,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::loanBroker(owner, seq), view, j)
-    {
-    }
-
-    explicit LoanBrokerEntry(
-        uint256 const& loanBrokerID,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::loanBroker(loanBrokerID), view, j)
-    {
-    }
-};
-
-using LoanBrokerEntryR = LoanBrokerEntry<ReadView>;
-using LoanBrokerEntryW = LoanBrokerEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/LoanEntry.h

@@ -1,45 +0,0 @@
-#pragma once
-
-#include <xrpl/basics/base_uint.h>
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-#include <xrpl/protocol/SeqProxy.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class LoanEntry : public SLEBase<ViewT, ltLOAN>
-{
-public:
-    using Base = SLEBase<ViewT, ltLOAN>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit LoanEntry(
-        uint256 const& loanBrokerID,
-        SeqProxy const& loanSeq,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::loan(loanBrokerID, loanSeq), view, j)
-    {
-    }
-
-    explicit LoanEntry(
-        uint256 const& loanID,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::loan(loanID), view, j)
-    {
-    }
-};
-
-using LoanEntryR = LoanEntry<ReadView>;
-using LoanEntryW = LoanEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/MPTokenEntry.h

@@ -1,55 +0,0 @@
-#pragma once
-
-#include <xrpl/basics/base_uint.h>
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-#include <xrpl/protocol/UintTypes.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class MPTokenEntry : public SLEBase<ViewT, ltMPTOKEN>
-{
-public:
-    using Base = SLEBase<ViewT, ltMPTOKEN>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit MPTokenEntry(
-        MPTID const& issuanceID,
-        AccountID const& holder,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::mptoken(issuanceID, holder), view, j)
-    {
-    }
-
-    explicit MPTokenEntry(
-        uint256 const& issuanceKey,
-        AccountID const& holder,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::mptoken(issuanceKey, holder), view, j)
-    {
-    }
-
-    explicit MPTokenEntry(
-        uint256 const& mptokenKey,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::mptoken(mptokenKey), view, j)
-    {
-    }
-};
-
-using MPTokenEntryR = MPTokenEntry<ReadView>;
-using MPTokenEntryW = MPTokenEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/MPTokenHelpers.h

@@ -132,6 +132,29 @@ authorizeMPToken(
     std::uint32_t flags = 0,
     std::optional<AccountID> holderID = std::nullopt);
 
+// Authorize an AMM-issued MPT and apply the reserve-exemption rule in
+// one shot: standard authorize (which increments owner count) followed
+// by an immediate adjustOwnerCount(-1) so the LP doesn't pay reserve
+// for the AMM-issued holding. Returns the same TER as authorizeMPToken.
+//
+// Callers must ensure the MPT's issuance is owned by an AMM pseudo-
+// account; mis-using this helper for non-AMM-issued MPTs would let an
+// LP hold an arbitrary issuer's MPT for free.
+[[nodiscard]] TER
+authorizeAMMIssuedMPT(
+    ApplyViewContext ctx,
+    XRPAmount const& priorBalance,
+    MPTID const& mptIssuanceID,
+    AccountID const& account,
+    beast::Journal journal);
+
+// Symmetric for snapshot-style SLEs the AMM owns on behalf of an LP
+// (e.g. ltAMM_BIN_HOLDING). The SLE is inserted into the LP's owner
+// directory by the caller; this helper compensates the owner-count
+// increment so the LP doesn't pay reserve.
+void
+exemptAMMOwnedSLE(ApplyView& view, AccountID const& account, beast::Journal journal);
+
 /**
  * Check if the account lacks required authorization for MPT.
  *

include/xrpl/ledger/helpers/MPTokenIssuanceEntry.h

@@ -1,56 +0,0 @@
-#pragma once
-
-#include <xrpl/basics/base_uint.h>
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-#include <xrpl/protocol/UintTypes.h>
-
-#include <cstdint>
-
-namespace xrpl {
-
-template <typename ViewT>
-class MPTokenIssuanceEntry : public SLEBase<ViewT, ltMPTOKEN_ISSUANCE>
-{
-public:
-    using Base = SLEBase<ViewT, ltMPTOKEN_ISSUANCE>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit MPTokenIssuanceEntry(
-        std::uint32_t seq,
-        AccountID const& issuer,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::mptokenIssuance(makeMptID(seq, issuer)), view, j)
-    {
-    }
-
-    explicit MPTokenIssuanceEntry(
-        MPTID const& issuanceID,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::mptokenIssuance(issuanceID), view, j)
-    {
-    }
-
-    explicit MPTokenIssuanceEntry(
-        uint256 const& issuanceKey,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::mptokenIssuance(issuanceKey), view, j)
-    {
-    }
-};
-
-using MPTokenIssuanceEntryR = MPTokenIssuanceEntry<ReadView>;
-using MPTokenIssuanceEntryW = MPTokenIssuanceEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/NFTokenHelpers.h

@@ -16,6 +16,7 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/XRPAmount.h>
+#include <xrpl/protocol/nft.h>
 
 #include <cstddef>
 #include <cstdint>
@@ -161,4 +162,12 @@ checkTrustlineDeepFrozen(
     beast::Journal const j,
     Issue const& issue);
 
+TER
+transferNFToken(
+    ApplyView& view,
+    AccountID const& buyer,
+    AccountID const& seller,
+    uint256 const& nftokenID,
+    beast::Journal j);
+
 }  // namespace xrpl::nft

include/xrpl/ledger/helpers/NFTokenOfferEntry.h

@@ -1,46 +0,0 @@
-#pragma once
-
-#include <xrpl/basics/base_uint.h>
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-#include <xrpl/protocol/SeqProxy.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class NFTokenOfferEntry : public SLEBase<ViewT, ltNFTOKEN_OFFER>
-{
-public:
-    using Base = SLEBase<ViewT, ltNFTOKEN_OFFER>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit NFTokenOfferEntry(
-        AccountID const& owner,
-        SeqProxy const& seq,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::nftokenOffer(owner, seq), view, j)
-    {
-    }
-
-    explicit NFTokenOfferEntry(
-        uint256 const& offerID,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::nftokenOffer(offerID), view, j)
-    {
-    }
-};
-
-using NFTokenOfferEntryR = NFTokenOfferEntry<ReadView>;
-using NFTokenOfferEntryW = NFTokenOfferEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/NFTokenPageEntry.h

@@ -1,37 +0,0 @@
-#pragma once
-
-#include <xrpl/basics/base_uint.h>
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/Keylet.h>
-#include <xrpl/protocol/LedgerFormats.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class NFTokenPageEntry : public SLEBase<ViewT, ltNFTOKEN_PAGE>
-{
-public:
-    using Base = SLEBase<ViewT, ltNFTOKEN_PAGE>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit NFTokenPageEntry(
-        Keylet const& page,
-        uint256 const& token,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::nftokenPage(page, token), view, j)
-    {
-    }
-};
-
-using NFTokenPageEntryR = NFTokenPageEntry<ReadView>;
-using NFTokenPageEntryW = NFTokenPageEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/NegativeUNLEntry.h

@@ -1,33 +0,0 @@
-#pragma once
-
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class NegativeUNLEntry : public SLEBase<ViewT, ltNEGATIVE_UNL>
-{
-public:
-    using Base = SLEBase<ViewT, ltNEGATIVE_UNL>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit NegativeUNLEntry(
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::negativeUNL(), view, j)
-    {
-    }
-};
-
-using NegativeUNLEntryR = NegativeUNLEntry<ReadView>;
-using NegativeUNLEntryW = NegativeUNLEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/OfferEntry.h

@@ -1,46 +0,0 @@
-#pragma once
-
-#include <xrpl/basics/base_uint.h>
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-#include <xrpl/protocol/SeqProxy.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class OfferEntry : public SLEBase<ViewT, ltOFFER>
-{
-public:
-    using Base = SLEBase<ViewT, ltOFFER>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit OfferEntry(
-        AccountID const& id,
-        SeqProxy const& seq,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::offer(id, seq), view, j)
-    {
-    }
-
-    explicit OfferEntry(
-        uint256 const& offerID,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::offer(offerID), view, j)
-    {
-    }
-};
-
-using OfferEntryR = OfferEntry<ReadView>;
-using OfferEntryW = OfferEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/OracleEntry.h

@@ -1,38 +0,0 @@
-#pragma once
-
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-
-#include <cstdint>
-
-namespace xrpl {
-
-template <typename ViewT>
-class OracleEntry : public SLEBase<ViewT, ltORACLE>
-{
-public:
-    using Base = SLEBase<ViewT, ltORACLE>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit OracleEntry(
-        AccountID const& account,
-        std::uint32_t documentID,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::oracle(account, documentID), view, j)
-    {
-    }
-};
-
-using OracleEntryR = OracleEntry<ReadView>;
-using OracleEntryW = OracleEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/PayChannelEntry.h

@@ -1,38 +0,0 @@
-#pragma once
-
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-#include <xrpl/protocol/SeqProxy.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class PayChannelEntry : public SLEBase<ViewT, ltPAYCHAN>
-{
-public:
-    using Base = SLEBase<ViewT, ltPAYCHAN>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit PayChannelEntry(
-        AccountID const& src,
-        AccountID const& dst,
-        SeqProxy const& seq,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::payChannel(src, dst, seq), view, j)
-    {
-    }
-};
-
-using PayChannelEntryR = PayChannelEntry<ReadView>;
-using PayChannelEntryW = PayChannelEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/PaymentChannelHelpers.h

@@ -2,28 +2,85 @@
 
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/utility/Journal.h>
+#include <xrpl/beast/utility/Zero.h>
 #include <xrpl/ledger/ApplyView.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Concepts.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/MPTAmount.h>
+#include <xrpl/protocol/MPTIssue.h>
+#include <xrpl/protocol/Protocol.h>
 #include <xrpl/protocol/Rules.h>
+#include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/UintTypes.h>
 
 #include <cstdint>
 #include <optional>
 
 namespace xrpl {
 
+/**
+ * Validate the token amount of a PaymentChannelCreate or PaymentChannelFund
+ * transaction during preflight.
+ *
+ * @param rules The current ledger rules used to check amendment status.
+ * @param amount The channel or funding amount from the transaction.
+ * @return tesSUCCESS if the amount is valid; temBAD_AMOUNT, temBAD_CURRENCY,
+ *     or temDISABLED otherwise.
+ */
+template <ValidIssueType T>
+NotTEC
+payChanAmountPreflightHelper(Rules const& rules, STAmount const& amount);
+
+template <>
+inline NotTEC
+payChanAmountPreflightHelper<Issue>(Rules const&, STAmount const& amount)
+{
+    if (amount.native() || amount <= beast::kZero)
+        return temBAD_AMOUNT;
+
+    if (badCurrency() == amount.get<Issue>().currency)
+        return temBAD_CURRENCY;
+
+    return tesSUCCESS;
+}
+
+template <>
+inline NotTEC
+payChanAmountPreflightHelper<MPTIssue>(Rules const& rules, STAmount const& amount)
+{
+    if (!rules.enabled(fixCleanup3_2_0) && !rules.enabled(featureMPTokensV1))
+        return temDISABLED;
+
+    if (amount.native() || amount.mpt() > MPTAmount{kMaxMpTokenAmount} || amount <= beast::kZero)
+        return temBAD_AMOUNT;
+
+    return tesSUCCESS;
+}
+
 /**
  * Close a payment channel and return its remaining funds to the channel owner.
  *
- * @param slep  The SLE for the PayChannel object to close.
- * @param view  The apply view in which ledger state modifications are made.
- * @param key   The ledger key identifying the PayChannel entry.
- * @param j     Journal used for fatal-level diagnostic messages.
- * @return      tesSUCCESS on success; tefBAD_LEDGER if a directory removal
- *              fails; tefINTERNAL if the source account SLE cannot be found.
+ * @param slep The SLE for the PayChannel object to close.
+ * @param ctx The apply view context (view and transaction) in which ledger
+ *     state modifications are made.
+ * @param key The ledger key identifying the PayChannel entry.
+ * @param txAccount The account submitting the transaction that closes the
+ *     channel.
+ * @param j Journal used for fatal-level diagnostic messages.
+ * @return tesSUCCESS on success; tefBAD_LEDGER if a directory removal
+ *     fails; tefINTERNAL if the source account SLE cannot be found.
  */
 TER
-closeChannel(SLE::ref slep, ApplyView& view, uint256 const& key, beast::Journal j);
+closeChannel(
+    SLE::ref slep,
+    ApplyViewContext ctx,
+    uint256 const& key,
+    AccountID const& txAccount,
+    beast::Journal j);
 
 /**
  * Add two uint32_t values with saturation at UINT32_MAX.

include/xrpl/ledger/helpers/PermissionedDomainEntry.h

@@ -1,46 +0,0 @@
-#pragma once
-
-#include <xrpl/basics/base_uint.h>
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-#include <xrpl/protocol/SeqProxy.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class PermissionedDomainEntry : public SLEBase<ViewT, ltPERMISSIONED_DOMAIN>
-{
-public:
-    using Base = SLEBase<ViewT, ltPERMISSIONED_DOMAIN>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit PermissionedDomainEntry(
-        AccountID const& account,
-        SeqProxy const& seq,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::permissionedDomain(account, seq), view, j)
-    {
-    }
-
-    explicit PermissionedDomainEntry(
-        uint256 const& domainID,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::permissionedDomain(domainID), view, j)
-    {
-    }
-};
-
-using PermissionedDomainEntryR = PermissionedDomainEntry<ReadView>;
-using PermissionedDomainEntryW = PermissionedDomainEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/RepoHelpers.h

@@ -0,0 +1,85 @@
+#pragma once
+
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/ledger/ApplyView.h>
+#include <xrpl/ledger/ReadView.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Asset.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/STLedgerEntry.h>
+#include <xrpl/protocol/TER.h>
+
+#include <cstdint>
+
+namespace xrpl {
+namespace repo {
+
+/**
+ * Seconds in a year, the denominator of the annualized interest rate.
+ */
+
+/**
+ * A repo is active once the buyer has accepted it, which is recorded by
+ * sfStartDate. Before that it is a pending offer.
+ */
+[[nodiscard]] inline bool
+isActive(SLE::const_ref sleRepo)
+{
+    return sleRepo->isFieldPresent(sfStartDate);
+}
+
+/**
+ * The amount the seller owes to repurchase the collateral.
+ *
+ * PurchasePrice * (1 + InterestRate * elapsed / kSecondsInYear), where elapsed
+ * runs from StartDate to the close time, capped at MaturityDate so the seller
+ * never pays for time past maturity. Computed in Number and rounded up, so
+ * rounding never favours the seller.
+ */
+[[nodiscard]] STAmount
+repurchaseAmount(SLE::const_ref sleRepo, std::uint32_t closeTime);
+
+/**
+ * Lock the collateral out of the seller's spendable balance.
+ *
+ * XRP is deducted from the account balance by the caller; this handles the
+ * issued-asset cases the same way an escrow does.
+ */
+[[nodiscard]] TER
+lockCollateral(
+    ApplyView& view,
+    AccountID const& issuer,
+    AccountID const& seller,
+    STAmount const& amount,
+    beast::Journal journal);
+
+/**
+ * The XLS-85 checks that decide whether collateral may be locked at all.
+ *
+ * Both parties are checked, not just the seller: the buyer receives the
+ * collateral if the repo defaults, so an unauthorized or frozen buyer would
+ * leave the collateral unable to move at exactly the moment it must.
+ */
+[[nodiscard]] TER
+checkCollateral(
+    ReadView const& view,
+    AccountID const& seller,
+    AccountID const& buyer,
+    STAmount const& collateral,
+    beast::Journal journal);
+
+/**
+ * Return the locked collateral to an account and remove the entry.
+ *
+ * Used by cancel, close and default; they differ only in who receives the
+ * collateral and whether any cash moved first.
+ */
+[[nodiscard]] TER
+releaseAndDelete(
+    ApplyViewContext ctx,
+    SLE::ref sleRepo,
+    AccountID const& receiver,
+    beast::Journal journal);
+
+}  // namespace repo
+}  // namespace xrpl

include/xrpl/ledger/helpers/RippleStateEntry.h

@@ -1,48 +0,0 @@
-#pragma once
-
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/Issue.h>
-#include <xrpl/protocol/LedgerFormats.h>
-#include <xrpl/protocol/UintTypes.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class RippleStateEntry : public SLEBase<ViewT, ltRIPPLE_STATE>
-{
-public:
-    using Base = SLEBase<ViewT, ltRIPPLE_STATE>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit RippleStateEntry(
-        AccountID const& id0,
-        AccountID const& id1,
-        Currency const& currency,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::trustLine(id0, id1, currency), view, j)
-    {
-    }
-
-    explicit RippleStateEntry(
-        AccountID const& id,
-        Issue const& issue,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::trustLine(id, issue), view, j)
-    {
-    }
-};
-
-using RippleStateEntryR = RippleStateEntry<ReadView>;
-using RippleStateEntryW = RippleStateEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/RippleStateHelpers.h

@@ -239,8 +239,13 @@ canTransfer(ReadView const& view, Issue const& issue, AccountID const& from, Acc
 //------------------------------------------------------------------------------
 
 /**
- * Any transactors that call addEmptyHolding() in doApply must call
- * canAddHolding() in preflight with the same View and Asset
+ * XRP and the issuer itself are always tesSUCCESS. Otherwise, after
+ * fixCleanup3_4_0, an existing trust line returns tecDUPLICATE without
+ * consulting issuer freeze or DefaultRipple; both still apply on the create
+ * path (DefaultRipple off is terNO_RIPPLE). canAddHolding() ignores existing
+ * holdings, so transactors that may create a holding in doApply should gate
+ * their preclaim call on it: after the amendment only when no holding
+ * exists, before it always.
  */
 [[nodiscard]] TER
 addEmptyHolding(

include/xrpl/ledger/helpers/SLEBase.h

@@ -1,496 +0,0 @@
-#pragma once
-
-#include <xrpl/basics/base_uint.h>
-#include <xrpl/basics/contract.h>
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/beast/utility/instrumentation.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/protocol/Keylet.h>
-#include <xrpl/protocol/LedgerFormats.h>
-#include <xrpl/protocol/STLedgerEntry.h>
-
-#include <concepts>
-#include <memory>
-#include <stdexcept>
-#include <type_traits>
-#include <utility>
-
-namespace xrpl {
-
-// Concept to distinguish read-only vs writable view types
-template <typename V>
-concept IsWritableView = std::derived_from<V, ApplyView>;
-
-namespace detail {
-
-/**
- * Resolves a keylet for a read-only entry.
- *
- * ReadView::read() on an ApplyView returns the underlying ledger's entry
- * whenever the view is not already tracking one, while peek() installs the
- * view's own copy and returns that. A read-only entry built with read()
- * would therefore hold an SLE that goes stale the moment anything peeks the
- * same key and modifies it. Resolve through peek() whenever the view really is
- * an ApplyView, so every entry over that view shares one SLE.
- *
- * @note The const_cast is what makes reaching ApplyView::peek() possible, and
- *       it is safe only because xrpld never instantiates a ReadView as a
- *       genuinely const object -- every view is a non-const object that some
- *       call sites merely observe through a const reference. If an actually
- *       const-qualified view type is ever introduced (an immutable snapshot,
- *       say), this becomes undefined behavior and must be revisited.
- *
- * @note Consequently a "read-only" entry over an ApplyView is not free of
- *       side effects: peek() installs an Action::Cache entry in the apply
- *       state table. That is benign for transaction metadata -- Cache entries
- *       are skipped in ApplyStateTable::apply(), ::visit() and in metadata
- *       generation -- but it does cost one deep SLE copy on first touch.
- */
-inline SLE::const_pointer
-resolveEntry(ReadView const& view, Keylet const& key)
-{
-    // Views are never const objects; the read-only entry only holds a const
-    // reference because it does not itself modify the view.
-    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-const-cast)
-    if (auto const applyView = dynamic_cast<ApplyView*>(const_cast<ReadView*>(&view)))
-        return applyView->peek(key);
-    return view.read(key);
-}
-
-}  // namespace detail
-
-/**
- * View-parameterized base class for all ledger entries.
- *
- * SLEBase<ReadView>  — read-only:  holds shared_ptr<SLE const> + ReadView const&
- * SLEBase<ApplyView> — writable:   holds shared_ptr<SLE> + ApplyView& + Keylet,
- *                                   plus insert/update/erase operations
- *
- * Write-only members are gated by `requires` clauses, providing compile-time
- * guarantees that read-only entries cannot mutate state.
- *
- * @tparam EntryType the ledger entry type this entry is statically bound to.
- * Derived per-type entries pass their own type (e.g. ltACCOUNT_ROOT); the
- * generic ReadOnlySLE / WritableSLE aliases leave it at ltANY, which opts out
- * of the static type check. Binding the type here is what keeps an entry for
- * one entry type from being constructed or converted from another -- see the
- * converting constructor below.
- *
- * Derived classes should provide domain-specific accessors that hide
- * implementation details of the underlying ledger entry format.
- */
-template <typename ViewT, LedgerEntryType EntryType = ltANY>
-class SLEBase
-{
-public:
-    static constexpr bool kIsWritable = IsWritableView<ViewT>;
-
-    // The ledger entry type this entry is bound to, and whether that binding
-    // is meaningful (ltANY means "any type", i.e. no static check).
-    static constexpr LedgerEntryType kEntryType = EntryType;
-    static constexpr bool kIsTyped = (EntryType != ltANY);
-
-    // SLE pointer type: mutable for writable views, const for read-only
-    using SlePtrType = std::conditional_t<kIsWritable, SLE::pointer, SLE::const_pointer>;
-
-    // View reference type: ApplyView& for writable, ReadView const& for
-    // read-only
-    using ViewRefType = std::conditional_t<kIsWritable, ApplyView&, ReadView const&>;
-
-    // Non-virtual by design: these entries are parameterized on the view and
-    // entry type, never used polymorphically through a base pointer. A vptr
-    // would be 8 bytes of pure overhead on a type meant to be as cheap as the
-    // shared_ptr it wraps. See the static_assert below the class.
-    //
-    // The destructor is public because the ReadOnlySLE / WritableSLE aliases
-    // name this class directly and are used as value types. Since it is not
-    // virtual, never delete a derived entry through an SLEBase*.
-    ~SLEBase() = default;
-
-    SLEBase(SLEBase const&)
-        requires(!kIsWritable)
-    = default;
-    SLEBase(SLEBase&&) = default;
-    SLEBase&
-    operator=(SLEBase const&) = delete;
-    SLEBase&
-    operator=(SLEBase&&) = delete;
-    SLEBase() = delete;
-
-    // --- Constructors that adopt/resolve an SLE (public so the ReadOnlySLE /
-    //     WritableSLE aliases and the per-type entries can be built directly
-    //     from a keylet, or -- read-only only -- from an already-fetched
-    //     SLE). ---
-
-    /**
-     * Constructor for read-only context (adopt an already-fetched SLE).
-     *
-     * There is deliberately no writable equivalent: a writable entry needs
-     * a Keylet so that newSLE() can still build an entry when none exists,
-     * and that cannot be recovered from a null SLE.
-     */
-    explicit SLEBase(
-        SLE::const_pointer sle,
-        ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        requires(!kIsWritable)
-        : view_(view), sle_(std::move(sle)), j_(j)
-    {
-        XRPL_ASSERT(
-            !kIsTyped || !sle_ || sle_->getType() == kEntryType,
-            "xrpl::SLEBase::SLEBase : adopted SLE matches bound entry type");
-    }
-
-    /**
-     * Constructor for read-only context (read from view by keylet)
-     */
-    explicit SLEBase(
-        Keylet const& key,
-        ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        requires(!kIsWritable)
-        : view_(view), sle_(detail::resolveEntry(view, key)), j_(j)
-    {
-        XRPL_ASSERT(
-            !kIsTyped || key.type == kEntryType,
-            "xrpl::SLEBase::SLEBase : keylet matches bound entry type");
-    }
-
-    /**
-     * Converting constructor: writable → read-only.
-     *
-     * Enables implicit conversion from SLEBase<ApplyView> to
-     * SLEBase<ReadView>, so functions taking ReadOnlySLE const& can accept
-     * WritableSLE.
-     *
-     * Constrained to the same entry type (or to a ltANY target, i.e. widening
-     * a typed entry to a generic ReadOnlySLE). The constraint is load-bearing:
-     * this constructor is inherited into every per-type entry, and unconstrained
-     * it would bind any writable entry that slices to SLEBase, so an OfferEntryW
-     * would convert to an AccountRootEntryR with no cast at the call site.
-     */
-    template <typename OtherViewT, LedgerEntryType OtherType>
-    SLEBase(SLEBase<OtherViewT, OtherType> const& other)
-        requires(!kIsWritable && IsWritableView<OtherViewT> &&
-                 (OtherType == EntryType || EntryType == ltANY))
-        : view_(other.readView()), sle_(other.rawSle()), j_(other.journal())
-    {
-    }
-
-    /**
-     * Constructor for writable context (peek from view by keylet)
-     */
-    explicit SLEBase(
-        Keylet const& key,
-        ApplyView& view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        requires kIsWritable
-        : view_(view), key_(key), sle_(view_.peek(key)), j_(j)
-    {
-        XRPL_ASSERT(
-            !kIsTyped || key.type == kEntryType,
-            "xrpl::SLEBase::SLEBase : keylet matches bound entry type");
-    }
-
-    /**
-     * Constructor for writable context, for call sites that hold an
-     * ApplyViewContext (peek from ctx.view by keylet).
-     *
-     * ctx.tx is not retained: this exists purely so transactors can pass the
-     * context they already have instead of spelling out ctx.view. If an entry
-     * ever needs the applying transaction, store it here rather than adding
-     * another overload.
-     */
-    explicit SLEBase(
-        Keylet const& key,
-        ApplyViewContext const& ctx,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        requires kIsWritable
-        : SLEBase(key, ctx.view, j)
-    {
-    }
-
-    // --- Common interface (always available) ---
-
-    /**
-     * Returns true if the ledger entry exists
-     */
-    [[nodiscard]] bool
-    exists() const
-    {
-        return sle_ != nullptr;
-    }
-
-    /**
-     * Explicit conversion to bool for convenient existence checking
-     */
-    explicit
-    operator bool() const
-    {
-        return exists();
-    }
-
-    /**
-     * Returns the underlying SLE for read access.
-     *
-     * Prefer operator-> / operator* for field access; this is for the call
-     * sites that need the shared_ptr itself.
-     */
-    [[nodiscard]] SLE::const_pointer
-    rawSle() const
-    {
-        return sle_;
-    }
-
-    /**
-     * Returns the ledger entry type of this entry.
-     *
-     * For a per-type entry this is kEntryType, known at compile time and
-     * valid whether or not the entry exists. Only the generic ReadOnlySLE /
-     * WritableSLE aliases have to read it back out of the SLE.
-     *
-     * @throws std::logic_error for a generic (ltANY) entry if exists() is
-     *         false.
-     */
-    [[nodiscard]] LedgerEntryType
-    type() const
-    {
-        if constexpr (kIsTyped)
-        {
-            return kEntryType;
-        }
-        else
-        {
-            if (!exists())
-                Throw<std::logic_error>("xrpl::SLEBase::type : entry does not exist");
-            return sle_->getType();
-        }
-    }
-
-    /**
-     * Returns the keylet identifying this entry.
-     *
-     * Writable entries keep the keylet they were built from, so it is valid
-     * even before newSLE(). Read-only entries derive it from the SLE, which
-     * must therefore exist.
-     *
-     * @throws std::logic_error for a read-only entry if exists() is false.
-     */
-    [[nodiscard]] Keylet
-    keylet() const
-    {
-        if constexpr (kIsWritable)
-        {
-            return key_;
-        }
-        else
-        {
-            if (!exists())
-                Throw<std::logic_error>("xrpl::SLEBase::keylet : entry does not exist");
-            // Take the type from the SLE, not from kEntryType: the adopt-SLE
-            // constructor's type check is assert-only, so a Release build can
-            // be holding an SLE whose type disagrees with the binding, and the
-            // SLE is the one telling the truth.
-            return Keylet(sle_->getType(), sle_->key());
-        }
-    }
-
-    /**
-     * Returns the ledger key of this entry.
-     *
-     * @throws std::logic_error same as keylet(): for read-only entries,
-     *         if exists() is false.
-     */
-    [[nodiscard]] uint256
-    key() const
-    {
-        return keylet().key;
-    }
-
-    /**
-     * Returns the read view (always available; ApplyView inherits ReadView)
-     */
-    [[nodiscard]] ReadView const&
-    readView() const
-    {
-        return view_;
-    }
-
-    /**
-     * Const dereference operators (always available)
-     *
-     * @throws std::logic_error if exists() is false.
-     */
-    STLedgerEntry const*
-    operator->() const
-    {
-        if (!exists())
-            Throw<std::logic_error>("xrpl::SLEBase::operator-> : entry does not exist");
-        return sle_.get();
-    }
-
-    STLedgerEntry const&
-    operator*() const
-    {
-        if (!exists())
-            Throw<std::logic_error>("xrpl::SLEBase::operator* : entry does not exist");
-        return *sle_;
-    }
-
-    // --- Writable interface (compile-time gated) ---
-    //
-    // Everything that hands out mutable access (or mutates) is non-const, so
-    // that a `FooEntryW const&` is as inert as a `FooEntryR`. Use readView()
-    // when a const entry only needs to inspect the view.
-
-    /**
-     * Returns the underlying SLE for write access.
-     *
-     * Prefer operator-> / operator* for field access; this is for the call
-     * sites that need the shared_ptr itself.
-     */
-    [[nodiscard]] SlePtrType const&
-    mutableRawSle()
-        requires kIsWritable
-    {
-        return sle_;
-    }
-
-    /**
-     * Returns the apply view for write operations
-     */
-    [[nodiscard]] ApplyView&
-    applyView()
-        requires kIsWritable
-    {
-        return view_;
-    }
-
-    /**
-     * Mutable dereference operators
-     *
-     * @throws std::logic_error if exists() is false.
-     */
-    STLedgerEntry*
-    operator->()
-        requires kIsWritable
-    {
-        if (!exists())
-            Throw<std::logic_error>("xrpl::SLEBase::operator-> : entry does not exist");
-        return sle_.get();
-    }
-
-    STLedgerEntry&
-    operator*()
-        requires kIsWritable
-    {
-        if (!exists())
-            Throw<std::logic_error>("xrpl::SLEBase::operator* : entry does not exist");
-        return *sle_;
-    }
-
-    /**
-     * Inserts the entry into the view.
-     *
-     * @throws std::logic_error if exists() is false.
-     */
-    void
-    insert()
-        requires kIsWritable
-    {
-        if (!exists())
-            Throw<std::logic_error>("xrpl::SLEBase::insert : entry does not exist");
-        view_.insert(sle_);
-    }
-
-    /**
-     * Erases the entry from the view.
-     *
-     * Drops the SLE afterwards, so the entry reports !exists() and any
-     * further use trips an assertion here rather than either throwing from
-     * deep inside ApplyStateTable or -- worse -- silently succeeding. For an
-     * entry that already existed, ApplyStateTable::erase keeps holding this
-     * exact SLE and builds the DeletedNode's FinalFields from it, so a write
-     * through the entry after erase() would land in transaction metadata
-     * with no diagnostic at all.
-     *
-     * @throws std::logic_error if exists() is false.
-     */
-    void
-    erase()
-        requires kIsWritable
-    {
-        if (!exists())
-            Throw<std::logic_error>("xrpl::SLEBase::erase : entry does not exist");
-        view_.erase(sle_);
-        sle_ = nullptr;
-    }
-
-    /**
-     * @throws std::logic_error if exists() is false.
-     */
-    void
-    update()
-        requires kIsWritable
-    {
-        if (!exists())
-            Throw<std::logic_error>("xrpl::SLEBase::update : entry does not exist");
-        view_.update(sle_);
-    }
-
-    /**
-     * @throws std::logic_error if exists() is true: newSLE() would otherwise
-     *         silently discard the SLE already held.
-     */
-    void
-    newSLE()
-        requires kIsWritable
-    {
-        if (exists())
-            Throw<std::logic_error>("xrpl::SLEBase::newSLE : entry already exists");
-        sle_ = std::make_shared<SLE>(key_);
-    }
-
-    [[nodiscard]] beast::Journal
-    journal() const
-    {
-        return j_;
-    }
-
-protected:
-    ViewRefType view_;
-
-    // Keylet is only meaningful for writable views, which need it to build an
-    // SLE that does not exist yet; read-only entries derive it from the SLE.
-    struct Empty
-    {
-    };
-
-    // No default member initializer: Keylet is not default-constructible, so
-    // every writable constructor must initialize key_ explicitly.
-    [[no_unique_address]]
-    std::conditional_t<kIsWritable, Keylet, Empty> key_;
-
-    SlePtrType sle_{};
-    beast::Journal j_;
-};
-
-/**
- * Generic (any-entry-type) SLE entries.
- *
- * Use these when the concrete ledger entry type is not known at a given site;
- * otherwise prefer the per-type entries (e.g. AccountRootEntry.h), which
- * additionally enforce the entry type at compile time.
- *
- *   SLE::const_pointer / SLE::const_ref  ->  ReadOnlySLE
- *   SLE::pointer       / SLE::ref        ->  WritableSLE
- */
-using ReadOnlySLE = SLEBase<ReadView>;
-using WritableSLE = SLEBase<ApplyView>;
-
-static_assert(
-    !std::is_polymorphic_v<ReadOnlySLE> && !std::is_polymorphic_v<WritableSLE>,
-    "SLEBase must stay a thin value type; it must not acquire a vtable");
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/SignerListEntry.h

@@ -1,35 +0,0 @@
-#pragma once
-
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/helpers/SLEBase.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class SignerListEntry : public SLEBase<ViewT, ltSIGNER_LIST>
-{
-public:
-    using Base = SLEBase<ViewT, ltSIGNER_LIST>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit SignerListEntry(
-        AccountID const& account,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::signerList(account), view, j)
-    {
-    }
-};
-
-using SignerListEntryR = SignerListEntry<ReadView>;
-using SignerListEntryW = SignerListEntry<ApplyView>;
-
-}  // namespace xrpl