fix: address clang-tidy findings and review feedback

fix: harden cgroup detection and rename ledger_fetch_size
feat: add overrides for fixed cache policy values
2026-08-25 00:01:04 +00:00 · 2026-08-06 15:08:42 -04:00 · 2026-08-06 12:37:30 -04:00 · 2026-08-06 12:20:44 -04:00 · 2026-08-06 12:18:39 -04:00 · 2026-08-06 11:06:51 -04:00
410 changed files with 6047 additions and 15317 deletions
--- a/.cspell.config.yaml
+++ b/.cspell.config.yaml
@@ -7,7 +7,6 @@ ignorePaths:
  - cmake/**
  - LICENSE.md
  - .clang-tidy
-  - nix/check-tools/*.txt # generated, and full of Nix store hashes
 language: en
 allowCompoundWords: true # TODO (#6334)
 ignoreRandomStrings: true
@@ -133,7 +132,6 @@ words:
  - godexsoft
  - gpgcheck
  - gpgkey
-  - Hinnant
  - hotwallet
  - hwaddress
  - hwrap
@@ -167,7 +165,6 @@ words:
  - llection
  - LOCALGOOD
  - logwstream
-  - Lombrozo
  - lseq
  - lsmf
  - ltype
@@ -204,7 +201,6 @@ words:
  - nftokens
  - nftpage
  - nikb
-  - Nikolaos
  - nixfmt
  - nixos
  - nixpkgs
@@ -366,7 +362,6 @@ words:
  - xchain
  - ximinez
  - XMACRO
-  - xored
  - xrpkuwait
  - xrpl
  - xrpld
--- a/.envrc
+++ b/.envrc
@@ -1,7 +1,3 @@
 watch_file nix/*.nix

-# The dev shell derivation includes all of conan/ (see nix/devshell.nix), so any
-# change in there has to invalidate direnv's cached environment.
-watch_dir conan
-
 use flake
--- a/.github/scripts/strategy-matrix/generate.py
+++ b/.github/scripts/strategy-matrix/generate.py
@@ -143,8 +143,7 @@ class MatrixEntry:
 class PackagingEntry:
    """One entry in the generated packaging strategy matrix."""

-    xrpld_artifact_name: str
-    validator_keys_artifact_name: str
+    artifact_name: str
    image: str
    distro: str  # e.g. "debian" or "rhel"; drives package-format-specific steps

@@ -219,19 +218,14 @@ def expand_linux_packaging(linux: LinuxFile) -> list[PackagingEntry]:
    the nix-based build images, because deb/rpm tooling (debhelper, rpm-build)
    is taken from the distro's archive rather than from nixpkgs. Each config
    entry carries its own 'image'.
-
-    The artifact names must match what the build job uploads: one artifact per
-    binary, each named after the build config.
    """
    entries = []
    for distro, configs in linux.package_configs.items():
        for cfg in configs:
            for compiler, build_type in itertools.product(cfg.compiler, cfg.build_type):
-                config_name = f"{distro}-{compiler}-{build_type.lower()}-amd64"
                entries.append(
                    PackagingEntry(
-                        xrpld_artifact_name=f"xrpld-{config_name}",
-                        validator_keys_artifact_name=f"validator-keys-{config_name}",
+                        artifact_name=f"xrpld-{distro}-{compiler}-{build_type.lower()}-amd64",
                        image=cfg.image,
                        distro=distro,
                    )
--- a/.github/scripts/strategy-matrix/linux.json
+++ b/.github/scripts/strategy-matrix/linux.json
@@ -1,5 +1,5 @@
 {
-  "image_tag": "sha-a0074f8",
+  "image_tag": "sha-fecfc0c",
  "configs": {
    "ubuntu": [
      {
@@ -70,8 +70,7 @@
        "compiler": ["gcc"],
        "build_type": ["Release"],
        "arch": ["amd64"],
-        "minimal": false,
-        "extra_cmake_args": "-Dvalidator_keys=ON"
+        "minimal": false
      }
    ],

@@ -80,8 +79,7 @@
        "compiler": ["gcc"],
        "build_type": ["Release"],
        "arch": ["amd64"],
-        "minimal": false,
-        "extra_cmake_args": "-Dvalidator_keys=ON"
+        "minimal": false
      }
    ]
  },
--- a/.github/workflows/on-pr.yml
+++ b/.github/workflows/on-pr.yml
@@ -82,7 +82,6 @@ jobs:
            .github/scripts/strategy-matrix/**
            .github/workflows/reusable-build-test-config.yml
            .github/workflows/reusable-build-test.yml
-            .github/workflows/reusable-check-autogen.yml
            .github/workflows/reusable-clang-tidy.yml
            .github/workflows/reusable-package.yml
            .github/workflows/reusable-strategy-matrix.yml
@@ -127,11 +126,6 @@ jobs:
    outputs:
      go: ${{ steps.go.outputs.go == 'true' }}

-  check-autogen:
-    needs: should-run
-    if: ${{ needs.should-run.outputs.go == 'true' }}
-    uses: ./.github/workflows/reusable-check-autogen.yml
-
  check-levelization:
    needs: should-run
    if: ${{ needs.should-run.outputs.go == 'true' }}
@@ -206,7 +200,6 @@ jobs:
  passed:
    if: failure() || cancelled()
    needs:
-      - check-autogen
      - check-levelization
      - check-rename
      - clang-tidy
--- a/.github/workflows/on-trigger.yml
+++ b/.github/workflows/on-trigger.yml
@@ -20,7 +20,6 @@ on:
      - ".github/scripts/strategy-matrix/**"
      - ".github/workflows/reusable-build-test-config.yml"
      - ".github/workflows/reusable-build-test.yml"
-      - ".github/workflows/reusable-check-autogen.yml"
      - ".github/workflows/reusable-clang-tidy.yml"
      - ".github/workflows/reusable-package.yml"
      - ".github/workflows/reusable-strategy-matrix.yml"
@@ -68,9 +67,6 @@ defaults:
    shell: bash

 jobs:
-  check-autogen:
-    uses: ./.github/workflows/reusable-check-autogen.yml
-
  clang-tidy:
    uses: ./.github/workflows/reusable-clang-tidy.yml
    permissions:
--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -41,7 +41,7 @@ env:
 jobs:
  build:
    runs-on: ubuntu-latest
-    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-a0074f8
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-fecfc0c
    steps:
      - name: Checkout repository
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
--- a/.github/workflows/reusable-build-test-config.yml
+++ b/.github/workflows/reusable-build-test-config.yml
@@ -106,10 +106,9 @@ jobs:
      # header files are copied into separate directories by CMake, which will
      # otherwise result in cache misses.
      CCACHE_SLOPPINESS: include_file_ctime,include_file_mtime
-      # Determine if coverage, voidstar and validator-keys should be enabled.
+      # Determine if coverage and voidstar should be enabled.
      COVERAGE_ENABLED: ${{ contains(inputs.cmake_args, '-Dcoverage=ON') }}
      VOIDSTAR_ENABLED: ${{ contains(inputs.cmake_args, '-Dvoidstar=ON') }}
-      VALIDATOR_KEYS_ENABLED: ${{ contains(inputs.cmake_args, '-Dvalidator_keys=ON') }}
      SANITIZERS_ENABLED: ${{ inputs.sanitizers != '' }}
    steps:
      - name: Cleanup workspace (macOS and Windows)
@@ -177,9 +176,9 @@ jobs:
              ..

      # Export the sanitizer options before any instrumented binary runs. The
-      # build step below invokes instrumented dependency tools (protoc, grpc),
-      # so setting UBSAN_OPTIONS here lets the UBSan suppression list silence
-      # their diagnostics too, not just at test time.
+      # protocol code-gen and build steps below invoke instrumented dependency
+      # tools (protoc, grpc), so setting UBSAN_OPTIONS here lets the UBSan
+      # suppression list silence their diagnostics too, not just at test time.
      # GITHUB_WORKSPACE (not the github.workspace context) is used so the path
      # resolves correctly inside the container job.
      - name: Set sanitizer options
@@ -197,6 +196,32 @@ jobs:
          echo "UBSAN_OPTIONS=include=${SUPP}/runtime-ubsan-options.txt:suppressions=${SUPP}/ubsan.supp" >>${GITHUB_ENV}
          echo "LSAN_OPTIONS=include=${SUPP}/runtime-lsan-options.txt:suppressions=${SUPP}/lsan.supp" >>${GITHUB_ENV}

+      - name: Check protocol autogen files are up-to-date
+        working-directory: ${{ env.BUILD_DIR }}
+        env:
+          MESSAGE: |
+
+            The generated protocol wrapper classes are out of date.
+
+            This typically happens when the macro files or generator scripts
+            have changed but the generated files were not regenerated.
+
+            To fix this:
+              1. Run: cmake --build . --target setup_code_gen
+              2. Run: cmake --build . --target code_gen
+              3. Commit and push the regenerated files
+        run: |
+          set -e
+          cmake --build . --target setup_code_gen
+          cmake --build . --target code_gen
+          DIFF=$(git -C .. status --porcelain -- include/xrpl/protocol_autogen src/tests/libxrpl/protocol_autogen)
+          if [ -n "${DIFF}" ]; then
+              echo "::error::Generated protocol files are out of date"
+              git -C .. diff -- include/xrpl/protocol_autogen src/tests/libxrpl/protocol_autogen
+              echo "${MESSAGE}"
+              exit 1
+          fi
+
      - name: Build the binary
        working-directory: ${{ env.BUILD_DIR }}
        env:
@@ -230,22 +255,6 @@ jobs:
          retention-days: 3
          if-no-files-found: error

-      - name: Run the validator-keys tests
-        if: ${{ env.VALIDATOR_KEYS_ENABLED == 'true' }}
-        working-directory: ${{ env.BUILD_DIR }}
-        run: ./validator-keys --unittest
-
-      - name: Upload the validator-keys binary
-        if: ${{ github.event.repository.visibility == 'public' && env.VALIDATOR_KEYS_ENABLED == 'true' }}
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        with:
-          name: validator-keys-${{ inputs.config_name }}
-          path: |
-            ${{ env.BUILD_DIR }}/validator-keys
-            ${{ env.BUILD_DIR }}/validator-keys-LICENSE
-          retention-days: 3
-          if-no-files-found: error
-
      - name: Upload the test binary (Linux)
        if: ${{ github.event.repository.visibility == 'public' && runner.os == 'Linux' }}
        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
@@ -387,7 +396,7 @@ jobs:
              --target coverage

      - name: Upload coverage report
-        if: ${{ github.repository_owner == 'XRPLF' && !inputs.build_only && env.COVERAGE_ENABLED == 'true' }}
+        if: ${{ github.repository == 'XRPLF/rippled' && !inputs.build_only && env.COVERAGE_ENABLED == 'true' }}
        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
        with:
          disable_search: true
--- a/.github/workflows/reusable-check-autogen.yml
+++ b/.github/workflows/reusable-check-autogen.yml
@@ -1,76 +0,0 @@
-# This workflow checks that the generated protocol wrapper classes are
-# up-to-date with the macro files and generator scripts they are produced from,
-# see more info in include/xrpl/protocol_autogen/README.md.
-name: Check autogen
-
-# This workflow can only be triggered by other workflows.
-on: workflow_call
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-autogen
-  cancel-in-progress: true
-
-defaults:
-  run:
-    shell: bash
-
-env:
-  BUILD_DIR: build/codegen
-
-jobs:
-  autogen:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-
-      - name: Set up Python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
-        with:
-          python-version: "3.13"
-
-      # Code generation is pure Python, so the standalone project below offers
-      # the same targets as the main build without needing its dependencies or
-      # a compiler, which keeps this job down to a few seconds.
-      - name: Configure CMake
-        run: cmake -S cmake/codegen -B "${BUILD_DIR}"
-
-      - name: Install code generation dependencies
-        run: cmake --build "${BUILD_DIR}" --target setup_code_gen
-
-      - name: Generate code
-        run: cmake --build "${BUILD_DIR}" --target code_gen
-
-      - name: Check for differences
-        env:
-          MESSAGE: |
-
-            The generated protocol wrapper classes are out of date.
-
-            This typically happens when the macro files or generator scripts
-            have changed but the generated files were not regenerated.
-
-            Run the following from the repository root, then commit and push
-            the regenerated files. This needs neither the dependencies nor a
-            compiler. See include/xrpl/protocol_autogen/README.md for more info.
-
-              cmake -S cmake/codegen -B build/codegen
-              cmake --build build/codegen --target setup_code_gen
-              cmake --build build/codegen --target code_gen
-
-            In an already configured build directory, the 'setup_code_gen' and
-            'code_gen' targets do the same thing.
-        run: |
-          # Record untracked files in the index without staging their contents,
-          # so that classes generated for a newly added transaction or ledger
-          # entry type show up in the diff below rather than silently as an
-          # empty one.
-          git add --intent-to-add .
-          DIFF=$(git status --porcelain)
-          if [ -n "${DIFF}" ]; then
-              # Print the differences to give the contributor a hint about what to
-              # expect when running code generation on their own machine.
-              git diff
-              echo "${MESSAGE}"
-              exit 1
-          fi
--- a/.github/workflows/reusable-clang-tidy.yml
+++ b/.github/workflows/reusable-clang-tidy.yml
@@ -34,7 +34,7 @@ jobs:
    needs: [determine-files]
    if: ${{ needs.determine-files.outputs.cpp_changed_files != '' || needs.determine-files.outputs.need_full_run == 'true' }}
    runs-on: ["self-hosted", "Linux", "X64", "heavy"]
-    container: "ghcr.io/xrplf/xrpld/nix-debian:sha-a0074f8"
+    container: "ghcr.io/xrplf/xrpld/nix-debian:sha-fecfc0c"
    permissions:
      contents: read
      issues: write
--- a/.github/workflows/reusable-package.yml
+++ b/.github/workflows/reusable-package.yml
@@ -1,7 +1,7 @@
-# Build Linux packages (DEB and RPM) from pre-built binary artifacts (xrpld and
-# validator-keys). Discovers which configurations to package from linux.json
-# (configs in "package_configs") and fans out one job per distro. Only
-# linux/amd64 is supported; the runner is hardcoded in the job below.
+# Build Linux packages (DEB and RPM) from pre-built binary artifacts.
+# Discovers which configurations to package from linux.json (configs in
+# "package_configs") and fans out one job per distro. Only linux/amd64 is
+# supported; the runner is hardcoded in the job below.
 name: Package

 on:
@@ -45,7 +45,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
-    name: "${{ matrix.xrpld_artifact_name }}"
+    name: "${{ matrix.artifact_name }}"
    permissions:
      contents: read
    runs-on: ["self-hosted", "Linux", "X64", "heavy"]
@@ -56,20 +56,14 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

-      - name: Download pre-built xrpld binary
+      - name: Download pre-built binary
        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
        with:
-          name: ${{ matrix.xrpld_artifact_name }}
+          name: ${{ matrix.artifact_name }}
          path: ${{ env.BUILD_DIR }}

-      - name: Download pre-built validator-keys binary
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: ${{ matrix.validator_keys_artifact_name }}
-          path: ${{ env.BUILD_DIR }}
-
-      - name: Make binaries executable
-        run: chmod +x "${BUILD_DIR}/xrpld" "${BUILD_DIR}/validator-keys"
+      - name: Make binary executable
+        run: chmod +x "${BUILD_DIR}/xrpld"

      - name: Build package
        env:
@@ -79,7 +73,7 @@ jobs:
      - name: Upload package artifact
        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
-          name: ${{ matrix.xrpld_artifact_name }}-pkg
+          name: ${{ matrix.artifact_name }}-pkg
          path: |
            ${{ env.BUILD_DIR }}/debbuild/*.deb
            ${{ env.BUILD_DIR }}/debbuild/*.ddeb
--- a/.github/workflows/reusable-upload-recipe.yml
+++ b/.github/workflows/reusable-upload-recipe.yml
@@ -40,7 +40,7 @@ defaults:
 jobs:
  upload:
    runs-on: ubuntu-latest
-    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-a0074f8
+    container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-fecfc0c
    env:
      REMOTE_NAME: ${{ inputs.remote_name }}
      CONAN_LOGIN_USERNAME_XRPLF: ${{ secrets.remote_username }}
--- a/API-CHANGELOG.md
+++ b/API-CHANGELOG.md
@@ -26,12 +26,10 @@ This version is supported by all `xrpld` versions. For WebSocket and HTTP JSON-R

 This section contains changes targeting a future version.

-### Breaking changes
-
- `feature`: In admin-mode responses, the `vetoed` field is now always a boolean. Disabled obsolete amendments now have `"vetoed": true` and a new `"obsolete": true` field, instead of the previous `"vetoed": "Obsolete"` string value. This change improves type safety for API clients. Both `vetoed` and `obsolete` fields are only present in admin-mode responses for disabled amendments.
-
 ### Additions

+- `server_info` (admin): The `node_size` field has been removed along with the deprecated `[node_size]` config setting it reported. Admin responses now include `memory_limit`, the cache memory budget in gigabytes (0 when enforcement is disabled).
+
 - `account_tx`: Added an optional `delegate` request object to filter delegated transactions. The object requires `delegate_filter`, which must be either `actor` for transactions owned by the requested account but signed by another account, or `authorizer` for transactions signed by the requested account on behalf of another account. The optional `counter_party` account narrows the results to a specific signer/delegate for `actor` or a specific owner/delegator for `authorizer`. Malformed `delegate`, `delegate_filter`, and `counter_party` values return standard invalid field errors, and invalid account IDs return `actMalformed`.
  When paginating delegate-filtered queries, a marker from a delegate-filtered query includes a `delegate` flag and is only valid for follow-up requests that also supply `delegate` (mixing marker conventions returns `invalidParams`). Because filtering is applied after the ledger scan, a page may contain fewer results than `limit` (possibly zero) while still returning a marker, so callers must continue until no marker is present.

@@ -46,7 +44,6 @@ This section contains changes targeting a future version.

 ### Bugfixes

- `get_aggregate_price`: Duplicate entries in the `oracles` request array are now ignored. [#6586](https://github.com/XRPLF/rippled/pull/6586)
 - Peer Crawler: The `port` field in `overlay.active[]` now consistently returns an integer instead of a string for outbound peers. [#6318](https://github.com/XRPLF/rippled/pull/6318)
 - `ping`: The `ip` field is no longer returned as an empty string for proxied connections without a forwarded-for header. It is now omitted, consistent with the behavior for identified connections. [#6730](https://github.com/XRPLF/rippled/pull/6730)
 - gRPC `GetLedgerDiff`: Fixed error message that incorrectly said "base ledger not validated" when the desired ledger was not validated. [#6730](https://github.com/XRPLF/rippled/pull/6730)
@@ -58,8 +55,6 @@ This section contains changes targeting a future version.
 - `submit`: The `fail_hard` field now returns an error if the value is not a boolean. [#6529](https://github.com/XRPLF/rippled/pull/6529)
 - `subscribe`: The `taker` field in the `books` array now returns `actMalformed` instead of `badIssuer` if the value is not a valid account. [#6529](https://github.com/XRPLF/rippled/pull/6529)
 - Fixed a bug in `Forwarded` HTTP header parsing where the extracted IP address could be incorrect when no comma or semicolon delimiter follows the address. This could cause the server to misidentify a client's IP address when operating behind a reverse proxy. [#6529](https://github.com/XRPLF/rippled/pull/6529)
- `gateway_balances`: The `account` and `ident` fields now return an `invalidParams` error if the value is not a string, instead of an `internal` error. [#7655](https://github.com/XRPLF/rippled/pull/7655)
- `account_lines`: The `peer` field now returns an error if the value is not a string. [#7728](https://github.com/XRPLF/rippled/pull/7728)

 ## XRP Ledger server version 3.1.0

--- a/BUILD.md
+++ b/BUILD.md
@@ -4,14 +4,34 @@

 ## Minimum Requirements

-For the hardware needed to run a node, see
-[System Requirements](https://xrpl.org/system-requirements.html).
+See [System Requirements](https://xrpl.org/system-requirements.html).

-For the software needed to build xrpld, see the
-[environment setup guide](./docs/build/environment.md).
+Building xrpld generally requires Git, Python, Conan, CMake, and a C++
+compiler.
+
+- [Python](https://www.python.org/downloads/)
+- [Conan](https://conan.io/downloads.html)
+- [CMake](https://cmake.org/download/)
+
+You can verify that the required tools are installed and runnable with:
+
+```bash
+./bin/check-tools.sh
+```
+
+`xrpld` is written in the C++23 dialect. The [tested compiler versions][cpp23-support] are:
+
+| Compiler    | Version         |
+| ----------- | --------------- |
+| GCC         | 15.2            |
+| Clang       | 22              |
+| Apple Clang | 21              |
+| MSVC        | 19.44[^windows] |

 ## Operating Systems

+Please see the [environment setup guide](./docs/build/environment.md) for detailed instructions for all platforms.
+
 ### Linux

 The Ubuntu Linux distribution has received the highest level of quality
@@ -27,8 +47,9 @@ CI testing is done in macOS 26 (Tahoe), but the build defaults `CMAKE_OSX_DEPLOY

 ### Windows

-Windows is used by some engineers for development only, and is not recommended
-for production use.
+Windows is used by some engineers for development only.
+
+[^windows]: Windows is not recommended for production use.

 ## Steps

@@ -53,25 +74,37 @@ releases](https://github.com/XRPLF/rippled/releases).

 ### Set Up Conan

-Once your [development environment](./docs/build/environment.md) is ready, set
-Conan up for this repository:
+After you have a [C++ development environment](./docs/build/environment.md) ready with Git, Python,
+Conan, CMake, and a C++ compiler, you may need to set up your Conan profile.
+
+These instructions assume a basic familiarity with Conan and CMake. If you are
+unfamiliar with Conan, then please read [this crash course](./docs/build/conan.md) or the official
+[Getting Started][conan-getting-started] walkthrough.
+
+#### Profiles
+
+We recommend that you install our Conan profiles:

 ```bash
-./conan/init.sh
+conan config install conan/profiles/ -tf $(conan config home)/profiles/
 ```

-That installs our [`global.conf`](./conan/global.conf), our Conan
-[profiles](./conan/profiles), and the `xrplf` remote that hosts some of our
-dependencies. It honours `CONAN_HOME` and never deletes an existing Conan home,
-so it is safe to re-run — it only overwrites the files it manages.
+You can check your Conan profile by running:

-> [!TIP]
-> In the [Nix development shell](./docs/build/nix.md#conan-configuration) this is
-> already done for you: the script runs on entry.
+```bash
+conan profile show
+```

-You can inspect the resulting profile with `conan profile show`. If it is not
-suitable for your environment, create a custom profile and pass it to Conan — see
-[Advanced Conan configuration](./docs/build/advanced_conan.md).
+If the default profile is not suitable for your environment, you can create a custom profile and pass it to Conan.
+More information on customizing Conan can be found in the [Advanced Conan configuration](./docs/build/advanced_conan.md).
+
+#### Add xrplf remote
+
+Run the following command to add the `xrplf` remote, which hosts some of our dependencies:
+
+```bash
+conan remote add --index 0 --force xrplf https://conan.xrplf.org/repository/conan/
+```

 ### Set Up Ccache

@@ -214,17 +247,7 @@ cmake --build . --target setup_code_gen  # create venv and install dependencies
 cmake --build . --target code_gen        # regenerate code
 ```

-The same targets are also available as a standalone project, which does not
-need the dependencies to be configured first:
-
-```
-cmake -S cmake/codegen -B build/codegen
-cmake --build build/codegen --target setup_code_gen
-cmake --build build/codegen --target code_gen
-```
-
-The regenerated files should be committed alongside your changes. CI verifies
-that they are up-to-date.
+The regenerated files should be committed alongside your changes.

 ## Coverage report

@@ -236,14 +259,10 @@ which is only enabled when the `coverage` option is set, e.g. with
 Prerequisites for the coverage report:

 - [gcovr tool][gcovr] (can be installed e.g. with [pip][python-pip])
- `gcov` for GCC or `llvm-cov` for Clang, usually installed with the compiler
+- `gcov` for GCC (installed with the compiler by default) or
+- `llvm-cov` for Clang (installed with the compiler by default)
 - `Debug` build type

-> [!NOTE]
-> Clang coverage is not available in the [Nix development shell](./docs/build/nix.md#building-xrpld-in-the-nix-shell):
-> its `clang` shells do not ship `llvm-cov`. Use a `gcc` shell instead (`.#gcc`,
-> or `.#gcc-plain` on Linux), which provides a `gcov` matching its compiler.
-
 A coverage report is created when the following steps are completed, in order:

 1. `xrpld` binary built with instrumentation data, enabled by the `coverage`
@@ -360,14 +379,10 @@ After any updates or changes to dependencies, you may need to do the following:
 4. [Regenerate lockfile](./docs/build/advanced_conan.md#conan-lockfile).
 5. Re-run [conan install](#build-and-test).

-If you are using the Nix development shell, whether prebuilt Conan binaries apply
-depends on your platform — see
-[Prebuilt packages](./docs/build/nix.md#prebuilt-packages).
-
 #### ERROR: Package not resolved

 If you're seeing an error like `ERROR: Package 'snappy/1.1.10' not resolved: Unable to find 'snappy/1.1.10#968fef506ff261592ec30c574d4a7809%1756234314.246' in remotes.`,
-please [set Conan up](#set-up-conan) so the `xrplf` remote is configured, or re-run `conan export` for [patched recipes](./docs/build/advanced_conan.md#patched-recipes).
+please [add `xrplf` remote](#add-xrplf-remote) or re-run `conan export` for [patched recipes](./docs/build/advanced_conan.md#patched-recipes).

 ### `protobuf/port_def.inc` file not found

@@ -387,6 +402,7 @@ For example, if you want to build Debug:
 1. For conan install, pass `--settings build_type=Debug`
 2. For cmake, pass `-DCMAKE_BUILD_TYPE=Debug`

+[cpp23-support]: https://en.cppreference.com/w/cpp/compiler_support/23
 [conan-getting-started]: https://docs.conan.io/en/latest/getting_started.html
 [unity-build]: https://en.wikipedia.org/wiki/Unity_build
 [gcovr]: https://gcovr.com/en/stable/getting-started.html
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -161,10 +161,8 @@ endif()
 include(XrplCore)
 include(XrplProtocolAutogen)
 include(XrplInstall)
-include(XrplValidatorKeys)
-# Must come after XrplValidatorKeys: the 'package' target depends on the
-# validator-keys target existing.
 include(XrplPackaging)
+include(XrplValidatorKeys)

 if(tests)
    include(CTest)
--- a/bin/check-tools.sh
+++ b/bin/check-tools.sh
@@ -15,14 +15,10 @@
 #   - Windows: the core build tools only (CMake, Conan, Git, Python).
 #              MSVC is expected to be provided separately and is not checked here.
 #
-# Some tools (clang-format, clang-tidy, doxygen, gcovr, gh, git-cliff, gpg,
-# pre-commit, run-clang-tidy) are present in our Linux CI images and in local
-# development setups, but not in the macOS CI environment. They are checked
-# everywhere except when running in CI on macOS.
-#
-# Tools that Nix also exposes under a version-suffixed name (`clang-tidy-22`,
-# `g++-15`, ...) are probed under both names: a suffixed name can break while
-# the plain one still works (see mkVersionedToolLinks in nix/packages.nix).
+# Some tools (clang-format, doxygen, gcovr, gh, git-cliff, gpg, pre-commit,
+# run-clang-tidy) are present in our Linux CI images and in local development
+# setups, but not in the macOS CI environment. They are checked everywhere
+# except when running in CI on macOS.
 #
 # Environment variables:
 #   CI                      if set, skip the tools above when on macOS.
@@ -30,27 +26,14 @@

 set -uo pipefail

-# Version suffixes of the Nix tool links, tracking nix/packages.nix.
-gcc_version=15
-llvm_version=22
-
 missing=()
 checked=0

-# tool_path <name>
-# Fully resolved path of a tool, so the snapshots record which derivation
-# provides it. Prints nothing when it isn't on PATH.
-tool_path() {
-    local path
-    path="$(command -v "$1" 2>/dev/null)" || return 0
-    readlink -f "${path}" 2>/dev/null || printf '%s' "${path}"
-}
-
 # check <name> [probe-command...]
 # Runs the probe (default: "<name> --version"), capturing both stdout and
-# stderr, and prints three lines: the status and name, the first non-blank line
-# of the probe output (its version, or the error when it failed), and the tool's
-# resolved path. Records <name> as missing if it is not found or exits non-zero.
+# stderr, and prints one aligned line: the status, the name, and the first
+# non-blank line of the probe output (its version). Records <name> as missing
+# if the command is not found or exits non-zero.
 check() {
    local name="$1"
    shift
@@ -60,17 +43,14 @@ check() {
    fi

    checked=$((checked + 1))
-    local output version path
-    path="$(tool_path "${name}")"
+    local output version
    if output="$("${probe[@]}" 2>&1)"; then
-        printf '  ✅ %s\n' "${name}"
+        version="$(printf '%s\n' "${output}" | grep -m1 '[^[:space:]]' || true)"
+        printf '  [ ok ] %-20s %s\n' "${name}" "${version}"
    else
-        printf '  ❌ %s\n' "${name}"
+        printf '  [MISS] %s\n' "${name}"
        missing+=("${name}")
    fi
-    version="$(printf '%s\n' "${output}" | grep -m1 '[^[:space:]]' || true)"
-    printf '     %s\n' "${version:-(no output)}"
-    printf '     %s\n' "${path:-(not found)}"
 }

 case "$(uname -s)" in
@@ -102,9 +82,7 @@ if [ "${os}" = "linux" ] || [ "${os}" = "macos" ]; then
    echo "Development tooling:"
    check ccache
    check clang
-    check "clang-${llvm_version}"
    check clang++
-    check "clang++-${llvm_version}"
    check ClangBuildAnalyzer
    check curl
    check file
@@ -123,14 +101,7 @@ if [ "${os}" = "linux" ] || [ "${os}" = "macos" ]; then
    # setups, but not in the macOS CI environment. So check them everywhere
    # except when running in CI on macOS.
    if [ "${os}" = "linux" ] || [ -z "${CI:-}" ]; then
-        check clang-apply-replacements
-        check "clang-apply-replacements-${llvm_version}"
        check clang-format
-        check "clang-format-${llvm_version}"
-        # clang-tidy leads --version with the LLVM banner, not the version.
-        tidy_probe="--version | grep -m1 -oE 'LLVM version [0-9.]+'"
-        check clang-tidy sh -c "clang-tidy ${tidy_probe}"
-        check "clang-tidy-${llvm_version}" sh -c "clang-tidy-${llvm_version} ${tidy_probe}"
        check dot
        check doxygen
        check gcovr
@@ -141,7 +112,6 @@ if [ "${os}" = "linux" ] || [ "${os}" = "macos" ]; then
        # pre-commit, or its alternative implementation prek
        check pre-commit sh -c 'pre-commit --version || prek --version'
        check run-clang-tidy run-clang-tidy --help
-        check "run-clang-tidy-${llvm_version}" "run-clang-tidy-${llvm_version}" --help
    fi
 fi

@@ -156,7 +126,7 @@ if [ "${os}" = "linux" ] || [ "${os}" = "macos" ]; then
    check cargo-audit cargo audit --version
    check cargo-llvm-cov cargo llvm-cov --version
    check cargo-nextest cargo nextest --version
-    check clippy-driver
+    check clippy clippy-driver --version
    check rust-analyzer
    check rustc
    check rustfmt
@@ -168,11 +138,7 @@ if [ "${os}" = "linux" ]; then
    echo
    echo "GCC toolchain:"
    check gcc
-    check "gcc-${gcc_version}"
    check g++
-    check "g++-${gcc_version}"
-    check cpp
-    check "cpp-${gcc_version}"
    check gcov

    echo
@@ -197,9 +163,9 @@ else
    checked=$((checked + 1))
    tmp_clone="$(mktemp -d)"
    if git clone --depth 1 https://github.com/XRPLF/actions.git "${tmp_clone}/actions" >/dev/null 2>&1; then
-        printf '  ✅ git clone over HTTPS\n'
+        printf '  [ ok ] git clone over HTTPS\n'
    else
-        printf '  ❌ git clone over HTTPS\n'
+        printf '  [MISS] git clone over HTTPS\n'
        missing+=("git-https-clone")
    fi
    rm -rf "${tmp_clone}"
@@ -207,9 +173,9 @@ fi

 echo
 if [ "${#missing[@]}" -eq 0 ]; then
-    echo "✅ All ${checked} checked tools are present and runnable."
+    echo "All ${checked} checked tools are present and runnable."
 else
-    echo "❌ Missing or non-functional tools (${#missing[@]} of ${checked}):" >&2
+    echo "Missing or non-functional tools (${#missing[@]} of ${checked}):" >&2
    for tool in "${missing[@]}"; do
        echo "  - ${tool}" >&2
    done
--- a/cfg/xrpld-example.cfg
+++ b/cfg/xrpld-example.cfg
@@ -488,17 +488,6 @@
 #   Must be a number between 100 and 1000, defaults to 250
 #
 #
-# [max_subscriptions_per_connection]
-#
-#   Maximum number of account, real-time account, and account-history
-#   subscriptions a single client connection may hold at once. Bounds the
-#   per-connection state torn down when the connection disconnects. Book
-#   subscriptions are tracked separately and are not counted here.
-#
-#   Defaults to 100000 if not set; large enough for legitimate power users
-#   such as block explorers.
-#
-#
 # [overlay]
 #
 #   Controls settings related to the peer to peer overlay.
@@ -549,45 +538,6 @@
 #       only be used for local testing and debugging. Do not disable
 #       on mainnet.
 #
-#   max_untrusted_count = <number>
-#
-#       The number of manifests the server keeps for validators it does not
-#       list, and the number it sends and processes in a single peer protocol
-#       message. Once the server holds this many, a manifest for a new
-#       unlisted validator is rejected, so peer gossip cannot grow the cache
-#       without end.
-#
-#       This option can take any value between 50 and 1000, inclusive. If
-#       the option is not present the server uses its built-in value.
-#
-#       The current default (which is subject to change) is 300.
-#
-#   max_trusted_count = <number>
-#
-#       The number of manifests for listed validators to allow for when
-#       sizing peer protocol messages. Manifests for listed validators are
-#       never dropped, whether sending or receiving, because doing so would
-#       delay a validator key change reaching this server. Set this above the
-#       number of validators the server lists.
-#
-#       Together the two counts above set the largest manifest message the
-#       server accepts: bigger messages are discarded without reading them,
-#       and without penalising the sender. Raising either means the server
-#       accepts and sends bigger messages than a peer using the defaults, and
-#       those peers will discard what this server sends. Lowering either below
-#       what peers send makes this server discard their manifest messages,
-#       which it does without recording anything.
-#
-#       This option can take any value between 50 and 1000, inclusive. If
-#       the option is not present the server uses its built-in value.
-#
-#       The current default (which is subject to change) is 300.
-#
-#       NOTE: These two options (max_untrusted_count and max_trusted_count)
-#       are transitional. They exist to bound manifest-message size and cache
-#       growth during the network upgrade. They may be removed in a future
-#       release once the fleet has upgraded, and should not be relied upon as
-#       stable configuration.
 #
 # [transaction_queue] EXPERIMENTAL
 #
@@ -1356,23 +1306,40 @@
 #
 # [node_size]
 #
-#   Tunes the servers based on the expected load and available memory. Legal
-#   sizes are "tiny", "small", "medium", "large", and "huge". We recommend
-#   you start at the default and raise the setting if you have extra memory.
+#   DEPRECATED. Each size is now an alias for a [memory_limit] value:
+#   tiny = 4, small = 8, medium = 32, large = 64, huge = 128. Set
+#   [memory_limit] instead; setting this logs a warning at startup.
 #
-#   The code attempts to automatically determine the appropriate size for
-#   this parameter based on the amount of RAM and the number of execution
-#   cores available to the server. The current decision matrix is:
+# [memory_limit]
 #
-#   |         |         Cores          |
-#   |---------|------------------------|
-#   |   RAM   |   1  | 2 or 3 |   ≥ 4  |
-#   |---------|------|--------|--------|
-#   |  < ~8GB | tiny |   tiny |   tiny |
-#   | < ~12GB | tiny |  small |  small |
-#   | < ~16GB | tiny |  small | medium |
-#   | < ~24GB | tiny |  small |  large |
-#   | < ~32GB | tiny |  small |   huge |
+#   The memory budget, in gigabytes, that the server sizes its caches
+#   within. Cache sizes scale with the budget; the SHAMap tree node cache
+#   is capped to fit within half of it, enforced as it grows. Defaults to
+#   detected physical RAM (capped by the container limit when one is set);
+#   0 selects minimal sizes with no enforcement. Values above 1024 are
+#   rejected, and a value above detected RAM logs a warning.
+#   Set this when xrpld shares the machine with other services or runs in
+#   a container with a memory limit below the host's RAM. Thread counts
+#   are unrelated: they come from the core count and the [workers] /
+#   [io_workers] overrides.
+#
+#   Example:
+#       memory_limit = 16
+#
+# [tree_cache_age]
+#
+#   Seconds a SHAMap tree node stays cached after its last use. The default
+#   is 300. Accepted values are 10 to 3600.
+#
+# [ledger_cache_age]
+#
+#   Seconds a full ledger stays in the ledger cache after its last use. The
+#   default is 180. Accepted values are 10 to 3600.
+#
+# [ledger_fetch_size]
+#
+#   How many historical ledgers to acquire per fetch pass while backfilling.
+#   The default is 4. Accepted values are 1 to 16.
 #
 # [signing_support]
 #
--- a/cmake/PatchNixBinary.cmake
+++ b/cmake/PatchNixBinary.cmake
@@ -2,10 +2,9 @@
   Patch executables to run in non-Nix environments.

   The Nix toolchain links binaries against an ELF interpreter (loader)
-   that lives in the Nix store, so the resulting binaries don't run elsewhere
-   (including once installed from the .deb package). `patch_nix_binary` resets
-   the interpreter to the system default loader and drops the rpath, once the
-   binary has been linked.
+   that lives in the Nix store, so the resulting binaries don't run elsewhere.
+   `patch_nix_binary` adds a POST_BUILD step that resets the interpreter
+   to the system default loader and drops the rpath.

   This runs by default for Nix-toolchain builds (determined by whether the compiler resolves under /nix/store/).
   Those builds are where binaries get a Nix-store loader.
@@ -53,38 +52,13 @@ function(patch_nix_binary target)
    if(NOT PATCH_NIX_BINARIES)
        return()
    endif()
-
-    set(patch_command
-        "${PATCHELF_COMMAND}"
-        --set-interpreter
-        "${DEFAULT_LOADER_PATH}"
-        --remove-rpath
-        "$<TARGET_FILE:${target}>"
+    add_custom_command(
+        TARGET ${target}
+        POST_BUILD
+        COMMAND
+            "${PATCHELF_COMMAND}" --set-interpreter "${DEFAULT_LOADER_PATH}"
+            --remove-rpath "$<TARGET_FILE:${target}>"
+        COMMENT "Patching ${target}: set default loader, remove rpath"
+        VERBATIM
    )
-    set(comment "Patching ${target}: set default loader, remove rpath")
-
-    # POST_BUILD is the cheap way to do this: it runs only when the binary is
-    # relinked. It is also only available in the directory that defined the
-    # target, so for a target from elsewhere (e.g. a FetchContent subproject)
-    # fall back to a custom target that runs after the binary is linked. That
-    # one runs on every build, which is harmless because patchelf is idempotent.
-    get_target_property(target_source_dir ${target} SOURCE_DIR)
-    if("${target_source_dir}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
-        add_custom_command(
-            TARGET ${target}
-            POST_BUILD
-            COMMAND ${patch_command}
-            COMMENT "${comment}"
-            VERBATIM
-        )
-    else()
-        add_custom_target(
-            ${target}-patch-nix
-            ALL
-            COMMAND ${patch_command}
-            COMMENT "${comment}"
-            VERBATIM
-        )
-        add_dependencies(${target}-patch-nix ${target})
-    endif()
 endfunction()
--- a/cmake/XrplCompiler.cmake
+++ b/cmake/XrplCompiler.cmake
@@ -266,50 +266,10 @@ elseif(use_lld)
    )
    if("${LD_VERSION}" MATCHES "LLD")
        target_link_libraries(common INTERFACE -fuse-ld=lld)
-        # remembered for the linker flag probe below
-        set(fuse_ld_flag "-fuse-ld=lld")
    endif()
    unset(LD_VERSION)
 endif()

-# Linker warnings are errors where we control the toolchain and the dependencies: CI and the Nix dev shell.
-# On non-Nix macOS we suppress the deployment target warning: an old Conan profile may not pin os.version.
-# Only the new Apple linker understands the flag, so probe the actual linker (lld may be selected above).
-if(is_macos OR is_linux)
-    if(is_ci OR is_nix_compiler)
-        if(is_macos)
-            set(fatal_warnings_flag "-Wl,-fatal_warnings")
-        else()
-            set(fatal_warnings_flag "-Wl,--fatal-warnings")
-        endif()
-        message(
-            STATUS
-            "Treating all linker warnings as errors (${fatal_warnings_flag})"
-        )
-        target_link_options(common INTERFACE "${fatal_warnings_flag}")
-        unset(fatal_warnings_flag)
-    elseif(is_macos)
-        set(silence_flag "-Wl,-deployment_target_mismatches,suppress")
-        set(probe_flags ${fuse_ld_flag} "${silence_flag}")
-        include(CheckLinkerFlag)
-        check_linker_flag(
-            CXX
-            "${probe_flags}"
-            have_deployment_target_mismatches
-        )
-        if(have_deployment_target_mismatches)
-            message(
-                STATUS
-                "Silencing macOS deployment target mismatch warnings (${silence_flag})"
-            )
-            target_link_options(common INTERFACE "${silence_flag}")
-        endif()
-        unset(probe_flags)
-        unset(silence_flag)
-    endif()
-endif()
-unset(fuse_ld_flag)
-
 if(assert)
    foreach(var_ CMAKE_C_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELEASE)
        string(REGEX REPLACE "[-/]DNDEBUG" "" ${var_} "${${var_}}")
--- a/cmake/XrplCov.cmake
+++ b/cmake/XrplCov.cmake
@@ -44,7 +44,6 @@ setup_target_for_coverage_gcovr(
    EXCLUDE
        "src/test"
        "src/tests"
-        "src/benchmarks"
        "include/xrpl/beast/test"
        "include/xrpl/beast/unit_test"
        "${CMAKE_BINARY_DIR}/pb-xrpl.libpb"
--- a/cmake/XrplPackaging.cmake
+++ b/cmake/XrplPackaging.cmake
@@ -25,19 +25,6 @@ if(NOT (RPMBUILD_EXECUTABLE OR DPKG_BUILDPACKAGE_EXECUTABLE))
    return()
 endif()

-if(NOT TARGET xrpld)
-    message(STATUS "xrpld=ON is required; 'package' target not available")
-    return()
-endif()
-
-if(NOT TARGET validator-keys)
-    message(
-        STATUS
-        "validator_keys=ON is required; 'package' target not available"
-    )
-    return()
-endif()
-
 set(package_env
    SRC_DIR=${CMAKE_SOURCE_DIR}
    BUILD_DIR=${CMAKE_BINARY_DIR}
@@ -50,7 +37,7 @@ add_custom_target(
        ${CMAKE_COMMAND} -E env ${package_env}
        ${CMAKE_SOURCE_DIR}/package/build_pkg.sh
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    DEPENDS xrpld validator-keys
+    DEPENDS xrpld
    COMMENT "Building Linux package (deb/rpm inferred from host tooling)"
    VERBATIM
 )
--- a/cmake/XrplProtocolAutogen.cmake
+++ b/cmake/XrplProtocolAutogen.cmake
@@ -2,22 +2,21 @@
   Protocol Autogen - Code generation for protocol wrapper classes
 #]===================================================================]

-# The repository root, derived from the location of this file rather than from
-# the including project, so that the targets below can also be offered on their
-# own by cmake/codegen/CMakeLists.txt.
-get_filename_component(XRPL_ROOT "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
-
 set(CODEGEN_VENV_DIR
-    "${XRPL_ROOT}/.venv"
+    "${CMAKE_CURRENT_SOURCE_DIR}/.venv"
    CACHE PATH
    "Path to a Python virtual environment for code generation. A venv will be created here by setup_code_gen and used to run generation scripts."
 )

 # Directory paths
-set(MACRO_DIR "${XRPL_ROOT}/include/xrpl/protocol/detail")
-set(AUTOGEN_HEADER_DIR "${XRPL_ROOT}/include/xrpl/protocol_autogen")
-set(AUTOGEN_TEST_DIR "${XRPL_ROOT}/src/tests/libxrpl/protocol_autogen")
-set(SCRIPTS_DIR "${XRPL_ROOT}/cmake/scripts/codegen")
+set(MACRO_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include/xrpl/protocol/detail")
+set(AUTOGEN_HEADER_DIR
+    "${CMAKE_CURRENT_SOURCE_DIR}/include/xrpl/protocol_autogen"
+)
+set(AUTOGEN_TEST_DIR
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/tests/libxrpl/protocol_autogen"
+)
+set(SCRIPTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/scripts/codegen")

 # Input macro files
 set(TRANSACTIONS_MACRO "${MACRO_DIR}/transactions.macro")
@@ -115,14 +114,14 @@ if(CODEGEN_VENV_DIR)
        setup_code_gen
        COMMAND ${Python3_EXECUTABLE} -m venv "${CODEGEN_VENV_DIR}"
        COMMAND ${CODEGEN_PYTHON} -m pip install -r "${REQUIREMENTS_FILE}"
-        WORKING_DIRECTORY "${XRPL_ROOT}"
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
        COMMENT "Creating venv and installing code generation dependencies..."
    )
 else()
    add_custom_target(
        setup_code_gen
        COMMAND ${Python3_EXECUTABLE} -m pip install -r "${REQUIREMENTS_FILE}"
-        WORKING_DIRECTORY "${XRPL_ROOT}"
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
        COMMENT "Installing code generation dependencies..."
    )
 endif()
@@ -140,8 +139,8 @@ add_custom_target(
        -DSFIELDS_MACRO=${SFIELDS_MACRO}
        -DAUTOGEN_HEADER_DIR=${AUTOGEN_HEADER_DIR}
        -DAUTOGEN_TEST_DIR=${AUTOGEN_TEST_DIR} -P
-        "${CMAKE_CURRENT_LIST_DIR}/XrplProtocolAutogenRun.cmake"
-    WORKING_DIRECTORY "${XRPL_ROOT}"
+        "${CMAKE_CURRENT_SOURCE_DIR}/cmake/XrplProtocolAutogenRun.cmake"
+    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
    COMMENT "Running protocol code generation..."
    SOURCES ${ALL_INPUT_FILES}
 )
--- a/cmake/XrplValidatorKeys.cmake
+++ b/cmake/XrplValidatorKeys.cmake
@@ -5,39 +5,22 @@ option(
 )

 if(validator_keys)
-    # Own the install destination below rather than relying on another module
-    # having pulled this in first.
-    include(GNUInstallDirs)
-
-    # Pinned to an exact commit, not a branch: the tool ships inside our
-    # packages, so the same xrpld version must always package the same
-    # validator-keys. Bump this deliberately.
-    set(validator_keys_commit "4c0fb75eec9601c711645998c904507e87e910ae")
-    message(STATUS "Using ValidatorKeys commit: ${validator_keys_commit}")
+    git_branch(current_branch)
+    # default to tracking VK master branch unless we are on release
+    if(NOT (current_branch STREQUAL "release"))
+        set(current_branch "master")
+    endif()
+    message(STATUS "Tracking ValidatorKeys branch: ${current_branch}")

    FetchContent_Declare(
        validator_keys
        GIT_REPOSITORY https://github.com/ripple/validator-keys-tool.git
-        GIT_TAG "${validator_keys_commit}"
+        GIT_TAG "${current_branch}"
    )
    FetchContent_MakeAvailable(validator_keys)
-    # The tool's own CMakeLists excludes the target from 'all' when it is built
-    # as a subproject. Undo that, so validator_keys=ON really does build it.
    set_target_properties(
        validator-keys
-        PROPERTIES
-            RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
-            EXCLUDE_FROM_ALL OFF
-            EXCLUDE_FROM_DEFAULT_BUILD OFF
-    )
-    # We ship this binary, so like xrpld it must not keep the Nix store's ELF
-    # loader, or it cannot run on the target distro at all.
-    patch_nix_binary(validator-keys)
-
-    configure_file(
-        "${validator_keys_SOURCE_DIR}/LICENSE"
-        "${CMAKE_BINARY_DIR}/validator-keys-LICENSE"
-        COPYONLY
+        PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
    )
    install(TARGETS validator-keys RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
--- a/cmake/codegen/CMakeLists.txt
+++ b/cmake/codegen/CMakeLists.txt
@@ -1,21 +0,0 @@
-#[===================================================================[
-   Protocol Autogen - Standalone project
-
-   Exposes the 'setup_code_gen' and 'code_gen' targets on their own, without
-   configuring the rest of xrpl. Code generation is pure Python, so this needs
-   neither the dependencies nor a compiler, which makes it usable in CI and by
-   contributors who only want to regenerate the protocol wrapper classes:
-
-     cmake -S cmake/codegen -B build/codegen
-     cmake --build build/codegen --target setup_code_gen
-     cmake --build build/codegen --target code_gen
-
-   The targets are identical to the ones offered by the top-level build, since
-   both come from cmake/XrplProtocolAutogen.cmake.
-#]===================================================================]
-
-cmake_minimum_required(VERSION 3.16)
-
-project(xrpl_codegen LANGUAGES NONE)
-
-include("${CMAKE_CURRENT_LIST_DIR}/../XrplProtocolAutogen.cmake")
--- a/conan.lock
+++ b/conan.lock
@@ -12,7 +12,7 @@
        "protobuf/6.33.5#ff253ead763bd8d9904a52979cd21e81%1782392410.233933",
        "openssl/3.6.3#f806de8933e3bf6f01016c6a888cee2e%1783945160.863288",
        "nudb/2.0.9#11149c73f8f2baff9a0198fe25971fc7%1782392402.297166",
-        "mpt-crypto/1.0.2#b313cef0c1a493eb970ad185b2e9bab7%1784285108.866483",
+        "mpt-crypto/0.4.0-rc4#ffdba12f2332357f0d8b0ae944cfff52%1784138702.932355",
        "lz4/1.10.0#982d9b673900f665a1da109e09c17cab%1782392402.164188",
        "libiconv/1.17#9923bc6dc6f106646d6967e0039a5ada%1782392792.775744",
        "libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1782392402.420732",
--- a/conan/init.sh
+++ b/conan/init.sh
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-# Install our Conan configuration, profiles and the xrplf remote into CONAN_HOME.
-# Safe to re-run; never deletes the Conan home.
-
-set -euo pipefail
-
-SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
-CONAN_DIR="$(conan config home)"
-
-echo "Installing Conan configuration into ${CONAN_DIR}"
-conan config install "${SCRIPT_DIR}/global.conf"
-conan config install "${SCRIPT_DIR}/profiles" -tf "${CONAN_DIR}/profiles"
-# This script manages these files, so make them read-only - Conan does not
-# preserve the source mode. Only the files: the directories must stay writable
-# for `conan config install` to replace them.
-chmod a-w "${CONAN_DIR}/global.conf"
-find "${CONAN_DIR}/profiles" -type f -exec chmod a-w {} +
-
-echo "Adding the xrplf Conan remote"
-# --index 0: our patched recipes must win over Conan Center.
-conan remote add --index 0 --force xrplf https://conan.xrplf.org/repository/conan/
--- a/conan/profiles/default
+++ b/conan/profiles/default
@@ -1,7 +1,10 @@
 {% set os = detect_api.detect_os() %}
 {% set arch = detect_api.detect_arch() %}
 {% set compiler, version, compiler_exe = detect_api.detect_default_compiler() %}
+{% set compiler_version = version %}
+{% if os == "Linux" %}
 {% set compiler_version = detect_api.default_compiler_version(compiler, version) %}
+{% endif %}
 {% if os == "Macos" %}
 {# Minimum macOS the dependencies target. #}
 {# Without this, Conan builds each dependency against the (possibly newer) host SDK, so the #}
--- a/conanfile.py
+++ b/conanfile.py
@@ -139,7 +139,7 @@ class Xrpl(ConanFile):
        if self.options.jemalloc:
            self.requires("jemalloc/5.3.1")
        self.requires("lz4/1.10.0", force=True)
-        self.requires("mpt-crypto/1.0.2", transitive_headers=True)
+        self.requires("mpt-crypto/0.4.0-rc4", transitive_headers=True)
        self.requires("protobuf/6.33.5", force=True)
        if self.options.rocksdb:
            self.requires("rocksdb/10.5.1")
--- a/docs/NodeStoreRefactoringCaseStudy.pdf
+++ b/docs/NodeStoreRefactoringCaseStudy.pdf
--- a/docs/build/environment.md
+++ b/docs/build/environment.md
@@ -6,52 +6,22 @@ This document explains how to set one up.

 ## Tested compiler versions

-`xrpld` is built in the **C++23** dialect by default, so your toolchain has to
-support it — see [compiler support for C++23][cpp23-support].
-The versions currently tested in CI are:
+`xrpld` is built in the **C++23** dialect by default.
+Make sure your toolchain is recent enough — the compiler versions currently tested in CI are:

-| Compiler    | Version            |
-| ----------- | ------------------ |
-| GCC         | 15.2               |
-| Clang       | 22                 |
-| Apple Clang | 21                 |
-| MSVC        | Visual Studio 2026 |
+| Compiler    | Version |
+| ----------- | ------- |
+| GCC         | 15.2    |
+| Clang       | 22      |
+| Apple Clang | 17      |
+| MSVC        | 19.44   |

 LLVM tools (`clang-tidy` and `clang-format`) are also pinned to version 22.

-### Older compilers
-
 Older compilers may fail to build the latest `develop` code: the codebase now
 relies on C++23 features and has been adjusted for `clang-tidy`.
 If the latest code doesn't build for you, update your build toolchain first.

-If updating isn't an option for you, we do accept pull requests that fix builds
-on older compilers, as long as the change is small and doesn't make the code
-harder to read. What we can't promise is that older compilers will keep working:
-only the versions in the table above are tested in CI, and we won't hold back
-the use of C++23 features or add invasive workarounds to keep an untested
-compiler building. Treat support for anything outside the table as best-effort.
-
-## Required tools
-
-Besides a compiler, building `xrpld` requires:
-
-| Tool                                        | Minimum version |
-| ------------------------------------------- | --------------- |
-| [Git](https://git-scm.com/downloads)        | any recent      |
-| [Python](https://www.python.org/downloads/) | 3.11            |
-| [Conan](https://conan.io/downloads.html)    | 2.17            |
-| [CMake](https://cmake.org/download/)        | 3.16            |
-
-On Linux and macOS, the [Nix development shell](./nix.md) provides all of them
-(see below). On Windows they have to be installed manually.
-
-Once they are in place, verify that everything is installed and runnable with:
-
-```bash
-./bin/check-tools.sh
-```
-
 ## Linux and macOS

 The **recommended way** to get a development environment on Linux and macOS is
@@ -69,15 +39,20 @@ Clang. If you instead opt to use your system-wide Apple Clang (via
 below).

 See [Using the Nix development shell](./nix.md) for installation and usage
-details, including how to select a different compiler and why we recommend Nix
-over a hand-maintained environment.
+details, including how to select a different compiler.
+
+> [!NOTE]
+> Using Nix is not mandatory. Any custom environment (Homebrew packages or
+> anything else) will continue to work, but then it is up to you to keep it in
+> sync with the environment used in CI. Nix unifies the development environment
+> for everyone and synchronizes updates, which is why we recommend it.

 ### macOS: managing the Apple Clang version

 If you use your system-wide Apple Clang on macOS (via `nix develop .#apple-clang`),
 the compiler version is whatever your installed Xcode (or Command Line Tools)
 provides. The following command should return a version greater than or equal to
-the [tested one](#tested-compiler-versions):
+the [minimum required](#tested-compiler-versions):

 ```bash
 clang --version
@@ -114,23 +89,23 @@ building xrpld. You may want to install and pin a specific version of Xcode:
 Nix is not available on Windows, so the required tools have to be installed
 manually:

- [Visual Studio 2026](https://visualstudio.microsoft.com/) with the
+- [Visual Studio 2022](https://visualstudio.microsoft.com/) with the
  **"Desktop development with C++"** workload — this provides MSVC and the
-  "x64 Native Tools Command Prompt". CI configures CMake with the
-  `Visual Studio 18 2026` generator.
+  "x64 Native Tools Command Prompt".
 - [Git for Windows](https://git-scm.com/download/win)
- Python, Conan, and CMake, at the versions listed in
-  [Required tools](#required-tools).
+- [Python 3.11](https://www.python.org/downloads/), or higher
+- [Conan 2.17](https://conan.io/downloads.html), or higher
+- [CMake 3.22](https://cmake.org/download/), or higher
+
+> [!NOTE]
+> Windows is used for development only and is not recommended for production.

 ## Clang-tidy

 `clang-tidy` is required to run static analysis checks locally (see
 [CONTRIBUTING.md](../../CONTRIBUTING.md)). It is not required to build the
-project. The version this project uses is listed in
-[Tested compiler versions](#tested-compiler-versions).
+project. This project currently uses `clang-tidy` version 22.

-On Linux and macOS, the [Nix development shell](./nix.md) provides that exact
-version out of the box — run it via `run-clang-tidy`. No separate installation
-is needed.
-
-[cpp23-support]: https://en.cppreference.com/w/cpp/compiler_support/23
+On Linux and macOS, the [Nix development shell](./nix.md) provides `clang-tidy`
+22 out of the box — run it via `run-clang-tidy`. No separate installation is
+needed.
--- a/docs/build/nix.md
+++ b/docs/build/nix.md
@@ -120,7 +120,7 @@ nix develop -c "$SHELL"
 >
 > If it doesn't, either adjust your shell configuration so it doesn't override `$PATH`, or use [direnv](#automatic-activation-with-direnv) (below), which loads the environment _after_ your shell config and so takes precedence regardless of the shell you use.

-## Building xrpld in the Nix shell
+## Building xrpld with Nix

 Once inside the Nix development shell, follow the standard [build instructions](../../BUILD.md#steps). The Nix shell provides all necessary tools (CMake, Ninja, Conan, etc.).

@@ -128,28 +128,6 @@ Coverage builds (`-Dcoverage=ON`) work in the `gcc` shell (and `gcc-plain` on Li
 each ships a `gcov` matching its compiler, since Nix's cc-wrapper does not expose one.
 The `clang` shells do not include `llvm-cov`, so use a `gcc` shell for coverage.

-## Conan configuration
-
-The shell runs [`conan/init.sh`](../../conan/init.sh) on entry, so
-[Set Up Conan](../../BUILD.md#set-up-conan) is already done for you. It installs
-into the shell's own Conan home: `CONAN_HOME=~/.conan2-nix`.
-
-### Prebuilt packages
-
-On **Linux**, the binaries on the `xrplf` remote are built in this same Nix
-environment — CI runs in Docker images that bundle the dev shell's toolchain (see
-[`nix/docker`](../../nix/docker)) — so `.#gcc` and `.#clang` can reuse them. The
-`-plain` shells do not match that toolchain's glibc, so binaries from the remote
-are not a reliable match there.
-
-On **macOS**, CI builds with Apple Clang, so the remote holds nothing for the Nix
-`clang` toolchain and dependencies are compiled locally. We do not publish
-Nix-built macOS binaries because a Conan package ID records the compiler version
-but not the nixpkgs revision.
-
-To compile everything from source, add `--build '*'` to the `conan install`
-command.
-
 ## Automatic Activation with direnv

 [direnv](https://direnv.net/) or [nix-direnv](https://github.com/nix-community/nix-direnv) can automatically activate the Nix development shell when you enter the repository directory.
@@ -164,6 +142,14 @@ The repository already ships an `.envrc` at its root that activates the Nix flak
 > [!NOTE]
 > direnv only caches the `.direnv` directory (already listed in `.gitignore`); no other repository files are affected.

+## Conan and Prebuilt Packages
+
+Please note that there is no guarantee that binaries from conan cache will work when using nix. If you encounter any errors, please use `--build '*'` to force conan to compile everything from source:
+
+```bash
+conan install .. --output-folder . --build '*' --settings build_type=Release
+```
+
 ## Updating `flake.lock` file

 To update `flake.lock` to the latest revision use `nix flake update` command.
--- a/docs/sample_chart.doc
+++ b/docs/sample_chart.doc
@@ -0,0 +1,24 @@
+/*!
+    \page somestatechart Example state diagram
+
+    \startuml SomeState "my state diagram"
+    scale 600 width
+
+    [*] -> State1
+    State1 --> State2 : Succeeded
+    State1 --> [*] : Aborted
+    State2 --> State3 : Succeeded
+    State2 --> [*] : Aborted
+    state State3 {
+      state "Accumulate Enough Data\nLong State Name" as long1
+      long1 : Just a test
+      [*] --> long1
+      long1 --> long1 : New Data
+      long1 --> ProcessData : Enough Data
+    }
+    State3 --> State3 : Failed
+    State3 --> [*] : Succeeded / Save Result
+    State3 --> [*] : Aborted
+
+    \enduml
+*/
--- a/include/xrpl/basics/Archive.h
+++ b/include/xrpl/basics/Archive.h
@@ -1,6 +1,6 @@
 #pragma once

