fix: Judge a node's position on both getMissingNodes paths

Both getMissingNodes paths judge a leaf's position: the arm that handles a node descendAsync has already resolved, and the deferred-read hook for one an asynchronous read resolves later. The deferred-read hook also refuses an inner node at kLeafDepth, which only the synchronous arm judged before. gmnProcessDeferredReads() is no longer static so it can record the verdict, and it keeps draining every read this pass posted after reaching it, since each holds a pointer to the walk's state. Both of its tests skip the node rather than return. A second belongsAt() overload answers about a child from its parent's position and the branch taken, so neither site builds the child's ID, and the type is tested first, which keeps the position test off every inner child. It is reached only for a child the full-below lookup did not answer for: that lookup decides which children the walk visits, and this test decides whether a visited leaf belongs where it was put. With the node flag no longer trusted below the root, this is also what closes the shared-subtree case: a root naming a completed subtree one branch over, or using it as a root, now descends it and condemns the map at the misplaced leaf. The full-below case asserts that outcome.
fix: Judge a node's position at its hook and in both full-below memos
2026-10-22 19:47:17 +00:00 · 2026-10-16 06:37:12 +00:00 · 2026-10-16 06:37:12 +00:00 · 2026-10-16 06:37:11 +00:00 · 2026-10-16 06:37:11 +00:00 · 2026-10-16 06:37:10 +00:00
256 changed files with 23975 additions and 7551 deletions
@@ -198,7 +198,6 @@ words:
  - mptokens
  - mpts
  - mtgox
-  - mudhra
  - multisig
  - multisign
  - multisigned
@@ -319,6 +318,7 @@ words:
  - sttx
  - stvar
  - stvector
+  - stxchainattestations
  - summands
  - superpeer
  - superpeers
@@ -377,6 +377,7 @@ words:
  - writeme
  - wsrch
  - wthread
+  - xbridge
  - xchain
  - xcrun
  - ximinez
