Merge develop

2026-10-11 06:08:02 +00:00 · 2026-08-26 16:31:36 +01:00 · 2026-08-20 15:09:15 +01:00 · 2026-08-19 17:49:41 +01:00 · 2026-08-09 14:34:11 -04:00 · 2026-08-04 15:24:06 +01:00
419 changed files with 4850 additions and 33364 deletions
--- a/.cspell.config.yaml
+++ b/.cspell.config.yaml
@@ -64,7 +64,6 @@ words:
  - blindings
  - bookdir
  - Bougalis
-  - bthomee
  - Britto
  - Btrfs
  - Buildx
@@ -142,7 +141,6 @@ words:
  - hwrap
  - ifndef
  - inequation
-  - Injectivity
  - insuf
  - insuff
  - invasively
@@ -368,6 +366,7 @@ words:
  - venv
  - vfalco
  - vinnie
+  - vkeylet
  - wasmi
  - wextra
  - wptr
@@ -388,4 +387,3 @@ words:
  - xxhasher
  - zstdio
  - CGNAT
-  - ungated
--- a/.github/actions/release-info/action.yml
+++ b/.github/actions/release-info/action.yml
@@ -7,10 +7,10 @@ outputs:
    value: ${{ steps.version.outputs.version }}
  channel:
    description: "The release channel this build belongs to."
-    value: ${{ steps.release_info.outputs.channel }}
+    value: ${{ steps.channel.outputs.channel }}
  pkg_release:
-    description: "The package release number: 1 for a tag, <run number>.<commit date>git<short commit hash> otherwise."
-    value: ${{ steps.release_info.outputs.pkg_release }}
+    description: "The package release number: 1 for a tag, the run number otherwise."
+    value: ${{ steps.pkg_release.outputs.pkg_release }}

 runs:
  using: composite
@@ -39,6 +39,52 @@ runs:

        echo "version=${version}" | tee -a "${GITHUB_OUTPUT}"

-    - name: Determine release channel and package release
-      id: release_info
-      uses: XRPLF/actions/release-info@ebcf6cea14eee258697308a51fea55cad777581b
+    # Only a tag says how mature a build is: a push is a develop build whatever
+    # its version, and a non-public codebase keeps its packages to itself.
+    - name: Determine release channel
+      id: channel
+      shell: bash
+      env:
+        IS_TAG: ${{ startsWith(github.ref, 'refs/tags/') }}
+        REF_NAME: ${{ github.ref_name }}
+        VISIBILITY: ${{ github.event.repository.visibility }}
+      run: |
+        pre_release=""
+        if [[ "${REF_NAME}" == *-* ]]; then
+            pre_release="${REF_NAME#*-}"
+        fi
+
+        if [[ "${VISIBILITY}" != "public" ]]; then
+            channel=private
+        elif [[ "${IS_TAG}" != "true" ]]; then
+            channel=develop
+        elif [[ -z "${pre_release}" ]]; then
+            channel=stable
+        elif [[ "${pre_release}" =~ ^rc[0-9]+(\+.*)?$ ]]; then
+            channel=rc
+        elif [[ "${pre_release}" =~ ^b(0|[1-9][0-9]*)(\+.*)?$ ]]; then
+            channel=beta
+        else
+            echo "Unsupported pre-release in tag '${REF_NAME}'. Use bN or rcN." >&2
+            exit 1
+        fi
+
+        echo "channel=${channel}" | tee -a "${GITHUB_OUTPUT}"
+
+    # A tag is packaged once, so its release number is fixed at 1. Develop builds
+    # repeat the same version, so the run number is what makes each push an
+    # upgrade rather than a reinstall.
+    - name: Determine package release
+      id: pkg_release
+      shell: bash
+      env:
+        IS_TAG: ${{ startsWith(github.ref, 'refs/tags/') }}
+        RUN_NUMBER: ${{ github.run_number }}
+      run: |
+        if [[ "${IS_TAG}" == "true" ]]; then
+            pkg_release=1
+        else
+            pkg_release="${RUN_NUMBER}"
+        fi
+
+        echo "pkg_release=${pkg_release}" | tee -a "${GITHUB_OUTPUT}"
--- a/.github/actions/setup-nix-env/action.yml
+++ b/.github/actions/setup-nix-env/action.yml
@@ -40,11 +40,10 @@ 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.

-        # 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}"
+        # 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}"

    # Config, profiles and remote, exactly as the dev shell sets them up on
    # entry; the `setup-conan` action is skipped for this toolchain.
--- a/.github/pull_request_template.md
+++ b/.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.
--- a/.github/scripts/levelization/results/ordering.txt
+++ b/.github/scripts/levelization/results/ordering.txt
@@ -82,6 +82,7 @@ test.app > xrpl.tx
 test.basics > test.jtx
 test.basics > xrpl.basics
 test.basics > xrpl.core
+test.basics > xrpld.rpc
 test.basics > xrpl.json
 test.basics > xrpl.protocol
 test.beast > xrpl.basics
@@ -112,7 +113,6 @@ test.jtx > xrpl.config
 test.jtx > xrpl.core
 test.jtx > xrpld.app
 test.jtx > xrpld.core
-test.jtx > xrpld.overlay
 test.jtx > xrpld.rpc
 test.jtx > xrpl.json
 test.jtx > xrpl.ledger
@@ -194,9 +194,6 @@ tests.libxrpl > xrpl.resource
 tests.libxrpl > xrpl.server
 tests.libxrpl > xrpl.shamap
 tests.libxrpl > xrpl.tx
-tests.xrpld > xrpld.rpc
-tests.xrpld > xrpl.json
-tests.xrpld > xrpl.protocol
 xrpl.conditions > xrpl.basics
 xrpl.conditions > xrpl.protocol
 xrpl.config > xrpl.basics
@@ -289,10 +286,10 @@ xrpld.perflog > xrpl.basics
 xrpld.perflog > xrpl.config
 xrpld.perflog > xrpl.core
 xrpld.perflog > xrpld.app
+xrpld.perflog > xrpld.rpc
 xrpld.perflog > xrpl.json
 xrpld.perflog > xrpl.nodestore
 xrpld.perflog > xrpl.protocol
-xrpld.perflog > xrpl.server
 xrpld.rpc > xrpl.basics
 xrpld.rpc > xrpl.config
 xrpld.rpc > xrpl.core
--- a/.github/scripts/strategy-matrix/generate.py
+++ b/.github/scripts/strategy-matrix/generate.py
@@ -15,14 +15,6 @@ _BASE_CMAKE_ARGS = [
    "-Drust=ON",
 ]

-# The package formats a config can be packaged as, each with its own
-# install-test job in reusable-package.yml.
-PACKAGE_TYPES = ("deb", "rpm")
-
-# The package name a variant suffixes, as build_pkg.py's BASE_NAME spells it:
-# the two have to agree, or the artifact globs miss what was built.
-BASE_NAME = "xrpld"
-
 # Maps sanitizer names (as used in cmake) to short config-name suffixes.
 _SANITIZER_SUFFIX: dict[str, str] = {
    "address": "asan",
@@ -70,20 +62,10 @@ def get_cmake_args(build_type: str, extra_args: str) -> str:
 class PackageConfig:
    """The 'package' map of a config whose binaries are also packaged."""

-    type: str  # has to match what the image provides
+    type: str  # "deb" or "rpm"; has to match what the image provides
    # The packaging container image: a vanilla distro image, not the nix image
    # the config itself builds in.
    image: str
-    # A flavour of the package, named xrpld-<variant>, for a config whose
-    # binaries are not the plain release build. A variant needs no counterpart
-    # in the other format.
-    variant: str = ""
-
-    def __post_init__(self) -> None:
-        assert self.type in PACKAGE_TYPES, (
-            f"unsupported package type {self.type!r}: "
-            f"use one of {', '.join(PACKAGE_TYPES)}."
-        )


@dataclasses.dataclass
@@ -196,8 +178,6 @@ class PackagingEntry:
    validator_keys_artifact_name: str
    image: str
    package_type: str  # "deb" or "rpm"; drives the format-specific steps
-    package_variant: str  # passed to build_pkg.py --variant; empty for xrpld
-    package_name: str  # the name it builds under, which the artifact globs use


 # ---------------------------------------------------------------------------
@@ -287,32 +267,12 @@ def expand_linux_packaging(linux: LinuxFile) -> list[PackagingEntry]:
                        validator_keys_artifact_name=f"validator-keys-{name}",
                        image=cfg.package.image,
                        package_type=cfg.package.type,
-                        package_variant=cfg.package.variant,
-                        package_name=(
-                            f"{BASE_NAME}-{cfg.package.variant}"
-                            if cfg.package.variant
-                            else BASE_NAME
-                        ),
                    )
                )

    return entries