-#include <filesystem>
+#include <boost/filesystem.hpp>

 namespace xrpl {

@@ -13,6 +13,6 @@ namespace xrpl {
 * @throws runtime_error
 */
 void
-extractTarLz4(std::filesystem::path const& src, std::filesystem::path const& dst);
+extractTarLz4(boost::filesystem::path const& src, boost::filesystem::path const& dst);

 }  // namespace xrpl
--- a/include/xrpl/basics/Buffer.h
+++ b/include/xrpl/basics/Buffer.h
@@ -3,7 +3,6 @@
 #include <xrpl/basics/Slice.h>
 #include <xrpl/beast/utility/instrumentation.h>

-#include <algorithm>
 #include <cstdint>
 #include <cstring>
 #include <memory>
@@ -157,19 +156,6 @@ public:
    }
    /** @} */

-    /**
-     * Set every byte in the buffer to the given value.
-     *
-     * The size is unchanged, and this is a no-op on an empty buffer.
-     *
-     * @param value the byte to write to every position.
-     */
-    void
-    fill(std::uint8_t value) noexcept
-    {
-        std::fill_n(p_.get(), size_, value);
-    }
-
    /**
     * Reset the buffer.
     * All memory is deallocated. The resulting size is 0.
@@ -240,4 +226,10 @@ operator==(Buffer const& lhs, Buffer const& rhs) noexcept
    return std::memcmp(lhs.data(), rhs.data(), lhs.size()) == 0;
 }

+inline bool
+operator!=(Buffer const& lhs, Buffer const& rhs) noexcept
+{
+    return !(lhs == rhs);
+}
+
 }  // namespace xrpl
--- a/include/xrpl/basics/FileUtilities.h
+++ b/include/xrpl/basics/FileUtilities.h
@@ -1,79 +1,24 @@
 #pragma once

+#include <boost/filesystem.hpp>
+#include <boost/system/error_code.hpp>
+
 #include <cstddef>
-#include <filesystem>
 #include <optional>
 #include <string>
-#include <system_error>

 namespace xrpl {

 std::string
 getFileContents(
-    std::error_code& ec,
-    std::filesystem::path const& sourcePath,
+    boost::system::error_code& ec,
+    boost::filesystem::path const& sourcePath,
    std::optional<std::size_t> maxSize = std::nullopt);

 void
 writeFileContents(
-    std::error_code& ec,
-    std::filesystem::path const& destPath,
+    boost::system::error_code& ec,
+    boost::filesystem::path const& destPath,
    std::string const& contents);

-/**
- * Generate a unique, non-existing path under @p base whose filename starts with
- * @p prefix and ends with a random hex suffix.
- *
- * Attempts up to @p maxAttempts paths. Throws `std::runtime_error` if a unique
- * path cannot be found or if the filesystem returns an error while checking for
- * existence.
- */
-std::filesystem::path
-uniqueRandomPath(
-    std::filesystem::path const& base,
-    std::string const& prefix = "",
-    std::size_t maxAttempts = 100);
-
-/**
- * RAII temporary directory.
- *
- * The directory and all its contents are deleted when
- * the instance of `TempDir` is destroyed.
- */
-class TempDir
-{
-    std::filesystem::path path_;
-
-public:
-#if !GENERATING_DOCS
-    TempDir(TempDir const&) = delete;
-    TempDir&
-    operator=(TempDir const&) = delete;
-#endif
-
-    /**
-     * Construct a temporary directory.
-     */
-    TempDir();
-
-    /**
-     * Destroy a temporary directory.
-     */
-    ~TempDir();
-
-    /**
-     * Get the native path for the temporary directory.
-     */
-    [[nodiscard]] std::string
-    path() const;
-
-    /**
-     * Get the native path for a file.
-     *
-     * The file does not need to exist.
-     */
-    [[nodiscard]] std::string
-    file(std::string const& name) const;
-};
-
 }  // namespace xrpl