@@ -1,5 +1,5 @@
 {
-  "image_tag": "sha-d3a71b2",
+  "image_tag": "sha-3d526d4",
  "configs": {
    "ubuntu": [
      {
@@ -74,7 +74,7 @@
        "extra_cmake_args": "-Dvalidator_keys=ON",
        "package": {
          "type": "deb",
-          "image": "ghcr.io/xrplf/xrpld/packaging-debian:sha-d3a71b2"
+          "image": "ghcr.io/xrplf/xrpld/packaging-debian:sha-e6055dd"
        }
      },
      {
@@ -86,7 +86,7 @@
        "extra_cmake_args": "-Dvalidator_keys=ON -Dassert=ON",
        "package": {
          "type": "deb",
-          "image": "ghcr.io/xrplf/xrpld/packaging-debian:sha-d3a71b2",
+          "image": "ghcr.io/xrplf/xrpld/packaging-debian:sha-e6055dd",
          "variant": "assert"
        }
      }
@@ -101,7 +101,7 @@
        "extra_cmake_args": "-Dvalidator_keys=ON",
        "package": {
          "type": "rpm",
-          "image": "ghcr.io/xrplf/xrpld/packaging-rhel:sha-d3a71b2"
+          "image": "ghcr.io/xrplf/xrpld/packaging-rhel:sha-e6055dd"
        }
      }
    ]
@@ -24,7 +24,6 @@ on:
      - "!nix/devshell.nix"
      - "!nix/check-tools/**"
      - "bin/check-tools.sh"
-      - "bin/check-distrusted-roots.sh"
      - "bin/nix/default-loader-path.sh"
      - "bin/install/sanitizer-libs.sh"
  workflow_dispatch:
@@ -10,7 +10,6 @@ on:
  pull_request:
    paths:
      - ".github/workflows/build-packaging-images.yml"
-      - "bin/check-distrusted-roots.sh"
      - "bin/install/packaging-tools.sh"
      - "package/images/packaging/**"
  workflow_dispatch:
@@ -10,7 +10,6 @@ on:
  pull_request:
    paths:
      - ".github/workflows/build-pre-commit-image.yml"
-      - "bin/check-distrusted-roots.sh"
      - "bin/pre-commit/Dockerfile"
      - "rust-toolchain.toml"
  workflow_dispatch:
@@ -8,7 +8,6 @@ on:
    branches:
      - "develop"
      - "release/*"
-      - "staging/*"
    paths:
      - "crates/**/Cargo.toml"
      - "crates/Cargo.lock"
@@ -35,7 +34,7 @@ permissions:
 jobs:
  audit:
    runs-on: ubuntu-latest
-    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-d3a71b2
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-3d526d4
    permissions:
      contents: read
      # Needed to open an issue on scheduled failures.
@@ -79,7 +79,7 @@ jobs:
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@6645b8721d3810be1c59f4180315249e59bf1312
+        uses: XRPLF/actions/prepare-runner@8e98d61f011fd2a67f3fde5f0f075662c099a527
        with:
          enable_ccache: false

@@ -243,7 +243,7 @@ jobs:
      - should-run
      - build-test
    # Only run when committing to a PR that targets a release branch.
-    if: ${{ github.repository == 'XRPLF/rippled' && needs.should-run.outputs.go == 'true' && github.event_name == 'pull_request' && startsWith(github.event.pull_request.base.ref, 'release/') }}
+    if: ${{ github.repository == 'XRPLF/rippled' && needs.should-run.outputs.go == 'true' && github.event_name == 'pull_request' && startsWith(github.event.pull_request.base.ref, 'release') }}
    uses: ./.github/workflows/reusable-upload-recipe.yml
    secrets:
      remote_username: ${{ secrets.NEXUS_REMOTE_USERNAME }}
@@ -1,16 +1,14 @@
 # This workflow runs all workflows to build and test the code on various Linux
 # flavors, as well as on MacOS and Windows, on a scheduled basis, on merge into
-# the 'develop', 'release/*' or 'staging/*' branches, or when requested
-# manually. Upon pushes to the develop branch, it also uploads the libxrpl
-# recipe to the Conan remote.
+# the 'develop' or 'release*' branches, or when requested manually. Upon pushes
+# to the develop branch it also uploads the libxrpl recipe to the Conan remote.
 name: Trigger

 on:
  push:
    branches:
      - "develop"
-      - "release/*"
-      - "staging/*"
+      - "release*"
    paths:
      # These paths are unique to `on-trigger.yml`.
      - ".github/workflows/on-trigger.yml"
@@ -64,9 +62,9 @@ on:
  workflow_dispatch:

 concurrency:
-  # When a PR is merged into the develop branch, it will be assigned a unique
+  # When a PR is merged into the develop branch it will be assigned a unique
  # group identifier, so execution will continue even if another PR is merged
-  # while it is still running. In all other cases, the group identifier is shared
+  # while it is still running. In all other cases the group identifier is shared
  # per branch, so that any in-progress runs are cancelled when a new commit is
  # pushed.
  group: ${{ github.workflow }}-${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' && github.sha || github.ref }}
@@ -100,7 +98,7 @@ jobs:
      # However, we do not enable ccache for events targeting a release branch,
      # to protect against the rare case that the output produced by ccache is
      # not identical to a regular compilation.
-      ccache_enabled: ${{ github.repository_owner == 'XRPLF' && !startsWith(github.ref, 'refs/heads/release/') }}
+      ccache_enabled: ${{ github.repository_owner == 'XRPLF' && !startsWith(github.ref, 'refs/heads/release') }}
      os: ${{ matrix.os }}
    secrets:
      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
@@ -8,14 +8,13 @@ on:
  push:
    branches:
      - "develop"
-      - "release/*"
-      - "staging/*"
+      - "release*"
  workflow_dispatch:

 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@6a52459a658649a0aeaab4ebd6a8f25173f6f16f
+    uses: XRPLF/actions/.github/workflows/pre-commit.yml@d7f2acb47d9662e1e2f8b1f5feffa6d21cc3290a
    with:
      runs_on: ubuntu-latest
-      container: '{ "image": "ghcr.io/xrplf/xrpld/pre-commit:sha-d3a71b2" }'
+      container: '{ "image": "ghcr.io/xrplf/xrpld/pre-commit:sha-70b8fd3" }'
@@ -41,13 +41,13 @@ env:
 jobs:
  build:
    runs-on: ubuntu-latest
-    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-d3a71b2
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-3d526d4
    steps:
      - name: Checkout repository
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@6645b8721d3810be1c59f4180315249e59bf1312
+        uses: XRPLF/actions/prepare-runner@8e98d61f011fd2a67f3fde5f0f075662c099a527
        with:
          enable_ccache: false

@@ -129,7 +129,7 @@ jobs:
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@6645b8721d3810be1c59f4180315249e59bf1312
+        uses: XRPLF/actions/prepare-runner@8e98d61f011fd2a67f3fde5f0f075662c099a527
        with:
          enable_ccache: ${{ inputs.ccache_enabled }}

@@ -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-d3a71b2"
+    container: "ghcr.io/xrplf/xrpld/nix-debian:sha-3d526d4"
    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@6645b8721d3810be1c59f4180315249e59bf1312
+        uses: XRPLF/actions/prepare-runner@8e98d61f011fd2a67f3fde5f0f075662c099a527
        with:
          enable_ccache: false

@@ -100,7 +100,7 @@ jobs:
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@6645b8721d3810be1c59f4180315249e59bf1312
+        uses: XRPLF/actions/prepare-runner@8e98d61f011fd2a67f3fde5f0f075662c099a527
        with:
          enable_ccache: false

@@ -225,7 +225,7 @@ jobs:
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@6645b8721d3810be1c59f4180315249e59bf1312
+        uses: XRPLF/actions/prepare-runner@8e98d61f011fd2a67f3fde5f0f075662c099a527
        with:
          enable_ccache: false

@@ -28,7 +28,7 @@ permissions:
 jobs:
  clippy:
    runs-on: ubuntu-latest
-    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-d3a71b2
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-3d526d4
    steps:
      - name: Checkout repository
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -41,7 +41,7 @@ jobs:

  coverage:
    runs-on: ubuntu-latest
-    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-d3a71b2
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-3d526d4
    steps:
      - name: Checkout repository
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -70,7 +70,7 @@ jobs:

  doc:
    runs-on: ubuntu-latest
-    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-d3a71b2
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-3d526d4
    steps:
      - name: Checkout repository
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -40,7 +40,7 @@ defaults:
 jobs:
  upload:
    runs-on: ubuntu-latest
-    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-d3a71b2
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-3d526d4
    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@6645b8721d3810be1c59f4180315249e59bf1312
+        uses: XRPLF/actions/prepare-runner@8e98d61f011fd2a67f3fde5f0f075662c099a527
        with:
          enable_ccache: false

@@ -68,7 +68,7 @@ jobs:
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

      - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@6645b8721d3810be1c59f4180315249e59bf1312
+        uses: XRPLF/actions/prepare-runner@8e98d61f011fd2a67f3fde5f0f075662c099a527
        with:
          enable_ccache: false

@@ -26,11 +26,6 @@ This version is supported by all `xrpld` versions. For WebSocket and HTTP JSON-R

 Version 3.5.0 is not yet released.

-### 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.
- `subscribe` (`ledger` stream): The deprecated `fee_ref` field has been removed unconditionally from both the `subscribe` response and the `ledgerClosed` stream messages. It was previously only omitted when the `XRPFees` amendment was enabled; that amendment has now been retired, so the field is never returned. This applies to all API versions.
-
 ### Additions in 3.5.0

 - `subscribe`, `unsubscribe`: Added an optional `mpt_issuances` request field, an array of MPT issuance IDs (hex strings). Subscribers receive the same `transaction` message as the `transactions` stream for each validated transaction whose metadata affects a subscribed issuance. MPT issuance subscriptions count toward the per-connection subscription limit. An empty array, a non-array value, or an invalid ID returns `invalidParams`. ([#5671](https://github.com/XRPLF/rippled/pull/5671))
@@ -42,9 +37,6 @@ Version 3.5.0 is not yet released.
 - `channel_verify`: The `channel_id` and `signature` fields now return an `invalidParams` error if the value is not a string. [#7582](https://github.com/XRPLF/rippled/pull/7582)
 - `account_currencies`, `account_nfts`, `account_offers`: A request with more than one problem may now report a different one of them. An invalid `ledger_hash` or `ledger_index` is reported before an invalid or missing `account`. An invalid `limit` or `marker` is reported before `lgrNotFound` or `actNotFound`, and for `account_offers` also before `actMalformed`. A request with a single problem returns the same error as before. [#8561](https://github.com/XRPLF/rippled/pull/8561)
 - `deposit_authorized`: A `credentials` entry that is all zeros (for example `"0"` or 64 `0` characters) now returns a `badCredentials` error instead of looking up a credential that can never exist.
- `account_info`, `account_lines`, `account_channels`: A request with more than one problem may now report a different one of them. An invalid `ledger_hash` or `ledger_index` is reported before a missing or invalid `account`, or `ident` for `account_info`. For `account_lines`, a `peer` that is not a string, or an invalid `limit` or `marker`, is reported before `lgrNotFound`, `actNotFound` or a malformed `account`, and an invalid `limit` or `marker` also before a malformed `peer`. For `account_channels`, a malformed `account` is reported before `lgrNotFound`, and an invalid `destination_account`, `limit` or `marker` before `lgrNotFound` or `actNotFound`. A request with a single problem returns the same error as before. [#8573](https://github.com/XRPLF/rippled/pull/8573)
- `deposit_authorized`, `nft_buy_offers`, `nft_sell_offers`: A request with more than one problem may now report a different one of them. An invalid `ledger_hash` or `ledger_index` is reported before a missing or invalid `source_account`, `destination_account` or `nft_id`, and for `nft_buy_offers` / `nft_sell_offers` also before an invalid `limit`. For `deposit_authorized`, an invalid `credentials` array is reported before `lgrNotFound`, `srcActNotFound`, `dstActNotFound` or `badCredentials`. For `nft_buy_offers` and `nft_sell_offers`, an invalid `marker` is reported before `lgrNotFound` or `objectNotFound`. A request with a single problem returns the same error as before. [#8613](https://github.com/XRPLF/rippled/pull/8613)
- `nft_buy_offers`, `nft_sell_offers`: An `nft_id` that is an array or an object now returns an `invalidParams` error instead of an `internal` error. [#8613](https://github.com/XRPLF/rippled/pull/8613)

 ### Bugfixes in 3.5.0

@@ -1,60 +0,0 @@
-#!/bin/bash
-#
-# check-distrusted-roots.sh — fail if a CA bundle trusts a root of the
-# compromised eMudhra intermediates; see https://emudhra.we-have-a-problem.com/.
-#
-# Usage: check-distrusted-roots.sh [ca-bundle]
-# Defaults to the system bundle (Debian or RHEL path).
-#
-# Roots are matched by SHA-256 fingerprint, needing only bash, base64 and
-# sha256sum (nixos/nix has no awk). Only plain CERTIFICATE blocks are checked:
-# OpenSSL's TRUSTED CERTIFICATE blocks carry their own trust settings, which is
-# how nixpkgs' cacert marks a blacklisted root as rejected.
-
-set -euo pipefail
-
-declare -A ROOTS=(
-    [d7a7a0fb5d7e2731d771e9484ebcdef71d5f0c3e0a2948782bc83ee0ea699ef4]="AAA Certificate Services"
-    [86a1ecba089c4a8d3bbe2734c612ba341d813e043cf9e8a862cd5c57a36bbe6b]="emSign ECC Root CA - G3"
-)
-
-BUNDLE="${1:-}"
-if [ -z "${BUNDLE}" ]; then
-    for CANDIDATE in /etc/ssl/certs/ca-certificates.crt /etc/pki/tls/certs/ca-bundle.crt; do
-        if [ -f "${CANDIDATE}" ]; then
-            BUNDLE="${CANDIDATE}"
-            break
-        fi
-    done
-fi
-
-STATUS=0
-COUNT=0
-PEM=""
-while IFS= read -r LINE || [ -n "${LINE}" ]; do
-    case "${LINE}" in
-        "-----BEGIN CERTIFICATE-----") PEM="" ;;
-        "-----END CERTIFICATE-----")
-            COUNT=$((COUNT + 1))
-            FINGERPRINT="$(base64 -d <<<"${PEM}" | sha256sum)" || {
-                echo "ERROR: certificate ${COUNT} in ${BUNDLE} is not valid base64" >&2
-                exit 1
-            }
-            ROOT="${ROOTS[${FINGERPRINT%% *}]:-}"
-            if [ -n "${ROOT}" ]; then
-                echo "ERROR: ${BUNDLE} trusts '${ROOT}'" >&2
-                STATUS=1
-            fi
-            ;;
-        # Lines outside a CERTIFICATE block only collect until the next BEGIN.
-        *) PEM+="${LINE}" ;;
-    esac
-done <"${BUNDLE:?no system CA bundle found}"
-
-# An empty or unparsable bundle would otherwise pass.
-if [ "${COUNT}" -eq 0 ]; then
-    echo "ERROR: ${BUNDLE} has no certificates" >&2
-    exit 1
-fi
-echo "${BUNDLE}: checked ${COUNT} certificates"
-exit "${STATUS}"
@@ -58,14 +58,6 @@ function install() {
                rpm-build \
                rpm-sign \
                systemd-rpm-macros
-
-            # AlmaLinux's ca-certificates still trusts the root of the compromised
-            # eMudhra intermediates; see https://emudhra.we-have-a-problem.com/.
-            # TODO: drop once it ships a fix.
-            trust extract --format=pem-bundle \
-                --filter="pkcs11:object=emSign%20ECC%20Root%20CA%20-%20G3;type=cert" \
-                /etc/pki/ca-trust/source/blocklist/emSign_ECC_Root_CA_-_G3.pem
-            update-ca-trust
            ;;
    esac
 }
@@ -9,14 +9,13 @@ ARG DEBIAN_FRONTEND=noninteractive

 RUN <<EOF
 pkgs=()
-pkgs+=(ca-certificates)  # Trust store for curl, git, pip and nix.
-pkgs+=(curl)             # Required to install nix.
-pkgs+=(doxygen)          # Needed for Clio's check-doxygen-docs.sh.
-pkgs+=(git)              # Required for prepare-runner.
-pkgs+=(libatomic1)       # Required to run pre-commit provided `node`.
-pkgs+=(python3)          # Python 3 interpreter.
-pkgs+=(python3-venv)     # Virtual environment for Python applications.
-pkgs+=(xz-utils)         # Required to install nix
+pkgs+=(curl)         # Required to install nix.
+pkgs+=(doxygen)      # Needed for Clio's check-doxygen-docs.sh.
+pkgs+=(git)          # Required for prepare-runner.
+pkgs+=(libatomic1)   # Required to run pre-commit provided `node`.
+pkgs+=(python3)      # Python 3 interpreter.
+pkgs+=(python3-pip)  # Package manager for Python applications.
+pkgs+=(xz-utils)     # Required to install nix

 apt-get update
 apt-get install -y --no-install-recommends "${pkgs[@]}"
@@ -24,21 +23,9 @@ apt-get clean
 rm -rf /var/lib/apt/lists/*
 EOF

-# Sanity-check that the system CA bundle distrusts the compromised eMudhra roots,
-# before pip and the nix installer download anything with it.
-RUN --mount=type=bind,source=bin/check-distrusted-roots.sh,target=/check-distrusted-roots.sh \
-    /check-distrusted-roots.sh
-
-# Ahead of the system Python on PATH,
-# so `python3` and `pip` resolve to the venv and installs stay out of the system Python.
-ENV VIRTUAL_ENV="/opt/venv"
-ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
-
 ARG PRE_COMMIT_VERSION=4.6.2
-RUN <<EOF
-python3 -m venv "${VIRTUAL_ENV}"
-pip install --no-cache pre-commit==${PRE_COMMIT_VERSION}
-EOF
+RUN pip install --no-cache --break-system-packages \
+    pre-commit==${PRE_COMMIT_VERSION}

 RUN sh <(curl --proto '=https' --tlsv1.2 -L https://nixos.org/nix/install) --daemon --yes

@@ -46,9 +33,7 @@ RUN sh <(curl --proto '=https' --tlsv1.2 -L https://nixos.org/nix/install) --dae
 # so nix is available in all shells including non-interactive shells (e.g., GitHub Actions).
 ENV PATH="/nix/var/nix/profiles/default/bin:${PATH}"
 ENV NIX_PROFILES="/nix/var/nix/profiles/default"
-# The system bundle gets security updates through apt;
-# the one in the Nix profile is frozen at the installer's nixpkgs.
-ENV NIX_SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt"
+ENV NIX_SSL_CERT_FILE="/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"

 # Verify nix installation
 RUN nix --version
@@ -297,16 +297,11 @@ if(xrpld)
        VALUE_TYPE "::json::Value"
        VIEW_HEADER "xrpld/rpc/detail/JsonObjectView.hpp"
        HANDLERS
-            account_channels
            account_currencies
-            account_info
-            account_lines
            account_nfts
            account_offers
            book_changes
-            deposit_authorized
            ledger
-            nft_offers_common
            transaction_entry
    )
    target_sources(xrpld PRIVATE ${rpcspec_instantiations})
@@ -3,11 +3,11 @@
    "requires": [
        "zlib/1.3.2#1cb806da49011867778ffb6ac7190fcb%1782392402.122708",
        "xxhash/0.8.3#681d36a0a6111fc56e5e45ea182c19cc%1782392402.420688",
-        "xrpl-rpc-spec/0.1.29#852afc87cac32aca93cc50a985d73fe0%1792359643.19817",
+        "xrpl-rpc-spec/0.1.23#56e8946f5b3fb949a3732e1a51135ca2%1790977482.197086",
        "sqlite3/3.53.0#324ada52333108388a9a6108bfa96734%1782392403.185447",
        "soci/4.0.3#e726491a03468795453f7c83fc924a96%1782392402.679521",
        "snappy/1.1.10#968fef506ff261592ec30c574d4a7809%1782307151.633168",
-        "secp256k1/0.7.1#f4d16a4d907dd057598954476ca6f88c%1792234329.790275",
+        "secp256k1/0.7.1#b1f450b7f78a36fff75bb6934a356f3a%1782338841.3729",
        "rocksdb/10.5.1#4a197eca381a3e5ae8adf8cffa5aacd0%1782392413.075713",
        "re2/20251105#8579cfd0bda4daf0683f9e3898f964b4%1782392402.431897",
        "protobuf/6.33.5#ff253ead763bd8d9904a52979cd21e81%1782392410.233933",
@@ -40,7 +40,7 @@ class Xrpl(ConanFile):
        "nudb/2.0.9",
        "openssl/3.6.3",
        "soci/4.0.3",
-        "xrpl-rpc-spec/0.1.29",
+        "xrpl-rpc-spec/0.1.23",
        "zlib/1.3.2",
    ]

@@ -1,10 +1,15 @@
 #pragma once

 #include <xrpl/basics/TaggedCache.h>
-#include <xrpl/basics/base_uint.h>

 namespace xrpl {

-using KeyCache = TaggedCache<UInt256, int, true>;
+/**
+ * TaggedCache in key-only mode, holding no value per key.
+ *
+ * @tparam Key the key type to remember.
+ */
+template <class Key>
+using KeyCache = TaggedCache<Key, int, true>;

 }  // namespace xrpl
@@ -352,9 +352,9 @@ class Number final
    using rep = std::int64_t;
    using InternalRep = MantissaRange::rep;

+    bool negative_{false};
    InternalRep mantissa_{0};
    int exponent_{std::numeric_limits<int>::lowest()};
-    bool negative_{false};

 public:
    // The range for the exponent when normalized
@@ -650,12 +650,8 @@ private:
    shiftExponent(int exponentDelta) const;
 };

-// The number class currently has 3 tail padding bytes. If you are adding new
-// members, try to fit them there before expanding the size of the class.
-static_assert(sizeof(Number) == 16);
-
 constexpr Number::Number(bool negative, InternalRep mantissa, int exponent, Unchecked) noexcept
-    : mantissa_{mantissa}, exponent_{exponent}, negative_(negative)
+    : negative_(negative), mantissa_{mantissa}, exponent_{exponent}
 {
 }

@@ -105,6 +105,16 @@ public:
        std::vector<UInt256> const& amendments,
        Family& family);

+    /**
+     * Create a ledger from a header whose maps are filled in afterwards.
+     *
+     * Both maps start Synching against the hashes the header carries, which are
+     * input rather than derived, so setImmutable() leaves them alone.
+     *
+     * @param info The header to build from.
+     * @param rules The rules in force.
+     * @param family The SHAMap family the maps belong to.
+     */
    Ledger(LedgerHeader const& info, Rules rules, Family& family);

    /**
@@ -278,23 +288,25 @@ public:
    /**
     * Mark this ledger as immutable, so it can no longer be modified.
     *
-     * A ledger built or loaded locally cannot have an invalid map, since only
-     * a map syncing against hashes from outside can be proven impossible (see
-     * SHAMap::addKnownNode), so a caller on such a path may treat a false
-     * return as a broken internal invariant. A caller assembling a ledger from
-     * peer data may not: for it, false is an outcome a peer can produce.
+     * Only a map syncing against hashes from outside can be found unsound (see
+     * SHAMap::addKnownNode), so a caller whose ledger was built or loaded
+     * locally treats a false return as a broken internal invariant.
     *
     * @param rehash Whether to recompute the ledger hash from the header
     *        fields. The transaction and account hashes are recomputed from the
-     *        maps too, but only the first time.
+     *        maps too, but only the first time and only if the header did not
+     *        supply them.
     * @return false if either map is Invalid, leaving the immutable flag as it
-     *         was and the header untouched. A map invalidated partway through can
-     *         still leave the other one immutable, so a false return means the
-     *         ledger must be discarded rather than retried.
+     *         was and the header untouched. The ledger must then be discarded
+     *         rather than retried, since one map may already be immutable.
     */
    [[nodiscard]] bool
    setImmutable(bool rehash = true);

+    /**
+     * @return Whether both maps have been settled, so the ledger can no longer
+     *         change.
+     */
    bool
    isImmutable() const
    {
@@ -470,6 +482,15 @@ private:

    bool immutable_;

+    /**
+     * Whether the header supplied the transaction and account hashes, so they
+     * must not be derived from the maps.
+     *
+     * True only for a ledger built from a header, which stays verified against
+     * the hash it was asked for. Fixed at construction, unlike immutable_.
+     */
+    bool const mapHashesFromHeader_ = false;
+
    // A SHAMap containing the transactions associated with this ledger.
    SHAMap mutable txMap_;

@@ -0,0 +1,36 @@
+#pragma once
+
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/ledger/ApplyView.h>
+#include <xrpl/ledger/ReadView.h>
+#include <xrpl/ledger/entries/SLEBase.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/STXChainBridge.h>
+
+namespace xrpl {
+
+template <typename ViewT>
+class BridgeEntry : public SLEBase<ViewT, ltBRIDGE>
+{
+public:
+    using Base = SLEBase<ViewT, ltBRIDGE>;
+
+    // Inherit base constructors: adopt an existing SLE, or resolve one from a
+    // Keylet against the view.
+    using Base::Base;
+
+    explicit BridgeEntry(
+        STXChainBridge const& bridge,
+        STXChainBridge::ChainType chainType,
+        Base::ViewRefType view,
+        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
+        : Base(keylet::bridge(bridge, chainType), view, j)
+    {
+    }
+};
+
+using BridgeEntryR = BridgeEntry<ReadView>;
+using BridgeEntryW = BridgeEntry<ApplyView>;
+
+}  // namespace xrpl
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/ledger/ApplyView.h>
+#include <xrpl/ledger/ReadView.h>
+#include <xrpl/ledger/entries/SLEBase.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/STXChainBridge.h>
+
+#include <cstdint>
+
+namespace xrpl {
+
+template <typename ViewT>
+class XChainOwnedClaimIDEntry : public SLEBase<ViewT, ltXCHAIN_OWNED_CLAIM_ID>
+{
+public:
+    using Base = SLEBase<ViewT, ltXCHAIN_OWNED_CLAIM_ID>;
+
+    // Inherit base constructors: adopt an existing SLE, or resolve one from a
+    // Keylet against the view.
+    using Base::Base;
+
+    explicit XChainOwnedClaimIDEntry(
+        STXChainBridge const& bridge,
+        std::uint64_t seq,
+        Base::ViewRefType view,
+        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
+        : Base(keylet::xChainClaimID(bridge, seq), view, j)
+    {
+    }
+};
+
+using XChainOwnedClaimIDEntryR = XChainOwnedClaimIDEntry<ReadView>;
+using XChainOwnedClaimIDEntryW = XChainOwnedClaimIDEntry<ApplyView>;
+
+}  // namespace xrpl
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/ledger/ApplyView.h>
+#include <xrpl/ledger/ReadView.h>
+#include <xrpl/ledger/entries/SLEBase.h>
+#include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/STXChainBridge.h>
+
+#include <cstdint>
+
+namespace xrpl {
+
+template <typename ViewT>
+class XChainOwnedCreateAccountClaimIDEntry
+    : public SLEBase<ViewT, ltXCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID>
+{
+public:
+    using Base = SLEBase<ViewT, ltXCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID>;
+
+    // Inherit base constructors: adopt an existing SLE, or resolve one from a
+    // Keylet against the view.
+    using Base::Base;
+
+    explicit XChainOwnedCreateAccountClaimIDEntry(
+        STXChainBridge const& bridge,
+        std::uint64_t seq,
+        Base::ViewRefType view,
+        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
+        : Base(keylet::xChainCreateAccountClaimID(bridge, seq), view, j)
+    {
+    }
+};
+
+using XChainOwnedCreateAccountClaimIDEntryR = XChainOwnedCreateAccountClaimIDEntry<ReadView>;
+using XChainOwnedCreateAccountClaimIDEntryW = XChainOwnedCreateAccountClaimIDEntry<ApplyView>;
+
+}  // namespace xrpl
@@ -14,7 +14,6 @@
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Concepts.h>
 #include <xrpl/protocol/Feature.h>
-#include <xrpl/protocol/Fees.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Issue.h>
 #include <xrpl/protocol/Keylet.h>
@@ -28,8 +27,6 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/UintTypes.h>

-#include <cstdint>
-
 namespace xrpl {

 /**
@@ -563,54 +560,4 @@ escrowUnlockApplyHelper<MPTIssue>(
        journal);
 }

-/**
- * Smart escrow kill switches, driven by the voted FeeSettings.
- *
- * Zeroing `bytecodeSizeLimit` stops new uploads while leaving existing escrows
- * finishable without forcing holders to wait for `CancelAfter`.
- * Zeroing `gasLimit` stops both.
- */
-/** @{ */
-inline bool
-isBytecodeUploadDisabled(Fees const& fees)
-{
-    return fees.bytecodeSizeLimit == 0 || fees.gasLimit == 0;
-}
-
-inline bool
-isBytecodeExecutionDisabled(Fees const& fees)
-{
-    return fees.gasLimit == 0;
-}
-/** @} */
-
-/**
- * Owner count an escrow costs.
- *
- *  An escrow costs one increment per started 500 bytes of bytecode, and one
- *  increment if it carries no bytecode.
- */
-template <class T>
-int32_t
-calculateAdditionalReserve(T const& finishFunction)
-{
-    static auto constexpr kBytecodeReserveIncrement = 500;
-
-    if (!finishFunction)
-        return 1;
-
-    auto const size = finishFunction->size();
-    if (size == 0)
-    {
-        // LCOV_EXCL_START
-        // Empty Bytecode is refused at create, so no escrow carries it. Ceiling
-        // division would answer 0, which would subtract less than the create added.
-        UNREACHABLE("xrpl::calculateAdditionalReserve : empty Bytecode");
-        return 1;
-        // LCOV_EXCL_STOP
-    }
-
-    return static_cast<int32_t>((size + kBytecodeReserveIncrement - 1) / kBytecodeReserveIncrement);
-}
-
 }  // namespace xrpl
@@ -142,11 +142,11 @@ deleteProposal(ApplyView& view, SLE::pointer const& sleProposal, beast::Journal
 * off-ledger signatures it carries, and any change to a non-signature field
 * results in a false-return value.
 *
- * Signature (PaymentChannelClaim) is deliberately not compared: it is
- * outside the account's own TxnSignature even for an ordinary submission, so
- * a proposal cannot bind it more tightly than the signatures it collects do,
- * and that transactor still validates a substituted value exactly as it would
- * for an ordinary submission.
+ * Signature (PaymentChannelClaim and the XChain attestation transactions)
+ * is deliberately not compared: it is outside the account's own TxnSignature
+ * even for an ordinary submission, so a proposal cannot bind it more tightly
+ * than the signatures it collects do, and those transactors still validate a
+ * substituted value exactly as they would for an ordinary submission.
 * MasterSignature appears in no transaction format.
 *
 * @param proposedTx The proposal's ProposedTransaction field.
@@ -74,6 +74,12 @@ invalidAMMAssetPair(
 std::optional<std::uint8_t>
 ammAuctionTimeSlot(std::uint64_t current, STObject const& auctionSlot);

+/**
+ * Return true if required AMM amendment is enabled
+ */
+bool
+ammEnabled(Rules const&);
+
 /**
 * Convert to the fee from the basis points
 * @param tfee  trading fee in {0, 1000}
@@ -6,6 +6,10 @@

 namespace xrpl {

+// Deprecated constant for backwards compatibility with pre-XRPFees amendment.
+// This was the reference fee units used in the old fee calculation.
+inline constexpr std::uint32_t kFeeUnitsDeprecated = 10;
+
 // Number of micro-drops in one drop.
 inline constexpr std::uint32_t microDropsPerDrop{1'000'000};

@@ -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>

@@ -320,6 +321,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;

@@ -103,32 +103,6 @@ enum LedgerEntryType : std::uint16_t {
     */
    ltGENERATOR_MAP [[deprecated("This object type is not supported and should not be used.")]] =
        0x0067,
-
-    /**
-     * A deprecated type, removed with the XChainBridge amendment.
-     *
-     * @deprecated **This object type is not supported and should not be used.**
-     *             The XChainBridge amendment was never enabled on Mainnet.
-     */
-    ltBRIDGE [[deprecated("This object type is not supported and should not be used.")]] = 0x0069,
-
-    /**
-     * A deprecated type, removed with the XChainBridge amendment.
-     *
-     * @deprecated **This object type is not supported and should not be used.**
-     *             The XChainBridge amendment was never enabled on Mainnet.
-     */
-    ltXCHAIN_OWNED_CLAIM_ID
-    [[deprecated("This object type is not supported and should not be used.")]] = 0x0071,
-
-    /**
-     * A deprecated type, removed with the XChainBridge amendment.
-     *
-     * @deprecated **This object type is not supported and should not be used.**
-     *             The XChainBridge amendment was never enabled on Mainnet.
-     */
-    ltXCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID
-    [[deprecated("This object type is not supported and should not be used.")]] = 0x0074,
 };

 /**
@@ -398,11 +398,6 @@ constexpr std::uint32_t kMaxInvestmentPeriod = std::chrono::seconds{std::chrono:
 */
 constexpr std::uint8_t kMaxAssetCheckDepth = 5;

-/**
- * Maximum length of a Data field in Escrow object that can be updated by WASM code.
- */
-constexpr std::size_t kMaxWasmDataLength = 1 * 1024;  // 1KB
-
 /**
 * A ledger index.
 */
@@ -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 reserved */                          \
+    STYPE(STI_XCHAIN_BRIDGE, 25)                  \
    STYPE(STI_CURRENCY, 26)                       \
                                                  \
    /* high-level types */                        \
@@ -360,6 +361,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>;
 // NOLINTEND(readability-identifier-naming)

 //------------------------------------------------------------------------------
@@ -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>
@@ -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
@@ -133,6 +133,7 @@ enum TEMcodes : TERUnderlyingType {
    temBAD_MPT,
    temBAD_CIPHERTEXT,
    temINVALID_BYTECODE,
+    temTEMP_DISABLED,
 };

 //------------------------------------------------------------------------------
@@ -183,8 +184,6 @@ enum TEFcodes : TERUnderlyingType {
    tefBAD_PATH_COUNT,
    tefNO_BYTECODE,
    tefBYTECODE_NOT_INCLUDED,
-    tefTEMP_DISABLED,
-    tefEXCEEDS_LIMIT,
 };

 //------------------------------------------------------------------------------
@@ -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),                                                                                                      \
@@ -73,54 +73,6 @@ enum TxType : std::uint16_t
     * This transaction type installs a hook.
     */
    TtHookSet [[maybe_unused]] = 22,
-
-    /**
-     * This transaction type was removed with the XChainBridge amendment, which was never enabled
-     * on Mainnet. The value is reserved for historical purposes.
-     */
-    TtXChainCreateClaimID [[deprecated("This transaction type is not supported and should not be used.")]] = 41,
-
-    /**
-     * This transaction type was removed with the XChainBridge amendment, which was never enabled
-     * on Mainnet. The value is reserved for historical purposes.
-     */
-    TtXChainCommit [[deprecated("This transaction type is not supported and should not be used.")]] = 42,
-
-    /**
-     * This transaction type was removed with the XChainBridge amendment, which was never enabled
-     * on Mainnet. The value is reserved for historical purposes.
-     */
-    TtXChainClaim [[deprecated("This transaction type is not supported and should not be used.")]] = 43,
-
-    /**
-     * This transaction type was removed with the XChainBridge amendment, which was never enabled
-     * on Mainnet. The value is reserved for historical purposes.
-     */
-    TtXChainAccountCreateCommit [[deprecated("This transaction type is not supported and should not be used.")]] = 44,
-
-    /**
-     * This transaction type was removed with the XChainBridge amendment, which was never enabled
-     * on Mainnet. The value is reserved for historical purposes.
-     */
-    TtXChainAddClaimAttestation [[deprecated("This transaction type is not supported and should not be used.")]] = 45,
-
-    /**
-     * This transaction type was removed with the XChainBridge amendment, which was never enabled
-     * on Mainnet. The value is reserved for historical purposes.
-     */
-    TtXChainAddAccountCreateAttestation [[deprecated("This transaction type is not supported and should not be used.")]] = 46,
-
-    /**
-     * This transaction type was removed with the XChainBridge amendment, which was never enabled
-     * on Mainnet. The value is reserved for historical purposes.
-     */
-    TtXChainModifyBridge [[deprecated("This transaction type is not supported and should not be used.")]] = 47,
-
-    /**
-     * This transaction type was removed with the XChainBridge amendment, which was never enabled
-     * on Mainnet. The value is reserved for historical purposes.
-     */
-    TtXChainCreateBridge [[deprecated("This transaction type is not supported and should not be used.")]] = 48,
 };
 // clang-format on

@@ -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
@@ -62,9 +62,14 @@ XRPL_FIX    (EnforceNFTokenTrustline,    Supported::Yes, VoteBehavior::DefaultNo
 XRPL_FIX    (ReducedOffersV2,            Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(NFTokenMintOffer,           Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (PreviousTxnID,              Supported::Yes, VoteBehavior::DefaultNo)
+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::DefaultNo)
+XRPL_FEATURE(AMM,                        Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(XRPFees,                    Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (RemoveNFTokenAutoTrustLine, Supported::Yes, VoteBehavior::DefaultYes)

 // The following amendments are obsolete, but must remain supported
@@ -80,9 +85,6 @@ XRPL_FIX    (RemoveNFTokenAutoTrustLine, Supported::Yes, VoteBehavior::DefaultYe
 // to vote for it, the feature can be removed entirely from the code. Until
 // then the feature needs to be marked explicitly as obsolete, e.g.
 // XRPL_FEATURE(Example, Supported::yes, VoteBehavior::Obsolete)
-XRPL_FEATURE(XChainBridge,               Supported::Yes, VoteBehavior::Obsolete)
-XRPL_FIX    (XChainRewardRounding,       Supported::Yes, VoteBehavior::Obsolete)
-
 // The following amendments have been active for at least two years. Their
 // pre-amendment code has been removed and the identifiers are deprecated.
 // All known amendments and amendments that may appear in a validated ledger
@@ -107,7 +109,6 @@ XRPL_RETIRE_FIX(AMMOverflowOffer)
 XRPL_RETIRE_FIX(AMMv1_1)
 XRPL_RETIRE_FIX(CheckThreading)
 XRPL_RETIRE_FIX(DisallowIncomingV1)
-XRPL_RETIRE_FIX(FillOrKill)
 XRPL_RETIRE_FIX(InnerObjTemplate)
 XRPL_RETIRE_FIX(MasterKeyAsRegularKey)
 XRPL_RETIRE_FIX(NonFungibleTokensV1_2)
@@ -122,7 +123,6 @@ XRPL_RETIRE_FIX(TakerDryOfferRemoval)
 XRPL_RETIRE_FIX(TrustLinesToSelf)
 XRPL_RETIRE_FIX(UniversalNumber)

-XRPL_RETIRE_FEATURE(AMM)
 XRPL_RETIRE_FEATURE(Checks)
 XRPL_RETIRE_FEATURE(CheckCashMakesTrustLine)
 XRPL_RETIRE_FEATURE(Clawback)
@@ -151,4 +151,3 @@ XRPL_RETIRE_FEATURE(SortedDirectories)
 XRPL_RETIRE_FEATURE(TicketBatch)
 XRPL_RETIRE_FEATURE(TickSize)
 XRPL_RETIRE_FEATURE(TrustSetAuth)
-XRPL_RETIRE_FEATURE(XRPFees)
@@ -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
@@ -285,6 +318,20 @@ LEDGER_ENTRY(ltFEE_SETTINGS, 0x0073, FeeSettings, fee, ({
    {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
@@ -5,9 +5,6 @@
 #error "undefined macro: TYPED_SFIELD"
 #endif

-// A code marked "reserved" is not assigned to a field. Do not reuse a reserved
-// code until a year or two after its field was removed, so that no supported
-// release or tool still knows the old meaning.

 // untyped
 UNTYPED_SFIELD(sfLedgerEntry,            LEDGERENTRY, 257)
@@ -26,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 reserved
+// 18 unused
+TYPED_SFIELD(sfWasLockingChainSend,      UINT8,     19)
 TYPED_SFIELD(sfWithdrawalPolicy,         UINT8,     20)
 TYPED_SFIELD(sfContractResult,           UINT8,     21)
 TYPED_SFIELD(sfVaultKind,                UINT8,     22)
@@ -41,7 +39,7 @@ TYPED_SFIELD(sfDiscountedFee,            UINT16,     6)

 // 16-bit integers (uncommon)
 TYPED_SFIELD(sfVersion,                  UINT16,    16)
-// 17 to 20 reserved
+// 17 to 20 unused
 TYPED_SFIELD(sfLedgerFixType,            UINT16,    21)
 TYPED_SFIELD(sfManagementFeeRate,        UINT16,    22) // 1/10 basis points (bips)

@@ -92,7 +90,7 @@ TYPED_SFIELD(sfTicketSequence,           UINT32,    41)
 TYPED_SFIELD(sfNFTokenTaxon,             UINT32,    42)
 TYPED_SFIELD(sfMintedNFTokens,           UINT32,    43)
 TYPED_SFIELD(sfBurnedNFTokens,           UINT32,    44)
-// 45 to 47 reserved
+// 45 to 47 unused
 TYPED_SFIELD(sfVoteWeight,               UINT32,    48)
 TYPED_SFIELD(sfFirstNFTokenSequence,     UINT32,    50)
 TYPED_SFIELD(sfOracleDocumentID,         UINT32,    51)
@@ -147,9 +145,11 @@ TYPED_SFIELD(sfNFTokenOfferNode,         UINT64,    12)
 TYPED_SFIELD(sfEmitBurden,               UINT64,    13)

 // 64-bit integers (uncommon)
-// 16 to 18 reserved
+// 16 to 18 unused
 TYPED_SFIELD(sfReferenceCount,           UINT64,    19)
-// 20 to 22 reserved
+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)
@@ -199,7 +199,7 @@ TYPED_SFIELD(sfBookDirectory,            UINT256,   16)
 TYPED_SFIELD(sfInvoiceID,                UINT256,   17)
 TYPED_SFIELD(sfNickname,                 UINT256,   18)
 TYPED_SFIELD(sfAmendment,                UINT256,   19)
-//                                                  20 reserved
+//                                                  20 unused
 TYPED_SFIELD(sfDigest,                   UINT256,   21)
 TYPED_SFIELD(sfChannel,                  UINT256,   22)
 TYPED_SFIELD(sfConsensusHash,            UINT256,   23)
@@ -209,7 +209,7 @@ TYPED_SFIELD(sfPreviousPageMin,          UINT256,   26)
 TYPED_SFIELD(sfNextPageMin,              UINT256,   27)
 TYPED_SFIELD(sfNFTokenBuyOffer,          UINT256,   28)
 TYPED_SFIELD(sfNFTokenSellOffer,         UINT256,   29)
-// 30 to 33 reserved
+// 30 to 33 unused
 TYPED_SFIELD(sfDomainID,                 UINT256,   34)
 TYPED_SFIELD(sfVaultID,                  UINT256,   35,
    SField::kSmdPseudoAccount | SField::kSmdDefault)
@@ -268,7 +268,7 @@ TYPED_SFIELD(sfMinimumOffer,             AMOUNT,    16)
 TYPED_SFIELD(sfRippleEscrow,             AMOUNT,    17)
 TYPED_SFIELD(sfDeliveredAmount,          AMOUNT,    18)
 TYPED_SFIELD(sfNFTokenBrokerFee,         AMOUNT,    19)
-// 20 to 21 reserved
+// 20 to 21 unused
 // currency amount (fees)
 TYPED_SFIELD(sfBaseFeeDrops,             AMOUNT,    22)
 TYPED_SFIELD(sfReserveBaseDrops,         AMOUNT,    23)
@@ -279,7 +279,8 @@ TYPED_SFIELD(sfLPTokenOut,               AMOUNT,    25)
 TYPED_SFIELD(sfLPTokenIn,                AMOUNT,    26)
 TYPED_SFIELD(sfEPrice,                   AMOUNT,    27)
 TYPED_SFIELD(sfPrice,                    AMOUNT,    28)
-// 29 to 30 reserved
+TYPED_SFIELD(sfSignatureReward,          AMOUNT,    29)
+TYPED_SFIELD(sfMinAccountCreateAmount,   AMOUNT,    30)
 TYPED_SFIELD(sfLPTokenBalance,           AMOUNT,    31)
 TYPED_SFIELD(sfFeeAmount,                AMOUNT,    32)
 TYPED_SFIELD(sfMaxFee,                   AMOUNT,    33)
@@ -308,7 +309,7 @@ TYPED_SFIELD(sfMasterSignature,          VL,        18, SField::kSmdDefault, SFi
 TYPED_SFIELD(sfUNLModifyValidator,       VL,        19)
 TYPED_SFIELD(sfValidatorToDisable,       VL,        20)
 TYPED_SFIELD(sfValidatorToReEnable,      VL,        21)
-// 22 to 25 reserved
+// 22 to 25 unused
 TYPED_SFIELD(sfDIDDocument,              VL,        26)
 TYPED_SFIELD(sfData,                     VL,        27)
 TYPED_SFIELD(sfAssetClass,               VL,        28)
@@ -342,7 +343,7 @@ TYPED_SFIELD(sfDestination,              ACCOUNT,    3)
 TYPED_SFIELD(sfIssuer,                   ACCOUNT,    4)
 TYPED_SFIELD(sfAuthorize,                ACCOUNT,    5)
 TYPED_SFIELD(sfUnauthorize,              ACCOUNT,    6)
-//                                                   7 reserved
+//                                                   7 unused
 TYPED_SFIELD(sfRegularKey,               ACCOUNT,    8)
 TYPED_SFIELD(sfNFTokenMinter,            ACCOUNT,    9)
 TYPED_SFIELD(sfEmitCallback,             ACCOUNT,   10)
@@ -350,7 +351,13 @@ TYPED_SFIELD(sfHolder,                   ACCOUNT,   11)
 TYPED_SFIELD(sfDelegate,                 ACCOUNT,   12)

 // account (uncommon)
-// 16 to 23 reserved
+// 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)
@@ -376,10 +383,14 @@ TYPED_SFIELD(sfBaseAsset,                CURRENCY,   1)
 TYPED_SFIELD(sfQuoteAsset,               CURRENCY,   2)

 // issue
-// 1 to 2 reserved
+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)
@@ -394,19 +405,22 @@ UNTYPED_SFIELD(sfMemo,                   OBJECT,    10)
 UNTYPED_SFIELD(sfSignerEntry,            OBJECT,    11)
 UNTYPED_SFIELD(sfNFToken,                OBJECT,    12)
 UNTYPED_SFIELD(sfEmitDetails,            OBJECT,    13)
-// 14 reserved
+// 14 unused
 UNTYPED_SFIELD(sfPermission,             OBJECT,    15)

 // inner object (uncommon)
 UNTYPED_SFIELD(sfSigner,                 OBJECT,    16)
-//                                                  17 reserved
+//                                                  17 unused
 UNTYPED_SFIELD(sfMajority,               OBJECT,    18)
 UNTYPED_SFIELD(sfDisabledValidator,      OBJECT,    19)
-// 20 to 24 reserved
+// 20 to 24 unused
 UNTYPED_SFIELD(sfVoteEntry,              OBJECT,    25)
 UNTYPED_SFIELD(sfAuctionSlot,            OBJECT,    26)
 UNTYPED_SFIELD(sfAuthAccount,            OBJECT,    27)
-// 28 to 31 reserved
+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)
@@ -428,14 +442,17 @@ UNTYPED_SFIELD(sfSufficient,             ARRAY,      7)
 UNTYPED_SFIELD(sfAffectedNodes,          ARRAY,      8)
 UNTYPED_SFIELD(sfMemos,                  ARRAY,      9)
 UNTYPED_SFIELD(sfNFTokens,               ARRAY,     10)
-// 11 reserved
+// 11 unused
 UNTYPED_SFIELD(sfVoteSlots,              ARRAY,     12)
 UNTYPED_SFIELD(sfAdditionalBooks,        ARRAY,     13)

 // array of objects (uncommon)
 UNTYPED_SFIELD(sfMajorities,             ARRAY,     16)
 UNTYPED_SFIELD(sfDisabledValidators,     ARRAY,     17)
-// 18 to 23 reserved
+// 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)
@@ -372,6 +372,7 @@ TRANSACTION(ttAMM_CLAWBACK, 31, AMMClawback,
 TRANSACTION(ttAMM_CREATE, 35, AMMCreate,
    ({
        .delegable = Delegation::Delegable,
+        .amendment = featureAMM,
        .privileges = Privilege::CreatePseudoAcct | Privilege::MayCreateMpt,
    }),
    ({
@@ -385,7 +386,7 @@ TRANSACTION(ttAMM_CREATE, 35, AMMCreate,
 #   include <xrpl/tx/transactors/dex/AMMDeposit.h>
 #endif
 TRANSACTION(ttAMM_DEPOSIT, 36, AMMDeposit,
-    ({.delegable = Delegation::Delegable}),
+    ({.delegable = Delegation::Delegable, .amendment = featureAMM}),
    ({
    {sfAsset, SoeRequired, SoeMptSupported},
    {sfAsset2, SoeRequired, SoeMptSupported},
@@ -403,6 +404,7 @@ TRANSACTION(ttAMM_DEPOSIT, 36, AMMDeposit,
 TRANSACTION(ttAMM_WITHDRAW, 37, AMMWithdraw,
    ({
        .delegable = Delegation::Delegable,
+        .amendment = featureAMM,
        .privileges = Privilege::MayDeleteAcct | Privilege::MayAuthorizeMpt,
    }),
    ({
@@ -419,7 +421,7 @@ TRANSACTION(ttAMM_WITHDRAW, 37, AMMWithdraw,
 #   include <xrpl/tx/transactors/dex/AMMVote.h>
 #endif
 TRANSACTION(ttAMM_VOTE, 38, AMMVote,
-    ({.delegable = Delegation::Delegable}),
+    ({.delegable = Delegation::Delegable, .amendment = featureAMM}),
    ({
    {sfAsset, SoeRequired, SoeMptSupported},
    {sfAsset2, SoeRequired, SoeMptSupported},
@@ -431,7 +433,7 @@ TRANSACTION(ttAMM_VOTE, 38, AMMVote,
 #   include <xrpl/tx/transactors/dex/AMMBid.h>
 #endif
 TRANSACTION(ttAMM_BID, 39, AMMBid,
-    ({.delegable = Delegation::Delegable}),
+    ({.delegable = Delegation::Delegable, .amendment = featureAMM}),
    ({
    {sfAsset, SoeRequired, SoeMptSupported},
    {sfAsset2, SoeRequired, SoeMptSupported},
@@ -447,6 +449,7 @@ TRANSACTION(ttAMM_BID, 39, AMMBid,
 TRANSACTION(ttAMM_DELETE, 40, AMMDelete,
    ({
        .delegable = Delegation::Delegable,
+        .amendment = featureAMM,
        .privileges = Privilege::MustDeleteAcct | Privilege::MayDeleteMpt,
    }),
    ({
@@ -454,7 +457,111 @@ TRANSACTION(ttAMM_DELETE, 40, AMMDelete,
    {sfAsset2, SoeRequired, SoeMptSupported},
 }))

-// 41 to 48 deprecated
+/** 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
@@ -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
@@ -262,6 +263,7 @@ JSS(fee_base);                       // out: NetworkOPs
 JSS(fee_div_max);                    // in: TransactionSign
 JSS(fee_level);                      // out: AccountInfo
 JSS(fee_mult_max);                   // in: TransactionSign
+JSS(fee_ref);                        // out: NetworkOPs, DEPRECATED
 JSS(fetch_pack);                     // out: NetworkOPs
 JSS(FIELDS);                         // out: RPC server_definitions
                                     // matches definitions.json format
@@ -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>
@@ -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
@@ -0,0 +1,314 @@
+// 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 XChainOwnedClaimIDBuilder;
+
+/**
+ * @brief Ledger Entry: XChainOwnedClaimID
+ *
+ * Type: ltXCHAIN_OWNED_CLAIM_ID (0x0071)
+ * RPC Name: xchain_owned_claim_id
+ *
+ * Immutable wrapper around SLE providing type-safe field access.
+ * Use XChainOwnedClaimIDBuilder to construct new ledger entries.
+ */
+class XChainOwnedClaimID : public LedgerEntryBase
+{
+public:
+    static constexpr LedgerEntryType entryType = ltXCHAIN_OWNED_CLAIM_ID;
+
+    /**
+     * @brief Construct a XChainOwnedClaimID ledger entry wrapper from an existing SLE object.
+     * @throws std::runtime_error if the ledger entry type doesn't match.
+     */
+    explicit XChainOwnedClaimID(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 XChainOwnedClaimID");
+        }
+    }
+
+    // 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 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 sfOtherChainSource (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_ACCOUNT::type::value_type
+    getOtherChainSource() const
+    {
+        return this->sle_->at(sfOtherChainSource);
+    }
+
+    /**
+     * @brief Get sfXChainClaimAttestations (SoeRequired)
+     * @note This is an untyped field (unknown).
+     * @return The field value.
+     */
+    [[nodiscard]]
+    STArray const&
+    getXChainClaimAttestations() const
+    {
+        return this->sle_->getFieldArray(sfXChainClaimAttestations);
+    }
+
+    /**
+     * @brief Get sfSignatureReward (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_AMOUNT::type::value_type
+    getSignatureReward() const
+    {
+        return this->sle_->at(sfSignatureReward);
+    }
+
+    /**
+     * @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 XChainOwnedClaimID 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 XChainOwnedClaimIDBuilder : public LedgerEntryBuilderBase<XChainOwnedClaimIDBuilder>
+{
+public:
+    /**
+     * @brief Construct a new XChainOwnedClaimIDBuilder with required fields.
+     * @param account The sfAccount field value.
+     * @param xChainBridge The sfXChainBridge field value.
+     * @param xChainClaimID The sfXChainClaimID field value.
+     * @param otherChainSource The sfOtherChainSource field value.
+     * @param xChainClaimAttestations The sfXChainClaimAttestations field value.
+     * @param signatureReward The sfSignatureReward field value.
+     * @param ownerNode The sfOwnerNode field value.
+     * @param previousTxnID The sfPreviousTxnID field value.
+     * @param previousTxnLgrSeq The sfPreviousTxnLgrSeq field value.
+     */
+    XChainOwnedClaimIDBuilder(std::decay_t<typename SF_ACCOUNT::type::value_type> const& account,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_ACCOUNT::type::value_type> const& otherChainSource,STArray const& xChainClaimAttestations,std::decay_t<typename SF_AMOUNT::type::value_type> const& signatureReward,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<XChainOwnedClaimIDBuilder>(ltXCHAIN_OWNED_CLAIM_ID)
+    {
+        setAccount(account);
+        setXChainBridge(xChainBridge);
+        setXChainClaimID(xChainClaimID);
+        setOtherChainSource(otherChainSource);
+        setXChainClaimAttestations(xChainClaimAttestations);
+        setSignatureReward(signatureReward);
+        setOwnerNode(ownerNode);
+        setPreviousTxnID(previousTxnID);
+        setPreviousTxnLgrSeq(previousTxnLgrSeq);
+    }
+
+    /**
+     * @brief Construct a XChainOwnedClaimIDBuilder 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.
+     */
+    XChainOwnedClaimIDBuilder(SLE::const_pointer sle)
+    {
+        if (sle->at(sfLedgerEntryType) != ltXCHAIN_OWNED_CLAIM_ID)
+        {
+            throw std::runtime_error("Invalid ledger entry type for XChainOwnedClaimID");
+        }
+        object_ = *sle;
+    }
+
+    /**
+     * @brief Ledger entry-specific field setters
+     */
+
+    /**
+     * @brief Set sfAccount (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainOwnedClaimIDBuilder&
+    setAccount(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
+    {
+        object_[sfAccount] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfXChainBridge (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainOwnedClaimIDBuilder&
+    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.
+     */
+    XChainOwnedClaimIDBuilder&
+    setXChainClaimID(std::decay_t<typename SF_UINT64::type::value_type> const& value)
+    {
+        object_[sfXChainClaimID] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfOtherChainSource (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainOwnedClaimIDBuilder&
+    setOtherChainSource(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
+    {
+        object_[sfOtherChainSource] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfXChainClaimAttestations (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainOwnedClaimIDBuilder&
+    setXChainClaimAttestations(STArray const& value)
+    {
+        object_.setFieldArray(sfXChainClaimAttestations, value);
+        return *this;
+    }
+
+    /**
+     * @brief Set sfSignatureReward (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainOwnedClaimIDBuilder&
+    setSignatureReward(std::decay_t<typename SF_AMOUNT::type::value_type> const& value)
+    {
+        object_[sfSignatureReward] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfOwnerNode (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainOwnedClaimIDBuilder&
+    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.
+     */
+    XChainOwnedClaimIDBuilder&
+    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.
+     */
+    XChainOwnedClaimIDBuilder&
+    setPreviousTxnLgrSeq(std::decay_t<typename SF_UINT32::type::value_type> const& value)
+    {
+        object_[sfPreviousTxnLgrSeq] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Build and return the completed XChainOwnedClaimID wrapper.
+     * @param index The ledger entry index.
+     * @return The constructed ledger entry wrapper.
+     */
+    XChainOwnedClaimID
+    build(UInt256 const& index)
+    {
+        return XChainOwnedClaimID{std::make_shared<SLE>(std::move(object_), index)};
+    }
+};
+
+}  // namespace xrpl::ledger_entries
@@ -0,0 +1,266 @@
+// 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 XChainOwnedCreateAccountClaimIDBuilder;
+
+/**
+ * @brief Ledger Entry: XChainOwnedCreateAccountClaimID
+ *
+ * Type: ltXCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID (0x0074)
+ * RPC Name: xchain_owned_create_account_claim_id
+ *
+ * Immutable wrapper around SLE providing type-safe field access.
+ * Use XChainOwnedCreateAccountClaimIDBuilder to construct new ledger entries.
+ */
+class XChainOwnedCreateAccountClaimID : public LedgerEntryBase
+{
+public:
+    static constexpr LedgerEntryType entryType = ltXCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID;
+
+    /**
+     * @brief Construct a XChainOwnedCreateAccountClaimID ledger entry wrapper from an existing SLE object.
+     * @throws std::runtime_error if the ledger entry type doesn't match.
+     */
+    explicit XChainOwnedCreateAccountClaimID(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 XChainOwnedCreateAccountClaimID");
+        }
+    }
+
+    // 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 sfXChainBridge (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_XCHAIN_BRIDGE::type::value_type
+    getXChainBridge() const
+    {
+        return this->sle_->at(sfXChainBridge);
+    }
+
+    /**
+     * @brief Get sfXChainAccountCreateCount (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_UINT64::type::value_type
+    getXChainAccountCreateCount() const
+    {
+        return this->sle_->at(sfXChainAccountCreateCount);
+    }
+
+    /**
+     * @brief Get sfXChainCreateAccountAttestations (SoeRequired)
+     * @note This is an untyped field (unknown).
+     * @return The field value.
+     */
+    [[nodiscard]]
+    STArray const&
+    getXChainCreateAccountAttestations() const
+    {
+        return this->sle_->getFieldArray(sfXChainCreateAccountAttestations);
+    }
+
+    /**
+     * @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 XChainOwnedCreateAccountClaimID 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 XChainOwnedCreateAccountClaimIDBuilder : public LedgerEntryBuilderBase<XChainOwnedCreateAccountClaimIDBuilder>
+{
+public:
+    /**
+     * @brief Construct a new XChainOwnedCreateAccountClaimIDBuilder with required fields.
+     * @param account The sfAccount field value.
+     * @param xChainBridge The sfXChainBridge field value.
+     * @param xChainAccountCreateCount The sfXChainAccountCreateCount field value.
+     * @param xChainCreateAccountAttestations The sfXChainCreateAccountAttestations field value.
+     * @param ownerNode The sfOwnerNode field value.
+     * @param previousTxnID The sfPreviousTxnID field value.
+     * @param previousTxnLgrSeq The sfPreviousTxnLgrSeq field value.
+     */
+    XChainOwnedCreateAccountClaimIDBuilder(std::decay_t<typename SF_ACCOUNT::type::value_type> const& account,std::decay_t<typename SF_XCHAIN_BRIDGE::type::value_type> const& xChainBridge,std::decay_t<typename SF_UINT64::type::value_type> const& xChainAccountCreateCount,STArray const& xChainCreateAccountAttestations,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<XChainOwnedCreateAccountClaimIDBuilder>(ltXCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID)
+    {
+        setAccount(account);
+        setXChainBridge(xChainBridge);
+        setXChainAccountCreateCount(xChainAccountCreateCount);
+        setXChainCreateAccountAttestations(xChainCreateAccountAttestations);
+        setOwnerNode(ownerNode);
+        setPreviousTxnID(previousTxnID);
+        setPreviousTxnLgrSeq(previousTxnLgrSeq);
+    }
+
+    /**
+     * @brief Construct a XChainOwnedCreateAccountClaimIDBuilder 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.
+     */
+    XChainOwnedCreateAccountClaimIDBuilder(SLE::const_pointer sle)
+    {
+        if (sle->at(sfLedgerEntryType) != ltXCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID)
+        {
+            throw std::runtime_error("Invalid ledger entry type for XChainOwnedCreateAccountClaimID");
+        }
+        object_ = *sle;
+    }
+
+    /**
+     * @brief Ledger entry-specific field setters
+     */
+
+    /**
+     * @brief Set sfAccount (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainOwnedCreateAccountClaimIDBuilder&
+    setAccount(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
+    {
+        object_[sfAccount] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfXChainBridge (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainOwnedCreateAccountClaimIDBuilder&
+    setXChainBridge(std::decay_t<typename SF_XCHAIN_BRIDGE::type::value_type> const& value)
+    {
+        object_[sfXChainBridge] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfXChainAccountCreateCount (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainOwnedCreateAccountClaimIDBuilder&
+    setXChainAccountCreateCount(std::decay_t<typename SF_UINT64::type::value_type> const& value)
+    {
+        object_[sfXChainAccountCreateCount] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfXChainCreateAccountAttestations (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainOwnedCreateAccountClaimIDBuilder&
+    setXChainCreateAccountAttestations(STArray const& value)
+    {
+        object_.setFieldArray(sfXChainCreateAccountAttestations, value);
+        return *this;
+    }
+
+    /**
+     * @brief Set sfOwnerNode (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainOwnedCreateAccountClaimIDBuilder&
+    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.
+     */
+    XChainOwnedCreateAccountClaimIDBuilder&
+    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.
+     */
+    XChainOwnedCreateAccountClaimIDBuilder&
+    setPreviousTxnLgrSeq(std::decay_t<typename SF_UINT32::type::value_type> const& value)
+    {
+        object_[sfPreviousTxnLgrSeq] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Build and return the completed XChainOwnedCreateAccountClaimID wrapper.
+     * @param index The ledger entry index.
+     * @return The constructed ledger entry wrapper.
+     */
+    XChainOwnedCreateAccountClaimID
+    build(UInt256 const& index)
+    {
+        return XChainOwnedCreateAccountClaimID{std::make_shared<SLE>(std::move(object_), index)};
+    }
+};
+
+}  // namespace xrpl::ledger_entries
@@ -20,7 +20,7 @@ class AMMBidBuilder;
 *
 * Type: ttAMM_BID (39)
 * Delegable: Delegation::Delegable
- * Amendment: UInt256{}
+ * Amendment: featureAMM
 * Privileges: Privilege::NoPriv
 *
 * Immutable wrapper around STTx providing type-safe field access.
@@ -20,7 +20,7 @@ class AMMCreateBuilder;
 *
 * Type: ttAMM_CREATE (35)
 * Delegable: Delegation::Delegable
- * Amendment: UInt256{}
+ * Amendment: featureAMM
 * Privileges: Privilege::CreatePseudoAcct | Privilege::MayCreateMpt
 *
 * Immutable wrapper around STTx providing type-safe field access.
@@ -20,7 +20,7 @@ class AMMDeleteBuilder;
 *
 * Type: ttAMM_DELETE (40)
 * Delegable: Delegation::Delegable
- * Amendment: UInt256{}
+ * Amendment: featureAMM
 * Privileges: Privilege::MustDeleteAcct | Privilege::MayDeleteMpt
 *
 * Immutable wrapper around STTx providing type-safe field access.
@@ -20,7 +20,7 @@ class AMMDepositBuilder;
 *
 * Type: ttAMM_DEPOSIT (36)
 * Delegable: Delegation::Delegable
- * Amendment: UInt256{}
+ * Amendment: featureAMM
 * Privileges: Privilege::NoPriv
 *
 * Immutable wrapper around STTx providing type-safe field access.
@@ -20,7 +20,7 @@ class AMMVoteBuilder;
 *
 * Type: ttAMM_VOTE (38)
 * Delegable: Delegation::Delegable
- * Amendment: UInt256{}
+ * Amendment: featureAMM
 * Privileges: Privilege::NoPriv
 *
 * Immutable wrapper around STTx providing type-safe field access.
@@ -20,7 +20,7 @@ class AMMWithdrawBuilder;
 *
 * Type: ttAMM_WITHDRAW (37)
 * Delegable: Delegation::Delegable
- * Amendment: UInt256{}
+ * Amendment: featureAMM
 * Privileges: Privilege::MayDeleteAcct | Privilege::MayAuthorizeMpt
 *
 * Immutable wrapper around STTx providing type-safe field access.
@@ -0,0 +1,203 @@
+// This file is auto-generated. Do not edit.
+#pragma once
+
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/STParsedJSON.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol_autogen/TransactionBase.h>
+#include <xrpl/protocol_autogen/TransactionBuilderBase.h>
+#include <xrpl/json/json_value.h>
+
+#include <stdexcept>
+#include <optional>
+
+namespace xrpl::transactions {
+
+class XChainAccountCreateCommitBuilder;
+
+/**
+ * @brief Transaction: XChainAccountCreateCommit
+ *
+ * Type: ttXCHAIN_ACCOUNT_CREATE_COMMIT (44)
+ * Delegable: Delegation::Delegable
+ * Amendment: featureXChainBridge
+ * Privileges: Privilege::NoPriv
+ *
+ * Immutable wrapper around STTx providing type-safe field access.
+ * Use XChainAccountCreateCommitBuilder to construct new transactions.
+ */
+class XChainAccountCreateCommit : public TransactionBase
+{
+public:
+    static constexpr xrpl::TxType txType = ttXCHAIN_ACCOUNT_CREATE_COMMIT;
+
+    /**
+     * @brief Construct a XChainAccountCreateCommit transaction wrapper from an existing STTx object.
+     * @throws std::runtime_error if the transaction type doesn't match.
+     */
+    explicit XChainAccountCreateCommit(std::shared_ptr<STTx const> tx)
+        : TransactionBase(std::move(tx))
+    {
+        // Verify transaction type
+        if (tx_->getTxnType() != txType)
+        {
+            throw std::runtime_error("Invalid transaction type for XChainAccountCreateCommit");
+        }
+    }
+
+    // Transaction-specific field getters
+
+    /**
+     * @brief Get sfXChainBridge (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_XCHAIN_BRIDGE::type::value_type
+    getXChainBridge() const
+    {
+        return this->tx_->at(sfXChainBridge);
+    }
+
+    /**
+     * @brief Get sfDestination (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_ACCOUNT::type::value_type
+    getDestination() const
+    {
+        return this->tx_->at(sfDestination);
+    }
+
+    /**
+     * @brief Get sfAmount (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_AMOUNT::type::value_type
+    getAmount() const
+    {
+        return this->tx_->at(sfAmount);
+    }
+
+    /**
+     * @brief Get sfSignatureReward (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_AMOUNT::type::value_type
+    getSignatureReward() const
+    {
+        return this->tx_->at(sfSignatureReward);
+    }
+};
+
+/**
+ * @brief Builder for XChainAccountCreateCommit transactions.
+ *
+ * Provides a fluent interface for constructing transactions with method chaining.
+ * Uses STObject internally for flexible transaction construction.
+ * Inherits common field setters from TransactionBuilderBase.
+ */
+class XChainAccountCreateCommitBuilder : public TransactionBuilderBase<XChainAccountCreateCommitBuilder>
+{
+public:
+    /**
+     * @brief Construct a new XChainAccountCreateCommitBuilder with required fields.
+     * @param account The account initiating the transaction.
+     * @param xChainBridge The sfXChainBridge field value.
+     * @param destination The sfDestination field value.
+     * @param amount The sfAmount field value.
+     * @param signatureReward The sfSignatureReward field value.
+     * @param sequence Optional sequence number for the transaction.
+     * @param fee Optional fee for the transaction.
+     */
+    XChainAccountCreateCommitBuilder(SF_ACCOUNT::type::value_type account,
+                     std::decay_t<typename SF_XCHAIN_BRIDGE::type::value_type> const& xChainBridge,                     std::decay_t<typename SF_ACCOUNT::type::value_type> const& destination,                     std::decay_t<typename SF_AMOUNT::type::value_type> const& amount,                     std::decay_t<typename SF_AMOUNT::type::value_type> const& signatureReward,                    std::optional<SF_UINT32::type::value_type> sequence = std::nullopt,
+                    std::optional<SF_AMOUNT::type::value_type> fee = std::nullopt
+)
+        : TransactionBuilderBase<XChainAccountCreateCommitBuilder>(ttXCHAIN_ACCOUNT_CREATE_COMMIT, account, sequence, fee)
+    {
+        setXChainBridge(xChainBridge);
+        setDestination(destination);
+        setAmount(amount);
+        setSignatureReward(signatureReward);
+    }
+
+    /**
+     * @brief Construct a XChainAccountCreateCommitBuilder from an existing STTx object.
+     * @param tx The existing transaction to copy from.
+     * @throws std::runtime_error if the transaction type doesn't match.
+     */
+    XChainAccountCreateCommitBuilder(std::shared_ptr<STTx const> tx)
+    {
+        if (tx->getTxnType() != ttXCHAIN_ACCOUNT_CREATE_COMMIT)
+        {
+            throw std::runtime_error("Invalid transaction type for XChainAccountCreateCommitBuilder");
+        }
+        object_ = *tx;
+    }
+
+    /**
+     * @brief Transaction-specific field setters
+     */
+
+    /**
+     * @brief Set sfXChainBridge (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAccountCreateCommitBuilder&
+    setXChainBridge(std::decay_t<typename SF_XCHAIN_BRIDGE::type::value_type> const& value)
+    {
+        object_[sfXChainBridge] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfDestination (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAccountCreateCommitBuilder&
+    setDestination(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
+    {
+        object_[sfDestination] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfAmount (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAccountCreateCommitBuilder&
+    setAmount(std::decay_t<typename SF_AMOUNT::type::value_type> const& value)
+    {
+        object_[sfAmount] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfSignatureReward (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAccountCreateCommitBuilder&
+    setSignatureReward(std::decay_t<typename SF_AMOUNT::type::value_type> const& value)
+    {
+        object_[sfSignatureReward] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Build and return the XChainAccountCreateCommit wrapper.
+     * @param publicKey The public key for signing.
+     * @param secretKey The secret key for signing.
+     * @return The constructed transaction wrapper.
+     */
+    XChainAccountCreateCommit
+    build(PublicKey const& publicKey, SecretKey const& secretKey)
+    {
+        sign(publicKey, secretKey);
+        return XChainAccountCreateCommit{std::make_shared<STTx>(std::move(object_))};
+    }
+};
+
+}  // namespace xrpl::transactions
@@ -0,0 +1,371 @@
+// This file is auto-generated. Do not edit.
+#pragma once
+
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/STParsedJSON.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol_autogen/TransactionBase.h>
+#include <xrpl/protocol_autogen/TransactionBuilderBase.h>
+#include <xrpl/json/json_value.h>
+
+#include <stdexcept>
+#include <optional>
+
+namespace xrpl::transactions {
+
+class XChainAddAccountCreateAttestationBuilder;
+
+/**
+ * @brief Transaction: XChainAddAccountCreateAttestation
+ *
+ * Type: ttXCHAIN_ADD_ACCOUNT_CREATE_ATTESTATION (46)
+ * Delegable: Delegation::Delegable
+ * Amendment: featureXChainBridge
+ * Privileges: Privilege::CreateAcct
+ *
+ * Immutable wrapper around STTx providing type-safe field access.
+ * Use XChainAddAccountCreateAttestationBuilder to construct new transactions.
+ */
+class XChainAddAccountCreateAttestation : public TransactionBase
+{
+public:
+    static constexpr xrpl::TxType txType = ttXCHAIN_ADD_ACCOUNT_CREATE_ATTESTATION;
+
+    /**
+     * @brief Construct a XChainAddAccountCreateAttestation transaction wrapper from an existing STTx object.
+     * @throws std::runtime_error if the transaction type doesn't match.
+     */
+    explicit XChainAddAccountCreateAttestation(std::shared_ptr<STTx const> tx)
+        : TransactionBase(std::move(tx))
+    {
+        // Verify transaction type
+        if (tx_->getTxnType() != txType)
+        {
+            throw std::runtime_error("Invalid transaction type for XChainAddAccountCreateAttestation");
+        }
+    }
+
+    // Transaction-specific field getters
+
+    /**
+     * @brief Get sfXChainBridge (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_XCHAIN_BRIDGE::type::value_type
+    getXChainBridge() const
+    {
+        return this->tx_->at(sfXChainBridge);
+    }
+
+    /**
+     * @brief Get sfAttestationSignerAccount (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_ACCOUNT::type::value_type
+    getAttestationSignerAccount() const
+    {
+        return this->tx_->at(sfAttestationSignerAccount);
+    }
+
+    /**
+     * @brief Get sfPublicKey (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_VL::type::value_type
+    getPublicKey() const
+    {
+        return this->tx_->at(sfPublicKey);
+    }
+
+    /**
+     * @brief Get sfSignature (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_VL::type::value_type
+    getSignature() const
+    {
+        return this->tx_->at(sfSignature);
+    }
+
+    /**
+     * @brief Get sfOtherChainSource (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_ACCOUNT::type::value_type
+    getOtherChainSource() const
+    {
+        return this->tx_->at(sfOtherChainSource);
+    }
+
+    /**
+     * @brief Get sfAmount (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_AMOUNT::type::value_type
+    getAmount() const
+    {
+        return this->tx_->at(sfAmount);
+    }
+
+    /**
+     * @brief Get sfAttestationRewardAccount (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_ACCOUNT::type::value_type
+    getAttestationRewardAccount() const
+    {
+        return this->tx_->at(sfAttestationRewardAccount);
+    }
+
+    /**
+     * @brief Get sfWasLockingChainSend (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_UINT8::type::value_type
+    getWasLockingChainSend() const
+    {
+        return this->tx_->at(sfWasLockingChainSend);
+    }
+
+    /**
+     * @brief Get sfXChainAccountCreateCount (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_UINT64::type::value_type
+    getXChainAccountCreateCount() const
+    {
+        return this->tx_->at(sfXChainAccountCreateCount);
+    }
+
+    /**
+     * @brief Get sfDestination (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_ACCOUNT::type::value_type
+    getDestination() const
+    {
+        return this->tx_->at(sfDestination);
+    }
+
+    /**
+     * @brief Get sfSignatureReward (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_AMOUNT::type::value_type
+    getSignatureReward() const
+    {
+        return this->tx_->at(sfSignatureReward);
+    }
+};
+
+/**
+ * @brief Builder for XChainAddAccountCreateAttestation transactions.
+ *
+ * Provides a fluent interface for constructing transactions with method chaining.
+ * Uses STObject internally for flexible transaction construction.
+ * Inherits common field setters from TransactionBuilderBase.
+ */
+class XChainAddAccountCreateAttestationBuilder : public TransactionBuilderBase<XChainAddAccountCreateAttestationBuilder>
+{
+public:
+    /**
+     * @brief Construct a new XChainAddAccountCreateAttestationBuilder with required fields.
+     * @param account The account initiating the transaction.
+     * @param xChainBridge The sfXChainBridge field value.
+     * @param attestationSignerAccount The sfAttestationSignerAccount field value.
+     * @param publicKey The sfPublicKey field value.
+     * @param signature The sfSignature field value.
+     * @param otherChainSource The sfOtherChainSource field value.
+     * @param amount The sfAmount field value.
+     * @param attestationRewardAccount The sfAttestationRewardAccount field value.
+     * @param wasLockingChainSend The sfWasLockingChainSend field value.
+     * @param xChainAccountCreateCount The sfXChainAccountCreateCount field value.
+     * @param destination The sfDestination field value.
+     * @param signatureReward The sfSignatureReward field value.
+     * @param sequence Optional sequence number for the transaction.
+     * @param fee Optional fee for the transaction.
+     */
+    XChainAddAccountCreateAttestationBuilder(SF_ACCOUNT::type::value_type account,
+                     std::decay_t<typename SF_XCHAIN_BRIDGE::type::value_type> const& xChainBridge,                     std::decay_t<typename SF_ACCOUNT::type::value_type> const& attestationSignerAccount,                     std::decay_t<typename SF_VL::type::value_type> const& publicKey,                     std::decay_t<typename SF_VL::type::value_type> const& signature,                     std::decay_t<typename SF_ACCOUNT::type::value_type> const& otherChainSource,                     std::decay_t<typename SF_AMOUNT::type::value_type> const& amount,                     std::decay_t<typename SF_ACCOUNT::type::value_type> const& attestationRewardAccount,                     std::decay_t<typename SF_UINT8::type::value_type> const& wasLockingChainSend,                     std::decay_t<typename SF_UINT64::type::value_type> const& xChainAccountCreateCount,                     std::decay_t<typename SF_ACCOUNT::type::value_type> const& destination,                     std::decay_t<typename SF_AMOUNT::type::value_type> const& signatureReward,                    std::optional<SF_UINT32::type::value_type> sequence = std::nullopt,
+                    std::optional<SF_AMOUNT::type::value_type> fee = std::nullopt
+)
+        : TransactionBuilderBase<XChainAddAccountCreateAttestationBuilder>(ttXCHAIN_ADD_ACCOUNT_CREATE_ATTESTATION, account, sequence, fee)
+    {
+        setXChainBridge(xChainBridge);
+        setAttestationSignerAccount(attestationSignerAccount);
+        setPublicKey(publicKey);
+        setSignature(signature);
+        setOtherChainSource(otherChainSource);
+        setAmount(amount);
+        setAttestationRewardAccount(attestationRewardAccount);
+        setWasLockingChainSend(wasLockingChainSend);
+        setXChainAccountCreateCount(xChainAccountCreateCount);
+        setDestination(destination);
+        setSignatureReward(signatureReward);
+    }
+
+    /**
+     * @brief Construct a XChainAddAccountCreateAttestationBuilder from an existing STTx object.
+     * @param tx The existing transaction to copy from.
+     * @throws std::runtime_error if the transaction type doesn't match.
+     */
+    XChainAddAccountCreateAttestationBuilder(std::shared_ptr<STTx const> tx)
+    {
+        if (tx->getTxnType() != ttXCHAIN_ADD_ACCOUNT_CREATE_ATTESTATION)
+        {
+            throw std::runtime_error("Invalid transaction type for XChainAddAccountCreateAttestationBuilder");
+        }
+        object_ = *tx;
+    }
+
+    /**
+     * @brief Transaction-specific field setters
+     */
+
+    /**
+     * @brief Set sfXChainBridge (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddAccountCreateAttestationBuilder&
+    setXChainBridge(std::decay_t<typename SF_XCHAIN_BRIDGE::type::value_type> const& value)
+    {
+        object_[sfXChainBridge] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfAttestationSignerAccount (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddAccountCreateAttestationBuilder&
+    setAttestationSignerAccount(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
+    {
+        object_[sfAttestationSignerAccount] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfPublicKey (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddAccountCreateAttestationBuilder&
+    setPublicKey(std::decay_t<typename SF_VL::type::value_type> const& value)
+    {
+        object_[sfPublicKey] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfSignature (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddAccountCreateAttestationBuilder&
+    setSignature(std::decay_t<typename SF_VL::type::value_type> const& value)
+    {
+        object_[sfSignature] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfOtherChainSource (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddAccountCreateAttestationBuilder&
+    setOtherChainSource(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
+    {
+        object_[sfOtherChainSource] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfAmount (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddAccountCreateAttestationBuilder&
+    setAmount(std::decay_t<typename SF_AMOUNT::type::value_type> const& value)
+    {
+        object_[sfAmount] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfAttestationRewardAccount (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddAccountCreateAttestationBuilder&
+    setAttestationRewardAccount(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
+    {
+        object_[sfAttestationRewardAccount] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfWasLockingChainSend (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddAccountCreateAttestationBuilder&
+    setWasLockingChainSend(std::decay_t<typename SF_UINT8::type::value_type> const& value)
+    {
+        object_[sfWasLockingChainSend] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfXChainAccountCreateCount (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddAccountCreateAttestationBuilder&
+    setXChainAccountCreateCount(std::decay_t<typename SF_UINT64::type::value_type> const& value)
+    {
+        object_[sfXChainAccountCreateCount] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfDestination (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddAccountCreateAttestationBuilder&
+    setDestination(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
+    {
+        object_[sfDestination] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfSignatureReward (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddAccountCreateAttestationBuilder&
+    setSignatureReward(std::decay_t<typename SF_AMOUNT::type::value_type> const& value)
+    {
+        object_[sfSignatureReward] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Build and return the XChainAddAccountCreateAttestation wrapper.
+     * @param publicKey The public key for signing.
+     * @param secretKey The secret key for signing.
+     * @return The constructed transaction wrapper.
+     */
+    XChainAddAccountCreateAttestation
+    build(PublicKey const& publicKey, SecretKey const& secretKey)
+    {
+        sign(publicKey, secretKey);
+        return XChainAddAccountCreateAttestation{std::make_shared<STTx>(std::move(object_))};
+    }
+};
+
+}  // namespace xrpl::transactions
@@ -0,0 +1,360 @@
+// This file is auto-generated. Do not edit.
+#pragma once
+
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/STParsedJSON.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol_autogen/TransactionBase.h>
+#include <xrpl/protocol_autogen/TransactionBuilderBase.h>
+#include <xrpl/json/json_value.h>
+
+#include <stdexcept>
+#include <optional>
+
+namespace xrpl::transactions {
+
+class XChainAddClaimAttestationBuilder;
+
+/**
+ * @brief Transaction: XChainAddClaimAttestation
+ *
+ * Type: ttXCHAIN_ADD_CLAIM_ATTESTATION (45)
+ * Delegable: Delegation::Delegable
+ * Amendment: featureXChainBridge
+ * Privileges: Privilege::CreateAcct
+ *
+ * Immutable wrapper around STTx providing type-safe field access.
+ * Use XChainAddClaimAttestationBuilder to construct new transactions.
+ */
+class XChainAddClaimAttestation : public TransactionBase
+{
+public:
+    static constexpr xrpl::TxType txType = ttXCHAIN_ADD_CLAIM_ATTESTATION;
+
+    /**
+     * @brief Construct a XChainAddClaimAttestation transaction wrapper from an existing STTx object.
+     * @throws std::runtime_error if the transaction type doesn't match.
+     */
+    explicit XChainAddClaimAttestation(std::shared_ptr<STTx const> tx)
+        : TransactionBase(std::move(tx))
+    {
+        // Verify transaction type
+        if (tx_->getTxnType() != txType)
+        {
+            throw std::runtime_error("Invalid transaction type for XChainAddClaimAttestation");
+        }
+    }
+
+    // Transaction-specific field getters
+
+    /**
+     * @brief Get sfXChainBridge (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_XCHAIN_BRIDGE::type::value_type
+    getXChainBridge() const
+    {
+        return this->tx_->at(sfXChainBridge);
+    }
+
+    /**
+     * @brief Get sfAttestationSignerAccount (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_ACCOUNT::type::value_type
+    getAttestationSignerAccount() const
+    {
+        return this->tx_->at(sfAttestationSignerAccount);
+    }
+
+    /**
+     * @brief Get sfPublicKey (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_VL::type::value_type
+    getPublicKey() const
+    {
+        return this->tx_->at(sfPublicKey);
+    }
+
+    /**
+     * @brief Get sfSignature (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_VL::type::value_type
+    getSignature() const
+    {
+        return this->tx_->at(sfSignature);
+    }
+
+    /**
+     * @brief Get sfOtherChainSource (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_ACCOUNT::type::value_type
+    getOtherChainSource() const
+    {
+        return this->tx_->at(sfOtherChainSource);
+    }
+
+    /**
+     * @brief Get sfAmount (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_AMOUNT::type::value_type
+    getAmount() const
+    {
+        return this->tx_->at(sfAmount);
+    }
+
+    /**
+     * @brief Get sfAttestationRewardAccount (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_ACCOUNT::type::value_type
+    getAttestationRewardAccount() const
+    {
+        return this->tx_->at(sfAttestationRewardAccount);
+    }
+
+    /**
+     * @brief Get sfWasLockingChainSend (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_UINT8::type::value_type
+    getWasLockingChainSend() const
+    {
+        return this->tx_->at(sfWasLockingChainSend);
+    }
+
+    /**
+     * @brief Get sfXChainClaimID (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_UINT64::type::value_type
+    getXChainClaimID() const
+    {
+        return this->tx_->at(sfXChainClaimID);
+    }
+
+    /**
+     * @brief Get sfDestination (SoeOptional)
+     * @return The field value, or std::nullopt if not present.
+     */
+    [[nodiscard]]
+    protocol_autogen::Optional<SF_ACCOUNT::type::value_type>
+    getDestination() const
+    {
+        if (hasDestination())
+        {
+            return this->tx_->at(sfDestination);
+        }
+        return std::nullopt;
+    }
+
+    /**
+     * @brief Check if sfDestination is present.
+     * @return True if the field is present, false otherwise.
+     */
+    [[nodiscard]]
+    bool
+    hasDestination() const
+    {
+        return this->tx_->isFieldPresent(sfDestination);
+    }
+};
+
+/**
+ * @brief Builder for XChainAddClaimAttestation transactions.
+ *
+ * Provides a fluent interface for constructing transactions with method chaining.
+ * Uses STObject internally for flexible transaction construction.
+ * Inherits common field setters from TransactionBuilderBase.
+ */
+class XChainAddClaimAttestationBuilder : public TransactionBuilderBase<XChainAddClaimAttestationBuilder>
+{
+public:
+    /**
+     * @brief Construct a new XChainAddClaimAttestationBuilder with required fields.
+     * @param account The account initiating the transaction.
+     * @param xChainBridge The sfXChainBridge field value.
+     * @param attestationSignerAccount The sfAttestationSignerAccount field value.
+     * @param publicKey The sfPublicKey field value.
+     * @param signature The sfSignature field value.
+     * @param otherChainSource The sfOtherChainSource field value.
+     * @param amount The sfAmount field value.
+     * @param attestationRewardAccount The sfAttestationRewardAccount field value.
+     * @param wasLockingChainSend The sfWasLockingChainSend field value.
+     * @param xChainClaimID The sfXChainClaimID field value.
+     * @param sequence Optional sequence number for the transaction.
+     * @param fee Optional fee for the transaction.
+     */
+    XChainAddClaimAttestationBuilder(SF_ACCOUNT::type::value_type account,
+                     std::decay_t<typename SF_XCHAIN_BRIDGE::type::value_type> const& xChainBridge,                     std::decay_t<typename SF_ACCOUNT::type::value_type> const& attestationSignerAccount,                     std::decay_t<typename SF_VL::type::value_type> const& publicKey,                     std::decay_t<typename SF_VL::type::value_type> const& signature,                     std::decay_t<typename SF_ACCOUNT::type::value_type> const& otherChainSource,                     std::decay_t<typename SF_AMOUNT::type::value_type> const& amount,                     std::decay_t<typename SF_ACCOUNT::type::value_type> const& attestationRewardAccount,                     std::decay_t<typename SF_UINT8::type::value_type> const& wasLockingChainSend,                     std::decay_t<typename SF_UINT64::type::value_type> const& xChainClaimID,                    std::optional<SF_UINT32::type::value_type> sequence = std::nullopt,
+                    std::optional<SF_AMOUNT::type::value_type> fee = std::nullopt
+)
+        : TransactionBuilderBase<XChainAddClaimAttestationBuilder>(ttXCHAIN_ADD_CLAIM_ATTESTATION, account, sequence, fee)
+    {
+        setXChainBridge(xChainBridge);
+        setAttestationSignerAccount(attestationSignerAccount);
+        setPublicKey(publicKey);
+        setSignature(signature);
+        setOtherChainSource(otherChainSource);
+        setAmount(amount);
+        setAttestationRewardAccount(attestationRewardAccount);
+        setWasLockingChainSend(wasLockingChainSend);
+        setXChainClaimID(xChainClaimID);
+    }
+
+    /**
+     * @brief Construct a XChainAddClaimAttestationBuilder from an existing STTx object.
+     * @param tx The existing transaction to copy from.
+     * @throws std::runtime_error if the transaction type doesn't match.
+     */
+    XChainAddClaimAttestationBuilder(std::shared_ptr<STTx const> tx)
+    {
+        if (tx->getTxnType() != ttXCHAIN_ADD_CLAIM_ATTESTATION)
+        {
+            throw std::runtime_error("Invalid transaction type for XChainAddClaimAttestationBuilder");
+        }
+        object_ = *tx;
+    }
+
+    /**
+     * @brief Transaction-specific field setters
+     */
+
+    /**
+     * @brief Set sfXChainBridge (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddClaimAttestationBuilder&
+    setXChainBridge(std::decay_t<typename SF_XCHAIN_BRIDGE::type::value_type> const& value)
+    {
+        object_[sfXChainBridge] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfAttestationSignerAccount (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddClaimAttestationBuilder&
+    setAttestationSignerAccount(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
+    {
+        object_[sfAttestationSignerAccount] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfPublicKey (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddClaimAttestationBuilder&
+    setPublicKey(std::decay_t<typename SF_VL::type::value_type> const& value)
+    {
+        object_[sfPublicKey] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfSignature (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddClaimAttestationBuilder&
+    setSignature(std::decay_t<typename SF_VL::type::value_type> const& value)
+    {
+        object_[sfSignature] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfOtherChainSource (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddClaimAttestationBuilder&
+    setOtherChainSource(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
+    {
+        object_[sfOtherChainSource] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfAmount (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddClaimAttestationBuilder&
+    setAmount(std::decay_t<typename SF_AMOUNT::type::value_type> const& value)
+    {
+        object_[sfAmount] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfAttestationRewardAccount (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddClaimAttestationBuilder&
+    setAttestationRewardAccount(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
+    {
+        object_[sfAttestationRewardAccount] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfWasLockingChainSend (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddClaimAttestationBuilder&
+    setWasLockingChainSend(std::decay_t<typename SF_UINT8::type::value_type> const& value)
+    {
+        object_[sfWasLockingChainSend] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfXChainClaimID (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddClaimAttestationBuilder&
+    setXChainClaimID(std::decay_t<typename SF_UINT64::type::value_type> const& value)
+    {
+        object_[sfXChainClaimID] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfDestination (SoeOptional)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainAddClaimAttestationBuilder&
+    setDestination(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
+    {
+        object_[sfDestination] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Build and return the XChainAddClaimAttestation wrapper.
+     * @param publicKey The public key for signing.
+     * @param secretKey The secret key for signing.
+     * @return The constructed transaction wrapper.
+     */
+    XChainAddClaimAttestation
+    build(PublicKey const& publicKey, SecretKey const& secretKey)
+    {
+        sign(publicKey, secretKey);
+        return XChainAddClaimAttestation{std::make_shared<STTx>(std::move(object_))};
+    }
+};
+
+}  // namespace xrpl::transactions
@@ -0,0 +1,240 @@
+// This file is auto-generated. Do not edit.
+#pragma once
+
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/STParsedJSON.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol_autogen/TransactionBase.h>
+#include <xrpl/protocol_autogen/TransactionBuilderBase.h>
+#include <xrpl/json/json_value.h>
+
+#include <stdexcept>
+#include <optional>
+
+namespace xrpl::transactions {
+
+class XChainClaimBuilder;
+
+/**
+ * @brief Transaction: XChainClaim
+ *
+ * Type: ttXCHAIN_CLAIM (43)
+ * Delegable: Delegation::Delegable
+ * Amendment: featureXChainBridge
+ * Privileges: Privilege::NoPriv
+ *
+ * Immutable wrapper around STTx providing type-safe field access.
+ * Use XChainClaimBuilder to construct new transactions.
+ */
+class XChainClaim : public TransactionBase
+{
+public:
+    static constexpr xrpl::TxType txType = ttXCHAIN_CLAIM;
+
+    /**
+     * @brief Construct a XChainClaim transaction wrapper from an existing STTx object.
+     * @throws std::runtime_error if the transaction type doesn't match.
+     */
+    explicit XChainClaim(std::shared_ptr<STTx const> tx)
+        : TransactionBase(std::move(tx))
+    {
+        // Verify transaction type
+        if (tx_->getTxnType() != txType)
+        {
+            throw std::runtime_error("Invalid transaction type for XChainClaim");
+        }
+    }
+
+    // Transaction-specific field getters
+
+    /**
+     * @brief Get sfXChainBridge (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_XCHAIN_BRIDGE::type::value_type
+    getXChainBridge() const
+    {
+        return this->tx_->at(sfXChainBridge);
+    }
+
+    /**
+     * @brief Get sfXChainClaimID (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_UINT64::type::value_type
+    getXChainClaimID() const
+    {
+        return this->tx_->at(sfXChainClaimID);
+    }
+
+    /**
+     * @brief Get sfDestination (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_ACCOUNT::type::value_type
+    getDestination() const
+    {
+        return this->tx_->at(sfDestination);
+    }
+
+    /**
+     * @brief Get sfDestinationTag (SoeOptional)
+     * @return The field value, or std::nullopt if not present.
+     */
+    [[nodiscard]]
+    protocol_autogen::Optional<SF_UINT32::type::value_type>
+    getDestinationTag() const
+    {
+        if (hasDestinationTag())
+        {
+            return this->tx_->at(sfDestinationTag);
+        }
+        return std::nullopt;
+    }
+
+    /**
+     * @brief Check if sfDestinationTag is present.
+     * @return True if the field is present, false otherwise.
+     */
+    [[nodiscard]]
+    bool
+    hasDestinationTag() const
+    {
+        return this->tx_->isFieldPresent(sfDestinationTag);
+    }
+
+    /**
+     * @brief Get sfAmount (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_AMOUNT::type::value_type
+    getAmount() const
+    {
+        return this->tx_->at(sfAmount);
+    }
+};
+
+/**
+ * @brief Builder for XChainClaim transactions.
+ *
+ * Provides a fluent interface for constructing transactions with method chaining.
+ * Uses STObject internally for flexible transaction construction.
+ * Inherits common field setters from TransactionBuilderBase.
+ */
+class XChainClaimBuilder : public TransactionBuilderBase<XChainClaimBuilder>
+{
+public:
+    /**
+     * @brief Construct a new XChainClaimBuilder with required fields.
+     * @param account The account initiating the transaction.
+     * @param xChainBridge The sfXChainBridge field value.
+     * @param xChainClaimID The sfXChainClaimID field value.
+     * @param destination The sfDestination field value.
+     * @param amount The sfAmount field value.
+     * @param sequence Optional sequence number for the transaction.
+     * @param fee Optional fee for the transaction.
+     */
+    XChainClaimBuilder(SF_ACCOUNT::type::value_type account,
+                     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_ACCOUNT::type::value_type> const& destination,                     std::decay_t<typename SF_AMOUNT::type::value_type> const& amount,                    std::optional<SF_UINT32::type::value_type> sequence = std::nullopt,
+                    std::optional<SF_AMOUNT::type::value_type> fee = std::nullopt
+)
+        : TransactionBuilderBase<XChainClaimBuilder>(ttXCHAIN_CLAIM, account, sequence, fee)
+    {
+        setXChainBridge(xChainBridge);
+        setXChainClaimID(xChainClaimID);
+        setDestination(destination);
+        setAmount(amount);
+    }
+
+    /**
+     * @brief Construct a XChainClaimBuilder from an existing STTx object.
+     * @param tx The existing transaction to copy from.
+     * @throws std::runtime_error if the transaction type doesn't match.
+     */
+    XChainClaimBuilder(std::shared_ptr<STTx const> tx)
+    {
+        if (tx->getTxnType() != ttXCHAIN_CLAIM)
+        {
+            throw std::runtime_error("Invalid transaction type for XChainClaimBuilder");
+        }
+        object_ = *tx;
+    }
+
+    /**
+     * @brief Transaction-specific field setters
+     */
+
+    /**
+     * @brief Set sfXChainBridge (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainClaimBuilder&
+    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.
+     */
+    XChainClaimBuilder&
+    setXChainClaimID(std::decay_t<typename SF_UINT64::type::value_type> const& value)
+    {
+        object_[sfXChainClaimID] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfDestination (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainClaimBuilder&
+    setDestination(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
+    {
+        object_[sfDestination] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfDestinationTag (SoeOptional)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainClaimBuilder&
+    setDestinationTag(std::decay_t<typename SF_UINT32::type::value_type> const& value)
+    {
+        object_[sfDestinationTag] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfAmount (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainClaimBuilder&
+    setAmount(std::decay_t<typename SF_AMOUNT::type::value_type> const& value)
+    {
+        object_[sfAmount] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Build and return the XChainClaim wrapper.
+     * @param publicKey The public key for signing.
+     * @param secretKey The secret key for signing.
+     * @return The constructed transaction wrapper.
+     */
+    XChainClaim
+    build(PublicKey const& publicKey, SecretKey const& secretKey)
+    {
+        sign(publicKey, secretKey);
+        return XChainClaim{std::make_shared<STTx>(std::move(object_))};
+    }
+};
+
+}  // namespace xrpl::transactions
@@ -0,0 +1,216 @@
+// This file is auto-generated. Do not edit.
+#pragma once
+
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/STParsedJSON.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol_autogen/TransactionBase.h>
+#include <xrpl/protocol_autogen/TransactionBuilderBase.h>
+#include <xrpl/json/json_value.h>
+
+#include <stdexcept>
+#include <optional>
+
+namespace xrpl::transactions {
+
+class XChainCommitBuilder;
+
+/**
+ * @brief Transaction: XChainCommit
+ *
+ * Type: ttXCHAIN_COMMIT (42)
+ * Delegable: Delegation::Delegable
+ * Amendment: featureXChainBridge
+ * Privileges: Privilege::NoPriv
+ *
+ * Immutable wrapper around STTx providing type-safe field access.
+ * Use XChainCommitBuilder to construct new transactions.
+ */
+class XChainCommit : public TransactionBase
+{
+public:
+    static constexpr xrpl::TxType txType = ttXCHAIN_COMMIT;
+
+    /**
+     * @brief Construct a XChainCommit transaction wrapper from an existing STTx object.
+     * @throws std::runtime_error if the transaction type doesn't match.
+     */
+    explicit XChainCommit(std::shared_ptr<STTx const> tx)
+        : TransactionBase(std::move(tx))
+    {
+        // Verify transaction type
+        if (tx_->getTxnType() != txType)
+        {
+            throw std::runtime_error("Invalid transaction type for XChainCommit");
+        }
+    }
+
+    // Transaction-specific field getters
+
+    /**
+     * @brief Get sfXChainBridge (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_XCHAIN_BRIDGE::type::value_type
+    getXChainBridge() const
+    {
+        return this->tx_->at(sfXChainBridge);
+    }
+
+    /**
+     * @brief Get sfXChainClaimID (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_UINT64::type::value_type
+    getXChainClaimID() const
+    {
+        return this->tx_->at(sfXChainClaimID);
+    }
+
+    /**
+     * @brief Get sfAmount (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_AMOUNT::type::value_type
+    getAmount() const
+    {
+        return this->tx_->at(sfAmount);
+    }
+
+    /**
+     * @brief Get sfOtherChainDestination (SoeOptional)
+     * @return The field value, or std::nullopt if not present.
+     */
+    [[nodiscard]]
+    protocol_autogen::Optional<SF_ACCOUNT::type::value_type>
+    getOtherChainDestination() const
+    {
+        if (hasOtherChainDestination())
+        {
+            return this->tx_->at(sfOtherChainDestination);
+        }
+        return std::nullopt;
+    }
+
+    /**
+     * @brief Check if sfOtherChainDestination is present.
+     * @return True if the field is present, false otherwise.
+     */
+    [[nodiscard]]
+    bool
+    hasOtherChainDestination() const
+    {
+        return this->tx_->isFieldPresent(sfOtherChainDestination);
+    }
+};
+
+/**
+ * @brief Builder for XChainCommit transactions.
+ *
+ * Provides a fluent interface for constructing transactions with method chaining.
+ * Uses STObject internally for flexible transaction construction.
+ * Inherits common field setters from TransactionBuilderBase.
+ */
+class XChainCommitBuilder : public TransactionBuilderBase<XChainCommitBuilder>
+{
+public:
+    /**
+     * @brief Construct a new XChainCommitBuilder with required fields.
+     * @param account The account initiating the transaction.
+     * @param xChainBridge The sfXChainBridge field value.
+     * @param xChainClaimID The sfXChainClaimID field value.
+     * @param amount The sfAmount field value.
+     * @param sequence Optional sequence number for the transaction.
+     * @param fee Optional fee for the transaction.
+     */
+    XChainCommitBuilder(SF_ACCOUNT::type::value_type account,
+                     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_AMOUNT::type::value_type> const& amount,                    std::optional<SF_UINT32::type::value_type> sequence = std::nullopt,
+                    std::optional<SF_AMOUNT::type::value_type> fee = std::nullopt
+)
+        : TransactionBuilderBase<XChainCommitBuilder>(ttXCHAIN_COMMIT, account, sequence, fee)
+    {
+        setXChainBridge(xChainBridge);
+        setXChainClaimID(xChainClaimID);
+        setAmount(amount);
+    }
+
+    /**
+     * @brief Construct a XChainCommitBuilder from an existing STTx object.
+     * @param tx The existing transaction to copy from.
+     * @throws std::runtime_error if the transaction type doesn't match.
+     */
+    XChainCommitBuilder(std::shared_ptr<STTx const> tx)
+    {
+        if (tx->getTxnType() != ttXCHAIN_COMMIT)
+        {
+            throw std::runtime_error("Invalid transaction type for XChainCommitBuilder");
+        }
+        object_ = *tx;
+    }
+
+    /**
+     * @brief Transaction-specific field setters
+     */
+
+    /**
+     * @brief Set sfXChainBridge (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainCommitBuilder&
+    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.
+     */
+    XChainCommitBuilder&
+    setXChainClaimID(std::decay_t<typename SF_UINT64::type::value_type> const& value)
+    {
+        object_[sfXChainClaimID] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfAmount (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainCommitBuilder&
+    setAmount(std::decay_t<typename SF_AMOUNT::type::value_type> const& value)
+    {
+        object_[sfAmount] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfOtherChainDestination (SoeOptional)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainCommitBuilder&
+    setOtherChainDestination(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
+    {
+        object_[sfOtherChainDestination] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Build and return the XChainCommit wrapper.
+     * @param publicKey The public key for signing.
+     * @param secretKey The secret key for signing.
+     * @return The constructed transaction wrapper.
+     */
+    XChainCommit
+    build(PublicKey const& publicKey, SecretKey const& secretKey)
+    {
+        sign(publicKey, secretKey);
+        return XChainCommit{std::make_shared<STTx>(std::move(object_))};
+    }
+};
+
+}  // namespace xrpl::transactions
@@ -0,0 +1,192 @@
+// This file is auto-generated. Do not edit.
+#pragma once
+
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/STParsedJSON.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol_autogen/TransactionBase.h>
+#include <xrpl/protocol_autogen/TransactionBuilderBase.h>
+#include <xrpl/json/json_value.h>
+
+#include <stdexcept>
+#include <optional>
+
+namespace xrpl::transactions {
+
+class XChainCreateBridgeBuilder;
+
+/**
+ * @brief Transaction: XChainCreateBridge
+ *
+ * Type: ttXCHAIN_CREATE_BRIDGE (48)
+ * Delegable: Delegation::Delegable
+ * Amendment: featureXChainBridge
+ * Privileges: Privilege::NoPriv
+ *
+ * Immutable wrapper around STTx providing type-safe field access.
+ * Use XChainCreateBridgeBuilder to construct new transactions.
+ */
+class XChainCreateBridge : public TransactionBase
+{
+public:
+    static constexpr xrpl::TxType txType = ttXCHAIN_CREATE_BRIDGE;
+
+    /**
+     * @brief Construct a XChainCreateBridge transaction wrapper from an existing STTx object.
+     * @throws std::runtime_error if the transaction type doesn't match.
+     */
+    explicit XChainCreateBridge(std::shared_ptr<STTx const> tx)
+        : TransactionBase(std::move(tx))
+    {
+        // Verify transaction type
+        if (tx_->getTxnType() != txType)
+        {
+            throw std::runtime_error("Invalid transaction type for XChainCreateBridge");
+        }
+    }
+
+    // Transaction-specific field getters
+
+    /**
+     * @brief Get sfXChainBridge (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_XCHAIN_BRIDGE::type::value_type
+    getXChainBridge() const
+    {
+        return this->tx_->at(sfXChainBridge);
+    }
+
+    /**
+     * @brief Get sfSignatureReward (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_AMOUNT::type::value_type
+    getSignatureReward() const
+    {
+        return this->tx_->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->tx_->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->tx_->isFieldPresent(sfMinAccountCreateAmount);
+    }
+};
+
+/**
+ * @brief Builder for XChainCreateBridge transactions.
+ *
+ * Provides a fluent interface for constructing transactions with method chaining.
+ * Uses STObject internally for flexible transaction construction.
+ * Inherits common field setters from TransactionBuilderBase.
+ */
+class XChainCreateBridgeBuilder : public TransactionBuilderBase<XChainCreateBridgeBuilder>
+{
+public:
+    /**
+     * @brief Construct a new XChainCreateBridgeBuilder with required fields.
+     * @param account The account initiating the transaction.
+     * @param xChainBridge The sfXChainBridge field value.
+     * @param signatureReward The sfSignatureReward field value.
+     * @param sequence Optional sequence number for the transaction.
+     * @param fee Optional fee for the transaction.
+     */
+    XChainCreateBridgeBuilder(SF_ACCOUNT::type::value_type account,
+                     std::decay_t<typename SF_XCHAIN_BRIDGE::type::value_type> const& xChainBridge,                     std::decay_t<typename SF_AMOUNT::type::value_type> const& signatureReward,                    std::optional<SF_UINT32::type::value_type> sequence = std::nullopt,
+                    std::optional<SF_AMOUNT::type::value_type> fee = std::nullopt
+)
+        : TransactionBuilderBase<XChainCreateBridgeBuilder>(ttXCHAIN_CREATE_BRIDGE, account, sequence, fee)
+    {
+        setXChainBridge(xChainBridge);
+        setSignatureReward(signatureReward);
+    }
+
+    /**
+     * @brief Construct a XChainCreateBridgeBuilder from an existing STTx object.
+     * @param tx The existing transaction to copy from.
+     * @throws std::runtime_error if the transaction type doesn't match.
+     */
+    XChainCreateBridgeBuilder(std::shared_ptr<STTx const> tx)
+    {
+        if (tx->getTxnType() != ttXCHAIN_CREATE_BRIDGE)
+        {
+            throw std::runtime_error("Invalid transaction type for XChainCreateBridgeBuilder");
+        }
+        object_ = *tx;
+    }
+
+    /**
+     * @brief Transaction-specific field setters
+     */
+
+    /**
+     * @brief Set sfXChainBridge (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainCreateBridgeBuilder&
+    setXChainBridge(std::decay_t<typename SF_XCHAIN_BRIDGE::type::value_type> const& value)
+    {
+        object_[sfXChainBridge] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfSignatureReward (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainCreateBridgeBuilder&
+    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.
+     */
+    XChainCreateBridgeBuilder&
+    setMinAccountCreateAmount(std::decay_t<typename SF_AMOUNT::type::value_type> const& value)
+    {
+        object_[sfMinAccountCreateAmount] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Build and return the XChainCreateBridge wrapper.
+     * @param publicKey The public key for signing.
+     * @param secretKey The secret key for signing.
+     * @return The constructed transaction wrapper.
+     */
+    XChainCreateBridge
+    build(PublicKey const& publicKey, SecretKey const& secretKey)
+    {
+        sign(publicKey, secretKey);
+        return XChainCreateBridge{std::make_shared<STTx>(std::move(object_))};
+    }
+};
+
+}  // namespace xrpl::transactions
@@ -0,0 +1,179 @@
+// This file is auto-generated. Do not edit.
+#pragma once
+
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/STParsedJSON.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol_autogen/TransactionBase.h>
+#include <xrpl/protocol_autogen/TransactionBuilderBase.h>
+#include <xrpl/json/json_value.h>
+
+#include <stdexcept>
+#include <optional>
+
+namespace xrpl::transactions {
+
+class XChainCreateClaimIDBuilder;
+
+/**
+ * @brief Transaction: XChainCreateClaimID
+ *
+ * Type: ttXCHAIN_CREATE_CLAIM_ID (41)
+ * Delegable: Delegation::Delegable
+ * Amendment: featureXChainBridge
+ * Privileges: Privilege::NoPriv
+ *
+ * Immutable wrapper around STTx providing type-safe field access.
+ * Use XChainCreateClaimIDBuilder to construct new transactions.
+ */
+class XChainCreateClaimID : public TransactionBase
+{
+public:
+    static constexpr xrpl::TxType txType = ttXCHAIN_CREATE_CLAIM_ID;
+
+    /**
+     * @brief Construct a XChainCreateClaimID transaction wrapper from an existing STTx object.
+     * @throws std::runtime_error if the transaction type doesn't match.
+     */
+    explicit XChainCreateClaimID(std::shared_ptr<STTx const> tx)
+        : TransactionBase(std::move(tx))
+    {
+        // Verify transaction type
+        if (tx_->getTxnType() != txType)
+        {
+            throw std::runtime_error("Invalid transaction type for XChainCreateClaimID");
+        }
+    }
+
+    // Transaction-specific field getters
+
+    /**
+     * @brief Get sfXChainBridge (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_XCHAIN_BRIDGE::type::value_type
+    getXChainBridge() const
+    {
+        return this->tx_->at(sfXChainBridge);
+    }
+
+    /**
+     * @brief Get sfSignatureReward (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_AMOUNT::type::value_type
+    getSignatureReward() const
+    {
+        return this->tx_->at(sfSignatureReward);
+    }
+
+    /**
+     * @brief Get sfOtherChainSource (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_ACCOUNT::type::value_type
+    getOtherChainSource() const
+    {
+        return this->tx_->at(sfOtherChainSource);
+    }
+};
+
+/**
+ * @brief Builder for XChainCreateClaimID transactions.
+ *
+ * Provides a fluent interface for constructing transactions with method chaining.
+ * Uses STObject internally for flexible transaction construction.
+ * Inherits common field setters from TransactionBuilderBase.
+ */
+class XChainCreateClaimIDBuilder : public TransactionBuilderBase<XChainCreateClaimIDBuilder>
+{
+public:
+    /**
+     * @brief Construct a new XChainCreateClaimIDBuilder with required fields.
+     * @param account The account initiating the transaction.
+     * @param xChainBridge The sfXChainBridge field value.
+     * @param signatureReward The sfSignatureReward field value.
+     * @param otherChainSource The sfOtherChainSource field value.
+     * @param sequence Optional sequence number for the transaction.
+     * @param fee Optional fee for the transaction.
+     */
+    XChainCreateClaimIDBuilder(SF_ACCOUNT::type::value_type account,
+                     std::decay_t<typename SF_XCHAIN_BRIDGE::type::value_type> const& xChainBridge,                     std::decay_t<typename SF_AMOUNT::type::value_type> const& signatureReward,                     std::decay_t<typename SF_ACCOUNT::type::value_type> const& otherChainSource,                    std::optional<SF_UINT32::type::value_type> sequence = std::nullopt,
+                    std::optional<SF_AMOUNT::type::value_type> fee = std::nullopt
+)
+        : TransactionBuilderBase<XChainCreateClaimIDBuilder>(ttXCHAIN_CREATE_CLAIM_ID, account, sequence, fee)
+    {
+        setXChainBridge(xChainBridge);
+        setSignatureReward(signatureReward);
+        setOtherChainSource(otherChainSource);
+    }
+
+    /**
+     * @brief Construct a XChainCreateClaimIDBuilder from an existing STTx object.
+     * @param tx The existing transaction to copy from.
+     * @throws std::runtime_error if the transaction type doesn't match.
+     */
+    XChainCreateClaimIDBuilder(std::shared_ptr<STTx const> tx)
+    {
+        if (tx->getTxnType() != ttXCHAIN_CREATE_CLAIM_ID)
+        {
+            throw std::runtime_error("Invalid transaction type for XChainCreateClaimIDBuilder");
+        }
+        object_ = *tx;
+    }
+
+    /**
+     * @brief Transaction-specific field setters
+     */
+
+    /**
+     * @brief Set sfXChainBridge (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainCreateClaimIDBuilder&
+    setXChainBridge(std::decay_t<typename SF_XCHAIN_BRIDGE::type::value_type> const& value)
+    {
+        object_[sfXChainBridge] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfSignatureReward (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainCreateClaimIDBuilder&
+    setSignatureReward(std::decay_t<typename SF_AMOUNT::type::value_type> const& value)
+    {
+        object_[sfSignatureReward] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfOtherChainSource (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainCreateClaimIDBuilder&
+    setOtherChainSource(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
+    {
+        object_[sfOtherChainSource] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Build and return the XChainCreateClaimID wrapper.
+     * @param publicKey The public key for signing.
+     * @param secretKey The secret key for signing.
+     * @return The constructed transaction wrapper.
+     */
+    XChainCreateClaimID
+    build(PublicKey const& publicKey, SecretKey const& secretKey)
+    {
+        sign(publicKey, secretKey);
+        return XChainCreateClaimID{std::make_shared<STTx>(std::move(object_))};
+    }
+};
+
+}  // namespace xrpl::transactions
@@ -0,0 +1,205 @@
+// This file is auto-generated. Do not edit.
+#pragma once
+
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/STParsedJSON.h>
+#include <xrpl/protocol/jss.h>
+#include <xrpl/protocol_autogen/TransactionBase.h>
+#include <xrpl/protocol_autogen/TransactionBuilderBase.h>
+#include <xrpl/json/json_value.h>
+
+#include <stdexcept>
+#include <optional>
+
+namespace xrpl::transactions {
+
+class XChainModifyBridgeBuilder;
+
+/**
+ * @brief Transaction: XChainModifyBridge
+ *
+ * Type: ttXCHAIN_MODIFY_BRIDGE (47)
+ * Delegable: Delegation::Delegable
+ * Amendment: featureXChainBridge
+ * Privileges: Privilege::NoPriv
+ *
+ * Immutable wrapper around STTx providing type-safe field access.
+ * Use XChainModifyBridgeBuilder to construct new transactions.
+ */
+class XChainModifyBridge : public TransactionBase
+{
+public:
+    static constexpr xrpl::TxType txType = ttXCHAIN_MODIFY_BRIDGE;
+
+    /**
+     * @brief Construct a XChainModifyBridge transaction wrapper from an existing STTx object.
+     * @throws std::runtime_error if the transaction type doesn't match.
+     */
+    explicit XChainModifyBridge(std::shared_ptr<STTx const> tx)
+        : TransactionBase(std::move(tx))
+    {
+        // Verify transaction type
+        if (tx_->getTxnType() != txType)
+        {
+            throw std::runtime_error("Invalid transaction type for XChainModifyBridge");
+        }
+    }
+
+    // Transaction-specific field getters
+
+    /**
+     * @brief Get sfXChainBridge (SoeRequired)
+     * @return The field value.
+     */
+    [[nodiscard]]
+    SF_XCHAIN_BRIDGE::type::value_type
+    getXChainBridge() const
+    {
+        return this->tx_->at(sfXChainBridge);
+    }
+
+    /**
+     * @brief Get sfSignatureReward (SoeOptional)
+     * @return The field value, or std::nullopt if not present.
+     */
+    [[nodiscard]]
+    protocol_autogen::Optional<SF_AMOUNT::type::value_type>
+    getSignatureReward() const
+    {
+        if (hasSignatureReward())
+        {
+            return this->tx_->at(sfSignatureReward);
+        }
+        return std::nullopt;
+    }
+
+    /**
+     * @brief Check if sfSignatureReward is present.
+     * @return True if the field is present, false otherwise.
+     */
+    [[nodiscard]]
+    bool
+    hasSignatureReward() const
+    {
+        return this->tx_->isFieldPresent(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->tx_->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->tx_->isFieldPresent(sfMinAccountCreateAmount);
+    }
+};
+
+/**
+ * @brief Builder for XChainModifyBridge transactions.
+ *
+ * Provides a fluent interface for constructing transactions with method chaining.
+ * Uses STObject internally for flexible transaction construction.
+ * Inherits common field setters from TransactionBuilderBase.
+ */
+class XChainModifyBridgeBuilder : public TransactionBuilderBase<XChainModifyBridgeBuilder>
+{
+public:
+    /**
+     * @brief Construct a new XChainModifyBridgeBuilder with required fields.
+     * @param account The account initiating the transaction.
+     * @param xChainBridge The sfXChainBridge field value.
+     * @param sequence Optional sequence number for the transaction.
+     * @param fee Optional fee for the transaction.
+     */
+    XChainModifyBridgeBuilder(SF_ACCOUNT::type::value_type account,
+                     std::decay_t<typename SF_XCHAIN_BRIDGE::type::value_type> const& xChainBridge,                    std::optional<SF_UINT32::type::value_type> sequence = std::nullopt,
+                    std::optional<SF_AMOUNT::type::value_type> fee = std::nullopt
+)
+        : TransactionBuilderBase<XChainModifyBridgeBuilder>(ttXCHAIN_MODIFY_BRIDGE, account, sequence, fee)
+    {
+        setXChainBridge(xChainBridge);
+    }
+
+    /**
+     * @brief Construct a XChainModifyBridgeBuilder from an existing STTx object.
+     * @param tx The existing transaction to copy from.
+     * @throws std::runtime_error if the transaction type doesn't match.
+     */
+    XChainModifyBridgeBuilder(std::shared_ptr<STTx const> tx)
+    {
+        if (tx->getTxnType() != ttXCHAIN_MODIFY_BRIDGE)
+        {
+            throw std::runtime_error("Invalid transaction type for XChainModifyBridgeBuilder");
+        }
+        object_ = *tx;
+    }
+
+    /**
+     * @brief Transaction-specific field setters
+     */
+
+    /**
+     * @brief Set sfXChainBridge (SoeRequired)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainModifyBridgeBuilder&
+    setXChainBridge(std::decay_t<typename SF_XCHAIN_BRIDGE::type::value_type> const& value)
+    {
+        object_[sfXChainBridge] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Set sfSignatureReward (SoeOptional)
+     * @return Reference to this builder for method chaining.
+     */
+    XChainModifyBridgeBuilder&
+    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.
+     */
+    XChainModifyBridgeBuilder&
+    setMinAccountCreateAmount(std::decay_t<typename SF_AMOUNT::type::value_type> const& value)
+    {
+        object_[sfMinAccountCreateAmount] = value;
+        return *this;
+    }
+
+    /**
+     * @brief Build and return the XChainModifyBridge wrapper.
+     * @param publicKey The public key for signing.
+     * @param secretKey The secret key for signing.
+     * @return The constructed transaction wrapper.
+     */
+    XChainModifyBridge
+    build(PublicKey const& publicKey, SecretKey const& secretKey)
+    {
+        sign(publicKey, secretKey);
+        return XChainModifyBridge{std::make_shared<STTx>(std::move(object_))};
+    }
+};
+
+}  // namespace xrpl::transactions
@@ -3,9 +3,12 @@
 #include <xrpl/basics/KeyCache.h>
 #include <xrpl/basics/TaggedCache.h>
 #include <xrpl/basics/base_uint.h>
+#include <xrpl/basics/partitioned_unordered_map.h>
+#include <xrpl/beast/hash/hash_append.h>
 #include <xrpl/beast/insight/Collector.h>
 #include <xrpl/beast/insight/NullCollector.h>
 #include <xrpl/beast/utility/Journal.h>
+#include <xrpl/shamap/SHAMapNodeID.h>

 #include <atomic>
 #include <chrono>
@@ -15,6 +18,112 @@

 namespace xrpl {

+/**
+ * Names a subtree whose descendants are all resident, by hash and by position.
+ *
+ * A node's hash covers its children but neither its depth nor its path, and one
+ * cache answers for every map built from a NodeFamily, so the position is what
+ * makes a hit answer for the position asked about and no other. The depth is
+ * kept beside the id because SHAMapNodeID masks its id to its own depth, so an
+ * all-zero id belongs to the root and to every all-zero prefix alike.
+ *
+ * Held as two fields rather than as a SHAMapNodeID, which is a CountedObject:
+ * one per entry would report the cache's population as live node IDs in the
+ * get_counts RPC, and would put an atomic increment on every temporary key a
+ * lookup builds.
+ */
+struct FullBelowKey
+{
+    /**
+     * The hash of the subtree.
+     */
+    UInt256 hash;
+
+    /**
+     * The masked id of the node the subtree was completed at.
+     */
+    UInt256 position;
+
+    /**
+     * The depth of that node.
+     */
+    std::uint32_t depth{0};
+
+    /**
+     * @param subtreeHash The hash of the subtree whose descendants are all
+     *        resident.
+     * @param nodeID The node the subtree was completed at.
+     */
+    FullBelowKey(UInt256 const& subtreeHash, SHAMapNodeID const& nodeID)
+        : hash(subtreeHash)
+        , position(nodeID.getNodeID())
+        , depth(static_cast<std::uint32_t>(nodeID.getDepth()))
+    {
+    }
+
+    /**
+     * The same key, named by the node above the position and the branch taken.
+     *
+     * Produces the fields the constructor above would for that child's own node
+     * ID, so the two forms name one entry.
+     *
+     * @param subtreeHash The hash of the subtree that is fully resident.
+     * @param parentID The node above the one the subtree was completed at.
+     * @param branch The branch of that node leading to it.
+     */
+    FullBelowKey(UInt256 const& subtreeHash, SHAMapNodeID const& parentID, unsigned int branch)
+        : hash(subtreeHash)
+        , position(childNodeID(parentID.getNodeID(), parentID.getDepth(), branch))
+        , depth(static_cast<std::uint32_t>(parentID.getDepth() + 1))
+    {
+    }
+
+    [[nodiscard]] bool
+    operator==(FullBelowKey const& other) const = default;
+};
+
+// The per-entry cost of this cache is computed from these sizes, so pin the layout that arithmetic
+// assumes: the three fields sit back to back with no padding.
+static_assert(
+    sizeof(FullBelowKey) == (2 * sizeof(UInt256)) + sizeof(std::uint32_t),
+    "FullBelowKey must stay free of padding");
+static_assert(
+    alignof(FullBelowKey) == alignof(std::uint32_t),
+    "FullBelowKey's lack of padding rests on its alignment");
+
+/**
+ * Feed a key to a hasher, field by field.
+ *
+ * Written out rather than hashed in one call over the object's bytes, since
+ * beast::IsUniquelyRepresented is opt-in per type and has no case for a
+ * user-defined struct, whatever its layout.
+ *
+ * @param h The hasher to feed.
+ * @param key The key to hash.
+ */
+template <class Hasher>
+void
+hash_append(Hasher& h, FullBelowKey const& key) noexcept
+{
+    using beast::hash_append;
+    hash_append(h, key.hash, key.position, key.depth);
+}
+
+/**
+ * Choose which partition of the cache's map a key lives in.
+ *
+ * Taken from the subtree hash, which is already uniformly distributed.
+ *
+ * @param key The key to place.
+ * @return The value PartitionedUnorderedMap reduces by its partition count.
+ */
+template <>
+inline std::size_t
+extract(FullBelowKey const& key)
+{
+    return extract(key.hash);
+}
+
 namespace detail {

 /**
@@ -24,12 +133,12 @@ namespace detail {
 class BasicFullBelowCache
 {
 private:
-    using CacheType = KeyCache;
+    using CacheType = KeyCache<FullBelowKey>;

 public:
    static constexpr auto kDefaultCacheTargetSize = 0;

-    using key_type = UInt256;
+    using key_type = FullBelowKey;
    using ClockType = CacheType::ClockType;

    /**
@@ -86,13 +195,15 @@ public:
     * Refresh the last access time of an item, if it exists.
     * Thread safety:
     *     Safe to call from any thread.
-     * @param key The key to refresh.
-     * @return `true` If the key exists.
+     * @param hash The hash of the subtree to ask about.
+     * @param parentID The node above the position to ask about it at.
+     * @param branch The branch of that node leading to that position.
+     * @return `true` If that subtree is recorded as resident at that position.
     */
    bool
-    touchIfExists(key_type const& key)
+    touchIfExists(UInt256 const& hash, SHAMapNodeID const& parentID, unsigned int branch)
    {
-        return cache_.touchIfExists(key);
+        return cache_.touchIfExists(key_type{hash, parentID, branch});
    }

    /**
@@ -101,12 +212,13 @@ public:
     * be refreshed.
     * Thread safety:
     *     Safe to call from any thread.
-     * @param key The key to insert.
+     * @param hash The hash of the subtree whose descendants are all resident.
+     * @param nodeID The node that subtree was completed at.
     */
    void
-    insert(key_type const& key)
+    insert(UInt256 const& hash, SHAMapNodeID const& nodeID)
    {
-        cache_.insert(key);
+        cache_.insert(key_type{hash, nodeID});
    }

    /**
@@ -278,11 +278,14 @@ This cache remembers which trie keys have all of their children resident in a
 when creating the missing nodes list. Missing nodes are those nodes that a
 `SHAMap` refers to but that are not stored in the local database.

-As a depth-first walk of a `SHAMap` is performed, if an inner node answers true to
-`isFullBelow()` then it is known that none of this node's children are missing
-nodes, and thus that subtree does not need to be walked. These nodes are stored
-in the FullBelowCache. Subsequent walks check the FullBelowCache first when
-encountering a node, and ignore that subtree if found.
+As a depth-first walk of a `SHAMap` completes an inner node, meaning none of the
+nodes below it are missing, the node's hash and position are stored in the
+FullBelowCache. Subsequent walks check the FullBelowCache when encountering a
+child, and skip that subtree if found. The entry is keyed by position as well as
+hash, since a hash commits to a node's contents rather than its place, and the
+same node object is shared by hash between maps and positions. For the same
+reason the inner node's own `isFullBelow()` flag is written and read for a
+walk's root alone, where the position is fixed.

 ## `SHAMapTreeNode`

@@ -131,21 +131,18 @@ private:
    /**
     * The sequence of the ledger that this map references, if any.
     *
-     * Written when a map's ledger sequence is established (Ledger::setFull(),
-     * InboundLedger) while a nodestore reader thread reads it. Relaxed either
-     * way: it serves as a lookup hint for a nodestore keyed by hash.
+     * Written by Ledger::setFull() and by InboundLedger, and read on a
+     * nodestore reader thread. Relaxed both ways, since it is only a lookup
+     * hint for a store keyed by hash.
     */
    std::atomic<std::uint32_t> ledgerSeq_ = 0;

    SHAMapTreeNodePtr root_;

    /**
-     * The map's state.
-     *
-     * A getMissingNodes() walk writes it, through setInvalid() and
-     * clearSynching(), while whatever drives the acquisition reads it.
-     * The walk runs with the acquisition's lock released, so this is atomic
-     * rather than guarded.
+     * The map's state. Atomic because a getMissingNodes() walk writes it with
+     * the acquisition's lock released. Mutable because a const descend() can
+     * record the Invalid verdict.
     */
    mutable std::atomic<SHAMapState> state_;
    SHAMapType const type_;
@@ -294,9 +291,11 @@ public:
    /**
     * Find the first item after the given item.
     *
-     * @param id the identifier of the item.
-     *
-     * @note The item does not need to exist.
+     * @param id the identifier of the item, which need not exist in the map.
+     * @return an iterator at the first item with a greater key, or end() if the
+     *         map holds no greater key.
+     * @throws SHAMapMissingNode if the map cannot be walked. end() is the
+     *         separate answer that the map holds no greater key.
     */
    ConstIterator
    upperBound(UInt256 const& id) const;
@@ -304,9 +303,11 @@ public:
    /**
     * Find the object with the greatest object id smaller than the input id.
     *
-     * @param id the identifier of the item.
-     *
-     * @note The item does not need to exist.
+     * @param id the identifier of the item, which need not exist in the map.
+     * @return an iterator at the last item with a smaller key, or end() if the
+     *         map holds no smaller key.
+     * @throws SHAMapMissingNode if the map cannot be walked. end() is the
+     *         separate answer that the map holds no smaller key.
     */
    ConstIterator
    lowerBound(UInt256 const& id) const;
@@ -419,17 +420,25 @@ public:
     * deserialized.
     *
     * A node that no valid tree can hold makes the map Invalid, which is
-     * terminal: the root hash committed to an impossible shape, so no peer
-     * can satisfy it.
+     * terminal. An acquisition reaching that verdict gives up.
     *
     * @param nodeID The position in the tree where this node belongs.
     * @param treeNode A deserialized tree node to add.
     * @param filter Optional sync filter to track received nodes.
     * @return Status indicating whether the node was useful, duplicate, or invalid.
     *
-     * @note This function expects the treeNode to be a valid, deserialized SHAMapTreeNode. The
-     *       caller is responsible for deserialization and basic validation before calling this
-     *       function. This also means that the nodeID must be consistent with the node's content.
+     * @note The caller is responsible for deserialization. The position is
+     *       checked here, in three steps that share two verdicts. A node
+     *       the descent reaches at a position other than the one nodeID
+     *       claims is refused with invalid(), and the map stays valid, since
+     *       only the label was wrong. A leaf that hash-verified at the
+     *       position nodeID claims, but whose own key does not lie under
+     *       nodeID, condemns the map and returns mapInvalidated(). A node the
+     *       descent itself condemns on the way, resolved from the local store
+     *       or the filter rather than supplied by the caller, leaves the map
+     *       Invalid and returns invalid(), since that verdict is not the
+     *       caller's doing. Any map outside Synching, including one already
+     *       condemned, returns duplicate().
     */
    SHAMapAddNode
    addKnownNode(
@@ -523,6 +532,29 @@ public:
    invariants() const;

 private:
+    /**
+     * Whether placing `node` one level below `parentDepth` leaves it no room.
+     *
+     * Only a leaf may sit at kLeafDepth, and only a parent above kLeafDepth has
+     * a nibble left to record the branch taken. Both bounds are needed, since a
+     * leaf one level above kLeafDepth is allowed. Position is judged separately,
+     * by the walk that keeps a path.
+     *
+     * The conjunct order is load bearing: the depth is tested first, so the
+     * virtual isInner() call runs only at the one level where the bound
+     * applies.
+     *
+     * @param parentDepth the depth of the node being descended from.
+     * @param node the node about to be placed one level below it.
+     * @return whether that placement is past the deepest level this kind of
+     *         node may occupy.
+     */
+    [[nodiscard]] static bool
+    pastLeafDepth(unsigned int parentDepth, SHAMapTreeNode const& node)
+    {
+        return parentDepth + 1u >= kLeafDepth && (node.isInner() || parentDepth >= kLeafDepth);
+    }
+
    /**
     * A path from the root of the map down to some node, pairing each node with the ID naming its
     * position.
@@ -547,20 +579,46 @@ private:
            return stack_.size();
        }

+        /**
+         * The node at the end of the path, paired with its ID.
+         *
+         * std::stack::top on an empty stack is undefined, so an empty path
+         * yields a null node the caller can test. The assert alone is
+         * stripped in release.
+         */
        [[nodiscard]] std::pair<SHAMapTreeNodePtr, SHAMapNodeID> const&
        top() const
        {
-            XRPL_ASSERT(!stack_.empty(), "xrpl::SHAMap::NodePathStack::top : non-empty stack");
+            if (stack_.empty())
+            {
+                // LCOV_EXCL_START
+                UNREACHABLE("xrpl::SHAMap::NodePathStack::top : empty stack");
+                static std::pair<SHAMapTreeNodePtr, SHAMapNodeID> const kEmpty;
+                return kEmpty;
+                // LCOV_EXCL_STOP
+            }
            return stack_.top();
        }

+        /**
+         * Shorten the path by one node. An empty path is left as it is.
+         */
        void
        pop()
        {
-            XRPL_ASSERT(!stack_.empty(), "xrpl::SHAMap::NodePathStack::pop : non-empty stack");
+            if (stack_.empty())
+            {
+                // LCOV_EXCL_START
+                UNREACHABLE("xrpl::SHAMap::NodePathStack::pop : empty stack");
+                return;
+                // LCOV_EXCL_STOP
+            }
            stack_.pop();
        }

+        /**
+         * Discard the whole path.
+         */
        void
        clear()
        {
@@ -569,36 +627,79 @@ private:

        /**
         * Start a path at the root of the map, whose ID is the zero-depth ID by definition.
+         *
+         * @return false, leaving the path unchanged, if a path was already
+         *         started, so the caller stops rather than overwriting it.
         */
-        void
+        [[nodiscard]] bool
        pushRoot(SHAMapTreeNodePtr node)
        {
-            XRPL_ASSERT(stack_.empty(), "xrpl::SHAMap::NodePathStack::pushRoot : empty stack");
+            if (!stack_.empty())
+            {
+                // LCOV_EXCL_START
+                UNREACHABLE("xrpl::SHAMap::NodePathStack::pushRoot : non-empty stack");
+                return false;
+                // LCOV_EXCL_STOP
+            }
            stack_.emplace(std::move(node), SHAMapNodeID{});
+            return true;
        }

        /**
         * Extend the path to the child of the current node reached by `branch`.
         *
-         * A node keeps the depth it was reached at, never a normalized kLeafDepth. Only a leaf may
-         * sit at kLeafDepth, since an inner node there would have no branch left to select.
+         * A node keeps the depth it was reached at.
+         *
+         * @param node the child to append.
+         * @param branch the branch of the current node that `node` was
+         *               reached through.
+         * @return false, leaving the path unchanged, if there is no node to
+         *         descend from, no node to push, no branch of that number, no
+         *         room left below for the kind of node offered, or a leaf
+         *         whose own key does not lie under `branch`. The caller stops
+         *         walking on a false return.
         */
-        void
+        [[nodiscard]] bool
        pushChild(SHAMapTreeNodePtr node, unsigned int branch)
        {
-            XRPL_ASSERT(node, "xrpl::SHAMap::NodePathStack::pushChild : non-null node input");
-            XRPL_ASSERT(
-                !stack_.empty(), "xrpl::SHAMap::NodePathStack::pushChild : non-empty stack");
-            auto const childID = stack_.top().second.getChildNodeID(branch);
-            XRPL_ASSERT_IF(
-                node->isInner(),
-                childID.getDepth() < kLeafDepth,
-                "xrpl::SHAMap::NodePathStack::pushChild : inner node above leaf depth");
-            XRPL_ASSERT_IF(
-                node->isLeaf(),
-                childID.isPrefixOf(leafKey(*node)),
-                "xrpl::SHAMap::NodePathStack::pushChild : leaf key below branch");
+            if (stack_.empty() || !node || branch >= kBranchFactor)
+            {
+                // LCOV_EXCL_START
+                UNREACHABLE("xrpl::SHAMap::NodePathStack::pushChild : no child to push");
+                return false;
+                // LCOV_EXCL_STOP
+            }
+
+            // Reachable, for the same reason the misplaced-leaf case below is: the two-argument
+            // SHAMap::descend fetches by the parent's recorded child hash and hooks what comes
+            // back, and a parsed node adopts that hash, so an inner node can arrive one level
+            // too deep. The push is refused and the caller stops.
+            auto const& parentID = stack_.top().second;
+            auto const parentDepth = parentID.getDepth();
+            bool const tooDeep = pastLeafDepth(parentDepth, *node);
+            SOMETIMES(tooDeep, "xrpl::SHAMap::NodePathStack::pushChild : child past leaf depth");
+            if (tooDeep)
+            {
+                return false;
+            }
+
+            // A leaf's own key names its position, so a leaf reached by this branch must agree with
+            // the ID that branch derives. Where the two disagree the push is refused.
+            //
+            // Reported rather than asserted, for the reason given above: a map read lazily from
+            // the local store reaches this push directly, with no hook ahead of it to judge the
+            // node first.
+            auto const childID = parentID.getChildNodeID(branch);
+            bool const misplaced = !belongsAt(childID, *node);
+            SOMETIMES(
+                misplaced, "xrpl::SHAMap::NodePathStack::pushChild : leaf key outside branch");
+            if (misplaced)
+            {
+                return false;
+            }
+
            stack_.emplace(std::move(node), childID);
+            return true;
        }

        /**
@@ -607,17 +708,14 @@ private:
         * For nodes not reached by descending a known branch: the walk tracks only the key it is
         * heading for, or the node is newly created. Either way `target` selects the branch.
         */
-        void
+        [[nodiscard]] bool
        pushNode(SHAMapTreeNodePtr node, UInt256 const& target)
        {
            if (stack_.empty())
            {
-                pushRoot(std::move(node));
-            }
-            else
-            {
-                pushChild(std::move(node), selectBranch(stack_.top().second, target));
+                return pushRoot(std::move(node));
            }
+            return pushChild(std::move(node), selectBranch(stack_.top().second, target));
        }

    private:
@@ -649,28 +747,41 @@ private:
    /**
     * Record that the map is provably not the one it claims to be.
     *
-     * Private because only the map itself can prove that, from a node that
-     * contradicts the hashes it is syncing against. Cannot fail, since
-     * Invalid outranks every other state; see trySetState().
+     * Cannot fail, since Invalid outranks every other state. Const because a
+     * const descend() can reach this verdict while resolving a node.
     */
    void
-    setInvalid();
+    setInvalid() const;
+
+    /**
+     * Condemn the map, naming in the log the node whose position proves it.
+     *
+     * Const, because a read path can reach this verdict. See setInvalid().
+     *
+     * @param node the node that cannot sit where it was offered.
+     * @param hash the hash it was resolved under.
+     * @param position the place in the tree it was offered for.
+     */
+    void
+    condemn(SHAMapTreeNode const& node, SHAMapHash const& hash, SHAMapNodeID const& position) const;

    /**
     * Move the map to a new state, atomically.
     *
-     * With clearSynching(), the only writer of state_ past construction, so
-     * the order between the states lives in one place: Invalid outranks all
-     * of them and is always stored, while every other transition is refused
-     * once the map is Invalid, which is what makes that verdict terminal.
+     * With clearSynching(), the only writer of state_ past construction.
+     * Invalid is always stored, and every other transition is refused once
+     * the map is Invalid, which is what makes that verdict terminal.
     * clearSynching() is narrower and moves only Synching.
     *
+     * Const to let setInvalid() be const. state_ is mutable, which makes that
+     * legal.
+     *
     * @param desired The state to move to.
     * @return false if the map is Invalid and the requested state is not,
-     *         leaving it unchanged; true otherwise.
+     *         leaving it unchanged. True otherwise.
     */
    bool
-    trySetState(SHAMapState desired);
+    trySetState(SHAMapState desired) const;

    // tree node cache operations
    SHAMapTreeNodePtr
@@ -736,8 +847,13 @@ private:
    /**
     * Returns the first or last item at or below the node already on top of `stack`, extending
     * `stack` with the path walked to reach it.
+     *
+     * @param stack the path to extend, whose last node the search starts from.
+     * @param direction whether to take the lowest or the highest branch at
+     *                  each level.
+     * @return the leaf found, or nullptr if no leaf lies below that node.
     */
-    SHAMapLeafNode*
+    [[nodiscard]] SHAMapLeafNode*
    belowHelper(NodePathStack& stack, BelowDirection direction) const;

    /**
@@ -751,7 +867,7 @@ private:
     * @param direction First to search upwards from `id`, Last to search downwards.
     * @return An iterator to the item found, or end() if no item lies on that side of `id`.
     */
-    ConstIterator
+    [[nodiscard]] ConstIterator
    boundHelper(UInt256 const& id, BelowDirection direction) const;

    // Simple descent
@@ -776,6 +892,22 @@ private:
        bool& pending,
        DescendCallback&&) const;

+    /**
+     * Resolve the child of `parent` on `branch`, judging where it lands.
+     *
+     * Const, yet it records the Invalid verdict through setInvalid(). A new
+     * caller must therefore be a path that may reach that verdict. Today
+     * addKnownNode() is the only one.
+     *
+     * @param parent the inner node to descend from.
+     * @param parentID the position of `parent`.
+     * @param branch the branch of `parent` to resolve, which the caller has
+     *               already bounded.
+     * @param filter an alternate source of nodes, or null for the store alone.
+     * @return the child and the child's position. A null child where the branch
+     *         could not be resolved, or where what came back does not belong at
+     *         that position, in which case the map is left Invalid.
+     */
    std::pair<SHAMapTreeNode*, SHAMapNodeID>
    descend(
        SHAMapInnerNode* parent,
@@ -876,10 +1008,29 @@ private:
    };

    // getMissingNodes helper functions
+
+    /**
+     * Examine the remaining branches of one inner node, recording or
+     * requesting what is missing.
+     *
+     * @param mn the walk's shared state, which collects the missing nodes.
+     * @param node the walk's current position, updated to the node to process
+     *             next.
+     */
    void
-    gmnProcessNodes(MissingNodes&, MissingNodes::StackEntry& node);
-    static void
-    gmnProcessDeferredReads(MissingNodes&);
+    gmnProcessNodes(MissingNodes& mn, MissingNodes::StackEntry& node);
+
+    /**
+     * Wait for every read this pass posted, then hook up or record what each
+     * one resolved.
+     *
+     * Drains all of them even after judging the map, since an outstanding read
+     * holds a pointer to `mn`.
+     *
+     * @param mn the walk's shared state, holding the posted reads.
+     */
+    void
+    gmnProcessDeferredReads(MissingNodes& mn);

    // fetch from DB helper function
    SHAMapTreeNodePtr
@@ -912,10 +1063,9 @@ SHAMap::state() const
 }

 inline bool
-SHAMap::trySetState(SHAMapState desired)
+SHAMap::trySetState(SHAMapState desired) const
 {
-    // Invalid is stored outright: a walk reaching that verdict has to win against a thread
-    // settling the map.
+    // Invalid is stored outright: that verdict outranks a concurrent transition.
    if (desired == SHAMapState::Invalid)
    {
        state_.store(SHAMapState::Invalid, std::memory_order_release);
@@ -997,7 +1147,7 @@ SHAMap::isValid() const
 }

 inline void
-SHAMap::setInvalid()
+SHAMap::setInvalid() const
 {
    // Through trySetState() like every other transition, so state_ has one writer funnel.
    trySetState(SHAMapState::Invalid);
@@ -12,6 +12,10 @@ private:
    int bad_;
    int duplicate_;

+    // Whether a node in the batch proved the map impossible. A fact about the batch rather than
+    // about the map, so a caller can tell this batch's doing from a concurrent walk's verdict.
+    bool invalidatedMap_;
+
 public:
    SHAMapAddNode();

@@ -96,6 +100,26 @@ public:
    static SHAMapAddNode
    invalid();

+    /**
+     * @return A verdict recording one invalid node that proved the map
+     *         impossible.
+     */
+    static SHAMapAddNode
+    mapInvalidated();
+
+    /**
+     * Whether a node in the batch proved the map impossible.
+     *
+     * Reports what the batch did rather than what the map now holds, so a
+     * verdict another thread's walk reached is not read as this batch's. The
+     * two differ: SHAMap::setInvalid() is written with no lock held, by a
+     * getMissingNodes() walk its caller runs lock-free.
+     *
+     * @return Whether a node in the batch invalidated the map.
+     */
+    [[nodiscard]] bool
+    invalidatedMap() const;
+
    /**
     * Clear every count back to zero.
     */
@@ -121,15 +145,15 @@ public:
    operator+=(SHAMapAddNode const& n);

 private:
-    SHAMapAddNode(int good, int bad, int duplicate);
+    SHAMapAddNode(int good, int bad, int duplicate, bool invalidatedMap = false);
 };

-inline SHAMapAddNode::SHAMapAddNode() : good_(0), bad_(0), duplicate_(0)
+inline SHAMapAddNode::SHAMapAddNode() : good_(0), bad_(0), duplicate_(0), invalidatedMap_(false)
 {
 }

-inline SHAMapAddNode::SHAMapAddNode(int good, int bad, int duplicate)
-    : good_(good), bad_(bad), duplicate_(duplicate)
+inline SHAMapAddNode::SHAMapAddNode(int good, int bad, int duplicate, bool invalidatedMap)
+    : good_(good), bad_(bad), duplicate_(duplicate), invalidatedMap_(invalidatedMap)
 {
 }

@@ -187,6 +211,12 @@ SHAMapAddNode::isUseful() const
    return good_ > 0;
 }

+inline bool
+SHAMapAddNode::invalidatedMap() const
+{
+    return invalidatedMap_;
+}
+
 inline SHAMapAddNode
 SHAMapAddNode::duplicate()
 {
@@ -205,10 +235,17 @@ SHAMapAddNode::invalid()
    return SHAMapAddNode(0, 1, 0);
 }

+inline SHAMapAddNode
+SHAMapAddNode::mapInvalidated()
+{
+    return SHAMapAddNode(0, 1, 0, true);
+}
+
 inline void
 SHAMapAddNode::reset()
 {
    good_ = bad_ = duplicate_ = 0;
+    invalidatedMap_ = false;
 }

 inline std::string
@@ -246,6 +283,9 @@ SHAMapAddNode::operator+=(SHAMapAddNode const& n)
    bad_ += n.bad_;
    duplicate_ += n.duplicate_;

+    // Or-ed, not summed: one node in the batch having proved the map impossible is the whole fact.
+    invalidatedMap_ = invalidatedMap_ || n.invalidatedMap_;
+
    return *this;
 }

@@ -38,10 +38,16 @@ private:
    static_assert(alignof(std::atomic<std::uint32_t>) == alignof(std::uint32_t));

    /**
-     * Written from more than one thread, since canonicalization shares a node
-     * between maps and a walk can run with the acquisition lock released (see
-     * SHAMap::state_). Relaxed both ways, since a generation is only compared
-     * for equality and the children it vouches for are published through lock_.
+     * The generation in which a walk found every node below this one resident,
+     * with this node as the walk's root. The node object is shared by hash
+     * between maps and positions, and a hash commits to a node's contents
+     * rather than its place, so the flag is written and read for the root
+     * position only; below the root, the position-keyed FullBelowCache is the
+     * memo. Written from more than one thread, since canonicalization shares a
+     * node between maps and a walk can run with the acquisition lock released
+     * (see SHAMap::state_). Relaxed both ways, since a generation is only
+     * compared for equality and the children it vouches for are published
+     * through lock_.
     */
    std::atomic<std::uint32_t> fullBelowGen_ = 0;
    std::uint16_t isBranch_ = 0;
@@ -160,10 +166,23 @@ public:
    SHAMapTreeNodePtr
    canonicalizeChild(unsigned int branch, SHAMapTreeNodePtr node);

-    // sync functions
+    /**
+     * Whether a walk rooted at this node found every node below it resident.
+     *
+     * Meaningful only for the node a walk starts at; see fullBelowGen_.
+     *
+     * @param generation The FullBelowCache generation the asking walk runs in.
+     * @return True if a walk rooted here completed in that generation.
+     */
    bool
    isFullBelow(std::uint32_t generation) const;

+    /**
+     * Record that a walk rooted at this node found every node below it
+     * resident.
+     *
+     * @param gen The FullBelowCache generation the completing walk ran in.
+     */
    void
    setFullBelowGen(std::uint32_t gen);

@@ -75,4 +75,41 @@ leafKey(SHAMapTreeNode const& node)
    return safeDowncast<SHAMapLeafNode const&>(node).peekItem()->key();
 }

+/**
+ * Whether a node may occupy a position in a SHAMap.
+ *
+ * A leaf's own key names its position. An inner node carries no key, so every
+ * position agrees with it and a caller's own depth rules are what bound it.
+ *
+ * @param nodeID the position the node is claimed to occupy.
+ * @param node the node to judge.
+ * @return whether the node's own key agrees with that position.
+ */
+[[nodiscard]] inline bool
+belongsAt(SHAMapNodeID const& nodeID, SHAMapTreeNode const& node)
+{
+    return !node.isLeaf() || nodeID.isPrefixOf(leafKey(node));
+}
+
+/**
+ * Whether a node may occupy the child position a branch leads to.
+ *
+ * The overload above, asked about a child without building the child's id.
+ *
+ * @param parentID the position of the node above, whose depth must be below
+ *                 SHAMap::kLeafDepth.
+ * @param branch the branch of that node leading to the position judged.
+ * @param node the node to judge.
+ * @return whether the node's own key agrees with that position.
+ */
+[[nodiscard]] inline bool
+belongsAt(SHAMapNodeID const& parentID, unsigned int branch, SHAMapTreeNode const& node)
+{
+    if (!node.isLeaf())
+        return true;
+
+    auto const& key = leafKey(node);
+    return parentID.isPrefixOf(key) && selectBranch(parentID, key) == branch;
+}
+
 }  // namespace xrpl
@@ -123,6 +123,25 @@ operator<<(std::ostream& out, SHAMapNodeID const& node)
    return out << to_string(node);
 }

+/**
+ * Returns the masked id of the child a parent's branch leads to
+ *
+ * An id names the subtree its leading nibbles spell, so a child's id is its
+ * parent's with the nibble at the parent's own depth set to the branch taken.
+ * A parent's id carries no bits below its own depth, so that nibble is free
+ * and the result is already masked to the child's depth.
+ *
+ * This is the write counterpart of selectBranch, and callers that want only
+ * the id use this rather than building a SHAMapNodeID for it.
+ *
+ * @param parentID the masked id of the parent.
+ * @param parentDepth the depth of the parent, below SHAMap::kLeafDepth.
+ * @param branch the branch of the parent leading to the child.
+ * @return the masked id of that child, whose depth is parentDepth + 1.
+ */
+[[nodiscard]] UInt256
+childNodeID(UInt256 const& parentID, unsigned int parentDepth, unsigned int branch);
+
 /**
 * Return an object representing a serialized SHAMap Node ID
 *
@@ -1,52 +0,0 @@
-#pragma once
-
-#include <xrpl/basics/base_uint.h>
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/protocol/Keylet.h>
-#include <xrpl/protocol/STLedgerEntry.h>
-#include <xrpl/protocol/STTx.h>
-#include <xrpl/protocol/TER.h>
-#include <xrpl/protocol/XRPAmount.h>
-
-#include <cstdint>
-#include <set>
-#include <vector>
-
-namespace xrpl {
-
-class ReadView;
-
-/**
- * @brief Invariants for TransactionProposal ledger entries.
- *
- * - Only transaction types implementing proposal lifecycle operations may
- *   create or modify proposals, and a failed one leaves no proposal effect.
- * - A proposal is deleted only by TransactionProposalCancel or together with
- *   the Ticket it is keyed to, and a deleted Ticket takes the proposal keyed
- *   to it along.
- * - Collected signer arrays remain sorted, unique, and bounded.
- */
-class ValidTransactionProposal
-{
-    // The Ticket each deleted proposal was keyed to; a proposal may go with
-    // its Ticket, or by Cancel, and no other way.
-    std::vector<uint256> ticketsOfDeletedProposals_;
-    // The proposal each deleted Ticket was keyed to, whether or not one
-    // existed; none may survive its Ticket.
-    std::vector<Keylet> proposalsOfDeletedTickets_;
-    std::set<uint256> deletedTickets_;
-    std::uint32_t created_ = 0;
-    std::uint32_t modified_ = 0;
-    std::uint32_t deleted_ = 0;
-    bool invalidSignerArrays_ = false;
-
-public:
-    void
-    visitEntry(bool isDelete, SLE::ConstRef before, SLE::ConstRef after);
-
-    [[nodiscard]] bool
-    finalize(STTx const& tx, TER result, XRPAmount, ReadView const& view, beast::Journal const& j)
-        const;
-};
-
-}  // namespace xrpl
@@ -9,7 +9,6 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/invariants/AMMInvariant.h>
-#include <xrpl/tx/invariants/CosignerInvariant.h>
 #include <xrpl/tx/invariants/DirectoryInvariant.h>
 #include <xrpl/tx/invariants/FreezeInvariant.h>
 #include <xrpl/tx/invariants/LoanBrokerInvariant.h>
@@ -484,7 +483,6 @@ using InvariantChecks = std::tuple<
    ValidAmounts,
    ValidMPTTransfer,
    ObjectHasPseudoAccount,
-    ValidTransactionProposal,
    SponsorshipOwnerCountsMatch,
    SponsorshipAccountCountMatchesField>;

@@ -818,10 +818,13 @@ flow(
     *   TakerPays. We reverse pays and gets because during crossing
     *   we are taking, therefore the owner must deliver the full TakerPays and
     *   the entire TakerGets doesn't have to be spent.
+     *   Pre-fixFillOrKill amendment code fails if the entire TakerGets
+     *   is not spent. fixFillOrKill addresses this issue.
     * 2. If tfSell is also set then the owner must spend the entire TakerGets
     *   even if it means obtaining more than TakerPays. Since the pays and gets
     *   are reversed, the owner must send the entire TakerGets.
     */
+    bool const fillOrKillEnabled = baseView.rules().enabled(fixFillOrKill);

    if (actualOut != outReq)
    {
@@ -837,9 +840,13 @@ flow(
        }
        if (!partialPayment)
        {
-            // If partialPayment is false, the caller requires full outReq (payments, or FillOrKill
-            // offers).
-            if (offerCrossing != OfferCrossing::Sell)
+            // If we're offerCrossing a !partialPayment, then we're handling tfFillOrKill.
+            // Pre-fixFillOrKill amendment:
+            //   That case is handled below; not here.
+            // fixFillOrKill amendment:
+            //   That case is handled here if tfSell is also not set; i.e, case 1.
+            if (offerCrossing == OfferCrossing::No ||
+                (fillOrKillEnabled && offerCrossing != OfferCrossing::Sell))
            {
                return {tecPATH_PARTIAL, actualIn, actualOut, std::move(ofrsToRmOnFail)};
            }
@@ -849,10 +856,16 @@ flow(
            return {tecPATH_DRY, std::move(ofrsToRmOnFail)};
        }
    }
-    if (!partialPayment && offerCrossing == OfferCrossing::Sell)
+    if (offerCrossing != OfferCrossing::No &&
+        (!partialPayment && (!fillOrKillEnabled || offerCrossing == OfferCrossing::Sell)))
    {
        // If we're offer crossing and partialPayment is *not* true, then
-        // we're handling a FillOrKill offer.
+        // we're handling a FillOrKill offer.  In this case remainingIn must
+        // be zero (all funds must be consumed) or else we kill the offer.
+        // Pre-fixFillOrKill amendment:
+        //   Handles both cases 1. and 2.
+        // fixFillOrKill amendment:
+        //   Handles 2. 1. is handled above and falls through for tfSell.
        XRPL_ASSERT(remainingIn, "xrpl::flow : nonzero remainingIn");
        if (remainingIn && *remainingIn != beast::kZero)
            return {tecPATH_PARTIAL, actualIn, actualOut, std::move(ofrsToRmOnFail)};
@@ -0,0 +1,336 @@
+#pragma once
+
+#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/core/ServiceRegistry.h>
+#include <xrpl/ledger/ReadView.h>
+#include <xrpl/protocol/STTx.h>
+#include <xrpl/protocol/TER.h>
+#include <xrpl/protocol/XRPAmount.h>
+#include <xrpl/tx/ApplyContext.h>
+#include <xrpl/tx/Transactor.h>
+
+#include <cstddef>
+#include <cstdint>
+
+namespace xrpl {
+
+constexpr size_t kXbridgeMaxAccountCreateClaims = 128;
+
+// Attach a new bridge to a door account. Once this is done, the cross-chain
+// transfer transactions may be used to transfer funds from this account.
+class XChainCreateBridge : public Transactor
+{
+public:
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
+
+    explicit XChainCreateBridge(ApplyContext& ctx) : Transactor(ctx)
+    {
+    }
+
+    static NotTEC
+    preflight(PreflightContext const& ctx);
+
+    static TER
+    preclaim(PreclaimContext const& ctx);
+
+    TER
+    doApply() override;
+
+    void
+    visitInvariantEntry(bool isDelete, SLE::ConstRef before, SLE::ConstRef after) override;
+
+    [[nodiscard]] bool
+    finalizeInvariants(
+        STTx const& tx,
+        TER result,
+        XRPAmount fee,
+        ReadView const& view,
+        beast::Journal const& j) override;
+};
+
+class BridgeModify : public Transactor
+{
+public:
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
+
+    explicit BridgeModify(ApplyContext& ctx) : Transactor(ctx)
+    {
+    }
+
+    static std::uint32_t
+    getFlagsMask(PreflightContext const& ctx);
+
+    static NotTEC
+    preflight(PreflightContext const& ctx);
+
+    static TER
+    preclaim(PreclaimContext const& ctx);
+
+    TER
+    doApply() override;
+
+    void
+    visitInvariantEntry(bool isDelete, SLE::ConstRef before, SLE::ConstRef after) override;
+
+    [[nodiscard]] bool
+    finalizeInvariants(
+        STTx const& tx,
+        TER result,
+        XRPAmount fee,
+        ReadView const& view,
+        beast::Journal const& j) override;
+};
+
+using XChainModifyBridge = BridgeModify;
+
+//------------------------------------------------------------------------------
+
+// Claim funds from a `XChainCommit` transaction. This is normally not needed,
+// but may be used to handle transaction failures or if the destination account
+// was not specified in the `XChainCommit` transaction. It may only be used
+// after a quorum of signatures have been sent from the witness servers.
+//
+// If the transaction succeeds in moving funds, the referenced `XChainClaimID`
+// ledger object will be destroyed. This prevents transaction replay. If the
+// transaction fails, the `XChainClaimID` will not be destroyed and the
+// transaction may be re-run with different parameters.
+class XChainClaim : public Transactor
+{
+public:
+    // Blocker since we cannot accurately calculate the consequences
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Blocker;
+
+    explicit XChainClaim(ApplyContext& ctx) : Transactor(ctx)
+    {
+    }
+
+    static NotTEC
+    preflight(PreflightContext const& ctx);
+
+    static TER
+    preclaim(PreclaimContext const& ctx);
+
+    TER
+    doApply() override;
+
+    void
+    visitInvariantEntry(bool isDelete, SLE::ConstRef before, SLE::ConstRef after) override;
+
+    [[nodiscard]] bool
+    finalizeInvariants(
+        STTx const& tx,
+        TER result,
+        XRPAmount fee,
+        ReadView const& view,
+        beast::Journal const& j) override;
+};
+
+//------------------------------------------------------------------------------
+
+// Put assets into trust on the locking-chain so they may be wrapped on the
+// issuing-chain, or return wrapped assets on the issuing-chain so they can be
+// unlocked on the locking-chain. The second step in a cross-chain transfer.
+class XChainCommit : public Transactor
+{
+public:
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Custom;
+
+    static TxConsequences
+    makeTxConsequences(PreflightContext const& ctx);
+
+    explicit XChainCommit(ApplyContext& ctx) : Transactor(ctx)
+    {
+    }
+
+    static NotTEC
+    preflight(PreflightContext const& ctx);
+
+    static TER
+    preclaim(PreclaimContext const& ctx);
+
+    TER
+    doApply() override;
+
+    void
+    visitInvariantEntry(bool isDelete, SLE::ConstRef before, SLE::ConstRef after) override;
+
+    [[nodiscard]] bool
+    finalizeInvariants(
+        STTx const& tx,
+        TER result,
+        XRPAmount fee,
+        ReadView const& view,
+        beast::Journal const& j) override;
+};
+
+//------------------------------------------------------------------------------
+
+// Create a new claim id owned by the account. This is the first step in a
+// cross-chain transfer. The claim id must be created on the destination chain
+// before the `XChainCommit` transaction (which must reference this number) can
+// be sent on the source chain. The account that will send the `XChainCommit` on
+// the source chain must be specified in this transaction (see note on the
+// `SourceAccount` field in the `XChainClaimID` ledger object for
+// justification). The actual sequence number must be retrieved from a validated
+// ledger.
+class XChainCreateClaimID : public Transactor
+{
+public:
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
+
+    explicit XChainCreateClaimID(ApplyContext& ctx) : Transactor(ctx)
+    {
+    }
+
+    static NotTEC
+    preflight(PreflightContext const& ctx);
+
+    static TER
+    preclaim(PreclaimContext const& ctx);
+
+    TER
+    doApply() override;
+
+    void
+    visitInvariantEntry(bool isDelete, SLE::ConstRef before, SLE::ConstRef after) override;
+
+    [[nodiscard]] bool
+    finalizeInvariants(
+        STTx const& tx,
+        TER result,
+        XRPAmount fee,
+        ReadView const& view,
+        beast::Journal const& j) override;
+};
+
+//------------------------------------------------------------------------------
+
+// Provide attestations from a witness server attesting to events on
+// the other chain. The signatures must be from one of the keys on the door's
+// signer's list at the time the signature was provided. However, if the
+// signature list changes between the time the signature was submitted and the
+// quorum is reached, the new signature set is used and some of the currently
+// collected signatures may be removed. Also note the reward is only sent to
+// accounts that have keys on the current list.
+class XChainAddClaimAttestation : public Transactor
+{
+public:
+    // Blocker since we cannot accurately calculate the consequences
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Blocker;
+
+    explicit XChainAddClaimAttestation(ApplyContext& ctx) : Transactor(ctx)
+    {
+    }
+
+    static NotTEC
+    preflight(PreflightContext const& ctx);
+
+    static TER
+    preclaim(PreclaimContext const& ctx);
+
+    TER
+    doApply() override;
+
+    void
+    visitInvariantEntry(bool isDelete, SLE::ConstRef before, SLE::ConstRef after) override;
+
+    [[nodiscard]] bool
+    finalizeInvariants(
+        STTx const& tx,
+        TER result,
+        XRPAmount fee,
+        ReadView const& view,
+        beast::Journal const& j) override;
+};
+
+class XChainAddAccountCreateAttestation : public Transactor
+{
+public:
+    // Blocker since we cannot accurately calculate the consequences
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Blocker;
+
+    explicit XChainAddAccountCreateAttestation(ApplyContext& ctx) : Transactor(ctx)
+    {
+    }
+
+    static NotTEC
+    preflight(PreflightContext const& ctx);
+
+    static TER
+    preclaim(PreclaimContext const& ctx);
+
+    TER
+    doApply() override;
+
+    void
+    visitInvariantEntry(bool isDelete, SLE::ConstRef before, SLE::ConstRef after) override;
+
+    [[nodiscard]] bool
+    finalizeInvariants(
+        STTx const& tx,
+        TER result,
+        XRPAmount fee,
+        ReadView const& view,
+        beast::Journal const& j) override;
+};
+
+//------------------------------------------------------------------------------
+
+// This is a special transaction used for creating accounts through a
+// cross-chain transfer. A normal cross-chain transfer requires a "chain claim
+// id" (which requires an existing account on the destination chain). One
+// purpose of the "chain claim id" is to prevent transaction replay. For this
+// transaction, we use a different mechanism: the accounts must be claimed on
+// the destination chain in the same order that the `XChainCreateAccountCommit`
+// transactions occurred on the source chain.
+//
+// This transaction can only be used for XRP to XRP bridges.
+//
+// IMPORTANT: This transaction should only be enabled if the witness
+// attestations will be reliably delivered to the destination chain. If the
+// signatures are not delivered (for example, the chain relies on user wallets
+// to collect signatures) then account creation would be blocked for all
+// transactions that happened after the one waiting on attestations. This could
+// be used maliciously. To disable this transaction on XRP to XRP bridges, the
+// bridge's `MinAccountCreateAmount` should not be present.
+//
+// Note: If this account already exists, the XRP is transferred to the existing
+// account. However, note that unlike the `XChainCommit` transaction, there is
+// no error handling mechanism. If the claim transaction fails, there is no
+// mechanism for refunds. The funds are permanently lost. This transaction
+// should still only be used for account creation.
+class XChainCreateAccountCommit : public Transactor
+{
+public:
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
+
+    explicit XChainCreateAccountCommit(ApplyContext& ctx) : Transactor(ctx)
+    {
+    }
+
+    static NotTEC
+    preflight(PreflightContext const& ctx);
+
+    static TER
+    preclaim(PreclaimContext const& ctx);
+
+    TER
+    doApply() override;
+
+    void
+    visitInvariantEntry(bool isDelete, SLE::ConstRef before, SLE::ConstRef after) override;
+
+    [[nodiscard]] bool
+    finalizeInvariants(
+        STTx const& tx,
+        TER result,
+        XRPAmount fee,
+        ReadView const& view,
+        beast::Journal const& j) override;
+};
+
+using XChainAccountCreateCommit = XChainCreateAccountCommit;
+
+//------------------------------------------------------------------------------
+
+}  // namespace xrpl
@@ -20,14 +20,11 @@ public:
    {
    }

-    static bool
-    checkExtraFeatures(PreflightContext const& ctx);
-
    static TxConsequences
    makeTxConsequences(PreflightContext const& ctx);

-    static XRPAmount
-    calculateBaseFee(ReadView const& view, STTx const& tx);
+    static bool
+    checkExtraFeatures(PreflightContext const& ctx);

    static NotTEC
    preflight(PreflightContext const& ctx);
@@ -7,26 +7,17 @@
  ...
 }:
 let
-  inherit (import ./packages.nix { inherit pkgs customGlibc; }) cacert commonPackages;
+  inherit (import ./packages.nix { inherit pkgs customGlibc; }) commonPackages;

  # Each forces something absent on the other platform, so both stay lazy.
  linux = import ./linux.nix { inherit pkgs customGlibc; };
  darwin = import ./darwin.nix { inherit pkgs; };

-  # Nix-built tools (git, curl, Conan's certifi) read NIX_SSL_CERT_FILE, which
-  # the macOS runners point at their Nix profile's bundle, frozen at install
-  # time. The Linux images set it in nix/docker/Dockerfile.
-  caEnv = {
-    NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-  };
-
  # What a buildEnv cannot express: environment variables. $GITHUB_ENV format;
  # `set -a; . env; set +a` loads it in a shell.
  darwinEnv = pkgs.writeTextDir "share/xrpld-ci-env/env" (
    pkgs.lib.concatStrings (
-      pkgs.lib.mapAttrsToList (name: value: "${name}=${value}\n") (
-        darwin.sdkEnv // darwin.libresolvEnv // caEnv
-      )
+      pkgs.lib.mapAttrsToList (name: value: "${name}=${value}\n") (darwin.sdkEnv // darwin.libresolvEnv)
    )
  );

@@ -42,7 +33,7 @@ in
      ++ [
        # CA certificate bundle so HTTPS clients (git, curl, conan) can verify
        # TLS connections without ca-certificates being installed in the system.
-        cacert
+        pkgs.cacert
      ];
    pathsToLink = [
      "/bin"
@@ -1,7 +1,6 @@
 { pkgs, customGlibc, ... }:
 let
  inherit (import ./packages.nix { inherit pkgs; })
-    cacert
    commonPackages
    gccPackage
    gccVersion
@@ -54,17 +53,6 @@ let
    unset _xrpl_conan_stamp
  '';

-  # Nix's Python certifi (used by Conan) reads only NIX_SSL_CERT_FILE. Swap
-  # Nix's default profile bundle, frozen at install time, for the patched cacert,
-  # but leave a bundle the user chose (e.g. with a proxy CA) alone.
-  caHook = ''
-    case "''${NIX_SSL_CERT_FILE:-}" in
-      "" | /nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt | "$HOME/.nix-profile/etc/ssl/certs/ca-bundle.crt")
-        export NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
-        ;;
-    esac
-  '';
-
  # Not sdkEnv: a shell's stdenv already sets that up. Prepended so the stub
  # beats the nixpkgs libresolv this shell's tooling drags in.
  darwinLibresolvHook = pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isDarwin (
@@ -134,7 +122,6 @@ let
          echo "Welcome to xrpld development shell";
          ${compilerVersionHook}
          ${darwinLibresolvHook}
-          ${caHook}
          ${conanHook}
          ${pkgs.lib.optionalString plain plainWarningHook}
        '';
@@ -53,11 +53,9 @@ ENV PATH="/nix/ci-env/bin:${PATH}"

 # Point HTTPS clients (git, curl, conan, ...) at the CA bundle shipped in the
 # Nix CI environment, so TLS verification works without ca-certificates being
-# installed in the system. Nix's Python certifi (used by Conan) reads only
-# NIX_SSL_CERT_FILE, falling back to its own copy otherwise.
+# installed in the system.
 ENV SSL_CERT_FILE="/nix/ci-env/etc/ssl/certs/ca-bundle.crt"
 ENV GIT_SSL_CAINFO="/nix/ci-env/etc/ssl/certs/ca-bundle.crt"
-ENV NIX_SSL_CERT_FILE="/nix/ci-env/etc/ssl/certs/ca-bundle.crt"

 # Externally-built dynamically-linked ELF binaries hard-code the loader path
 # (e.g. /lib64/ld-linux-x86-64.so.2) in their PT_INTERP header. Install it
@@ -109,13 +107,7 @@ COPY nix/docker/test_files/rust/run-binaries.sh /tmp/test_files/rust/run-binarie
 COPY --from=final /tmp/cpp-bins /tmp/cpp-bins
 COPY --from=final /tmp/rust-bins /tmp/rust-bins

-# Sanity-check that the CA bundle shipped in the Nix CI environment distrusts
-# the compromised eMudhra roots.
-COPY bin/check-distrusted-roots.sh /tmp/check-distrusted-roots.sh
-COPY --from=final /nix/ci-env/etc/ssl/certs/ca-bundle.crt /tmp/ca-bundle.crt
-
 RUN <<EOF
-/tmp/check-distrusted-roots.sh /tmp/ca-bundle.crt
 if echo "${BASE_IMAGE}" | grep -qiE 'nixos'; then
    echo "Skipping runnning binaries on NixOS."
 else
@@ -30,16 +30,6 @@ let
    exec ${pkgs.python3}/bin/python3 ${llvmPackages.clang-unwrapped}/bin/run-clang-tidy "$@"
  '';

-  # Distrusts the roots of the compromised eMudhra intermediates;
-  # see https://emudhra.we-have-a-problem.com/.
-  # TODO: revert to plain pkgs.cacert once nixpkgs ships cacert >= 3.131.1.
-  cacert = pkgs.cacert.override {
-    blacklist = [
-      "Comodo AAA Services root"
-      "emSign ECC Root CA - G3"
-    ];
-  };
-
  # Conan 2.33 is the first release whose settings.yml accepts clang 23.
  # TODO: drop once nixpkgs ships it.
  conan = pkgs.conan.overridePythonAttrs (old: {
@@ -124,7 +114,6 @@ let
 in
 {
  inherit
-    cacert
    gccVersion
    llvmVersion
    gccPackage
@@ -13,9 +13,7 @@ Vcs-Browser: https://github.com/XRPLF/rippled

 Package: @PKG@
 Architecture: any
-# The default config fetches validator lists over verified HTTPS.
 Depends:
- ca-certificates,
 ${shlibs:Depends},
 ${misc:Depends}
 Description: XRP Ledger daemon
@@ -5,9 +5,5 @@ FROM ${BASE_IMAGE}
 RUN --mount=type=bind,source=bin/install/packaging-tools.sh,target=/install-packaging-tools.sh \
    /install-packaging-tools.sh

-# Sanity-check that the system CA bundle distrusts the compromised eMudhra roots.
-RUN --mount=type=bind,source=bin/check-distrusted-roots.sh,target=/check-distrusted-roots.sh \
-    /check-distrusted-roots.sh
-
 # See package/README.md, "Publishing from other repositories".
 COPY package/images/packaging/publish_pkg.py /usr/local/bin/publish_pkg.py
@@ -20,8 +20,6 @@ URL:      https://github.com/XRPLF/rippled

 ExclusiveArch: x86_64 aarch64
 BuildRequires: systemd-rpm-macros
-# The default config fetches validator lists over verified HTTPS.
-Requires: ca-certificates

 # A variant owns the same paths, so it stands in for the plain package.
 %if "%{?pkg_variant}" != ""
@@ -183,9 +183,23 @@ Ledger::Ledger(

    {
        auto const sle = std::make_shared<SLE>(keylet::feeSettings());
-        sle->at(sfBaseFeeDrops) = fees.base;
-        sle->at(sfReserveBaseDrops) = fees.reserve;
-        sle->at(sfReserveIncrementDrops) = fees.increment;
+        // Whether featureXRPFees is supported will depend on startup options.
+        if (std::ranges::find(amendments, featureXRPFees) != amendments.end())
+        {
+            sle->at(sfBaseFeeDrops) = fees.base;
+            sle->at(sfReserveBaseDrops) = fees.reserve;
+            sle->at(sfReserveIncrementDrops) = fees.increment;
+        }
+        else
+        {
+            if (auto const f = fees.base.dropsAs<std::uint64_t>())
+                sle->at(sfBaseFee) = *f;
+            if (auto const f = fees.reserve.dropsAs<std::uint32_t>())
+                sle->at(sfReserveBase) = *f;
+            if (auto const f = fees.increment.dropsAs<std::uint32_t>())
+                sle->at(sfReserveIncrement) = *f;
+            sle->at(sfReferenceFeeUnits) = kFeeUnitsDeprecated;
+        }
        if (std::ranges::find(amendments, featureSmartEscrow) != amendments.end())
        {
            sle->at(sfGasLimit) = fees.gasLimit;
@@ -291,7 +305,8 @@ Ledger::Ledger(Ledger const& prevLedger, NetClock::time_point closeTime)
 }

 Ledger::Ledger(LedgerHeader const& info, Rules rules, Family& family)
-    : immutable_(true)
+    : immutable_(false)
+    , mapHashesFromHeader_(true)
    , txMap_(SHAMapType::TRANSACTION, info.txHash, family)
    , stateMap_(SHAMapType::STATE, info.accountHash, family)
    , rules_(std::move(rules))
@@ -323,31 +338,29 @@ Ledger::Ledger(
 bool
 Ledger::setImmutable(bool rehash)
 {
-    // A map found structurally invalid during sync must never be made immutable: isValid() tests
-    // only for Invalid, and an immutable ledger is treated as persistable. Asked before anything is
-    // written, so a refusal leaves the header exactly as it was rather than half relabeled.
+    // An immutable ledger is treated as persistable, so an invalid map must never become
+    // immutable. The validity test runs before anything is written, so a refusal leaves
+    // the header as it was.
    if (!mapsValid())
        return false;

-    // Read here but written to the header below, once the maps are settled: getHash() can unshare a
-    // dirty tree, so it has to run while the map is still mutable, while a write to the header must
-    // wait until both maps have made it. Skipped once the ledger is immutable, since its maps can
-    // no longer change.
-    bool const deriveMapHashes = !immutable_ && rehash;
+    // Read now but written to the header below: getHash() can unshare a dirty tree, so it must run
+    // while the map is still mutable, while the header may only be written once both maps are
+    // settled. Skipped when the ledger is already immutable or when the header supplied these.
+    bool const deriveMapHashes = !immutable_ && !mapHashesFromHeader_ && rehash;
    UInt256 const txHash = deriveMapHashes ? txMap_.getHash().asUInt256() : UInt256{};
    UInt256 const accountHash = deriveMapHashes ? stateMap_.getHash().asUInt256() : UInt256{};

-    // Both were valid at the check above, but a concurrent walk can invalidate one in between (see
-    // SHAMap::state_), so the result is checked. setInvalid() outranks Immutable and can land
-    // after both maps have been settled, so this narrows the window it guards.
+    // A concurrent walk can invalidate a map between the check above and here (see
+    // SHAMap::state_), so the result is checked. That narrows the window rather than closing it,
+    // since setInvalid() outranks Immutable.
    bool const bothImmutable = setMapsImmutable();
    SOMETIMES(!bothImmutable, "xrpl::Ledger::setImmutable : map invalidated while going immutable");
    if (!bothImmutable)
-        return false;
+        return false;  // LCOV_EXCL_LINE: only the walk named above reaches this, so no test does

-    // Written only now, so losing the race above leaves the header describing what the ledger was
-    // built from rather than a map that has since been abandoned. Forced rather than conditional,
-    // since this is the only place the hash transitions to valid.
+    // Written only now, so failing the check above leaves the header describing what the ledger was
+    // built from. Forced, since this is the only place the hash transitions to valid.
    if (deriveMapHashes)
    {
        header_.txHash = txHash;
@@ -663,6 +676,11 @@ Ledger::setup()
                // Should be all of one or the other, but not both
                ret = false;
            }
+            if (!rules_.enabled(featureXRPFees) && newFees)
+            {
+                // Can't populate the new fees before the amendment is enabled
+                ret = false;
+            }
            if (!rules_.enabled(featureSmartEscrow) && extensionFees)
            {
                // Can't populate the extension fees before the amendment is
@@ -43,9 +43,6 @@ constexpr auto kProposalTxTypes = std::to_array<TxType>({
 bool
 isValidProposalTxnType(STObject const& proposedTx)
 {
-    if (!proposedTx.isFieldPresent(sfTransactionType))
-        return false;
-
    auto const type = proposedTx.getFieldU16(sfTransactionType);

    if (std::ranges::find(kProposalTxTypes, type) != kProposalTxTypes.end())
@@ -4,7 +4,6 @@
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/AccountRootHelpers.h>
-#include <xrpl/ledger/helpers/EscrowHelpers.h>
 #include <xrpl/ledger/helpers/OracleHelpers.h>
 #include <xrpl/ledger/helpers/ProposalHelpers.h>
 #include <xrpl/protocol/AccountID.h>
@@ -320,8 +319,6 @@ getLedgerEntryOwnerCount(SLE const& sle)
            UNREACHABLE("AccountRoots are not supported by object sponsorship.");
            return 0;
            // LCOV_EXCL_STOP
-        case ltESCROW:
-            return calculateAdditionalReserve(sle[~sfBytecode]);
        default:
            return 1;
    }
@@ -6,8 +6,10 @@
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Asset.h>
 #include <xrpl/protocol/Concepts.h>
+#include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Issue.h>
 #include <xrpl/protocol/MPTIssue.h>
+#include <xrpl/protocol/Rules.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/STInteger.h>  // IWYU pragma: keep
@@ -123,4 +125,10 @@ ammAuctionTimeSlot(std::uint64_t current, STObject const& auctionSlot)
    return std::nullopt;
 }

+bool
+ammEnabled(Rules const& rules)
+{
+    return rules.enabled(featureAMM);
+}
+
 }  // namespace xrpl
@@ -12,6 +12,8 @@
 #include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/MPTIssue.h>
 #include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/STXChainBridge.h>
 #include <xrpl/protocol/SeqProxy.h>
 #include <xrpl/protocol/UintTypes.h>
 #include <xrpl/protocol/digest.h>
@@ -103,6 +105,9 @@ enum class LedgerNameSpace : std::uint16_t {
    NftokenBuyOffers = 'h',
    NftokenSellOffers = 'i',
    Amm = 'A',
+    Bridge = 'H',
+    XchainClaimId = 'Q',
+    XchainCreateAccountClaimId = 'K',
    Did = 'I',
    Oracle = 'R',
    MPTokenIssuance = '~',
@@ -120,9 +125,6 @@ enum class LedgerNameSpace : std::uint16_t {
    Contract [[deprecated]] = 'c',
    Generator [[deprecated]] = 'g',
    Nickname [[deprecated]] = 'n',
-    Bridge [[deprecated]] = 'H',
-    XchainClaimId [[deprecated]] = 'Q',
-    XchainCreateAccountClaimId [[deprecated]] = 'K',
 };

 template <class... Args>
@@ -525,6 +527,44 @@ delegate(AccountID const& account, AccountID const& authorizedAccount) noexcept
    return {ltDELEGATE, indexHash(LedgerNameSpace::Delegate, account, authorizedAccount)};
 }

+Keylet
+bridge(STXChainBridge const& bridge, STXChainBridge::ChainType chainType)
+{
+    // A door account can support multiple bridges. On the locking chain
+    // there can only be one bridge per lockingChainCurrency. On the issuing
+    // chain there can only be one bridge per issuingChainCurrency.
+    auto const& issue = bridge.issue(chainType);
+    return {ltBRIDGE, indexHash(LedgerNameSpace::Bridge, bridge.door(chainType), issue.currency)};
+}
+
+Keylet
+xChainClaimID(STXChainBridge const& bridge, std::uint64_t const seq)
+{
+    return {
+        ltXCHAIN_OWNED_CLAIM_ID,
+        indexHash(
+            LedgerNameSpace::XchainClaimId,
+            bridge.lockingChainDoor(),
+            bridge.lockingChainIssue(),
+            bridge.issuingChainDoor(),
+            bridge.issuingChainIssue(),
+            seq)};
+}
+
+Keylet
+xChainCreateAccountClaimID(STXChainBridge const& bridge, std::uint64_t const seq)
+{
+    return {
+        ltXCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID,
+        indexHash(
+            LedgerNameSpace::XchainCreateAccountClaimId,
+            bridge.lockingChainDoor(),
+            bridge.lockingChainIssue(),
+            bridge.issuingChainDoor(),
+            bridge.issuingChainIssue(),
+            seq)};
+}
+
 Keylet
 did(AccountID const& account) noexcept
 {
@@ -65,6 +65,58 @@ InnerObjectFormats::InnerObjectFormats()
            {sfAuthAccounts, SoeOptional},
        });

+    add(sfXChainClaimAttestationCollectionElement.jsonName,
+        sfXChainClaimAttestationCollectionElement.getCode(),
+        {
+            {sfAttestationSignerAccount, SoeRequired},
+            {sfPublicKey, SoeRequired},
+            {sfSignature, SoeRequired},
+            {sfAmount, SoeRequired},
+            {sfAccount, SoeRequired},
+            {sfAttestationRewardAccount, SoeRequired},
+            {sfWasLockingChainSend, SoeRequired},
+            {sfXChainClaimID, SoeRequired},
+            {sfDestination, SoeOptional},
+        });
+
+    add(sfXChainCreateAccountAttestationCollectionElement.jsonName,
+        sfXChainCreateAccountAttestationCollectionElement.getCode(),
+        {
+            {sfAttestationSignerAccount, SoeRequired},
+            {sfPublicKey, SoeRequired},
+            {sfSignature, SoeRequired},
+            {sfAmount, SoeRequired},
+            {sfAccount, SoeRequired},
+            {sfAttestationRewardAccount, SoeRequired},
+            {sfWasLockingChainSend, SoeRequired},
+            {sfXChainAccountCreateCount, SoeRequired},
+            {sfDestination, SoeRequired},
+            {sfSignatureReward, SoeRequired},
+        });
+
+    add(sfXChainClaimProofSig.jsonName,
+        sfXChainClaimProofSig.getCode(),
+        {
+            {sfAttestationSignerAccount, SoeRequired},
+            {sfPublicKey, SoeRequired},
+            {sfAmount, SoeRequired},
+            {sfAttestationRewardAccount, SoeRequired},
+            {sfWasLockingChainSend, SoeRequired},
+            {sfDestination, SoeOptional},
+        });
+
+    add(sfXChainCreateAccountProofSig.jsonName,
+        sfXChainCreateAccountProofSig.getCode(),
+        {
+            {sfAttestationSignerAccount, SoeRequired},
+            {sfPublicKey, SoeRequired},
+            {sfAmount, SoeRequired},
+            {sfSignatureReward, SoeRequired},
+            {sfAttestationRewardAccount, SoeRequired},
+            {sfWasLockingChainSend, SoeRequired},
+            {sfDestination, SoeRequired},
+        });
+
    add(sfAuthAccount.jsonName,
        sfAuthAccount.getCode(),
        {
@@ -24,9 +24,9 @@
 #include <xrpl/protocol/STInteger.h>
 #include <xrpl/protocol/STIssue.h>
 #include <xrpl/protocol/STNumber.h>
-#include <xrpl/protocol/STObject.h>
 #include <xrpl/protocol/STPathSet.h>
 #include <xrpl/protocol/STVector256.h>
+#include <xrpl/protocol/STXChainBridge.h>
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxFormats.h>
 #include <xrpl/protocol/UintTypes.h>
@@ -956,6 +956,18 @@ parseLeaf(
            }
            break;

+        case STI_XCHAIN_BRIDGE:
+            try
+            {
+                ret = detail::makeStvar<STXChainBridge>(STXChainBridge(field, value));
+            }
+            catch (std::exception const&)
+            {
+                error = invalidData(jsonName, fieldName);
+                return ret;
+            }
+            break;
+
        case STI_CURRENCY:
            try
            {
@@ -47,6 +47,9 @@ STValidation::validationFormat()
        {sfCloseTime,           SoeOptional},
        {sfLoadFee,             SoeOptional},
        {sfAmendments,          SoeOptional},
+        {sfBaseFee,             SoeOptional},
+        {sfReserveBase,         SoeOptional},
+        {sfReserveIncrement,    SoeOptional},
        {sfSigningTime,         SoeRequired},
        {sfSigningPubKey,       SoeRequired},
        {sfSignature,           SoeRequired},
@@ -54,6 +57,7 @@ STValidation::validationFormat()
        {sfCookie,              SoeDefault},
        {sfValidatedHash,       SoeOptional},
        {sfServerVersion,       SoeOptional},
+        // featureXRPFees
        {sfBaseFeeDrops,          SoeOptional},
        {sfReserveBaseDrops,      SoeOptional},
        {sfReserveIncrementDrops, SoeOptional},
@@ -16,6 +16,7 @@
 #include <xrpl/protocol/STObject.h>
 #include <xrpl/protocol/STPathSet.h>
 #include <xrpl/protocol/STVector256.h>
+#include <xrpl/protocol/STXChainBridge.h>
 #include <xrpl/protocol/Serializer.h>

 #include <stdexcept>
@@ -216,6 +217,9 @@ STVar::constructST(SerializedTypeID id, int depth, Args&&... args)
        case STI_ISSUE:
            construct<STIssue>(std::forward<Args>(args)...);
            return;
+        case STI_XCHAIN_BRIDGE:
+            construct<STXChainBridge>(std::forward<Args>(args)...);
+            return;
        case STI_CURRENCY:
            construct<STCurrency>(std::forward<Args>(args)...);
            return;
@@ -0,0 +1,204 @@
+#include <xrpl/protocol/STXChainBridge.h>
+
+#include <xrpl/basics/contract.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/STObject.h>
+#include <xrpl/protocol/Serializer.h>
+#include <xrpl/protocol/jss.h>
+
+#include <cstddef>
+#include <format>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <utility>
+
+namespace xrpl {
+
+STXChainBridge::STXChainBridge() : STBase{sfXChainBridge}
+{
+}
+
+STXChainBridge::STXChainBridge(SField const& name) : STBase{name}
+{
+}
+
+STXChainBridge::STXChainBridge(
+    AccountID const& srcChainDoor,
+    Issue const& srcChainIssue,
+    AccountID const& dstChainDoor,
+    Issue const& dstChainIssue)
+    : STBase{sfXChainBridge}
+    , lockingChainDoor_{sfLockingChainDoor, srcChainDoor}
+    , lockingChainIssue_{sfLockingChainIssue, srcChainIssue}
+    , issuingChainDoor_{sfIssuingChainDoor, dstChainDoor}
+    , issuingChainIssue_{sfIssuingChainIssue, dstChainIssue}
+{
+}
+
+STXChainBridge::STXChainBridge(STObject const& o)
+    : STBase{sfXChainBridge}
+    , lockingChainDoor_{sfLockingChainDoor, o[sfLockingChainDoor]}
+    , lockingChainIssue_{sfLockingChainIssue, o[sfLockingChainIssue]}
+    , issuingChainDoor_{sfIssuingChainDoor, o[sfIssuingChainDoor]}
+    , issuingChainIssue_{sfIssuingChainIssue, o[sfIssuingChainIssue]}
+{
+}
+
+STXChainBridge::STXChainBridge(json::Value const& v) : STXChainBridge{sfXChainBridge, v}
+{
+}
+
+STXChainBridge::STXChainBridge(SField const& name, json::Value const& v) : STBase{name}
+{
+    if (!v.isObject())
+    {
+        Throw<std::runtime_error>(
+            "STXChainBridge can only be specified with a 'object' Json value");
+    }
+
+    auto const checkExtra = [](json::Value const& v) {
+        static auto const kBridgeJson =
+            xrpl::STXChainBridge().getJson(xrpl::JsonOptions::Values::None);
+        for (auto it = v.begin(); it != v.end(); ++it)
+        {
+            std::string const name = it.memberName();
+            if (!kBridgeJson.isMember(name))
+            {
+                Throw<std::runtime_error>(
+                    std::format("STXChainBridge extra field detected: {}", name));
+            }
+        }
+        return true;
+    };
+    checkExtra(v);
+
+    json::Value const& lockingChainDoorStr = v[jss::LockingChainDoor];
+    json::Value const& lockingChainIssue = v[jss::LockingChainIssue];
+    json::Value const& issuingChainDoorStr = v[jss::IssuingChainDoor];
+    json::Value const& issuingChainIssue = v[jss::IssuingChainIssue];
+
+    if (!lockingChainDoorStr.isString())
+    {
+        Throw<std::runtime_error>("STXChainBridge LockingChainDoor must be a string Json value");
+    }
+    if (!issuingChainDoorStr.isString())
+    {
+        Throw<std::runtime_error>("STXChainBridge IssuingChainDoor must be a string Json value");
+    }
+
+    auto const lockingChainDoor = parseBase58<AccountID>(lockingChainDoorStr.asString());
+    auto const issuingChainDoor = parseBase58<AccountID>(issuingChainDoorStr.asString());
+    if (!lockingChainDoor)
+    {
+        Throw<std::runtime_error>("STXChainBridge LockingChainDoor must be a valid account");
+    }
+    if (!issuingChainDoor)
+    {
+        Throw<std::runtime_error>("STXChainBridge IssuingChainDoor must be a valid account");
+    }
+
+    lockingChainDoor_ = STAccount{sfLockingChainDoor, *lockingChainDoor};
+    lockingChainIssue_ = STIssue{sfLockingChainIssue, issueFromJson(lockingChainIssue)};
+    issuingChainDoor_ = STAccount{sfIssuingChainDoor, *issuingChainDoor};
+    issuingChainIssue_ = STIssue{sfIssuingChainIssue, issueFromJson(issuingChainIssue)};
+}
+
+STXChainBridge::STXChainBridge(SerialIter& sit, SField const& name)
+    : STBase{name}
+    , lockingChainDoor_{sit, sfLockingChainDoor}
+    , lockingChainIssue_{sit, sfLockingChainIssue}
+    , issuingChainDoor_{sit, sfIssuingChainDoor}
+    , issuingChainIssue_{sit, sfIssuingChainIssue}
+{
+}
+
+void
+STXChainBridge::add(Serializer& s) const
+{
+    lockingChainDoor_.add(s);
+    lockingChainIssue_.add(s);
+    issuingChainDoor_.add(s);
+    issuingChainIssue_.add(s);
+}
+
+json::Value
+STXChainBridge::getJson(JsonOptions jo) const
+{
+    json::Value v;
+    v[jss::LockingChainDoor] = lockingChainDoor_.getJson(jo);
+    v[jss::LockingChainIssue] = lockingChainIssue_.getJson(jo);
+    v[jss::IssuingChainDoor] = issuingChainDoor_.getJson(jo);
+    v[jss::IssuingChainIssue] = issuingChainIssue_.getJson(jo);
+    return v;
+}
+
+std::string
+STXChainBridge::getText() const
+{
+    return std::format(
+        "{{ {} = {}, {} = {}, {} = {}, {} = {} }}",
+        sfLockingChainDoor.getName(),
+        lockingChainDoor_.getText(),
+        sfLockingChainIssue.getName(),
+        lockingChainIssue_.getText(),
+        sfIssuingChainDoor.getName(),
+        issuingChainDoor_.getText(),
+        sfIssuingChainIssue.getName(),
+        issuingChainIssue_.getText());
+}
+
+STObject
+STXChainBridge::toSTObject() const
+{
+    STObject o{sfXChainBridge};
+    o[sfLockingChainDoor] = lockingChainDoor_;
+    o[sfLockingChainIssue] = lockingChainIssue_;
+    o[sfIssuingChainDoor] = issuingChainDoor_;
+    o[sfIssuingChainIssue] = issuingChainIssue_;
+    return o;
+}
+
+SerializedTypeID
+STXChainBridge::getSType() const
+{
+    return STI_XCHAIN_BRIDGE;
+}
+
+bool
+STXChainBridge::isEquivalent(STBase const& t) const
+{
+    auto const* v = dynamic_cast<STXChainBridge const*>(&t);
+    return (v != nullptr) && (*v == *this);
+}
+
+bool
+STXChainBridge::isDefault() const
+{
+    return lockingChainDoor_.isDefault() && lockingChainIssue_.isDefault() &&
+        issuingChainDoor_.isDefault() && issuingChainIssue_.isDefault();
+}
+
+std::unique_ptr<STXChainBridge>
+STXChainBridge::construct(SerialIter& sit, SField const& name)
+{
+    return std::make_unique<STXChainBridge>(sit, name);
+}
+
+STBase*
+STXChainBridge::copy(std::size_t n, void* buf) const
+{
+    return emplace(n, buf, *this);
+}
+
+STBase*
+STXChainBridge::move(std::size_t n, void* buf)
+{
+    return emplace(n, buf, std::move(*this));
+}
+}  // namespace xrpl
@@ -137,8 +137,6 @@ transResults()
        MAKE_ERROR(tefBAD_PATH_COUNT,              "Malformed: Too many paths."),
        MAKE_ERROR(tefNO_BYTECODE,                 "There is no WASM code to run, but a WASM-specific field was included."),
        MAKE_ERROR(tefBYTECODE_NOT_INCLUDED,       "WASM code requires a field that was not included."),
-        MAKE_ERROR(tefTEMP_DISABLED,               "The transaction requires logic that is currently temporarily disabled."),
-        MAKE_ERROR(tefEXCEEDS_LIMIT,               "The transaction exceeds a limit set by fee voting."),

        MAKE_ERROR(telLOCAL_ERROR,            "Local failure."),
        MAKE_ERROR(telBAD_DOMAIN,             "Domain too long."),
@@ -211,6 +209,7 @@ transResults()
        MAKE_ERROR(temINVALID_INNER_BATCH,       "Malformed: Invalid inner batch transaction."),
        MAKE_ERROR(temBAD_CIPHERTEXT,            "Malformed: Invalid ciphertext."),
        MAKE_ERROR(temINVALID_BYTECODE,          "Malformed: Provided byte code is invalid."),
+        MAKE_ERROR(temTEMP_DISABLED,             "The transaction requires logic that is currently temporarily disabled."),

        MAKE_ERROR(terRETRY,                  "Retry transaction."),
        MAKE_ERROR(terFUNDS_SPENT,            "DEPRECATED."),
@@ -0,0 +1,706 @@
+#include <xrpl/protocol/XChainAttestations.h>
+
+#include <xrpl/basics/Buffer.h>
+#include <xrpl/basics/Slice.h>
+#include <xrpl/basics/contract.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/STAccount.h>
+#include <xrpl/protocol/STAmount.h>
+#include <xrpl/protocol/STArray.h>
+#include <xrpl/protocol/STObject.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/Serializer.h>
+#include <xrpl/protocol/json_get_or_throw.h>
+#include <xrpl/protocol/jss.h>
+
+#include <cstdint>
+#include <optional>
+#include <stdexcept>
+#include <tuple>
+#include <utility>
+#include <vector>
+
+namespace xrpl {
+namespace attestations {
+
+AttestationBase::AttestationBase(
+    AccountID attestationSignerAccount,
+    PublicKey const& publicKey,
+    Buffer signature,
+    AccountID const& sendingAccount,
+    STAmount sendingAmount,
+    AccountID const& rewardAccount,
+    bool wasLockingChainSend)
+    : attestationSignerAccount{attestationSignerAccount}
+    , publicKey{publicKey}
+    , signature{std::move(signature)}
+    , sendingAccount{sendingAccount}
+    , sendingAmount{std::move(sendingAmount)}
+    , rewardAccount{rewardAccount}
+    , wasLockingChainSend{wasLockingChainSend}
+{
+}
+
+bool
+AttestationBase::equalHelper(AttestationBase const& lhs, AttestationBase const& rhs)
+{
+    return std::tie(
+               lhs.attestationSignerAccount,
+               lhs.publicKey,
+               lhs.signature,
+               lhs.sendingAccount,
+               lhs.sendingAmount,
+               lhs.rewardAccount,
+               lhs.wasLockingChainSend) ==
+        std::tie(
+               rhs.attestationSignerAccount,
+               rhs.publicKey,
+               rhs.signature,
+               rhs.sendingAccount,
+               rhs.sendingAmount,
+               rhs.rewardAccount,
+               rhs.wasLockingChainSend);
+}
+
+bool
+AttestationBase::sameEventHelper(AttestationBase const& lhs, AttestationBase const& rhs)
+{
+    return std::tie(lhs.sendingAccount, lhs.sendingAmount, lhs.wasLockingChainSend) ==
+        std::tie(rhs.sendingAccount, rhs.sendingAmount, rhs.wasLockingChainSend);
+}
+
+bool
+AttestationBase::verify(STXChainBridge const& bridge) const
+{
+    std::vector<std::uint8_t> const msg = message(bridge);
+    return xrpl::verify(publicKey, makeSlice(msg), signature);
+}
+
+AttestationBase::AttestationBase(STObject const& o)
+    : attestationSignerAccount{o[sfAttestationSignerAccount]}
+    , publicKey{o[sfPublicKey]}
+    , signature{o[sfSignature]}
+    , sendingAccount{o[sfAccount]}
+    , sendingAmount{o[sfAmount]}
+    , rewardAccount{o[sfAttestationRewardAccount]}
+    , wasLockingChainSend{bool(o[sfWasLockingChainSend])}
+{
+}
+
+AttestationBase::AttestationBase(json::Value const& v)
+    : attestationSignerAccount{json::getOrThrow<AccountID>(v, sfAttestationSignerAccount)}
+    , publicKey{json::getOrThrow<PublicKey>(v, sfPublicKey)}
+    , signature{json::getOrThrow<Buffer>(v, sfSignature)}
+    , sendingAccount{json::getOrThrow<AccountID>(v, sfAccount)}
+    , sendingAmount{json::getOrThrow<STAmount>(v, sfAmount)}
+    , rewardAccount{json::getOrThrow<AccountID>(v, sfAttestationRewardAccount)}
+    , wasLockingChainSend{json::getOrThrow<bool>(v, sfWasLockingChainSend)}
+{
+}
+
+void
+AttestationBase::addHelper(STObject& o) const
+{
+    o[sfAttestationSignerAccount] = attestationSignerAccount;
+    o[sfPublicKey] = publicKey;
+    o[sfSignature] = signature;
+    o[sfAmount] = sendingAmount;
+    o[sfAccount] = sendingAccount;
+    o[sfAttestationRewardAccount] = rewardAccount;
+    o[sfWasLockingChainSend] = wasLockingChainSend;
+}
+
+AttestationClaim::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)
+    : AttestationBase(
+          attestationSignerAccount,
+          publicKey,
+          std::move(signature),
+          sendingAccount,
+          sendingAmount,
+          rewardAccount,
+          wasLockingChainSend)
+    , claimID{claimId}
+    , dst{dst}
+{
+}
+
+AttestationClaim::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)
+    : AttestationClaim{
+          attestationSignerAccount,
+          publicKey,
+          Buffer{},
+          sendingAccount,
+          sendingAmount,
+          rewardAccount,
+          wasLockingChainSend,
+          claimId,
+          dst}
+{
+    auto const toSign = message(bridge);
+    signature = sign(publicKey, secretKey, makeSlice(toSign));
+}
+
+AttestationClaim::AttestationClaim(STObject const& o)
+    : AttestationBase(o), claimID{o[sfXChainClaimID]}, dst{o[~sfDestination]}
+{
+}
+
+AttestationClaim::AttestationClaim(json::Value const& v)
+    : AttestationBase{v}, claimID{json::getOrThrow<std::uint64_t>(v, sfXChainClaimID)}
+{
+    if (v.isMember(sfDestination.getJsonName()))
+        dst = json::getOrThrow<AccountID>(v, sfDestination);
+}
+
+STObject
+AttestationClaim::toSTObject() const
+{
+    STObject o = STObject::makeInnerObject(sfXChainClaimAttestationCollectionElement);
+    addHelper(o);
+    o[sfXChainClaimID] = claimID;
+    if (dst)
+        o[sfDestination] = *dst;
+    return o;
+}
+
+std::vector<std::uint8_t>
+AttestationClaim::message(
+    STXChainBridge const& bridge,
+    AccountID const& sendingAccount,
+    STAmount const& sendingAmount,
+    AccountID const& rewardAccount,
+    bool wasLockingChainSend,
+    std::uint64_t claimID,
+    std::optional<AccountID> const& dst)
+{
+    STObject o{sfGeneric};
+    // Serialize in SField order to make python serializers easier to write
+    o[sfXChainClaimID] = claimID;
+    o[sfAmount] = sendingAmount;
+    if (dst)
+        o[sfDestination] = *dst;
+    o[sfOtherChainSource] = sendingAccount;
+    o[sfAttestationRewardAccount] = rewardAccount;
+    o[sfWasLockingChainSend] = wasLockingChainSend ? 1 : 0;
+    o[sfXChainBridge] = bridge;
+
+    Serializer s;
+    o.add(s);
+
+    return std::move(s.modData());
+}
+
+std::vector<std::uint8_t>
+AttestationClaim::message(STXChainBridge const& bridge) const
+{
+    return AttestationClaim::message(
+        bridge, sendingAccount, sendingAmount, rewardAccount, wasLockingChainSend, claimID, dst);
+}
+
+bool
+AttestationClaim::validAmounts() const
+{
+    return isLegalNet(sendingAmount);
+}
+
+bool
+AttestationClaim::sameEvent(AttestationClaim const& rhs) const
+{
+    return AttestationClaim::sameEventHelper(*this, rhs) &&
+        tie(claimID, dst) == tie(rhs.claimID, rhs.dst);
+}
+
+bool
+operator==(AttestationClaim const& lhs, AttestationClaim const& rhs)
+{
+    return AttestationClaim::equalHelper(lhs, rhs) &&
+        tie(lhs.claimID, lhs.dst) == tie(rhs.claimID, rhs.dst);
+}
+
+AttestationCreateAccount::AttestationCreateAccount(STObject const& o)
+    : AttestationBase(o)
+    , createCount{o[sfXChainAccountCreateCount]}
+    , toCreate{o[sfDestination]}
+    , rewardAmount{o[sfSignatureReward]}
+{
+}
+
+AttestationCreateAccount::AttestationCreateAccount(json::Value const& v)
+    : AttestationBase{v}
+    , createCount{json::getOrThrow<std::uint64_t>(v, sfXChainAccountCreateCount)}
+    , toCreate{json::getOrThrow<AccountID>(v, sfDestination)}
+    , rewardAmount{json::getOrThrow<STAmount>(v, sfSignatureReward)}
+{
+}
+
+AttestationCreateAccount::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)
+    : AttestationBase(
+          attestationSignerAccount,
+          publicKey,
+          std::move(signature),
+          sendingAccount,
+          sendingAmount,
+          rewardAccount,
+          wasLockingChainSend)
+    , createCount{createCount}
+    , toCreate{toCreate}
+    , rewardAmount{std::move(rewardAmount)}
+{
+}
+
+AttestationCreateAccount::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)
+    : AttestationCreateAccount{
+          attestationSignerAccount,
+          publicKey,
+          Buffer{},
+          sendingAccount,
+          sendingAmount,
+          rewardAmount,
+          rewardAccount,
+          wasLockingChainSend,
+          createCount,
+          toCreate}
+{
+    auto const toSign = message(bridge);
+    signature = sign(publicKey, secretKey, makeSlice(toSign));
+}
+
+STObject
+AttestationCreateAccount::toSTObject() const
+{
+    STObject o = STObject::makeInnerObject(sfXChainCreateAccountAttestationCollectionElement);
+    addHelper(o);
+
+    o[sfXChainAccountCreateCount] = createCount;
+    o[sfDestination] = toCreate;
+    o[sfSignatureReward] = rewardAmount;
+
+    return o;
+}
+
+std::vector<std::uint8_t>
+AttestationCreateAccount::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)
+{
+    STObject o{sfGeneric};
+    // Serialize in SField order to make python serializers easier to write
+    o[sfXChainAccountCreateCount] = createCount;
+    o[sfAmount] = sendingAmount;
+    o[sfSignatureReward] = rewardAmount;
+    o[sfDestination] = dst;
+    o[sfOtherChainSource] = sendingAccount;
+    o[sfAttestationRewardAccount] = rewardAccount;
+    o[sfWasLockingChainSend] = wasLockingChainSend ? 1 : 0;
+    o[sfXChainBridge] = bridge;
+
+    Serializer s;
+    o.add(s);
+
+    return std::move(s.modData());
+}
+
+std::vector<std::uint8_t>
+AttestationCreateAccount::message(STXChainBridge const& bridge) const
+{
+    return AttestationCreateAccount::message(
+        bridge,
+        sendingAccount,
+        sendingAmount,
+        rewardAmount,
+        rewardAccount,
+        wasLockingChainSend,
+        createCount,
+        toCreate);
+}
+
+bool
+AttestationCreateAccount::validAmounts() const
+{
+    return isLegalNet(rewardAmount) && isLegalNet(sendingAmount);
+}
+
+bool
+AttestationCreateAccount::sameEvent(AttestationCreateAccount const& rhs) const
+{
+    return AttestationCreateAccount::sameEventHelper(*this, rhs) &&
+        std::tie(createCount, toCreate, rewardAmount) ==
+        std::tie(rhs.createCount, rhs.toCreate, rhs.rewardAmount);
+}
+
+bool
+operator==(AttestationCreateAccount const& lhs, AttestationCreateAccount const& rhs)
+{
+    return AttestationCreateAccount::equalHelper(lhs, rhs) &&
+        std::tie(lhs.createCount, lhs.toCreate, lhs.rewardAmount) ==
+        std::tie(rhs.createCount, rhs.toCreate, rhs.rewardAmount);
+}
+
+}  // namespace attestations
+
+SField const& XChainClaimAttestation::arrayFieldName{sfXChainClaimAttestations};
+SField const& XChainCreateAccountAttestation::arrayFieldName{sfXChainCreateAccountAttestations};
+
+XChainClaimAttestation::XChainClaimAttestation(
+    AccountID const& keyAccount,
+    PublicKey const& publicKey,
+    STAmount const& amount,
+    AccountID const& rewardAccount,
+    bool wasLockingChainSend,
+    std::optional<AccountID> const& dst)
+    : keyAccount(keyAccount)
+    , publicKey(publicKey)
+    , amount(sfAmount, amount)
+    , rewardAccount(rewardAccount)
+    , wasLockingChainSend(wasLockingChainSend)
+    , dst(dst)
+{
+}
+
+XChainClaimAttestation::XChainClaimAttestation(
+    STAccount const& keyAccount,
+    PublicKey const& publicKey,
+    STAmount const& amount,
+    STAccount const& rewardAccount,
+    bool wasLockingChainSend,
+    std::optional<STAccount> const& dst)
+    : XChainClaimAttestation{
+          keyAccount.value(),
+          publicKey,
+          amount,
+          rewardAccount.value(),
+          wasLockingChainSend,
+          dst ? std::optional<AccountID>{dst->value()} : std::nullopt}
+{
+}
+
+XChainClaimAttestation::XChainClaimAttestation(STObject const& o)
+    : XChainClaimAttestation{
+          o[sfAttestationSignerAccount],
+          PublicKey{o[sfPublicKey]},
+          o[sfAmount],
+          o[sfAttestationRewardAccount],
+          o[sfWasLockingChainSend] != 0,
+          o[~sfDestination]} {};
+
+XChainClaimAttestation::XChainClaimAttestation(json::Value const& v)
+    : XChainClaimAttestation{
+          json::getOrThrow<AccountID>(v, sfAttestationSignerAccount),
+          json::getOrThrow<PublicKey>(v, sfPublicKey),
+          json::getOrThrow<STAmount>(v, sfAmount),
+          json::getOrThrow<AccountID>(v, sfAttestationRewardAccount),
+          json::getOrThrow<bool>(v, sfWasLockingChainSend),
+          std::nullopt}
+{
+    if (v.isMember(sfDestination.getJsonName()))
+        dst = json::getOrThrow<AccountID>(v, sfDestination);
+};
+
+XChainClaimAttestation::XChainClaimAttestation(
+    XChainClaimAttestation::TSignedAttestation const& claimAtt)
+    : XChainClaimAttestation{
+          claimAtt.attestationSignerAccount,
+          claimAtt.publicKey,
+          claimAtt.sendingAmount,
+          claimAtt.rewardAccount,
+          claimAtt.wasLockingChainSend,
+          claimAtt.dst}
+{
+}
+
+STObject
+XChainClaimAttestation::toSTObject() const
+{
+    STObject o = STObject::makeInnerObject(sfXChainClaimProofSig);
+    o[sfAttestationSignerAccount] = STAccount{sfAttestationSignerAccount, keyAccount};
+    o[sfPublicKey] = publicKey;
+    o[sfAmount] = STAmount{sfAmount, amount};
+    o[sfAttestationRewardAccount] = STAccount{sfAttestationRewardAccount, rewardAccount};
+    o[sfWasLockingChainSend] = wasLockingChainSend;
+    if (dst)
+        o[sfDestination] = STAccount{sfDestination, *dst};
+    return o;
+}
+
+bool
+operator==(XChainClaimAttestation const& lhs, XChainClaimAttestation const& rhs)
+{
+    return std::tie(
+               lhs.keyAccount,
+               lhs.publicKey,
+               lhs.amount,
+               lhs.rewardAccount,
+               lhs.wasLockingChainSend,
+               lhs.dst) ==
+        std::tie(
+               rhs.keyAccount,
+               rhs.publicKey,
+               rhs.amount,
+               rhs.rewardAccount,
+               rhs.wasLockingChainSend,
+               rhs.dst);
+}
+
+XChainClaimAttestation::MatchFields::MatchFields(
+    XChainClaimAttestation::TSignedAttestation const& att)
+    : amount{att.sendingAmount}, wasLockingChainSend{att.wasLockingChainSend}, dst{att.dst}
+{
+}
+
+AttestationMatch
+XChainClaimAttestation::match(XChainClaimAttestation::MatchFields const& rhs) const
+{
+    if (std::tie(amount, wasLockingChainSend) != std::tie(rhs.amount, rhs.wasLockingChainSend))
+        return AttestationMatch::NonDstMismatch;
+    if (dst != rhs.dst)
+        return AttestationMatch::MatchExceptDst;
+    return AttestationMatch::Match;
+}
+
+//------------------------------------------------------------------------------
+
+XChainCreateAccountAttestation::XChainCreateAccountAttestation(
+    AccountID const& keyAccount,
+    PublicKey const& publicKey,
+    STAmount const& amount,
+    STAmount const& rewardAmount,
+    AccountID const& rewardAccount,
+    bool wasLockingChainSend,
+    AccountID const& dst)
+    : keyAccount(keyAccount)
+    , publicKey(publicKey)
+    , amount(sfAmount, amount)
+    , rewardAmount(sfSignatureReward, rewardAmount)
+    , rewardAccount(rewardAccount)
+    , wasLockingChainSend(wasLockingChainSend)
+    , dst(dst)
+{
+}
+
+XChainCreateAccountAttestation::XChainCreateAccountAttestation(STObject const& o)
+    : XChainCreateAccountAttestation{
+          o[sfAttestationSignerAccount],
+          PublicKey{o[sfPublicKey]},
+          o[sfAmount],
+          o[sfSignatureReward],
+          o[sfAttestationRewardAccount],
+          o[sfWasLockingChainSend] != 0,
+          o[sfDestination]} {};
+
+XChainCreateAccountAttestation::XChainCreateAccountAttestation(json::Value const& v)
+    : XChainCreateAccountAttestation{
+          json::getOrThrow<AccountID>(v, sfAttestationSignerAccount),
+          json::getOrThrow<PublicKey>(v, sfPublicKey),
+          json::getOrThrow<STAmount>(v, sfAmount),
+          json::getOrThrow<STAmount>(v, sfSignatureReward),
+          json::getOrThrow<AccountID>(v, sfAttestationRewardAccount),
+          json::getOrThrow<bool>(v, sfWasLockingChainSend),
+          json::getOrThrow<AccountID>(v, sfDestination)}
+{
+}
+
+XChainCreateAccountAttestation::XChainCreateAccountAttestation(
+    XChainCreateAccountAttestation::TSignedAttestation const& createAtt)
+    : XChainCreateAccountAttestation{
+          createAtt.attestationSignerAccount,
+          createAtt.publicKey,
+          createAtt.sendingAmount,
+          createAtt.rewardAmount,
+          createAtt.rewardAccount,
+          createAtt.wasLockingChainSend,
+          createAtt.toCreate}
+{
+}
+
+STObject
+XChainCreateAccountAttestation::toSTObject() const
+{
+    STObject o = STObject::makeInnerObject(sfXChainCreateAccountProofSig);
+
+    o[sfAttestationSignerAccount] = STAccount{sfAttestationSignerAccount, keyAccount};
+    o[sfPublicKey] = publicKey;
+    o[sfAmount] = STAmount{sfAmount, amount};
+    o[sfSignatureReward] = STAmount{sfSignatureReward, rewardAmount};
+    o[sfAttestationRewardAccount] = STAccount{sfAttestationRewardAccount, rewardAccount};
+    o[sfWasLockingChainSend] = wasLockingChainSend;
+    o[sfDestination] = STAccount{sfDestination, dst};
+
+    return o;
+}
+
+XChainCreateAccountAttestation::MatchFields::MatchFields(
+    XChainCreateAccountAttestation::TSignedAttestation const& att)
+    : amount{att.sendingAmount}
+    , rewardAmount(att.rewardAmount)
+    , wasLockingChainSend{att.wasLockingChainSend}
+    , dst{att.toCreate}
+{
+}
+
+AttestationMatch
+XChainCreateAccountAttestation::match(XChainCreateAccountAttestation::MatchFields const& rhs) const
+{
+    if (std::tie(amount, rewardAmount, wasLockingChainSend) !=
+        std::tie(rhs.amount, rhs.rewardAmount, rhs.wasLockingChainSend))
+        return AttestationMatch::NonDstMismatch;
+    if (dst != rhs.dst)
+        return AttestationMatch::MatchExceptDst;
+    return AttestationMatch::Match;
+}
+
+bool
+operator==(XChainCreateAccountAttestation const& lhs, XChainCreateAccountAttestation const& rhs)
+{
+    return std::tie(
+               lhs.keyAccount,
+               lhs.publicKey,
+               lhs.amount,
+               lhs.rewardAmount,
+               lhs.rewardAccount,
+               lhs.wasLockingChainSend,
+               lhs.dst) ==
+        std::tie(
+               rhs.keyAccount,
+               rhs.publicKey,
+               rhs.amount,
+               rhs.rewardAmount,
+               rhs.rewardAccount,
+               rhs.wasLockingChainSend,
+               rhs.dst);
+}
+
+//------------------------------------------------------------------------------
+//
+template <class TAttestation>
+XChainAttestationsBase<TAttestation>::XChainAttestationsBase(
+    XChainAttestationsBase<TAttestation>::AttCollection&& atts)
+    : attestations_{std::move(atts)}
+{
+}
+
+template <class TAttestation>
+XChainAttestationsBase<TAttestation>::AttCollection::const_iterator
+XChainAttestationsBase<TAttestation>::begin() const
+{
+    return attestations_.begin();
+}
+
+template <class TAttestation>
+XChainAttestationsBase<TAttestation>::AttCollection::const_iterator
+XChainAttestationsBase<TAttestation>::end() const
+{
+    return attestations_.end();
+}
+
+template <class TAttestation>
+XChainAttestationsBase<TAttestation>::AttCollection::iterator
+XChainAttestationsBase<TAttestation>::begin()
+{
+    return attestations_.begin();
+}
+
+template <class TAttestation>
+XChainAttestationsBase<TAttestation>::AttCollection::iterator
+XChainAttestationsBase<TAttestation>::end()
+{
+    return attestations_.end();
+}
+
+template <class TAttestation>
+XChainAttestationsBase<TAttestation>::XChainAttestationsBase(json::Value const& v)
+{
+    if (!v.isObject())
+    {
+        Throw<std::runtime_error>(
+            "XChainAttestationsBase can only be specified with an 'object' "
+            "Json value");
+    }
+
+    attestations_ = [&] {
+        auto const jAtts = v[jss::attestations];
+
+        if (jAtts.size() > kMaxAttestations)
+            Throw<std::runtime_error>("XChainAttestationsBase exceeded max number of attestations");
+
+        std::vector<TAttestation> r;
+        r.reserve(jAtts.size());
+        for (auto const& a : jAtts)
+            r.emplace_back(a);
+        return r;
+    }();
+}
+
+template <class TAttestation>
+XChainAttestationsBase<TAttestation>::XChainAttestationsBase(STArray const& arr)
+{
+    if (arr.size() > kMaxAttestations)
+        Throw<std::runtime_error>("XChainAttestationsBase exceeded max number of attestations");
+
+    attestations_.reserve(arr.size());
+    for (auto const& o : arr)
+        attestations_.emplace_back(o);
+}
+
+template <class TAttestation>
+STArray
+XChainAttestationsBase<TAttestation>::toSTArray() const
+{
+    STArray r{TAttestation::arrayFieldName, attestations_.size()};
+    for (auto const& e : attestations_)
+        r.emplaceBack(e.toSTObject());
+    return r;
+}
+
+template class XChainAttestationsBase<XChainClaimAttestation>;
+template class XChainAttestationsBase<XChainCreateAccountAttestation>;
+
+}  // namespace xrpl
@@ -106,6 +106,18 @@ SHAMap::snapShot(bool isMutable) const
    return std::make_shared<SHAMap>(*this, isMutable);
 }

+void
+SHAMap::condemn(SHAMapTreeNode const& node, SHAMapHash const& hash, SHAMapNodeID const& position)
+    const
+{
+    // journal_ is shared by every map built from one Family, so name which map this is. The root
+    // node's own hash, since getHash() unshares the tree on a zero hash.
+    JLOG(journal_.warn()) << (node.isLeaf() ? "Leaf " : "Inner node ") << hash << " cannot sit at "
+                          << position << ", so the map with root hash " << root_->getHash()
+                          << " is invalid";
+    setInvalid();
+}
+
 void
 SHAMap::dirtyUp(NodePathStack& stack, UInt256 const& target, SHAMapTreeNodePtr child)
 {
@@ -138,32 +150,64 @@ SHAMap::dirtyUp(NodePathStack& stack, UInt256 const& target, SHAMapTreeNodePtr c
 SHAMapLeafNode*
 SHAMap::walkTowardsKey(UInt256 const& id, NodePathStack* stack) const
 {
-    XRPL_ASSERT(
-        stack == nullptr || stack->empty(), "xrpl::SHAMap::walkTowardsKey : empty stack input");
+    if (stack != nullptr && !stack->empty())
+    {
+        // The path must start at the root, so a non-empty one is cleared rather than appended to.
+        // LCOV_EXCL_START
+        UNREACHABLE("xrpl::SHAMap::walkTowardsKey : non-empty stack input");
+        stack->clear();
+        return nullptr;
+        // LCOV_EXCL_STOP
+    }
+
    auto inNode = root_;
    SHAMapNodeID nodeID;

-    // Every node on this walk lies on the path to `id`, so the stack can derive each ID from the
-    // branch `id` selects at the node above it.
-    auto const pushCurrent = [&] {
-        if (stack != nullptr)
-            stack->pushNode(inNode, id);
+    // A false return means the map is malformed, not that `id` is absent; see pushChild. The
+    // path is cleared so a caller can read an empty path as "refused".
+    auto const pushCurrent = [&] -> bool {
+        if (stack == nullptr || stack->pushNode(inNode, id))
+        {
+            return true;
+        }
+        stack->clear();
+        return false;
    };

    while (inNode->isInner())
    {
-        pushCurrent();
+        if (!pushCurrent())
+        {
+            return nullptr;
+        }

        auto& inner = safeDowncast<SHAMapInnerNode&>(*inNode);
-        auto const branch = selectBranch(nodeID, id);
+        auto const branch = selectBranch(stack != nullptr ? stack->top().second : nodeID, id);
        if (inner.isEmptyBranch(branch))
            return nullptr;

        inNode = descendThrow(inner, branch);
-        nodeID = nodeID.getChildNodeID(branch);
+        if (stack == nullptr)
+        {
+            // Shares pastLeafDepth with pushChild, so this mode and the one with a
+            // caller-supplied path refuse at the same depth. Reachable for the reason pushChild's
+            // depth check gives: a node resolved from the local store arrives with its position
+            // and its type still to be judged. The walk reports the refusal and stops.
+            auto const depth = nodeID.getDepth();
+            bool const tooDeep = pastLeafDepth(depth, *inNode);
+            SOMETIMES(tooDeep, "xrpl::SHAMap::walkTowardsKey : child too deep");
+            if (tooDeep)
+            {
+                return nullptr;
+            }
+            nodeID = nodeID.getChildNodeID(branch);
+        }
    }

-    pushCurrent();
+    if (!pushCurrent())
+    {
+        return nullptr;
+    }
    return safeDowncast<SHAMapLeafNode*>(inNode.get());
 }

@@ -374,12 +418,23 @@ SHAMap::descend(
        !parent->isEmptyBranch(branch), "xrpl::SHAMap::descend : parent branch is non-empty");

    SHAMapTreeNode* child = parent->getChildPointer(branch);  // NOLINT(misc-const-correctness)
+    auto const childID = parentID.getChildNodeID(branch);

    if (child == nullptr)
    {
        auto const& childHash = parent->getChildHash(branch);
        SHAMapTreeNodePtr childNode = fetchNodeNT(childHash, filter);

+        if (childNode &&
+            (!belongsAt(childID, *childNode) || pastLeafDepth(parentID.getDepth(), *childNode)))
+        {
+            // A hash covers a node's contents, not its position, so position is judged before
+            // canonicalizeChild hooks the node in. The verdict lands on the map, since resolving
+            // the same blob again gives the same node.
+            condemn(*childNode, childHash, childID);
+            return std::make_pair(nullptr, childID);
+        }
+
        if (childNode)
        {
            childNode = parent->canonicalizeChild(branch, std::move(childNode));
@@ -387,7 +442,7 @@ SHAMap::descend(
        }
    }

-    return std::make_pair(child, parentID.getChildNodeID(branch));
+    return std::make_pair(child, childID);
 }

 SHAMapTreeNode*
@@ -453,6 +508,12 @@ SHAMapLeafNode*
 SHAMap::belowHelper(NodePathStack& stack, BelowDirection direction) const
 {
    XRPL_ASSERT(!stack.empty(), "xrpl::SHAMap::belowHelper : non-empty stack input");
+    if (stack.empty())
+    {
+        // LCOV_EXCL_START
+        return nullptr;
+        // LCOV_EXCL_STOP
+    }
    if (auto const& top = stack.top().first; top->isLeaf())
        return safeDowncast<SHAMapLeafNode*>(top.get());

@@ -472,7 +533,23 @@ SHAMap::belowHelper(NodePathStack& stack, BelowDirection direction) const
            continue;
        }

-        stack.pushChild(descendThrow(*inner, childBranch), childBranch);
+        auto descended = descendThrow(*inner, childBranch);
+        if (!stack.pushChild(std::move(descended), childBranch))
+        {
+            // A refused push means the map holds a node that cannot be walked. Throwing keeps
+            // nullptr meaning a subtree with no leaf below it, so begin() and an iterator
+            // increment agree on this condition. SHAMapMissingNode describes a resident node
+            // poorly, but descendThrow above already throws it on this route, so the type is
+            // the one a caller of belowHelper sees either way.
+            //
+            // The verdict is left to the acquisition path. Every caller of belowHelper is a const
+            // read on an immutable snapshot, called from several RPC threads at once, and the
+            // readers that consult isValid() are on the acquisition path. A map from peer data is
+            // judged where it is assembled (see gmnProcessNodes).
+            JLOG(journal_.warn()) << "Cannot walk below " << stack.top().second << " at branch "
+                                  << childBranch;
+            Throw<SHAMapMissingNode>(type_, inner->getChildHash(childBranch));
+        }

        auto const& child = stack.top().first;
        if (child->isLeaf())
@@ -529,7 +606,12 @@ SHAMapLeafNode const*
 SHAMap::peekFirstItem(NodePathStack& stack) const
 {
    XRPL_ASSERT(stack.empty(), "xrpl::SHAMap::peekFirstItem : empty stack input");
-    stack.pushRoot(root_);
+    if (!stack.pushRoot(root_))
+    {
+        // LCOV_EXCL_START
+        return nullptr;
+        // LCOV_EXCL_STOP
+    }
    SHAMapLeafNode const* node = belowHelper(stack, BelowDirection::First);
    if (node == nullptr)
    {
@@ -543,6 +625,12 @@ SHAMapLeafNode const*
 SHAMap::peekNextItem(UInt256 const& id, NodePathStack& stack) const
 {
    XRPL_ASSERT(!stack.empty(), "xrpl::SHAMap::peekNextItem : non-empty stack input");
+    if (stack.empty())
+    {
+        // LCOV_EXCL_START
+        return nullptr;
+        // LCOV_EXCL_STOP
+    }
    XRPL_ASSERT(stack.top().first->isLeaf(), "xrpl::SHAMap::peekNextItem : stack starts with leaf");
    stack.pop();
    while (!stack.empty())
@@ -554,7 +642,11 @@ SHAMap::peekNextItem(UInt256 const& id, NodePathStack& stack) const
        {
            if (!inner.isEmptyBranch(i))
            {
-                stack.pushChild(descendThrow(inner, i), i);
+                auto child = descendThrow(inner, i);
+                if (!stack.pushChild(std::move(child), i))
+                {
+                    Throw<SHAMapMissingNode>(type_, id);
+                }
                auto leaf = belowHelper(stack, BelowDirection::First);
                if (leaf == nullptr)
                    Throw<SHAMapMissingNode>(type_, id);
@@ -598,6 +690,12 @@ SHAMap::boundHelper(UInt256 const& id, BelowDirection direction) const

    NodePathStack stack;
    walkTowardsKey(id, &stack);
+
+    // An empty path means the walk refused a node. An empty map still leaves its root on the path,
+    // and end() would claim no key lies on the requested side of `id`, so a refusal throws.
+    if (stack.empty())
+        Throw<SHAMapMissingNode>(type_, id);
+
    while (!stack.empty())
    {
        auto const [node, nodeID] = stack.top();
@@ -620,7 +718,11 @@ SHAMap::boundHelper(UInt256 const& id, BelowDirection direction) const
                if (inner.isEmptyBranch(branch))
                    continue;

-                stack.pushChild(descendThrow(inner, branch), branch);
+                auto child = descendThrow(inner, branch);
+                if (!stack.pushChild(std::move(child), branch))
+                {
+                    Throw<SHAMapMissingNode>(type_, id);
+                }
                auto const leaf = belowHelper(stack, direction);
                if (leaf == nullptr)
                    Throw<SHAMapMissingNode>(type_, id);
@@ -782,7 +884,14 @@ SHAMap::addGiveItem(SHAMapNodeType type, boost::intrusive_ptr<SHAMapItem const>

        while ((b1 = selectBranch(nodeID, tag)) == (b2 = selectBranch(nodeID, otherItem->key())))
        {
-            stack.pushNode(node, tag);
+            if (!stack.pushNode(node, tag))
+            {
+                // The loop advances only while the two keys agree at the current nibble, and keys
+                // agreeing at every nibble are equal, which returned false above.
+                // LCOV_EXCL_START
+                Throw<SHAMapMissingNode>(type_, tag);
+                // LCOV_EXCL_STOP
+            }

            // we need a new inner node, since both go on same branch at this
            // level
@@ -90,6 +90,31 @@ SHAMapNodeID::getRawString() const
    return s.getString();
 }

+[[nodiscard]] UInt256
+childNodeID(UInt256 const& parentID, unsigned int parentDepth, unsigned int branch)
+{
+    XRPL_ASSERT(branch < SHAMap::kBranchFactor, "xrpl::childNodeID : valid branch input");
+    XRPL_ASSERT(parentDepth < SHAMap::kLeafDepth, "xrpl::childNodeID : parent above leaf depth");
+
+    // Only a depth below kLeafDepth names a child nibble, so clamp to the last one that does.
+    auto const clamped = std::min(parentDepth, SHAMap::kLeafDepth - 1u);
+
+    // The nibble is cleared before the branch is written, so an id already carrying one there is
+    // overwritten rather than merged. The byte index and both nibble choices read `clamped`, so
+    // they cannot disagree.
+    UInt256 id = parentID;
+    auto& byte = *(id.begin() + (clamped / 2));
+    if ((clamped & 1) != 0u)
+    {
+        byte = static_cast<unsigned char>((byte & 0xF0u) | branch);
+    }
+    else
+    {
+        byte = static_cast<unsigned char>((byte & 0x0Fu) | (branch << 4));
+    }
+    return id;
+}
+
 SHAMapNodeID
 SHAMapNodeID::getChildNodeID(unsigned int branch) const
 {
@@ -113,9 +138,7 @@ SHAMapNodeID::getChildNodeID(unsigned int branch) const
    if (!isPrefixOf(id_))
        Throw<std::logic_error>(std::format("Incorrect mask for {}", to_string(*this)));

-    SHAMapNodeID node{depth_ + 1, id_};
-    node.id_.begin()[depth_ / 2] |= ((depth_ & 1) != 0u) ? branch : (branch << 4);
-    return node;
+    return SHAMapNodeID{depth_ + 1, childNodeID(id_, depth_, branch)};
 }

 bool
Author	SHA1	Message	Date
Bart	3b9e8e19f0	fix: Judge a node's position on both getMissingNodes paths Both getMissingNodes paths judge a leaf's position: the arm that handles a node descendAsync has already resolved, and the deferred-read hook for one an asynchronous read resolves later. The deferred-read hook also refuses an inner node at kLeafDepth, which only the synchronous arm judged before. gmnProcessDeferredReads() is no longer static so it can record the verdict, and it keeps draining every read this pass posted after reaching it, since each holds a pointer to the walk's state. Both of its tests skip the node rather than return. A second belongsAt() overload answers about a child from its parent's position and the branch taken, so neither site builds the child's ID, and the type is tested first, which keeps the position test off every inner child. It is reached only for a child the full-below lookup did not answer for: that lookup decides which children the walk visits, and this test decides whether a visited leaf belongs where it was put. With the node flag no longer trusted below the root, this is also what closes the shared-subtree case: a root naming a completed subtree one branch over, or using it as a root, now descends it and condemns the map at the misplaced leaf. The full-below case asserts that outcome.	2026-10-16 06:37:12 +00:00
Bart	079c3b43dd	fix: Judge a node's position at its hook and in both full-below memos descend()'s filter path and addKnownNode()'s leaf hook judge a node's position before hooking it. setInvalid() and the trySetState() it routes through are const, so a read-only descend() can record that verdict. A full-below entry was keyed on the subtree hash alone, so a hit answered for a hash without answering for a position. FullBelowKey carries the masked node ID, from the new childNodeID(), and its depth beside the hash, so a hit answers for one position. The depth is kept because SHAMapNodeID masks its id to its own depth, leaving the root and every all-zero prefix sharing one id, and the position is two plain fields rather than a SHAMapNodeID, which is a CountedObject a cache entry has no business entering. The key grows from 32 to 68 bytes, so about 18 MiB more at the kFullBelowTargetSize of 524288 entries. SHAMapInnerNode::fullBelowGen_ is the second memo with the same flaw. The TreeNodeCache shares one node object by hash across maps and positions, and the walk read the flag in its loop condition ahead of the cache lookup, so a subtree completed at one position was skipped at another. The flag is now written and read for a walk's root alone, where the position is fixed, and the position-keyed cache is the only memo below it. A backed map already consults the cache first, so a warm cache costs nothing more; an unbacked map re-walks its resident nodes on each pass. The new case completes a subtree in one map, then checks that a root naming it one branch over descends it and that the subtree used as a root is walked rather than trusted.	2026-10-16 06:37:12 +00:00
Bart	962767a9b3	fix: Refuse a node that cannot sit where a path puts it NodePathStack::pushChild() refuses a node with no room below it at the depth offered, and a leaf whose key does not lie under the branch reached. belongsAt() and pastLeafDepth() are the predicates, and walkTowardsKey()'s no-path mode shares pastLeafDepth(), so both its modes refuse at the same depth; the no-path mode reports the key absent, since its callers ask about a key rather than a position. Each reports SOMETIMES, not UNREACHABLE, since the two-argument descend() judges neither position nor type. boundHelper() throws where it answered end(), since an empty map still leaves its root on the path, so an empty path means a node was refused while end() claims no key lies on the requested side. A refusal also reaches the empty-path throws in delItem(), addGiveItem() and updateGiveItem(). OpenLedger::apply() gains in its retry pass the guard the first pass already had, counting a transaction it cannot apply as a failure.	2026-10-16 06:37:11 +00:00
Bart	4aea1e20ef	fix: Bound the duplicate credit a TX-set acquire grants A duplicate-only reply postpones at most kMaxDuplicateCredits consecutive timer intervals with no useful node in between, so the timeout count always resumes. A batch that advances the set earns the budget back, and stillNeed() clears it on revival. The credit is spent only while nothing else has answered the interval, so a wide fan-out costs one credit rather than one per loser. Two bounds join it: the sender must be a peer already asked, and the acquisition must still be running. Both are read in takeNodes() before takeNodesLocked(), which settles the set on some paths and enrolls the sender in requestedPeers_ on others. takeNodes() also absorbs the settled-set branch, so both bounds and the late-reply allowance are judged ahead of takeNodesLocked().	2026-10-16 06:37:11 +00:00
Bart	206514a024	fix: Keep an acquisition registered when it supplies its own set giveSet()'s third parameter is now fromAcquire, and the entry's acquire pointer is reset only when something other than the acquisition supplied the set. Dropping it cancels an acquisition in flight, which a set arriving some other way should do and an acquisition completing on its own should not, so the entry stays registered until newRound() sweeps it and a late reply still reaches the per-peer allowance. Keying the entry by hash alone holds because addRootNode() refuses a root that does not hash to the hash asked for. wantsReplyFrom() decides ahead of the parse, so a reply turned away is never built into nodes. It shares chargeLateReply() with takeNodesLocked(), and only one of the two sees a reply, so one charge.	2026-10-16 06:37:10 +00:00
Bart	0633d5cd6b	fix: Fail a receiveNode() packet whose map has been abandoned receiveNode() asks map.isValid() right after the locked receive and fails the acquisition without charging the sender, since the verdict belongs to the walk that reached it rather than to this packet. The test sits ahead of isSynching(), which reads an abandoned map the same way as one this packet just finished, because addKnownNode() answers every node offered to such a map as a duplicate. A second case pins the other outcome at that site: a packet leaving nothing to fetch settles the ledger and reports it complete from receiveNode() itself. DeepChain::allNodes() names the node list, root included, that two suites assembled by hand.	2026-10-16 06:37:10 +00:00
Bart	6c29093de0	fix: Fail an acquisition whose map cannot exist A node that leaves a map invalid proves the hash being chased belongs to no valid tree, so TransactionAcquire::takeNodesLocked() and InboundLedger::receiveNode() fail the acquisition there rather than leaving the failure to the next trigger(). The whole batch is discarded, since the nodes hooked in ahead of that one belong to the same tree. Such a node costs kFeeMalformedData rather than kFeeInvalidData. stillNeed() reports whether the set is still worth keeping and refuses to revive one whose map went invalid. InboundTransactions::getSet() refreshes an entry's retention window only while that answer is yes, so such an entry is swept rather than kept alive by the asking. recordPacket() and haveEverything() name the packet tally and the nothing-left-to-fetch test that several sites repeated.	2026-10-16 06:37:09 +00:00
Bart	16187ab684	fix: Charge declined TX-set data where it was declined takeNodesLocked() issues the charge for declined data, under the lock that reached the verdict: an empty node list, a root that does not hash to the set asked for, a node that cannot be hooked, and node data that will not deserialize each cost kFeeInvalidData at the site rejecting it. A batch whose parse throws is tallied as invalid but not charged, since what throws there is this code rather than the data. A reply arriving after the acquisition has failed is free once per peer: each peer holds one unspent pass, renewed by each request the acquisition sends it, so overlapping requests to one peer share one pass, and a reply past that pass costs kFeeUselessData. requestedPeers_ records every peer a request went to, since trigger() can also send a targeted request to an unsolicited sender, and it records one where it builds the request, so selection alone does not enroll a peer. lateReplyGranted_ keys the allowance by peer identity rather than counting it, since a count cannot say whose pass a reply spends. recordAsked() renews a peer's pass with every request that reaches it, targeted or broadcast; a revival on its own renews nothing. A reply to a completed set still costs kFeeUselessData, since giveSet() drops the acquisition. That settled reply reports a duplicate, so takeNodes() reads whether the set was settled when the call arrived and grants the timer credit only to a reply the running acquisition earned.	2026-10-16 06:37:08 +00:00
Bart	28f83b5bcf	fix: Count partial batch progress in a TX-set reply TransactionAcquire::takeNodes() accumulates one SHAMapAddNode across the whole batch, so a packet that ends on a rejected node still counts the nodes hooked in ahead of it, as InboundLedger::receiveNode() does. The body moves to takeNodesLocked() and takeNodes() records progress on the single exit, since several inner returns stop the batch early. Progress is recorded for a batch that hooked a node in or answered with one already held. A batch of nodes already held is what an honest second responder to trigger()'s fan-out sends, so gotData() reads isGood() rather than isUseful() when it decides whether to charge for useless data.	2026-10-16 06:37:08 +00:00
Bart	67271ddc01	fix: Restart the timer when reviving a timed-out TX-set acquire TransactionAcquire::stillNeed() restarts the retry timer whenever it revives a failed acquisition, so a revived object resumes asking rather than waiting for a peer to send data unprompted. expires_after() cancels whatever wait was outstanding, so the timer holds at most one wait at a time. A job already handed to the JobQueue is not canceled and re-arms this same timer, which folds back into the one chain. A running acquisition returns early and keeps the wait it has, so a consensus round that asks for the set again does not restart it. The timeout count is clamped either way.	2026-10-16 06:37:07 +00:00
Bart	2f9e1b1716	fix: Start a ledger built from a header mutable Ledger(LedgerHeader const&, Rules, Family&) starts at immutable_ false. Its maps are constructed Synching and filled in afterwards by an acquisition or a replay, so setImmutable() is what settles the ledger, and only once both maps are sound. mapHashesFromHeader_ records that this constructor's transaction and account hashes are input rather than derived, so setImmutable() leaves them alone: deriving them from the maps would relabel a map that fell short of its target. The flag is const, unlike immutable_. A ledger this constructor built is therefore unsettled until setImmutable() says otherwise, and LedgerMaster::switchLCL() and LedgerHistory::insert() each require a settled one. InboundLedger::getLedger() already reports nothing once the acquisition has failed, so done()'s posted job reads the accessor: failure and a null ledger_ are refused by one check, and checkAccept() requires a non-null one. isFailed()'s comment said the opposite of what it returns.	2026-10-16 06:37:07 +00:00
Bart	d7988a2579	fix: Settle an acquired ledger before reporting it complete done() owns the publication of complete_ and sets it only once the ledger is settled, so a caller reading isComplete() without mtx_ may use the ledger directly. LedgerHistory::insert(), LedgerHolder::set() and LedgerMaster::switchLCL() each require an immutable ledger, and that ordering is what their requirement rests on. trigger() and receiveNode() set the have-flags and leave the verdict to done(), while tryDB() settles its own result and sets complete_ itself, so that path arrives with only the reporting left.	2026-10-16 06:37:06 +00:00
Bart	cf7d48d117	fix: Publish an acquisition's outcome flags across threads complete_ and failed_ are std::atomic<bool> at the default seq_cst order, so a reader that sees either flag set also sees the work the writer did before setting it. isComplete() and isFailed() return them without taking mtx_, and InboundLedgers::acquire() calls both outside every lock it holds. A static_assert pins both to a lock-free representation, so neither accessor can block. No access site changes: a plain assignment and a plain test compile unchanged, and nothing takes a reference or an address of either field. Scoped to those two, which are the only fields here reached through an accessor that takes no lock.	2026-10-16 06:37:06 +00:00
Bart	495374869a	fix: Tell a satisfied InboundLedger map from an abandoned one hasInvalidMap() reports whether either map of the ledger being acquired has been found invalid, and the three places that read an empty walk result as nothing left to fetch ask it first: tryDB(), whose two walks set haveState_ and haveTransactions_ independently, trigger()'s aggressive-retry branch, whose getNeededHashes() walk can reach the verdict itself, and trigger()'s state-map walk, the one walk that runs with mtx_ released. The state-map walk asks outside the guard that re-reads the flags after re-locking, since the verdict is about the map rather than the round, and it withdraws the completeness claim beside the failure.	2026-10-16 06:37:04 +00:00