fix: Give a multi-signed BatchSigner its own signing prefix

A batch signer signs one of two payloads: the batch data plus its own account, or, when it signs from a signer list, the batch data plus its own account plus the signer's account. Both used the BCH prefix, so the two payloads shared a hash space, unlike TxSign and TxMultiSign, which are split for exactly this reason. The multi-signing form now uses a BCM prefix. The two payloads already differed in length, so this closes no attack; it applies the convention that every distinct signing payload gets its own prefix. Batch is gated on featureBatchV1_1, which is not enabled on any network, so no existing signature changes and no amendment gate is needed.
2026-09-23 13:40:15 +00:00 · 2026-09-02 15:20:31 -04:00
328 changed files with 19677 additions and 15435 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
@@ -316,6 +314,7 @@ words:
  - sttx
  - stvar
  - stvector
+  - stxchainattestations
  - summands
  - superpeer
  - superpeers
@@ -373,6 +372,7 @@ words:
  - writeme
  - wsrch
  - wthread
+  - xbridge
  - xchain
  - xcrun
  - ximinez
--- 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
@@ -285,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-49cdc10"
-        }
-      },
-      {
-        "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-49cdc10",
-          "variant": "assert"
+          "image": "ghcr.io/xrplf/xrpld/packaging-debian:sha-b6a8995"
        }
      }
    ],
@@ -101,7 +88,7 @@
        "extra_cmake_args": "-Dvalidator_keys=ON",
        "package": {
          "type": "rpm",
-          "image": "ghcr.io/xrplf/xrpld/packaging-rhel:sha-49cdc10"
+          "image": "ghcr.io/xrplf/xrpld/packaging-rhel:sha-b6a8995"
        }
      }
    ]
--- 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@034e87065fcd0100214cf0672923bd38d193cf78
+    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
@@ -41,7 +41,7 @@ jobs:
          # AlmaLinux rather than UBI, which does not ship rpm-sign.
          - name: rhel
            base_image: almalinux:10
-    uses: XRPLF/actions/.github/workflows/build-multiarch-image.yml@034e87065fcd0100214cf0672923bd38d193cf78
+    uses: XRPLF/actions/.github/workflows/build-multiarch-image.yml@65d5a0bd72be4ecea95cff0673a6e0672ab5243a
    with:
      image_name: xrpld/packaging-${{ matrix.distro.name }}
      dockerfile: package/docker/Dockerfile
--- 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@034e87065fcd0100214cf0672923bd38d193cf78
+    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-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"
--- 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 }}

@@ -439,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,16 +1,11 @@
-# Build, verify and publish Linux packages from the pre-built xrpld and
-# validator-keys artifacts, in three 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'
+#   - one job per config that carries a "package" map in linux.json
+#   - that map names the container image and the format it builds there
+#   - every job ends with the image's publish_pkg.py, uploading what it built
+#     with 'publish: true' and doing a --dry-run otherwise
 #
-# 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:
@@ -25,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:
@@ -44,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
@@ -78,14 +70,14 @@ 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
+        uses: XRPLF/actions/prepare-runner@7bf7ceca5932114abdd0d43493c3c30c5a654e13
        with:
          enable_ccache: false

@@ -111,7 +103,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: |
@@ -119,116 +110,26 @@ 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) }}
-    # The name says which of the two this is, because the job runs either way:
-    # with publish false it passes --dry-run and uploads nothing, and a job
-    # called "publish ..." succeeding on a pull request reads like a release.
-    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
        env:
          CHANNEL: ${{ steps.release_info.outputs.channel }}
@@ -239,6 +140,6 @@ jobs:
        run: |
          publish_pkg.py \
              --channel "${CHANNEL}" \
-              --package-dir "${PACKAGE_DIR}" \
+              --package-dir "${BUILD_DIR}" \
              --nexus-url "${NEXUS_URL}" \
              ${DRY_RUN_OPTION}
--- 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 }}
@@ -50,7 +50,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/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/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -70,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/API-CHANGELOG.md
+++ b/API-CHANGELOG.md
@@ -22,55 +22,14 @@ 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.5.0
+## Unreleased

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

-### Breaking changes in 3.5.0
-
- The `XChainBridge` amendment and its ledger entries and transactions are removed. `XChainBridge` and `fixXChainRewardRounding` are now obsolete and can no longer be voted for; neither was ever enabled on Mainnet. `ledger_entry` no longer accepts `bridge`, `xchain_owned_claim_id`, or `xchain_owned_create_account_claim_id`; `account_objects` no longer accepts those values in `type`; and `server_definitions` no longer lists the removed ledger entry types, transaction types, fields, and the `XChainBridge` serialized type.
-
-## XRP Ledger server version 3.4.0
-
-Version 3.4.0 is not yet released. These changes are available in the 3.4.0 beta releases.
-
-### Additions in 3.4.0
-
- `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
+### Additions

+- `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.
@@ -78,9 +37,12 @@ This release contains bug fixes only and no API changes.
  - `TRANSACTION_FLAGS`: Maps transaction type names to their supported flags and flag values.
  - `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.
+- `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.2.0
+### Bugfixes

+- `sign_for`, `submit_multisigned`: A `BatchSigner` that signs from a signer list now covers a different signing prefix (`BCM`) than a `BatchSigner` that signs on its own (`BCH`), matching the existing split between `STX` and `SMT`. Clients that build batch signatures themselves must use the new prefix for the multi-signing form. `Batch` is not enabled on any network, so no existing signature is affected.
+- `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)
@@ -92,24 +54,12 @@ 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)
+- `ledger`: `delivered_amount` is now included in the metadata of successful `AccountDelete` transactions when transactions are expanded (`expand`, or admin-only `full`). Previously it was only added for `Payment` and `CheckCash`, which made `ledger` inconsistent with `tx` and `account_tx`. [#5706](https://github.com/XRPLF/rippled/pull/5706)

 ## XRP Ledger server version 3.1.0

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

--- 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/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/conanfile.py
+++ b/conanfile.py
@@ -149,7 +149,6 @@ class Xrpl(ConanFile):
        self.requires("xxhash/0.8.3", transitive_headers=True)

    exports_sources = (
-        "bin/default-loader-path.sh",
        "CMakeLists.txt",
        "cfg/*",
        "cmake/*",
--- 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/install.md
+++ b/docs/install.md
@@ -6,8 +6,7 @@

 `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
@@ -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/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/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/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/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/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
 */
--- a/include/xrpl/ledger/helpers/VaultHelpers.h
+++ b/include/xrpl/ledger/helpers/VaultHelpers.h
@@ -172,8 +172,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/Batch.h
+++ b/include/xrpl/protocol/Batch.h
@@ -10,15 +10,24 @@

 namespace xrpl {

+/**
+ * Serialize the data that a batch signer signs.
+ *
+ * @param prefix HashPrefix::Batch when the batch signer signs on its own,
+ * HashPrefix::BatchMultiSign when the signature comes from a signer list. The
+ * two forms differ by the signer account that the caller appends, so the
+ * prefix keeps them in separate hash spaces, as with TxSign and TxMultiSign.
+ */
 inline void
 serializeBatch(
    Serializer& msg,
+    HashPrefix prefix,
    AccountID const& outerAccount,
    std::uint32_t outerSeqValue,
    std::uint32_t const& flags,
    std::vector<uint256> const& txids)
 {
-    msg.add32(HashPrefix::Batch);
+    msg.add32(prefix);
    msg.addBitString(outerAccount);
    msg.add32(outerSeqValue);
    msg.add32(flags);
--- 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,63 +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 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
@@ -89,29 +89,14 @@ enum class HashPrefix : std::uint32_t {
    PaymentChannelClaim = detail::makeHashPrefix('C', 'L', 'M'),

    /**
-     * Batch
+     * Batch to sign
     */
    Batch = detail::makeHashPrefix('B', 'C', 'H'),

    /**
-     * inner transaction to sign as the counterparty
+     * Batch to multi-sign
     */
-    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'),
+    BatchMultiSign = detail::makeHashPrefix('B', 'C', 'M'),
 };

 template <class Hasher>
--- a/include/xrpl/protocol/Indexes.h
+++ b/include/xrpl/protocol/Indexes.h
@@ -11,6 +11,7 @@
 #include <xrpl/protocol/Keylet.h>
 #include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/STXChainBridge.h>
 #include <xrpl/protocol/SeqProxy.h>
 #include <xrpl/protocol/UintTypes.h>

@@ -306,6 +307,17 @@ amm(uint256 const& amm) noexcept;
 Keylet
 delegate(AccountID const& account, AccountID const& authorizedAccount) noexcept;

+Keylet
+bridge(STXChainBridge const& bridge, STXChainBridge::ChainType chainType);
+
+// `seq` is stored as `sfXChainClaimID` in the object
+Keylet
+xChainClaimID(STXChainBridge const& bridge, std::uint64_t const seq);
+
+// `seq` is stored as `sfXChainAccountCreateCount` in the object
+Keylet
+xChainCreateAccountClaimID(STXChainBridge const& bridge, std::uint64_t const seq);
+
 Keylet
 did(AccountID const& account) noexcept;

--- 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,
@@ -545,11 +544,6 @@ constexpr std::size_t kEcClawbackProofLength = SECP256K1_COMPACT_CLAWBACK_PROOF_
 */
 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/include/xrpl/protocol/SField.h
+++ b/include/xrpl/protocol/SField.h
@@ -31,6 +31,7 @@ class STBitString;
 template <class>
 class STInteger;
 class STNumber;
+class STXChainBridge;
 class STVector256;
 class STCurrency;

@@ -70,7 +71,7 @@ class STCurrency;
    STYPE(STI_UINT384, 22)                        \
    STYPE(STI_UINT512, 23)                        \
    STYPE(STI_ISSUE, 24)                          \
-    /* 25 is unused */                            \
+    STYPE(STI_XCHAIN_BRIDGE, 25)                  \
    STYPE(STI_CURRENCY, 26)                       \
                                                  \
    /* high-level types */                        \
@@ -357,6 +358,7 @@ using SF_CURRENCY = TypedField<STCurrency>;
 using SF_NUMBER = TypedField<STNumber>;
 using SF_VL = TypedField<STBlob>;
 using SF_VECTOR256 = TypedField<STVector256>;
+using SF_XCHAIN_BRIDGE = TypedField<STXChainBridge>;

 //------------------------------------------------------------------------------

--- a/include/xrpl/protocol/STObject.h
+++ b/include/xrpl/protocol/STObject.h
@@ -12,7 +12,6 @@
 #include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/SOTemplate.h>
-#include <xrpl/protocol/STAccount.h>  // IWYU pragma: keep
 #include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/STBase.h>
 #include <xrpl/protocol/STBitString.h>
--- a/include/xrpl/protocol/STPathSet.h
+++ b/include/xrpl/protocol/STPathSet.h
@@ -12,8 +12,6 @@
 #include <xrpl/protocol/UintTypes.h>

 #include <cstddef>
-#include <cstdint>
-#include <memory>
 #include <optional>
 #include <utility>
 #include <vector>
@@ -67,7 +65,7 @@ public:
        PathAsset const& asset,
        AccountID const& issuer);

-    [[nodiscard]] std::uint32_t
+    [[nodiscard]] auto
    getNodeType() const;

    [[nodiscard]] bool
@@ -111,6 +109,9 @@ public:
    [[nodiscard]] bool
    isType(Type const& pe) const;

+    [[nodiscard]] size_t
+    getHash() const;
+
    bool
    operator==(STPathElement const& t) const;

@@ -119,17 +120,6 @@ private:
    getHash(STPathElement const& element);
 };