-def package_names_by_type(entries: list[PackagingEntry]) -> dict[str, list[str]]:
-    """The names of the packages in 'entries', keyed by format.
-
-    Derived from the packaging matrix rather than listed again, so the packages
-    the install-test jobs look for are the packages that were built.
-    """
-    return {
-        package_type: sorted(
-            {e.package_name for e in entries if e.package_type == package_type}
-        )
-        for package_type in PACKAGE_TYPES
-    }
-
-
 def expand_platform_matrix(pf: PlatformFile, minimal: bool) -> list[MatrixEntry]:
    """Expand a PlatformFile (macOS or Windows) into matrix entries.

@@ -381,10 +341,6 @@ if __name__ == "__main__":

    if args.packaging:
        matrix = expand_linux_packaging(LinuxFile.load(THIS_DIR / "linux.json"))
-        # One list per format, so each install-test job installs the packages its
-        # own format produced.
-        for package_type, names in package_names_by_type(matrix).items():
-            print(f"{package_type}_package_names={json.dumps(names)}")
    else:
        if args.config in ("linux", None):
            matrix += expand_linux_matrix(
--- a/.github/scripts/strategy-matrix/linux.json
+++ b/.github/scripts/strategy-matrix/linux.json
@@ -1,5 +1,5 @@
 {
-  "image_tag": "sha-060957e",
+  "image_tag": "sha-473fe44",
  "configs": {
    "ubuntu": [
      {
@@ -74,20 +74,7 @@
        "extra_cmake_args": "-Dvalidator_keys=ON",
        "package": {
          "type": "deb",
-          "image": "ghcr.io/xrplf/xrpld/packaging-debian:sha-3a2d19f"
-        }
-      },
-      {
-        "compiler": ["gcc"],
-        "build_type": ["Release"],
-        "arch": ["amd64"],
-        "minimal": false,
-        "suffix": "assert",
-        "extra_cmake_args": "-Dvalidator_keys=ON -Dassert=ON",
-        "package": {
-          "type": "deb",
-          "image": "ghcr.io/xrplf/xrpld/packaging-debian:sha-3a2d19f",
-          "variant": "assert"
+          "image": "ghcr.io/xrplf/xrpld/packaging-debian:sha-45e4b88"
        }
      }
    ],
@@ -101,7 +88,7 @@
        "extra_cmake_args": "-Dvalidator_keys=ON",
        "package": {
          "type": "rpm",
-          "image": "ghcr.io/xrplf/xrpld/packaging-rhel:sha-3a2d19f"
+          "image": "ghcr.io/xrplf/xrpld/packaging-rhel:sha-45e4b88"
        }
      }
    ]
--- a/.github/workflows/build-nix-images.yml
+++ b/.github/workflows/build-nix-images.yml
@@ -5,13 +5,15 @@ 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/**"
+      - "!nix/check-tools/*.txt"
+      - "bin/check-tools.sh"
      - "bin/default-loader-path.sh"
      - "bin/install-sanitizer-libs.sh"
  pull_request:
@@ -23,7 +25,7 @@ on:
      - "nix/**"
      - "!nix/docker/README.md"
      - "!nix/devshell.nix"
-      - "!nix/check-tools/**"
+      - "!nix/check-tools/*.txt"
      - "bin/check-tools.sh"
      - "bin/default-loader-path.sh"
      - "bin/install-sanitizer-libs.sh"
@@ -58,7 +60,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@696384b292577293292daed06af0306d1b83bd7d
+    uses: XRPLF/actions/.github/workflows/build-multiarch-image.yml@65d5a0bd72be4ecea95cff0673a6e0672ab5243a
    with:
      image_name: xrpld/nix-${{ matrix.distro.name }}
      dockerfile: nix/docker/Dockerfile
--- a/.github/workflows/build-packaging-images.yml
+++ b/.github/workflows/build-packaging-images.yml
@@ -6,13 +6,13 @@ on:
      - develop
    paths:
      - ".github/workflows/build-packaging-images.yml"
-      - "bin/install-packaging-tools.sh"
-      - "package/images/packaging/**"
+      - "package/Dockerfile"
+      - "package/install-packaging-tools.sh"
  pull_request:
    paths:
      - ".github/workflows/build-packaging-images.yml"
-      - "bin/install-packaging-tools.sh"
-      - "package/images/packaging/**"
+      - "package/Dockerfile"
+      - "package/install-packaging-tools.sh"
  workflow_dispatch:

 concurrency:
@@ -41,9 +41,9 @@ 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@696384b292577293292daed06af0306d1b83bd7d
+    uses: XRPLF/actions/.github/workflows/build-multiarch-image.yml@65d5a0bd72be4ecea95cff0673a6e0672ab5243a
    with:
      image_name: xrpld/packaging-${{ matrix.distro.name }}
-      dockerfile: package/images/packaging/Dockerfile
+      dockerfile: package/Dockerfile
      base_image: ${{ matrix.distro.base_image }}
      push: ${{ github.event_name == 'push' }}
--- a/.github/workflows/build-pre-commit-image.yml
+++ b/.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@696384b292577293292daed06af0306d1b83bd7d
+    uses: XRPLF/actions/.github/workflows/build-multiarch-image.yml@65d5a0bd72be4ecea95cff0673a6e0672ab5243a
    with:
      image_name: xrpld/pre-commit
      dockerfile: bin/pre-commit/Dockerfile
--- a/.github/workflows/cargo-audit.yml
+++ b/.github/workflows/cargo-audit.yml
@@ -34,7 +34,7 @@ permissions:
 jobs:
  audit:
    runs-on: ubuntu-latest
-    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-060957e
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-473fe44
    permissions:
      contents: read
      # Needed to open an issue on scheduled failures.
--- a/.github/workflows/check-tools.yml
+++ b/.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@b3e255d74d785d053e4903da8ac90983cd7d9e82
+        uses: XRPLF/actions/prepare-runner@7bf7ceca5932114abdd0d43493c3c30c5a654e13
        with:
          enable_ccache: false

--- a/.github/workflows/on-pr.yml
+++ b/.github/workflows/on-pr.yml
@@ -85,7 +85,6 @@ jobs:
            .github/workflows/reusable-build-test.yml
            .github/workflows/reusable-check-autogen.yml
            .github/workflows/reusable-clang-tidy.yml
-            .github/workflows/reusable-package-test-install.yml
            .github/workflows/reusable-package.yml
            .github/workflows/reusable-rust.yml
            .github/workflows/reusable-strategy-matrix.yml
@@ -190,12 +189,6 @@ jobs:
    # matrix (i.e. not yet labeled "Ready to merge" or "Full CI build").
    if: ${{ needs.should-run.outputs.go == 'true' && (github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'Ready to merge') || contains(github.event.pull_request.labels.*.name, 'Full CI build')) }}
    uses: ./.github/workflows/reusable-package.yml
-    with:
-      # A pull request builds packages to prove they still build, and publishes
-      # nothing. Stated rather than left to the input's default, so that changing
-      # that default cannot start publishing from pull requests. No secrets are
-      # passed either, which is the second reason a publish here cannot succeed.
-      publish: false

  upload-recipe:
    needs:
--- a/.github/workflows/on-tag.yml
+++ b/.github/workflows/on-tag.yml
@@ -50,7 +50,3 @@ jobs:
      remote_username: ${{ secrets.NEXUS_REMOTE_USERNAME }}
      remote_password: ${{ secrets.NEXUS_REMOTE_PASSWORD }}
      signing_key: ${{ secrets.NEXUS_PACKAGES_PRIVATE_KEY }}
-      dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
-      antithesis_docker_host: ${{ secrets.ANTITHESIS_DOCKER_HOST }}
-      antithesis_docker_path: ${{ secrets.ANTITHESIS_DOCKER_PATH }}
-      antithesis_docker_credentials: ${{ secrets.ANTITHESIS_DOCKER_CREDENTIALS }}
--- a/.github/workflows/on-trigger.yml
+++ b/.github/workflows/on-trigger.yml
@@ -23,7 +23,6 @@ on:
      - ".github/workflows/reusable-build-test.yml"
      - ".github/workflows/reusable-check-autogen.yml"
      - ".github/workflows/reusable-clang-tidy.yml"
-      - ".github/workflows/reusable-package-test-install.yml"
      - ".github/workflows/reusable-package.yml"
      - ".github/workflows/reusable-rust.yml"
      - ".github/workflows/reusable-strategy-matrix.yml"
@@ -129,7 +128,3 @@ jobs:
      remote_username: ${{ secrets.NEXUS_REMOTE_USERNAME }}
      remote_password: ${{ secrets.NEXUS_REMOTE_PASSWORD }}
      signing_key: ${{ secrets.NEXUS_PACKAGES_PRIVATE_KEY }}
-      dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
-      antithesis_docker_host: ${{ secrets.ANTITHESIS_DOCKER_HOST }}
-      antithesis_docker_path: ${{ secrets.ANTITHESIS_DOCKER_PATH }}
-      antithesis_docker_credentials: ${{ secrets.ANTITHESIS_DOCKER_CREDENTIALS }}
--- a/.github/workflows/pre-commit.yml
+++ b/.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@279ec358f4a1be4088be3e024b07916fa97c75b6
+    uses: XRPLF/actions/.github/workflows/pre-commit.yml@f1952595d212e86169935135efc66294b4574131
    with:
      runs_on: ubuntu-latest
      container: '{ "image": "ghcr.io/xrplf/xrpld/pre-commit:sha-473fe44" }'
--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -41,13 +41,13 @@ env:
 jobs:
  build:
    runs-on: ubuntu-latest
-    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-060957e
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-473fe44
    steps:
      - name: Checkout repository
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@b3e255d74d785d053e4903da8ac90983cd7d9e82
+        uses: XRPLF/actions/prepare-runner@7bf7ceca5932114abdd0d43493c3c30c5a654e13
        with:
          enable_ccache: false

@@ -91,4 +91,4 @@ jobs:
    steps:
      - name: Deploy to GitHub Pages
        id: deploy
-        uses: actions/deploy-pages@368f82528645a54fb793d4d04e342629a3f51346 # v5.0.1
+        uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # v5.0.0
--- a/.github/workflows/reusable-build-test-config.yml
+++ b/.github/workflows/reusable-build-test-config.yml
@@ -129,7 +129,7 @@ jobs:
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@b3e255d74d785d053e4903da8ac90983cd7d9e82
+        uses: XRPLF/actions/prepare-runner@7bf7ceca5932114abdd0d43493c3c30c5a654e13
        with:
          enable_ccache: ${{ inputs.ccache_enabled }}

@@ -257,7 +257,6 @@ jobs:
        run: |
          ./bin/check-nix-store-refs.sh "${BUILD_DIR}/xrpld"
          ./bin/check-nix-store-refs.sh "${BUILD_DIR}/xrpl_tests"
-          ./bin/check-nix-store-refs.sh "${BUILD_DIR}/xrpld_tests"

      - name: Show ccache statistics
        if: ${{ inputs.ccache_enabled }}
@@ -339,9 +338,7 @@ jobs:
      - name: Run the separate tests
        if: ${{ !inputs.build_only }}
        working-directory: ${{ runner.os == 'Windows' && format('{0}/{1}', env.BUILD_DIR, inputs.build_type) || env.BUILD_DIR }}
-        run: |
-          ./xrpl_tests
-          ./xrpld_tests
+        run: ./xrpl_tests

      - name: Run the embedded tests
        if: ${{ !inputs.build_only }}
@@ -442,7 +439,7 @@ jobs:

      - name: Upload coverage report
        if: ${{ github.repository_owner == 'XRPLF' && !inputs.build_only && env.COVERAGE_ENABLED == 'true' }}
-        uses: codecov/codecov-action@303a32d7a59b442fa8d48b6a1cc6825c09c847a5 # v7.1.1
+        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
        with:
          disable_search: true
          disable_telem: true
--- a/.github/workflows/reusable-clang-tidy.yml
+++ b/.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-060957e"
+    container: "ghcr.io/xrplf/xrpld/nix-debian:sha-473fe44"
    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@b3e255d74d785d053e4903da8ac90983cd7d9e82
+        uses: XRPLF/actions/prepare-runner@7bf7ceca5932114abdd0d43493c3c30c5a654e13
        with:
          enable_ccache: false

--- a/.github/workflows/reusable-package-test-install.yml
+++ b/.github/workflows/reusable-package-test-install.yml
@@ -1,120 +0,0 @@
-# Install one package format on every distro family it targets, one job per
-# package name and image, and run the binaries there. Called once per format by
-# reusable-package.yml, which owns the names and the image lists.
-name: Install packages
-
-on:
-  workflow_call:
-    inputs:
-      package_type:
-        description: 'The package format to install ("deb" or "rpm").'
-        required: true
-        type: string
-      package_names:
-        description: "JSON array of package names built for this format."
-        required: true
-        type: string
-      images:
-        description: "JSON array of container images to install in."
-        required: true
-        type: string
-
-defaults:
-  run:
-    shell: bash
-
-env:
-  PACKAGE_DIR: packages
-
-jobs:
-  install:
-    strategy:
-      fail-fast: false
-      matrix:
-        package_name: ${{ fromJson(inputs.package_names) }}
-        image: ${{ fromJson(inputs.images) }}
-    name: "${{ matrix.package_name }} on ${{ matrix.image }}"
-    permissions:
-      contents: read
-    runs-on: ubuntu-latest
-    container: ${{ matrix.image }}
-    timeout-minutes: 5
-
-    steps:
-      # Every package lands in one directory; the step below picks its own,
-      # which keeps this 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_NAME: ${{ matrix.package_name }}
-          PACKAGE_TYPE: ${{ inputs.package_type }}
-        run: |
-          # The version follows the name, separated by '_' in a DEB and '-' in an
-          # RPM. Requiring a digit after it is what keeps 'xrpld' from picking up
-          # another package, such as 'xrpld-assert'.
-          pattern="${PACKAGE_NAME}[_-][0-9]*.${PACKAGE_TYPE}"
-          package="$(find "${PACKAGE_DIR}" -type f -name "${pattern}" -print -quit)"
-          test -n "${package}" || {
-              echo "no ${pattern} 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: ${{ inputs.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: ${{ inputs.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
--- a/.github/workflows/reusable-package.yml
+++ b/.github/workflows/reusable-package.yml
@@ -1,19 +1,11 @@
-# Build, verify and publish Linux packages from the pre-built xrpld and
-# validator-keys artifacts, in these stages:
+# Build Linux packages from the pre-built xrpld and validator-keys artifacts:
 #
-#   - '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-deb' and 'test-install-rpm' call
-#     reusable-package-test-install.yml to install what was built on a range of
-#     distros and run 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'
-#   - 'docker' builds an Ubuntu image from the tested DEB, and one with the
-#     voidstar binary for Antithesis, pushing them to Docker Hub and to the
-#     Antithesis registry only with 'publish: true'
+#   - one job per config that carries a "package" map in linux.json
+#   - that map names the container image and the format it builds there
+#   - with 'publish: true' a job also uploads what it built
+#     (see package/publish_pkg.py)
 #
-# Only linux/amd64 is supported; the runner is hardcoded in the jobs below.
+# Only linux/amd64 is supported; the runner is hardcoded in the job below.
 name: Package

 on:
@@ -28,7 +20,7 @@ on:
        description: "The base URL of the Nexus instance hosting the deb and rpm repositories."
        required: false
        type: string
-        default: https://packages-upload.xrplf.org
+        default: https://packages.xrplf.org

    secrets:
      remote_username:
@@ -38,19 +30,7 @@ on:
        description: "The password or token for that Nexus account."
        required: false
      signing_key:
-        description: "Armoured PGP private key used to sign the RPMs."
-        required: false
-      dockerhub_token:
-        description: "A Docker Hub organization access token for xrplf, with push access to xrplf/xrpld."
-        required: false
-      antithesis_docker_host:
-        description: "The host of the Antithesis container registry, e.g. us-central1-docker.pkg.dev."
-        required: false
-      antithesis_docker_path:
-        description: "The repository path in that registry, the image name excluded."
-        required: false
-      antithesis_docker_credentials:
-        description: "The JSON key of a service account with push access to that repository."
+        description: "Armoured PGP private key used to sign the RPMs. Required when publishing."
        required: false

 defaults:
@@ -59,15 +39,12 @@ defaults:

 env:
  BUILD_DIR: build
-  PACKAGE_DIR: packages

 jobs:
  generate-matrix:
    runs-on: ubuntu-latest
    outputs:
      matrix: ${{ steps.generate.outputs.matrix }}
-      deb_package_names: ${{ steps.generate.outputs.deb_package_names }}
-      rpm_package_names: ${{ steps.generate.outputs.rpm_package_names }}
    steps:
      - name: Checkout repository
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -93,17 +70,12 @@ jobs:
      contents: read
    runs-on: ["self-hosted", "Linux", "X64", "heavy"]
    container: ${{ matrix.image }}
-    timeout-minutes: 10
+    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
-
      - name: Download pre-built xrpld binary
        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
        with:
@@ -126,7 +98,6 @@ jobs:
      - name: Build package
        env:
          PACKAGE_TYPE: ${{ matrix.package_type }}
-          PACKAGE_VARIANT: ${{ matrix.package_variant }}
          PKG_RELEASE: ${{ steps.release_info.outputs.pkg_release }}
          CHANNEL: ${{ steps.release_info.outputs.channel }}
        run: |
@@ -134,206 +105,35 @@ jobs:
              --package-type "${PACKAGE_TYPE}" \
              --build-dir "${BUILD_DIR}" \
              --pkg-release "${PKG_RELEASE}" \
-              --variant "${PACKAGE_VARIANT}" \
              --channel "${CHANNEL}"

-      # Before the upload, so the artifact, the tested package and the published
-      # package are the same bytes.
+      # 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.
      - 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. In the globs below the
-      # version follows the name, separated by '_' in a DEB and '-' in an RPM. A
-      # version starts with a digit and a longer name does not, so that one digit
-      # is what tells 'xrpld-3.4.1-...' from 'xrpld-assert-3.4.1-...'.
      - name: Upload package artifact
        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: ${{ matrix.xrpld_artifact_name }}-pkg
          path: |
-            ${{ env.BUILD_DIR }}/debbuild/${{ matrix.package_name }}_[0-9]*.deb
-            ${{ env.BUILD_DIR }}/rpmbuild/RPMS/**/${{ matrix.package_name }}-[0-9]*.rpm
+            ${{ env.BUILD_DIR }}/debbuild/*.deb
+            ${{ env.BUILD_DIR }}/debbuild/*.ddeb
+            ${{ env.BUILD_DIR }}/rpmbuild/RPMS/**/*.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/${{ matrix.package_name }}-dbgsym_[0-9]*.deb
-            ${{ env.BUILD_DIR }}/debbuild/${{ matrix.package_name }}-dbgsym_[0-9]*.ddeb
-            ${{ env.BUILD_DIR }}/rpmbuild/RPMS/**/${{ matrix.package_name }}-debuginfo-[0-9]*.rpm
-          if-no-files-found: error
-
-  # One call per format, so a variant packaged for one format is installed for
-  # that format alone. The images are every distro family that format targets,
-  # oldest release first, so both ends of the dependency range the packages
-  # declare are exercised.
-  test-install-deb:
-    needs: [generate-matrix, package]
-    name: install deb
-    uses: ./.github/workflows/reusable-package-test-install.yml
-    with:
-      package_type: deb
-      package_names: ${{ needs.generate-matrix.outputs.deb_package_names }}
-      images: |
-        [
-          "debian:11",
-          "debian:12",
-          "debian:13",
-          "ubuntu:20.04",
-          "ubuntu:22.04",
-          "ubuntu:24.04",
-          "ubuntu:26.04"
-        ]
-
-  test-install-rpm:
-    needs: [generate-matrix, package]
-    name: install rpm
-    uses: ./.github/workflows/reusable-package-test-install.yml
-    with:
-      package_type: rpm
-      package_names: ${{ needs.generate-matrix.outputs.rpm_package_names }}
-      images: |
-        [
-          "almalinux:9",
-          "almalinux:10",
-          "rockylinux/rockylinux:9",
-          "rockylinux/rockylinux:10",
-          "registry.access.redhat.com/ubi9/ubi",
-          "registry.access.redhat.com/ubi10/ubi"
-        ]
-
-  publish:
-    needs: [generate-matrix, package, test-install-deb, test-install-rpm]
-    strategy:
-      fail-fast: false
-      matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
-    name: "publish ${{ matrix.xrpld_artifact_name }}${{ !inputs.publish && ' (dry run)' || '' }}"
-    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
+        if: ${{ inputs.publish }}
        env:
          CHANNEL: ${{ steps.release_info.outputs.channel }}
-          DRY_RUN_OPTION: ${{ !inputs.publish && '--dry-run' || '' }}
          NEXUS_URL: ${{ inputs.nexus_url }}
-          NEXUS_USERNAME: ${{ inputs.publish && secrets.remote_username || '' }}
-          NEXUS_PASSWORD: ${{ inputs.publish && secrets.remote_password || '' }}
+          NEXUS_USERNAME: ${{ secrets.remote_username }}
+          NEXUS_PASSWORD: ${{ secrets.remote_password }}
        run: |
-          publish_pkg.py \
+          ./package/publish_pkg.py \
              --channel "${CHANNEL}" \
-              --package-dir "${PACKAGE_DIR}" \
-              --nexus-url "${NEXUS_URL}" \
-              ${DRY_RUN_OPTION}
-
-  docker:
-    needs: [test-install-deb, test-install-rpm]
-    strategy:
-      fail-fast: false
-      matrix:
-        target: [xrpld, voidstar]
-    name: "docker ${{ matrix.target }}${{ !inputs.publish && ' (dry run)' || '' }}"
-    permissions:
-      contents: read
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    env:
-      CONTEXT: image-context
-      IMAGE: ${{ matrix.target == 'voidstar' && 'xrpld-voidstar' || 'xrplf/xrpld' }}:${{ github.ref_type == 'tag' && github.ref_name || 'develop' }}
-      # Docker Hub is public, so a private build never reaches it;
-      # the Antithesis registry is not.
-      PUSH: ${{ inputs.publish && (matrix.target == 'voidstar' || github.event.repository.visibility == 'public') }}
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-
-      - name: Download package artifacts
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          pattern: "*-pkg"
-          merge-multiple: true
-          path: ${{ env.PACKAGE_DIR }}
-
-      - name: Download voidstar binary
-        if: ${{ matrix.target == 'voidstar' }}
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: xrpld-ubuntu-clang-debug-amd64-voidstar
-          path: ${{ env.CONTEXT }}
-
-      - name: Build image
-        env:
-          TARGET: ${{ matrix.target }}
-        run: |
-          mkdir -p "${CONTEXT}"
-          find "${PACKAGE_DIR}" -type f -name 'xrpld_[0-9]*.deb' -exec cp {} "${CONTEXT}/" \;
-          docker build --pull --file package/images/xrpld/Dockerfile --target "${TARGET}" --tag "${IMAGE}" "${CONTEXT}"
-
-      - name: Start the server
-        run: |
-          container="$(docker run --detach "${IMAGE}" --standalone --silent --conf /etc/xrpld/xrpld.cfg)"
-          trap 'docker rm --force "${container}" >/dev/null' EXIT
-
-          for _ in $(seq 30); do
-              output="$(docker exec "${container}" xrpld --conf /etc/xrpld/xrpld.cfg server_info || true)"
-              if [[ "${output}" == *'"status" : "success"'* ]]; then
-                  exit 0
-              fi
-              sleep 2
-          done
-
-          docker logs "${container}"
-          exit 1
-
-      - name: Log in to Docker Hub
-        if: ${{ env.PUSH == 'true' && matrix.target == 'xrpld' }}
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
-        with:
-          username: xrplf
-          password: ${{ secrets.dockerhub_token }}
-
-      - name: Log in to the Antithesis registry
-        if: ${{ env.PUSH == 'true' && matrix.target == 'voidstar' }}
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
-        with:
-          registry: ${{ secrets.antithesis_docker_host }}
-          username: _json_key
-          password: ${{ secrets.antithesis_docker_credentials }}
-
-      - name: Push image
-        if: ${{ env.PUSH == 'true' }}
-        env:
-          REGISTRY: ${{ matrix.target == 'voidstar' && format('{0}/{1}/', secrets.antithesis_docker_host, secrets.antithesis_docker_path) || '' }}
-        run: |
-          docker tag "${IMAGE}" "${REGISTRY}${IMAGE}"
-          docker push "${REGISTRY}${IMAGE}"
+              --package-dir "${BUILD_DIR}" \
+              --nexus-url "${NEXUS_URL}"
--- a/.github/workflows/reusable-rust.yml
+++ b/.github/workflows/reusable-rust.yml
@@ -1,9 +1,8 @@
 # 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 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.
+# (and therefore the lints, coverage instrumentation and the cargo cache) matches
+# what production builds use.
 #
 # 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
@@ -28,7 +27,7 @@ permissions:
 jobs:
  clippy:
    runs-on: ubuntu-latest
-    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-060957e
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-473fe44
    steps:
      - name: Checkout repository
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -41,14 +40,11 @@ jobs:

  coverage:
    runs-on: ubuntu-latest
-    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-060957e
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-473fe44
    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

@@ -57,7 +53,7 @@ jobs:

      - name: Upload coverage report
        if: ${{ github.repository == 'XRPLF/rippled' }}
-        uses: codecov/codecov-action@303a32d7a59b442fa8d48b6a1cc6825c09c847a5 # v7.1.1
+        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
        with:
          disable_search: true
          disable_telem: true
@@ -70,7 +66,7 @@ jobs:

  doc:
    runs-on: ubuntu-latest
-    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-060957e
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-473fe44
    steps:
      - name: Checkout repository
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
--- a/.github/workflows/reusable-upload-recipe.yml
+++ b/.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-060957e
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-473fe44
    env:
      REMOTE_NAME: ${{ inputs.remote_name }}
      CONAN_LOGIN_USERNAME_XRPLF: ${{ secrets.remote_username }}
@@ -49,11 +49,6 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

-      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@b3e255d74d785d053e4903da8ac90983cd7d9e82
-        with:
-          enable_ccache: false
-
      - name: Determine release info
        id: release_info
        uses: ./.github/actions/release-info
@@ -68,17 +63,33 @@ jobs:
        run: conan remote login "${REMOTE_NAME}" "${CONAN_LOGIN_USERNAME_XRPLF}" --password "${CONAN_PASSWORD_XRPLF}"

      - name: Upload Conan recipe (version)
-        env:
-          VERSION: ${{ steps.release_info.outputs.version }}
        run: |
-          conan export . --version="${VERSION}"
-          conan upload --confirm --check --remote="${REMOTE_NAME}" "xrpl/${VERSION}"
+          conan export . --version=${{ steps.release_info.outputs.version }}
+          conan upload --confirm --check --remote="${REMOTE_NAME}" xrpl/${{ steps.release_info.outputs.version }}

+      # When this workflow is triggered by a push event, it will always be when merging into the
+      # 'develop' branch, see on-trigger.yml.
      - name: Upload Conan recipe (develop)
-        if: ${{ github.ref == 'refs/heads/develop' }}
+        if: ${{ github.event_name == 'push' }}
        run: |
          conan export . --version=develop
          conan upload --confirm --check --remote="${REMOTE_NAME}" xrpl/develop

+      # When this workflow is triggered by a pull request event, it will always be when merging into
+      # one of the 'release' branches, see on-pr.yml.
+      - name: Upload Conan recipe (rc)
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          conan export . --version=rc
+          conan upload --confirm --check --remote="${REMOTE_NAME}" xrpl/rc
+
+      # When this workflow is triggered by a push event, it will always be when tagging a final
+      # release, see on-tag.yml.
+      - name: Upload Conan recipe (release)
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        run: |
+          conan export . --version=release
+          conan upload --confirm --check --remote="${REMOTE_NAME}" xrpl/release
+
    outputs:
      ref: xrpl/${{ steps.release_info.outputs.version }}
--- a/.github/workflows/upload-conan-deps.yml
+++ b/.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@b3e255d74d785d053e4903da8ac90983cd7d9e82
+        uses: XRPLF/actions/prepare-runner@7bf7ceca5932114abdd0d43493c3c30c5a654e13
        with:
          enable_ccache: false

--- a/.gitignore
+++ b/.gitignore
@@ -72,16 +72,11 @@ 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/settings.local.json
-AGENTS.override.md
-CLAUDE.local.md
-GEMINI.local.md
+/.claude
+/CLAUDE.md

 # Python
 __pycache__
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -53,11 +53,6 @@ repos:
        entry: ./bin/pre-commit/check_doxygen_style.py
        language: python
        types_or: [c++, c]
-      - id: fix-gtest-names
-        name: "fix gtest names: CamelCase suite, snake_case test case"
-        entry: ./bin/pre-commit/fix_gtest_names.py
-        language: python
-        types_or: [c++, c]

  - repo: https://github.com/pre-commit/mirrors-clang-format
    rev: f4d7745e17a28aad7eed2f4874ca8d1568c11c4c # frozen: v22.1.8
@@ -75,11 +70,6 @@ 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
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,42 +0,0 @@
-# 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).
--- a/API-CHANGELOG.md
+++ b/API-CHANGELOG.md
@@ -22,48 +22,17 @@ 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.

-## XRP Ledger server version 3.4.0
+## Unreleased

-Version 3.4.0 is not yet released. These changes are available in the 3.4.0 beta releases.
+This section contains changes targeting a future version.

-### Additions in 3.4.0
+### Additions

- `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)
- `noripple_check`: The `transactions` field is no longer included in error responses; it is still returned (possibly as an empty array) whenever `transactions` is `true` and the request succeeds. A malformed `account` is now rejected before the ledger is looked up, so that error response no longer carries the `ledger_hash`, `ledger_index`, and `validated` fields ([#6303](https://github.com/XRPLF/rippled/pull/6303)).
-
-## 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
+- `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.
@@ -71,8 +40,9 @@ This release contains bug fixes only and no API changes.
  - `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 in 3.2.0
+### Bugfixes

+- `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)
@@ -84,24 +54,11 @@ This release contains bug fixes only and no API changes.
 - `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)
-
-## 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.
+- `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.0

--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -1 +0,0 @@
-AGENTS.md
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,8 +114,8 @@ find_package(OpenSSL REQUIRED)
 find_package(secp256k1 REQUIRED)
 find_package(SOCI REQUIRED)
 find_package(SQLite3 REQUIRED)
+find_package(wasmi REQUIRED)
 find_package(xxHash REQUIRED)
-find_package(xrpl-rpc-spec REQUIRED)

 target_link_libraries(
    xrpl_libs
@@ -176,7 +176,6 @@ include(XrplPackaging)
 if(tests)
    include(CTest)
    add_subdirectory(src/tests/libxrpl)
-    add_subdirectory(src/tests/xrpld)
 endif()

 if(benchmark)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -59,17 +59,6 @@ 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.)
@@ -93,7 +82,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`.
- 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 test source files must 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
--- a/bin/check-tools.sh
+++ b/bin/check-tools.sh
@@ -158,7 +158,6 @@ 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
--- a/bin/pre-commit/check_rust_coverage_attrs.py
+++ b/bin/pre-commit/check_rust_coverage_attrs.py
@@ -1,149 +0,0 @@
-#!/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())
--- a/bin/pre-commit/fix_gtest_names.py
+++ b/bin/pre-commit/fix_gtest_names.py
@@ -1,144 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-Rewrites gtest names to the required style in this project: the suite name is
-CamelCase, the test-case name is snake_case.
-
-    TEST(SuiteName, test_case_name)
-
-The gtest `DISABLED_` prefix is kept verbatim on either name.
-
-Both conversions fold acronyms the way a reader expects:
-`SetAndResetAccountTxnID` -> `set_and_reset_account_txn_id`, not
-`set_and_reset_account_txn_i_d`.
-
-The first argument of `TEST_F`, `TEST_P`, `TYPED_TEST` and `TYPED_TEST_P` is a
-fixture class rather than a free identifier, so rewriting it here would leave
-the class it names behind. Those are reported for a human to rename (clang-tidy
-checks the class declaration itself, via readability-identifier-naming).
-
-Usage: ./bin/pre-commit/fix_gtest_names.py <file1> <file2> ...
-"""
-
-import re
-import sys
-from collections import Counter
-from pathlib import Path
-
-# A test-case definition, `MACRO(SuiteOrFixture, TestName)`, anchored at the
-# start of a line so that commented-out definitions and project macros that
-# merely look similar (`TEST_EXPECT(...)`) are left alone. The `\s*` between
-# arguments allows for a definition clang-format wrapped over several lines.
-PATTERN = re.compile(
-    r"(?P<head>^[ \t]*(?P<macro>TYPED_TEST_P|TYPED_TEST|TEST_F|TEST_P|TEST)\s*\(\s*)"
-    r"(?P<suite>\w+)(?P<mid>\s*,\s*)(?P<name>\w+)(?P<tail>\s*\))",
-    re.MULTILINE,
-)
-
-# The macros whose first argument names a fixture class, not a free identifier.
-FIXTURE_MACROS = ("TEST_F", "TEST_P", "TYPED_TEST", "TYPED_TEST_P")
-
-DISABLED = "DISABLED_"
-
-ACRONYM_BOUNDARY = re.compile(r"([A-Z]+)([A-Z][a-z])")
-WORD_BOUNDARY = re.compile(r"([a-z\d])([A-Z])")
-
-
-def _split_disabled(name: str) -> tuple[str, str]:
-    """Splits off gtest's `DISABLED_` prefix, which is kept verbatim."""
-    if name.startswith(DISABLED):
-        return DISABLED, name[len(DISABLED) :]
-    return "", name
-
-
-def snake_case(name: str) -> str:
-    """Returns the name in snake_case, leaving acronyms whole.
-
-    `SetAndResetAccountTxnID` -> `set_and_reset_account_txn_id`,
-    `parseStatRSSkB` -> `parse_stat_rs_sk_b`.
-    """
-    prefix, core = _split_disabled(name)
-    core = ACRONYM_BOUNDARY.sub(r"\1_\2", core)
-    return prefix + WORD_BOUNDARY.sub(r"\1_\2", core).lower()
-
-
-def camel_case(name: str) -> str:
-    """Returns the name in CamelCase, capitalizing each underscored word.
-
-    Only the letters that have to change are touched, so acronyms survive: a
-    conversion that went via snake_case would turn `SHAMapTest` into
-    `ShaMapTest`, whereas here it is already CamelCase and stays put.
-    `json_value` -> `JsonValue`, `parseStatRSSkB` -> `ParseStatRSSkB`.
-    """
-    prefix, core = _split_disabled(name)
-    return prefix + "".join(w[:1].upper() + w[1:] for w in core.split("_") if w)
-
-
-def _corrected(match: re.Match) -> tuple[str, str]:
-    """Returns the suite and test-case names this definition should end up with."""
-    suite = match["suite"]
-    return (
-        suite if match["macro"] in FIXTURE_MACROS else camel_case(suite),
-        snake_case(match["name"]),
-    )
-
-
-def fix_source(text: str) -> tuple[str, list[str]]:
-    """Returns the corrected text and one `line: message` report per bad name."""
-    # gtest joins the suite and test names into one class name, so two test
-    # cases whose joined names agree cannot coexist: `TEST(a, b_c)` and
-    # `TEST(a_b, c)` both define `a_b_c_Test`. A rename that would introduce
-    # such a clash is reported for a human instead of applied.
-    joined = Counter("_".join(_corrected(m)) for m in PATTERN.finditer(text))
-    reports = []
-
-    def rewrite(match: re.Match) -> str:
-        suite, name = match["suite"], match["name"]
-        new_suite, new_name = _corrected(match)
-        line = text.count("\n", 0, match.start()) + 1
-
-        if match["macro"] in FIXTURE_MACROS and camel_case(suite) != suite:
-            reports.append(
-                f"{line}: fixture '{suite}' is not CamelCase: rename the class "
-                f"to '{camel_case(suite)}' by hand"
-            )
-        if (new_suite, new_name) == (suite, name):
-            return match[0]
-        if joined[f"{new_suite}_{new_name}"] > 1:
-            reports.append(
-                f"{line}: cannot rename '{suite}, {name}' to '{new_suite}, "
-                f"{new_name}': another test case already generates that name"
-            )
-            return match[0]
-        if new_suite != suite:
-            reports.append(f"{line}: renamed suite '{suite}' to '{new_suite}'")
-        if new_name != name:
-            reports.append(f"{line}: renamed test case '{name}' to '{new_name}'")
-        return match["head"] + new_suite + match["mid"] + new_name + match["tail"]
-
-    return PATTERN.sub(rewrite, text), reports
-
-
-def fix_names(path: Path) -> bool:
-    """Corrects one file's gtest names, reporting each on stdout."""
-    original = path.read_text(encoding="utf-8")
-    fixed, reports = fix_source(original)
-    for report in reports:
-        print(f"{path}:{report}")
-    if fixed != original:
-        path.write_text(fixed, encoding="utf-8")
-    return not reports
-
-
-def main() -> int:
-    files = [Path(f) for f in sys.argv[1:]]
-    success = True
-
-    for path in files:
-        success &= fix_names(path)
-
-    return 0 if success else 1
-
-
-if __name__ == "__main__":
-    sys.exit(main())
--- a/bin/pre-commit/test_fix_gtest_names.py
+++ b/bin/pre-commit/test_fix_gtest_names.py
@@ -1,259 +0,0 @@
-#!/usr/bin/env python3
-"""
-Tests for fix_gtest_names.py.
-
-Run directly (no test framework needed):
-    ./bin/pre-commit/test_fix_gtest_names.py
-or under pytest:
-    pytest bin/pre-commit/test_fix_gtest_names.py
-"""
-
-import sys
-import textwrap
-
-from fix_gtest_names import camel_case, fix_source, snake_case
-
-
-def dedent(text: str) -> str:
-    """Removes a fixture's common indentation and its leading newline.
-
-    Lets fixtures be written as indented triple-quoted here-docs while keeping
-    honest 1-based line numbers.
-    """
-    return textwrap.dedent(text).lstrip("\n")
-
-
-def fixed(text: str) -> str:
-    return fix_source(dedent(text))[0]
-
-
-def reports(text: str) -> list[str]:
-    return fix_source(dedent(text))[1]
-
-
-# --- conversion --------------------------------------------------------------
-
-
-def test_snake_case_conversion() -> None:
-    assert snake_case("BadInputs") == "bad_inputs"
-    assert snake_case("mulDiv") == "mul_div"
-    assert snake_case("already_snake") == "already_snake"
-    assert snake_case("base64") == "base64"
-
-
-def test_snake_case_keeps_acronyms_whole() -> None:
-    assert snake_case("SetAndResetAccountTxnID") == "set_and_reset_account_txn_id"
-    assert snake_case("XRPToIOU") == "xrp_to_iou"
-    assert snake_case("STAmountMath") == "st_amount_math"
-
-
-def test_camel_case_conversion() -> None:
-    assert camel_case("json_value") == "JsonValue"
-    assert camel_case("mulDiv") == "MulDiv"
-    assert camel_case("scope") == "Scope"
-    assert camel_case("base64") == "Base64"
-
-
-def test_camel_case_leaves_acronyms_alone() -> None:
-    # A snake_case round-trip would give `ShaMapTest` / `ParseStatmRsSkB` here.
-    assert camel_case("SHAMapTest") == "SHAMapTest"
-    assert camel_case("parseStatmRSSkB") == "ParseStatmRSSkB"
-    assert camel_case("XRPAmount") == "XRPAmount"
-    assert camel_case("CSPRNG") == "CSPRNG"
-
-
-def test_disabled_prefix_preserved() -> None:
-    assert snake_case("DISABLED_FooBar") == "DISABLED_foo_bar"
-    assert snake_case("DISABLED_foo_bar") == "DISABLED_foo_bar"
-    assert snake_case("DISABLED_") == "DISABLED_"
-    assert camel_case("DISABLED_foo_bar") == "DISABLED_FooBar"
-    assert camel_case("DISABLED_") == "DISABLED_"
-
-
-# --- what counts as a test definition ---------------------------------------
-
-
-def test_all_macros_recognized() -> None:
-    code = """
-    TEST(Suite, oneName)
-    TEST_F(Fixture, twoName)
-    TEST_P(Fixture, threeName)
-    TYPED_TEST(Fixture, fourName)
-    TYPED_TEST_P(Fixture, fiveName)
-    """
-    assert fixed(code) == dedent("""
-        TEST(Suite, one_name)
-        TEST_F(Fixture, two_name)
-        TEST_P(Fixture, three_name)
-        TYPED_TEST(Fixture, four_name)
-        TYPED_TEST_P(Fixture, five_name)
-        """)
-
-
-def test_conforming_definitions_untouched() -> None:
-    code = """
-    TEST(AccountSet, bad_inputs)
-    TEST_F(MutexMakeTest, default_constructor)
-    TEST(SHAMap, DISABLED_slow_path)
-    """
-    assert reports(code) == []
-    assert fixed(code) == dedent(code)
-
-
-def test_lookalikes_ignored() -> None:
-    code = """
-    // TEST(Suite, notATest)
-    TEST_EXPECT(someCall())
-    TEST_EXPECTS(amount == value, amount.getText())
-    INSTANTIATE_TEST_SUITE_P(Prefix, Fixture, testValues());
-    auto x = TEST(Suite, notATest);
-    TYPED_TEST_SUITE(Fixture, MyTypes);
-    """
-    assert reports(code) == []
-    assert fixed(code) == dedent(code)
-
-
-def test_indented_and_wrapped_definitions() -> None:
-    code = """
-    namespace ripple {
-        TEST(Suite, indentedName)
-    }
-    TEST_F(
-        SomeVeryLongFixtureName,
-        wrappedName)
-    """
-    assert fixed(code) == dedent("""
-        namespace ripple {
-            TEST(Suite, indented_name)
-        }
-        TEST_F(
-            SomeVeryLongFixtureName,
-            wrapped_name)
-        """)
-
-
-# --- rewriting --------------------------------------------------------------
-
-
-def test_only_the_two_names_are_rewritten() -> None:
-    code = """
-    TEST(mulDiv, mulDiv)
-    {
-        auto const mulDiv = 1;  // mulDiv stays
-    }
-    """
-    assert fixed(code) == dedent("""
-        TEST(MulDiv, mul_div)
-        {
-            auto const mulDiv = 1;  // mulDiv stays
-        }
-        """)
-
-
-def test_suite_name_camel_cased() -> None:
-    code = """
-    TEST(json_value, limits)
-    TEST(scope, ScopeExit)
-    """
-    assert reports(code) == [
-        "1: renamed suite 'json_value' to 'JsonValue'",
-        "2: renamed suite 'scope' to 'Scope'",
-        "2: renamed test case 'ScopeExit' to 'scope_exit'",
-    ]
-    assert fixed(code) == dedent("""
-        TEST(JsonValue, limits)
-        TEST(Scope, scope_exit)
-        """)
-
-
-def test_fixture_reported_but_not_renamed() -> None:
-    # The first argument names a class, so only a human (or clang-tidy) can
-    # rename it; the test-case name is still fixed.
-    code = """
-    TEST_F(my_fixture, someTest)
-    """
-    assert reports(code) == [
-        "1: fixture 'my_fixture' is not CamelCase: rename the class to "
-        "'MyFixture' by hand",
-        "1: renamed test case 'someTest' to 'some_test'",
-    ]
-    assert fixed(code) == dedent("""
-        TEST_F(my_fixture, some_test)
-        """)
-
-
-def test_reports_carry_line_numbers() -> None:
-    code = """
-    #include <foo.h>
-
-    TEST(Suite, firstName)
-
-    TEST(Suite, secondName)
-    """
-    assert reports(code) == [
-        "3: renamed test case 'firstName' to 'first_name'",
-        "5: renamed test case 'secondName' to 'second_name'",
-    ]
-
-
-# --- collisions -------------------------------------------------------------
-
-
-def test_collision_reported_and_not_applied() -> None:
-    # Both would define `Suite_mul_div_Test`.
-    code = """
-    TEST(Suite, mulDiv)
-    TEST(Suite, mul_div)
-    """
-    assert reports(code) == [
-        "1: cannot rename 'Suite, mulDiv' to 'Suite, mul_div': another test "
-        "case already generates that name"
-    ]
-    assert fixed(code) == dedent(code)
-
-
-def test_collision_between_converging_suites() -> None:
-    # Both suites camel-case to `SuiteA`, so both would define
-    # `SuiteA_one_test_Test`.
-    code = """
-    TEST(SuiteA, oneTest)
-    TEST(Suite_a, one_test)
-    """
-    assert [r.split(":")[1].strip() for r in reports(code)] == [
-        "cannot rename 'SuiteA, oneTest' to 'SuiteA, one_test'",
-        "cannot rename 'Suite_a, one_test' to 'SuiteA, one_test'",
-    ]
-    assert fixed(code) == dedent(code)
-
-
-def test_same_name_in_different_suites_is_not_a_collision() -> None:
-    code = """
-    TEST(SuiteOne, mulDiv)
-    TEST(SuiteTwo, mulDiv)
-    """
-    assert fixed(code) == dedent("""
-        TEST(SuiteOne, mul_div)
-        TEST(SuiteTwo, mul_div)
-        """)
-
-
-def main() -> int:
-    tests = sorted(
-        (name, fn)
-        for name, fn in globals().items()
-        if name.startswith("test_") and callable(fn)
-    )
-    failed = 0
-    for name, fn in tests:
-        try:
-            fn()
-            print(f"PASS {name}")
-        except AssertionError as exc:
-            failed += 1
-            print(f"FAIL {name}: {exc!r}")
-    print(f"\n{len(tests) - failed}/{len(tests)} passed")
-    return 1 if failed else 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())
--- a/cmake/XrplCore.cmake
+++ b/cmake/XrplCore.cmake
@@ -69,6 +69,7 @@ target_link_libraries(
        Xrpl::opts
        Xrpl::syslibs
        secp256k1::secp256k1
+        wasmi::wasmi
        xrpl.libpb
        xxHash::xxhash
        $<$<BOOL:${voidstar}>:antithesis-sdk-cpp>
@@ -296,14 +297,7 @@ if(xrpld)
        target_sources(xrpld PRIVATE ${sources})
    endif()

-    target_link_libraries(
-        xrpld
-        Xrpl::boost
-        Xrpl::opts
-        Xrpl::libs
-        xrpl.libxrpl
-        rpcspec::rpcspec
-    )
+    target_link_libraries(xrpld Xrpl::boost Xrpl::opts Xrpl::libs xrpl.libxrpl)
    exclude_if_included(xrpld)
    # define a macro for tests that might need to
    # be excluded or run differently in CI environment
--- a/cmake/XrplCov.cmake
+++ b/cmake/XrplCov.cmake
@@ -48,7 +48,7 @@ setup_target_for_coverage_gcovr(
        "include/xrpl/beast/test"
        "include/xrpl/beast/unit_test"
        "${CMAKE_BINARY_DIR}/pb-xrpl.libpb"
-    DEPENDENCIES xrpld xrpl_tests xrpld_tests
+    DEPENDENCIES xrpld xrpl_tests
 )

 add_code_coverage_to_target(opts INTERFACE)
--- a/cmake/XrplPackaging.cmake
+++ b/cmake/XrplPackaging.cmake
@@ -44,18 +44,12 @@ else()
    set(pkg_type rpm)
 endif()

-# Unquoted below, so an empty value adds no argument at all.
-set(pkg_variant_option "")
-if(assert)
-    set(pkg_variant_option --variant=assert)
-endif()
-
 add_custom_target(
    package
    COMMAND
        ${CMAKE_SOURCE_DIR}/package/build_pkg.py --package-type=${pkg_type}
        --build-dir=${CMAKE_BINARY_DIR} --pkg-release=${pkg_release}
-        ${pkg_variant_option} --channel=UNRELEASED
+        --channel=UNRELEASED
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
    DEPENDS xrpld validator-keys
    COMMENT "Building Linux ${pkg_type} package"
--- a/conan.lock
+++ b/conan.lock
@@ -3,7 +3,7 @@
    "requires": [
        "zlib/1.3.2#1cb806da49011867778ffb6ac7190fcb%1782392402.122708",
        "xxhash/0.8.3#681d36a0a6111fc56e5e45ea182c19cc%1782392402.420688",
-        "xrpl-rpc-spec/0.1.19#870b2d3abcfbbf13b61c2d3c69495060%1790348286.187549",
+        "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",
@@ -20,8 +20,8 @@
        "libarchive/3.8.7#c446109bd1f1d8ba7936c94189bc50e6%1782392403.066892",
        "jemalloc/5.3.1#1fc58d55316041f10fbc1e8a2eae632a%1776700028.228",
        "gtest/1.17.0#5224b3b3ff3b4ce1133cbdd27d53ee7d%1782392402.791979",
-        "grpc/1.81.1#b87796a4269034856cbc1a2522db16eb%1788275071.530512",
-        "fast_float/8.2.10#f6f28d6bb22112078e7dbda611caf681%1785888854.601666",
+        "grpc/1.81.1#f729f6d75992d20f9c72828e9142d62f%1783945160.094135",
+        "fast_float/8.2.10#f6f28d6bb22112078e7dbda611caf681%1782494504.298",
        "ed25519/2015.03#ae761bdc52730a843f0809bdf6c1b1f6%1782307148.15562",
        "date/3.0.4#862e11e80030356b53c2c38599ceb32b%1782392402.538492",
        "corrosion/0.6.1#bfa292df0a957bc70a450ff316cd9435%1786119416.131296",
@@ -46,10 +46,6 @@
    ],
    "python_requires": [],
    "overrides": {
-        "boost/1.91.0#ea540ca2133d831b560036aa24dece3c": [
-            null,
-            "boost/1.91.0#ea540ca2133d831b560036aa24dece3c"
-        ],
        "protobuf/[>=5.27.0 <7]": [
            "protobuf/6.33.5"
        ],
--- a/conanfile.py
+++ b/conanfile.py
@@ -36,7 +36,7 @@ class Xrpl(ConanFile):
        "nudb/2.0.9",
        "openssl/3.6.3",
        "soci/4.0.3",
-        "xrpl-rpc-spec/0.1.19",
+        "wasmi/1.0.9",
        "zlib/1.3.2",
    ]

@@ -115,7 +115,6 @@ class Xrpl(ConanFile):
        "soci/*:shared": False,
        "soci/*:with_sqlite3": True,
        "soci/*:with_boost": True,
-        "xrpl-rpc-spec/*:server": "xrpld",
        "xxhash/*:shared": False,
    }

@@ -151,7 +150,6 @@ class Xrpl(ConanFile):
        self.requires("xxhash/0.8.3", transitive_headers=True)

    exports_sources = (
-        "bin/default-loader-path.sh",
        "CMakeLists.txt",
        "cfg/*",
        "cmake/*",
@@ -227,6 +225,7 @@ class Xrpl(ConanFile):
            "soci::soci",
            "secp256k1::secp256k1",
            "sqlite3::sqlite",
+            "wasmi::wasmi",
            "xxhash::xxhash",
            "zlib::zlib",
        ]
--- a/crates/Cargo.lock
+++ b/crates/Cargo.lock
@@ -57,9 +57,9 @@ dependencies = [

 [[package]]
 name = "cxx"
-version = "1.0.202"
+version = "1.0.199"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13f6de320895f42e6e081abb5c7983bedcf0b6d0ff9323de0d33f620c8ac1199"
+checksum = "824894a4a85dca76d4c95c2b9098c036f5a29f627b30c12780774f6654e60974"
 dependencies = [
 "cc",
 "cxx-build",
@@ -72,9 +72,9 @@ dependencies = [

 [[package]]
 name = "cxx-build"
-version = "1.0.202"
+version = "1.0.199"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fde53ca86b9704a943fef0f1e1d836239a6aedca5de3c65fa9f97ec0bd46d39"
+checksum = "f1ae0b651ea5b0000b19513aef5a03f194d7e3486f2d9258b658da8677fe9036"
 dependencies = [
 "cc",
 "codespan-reporting",
@@ -87,9 +87,9 @@ dependencies = [

 [[package]]
 name = "cxxbridge-cmd"
-version = "1.0.202"
+version = "1.0.199"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bae89236c811fd4d08ed3441759ac4ac98d752cbfd3de341315ba16ad20ec3"
+checksum = "fb05f91d3fb8435d9bab6ac5ce6ac1868be774325fb7fb2a91be39393b21388e"
 dependencies = [
 "clap",
 "codespan-reporting",
@@ -101,15 +101,15 @@ dependencies = [

 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.202"
+version = "1.0.199"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49045042e5fced01b80742aba5508de82aa4f13677ed3fa2b4cda709c40c5918"
+checksum = "bf293202e0e3e98495785745389e8d0755b217e66f19194a5c695c25e03282ef"

 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.202"
+version = "1.0.199"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b181252e2e3d3b5d183afbdc033a3958b445eb3e1a0ae65fc3d4f5259f5da6fd"
+checksum = "ca001d746947c7249ed9d332a10f7a59daedbafeb0ec68c5c18a7db7a93f6ccc"
 dependencies = [
 "indexmap",
 "proc-macro2",
--- a/crates/Cargo.toml
+++ b/crates/Cargo.toml
@@ -8,9 +8,6 @@ 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
--- a/crates/hello_world/Cargo.toml
+++ b/crates/hello_world/Cargo.toml
@@ -8,6 +8,3 @@ crate-type = ["staticlib"]

 [dependencies]
 cxx.workspace = true
-
-[lints]
-workspace = true
--- a/crates/hello_world/src/lib.rs
+++ b/crates/hello_world/src/lib.rs
@@ -1,5 +1,3 @@
-#![cfg_attr(coverage_nightly, feature(coverage_attribute))]
-
 #[cxx::bridge(namespace = "rs::hello_world")]
 mod ffi {
    extern "Rust" {
@@ -10,14 +8,3 @@ 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")
-    }
-}
--- a/docs/Docker.md
+++ b/docs/Docker.md
@@ -1,19 +1,5 @@
 # `xrpld` Docker Image

-`xrpld` is published to Docker Hub as [`xrplf/xrpld`](https://hub.docker.com/r/xrplf/xrpld):
-the `xrpld` DEB package installed on Ubuntu 26.04, running as the `xrpld` user.
-Each release is tagged with its version, `xrplf/xrpld:<version>`, and
-`xrplf/xrpld:develop` follows the `develop` branch.
-See [`package/README.md`](../package/README.md#docker-images) for how it is built
-and tagged.
-
-```bash
-docker run --detach --name xrpld \
-    --volume xrpld-db:/var/lib/xrpld \
-    --publish 2459:2459 \
-    xrplf/xrpld:develop
-```
-
-The admin ports (5005, 6006 and 50051) listen on `127.0.0.1` in the shipped
-configuration; to reach them from outside the container, mount your own over
-`/etc/xrpld/xrpld.cfg`.
+- Some info relating to Docker containers can be found here: [../Builds/containers](../Builds/containers)
+- Images for building and testing xrpld can be found here: [thejohnfreeman/rippled-docker](https://github.com/thejohnfreeman/rippled-docker/)
+  - These images do not have xrpld. They have all the tools necessary to build xrpld.
--- a/docs/install.md
+++ b/docs/install.md
@@ -6,15 +6,14 @@

 `xrpld` is published as DEB and RPM packages for 64-bit x86 Linux.
 Use APT on Debian-based distributions such as Debian and Ubuntu,
-and DNF on Red Hat-based distributions such as RHEL, AlmaLinux, and Rocky Linux,
-where `yum` is a symlink to `dnf`.
+and YUM on Red Hat-based distributions such as RHEL, AlmaLinux, and Rocky Linux.
 To build from source instead, see [BUILD.md](../BUILD.md).

 ## Release channels

 Packages are published to four channels:

- `stable` - production releases
+- `stable` - the latest production release
 - `rc` - release candidates
 - `beta` - beta builds
 - `develop` - every push to the [`develop` branch](https://github.com/XRPLF/rippled/tree/develop)
@@ -82,7 +81,7 @@ wherever it appears in the repository configuration.
    sudo apt -y install xrpld
    ```

-### With the DNF package manager
+### With the YUM package manager

 1.  Add the XRPL Foundation package-signing key:

@@ -110,23 +109,9 @@ wherever it appears in the repository configuration.
 3.  Install the `xrpld` package:

    ```bash
-    sudo dnf install -y xrpld
+    sudo yum install -y xrpld
    ```

-### Optional: the assert-enabled build
-
-Every channel also carries `xrpld-assert` as a DEB, the same build with assertions
-enabled, for diagnosing a problem on a non-production server.
-It installs the same files as `xrpld` and replaces it, so install one or the other:
-
-```bash
-sudo apt -y install xrpld-assert # APT removes xrpld itself
-```
-
-Switching stops the service, since it is a removal and an installation rather than an upgrade,
-and APT starts it again.
-Install `xrpld` the same way to switch back.
-
 ## The xrpld service

 Both package managers install a systemd unit and enable it, so `xrpld` starts on boot.
@@ -136,7 +121,7 @@ Check whether it is already running:
 systemctl status xrpld.service
 ```

-The DEB packages start it immediately as well; the RPM packages do not, so start it yourself:
+The APT packages start it immediately as well; the YUM packages do not, so start it yourself:

 ```bash
 sudo systemctl start xrpld.service
--- a/include/xrpl/basics/StringUtilities.h
+++ b/include/xrpl/basics/StringUtilities.h
@@ -162,89 +162,4 @@ toUInt64(std::string const& s);
 bool
 isProperlyFormedTomlDomain(std::string_view domain);

-/**
- * Whether a view can be passed on as a C string.
- *
- * A reader given only data() stops at the first null, so the view must reach the
- * terminating null. The test rebuilds the view from data() and compares: a view
- * that stops earlier rebuilds longer, and so compares unequal.
- *
- * consteval because reading the byte after the view is only defined when @p str
- * points into storage holding a null at or after its end, such as a string
- * literal. An unterminated view is then a compile error, not an out-of-bounds
- * read.
- *
- * @param str The view to test.
- * @return Whether @p str is null-terminated. A view with no data is not.
- */
-consteval bool
-isNullTerminated(std::string_view str)
-{
-    if (str.data() == nullptr)
-        return false;
-
-    // Reading past the view is the point, so the usual data() warning does not
-    // apply.
-    // NOLINTNEXTLINE(bugprone-suspicious-stringview-data-usage)
-    return std::string_view{str.data()} == str;
-}
-
-/**
- * A string that is known to reach its terminating null.
- *
- * Converts to std::string_view, so it compares and hashes as one. Unlike a
- * view, asCString() may be handed to a reader that expects a C string, such
- * as json::StaticString.
- *
- * The only constructor is consteval and rejects a view that stops before the
- * null, so the property holds by construction and no caller asserts it.
- */
-class NullTerminatedView
-{
-public:
-    /**
-     * Build a view from one that reaches its terminating null.
-     *
-     * Explicit, so that a plain view cannot become a proof of termination by
-     * accident. The conversion the other way stays implicit.
-     *
-     * @param view The string to hold. Rejected at compile time if it stops
-     *        before its terminating null, or has no data.
-     */
-    explicit consteval NullTerminatedView(std::string_view view)
-        : data_(view.data()), size_(view.size())
-    {
-        if (!isNullTerminated(view))
-            throw "xrpl::NullTerminatedView : view does not reach a null";
-    }
-
-    constexpr
-    operator std::string_view() const noexcept
-    {
-        return view();
-    }
-
-    /**
-     * @return The string as a view.
-     */
-    [[nodiscard]] constexpr std::string_view
-    view() const noexcept
-    {
-        return {data_, size_};
-    }
-
-    /**
-     * @return The string as a C string. Never null.
-     */
-    [[nodiscard]] constexpr char const*
-    asCString() const noexcept
-    {
-        return data_;
-    }
-
-private:
-    char const* data_;
-    std::size_t size_;
-};
-
 }  // namespace xrpl
--- a/include/xrpl/basics/base_uint.h
+++ b/include/xrpl/basics/base_uint.h
@@ -518,7 +518,7 @@ public:
     * The input must be precisely `2 * bytes` hexadecimal characters
     * long, with one exception: the value '0'.
     *
-     * @param sv A string of hexadecimal characters
+     * @param sv A null-terminated string of hexadecimal characters
     * @return true if the input was parsed properly; false otherwise.
     */
    [[nodiscard]] constexpr bool
--- a/include/xrpl/core/HashRouter.h
+++ b/include/xrpl/core/HashRouter.h
@@ -34,10 +34,7 @@ enum class HashRouterFlags : std::uint16_t {
    PRIVATE4 = 0x0800,
    // Used in EscrowFinish.cpp
    PRIVATE5 = 0x1000,
-    PRIVATE6 = 0x2000,
-    // Used in apply.cpp
-    PRIVATE7 = 0x4000,
-    PRIVATE8 = 0x8000
+    PRIVATE6 = 0x2000
 };

 constexpr HashRouterFlags
--- a/include/xrpl/core/PerfLog.h
+++ b/include/xrpl/core/PerfLog.h
@@ -1,7 +1,6 @@
 #pragma once

 #include <xrpl/basics/Log.h>
-#include <xrpl/basics/StringUtilities.h>
 #include <xrpl/core/Job.h>
 #include <xrpl/json/json_value.h>

@@ -10,8 +9,7 @@
 #include <filesystem>
 #include <functional>
 #include <memory>
-#include <span>
-#include <string_view>
+#include <string>

 namespace beast {
 class Journal;
@@ -69,7 +67,7 @@ public:
     * @param requestId Unique identifier to track command
     */
    virtual void
-    rpcStart(std::string_view method, std::uint64_t requestId) = 0;
+    rpcStart(std::string const& method, std::uint64_t requestId) = 0;

    /**
     * Log successful finish of RPC call
@@ -78,7 +76,7 @@ public:
     * @param requestId Unique identifier to track command
     */
    virtual void
-    rpcFinish(std::string_view method, std::uint64_t requestId) = 0;
+    rpcFinish(std::string const& method, std::uint64_t requestId) = 0;

    /**
     * Log errored RPC call
@@ -87,7 +85,7 @@ public:
     * @param requestId Unique identifier to track command
     */
    virtual void
-    rpcError(std::string_view method, std::uint64_t requestId) = 0;
+    rpcError(std::string const& method, std::uint64_t requestId) = 0;

    /**
     * Log queued job
@@ -152,20 +150,10 @@ public:
 PerfLog::Setup
 setupPerfLog(Section const& section, std::filesystem::path const& configDir);

-/**
- * @param methodNames The RPC methods to count, one counter per name. Reported
- *        as JSON keys that borrow each name and read it as a C string, which is
- *        why the parameter type requires one that reaches its terminating null.
- *        The names must outlive the returned object, which holds views of them.
- *        The range itself need not: it is copied.
- *        Passed in rather than looked up here, so that this layer needs no
- *        knowledge of the dispatch table.
- */
 std::unique_ptr<PerfLog>
 makePerfLog(
    PerfLog::Setup const& setup,
    Application& app,
-    std::span<NullTerminatedView const> methodNames,
    beast::Journal journal,
    std::function<void()>&& signalStop);

@@ -173,7 +161,7 @@ template <typename Func, class Rep, class Period>
 auto
 measureDurationAndLog(
    Func&& func,
-    std::string_view actionDescription,
+    std::string const& actionDescription,
    std::chrono::duration<Rep, Period> maxDelay,
    beast::Journal const& journal)
 {
--- a/include/xrpl/ledger/ApplyView.h
+++ b/include/xrpl/ledger/ApplyView.h
@@ -43,14 +43,7 @@ enum ApplyFlags : std::uint32_t {

    // Transaction shouldn't be applied
    // Signatures shouldn't be checked
-    TapDryRun = 0x1000,
-
-    // Transaction is being preflighted as the payload of a
-    // TransactionProposalCreate. Its signatures are collected on-ledger
-    // afterward, so signature-presence checks (e.g. Batch signer matching)
-    // are skipped at proposal-creation time (On-Chain Cosigner spec
-    // §5.3.1.2).
-    TapProposal = 0x2000
+    TapDryRun = 0x1000
 };

 constexpr ApplyFlags
--- a/include/xrpl/ledger/entries/AMMEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/AccountRootEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/AmendmentsEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/BridgeEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/CheckEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/CredentialEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/DIDEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/DelegateEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/DepositPreauthEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/DirectoryNodeEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/EscrowEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/FeeSettingsEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/LedgerHashesEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/LoanBrokerEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/LoanEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/MPTokenEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/MPTokenIssuanceEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/NFTokenOfferEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/NFTokenPageEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/NegativeUNLEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/OfferEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/OracleEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/PayChannelEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/PermissionedDomainEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/RippleStateEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/SLEBase.h
+++ b/include/xrpl/ledger/entries/SLEBase.h
@@ -1,503 +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 defined behavior only when the view really is a non-const
- *       object that the caller merely observes through a const reference.
- *       That holds for every production view today, but it is not a
- *       guarantee the codebase makes: the unit tests already build
- *       genuinely const ApplyView-derived objects (`Sandbox const` in
- *       Directory_test.cpp and View_test.cpp, `PaymentSandbox const` in
- *       TheoreticalQuality_test.cpp and View_test.cpp). Constructing a
- *       read-only entry over one of those would be undefined behavior, so
- *       do not, until #8069 removes the cast -- by giving ApplyView a
- *       const-qualified peek(), which needs no amendment because
- *       Action::Cache is invisible to apply(), visit() and metadata.
- *
- * @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)
-{
-    // Safe only for a view that is not itself a const object -- see the
-    // note above. The entry holds a const reference because it does not
-    // modify the view, not because the view is const.
-    // 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 throws 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
--- a/include/xrpl/ledger/entries/SignerListEntry.h
+++ b/include/xrpl/ledger/entries/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/entries/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
--- a/include/xrpl/ledger/entries/SponsorshipEntry.h
+++ b/include/xrpl/ledger/entries/SponsorshipEntry.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/entries/SLEBase.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-
-namespace xrpl {
-
-template <typename ViewT>
-class SponsorshipEntry : public SLEBase<ViewT, ltSPONSORSHIP>
-{
-public:
-    using Base = SLEBase<ViewT, ltSPONSORSHIP>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit SponsorshipEntry(
-        AccountID const& sponsor,
-        AccountID const& sponsee,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::sponsorship(sponsor, sponsee), view, j)
-    {
-    }
-};
-
-using SponsorshipEntryR = SponsorshipEntry<ReadView>;
-using SponsorshipEntryW = SponsorshipEntry<ApplyView>;
-
-}  // namespace xrpl
--- a/include/xrpl/ledger/entries/TicketEntry.h
+++ b/include/xrpl/ledger/entries/TicketEntry.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/entries/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 TicketEntry : public SLEBase<ViewT, ltTICKET>
-{
-public:
-    using Base = SLEBase<ViewT, ltTICKET>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit TicketEntry(
-        AccountID const& id,
-        SeqProxy const& ticketSeq,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::ticket(id, ticketSeq), view, j)
-    {
-    }
-
-    explicit TicketEntry(
-        uint256 const& ticketID,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::ticket(ticketID), view, j)
-    {
-    }
-};
-
-using TicketEntryR = TicketEntry<ReadView>;
-using TicketEntryW = TicketEntry<ApplyView>;
-
-}  // namespace xrpl
--- a/include/xrpl/ledger/entries/TransactionProposalEntry.h
+++ b/include/xrpl/ledger/entries/TransactionProposalEntry.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/entries/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 TransactionProposalEntry : public SLEBase<ViewT, ltTRANSACTION_PROPOSAL>
-{
-public:
-    using Base = SLEBase<ViewT, ltTRANSACTION_PROPOSAL>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit TransactionProposalEntry(
-        AccountID const& target,
-        std::uint32_t ticketSequence,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::txProposal(target, ticketSequence), view, j)
-    {
-    }
-};
-
-using TransactionProposalEntryR = TransactionProposalEntry<ReadView>;
-using TransactionProposalEntryW = TransactionProposalEntry<ApplyView>;
-
-}  // namespace xrpl
--- a/include/xrpl/ledger/entries/VaultEntry.h
+++ b/include/xrpl/ledger/entries/VaultEntry.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/entries/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 VaultEntry : public SLEBase<ViewT, ltVAULT>
-{
-public:
-    using Base = SLEBase<ViewT, ltVAULT>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit VaultEntry(
-        AccountID const& owner,
-        SeqProxy const& seq,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::vault(owner, seq), view, j)
-    {
-    }
-
-    explicit VaultEntry(
-        uint256 const& vaultID,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::vault(vaultID), view, j)
-    {
-    }
-};
-
-using VaultEntryR = VaultEntry<ReadView>;
-using VaultEntryW = VaultEntry<ApplyView>;
-
-}  // namespace xrpl
--- a/include/xrpl/ledger/entries/XChainOwnedClaimIDEntry.h
+++ b/include/xrpl/ledger/entries/XChainOwnedClaimIDEntry.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/entries/SLEBase.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-#include <xrpl/protocol/STXChainBridge.h>
-
-#include <cstdint>
-
-namespace xrpl {
-
-template <typename ViewT>
-class XChainOwnedClaimIDEntry : public SLEBase<ViewT, ltXCHAIN_OWNED_CLAIM_ID>
-{
-public:
-    using Base = SLEBase<ViewT, ltXCHAIN_OWNED_CLAIM_ID>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit XChainOwnedClaimIDEntry(
-        STXChainBridge const& bridge,
-        std::uint64_t seq,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::xChainClaimID(bridge, seq), view, j)
-    {
-    }
-};
-
-using XChainOwnedClaimIDEntryR = XChainOwnedClaimIDEntry<ReadView>;
-using XChainOwnedClaimIDEntryW = XChainOwnedClaimIDEntry<ApplyView>;
-
-}  // namespace xrpl
--- a/include/xrpl/ledger/entries/XChainOwnedCreateAccountClaimIDEntry.h
+++ b/include/xrpl/ledger/entries/XChainOwnedCreateAccountClaimIDEntry.h
@@ -1,39 +0,0 @@
-#pragma once
-
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/entries/SLEBase.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-#include <xrpl/protocol/STXChainBridge.h>
-
-#include <cstdint>
-
-namespace xrpl {
-
-template <typename ViewT>
-class XChainOwnedCreateAccountClaimIDEntry
-    : public SLEBase<ViewT, ltXCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID>
-{
-public:
-    using Base = SLEBase<ViewT, ltXCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit XChainOwnedCreateAccountClaimIDEntry(
-        STXChainBridge const& bridge,
-        std::uint64_t seq,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::xChainCreateAccountClaimID(bridge, seq), view, j)
-    {
-    }
-};
-
-using XChainOwnedCreateAccountClaimIDEntryR = XChainOwnedCreateAccountClaimIDEntry<ReadView>;
-using XChainOwnedCreateAccountClaimIDEntryW = XChainOwnedCreateAccountClaimIDEntry<ApplyView>;
-
-}  // namespace xrpl
--- a/include/xrpl/ledger/helpers/AccountRootHelpers.h
+++ b/include/xrpl/ledger/helpers/AccountRootHelpers.h
@@ -15,6 +15,7 @@
 #include <cstdint>
 #include <expected>
 #include <optional>
+#include <set>
 #include <vector>

 namespace xrpl {
@@ -352,14 +353,14 @@ pseudoAccountAddress(ReadView const& view, uint256 const& pseudoOwnerKey);
 *
 * The list is constructed during initialization and is const after that.
 * Pseudo-account designator fields MUST be maintained by including the
- * SField::kSmdPseudoAccount flag in the SField definition.
+ * SField::sMD_PseudoAccount flag in the SField definition.
 */
 [[nodiscard]] std::vector<SField const*> const&
 getPseudoAccountFields();

 /**
- * Returns true if and only if sleAcct is a pseudo-account of any kind
- * (i.e. carries at least one field flagged with SField::kSmdPseudoAccount).
+ * Returns true if and only if sleAcct is a pseudo-account or specific
+ * pseudo-accounts in pseudoFieldFilter.
 *
 * Returns false if sleAcct is:
 * - NOT a pseudo-account OR
@@ -367,15 +368,18 @@ getPseudoAccountFields();
 * - null pointer
 */
 [[nodiscard]] bool
-isPseudoAccount(SLE::const_pointer sleAcct);
+isPseudoAccount(SLE::const_pointer sleAcct, std::set<SField const*> const& pseudoFieldFilter = {});

 /**
 * Convenience overload that reads the account from the view.
 */
 [[nodiscard]] inline bool
-isPseudoAccount(ReadView const& view, AccountID const& accountId)
+isPseudoAccount(
+    ReadView const& view,
+    AccountID const& accountId,
+    std::set<SField const*> const& pseudoFieldFilter = {})
 {
-    return isPseudoAccount(view.read(keylet::account(accountId)));
+    return isPseudoAccount(view.read(keylet::account(accountId)), pseudoFieldFilter);
 }

 /**
--- a/include/xrpl/ledger/helpers/CredentialHelpers.h
+++ b/include/xrpl/ledger/helpers/CredentialHelpers.h
@@ -14,6 +14,7 @@
 #include <xrpl/protocol/STVector256.h>
 #include <xrpl/protocol/TER.h>

+#include <cstdint>
 #include <memory>
 #include <set>
 #include <utility>
@@ -33,6 +34,32 @@ 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);
--- a/include/xrpl/ledger/helpers/LendingHelpers.h
+++ b/include/xrpl/ledger/helpers/LendingHelpers.h
@@ -338,9 +338,9 @@ struct AccountingDeltas
    Number debtTotalDelta;
 };

-// Instant interest recognition (pre-LendingProtocolV1_1): interest is
-// recognized into AssetsTotal/DebtTotal immediately, at origination.
-namespace instant_recognition {
+// Whole-life (pre-LendingProtocolV1_1) recognition model: interest is
+// recognized into AssetsTotal/DebtTotal up front, at origination.
+namespace accrual {

 // LoanSet origination: what's added to Vault.AssetsTotal and LoanBroker.DebtTotal
 AccountingDeltas
@@ -362,7 +362,7 @@ loanVaultExposure(SLE::const_ref loanSle);
 AccountingDeltas
 loanPaymentDeltas(LoanPaymentParts const& parts);

-}  // namespace instant_recognition
+}  // namespace accrual

 // Cash-basis (LendingProtocolV1_1) recognition model: AssetsTotal/DebtTotal
 // are principal-only, interest is recognized only as it's actually paid.
@@ -381,7 +381,7 @@ loanPaymentDeltas(LoanPaymentParts const& parts);

 // Public dispatchers: pick cash_basis:: if featureLendingProtocolV1_1 is
 // enabled AND the Vault's LEVersion (VaultHelpers::getVaultVersion) is
-// VaultVersion::CashBasis, else instant_recognition::. These are the only entry points
+// VaultVersion::CashBasis, else accrual::. These are the only entry points
 // transactors call.
 AccountingDeltas
 loanOriginationDeltas(
--- a/include/xrpl/ledger/helpers/ProposalHelpers.h
+++ b/include/xrpl/ledger/helpers/ProposalHelpers.h
@@ -1,87 +0,0 @@
-#pragma once
-
-#include <xrpl/protocol/SField.h>
-#include <xrpl/protocol/STObject.h>
-#include <xrpl/protocol/TxFormats.h>
-
-#include <cstdint>
-
-namespace xrpl::proposal {
-
-/**
- * Owner-reserve increments held by a proposal of an ordinary transaction.
- */
-constexpr std::uint32_t kProposalOwnerCount = 5;
-
-/**
- * Owner-reserve increments held by a proposal of a Batch transaction. A
- * proposed Batch stores up to eight inner transactions plus multi-account
- * signatures, so it reserves more than an ordinary proposed transaction.
- */
-constexpr std::uint32_t kBatchProposalOwnerCount = 10;
-
-/**
- * Owner-reserve increments held by a proposal of the given transaction.
- */
-inline std::uint32_t
-proposalOwnerCount(STObject const& proposedTx)
-{
-    return proposedTx.getFieldU16(sfTransactionType) == ttBATCH ? kBatchProposalOwnerCount
-                                                                : kProposalOwnerCount;
-}
-
-/**
- * Whether the proposed transaction is itself a proposal transaction, which
- * would nest one proposal inside another.
- *
- * TODO: cover ttTRANSACTION_PROPOSAL_SIGN and ttTRANSACTION_PROPOSAL_CANCEL
- * once those transactions exist.
- */
-inline bool
-isProposalTx(STObject const& proposedTx)
-{
-    return proposedTx.getFieldU16(sfTransactionType) == ttTRANSACTION_PROPOSAL_CREATE;
-}
-
-/**
- * Whether the proposed transaction is independently submittable through the
- * ordinary multi-sign path: not a nested proposal, not a pseudo-transaction,
- * not itself flagged as someone else's inner batch transaction, and — if it
- * is a Batch — none of its own inner transactions is a nested proposal or a
- * pseudo-transaction either. A Batch inner transaction cannot itself be
- * pseudo (preflight0 rejects the pseudo/tfInnerBatchTxn combination
- * generically), but that guard lives outside this feature, so it is checked
- * again here rather than relied upon.
- */
-bool
-isValidProposal(STObject const& proposedTx);
-
-/**
- * Whether the proposed transaction carries any signature field.
- *
- * A proposal is stored in unsigned canonical form; signatures may only ever
- * arrive through TransactionProposalSign. Shared by the create-time check and
- * the invariant that guards the stored entry, so the two cannot drift apart.
- */
-inline bool
-hasSignatureField(STObject const& proposedTx)
-{
-    return proposedTx.isFieldPresent(sfTxnSignature) || proposedTx.isFieldPresent(sfSigners) ||
-        proposedTx.isFieldPresent(sfBatchSigners) ||
-        proposedTx.isFieldPresent(sfCounterpartySignature) ||
-        proposedTx.isFieldPresent(sfSponsorSignature);
-}
-
-/**
- * Whether the proposed transaction's SigningPubKey is present and empty, as
- * unsigned canonical form requires. An absent field is not the same as an
- * empty one, and a populated one means the payload was already signed.
- */
-inline bool
-hasEmptySigningPubKey(STObject const& proposedTx)
-{
-    return proposedTx.isFieldPresent(sfSigningPubKey) &&
-        proposedTx.getFieldVL(sfSigningPubKey).empty();
-}
-
-}  // namespace xrpl::proposal
--- a/include/xrpl/ledger/helpers/RippleStateHelpers.h
+++ b/include/xrpl/ledger/helpers/RippleStateHelpers.h
@@ -239,13 +239,8 @@ canTransfer(ReadView const& view, Issue const& issue, AccountID const& from, Acc
 //------------------------------------------------------------------------------

 /**
- * 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.
+ * Any transactors that call addEmptyHolding() in doApply must call
+ * canAddHolding() in preflight with the same View and Asset
 */
 [[nodiscard]] TER
 addEmptyHolding(
--- a/include/xrpl/ledger/helpers/TokenHelpers.h
+++ b/include/xrpl/ledger/helpers/TokenHelpers.h
@@ -38,12 +38,6 @@ enum class FreezeHandling { IgnoreFreeze, ZeroIfFrozen };
 */
 enum class AuthHandling { IgnoreAuth, ZeroIfUnauthorized };

-/**
- * Controls whether the recipient owner-reserve check is enforced when
- * auto-creating a trustline or MPToken during AMMWithdraw or AMMClawback.
- */
-enum class ReserveHandling : bool { EnforceReserve, IgnoreReserve };
-
 /**
 * Controls whether to include the account's full spendable balance
 */
@@ -300,14 +294,6 @@ accountFunds(
    AuthHandling authHandling,
    beast::Journal j);

-/**
- * Returns the transfer fee as Rate based on the type of token
- * @param view The ledger view
- * @param asset The asset being transferred
- */
-[[nodiscard]] Rate
-transferRate(ReadView const& view, Asset const& asset);
-
 /**
 * Returns the transfer fee as Rate based on the type of token
 * @param view The ledger view
@@ -325,12 +311,6 @@ transferRate(ReadView const& view, STAmount const& amount);
 [[nodiscard]] TER
 canAddHolding(ReadView const& view, Asset const& asset);

-/**
- * True if the account already holds this asset (or is the issuer / XRP).
- */
-[[nodiscard]] bool
-holdingExists(ReadView const& view, AccountID const& account, Asset const& asset);
-
 [[nodiscard]] TER
 addEmptyHolding(
    ApplyViewContext ctx,
--- a/include/xrpl/ledger/helpers/VaultHelpers.h
+++ b/include/xrpl/ledger/helpers/VaultHelpers.h
@@ -10,7 +10,6 @@
 #include <xrpl/protocol/TER.h>

 #include <cstdint>
-#include <expected>
 #include <optional>

 namespace xrpl {
@@ -45,32 +44,6 @@ assetsToSharesDeposit(SLE::const_ref vault, SLE::const_ref issuance, STAmount co
 [[nodiscard]] std::optional<STAmount>
 sharesToAssetsDeposit(SLE::const_ref vault, SLE::const_ref issuance, STAmount const& shares);

-/**
- * Adjusts a requested asset change (`delta`) to match the decimal scale of the
- * updated total vault assets. This ensures `sfAssetsTotal`, `sfAssetsAvailable`,
- * and the actual asset transfer change by the exact same representable amount.
- *
- * Rounding strategy:
- * - Debits (withdrawals): Rounds down `|delta|` on the new scale to prevent
- *   paying out more than requested.
- * - Credits (deposits): Floors the resulting total asset balance and returns the
- *   difference from the current total. This prevents crediting the vault with
- *   more assets than the user deposited.
- *
- * Key rules:
- * - The returned magnitude never exceeds `|delta|`.
- * - Returns `tecPRECISION_LOSS` if the change is smaller than 1 ULP of the target scale
- *   (prevents share operations when totals cannot change).
- * - For integer assets (XRP, MPT), rounding is a no-op.
- *
- * @param vault The vault ledger entry.
- * @param delta The requested signed change to sfAssetsTotal.
- * @return The rounded, positive magnitude, or `tecPRECISION_LOSS` if the
- *         change is below representable precision.
- */
-[[nodiscard]] std::expected<STAmount, TER>
-clampToAssetsTotalScale(SLE::const_ref vault, STAmount const& delta);
-
 /**
 * Controls whether to truncate shares instead of rounding.
 */
@@ -86,30 +59,33 @@ enum class TruncateShares : bool { No = false, Yes = true };
 enum class WaiveUnrealizedLoss : bool { No = false, Yes = true };

 /**
- * Returns the assets backing outstanding shares for a withdrawal:
- * sfAssetsTotal minus sfLossUnrealized, or sfAssetsTotal alone when the
- * unrealized loss is waived. Used by assetsToSharesWithdraw and
- * sharesToAssetsWithdraw as the numerator of the share/asset exchange rate.
+ * Returns the effective total of assets backing outstanding shares for the
+ * purposes of a withdrawal, i.e. sfAssetsTotal, discounted by sfLossUnrealized
+ * unless waived. This is the numerator used by both withdraw conversion
+ * helpers (assetsToSharesWithdraw and sharesToAssetsWithdraw) to compute the
+ * share/asset exchange rate.
 *
 * @param vault The vault SLE.
- * @param waive Whether to skip subtracting the unrealized loss.
+ * @param waive Whether to waive (i.e. not subtract) the vault's unrealized
+ *              loss.
 */
 [[nodiscard]] Number
 assetsTotalForWithdrawal(SLE::const_ref vault, WaiveUnrealizedLoss waive);

 /**
- * Returns true if debiting `amount` from `total` (the current value of a
- * vault's sfAssetsTotal or sfAssetsAvailable) would canonicalize to the
- * same STAmount value. This happens when `amount` is non-zero but too small
- * to change the stored total at STAmount's precision. Shares would still
- * move, so the ValidVault invariant would fail after apply; callers use
- * this to reject the transaction upfront instead.
+ * Returns whether debiting `amount` from `total` — the current value of a
+ * vault's sfAssetsTotal or sfAssetsAvailable field — would canonicalize back
+ * to the exact same STAmount value it started at. This happens when a
+ * genuinely non-zero debit is dust relative to a `total` large enough to
+ * exceed STAmount's significant-digit precision: the shares still move, but
+ * the stored total doesn't change, which otherwise trips the ValidVault
+ * invariant after the fact instead of failing cleanly upfront.
 *
- * @param asset The vault's underlying asset, used to canonicalize both
- *              sides the same way the ledger will when the field is stored.
+ * @param asset The vault's underlying asset, used to canonicalize both sides
+ *              the same way the ledger will when the field is stored.
 * @param total The field's current value.
- * @param amount The amount to debit. Zero always returns false; that case
- *               is rejected separately.
+ * @param amount The amount to debit. A value of zero always returns false;
+ *               that case is rejected separately and unconditionally.
 */
 [[nodiscard]] bool
 debitIsNonZeroDust(Asset const& asset, Number const& total, Number const& amount);
@@ -172,8 +148,8 @@ isSoleShareholder(ReadView const& view, AccountID const& account, SLE::const_ref

 /**
 * Resolves a Vault's LEVersion, the single point every accounting touch
- * point should call to determine which recognition model (instant interest
- * recognition vs. cash-basis) a Vault uses. Vaults created before featureLendingProtocolV1_1
+ * point should call to determine which recognition model (accrual vs.
+ * cash-basis) a Vault uses. Vaults created before featureLendingProtocolV1_1
 * activated never have sfLEVersion set, which resolves here to
 * VaultVersion::Legacy.
 *
--- a/include/xrpl/nodestore/detail/DatabaseNodeImp.h
+++ b/include/xrpl/nodestore/detail/DatabaseNodeImp.h
@@ -92,7 +92,7 @@ public:
    void
    importDatabase(Database& source) override
    {
-        importInternal(*backend_, source);
+        importInternal(*backend_.get(), source);
    }

    void
--- a/include/xrpl/peerfinder/Config.h
+++ b/include/xrpl/peerfinder/Config.h
@@ -26,8 +26,7 @@ struct Config
    /**
     * The largest number of public peer slots to allow.
     * This includes both inbound and outbound, but does not include
-     * fixed peers. A configuration built by `makeConfig` always holds
-     * `maxPeers == inPeers + outPeers`.
+     * fixed peers.
     */
    std::size_t maxPeers{tuning::kDefaultMaxPeers};

--- a/include/xrpl/protocol/ConfidentialTransfer.h
+++ b/include/xrpl/protocol/ConfidentialTransfer.h
@@ -6,7 +6,6 @@
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/STInteger.h>  // IWYU pragma: keep
-#include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol/STObject.h>
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/UintTypes.h>
@@ -302,87 +301,6 @@ verifySchnorrProof(Slice const& pubKeySlice, Slice const& proofSlice, uint256 co
 NotTEC
 checkEncryptedAmountFormat(STObject const& object);

-/**
- * @brief Checks whether a holder's issuer mirror is encrypted under the
- * issuance's currently registered issuer key.
- *
- * Verifies that the holder's issuer mirror epoch matches the active issuer key
- * epoch on the issuance. An absent mirror epoch defaults to epoch 0. A holder without an issuer
- * mirror is considered stale, as there is no key anchor for future re-encryptions.
- *
- * @param issuance The MPTokenIssuance ledger object.
- * @param mptoken  The holder's MPToken ledger object.
- * @return true if the MPToken's issuer mirror is current. false if stale.
- */
-[[nodiscard]] bool
-isIssuerMirrorCurrent(SLE const& issuance, SLE const& mptoken);
-
-/**
- * @brief Checks whether a holder's auditor mirror is encrypted under the
- * issuance's currently registered auditor key.
- *
- * Verifies that the holder's auditor mirror epoch matches the active auditor key
- * epoch on the issuance. An absent mirror epoch defaults to epoch 0. An issuance
- * without an auditor key requires no auditor mirror and is considered current.
- *
- * @param issuance The MPTokenIssuance ledger object.
- * @param mptoken  The holder's MPToken ledger object.
- * @return true if the auditor mirror is current or not required.
- */
-[[nodiscard]] bool
-isAuditorMirrorCurrent(SLE const& issuance, SLE const& mptoken);
-
-/**
- * @brief Checks whether each mirror a holder is required to have is encrypted
- * under the issuance's currently registered ElGamal keys.
- *
- * Verifies that both the issuer mirror and the auditor mirror (if required)
- * are current. This serves as a combined check, ensuring all necessary
- * holder mirror epochs match the active key epochs on the issuance.
- *
- * @param issuance The MPTokenIssuance ledger object.
- * @param mptoken  The holder's MPToken ledger object.
- * @return true if the required mirrors are current.
- */
-[[nodiscard]] bool
-areMirrorsCurrent(SLE const& issuance, SLE const& mptoken);
-
-/**
- * @brief Set the holder's issuer mirror epoch to match the issuance's current issuer key epoch.
- *
- * Call this after writing the issuer mirror ciphertext under the issuance's
- * currently registered issuer key, so that the mirror reads as current afterwards.
- *
- * @param issuance The MPTokenIssuance ledger object.
- * @param mptoken  The holder's MPToken ledger entry to update.
- */
-void
-setIssuerMirrorEpoch(SLE const& issuance, SLE& mptoken);
-
-/**
- * @brief Set the holder's auditor mirror epoch to match the issuance's current auditor key epoch.
- *
- * Call this after writing the auditor mirror ciphertext under the issuance's
- * currently registered auditor key. Does nothing when the holder has no auditor mirror.
- *
- * @param issuance The MPTokenIssuance ledger object.
- * @param mptoken  The holder's MPToken ledger entry to update.
- */
-void
-setAuditorMirrorEpoch(SLE const& issuance, SLE& mptoken);
-
-/**
- * @brief Set the holder's MPToken mirror epochs to match the issuance's current key epochs.
- *
- * Call this after writing mirror ciphertexts under the issuance's currently
- * registered keys, so that the mirrors read as current afterwards.
- *
- * @param issuance The MPTokenIssuance ledger object.
- * @param mptoken  The holder's MPToken ledger entry to update.
- */
-void
-setMirrorEpochs(SLE const& issuance, SLE& mptoken);
-
 /**
 * @brief Verifies revealed amount encryptions for all recipients.
 *
--- a/include/xrpl/protocol/HashPrefix.h
+++ b/include/xrpl/protocol/HashPrefix.h
@@ -92,26 +92,6 @@ enum class HashPrefix : std::uint32_t {
     * Batch
     */
    Batch = detail::makeHashPrefix('B', 'C', 'H'),
-
-    /**
-     * inner transaction to sign as the counterparty
-     */
-    CounterpartyTxSign = detail::makeHashPrefix('C', 'P', 'T'),
-
-    /**
-     * inner transaction to multi-sign as the counterparty
-     */
-    CounterpartyTxMultiSign = detail::makeHashPrefix('C', 'P', 'M'),
-
-    /**
-     * inner transaction to sign as the sponsor
-     */
-    SponsorTxSign = detail::makeHashPrefix('S', 'P', 'N'),
-
-    /**
-     * inner transaction to multi-sign as the sponsor
-     */
-    SponsorTxMultiSign = detail::makeHashPrefix('S', 'P', 'M'),
 };

 template <class Hasher>
--- a/include/xrpl/protocol/Indexes.h
+++ b/include/xrpl/protocol/Indexes.h
@@ -183,20 +183,6 @@ check(uint256 const& key) noexcept
 }
 /** @} */

-/**
- * A TransactionProposal
- */
-/** @{ */
-Keylet
-txProposal(AccountID const& target, std::uint32_t ticketSequence) noexcept;
-
-inline Keylet
-txProposal(uint256 const& key) noexcept
-{
-    return {ltTRANSACTION_PROPOSAL, key};
-}
-/** @} */
-
 /**
 * A DepositPreauth
 */
--- a/include/xrpl/protocol/MPTAmount.h
+++ b/include/xrpl/protocol/MPTAmount.h
@@ -9,7 +9,6 @@

 #include <cstdint>
 #include <limits>
-#include <optional>
 #include <ostream>
 #include <stdexcept>
 #include <string>
@@ -175,17 +174,4 @@ mulRatio(MPTAmount const& amt, std::uint32_t num, std::uint32_t den, bool roundU
    return MPTAmount(r.convert_to<MPTAmount::value_type>());
 }

-inline std::optional<MPTAmount>
-tryMulRatio(MPTAmount const& amt, std::uint32_t num, std::uint32_t den, bool roundUp)
-{
-    try
-    {
-        return mulRatio(amt, num, den, roundUp);
-    }
-    catch (std::overflow_error const&)
-    {
-        return std::nullopt;
-    }
-}
-
 }  // namespace xrpl
--- a/include/xrpl/protocol/NFTSyntheticSerializer.h
+++ b/include/xrpl/protocol/NFTSyntheticSerializer.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <xrpl/json/json_forwards.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/TxMeta.h>
+
+#include <memory>
+
+namespace xrpl::rpc {
+
+/**
+ * Adds common synthetic fields to transaction-related JSON responses
+ */
+/** @{ */
+void
+insertNFTSyntheticInJson(json::Value&, std::shared_ptr<STTx const> const&, TxMeta const&);
+/** @} */
+
+}  // namespace xrpl::rpc
--- a/include/xrpl/protocol/PathAsset.h
+++ b/include/xrpl/protocol/PathAsset.h
@@ -5,11 +5,9 @@
 #include <xrpl/protocol/Concepts.h>
 #include <xrpl/protocol/UintTypes.h>

-#include <cstdint>
 #include <ostream>
 #include <stdexcept>
 #include <string>
-#include <type_traits>
 #include <variant>

 namespace xrpl {
@@ -123,32 +121,9 @@ operator==(PathAsset const& lhs, PathAsset const& rhs)

 template <typename Hasher>
 void
-hash_append(Hasher& h, PathAsset const& pathAsset) noexcept
+hash_append(Hasher& h, PathAsset const& pathAsset)
 {
-    using beast::hash_append;
-    using Variant = std::remove_cvref_t<decltype(pathAsset.value())>;
-
-    static_assert(
-        std::variant_size_v<Variant> < 0xFFu,
-        "PathAsset's discriminant must fit in a byte, leaving 0xFF reserved.");
-
-    // std::visit is not noexcept: it throws bad_variant_access when the variant
-    // is valueless_by_exception.
-    if (pathAsset.value().valueless_by_exception()) [[unlikely]]
-    {
-        hash_append(h, static_cast<std::uint8_t>(0xFFu));
-        return;
-    }
-
-    hash_append(h, static_cast<std::uint8_t>(pathAsset.value().index()));
-    std::visit(
-        [&]<ValidPathAsset T>(T const& e) noexcept {
-            static_assert(
-                noexcept(hash_append(h, e)),
-                "Every PathAsset alternative must be nothrow-hashable.");
-            hash_append(h, e);
-        },
-        pathAsset.value());
+    std::visit([&]<ValidPathAsset T>(T const& e) { hash_append(h, e); }, pathAsset.value());
 }

 inline bool
--- a/include/xrpl/protocol/Protocol.h
+++ b/include/xrpl/protocol/Protocol.h
@@ -12,7 +12,6 @@
 #include <chrono>
 #include <cstddef>
 #include <cstdint>
-#include <limits>

 namespace xrpl {

@@ -322,7 +321,7 @@ constexpr std::uint8_t kVaultMaximumIouScale = 18;
 * Vault ledger-entry schema versions. Assigned to newly created
 * Vaults once featureLendingProtocolV1_1 is enabled. Vaults created before
 * activation are left without LEVersion (implicit legacy version 0,
- * instant interest recognition).
+ * accrual-basis accounting).
 */
 enum class VaultVersion : uint8_t {
    Legacy = 0,
@@ -349,24 +348,13 @@ enum class VaultPhase : std::uint8_t {
    Redemption,
 };

-/**
- * Minimum gap between a closed-ended loan's final scheduled payment and the
- * vault's RedemptionDate. LoanSet rejects a schedule whose final payment is
- * fewer than this many seconds before RedemptionDate.
- */
-constexpr std::uint32_t kLoanRedemptionBuffer = std::chrono::seconds{60}.count();
-
 /**
 * Bounds on the length of a closed-ended vault's Investment phase
 * (RedemptionDate - SubscriptionDate). At vault creation the gap must satisfy
 * kMinInvestmentPeriod <= gap < kMaxInvestmentPeriod.
- *
- * 180s is enough to originate a loan that uses the minimum payment interval
- * and kLoanRedemptionBuffer after StartDate, which is strictly after
- * SubscriptionDate. The interval and buffer need not be equal; only their
- * sum plus one second must fit in this floor.
 */
-constexpr std::uint32_t kMinInvestmentPeriod = std::chrono::seconds{180}.count();
+constexpr std::uint32_t kMinInvestmentPeriod =
+    std::chrono::seconds{std::chrono::minutes{1}}.count();
 // This is 946708560 seconds which 30 x 365.2425 days (the average length of a Gregorian year).
 constexpr std::uint32_t kMaxInvestmentPeriod = std::chrono::seconds{std::chrono::years{30}}.count();

@@ -408,6 +396,16 @@ using TxID = uint256;
 */
 constexpr std::uint16_t kMaxDeletableAmmTrustLines = 512;

+/**
+ * The maximum number of owner-directory entries to walk when clearing
+ * credentials pinned to a pseudo-account, in a single transaction.
+ *
+ * The walk stops after this many entries whether or not each one turns out to
+ * be a credential, so a directory that also holds other objects yields fewer
+ * deletions per transaction.
+ */
+constexpr std::uint16_t kMaxDeletablePseudoAccountCredentials = 512;
+
 /**
 * The maximum length of a URI inside an Oracle
 */
@@ -540,21 +538,11 @@ constexpr std::size_t kEcConvertBackProofLength =
 */
 constexpr std::size_t kEcClawbackProofLength = SECP256K1_COMPACT_CLAWBACK_PROOF_SIZE;

-/**
- * Length of compact equality proof.
- */
-constexpr std::size_t kEcEqualityProofLength = 128;
-
 /**
 * Extra base fee multiplier charged to confidential MPT transactions.
 */
 constexpr std::uint32_t kConfidentialFeeMultiplier = 9;

-/**
- * Maximum value a confidential MPT key epoch may reach.
- */
-constexpr std::uint32_t kMaxKeyEpoch = std::numeric_limits<std::uint32_t>::max();
-
 /**
 * Compressed EC point prefix for even y-coordinate
 */
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sergey Kuznetsov	222ca8f3ce	Merge develop	2026-08-26 16:31:36 +01:00
Sergey Kuznetsov	ee7ac58ffb	Merge develop	2026-08-20 15:09:15 +01:00
Sergey Kuznetsov	579c44bb22	Merge develop	2026-08-19 17:49:41 +01:00
Peng Wang	226ec160bb	Merge remote-tracking branch 'origin/develop' into ripple/wasmi	2026-08-09 14:34:11 -04:00
Sergey Kuznetsov	4d685d4bad	Merge branch 'develop' into ripple/wasmi	2026-08-04 15:24:06 +01:00
Mayukha Vadari	9a8ec56d42	Merge branch 'develop' into ripple/wasmi	2026-07-23 11:29:49 -04:00
Sergey Kuznetsov	8950530b04	Merge branch 'develop' into ripple/wasmi	2026-07-21 12:39:31 +01:00
Mayukha Vadari	f6472347e9	Merge branch 'develop' into ripple/wasmi	2026-07-20 17:33:13 -04:00
Sergey Kuznetsov	9e427ae3ba	Merge develop	2026-07-08 14:24:21 +01:00
Mayukha Vadari	ef7aeca6bf	Merge branch 'develop' into ripple/wasmi	2026-05-18 18:25:09 -04:00
Mayukha Vadari	eec1d29b92	Merge branch 'develop' into ripple/wasmi	2026-05-15 11:36:56 -04:00
Mayukha Vadari	ecee732187	Merge branch 'develop' into ripple/wasmi	2026-04-22 17:22:28 -04:00
Mayukha Vadari	1259c1d5ca	Merge branch 'develop' of https://github.com/XRPLF/rippled into ripple/wasmi	2026-04-08 13:48:41 -04:00
Mayukha Vadari	9917f96166	Merge remote-tracking branch 'upstream/develop' into ripple/wasmi	2026-04-07 16:02:56 -04:00
Pratik Mankawde	2cc9439fde	fix: Handle WSClient write failure when server closes WebSocket (#6671 ) Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>	2026-04-07 16:01:26 -04:00
Ayaz Salikhov	52af9582e2	ci: Change conditions for uploading artifacts in public/private/org repos (#6734 )	2026-04-07 16:01:26 -04:00
Bart	46e88dc732	refactor: Rename non-functional uses of `ripple(d)` to `xrpl(d)` (#6676 ) Co-authored-by: Bart <11445373+bthomee@users.noreply.github.com>	2026-04-07 16:01:26 -04:00
Mayukha Vadari	bc24f2e211	refactor: Move more helper files into `libxrpl/ledger/helpers` (#6731 ) Co-authored-by: xrplf-ai-reviewer[bot] <266832837+xrplf-ai-reviewer[bot]@users.noreply.github.com>	2026-04-07 16:01:26 -04:00
Mayukha Vadari	7a7c993b15	fix: Minor RPC fixes (#6730 )	2026-04-07 16:01:26 -04:00
Zhiyuan Wang	9733ca8f91	fix: Prevent deletion of MPTokens with active escrow (#6635 ) Co-authored-by: Bart <bthomee@users.noreply.github.com>	2026-04-07 16:01:26 -04:00
Vito Tumas	18d5e3e226	fix: Clamp VaultClawback to assetsAvailable for zero-amount clawback (#6646 )	2026-04-07 16:01:25 -04:00
Vito Tumas	b30b4e1d65	fix: Add assorted Lending Protocol fixes (#6678 ) Co-authored-by: Shawn Xie <35279399+shawnxie999@users.noreply.github.com>	2026-04-07 16:01:25 -04:00
Mayukha Vadari	d435893602	fix: Change variable signedness and correctly handle `std::optional` (#6657 )	2026-04-07 16:01:25 -04:00
Olek	00b0cf50f6	Update wasmi to 1.0.9 (#6727 )	2026-04-07 15:58:29 -04:00
Mayukha Vadari	1338062be7	Merge branch 'develop' of https://github.com/XRPLF/rippled into ripple/wasmi	2026-04-03 09:56:55 -04:00
Mayukha Vadari	1d4a3c00b8	Merge branch 'develop' of https://github.com/XRPLF/rippled into ripple/wasmi	2026-04-02 17:53:53 -04:00
Mayukha Vadari	2930ef217f	Merge remote-tracking branch 'upstream/develop' into ripple/wasmi	2026-03-24 10:20:38 -07:00
Mayukha Vadari	913e4b919e	Merge remote-tracking branch 'upstream/develop' into ripple/wasmi	2026-03-24 08:41:12 -07:00
Mayukha Vadari	bce5d91e45	Merge branch 'develop' into ripple/wasmi	2026-03-12 14:37:01 -04:00
Mayukha Vadari	654338fa66	Merge branch 'develop' into ripple/wasmi	2026-03-06 16:27:50 -04:00
Mayukha Vadari	3a825a41e1	Merge branch 'develop' into ripple/wasmi	2026-03-05 13:48:16 -04:00
Mayukha Vadari	61bcb7621f	Merge branch 'develop' into ripple/wasmi	2026-03-03 11:18:26 -04:00
Mayukha Vadari	a3f71b1774	Merge branch 'develop' into ripple/wasmi	2026-03-02 17:06:17 -05:00
Mayukha Vadari	b08bcf5d21	Merge branch 'develop' into ripple/wasmi	2026-02-27 16:41:44 -05:00
Mayukha Vadari	77dfd56ace	Merge branch 'develop' into ripple/wasmi	2026-02-27 13:49:25 -05:00
Mayukha Vadari	9c3c0280b1	Merge branch 'develop' into ripple/wasmi	2026-02-18 12:35:51 -05:00
Mayukha Vadari	bd16f7989d	Merge branch 'develop' into ripple/wasmi	2026-02-10 17:26:33 -05:00
Mayukha Vadari	2ec4a1114e	Merge branch 'develop' into ripple/wasmi	2026-02-04 18:13:00 -05:00
Mayukha Vadari	b2627039f6	Merge branch 'develop' into ripple/wasmi	2026-02-03 14:51:59 -05:00
Mayukha Vadari	e85e7b1b1a	Merge branch 'develop' into ripple/wasmi	2026-01-29 13:53:55 -05:00
Mayukha Vadari	72fffb6e51	Merge branch 'develop' into ripple/wasmi	2026-01-28 15:56:18 -05:00
Mayukha Vadari	f7ee580f01	Merge commit '5f638f55536def0d88b970d1018a465a238e55f4' into ripple/wasmi	2026-01-28 15:56:11 -05:00
Mayukha Vadari	122d405750	Merge commit '92046785d1fea5f9efe5a770d636792ea6cab78b' into ripple/wasmi	2026-01-28 15:56:04 -05:00
Mayukha Vadari	d7ed6d6512	Merge branch 'develop' into ripple/wasmi	2026-01-27 13:26:39 -05:00
Mayukha Vadari	8bc6f9cd70	Merge branch 'develop' into ripple/wasmi	2026-01-23 13:13:11 -05:00
Mayukha Vadari	ed5139d4e3	Merge branch 'develop' into ripple/wasmi	2026-01-21 12:57:29 -05:00
Mayukha Vadari	7a9d245950	Merge branch 'develop' into ripple/wasmi	2026-01-14 13:01:35 -05:00
Olek	d83ec96848	Switch to wasmi v1.0.6 (#6204 )	2026-01-12 13:36:02 -05:00
Mayukha Vadari	419d53ec4c	Merge branch 'develop' into ripple/wasmi	2026-01-12 13:10:58 -05:00
Mayukha Vadari	d4d70d5675	Merge branch 'develop' into ripple/wasmi	2026-01-12 12:27:48 -05:00
Mayukha Vadari	bbc28b3b1c	Merge branch 'develop' into ripple/wasmi	2026-01-08 11:42:28 -05:00
Mayukha Vadari	5aab274b7a	Merge branch 'develop' into ripple/wasmi	2026-01-07 16:52:10 -05:00
Mayukha Vadari	2c30e41191	use the develop hashes	2026-01-07 16:50:45 -05:00
Mayukha Vadari	8ea5106b0b	Merge branch 'develop' into ripple/wasmi	2026-01-07 14:34:49 -05:00
Mayukha Vadari	1977df9c2e	Merge remote-tracking branch 'upstream/develop' into ripple/wasmi	2026-01-05 18:43:49 -05:00
Mayukha Vadari	6c95548df5	Merge remote-tracking branch 'upstream/develop' into ripple/wasmi	2025-12-22 15:51:19 -08:00
Mayukha Vadari	90e0bbd0fc	Merge branch 'develop' into ripple/wasmi	2025-12-08 14:28:41 -05:00
Olek	b57df290de	Use conan repo for wasmi lib (#6109 ) * Use conan repo for wasmi lib * Generate lockfile	2025-12-08 13:02:01 -05:00
Mayukha Vadari	8a403f1241	Merge branch 'develop' into ripple/wasmi	2025-12-05 14:32:48 -05:00
Mayukha Vadari	6d2640871d	Merge branch 'develop' into ripple/wasmi	2025-12-02 18:40:54 -05:00
Olek	500bb68831	Fix win build (#6076 )	2025-11-24 16:56:23 -05:00
Mayukha Vadari	16087c9680	fix merge issue	2025-11-25 02:57:47 +05:30
Mayukha Vadari	25c3060fef	remove conan.lock (temporary)	2025-11-25 02:40:57 +05:30
Mayukha Vadari	ce9f0b38a4	Merge branch 'develop' into ripple/wasmi	2025-11-25 02:33:47 +05:30
Mayukha Vadari	35f7cbf772	update	2025-11-25 02:31:51 +05:30
Mayukha Vadari	0db564d261	WASMI data	2025-11-04 15:57:07 -05:00