chore: Bump version to 3.4.0

.cspell.config.yaml

@@ -64,7 +64,6 @@ words:
   - blindings
   - bookdir
   - Bougalis
-  - bthomee
   - Britto
   - Btrfs
   - Buildx

.github/actions/release-info/action.yml

@@ -41,4 +41,4 @@ runs:
 
     - name: Determine release channel and package release
       id: release_info
-      uses: XRPLF/actions/release-info@ebcf6cea14eee258697308a51fea55cad777581b
+      uses: XRPLF/actions/release-info@7cc0e4a8d9d0b838f92c48d312856b190341bbba

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

@@ -82,6 +82,7 @@ test.app > xrpl.tx
 test.basics > test.jtx
 test.basics > xrpl.basics
 test.basics > xrpl.core
+test.basics > xrpld.rpc
 test.basics > xrpl.json
 test.basics > xrpl.protocol
 test.beast > xrpl.basics
@@ -112,7 +113,6 @@ test.jtx > xrpl.config
 test.jtx > xrpl.core
 test.jtx > xrpld.app
 test.jtx > xrpld.core
-test.jtx > xrpld.overlay
 test.jtx > xrpld.rpc
 test.jtx > xrpl.json
 test.jtx > xrpl.ledger
@@ -194,9 +194,6 @@ tests.libxrpl > xrpl.resource
 tests.libxrpl > xrpl.server
 tests.libxrpl > xrpl.shamap
 tests.libxrpl > xrpl.tx
-tests.xrpld > xrpld.rpc
-tests.xrpld > xrpl.json
-tests.xrpld > xrpl.protocol
 xrpl.conditions > xrpl.basics
 xrpl.conditions > xrpl.protocol
 xrpl.config > xrpl.basics
@@ -289,10 +286,10 @@ xrpld.perflog > xrpl.basics
 xrpld.perflog > xrpl.config
 xrpld.perflog > xrpl.core
 xrpld.perflog > xrpld.app
+xrpld.perflog > xrpld.rpc
 xrpld.perflog > xrpl.json
 xrpld.perflog > xrpl.nodestore
 xrpld.perflog > xrpl.protocol
-xrpld.perflog > xrpl.server
 xrpld.rpc > xrpl.basics
 xrpld.rpc > xrpl.config
 xrpld.rpc > xrpl.core

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