-template <class Hasher>
-void
-hash_append(Hasher& h, STPathElement const& e) noexcept
-{
-    using beast::hash_append;
-    hash_append(h, (e.getNodeType() & STPathElement::TypeAccount) != 0u);
-    hash_append(h, e.getAccountID());
-    hash_append(h, e.getPathAsset());
-    hash_append(h, e.getIssuerID());
-}
-
 class STPath final : public CountedObject<STPath>
 {
    std::vector<STPathElement> path_;
@@ -186,10 +176,9 @@ template <class Hasher>
 void
 hash_append(Hasher& h, STPath const& p) noexcept
 {
-    using beast::hash_append;
    for (auto const& e : p)
    {
-        hash_append(h, e);
+        beast::hash_append(h, e.getHash());
    }
 }

@@ -199,39 +188,13 @@ hash_append(Hasher& h, STPath const& p) noexcept
 class STPathSet final : public STBase, public CountedObject<STPathSet>
 {
    std::vector<STPath> value_;
-
-    /**
-     * Deduplication index over `value_`, for pathfinding.
-     * The use of a std::unique_ptr is intentional as it
-     * only requires 8 additional bytes of storage for the pointer
-     * as opposed to 64 bytes with an optional.  This keeps the size
-     * of the STPathSet to within the `STVar::kMaxSize` limit of 72 bytes.
-     */
-    std::unique_ptr<hardened_hash_set<STPath>> seen_;
+    xrpl::hardened_hash_set<STPath> seenHashes_;

 public:
-    struct DeduplicationTag
-    {
-    };
-
    STPathSet() = default;
-    /**
-     * Deduplication tagged constructor.
-     * Use when you want to ensure that the STPathSet does not contain duplicate paths.
-     */
-    explicit STPathSet(DeduplicationTag);

    STPathSet(SField const& n);
    STPathSet(SerialIter& sit, SField const& name);
-    STPathSet(STPathSet const& other);
-    STPathSet(STPathSet&&) = default;
-
-    STPathSet&
-    operator=(STPathSet const& other);
-    STPathSet&
-    operator=(STPathSet&&) = default;
-
-    ~STPathSet() override = default;

    void
    add(Serializer& s) const override;
@@ -241,16 +204,6 @@ public:
    [[nodiscard]] SerializedTypeID
    getSType() const override;

-    /**
-     * @brief assembleAdd adds a path to the set by combining a base path and a tail element.
-     *
-     * @param base The base path.
-     * @param tail The tail element.
-     * @return true if the path was added, false if it was a duplicate and not added.
-     * @remarks Requires the STPathSet to be constructed with the DeduplicationTag. The return value
-     * indicates whether the combined path was inserted (true) or rejected as a duplicate (false).
-     * It is fine for callers to ignore the return value.
-     */
    bool
    assembleAdd(STPath const& base, STPathElement const& tail);

@@ -276,61 +229,22 @@ public:
    [[nodiscard]] bool
    empty() const;

-    /**
-     * @brief pushBack adds a path to the set.
-     *
-     * @param e The path to add.
-     * @return true if the path was added, false if it was a duplicate and not added.
-     * @remarks If the STPathSet was constructed with the DeduplicationTag, then this method will
-     *          check for duplicates and only add the path if it is not already present in the
-     *          set. If the STPathSet was constructed without the DeduplicationTag,
-     *          then this method will always add the path to the set, regardless of duplicates.
-     *          It is fine for callers to ignore the return value.
-     */
-    bool
+    void
    pushBack(STPath const& e);

-    /**
-     * @brief emplaceBack adds a path to the set.
-     *
-     * @param args The arguments to construct the path with.
-     * @return true if the path was added, false if it was a duplicate and not added.
-     * @remarks If the STPathSet was constructed with the DeduplicationTag, then this method will
-     *          check for duplicates and only add the path if it is not already present in the
-     *          set. If the STPathSet was constructed without the DeduplicationTag,
-     *          then this method will always add the path to the set, regardless of duplicates.
-     *          It is fine for callers to ignore the return value.
-     * @note The path is constructed before the duplicate check, so on a false
-     *       return the constructed path is discarded and any argument
-     *       forwarded as an rvalue is left in a moved-from state.  Use
-     *       pushBack when the caller needs to keep its path on rejection.
-     */
    template <typename... Args>
-    bool
+    void
    emplaceBack(Args&&... args);

+    [[nodiscard]] bool
+    contains(STPath const& path) const;
+
 private:
    STBase*
    copy(std::size_t n, void* buf) const override;
    STBase*
    move(std::size_t n, void* buf) override;

-    /**
-     * @brief Append a path via `append`, then register it in the deduplication index.
-     *
-     * @param append Invoked with `value_`; must append exactly one path to it.
-     * @return true if the path was kept, false if it was a duplicate and was rolled back.
-     * @remarks Appends to the vector before touching the index, so that a failed allocation
-     *          there leaves both containers untouched rather than leaving the index holding
-     *          a path the vector does not.  If the index insert reports a duplicate, or
-     *          throws, the append is rolled back so the two containers stay consistent; in
-     *          the throwing case the exception propagates.  With no index (constructed
-     *          without the DeduplicationTag) the append is unconditional.
-     */
-    template <typename Append>
-    bool
-    appendUnique(Append&& append);
-
    friend class detail::STVar;
 };

@@ -422,7 +336,7 @@ inline STPathElement::STPathElement(
    hashValue_ = getHash(*this);
 }

-inline std::uint32_t
+inline auto
 STPathElement::getNodeType() const
 {
    return type_;
@@ -631,50 +545,25 @@ STPathSet::empty() const
    return value_.empty();
 }

-template <typename Append>
-inline bool
-STPathSet::appendUnique(Append&& append)
-{
-    // Append to the vector first, so that a failed allocation there leaves both
-    // containers untouched rather than leaving the index holding a path the
-    // vector does not.
-    append(value_);
-
-    if (seen_ == nullptr)
-    {
-        return true;
-    }
-
-    try
-    {
-        if (!seen_->insert(value_.back()).second)
-        {
-            // Already present: roll back the append.
-            value_.pop_back();
-            return false;
-        }
-    }
-    catch (...)
-    {
-        // The index insert failed, so roll back the append to keep the vector
-        // and the index consistent.
-        value_.pop_back();
-        throw;
-    }
-    return true;
-}
-
-inline bool
+inline void
 STPathSet::pushBack(STPath const& e)
 {
-    return appendUnique([&](auto& value) { value.push_back(e); });
+    value_.push_back(e);
+    seenHashes_.emplace(value_.back());
 }

 template <typename... Args>
-inline bool
+inline void
 STPathSet::emplaceBack(Args&&... args)
 {
-    return appendUnique([&](auto& value) { value.emplace_back(std::forward<Args>(args)...); });
+    value_.emplace_back(std::forward<Args>(args)...);
+    seenHashes_.emplace(value_.back());
+}
+
+inline bool
+STPathSet::contains(STPath const& path) const
+{
+    return seenHashes_.contains(path);
 }

 }  // namespace xrpl
--- a/include/xrpl/protocol/STTx.h
+++ b/include/xrpl/protocol/STTx.h
@@ -5,7 +5,6 @@
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/PublicKey.h>
 #include <xrpl/protocol/Rules.h>
 #include <xrpl/protocol/SField.h>
@@ -14,7 +13,6 @@
 #include <xrpl/protocol/SecretKey.h>
 #include <xrpl/protocol/SeqProxy.h>
 #include <xrpl/protocol/Serializer.h>
-#include <xrpl/protocol/Sign.h>
 #include <xrpl/protocol/TxFormats.h>

 #include <boost/container/flat_set.hpp>
@@ -107,36 +105,14 @@ public:
    [[nodiscard]] json::Value
    getJson(JsonOptions options, bool binary) const;

-    /**
-     * Sign the transaction as its account.
-     *
-     * @param publicKey The public key for signing.
-     * @param secretKey The secret key for signing.
-     */
-    void
-    sign(PublicKey const& publicKey, SecretKey const& secretKey);
-
-    /**
-     * Sign the transaction in one of its signature fields.
-     *
-     * The signature is bound to the role that made it, so it cannot be moved
-     * into another role.
-     *
-     * @param publicKey The public key for signing.
-     * @param secretKey The secret key for signing.
-     * @param role The role signing the transaction.
-     * @param rules The current ledger rules.
-     */
    void
    sign(
        PublicKey const& publicKey,
        SecretKey const& secretKey,
-        SignatureRole role,
-        Rules const& rules);
+        std::optional<std::reference_wrapper<SField const>> signatureTarget = {});

    /**
     * Check the signature.
-     *
     * @param rules The current ledger rules.
     * @return `true` if valid signature. If invalid, the error message string.
     */
@@ -144,7 +120,7 @@ public:
    checkSign(Rules const& rules) const;

    [[nodiscard]] std::expected<void, std::string>
-    checkBatchSign() const;
+    checkBatchSign(Rules const& rules) const;

    // SQL Functions with metadata.
    static std::string const&
@@ -186,28 +162,28 @@ public:
 private:
    /**
     * Check the signature.
-     *
     * @param rules The current ledger rules.
     * @param sigObject Reference to object that contains the signature fields.
     *     Will be *this more often than not.
-     * @param role The role that made the signature in sigObject. Determines
-     *     the signing prefix, which binds the signature to that role.
     * @return `true` if valid signature. If invalid, the error message string.
     */
    [[nodiscard]] std::expected<void, std::string>
-    checkSign(Rules const& rules, STObject const& sigObject, SignatureRole role) const;
+    checkSign(Rules const& rules, STObject const& sigObject) const;

    [[nodiscard]] std::expected<void, std::string>
-    checkSingleSign(STObject const& sigObject, HashPrefix prefix) const;
+    checkSingleSign(STObject const& sigObject) const;

    [[nodiscard]] std::expected<void, std::string>
-    checkMultiSign(STObject const& sigObject, HashPrefix prefix) const;
+    checkMultiSign(Rules const& rules, STObject const& sigObject) const;

    [[nodiscard]] std::expected<void, std::string>
    checkBatchSingleSign(STObject const& batchSigner, std::vector<uint256> const& txIds) const;

    [[nodiscard]] std::expected<void, std::string>
-    checkBatchMultiSign(STObject const& batchSigner, std::vector<uint256> const& txIds) const;
+    checkBatchMultiSign(
+        STObject const& batchSigner,
+        Rules const& rules,
+        std::vector<uint256> const& txIds) const;

    void
    buildBatchTxns();
--- a/include/xrpl/protocol/STValidation.h
+++ b/include/xrpl/protocol/STValidation.h
@@ -124,13 +124,6 @@ public:
    [[nodiscard]] NodeID const&
    getNodeID() const noexcept;

-    /**
-     * Whether this validation carries a good signature.
-     *
-     * Reports false if the signature cannot be checked at all, so a caller
-     * cannot tell that apart from a bad signature. Either way the validation is
-     * unusable, and the reason is logged. Only a computed answer is remembered.
-     */
    [[nodiscard]] bool
    isValid() const noexcept;