--- a/include/xrpl/basics/IntrusivePointer.h
+++ b/include/xrpl/basics/IntrusivePointer.h
@@ -96,6 +96,9 @@ public:
    SharedIntrusive&
    operator=(SharedIntrusive const& rhs);

+    bool
+    operator!=(std::nullptr_t) const;
+
    bool
    operator==(std::nullptr_t) const;

--- a/include/xrpl/basics/IntrusivePointer.ipp
+++ b/include/xrpl/basics/IntrusivePointer.ipp
@@ -111,6 +111,13 @@ SharedIntrusive<T>::operator=(SharedIntrusive<TT>&& rhs)
    return *this;
 }

+template <class T>
+bool
+SharedIntrusive<T>::operator!=(std::nullptr_t) const
+{
+    return this->get() != nullptr;
+}
+
 template <class T>
 bool
 SharedIntrusive<T>::operator==(std::nullptr_t) const
--- a/include/xrpl/basics/Log.h
+++ b/include/xrpl/basics/Log.h
@@ -3,8 +3,8 @@
 #include <xrpl/beast/utility/Journal.h>

 #include <boost/beast/core/string.hpp>
+#include <boost/filesystem.hpp>

-#include <filesystem>
 #include <fstream>
 #include <map>
 #include <memory>
@@ -84,7 +84,7 @@ private:
         * @return `true` if the file was opened.
         */
        bool