@@ -1,5 +1,5 @@
 {
-  "image_tag": "sha-060957e",
+  "image_tag": "sha-473fe44",
   "configs": {
     "ubuntu": [
       {
@@ -74,7 +74,7 @@
         "extra_cmake_args": "-Dvalidator_keys=ON",
         "package": {
           "type": "deb",
-          "image": "ghcr.io/xrplf/xrpld/packaging-debian:sha-3a2d19f"
+          "image": "ghcr.io/xrplf/xrpld/packaging-debian:sha-49cdc10"
         }
       },
       {
@@ -86,7 +86,7 @@
         "extra_cmake_args": "-Dvalidator_keys=ON -Dassert=ON",
         "package": {
           "type": "deb",
-          "image": "ghcr.io/xrplf/xrpld/packaging-debian:sha-3a2d19f",
+          "image": "ghcr.io/xrplf/xrpld/packaging-debian:sha-49cdc10",
           "variant": "assert"
         }
       }
@@ -101,7 +101,7 @@
         "extra_cmake_args": "-Dvalidator_keys=ON",
         "package": {
           "type": "rpm",
-          "image": "ghcr.io/xrplf/xrpld/packaging-rhel:sha-3a2d19f"
+          "image": "ghcr.io/xrplf/xrpld/packaging-rhel:sha-49cdc10"
         }
       }
     ]

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

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

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

@@ -7,12 +7,12 @@ on:
     paths:
       - ".github/workflows/build-packaging-images.yml"
       - "bin/install-packaging-tools.sh"
-      - "package/images/packaging/**"
+      - "package/docker/**"
   pull_request:
     paths:
       - ".github/workflows/build-packaging-images.yml"
       - "bin/install-packaging-tools.sh"
-      - "package/images/packaging/**"
+      - "package/docker/**"
   workflow_dispatch:
 
 concurrency:
@@ -41,9 +41,9 @@ jobs:
           # AlmaLinux rather than UBI, which does not ship rpm-sign.
           - name: rhel
             base_image: almalinux:10
-    uses: XRPLF/actions/.github/workflows/build-multiarch-image.yml@696384b292577293292daed06af0306d1b83bd7d
+    uses: XRPLF/actions/.github/workflows/build-multiarch-image.yml@034e87065fcd0100214cf0672923bd38d193cf78
     with:
       image_name: xrpld/packaging-${{ matrix.distro.name }}
-      dockerfile: package/images/packaging/Dockerfile
+      dockerfile: package/docker/Dockerfile
       base_image: ${{ matrix.distro.base_image }}
       push: ${{ github.event_name == 'push' }}

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

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

.github/workflows/cargo-audit.yml

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

.github/workflows/on-pr.yml

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

.github/workflows/on-tag.yml

@@ -50,7 +50,3 @@ jobs:
       remote_username: ${{ secrets.NEXUS_REMOTE_USERNAME }}
       remote_password: ${{ secrets.NEXUS_REMOTE_PASSWORD }}
       signing_key: ${{ secrets.NEXUS_PACKAGES_PRIVATE_KEY }}
-      dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
-      antithesis_docker_host: ${{ secrets.ANTITHESIS_DOCKER_HOST }}
-      antithesis_docker_path: ${{ secrets.ANTITHESIS_DOCKER_PATH }}
-      antithesis_docker_credentials: ${{ secrets.ANTITHESIS_DOCKER_CREDENTIALS }}

.github/workflows/on-trigger.yml

@@ -129,7 +129,3 @@ jobs:
       remote_username: ${{ secrets.NEXUS_REMOTE_USERNAME }}
       remote_password: ${{ secrets.NEXUS_REMOTE_PASSWORD }}
       signing_key: ${{ secrets.NEXUS_PACKAGES_PRIVATE_KEY }}
-      dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
-      antithesis_docker_host: ${{ secrets.ANTITHESIS_DOCKER_HOST }}
-      antithesis_docker_path: ${{ secrets.ANTITHESIS_DOCKER_PATH }}
-      antithesis_docker_credentials: ${{ secrets.ANTITHESIS_DOCKER_CREDENTIALS }}

.github/workflows/publish-docs.yml

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

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

@@ -257,7 +257,6 @@ jobs:
         run: |
           ./bin/check-nix-store-refs.sh "${BUILD_DIR}/xrpld"
           ./bin/check-nix-store-refs.sh "${BUILD_DIR}/xrpl_tests"
-          ./bin/check-nix-store-refs.sh "${BUILD_DIR}/xrpld_tests"
 
       - name: Show ccache statistics
         if: ${{ inputs.ccache_enabled }}
@@ -339,9 +338,7 @@ jobs:
       - name: Run the separate tests
         if: ${{ !inputs.build_only }}
         working-directory: ${{ runner.os == 'Windows' && format('{0}/{1}', env.BUILD_DIR, inputs.build_type) || env.BUILD_DIR }}
-        run: |
-          ./xrpl_tests
-          ./xrpld_tests
+        run: ./xrpl_tests
 
       - name: Run the embedded tests
         if: ${{ !inputs.build_only }}
@@ -442,7 +439,7 @@ jobs:
 
       - name: Upload coverage report
         if: ${{ github.repository_owner == 'XRPLF' && !inputs.build_only && env.COVERAGE_ENABLED == 'true' }}
-        uses: codecov/codecov-action@303a32d7a59b442fa8d48b6a1cc6825c09c847a5 # v7.1.1
+        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
         with:
           disable_search: true
           disable_telem: true

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

@@ -34,7 +34,7 @@ jobs:
     needs: [determine-files]
     if: ${{ needs.determine-files.outputs.cpp_changed_files != '' || needs.determine-files.outputs.need_full_run == 'true' }}
     runs-on: ["self-hosted", "Linux", "X64", "heavy"]
-    container: "ghcr.io/xrplf/xrpld/nix-debian:sha-060957e"
+    container: "ghcr.io/xrplf/xrpld/nix-debian:sha-473fe44"
     permissions:
       contents: read
       issues: write

.github/workflows/reusable-package.yml

@@ -1,5 +1,5 @@
 # Build, verify and publish Linux packages from the pre-built xrpld and
-# validator-keys artifacts, in these stages:
+# validator-keys artifacts, in three stages:
 #
 #   - 'package' builds and signs one format per config that carries a "package"
 #     map in linux.json; that map names the container image and the format
@@ -9,9 +9,6 @@
 #     never reaches Nexus
 #   - 'publish' uploads with the image's publish_pkg.py, doing a --dry-run
 #     unless 'publish: true'
-#   - 'docker' builds an Ubuntu image from the tested DEB, and one with the
-#     voidstar binary for Antithesis, pushing them to Docker Hub and to the
-#     Antithesis registry only with 'publish: true'
 #
 # Only linux/amd64 is supported; the runner is hardcoded in the jobs below.
 name: Package
@@ -28,7 +25,7 @@ on:
         description: "The base URL of the Nexus instance hosting the deb and rpm repositories."
         required: false
         type: string
-        default: https://packages-upload.xrplf.org
+        default: https://packages.xrplf.org
 
     secrets:
       remote_username:
@@ -38,19 +35,7 @@ on:
         description: "The password or token for that Nexus account."
         required: false
       signing_key:
-        description: "Armoured PGP private key used to sign the RPMs."
-        required: false
-      dockerhub_token:
-        description: "A Docker Hub organization access token for xrplf, with push access to xrplf/xrpld."
-        required: false
-      antithesis_docker_host:
-        description: "The host of the Antithesis container registry, e.g. us-central1-docker.pkg.dev."
-        required: false
-      antithesis_docker_path:
-        description: "The repository path in that registry, the image name excluded."
-        required: false
-      antithesis_docker_credentials:
-        description: "The JSON key of a service account with push access to that repository."
+        description: "Armoured PGP private key used to sign the RPMs. Required when publishing."
         required: false
 
 defaults:
@@ -213,7 +198,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
-    name: "publish ${{ matrix.xrpld_artifact_name }}${{ !inputs.publish && ' (dry run)' || '' }}"
+    name: "publish ${{ matrix.xrpld_artifact_name }}"
     permissions:
       contents: read
     runs-on: ["self-hosted", "Linux", "X64", "heavy"]
@@ -254,86 +239,3 @@ jobs:
               --package-dir "${PACKAGE_DIR}" \
               --nexus-url "${NEXUS_URL}" \
               ${DRY_RUN_OPTION}
-
-  docker:
-    needs: [test-install-deb, test-install-rpm]
-    strategy:
-      fail-fast: false
-      matrix:
-        target: [xrpld, voidstar]
-    name: "docker ${{ matrix.target }}${{ !inputs.publish && ' (dry run)' || '' }}"
-    permissions:
-      contents: read
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    env:
-      CONTEXT: image-context
-      IMAGE: ${{ matrix.target == 'voidstar' && 'xrpld-voidstar' || 'xrplf/xrpld' }}:${{ github.ref_type == 'tag' && github.ref_name || 'develop' }}
-      # Docker Hub is public, so a private build never reaches it;
-      # the Antithesis registry is not.
-      PUSH: ${{ inputs.publish && (matrix.target == 'voidstar' || github.event.repository.visibility == 'public') }}
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-
-      - name: Download package artifacts
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          pattern: "*-pkg"
-          merge-multiple: true
-          path: ${{ env.PACKAGE_DIR }}
-
-      - name: Download voidstar binary
-        if: ${{ matrix.target == 'voidstar' }}
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: xrpld-ubuntu-clang-debug-amd64-voidstar
-          path: ${{ env.CONTEXT }}
-
-      - name: Build image
-        env:
-          TARGET: ${{ matrix.target }}
-        run: |
-          mkdir -p "${CONTEXT}"
-          find "${PACKAGE_DIR}" -type f -name 'xrpld_[0-9]*.deb' -exec cp {} "${CONTEXT}/" \;
-          docker build --pull --file package/images/xrpld/Dockerfile --target "${TARGET}" --tag "${IMAGE}" "${CONTEXT}"
-
-      - name: Start the server
-        run: |
-          container="$(docker run --detach "${IMAGE}" --standalone --silent --conf /etc/xrpld/xrpld.cfg)"
-          trap 'docker rm --force "${container}" >/dev/null' EXIT
-
-          for _ in $(seq 30); do
-              output="$(docker exec "${container}" xrpld --conf /etc/xrpld/xrpld.cfg server_info || true)"
-              if [[ "${output}" == *'"status" : "success"'* ]]; then
-                  exit 0
-              fi
-              sleep 2
-          done
-
-          docker logs "${container}"
-          exit 1
-
-      - name: Log in to Docker Hub
-        if: ${{ env.PUSH == 'true' && matrix.target == 'xrpld' }}
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
-        with:
-          username: xrplf
-          password: ${{ secrets.dockerhub_token }}
-
-      - name: Log in to the Antithesis registry
-        if: ${{ env.PUSH == 'true' && matrix.target == 'voidstar' }}
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
-        with:
-          registry: ${{ secrets.antithesis_docker_host }}
-          username: _json_key
-          password: ${{ secrets.antithesis_docker_credentials }}
-
-      - name: Push image
-        if: ${{ env.PUSH == 'true' }}
-        env:
-          REGISTRY: ${{ matrix.target == 'voidstar' && format('{0}/{1}/', secrets.antithesis_docker_host, secrets.antithesis_docker_path) || '' }}
-        run: |
-          docker tag "${IMAGE}" "${REGISTRY}${IMAGE}"
-          docker push "${REGISTRY}${IMAGE}"

.github/workflows/reusable-rust.yml

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

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

@@ -40,7 +40,7 @@ defaults:
 jobs:
   upload:
     runs-on: ubuntu-latest
-    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-060957e
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-473fe44
     env:
       REMOTE_NAME: ${{ inputs.remote_name }}
       CONAN_LOGIN_USERNAME_XRPLF: ${{ secrets.remote_username }}
@@ -68,17 +68,33 @@ jobs:
         run: conan remote login "${REMOTE_NAME}" "${CONAN_LOGIN_USERNAME_XRPLF}" --password "${CONAN_PASSWORD_XRPLF}"
 
       - name: Upload Conan recipe (version)
-        env:
-          VERSION: ${{ steps.release_info.outputs.version }}
         run: |
-          conan export . --version="${VERSION}"
-          conan upload --confirm --check --remote="${REMOTE_NAME}" "xrpl/${VERSION}"
+          conan export . --version=${{ steps.release_info.outputs.version }}
+          conan upload --confirm --check --remote="${REMOTE_NAME}" xrpl/${{ steps.release_info.outputs.version }}
 
+      # When this workflow is triggered by a push event, it will always be when merging into the
+      # 'develop' branch, see on-trigger.yml.
       - name: Upload Conan recipe (develop)
-        if: ${{ github.ref == 'refs/heads/develop' }}
+        if: ${{ github.event_name == 'push' }}
         run: |
           conan export . --version=develop
           conan upload --confirm --check --remote="${REMOTE_NAME}" xrpl/develop
 
+      # When this workflow is triggered by a pull request event, it will always be when merging into
+      # one of the 'release' branches, see on-pr.yml.
+      - name: Upload Conan recipe (rc)
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          conan export . --version=rc
+          conan upload --confirm --check --remote="${REMOTE_NAME}" xrpl/rc
+
+      # When this workflow is triggered by a push event, it will always be when tagging a final
+      # release, see on-tag.yml.
+      - name: Upload Conan recipe (release)
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        run: |
+          conan export . --version=release
+          conan upload --confirm --check --remote="${REMOTE_NAME}" xrpl/release
+
     outputs:
       ref: xrpl/${{ steps.release_info.outputs.version }}

.pre-commit-config.yaml

@@ -53,11 +53,6 @@ repos:
         entry: ./bin/pre-commit/check_doxygen_style.py
         language: python
         types_or: [c++, c]
-      - id: fix-gtest-names
-        name: "fix gtest names: CamelCase suite, snake_case test case"
-        entry: ./bin/pre-commit/fix_gtest_names.py
-        language: python
-        types_or: [c++, c]
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
     rev: f4d7745e17a28aad7eed2f4874ca8d1568c11c4c # frozen: v22.1.8
@@ -75,11 +70,6 @@ repos:
         language: system
         types: [rust]
         pass_filenames: false # rustfmt formats the whole workspace
-      - id: check-coverage-attrs
-        name: check Rust coverage attributes
-        entry: ./bin/pre-commit/check_rust_coverage_attrs.py
-        language: python
-        files: ^crates/.*\.rs$
 
   - repo: https://github.com/BlankSpruce/gersemi-pre-commit
     rev: e98930bdc210d3387007f9252d8c1694ea7e410f # frozen: 0.27.7

API-CHANGELOG.md

@@ -41,7 +41,6 @@ Version 3.4.0 is not yet released. These changes are available in the 3.4.0 beta
 - `gateway_balances`: The `account` and `ident` fields now return an `invalidParams` error if the value is not a string, instead of an `internal` error. [#7655](https://github.com/XRPLF/rippled/pull/7655)
 - `account_lines`: The `peer` field now returns an error if the value is not a string. [#7728](https://github.com/XRPLF/rippled/pull/7728)
 - `ledger`: `delivered_amount` is now included in the metadata of successful `AccountDelete` transactions when transactions are expanded (`expand`, or admin-only `full`). Previously it was only added for `Payment` and `CheckCash`, which made `ledger` inconsistent with `tx` and `account_tx`. [#5706](https://github.com/XRPLF/rippled/pull/5706)
-- `noripple_check`: The `transactions` field is no longer included in error responses; it is still returned (possibly as an empty array) whenever `transactions` is `true` and the request succeeds. A malformed `account` is now rejected before the ledger is looked up, so that error response no longer carries the `ledger_hash`, `ledger_index`, and `validated` fields ([#6303](https://github.com/XRPLF/rippled/pull/6303)).
 
 ## XRP Ledger server version 3.3.0
 

CMakeLists.txt

@@ -115,7 +115,6 @@ find_package(secp256k1 REQUIRED)
 find_package(SOCI REQUIRED)
 find_package(SQLite3 REQUIRED)
 find_package(xxHash REQUIRED)
-find_package(xrpl-rpc-spec REQUIRED)
 
 target_link_libraries(
     xrpl_libs
@@ -176,7 +175,6 @@ include(XrplPackaging)
 if(tests)
     include(CTest)
     add_subdirectory(src/tests/libxrpl)
-    add_subdirectory(src/tests/xrpld)
 endif()
 
 if(benchmark)

bin/check-tools.sh

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

bin/pre-commit/check_rust_coverage_attrs.py

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

bin/pre-commit/fix_gtest_names.py

@@ -1,144 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-Rewrites gtest names to the required style in this project: the suite name is
-CamelCase, the test-case name is snake_case.
-
-    TEST(SuiteName, test_case_name)
-
-The gtest `DISABLED_` prefix is kept verbatim on either name.
-
-Both conversions fold acronyms the way a reader expects:
-`SetAndResetAccountTxnID` -> `set_and_reset_account_txn_id`, not
-`set_and_reset_account_txn_i_d`.
-
-The first argument of `TEST_F`, `TEST_P`, `TYPED_TEST` and `TYPED_TEST_P` is a
-fixture class rather than a free identifier, so rewriting it here would leave
-the class it names behind. Those are reported for a human to rename (clang-tidy
-checks the class declaration itself, via readability-identifier-naming).
-
-Usage: ./bin/pre-commit/fix_gtest_names.py <file1> <file2> ...
-"""
-
-import re
-import sys
-from collections import Counter
-from pathlib import Path
-
-# A test-case definition, `MACRO(SuiteOrFixture, TestName)`, anchored at the
-# start of a line so that commented-out definitions and project macros that
-# merely look similar (`TEST_EXPECT(...)`) are left alone. The `\s*` between
-# arguments allows for a definition clang-format wrapped over several lines.
-PATTERN = re.compile(
-    r"(?P<head>^[ \t]*(?P<macro>TYPED_TEST_P|TYPED_TEST|TEST_F|TEST_P|TEST)\s*\(\s*)"
-    r"(?P<suite>\w+)(?P<mid>\s*,\s*)(?P<name>\w+)(?P<tail>\s*\))",
-    re.MULTILINE,
-)
-
-# The macros whose first argument names a fixture class, not a free identifier.
-FIXTURE_MACROS = ("TEST_F", "TEST_P", "TYPED_TEST", "TYPED_TEST_P")
-
-DISABLED = "DISABLED_"
-
-ACRONYM_BOUNDARY = re.compile(r"([A-Z]+)([A-Z][a-z])")
-WORD_BOUNDARY = re.compile(r"([a-z\d])([A-Z])")
-
-
-def _split_disabled(name: str) -> tuple[str, str]:
-    """Splits off gtest's `DISABLED_` prefix, which is kept verbatim."""
-    if name.startswith(DISABLED):
-        return DISABLED, name[len(DISABLED) :]
-    return "", name
-
-
-def snake_case(name: str) -> str:
-    """Returns the name in snake_case, leaving acronyms whole.
-
-    `SetAndResetAccountTxnID` -> `set_and_reset_account_txn_id`,
-    `parseStatRSSkB` -> `parse_stat_rs_sk_b`.
-    """
-    prefix, core = _split_disabled(name)
-    core = ACRONYM_BOUNDARY.sub(r"\1_\2", core)
-    return prefix + WORD_BOUNDARY.sub(r"\1_\2", core).lower()
-
-
-def camel_case(name: str) -> str:
-    """Returns the name in CamelCase, capitalizing each underscored word.
-
-    Only the letters that have to change are touched, so acronyms survive: a
-    conversion that went via snake_case would turn `SHAMapTest` into
-    `ShaMapTest`, whereas here it is already CamelCase and stays put.
-    `json_value` -> `JsonValue`, `parseStatRSSkB` -> `ParseStatRSSkB`.
-    """
-    prefix, core = _split_disabled(name)
-    return prefix + "".join(w[:1].upper() + w[1:] for w in core.split("_") if w)
-
-
-def _corrected(match: re.Match) -> tuple[str, str]:
-    """Returns the suite and test-case names this definition should end up with."""
-    suite = match["suite"]
-    return (
-        suite if match["macro"] in FIXTURE_MACROS else camel_case(suite),
-        snake_case(match["name"]),
-    )
-
-
-def fix_source(text: str) -> tuple[str, list[str]]:
-    """Returns the corrected text and one `line: message` report per bad name."""
-    # gtest joins the suite and test names into one class name, so two test
-    # cases whose joined names agree cannot coexist: `TEST(a, b_c)` and
-    # `TEST(a_b, c)` both define `a_b_c_Test`. A rename that would introduce
-    # such a clash is reported for a human instead of applied.
-    joined = Counter("_".join(_corrected(m)) for m in PATTERN.finditer(text))
-    reports = []
-
-    def rewrite(match: re.Match) -> str:
-        suite, name = match["suite"], match["name"]
-        new_suite, new_name = _corrected(match)
-        line = text.count("\n", 0, match.start()) + 1
-
-        if match["macro"] in FIXTURE_MACROS and camel_case(suite) != suite:
-            reports.append(
-                f"{line}: fixture '{suite}' is not CamelCase: rename the class "
-                f"to '{camel_case(suite)}' by hand"
-            )
-        if (new_suite, new_name) == (suite, name):
-            return match[0]
-        if joined[f"{new_suite}_{new_name}"] > 1:
-            reports.append(
-                f"{line}: cannot rename '{suite}, {name}' to '{new_suite}, "
-                f"{new_name}': another test case already generates that name"
-            )
-            return match[0]
-        if new_suite != suite:
-            reports.append(f"{line}: renamed suite '{suite}' to '{new_suite}'")
-        if new_name != name:
-            reports.append(f"{line}: renamed test case '{name}' to '{new_name}'")
-        return match["head"] + new_suite + match["mid"] + new_name + match["tail"]
-
-    return PATTERN.sub(rewrite, text), reports
-
-
-def fix_names(path: Path) -> bool:
-    """Corrects one file's gtest names, reporting each on stdout."""
-    original = path.read_text(encoding="utf-8")
-    fixed, reports = fix_source(original)
-    for report in reports:
-        print(f"{path}:{report}")
-    if fixed != original:
-        path.write_text(fixed, encoding="utf-8")
-    return not reports
-
-
-def main() -> int:
-    files = [Path(f) for f in sys.argv[1:]]
-    success = True
-
-    for path in files:
-        success &= fix_names(path)
-
-    return 0 if success else 1
-
-
-if __name__ == "__main__":
-    sys.exit(main())

bin/pre-commit/test_fix_gtest_names.py

@@ -1,259 +0,0 @@
-#!/usr/bin/env python3
-"""
-Tests for fix_gtest_names.py.
-
-Run directly (no test framework needed):
-    ./bin/pre-commit/test_fix_gtest_names.py
-or under pytest:
-    pytest bin/pre-commit/test_fix_gtest_names.py
-"""
-
-import sys
-import textwrap
-
-from fix_gtest_names import camel_case, fix_source, snake_case
-
-
-def dedent(text: str) -> str:
-    """Removes a fixture's common indentation and its leading newline.
-
-    Lets fixtures be written as indented triple-quoted here-docs while keeping
-    honest 1-based line numbers.
-    """
-    return textwrap.dedent(text).lstrip("\n")
-
-
-def fixed(text: str) -> str:
-    return fix_source(dedent(text))[0]
-
-
-def reports(text: str) -> list[str]:
-    return fix_source(dedent(text))[1]
-
-
-# --- conversion --------------------------------------------------------------
-
-
-def test_snake_case_conversion() -> None:
-    assert snake_case("BadInputs") == "bad_inputs"
-    assert snake_case("mulDiv") == "mul_div"
-    assert snake_case("already_snake") == "already_snake"
-    assert snake_case("base64") == "base64"
-
-
-def test_snake_case_keeps_acronyms_whole() -> None:
-    assert snake_case("SetAndResetAccountTxnID") == "set_and_reset_account_txn_id"
-    assert snake_case("XRPToIOU") == "xrp_to_iou"
-    assert snake_case("STAmountMath") == "st_amount_math"
-
-
-def test_camel_case_conversion() -> None:
-    assert camel_case("json_value") == "JsonValue"
-    assert camel_case("mulDiv") == "MulDiv"
-    assert camel_case("scope") == "Scope"
-    assert camel_case("base64") == "Base64"
-
-
-def test_camel_case_leaves_acronyms_alone() -> None:
-    # A snake_case round-trip would give `ShaMapTest` / `ParseStatmRsSkB` here.
-    assert camel_case("SHAMapTest") == "SHAMapTest"
-    assert camel_case("parseStatmRSSkB") == "ParseStatmRSSkB"
-    assert camel_case("XRPAmount") == "XRPAmount"
-    assert camel_case("CSPRNG") == "CSPRNG"
-
-
-def test_disabled_prefix_preserved() -> None:
-    assert snake_case("DISABLED_FooBar") == "DISABLED_foo_bar"
-    assert snake_case("DISABLED_foo_bar") == "DISABLED_foo_bar"
-    assert snake_case("DISABLED_") == "DISABLED_"
-    assert camel_case("DISABLED_foo_bar") == "DISABLED_FooBar"
-    assert camel_case("DISABLED_") == "DISABLED_"
-
-
-# --- what counts as a test definition ---------------------------------------
-
-
-def test_all_macros_recognized() -> None:
-    code = """
-    TEST(Suite, oneName)
-    TEST_F(Fixture, twoName)
-    TEST_P(Fixture, threeName)
-    TYPED_TEST(Fixture, fourName)
-    TYPED_TEST_P(Fixture, fiveName)
-    """
-    assert fixed(code) == dedent("""
-        TEST(Suite, one_name)
-        TEST_F(Fixture, two_name)
-        TEST_P(Fixture, three_name)
-        TYPED_TEST(Fixture, four_name)
-        TYPED_TEST_P(Fixture, five_name)
-        """)
-
-
-def test_conforming_definitions_untouched() -> None:
-    code = """
-    TEST(AccountSet, bad_inputs)
-    TEST_F(MutexMakeTest, default_constructor)
-    TEST(SHAMap, DISABLED_slow_path)
-    """
-    assert reports(code) == []
-    assert fixed(code) == dedent(code)
-
-
-def test_lookalikes_ignored() -> None:
-    code = """
-    // TEST(Suite, notATest)
-    TEST_EXPECT(someCall())
-    TEST_EXPECTS(amount == value, amount.getText())
-    INSTANTIATE_TEST_SUITE_P(Prefix, Fixture, testValues());
-    auto x = TEST(Suite, notATest);
-    TYPED_TEST_SUITE(Fixture, MyTypes);
-    """
-    assert reports(code) == []
-    assert fixed(code) == dedent(code)
-
-
-def test_indented_and_wrapped_definitions() -> None:
-    code = """
-    namespace ripple {
-        TEST(Suite, indentedName)
-    }
-    TEST_F(
-        SomeVeryLongFixtureName,
-        wrappedName)
-    """
-    assert fixed(code) == dedent("""
-        namespace ripple {
-            TEST(Suite, indented_name)
-        }
-        TEST_F(
-            SomeVeryLongFixtureName,
-            wrapped_name)
-        """)
-
-
-# --- rewriting --------------------------------------------------------------
-
-
-def test_only_the_two_names_are_rewritten() -> None:
-    code = """
-    TEST(mulDiv, mulDiv)
-    {
-        auto const mulDiv = 1;  // mulDiv stays
-    }
-    """
-    assert fixed(code) == dedent("""
-        TEST(MulDiv, mul_div)
-        {
-            auto const mulDiv = 1;  // mulDiv stays
-        }
-        """)
-
-
-def test_suite_name_camel_cased() -> None:
-    code = """
-    TEST(json_value, limits)
-    TEST(scope, ScopeExit)
-    """
-    assert reports(code) == [
-        "1: renamed suite 'json_value' to 'JsonValue'",
-        "2: renamed suite 'scope' to 'Scope'",
-        "2: renamed test case 'ScopeExit' to 'scope_exit'",
-    ]
-    assert fixed(code) == dedent("""
-        TEST(JsonValue, limits)
-        TEST(Scope, scope_exit)
-        """)
-
-
-def test_fixture_reported_but_not_renamed() -> None:
-    # The first argument names a class, so only a human (or clang-tidy) can
-    # rename it; the test-case name is still fixed.
-    code = """
-    TEST_F(my_fixture, someTest)
-    """
-    assert reports(code) == [
-        "1: fixture 'my_fixture' is not CamelCase: rename the class to "
-        "'MyFixture' by hand",
-        "1: renamed test case 'someTest' to 'some_test'",
-    ]
-    assert fixed(code) == dedent("""
-        TEST_F(my_fixture, some_test)
-        """)
-
-
-def test_reports_carry_line_numbers() -> None:
-    code = """
-    #include <foo.h>
-
-    TEST(Suite, firstName)
-
-    TEST(Suite, secondName)
-    """
-    assert reports(code) == [
-        "3: renamed test case 'firstName' to 'first_name'",
-        "5: renamed test case 'secondName' to 'second_name'",
-    ]
-
-
-# --- collisions -------------------------------------------------------------
-
-
-def test_collision_reported_and_not_applied() -> None:
-    # Both would define `Suite_mul_div_Test`.
-    code = """
-    TEST(Suite, mulDiv)
-    TEST(Suite, mul_div)
-    """
-    assert reports(code) == [
-        "1: cannot rename 'Suite, mulDiv' to 'Suite, mul_div': another test "
-        "case already generates that name"
-    ]
-    assert fixed(code) == dedent(code)
-
-
-def test_collision_between_converging_suites() -> None:
-    # Both suites camel-case to `SuiteA`, so both would define
-    # `SuiteA_one_test_Test`.
-    code = """
-    TEST(SuiteA, oneTest)
-    TEST(Suite_a, one_test)
-    """
-    assert [r.split(":")[1].strip() for r in reports(code)] == [
-        "cannot rename 'SuiteA, oneTest' to 'SuiteA, one_test'",
-        "cannot rename 'Suite_a, one_test' to 'SuiteA, one_test'",
-    ]
-    assert fixed(code) == dedent(code)
-
-
-def test_same_name_in_different_suites_is_not_a_collision() -> None:
-    code = """
-    TEST(SuiteOne, mulDiv)
-    TEST(SuiteTwo, mulDiv)
-    """
-    assert fixed(code) == dedent("""
-        TEST(SuiteOne, mul_div)
-        TEST(SuiteTwo, mul_div)
-        """)
-
-
-def main() -> int:
-    tests = sorted(
-        (name, fn)
-        for name, fn in globals().items()
-        if name.startswith("test_") and callable(fn)
-    )
-    failed = 0
-    for name, fn in tests:
-        try:
-            fn()
-            print(f"PASS {name}")
-        except AssertionError as exc:
-            failed += 1
-            print(f"FAIL {name}: {exc!r}")
-    print(f"\n{len(tests) - failed}/{len(tests)} passed")
-    return 1 if failed else 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())

cmake/XrplCore.cmake

@@ -296,14 +296,7 @@ if(xrpld)
         target_sources(xrpld PRIVATE ${sources})
     endif()
 
-    target_link_libraries(
-        xrpld
-        Xrpl::boost
-        Xrpl::opts
-        Xrpl::libs
-        xrpl.libxrpl
-        rpcspec::rpcspec
-    )
+    target_link_libraries(xrpld Xrpl::boost Xrpl::opts Xrpl::libs xrpl.libxrpl)
     exclude_if_included(xrpld)
     # define a macro for tests that might need to
     # be excluded or run differently in CI environment

cmake/XrplCov.cmake

@@ -48,7 +48,7 @@ setup_target_for_coverage_gcovr(
         "include/xrpl/beast/test"
         "include/xrpl/beast/unit_test"
         "${CMAKE_BINARY_DIR}/pb-xrpl.libpb"
-    DEPENDENCIES xrpld xrpl_tests xrpld_tests
+    DEPENDENCIES xrpld xrpl_tests
 )
 
 add_code_coverage_to_target(opts INTERFACE)

conan.lock

@@ -3,7 +3,6 @@
     "requires": [
         "zlib/1.3.2#1cb806da49011867778ffb6ac7190fcb%1782392402.122708",
         "xxhash/0.8.3#681d36a0a6111fc56e5e45ea182c19cc%1782392402.420688",
-        "xrpl-rpc-spec/0.1.19#870b2d3abcfbbf13b61c2d3c69495060%1790348286.187549",
         "sqlite3/3.53.0#324ada52333108388a9a6108bfa96734%1782392403.185447",
         "soci/4.0.3#e726491a03468795453f7c83fc924a96%1782392402.679521",
         "snappy/1.1.10#968fef506ff261592ec30c574d4a7809%1782307151.633168",
@@ -20,8 +19,8 @@
         "libarchive/3.8.7#c446109bd1f1d8ba7936c94189bc50e6%1782392403.066892",
         "jemalloc/5.3.1#1fc58d55316041f10fbc1e8a2eae632a%1776700028.228",
         "gtest/1.17.0#5224b3b3ff3b4ce1133cbdd27d53ee7d%1782392402.791979",
-        "grpc/1.81.1#b87796a4269034856cbc1a2522db16eb%1788275071.530512",
-        "fast_float/8.2.10#f6f28d6bb22112078e7dbda611caf681%1785888854.601666",
+        "grpc/1.81.1#f729f6d75992d20f9c72828e9142d62f%1783945160.094135",
+        "fast_float/8.2.10#f6f28d6bb22112078e7dbda611caf681%1782494504.298",
         "ed25519/2015.03#ae761bdc52730a843f0809bdf6c1b1f6%1782307148.15562",
         "date/3.0.4#862e11e80030356b53c2c38599ceb32b%1782392402.538492",
         "corrosion/0.6.1#bfa292df0a957bc70a450ff316cd9435%1786119416.131296",
@@ -46,10 +45,6 @@
     ],
     "python_requires": [],
     "overrides": {
-        "boost/1.91.0#ea540ca2133d831b560036aa24dece3c": [
-            null,
-            "boost/1.91.0#ea540ca2133d831b560036aa24dece3c"
-        ],
         "protobuf/[>=5.27.0 <7]": [
             "protobuf/6.33.5"
         ],

conanfile.py

@@ -36,7 +36,6 @@ class Xrpl(ConanFile):
         "nudb/2.0.9",
         "openssl/3.6.3",
         "soci/4.0.3",
-        "xrpl-rpc-spec/0.1.19",
         "zlib/1.3.2",
     ]
 
@@ -115,7 +114,6 @@ class Xrpl(ConanFile):
         "soci/*:shared": False,
         "soci/*:with_sqlite3": True,
         "soci/*:with_boost": True,
-        "xrpl-rpc-spec/*:server": "xrpld",
         "xxhash/*:shared": False,
     }
 

crates/Cargo.lock

@@ -57,9 +57,9 @@ dependencies = [
 
 [[package]]
 name = "cxx"
-version = "1.0.202"
+version = "1.0.199"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13f6de320895f42e6e081abb5c7983bedcf0b6d0ff9323de0d33f620c8ac1199"
+checksum = "824894a4a85dca76d4c95c2b9098c036f5a29f627b30c12780774f6654e60974"
 dependencies = [
  "cc",
  "cxx-build",
@@ -72,9 +72,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.202"
+version = "1.0.199"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fde53ca86b9704a943fef0f1e1d836239a6aedca5de3c65fa9f97ec0bd46d39"
+checksum = "f1ae0b651ea5b0000b19513aef5a03f194d7e3486f2d9258b658da8677fe9036"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -87,9 +87,9 @@ dependencies = [
 
 [[package]]
 name = "cxxbridge-cmd"
-version = "1.0.202"
+version = "1.0.199"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bae89236c811fd4d08ed3441759ac4ac98d752cbfd3de341315ba16ad20ec3"
+checksum = "fb05f91d3fb8435d9bab6ac5ce6ac1868be774325fb7fb2a91be39393b21388e"
 dependencies = [
  "clap",
  "codespan-reporting",
@@ -101,15 +101,15 @@ dependencies = [
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.202"
+version = "1.0.199"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49045042e5fced01b80742aba5508de82aa4f13677ed3fa2b4cda709c40c5918"
+checksum = "bf293202e0e3e98495785745389e8d0755b217e66f19194a5c695c25e03282ef"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.202"
+version = "1.0.199"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b181252e2e3d3b5d183afbdc033a3958b445eb3e1a0ae65fc3d4f5259f5da6fd"
+checksum = "ca001d746947c7249ed9d332a10f7a59daedbafeb0ec68c5c18a7db7a93f6ccc"
 dependencies = [
  "indexmap",
  "proc-macro2",

crates/Cargo.toml

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

crates/hello_world/Cargo.toml

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

crates/hello_world/src/lib.rs

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

docs/Docker.md

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

include/xrpl/basics/StringUtilities.h

@@ -162,89 +162,4 @@ toUInt64(std::string const& s);
 bool
 isProperlyFormedTomlDomain(std::string_view domain);
 
-/**
- * Whether a view can be passed on as a C string.
- *
- * A reader given only data() stops at the first null, so the view must reach the
- * terminating null. The test rebuilds the view from data() and compares: a view
- * that stops earlier rebuilds longer, and so compares unequal.
- *
- * consteval because reading the byte after the view is only defined when @p str
- * points into storage holding a null at or after its end, such as a string
- * literal. An unterminated view is then a compile error, not an out-of-bounds
- * read.
- *
- * @param str The view to test.
- * @return Whether @p str is null-terminated. A view with no data is not.
- */
-consteval bool
-isNullTerminated(std::string_view str)
-{
-    if (str.data() == nullptr)
-        return false;
-
-    // Reading past the view is the point, so the usual data() warning does not
-    // apply.
-    // NOLINTNEXTLINE(bugprone-suspicious-stringview-data-usage)
-    return std::string_view{str.data()} == str;
-}
-
-/**
- * A string that is known to reach its terminating null.
- *
- * Converts to std::string_view, so it compares and hashes as one. Unlike a
- * view, asCString() may be handed to a reader that expects a C string, such
- * as json::StaticString.
- *
- * The only constructor is consteval and rejects a view that stops before the
- * null, so the property holds by construction and no caller asserts it.
- */
-class NullTerminatedView
-{
-public:
-    /**
-     * Build a view from one that reaches its terminating null.
-     *
-     * Explicit, so that a plain view cannot become a proof of termination by
-     * accident. The conversion the other way stays implicit.
-     *
-     * @param view The string to hold. Rejected at compile time if it stops
-     *        before its terminating null, or has no data.
-     */
-    explicit consteval NullTerminatedView(std::string_view view)
-        : data_(view.data()), size_(view.size())
-    {
-        if (!isNullTerminated(view))
-            throw "xrpl::NullTerminatedView : view does not reach a null";
-    }
-
-    constexpr
-    operator std::string_view() const noexcept
-    {
-        return view();
-    }
-
-    /**
-     * @return The string as a view.
-     */
-    [[nodiscard]] constexpr std::string_view
-    view() const noexcept
-    {
-        return {data_, size_};
-    }
-
-    /**
-     * @return The string as a C string. Never null.
-     */
-    [[nodiscard]] constexpr char const*
-    asCString() const noexcept
-    {
-        return data_;
-    }
-
-private:
-    char const* data_;
-    std::size_t size_;
-};
-
 }  // namespace xrpl

include/xrpl/basics/base_uint.h

@@ -518,7 +518,7 @@ public:
      * The input must be precisely `2 * bytes` hexadecimal characters
      * long, with one exception: the value '0'.
      *
-     * @param sv A string of hexadecimal characters
+     * @param sv A null-terminated string of hexadecimal characters
      * @return true if the input was parsed properly; false otherwise.
      */
     [[nodiscard]] constexpr bool

include/xrpl/core/PerfLog.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <xrpl/basics/Log.h>
-#include <xrpl/basics/StringUtilities.h>
 #include <xrpl/core/Job.h>
 #include <xrpl/json/json_value.h>
 
@@ -10,8 +9,7 @@
 #include <filesystem>
 #include <functional>
 #include <memory>
-#include <span>
-#include <string_view>
+#include <string>
 
 namespace beast {
 class Journal;
@@ -69,7 +67,7 @@ public:
      * @param requestId Unique identifier to track command
      */
     virtual void
-    rpcStart(std::string_view method, std::uint64_t requestId) = 0;
+    rpcStart(std::string const& method, std::uint64_t requestId) = 0;
 
     /**
      * Log successful finish of RPC call
@@ -78,7 +76,7 @@ public:
      * @param requestId Unique identifier to track command
      */
     virtual void
-    rpcFinish(std::string_view method, std::uint64_t requestId) = 0;
+    rpcFinish(std::string const& method, std::uint64_t requestId) = 0;
 
     /**
      * Log errored RPC call
@@ -87,7 +85,7 @@ public:
      * @param requestId Unique identifier to track command
      */
     virtual void
-    rpcError(std::string_view method, std::uint64_t requestId) = 0;
+    rpcError(std::string const& method, std::uint64_t requestId) = 0;
 
     /**
      * Log queued job
@@ -152,20 +150,10 @@ public:
 PerfLog::Setup
 setupPerfLog(Section const& section, std::filesystem::path const& configDir);
 
-/**
- * @param methodNames The RPC methods to count, one counter per name. Reported
- *        as JSON keys that borrow each name and read it as a C string, which is
- *        why the parameter type requires one that reaches its terminating null.
- *        The names must outlive the returned object, which holds views of them.
- *        The range itself need not: it is copied.
- *        Passed in rather than looked up here, so that this layer needs no
- *        knowledge of the dispatch table.
- */
 std::unique_ptr<PerfLog>
 makePerfLog(
     PerfLog::Setup const& setup,
     Application& app,
-    std::span<NullTerminatedView const> methodNames,
     beast::Journal journal,
     std::function<void()>&& signalStop);
 
@@ -173,7 +161,7 @@ template <typename Func, class Rep, class Period>
 auto
 measureDurationAndLog(
     Func&& func,
-    std::string_view actionDescription,
+    std::string const& actionDescription,
     std::chrono::duration<Rep, Period> maxDelay,
     beast::Journal const& journal)
 {

include/xrpl/ledger/ApplyView.h

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

include/xrpl/ledger/entries/AMMEntry.h

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

include/xrpl/ledger/entries/AccountRootEntry.h

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

include/xrpl/ledger/entries/AmendmentsEntry.h

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

include/xrpl/ledger/entries/BridgeEntry.h

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

include/xrpl/ledger/entries/CheckEntry.h

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

include/xrpl/ledger/entries/CredentialEntry.h

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

include/xrpl/ledger/entries/DIDEntry.h

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

include/xrpl/ledger/entries/DelegateEntry.h

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

include/xrpl/ledger/entries/DepositPreauthEntry.h

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

include/xrpl/ledger/entries/DirectoryNodeEntry.h

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

include/xrpl/ledger/entries/EscrowEntry.h

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

include/xrpl/ledger/entries/FeeSettingsEntry.h

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

include/xrpl/ledger/entries/LedgerHashesEntry.h

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

include/xrpl/ledger/entries/LoanBrokerEntry.h

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

include/xrpl/ledger/entries/LoanEntry.h

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

include/xrpl/ledger/entries/MPTokenEntry.h

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

include/xrpl/ledger/entries/MPTokenIssuanceEntry.h

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

include/xrpl/ledger/entries/NFTokenOfferEntry.h

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

include/xrpl/ledger/entries/NFTokenPageEntry.h

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

include/xrpl/ledger/entries/NegativeUNLEntry.h

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

include/xrpl/ledger/entries/OfferEntry.h

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

include/xrpl/ledger/entries/OracleEntry.h

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

include/xrpl/ledger/entries/PayChannelEntry.h

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

include/xrpl/ledger/entries/PermissionedDomainEntry.h

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

include/xrpl/ledger/entries/RippleStateEntry.h

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

include/xrpl/ledger/entries/SLEBase.h

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

include/xrpl/ledger/entries/SignerListEntry.h

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

include/xrpl/ledger/entries/SponsorshipEntry.h

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

include/xrpl/ledger/entries/TicketEntry.h

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

include/xrpl/ledger/entries/TransactionProposalEntry.h

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

include/xrpl/ledger/entries/VaultEntry.h

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

include/xrpl/ledger/entries/XChainOwnedClaimIDEntry.h

@@ -1,38 +0,0 @@
-#pragma once
-
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/entries/SLEBase.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-#include <xrpl/protocol/STXChainBridge.h>
-
-#include <cstdint>
-
-namespace xrpl {
-
-template <typename ViewT>
-class XChainOwnedClaimIDEntry : public SLEBase<ViewT, ltXCHAIN_OWNED_CLAIM_ID>
-{
-public:
-    using Base = SLEBase<ViewT, ltXCHAIN_OWNED_CLAIM_ID>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit XChainOwnedClaimIDEntry(
-        STXChainBridge const& bridge,
-        std::uint64_t seq,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::xChainClaimID(bridge, seq), view, j)
-    {
-    }
-};
-
-using XChainOwnedClaimIDEntryR = XChainOwnedClaimIDEntry<ReadView>;
-using XChainOwnedClaimIDEntryW = XChainOwnedClaimIDEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/entries/XChainOwnedCreateAccountClaimIDEntry.h

@@ -1,39 +0,0 @@
-#pragma once
-
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ApplyView.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/ledger/entries/SLEBase.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/LedgerFormats.h>
-#include <xrpl/protocol/STXChainBridge.h>
-
-#include <cstdint>
-
-namespace xrpl {
-
-template <typename ViewT>
-class XChainOwnedCreateAccountClaimIDEntry
-    : public SLEBase<ViewT, ltXCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID>
-{
-public:
-    using Base = SLEBase<ViewT, ltXCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID>;
-
-    // Inherit base constructors: adopt an existing SLE, or resolve one from a
-    // Keylet against the view.
-    using Base::Base;
-
-    explicit XChainOwnedCreateAccountClaimIDEntry(
-        STXChainBridge const& bridge,
-        std::uint64_t seq,
-        Base::ViewRefType view,
-        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
-        : Base(keylet::xChainCreateAccountClaimID(bridge, seq), view, j)
-    {
-    }
-};
-
-using XChainOwnedCreateAccountClaimIDEntryR = XChainOwnedCreateAccountClaimIDEntry<ReadView>;
-using XChainOwnedCreateAccountClaimIDEntryW = XChainOwnedCreateAccountClaimIDEntry<ApplyView>;
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/LendingHelpers.h

@@ -338,9 +338,9 @@ struct AccountingDeltas
     Number debtTotalDelta;
 };
 
-// Instant interest recognition (pre-LendingProtocolV1_1): interest is
-// recognized into AssetsTotal/DebtTotal immediately, at origination.
-namespace instant_recognition {
+// Whole-life (pre-LendingProtocolV1_1) recognition model: interest is
+// recognized into AssetsTotal/DebtTotal up front, at origination.
+namespace accrual {
 
 // LoanSet origination: what's added to Vault.AssetsTotal and LoanBroker.DebtTotal
 AccountingDeltas
@@ -362,7 +362,7 @@ loanVaultExposure(SLE::const_ref loanSle);
 AccountingDeltas
 loanPaymentDeltas(LoanPaymentParts const& parts);
 
-}  // namespace instant_recognition
+}  // namespace accrual
 
 // Cash-basis (LendingProtocolV1_1) recognition model: AssetsTotal/DebtTotal
 // are principal-only, interest is recognized only as it's actually paid.
@@ -381,7 +381,7 @@ loanPaymentDeltas(LoanPaymentParts const& parts);
 
 // Public dispatchers: pick cash_basis:: if featureLendingProtocolV1_1 is
 // enabled AND the Vault's LEVersion (VaultHelpers::getVaultVersion) is
-// VaultVersion::CashBasis, else instant_recognition::. These are the only entry points
+// VaultVersion::CashBasis, else accrual::. These are the only entry points
 // transactors call.
 AccountingDeltas
 loanOriginationDeltas(

include/xrpl/ledger/helpers/ProposalHelpers.h

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

include/xrpl/ledger/helpers/VaultHelpers.h

@@ -172,8 +172,8 @@ isSoleShareholder(ReadView const& view, AccountID const& account, SLE::const_ref
 
 /**
  * Resolves a Vault's LEVersion, the single point every accounting touch
- * point should call to determine which recognition model (instant interest
- * recognition vs. cash-basis) a Vault uses. Vaults created before featureLendingProtocolV1_1
+ * point should call to determine which recognition model (accrual vs.
+ * cash-basis) a Vault uses. Vaults created before featureLendingProtocolV1_1
  * activated never have sfLEVersion set, which resolves here to
  * VaultVersion::Legacy.
  *

include/xrpl/peerfinder/Config.h

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

include/xrpl/protocol/ConfidentialTransfer.h

@@ -6,7 +6,6 @@
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/STInteger.h>  // IWYU pragma: keep
-#include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol/STObject.h>
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/UintTypes.h>
@@ -302,87 +301,6 @@ verifySchnorrProof(Slice const& pubKeySlice, Slice const& proofSlice, uint256 co
 NotTEC
 checkEncryptedAmountFormat(STObject const& object);
 
-/**
- * @brief Checks whether a holder's issuer mirror is encrypted under the
- * issuance's currently registered issuer key.
- *
- * Verifies that the holder's issuer mirror epoch matches the active issuer key
- * epoch on the issuance. An absent mirror epoch defaults to epoch 0. A holder without an issuer
- * mirror is considered stale, as there is no key anchor for future re-encryptions.
- *
- * @param issuance The MPTokenIssuance ledger object.
- * @param mptoken  The holder's MPToken ledger object.
- * @return true if the MPToken's issuer mirror is current. false if stale.
- */
-[[nodiscard]] bool
-isIssuerMirrorCurrent(SLE const& issuance, SLE const& mptoken);
-
-/**
- * @brief Checks whether a holder's auditor mirror is encrypted under the
- * issuance's currently registered auditor key.
- *
- * Verifies that the holder's auditor mirror epoch matches the active auditor key
- * epoch on the issuance. An absent mirror epoch defaults to epoch 0. An issuance
- * without an auditor key requires no auditor mirror and is considered current.
- *
- * @param issuance The MPTokenIssuance ledger object.
- * @param mptoken  The holder's MPToken ledger object.
- * @return true if the auditor mirror is current or not required.
- */
-[[nodiscard]] bool
-isAuditorMirrorCurrent(SLE const& issuance, SLE const& mptoken);
-
-/**
- * @brief Checks whether each mirror a holder is required to have is encrypted
- * under the issuance's currently registered ElGamal keys.
- *
- * Verifies that both the issuer mirror and the auditor mirror (if required)
- * are current. This serves as a combined check, ensuring all necessary
- * holder mirror epochs match the active key epochs on the issuance.
- *
- * @param issuance The MPTokenIssuance ledger object.
- * @param mptoken  The holder's MPToken ledger object.
- * @return true if the required mirrors are current.
- */
-[[nodiscard]] bool
-areMirrorsCurrent(SLE const& issuance, SLE const& mptoken);
-
-/**
- * @brief Set the holder's issuer mirror epoch to match the issuance's current issuer key epoch.
- *
- * Call this after writing the issuer mirror ciphertext under the issuance's
- * currently registered issuer key, so that the mirror reads as current afterwards.
- *
- * @param issuance The MPTokenIssuance ledger object.
- * @param mptoken  The holder's MPToken ledger entry to update.
- */
-void
-setIssuerMirrorEpoch(SLE const& issuance, SLE& mptoken);
-
-/**
- * @brief Set the holder's auditor mirror epoch to match the issuance's current auditor key epoch.
- *
- * Call this after writing the auditor mirror ciphertext under the issuance's
- * currently registered auditor key. Does nothing when the holder has no auditor mirror.
- *
- * @param issuance The MPTokenIssuance ledger object.
- * @param mptoken  The holder's MPToken ledger entry to update.
- */
-void
-setAuditorMirrorEpoch(SLE const& issuance, SLE& mptoken);
-
-/**
- * @brief Set the holder's MPToken mirror epochs to match the issuance's current key epochs.
- *
- * Call this after writing mirror ciphertexts under the issuance's currently
- * registered keys, so that the mirrors read as current afterwards.
- *
- * @param issuance The MPTokenIssuance ledger object.
- * @param mptoken  The holder's MPToken ledger entry to update.
- */
-void
-setMirrorEpochs(SLE const& issuance, SLE& mptoken);
-
 /**
  * @brief Verifies revealed amount encryptions for all recipients.
  *

include/xrpl/protocol/Indexes.h

@@ -183,20 +183,6 @@ check(uint256 const& key) noexcept
 }
 /** @} */
 
-/**
- * A TransactionProposal
- */
-/** @{ */
-Keylet
-txProposal(AccountID const& target, std::uint32_t ticketSequence) noexcept;
-
-inline Keylet
-txProposal(uint256 const& key) noexcept
-{
-    return {ltTRANSACTION_PROPOSAL, key};
-}
-/** @} */
-
 /**
  * A DepositPreauth
  */

include/xrpl/protocol/Protocol.h

@@ -12,7 +12,6 @@
 #include <chrono>
 #include <cstddef>
 #include <cstdint>
-#include <limits>
 
 namespace xrpl {
 
@@ -322,7 +321,7 @@ constexpr std::uint8_t kVaultMaximumIouScale = 18;
  * Vault ledger-entry schema versions. Assigned to newly created
  * Vaults once featureLendingProtocolV1_1 is enabled. Vaults created before
  * activation are left without LEVersion (implicit legacy version 0,
- * instant interest recognition).
+ * accrual-basis accounting).
  */
 enum class VaultVersion : uint8_t {
     Legacy = 0,
@@ -540,21 +539,11 @@ constexpr std::size_t kEcConvertBackProofLength =
  */
 constexpr std::size_t kEcClawbackProofLength = SECP256K1_COMPACT_CLAWBACK_PROOF_SIZE;
 
-/**
- * Length of compact equality proof.
- */
-constexpr std::size_t kEcEqualityProofLength = 128;
-
 /**
  * Extra base fee multiplier charged to confidential MPT transactions.
  */
 constexpr std::uint32_t kConfidentialFeeMultiplier = 9;
 
-/**
- * Maximum value a confidential MPT key epoch may reach.
- */
-constexpr std::uint32_t kMaxKeyEpoch = std::numeric_limits<std::uint32_t>::max();
-
 /**
  * Compressed EC point prefix for even y-coordinate
  */

include/xrpl/protocol/STLedgerEntry.h

@@ -22,9 +22,6 @@ namespace test {
 class InvariantsMisc_test;
 }  // namespace test
 
-/**
- * A serialized ledger entry, commonly abbreviated "SLE".
- */
 class STLedgerEntry final : public STObject, public CountedObject<STLedgerEntry>
 {
     uint256 key_;

include/xrpl/protocol/TER.h

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

include/xrpl/protocol/detail/features.macro

@@ -15,11 +15,6 @@
 // Add new amendments to the top of this list.
 // Keep it sorted in reverse chronological order.
 
-XRPL_FEATURE(Cosign,                      Supported::No,  VoteBehavior::DefaultNo)
-XRPL_FEATURE(SmartEscrow,                 Supported::No,  VoteBehavior::DefaultNo)
-XRPL_FEATURE(LendingProtocolV1_2,         Supported::No,  VoteBehavior::DefaultNo)
-XRPL_FIX    (Cleanup3_5_0,                Supported::Yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(ConfidentialMPTKeyRotation,  Supported::No,  VoteBehavior::DefaultNo)
 XRPL_FIX    (Cleanup3_4_0,                Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(Sponsor,                     Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(BatchV1_1,                   Supported::Yes, VoteBehavior::DefaultNo)

include/xrpl/protocol/detail/ledger_entries.macro

@@ -309,11 +309,6 @@ LEDGER_ENTRY(ltFEE_SETTINGS, 0x0073, FeeSettings, fee, ({
     {sfBaseFeeDrops,           SoeOptional},
     {sfReserveBaseDrops,       SoeOptional},
     {sfReserveIncrementDrops,  SoeOptional},
-    // Smart Escrow fields
-    {sfGasLimit,               SoeOptional},
-    {sfBytecodeSizeLimit,      SoeOptional},
-    {sfGasPrice,               SoeOptional},
-
     {sfPreviousTxnID,          SoeOptional},
     {sfPreviousTxnLgrSeq,      SoeOptional},
 }))
@@ -344,8 +339,6 @@ LEDGER_ENTRY(ltESCROW, 0x0075, Escrow, escrow, ({
     {sfCondition,            SoeOptional},
     {sfCancelAfter,          SoeOptional},
     {sfFinishAfter,          SoeOptional},
-    {sfBytecode,             SoeOptional},
-    {sfData,                 SoeOptional},
     {sfSourceTag,            SoeOptional},
     {sfDestinationTag,       SoeOptional},
     {sfOwnerNode,            SoeRequired},
@@ -415,8 +408,6 @@ LEDGER_ENTRY(ltMPTOKEN_ISSUANCE, 0x007e, MPTokenIssuance, mpt_issuance, ({
     {sfReferenceHolding,         SoeOptional},
     {sfIssuerEncryptionKey,      SoeOptional},
     {sfAuditorEncryptionKey,     SoeOptional},
-    {sfIssuerKeyEpoch,           SoeOptional},
-    {sfAuditorKeyEpoch,          SoeOptional},
     {sfConfidentialOutstandingAmount, SoeDefault},
 }))
 
@@ -436,8 +427,6 @@ LEDGER_ENTRY(ltMPTOKEN, 0x007f, MPToken, mptoken, ({
     {sfConfidentialBalanceVersion,  SoeDefault},
     {sfIssuerEncryptedBalance,      SoeOptional},
     {sfAuditorEncryptedBalance,     SoeOptional},
-    {sfIssuerKeyMirrorEpoch,        SoeOptional},
-    {sfAuditorKeyMirrorEpoch,       SoeOptional},
     {sfHolderEncryptionKey,         SoeOptional},
 }))
 
@@ -651,24 +640,5 @@ LEDGER_ENTRY(ltSPONSORSHIP, 0x0090, Sponsorship, sponsorship, ({
     {sfSponseeNode,          SoeRequired},
 }))
 
-/** A ledger object holding a pending transaction proposal.
-
-    The proposed transaction is stored unsigned in ProposedTransaction, and
-    signatures accumulate on it over time. It becomes fully signed either from
-    a single signature by its own Account (or that account's Delegate), or once
-    the weight collected in its Signers field meets that account's quorum. At
-    that point the stored transaction is one that anyone may copy and submit.
-
-    \sa keylet::txProposal
- */
-LEDGER_ENTRY(ltTRANSACTION_PROPOSAL, 0x0091, TransactionProposal, transaction_proposal, ({
-    {sfPreviousTxnID,        SoeRequired},
-    {sfPreviousTxnLgrSeq,    SoeRequired},
-    {sfOwner,                SoeRequired},
-    {sfProposedTransaction,  SoeRequired},
-    {sfExpiration,           SoeRequired},
-    {sfOwnerNode,            SoeRequired},
-}))
-
 #undef EXPAND
 #undef LEDGER_ENTRY_DUPLICATE

include/xrpl/protocol/detail/sfields.macro

@@ -119,15 +119,6 @@ TYPED_SFIELD(sfRemainingOwnerCount,      UINT32,    73)
 TYPED_SFIELD(sfSponsorFlags,             UINT32,    74)
 TYPED_SFIELD(sfSubscriptionDate,         UINT32,    75)
 TYPED_SFIELD(sfRedemptionDate,           UINT32,    76)
-TYPED_SFIELD(sfIssuerKeyEpoch,           UINT32,    77)
-TYPED_SFIELD(sfAuditorKeyEpoch,          UINT32,    78)
-TYPED_SFIELD(sfIssuerKeyMirrorEpoch,     UINT32,    79)
-TYPED_SFIELD(sfAuditorKeyMirrorEpoch,    UINT32,    80)
-TYPED_SFIELD(sfGasLimit,                 UINT32,    81)
-TYPED_SFIELD(sfBytecodeSizeLimit,        UINT32,    82)
-TYPED_SFIELD(sfGasPrice,                 UINT32,    83)
-TYPED_SFIELD(sfGas,                      UINT32,    84)
-TYPED_SFIELD(sfGasUsed,                  UINT32,    85)
 
 // 64-bit integers (common)
 TYPED_SFIELD(sfIndexNext,                UINT64,     1)
@@ -220,7 +211,6 @@ TYPED_SFIELD(sfLoanID,                   UINT256,   38)
 TYPED_SFIELD(sfReferenceHolding,         UINT256,   39)
 TYPED_SFIELD(sfBlindingFactor,           UINT256,   40)
 TYPED_SFIELD(sfObjectID,                 UINT256,   41)
-TYPED_SFIELD(sfProposalID,               UINT256,   42)
 
 // number (common)
 TYPED_SFIELD(sfNumber,                   NUMBER,     1)
@@ -244,7 +234,6 @@ TYPED_SFIELD(sfManagementFeeOutstanding, NUMBER,     17, SField::kSmdNeedsAsset
 // 32-bit signed (common)
 TYPED_SFIELD(sfLoanScale,                INT32,      1)
 TYPED_SFIELD(sfRemainingOwnerCountDelta, INT32,      2)
-TYPED_SFIELD(sfVMReturnCode,             INT32,      3)
 
 // currency amount (common)
 TYPED_SFIELD(sfAmount,                   AMOUNT,     1)
@@ -329,7 +318,6 @@ TYPED_SFIELD(sfAuditorEncryptedAmount,      VL,     43)
 TYPED_SFIELD(sfAuditorEncryptionKey,        VL,     44)
 TYPED_SFIELD(sfAmountCommitment,            VL,     45)
 TYPED_SFIELD(sfBalanceCommitment,           VL,     46)
-TYPED_SFIELD(sfBytecode,                    VL,     47)
 
 // account (common)
 TYPED_SFIELD(sfAccount,                  ACCOUNT,    1)
@@ -361,7 +349,6 @@ TYPED_SFIELD(sfHighSponsor,              ACCOUNT,   28)
 TYPED_SFIELD(sfLowSponsor,               ACCOUNT,   29)
 TYPED_SFIELD(sfCounterpartySponsor,      ACCOUNT,   30)
 TYPED_SFIELD(sfSponsee,                  ACCOUNT,   31)
-TYPED_SFIELD(sfSigningFor,               ACCOUNT,   32)
 
 // vector of 256-bit
 TYPED_SFIELD(sfIndexes,                  VECTOR256,  1, SField::kSmdNever)
@@ -423,7 +410,6 @@ UNTYPED_SFIELD(sfBatchSigner,            OBJECT,    35)
 UNTYPED_SFIELD(sfBook,                   OBJECT,    36)
 UNTYPED_SFIELD(sfCounterpartySignature,  OBJECT,    37, SField::kSmdDefault, SField::kNotSigning)
 UNTYPED_SFIELD(sfSponsorSignature,       OBJECT,    38, SField::kSmdDefault, SField::kNotSigning)
-UNTYPED_SFIELD(sfProposedTransaction,    OBJECT,    39)
 
 // array of objects (common)
 // ARRAY/1 is reserved for end of array

include/xrpl/protocol/detail/transactions.macro

@@ -66,13 +66,11 @@ TRANSACTION(ttPAYMENT, 0, Payment,
 #endif
 TRANSACTION(ttESCROW_CREATE, 1, EscrowCreate, ({.delegable = Delegation::Delegable}), ({
     {sfDestination, SoeRequired},
-    {sfDestinationTag, SoeOptional},
     {sfAmount, SoeRequired, SoeMptSupported},
     {sfCondition, SoeOptional},
     {sfCancelAfter, SoeOptional},
     {sfFinishAfter, SoeOptional},
-    {sfBytecode, SoeOptional},
-    {sfData, SoeOptional},
+    {sfDestinationTag, SoeOptional},
 }))
 
 /** This transaction type completes an existing escrow. */
@@ -85,7 +83,6 @@ TRANSACTION(ttESCROW_FINISH, 2, EscrowFinish, ({.delegable = Delegation::Delegab
     {sfFulfillment, SoeOptional},
     {sfCondition, SoeOptional},
     {sfCredentialIDs, SoeOptional},
-    {sfGas, SoeOptional},
 }))
 
 
@@ -1134,31 +1131,6 @@ TRANSACTION(ttSPONSORSHIP_SET, 91, SponsorshipSet,
     {sfRemainingOwnerCountDelta, SoeOptional},
 }))
 
-#if TRANSACTION_INCLUDE
-#   include <xrpl/tx/transactors/token/ConfidentialMPTMirrorUpdate.h>
-#endif
-TRANSACTION(ttCONFIDENTIAL_MPT_MIRROR_UPDATE, 92, ConfidentialMPTMirrorUpdate,
-    ({.delegable = Delegation::Delegable, .amendment = featureConfidentialMPTKeyRotation}),
-    ({
-    {sfMPTokenIssuanceID, SoeRequired},
-    {sfHolder, SoeOptional},
-    {sfIssuerEncryptedAmount, SoeOptional},
-    {sfAuditorEncryptedAmount, SoeOptional},
-    {sfZKProof, SoeRequired},
-}))
-
-/** This transaction posts an unsigned transaction on-ledger as a
-    TransactionProposal, pending multi-signature collection. */
-#if TRANSACTION_INCLUDE
-#   include <xrpl/tx/transactors/proposal/TransactionProposalCreate.h>
-#endif
-TRANSACTION(ttTRANSACTION_PROPOSAL_CREATE, 93, TransactionProposalCreate,
-    ({.amendment = featureCosign}),
-    ({
-    {sfProposedTransaction, SoeRequired},
-    {sfExpiration, SoeRequired},
-}))
-
 /** This system-generated transaction type is used to update the status of the various amendments.
 
     For details, see: https://xrpl.org/amendments.html
@@ -1189,10 +1161,6 @@ TRANSACTION(ttFEE, 101, SetFee,
     {sfBaseFeeDrops, SoeOptional},
     {sfReserveBaseDrops, SoeOptional},
     {sfReserveIncrementDrops, SoeOptional},
-    // Smart Escrow fields
-    {sfGasLimit, SoeOptional},
-    {sfBytecodeSizeLimit, SoeOptional},
-    {sfGasPrice, SoeOptional},
 }))
 
 /** This system-generated transaction type is used to update the network's negative UNL

include/xrpl/protocol/jss.h

@@ -278,7 +278,6 @@ JSS(frozen_balances);                // out: GatewayBalances
 JSS(full);                           // in: LedgerClearer, handlers/Ledger
 JSS(full_reply);                     // out: PathFind
 JSS(fullbelow_size);                 // out: GetCounts
-JSS(gateway);                        // in: noripple_check
 JSS(git);                            // out: server_info
 JSS(good);                           // out: RPCVersion
 JSS(hash);                           // out: NetworkOPs, InboundLedger, LedgerToJson, STTx; field
@@ -482,7 +481,6 @@ JSS(ports);                       // out: NetworkOPs
 JSS(previous);                    // out: Reservations
 JSS(previous_ledger);             // out: LedgerPropose
 JSS(price);                       // out: amm_info, AuctionSlot
-JSS(problems);                    // out: noripple_check
 JSS(proof);                       // in: BookOffers
 JSS(propose_seq);                 // out: LedgerPropose
 JSS(proposers);                   // out: NetworkOPs, LedgerConsensus
@@ -662,7 +660,6 @@ JSS(url);                         // in/out: Subscribe, Unsubscribe
 JSS(url_password);                // in: Subscribe
 JSS(url_username);                // in: Subscribe
 JSS(urlgravatar);                 //
-JSS(user);                        // in: noripple_check
 JSS(username);                    // in: Subscribe
 JSS(validated);                   // out: NetworkOPs, RPCHelpers, AccountTx*, Tx
 JSS(validator_list_expires);      // out: NetworkOps, ValidatorList

include/xrpl/protocol_autogen/ledger_entries/Escrow.h

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

include/xrpl/protocol_autogen/ledger_entries/FeeSettings.h

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

include/xrpl/protocol_autogen/ledger_entries/MPToken.h

@@ -268,54 +268,6 @@ public:
         return this->sle_->isFieldPresent(sfAuditorEncryptedBalance);
     }
 
-    /**
-     * @brief Get sfIssuerKeyMirrorEpoch (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getIssuerKeyMirrorEpoch() const
-    {
-        if (hasIssuerKeyMirrorEpoch())
-            return this->sle_->at(sfIssuerKeyMirrorEpoch);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfIssuerKeyMirrorEpoch is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasIssuerKeyMirrorEpoch() const
-    {
-        return this->sle_->isFieldPresent(sfIssuerKeyMirrorEpoch);
-    }
-
-    /**
-     * @brief Get sfAuditorKeyMirrorEpoch (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getAuditorKeyMirrorEpoch() const
-    {
-        if (hasAuditorKeyMirrorEpoch())
-            return this->sle_->at(sfAuditorKeyMirrorEpoch);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfAuditorKeyMirrorEpoch is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasAuditorKeyMirrorEpoch() const
-    {
-        return this->sle_->isFieldPresent(sfAuditorKeyMirrorEpoch);
-    }
-
     /**
      * @brief Get sfHolderEncryptionKey (SoeOptional)
      * @return The field value, or std::nullopt if not present.
@@ -519,28 +471,6 @@ public:
         return *this;
     }
 
-    /**
-     * @brief Set sfIssuerKeyMirrorEpoch (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    MPTokenBuilder&
-    setIssuerKeyMirrorEpoch(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfIssuerKeyMirrorEpoch] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfAuditorKeyMirrorEpoch (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    MPTokenBuilder&
-    setAuditorKeyMirrorEpoch(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfAuditorKeyMirrorEpoch] = value;
-        return *this;
-    }
-
     /**
      * @brief Set sfHolderEncryptionKey (SoeOptional)
      * @return Reference to this builder for method chaining.

include/xrpl/protocol_autogen/ledger_entries/MPTokenIssuance.h

@@ -351,54 +351,6 @@ public:
         return this->sle_->isFieldPresent(sfAuditorEncryptionKey);
     }
 
-    /**
-     * @brief Get sfIssuerKeyEpoch (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getIssuerKeyEpoch() const
-    {
-        if (hasIssuerKeyEpoch())
-            return this->sle_->at(sfIssuerKeyEpoch);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfIssuerKeyEpoch is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasIssuerKeyEpoch() const
-    {
-        return this->sle_->isFieldPresent(sfIssuerKeyEpoch);
-    }
-
-    /**
-     * @brief Get sfAuditorKeyEpoch (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getAuditorKeyEpoch() const
-    {
-        if (hasAuditorKeyEpoch())
-            return this->sle_->at(sfAuditorKeyEpoch);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfAuditorKeyEpoch is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasAuditorKeyEpoch() const
-    {
-        return this->sle_->isFieldPresent(sfAuditorKeyEpoch);
-    }
-
     /**
      * @brief Get sfConfidentialOutstandingAmount (SoeDefault)
      * @return The field value, or std::nullopt if not present.
@@ -648,28 +600,6 @@ public:
         return *this;
     }
 
-    /**
-     * @brief Set sfIssuerKeyEpoch (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    MPTokenIssuanceBuilder&
-    setIssuerKeyEpoch(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfIssuerKeyEpoch] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfAuditorKeyEpoch (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    MPTokenIssuanceBuilder&
-    setAuditorKeyEpoch(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfAuditorKeyEpoch] = value;
-        return *this;
-    }
-
     /**
      * @brief Set sfConfidentialOutstandingAmount (SoeDefault)
      * @return Reference to this builder for method chaining.

include/xrpl/protocol_autogen/ledger_entries/TransactionProposal.h

@@ -1,242 +0,0 @@
-// 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 TransactionProposalBuilder;
-
-/**
- * @brief Ledger Entry: TransactionProposal
- *
- * Type: ltTRANSACTION_PROPOSAL (0x0091)
- * RPC Name: transaction_proposal
- *
- * Immutable wrapper around SLE providing type-safe field access.
- * Use TransactionProposalBuilder to construct new ledger entries.
- */
-class TransactionProposal : public LedgerEntryBase
-{
-public:
-    static constexpr LedgerEntryType entryType = ltTRANSACTION_PROPOSAL;
-
-    /**
-     * @brief Construct a TransactionProposal ledger entry wrapper from an existing SLE object.
-     * @throws std::runtime_error if the ledger entry type doesn't match.
-     */
-    explicit TransactionProposal(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 TransactionProposal");
-        }
-    }
-
-    // Ledger entry-specific field getters
-
-    /**
-     * @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 Get sfOwner (SoeRequired)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_ACCOUNT::type::value_type
-    getOwner() const
-    {
-        return this->sle_->at(sfOwner);
-    }
-
-    /**
-     * @brief Get sfProposedTransaction (SoeRequired)
-     * @note This is an untyped field (unknown).
-     * @return The field value.
-     */
-    [[nodiscard]]
-    STObject
-    getProposedTransaction() const
-    {
-        return this->sle_->getFieldObject(sfProposedTransaction);
-    }
-
-    /**
-     * @brief Get sfExpiration (SoeRequired)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_UINT32::type::value_type
-    getExpiration() const
-    {
-        return this->sle_->at(sfExpiration);
-    }
-
-    /**
-     * @brief Get sfOwnerNode (SoeRequired)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_UINT64::type::value_type
-    getOwnerNode() const
-    {
-        return this->sle_->at(sfOwnerNode);
-    }
-};
-
-/**
- * @brief Builder for TransactionProposal 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 TransactionProposalBuilder : public LedgerEntryBuilderBase<TransactionProposalBuilder>
-{
-public:
-    /**
-     * @brief Construct a new TransactionProposalBuilder with required fields.
-     * @param previousTxnID The sfPreviousTxnID field value.
-     * @param previousTxnLgrSeq The sfPreviousTxnLgrSeq field value.
-     * @param owner The sfOwner field value.
-     * @param proposedTransaction The sfProposedTransaction field value.
-     * @param expiration The sfExpiration field value.
-     * @param ownerNode The sfOwnerNode field value.
-     */
-    TransactionProposalBuilder(std::decay_t<typename SF_UINT256::type::value_type> const& previousTxnID,std::decay_t<typename SF_UINT32::type::value_type> const& previousTxnLgrSeq,std::decay_t<typename SF_ACCOUNT::type::value_type> const& owner,STObject const& proposedTransaction,std::decay_t<typename SF_UINT32::type::value_type> const& expiration,std::decay_t<typename SF_UINT64::type::value_type> const& ownerNode)
-        : LedgerEntryBuilderBase<TransactionProposalBuilder>(ltTRANSACTION_PROPOSAL)
-    {
-        setPreviousTxnID(previousTxnID);
-        setPreviousTxnLgrSeq(previousTxnLgrSeq);
-        setOwner(owner);
-        setProposedTransaction(proposedTransaction);
-        setExpiration(expiration);
-        setOwnerNode(ownerNode);
-    }
-
-    /**
-     * @brief Construct a TransactionProposalBuilder 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.
-     */
-    TransactionProposalBuilder(SLE::const_pointer sle)
-    {
-        if (sle->at(sfLedgerEntryType) != ltTRANSACTION_PROPOSAL)
-        {
-            throw std::runtime_error("Invalid ledger entry type for TransactionProposal");
-        }
-        object_ = *sle;
-    }
-
-    /**
-     * @brief Ledger entry-specific field setters
-     */
-
-    /**
-     * @brief Set sfPreviousTxnID (SoeRequired)
-     * @return Reference to this builder for method chaining.
-     */
-    TransactionProposalBuilder&
-    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.
-     */
-    TransactionProposalBuilder&
-    setPreviousTxnLgrSeq(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfPreviousTxnLgrSeq] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfOwner (SoeRequired)
-     * @return Reference to this builder for method chaining.
-     */
-    TransactionProposalBuilder&
-    setOwner(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
-    {
-        object_[sfOwner] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfProposedTransaction (SoeRequired)
-     * @return Reference to this builder for method chaining.
-     */
-    TransactionProposalBuilder&
-    setProposedTransaction(STObject const& value)
-    {
-        object_.setFieldObject(sfProposedTransaction, value);
-        return *this;
-    }
-
-    /**
-     * @brief Set sfExpiration (SoeRequired)
-     * @return Reference to this builder for method chaining.
-     */
-    TransactionProposalBuilder&
-    setExpiration(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfExpiration] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfOwnerNode (SoeRequired)
-     * @return Reference to this builder for method chaining.
-     */
-    TransactionProposalBuilder&
-    setOwnerNode(std::decay_t<typename SF_UINT64::type::value_type> const& value)
-    {
-        object_[sfOwnerNode] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Build and return the completed TransactionProposal wrapper.
-     * @param index The ledger entry index.
-     * @return The constructed ledger entry wrapper.
-     */
-    TransactionProposal
-    build(uint256 const& index)
-    {
-        return TransactionProposal{std::make_shared<SLE>(std::move(object_), index)};
-    }
-};
-
-}  // namespace xrpl::ledger_entries

include/xrpl/protocol_autogen/transactions/ConfidentialMPTMirrorUpdate.h

@@ -1,266 +0,0 @@
-// 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 ConfidentialMPTMirrorUpdateBuilder;
-
-/**
- * @brief Transaction: ConfidentialMPTMirrorUpdate
- *
- * Type: ttCONFIDENTIAL_MPT_MIRROR_UPDATE (92)
- * Delegable: Delegation::Delegable
- * Amendment: featureConfidentialMPTKeyRotation
- * Privileges: Privilege::NoPriv
- *
- * Immutable wrapper around STTx providing type-safe field access.
- * Use ConfidentialMPTMirrorUpdateBuilder to construct new transactions.
- */
-class ConfidentialMPTMirrorUpdate : public TransactionBase
-{
-public:
-    static constexpr xrpl::TxType txType = ttCONFIDENTIAL_MPT_MIRROR_UPDATE;
-
-    /**
-     * @brief Construct a ConfidentialMPTMirrorUpdate transaction wrapper from an existing STTx object.
-     * @throws std::runtime_error if the transaction type doesn't match.
-     */
-    explicit ConfidentialMPTMirrorUpdate(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 ConfidentialMPTMirrorUpdate");
-        }
-    }
-
-    // Transaction-specific field getters
-
-    /**
-     * @brief Get sfMPTokenIssuanceID (SoeRequired)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_UINT192::type::value_type
-    getMPTokenIssuanceID() const
-    {
-        return this->tx_->at(sfMPTokenIssuanceID);
-    }
-
-    /**
-     * @brief Get sfHolder (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_ACCOUNT::type::value_type>
-    getHolder() const
-    {
-        if (hasHolder())
-        {
-            return this->tx_->at(sfHolder);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfHolder is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasHolder() const
-    {
-        return this->tx_->isFieldPresent(sfHolder);
-    }
-
-    /**
-     * @brief Get sfIssuerEncryptedAmount (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_VL::type::value_type>
-    getIssuerEncryptedAmount() const
-    {
-        if (hasIssuerEncryptedAmount())
-        {
-            return this->tx_->at(sfIssuerEncryptedAmount);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfIssuerEncryptedAmount is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasIssuerEncryptedAmount() const
-    {
-        return this->tx_->isFieldPresent(sfIssuerEncryptedAmount);
-    }
-
-    /**
-     * @brief Get sfAuditorEncryptedAmount (SoeOptional)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_VL::type::value_type>
-    getAuditorEncryptedAmount() const
-    {
-        if (hasAuditorEncryptedAmount())
-        {
-            return this->tx_->at(sfAuditorEncryptedAmount);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfAuditorEncryptedAmount is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasAuditorEncryptedAmount() const
-    {
-        return this->tx_->isFieldPresent(sfAuditorEncryptedAmount);
-    }
-
-    /**
-     * @brief Get sfZKProof (SoeRequired)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_VL::type::value_type
-    getZKProof() const
-    {
-        return this->tx_->at(sfZKProof);
-    }
-};
-
-/**
- * @brief Builder for ConfidentialMPTMirrorUpdate 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 ConfidentialMPTMirrorUpdateBuilder : public TransactionBuilderBase<ConfidentialMPTMirrorUpdateBuilder>
-{
-public:
-    /**
-     * @brief Construct a new ConfidentialMPTMirrorUpdateBuilder with required fields.
-     * @param account The account initiating the transaction.
-     * @param mPTokenIssuanceID The sfMPTokenIssuanceID field value.
-     * @param zKProof The sfZKProof field value.
-     * @param sequence Optional sequence number for the transaction.
-     * @param fee Optional fee for the transaction.
-     */
-    ConfidentialMPTMirrorUpdateBuilder(SF_ACCOUNT::type::value_type account,
-                     std::decay_t<typename SF_UINT192::type::value_type> const& mPTokenIssuanceID,                     std::decay_t<typename SF_VL::type::value_type> const& zKProof,                    std::optional<SF_UINT32::type::value_type> sequence = std::nullopt,
-                    std::optional<SF_AMOUNT::type::value_type> fee = std::nullopt
-)
-        : TransactionBuilderBase<ConfidentialMPTMirrorUpdateBuilder>(ttCONFIDENTIAL_MPT_MIRROR_UPDATE, account, sequence, fee)
-    {
-        setMPTokenIssuanceID(mPTokenIssuanceID);
-        setZKProof(zKProof);
-    }
-
-    /**
-     * @brief Construct a ConfidentialMPTMirrorUpdateBuilder from an existing STTx object.
-     * @param tx The existing transaction to copy from.
-     * @throws std::runtime_error if the transaction type doesn't match.
-     */
-    ConfidentialMPTMirrorUpdateBuilder(std::shared_ptr<STTx const> tx)
-    {
-        if (tx->getTxnType() != ttCONFIDENTIAL_MPT_MIRROR_UPDATE)
-        {
-            throw std::runtime_error("Invalid transaction type for ConfidentialMPTMirrorUpdateBuilder");
-        }
-        object_ = *tx;
-    }
-
-    /**
-     * @brief Transaction-specific field setters
-     */
-
-    /**
-     * @brief Set sfMPTokenIssuanceID (SoeRequired)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTMirrorUpdateBuilder&
-    setMPTokenIssuanceID(std::decay_t<typename SF_UINT192::type::value_type> const& value)
-    {
-        object_[sfMPTokenIssuanceID] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfHolder (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTMirrorUpdateBuilder&
-    setHolder(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
-    {
-        object_[sfHolder] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfIssuerEncryptedAmount (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTMirrorUpdateBuilder&
-    setIssuerEncryptedAmount(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfIssuerEncryptedAmount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfAuditorEncryptedAmount (SoeOptional)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTMirrorUpdateBuilder&
-    setAuditorEncryptedAmount(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfAuditorEncryptedAmount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfZKProof (SoeRequired)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTMirrorUpdateBuilder&
-    setZKProof(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfZKProof] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Build and return the ConfidentialMPTMirrorUpdate wrapper.
-     * @param publicKey The public key for signing.
-     * @param secretKey The secret key for signing.
-     * @return The constructed transaction wrapper.
-     */
-    ConfidentialMPTMirrorUpdate
-    build(PublicKey const& publicKey, SecretKey const& secretKey)
-    {
-        sign(publicKey, secretKey);
-        return ConfidentialMPTMirrorUpdate{std::make_shared<STTx>(std::move(object_))};
-    }
-};
-
-}  // namespace xrpl::transactions

include/xrpl/protocol_autogen/transactions/EscrowCreate.h

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

include/xrpl/protocol_autogen/transactions/EscrowFinish.h

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

include/xrpl/protocol_autogen/transactions/SetFee.h

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

include/xrpl/protocol_autogen/transactions/TransactionProposalCreate.h

@@ -1,155 +0,0 @@
-// 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 TransactionProposalCreateBuilder;
-
-/**
- * @brief Transaction: TransactionProposalCreate
- *
- * Type: ttTRANSACTION_PROPOSAL_CREATE (93)
- * Delegable: Delegation::NotDelegable
- * Amendment: featureCosign
- * Privileges: Privilege::NoPriv
- *
- * Immutable wrapper around STTx providing type-safe field access.
- * Use TransactionProposalCreateBuilder to construct new transactions.
- */
-class TransactionProposalCreate : public TransactionBase
-{
-public:
-    static constexpr xrpl::TxType txType = ttTRANSACTION_PROPOSAL_CREATE;
-
-    /**
-     * @brief Construct a TransactionProposalCreate transaction wrapper from an existing STTx object.
-     * @throws std::runtime_error if the transaction type doesn't match.
-     */
-    explicit TransactionProposalCreate(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 TransactionProposalCreate");
-        }
-    }
-
-    // Transaction-specific field getters
-    /**
-     * @brief Get sfProposedTransaction (SoeRequired)
-     * @note This is an untyped field.
-     * @return The field value.
-     */
-    [[nodiscard]]
-    STObject
-    getProposedTransaction() const
-    {
-        return this->tx_->getFieldObject(sfProposedTransaction);
-    }
-
-    /**
-     * @brief Get sfExpiration (SoeRequired)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_UINT32::type::value_type
-    getExpiration() const
-    {
-        return this->tx_->at(sfExpiration);
-    }
-};
-
-/**
- * @brief Builder for TransactionProposalCreate 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 TransactionProposalCreateBuilder : public TransactionBuilderBase<TransactionProposalCreateBuilder>
-{
-public:
-    /**
-     * @brief Construct a new TransactionProposalCreateBuilder with required fields.
-     * @param account The account initiating the transaction.
-     * @param proposedTransaction The sfProposedTransaction field value.
-     * @param expiration The sfExpiration field value.
-     * @param sequence Optional sequence number for the transaction.
-     * @param fee Optional fee for the transaction.
-     */
-    TransactionProposalCreateBuilder(SF_ACCOUNT::type::value_type account,
-                     STObject const& proposedTransaction,                     std::decay_t<typename SF_UINT32::type::value_type> const& expiration,                    std::optional<SF_UINT32::type::value_type> sequence = std::nullopt,
-                    std::optional<SF_AMOUNT::type::value_type> fee = std::nullopt
-)
-        : TransactionBuilderBase<TransactionProposalCreateBuilder>(ttTRANSACTION_PROPOSAL_CREATE, account, sequence, fee)
-    {
-        setProposedTransaction(proposedTransaction);
-        setExpiration(expiration);
-    }
-
-    /**
-     * @brief Construct a TransactionProposalCreateBuilder from an existing STTx object.
-     * @param tx The existing transaction to copy from.
-     * @throws std::runtime_error if the transaction type doesn't match.
-     */
-    TransactionProposalCreateBuilder(std::shared_ptr<STTx const> tx)
-    {
-        if (tx->getTxnType() != ttTRANSACTION_PROPOSAL_CREATE)
-        {
-            throw std::runtime_error("Invalid transaction type for TransactionProposalCreateBuilder");
-        }
-        object_ = *tx;
-    }
-
-    /**
-     * @brief Transaction-specific field setters
-     */
-
-    /**
-     * @brief Set sfProposedTransaction (SoeRequired)
-     * @return Reference to this builder for method chaining.
-     */
-    TransactionProposalCreateBuilder&
-    setProposedTransaction(STObject const& value)
-    {
-        object_.setFieldObject(sfProposedTransaction, value);
-        return *this;
-    }
-
-    /**
-     * @brief Set sfExpiration (SoeRequired)
-     * @return Reference to this builder for method chaining.
-     */
-    TransactionProposalCreateBuilder&
-    setExpiration(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfExpiration] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Build and return the TransactionProposalCreate wrapper.
-     * @param publicKey The public key for signing.
-     * @param secretKey The secret key for signing.
-     * @return The constructed transaction wrapper.
-     */
-    TransactionProposalCreate
-    build(PublicKey const& publicKey, SecretKey const& secretKey)
-    {
-        sign(publicKey, secretKey);
-        return TransactionProposalCreate{std::make_shared<STTx>(std::move(object_))};
-    }
-};
-
-}  // namespace xrpl::transactions

include/xrpl/shamap/SHAMap.h

@@ -14,7 +14,6 @@
 #include <xrpl/shamap/SHAMapItem.h>
 #include <xrpl/shamap/SHAMapLeafNode.h>
 #include <xrpl/shamap/SHAMapMissingNode.h>
-#include <xrpl/shamap/SHAMapNodeID.h>
 #include <xrpl/shamap/SHAMapTreeNode.h>
 
 #include <condition_variable>
@@ -35,6 +34,7 @@
 
 namespace xrpl {
 
+class SHAMapNodeID;
 class SHAMapSyncFilter;
 
 /**
@@ -420,107 +420,7 @@ public:
     invariants() const;
 
 private:
-    /**
-     * A path from the root of the map down to some node, pairing each node with the ID naming its
-     * position.
-     *
-     * The two halves of an entry must agree, and the only way to get that wrong is to compute an ID
-     * from the wrong branch. So this type does not accept an ID at all: every push takes the branch
-     * being descended and derives the ID itself, so a node and its ID cannot disagree. Reads are
-     * exposed through the same accessors a std::stack would offer.
-     */
-    class NodePathStack
-    {
-    public:
-        [[nodiscard]] bool
-        empty() const
-        {
-            return stack_.empty();
-        }
-
-        [[nodiscard]] std::size_t
-        size() const
-        {
-            return stack_.size();
-        }
-
-        [[nodiscard]] std::pair<SHAMapTreeNodePtr, SHAMapNodeID> const&
-        top() const
-        {
-            XRPL_ASSERT(!stack_.empty(), "xrpl::SHAMap::NodePathStack::top : non-empty stack");
-            return stack_.top();
-        }
-
-        void
-        pop()
-        {
-            XRPL_ASSERT(!stack_.empty(), "xrpl::SHAMap::NodePathStack::pop : non-empty stack");
-            stack_.pop();
-        }
-
-        void
-        clear()
-        {
-            stack_ = {};
-        }
-
-        /**
-         * Start a path at the root of the map, whose ID is the zero-depth ID by definition.
-         */
-        void
-        pushRoot(SHAMapTreeNodePtr node)
-        {
-            XRPL_ASSERT(stack_.empty(), "xrpl::SHAMap::NodePathStack::pushRoot : empty stack");
-            stack_.emplace(std::move(node), SHAMapNodeID{});
-        }
-
-        /**
-         * 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.
-         */
-        void
-        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 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");
-            stack_.emplace(std::move(node), std::move(childID));
-        }
-
-        /**
-         * Extend the path to a node lying on the path to `target`.
-         *
-         * 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
-        pushNode(SHAMapTreeNodePtr node, uint256 const& target)
-        {
-            if (stack_.empty())
-            {
-                pushRoot(std::move(node));
-            }
-            else
-            {
-                pushChild(std::move(node), selectBranch(stack_.top().second, target));
-            }
-        }
-
-    private:
-        std::stack<std::pair<SHAMapTreeNodePtr, SHAMapNodeID>> stack_;
-    };
-
+    using SharedPtrNodeStack = std::stack<std::pair<SHAMapTreeNodePtr, SHAMapNodeID>>;
     using DeltaRef =
         std::pair<boost::intrusive_ptr<SHAMapItem const>, boost::intrusive_ptr<SHAMapItem const>>;
 
@@ -547,7 +447,7 @@ private:
      * Update hashes up to the root
      */
     void
-    dirtyUp(NodePathStack& stack, uint256 const& target, SHAMapTreeNodePtr terminal);
+    dirtyUp(SharedPtrNodeStack& stack, uint256 const& target, SHAMapTreeNodePtr terminal);
 
     /**
      * Walk towards the specified id, returning the node.  Caller must check
@@ -555,7 +455,7 @@ private:
      * id
      */
     SHAMapLeafNode*
-    walkTowardsKey(uint256 const& id, NodePathStack* stack = nullptr) const;
+    walkTowardsKey(uint256 const& id, SharedPtrNodeStack* stack = nullptr) const;
     /**
      * Return nullptr if key not found
      */
@@ -582,29 +482,27 @@ private:
     SHAMapTreeNodePtr
     writeNode(NodeObjectType t, SHAMapTreeNodePtr node) const;
 
-    // direction in which a scan walks an inner node's branches
+    // returns the first item at or below this node
+    SHAMapLeafNode*
+    firstBelow(SHAMapTreeNodePtr node, SharedPtrNodeStack& stack, unsigned int branch = 0u) const;
+
+    // returns the last item at or below this node
+    SHAMapLeafNode*
+    lastBelow(
+        SHAMapTreeNodePtr node,
+        SharedPtrNodeStack& stack,
+        unsigned int branch = kBranchFactor) const;
+
+    // direction in which belowHelper scans an inner node's branches
     enum class BelowDirection { First, Last };
 
-    /**
-     * 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.
-     */
+    // helper function for firstBelow and lastBelow
     SHAMapLeafNode*
-    belowHelper(NodePathStack& stack, BelowDirection direction) const;
-
-    /**
-     * Returns the nearest item strictly past `id`, in the given direction.
-     *
-     * Walks back up the path to `id`. At each inner node the branches beyond the one `id` takes
-     * hold the candidates, so the first non-empty one is the closest and the extreme leaf below
-     * it is the answer.
-     *
-     * @param id The key to search from, which need not be in the map.
-     * @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
-    boundHelper(uint256 const& id, BelowDirection direction) const;
+    belowHelper(
+        SHAMapTreeNodePtr node,
+        SharedPtrNodeStack& stack,
+        unsigned int branch,
+        BelowDirection direction) const;
 
     // Simple descent
     // Get a child of the specified node
@@ -652,9 +550,9 @@ private:
     hasLeafNode(uint256 const& tag, SHAMapHash const& hash) const;
 
     SHAMapLeafNode const*
-    peekFirstItem(NodePathStack& stack) const;
+    peekFirstItem(SharedPtrNodeStack& stack) const;
     SHAMapLeafNode const*
-    peekNextItem(uint256 const& id, NodePathStack& stack) const;
+    peekNextItem(uint256 const& id, SharedPtrNodeStack& stack) const;
     bool
     walkBranch(
         SHAMapTreeNode* node,
@@ -799,7 +697,7 @@ public:
     using pointer = value_type const*;
 
 private:
-    NodePathStack stack_;
+    SharedPtrNodeStack stack_;
     SHAMap const* map_ = nullptr;
     pointer item_ = nullptr;
 
@@ -825,7 +723,7 @@ public:
 private:
     explicit ConstIterator(SHAMap const* map);
     ConstIterator(SHAMap const* map, std::nullptr_t);
-    ConstIterator(SHAMap const* map, pointer item, NodePathStack&& stack);
+    ConstIterator(SHAMap const* map, pointer item, SharedPtrNodeStack&& stack);
 
     friend bool
     operator==(ConstIterator const& x, ConstIterator const& y);
@@ -844,7 +742,10 @@ inline SHAMap::ConstIterator::ConstIterator(SHAMap const* map, std::nullptr_t) :
 {
 }
 
-inline SHAMap::ConstIterator::ConstIterator(SHAMap const* map, pointer item, NodePathStack&& stack)
+inline SHAMap::ConstIterator::ConstIterator(
+    SHAMap const* map,
+    pointer item,
+    SharedPtrNodeStack&& stack)
     : stack_(std::move(stack)), map_(map), item_(item)
 {
 }

include/xrpl/tx/Transactor.h

@@ -60,10 +60,6 @@ public:
         , j(j)
     {
         XRPL_ASSERT((flags & TapBatch) == TapBatch, "Batch apply flag should be set");
-        XRPL_ASSERT_IF(
-            (flags & TapProposal) != TapNone,
-            (flags & TapDryRun) != TapNone,
-            "xrpl::PreflightContext : proposal preflight implies dry run");
     }
 
     PreflightContext(
@@ -75,10 +71,6 @@ public:
         : registry(registry), tx(tx), rules(std::move(rules)), flags(flags), j(j)
     {
         XRPL_ASSERT((flags & TapBatch) == 0, "Batch apply flag should not be set");
-        XRPL_ASSERT_IF(
-            (flags & TapProposal) != TapNone,
-            (flags & TapDryRun) != TapNone,
-            "xrpl::PreflightContext : proposal preflight implies dry run");
     }
 
     PreflightContext&

include/xrpl/tx/applySteps.h

@@ -386,23 +386,6 @@ preflight(
 PreclaimResult
 preclaim(PreflightResult const& preflightResult, ServiceRegistry& registry, OpenView const& view);
 
-/**
- * Type-erased overload of Transactor::invokeCheckPermission.
- *
- * Dispatches on the transaction type to Transactor::invokeCheckPermission<T>
- * so a caller that only has an STTx still gets the same verdict submission
- * uses: transaction-level permission, then granular permissions and
- * checkGranularSandbox, then that type's checkGranularSemantics. Does not
- * check SignerList or signing keys.
- *
- * An unknown transaction type (should not occur after a successful preflight)
- * is treated as an internal invariant violation: UNREACHABLE is fired and the
- * type-erased fallback return is temUNKNOWN, mirroring the sibling
- * invokePreflight/invokePreclaim/invokeApply overloads in this header.
- */
-NotTEC
-invokeCheckPermission(ReadView const& view, STTx const& tx);
-
 /**
  * Compute only the expected base fee for a transaction.
  *

include/xrpl/tx/transactors/proposal/TransactionProposalCreate.h

@@ -1,44 +0,0 @@
-#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>
-
-namespace xrpl {
-
-class TransactionProposalCreate : public Transactor
-{
-public:
-    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
-
-    explicit TransactionProposalCreate(ApplyContext& ctx) : Transactor(ctx)
-    {
-    }
-
-    static NotTEC
-    preflight(PreflightContext const& ctx);
-
-    static TER
-    preclaim(PreclaimContext const& ctx);
-
-    TER
-    doApply() override;
-
-    void
-    visitInvariantEntry(bool isDelete, SLE::const_ref before, SLE::const_ref after) override;
-
-    [[nodiscard]] bool
-    finalizeInvariants(
-        STTx const& tx,
-        TER result,
-        XRPAmount fee,
-        ReadView const& view,
-        beast::Journal const& j) override;
-};
-
-}  // namespace xrpl

include/xrpl/tx/transactors/token/ConfidentialMPTMirrorUpdate.h

@@ -1,98 +0,0 @@
-#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>
-
-namespace xrpl {
-
-/**
- * @brief Updates the encrypted mirror balances of a Confidential MPToken.
- *
- * @details
- * This transaction updates a single holder's mirrored confidential balances
- * (`sfIssuerEncryptedBalance` and/or `sfAuditorEncryptedBalance`) with the latest
- * ElGamal public keys defined on the `MPTokenIssuance`.
- *
- * It supports both issuer and holder self-migration modes, each mode supports multiple flows:
- * - Issuer mode: Submitted by the issuer.
- * 1. Issuer Key Rotation Migration: Re-encrypts the
- *   holder's `sfIssuerEncryptedBalance` under the issuer's new ElGamal public key.
- *
- * 2. Auditor Key Rotation Migration: Re-encrypts the
- *   holder's `sfAuditorEncryptedBalance` under the auditor's new ElGamal public key.
- *
- * 3. Simultaneous Rotation Migration: Updates both the issuer
- *   and auditor encrypted balances in a single transaction to optimize network throughput.
- *
- * 4. Auditor Late-Registration Migration: When the issuer ElGamal
- *   public key is already registered on the `MPTokenIssuance` object, the issuer can
- *   register an auditor key at a later time through `MPTokenIssuanceSet`. Then the issuer uses this
- *   flow to set the holder's initial `sfAuditorEncryptedBalance` on `MPToken` object.
- *
- * - Holder self-migration mode: Submitted by the holder. The holder decrypts their own
- *   `sfConfidentialBalanceSpending` with holder's private key to recover the balance and
- *   re-encrypts it under the relevant new ElGamal public key(s). This mode is always
- *   available to the holder and is not conditioned on the issuer being unable to migrate
- *   them: the ledger cannot verify whether an issuer has really lost its private key. That
- *   loss is only the expected motivation, since an issuer that still holds its key can
- *   migrate holders itself in issuer mode.
- * @note All holder migration flows strictly require the holder's
- *       `sfConfidentialBalanceInbox` to be canonically zero; the holder must run
- *       `ConfidentialMPTMergeInbox` first so the spending balance reflects the
- *       full balance.
- *
- * 5. Holder Issuer-Mirror Migration: Re-encrypts the holder's
- *    `sfIssuerEncryptedBalance` under the issuer's new ElGamal public key.
- *
- * 6. Holder Auditor-Mirror Migration: Re-encrypts the holder's
- *    `sfAuditorEncryptedBalance` under the auditor's new ElGamal public key, or
- *    sets it for the first time when the auditor key was late-registered. This is the
- *    holder-driven counterpart to flows 2 and 4, for when the issuer does not migrate
- *    the holder itself.
- *
- * 7. Simultaneous Holder Self-Migration: Updates both the issuer and auditor
- *    encrypted balances in a single transaction (both keys have rotated).
- */
-class ConfidentialMPTMirrorUpdate : public Transactor
-{
-public:
-    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
-
-    explicit ConfidentialMPTMirrorUpdate(ApplyContext& ctx) : Transactor(ctx)
-    {
-    }
-
-    static bool
-    checkExtraFeatures(PreflightContext const& ctx);
-
-    static NotTEC
-    preflight(PreflightContext const& ctx);
-
-    static XRPAmount
-    calculateBaseFee(ReadView const& view, STTx const& tx);
-
-    static TER
-    preclaim(PreclaimContext const& ctx);
-
-    TER
-    doApply() override;
-
-    void
-    visitInvariantEntry(bool isDelete, SLE::const_ref before, SLE::const_ref after) override;
-
-    [[nodiscard]] bool
-    finalizeInvariants(
-        STTx const& tx,
-        TER result,
-        XRPAmount fee,
-        ReadView const& view,
-        beast::Journal const& j) override;
-};
-
-}  // namespace xrpl

nix/check-tools/macos.txt

@@ -131,9 +131,6 @@ Rust toolchain:
   ✅ rust-analyzer
      rust-analyzer 1.97.1 (8bab26f4 2026-07-14)
      /nix/store/j6apc5pmd0giy15da9p650r8zklslmvi-rust-analyzer-preview-1.97.1-aarch64-apple-darwin/bin/rust-analyzer
-  ✅ rust-nightly
-     rustc 1.99.0-nightly (87e5904f5 2026-07-20)
-     /nix/store/fqpjz4l0nsnji8b2pz57mnj0akbp6hcl-rust-nightly/bin/rust-nightly
   ✅ rustc
      rustc 1.97.1 (8bab26f4f 2026-07-14)
      /nix/store/bnfk1sl4s9angb0vj1cj9a5y5zvqinwy-rust-minimal-1.97.1/bin/rustc
@@ -143,4 +140,4 @@ Rust toolchain:
 
 Skipping git-over-HTTPS check (CHECK_TOOLS_SKIP_CLONE is set).
 
-✅ All 45 checked tools are present and runnable.
+✅ All 44 checked tools are present and runnable.