--- a/include/xrpl/protocol/STXChainBridge.h
+++ b/include/xrpl/protocol/STXChainBridge.h
@@ -0,0 +1,224 @@
+#pragma once
+
+#include <xrpl/basics/CountedObject.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Issue.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STAccount.h>
+#include <xrpl/protocol/STBase.h>
+#include <xrpl/protocol/STIssue.h>
+#include <xrpl/protocol/Serializer.h>
+
+#include <cstddef>
+#include <memory>
+#include <string>
+#include <tuple>
+
+namespace xrpl {
+
+class Serializer;
+class STObject;
+
+class STXChainBridge final : public STBase, public CountedObject<STXChainBridge>
+{
+    STAccount lockingChainDoor_{sfLockingChainDoor};
+    STIssue lockingChainIssue_{sfLockingChainIssue};
+    STAccount issuingChainDoor_{sfIssuingChainDoor};
+    STIssue issuingChainIssue_{sfIssuingChainIssue};
+
+public:
+    using value_type = STXChainBridge;
+
+    enum class ChainType { Locking, Issuing };
+
+    static ChainType
+    otherChain(ChainType ct);
+
+    static ChainType
+    srcChain(bool wasLockingChainSend);
+
+    static ChainType
+    dstChain(bool wasLockingChainSend);
+
+    STXChainBridge();
+
+    explicit STXChainBridge(SField const& name);
+
+    STXChainBridge(STXChainBridge const& rhs) = default;
+
+    STXChainBridge(STObject const& o);
+
+    STXChainBridge(
+        AccountID const& srcChainDoor,
+        Issue const& srcChainIssue,
+        AccountID const& dstChainDoor,
+        Issue const& dstChainIssue);
+
+    explicit STXChainBridge(json::Value const& v);
+
+    explicit STXChainBridge(SField const& name, json::Value const& v);
+
+    explicit STXChainBridge(SerialIter& sit, SField const& name);
+
+    STXChainBridge&
+    operator=(STXChainBridge const& rhs) = default;
+
+    [[nodiscard]] std::string
+    getText() const override;
+
+    [[nodiscard]] STObject
+    toSTObject() const;
+
+    [[nodiscard]] AccountID const&
+    lockingChainDoor() const;
+
+    [[nodiscard]] Issue const&
+    lockingChainIssue() const;
+
+    [[nodiscard]] AccountID const&
+    issuingChainDoor() const;
+
+    [[nodiscard]] Issue const&
+    issuingChainIssue() const;
+
+    [[nodiscard]] AccountID const&
+    door(ChainType ct) const;
+
+    [[nodiscard]] Issue const&
+    issue(ChainType ct) const;
+
+    [[nodiscard]] SerializedTypeID
+    getSType() const override;
+
+    [[nodiscard]] json::Value getJson(JsonOptions) const override;
+
+    void
+    add(Serializer& s) const override;
+
+    [[nodiscard]] bool
+    isEquivalent(STBase const& t) const override;
+
+    [[nodiscard]] bool
+    isDefault() const override;
+
+    [[nodiscard]] value_type const&
+    value() const noexcept;
+
+private:
+    static std::unique_ptr<STXChainBridge>
+    construct(SerialIter&, SField const& name);
+
+    STBase*
+    copy(std::size_t n, void* buf) const override;
+    STBase*
+    move(std::size_t n, void* buf) override;
+
+    friend bool
+    operator==(STXChainBridge const& lhs, STXChainBridge const& rhs);
+
+    friend bool
+    operator<(STXChainBridge const& lhs, STXChainBridge const& rhs);
+};
+
+inline bool
+operator==(STXChainBridge const& lhs, STXChainBridge const& rhs)
+{
+    return std::tie(
+               lhs.lockingChainDoor_,
+               lhs.lockingChainIssue_,
+               lhs.issuingChainDoor_,
+               lhs.issuingChainIssue_) ==
+        std::tie(
+               rhs.lockingChainDoor_,
+               rhs.lockingChainIssue_,
+               rhs.issuingChainDoor_,
+               rhs.issuingChainIssue_);
+}
+
+inline bool
+operator<(STXChainBridge const& lhs, STXChainBridge const& rhs)
+{
+    return std::tie(
+               lhs.lockingChainDoor_,
+               lhs.lockingChainIssue_,
+               lhs.issuingChainDoor_,
+               lhs.issuingChainIssue_) <
+        std::tie(
+               rhs.lockingChainDoor_,
+               rhs.lockingChainIssue_,
+               rhs.issuingChainDoor_,
+               rhs.issuingChainIssue_);
+}
+
+inline AccountID const&
+STXChainBridge::lockingChainDoor() const
+{
+    return lockingChainDoor_.value();
+};
+
+inline Issue const&
+STXChainBridge::lockingChainIssue() const
+{
+    return lockingChainIssue_.value().get<Issue>();
+};
+
+inline AccountID const&
+STXChainBridge::issuingChainDoor() const
+{
+    return issuingChainDoor_.value();
+};
+
+inline Issue const&
+STXChainBridge::issuingChainIssue() const
+{
+    return issuingChainIssue_.value().get<Issue>();
+};
+
+inline STXChainBridge::value_type const&
+STXChainBridge::value() const noexcept
+{
+    return *this;
+}
+
+inline AccountID const&
+STXChainBridge::door(ChainType ct) const
+{
+    if (ct == ChainType::Locking)
+        return lockingChainDoor();
+    return issuingChainDoor();
+}
+
+inline Issue const&
+STXChainBridge::issue(ChainType ct) const
+{
+    if (ct == ChainType::Locking)
+        return lockingChainIssue();
+    return issuingChainIssue();
+}
+
+inline STXChainBridge::ChainType
+STXChainBridge::otherChain(ChainType ct)
+{
+    if (ct == ChainType::Locking)
+        return ChainType::Issuing;
+    return ChainType::Locking;
+}
+
+inline STXChainBridge::ChainType
+STXChainBridge::srcChain(bool wasLockingChainSend)
+{
+    if (wasLockingChainSend)
+        return ChainType::Locking;
+    return ChainType::Issuing;
+}
+
+inline STXChainBridge::ChainType
+STXChainBridge::dstChain(bool wasLockingChainSend)
+{
+    if (wasLockingChainSend)
+        return ChainType::Issuing;
+    return ChainType::Locking;
+}
+
+}  // namespace xrpl
--- a/include/xrpl/protocol/Serializer.h
+++ b/include/xrpl/protocol/Serializer.h
@@ -10,7 +10,6 @@
 #include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/SField.h>

-#include <cstddef>
 #include <cstdint>
 #include <cstring>
 #include <stdexcept>
@@ -26,101 +25,6 @@ private:
    Blob data_;

 public:
-    /**
-     * A header is never longer than this. The encoder fills a buffer of this
-     * size and writes only the bytes it used.
-     */
-    static constexpr int kMaxNumberOfBytesInHeader = 3;
-
-    // A field whose size varies is stored as a header holding its length, then
-    // the field data. The header is 1, 2 or 3 bytes long. Nothing outside it says
-    // which, so the decoder reads the first byte and its value says how long the
-    // header is:
-    //
-    //     0 ... 192   kMin/kMaxValueOfFirstByteFor1ByteHeader
-    //   193 ... 240   kMin/kMaxValueOfFirstByteFor2ByteHeader
-    //   241 ... 254   kMin/kMaxValueOfFirstByteFor3ByteHeader
-    //         255     belongs to no header
-    //
-    // Each range starts one past the end of the range before it.
-
-    static constexpr int kMinValueOfFirstByteFor1ByteHeader = 0;
-    static constexpr int kMaxValueOfFirstByteFor1ByteHeader = 192;
-
-    static constexpr int kMinValueOfFirstByteFor2ByteHeader =
-        kMaxValueOfFirstByteFor1ByteHeader + 1;
-    static constexpr int kMaxValueOfFirstByteFor2ByteHeader = 240;
-
-    static constexpr int kMinValueOfFirstByteFor3ByteHeader =
-        kMaxValueOfFirstByteFor2ByteHeader + 1;
-
-    static constexpr int kMaxValueOfFirstByteFor3ByteHeader = 254;
-
-    // A length x too big for one byte is split across the header. For 2 bytes:
-    //
-    //     first byte  = 193 + (x - 193) / 256
-    //     second byte = (x - 193) % 256
-    //
-    // so 300 is stored as 193, 107. For 3 bytes it is the same, from 241, with
-    // the remainder split across two bytes: 20,000 is stored as 241, 29, 95.
-
-    static constexpr int kNumberOfValuesInOneByte = 256;
-    static constexpr int kNumberOfValuesInTwoBytes =
-        kNumberOfValuesInOneByte * kNumberOfValuesInOneByte;
-
-    // Each header length therefore covers a range of field lengths:
-    //
-    //        0 ...     192   kMin/kMaxValueOfLengthFor1ByteHeader
-    //      193 ...  12,480   kMin/kMaxValueOfLengthFor2ByteHeader
-    //   12,481 ... 918,744   kMin/kMaxValueOfLengthFor3ByteHeader
-    //
-    // The encoder always uses the shortest header that fits.
-
-    /**
-     * A 1 byte header holds the length in the byte itself, so both ends of
-     * this range are the same numbers as the first byte's own range.
-     */
-    static constexpr int kMinValueOfLengthFor1ByteHeader = kMinValueOfFirstByteFor1ByteHeader;
-    static constexpr int kMaxValueOfLengthFor1ByteHeader = kMaxValueOfFirstByteFor1ByteHeader;
-
-    static constexpr int kMinValueOfLengthFor2ByteHeader = kMaxValueOfLengthFor1ByteHeader + 1;
-
-    /**
-     * 48 values of the first byte mean a 2 byte header, and each of them covers
-     * 256 lengths. The 48 is worked out from the two range ends above, so it
-     * stays right if either of them changes.
-     */
-    static constexpr int kMaxValueOfLengthFor2ByteHeader = kMinValueOfLengthFor2ByteHeader +
-        ((kMaxValueOfFirstByteFor2ByteHeader - kMaxValueOfFirstByteFor1ByteHeader) *
-         kNumberOfValuesInOneByte) -
-        1;
-
-    static constexpr int kMinValueOfLengthFor3ByteHeader = kMaxValueOfLengthFor2ByteHeader + 1;
-
-    /**
-     * 14 values of the first byte mean a 3 byte header, and each of them covers
-     * 65,536 lengths. Counted the same way, that gives the largest length any
-     * header can state.
-     *
-     * Nothing is accepted or rejected against this. The assertion below uses it
-     * to check that every length the encoder writes is one a header can state.
-     */
-    static constexpr int kMaxRepresentableLength = kMinValueOfLengthFor3ByteHeader +
-        ((kMaxValueOfFirstByteFor3ByteHeader - kMaxValueOfFirstByteFor2ByteHeader) *
-         kNumberOfValuesInTwoBytes) -
-        1;
-
-    /**
-     * The largest length the encoder will write. This is the one number here
-     * that is picked rather than worked out. The decoder accepts nothing above
-     * it, so both sides agree on the same set of lengths.
-     */
-    static constexpr int kMaxValueOfLengthFor3ByteHeader = 918744;
-
-    static_assert(
-        kMaxValueOfLengthFor3ByteHeader <= kMaxRepresentableLength,
-        "a length the encoder writes must be one a header can state");
-
    explicit Serializer(int n = 256)
    {
        data_.reserve(n);
@@ -157,7 +61,7 @@ public:

    // assemble functions
    int
-    add8(unsigned char byteValue);
+    add8(unsigned char i);
    int
    add16(std::uint16_t i);

@@ -366,90 +270,18 @@ public:
        return v.data_ == data_;
    }

-    /**
-     * Works out how long a header is, from its first byte.
-     *
-     * Each overload of decodeVLLength below reads one header length, so call
-     * this first to learn which of them to call.
-     *
-     * @param firstByte First byte of the header, as read from the stream.
-     * @return How many bytes the whole header takes, counting firstByte: 1, 2
-     * or 3.
-     * @throws std::overflow_error if firstByte is the one value that starts no
-     * header.
-     */
    static int
-    decodeLengthLength(std::byte firstByte);
-
-    /**
-     * Reads the field length out of a 1 byte header.
-     *
-     * @param firstByte The single header byte, which is the length itself.
-     * @return Field length in bytes, from kMinValueOfLengthFor1ByteHeader to
-     * kMaxValueOfLengthFor1ByteHeader.
-     * @throws std::overflow_error if firstByte is big enough to mean a longer
-     * header, in which case it is not a length by itself.
-     */
+    decodeLengthLength(int b1);
    static int
-    decodeVLLength(std::byte firstByte);
-
-    /**
-     * Reads the field length out of a 2 byte header.
-     *
-     * @param firstByte First header byte. Its value means a 2 byte header, and
-     * how far it sits into that range gives the top part of the length.
-     * @param secondByte Second header byte, holding the rest of the length.
-     * @return Field length in bytes, from kMinValueOfLengthFor2ByteHeader to
-     * kMaxValueOfLengthFor2ByteHeader.
-     * @throws std::overflow_error if firstByte is outside the range that means
-     * a 2 byte header.
-     */
+    decodeVLLength(int b1);
    static int
-    decodeVLLength(std::byte firstByte, std::byte secondByte);
-
-    /**
-     * Reads the field length out of a 3 byte header.
-     *
-     * @param firstByte First header byte. Its value means a 3 byte header, and
-     * how far it sits into that range gives the top part of the length.
-     * @param secondByte Second header byte, holding the middle part of the
-     * length.
-     * @param thirdByte Third header byte, holding the low part.
-     * @return Field length in bytes, from kMinValueOfLengthFor3ByteHeader to
-     * kMaxValueOfLengthFor3ByteHeader.
-     * @throws std::overflow_error if firstByte is outside the range that means
-     * a 3 byte header, or if the three bytes together state a length above
-     * kMaxValueOfLengthFor3ByteHeader, which the encoder would not write back.
-     */
+    decodeVLLength(int b1, int b2);
    static int
-    decodeVLLength(std::byte firstByte, std::byte secondByte, std::byte thirdByte);
+    decodeVLLength(int b1, int b2, int b3);

 private:
-    /**
-     * Works out how many bytes the header needs for the given length.
-     *
-     * This deliberately repeats the width choice addEncoded makes, so that
-     * addVL's assertion can compare the two. It has no other caller; do not
-     * reach for it as a utility.
-     *
-     * @param length Field length in bytes.
-     * @return How many header bytes it needs: 1, 2 or 3.
-     * @throws std::overflow_error if length is negative, or above
-     * kMaxValueOfLengthFor3ByteHeader.
-     */
    static int
-    encodeLengthLength(int length);
-
-    /**
-     * Appends the length header for a field of the given length.
-     *
-     * The field's own data is not written; the caller appends it next.
-     *
-     * @param length Field length in bytes.
-     * @return Offset within this Serializer at which the header was written.
-     * @throws std::overflow_error if length is negative, or above
-     * kMaxValueOfLengthFor3ByteHeader.
-     */
+    encodeLengthLength(int length);  // length to encode length
    int
    addEncoded(int length);
 };
@@ -558,15 +390,9 @@ public:
    void
    getFieldID(int& type, int& name);

-    /**
-     * Reads the length header at the read position and steps past it.
-     *
-     * @return Field length in bytes. The iterator is left on the first byte of
-     * the field data.
-     * @throws std::overflow_error if the header states a length the encoder could
-     * not have written.
-     * @throws std::runtime_error if the data runs out before the header does.
-     */
+    // Returns the size of the VL if the
+    // next object is a VL. Advances the iterator
+    // to the beginning of the VL.
    int
    getVLDataLength();

--- a/include/xrpl/protocol/Sign.h
+++ b/include/xrpl/protocol/Sign.h
@@ -4,65 +4,13 @@
 #include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/KeyType.h>
 #include <xrpl/protocol/PublicKey.h>
-#include <xrpl/protocol/Rules.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/STObject.h>
 #include <xrpl/protocol/SecretKey.h>
 #include <xrpl/protocol/Serializer.h>

-#include <optional>
-
 namespace xrpl {

-/**
- * The signature slots on a transaction.
- *
- * Each role signs different bytes, so a signature cannot be moved from the
- * role that made it into another role. See signingPrefix.
- */
-enum class SignatureRole {
-    /**
-     * The transaction's own signature, in sfTxnSignature or sfSigners.
-     */
-    Transaction,
-    /**
-     * The counterparty's signature, in sfCounterpartySignature.
-     */
-    Counterparty,
-    /**
-     * The sponsor's signature, in sfSponsorSignature.
-     */
-    Sponsor
-};
-
-/**
- * The field that holds this role's signature.
- *
- * @return The signature field, or nullptr for SignatureRole::Transaction,
- * whose signature lives at the top level of the transaction.
- */
-[[nodiscard]] SField const*
-signatureField(SignatureRole role);
-
-/**
- * The role that signs into the given field.
- *
- * @return The role, or an unseated optional if the field does not hold a
- * transaction signature.
- */
-[[nodiscard]] std::optional<SignatureRole>
-signatureRole(SField const& sigField);
-
-/**
- * The hash prefix that binds a transaction signature to the role that made it.
- *
- * @param role The role making the signature.
- * @param multiSigning Whether the signature is a multi-signature.
- * @param rules The current ledger rules.
- */
-[[nodiscard]] HashPrefix
-signingPrefix(SignatureRole role, bool multiSigning, Rules const& rules);
-
 /**
 * Sign an STObject
 *
@@ -101,12 +49,9 @@ verify(

 /**
 * Return a Serializer suitable for computing a multisigning TxnSignature.
- *
- * @param prefix Prefix to insert before the serialized object. Get it from
- * signingPrefix, so that the signature is bound to the role making it.
 */
 Serializer
-buildMultiSigningData(STObject const& obj, AccountID const& signingID, HashPrefix prefix);
+buildMultiSigningData(STObject const& obj, AccountID const& signingID);

 /**
 * Break the multi-signing hash computation into 2 parts for optimization.
@@ -122,7 +67,7 @@ buildMultiSigningData(STObject const& obj, AccountID const& signingID, HashPrefi
 *     signer's unique data.
 */
 Serializer
-startMultiSigningData(STObject const& obj, HashPrefix prefix);
+startMultiSigningData(STObject const& obj);

 inline void
 finishMultiSigningData(AccountID const& signingID, Serializer& s)
--- a/include/xrpl/protocol/TER.h
+++ b/include/xrpl/protocol/TER.h
@@ -129,11 +129,8 @@ enum TEMcodes : TERUnderlyingType {
    temARRAY_TOO_LARGE,
    temBAD_TRANSFER_FEE,
    temINVALID_INNER_BATCH,
-
    temBAD_MPT,
    temBAD_CIPHERTEXT,
-    temINVALID_BYTECODE,
-    temTEMP_DISABLED,
 };

 //------------------------------------------------------------------------------
@@ -182,8 +179,6 @@ enum TEFcodes : TERUnderlyingType {
    tefINVALID_LEDGER_FIX_TYPE,
    tefNO_DST_PARTIAL,
    tefBAD_PATH_COUNT,
-    tefNO_BYTECODE,
-    tefBYTECODE_NOT_INCLUDED,
 };

 //------------------------------------------------------------------------------
@@ -375,8 +370,6 @@ enum TECcodes : TERUnderlyingType {
    tecNO_DELEGATE_PERMISSION = 198,
    tecBAD_PROOF = 199,
    tecNO_SPONSOR_PERMISSION = 200,
-    tecOUT_OF_GAS = 201,
-    tecBYTECODE_REJECTED = 202,
 };

 //------------------------------------------------------------------------------
--- a/include/xrpl/protocol/TxFlags.h
+++ b/include/xrpl/protocol/TxFlags.h
@@ -189,6 +189,10 @@ inline constexpr FlagValue tfUniversalMask = ~tfUniversal;
        TF_FLAG(tfClawTwoAssets, 0x00000001),                                                                                                                  \
        MASK_ADJ(0))                                                                                                                                           \
                                                                                                                                                               \