-        open(std::filesystem::path const& path);
+        open(boost::filesystem::path const& path);

        /**
         * Close and re-open the system file associated with the log
@@ -133,7 +133,7 @@ private:

    private:
        std::unique_ptr<std::ofstream> stream_;
-        std::filesystem::path path_;
+        boost::filesystem::path path_;
    };

    std::mutex mutable mutex_;
@@ -152,7 +152,7 @@ public:
    virtual ~Logs() = default;

    bool
-    open(std::filesystem::path const& pathToLogFile);
+    open(boost::filesystem::path const& pathToLogFile);

    beast::Journal::Sink&
    get(std::string const& name);
--- a/include/xrpl/basics/Number.h
+++ b/include/xrpl/basics/Number.h
@@ -304,7 +304,7 @@ concept Integral64 = std::is_same_v<T, std::int64_t> || std::is_same_v<T, std::u
 *      on-ledger are non-negative. This is due to implementation details of
 *      several operations which use unsigned arithmetic internally. This is
 *      sufficient to represent all valid XRP values (where the absolute value
- *      can not exceed kInitialXRP: 10^17), and MPT values (where the absolute
+ *      can not exceed INITIAL_XRP: 10^17), and MPT values (where the absolute
 *      value can not exceed maxMPTokenAmount: 2^63-1).
 *
 * ---- Mantissa Range Switching ----
@@ -449,6 +449,12 @@ public:
            x.exponent_ == y.exponent_;
    }

+    friend constexpr bool
+    operator!=(Number const& x, Number const& y) noexcept
+    {
+        return !(x == y);
+    }
+
    friend constexpr bool
    operator<(Number const& l, Number const& r) noexcept
    {
--- a/include/xrpl/basics/SHAMapHash.h
+++ b/include/xrpl/basics/SHAMapHash.h
@@ -85,6 +85,12 @@ public:
    }
 };

+inline bool
+operator!=(SHAMapHash const& x, SHAMapHash const& y)
+{
+    return !(x == y);
+}
+
 template <>
 inline std::size_t
 extract(SHAMapHash const& key)
--- a/include/xrpl/basics/Slice.h
+++ b/include/xrpl/basics/Slice.h
@@ -208,6 +208,12 @@ operator==(Slice const& lhs, Slice const& rhs) noexcept
    return std::memcmp(lhs.data(), rhs.data(), lhs.size()) == 0;
 }

+inline bool
+operator!=(Slice const& lhs, Slice const& rhs) noexcept
+{
+    return !(lhs == rhs);
+}
+
 inline bool
 operator<(Slice const& lhs, Slice const& rhs) noexcept
 {
--- a/include/xrpl/basics/StringUtilities.h
+++ b/include/xrpl/basics/StringUtilities.h
@@ -2,6 +2,7 @@

 #include <xrpl/basics/Blob.h>

+#include <boost/format.hpp>
 #include <boost/utility/string_view.hpp>

 #include <array>
@@ -124,31 +125,9 @@ struct ParsedUrl
 bool
 parseUrl(ParsedUrl& pUrl, std::string const& strUrl);

-/**
- * Remove leading and trailing ASCII whitespace.
- *
- * Whitespace is the fixed set " \t\n\v\f\r"; the current locale is not
- * consulted, so the result depends only on the input.
- *
- * @param str The string to trim.
- * @return @p str without leading or trailing whitespace.
- */
 std::string
 trimWhitespace(std::string str);

-/**
- * Fold ASCII upper case letters to lower case.
- *
- * Only 'A' through 'Z' are remapped; every other byte is left alone and the
- * current locale is not consulted, so the result depends only on the input.
- *
- * @param str The string to fold.
- * @return @p str with each ASCII upper case letter replaced by its lower case
- *         equivalent.
- */
-std::string
-toLower(std::string str);
-
 std::optional<std::uint64_t>
 toUInt64(std::string const& s);

--- a/include/xrpl/basics/TaggedCache.h
+++ b/include/xrpl/basics/TaggedCache.h
@@ -74,13 +74,20 @@ public:
    using shared_pointer_type = SharedPointerType;

 public:
+    /**
+     * @param cacheHardCap When positive, a hard upper bound on the number of
+     *     strongly-cached entries, enforced by demoting the approximately
+     *     oldest entry whenever growth would exceed it. 0 disables the cap
+     *     (the periodic sweep alone bounds the cache).
+     */
    TaggedCache(
        std::string const& name,
        int size,
        clock_type::duration expiration,
        clock_type& clock,
        beast::Journal journal,
-        beast::insight::Collector::ptr const& collector = beast::insight::NullCollector::make());
+        beast::insight::Collector::ptr const& collector = beast::insight::NullCollector::make(),
+        int cacheHardCap = 0);

 public:
    /**
@@ -357,6 +364,13 @@ private:

    using cache_type = hardened_partitioned_hash_map<key_type, Entry, Hash, KeyEqual>;

+    // Bounded approximate-LRU eviction from a single partition. Keeps the
+    // strong-entry count at/below cacheHardCap_ as new entries are inserted, so
+    // a burst can't drive the cache past its RAM budget between timer sweeps.
+    // No-op unless cacheHardCap_ > 0 (opt-in); caller holds mutex_.
+    void
+    evictForHardCap(cache_type::map_type& partition, cache_type::map_type::iterator const& keep);
+
    [[nodiscard]] std::thread
    sweepHelper(
        clock_type::time_point const& whenExpire,
@@ -390,8 +404,23 @@ private:
    // Desired maximum cache age
    clock_type::duration const targetAge_;

+    // Hard upper bound on strongly-cached entries, enforced by
+    // evictForHardCap whenever the strong count grows (fresh inserts and
+    // weak-to-strong revivals). 0 disables it (sweep-only sizing).
+    int const cacheHardCap_;
+
+    // Total hard-cap evictions (under mutex_); the first marks saturation
+    // onset for logging.
+    std::uint64_t hardCapEvictions_{0};
+
    // Number of items cached
    int cacheCount_{0};
+
+    // Rotating bucket cursor for evictForHardCap so successive over-cap
+    // evictions sweep the whole partition (CLOCK hand) instead of repeatedly
+    // sampling the head buckets. Advanced under mutex_.
+    std::size_t evictHand_{0};
+
    cache_type cache_;  // Hold strong reference to recent objects
    std::uint64_t hits_{0};
    std::uint64_t misses_{0};
--- a/include/xrpl/basics/TaggedCache.ipp
+++ b/include/xrpl/basics/TaggedCache.ipp
@@ -57,7 +57,8 @@ inline TaggedCache<
        clock_type::duration expiration,
        clock_type& clock,
        beast::Journal journal,
-        beast::insight::Collector::ptr const& collector)
+        beast::insight::Collector::ptr const& collector,
+        int cacheHardCap)
    : journal_(journal)
    , clock_(clock)
    , stats_(
@@ -67,6 +68,7 @@ inline TaggedCache<
    , name_(name)
    , targetSize_(size)
    , targetAge_(expiration)
+    , cacheHardCap_(cacheHardCap)
 {
 }

@@ -219,6 +221,102 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
    return true;
 }

+template <
+    class Key,
+    class T,
+    bool IsKeyCache,
+    class SharedWeakUnionPointer,
+    class SharedPointerType,
+    class Hash,
+    class KeyEqual,
+    class Mutex>
+inline void
+TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
+    evictForHardCap(cache_type::map_type& partition, cache_type::map_type::iterator const& keep)
+{
+    // Caller holds mutex_. Only value caches carry strong/weak entries; key
+    // caches never enable the hard cap, so this is a no-op for them.
+    if constexpr (!IsKeyCache)
+    {
+        std::size_t const bucketCount = partition.bucket_count();
+        if (bucketCount == 0)
+            return;
+
+        // Approximate LRU with bounded work per call: sample a window of
+        // strong entries starting at the rotating bucket cursor and demote
+        // the oldest, repeating until the count is back under the cap or the
+        // demotion budget is spent. Growth paths raise the count by one at a
+        // time, so the budget lets eviction catch up without stalling them.
+        constexpr int kEvictSampleBudget = 64;
+        constexpr int kMaxDemotionsPerCall = 8;
+        std::size_t const maxBuckets = std::min<std::size_t>(bucketCount, 4 * kEvictSampleBudget);
+
+        for (int demotions = 0; cacheCount_ > cacheHardCap_ && demotions < kMaxDemotionsPerCall;
+             ++demotions)
+        {
+            int sampled = 0;
+            std::size_t bucketsWalked = 0;
+            key_type oldestKey{};
+            bool haveOldest = false;
+            clock_type::time_point oldestAccess{};
+
+            std::size_t b = evictHand_ % bucketCount;
+            while (sampled < kEvictSampleBudget && bucketsWalked < maxBuckets)
+            {
+                for (auto lit = partition.begin(b); lit != partition.end(b); ++lit)
+                {
+                    if (lit->first == keep->first || lit->second.isWeak())
+                        continue;
+                    if (!haveOldest || lit->second.lastAccess < oldestAccess)
+                    {
+                        oldestAccess = lit->second.lastAccess;
+                        oldestKey = lit->first;
+                        haveOldest = true;
+                    }
+                    if (++sampled >= kEvictSampleBudget)
+                        break;
+                }
+                b = (b + 1) % bucketCount;
+                ++bucketsWalked;
+            }
+            evictHand_ = b;  // resume the scan here on the next over-cap call
+
+            if (!haveOldest)
+            {
+                JLOG(journal_.debug()) << name_ << ": over hard cap " << cacheHardCap_
+                                       << " but eviction sample found no strong entry to demote";
+                return;
+            }
+
+            auto oldest = partition.find(oldestKey);
+            if (oldest == partition.end() || oldest == keep || oldest->second.isWeak())
+                return;
+
+            if (oldest->second.ptr.useCount() == 1)
+            {
+                // Sole owner: release entirely.
+                partition.erase(oldest);
+            }
+            else
+            {
+                // Others hold it: keep it weakly tracked.
+                oldest->second.ptr.convertToWeak();
+            }
+            --cacheCount_;
+
+            // First eviction marks saturation onset; then a heartbeat every
+            // 100k to avoid flooding.
+            ++hardCapEvictions_;
+            if (hardCapEvictions_ == 1 || hardCapEvictions_ % 100000 == 0)
+            {
+                JLOG(journal_.warn()) << name_ << ": hard-cap eviction #" << hardCapEvictions_
+                                      << " (cap " << cacheHardCap_ << ", strong " << cacheCount_
+                                      << ") - cache saturated, growth now evicts";
+            }
+        }
+    }
+}
+
 template <
    class Key,
    class T,
@@ -360,11 +458,17 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,

    if (cit == cache_.end())
    {
-        cache_.emplace(
-            std::piecewise_construct,
-            std::forward_as_tuple(key),
-            std::forward_as_tuple(clock_.now(), data));
+        auto const emplacedIt = cache_
+                                    .emplace(
+                                        std::piecewise_construct,
+                                        std::forward_as_tuple(key),
+                                        std::forward_as_tuple(clock_.now(), data))
+                                    .first;
        ++cacheCount_;
+        // The just-inserted entry is the newest; evictForHardCap skips it
+        // and drops the oldest in its partition.
+        if (cacheHardCap_ > 0 && cacheCount_ > cacheHardCap_)
+            evictForHardCap(*emplacedIt.ait, emplacedIt.mit);
        return false;
    }

@@ -415,11 +519,15 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
        }

        ++cacheCount_;
+        if (cacheHardCap_ > 0 && cacheCount_ > cacheHardCap_)
+            evictForHardCap(*cit.ait, cit.mit);
        return true;
    }

    entry.ptr = data;
    ++cacheCount_;
+    if (cacheHardCap_ > 0 && cacheCount_ > cacheHardCap_)
+        evictForHardCap(*cit.ait, cit.mit);

    return false;
 }
@@ -729,6 +837,8 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
    {
        // independent of cache size, so not counted as a hit
        ++cacheCount_;
+        if (cacheHardCap_ > 0 && cacheCount_ > cacheHardCap_)
+            evictForHardCap(*cit.ait, cit.mit);
        entry.touch(clock_.now());
        return entry.ptr.getStrong();
    }
--- a/include/xrpl/basics/base64.h
+++ b/include/xrpl/basics/base64.h
@@ -41,35 +41,6 @@

 namespace xrpl {

-namespace base64 {
-
-/**
- * Returns the maximum number of characters needed to base64-encode @p nBytes bytes.
- *
- * @param nBytes Number of input bytes.
- * @return Size of the encoded string, including padding.
- */
-constexpr std::size_t
-encodedSize(std::size_t const nBytes)
-{
-    return 4 * ((nBytes + 2) / 3);
-}
-
-/**
- * Returns the maximum number of bytes a base64 string of @p numChars characters
- * decodes to.
- *
- * @param numChars Number of base64 characters.
- * @return Upper bound on the number of decoded bytes.
- */
-constexpr std::size_t
-decodedSize(std::size_t const numChars)
-{
-    return ((numChars / 4) * 3) + 2;
-}
-
-}  // namespace base64
-
 std::string
 base64Encode(std::uint8_t const* data, std::size_t len);

--- a/include/xrpl/basics/partitioned_unordered_map.h
+++ b/include/xrpl/basics/partitioned_unordered_map.h
@@ -116,6 +116,12 @@ public:
        {
            return lhs.map == rhs.map && lhs.ait == rhs.ait && lhs.mit == rhs.mit;
        }
+
+        friend bool
+        operator!=(Iterator const& lhs, Iterator const& rhs)
+        {
+            return !(lhs == rhs);
+        }
    };

    struct ConstIterator
@@ -183,6 +189,12 @@ public:
        {
            return lhs.map == rhs.map && lhs.ait == rhs.ait && lhs.mit == rhs.mit;
        }
+
+        friend bool
+        operator!=(ConstIterator const& lhs, ConstIterator const& rhs)
+        {
+            return !(lhs == rhs);
+        }
    };

 private:
--- a/include/xrpl/beast/container/detail/aged_ordered_container.h
+++ b/include/xrpl/beast/container/detail/aged_ordered_container.h
@@ -1038,6 +1038,25 @@ public:
               Compare,
               OtherAllocator> const& other) const;

+    template <
+        bool OtherIsMulti,
+        bool OtherIsMap,
+        class OtherT,
+        class OtherDuration,
+        class OtherAllocator>
+    bool
+    operator!=(AgedOrderedContainer<
+               OtherIsMulti,
+               OtherIsMap,
+               Key,
+               OtherT,
+               OtherDuration,
+               Compare,
+               OtherAllocator> const& other) const
+    {
+        return !(this->operator==(other));
+    }
+
    template <
        bool OtherIsMulti,
        bool OtherIsMap,
--- a/include/xrpl/beast/container/detail/aged_unordered_container.h
+++ b/include/xrpl/beast/container/detail/aged_unordered_container.h
@@ -1340,6 +1340,28 @@ public:
               OtherAllocator> const& other) const
        requires MaybeMulti;

+    template <
+        bool OtherIsMulti,
+        bool OtherIsMap,
+        class OtherKey,
+        class OtherT,
+        class OtherDuration,
+        class OtherHash,
+        class OtherAllocator>
+    bool
+    operator!=(AgedUnorderedContainer<
+               OtherIsMulti,
+               OtherIsMap,
+               OtherKey,
+               OtherT,
+               OtherDuration,
+               OtherHash,
+               KeyEqual,
+               OtherAllocator> const& other) const
+    {
+        return !(this->operator==(other));
+    }
+
 private:
    bool
    wouldExceed(size_type additional) const
--- a/include/xrpl/beast/core/List.h
+++ b/include/xrpl/beast/core/List.h
@@ -82,6 +82,13 @@ public:
        return node_ == other.node_;
    }

+    template <typename M>
+    bool
+    operator!=(ListIterator<M> const& other) const noexcept
+    {
+        return !((*this) == other);
+    }
+
    reference
    operator*() const noexcept
    {
--- a/include/xrpl/beast/net/IPEndpoint.h
+++ b/include/xrpl/beast/net/IPEndpoint.h
@@ -110,6 +110,12 @@ public:
    operator==(Endpoint const& lhs, Endpoint const& rhs);
    friend bool
    operator<(Endpoint const& lhs, Endpoint const& rhs);
+
+    friend bool
+    operator!=(Endpoint const& lhs, Endpoint const& rhs)
+    {
+        return !(lhs == rhs);
+    }
    friend bool
    operator>(Endpoint const& lhs, Endpoint const& rhs)
    {
--- a/include/xrpl/beast/rfc2616.h
+++ b/include/xrpl/beast/rfc2616.h
@@ -11,7 +11,6 @@
 #include <cstddef>
 #include <iterator>
 #include <string>
-#include <string_view>
 #include <vector>

 namespace beast::rfc2616 {
@@ -187,7 +186,7 @@ splitCommas(FwdIt first, FwdIt last)

 template <class Result = std::vector<std::string>>
 Result
-splitCommas(std::string_view s)
+splitCommas(boost::beast::string_view const& s)
 {
    return splitCommas(s.begin(), s.end());
 }
@@ -230,6 +229,12 @@ public:
        return other.it_ == it_ && other.end_ == end_ && other.value_.size() == value_.size();
    }

+    bool
+    operator!=(ListIterator const& other) const
+    {
+        return !(*this == other);
+    }
+
    reference
    operator*() const
    {
--- a/include/xrpl/beast/unit_test/reporter.h
+++ b/include/xrpl/beast/unit_test/reporter.h
@@ -8,6 +8,7 @@
 #include <xrpl/beast/unit_test/runner.h>
 #include <xrpl/beast/unit_test/suite_info.h>

+#include <boost/lexical_cast.hpp>
 #include <boost/optional.hpp>

 #include <algorithm>
@@ -187,7 +188,7 @@ Reporter<Unused>::fmtdur(clock_type::duration const& d)
    using namespace std::chrono;
    auto const ms = duration_cast<milliseconds>(d);
    if (ms < seconds{1})
-        return std::to_string(ms.count()) + "ms";
+        return boost::lexical_cast<std::string>(ms.count()) + "ms";
    std::stringstream ss;
    ss << std::fixed << std::setprecision(1) << (ms.count() / 1000.) << "s";
    return ss.str();
--- a/include/xrpl/beast/unit_test/suite.h
+++ b/include/xrpl/beast/unit_test/suite.h
@@ -6,10 +6,11 @@

 #include <xrpl/beast/unit_test/runner.h>

+#include <boost/filesystem.hpp>
+#include <boost/lexical_cast.hpp>
 #include <boost/throw_exception.hpp>

 #include <exception>
-#include <filesystem>
 #include <memory>
 #include <ostream>
 #include <sstream>
@@ -26,10 +27,10 @@ makeReason(String const& reason, char const* file, int line)
    std::string s(reason);
    if (!s.empty())
        s.append(": ");
-    namespace fs = std::filesystem;
+    namespace fs = boost::filesystem;
    s.append(fs::path{file}.filename().string());
    s.append("(");
-    s.append(std::to_string(line));
+    s.append(boost::lexical_cast<std::string>(line));
    s.append(")");
    return s;
 }
--- a/include/xrpl/beast/utility/temp_dir.h
+++ b/include/xrpl/beast/utility/temp_dir.h
@@ -0,0 +1,71 @@
+#pragma once
+
+#include <boost/filesystem.hpp>
+
+#include <string>
+
+namespace beast {
+
+/**
+ * RAII temporary directory.
+ *
+ * The directory and all its contents are deleted when
+ * the instance of `temp_dir` is destroyed.
+ */
+class TempDir
+{
+    boost::filesystem::path path_;
+
+public:
+#if !GENERATING_DOCS
+    TempDir(TempDir const&) = delete;
+    TempDir&
+    operator=(TempDir const&) = delete;
+#endif
+
+    /**
+     * Construct a temporary directory.
+     */
+    TempDir()
+    {
+        auto const dir = boost::filesystem::temp_directory_path();
+        do
+        {
+            path_ = dir / boost::filesystem::unique_path();
+        } while (boost::filesystem::exists(path_));
+        boost::filesystem::create_directory(path_);
+    }
+
+    /**
+     * Destroy a temporary directory.
+     */
+    ~TempDir()
+    {
+        // use non-throwing calls in the destructor
+        boost::system::error_code ec;
+        boost::filesystem::remove_all(path_, ec);
+        // TODO: warn/notify if ec set ?
+    }
+
+    /**
+     * Get the native path for the temporary directory
+     */
+    [[nodiscard]] std::string
+    path() const
+    {
+        return path_.string();
+    }
+
+    /**
+     * Get the native path for the a file.
+     *
+     * The file does not need to exist.
+     */
+    [[nodiscard]] std::string
+    file(std::string const& name) const
+    {
+        return (path_ / name).string();
+    }
+};
+
+}  // namespace beast
--- a/include/xrpl/conditions/Condition.h
+++ b/include/xrpl/conditions/Condition.h
@@ -92,4 +92,10 @@ operator==(Condition const& lhs, Condition const& rhs)
        lhs.fingerprint == rhs.fingerprint;
 }

+inline bool
+operator!=(Condition const& lhs, Condition const& rhs)
+{
+    return !(lhs == rhs);
+}
+
 }  // namespace xrpl::cryptoconditions
--- a/include/xrpl/conditions/Fulfillment.h
+++ b/include/xrpl/conditions/Fulfillment.h
@@ -93,6 +93,12 @@ operator==(Fulfillment const& lhs, Fulfillment const& rhs)
        lhs.fingerprint() == rhs.fingerprint();
 }

+inline bool
+operator!=(Fulfillment const& lhs, Fulfillment const& rhs)
+{
+    return !(lhs == rhs);
+}
+
 /**
 * Determine whether the given fulfillment and condition match
 */
--- a/include/xrpl/config/BasicConfig.h
+++ b/include/xrpl/config/BasicConfig.h
@@ -2,6 +2,7 @@

 #include <xrpl/basics/contract.h>

+#include <boost/beast/core/string.hpp>
 #include <boost/lexical_cast.hpp>

 #include <algorithm>
--- a/include/xrpl/config/Constants.h
+++ b/include/xrpl/config/Constants.h
@@ -22,11 +22,13 @@ struct Sections
    static constexpr auto kIoWorkers = "io_workers";
    static constexpr auto kIps = "ips";
    static constexpr auto kIpsFixed = "ips_fixed";
+    static constexpr auto kLedgerCacheAge = "ledger_cache_age";
+    static constexpr auto kLedgerFetchSize = "ledger_fetch_size";
    static constexpr auto kLedgerHistory = "ledger_history";
    static constexpr auto kLedgerReplay = "ledger_replay";
    static constexpr auto kLedgerTxTables = "ledger_tx_tables";
-    static constexpr auto kMaxSubscriptionsPerConnection = "max_subscriptions_per_connection";
    static constexpr auto kMaxTransactions = "max_transactions";
+    static constexpr auto kMemoryLimit = "memory_limit";
    static constexpr auto kNetworkId = "network_id";
    static constexpr auto kNetworkQuorum = "network_quorum";
    static constexpr auto kNodeDatabase = "node_db";
@@ -64,6 +66,7 @@ struct Sections
    static constexpr auto kSslVerifyFile = "ssl_verify_file";
    static constexpr auto kSweepInterval = "sweep_interval";
    static constexpr auto kTransactionQueue = "transaction_queue";
+    static constexpr auto kTreeCacheAge = "tree_cache_age";
    static constexpr auto kValidationSeed = "validation_seed";
    static constexpr auto kValidatorKeys = "validator_keys";
    static constexpr auto kValidatorKeyRevocation = "validator_key_revocation";
@@ -119,9 +122,7 @@ struct Keys
    static constexpr auto kLogInterval = "log_interval";
    static constexpr auto kMaxDivergedTime = "max_diverged_time";
    static constexpr auto kMaxLedgerCountsToStore = "max_ledger_counts_to_store";
-    static constexpr auto kMaxTrustedCount = "max_trusted_count";
    static constexpr auto kMaxUnknownTime = "max_unknown_time";
-    static constexpr auto kMaxUntrustedCount = "max_untrusted_count";
    static constexpr auto kMaximumTxnInLedger = "maximum_txn_in_ledger";
    static constexpr auto kMaximumTxnPerAccount = "maximum_txn_per_account";
    static constexpr auto kMemoryLevel = "memory_level";
--- a/include/xrpl/consensus/Consensus.h
+++ b/include/xrpl/consensus/Consensus.h
@@ -21,7 +21,6 @@
 #include <map>
 #include <memory>
 #include <optional>
-#include <ranges>
 #include <sstream>
 #include <string>
 #include <utility>