+    TRANSACTION(XChainModifyBridge,                                                                                                                            \
+        TF_FLAG(tfClearAccountCreateAmount, 0x00010000),                                                                                                       \
+        MASK_ADJ(0))                                                                                                                                           \
+                                                                                                                                                               \
    TRANSACTION(VaultCreate,                                                                                                                                   \
        TF_FLAG(tfVaultPrivate, lsfVaultPrivate)                                                                                                               \
        TF_FLAG(tfVaultShareNonTransferable, 0x00020000),                                                                                                      \
--- a/include/xrpl/protocol/XChainAttestations.h
+++ b/include/xrpl/protocol/XChainAttestations.h
@@ -0,0 +1,471 @@
+#pragma once
+
+#include <xrpl/basics/Buffer.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/PublicKey.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/STXChainBridge.h>
+#include <xrpl/protocol/SecretKey.h>
+
+#include <boost/container/flat_set.hpp>
+#include <boost/container/vector.hpp>
+
+#include <cstddef>
+#include <cstdint>
+#include <optional>
+#include <utility>
+#include <vector>
+
+namespace xrpl {
+
+namespace attestations {
+
+struct AttestationBase
+{
+    // Account associated with the public key
+    AccountID attestationSignerAccount;
+    // Public key from the witness server attesting to the event
+    PublicKey publicKey;
+    // Signature from the witness server attesting to the event
+    Buffer signature;
+    // Account on the sending chain that triggered the event (sent the
+    // transaction)
+    AccountID sendingAccount;
+    // Amount transferred on the sending chain
+    STAmount sendingAmount;
+    // Account on the destination chain that collects a share of the attestation
+    // reward
+    AccountID rewardAccount;
+    // Amount was transferred on the locking chain
+    bool wasLockingChainSend;
+
+    explicit AttestationBase(
+        AccountID attestationSignerAccount,
+        PublicKey const& publicKey,
+        Buffer signature,
+        AccountID const& sendingAccount,
+        STAmount sendingAmount,
+        AccountID const& rewardAccount,
+        bool wasLockingChainSend);
+
+    AttestationBase(AttestationBase const&) = default;
+
+    virtual ~AttestationBase() = default;
+
+    AttestationBase&
+    operator=(AttestationBase const&) = default;
+
+    // verify that the signature attests to the data.
+    [[nodiscard]] bool
+    verify(STXChainBridge const& bridge) const;
+
+protected:
+    explicit AttestationBase(STObject const& o);
+    explicit AttestationBase(json::Value const& v);
+
+    [[nodiscard]] static bool
+    equalHelper(AttestationBase const& lhs, AttestationBase const& rhs);
+
+    [[nodiscard]] static bool
+    sameEventHelper(AttestationBase const& lhs, AttestationBase const& rhs);
+
+    void
+    addHelper(STObject& o) const;
+
+private:
+    [[nodiscard]] virtual std::vector<std::uint8_t>
+    message(STXChainBridge const& bridge) const = 0;
+};
+
+// Attest to a regular cross-chain transfer
+struct AttestationClaim : AttestationBase
+{
+    std::uint64_t claimID;
+    std::optional<AccountID> dst;
+
+    explicit AttestationClaim(
+        AccountID attestationSignerAccount,
+        PublicKey const& publicKey,
+        Buffer signature,
+        AccountID const& sendingAccount,
+        STAmount const& sendingAmount,
+        AccountID const& rewardAccount,
+        bool wasLockingChainSend,
+        std::uint64_t claimId,
+        std::optional<AccountID> const& dst);
+
+    explicit AttestationClaim(
+        STXChainBridge const& bridge,
+        AccountID attestationSignerAccount,
+        PublicKey const& publicKey,
+        SecretKey const& secretKey,
+        AccountID const& sendingAccount,
+        STAmount const& sendingAmount,
+        AccountID const& rewardAccount,
+        bool wasLockingChainSend,
+        std::uint64_t claimId,
+        std::optional<AccountID> const& dst);
+
+    explicit AttestationClaim(STObject const& o);
+    explicit AttestationClaim(json::Value const& v);
+
+    [[nodiscard]] STObject
+    toSTObject() const;
+
+    // return true if the two attestations attest to the same thing
+    [[nodiscard]] bool
+    sameEvent(AttestationClaim const& rhs) const;
+
+    [[nodiscard]] static std::vector<std::uint8_t>
+    message(
+        STXChainBridge const& bridge,
+        AccountID const& sendingAccount,
+        STAmount const& sendingAmount,
+        AccountID const& rewardAccount,
+        bool wasLockingChainSend,
+        std::uint64_t claimID,
+        std::optional<AccountID> const& dst);
+
+    [[nodiscard]] bool
+    validAmounts() const;
+
+private:
+    [[nodiscard]] std::vector<std::uint8_t>
+    message(STXChainBridge const& bridge) const override;
+
+    friend bool
+    operator==(AttestationClaim const& lhs, AttestationClaim const& rhs);
+};
+
+struct CmpByClaimID
+{
+    bool
+    operator()(AttestationClaim const& lhs, AttestationClaim const& rhs) const
+    {
+        return lhs.claimID < rhs.claimID;
+    }
+};
+
+// Attest to a cross-chain transfer that creates an account
+struct AttestationCreateAccount : AttestationBase
+{
+    // createCount on the sending chain. This is the value of the `CreateCount`
+    // field of the bridge on the sending chain when the transaction was
+    // executed.
+    std::uint64_t createCount;
+    // Account to create on the destination chain
+    AccountID toCreate;
+    // Total amount of the reward pool
+    STAmount rewardAmount;
+
+    explicit AttestationCreateAccount(STObject const& o);
+
+    explicit AttestationCreateAccount(json::Value const& v);
+
+    explicit AttestationCreateAccount(
+        AccountID attestationSignerAccount,
+        PublicKey const& publicKey,
+        Buffer signature,
+        AccountID const& sendingAccount,
+        STAmount const& sendingAmount,
+        STAmount rewardAmount,
+        AccountID const& rewardAccount,
+        bool wasLockingChainSend,
+        std::uint64_t createCount,
+        AccountID const& toCreate);
+
+    explicit AttestationCreateAccount(
+        STXChainBridge const& bridge,
+        AccountID attestationSignerAccount,
+        PublicKey const& publicKey,
+        SecretKey const& secretKey,
+        AccountID const& sendingAccount,
+        STAmount const& sendingAmount,
+        STAmount const& rewardAmount,
+        AccountID const& rewardAccount,
+        bool wasLockingChainSend,
+        std::uint64_t createCount,
+        AccountID const& toCreate);
+
+    [[nodiscard]] STObject
+    toSTObject() const;
+
+    // return true if the two attestations attest to the same thing
+    [[nodiscard]] bool
+    sameEvent(AttestationCreateAccount const& rhs) const;
+
+    friend bool
+    operator==(AttestationCreateAccount const& lhs, AttestationCreateAccount const& rhs);
+
+    [[nodiscard]] static std::vector<std::uint8_t>
+    message(
+        STXChainBridge const& bridge,
+        AccountID const& sendingAccount,
+        STAmount const& sendingAmount,
+        STAmount const& rewardAmount,
+        AccountID const& rewardAccount,
+        bool wasLockingChainSend,
+        std::uint64_t createCount,
+        AccountID const& dst);
+
+    [[nodiscard]] bool
+    validAmounts() const;
+
+private:
+    [[nodiscard]] std::vector<std::uint8_t>
+    message(STXChainBridge const& bridge) const override;
+};
+
+struct CmpByCreateCount
+{
+    bool
+    operator()(AttestationCreateAccount const& lhs, AttestationCreateAccount const& rhs) const
+    {
+        return lhs.createCount < rhs.createCount;
+    }
+};
+
+};  // namespace attestations
+
+// Result when checking when two attestation match.
+enum class AttestationMatch {
+    // One of the fields doesn't match, and it isn't the dst field
+    NonDstMismatch,
+    // all of the fields match, except the dst field
+    MatchExceptDst,
+    // all of the fields match
+    Match
+};
+
+struct XChainClaimAttestation
+{
+    using TSignedAttestation = attestations::AttestationClaim;
+    static SField const& arrayFieldName;
+
+    AccountID keyAccount;
+    PublicKey publicKey;
+    STAmount amount;
+    AccountID rewardAccount;
+    bool wasLockingChainSend;
+    std::optional<AccountID> dst;
+
+    struct MatchFields
+    {
+        STAmount amount;
+        bool wasLockingChainSend;
+        std::optional<AccountID> dst;
+        MatchFields(TSignedAttestation const& att);
+        MatchFields(STAmount a, bool b, std::optional<AccountID> const& d)
+            : amount{std::move(a)}, wasLockingChainSend{b}, dst{d}
+        {
+        }
+    };
+
+    explicit XChainClaimAttestation(
+        AccountID const& keyAccount,
+        PublicKey const& publicKey,
+        STAmount const& amount,
+        AccountID const& rewardAccount,
+        bool wasLockingChainSend,
+        std::optional<AccountID> const& dst);
+
+    explicit XChainClaimAttestation(
+        STAccount const& keyAccount,
+        PublicKey const& publicKey,
+        STAmount const& amount,
+        STAccount const& rewardAccount,
+        bool wasLockingChainSend,
+        std::optional<STAccount> const& dst);
+
+    explicit XChainClaimAttestation(TSignedAttestation const& claimAtt);
+
+    explicit XChainClaimAttestation(STObject const& o);
+
+    explicit XChainClaimAttestation(json::Value const& v);
+
+    [[nodiscard]] AttestationMatch
+    match(MatchFields const& rhs) const;
+
+    [[nodiscard]] STObject
+    toSTObject() const;
+
+    friend bool
+    operator==(XChainClaimAttestation const& lhs, XChainClaimAttestation const& rhs);
+};
+
+struct XChainCreateAccountAttestation
+{
+    using TSignedAttestation = attestations::AttestationCreateAccount;
+    static SField const& arrayFieldName;
+
+    AccountID keyAccount;
+    PublicKey publicKey;
+    STAmount amount;
+    STAmount rewardAmount;
+    AccountID rewardAccount;
+    bool wasLockingChainSend;
+    AccountID dst;
+
+    struct MatchFields
+    {
+        STAmount amount;
+        STAmount rewardAmount;
+        bool wasLockingChainSend;
+        AccountID dst;
+
+        MatchFields(TSignedAttestation const& att);
+    };
+
+    explicit XChainCreateAccountAttestation(
+        AccountID const& keyAccount,
+        PublicKey const& publicKey,
+        STAmount const& amount,
+        STAmount const& rewardAmount,
+        AccountID const& rewardAccount,
+        bool wasLockingChainSend,
+        AccountID const& dst);
+
+    explicit XChainCreateAccountAttestation(TSignedAttestation const& claimAtt);
+
+    explicit XChainCreateAccountAttestation(STObject const& o);
+
+    explicit XChainCreateAccountAttestation(json::Value const& v);
+
+    [[nodiscard]] STObject
+    toSTObject() const;
+
+    [[nodiscard]] AttestationMatch
+    match(MatchFields const& rhs) const;
+
+    friend bool
+    operator==(
+        XChainCreateAccountAttestation const& lhs,
+        XChainCreateAccountAttestation const& rhs);
+};
+
+// Attestations from witness servers for a particular claim ID and bridge.
+// Only one attestation per signature is allowed.
+template <class TAttestation>
+class XChainAttestationsBase
+{
+public:
+    using AttCollection = std::vector<TAttestation>;
+
+private:
+    // Set a max number of allowed attestations to limit the amount of memory
+    // allocated and processing time. This number is much larger than the actual
+    // number of attestation a server would ever expect.
+    static constexpr std::uint32_t kMaxAttestations = 256;
+    AttCollection attestations_;
+
+protected:
+    // Prevent slicing to the base class
+    ~XChainAttestationsBase() = default;
+
+public:
+    XChainAttestationsBase() = default;
+    XChainAttestationsBase(XChainAttestationsBase const& rhs) = default;
+    XChainAttestationsBase&
+    operator=(XChainAttestationsBase const& rhs) = default;
+
+    explicit XChainAttestationsBase(AttCollection&& sigs);
+
+    explicit XChainAttestationsBase(json::Value const& v);
+
+    explicit XChainAttestationsBase(STArray const& arr);
+
+    [[nodiscard]] STArray
+    toSTArray() const;
+
+    [[nodiscard]] AttCollection::const_iterator
+    begin() const;
+
+    [[nodiscard]] AttCollection::const_iterator
+    end() const;
+
+    AttCollection::iterator
+    begin();
+
+    AttCollection::iterator
+    end();
+
+    template <class F>
+    std::size_t
+    eraseIf(F&& f);
+
+    [[nodiscard]] std::size_t
+    size() const;
+
+    [[nodiscard]] bool
+    empty() const;
+
+    [[nodiscard]] AttCollection const&
+    attestations() const;
+
+    template <class T>
+    void
+    emplaceBack(T&& att);
+};
+
+template <class TAttestation>
+[[nodiscard]] inline bool
+operator==(
+    XChainAttestationsBase<TAttestation> const& lhs,
+    XChainAttestationsBase<TAttestation> const& rhs)
+{
+    return lhs.attestations() == rhs.attestations();
+}
+
+template <class TAttestation>
+inline XChainAttestationsBase<TAttestation>::AttCollection const&
+XChainAttestationsBase<TAttestation>::attestations() const
+{
+    return attestations_;
+};
+
+template <class TAttestation>
+template <class T>
+inline void
+XChainAttestationsBase<TAttestation>::emplaceBack(T&& att)
+{
+    attestations_.emplace_back(std::forward<T>(att));
+};
+
+template <class TAttestation>
+template <class F>
+inline std::size_t
+XChainAttestationsBase<TAttestation>::eraseIf(F&& f)
+{
+    return std::erase_if(attestations_, std::forward<F>(f));
+}
+
+template <class TAttestation>
+inline std::size_t
+XChainAttestationsBase<TAttestation>::size() const
+{
+    return attestations_.size();
+}
+
+template <class TAttestation>
+inline bool
+XChainAttestationsBase<TAttestation>::empty() const
+{
+    return attestations_.empty();
+}
+
+class XChainClaimAttestations final : public XChainAttestationsBase<XChainClaimAttestation>
+{
+    using TBase = XChainAttestationsBase<XChainClaimAttestation>;
+    using TBase::TBase;
+};
+
+class XChainCreateAccountAttestations final
+    : public XChainAttestationsBase<XChainCreateAccountAttestation>
+{
+    using TBase = XChainAttestationsBase<XChainCreateAccountAttestation>;
+    using TBase::TBase;
+};
+
+}  // namespace xrpl
--- a/include/xrpl/protocol/detail/STVar.h
+++ b/include/xrpl/protocol/detail/STVar.h
@@ -34,11 +34,10 @@ concept ValidConstructSTArgs =
 // and includes a small-object allocation optimization.
 class STVar
 {
-public:
+private:
    // The largest "small object" we can accommodate
    static constexpr std::size_t kMaxSize = 72;

-private:
    alignas(std::max_align_t) std::byte d_[kMaxSize] = {};
    STBase* p_ = nullptr;

--- a/include/xrpl/protocol/detail/features.macro
+++ b/include/xrpl/protocol/detail/features.macro
@@ -15,10 +15,6 @@
 // Add new amendments to the top of this list.
 // Keep it sorted in reverse chronological order.

-XRPL_FEATURE(SmartEscrow,                 Supported::No,  VoteBehavior::DefaultNo)
-XRPL_FEATURE(LendingProtocolV1_2,         Supported::No,  VoteBehavior::DefaultNo)
-XRPL_FIX    (Cleanup3_5_0,                Supported::Yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(ConfidentialMPTKeyRotation,  Supported::No,  VoteBehavior::DefaultNo)
 XRPL_FIX    (Cleanup3_4_0,                Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(Sponsor,                     Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(BatchV1_1,                   Supported::Yes, VoteBehavior::DefaultNo)
@@ -60,12 +56,12 @@ XRPL_FIX    (ReducedOffersV2,            Supported::Yes, VoteBehavior::DefaultNo
 XRPL_FEATURE(NFTokenMintOffer,           Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (AMMv1_1,                    Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (PreviousTxnID,              Supported::Yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (XChainRewardRounding,       Supported::Yes, VoteBehavior::Obsolete)
+XRPL_FIX    (XChainRewardRounding,       Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (EmptyDID,                   Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(PriceOracle,                Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (FillOrKill,                 Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(DID,                        Supported::Yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(XChainBridge,               Supported::Yes, VoteBehavior::Obsolete)
+XRPL_FEATURE(XChainBridge,               Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(AMM,                        Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(XRPFees,                    Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (RemoveNFTokenAutoTrustLine, Supported::Yes, VoteBehavior::DefaultYes)
--- a/include/xrpl/protocol/detail/ledger_entries.macro
+++ b/include/xrpl/protocol/detail/ledger_entries.macro
@@ -206,6 +206,23 @@ LEDGER_ENTRY(ltLEDGER_HASHES, 0x0068, LedgerHashes, hashes, ({
    {sfHashes,               SoeRequired},
 }))

+/** The ledger object which lists details about sidechains.
+
+    \sa keylet::bridge
+*/
+LEDGER_ENTRY(ltBRIDGE, 0x0069, Bridge, bridge, ({
+    {sfAccount,                  SoeRequired},
+    {sfSignatureReward,          SoeRequired},
+    {sfMinAccountCreateAmount,   SoeOptional},
+    {sfXChainBridge,             SoeRequired},
+    {sfXChainClaimID,            SoeRequired},
+    {sfXChainAccountCreateCount, SoeRequired},
+    {sfXChainAccountClaimCount,  SoeRequired},
+    {sfOwnerNode,                SoeRequired},
+    {sfPreviousTxnID,            SoeRequired},
+    {sfPreviousTxnLgrSeq,        SoeRequired},
+}))
+
 /** A ledger object which describes an offer on the DEX.

    \sa keylet::offer
@@ -238,6 +255,22 @@ LEDGER_ENTRY_DUPLICATE(ltDEPOSIT_PREAUTH, 0x0070, DepositPreauth, deposit_preaut
    {sfAuthorizeCredentials, SoeOptional},
 }))

+/** A claim id for a cross chain transaction.
+
+    \sa keylet::xChainClaimID
+*/
+LEDGER_ENTRY(ltXCHAIN_OWNED_CLAIM_ID, 0x0071, XChainOwnedClaimID, xchain_owned_claim_id, ({
+    {sfAccount,                 SoeRequired},
+    {sfXChainBridge,            SoeRequired},
+    {sfXChainClaimID,           SoeRequired},
+    {sfOtherChainSource,        SoeRequired},
+    {sfXChainClaimAttestations, SoeRequired},
+    {sfSignatureReward,         SoeRequired},
+    {sfOwnerNode,               SoeRequired},
+    {sfPreviousTxnID,           SoeRequired},
+    {sfPreviousTxnLgrSeq,       SoeRequired},
+}))
+
 /** A ledger object which describes a bidirectional trust line.

    @note Per Vinnie Falco this should be renamed to ltTRUST_LINE
@@ -276,15 +309,24 @@ LEDGER_ENTRY(ltFEE_SETTINGS, 0x0073, FeeSettings, fee, ({
    {sfBaseFeeDrops,           SoeOptional},
    {sfReserveBaseDrops,       SoeOptional},
    {sfReserveIncrementDrops,  SoeOptional},
-    // Smart Escrow fields
-    {sfGasLimit,               SoeOptional},
-    {sfBytecodeSizeLimit,      SoeOptional},
-    {sfGasPrice,               SoeOptional},
-
    {sfPreviousTxnID,          SoeOptional},
    {sfPreviousTxnLgrSeq,      SoeOptional},
 }))

+/** A claim id for a cross chain create account transaction.
+
+    \sa keylet::xChainCreateAccountClaimID
+*/
+LEDGER_ENTRY(ltXCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID, 0x0074, XChainOwnedCreateAccountClaimID, xchain_owned_create_account_claim_id, ({
+    {sfAccount,                         SoeRequired},
+    {sfXChainBridge,                    SoeRequired},
+    {sfXChainAccountCreateCount,        SoeRequired},
+    {sfXChainCreateAccountAttestations, SoeRequired},
+    {sfOwnerNode,                       SoeRequired},
+    {sfPreviousTxnID,                   SoeRequired},
+    {sfPreviousTxnLgrSeq,               SoeRequired},
+}))
+
 /** A ledger object describing a single escrow.

    \sa keylet::escrow
@@ -297,8 +339,6 @@ LEDGER_ENTRY(ltESCROW, 0x0075, Escrow, escrow, ({
    {sfCondition,            SoeOptional},
    {sfCancelAfter,          SoeOptional},
    {sfFinishAfter,          SoeOptional},
-    {sfBytecode,             SoeOptional},
-    {sfData,                 SoeOptional},
    {sfSourceTag,            SoeOptional},
    {sfDestinationTag,       SoeOptional},
    {sfOwnerNode,            SoeRequired},
@@ -368,8 +408,6 @@ LEDGER_ENTRY(ltMPTOKEN_ISSUANCE, 0x007e, MPTokenIssuance, mpt_issuance, ({
    {sfReferenceHolding,         SoeOptional},
    {sfIssuerEncryptionKey,      SoeOptional},
    {sfAuditorEncryptionKey,     SoeOptional},
-    {sfIssuerKeyEpoch,           SoeOptional},
-    {sfAuditorKeyEpoch,          SoeOptional},
    {sfConfidentialOutstandingAmount, SoeDefault},
 }))

@@ -389,8 +427,6 @@ LEDGER_ENTRY(ltMPTOKEN, 0x007f, MPToken, mptoken, ({
    {sfConfidentialBalanceVersion,  SoeDefault},
    {sfIssuerEncryptedBalance,      SoeOptional},
    {sfAuditorEncryptedBalance,     SoeOptional},
-    {sfIssuerKeyMirrorEpoch,        SoeOptional},
-    {sfAuditorKeyMirrorEpoch,       SoeOptional},
    {sfHolderEncryptionKey,         SoeOptional},
 }))

--- a/include/xrpl/protocol/detail/sfields.macro
+++ b/include/xrpl/protocol/detail/sfields.macro
@@ -23,7 +23,8 @@ TYPED_SFIELD(sfLEVersion,                UINT8,      6)
 // 8-bit integers (uncommon)
 TYPED_SFIELD(sfTickSize,                 UINT8,     16)
 TYPED_SFIELD(sfUNLModifyDisabling,       UINT8,     17)
-// 18 to 19 unused
+// 18 unused
+TYPED_SFIELD(sfWasLockingChainSend,      UINT8,     19)
 TYPED_SFIELD(sfWithdrawalPolicy,         UINT8,     20)
 TYPED_SFIELD(sfContractResult,           UINT8,     21)
 TYPED_SFIELD(sfVaultKind,                UINT8,     22)
@@ -118,15 +119,6 @@ TYPED_SFIELD(sfRemainingOwnerCount,      UINT32,    73)
 TYPED_SFIELD(sfSponsorFlags,             UINT32,    74)
 TYPED_SFIELD(sfSubscriptionDate,         UINT32,    75)
 TYPED_SFIELD(sfRedemptionDate,           UINT32,    76)
-TYPED_SFIELD(sfIssuerKeyEpoch,           UINT32,    77)
-TYPED_SFIELD(sfAuditorKeyEpoch,          UINT32,    78)
-TYPED_SFIELD(sfIssuerKeyMirrorEpoch,     UINT32,    79)
-TYPED_SFIELD(sfAuditorKeyMirrorEpoch,    UINT32,    80)
-TYPED_SFIELD(sfGasLimit,                 UINT32,    81)
-TYPED_SFIELD(sfBytecodeSizeLimit,        UINT32,    82)
-TYPED_SFIELD(sfGasPrice,                 UINT32,    83)
-TYPED_SFIELD(sfGas,                      UINT32,    84)
-TYPED_SFIELD(sfGasUsed,                  UINT32,    85)

 // 64-bit integers (common)
 TYPED_SFIELD(sfIndexNext,                UINT64,     1)
@@ -146,7 +138,9 @@ TYPED_SFIELD(sfEmitBurden,               UINT64,    13)
 // 64-bit integers (uncommon)
 // 16 to 18 unused
 TYPED_SFIELD(sfReferenceCount,           UINT64,    19)
-// 20-22 unused
+TYPED_SFIELD(sfXChainClaimID,            UINT64,    20)
+TYPED_SFIELD(sfXChainAccountCreateCount, UINT64,    21)
+TYPED_SFIELD(sfXChainAccountClaimCount,  UINT64,    22)
 TYPED_SFIELD(sfAssetPrice,               UINT64,    23)
 TYPED_SFIELD(sfMaximumAmount,            UINT64,    24, SField::kSmdBaseTen|SField::kSmdDefault)
 TYPED_SFIELD(sfOutstandingAmount,        UINT64,    25, SField::kSmdBaseTen|SField::kSmdDefault)
@@ -240,7 +234,6 @@ TYPED_SFIELD(sfManagementFeeOutstanding, NUMBER,     17, SField::kSmdNeedsAsset
 // 32-bit signed (common)
 TYPED_SFIELD(sfLoanScale,                INT32,      1)
 TYPED_SFIELD(sfRemainingOwnerCountDelta, INT32,      2)
-TYPED_SFIELD(sfVMReturnCode,             INT32,      3)

 // currency amount (common)
 TYPED_SFIELD(sfAmount,                   AMOUNT,     1)
@@ -325,7 +318,6 @@ TYPED_SFIELD(sfAuditorEncryptedAmount,      VL,     43)
 TYPED_SFIELD(sfAuditorEncryptionKey,        VL,     44)
 TYPED_SFIELD(sfAmountCommitment,            VL,     45)
 TYPED_SFIELD(sfBalanceCommitment,           VL,     46)
-TYPED_SFIELD(sfBytecode,                    VL,     47)

 // account (common)
 TYPED_SFIELD(sfAccount,                  ACCOUNT,    1)
@@ -342,7 +334,13 @@ TYPED_SFIELD(sfHolder,                   ACCOUNT,   11)
 TYPED_SFIELD(sfDelegate,                 ACCOUNT,   12)

 // account (uncommon)
-// 16 to 23 unused
+// 16 unused
+TYPED_SFIELD(sfOtherChainSource,         ACCOUNT,   18)
+TYPED_SFIELD(sfOtherChainDestination,    ACCOUNT,   19)
+TYPED_SFIELD(sfAttestationSignerAccount, ACCOUNT,   20)
+TYPED_SFIELD(sfAttestationRewardAccount, ACCOUNT,   21)
+TYPED_SFIELD(sfLockingChainDoor,         ACCOUNT,   22)
+TYPED_SFIELD(sfIssuingChainDoor,         ACCOUNT,   23)
 TYPED_SFIELD(sfSubject,                  ACCOUNT,   24)
 TYPED_SFIELD(sfBorrower,                 ACCOUNT,   25)
 TYPED_SFIELD(sfCounterparty,             ACCOUNT,   26)
@@ -367,10 +365,14 @@ TYPED_SFIELD(sfBaseAsset,                CURRENCY,   1)
 TYPED_SFIELD(sfQuoteAsset,               CURRENCY,   2)

 // issue
-// 1 and 2 are unused
+TYPED_SFIELD(sfLockingChainIssue,        ISSUE,      1)
+TYPED_SFIELD(sfIssuingChainIssue,        ISSUE,      2)
 TYPED_SFIELD(sfAsset,                    ISSUE,      3)
 TYPED_SFIELD(sfAsset2,                   ISSUE,      4)

+// bridge
+TYPED_SFIELD(sfXChainBridge,             XCHAIN_BRIDGE, 1)
+
 // inner object
 // OBJECT/1 is reserved for end of object
 UNTYPED_SFIELD(sfTransactionMetaData,    OBJECT,     2)
@@ -397,7 +399,10 @@ UNTYPED_SFIELD(sfDisabledValidator,      OBJECT,    19)
 UNTYPED_SFIELD(sfVoteEntry,              OBJECT,    25)
 UNTYPED_SFIELD(sfAuctionSlot,            OBJECT,    26)
 UNTYPED_SFIELD(sfAuthAccount,            OBJECT,    27)
-// 28 to 31 unused
+UNTYPED_SFIELD(sfXChainClaimProofSig,    OBJECT,    28)
+UNTYPED_SFIELD(sfXChainCreateAccountProofSig, OBJECT, 29)
+UNTYPED_SFIELD(sfXChainClaimAttestationCollectionElement, OBJECT, 30)
+UNTYPED_SFIELD(sfXChainCreateAccountAttestationCollectionElement, OBJECT, 31)
 UNTYPED_SFIELD(sfPriceData,              OBJECT,    32)
 UNTYPED_SFIELD(sfCredential,             OBJECT,    33)
 UNTYPED_SFIELD(sfRawTransaction,         OBJECT,    34)
@@ -425,7 +430,10 @@ UNTYPED_SFIELD(sfAdditionalBooks,        ARRAY,     13)
 // array of objects (uncommon)
 UNTYPED_SFIELD(sfMajorities,             ARRAY,     16)
 UNTYPED_SFIELD(sfDisabledValidators,     ARRAY,     17)
-// 18 to 23 unused
+// 18 to 20 unused
+UNTYPED_SFIELD(sfXChainClaimAttestations, ARRAY,    21)
+UNTYPED_SFIELD(sfXChainCreateAccountAttestations, ARRAY, 22)
+//                                                  23 unused
 UNTYPED_SFIELD(sfPriceDataSeries,        ARRAY,     24)
 UNTYPED_SFIELD(sfAuthAccounts,           ARRAY,     25)
 UNTYPED_SFIELD(sfAuthorizeCredentials,   ARRAY,     26)
--- a/include/xrpl/protocol/detail/transactions.macro
+++ b/include/xrpl/protocol/detail/transactions.macro
@@ -66,13 +66,11 @@ TRANSACTION(ttPAYMENT, 0, Payment,
 #endif
 TRANSACTION(ttESCROW_CREATE, 1, EscrowCreate, ({.delegable = Delegation::Delegable}), ({
    {sfDestination, SoeRequired},
-    {sfDestinationTag, SoeOptional},
    {sfAmount, SoeRequired, SoeMptSupported},
    {sfCondition, SoeOptional},
    {sfCancelAfter, SoeOptional},
    {sfFinishAfter, SoeOptional},
-    {sfBytecode, SoeOptional},
-    {sfData, SoeOptional},
+    {sfDestinationTag, SoeOptional},
 }))

 /** This transaction type completes an existing escrow. */
@@ -85,7 +83,6 @@ TRANSACTION(ttESCROW_FINISH, 2, EscrowFinish, ({.delegable = Delegation::Delegab
    {sfFulfillment, SoeOptional},
    {sfCondition, SoeOptional},
    {sfCredentialIDs, SoeOptional},
-    {sfGas, SoeOptional},
 }))


@@ -457,7 +454,111 @@ TRANSACTION(ttAMM_DELETE, 40, AMMDelete,
    {sfAsset2, SoeRequired, SoeMptSupported},
 }))

-// 41 to 48 are unused
+/** This transactions creates a crosschain sequence number */
+#if TRANSACTION_INCLUDE
+#   include <xrpl/tx/transactors/bridge/XChainBridge.h>
+#endif
+TRANSACTION(ttXCHAIN_CREATE_CLAIM_ID, 41, XChainCreateClaimID,
+    ({.delegable = Delegation::Delegable, .amendment = featureXChainBridge}),
+    ({
+    {sfXChainBridge, SoeRequired},
+    {sfSignatureReward, SoeRequired},
+    {sfOtherChainSource, SoeRequired},
+}))
+
+/** This transactions initiates a crosschain transaction */
+TRANSACTION(ttXCHAIN_COMMIT, 42, XChainCommit,
+    ({.delegable = Delegation::Delegable, .amendment = featureXChainBridge}),
+    ({
+    {sfXChainBridge, SoeRequired},
+    {sfXChainClaimID, SoeRequired},
+    {sfAmount, SoeRequired},
+    {sfOtherChainDestination, SoeOptional},
+}))
+
+/** This transaction completes a crosschain transaction */
+TRANSACTION(ttXCHAIN_CLAIM, 43, XChainClaim,
+    ({.delegable = Delegation::Delegable, .amendment = featureXChainBridge}),
+    ({
+    {sfXChainBridge, SoeRequired},
+    {sfXChainClaimID, SoeRequired},
+    {sfDestination, SoeRequired},
+    {sfDestinationTag, SoeOptional},
+    {sfAmount, SoeRequired},
+}))
+
+/** This transaction initiates a crosschain account create transaction */
+TRANSACTION(ttXCHAIN_ACCOUNT_CREATE_COMMIT, 44, XChainAccountCreateCommit,
+    ({.delegable = Delegation::Delegable, .amendment = featureXChainBridge}),
+    ({
+    {sfXChainBridge, SoeRequired},
+    {sfDestination, SoeRequired},
+    {sfAmount, SoeRequired},
+    {sfSignatureReward, SoeRequired},
+}))
+
+/** This transaction adds an attestation to a claim */
+TRANSACTION(ttXCHAIN_ADD_CLAIM_ATTESTATION, 45, XChainAddClaimAttestation,
+    ({
+        .delegable = Delegation::Delegable,
+        .amendment = featureXChainBridge,
+        .privileges = Privilege::CreateAcct,
+    }),
+    ({
+    {sfXChainBridge, SoeRequired},
+
+    {sfAttestationSignerAccount, SoeRequired},
+    {sfPublicKey, SoeRequired},
+    {sfSignature, SoeRequired},
+    {sfOtherChainSource, SoeRequired},
+    {sfAmount, SoeRequired},
+    {sfAttestationRewardAccount, SoeRequired},
+    {sfWasLockingChainSend, SoeRequired},
+
+    {sfXChainClaimID, SoeRequired},
+    {sfDestination, SoeOptional},
+}))
+
+/** This transaction adds an attestation to an account */
+TRANSACTION(ttXCHAIN_ADD_ACCOUNT_CREATE_ATTESTATION, 46, XChainAddAccountCreateAttestation,
+    ({
+        .delegable = Delegation::Delegable,
+        .amendment = featureXChainBridge,
+        .privileges = Privilege::CreateAcct,
+    }),
+    ({
+    {sfXChainBridge, SoeRequired},
+
+    {sfAttestationSignerAccount, SoeRequired},
+    {sfPublicKey, SoeRequired},
+    {sfSignature, SoeRequired},
+    {sfOtherChainSource, SoeRequired},
+    {sfAmount, SoeRequired},
+    {sfAttestationRewardAccount, SoeRequired},
+    {sfWasLockingChainSend, SoeRequired},
+
+    {sfXChainAccountCreateCount, SoeRequired},
+    {sfDestination, SoeRequired},
+    {sfSignatureReward, SoeRequired},
+}))
+
+/** This transaction modifies a sidechain */
+TRANSACTION(ttXCHAIN_MODIFY_BRIDGE, 47, XChainModifyBridge,
+    ({.delegable = Delegation::Delegable, .amendment = featureXChainBridge}),
+    ({
+    {sfXChainBridge, SoeRequired},
+    {sfSignatureReward, SoeOptional},
+    {sfMinAccountCreateAmount, SoeOptional},
+}))
+
+/** This transactions creates a sidechain */
+TRANSACTION(ttXCHAIN_CREATE_BRIDGE, 48, XChainCreateBridge,
+    ({.delegable = Delegation::Delegable, .amendment = featureXChainBridge}),
+    ({
+    {sfXChainBridge, SoeRequired},
+    {sfSignatureReward, SoeRequired},
+    {sfMinAccountCreateAmount, SoeOptional},
+}))

 /** This transaction type creates or updates a DID */
 #if TRANSACTION_INCLUDE
@@ -1060,10 +1161,6 @@ TRANSACTION(ttFEE, 101, SetFee,
    {sfBaseFeeDrops, SoeOptional},
    {sfReserveBaseDrops, SoeOptional},
    {sfReserveIncrementDrops, SoeOptional},
-    // Smart Escrow fields
-    {sfGasLimit, SoeOptional},
-    {sfBytecodeSizeLimit, SoeOptional},
-    {sfGasPrice, SoeOptional},
 }))

 /** This system-generated transaction type is used to update the network's negative UNL
--- a/include/xrpl/protocol/jss.h
+++ b/include/xrpl/protocol/jss.h
@@ -159,6 +159,7 @@ JSS(both);                        // in: Subscribe, Unsubscribe
 JSS(both_sides);                  // in: Subscribe, Unsubscribe
 JSS(branch);                      // out: server_info
 JSS(broadcast);                   // out: SubmitTransaction
+JSS(bridge_account);              // in: LedgerEntry
 JSS(build_path);                  // in: TransactionSign
 JSS(build_version);               // out: NetworkOPs
 JSS(cancel_after);                // out: AccountChannels
@@ -277,7 +278,6 @@ JSS(frozen_balances);                // out: GatewayBalances
 JSS(full);                           // in: LedgerClearer, handlers/Ledger
 JSS(full_reply);                     // out: PathFind
 JSS(fullbelow_size);                 // out: GetCounts
-JSS(gateway);                        // in: noripple_check
 JSS(git);                            // out: server_info
 JSS(good);                           // out: RPCVersion
 JSS(hash);                           // out: NetworkOPs, InboundLedger, LedgerToJson, STTx; field
@@ -481,7 +481,6 @@ JSS(ports);                       // out: NetworkOPs
 JSS(previous);                    // out: Reservations
 JSS(previous_ledger);             // out: LedgerPropose
 JSS(price);                       // out: amm_info, AuctionSlot
-JSS(problems);                    // out: noripple_check
 JSS(proof);                       // in: BookOffers
 JSS(propose_seq);                 // out: LedgerPropose
 JSS(proposers);                   // out: NetworkOPs, LedgerConsensus
@@ -661,7 +660,6 @@ JSS(url);                         // in/out: Subscribe, Unsubscribe
 JSS(url_password);                // in: Subscribe
 JSS(url_username);                // in: Subscribe
 JSS(urlgravatar);                 //
-JSS(user);                        // in: noripple_check
 JSS(username);                    // in: Subscribe
 JSS(validated);                   // out: NetworkOPs, RPCHelpers, AccountTx*, Tx
 JSS(validator_list_expires);      // out: NetworkOps, ValidatorList
--- a/include/xrpl/protocol_autogen/TransactionBuilderBase.h
+++ b/include/xrpl/protocol_autogen/TransactionBuilderBase.h
@@ -10,6 +10,7 @@
 #include <xrpl/protocol/STInteger.h>
 #include <xrpl/protocol/STObject.h>
 #include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/STXChainBridge.h>
 #include <xrpl/protocol/SecretKey.h>
 #include <xrpl/protocol/Serializer.h>
 #include <xrpl/protocol/TxFormats.h>
--- a/include/xrpl/protocol_autogen/ledger_entries/Bridge.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/Bridge.h
@@ -0,0 +1,348 @@
+// This file is auto-generated. Do not edit.
+#pragma once
+
+#include <xrpl/protocol/STLedgerEntry.h>
+#include <xrpl/protocol/STParsedJSON.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol_autogen/LedgerEntryBase.h>
+#include <xrpl/protocol_autogen/LedgerEntryBuilderBase.h>
+#include <xrpl/json/json_value.h>
+
+#include <stdexcept>
+#include <optional>
+
+namespace xrpl::ledger_entries {
+
+class BridgeBuilder;
+
+/**
+ * @brief Ledger Entry: Bridge
+ *
+ * Type: ltBRIDGE (0x0069)
+ * RPC Name: bridge
+ *
+ * Immutable wrapper around SLE providing type-safe field access.
+ * Use BridgeBuilder to construct new ledger entries.
+ */
+class Bridge : public LedgerEntryBase
+{
+public:
+    static constexpr LedgerEntryType entryType = ltBRIDGE;
+
+    /**
+     * @brief Construct a Bridge ledger entry wrapper from an existing SLE object.
+     * @throws std::runtime_error if the ledger entry type doesn't match.
+     */
+    explicit Bridge(SLE::const_pointer sle)
+        : LedgerEntryBase(std::move(sle))
+    {
+        // Verify ledger entry type
+        if (sle_->getType() != entryType)
+        {
+            throw std::runtime_error("Invalid ledger entry type for Bridge");
+        }
+    }
+
+    // Ledger entry-specific field getters
+
+    /**
+     * @brief Get sfAccount (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_ACCOUNT::type::value_type
+    getAccount() const
+    {
+        return this->sle_->at(sfAccount);
+    }
+
+    /**
+     * @brief Get sfSignatureReward (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_AMOUNT::type::value_type
+    getSignatureReward() const
+    {
+        return this->sle_->at(sfSignatureReward);
+    }
+
+    /**
+     * @brief Get sfMinAccountCreateAmount (SoeOptional)
+     * @return The field value, or std::nullopt if not present.
+     */
+    [[nodiscard]]
+    protocol_autogen::Optional<SF_AMOUNT::type::value_type>
+    getMinAccountCreateAmount() const
+    {
+        if (hasMinAccountCreateAmount())
+            return this->sle_->at(sfMinAccountCreateAmount);
+        return std::nullopt;
+    }
+
+    /**
+     * @brief Check if sfMinAccountCreateAmount is present.
+     * @return True if the field is present, false otherwise.
+     */
+    [[nodiscard]]
+    bool
+    hasMinAccountCreateAmount() const
+    {
+        return this->sle_->isFieldPresent(sfMinAccountCreateAmount);
+    }
+
+    /**
+     * @brief Get sfXChainBridge (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_XCHAIN_BRIDGE::type::value_type
+    getXChainBridge() const
+    {
+        return this->sle_->at(sfXChainBridge);
+    }
+
+    /**
+     * @brief Get sfXChainClaimID (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_UINT64::type::value_type
+    getXChainClaimID() const
+    {
+        return this->sle_->at(sfXChainClaimID);
+    }
+
+    /**
+     * @brief Get sfXChainAccountCreateCount (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_UINT64::type::value_type
+    getXChainAccountCreateCount() const
+    {
+        return this->sle_->at(sfXChainAccountCreateCount);
+    }
+
+    /**
+     * @brief Get sfXChainAccountClaimCount (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_UINT64::type::value_type
+    getXChainAccountClaimCount() const
+    {
+        return this->sle_->at(sfXChainAccountClaimCount);
+    }
+
+    /**
+     * @brief Get sfOwnerNode (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_UINT64::type::value_type
+    getOwnerNode() const
+    {
+        return this->sle_->at(sfOwnerNode);
+    }
+
+    /**
+     * @brief Get sfPreviousTxnID (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_UINT256::type::value_type
+    getPreviousTxnID() const
+    {
+        return this->sle_->at(sfPreviousTxnID);
+    }
+
+    /**
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_UINT32::type::value_type
+    getPreviousTxnLgrSeq() const
+    {
+        return this->sle_->at(sfPreviousTxnLgrSeq);
+    }
+};
+
+/**
+ * @brief Builder for Bridge ledger entries.
+ *
+ * Provides a fluent interface for constructing ledger entries with method chaining.
+ * Uses STObject internally for flexible ledger entry construction.
+ * Inherits common field setters from LedgerEntryBuilderBase.
+ */
+class BridgeBuilder : public LedgerEntryBuilderBase<BridgeBuilder>
+{
+public:
+    /**
+     * @brief Construct a new BridgeBuilder with required fields.
+     * @param account The sfAccount field value.
+     * @param signatureReward The sfSignatureReward field value.
+     * @param xChainBridge The sfXChainBridge field value.
+     * @param xChainClaimID The sfXChainClaimID field value.
+     * @param xChainAccountCreateCount The sfXChainAccountCreateCount field value.
+     * @param xChainAccountClaimCount The sfXChainAccountClaimCount field value.
+     * @param ownerNode The sfOwnerNode field value.
+     * @param previousTxnID The sfPreviousTxnID field value.
+     * @param previousTxnLgrSeq The sfPreviousTxnLgrSeq field value.
+     */
+    BridgeBuilder(std::decay_t<typename SF_ACCOUNT::type::value_type> const& account,std::decay_t<typename SF_AMOUNT::type::value_type> const& signatureReward,std::decay_t<typename SF_XCHAIN_BRIDGE::type::value_type> const& xChainBridge,std::decay_t<typename SF_UINT64::type::value_type> const& xChainClaimID,std::decay_t<typename SF_UINT64::type::value_type> const& xChainAccountCreateCount,std::decay_t<typename SF_UINT64::type::value_type> const& xChainAccountClaimCount,std::decay_t<typename SF_UINT64::type::value_type> const& ownerNode,std::decay_t<typename SF_UINT256::type::value_type> const& previousTxnID,std::decay_t<typename SF_UINT32::type::value_type> const& previousTxnLgrSeq)
+        : LedgerEntryBuilderBase<BridgeBuilder>(ltBRIDGE)
+    {
+        setAccount(account);
+        setSignatureReward(signatureReward);
+        setXChainBridge(xChainBridge);
+        setXChainClaimID(xChainClaimID);
+        setXChainAccountCreateCount(xChainAccountCreateCount);
+        setXChainAccountClaimCount(xChainAccountClaimCount);
+        setOwnerNode(ownerNode);
+        setPreviousTxnID(previousTxnID);
+        setPreviousTxnLgrSeq(previousTxnLgrSeq);
+    }
+
+    /**
+     * @brief Construct a BridgeBuilder from an existing SLE object.
+     * @param sle The existing ledger entry to copy from.
+     * @throws std::runtime_error if the ledger entry type doesn't match.
+     */
+    BridgeBuilder(SLE::const_pointer sle)
+    {
+        if (sle->at(sfLedgerEntryType) != ltBRIDGE)
+        {
+            throw std::runtime_error("Invalid ledger entry type for Bridge");
+        }
+        object_ = *sle;
+    }
+
+    /**
+     * @brief Ledger entry-specific field setters
+     */
+
+    /**
+     * @brief Set sfAccount (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    BridgeBuilder&
+    setAccount(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
+    {
+        object_[sfAccount] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfSignatureReward (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    BridgeBuilder&
+    setSignatureReward(std::decay_t<typename SF_AMOUNT::type::value_type> const& value)
+    {
+        object_[sfSignatureReward] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfMinAccountCreateAmount (SoeOptional)
+     * @return Reference to this builder for method chaining.
+     */
+    BridgeBuilder&
+    setMinAccountCreateAmount(std::decay_t<typename SF_AMOUNT::type::value_type> const& value)
+    {
+        object_[sfMinAccountCreateAmount] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfXChainBridge (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    BridgeBuilder&
+    setXChainBridge(std::decay_t<typename SF_XCHAIN_BRIDGE::type::value_type> const& value)
+    {
+        object_[sfXChainBridge] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfXChainClaimID (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    BridgeBuilder&
+    setXChainClaimID(std::decay_t<typename SF_UINT64::type::value_type> const& value)
+    {
+        object_[sfXChainClaimID] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfXChainAccountCreateCount (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    BridgeBuilder&
+    setXChainAccountCreateCount(std::decay_t<typename SF_UINT64::type::value_type> const& value)
+    {
+        object_[sfXChainAccountCreateCount] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfXChainAccountClaimCount (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    BridgeBuilder&
+    setXChainAccountClaimCount(std::decay_t<typename SF_UINT64::type::value_type> const& value)
+    {
+        object_[sfXChainAccountClaimCount] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfOwnerNode (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    BridgeBuilder&
+    setOwnerNode(std::decay_t<typename SF_UINT64::type::value_type> const& value)
+    {
+        object_[sfOwnerNode] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfPreviousTxnID (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    BridgeBuilder&
+    setPreviousTxnID(std::decay_t<typename SF_UINT256::type::value_type> const& value)
+    {
+        object_[sfPreviousTxnID] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    BridgeBuilder&
+    setPreviousTxnLgrSeq(std::decay_t<typename SF_UINT32::type::value_type> const& value)
+    {
+        object_[sfPreviousTxnLgrSeq] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Build and return the completed Bridge wrapper.
+     * @param index The ledger entry index.
+     * @return The constructed ledger entry wrapper.
+     */
+    Bridge
+    build(uint256 const& index)
+    {
+        return Bridge{std::make_shared<SLE>(std::move(object_), index)};
+    }
+};
+
+}  // namespace xrpl::ledger_entries
--- a/include/xrpl/protocol_autogen/ledger_entries/Escrow.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/Escrow.h
@@ -174,54 +174,6 @@ public:
        return this->sle_->isFieldPresent(sfFinishAfter);
    }

-    /**
-     * @brief Get sfBytecode (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_VL::type::value_type>
-    getBytecode() const
-    {
-        if (hasBytecode())
-            return this->sle_->at(sfBytecode);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfBytecode is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasBytecode() const
-    {
-        return this->sle_->isFieldPresent(sfBytecode);
-    }
-
-    /**
-     * @brief Get sfData (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_VL::type::value_type>
-    getData() const
-    {
-        if (hasData())
-            return this->sle_->at(sfData);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfData is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasData() const
-    {
-        return this->sle_->isFieldPresent(sfData);
-    }
-
    /**
     * @brief Get sfSourceTag (SoeOptional)
     * @return The field value, or std::nullopt if not present.
@@ -501,28 +453,6 @@ public:
        return *this;
    }

-    /**
-     * @brief Set sfBytecode (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    EscrowBuilder&
-    setBytecode(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfBytecode] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfData (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    EscrowBuilder&
-    setData(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfData] = value;
-        return *this;
-    }
-
    /**
     * @brief Set sfSourceTag (SoeOptional)
     * @return Reference to this builder for method chaining.
--- a/include/xrpl/protocol_autogen/ledger_entries/FeeSettings.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/FeeSettings.h
@@ -213,78 +213,6 @@ public:
        return this->sle_->isFieldPresent(sfReserveIncrementDrops);
    }

-    /**
-     * @brief Get sfGasLimit (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getGasLimit() const
-    {
-        if (hasGasLimit())
-            return this->sle_->at(sfGasLimit);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfGasLimit is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasGasLimit() const
-    {
-        return this->sle_->isFieldPresent(sfGasLimit);
-    }
-
-    /**
-     * @brief Get sfBytecodeSizeLimit (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getBytecodeSizeLimit() const
-    {
-        if (hasBytecodeSizeLimit())
-            return this->sle_->at(sfBytecodeSizeLimit);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfBytecodeSizeLimit is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasBytecodeSizeLimit() const
-    {
-        return this->sle_->isFieldPresent(sfBytecodeSizeLimit);
-    }
-
-    /**
-     * @brief Get sfGasPrice (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getGasPrice() const
-    {
-        if (hasGasPrice())
-            return this->sle_->at(sfGasPrice);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfGasPrice is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasGasPrice() const
-    {
-        return this->sle_->isFieldPresent(sfGasPrice);
-    }
-
    /**
     * @brief Get sfPreviousTxnID (SoeOptional)
     * @return The field value, or std::nullopt if not present.
@@ -447,39 +375,6 @@ public:
        return *this;
    }

-    /**
-     * @brief Set sfGasLimit (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    FeeSettingsBuilder&
-    setGasLimit(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfGasLimit] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfBytecodeSizeLimit (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    FeeSettingsBuilder&
-    setBytecodeSizeLimit(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfBytecodeSizeLimit] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfGasPrice (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    FeeSettingsBuilder&
-    setGasPrice(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfGasPrice] = value;
-        return *this;
-    }
-
    /**
     * @brief Set sfPreviousTxnID (SoeOptional)
     * @return Reference to this builder for method chaining.
--- a/include/xrpl/protocol_autogen/ledger_entries/MPToken.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/MPToken.h
@@ -268,54 +268,6 @@ public:
        return this->sle_->isFieldPresent(sfAuditorEncryptedBalance);
    }

-    /**
-     * @brief Get sfIssuerKeyMirrorEpoch (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getIssuerKeyMirrorEpoch() const
-    {
-        if (hasIssuerKeyMirrorEpoch())
-            return this->sle_->at(sfIssuerKeyMirrorEpoch);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfIssuerKeyMirrorEpoch is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasIssuerKeyMirrorEpoch() const
-    {
-        return this->sle_->isFieldPresent(sfIssuerKeyMirrorEpoch);
-    }
-
-    /**
-     * @brief Get sfAuditorKeyMirrorEpoch (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getAuditorKeyMirrorEpoch() const
-    {
-        if (hasAuditorKeyMirrorEpoch())
-            return this->sle_->at(sfAuditorKeyMirrorEpoch);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfAuditorKeyMirrorEpoch is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasAuditorKeyMirrorEpoch() const
-    {
-        return this->sle_->isFieldPresent(sfAuditorKeyMirrorEpoch);
-    }
-
    /**
     * @brief Get sfHolderEncryptionKey (SoeOptional)
     * @return The field value, or std::nullopt if not present.
@@ -519,28 +471,6 @@ public:
        return *this;
    }

-    /**
-     * @brief Set sfIssuerKeyMirrorEpoch (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    MPTokenBuilder&
-    setIssuerKeyMirrorEpoch(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfIssuerKeyMirrorEpoch] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfAuditorKeyMirrorEpoch (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    MPTokenBuilder&
-    setAuditorKeyMirrorEpoch(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfAuditorKeyMirrorEpoch] = value;
-        return *this;
-    }
-
    /**
     * @brief Set sfHolderEncryptionKey (SoeOptional)
     * @return Reference to this builder for method chaining.
--- a/include/xrpl/protocol_autogen/ledger_entries/MPTokenIssuance.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/MPTokenIssuance.h
@@ -351,54 +351,6 @@ public:
        return this->sle_->isFieldPresent(sfAuditorEncryptionKey);
    }

-    /**
-     * @brief Get sfIssuerKeyEpoch (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getIssuerKeyEpoch() const
-    {
-        if (hasIssuerKeyEpoch())
-            return this->sle_->at(sfIssuerKeyEpoch);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfIssuerKeyEpoch is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasIssuerKeyEpoch() const
-    {
-        return this->sle_->isFieldPresent(sfIssuerKeyEpoch);
-    }
-
-    /**
-     * @brief Get sfAuditorKeyEpoch (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getAuditorKeyEpoch() const
-    {
-        if (hasAuditorKeyEpoch())
-            return this->sle_->at(sfAuditorKeyEpoch);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfAuditorKeyEpoch is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasAuditorKeyEpoch() const
-    {
-        return this->sle_->isFieldPresent(sfAuditorKeyEpoch);
-    }
-
    /**
     * @brief Get sfConfidentialOutstandingAmount (SoeDefault)
     * @return The field value, or std::nullopt if not present.
@@ -648,28 +600,6 @@ public:
        return *this;
    }

-    /**
-     * @brief Set sfIssuerKeyEpoch (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    MPTokenIssuanceBuilder&
-    setIssuerKeyEpoch(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfIssuerKeyEpoch] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfAuditorKeyEpoch (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    MPTokenIssuanceBuilder&
-    setAuditorKeyEpoch(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfAuditorKeyEpoch] = value;
-        return *this;
-    }
-
    /**
     * @brief Set sfConfidentialOutstandingAmount (SoeDefault)
     * @return Reference to this builder for method chaining.
--- a/Show More
+++ b/Show More