@@ -1580,13 +1579,7 @@ Consensus<Adaptor>::updateOurPositions(std::unique_ptr<std::stringstream> const&
        JLOG(j_.info()) << ss.str();
        CLOG(clog) << ss.str();

-        // Walk the votes highest-time first so that, among close times tied
-        // for the most votes, the earliest wins. The smaller value is the
-        // safer choice: without close-time consensus this round, the winner
-        // only updates our position for the next proposal, and a too-early
-        // time is bounded below by the prior ledger's close time. Only the
-        // tie-break changes; the bin with the most votes still wins.
-        for (auto const& [t, v] : std::views::reverse(closeTimeVotes))
+        for (auto const& [t, v] : closeTimeVotes)
        {
            JLOG(j_.debug()) << "CCTime: seq "
                             << static_cast<std::uint32_t>(previousLedger_.seq()) + 1 << ": "
--- a/include/xrpl/consensus/ConsensusTypes.h
+++ b/include/xrpl/consensus/ConsensusTypes.h
@@ -8,9 +8,7 @@

 #include <chrono>
 #include <cstddef>
-#include <cstdint>
 #include <map>
-#include <optional>
 #include <string>

 namespace xrpl {
@@ -191,75 +189,6 @@ struct ConsensusCloseTimes
    NetClock::time_point self;
 };

-/**
- * Offset of the network's close time relative to ours, using a weighted median.
- *
- * Treats the sample set as `{self x 1}` merged with `{t x w}` for each
- * `(t, w)` in `times.peers`, in time order, and returns `(median - self)`
- * in whole seconds. Uses the lower weighted median: the median is the
- * earliest time at which the running weight reaches half the total, so an
- * even total whose halfway point falls between two bins resolves to the
- * earlier bin.
- *
- * @param times Our own close time and the weighted close times of peers.
- * @return Weighted median of all close times minus our own, in whole seconds.
- */
-inline std::chrono::seconds
-medianCloseOffset(ConsensusCloseTimes const& times)
-{
-    using namespace std::chrono;
-    using time_point = NetClock::time_point;
-
-    std::int64_t totalWeight = 1;
-    for (auto const& [_, w] : times.peers)
-        totalWeight += w;
-
-    std::int64_t const halfWeight = (totalWeight + 1) / 2;
-
-    std::optional<time_point> median{};
-    std::int64_t tally = 0;
-    bool selfPlaced = false;
-
-    // Accumulate weight in time order; the first bin to reach halfWeight is
-    // the (lower) weighted median. Returns true once that bin is found.
-    auto step = [&](time_point t, std::int64_t w) {
-        XRPL_ASSERT(tally < halfWeight, "xrpl::medianCloseOffset::step : median not yet found");
-        tally += w;
-        if (tally >= halfWeight)
-        {
-            median = t;
-            return true;
-        }
-        return false;
-    };
-
-    for (auto const& [t, w] : times.peers)
-    {
-        if (!selfPlaced && times.self <= t)
-        {
-            selfPlaced = true;
-            if (step(times.self, 1))
-                break;
-        }
-        if (step(t, w))
-            break;
-    }
-    if (!selfPlaced && !median)
-        step(times.self, 1);
-
-    if (!median)
-    {
-        // LCOV_EXCL_START
-        UNREACHABLE("xrpl::medianCloseOffset : median not found");
-        median = times.self;
-        // LCOV_EXCL_STOP
-    }
-
-    return duration_cast<seconds>(
-        duration<std::int64_t>{median->time_since_epoch().count()} -
-        duration<std::int64_t>{times.self.time_since_epoch().count()});
-}
-
 /**
 * Whether we have or don't have a consensus
 */
--- a/include/xrpl/core/PerfLog.h
+++ b/include/xrpl/core/PerfLog.h
@@ -4,9 +4,10 @@
 #include <xrpl/core/Job.h>
 #include <xrpl/json/json_value.h>

+#include <boost/filesystem.hpp>
+
 #include <chrono>
 #include <cstdint>
-#include <filesystem>
 #include <functional>
 #include <memory>
 #include <string>
@@ -43,7 +44,7 @@ public:
     */
    struct Setup
    {
-        std::filesystem::path perfLog;
+        boost::filesystem::path perfLog;
        // log_interval is in milliseconds to support faster testing.
        milliseconds logInterval{seconds(1)};
    };
@@ -148,7 +149,7 @@ public:
 };

 PerfLog::Setup
-setupPerfLog(Section const& section, std::filesystem::path const& configDir);
+setupPerfLog(Section const& section, boost::filesystem::path const& configDir);

 std::unique_ptr<PerfLog>
 makePerfLog(
--- a/include/xrpl/json/Output.h
+++ b/include/xrpl/json/Output.h
@@ -1,19 +1,20 @@
 #pragma once

+#include <boost/beast/core/string.hpp>
+
 #include <functional>
 #include <string>
-#include <string_view>

 namespace json {

 class Value;

-using Output = std::function<void(std::string_view)>;
+using Output = std::function<void(boost::beast::string_view const&)>;

 inline Output
 stringOutput(std::string& s)
 {
-    return [&](std::string_view b) { s.append(b.data(), b.size()); };
+    return [&](boost::beast::string_view const& b) { s.append(b.data(), b.size()); };
 }

 /**
--- a/include/xrpl/json/json_value.h
+++ b/include/xrpl/json/json_value.h
@@ -4,7 +4,6 @@
 #include <xrpl/json/json_forwards.h>

 #include <cstring>
-#include <iterator>
 #include <limits>
 #include <map>
 #include <string>
@@ -73,18 +72,36 @@ operator==(StaticString x, StaticString y)
    return strcmp(x.cStr(), y.cStr()) == 0;
 }

+inline bool
+operator!=(StaticString x, StaticString y)
+{
+    return !(x == y);
+}
+
 inline bool
 operator==(std::string const& x, StaticString y)
 {
    return strcmp(x.c_str(), y.cStr()) == 0;
 }

+inline bool
+operator!=(std::string const& x, StaticString y)
+{
+    return !(x == y);
+}
+
 inline bool
 operator==(StaticString x, std::string const& y)
 {
    return y == x;
 }

+inline bool
+operator!=(StaticString x, std::string const& y)
+{
+    return !(y == x);
+}
+
 /**
 * @brief Represents a <a HREF="http://www.json.org">JSON</a> value.
 *
@@ -472,6 +489,12 @@ toJson(xrpl::Number const& number)
 bool
 operator==(Value const&, Value const&);

+inline bool
+operator!=(Value const& x, Value const& y)
+{
+    return !(x == y);
+}
+
 bool
 operator<(Value const&, Value const&);

@@ -525,7 +548,6 @@ public:
 class ValueIteratorBase
 {
 public:
-    using iterator_category = std::bidirectional_iterator_tag;
    using size_t = unsigned int;
    using difference_type = int;
    using SelfType = ValueIteratorBase;
@@ -540,6 +562,12 @@ public:
        return isEqual(other);
    }

+    bool
+    operator!=(SelfType const& other) const
+    {
+        return !isEqual(other);
+    }
+
    /**
     * Return either the index or the member name of the referenced value as a
     * Value.
--- a/include/xrpl/ledger/BookDirs.h
+++ b/include/xrpl/ledger/BookDirs.h
@@ -49,6 +49,12 @@ public:
    bool
    operator==(const_iterator const& other) const;

+    bool
+    operator!=(const_iterator const& other) const
+    {
+        return !(*this == other);
+    }
+
    reference
    operator*() const;

--- a/include/xrpl/ledger/CanonicalTXSet.h
+++ b/include/xrpl/ledger/CanonicalTXSet.h
@@ -59,6 +59,12 @@ private:
            return lhs.txId_ == rhs.txId_;
        }

+        friend bool
+        operator!=(Key const& lhs, Key const& rhs)
+        {
+            return !(lhs == rhs);
+        }
+
        [[nodiscard]] uint256 const&
        getAccount() const
        {
--- a/include/xrpl/ledger/Dir.h
+++ b/include/xrpl/ledger/Dir.h
@@ -59,6 +59,12 @@ public:
    bool
    operator==(ConstIterator const& other) const;

+    bool
+    operator!=(ConstIterator const& other) const
+    {
+        return !(*this == other);
+    }
+
    reference
    operator*() const;

--- a/include/xrpl/ledger/View.h
+++ b/include/xrpl/ledger/View.h
@@ -35,11 +35,6 @@ enum class SkipEntry : bool { No = false, Yes };
 //
 //------------------------------------------------------------------------------

-/**
- * Whether an expiration check should be inclusive or exclusive.
- */
-enum class ExpiryComparison { Inclusive, Exclusive };
-
 /**
 * Determines whether the given expiration time has passed.
 *
@@ -59,16 +54,11 @@ enum class ExpiryComparison { Inclusive, Exclusive };
 *
 * @param view The ledger whose parent time is used as the clock.
 * @param exp The optional expiration time we want to check.
- * @param comparison Whether the boundary is inclusive (`now >= exp`, the
- *                   default) or exclusive (`now > exp`).
 *
 * @return `true` if `exp` is in the past; `false` otherwise.
 */
 [[nodiscard]] bool
-hasExpired(
-    ReadView const& view,
-    std::optional<std::uint32_t> const& exp,
-    ExpiryComparison comparison = ExpiryComparison::Inclusive);
+hasExpired(ReadView const& view, std::optional<std::uint32_t> const& exp);

 // Note, depth parameter is used to limit the recursion depth
 [[nodiscard]] bool
@@ -78,13 +68,6 @@ isVaultPseudoAccountFrozen(
    MPTIssue const& mptShare,
    std::uint8_t depth);

-[[nodiscard]] bool
-isVaultPseudoAccountFrozen(
-    ReadView const& view,
-    AccountID const& account,
-    SLE const& issuanceSle,
-    std::uint8_t depth);
-
 [[nodiscard]] bool
 isLPTokenFrozen(
    ReadView const& view,
@@ -92,26 +75,6 @@ isLPTokenFrozen(
    Asset const& asset,
    Asset const& asset2);

-/**
- * Check whether an AMM LPToken may be transferred between @p from and @p to.
- *
- * @p lpTokenIssuer is the issuer of the LPToken being moved. If it is not an
- * AMM account the token is not an LPToken and the transfer is unconditionally
- * permitted. Otherwise, for each MPT pool asset of that AMM, canTransfer() must
- * permit the transfer (which exempts the MPT issuer). Non-MPT pool assets are
- * always transferable by this check, so it is implicitly gated by
- * featureMPTokensV2 (MPTs can only be AMM pool assets once V2 is enabled).
- *
- * @return tesSUCCESS if permitted, otherwise the canTransfer() failure code
- * (e.g. tecNO_AUTH) of the first MPT pool asset that disallows it.
- */
-[[nodiscard]] TER
-canTransferLPToken(
-    ReadView const& view,
-    AccountID const& from,
-    AccountID const& to,
-    AccountID const& lpTokenIssuer);
-
 // Return the list of enabled amendments
 [[nodiscard]] std::set<uint256>
 getEnabledAmendments(ReadView const& view);
--- a/include/xrpl/ledger/detail/ReadViewFwdRange.h
+++ b/include/xrpl/ledger/detail/ReadViewFwdRange.h
@@ -85,6 +85,9 @@ public:
        bool
        operator==(Iterator const& other) const;

+        bool
+        operator!=(Iterator const& other) const;
+
        // Can throw
        reference
        operator*() const;
--- a/include/xrpl/ledger/detail/ReadViewFwdRange.ipp
+++ b/include/xrpl/ledger/detail/ReadViewFwdRange.ipp
@@ -64,6 +64,13 @@ ReadViewFwdRange<ValueType>::Iterator::operator==(Iterator const& other) const
    return impl_ == other.impl_;
 }

+template <class ValueType>
+bool
+ReadViewFwdRange<ValueType>::Iterator::operator!=(Iterator const& other) const
+{
+    return !(*this == other);
+}
+
 template <class ValueType>
 auto
 ReadViewFwdRange<ValueType>::Iterator::operator*() const -> reference
--- a/include/xrpl/ledger/helpers/AMMHelpers.h
+++ b/include/xrpl/ledger/helpers/AMMHelpers.h
@@ -226,7 +226,7 @@ getAMMOfferStartWithTakerGets(

    auto getAmounts = [&pool, &tfee](Number const& nTakerGetsProposed) {
        // Round downward to minimize the offer and to maximize the quality.
-        // This has the most impact when takerGets is integral.
+        // This has the most impact when takerGets is XRP.
        auto const takerGets =
            toAmount<TOut>(getAsset(pool.out), nTakerGetsProposed, Number::RoundingMode::Downward);
        return TAmounts<TIn, TOut>{swapAssetOut(pool, takerGets, tfee), takerGets};
@@ -294,7 +294,7 @@ getAMMOfferStartWithTakerPays(

    auto getAmounts = [&pool, &tfee](Number const& nTakerPaysProposed) {
        // Round downward to minimize the offer and to maximize the quality.
-        // This has the most impact when takerPays is integral.
+        // This has the most impact when takerPays is XRP.
        auto const takerPays =
            toAmount<TIn>(getAsset(pool.in), nTakerPaysProposed, Number::RoundingMode::Downward);
        return TAmounts<TIn, TOut>{takerPays, swapAssetIn(pool, takerPays, tfee)};
@@ -313,11 +313,11 @@ getAMMOfferStartWithTakerPays(
 * is equal to LOB quality (in this case AMM offer quality is
 * better than LOB quality) or AMM offer is equal to LOB quality
 * (in this case SPQ is better than LOB quality).
- * Pre-amendment code calculates takerPays first. If takerGets is the
- * economically coarser integral side, it is rounded down, which results in
- * worse offer quality than LOB quality, and the offer might fail to generate.
- * Post-amendment code calculates the economically coarser integral offer side
- * first. The result is rounded down, which makes the offer quality better.
+ * Pre-amendment code calculates takerPays first. If takerGets is XRP,
+ * it is rounded down, which results in worse offer quality than
+ * LOB quality, and the offer might fail to generate.
+ * Post-amendment code calculates the XRP offer side first. The result
+ * is rounded down, which makes the offer quality better.
 *   It might not be possible to match either SPQ or AMM offer to LOB
 * quality. This generally happens at higher fees.
 * @param pool AMM pool balances
@@ -396,18 +396,10 @@ changeSpotPriceQuality(
        return std::nullopt;
    }

+    // Generate the offer starting with XRP side. Return seated offer amounts
+    // if the offer can be generated, otherwise nullopt.
    auto amounts = [&]() {
-        bool const inIntegral = getAsset(pool.in).integral();
-        bool const outIntegral = getAsset(pool.out).integral();
-
-        // Preserve historical behavior for fractional pairs and XRP/IOU-style
-        // one-integral-side pairs. For two integral assets, pick the side whose
-        // minimum unit is economically coarser at this quality.
-        //
-        // Quality::rate() is input units per output unit, so one output unit is
-        // coarser when it costs at least one input unit. Ties use takerGets,
-        // matching the historical XRP-output behavior.
-        if (outIntegral && (!inIntegral || Number(quality.rate()) >= 1))
+        if (isXRP(getAsset(pool.out)))
            return getAMMOfferStartWithTakerGets(pool, quality, tfee);
        return getAMMOfferStartWithTakerPays(pool, quality, tfee);
    }();
--- a/include/xrpl/ledger/helpers/CredentialHelpers.h
+++ b/include/xrpl/ledger/helpers/CredentialHelpers.h
@@ -7,7 +7,6 @@
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/Rules.h>
 #include <xrpl/protocol/STArray.h>
 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol/STTx.h>
@@ -35,7 +34,7 @@ deleteSLE(ApplyView& view, SLE::ref sleCredential, beast::Journal j);

 // Amendment and parameters checks for sfCredentialIDs field
 NotTEC
-checkFields(STTx const& tx, Rules const& rules, beast::Journal j);
+checkFields(STTx const& tx, beast::Journal j);

 // Accessing the ledger to check if provided credentials are valid. Do not use
 // in doApply (only in preclaim) since it does not remove expired credentials.
--- a/include/xrpl/ledger/helpers/EscrowHelpers.h
+++ b/include/xrpl/ledger/helpers/EscrowHelpers.h
@@ -2,7 +2,6 @@

 #include <xrpl/basics/Log.h>
 #include <xrpl/beast/utility/Journal.h>
-#include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/helpers/AccountRootHelpers.h>
 #include <xrpl/ledger/helpers/MPTokenHelpers.h>
@@ -16,7 +15,6 @@
 #include <xrpl/protocol/Issue.h>
 #include <xrpl/protocol/Keylet.h>
 #include <xrpl/protocol/LedgerFormats.h>
-#include <xrpl/protocol/MPTAmount.h>
 #include <xrpl/protocol/MPTIssue.h>
 #include <xrpl/protocol/Rate.h>
 #include <xrpl/protocol/SField.h>
@@ -243,25 +241,10 @@ escrowUnlockApplyHelper<MPTIssue>(
    auto finalAmt = amount;
    if ((!senderIssuer && !receiverIssuer) && lockedRate != kParityRate)
    {
-        if (ctx.view.rules().enabled(fixCleanup3_4_0))
-        {
-            XRPL_ASSERT(
-                lockedRate >= kParityRate,
-                "xrpl::escrowUnlockApplyHelper<MPTIssue> : lockedRate is at least parity");
-            // MPTs are integral, so round the delivered amount down and
-            // charge any fractional transfer fee to the escrowed amount.
-            auto const delivered =
-                mulRatio(amount.mpt(), kParityRate.value, lockedRate.value, false);
-            finalAmt = STAmount(amount.asset(), delivered.value());
-        }
-        else
-        {
-            // compute transfer fee, if any
-            auto const xferFee =
-                amount.value() - divideRound(amount, lockedRate, amount.asset(), true);
-            // compute balance to transfer
-            finalAmt = amount.value() - xferFee;
-        }
+        // compute transfer fee, if any
+        auto const xferFee = amount.value() - divideRound(amount, lockedRate, amount.asset(), true);
+        // compute balance to transfer
+        finalAmt = amount.value() - xferFee;
    }
    return unlockEscrowMPT(
        ctx.view,
--- a/include/xrpl/ledger/helpers/MPTokenHelpers.h
+++ b/include/xrpl/ledger/helpers/MPTokenHelpers.h
@@ -29,9 +29,6 @@ namespace xrpl {
 [[nodiscard]] bool
 isGlobalFrozen(ReadView const& view, MPTIssue const& mptIssue);

-[[nodiscard]] bool
-isGlobalFrozen(SLE const& issuanceSle);
-
 /**
 * Returns true if @p account's MPToken for @p mptIssue carries the
 * individual-lock flag (lsfMPTLocked).
@@ -43,29 +40,9 @@ isGlobalFrozen(SLE const& issuanceSle);
 * receive tokens — it combines isIndividualFrozen, isGlobalFrozen, and
 * isVaultPseudoAccountFrozen into a single complete check.
 */
-
 [[nodiscard]] bool
 isIndividualFrozen(ReadView const& view, AccountID const& account, MPTIssue const& mptIssue);

-[[nodiscard]] bool
-isIndividualFrozen(SLE const& mptSle);
-
-/**
- * Returns true if @p account cannot send or receive tokens of @p mptIssue
- * because a freeze applies. This is the complete check callers should use
- * before moving MPT value: it combines @ref isGlobalFrozen (issuance-level
- * lock), @ref isIndividualFrozen (per-holder lock bit), and the transitive
- * vault pseudo-account check (if @p mptIssue is a vault share, the underlying
- * asset is checked, and so on recursively up to @c maxAssetCheckDepth).
- *
- * The @c SLE overload takes an already-loaded ltMPTOKEN or ltMPTOKEN_ISSUANCE
- * ledger entry; for ltMPTOKEN it can skip the per-holder individual-lock lookup.
- * @ref isAnyFrozen answers the same question for a set of accounts and returns true
- * if the freeze applies to any of them.
- *
- * @param depth Current recursion depth for the vault-share walk. Callers
- * outside this module should leave it at the default.
- */
 [[nodiscard]] bool
 isFrozen(
    ReadView const& view,
@@ -73,18 +50,6 @@ isFrozen(
    MPTIssue const& mptIssue,
    std::uint8_t depth = 0);

-/**
- * SLE overload: pass an already-loaded ltMPTOKEN (holder row) or
- * ltMPTOKEN_ISSUANCE to reuse it for the freeze checks and avoid re-reading
- * the same object. For an ltMPTOKEN, @p sle is used directly for the
- * individual-lock check and the issuance is read once for global-freeze and
- * vault-pseudo-account. For an ltMPTOKEN_ISSUANCE, @p sle is used directly
- * for global-freeze and vault-pseudo-account, and the caller's holder row is
- * read for the individual-lock check.
- */
-[[nodiscard]] bool
-isFrozen(ReadView const& view, AccountID const& account, SLE const& sle, std::uint8_t depth = 0);
-
 [[nodiscard]] bool
 isAnyFrozen(
    ReadView const& view,
@@ -296,14 +261,6 @@ checkCreateMPT(
    xrpl::MPTIssue const& mptIssue,
    xrpl::AccountID const& holder,
    SLE::ref sponsorSle,
-    std::uint32_t flags,
-    beast::Journal j);
-
-TER
-checkCreateMPT(
-    xrpl::ApplyView& view,
-    xrpl::MPTIssue const& mptIssue,
-    xrpl::AccountID const& holder,
    beast::Journal j);

 //------------------------------------------------------------------------------
--- a/include/xrpl/ledger/helpers/VaultHelpers.h
+++ b/include/xrpl/ledger/helpers/VaultHelpers.h
@@ -6,13 +6,10 @@
 #include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/STLedgerEntry.h>

-#include <cstdint>
 #include <optional>

 namespace xrpl {

-class STTx;
-
 /**
 * From the perspective of a vault, return the number of shares to give
 * depositor when they offer a fixed amount of assets. Note, since shares are
@@ -126,82 +123,4 @@ isSoleShareholder(ReadView const& view, AccountID const& account, SLE::const_ref
 [[nodiscard]] VaultVersion
 getVaultVersion(SLE::const_ref vault);

-/**
- * Resolves the VaultKind of a vault SLE. Returns VaultKind::ClosedEnded when
- * sfVaultKind is present and equal to that value; anything else (including an
- * absent field or an unrecognised value) is treated as VaultKind::OpenEnded.
- *
- * @param vault The vault SLE.
- */
-[[nodiscard]] VaultKind
-getVaultKind(SLE::const_ref vault);
-
-/**
- * Reads sfVaultKind from a transaction. An absent field resolves to
- * VaultKind::OpenEnded (matching the on-ledger default); any unrecognised
- * value is also treated as VaultKind::OpenEnded, mirroring the SLE overload.
- * Callers that need to reject out-of-range values (e.g. preflight) should
- * gate on isValidVaultKind() first.
- *
- * @param tx The transaction.
- */
-[[nodiscard]] VaultKind
-getVaultKind(STTx const& tx);
-
-/**
- * Returns true iff sfVaultKind is either absent from @p tx or is present and
- * equal to a recognised VaultKind enumerator. Intended for use in preflight
- * to reject malformed transactions before decoding with getVaultKind().
- *
- * @param tx The transaction.
- */
-[[nodiscard]] bool
-isValidVaultKind(STTx const& tx);
-
-/**
- * Returns true iff the (SubscriptionDate, RedemptionDate) gap of a
- * closed-ended vault satisfies
- * kMinInvestmentPeriod <= (red - sub) < kMaxInvestmentPeriod. The arithmetic
- * is performed in std::int64_t so that @p sub near UINT32_MAX does not
- * overflow. Shared by VaultCreate::preflight and the ValidVault invariant.
- *
- * @param sub The value of sfSubscriptionDate.
- * @param red The value of sfRedemptionDate.
- */
-[[nodiscard]] bool
-isValidClosedEndedGap(std::uint32_t sub, std::uint32_t red);
-
-/**
- * Returns the current lifecycle phase of a vault. Open-ended
- * vaults are always NoPhase. For closed-ended vaults the phase is derived
- * from the parent ledger close time and the vault's immutable
- * SubscriptionDate and RedemptionDate.
- *
- * @param view The ledger view whose parent close time is used as the clock.
- * @param vault The vault SLE.
- */
-[[nodiscard]] VaultPhase
-getVaultPhase(ReadView const& view, SLE::const_ref vault);
-
-/**
- * Raw-fields overload of getVaultPhase. Derives the phase from an already
- * decomposed vault snapshot: an absent or non-ClosedEnded @p vaultKind
- * resolves to VaultPhase::NoPhase; otherwise the phase is computed from
- * @p subscriptionDate and @p redemptionDate against the view's parent
- * close time using the same boundary semantics as the SLE overload
- * (Subscription is inclusive of now == SubscriptionDate; Investment starts
- * strictly after).
- *
- * @param view The ledger view whose parent close time is used as the clock.
- * @param vaultKind The value of sfVaultKind, or nullopt if absent.
- * @param subscriptionDate The value of sfSubscriptionDate, or nullopt if absent.
- * @param redemptionDate The value of sfRedemptionDate, or nullopt if absent.
- */
-[[nodiscard]] VaultPhase
-getVaultPhase(
-    ReadView const& view,
-    std::optional<std::uint8_t> vaultKind,
-    std::optional<std::uint32_t> subscriptionDate,
-    std::optional<std::uint32_t> redemptionDate);
-
 }  // namespace xrpl
--- a/include/xrpl/net/HTTPClientSSLContext.h
+++ b/include/xrpl/net/HTTPClientSSLContext.h
@@ -8,11 +8,11 @@
 #include <boost/asio.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl.hpp>
+#include <boost/format.hpp>

 #include <openssl/err.h>
 #include <openssl/tls1.h>

-#include <format>
 #include <stdexcept>
 #include <string>
 #include <type_traits>
@@ -38,8 +38,8 @@ public:

            if (ec && sslVerifyDir.empty())
            {
-                Throw<std::runtime_error>(
-                    std::format("Failed to set_default_verify_paths: {}", ec.message()));
+                Throw<std::runtime_error>(boost::str(
+                    boost::format("Failed to set_default_verify_paths: %s") % ec.message()));
            }
        }
        else
@@ -54,7 +54,7 @@ public:
            if (ec)
            {
                Throw<std::runtime_error>(
-                    std::format("Failed to add verify path: {}", ec.message()));
+                    boost::str(boost::format("Failed to add verify path: %s") % ec.message()));
            }
        }
    }
--- a/include/xrpl/proto/xrpl.proto
+++ b/include/xrpl/proto/xrpl.proto
@@ -1,10 +1,10 @@
 syntax = "proto2";
 package protocol;

+// Unused numbers in the list below may have been used previously. Please don't
+// reassign them for reuse unless you are 100% certain that there won't be a
+// conflict. Even if you're sure, it's probably best to assign a new type.
 enum MessageType {
-  // Previously used - don't reuse.
-  reserved 0 to 1, 4, 6 to 14, 16 to 29, 36 to 40, 43 to 54, 61 to 62;
-
  mtMANIFESTS = 2;
  mtPING = 3;
  mtCLUSTER = 5;
@@ -17,6 +17,7 @@ enum MessageType {
  mtHAVE_SET = 35;
  mtVALIDATION = 41;
  mtGET_OBJECTS = 42;
+  mtVALIDATOR_LIST = 54;
  mtSQUELCH = 55;
  mtVALIDATOR_LIST_COLLECTION = 56;
  mtPROOF_PATH_REQ = 57;
@@ -161,6 +162,14 @@ message TMHaveTransactionSet {
  required bytes hash = 2;
 }

+// Validator list (UNL)
+message TMValidatorList {
+  required bytes manifest = 1;
+  required bytes blob = 2;
+  required bytes signature = 3;
+  required uint32 version = 4;
+}
+
 // Validator List v2
 message ValidatorBlobInfo {
  optional bytes manifest = 1;
@@ -292,15 +301,14 @@ message TMLedgerData {
 }

 message TMPing {
-  // Previously used - don't reuse.
-  reserved 3, 4;
-
  enum pingType {
    ptPING = 0;  // we want a reply
    ptPONG = 1;  // this is a reply
  }
  required pingType type = 1;
-  optional uint32 seq = 2;  // detect stale replies, ensure other side is reading
+  optional uint32 seq = 2;       // detect stale replies, ensure other side is reading
+  optional uint64 pingTime = 3;  // know when we think we sent the ping
+  optional uint64 netTime = 4;
 }

 message TMSquelch {
--- a/include/xrpl/protocol/AMMCore.h
+++ b/include/xrpl/protocol/AMMCore.h
@@ -47,7 +47,7 @@ ammLPTIssue(Asset const& asset1, Asset const& asset2, AccountID const& ammAccoun

 /**
 * Validate the amount.
- * If validZero is false and amount is beast::kZero then invalid amount.
+ * If validZero is false and amount is beast::zero then invalid amount.
 * Return error code if invalid amount.
 * If pair then validate amount's issue matches one of the pair's issue.
 */
--- a/include/xrpl/protocol/AmountConversions.h
+++ b/include/xrpl/protocol/AmountConversions.h
@@ -154,7 +154,7 @@ T
 toAmount(Asset const& asset, Number const& n, Number::RoundingMode mode = Number::getround())
 {
    SaveNumberRoundMode const rm(Number::getround());
-    if (asset.integral())
+    if (isXRP(asset))
        Number::setround(mode);

    if constexpr (std::is_same_v<IOUAmount, T>)
--- a/include/xrpl/protocol/Indexes.h
+++ b/include/xrpl/protocol/Indexes.h
@@ -12,7 +12,6 @@
 #include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/Protocol.h>
 #include <xrpl/protocol/STXChainBridge.h>
-#include <xrpl/protocol/SeqProxy.h>
 #include <xrpl/protocol/UintTypes.h>

 #include <array>
@@ -22,6 +21,8 @@
 #include <utility>

 namespace xrpl {
+
+class SeqProxy;
 /**
 * Keylet computation functions.
 *
@@ -122,7 +123,7 @@ trustLine(AccountID const& id, Issue const& issue) noexcept
 */
 /** @{ */
 Keylet
-offer(AccountID const& id, SeqProxy const& seq) noexcept;
+offer(AccountID const& id, std::uint32_t seq) noexcept;

 inline Keylet
 offer(uint256 const& key) noexcept
@@ -135,7 +136,7 @@ offer(uint256 const& key) noexcept
 * The initial directory page for a specific quality
 */
 Keylet
-quality(Keylet const& k, std::uint64_t const q) noexcept;
+quality(Keylet const& k, std::uint64_t q) noexcept;

 /**
 * The directory for the next lower quality
@@ -148,7 +149,10 @@ next(Keylet const& k);
 */
 /** @{ */
 Keylet
-ticket(AccountID const& id, SeqProxy const& ticketSeq);
+ticket(AccountID const& id, std::uint32_t ticketSeq);
+
+Keylet
+ticket(AccountID const& id, SeqProxy ticketSeq);

 inline Keylet
 ticket(uint256 const& key)
@@ -174,7 +178,7 @@ sponsorship(AccountID const& sponsor, AccountID const& sponsee) noexcept;
 */
 /** @{ */
 Keylet
-check(AccountID const& id, SeqProxy const& seq) noexcept;
+check(AccountID const& id, std::uint32_t seq) noexcept;

 inline Keylet
 check(uint256 const& key) noexcept
@@ -221,10 +225,10 @@ ownerDir(AccountID const& id) noexcept;
 */
 /** @{ */
 Keylet
-page(uint256 const& root, std::uint64_t const index = 0) noexcept;
+page(uint256 const& root, std::uint64_t index = 0) noexcept;

 inline Keylet
-page(Keylet const& root, std::uint64_t const index = 0) noexcept
+page(Keylet const& root, std::uint64_t index = 0) noexcept
 {
    XRPL_ASSERT(root.type == ltDIR_NODE, "xrpl::keylet::page : valid root type");
    return page(root.key, index);
@@ -235,13 +239,13 @@ page(Keylet const& root, std::uint64_t const index = 0) noexcept
 * An escrow entry
 */
 Keylet
-escrow(AccountID const& src, SeqProxy const& seq) noexcept;
+escrow(AccountID const& src, std::uint32_t seq) noexcept;

 /**
 * A PaymentChannel
 */
 Keylet
-payChannel(AccountID const& src, AccountID const& dst, SeqProxy const& seq) noexcept;
+payChannel(AccountID const& src, AccountID const& dst, std::uint32_t seq) noexcept;

 /**
 * NFT page keylets
@@ -272,7 +276,7 @@ nftokenPage(Keylet const& k, uint256 const& token);
 * An offer from an account to buy or sell an NFT
 */
 Keylet
-nftokenOffer(AccountID const& owner, SeqProxy const& seq);
+nftokenOffer(AccountID const& owner, std::uint32_t seq);

 inline Keylet
 nftokenOffer(uint256 const& offer)
@@ -312,17 +316,17 @@ bridge(STXChainBridge const& bridge, STXChainBridge::ChainType chainType);

 // `seq` is stored as `sfXChainClaimID` in the object
 Keylet
-xChainClaimID(STXChainBridge const& bridge, std::uint64_t const seq);
+xChainClaimID(STXChainBridge const& bridge, std::uint64_t seq);

 // `seq` is stored as `sfXChainAccountCreateCount` in the object
 Keylet
-xChainCreateAccountClaimID(STXChainBridge const& bridge, std::uint64_t const seq);
+xChainCreateAccountClaimID(STXChainBridge const& bridge, std::uint64_t seq);

 Keylet
 did(AccountID const& account) noexcept;

 Keylet
-oracle(AccountID const& account, std::uint32_t const documentID) noexcept;
+oracle(AccountID const& account, std::uint32_t const& documentID) noexcept;

 Keylet
 credential(AccountID const& subject, AccountID const& issuer, Slice const& credType) noexcept;
@@ -333,6 +337,9 @@ credential(uint256 const& key) noexcept
    return {ltCREDENTIAL, key};
 }

+Keylet
+mptokenIssuance(std::uint32_t seq, AccountID const& issuer) noexcept;
+
 Keylet
 mptokenIssuance(MPTID const& issuanceID) noexcept;

@@ -355,7 +362,7 @@ Keylet
 mptoken(uint256 const& issuanceKey, AccountID const& holder) noexcept;

 Keylet
-vault(AccountID const& owner, SeqProxy const& seq) noexcept;
+vault(AccountID const& owner, std::uint32_t seq) noexcept;

 inline Keylet
 vault(uint256 const& vaultKey)
@@ -364,7 +371,7 @@ vault(uint256 const& vaultKey)
 }

 Keylet
-loanBroker(AccountID const& owner, SeqProxy const& seq) noexcept;
+loanBroker(AccountID const& owner, std::uint32_t seq) noexcept;

 inline Keylet
 loanBroker(uint256 const& key)
@@ -373,7 +380,7 @@ loanBroker(uint256 const& key)
 }

 Keylet
-loan(uint256 const& loanBrokerID, SeqProxy const& loanSeq) noexcept;
+loan(uint256 const& loanBrokerID, std::uint32_t loanSeq) noexcept;

 inline Keylet
 loan(uint256 const& key)
@@ -382,7 +389,7 @@ loan(uint256 const& key)
 }

 Keylet
-permissionedDomain(AccountID const& account, SeqProxy const& seq) noexcept;
+permissionedDomain(AccountID const& account, std::uint32_t seq) noexcept;

 Keylet
 permissionedDomain(uint256 const& domainID) noexcept;
@@ -400,6 +407,12 @@ getQualityNext(uint256 const& uBase);
 std::uint64_t
 getQuality(uint256 const& uBase);

+uint256
+getTicketIndex(AccountID const& account, std::uint32_t uSequence);
+
+uint256
+getTicketIndex(AccountID const& account, SeqProxy ticketSeq);
+
 template <class... KeyletParams>
 // NOLINTNEXTLINE(cppcoreguidelines-pro-type-member-init)
 struct KeyletDesc
@@ -413,6 +426,6 @@ struct KeyletDesc
 extern std::array<KeyletDesc<AccountID const&>, 6> const kDirectAccountKeylets;

 MPTID
-makeMptID(std::uint32_t const sequence, AccountID const& account);
+makeMptID(std::uint32_t sequence, AccountID const& account);

 }  // namespace xrpl
--- a/include/xrpl/protocol/LedgerFormats.h
+++ b/include/xrpl/protocol/LedgerFormats.h
@@ -190,6 +190,17 @@ enum LedgerEntryType : std::uint16_t {
        LSF_FLAG(lsfMPTCanClawback, 0x00000040)                                                                                    \
        LSF_FLAG(lsfMPTCanHoldConfidentialBalance, 0x00000080))                                                                         \
                                                                                                                                   \
+    LEDGER_OBJECT(MPTokenIssuanceMutable,                                                                                          \
+        LSF_FLAG(lsmfMPTCanEnableCanLock, 0x00000002)                                                                              \
+        LSF_FLAG(lsmfMPTCanEnableRequireAuth, 0x00000004)                                                                          \
+        LSF_FLAG(lsmfMPTCanEnableCanEscrow, 0x00000008)                                                                            \
+        LSF_FLAG(lsmfMPTCanEnableCanTrade, 0x00000010)                                                                             \
+        LSF_FLAG(lsmfMPTCanEnableCanTransfer, 0x00000020)                                                                          \
+        LSF_FLAG(lsmfMPTCanEnableCanClawback, 0x00000040)                                                                          \
+        LSF_FLAG(lsmfMPTCannotEnableCanHoldConfidentialBalance, 0x00000080)                                                                          \
+        LSF_FLAG(lsmfMPTCanMutateMetadata, 0x00010000)                                                                             \
+        LSF_FLAG(lsmfMPTCanMutateTransferFee, 0x00020000))                                                            \
+                                                                                                                                   \
    LEDGER_OBJECT(MPToken,                                                                                                         \
        LSF_FLAG2(lsfMPTLocked, 0x00000001)                                                                                        \
        LSF_FLAG(lsfMPTAuthorized, 0x00000002)                                                                                     \
@@ -283,17 +294,6 @@ getAllLedgerFlags()
 #pragma pop_macro("TO_MAP")
 #pragma pop_macro("ALL_LEDGER_FLAGS")

-// MPTokenIssuance ImmutableFlags (sfImmutableFlags)
-inline constexpr std::uint32_t lsifMPTCanLock = 0x00000002;
-inline constexpr std::uint32_t lsifMPTRequireAuth = 0x00000004;
-inline constexpr std::uint32_t lsifMPTCanEscrow = 0x00000008;
-inline constexpr std::uint32_t lsifMPTCanTrade = 0x00000010;
-inline constexpr std::uint32_t lsifMPTCanTransfer = 0x00000020;
-inline constexpr std::uint32_t lsifMPTCanClawback = 0x00000040;
-inline constexpr std::uint32_t lsifMPTCanHoldConfidentialBalance = 0x00000080;
-inline constexpr std::uint32_t lsifMPTMetadata = 0x00010000;
-inline constexpr std::uint32_t lsifMPTTransferFee = 0x00020000;
-
 //------------------------------------------------------------------------------

 /**
--- a/include/xrpl/protocol/Protocol.h
+++ b/include/xrpl/protocol/Protocol.h
@@ -9,7 +9,6 @@
 #include <mpt_protocol.h>
 #include <secp256k1_mpt.h>

-#include <chrono>
 #include <cstddef>
 #include <cstdint>

@@ -328,36 +327,6 @@ enum class VaultVersion : uint8_t {
    CashBasis,
 };

-/**
- * Vault kind. Distinguishes closed-ended vaults from the default open-ended
- * kind. Persisted as sfVaultKind (UINT8); absent means OpenEnded.
- */
-enum class VaultKind : std::uint8_t {
-    OpenEnded = 0,
-    ClosedEnded = 1,
-};
-
-/**
- * Lifecycle phase of a vault. Open-ended vaults are always NoPhase; the other
- * three values are the phases of a closed-ended vault.
- */
-enum class VaultPhase : std::uint8_t {
-    NoPhase = 0,
-    Subscription,
-    Investment,
-    Redemption,
-};
-
-/**
- * Bounds on the length of a closed-ended vault's Investment phase
- * (RedemptionDate - SubscriptionDate). At vault creation the gap must satisfy
- * kMinInvestmentPeriod <= gap < kMaxInvestmentPeriod.
- */
-constexpr std::uint32_t kMinInvestmentPeriod =
-    std::chrono::seconds{std::chrono::minutes{1}}.count();
-// This is 946708560 seconds which 30 x 365.2425 days (the average length of a Gregorian year).
-constexpr std::uint32_t kMaxInvestmentPeriod = std::chrono::seconds{std::chrono::years{30}}.count();
-
 /**
 * Maximum recursion depth for vault shares being put as an asset inside
 * another vault; counted from 0
--- a/include/xrpl/protocol/Quality.h
+++ b/include/xrpl/protocol/Quality.h
@@ -75,6 +75,13 @@ operator==(TAmounts<In, Out> const& lhs, TAmounts<In, Out> const& rhs) noexcept
    return lhs.in == rhs.in && lhs.out == rhs.out;
 }

+template <class In, class Out>
+bool
+operator!=(TAmounts<In, Out> const& lhs, TAmounts<In, Out> const& rhs) noexcept
+{
+    return !(lhs == rhs);
+}
+
 //------------------------------------------------------------------------------

 // XRPL specific constant used for parsing qualities and other things
@@ -264,6 +271,12 @@ public:
        return lhs.value_ == rhs.value_;
    }

+    friend bool
+    operator!=(Quality const& lhs, Quality const& rhs) noexcept
+    {
+        return !(lhs == rhs);
+    }
+
    friend std::ostream&
    operator<<(std::ostream& os, Quality const& quality)
    {
--- a/include/xrpl/protocol/QualityFunction.h
+++ b/include/xrpl/protocol/QualityFunction.h
@@ -60,15 +60,6 @@ public:
    std::optional<Number>
    outFromAvgQ(Quality const& quality);

-    /**
-     * Return whether `out` produces at least the requested
-     * average quality.
-     * @param quality requested average quality (quality limit)
-     * @param out output amount to test
-     */
-    [[nodiscard]] bool
-    satisfiesAvgQ(Quality const& quality, Number const& out) const;
-
    /**
     * Return true if the quality function is constant
     */
--- a/include/xrpl/protocol/Rules.h
+++ b/include/xrpl/protocol/Rules.h
@@ -98,6 +98,9 @@ public:
     */
    bool
    operator==(Rules const&) const;
+
+    bool
+    operator!=(Rules const& other) const;
 };

 std::optional<Rules> const&
--- a/include/xrpl/protocol/STAmount.h
+++ b/include/xrpl/protocol/STAmount.h
@@ -642,6 +642,12 @@ operator==(STAmount const& lhs, STAmount const& rhs);
 bool
 operator<(STAmount const& lhs, STAmount const& rhs);

+inline bool
+operator!=(STAmount const& lhs, STAmount const& rhs)
+{
+    return !(lhs == rhs);
+}
+
 inline bool
 operator>(STAmount const& lhs, STAmount const& rhs)
 {
--- a/include/xrpl/protocol/STArray.h
+++ b/include/xrpl/protocol/STArray.h
@@ -133,6 +133,9 @@ public:
    bool
    operator==(STArray const& s) const;

+    bool
+    operator!=(STArray const& s) const;
+
    iterator
    erase(iterator pos);

@@ -280,6 +283,12 @@ STArray::operator==(STArray const& s) const
    return v_ == s.v_;
 }

+inline bool
+STArray::operator!=(STArray const& s) const
+{
+    return v_ != s.v_;
+}
+
 inline STArray::iterator
 STArray::erase(iterator pos)
 {
--- a/include/xrpl/protocol/STBase.h
+++ b/include/xrpl/protocol/STBase.h
@@ -140,6 +140,8 @@ public:

    bool
    operator==(STBase const& t) const;
+    bool
+    operator!=(STBase const& t) const;

    template <class D>
    D&
--- a/include/xrpl/protocol/STCurrency.h
+++ b/include/xrpl/protocol/STCurrency.h
@@ -93,6 +93,12 @@ operator==(STCurrency const& lhs, STCurrency const& rhs)
    return lhs.currency() == rhs.currency();
 }

+inline bool
+operator!=(STCurrency const& lhs, STCurrency const& rhs)
+{
+    return !operator==(lhs, rhs);
+}
+
 inline bool
 operator<(STCurrency const& lhs, STCurrency const& rhs)
 {
--- a/include/xrpl/protocol/STObject.h
+++ b/include/xrpl/protocol/STObject.h
@@ -90,11 +90,7 @@ public:
    operator=(STObject&& other);

    STObject(SOTemplate const& type, SField const& name);
-    STObject(
-        SOTemplate const& type,
-        SerialIter& sit,
-        SField const& name,
-        bool requireCanonicalOrder = false);
+    STObject(SOTemplate const& type, SerialIter& sit, SField const& name);
    STObject(SerialIter& sit, SField const& name, int depth = 0);
    STObject(SerialIter&& sit, SField const& name);
    explicit STObject(SField const& name);
@@ -127,7 +123,7 @@ public:
    set(SOTemplate const&);

    bool
-    set(SerialIter& u, int depth = 0, bool requireCanonicalOrder = false);
+    set(SerialIter& u, int depth = 0);

    [[nodiscard]] SerializedTypeID
    getSType() const override;
@@ -432,6 +428,8 @@ public:

    bool
    operator==(STObject const& o) const;
+    bool
+    operator!=(STObject const& o) const;

    class FieldErr;

@@ -665,6 +663,36 @@ public:
        return !lhs.engaged() || *lhs == *rhs;
    }

+    friend bool
+    operator!=(OptionalProxy const& lhs, std::nullopt_t) noexcept
+    {
+        return !(lhs == std::nullopt);
+    }
+
+    friend bool
+    operator!=(std::nullopt_t, OptionalProxy const& rhs) noexcept
+    {
+        return !(rhs == std::nullopt);
+    }
+
+    friend bool
+    operator!=(OptionalProxy const& lhs, optional_type const& rhs) noexcept
+    {
+        return !(lhs == rhs);
+    }
+
+    friend bool
+    operator!=(optional_type const& lhs, OptionalProxy const& rhs) noexcept
+    {
+        return !(lhs == rhs);
+    }
+
+    friend bool
+    operator!=(OptionalProxy const& lhs, OptionalProxy const& rhs) noexcept
+    {
+        return !(lhs == rhs);
+    }
+
    // Emulate std::optional::value_or
    [[nodiscard]] value_type
    valueOr(value_type val) const;
@@ -1170,6 +1198,12 @@ STObject::setFieldH160(SField const& field, BaseUInt<160, Tag> const& v)
    }
 }

+inline bool
+STObject::operator!=(STObject const& o) const
+{
+    return !(*this == o);
+}
+
 template <typename T, typename V>
 V
 STObject::getFieldByValue(SField const& field) const
--- a/include/xrpl/protocol/STPathSet.h
+++ b/include/xrpl/protocol/STPathSet.h
@@ -1,7 +1,6 @@
 #pragma once

 #include <xrpl/basics/CountedObject.h>
-#include <xrpl/basics/UnorderedContainers.h>
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/AccountID.h>
@@ -109,12 +108,12 @@ public:
    [[nodiscard]] bool
    isType(Type const& pe) const;

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

+    bool
+    operator!=(STPathElement const& t) const;
+
 private:
    static std::size_t
    getHash(STPathElement const& element);
@@ -172,23 +171,12 @@ public:
    reserve(size_t s);
 };

-template <class Hasher>
-void
-hash_append(Hasher& h, STPath const& p) noexcept
-{
-    for (auto const& e : p)
-    {
-        beast::hash_append(h, e.getHash());
-    }
-}
-
 //------------------------------------------------------------------------------

 // A set of zero or more payment paths
 class STPathSet final : public STBase, public CountedObject<STPathSet>
 {
    std::vector<STPath> value_;
-    xrpl::hardened_hash_set<STPath> seenHashes_;

 public:
    STPathSet() = default;
@@ -217,6 +205,9 @@ public:
    std::vector<STPath>::const_reference
    operator[](std::vector<STPath>::size_type n) const;

+    std::vector<STPath>::reference
+    operator[](std::vector<STPath>::size_type n);
+
    [[nodiscard]] std::vector<STPath>::const_iterator
    begin() const;

@@ -236,9 +227,6 @@ public:
    void
    emplaceBack(Args&&... args);

-    [[nodiscard]] bool
-    contains(STPath const& path) const;
-
 private:
    STBase*
    copy(std::size_t n, void* buf) const override;
@@ -429,6 +417,12 @@ STPathElement::operator==(STPathElement const& t) const
        accountID_ == t.accountID_ && assetID_ == t.assetID_ && issuerID_ == t.issuerID_;
 }

+inline bool
+STPathElement::operator!=(STPathElement const& t) const
+{
+    return !operator==(t);
+}
+
 // ------------ STPath ------------

 inline STPath::STPath(std::vector<STPathElement> p) : path_(std::move(p))
@@ -521,6 +515,12 @@ STPathSet::operator[](std::vector<STPath>::size_type n) const
    return value_[n];
 }

+inline std::vector<STPath>::reference
+STPathSet::operator[](std::vector<STPath>::size_type n)
+{
+    return value_[n];
+}
+
 inline std::vector<STPath>::const_iterator
 STPathSet::begin() const
 {
@@ -549,7 +549,6 @@ inline void
 STPathSet::pushBack(STPath const& e)
 {
    value_.push_back(e);
-    seenHashes_.emplace(value_.back());
 }

 template <typename... Args>
@@ -557,13 +556,6 @@ inline void
 STPathSet::emplaceBack(Args&&... args)
 {
    value_.emplace_back(std::forward<Args>(args)...);
-    seenHashes_.emplace(value_.back());
-}
-
-inline bool
-STPathSet::contains(STPath const& path) const
-{
-    return seenHashes_.contains(path);
 }

 }  // namespace xrpl
--- a/include/xrpl/protocol/STTx.h
+++ b/include/xrpl/protocol/STTx.h
@@ -93,6 +93,12 @@ public:
    [[nodiscard]] SeqProxy
    getSeqProxy() const;

+    /**
+     * Returns the first non-zero value of (Sequence, TicketSequence).
+     */
+    [[nodiscard]] std::uint32_t
+    getSeqValue() const;
+
    [[nodiscard]] boost::container::flat_set<AccountID>
    getMentionedAccounts() const;

--- a/include/xrpl/protocol/STValidation.h
+++ b/include/xrpl/protocol/STValidation.h
@@ -54,22 +54,6 @@ class STValidation final : public STObject, public CountedObject<STValidation>
    NetClock::time_point seenTime_;

 public:
-    /**
-     * @struct DeserializeOptions
-     * @brief Options controlling deserialization of a STValidation.
-
-     * @var DeserializeOptions::checkSignature
-     * Whether to verify the data was signed properly
-     *
-     * @var DeserializeOptions::requireCanonicalOrder
-     * Whether to require the fields to be in canonical order
-     */
-    struct DeserializeOptions
-    {
-        bool checkSignature;
-        bool requireCanonicalOrder;
-    };
-
    /**
     * Construct a STValidation from a peer from serialized data.
     *
@@ -80,12 +64,12 @@ public:
     *                     that signed the validation. For manifest based
     *                     validators, this should be the NodeID of the master
     *                     public key.
-     * @param options Options controlling deserialization
+     * @param checkSignature Whether to verify the data was signed properly
     *
     * @note Throws if the object is not valid
     */
    template <class LookupNodeID>
-    STValidation(SerialIter& sit, LookupNodeID&& lookupNodeID, DeserializeOptions options);
+    STValidation(SerialIter& sit, LookupNodeID&& lookupNodeID, bool checkSignature);

    /**
     * Construct, sign and trust a new STValidation issued by this node.
@@ -179,8 +163,8 @@ private:
 };

 template <class LookupNodeID>
-STValidation::STValidation(SerialIter& sit, LookupNodeID&& lookupNodeID, DeserializeOptions options)
-    : STObject(validationFormat(), sit, sfValidation, options.requireCanonicalOrder)
+STValidation::STValidation(SerialIter& sit, LookupNodeID&& lookupNodeID, bool checkSignature)
+    : STObject(validationFormat(), sit, sfValidation)
    , signingPubKey_([this]() {
        auto const spk = getFieldVL(sfSigningPubKey);

@@ -191,7 +175,7 @@ STValidation::STValidation(SerialIter& sit, LookupNodeID&& lookupNodeID, Deseria
    }())
    , nodeID_(lookupNodeID(signingPubKey_))
 {
-    if (options.checkSignature && !isValid())
+    if (checkSignature && !isValid())
    {
        JLOG(debugLog().error()) << "Invalid signature in validation: "
                                 << getJson(JsonOptions::Values::None);
--- a/include/xrpl/protocol/SeqProxy.h
+++ b/include/xrpl/protocol/SeqProxy.h
@@ -53,29 +53,14 @@ public:
    operator=(SeqProxy const& other) = default;

    /**
-     * Factory function to return a sequence-based SeqProxy.
-     * Outside of tests, this function should only be used for "secondary" transaction sequences,
-     * e.g. `sfOfferSequence`, or sequence fields in an existing ledger object. DO NOT use this for
-     * the "primary" sequence of a transaction, `sfSequence`.
+     * Factory function to return a sequence-based SeqProxy
     */
    static constexpr SeqProxy
-    rawSequence(std::uint32_t v)
+    sequence(std::uint32_t v)
    {
        return SeqProxy{Type::Seq, v};
    }

-    /**
-     * Factory function to return a ticket-based SeqProxy.
-     * Outside of tests, this function should only be used for "secondary" transaction sequences,
-     * e.g. `sfOfferSequence`, or sequence fields in an existing ledger object. DO NOT use this for
-     * the "primary" ticket sequence of a transaction, `sfTicketSequence`.
-     */
-    static constexpr SeqProxy
-    rawTicket(std::uint32_t v)
-    {
-        return SeqProxy{Type::Ticket, v};
-    }
-
    [[nodiscard]] constexpr std::uint32_t
    value() const
    {
@@ -123,6 +108,12 @@ public:
        return (lhs.value() == rhs.value());
    }

+    friend constexpr bool
+    operator!=(SeqProxy lhs, SeqProxy rhs)
+    {
+        return !(lhs == rhs);
+    }
+
    friend constexpr bool
    operator<(SeqProxy lhs, SeqProxy rhs)
    {
--- a/include/xrpl/protocol/Serializer.h
+++ b/include/xrpl/protocol/Serializer.h
@@ -265,10 +265,20 @@ public:
        return v == data_;
    }
    bool
+    operator!=(Blob const& v) const
+    {
+        return v != data_;
+    }
+    bool
    operator==(Serializer const& v) const
    {
        return v.data_ == data_;
    }
+    bool
+    operator!=(Serializer const& v) const
+    {
+        return v.data_ != data_;
+    }

    static int
    decodeLengthLength(int b1);
--- a/include/xrpl/protocol/TxFlags.h
+++ b/include/xrpl/protocol/TxFlags.h
@@ -152,14 +152,7 @@ inline constexpr FlagValue tfUniversalMask = ~tfUniversal;
                                                                                                                                                               \
    TRANSACTION(MPTokenIssuanceSet,                                                                                                                            \
        TF_FLAG(tfMPTLock, 0x00000001)                                                                                                                         \
-        TF_FLAG(tfMPTUnlock, 0x00000002)                                                                                                                       \
-        TF_FLAG(tfMPTSetCanLock, 0x00000004)                                                                                                                   \
-        TF_FLAG(tfMPTSetRequireAuth, 0x00000008)                                                                                                               \
-        TF_FLAG(tfMPTSetCanEscrow, 0x00000010)                                                                                                                 \
-        TF_FLAG(tfMPTSetCanTrade, 0x00000020)                                                                                                                  \
-        TF_FLAG(tfMPTSetCanTransfer, 0x00000040)                                                                                                               \
-        TF_FLAG(tfMPTSetCanClawback, 0x00000080)                                                                                                               \
-        TF_FLAG(tfMPTSetCanHoldConfidentialBalance, 0x00000100),                                                                                               \
+        TF_FLAG(tfMPTUnlock, 0x00000002),                                                                                                                      \
        MASK_ADJ(0))                                                                                                                                           \
                                                                                                                                                               \
    TRANSACTION(NFTokenCreateOffer,                                                                                                                            \
@@ -363,26 +356,38 @@ inline constexpr FlagValue tfMPTPaymentMask = ~(tfUniversal | tfPartialPayment);
 inline constexpr FlagValue tfTrustSetPermissionMask =
    ~(tfUniversal | tfSetfAuth | tfSetFreeze | tfClearFreeze);

-// MPTokenIssuanceCreate / MPTokenIssuanceSet ImmutableFlags:
-// Defines the immutable fields and flags specific to MPTokenIssuance.
-inline constexpr FlagValue tifMPTCanLock = lsifMPTCanLock;
-inline constexpr FlagValue tifMPTRequireAuth = lsifMPTRequireAuth;
-inline constexpr FlagValue tifMPTCanEscrow = lsifMPTCanEscrow;
-inline constexpr FlagValue tifMPTCanTrade = lsifMPTCanTrade;
-inline constexpr FlagValue tifMPTCanTransfer = lsifMPTCanTransfer;
-inline constexpr FlagValue tifMPTCanClawback = lsifMPTCanClawback;
-inline constexpr FlagValue tifMPTMetadata = lsifMPTMetadata;
-inline constexpr FlagValue tifMPTTransferFee = lsifMPTTransferFee;
-inline constexpr FlagValue tifMPTCanHoldConfidentialBalance = lsifMPTCanHoldConfidentialBalance;
-inline constexpr FlagValue tifMPTokenIssuanceImmutableMask =
-    ~(tifMPTCanLock | tifMPTRequireAuth | tifMPTCanEscrow | tifMPTCanTrade | tifMPTCanTransfer |
-      tifMPTCanClawback | tifMPTMetadata | tifMPTTransferFee | tifMPTCanHoldConfidentialBalance);
+// MPTokenIssuanceCreate MutableFlags:
+// Indicating specific fields or flags may be changed after issuance.
+inline constexpr FlagValue tmfMPTCanEnableCanLock = lsmfMPTCanEnableCanLock;
+inline constexpr FlagValue tmfMPTCanEnableRequireAuth = lsmfMPTCanEnableRequireAuth;
+inline constexpr FlagValue tmfMPTCanEnableCanEscrow = lsmfMPTCanEnableCanEscrow;
+inline constexpr FlagValue tmfMPTCanEnableCanTrade = lsmfMPTCanEnableCanTrade;
+inline constexpr FlagValue tmfMPTCanEnableCanTransfer = lsmfMPTCanEnableCanTransfer;
+inline constexpr FlagValue tmfMPTCanEnableCanClawback = lsmfMPTCanEnableCanClawback;
+inline constexpr FlagValue tmfMPTCanMutateMetadata = lsmfMPTCanMutateMetadata;
+inline constexpr FlagValue tmfMPTCanMutateTransferFee = lsmfMPTCanMutateTransferFee;
+inline constexpr FlagValue tmfMPTCannotEnableCanHoldConfidentialBalance =
+    lsmfMPTCannotEnableCanHoldConfidentialBalance;
+inline constexpr FlagValue tmfMPTokenIssuanceCreateMutableMask =
+    ~(tmfMPTCanEnableCanLock | tmfMPTCanEnableRequireAuth | tmfMPTCanEnableCanEscrow |
+      tmfMPTCanEnableCanTrade | tmfMPTCanEnableCanTransfer | tmfMPTCanEnableCanClawback |
+      tmfMPTCanMutateMetadata | tmfMPTCanMutateTransferFee |
+      tmfMPTCannotEnableCanHoldConfidentialBalance);

-// MPTokenIssuanceSet set of flags that is used to enable capabilities on an MPTokenIssuance.
-// Used as `txFlags & tfMPTokenIssuanceSetEnableFlagMask` to extract the capability-enabling bits.
-inline constexpr FlagValue tfMPTokenIssuanceSetEnableFlagMask = tfMPTSetCanLock |
-    tfMPTSetRequireAuth | tfMPTSetCanEscrow | tfMPTSetCanTrade | tfMPTSetCanTransfer |
-    tfMPTSetCanClawback | tfMPTSetCanHoldConfidentialBalance;
+// MPTokenIssuanceSet MutableFlags:
+// Enable mutable capability flags. These flags are one-way: once enabled,
+// the corresponding capability cannot be disabled by MPTokenIssuanceSet.
+
+inline constexpr FlagValue tmfMPTSetCanLock = 0x00000001;
+inline constexpr FlagValue tmfMPTSetRequireAuth = 0x00000002;
+inline constexpr FlagValue tmfMPTSetCanEscrow = 0x00000004;
+inline constexpr FlagValue tmfMPTSetCanTrade = 0x00000008;
+inline constexpr FlagValue tmfMPTSetCanTransfer = 0x00000010;
+inline constexpr FlagValue tmfMPTSetCanClawback = 0x00000020;
+inline constexpr FlagValue tmfMPTSetCanHoldConfidentialBalance = 0x00000040;
+inline constexpr FlagValue tmfMPTokenIssuanceSetMutableMask =
+    ~(tmfMPTSetCanLock | tmfMPTSetRequireAuth | tmfMPTSetCanEscrow | tmfMPTSetCanTrade |
+      tmfMPTSetCanTransfer | tmfMPTSetCanClawback | tmfMPTSetCanHoldConfidentialBalance);

 // Prior to fixRemoveNFTokenAutoTrustLine, transfer of an NFToken between accounts allowed a
 // TrustLine to be added to the issuer of that token without explicit permission from that issuer.
@@ -425,7 +430,8 @@ inline constexpr FlagValue tfDepositSubTx =
    ASF_FLAG(asfDefaultRipple, 8)                 \
    ASF_FLAG(asfDepositAuth, 9)                   \
    ASF_FLAG(asfAuthorizedNFTokenMinter, 10)      \
-    /*  11 is unused */                           \
+    /*  11 is reserved for Hooks amendment */     \
+    /* ASF_FLAG(asfTshCollect, 11) */             \
    ASF_FLAG(asfDisallowIncomingNFTokenOffer, 12) \
    ASF_FLAG(asfDisallowIncomingCheck, 13)        \
    ASF_FLAG(asfDisallowIncomingPayChan, 14)      \
--- a/include/xrpl/protocol/Units.h
+++ b/include/xrpl/protocol/Units.h
@@ -258,6 +258,13 @@ public:
        return value_ == other;
    }

+    template <Compatible<ValueUnit> Other>
+    constexpr bool
+    operator!=(ValueUnit<unit_type, Other> const& other) const
+    {
+        return !operator==(other);
+    }
+
    constexpr bool
    operator<(ValueUnit const& other) const
    {
--- a/include/xrpl/protocol/detail/STVar.h
+++ b/include/xrpl/protocol/detail/STVar.h
@@ -152,4 +152,10 @@ operator==(STVar const& lhs, STVar const& rhs)
    return lhs.get().isEquivalent(rhs.get());
 }

+inline bool
+operator!=(STVar const& lhs, STVar const& rhs)
+{
+    return !(lhs == rhs);
+}
+
 }  // namespace xrpl::detail
--- a/include/xrpl/protocol/detail/features.macro
+++ b/include/xrpl/protocol/detail/features.macro
@@ -59,6 +59,7 @@ XRPL_FIX    (PreviousTxnID,              Supported::Yes, VoteBehavior::DefaultNo
 XRPL_FIX    (XChainRewardRounding,       Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (EmptyDID,                   Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(PriceOracle,                Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (AMMOverflowOffer,           Supported::Yes, VoteBehavior::DefaultYes)
 XRPL_FIX    (FillOrKill,                 Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(DID,                        Supported::Yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(XChainBridge,               Supported::Yes, VoteBehavior::DefaultNo)
@@ -99,7 +100,6 @@ XRPL_RETIRE_FIX(1578)
 XRPL_RETIRE_FIX(1623)
 XRPL_RETIRE_FIX(1781)
 XRPL_RETIRE_FIX(AmendmentMajorityCalc)
-XRPL_RETIRE_FIX(AMMOverflowOffer)
 XRPL_RETIRE_FIX(CheckThreading)
 XRPL_RETIRE_FIX(DisallowIncomingV1)
 XRPL_RETIRE_FIX(InnerObjTemplate)
--- a/include/xrpl/protocol/detail/ledger_entries.macro
+++ b/include/xrpl/protocol/detail/ledger_entries.macro
@@ -404,7 +404,7 @@ LEDGER_ENTRY(ltMPTOKEN_ISSUANCE, 0x007e, MPTokenIssuance, mpt_issuance, ({
    {sfPreviousTxnID,            SoeRequired},
    {sfPreviousTxnLgrSeq,        SoeRequired},
    {sfDomainID,                 SoeOptional},
-    {sfImmutableFlags,           SoeDefault},
+    {sfMutableFlags,             SoeDefault},
    {sfReferenceHolding,         SoeOptional},
    {sfIssuerEncryptionKey,      SoeOptional},
    {sfAuditorEncryptionKey,     SoeOptional},
@@ -506,9 +506,6 @@ LEDGER_ENTRY(ltVAULT, 0x0084, Vault, vault, ({
    {sfWithdrawalPolicy,     SoeRequired},
    {sfScale,                SoeDefault},
    {sfLEVersion,            SoeDefault},
-    {sfVaultKind,            SoeDefault},
-    {sfSubscriptionDate,     SoeOptional},
-    {sfRedemptionDate,       SoeOptional},
    // no SharesTotal ever (use MPTIssuance.sfOutstandingAmount)
    // no PermissionedDomainID ever (use MPTIssuance.sfDomainID)
 }))
--- a/include/xrpl/protocol/detail/sfields.macro
+++ b/include/xrpl/protocol/detail/sfields.macro
@@ -23,11 +23,9 @@ TYPED_SFIELD(sfLEVersion,                UINT8,      6)
 // 8-bit integers (uncommon)
 TYPED_SFIELD(sfTickSize,                 UINT8,     16)
 TYPED_SFIELD(sfUNLModifyDisabling,       UINT8,     17)
-// 18 unused
+TYPED_SFIELD(sfHookResult,               UINT8,     18)
 TYPED_SFIELD(sfWasLockingChainSend,      UINT8,     19)
 TYPED_SFIELD(sfWithdrawalPolicy,         UINT8,     20)
-TYPED_SFIELD(sfContractResult,           UINT8,     21)
-TYPED_SFIELD(sfVaultKind,                UINT8,     22)

 // 16-bit integers (common)
 TYPED_SFIELD(sfLedgerEntryType,          UINT16,     1, SField::kSmdNever)
@@ -39,7 +37,10 @@ TYPED_SFIELD(sfDiscountedFee,            UINT16,     6)

 // 16-bit integers (uncommon)
 TYPED_SFIELD(sfVersion,                  UINT16,    16)
-// 17 to 20 unused
+TYPED_SFIELD(sfHookStateChangeCount,     UINT16,    17)
+TYPED_SFIELD(sfHookEmitCount,            UINT16,    18)
+TYPED_SFIELD(sfHookExecutionIndex,       UINT16,    19)
+TYPED_SFIELD(sfHookApiVersion,           UINT16,    20)
 TYPED_SFIELD(sfLedgerFixType,            UINT16,    21)
 TYPED_SFIELD(sfManagementFeeRate,        UINT16,    22) // 1/10 basis points (bips)

@@ -90,12 +91,14 @@ TYPED_SFIELD(sfTicketSequence,           UINT32,    41)
 TYPED_SFIELD(sfNFTokenTaxon,             UINT32,    42)
 TYPED_SFIELD(sfMintedNFTokens,           UINT32,    43)
 TYPED_SFIELD(sfBurnedNFTokens,           UINT32,    44)
-// 45 to 47 unused
+TYPED_SFIELD(sfHookStateCount,           UINT32,    45)
+TYPED_SFIELD(sfEmitGeneration,           UINT32,    46)
+//                                                  47 reserved for Hooks
 TYPED_SFIELD(sfVoteWeight,               UINT32,    48)
 TYPED_SFIELD(sfFirstNFTokenSequence,     UINT32,    50)
 TYPED_SFIELD(sfOracleDocumentID,         UINT32,    51)
 TYPED_SFIELD(sfPermissionValue,          UINT32,    52)
-TYPED_SFIELD(sfImmutableFlags,           UINT32,    53)
+TYPED_SFIELD(sfMutableFlags,             UINT32,    53)
 TYPED_SFIELD(sfStartDate,                UINT32,    54)
 TYPED_SFIELD(sfPaymentInterval,          UINT32,    55)
 TYPED_SFIELD(sfGracePeriod,              UINT32,    56)
@@ -117,8 +120,6 @@ TYPED_SFIELD(sfSponsoringOwnerCount,     UINT32,    71)
 TYPED_SFIELD(sfSponsoringAccountCount,   UINT32,    72)
 TYPED_SFIELD(sfRemainingOwnerCount,      UINT32,    73)
 TYPED_SFIELD(sfSponsorFlags,             UINT32,    74)
-TYPED_SFIELD(sfSubscriptionDate,         UINT32,    75)
-TYPED_SFIELD(sfRedemptionDate,           UINT32,    76)

 // 64-bit integers (common)
 TYPED_SFIELD(sfIndexNext,                UINT64,     1)
@@ -136,7 +137,9 @@ TYPED_SFIELD(sfNFTokenOfferNode,         UINT64,    12)
 TYPED_SFIELD(sfEmitBurden,               UINT64,    13)

 // 64-bit integers (uncommon)
-// 16 to 18 unused
+TYPED_SFIELD(sfHookOn,                   UINT64,    16)
+TYPED_SFIELD(sfHookInstructionCount,     UINT64,    17)
+TYPED_SFIELD(sfHookReturnCode,           UINT64,    18)
 TYPED_SFIELD(sfReferenceCount,           UINT64,    19)
 TYPED_SFIELD(sfXChainClaimID,            UINT64,    20)
 TYPED_SFIELD(sfXChainAccountCreateCount, UINT64,    21)
@@ -200,7 +203,10 @@ TYPED_SFIELD(sfPreviousPageMin,          UINT256,   26)
 TYPED_SFIELD(sfNextPageMin,              UINT256,   27)
 TYPED_SFIELD(sfNFTokenBuyOffer,          UINT256,   28)
 TYPED_SFIELD(sfNFTokenSellOffer,         UINT256,   29)
-// 30 to 33 unused
+TYPED_SFIELD(sfHookStateKey,             UINT256,   30)
+TYPED_SFIELD(sfHookHash,                 UINT256,   31)
+TYPED_SFIELD(sfHookNamespace,            UINT256,   32)
+TYPED_SFIELD(sfHookSetTxnID,             UINT256,   33)
 TYPED_SFIELD(sfDomainID,                 UINT256,   34)
 TYPED_SFIELD(sfVaultID,                  UINT256,   35,
    SField::kSmdPseudoAccount | SField::kSmdDefault)
@@ -231,9 +237,8 @@ TYPED_SFIELD(sfTotalValueOutstanding,    NUMBER,     15, SField::kSmdNeedsAsset
 TYPED_SFIELD(sfPeriodicPayment,          NUMBER,     16)
 TYPED_SFIELD(sfManagementFeeOutstanding, NUMBER,     17, SField::kSmdNeedsAsset | SField::kSmdDefault)

-// 32-bit signed (common)
+// int32
 TYPED_SFIELD(sfLoanScale,                INT32,      1)
-TYPED_SFIELD(sfRemainingOwnerCountDelta, INT32,      2)

 // currency amount (common)
 TYPED_SFIELD(sfAmount,                   AMOUNT,     1)
@@ -255,13 +260,15 @@ TYPED_SFIELD(sfMinimumOffer,             AMOUNT,    16)
 TYPED_SFIELD(sfRippleEscrow,             AMOUNT,    17)
 TYPED_SFIELD(sfDeliveredAmount,          AMOUNT,    18)
 TYPED_SFIELD(sfNFTokenBrokerFee,         AMOUNT,    19)
-// 20 to 21 unused
+
+// Reserve 20 & 21 for Hooks.
+
 // currency amount (fees)
 TYPED_SFIELD(sfBaseFeeDrops,             AMOUNT,    22)
 TYPED_SFIELD(sfReserveBaseDrops,         AMOUNT,    23)
 TYPED_SFIELD(sfReserveIncrementDrops,    AMOUNT,    24)

-// currency amount (more)
+// currency amount (AMM)
 TYPED_SFIELD(sfLPTokenOut,               AMOUNT,    25)
 TYPED_SFIELD(sfLPTokenIn,                AMOUNT,    26)
 TYPED_SFIELD(sfEPrice,                   AMOUNT,    27)
@@ -271,7 +278,6 @@ TYPED_SFIELD(sfMinAccountCreateAmount,   AMOUNT,    30)
 TYPED_SFIELD(sfLPTokenBalance,           AMOUNT,    31)
 TYPED_SFIELD(sfFeeAmount,                AMOUNT,    32)
 TYPED_SFIELD(sfMaxFee,                   AMOUNT,    33)
-TYPED_SFIELD(sfFeeAmountDelta,           AMOUNT,    34)

 // variable length (common)
 TYPED_SFIELD(sfPublicKey,                VL,         1)
@@ -296,7 +302,10 @@ TYPED_SFIELD(sfMasterSignature,          VL,        18, SField::kSmdDefault, SFi
 TYPED_SFIELD(sfUNLModifyValidator,       VL,        19)
 TYPED_SFIELD(sfValidatorToDisable,       VL,        20)
 TYPED_SFIELD(sfValidatorToReEnable,      VL,        21)
-// 22 to 25 unused
+TYPED_SFIELD(sfHookStateData,            VL,        22)
+TYPED_SFIELD(sfHookReturnString,         VL,        23)
+TYPED_SFIELD(sfHookParameterName,        VL,        24)
+TYPED_SFIELD(sfHookParameterValue,       VL,        25)
 TYPED_SFIELD(sfDIDDocument,              VL,        26)
 TYPED_SFIELD(sfData,                     VL,        27)
 TYPED_SFIELD(sfAssetClass,               VL,        28)
@@ -334,7 +343,7 @@ TYPED_SFIELD(sfHolder,                   ACCOUNT,   11)
 TYPED_SFIELD(sfDelegate,                 ACCOUNT,   12)

 // account (uncommon)
-// 16 unused
+TYPED_SFIELD(sfHookAccount,              ACCOUNT,   16)
 TYPED_SFIELD(sfOtherChainSource,         ACCOUNT,   18)
 TYPED_SFIELD(sfOtherChainDestination,    ACCOUNT,   19)
 TYPED_SFIELD(sfAttestationSignerAccount, ACCOUNT,   20)
@@ -387,7 +396,7 @@ UNTYPED_SFIELD(sfMemo,                   OBJECT,    10)
 UNTYPED_SFIELD(sfSignerEntry,            OBJECT,    11)
 UNTYPED_SFIELD(sfNFToken,                OBJECT,    12)
 UNTYPED_SFIELD(sfEmitDetails,            OBJECT,    13)
-// 14 unused
+UNTYPED_SFIELD(sfHook,                   OBJECT,    14)
 UNTYPED_SFIELD(sfPermission,             OBJECT,    15)

 // inner object (uncommon)
@@ -395,7 +404,11 @@ UNTYPED_SFIELD(sfSigner,                 OBJECT,    16)
 //                                                  17 unused
 UNTYPED_SFIELD(sfMajority,               OBJECT,    18)
 UNTYPED_SFIELD(sfDisabledValidator,      OBJECT,    19)
-// 20 to 24 unused
+UNTYPED_SFIELD(sfEmittedTxn,             OBJECT,    20)
+UNTYPED_SFIELD(sfHookExecution,          OBJECT,    21)
+UNTYPED_SFIELD(sfHookDefinition,         OBJECT,    22)
+UNTYPED_SFIELD(sfHookParameter,          OBJECT,    23)
+UNTYPED_SFIELD(sfHookGrant,              OBJECT,    24)
 UNTYPED_SFIELD(sfVoteEntry,              OBJECT,    25)
 UNTYPED_SFIELD(sfAuctionSlot,            OBJECT,    26)
 UNTYPED_SFIELD(sfAuthAccount,            OBJECT,    27)
@@ -423,14 +436,16 @@ UNTYPED_SFIELD(sfSufficient,             ARRAY,      7)
 UNTYPED_SFIELD(sfAffectedNodes,          ARRAY,      8)
 UNTYPED_SFIELD(sfMemos,                  ARRAY,      9)
 UNTYPED_SFIELD(sfNFTokens,               ARRAY,     10)
-// 11 unused
+UNTYPED_SFIELD(sfHooks,                  ARRAY,     11)
 UNTYPED_SFIELD(sfVoteSlots,              ARRAY,     12)
 UNTYPED_SFIELD(sfAdditionalBooks,        ARRAY,     13)

 // array of objects (uncommon)
 UNTYPED_SFIELD(sfMajorities,             ARRAY,     16)
 UNTYPED_SFIELD(sfDisabledValidators,     ARRAY,     17)
-// 18 to 20 unused
+UNTYPED_SFIELD(sfHookExecutions,         ARRAY,     18)
+UNTYPED_SFIELD(sfHookParameters,         ARRAY,     19)
+UNTYPED_SFIELD(sfHookGrants,             ARRAY,     20)
 UNTYPED_SFIELD(sfXChainClaimAttestations, ARRAY,    21)
 UNTYPED_SFIELD(sfXChainCreateAccountAttestations, ARRAY, 22)
 //                                                  23 unused
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Denis Angell	f80e72c6f7	fix: address clang-tidy findings and review feedback	2026-08-06 15:08:42 -04:00
Denis Angell	c16f18f79b	fix: harden cgroup detection and rename ledger_fetch_size	2026-08-06 12:37:30 -04:00
Denis Angell	a40b88436d	feat: add overrides for fixed cache policy values	2026-08-06 12:20:44 -04:00
Denis Angell	c65e4539f5	feat: resolve the process cgroup path for nested memory limits	2026-08-06 12:18:39 -04:00
Denis Angell	45ed9e4de7	feat: replace node_size with memory_limit	2026-08-06 11:06:51 -04:00