initial hash removal

2025-11-16 00:55:49 +00:00 · 2025-05-16 15:48:32 +01:00
487 changed files with 10236 additions and 34773 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -94,4 +94,3 @@ SpacesInSquareBrackets: false
 Standard:        Cpp11
 TabWidth:        8
 UseTab:          Never
-QualifierAlignment: Right
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -7,13 +7,13 @@ comment:
  show_carryforward_flags: false

 coverage:
-  range: "70..85"
+  range: "60..80"
  precision: 1
  round: nearest
  status:
    project:
      default:
-        target: 75%
+        target: 60%
        threshold: 2%
    patch:
      default:
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,8 +0,0 @@
-# Allow anyone to review any change by default.
-*
-
-# Require the rpc-reviewers team to review changes to the rpc code.
-include/xrpl/protocol/ @xrplf/rpc-reviewers
-src/libxrpl/protocol/ @xrplf/rpc-reviewers
-src/xrpld/rpc/ @xrplf/rpc-reviewers
-src/xrpld/app/misc/ @xrplf/rpc-reviewers
--- a/.github/workflows/doxygen.yml
+++ b/.github/workflows/doxygen.yml
@@ -10,7 +10,7 @@ concurrency:
  cancel-in-progress: true

 jobs:
-  documentation:
+  job:
    runs-on: ubuntu-latest
    permissions:
      contents: write
--- a/.github/workflows/libxrpl.yml
+++ b/.github/workflows/libxrpl.yml
@@ -1,6 +1,6 @@
 name: Check libXRPL compatibility with Clio
 env:
-  CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/dev
+  CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/conan-non-prod
  CONAN_LOGIN_USERNAME_RIPPLE: ${{ secrets.CONAN_USERNAME }}
  CONAN_PASSWORD_RIPPLE: ${{ secrets.CONAN_TOKEN }}
 on:
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -71,9 +71,6 @@ jobs:
          nproc --version
          echo -n "nproc returns: "
          nproc
-          system_profiler SPHardwareDataType
-          sysctl -n hw.logicalcpu
-          clang --version
      - name: configure Conan
        run : |
          conan profile new default --detect || true
@@ -92,11 +89,9 @@ jobs:
          generator: ${{ matrix.generator }}
          configuration: ${{ matrix.configuration }}
          cmake-args: "-Dassert=TRUE -Dwerr=TRUE ${{ matrix.cmake-args }}"
-      - name: test
-        run: |
-          n=$(nproc)
-          echo "Using $n test jobs"
-
-          cd ${build_dir}
-          ./rippled --unittest --unittest-jobs $n
-          ctest -j $n --output-on-failure
+      # TODO: Temporary disabled tests
+      # - name: test
+      #   run: |
+      #     n=$(nproc)
+      #     echo "Using $n test jobs"
+      #     ${build_dir}/rippled --unittest --unittest-jobs $n
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -163,9 +163,7 @@ jobs:
          cmake-args: "-Dassert=TRUE -Dwerr=TRUE ${{ matrix.cmake-args }}"
      - name: test
        run: |
-          cd ${build_dir}
-          ./rippled --unittest --unittest-jobs $(nproc)
-          ctest -j $(nproc) --output-on-failure
+          ${build_dir}/rippled --unittest --unittest-jobs $(nproc)

  reference-fee-test:
    strategy:
@@ -219,9 +217,8 @@ jobs:
          cmake-args: "-Dassert=TRUE -Dwerr=TRUE ${{ matrix.cmake-args }}"
      - name: test
        run: |
-          cd ${build_dir}
-          ./rippled --unittest --unittest-jobs $(nproc)
-          ctest -j $(nproc) --output-on-failure
+          ${build_dir}/rippled --unittest --unittest-jobs $(nproc)
+
  coverage:
    strategy:
      fail-fast: false
@@ -250,7 +247,7 @@ jobs:
          mkdir -p ~/.conan
          tar -xzf conan.tar -C ~/.conan
      - name: install gcovr
-        run: pip install "gcovr>=7,<9"
+        run: pip install "gcovr>=7,<8"
      - name: check environment
        run: |
          echo ${PATH} | tr ':' '\n'
@@ -444,4 +441,3 @@ jobs:
          run: |
            cd ${BUILD_DIR}
            ./rippled -u --unittest-jobs $(( $(nproc)/4 ))
-            ctest -j $(nproc) --output-on-failure
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -95,6 +95,5 @@ jobs:
        shell: bash
        if: ${{ matrix.configuration.tests }}
        run: |
-          cd ${build_dir}/${{ matrix.configuration.type }}
-          ./rippled --unittest --unittest-jobs $(nproc)
-          ctest -j $(nproc) --output-on-failure
+          ${build_dir}/${{ matrix.configuration.type }}/rippled --unittest \
+              --unittest-jobs $(nproc)
--- a/BUILD.md
+++ b/BUILD.md
@@ -288,7 +288,7 @@ It fixes some source files to add missing `#include`s.
   Single-config generators:

   ```
-   cmake --build . -j $(nproc)
+   cmake --build .
   ```

   Multi-config generators:
--- a/Builds/levelization/results/ordering.txt
+++ b/Builds/levelization/results/ordering.txt
@@ -132,7 +132,6 @@ test.shamap > xrpl.protocol
 test.toplevel > test.csf
 test.toplevel > xrpl.json
 test.unit_test > xrpl.basics
-tests.libxrpl > xrpl.basics
 xrpl.json > xrpl.basics
 xrpl.protocol > xrpl.basics
 xrpl.protocol > xrpl.json
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,11 +90,6 @@ set_target_properties(OpenSSL::SSL PROPERTIES
  INTERFACE_COMPILE_DEFINITIONS OPENSSL_NO_SSL2
 )
 set(SECP256K1_INSTALL TRUE)
-set(SECP256K1_BUILD_BENCHMARK FALSE)
-set(SECP256K1_BUILD_TESTS FALSE)
-set(SECP256K1_BUILD_EXHAUSTIVE_TESTS FALSE)
-set(SECP256K1_BUILD_CTIME_TESTS FALSE)
-set(SECP256K1_BUILD_EXAMPLES FALSE)
 add_subdirectory(external/secp256k1)
 add_library(secp256k1::secp256k1 ALIAS secp256k1)
 add_subdirectory(external/ed25519-donna)
@@ -149,8 +144,3 @@ set(PROJECT_EXPORT_SET RippleExports)
 include(RippledCore)
 include(RippledInstall)
 include(RippledValidatorKeys)
-
-if(tests)
-  include(CTest)
-  add_subdirectory(src/tests/libxrpl)
-endif()
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
-[![codecov](https://codecov.io/gh/XRPLF/rippled/graph/badge.svg?token=WyFr5ajq3O)](https://codecov.io/gh/XRPLF/rippled)
-
 # The XRP Ledger

 The [XRP Ledger](https://xrpl.org/) is a decentralized cryptographic ledger powered by a network of peer-to-peer nodes. The XRP Ledger uses a novel Byzantine Fault Tolerant consensus algorithm to settle and record transactions in a secure distributed database without a central operator.
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -83,7 +83,7 @@ To report a qualifying bug, please send a detailed report to:
 |Long Key ID  | `0xCD49A0AFC57929BE`                                |
 |Fingerprint  | `24E6 3B02 37E0 FA9C 5E96 8974 CD49 A0AF C579 29BE` |

-The full PGP key for this address, which is also available on several key servers (e.g. on [keyserver.ubuntu.com](https://keyserver.ubuntu.com)), is: 
+The full PGP key for this address, which is also available on several key servers (e.g. on [keys.gnupg.net](https://keys.gnupg.net)), is: 
 ```
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 mQINBFUwGHYBEAC0wpGpBPkd8W1UdQjg9+cEFzeIEJRaoZoeuJD8mofwI5Ejnjdt
--- a/cfg/validators-example.txt
+++ b/cfg/validators-example.txt
@@ -26,7 +26,7 @@
 #
 #   Examples:
 #    https://vl.ripple.com
-#    https://unl.xrplf.org
+#    https://vl.xrplf.org
 #    http://127.0.0.1:8000
 #    file:///etc/opt/ripple/vl.txt
 #
--- a/cmake/CodeCoverage.cmake
+++ b/cmake/CodeCoverage.cmake
@@ -98,9 +98,6 @@
 # 2024-04-03, Bronek Kozicki
 #     - add support for output formats: jacoco, clover, lcov
 #
-# 2025-05-12, Jingchen Wu
-#     - add -fprofile-update=atomic to ensure atomic profile generation
-#
 # USAGE:
 #
 # 1. Copy this file into your cmake modules path.
@@ -203,27 +200,15 @@ set(COVERAGE_COMPILER_FLAGS "-g --coverage"
    CACHE INTERNAL "")
 if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
    include(CheckCXXCompilerFlag)
-    include(CheckCCompilerFlag)
-
    check_cxx_compiler_flag(-fprofile-abs-path HAVE_cxx_fprofile_abs_path)
    if(HAVE_cxx_fprofile_abs_path)
        set(COVERAGE_CXX_COMPILER_FLAGS "${COVERAGE_COMPILER_FLAGS} -fprofile-abs-path")
    endif()
-
+    include(CheckCCompilerFlag)
    check_c_compiler_flag(-fprofile-abs-path HAVE_c_fprofile_abs_path)
    if(HAVE_c_fprofile_abs_path)
        set(COVERAGE_C_COMPILER_FLAGS "${COVERAGE_COMPILER_FLAGS} -fprofile-abs-path")
    endif()
-
-    check_cxx_compiler_flag(-fprofile-update HAVE_cxx_fprofile_update)
-    if(HAVE_cxx_fprofile_update)
-        set(COVERAGE_CXX_COMPILER_FLAGS "${COVERAGE_COMPILER_FLAGS}  -fprofile-update=atomic")
-    endif()
-
-    check_c_compiler_flag(-fprofile-update HAVE_c_fprofile_update)
-    if(HAVE_c_fprofile_update)
-        set(COVERAGE_C_COMPILER_FLAGS "${COVERAGE_COMPILER_FLAGS} -fprofile-update=atomic")
-    endif()
 endif()

 set(CMAKE_Fortran_FLAGS_COVERAGE
--- a/cmake/RippledDocs.cmake
+++ b/cmake/RippledDocs.cmake
@@ -53,9 +53,9 @@ set(download_script "${CMAKE_BINARY_DIR}/docs/download-cppreference.cmake")
 file(WRITE
  "${download_script}"
  "file(DOWNLOAD \
-    https://github.com/PeterFeicht/cppreference-doc/releases/download/v20250209/html-book-20250209.zip \
+    http://upload.cppreference.com/mwiki/images/b/b2/html_book_20190607.zip \
    ${CMAKE_BINARY_DIR}/docs/cppreference.zip \
-    EXPECTED_HASH MD5=bda585f72fbca4b817b29a3d5746567b \
+    EXPECTED_HASH MD5=82b3a612d7d35a83e3cb1195a63689ab \
  )\n \
  execute_process( \
    COMMAND \"${CMAKE_COMMAND}\" -E tar -xf cppreference.zip \
--- a/cmake/RippledSanity.cmake
+++ b/cmake/RippledSanity.cmake
@@ -2,6 +2,16 @@
   convenience variables and sanity checks
 #]===================================================================]

+include(ProcessorCount)
+
+if (NOT ep_procs)
+  ProcessorCount(ep_procs)
+  if (ep_procs GREATER 1)
+    # never use more than half of cores for EP builds
+    math (EXPR ep_procs "${ep_procs} / 2")
+    message (STATUS "Using ${ep_procs} cores for ExternalProject builds.")
+  endif ()
+endif ()
 get_property(is_multiconfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)

 set (CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE)
--- a/cmake/RippledSettings.cmake
+++ b/cmake/RippledSettings.cmake
@@ -18,7 +18,7 @@ if(tests)
  endif()
 endif()

-option(unity "Creates a build using UNITY support in cmake." OFF)
+option(unity "Creates a build using UNITY support in cmake. This is the default" ON)
 if(unity)
  if(NOT is_ci)
    set(CMAKE_UNITY_BUILD_BATCH_SIZE 15 CACHE STRING "")
--- a/cmake/deps/Boost.cmake
+++ b/cmake/deps/Boost.cmake
@@ -2,6 +2,7 @@ find_package(Boost 1.82 REQUIRED
  COMPONENTS
    chrono
    container
+    context
    coroutine
    date_time
    filesystem
@@ -23,7 +24,7 @@ endif()

 target_link_libraries(ripple_boost
  INTERFACE
-    Boost::headers
+    Boost::boost
    Boost::chrono
    Boost::container
    Boost::coroutine
--- a/cmake/xrpl_add_test.cmake
+++ b/cmake/xrpl_add_test.cmake
@@ -1,41 +0,0 @@
-include(isolate_headers)
-
-function(xrpl_add_test name)
-  set(target ${PROJECT_NAME}.test.${name})
-
-  file(GLOB_RECURSE sources CONFIGURE_DEPENDS
-  "${CMAKE_CURRENT_SOURCE_DIR}/${name}/*.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/${name}.cpp"
-  )
-  add_executable(${target} EXCLUDE_FROM_ALL ${ARGN} ${sources})
-
-  isolate_headers(
-    ${target}
-    "${CMAKE_SOURCE_DIR}"
-    "${CMAKE_SOURCE_DIR}/tests/${name}"
-    PRIVATE
-  )
-
-  # Make sure the test isn't optimized away in unity builds
-  set_target_properties(${target} PROPERTIES
-    UNITY_BUILD_MODE GROUP
-    UNITY_BUILD_BATCH_SIZE 0)  # Adjust as needed
-
-  add_test(NAME ${target} COMMAND ${target})
-  set_tests_properties(
-    ${target} PROPERTIES
-    FIXTURES_REQUIRED ${target}_fixture
-  )
-
-  add_test(
-    NAME ${target}.build
-    COMMAND
-      ${CMAKE_COMMAND}
-      --build ${CMAKE_BINARY_DIR}
-      --config $<CONFIG>
-      --target ${target}
-  )
-  set_tests_properties(${target}.build PROPERTIES
-    FIXTURES_SETUP ${target}_fixture
-  )
-endfunction()
--- a/conanfile.py
+++ b/conanfile.py
@@ -1,4 +1,4 @@
-from conan import ConanFile, __version__ as conan_version
+from conan import ConanFile
 from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
 import re

@@ -24,12 +24,13 @@ class Xrpl(ConanFile):
    }

    requires = [
-        'doctest/2.4.11',
+        'date/3.0.3',
        'grpc/1.50.1',
        'libarchive/3.7.6',
        'nudb/2.0.8',
        'openssl/1.1.1v',
        'soci/4.0.3',
+        'xxhash/0.8.2',
        'zlib/1.3.1',
    ]

@@ -98,10 +99,7 @@ class Xrpl(ConanFile):
            self.options['boost'].visibility = 'global'

    def requirements(self):
-        # Conan 2 requires transitive headers to be specified
-        transitive_headers_opt = {'transitive_headers': True} if conan_version.split('.')[0] == '2' else {}
-        self.requires('boost/1.83.0', force=True, **transitive_headers_opt)
-        self.requires('date/3.0.3', **transitive_headers_opt)
+        self.requires('boost/1.83.0', force=True)
        self.requires('lz4/1.10.0', force=True)
        self.requires('protobuf/3.21.9', force=True)
        self.requires('sqlite3/3.47.0', force=True)
@@ -109,7 +107,6 @@ class Xrpl(ConanFile):
            self.requires('jemalloc/5.3.0')
        if self.options.rocksdb:
            self.requires('rocksdb/9.7.3')
-        self.requires('xxhash/0.8.2', **transitive_headers_opt)

    exports_sources = (
        'CMakeLists.txt',
@@ -164,17 +161,7 @@ class Xrpl(ConanFile):
        # `include/`, not `include/ripple/proto/`.
        libxrpl.includedirs = ['include', 'include/ripple/proto']
        libxrpl.requires = [
-            'boost::headers',
-            'boost::chrono',
-            'boost::container',
-            'boost::coroutine',
-            'boost::date_time',
-            'boost::filesystem',
-            'boost::json',
-            'boost::program_options',
-            'boost::regex',
-            'boost::system',
-            'boost::thread',
+            'boost::boost',
            'date::date',
            'grpc::grpc++',
            'libarchive::libarchive',
--- a/docs/build/environment.md
+++ b/docs/build/environment.md
@@ -23,7 +23,7 @@ direction.

 ```
 apt update
-apt install --yes curl git libssl-dev pipx python3.10-dev python3-pip make g++-11 libprotobuf-dev protobuf-compiler
+apt install --yes curl git libssl-dev python3.10-dev python3-pip make g++-11 libprotobuf-dev protobuf-compiler

 curl --location --remote-name \
  "https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1.tar.gz"
@@ -35,8 +35,7 @@ make --jobs $(nproc)
 make install
 cd ..

-pipx install 'conan<2'
-pipx ensurepath
+pip3 install 'conan<2'
 ```

 [1]: https://github.com/thejohnfreeman/rippled-docker/blob/master/ubuntu-22.04/install.sh
--- a/external/antithesis-sdk/CMakeLists.txt
+++ b/external/antithesis-sdk/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 3.25)

 # Note, version set explicitly by rippled project
 project(antithesis-sdk-cpp VERSION 0.4.4 LANGUAGES CXX)
--- a/include/xrpl/basics/BasicConfig.h
+++ b/include/xrpl/basics/BasicConfig.h
@@ -367,7 +367,7 @@ get(Section const& section,
 }

 inline std::string
-get(Section const& section, std::string const& name, char const* defaultValue)
+get(Section const& section, std::string const& name, const char* defaultValue)
 {
    try
    {
--- a/include/xrpl/basics/CompressionAlgorithms.h
+++ b/include/xrpl/basics/CompressionAlgorithms.h
@@ -55,7 +55,7 @@ lz4Compress(void const* in, std::size_t inSize, BufferFactory&& bf)
    auto compressed = bf(outCapacity);

    auto compressedSize = LZ4_compress_default(
-        reinterpret_cast<char const*>(in),
+        reinterpret_cast<const char*>(in),
        reinterpret_cast<char*>(compressed),
        inSize,
        outCapacity);
@@ -89,7 +89,7 @@ lz4Decompress(
        Throw<std::runtime_error>("lz4Decompress: integer overflow (output)");

    if (LZ4_decompress_safe(
-            reinterpret_cast<char const*>(in),
+            reinterpret_cast<const char*>(in),
            reinterpret_cast<char*>(decompressed),
            inSize,
            decompressedSize) != decompressedSize)
--- a/include/xrpl/basics/Expected.h
+++ b/include/xrpl/basics/Expected.h
@@ -22,18 +22,8 @@

 #include <xrpl/basics/contract.h>

-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated"
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
 #include <boost/outcome.hpp>

-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
 #include <stdexcept>

 namespace ripple {
@@ -103,7 +93,7 @@ public:
    {
    }

-    constexpr E const&
+    constexpr const E&
    value() const&
    {
        return val_;
@@ -121,7 +111,7 @@ public:
        return std::move(val_);
    }

-    constexpr E const&&
+    constexpr const E&&
    value() const&&
    {
        return std::move(val_);
--- a/include/xrpl/basics/TaggedCache.h
+++ b/include/xrpl/basics/TaggedCache.h
@@ -115,7 +115,7 @@ public:
    sweep();

    bool
-    del(key_type const& key, bool valid);
+    del(const key_type& key, bool valid);

 public:
    /** Replace aliased objects with originals.
@@ -134,20 +134,20 @@ public:
    template <class R>
    bool
    canonicalize(
-        key_type const& key,
+        const key_type& key,
        SharedPointerType& data,
        R&& replaceCallback);

    bool
    canonicalize_replace_cache(
-        key_type const& key,
+        const key_type& key,
        SharedPointerType const& data);

    bool
-    canonicalize_replace_client(key_type const& key, SharedPointerType& data);
+    canonicalize_replace_client(const key_type& key, SharedPointerType& data);

    SharedPointerType
-    fetch(key_type const& key);
+    fetch(const key_type& key);

    /** Insert the element into the container.
        If the key already exists, nothing happens.
@@ -168,7 +168,7 @@ public:
    //             simply return an iterator.
    //
    bool
-    retrieve(key_type const& key, T& data);
+    retrieve(const key_type& key, T& data);

    mutex_type&
    peekMutex();
@@ -322,10 +322,10 @@ private:
    std::string m_name;

    // Desired number of cache entries (0 = ignore)
-    int const m_target_size;
+    const int m_target_size;

    // Desired maximum cache age
-    clock_type::duration const m_target_age;
+    const clock_type::duration m_target_age;

    // Number of items cached
    int m_cache_count;
--- a/include/xrpl/basics/TaggedCache.ipp
+++ b/include/xrpl/basics/TaggedCache.ipp
@@ -365,7 +365,7 @@ TaggedCache<
    SharedPointerType,
    Hash,
    KeyEqual,
-    Mutex>::del(key_type const& key, bool valid)
+    Mutex>::del(const key_type& key, bool valid)
 {
    // Remove from cache, if !valid, remove from map too. Returns true if
    // removed from cache
@@ -414,7 +414,7 @@ TaggedCache<
    KeyEqual,
    Mutex>::
    canonicalize(
-        key_type const& key,
+        const key_type& key,
        SharedPointerType& data,
        R&& replaceCallback)
 {
@@ -509,7 +509,7 @@ TaggedCache<
    KeyEqual,
    Mutex>::
    canonicalize_replace_cache(
-        key_type const& key,
+        const key_type& key,
        SharedPointerType const& data)
 {
    return canonicalize(
@@ -535,7 +535,7 @@ TaggedCache<
    Hash,
    KeyEqual,
    Mutex>::
-    canonicalize_replace_client(key_type const& key, SharedPointerType& data)
+    canonicalize_replace_client(const key_type& key, SharedPointerType& data)
 {
    return canonicalize(key, data, []() { return false; });
 }
@@ -558,7 +558,7 @@ TaggedCache<
    SharedPointerType,
    Hash,
    KeyEqual,
-    Mutex>::fetch(key_type const& key)
+    Mutex>::fetch(const key_type& key)
 {
    std::lock_guard<mutex_type> l(m_mutex);
    auto ret = initialFetch(key, l);
@@ -656,7 +656,7 @@ TaggedCache<
    SharedPointerType,
    Hash,
    KeyEqual,
-    Mutex>::retrieve(key_type const& key, T& data)
+    Mutex>::retrieve(const key_type& key, T& data)
 {
    // retrieve the value of the stored data
    auto entry = fetch(key);
--- a/include/xrpl/basics/base_uint.h
+++ b/include/xrpl/basics/base_uint.h
@@ -374,7 +374,7 @@ public:
    }

    base_uint&
-    operator^=(base_uint const& b)
+    operator^=(const base_uint& b)
    {
        for (int i = 0; i < WIDTH; i++)
            data_[i] ^= b.data_[i];
@@ -383,7 +383,7 @@ public:
    }

    base_uint&
-    operator&=(base_uint const& b)
+    operator&=(const base_uint& b)
    {
        for (int i = 0; i < WIDTH; i++)
            data_[i] &= b.data_[i];
@@ -392,7 +392,7 @@ public:
    }

    base_uint&
-    operator|=(base_uint const& b)
+    operator|=(const base_uint& b)
    {
        for (int i = 0; i < WIDTH; i++)
            data_[i] |= b.data_[i];
@@ -415,11 +415,11 @@ public:
        return *this;
    }

-    base_uint const
+    const base_uint
    operator++(int)
    {
        // postfix operator
-        base_uint const ret = *this;
+        const base_uint ret = *this;
        ++(*this);

        return ret;
@@ -441,11 +441,11 @@ public:
        return *this;
    }

-    base_uint const
+    const base_uint
    operator--(int)
    {
        // postfix operator
-        base_uint const ret = *this;
+        const base_uint ret = *this;
        --(*this);

        return ret;
@@ -466,7 +466,7 @@ public:
    }

    base_uint&
-    operator+=(base_uint const& b)
+    operator+=(const base_uint& b)
    {
        std::uint64_t carry = 0;

@@ -511,7 +511,7 @@ public:
    }

    [[nodiscard]] constexpr bool
-    parseHex(char const* str)
+    parseHex(const char* str)
    {
        return parseHex(std::string_view{str});
    }
--- a/include/xrpl/basics/comparators.h
+++ b/include/xrpl/basics/comparators.h
@@ -43,7 +43,7 @@ struct less
    using result_type = bool;

    constexpr bool
-    operator()(T const& left, T const& right) const
+    operator()(const T& left, const T& right) const
    {
        return std::less<T>()(left, right);
    }
@@ -55,7 +55,7 @@ struct equal_to
    using result_type = bool;

    constexpr bool
-    operator()(T const& left, T const& right) const
+    operator()(const T& left, const T& right) const
    {
        return std::equal_to<T>()(left, right);
    }
--- a/include/xrpl/basics/partitioned_unordered_map.h
+++ b/include/xrpl/basics/partitioned_unordered_map.h
@@ -52,7 +52,7 @@ template <
    typename Value,
    typename Hash,
    typename Pred = std::equal_to<Key>,
-    typename Alloc = std::allocator<std::pair<Key const, Value>>>
+    typename Alloc = std::allocator<std::pair<const Key, Value>>>
 class partitioned_unordered_map
 {
    std::size_t partitions_;
--- a/include/xrpl/basics/tagged_integer.h
+++ b/include/xrpl/basics/tagged_integer.h
@@ -76,13 +76,13 @@ public:
    }

    bool
-    operator<(tagged_integer const& rhs) const noexcept
+    operator<(const tagged_integer& rhs) const noexcept
    {
        return m_value < rhs.m_value;
    }

    bool
-    operator==(tagged_integer const& rhs) const noexcept
+    operator==(const tagged_integer& rhs) const noexcept
    {
        return m_value == rhs.m_value;
    }
@@ -144,14 +144,14 @@ public:
    }

    tagged_integer&
-    operator<<=(tagged_integer const& rhs) noexcept
+    operator<<=(const tagged_integer& rhs) noexcept
    {
        m_value <<= rhs.m_value;
        return *this;
    }

    tagged_integer&
-    operator>>=(tagged_integer const& rhs) noexcept
+    operator>>=(const tagged_integer& rhs) noexcept
    {
        m_value >>= rhs.m_value;
        return *this;
--- a/include/xrpl/beast/hash/hash_append.h
+++ b/include/xrpl/beast/hash/hash_append.h
@@ -24,38 +24,13 @@
 #include <boost/container/flat_set.hpp>
 #include <boost/endian/conversion.hpp>

-/*
-
-Workaround for overzealous clang warning, which trips on libstdc++ headers
-
-  In file included from
-  /usr/lib/gcc/x86_64-linux-gnu/12/../../../../include/c++/12/bits/stl_algo.h:61:
-  /usr/lib/gcc/x86_64-linux-gnu/12/../../../../include/c++/12/bits/stl_tempbuf.h:263:8:
-  error: 'get_temporary_buffer<std::pair<ripple::Quality, const
-  std::vector<std::unique_ptr<ripple::Step>> *>>' is deprecated
-  [-Werror,-Wdeprecated-declarations] 263 |
-  std::get_temporary_buffer<value_type>(_M_original_len));
-       ^
-*/
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated"
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
-#include <functional>
-#include <memory>
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
 #include <array>
 #include <chrono>
 #include <cstdint>
 #include <cstring>
+#include <functional>
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <system_error>
--- a/include/xrpl/beast/hash/uhash.h
+++ b/include/xrpl/beast/hash/uhash.h
@@ -30,7 +30,7 @@ namespace beast {
 template <class Hasher = xxhasher>
 struct uhash
 {
-    uhash() = default;
+    explicit uhash() = default;

    using result_type = typename Hasher::result_type;

--- a/include/xrpl/beast/net/IPEndpoint.h
+++ b/include/xrpl/beast/net/IPEndpoint.h
@@ -215,7 +215,7 @@ namespace std {
 template <>
 struct hash<::beast::IP::Endpoint>
 {
-    hash() = default;
+    explicit hash() = default;

    std::size_t
    operator()(::beast::IP::Endpoint const& endpoint) const
@@ -230,7 +230,7 @@ namespace boost {
 template <>
 struct hash<::beast::IP::Endpoint>
 {
-    hash() = default;
+    explicit hash() = default;

    std::size_t
    operator()(::beast::IP::Endpoint const& endpoint) const
--- a/include/xrpl/beast/utility/temp_dir.h
+++ b/include/xrpl/beast/utility/temp_dir.h
@@ -37,9 +37,9 @@ class temp_dir

 public:
 #if !GENERATING_DOCS
-    temp_dir(temp_dir const&) = delete;
+    temp_dir(const temp_dir&) = delete;
    temp_dir&
-    operator=(temp_dir const&) = delete;
+    operator=(const temp_dir&) = delete;
 #endif

    /// Construct a temporary directory.
--- a/include/xrpl/json/json_reader.h
+++ b/include/xrpl/json/json_reader.h
@@ -39,7 +39,7 @@ class Reader
 {
 public:
    using Char = char;
-    using Location = Char const*;
+    using Location = const Char*;

    /** \brief Constructs a Reader allowing all features
     * for parsing.
@@ -64,7 +64,7 @@ public:
     * error occurred.
     */
    bool
-    parse(char const* beginDoc, char const* endDoc, Value& root);
+    parse(const char* beginDoc, const char* endDoc, Value& root);

    /// \brief Parse from input stream.
    /// \see Json::operator>>(std::istream&, Json::Value&).
@@ -133,7 +133,7 @@ private:
    using Errors = std::deque<ErrorInfo>;

    bool
-    expectToken(TokenType type, Token& token, char const* message);
+    expectToken(TokenType type, Token& token, const char* message);
    bool
    readToken(Token& token);
    void
--- a/include/xrpl/json/json_value.h
+++ b/include/xrpl/json/json_value.h
@@ -20,13 +20,11 @@
 #ifndef RIPPLE_JSON_JSON_VALUE_H_INCLUDED
 #define RIPPLE_JSON_JSON_VALUE_H_INCLUDED

-#include <xrpl/basics/Number.h>
 #include <xrpl/json/json_forwards.h>

 #include <cstring>
 #include <map>
 #include <string>
-#include <utility>
 #include <vector>

 /** \brief JSON (JavaScript Object Notation).
@@ -63,24 +61,24 @@ enum ValueType {
 class StaticString
 {
 public:
-    constexpr explicit StaticString(char const* czstring) : str_(czstring)
+    constexpr explicit StaticString(const char* czstring) : str_(czstring)
    {
    }

    constexpr
-    operator char const*() const
+    operator const char*() const
    {
        return str_;
    }

-    constexpr char const*
+    constexpr const char*
    c_str() const
    {
        return str_;
    }

 private:
-    char const* str_;
+    const char* str_;
 };

 inline bool
@@ -158,10 +156,10 @@ public:
    using Int = Json::Int;
    using ArrayIndex = UInt;

-    static Value const null;
-    static Int const minInt;
-    static Int const maxInt;
-    static UInt const maxUInt;
+    static const Value null;
+    static const Int minInt;
+    static const Int maxInt;
+    static const UInt maxUInt;

 private:
    class CZString
@@ -173,24 +171,24 @@ private:
            duplicateOnCopy
        };
        CZString(int index);
-        CZString(char const* cstr, DuplicationPolicy allocate);
-        CZString(CZString const& other);
+        CZString(const char* cstr, DuplicationPolicy allocate);
+        CZString(const CZString& other);
        ~CZString();
        CZString&
-        operator=(CZString const& other) = delete;
+        operator=(const CZString& other) = delete;
        bool
-        operator<(CZString const& other) const;
+        operator<(const CZString& other) const;
        bool
-        operator==(CZString const& other) const;
+        operator==(const CZString& other) const;
        int
        index() const;
-        char const*
+        const char*
        c_str() const;
        bool
        isStaticString() const;

    private:
-        char const* cstr_;
+        const char* cstr_;
        int index_;
    };

@@ -217,8 +215,7 @@ public:
    Value(Int value);
    Value(UInt value);
    Value(double value);
-    Value(char const* value);
-    Value(ripple::Number const& value);
+    Value(const char* value);
    /** \brief Constructs a value from a static string.

     * Like other value string constructor but do not duplicate the string for
@@ -230,10 +227,10 @@ public:
     * Json::Value aValue( StaticString("some text") );
     * \endcode
     */
-    Value(StaticString const& value);
+    Value(const StaticString& value);
    Value(std::string const& value);
    Value(bool value);
-    Value(Value const& other);
+    Value(const Value& other);
    ~Value();

    Value&
@@ -250,7 +247,7 @@ public:
    ValueType
    type() const;

-    char const*
+    const char*
    asCString() const;
    /** Returns the unquoted string value. */
    std::string
@@ -320,12 +317,12 @@ public:
    /// Access an array element (zero based index )
    /// (You may need to say 'value[0u]' to get your compiler to distinguish
    ///  this from the operator[] which takes a string.)
-    Value const&
+    const Value&
    operator[](UInt index) const;
    /// If the array contains at least index+1 elements, returns the element
    /// value, otherwise returns defaultValue.
    Value
-    get(UInt index, Value const& defaultValue) const;
+    get(UInt index, const Value& defaultValue) const;
    /// Return true if index < size().
    bool
    isValidIndex(UInt index) const;
@@ -333,25 +330,25 @@ public:
    ///
    /// Equivalent to jsonvalue[jsonvalue.size()] = value;
    Value&
-    append(Value const& value);
+    append(const Value& value);
    Value&
    append(Value&& value);

    /// Access an object value by name, create a null member if it does not
    /// exist.
    Value&
-    operator[](char const* key);
+    operator[](const char* key);
    /// Access an object value by name, returns null if there is no member with
    /// that name.
-    Value const&
-    operator[](char const* key) const;
+    const Value&
+    operator[](const char* key) const;
    /// Access an object value by name, create a null member if it does not
    /// exist.
    Value&
    operator[](std::string const& key);
    /// Access an object value by name, returns null if there is no member with
    /// that name.
-    Value const&
+    const Value&
    operator[](std::string const& key) const;
    /** \brief Access an object value by name, create a null member if it does
     not exist.
@@ -367,16 +364,14 @@ public:
     * \endcode
     */
    Value&
-    operator[](StaticString const& key);
-    Value const&
-    operator[](StaticString const& key) const;
+    operator[](const StaticString& key);

    /// Return the member named key if it exist, defaultValue otherwise.
    Value
-    get(char const* key, Value const& defaultValue) const;
+    get(const char* key, const Value& defaultValue) const;
    /// Return the member named key if it exist, defaultValue otherwise.
    Value
-    get(std::string const& key, Value const& defaultValue) const;
+    get(std::string const& key, const Value& defaultValue) const;

    /// \brief Remove and return the named member.
    ///
@@ -385,14 +380,14 @@ public:
    /// \pre type() is objectValue or nullValue
    /// \post type() is unchanged
    Value
-    removeMember(char const* key);
+    removeMember(const char* key);
    /// Same as removeMember(const char*)
    Value
    removeMember(std::string const& key);

    /// Return true if the object has a member named key.
    bool
-    isMember(char const* key) const;
+    isMember(const char* key) const;
    /// Return true if the object has a member named key.
    bool
    isMember(std::string const& key) const;
@@ -419,13 +414,13 @@ public:
    end();

    friend bool
-    operator==(Value const&, Value const&);
+    operator==(const Value&, const Value&);
    friend bool
-    operator<(Value const&, Value const&);
+    operator<(const Value&, const Value&);

 private:
    Value&
-    resolveReference(char const* key, bool isStatic);
+    resolveReference(const char* key, bool isStatic);

 private:
    union ValueHolder
@@ -441,38 +436,32 @@ private:
    int allocated_ : 1;  // Notes: if declared as bool, bitfield is useless.
 };

-inline Value
-to_json(ripple::Number const& number)
-{
-    return to_string(number);
-}
-
 bool
-operator==(Value const&, Value const&);
+operator==(const Value&, const Value&);

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

 bool
-operator<(Value const&, Value const&);
+operator<(const Value&, const Value&);

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

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

 inline bool
-operator>=(Value const& x, Value const& y)
+operator>=(const Value& x, const Value& y)
 {
    return !(x < y);
 }
@@ -493,11 +482,11 @@ public:
    virtual ~ValueAllocator() = default;

    virtual char*
-    makeMemberName(char const* memberName) = 0;
+    makeMemberName(const char* memberName) = 0;
    virtual void
    releaseMemberName(char* memberName) = 0;
    virtual char*
-    duplicateStringValue(char const* value, unsigned int length = unknown) = 0;
+    duplicateStringValue(const char* value, unsigned int length = unknown) = 0;
    virtual void
    releaseStringValue(char* value) = 0;
 };
@@ -514,16 +503,16 @@ public:

    ValueIteratorBase();

-    explicit ValueIteratorBase(Value::ObjectValues::iterator const& current);
+    explicit ValueIteratorBase(const Value::ObjectValues::iterator& current);

    bool
-    operator==(SelfType const& other) const
+    operator==(const SelfType& other) const
    {
        return isEqual(other);
    }

    bool
-    operator!=(SelfType const& other) const
+    operator!=(const SelfType& other) const
    {
        return !isEqual(other);
    }
@@ -539,7 +528,7 @@ public:

    /// Return the member name of the referenced Value. "" if it is not an
    /// objectValue.
-    char const*
+    const char*
    memberName() const;

 protected:
@@ -553,13 +542,13 @@ protected:
    decrement();

    difference_type
-    computeDistance(SelfType const& other) const;
+    computeDistance(const SelfType& other) const;

    bool
-    isEqual(SelfType const& other) const;
+    isEqual(const SelfType& other) const;

    void
-    copy(SelfType const& other);
+    copy(const SelfType& other);

 private:
    Value::ObjectValues::iterator current_;
@@ -577,8 +566,8 @@ class ValueConstIterator : public ValueIteratorBase
 public:
    using size_t = unsigned int;
    using difference_type = int;
-    using reference = Value const&;
-    using pointer = Value const*;
+    using reference = const Value&;
+    using pointer = const Value*;
    using SelfType = ValueConstIterator;

    ValueConstIterator() = default;
@@ -586,11 +575,11 @@ public:
 private:
    /*! \internal Use by Value to create an iterator.
     */
-    explicit ValueConstIterator(Value::ObjectValues::iterator const& current);
+    explicit ValueConstIterator(const Value::ObjectValues::iterator& current);

 public:
    SelfType&
-    operator=(ValueIteratorBase const& other);
+    operator=(const ValueIteratorBase& other);

    SelfType
    operator++(int)
@@ -643,17 +632,17 @@ public:
    using SelfType = ValueIterator;

    ValueIterator() = default;
-    ValueIterator(ValueConstIterator const& other);
-    ValueIterator(ValueIterator const& other);
+    ValueIterator(const ValueConstIterator& other);
+    ValueIterator(const ValueIterator& other);

 private:
    /*! \internal Use by Value to create an iterator.
     */
-    explicit ValueIterator(Value::ObjectValues::iterator const& current);
+    explicit ValueIterator(const Value::ObjectValues::iterator& current);

 public:
    SelfType&
-    operator=(SelfType const& other);
+    operator=(const SelfType& other);

    SelfType
    operator++(int)
--- a/include/xrpl/json/json_writer.h
+++ b/include/xrpl/json/json_writer.h
@@ -39,7 +39,7 @@ public:
    {
    }
    virtual std::string
-    write(Value const& root) = 0;
+    write(const Value& root) = 0;
 };

 /** \brief Outputs a Value in <a HREF="http://www.json.org">JSON</a> format
@@ -60,11 +60,11 @@ public:

 public:  // overridden from Writer
    std::string
-    write(Value const& root) override;
+    write(const Value& root) override;

 private:
    void
-    writeValue(Value const& value);
+    writeValue(const Value& value);

    std::string document_;
 };
@@ -101,15 +101,15 @@ public:  // overridden from Writer
     * JSON document that represents the root value.
     */
    std::string
-    write(Value const& root) override;
+    write(const Value& root) override;

 private:
    void
-    writeValue(Value const& value);
+    writeValue(const Value& value);
    void
-    writeArrayValue(Value const& value);
+    writeArrayValue(const Value& value);
    bool
-    isMultineArray(Value const& value);
+    isMultineArray(const Value& value);
    void
    pushValue(std::string const& value);
    void
@@ -168,15 +168,15 @@ public:
     * return a value.
     */
    void
-    write(std::ostream& out, Value const& root);
+    write(std::ostream& out, const Value& root);

 private:
    void
-    writeValue(Value const& value);
+    writeValue(const Value& value);
    void
-    writeArrayValue(Value const& value);
+    writeArrayValue(const Value& value);
    bool
-    isMultineArray(Value const& value);
+    isMultineArray(const Value& value);
    void
    pushValue(std::string const& value);
    void
@@ -207,12 +207,12 @@ valueToString(double value);
 std::string
 valueToString(bool value);
 std::string
-valueToQuotedString(char const* value);
+valueToQuotedString(const char* value);

 /// \brief Output using the StyledStreamWriter.
 /// \see Json::operator>>()
 std::ostream&
-operator<<(std::ostream&, Value const& root);
+operator<<(std::ostream&, const Value& root);

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

--- a/include/xrpl/json/to_string.h
+++ b/include/xrpl/json/to_string.h
@@ -37,7 +37,7 @@ pretty(Value const&);

 /** Output using the StyledStreamWriter. @see Json::operator>>(). */
 std::ostream&
-operator<<(std::ostream&, Value const& root);
+operator<<(std::ostream&, const Value& root);

 }  // namespace Json

--- a/include/xrpl/protocol/AMMCore.h
+++ b/include/xrpl/protocol/AMMCore.h
@@ -48,6 +48,14 @@ class STObject;
 class STAmount;
 class Rules;

+/** Calculate AMM account ID.
+ */
+AccountID
+ammAccountID(
+    std::uint16_t prefix,
+    uint256 const& parentHash,
+    uint256 const& ammID);
+
 /** Calculate Liquidity Provider Token (LPT) Currency.
 */
 Currency
--- a/include/xrpl/protocol/AccountID.h
+++ b/include/xrpl/protocol/AccountID.h
@@ -149,7 +149,7 @@ namespace std {
 template <>
 struct hash<ripple::AccountID> : ripple::AccountID::hasher
 {
-    hash() = default;
+    explicit hash() = default;
 };

 }  // namespace std
--- a/include/xrpl/protocol/Asset.h
+++ b/include/xrpl/protocol/Asset.h
@@ -20,7 +20,6 @@
 #ifndef RIPPLE_PROTOCOL_ASSET_H_INCLUDED
 #define RIPPLE_PROTOCOL_ASSET_H_INCLUDED

-#include <xrpl/basics/Number.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/protocol/Issue.h>
 #include <xrpl/protocol/MPTIssue.h>
@@ -28,7 +27,6 @@
 namespace ripple {

 class Asset;
-class STAmount;

 template <typename TIss>
 concept ValidIssueType =
@@ -94,9 +92,6 @@ public:
    void
    setJson(Json::Value& jv) const;

-    STAmount
-    operator()(Number const&) const;
-
    bool
    native() const
    {
@@ -119,14 +114,6 @@ public:
    equalTokens(Asset const& lhs, Asset const& rhs);
 };

-inline Json::Value
-to_json(Asset const& asset)
-{
-    Json::Value jv;
-    asset.setJson(jv);
-    return jv;
-}
-
 template <ValidIssueType TIss>
 constexpr bool
 Asset::holds() const
@@ -232,6 +219,9 @@ validJSONAsset(Json::Value const& jv);
 Asset
 assetFromJson(Json::Value const& jv);

+Json::Value
+to_json(Asset const& asset);
+
 }  // namespace ripple

 #endif  // RIPPLE_PROTOCOL_ASSET_H_INCLUDED
--- a/include/xrpl/protocol/Batch.h
+++ b/include/xrpl/protocol/Batch.h
@@ -1,37 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of rippled: https://github.com/ripple/rippled
-    Copyright (c) 2024 Ripple Labs Inc.
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#include <xrpl/protocol/HashPrefix.h>
-#include <xrpl/protocol/STVector256.h>
-#include <xrpl/protocol/Serializer.h>
-
-namespace ripple {
-
-inline void
-serializeBatch(
-    Serializer& msg,
-    std::uint32_t const& flags,
-    std::vector<uint256> const& txids)
-{
-    msg.add32(HashPrefix::batch);
-    msg.add32(flags);
-    msg.add32(std::uint32_t(txids.size()));
-    for (auto const& txid : txids)
-        msg.addBitString(txid);
-}
-
-}  // namespace ripple
--- a/include/xrpl/protocol/Book.h
+++ b/include/xrpl/protocol/Book.h
@@ -21,7 +21,6 @@
 #define RIPPLE_PROTOCOL_BOOK_H_INCLUDED

 #include <xrpl/basics/CountedObject.h>
-#include <xrpl/basics/base_uint.h>
 #include <xrpl/protocol/Issue.h>

 #include <boost/utility/base_from_member.hpp>
@@ -37,17 +36,12 @@ class Book final : public CountedObject<Book>
 public:
    Issue in;
    Issue out;
-    std::optional<uint256> domain;

    Book()
    {
    }

-    Book(
-        Issue const& in_,
-        Issue const& out_,
-        std::optional<uint256> const& domain_)
-        : in(in_), out(out_), domain(domain_)
+    Book(Issue const& in_, Issue const& out_) : in(in_), out(out_)
    {
    }
 };
@@ -67,8 +61,6 @@ hash_append(Hasher& h, Book const& b)
 {
    using beast::hash_append;
    hash_append(h, b.in, b.out);
-    if (b.domain)
-        hash_append(h, *(b.domain));
 }

 Book
@@ -79,8 +71,7 @@ reversed(Book const& book);
 [[nodiscard]] inline constexpr bool
 operator==(Book const& lhs, Book const& rhs)
 {
-    return (lhs.in == rhs.in) && (lhs.out == rhs.out) &&
-        (lhs.domain == rhs.domain);
+    return (lhs.in == rhs.in) && (lhs.out == rhs.out);
 }
 /** @} */

@@ -91,18 +82,7 @@ operator<=>(Book const& lhs, Book const& rhs)
 {
    if (auto const c{lhs.in <=> rhs.in}; c != 0)
        return c;
-    if (auto const c{lhs.out <=> rhs.out}; c != 0)
-        return c;
-
-    // Manually compare optionals
-    if (lhs.domain && rhs.domain)
-        return *lhs.domain <=> *rhs.domain;  // Compare values if both exist
-    if (!lhs.domain && rhs.domain)
-        return std::weak_ordering::less;  // Empty is considered less
-    if (lhs.domain && !rhs.domain)
-        return std::weak_ordering::greater;  // Non-empty is greater
-
-    return std::weak_ordering::equivalent;  // Both are empty
+    return lhs.out <=> rhs.out;
 }
 /** @} */

@@ -124,7 +104,7 @@ private:
        boost::base_from_member<std::hash<ripple::AccountID>, 1>;

 public:
-    hash() = default;
+    explicit hash() = default;

    using value_type = std::size_t;
    using argument_type = ripple::Issue;
@@ -146,14 +126,12 @@ template <>
 struct hash<ripple::Book>
 {
 private:
-    using issue_hasher = std::hash<ripple::Issue>;
-    using uint256_hasher = ripple::uint256::hasher;
+    using hasher = std::hash<ripple::Issue>;

-    issue_hasher m_issue_hasher;
-    uint256_hasher m_uint256_hasher;
+    hasher m_hasher;

 public:
-    hash() = default;
+    explicit hash() = default;

    using value_type = std::size_t;
    using argument_type = ripple::Book;
@@ -161,12 +139,8 @@ public:
    value_type
    operator()(argument_type const& value) const
    {
-        value_type result(m_issue_hasher(value.in));
-        boost::hash_combine(result, m_issue_hasher(value.out));
-
-        if (value.domain)
-            boost::hash_combine(result, m_uint256_hasher(*value.domain));
-
+        value_type result(m_hasher(value.in));
+        boost::hash_combine(result, m_hasher(value.out));
        return result;
    }
 };
@@ -180,7 +154,7 @@ namespace boost {
 template <>
 struct hash<ripple::Issue> : std::hash<ripple::Issue>
 {
-    hash() = default;
+    explicit hash() = default;

    using Base = std::hash<ripple::Issue>;
    // VFALCO NOTE broken in vs2012
@@ -190,7 +164,7 @@ struct hash<ripple::Issue> : std::hash<ripple::Issue>
 template <>
 struct hash<ripple::Book> : std::hash<ripple::Book>
 {
-    hash() = default;
+    explicit hash() = default;

    using Base = std::hash<ripple::Book>;
    // VFALCO NOTE broken in vs2012
--- a/include/xrpl/protocol/ErrorCodes.h
+++ b/include/xrpl/protocol/ErrorCodes.h
@@ -120,7 +120,7 @@ enum error_code_i {
    rpcSRC_ACT_MALFORMED = 65,
    rpcSRC_ACT_MISSING = 66,
    rpcSRC_ACT_NOT_FOUND = 67,
-    rpcDELEGATE_ACT_NOT_FOUND = 68,
+    // unused                  68,
    rpcSRC_CUR_MALFORMED = 69,
    rpcSRC_ISR_MALFORMED = 70,
    rpcSTREAM_MALFORMED = 71,
@@ -154,10 +154,7 @@ enum error_code_i {
    // Simulate
    rpcTX_SIGNED = 96,

-    // Pathfinding
-    rpcDOMAIN_MALFORMED = 97,
-
-    rpcLAST = rpcDOMAIN_MALFORMED  // rpcLAST should always equal the last code.
+    rpcLAST = rpcTX_SIGNED  // rpcLAST should always equal the last code.
 };

 /** Codes returned in the `warnings` array of certain RPC commands.
--- a/include/xrpl/protocol/Feature.h
+++ b/include/xrpl/protocol/Feature.h
@@ -55,11 +55,6 @@
 *    `VoteBehavior::DefaultYes`. The communication process is beyond
 *    the scope of these instructions.
 *
- * 5) A feature marked as Obsolete can mean either:
- *    1) It is in the ledger (marked as Supported::yes) and it is on its way to
- *      become Retired
- *    2) The feature is not in the ledger (has always been marked as
- *      Supported::no) and the code to support it has been removed
 *
 * When a feature has been enabled for several years, the conditional code
 * may be removed, and the feature "retired". To retire a feature:
--- a/include/xrpl/protocol/FeeUnits.h
+++ b/include/xrpl/protocol/FeeUnits.h
@@ -336,7 +336,7 @@ public:
 // Output Fees as just their numeric value.
 template <class Char, class Traits, class UnitTag, class T>
 std::basic_ostream<Char, Traits>&
-operator<<(std::basic_ostream<Char, Traits>& os, TaggedFee<UnitTag, T> const& q)
+operator<<(std::basic_ostream<Char, Traits>& os, const TaggedFee<UnitTag, T>& q)
 {
    return os << q.value();
 }
--- a/include/xrpl/protocol/HashPrefix.h
+++ b/include/xrpl/protocol/HashPrefix.h
@@ -88,9 +88,6 @@ enum class HashPrefix : std::uint32_t {

    /** Credentials signature */
    credential = detail::make_hash_prefix('C', 'R', 'D'),
-
-    /** Batch */
-    batch = detail::make_hash_prefix('B', 'C', 'H'),
 };

 template <class Hasher>
--- a/include/xrpl/protocol/IOUAmount.h
+++ b/include/xrpl/protocol/IOUAmount.h
@@ -28,6 +28,7 @@

 #include <cstdint>
 #include <string>
+#include <utility>

 namespace ripple {

@@ -98,12 +99,6 @@ public:

    static IOUAmount
    minPositiveAmount();
-
-    friend std::ostream&
-    operator<<(std::ostream& os, IOUAmount const& x)
-    {
-        return os << to_string(x);
-    }
 };

 inline IOUAmount::IOUAmount(beast::Zero)
--- a/include/xrpl/protocol/Indexes.h
+++ b/include/xrpl/protocol/Indexes.h
@@ -279,10 +279,6 @@ amm(Asset const& issue1, Asset const& issue2) noexcept;
 Keylet
 amm(uint256 const& amm) noexcept;

-/** A keylet for Delegate object */
-Keylet
-delegate(AccountID const& account, AccountID const& authorizedAccount) noexcept;
-
 Keylet
 bridge(STXChainBridge const& bridge, STXChainBridge::ChainType chainType);

@@ -334,15 +330,6 @@ mptoken(uint256 const& mptokenKey)
 Keylet
 mptoken(uint256 const& issuanceKey, AccountID const& holder) noexcept;

-Keylet
-vault(AccountID const& owner, std::uint32_t seq) noexcept;
-
-inline Keylet
-vault(uint256 const& vaultKey)
-{
-    return {ltVAULT, vaultKey};
-}
-
 Keylet
 permissionedDomain(AccountID const& account, std::uint32_t seq) noexcept;

--- a/include/xrpl/protocol/LedgerFormats.h
+++ b/include/xrpl/protocol/LedgerFormats.h
@@ -145,15 +145,13 @@ enum LedgerSpecificFlags {
        0x10000000,               // True, reject new paychans
    lsfDisallowIncomingTrustline =
        0x20000000,               // True, reject new trustlines (only if no issued assets)
-    lsfAllowTrustLineLocking =
-        0x40000000,               // True, enable trustline locking
+    // 0x40000000 is available
    lsfAllowTrustLineClawback =
        0x80000000,               // True, enable clawback

    // ltOFFER
    lsfPassive = 0x00010000,
    lsfSell = 0x00020000,  // True, offer was placed as a sell.
-    lsfHybrid = 0x00040000,  // True, offer is hybrid.

    // ltRIPPLE_STATE
    lsfLowReserve = 0x00010000,  // True, if entry counts toward reserve.
@@ -193,9 +191,6 @@ enum LedgerSpecificFlags {

    // ltCREDENTIAL
    lsfAccepted = 0x00010000,
-
-    // ltVAULT
-    lsfVaultPrivate = 0x00010000,
 };

 //------------------------------------------------------------------------------
--- a/include/xrpl/protocol/MPTAmount.h
+++ b/include/xrpl/protocol/MPTAmount.h
@@ -24,12 +24,15 @@
 #include <xrpl/basics/contract.h>
 #include <xrpl/basics/safe_cast.h>
 #include <xrpl/beast/utility/Zero.h>
+#include <xrpl/json/json_value.h>

 #include <boost/multiprecision/cpp_int.hpp>
 #include <boost/operators.hpp>

 #include <cstdint>
+#include <optional>
 #include <string>
+#include <type_traits>

 namespace ripple {

--- a/include/xrpl/protocol/MPTIssue.h
+++ b/include/xrpl/protocol/MPTIssue.h
@@ -42,11 +42,8 @@ public:
    AccountID const&
    getIssuer() const;

-    constexpr MPTID const&
-    getMptID() const
-    {
-        return mptID_;
-    }
+    MPTID const&
+    getMptID() const;

    std::string
    getText() const;
--- a/include/xrpl/protocol/MultiApiJson.h
+++ b/include/xrpl/protocol/MultiApiJson.h
@@ -80,7 +80,7 @@ struct MultiApiJson
    }

    void
-    set(char const* key, auto const& v)
+    set(const char* key, auto const& v)
        requires std::constructible_from<Json::Value, decltype(v)>
    {
        for (auto& a : this->val)
@@ -91,7 +91,7 @@ struct MultiApiJson
    enum IsMemberResult : int { none = 0, some, all };

    [[nodiscard]] IsMemberResult
-    isMember(char const* key) const
+    isMember(const char* key) const
    {
        int count = 0;
        for (auto& a : this->val)
--- a/include/xrpl/protocol/NFTSyntheticSerializer.h
+++ b/include/xrpl/protocol/NFTSyntheticSerializer.h
@@ -28,8 +28,6 @@

 namespace ripple {

-namespace RPC {
-
 /**
   Adds common synthetic fields to transaction-related JSON responses

@@ -42,7 +40,6 @@ insertNFTSyntheticInJson(
    TxMeta const&);
 /** @} */

-}  // namespace RPC
 }  // namespace ripple

 #endif
--- a/include/xrpl/protocol/Permissions.h
+++ b/include/xrpl/protocol/Permissions.h
@@ -1,97 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of rippled: https://github.com/ripple/rippled
-    Copyright (c) 2025 Ripple Labs Inc.
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef RIPPLE_PROTOCOL_PERMISSION_H_INCLUDED
-#define RIPPLE_PROTOCOL_PERMISSION_H_INCLUDED
-
-#include <xrpl/protocol/TxFormats.h>
-
-#include <optional>
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-
-namespace ripple {
-/**
- * We have both transaction type permissions and granular type permissions.
- * Since we will reuse the TransactionFormats to parse the Transaction
- * Permissions, only the GranularPermissionType is defined here. To prevent
- * conflicts with TxType, the GranularPermissionType is always set to a value
- * greater than the maximum value of uint16.
- */
-enum GranularPermissionType : std::uint32_t {
-#pragma push_macro("PERMISSION")
-#undef PERMISSION
-
-#define PERMISSION(type, txType, value) type = value,
-
-#include <xrpl/protocol/detail/permissions.macro>
-
-#undef PERMISSION
-#pragma pop_macro("PERMISSION")
-};
-
-enum Delegation { delegatable, notDelegatable };
-
-class Permission
-{
-private:
-    Permission();
-
-    std::unordered_map<std::uint16_t, Delegation> delegatableTx_;
-
-    std::unordered_map<std::string, GranularPermissionType>
-        granularPermissionMap_;
-
-    std::unordered_map<GranularPermissionType, std::string> granularNameMap_;
-
-    std::unordered_map<GranularPermissionType, TxType> granularTxTypeMap_;
-
-public:
-    static Permission const&
-    getInstance();
-
-    Permission(Permission const&) = delete;
-    Permission&
-    operator=(Permission const&) = delete;
-
-    std::optional<std::uint32_t>
-    getGranularValue(std::string const& name) const;
-
-    std::optional<std::string>
-    getGranularName(GranularPermissionType const& value) const;
-
-    std::optional<TxType>
-    getGranularTxType(GranularPermissionType const& gpType) const;
-
-    bool
-    isDelegatable(std::uint32_t const& permissionValue) const;
-
-    // for tx level permission, permission value is equal to tx type plus one
-    uint32_t
-    txToPermissionType(TxType const& type) const;
-
-    // tx type value is permission value minus one
-    TxType
-    permissionToTxType(uint32_t const& value) const;
-};
-
-}  // namespace ripple
-
-#endif
--- a/include/xrpl/protocol/Protocol.h
+++ b/include/xrpl/protocol/Protocol.h
@@ -116,16 +116,6 @@ std::size_t constexpr maxMPTokenMetadataLength = 1024;
 /** The maximum amount of MPTokenIssuance */
 std::uint64_t constexpr maxMPTokenAmount = 0x7FFF'FFFF'FFFF'FFFFull;

-/** The maximum length of Data payload */
-std::size_t constexpr maxDataPayloadLength = 256;
-
-/** Vault withdrawal policies */
-std::uint8_t constexpr vaultStrategyFirstComeFirstServe = 1;
-
-/** Maximum recursion depth for vault shares being put as an asset inside
- * another vault; counted from 0 */
-std::uint8_t constexpr maxAssetCheckDepth = 5;
-
 /** A ledger index. */
 using LedgerIndex = std::uint32_t;

@@ -165,13 +155,6 @@ std::size_t constexpr maxPriceScale = 20;
 */
 std::size_t constexpr maxTrim = 25;

-/** The maximum number of delegate permissions an account can grant
- */
-std::size_t constexpr permissionMaxSize = 10;
-
-/** The maximum number of transactions that can be in a batch. */
-std::size_t constexpr maxBatchTxCount = 8;
-
 }  // namespace ripple

 #endif
--- a/include/xrpl/protocol/Quality.h
+++ b/include/xrpl/protocol/Quality.h
@@ -113,8 +113,8 @@ public:
    // have lower unsigned integer representations.
    using value_type = std::uint64_t;

-    static int const minTickSize = 3;
-    static int const maxTickSize = 16;
+    static const int minTickSize = 3;
+    static const int maxTickSize = 16;

 private:
    // This has the same representation as STAmount, see the comment on the
--- a/include/xrpl/protocol/Rules.h
+++ b/include/xrpl/protocol/Rules.h
@@ -28,9 +28,6 @@

 namespace ripple {

-bool
-isFeatureEnabled(uint256 const& feature);
-
 class DigestAwareReadView;

 /** Rules controlling protocol behavior. */
--- a/include/xrpl/protocol/SField.h
+++ b/include/xrpl/protocol/SField.h
@@ -25,6 +25,7 @@

 #include <cstdint>
 #include <map>
+#include <utility>

 namespace ripple {

@@ -181,22 +182,22 @@ public:
        private_access_tag_t,
        SerializedTypeID tid,
        int fv,
-        char const* fn,
+        const char* fn,
        int meta = sMD_Default,
        IsSigning signing = IsSigning::yes);
    explicit SField(private_access_tag_t, int fc);

-    static SField const&
+    static const SField&
    getField(int fieldCode);
-    static SField const&
+    static const SField&
    getField(std::string const& fieldName);
-    static SField const&
+    static const SField&
    getField(int type, int value)
    {
        return getField(field_code(type, value));
    }

-    static SField const&
+    static const SField&
    getField(SerializedTypeID type, int value)
    {
        return getField(field_code(type, value));
@@ -283,19 +284,19 @@ public:
    }

    bool
-    operator==(SField const& f) const
+    operator==(const SField& f) const
    {
        return fieldCode == f.fieldCode;
    }

    bool
-    operator!=(SField const& f) const
+    operator!=(const SField& f) const
    {
        return fieldCode != f.fieldCode;
    }

    static int
-    compare(SField const& f1, SField const& f2);
+    compare(const SField& f1, const SField& f2);

    static std::map<int, SField const*> const&
    getKnownCodeToField()
--- a/include/xrpl/protocol/STAccount.h
+++ b/include/xrpl/protocol/STAccount.h
@@ -58,7 +58,7 @@ public:
    add(Serializer& s) const override;

    bool
-    isEquivalent(STBase const& t) const override;
+    isEquivalent(const STBase& t) const override;

    bool
    isDefault() const override;
--- a/include/xrpl/protocol/STAmount.h
+++ b/include/xrpl/protocol/STAmount.h
@@ -62,20 +62,20 @@ private:
 public:
    using value_type = STAmount;

-    static int const cMinOffset = -96;
-    static int const cMaxOffset = 80;
+    static const int cMinOffset = -96;
+    static const int cMaxOffset = 80;

    // Maximum native value supported by the code
-    static std::uint64_t const cMinValue = 1000000000000000ull;
-    static std::uint64_t const cMaxValue = 9999999999999999ull;
-    static std::uint64_t const cMaxNative = 9000000000000000000ull;
+    static const std::uint64_t cMinValue = 1000000000000000ull;
+    static const std::uint64_t cMaxValue = 9999999999999999ull;
+    static const std::uint64_t cMaxNative = 9000000000000000000ull;

    // Max native value on network.
-    static std::uint64_t const cMaxNativeN = 100000000000000000ull;
-    static std::uint64_t const cIssuedCurrency = 0x8000000000000000ull;
-    static std::uint64_t const cPositive = 0x4000000000000000ull;
-    static std::uint64_t const cMPToken = 0x2000000000000000ull;
-    static std::uint64_t const cValueMask = ~(cPositive | cMPToken);
+    static const std::uint64_t cMaxNativeN = 100000000000000000ull;
+    static const std::uint64_t cIssuedCurrency = 0x8000000000000000ull;
+    static const std::uint64_t cPositive = 0x4000000000000000ull;
+    static const std::uint64_t cMPToken = 0x2000000000000000ull;
+    static const std::uint64_t cValueMask = ~(cPositive | cMPToken);

    static std::uint64_t const uRateOne;

@@ -153,12 +153,6 @@ public:
    template <AssetType A>
    STAmount(A const& asset, int mantissa, int exponent = 0);

-    template <AssetType A>
-    STAmount(A const& asset, Number const& number)
-        : STAmount(asset, number.mantissa(), number.exponent())
-    {
-    }
-
    // Legacy support for new-style amounts
    STAmount(IOUAmount const& amount, Issue const& issue);
    STAmount(XRPAmount const& amount);
@@ -236,9 +230,6 @@ public:
    STAmount&
    operator=(XRPAmount const& amount);

-    STAmount&
-    operator=(Number const&);
-
    //--------------------------------------------------------------------------
    //
    // Modification
@@ -277,13 +268,13 @@ public:
    std::string
    getText() const override;

-    Json::Value getJson(JsonOptions = JsonOptions::none) const override;
+    Json::Value getJson(JsonOptions) const override;

    void
    add(Serializer& s) const override;

    bool
-    isEquivalent(STBase const& t) const override;
+    isEquivalent(const STBase& t) const override;

    bool
    isDefault() const override;
@@ -426,7 +417,7 @@ STAmount
 amountFromQuality(std::uint64_t rate);

 STAmount
-amountFromString(Asset const& asset, std::string const& amount);
+amountFromString(Asset const& issue, std::string const& amount);

 STAmount
 amountFromJson(SField const& name, Json::Value const& v);
@@ -550,16 +541,6 @@ STAmount::operator=(XRPAmount const& amount)
    return *this;
 }

-inline STAmount&
-STAmount::operator=(Number const& number)
-{
-    mIsNegative = number.mantissa() < 0;
-    mValue = mIsNegative ? -number.mantissa() : number.mantissa();
-    mOffset = number.exponent();
-    canonicalize();
-    return *this;
-}
-
 inline void
 STAmount::negate()
 {
@@ -703,12 +684,6 @@ isXRP(STAmount const& amount)
    return amount.native();
 }

-bool
-canAdd(STAmount const& amt1, STAmount const& amt2);
-
-bool
-canSubtract(STAmount const& amt1, STAmount const& amt2);
-
 // Since `canonicalize` does not have access to a ledger, this is needed to put
 // the low-level routine stAmountCanonicalize on an amendment switch. Only
 // transactions need to use this switchover. Outside of a transaction it's safe
--- a/include/xrpl/protocol/STArray.h
+++ b/include/xrpl/protocol/STArray.h
@@ -128,13 +128,13 @@ public:
    add(Serializer& s) const override;

    void
-    sort(bool (*compare)(STObject const& o1, STObject const& o2));
+    sort(bool (*compare)(const STObject& o1, const STObject& o2));

    bool
-    operator==(STArray const& s) const;
+    operator==(const STArray& s) const;

    bool
-    operator!=(STArray const& s) const;
+    operator!=(const STArray& s) const;

    iterator
    erase(iterator pos);
@@ -152,7 +152,7 @@ public:
    getSType() const override;

    bool
-    isEquivalent(STBase const& t) const override;
+    isEquivalent(const STBase& t) const override;

    bool
    isDefault() const override;
@@ -275,13 +275,13 @@ STArray::swap(STArray& a) noexcept
 }

 inline bool
-STArray::operator==(STArray const& s) const
+STArray::operator==(const STArray& s) const
 {
    return v_ == s.v_;
 }

 inline bool
-STArray::operator!=(STArray const& s) const
+STArray::operator!=(const STArray& s) const
 {
    return v_ != s.v_;
 }
--- a/include/xrpl/protocol/STBase.h
+++ b/include/xrpl/protocol/STBase.h
@@ -92,16 +92,6 @@ struct JsonOptions
    }
 };

-template <typename T>
-    requires requires(T const& t) {
-        { t.getJson(JsonOptions::none) } -> std::convertible_to<Json::Value>;
-    }
-Json::Value
-to_json(T const& t)
-{
-    return t.getJson(JsonOptions::none);
-}
-
 namespace detail {
 class STVar;
 }
@@ -139,16 +129,16 @@ class STBase
 public:
    virtual ~STBase() = default;
    STBase();
-    STBase(STBase const&) = default;
+    STBase(const STBase&) = default;
    STBase&
-    operator=(STBase const& t);
+    operator=(const STBase& t);

    explicit STBase(SField const& n);

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

    template <class D>
    D&
@@ -167,7 +157,7 @@ public:
    virtual std::string
    getText() const;

-    virtual Json::Value getJson(JsonOptions = JsonOptions::none) const;
+    virtual Json::Value getJson(JsonOptions /*options*/) const;

    virtual void
    add(Serializer& s) const;
@@ -207,7 +197,7 @@ private:
 //------------------------------------------------------------------------------

 std::ostream&
-operator<<(std::ostream& out, STBase const& t);
+operator<<(std::ostream& out, const STBase& t);

 template <class D>
 D&
--- a/include/xrpl/protocol/STBitString.h
+++ b/include/xrpl/protocol/STBitString.h
@@ -45,8 +45,8 @@ public:
    STBitString() = default;

    STBitString(SField const& n);
-    STBitString(value_type const& v);
-    STBitString(SField const& n, value_type const& v);
+    STBitString(const value_type& v);
+    STBitString(SField const& n, const value_type& v);
    STBitString(SerialIter& sit, SField const& name);

    SerializedTypeID
@@ -56,7 +56,7 @@ public:
    getText() const override;

    bool
-    isEquivalent(STBase const& t) const override;
+    isEquivalent(const STBase& t) const override;

    void
    add(Serializer& s) const override;
@@ -93,12 +93,12 @@ inline STBitString<Bits>::STBitString(SField const& n) : STBase(n)
 }

 template <int Bits>
-inline STBitString<Bits>::STBitString(value_type const& v) : value_(v)
+inline STBitString<Bits>::STBitString(const value_type& v) : value_(v)
 {
 }

 template <int Bits>
-inline STBitString<Bits>::STBitString(SField const& n, value_type const& v)
+inline STBitString<Bits>::STBitString(SField const& n, const value_type& v)
    : STBase(n), value_(v)
 {
 }
@@ -160,9 +160,9 @@ STBitString<Bits>::getText() const

 template <int Bits>
 bool
-STBitString<Bits>::isEquivalent(STBase const& t) const
+STBitString<Bits>::isEquivalent(const STBase& t) const
 {
-    STBitString const* v = dynamic_cast<STBitString const*>(&t);
+    const STBitString* v = dynamic_cast<const STBitString*>(&t);
    return v && (value_ == v->value_);
 }

--- a/include/xrpl/protocol/STBlob.h
+++ b/include/xrpl/protocol/STBlob.h
@@ -63,7 +63,7 @@ public:
    add(Serializer& s) const override;

    bool
-    isEquivalent(STBase const& t) const override;
+    isEquivalent(const STBase& t) const override;

    bool
    isDefault() const override;
--- a/include/xrpl/protocol/STCurrency.h
+++ b/include/xrpl/protocol/STCurrency.h
@@ -65,7 +65,7 @@ public:
    add(Serializer& s) const override;

    bool
-    isEquivalent(STBase const& t) const override;
+    isEquivalent(const STBase& t) const override;

    bool
    isDefault() const override;
--- a/include/xrpl/protocol/STInteger.h
+++ b/include/xrpl/protocol/STInteger.h
@@ -54,7 +54,7 @@ public:
    isDefault() const override;

    bool
-    isEquivalent(STBase const& t) const override;
+    isEquivalent(const STBase& t) const override;

    STInteger&
    operator=(value_type const& v);
@@ -127,9 +127,9 @@ STInteger<Integer>::isDefault() const

 template <typename Integer>
 inline bool
-STInteger<Integer>::isEquivalent(STBase const& t) const
+STInteger<Integer>::isEquivalent(const STBase& t) const
 {
-    STInteger const* v = dynamic_cast<STInteger const*>(&t);
+    const STInteger* v = dynamic_cast<const STInteger*>(&t);
    return v && (value_ == v->value_);
 }

--- a/include/xrpl/protocol/STIssue.h
+++ b/include/xrpl/protocol/STIssue.h
@@ -37,7 +37,6 @@ public:
    using value_type = Asset;

    STIssue() = default;
-    STIssue(STIssue const& rhs) = default;

    explicit STIssue(SerialIter& sit, SField const& name);

@@ -46,9 +45,6 @@ public:

    explicit STIssue(SField const& name);

-    STIssue&
-    operator=(STIssue const& rhs) = default;
-
    template <ValidIssueType TIss>
    TIss const&
    get() const;
@@ -75,7 +71,7 @@ public:
    add(Serializer& s) const override;

    bool
-    isEquivalent(STBase const& t) const override;
+    isEquivalent(const STBase& t) const override;

    bool
    isDefault() const override;
--- a/include/xrpl/protocol/STLedgerEntry.h
+++ b/include/xrpl/protocol/STLedgerEntry.h
@@ -35,7 +35,7 @@ class STLedgerEntry final : public STObject, public CountedObject<STLedgerEntry>

 public:
    using pointer = std::shared_ptr<STLedgerEntry>;
-    using ref = std::shared_ptr<STLedgerEntry> const&;
+    using ref = const std::shared_ptr<STLedgerEntry>&;

    /** Create an empty object with the given key and type. */
    explicit STLedgerEntry(Keylet const& k);
--- a/include/xrpl/protocol/STNumber.h
+++ b/include/xrpl/protocol/STNumber.h
@@ -63,13 +63,6 @@ public:
    void
    setValue(Number const& v);

-    STNumber&
-    operator=(Number const& rhs)
-    {
-        setValue(rhs);
-        return *this;
-    }
-
    bool
    isEquivalent(STBase const& t) const override;
    bool
@@ -90,19 +83,6 @@ private:
 std::ostream&
 operator<<(std::ostream& out, STNumber const& rhs);

-struct NumberParts
-{
-    std::uint64_t mantissa = 0;
-    int exponent = 0;
-    bool negative = false;
-};
-
-NumberParts
-partsFromString(std::string const& number);
-
-STNumber
-numberFromJson(SField const& field, Json::Value const& value);
-
 }  // namespace ripple

 #endif
--- a/include/xrpl/protocol/STObject.h
+++ b/include/xrpl/protocol/STObject.h
@@ -99,8 +99,8 @@ public:
    STObject&
    operator=(STObject&& other);

-    STObject(SOTemplate const& type, SField const& name);
-    STObject(SOTemplate const& type, SerialIter& sit, SField const& name);
+    STObject(const SOTemplate& type, SField const& name);
+    STObject(const SOTemplate& 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);
@@ -121,7 +121,7 @@ public:
    reserve(std::size_t n);

    void
-    applyTemplate(SOTemplate const& type);
+    applyTemplate(const SOTemplate& type);

    void
    applyTemplateFromSField(SField const&);
@@ -130,7 +130,7 @@ public:
    isFree() const;

    void
-    set(SOTemplate const&);
+    set(const SOTemplate&);

    bool
    set(SerialIter& u, int depth = 0);
@@ -139,7 +139,7 @@ public:
    getSType() const override;

    bool
-    isEquivalent(STBase const& t) const override;
+    isEquivalent(const STBase& t) const override;

    bool
    isDefault() const override;
@@ -154,7 +154,8 @@ public:
    getText() const override;

    // TODO(tom): options should be an enum.
-    Json::Value getJson(JsonOptions = JsonOptions::none) const override;
+    Json::Value
+    getJson(JsonOptions options) const override;

    void
    addWithoutSigningFields(Serializer& s) const;
@@ -182,13 +183,13 @@ public:
    uint256
    getSigningHash(HashPrefix prefix) const;

-    STBase const&
+    const STBase&
    peekAtIndex(int offset) const;

    STBase&
    getIndex(int offset);

-    STBase const*
+    const STBase*
    peekAtPIndex(int offset) const;

    STBase*
@@ -200,13 +201,13 @@ public:
    SField const&
    getFieldSType(int index) const;

-    STBase const&
+    const STBase&
    peekAtField(SField const& field) const;

    STBase&
    getField(SField const& field);

-    STBase const*
+    const STBase*
    peekAtPField(SField const& field) const;

    STBase*
@@ -240,11 +241,11 @@ public:
    getFieldAmount(SField const& field) const;
    STPathSet const&
    getFieldPathSet(SField const& field) const;
-    STVector256 const&
+    const STVector256&
    getFieldV256(SField const& field) const;
-    STArray const&
+    const STArray&
    getFieldArray(SField const& field) const;
-    STCurrency const&
+    const STCurrency&
    getFieldCurrency(SField const& field) const;
    STNumber const&
    getFieldNumber(SField const& field) const;
@@ -408,12 +409,12 @@ public:
    delField(int index);

    bool
-    hasMatchingEntry(STBase const&);
+    hasMatchingEntry(const STBase&);

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

    class FieldErr;

@@ -483,19 +484,9 @@ private:
 template <class T>
 class STObject::Proxy
 {
-public:
+protected:
    using value_type = typename T::value_type;

-    value_type
-    value() const;
-
-    value_type
-    operator*() const;
-
-    T const*
-    operator->() const;
-
-protected:
    STObject* st_;
    SOEStyle style_;
    TypedField<T> const* f_;
@@ -504,6 +495,9 @@ protected:

    Proxy(STObject* st, TypedField<T> const* f);

+    value_type
+    value() const;
+
    T const*
    find() const;

@@ -518,7 +512,7 @@ template <typename U>
 concept IsArithmetic = std::is_arithmetic_v<U> || std::is_same_v<U, STAmount>;

 template <class T>
-class STObject::ValueProxy : public Proxy<T>
+class STObject::ValueProxy : private Proxy<T>
 {
 private:
    using value_type = typename T::value_type;
@@ -544,13 +538,6 @@ public:

    operator value_type() const;

-    template <typename U>
-    friend bool
-    operator==(U const& lhs, STObject::ValueProxy<T> const& rhs)
-    {
-        return rhs.value() == lhs;
-    }
-
 private:
    friend class STObject;

@@ -558,7 +545,7 @@ private:
 };

 template <class T>
-class STObject::OptionalProxy : public Proxy<T>
+class STObject::OptionalProxy : private Proxy<T>
 {
 private:
    using value_type = typename T::value_type;
@@ -578,6 +565,15 @@ public:
    explicit
    operator bool() const noexcept;

+    /** Return the contained value
+
+        Throws:
+
+            STObject::FieldErr if !engaged()
+    */
+    value_type
+    operator*() const;
+
    operator optional_type() const;

    /** Explicit conversion to std::optional */
@@ -721,20 +717,6 @@ STObject::Proxy<T>::value() const -> value_type
    return value_type{};
 }

-template <class T>
-auto
-STObject::Proxy<T>::operator*() const -> value_type
-{
-    return this->value();
-}
-
-template <class T>
-T const*
-STObject::Proxy<T>::operator->() const
-{
-    return this->find();
-}
-
 template <class T>
 inline T const*
 STObject::Proxy<T>::find() const
@@ -810,6 +792,13 @@ STObject::OptionalProxy<T>::operator bool() const noexcept
    return engaged();
 }

+template <class T>
+auto
+STObject::OptionalProxy<T>::operator*() const -> value_type
+{
+    return this->value();
+}
+
 template <class T>
 STObject::OptionalProxy<T>::operator typename STObject::OptionalProxy<
    T>::optional_type() const
@@ -981,7 +970,7 @@ STObject::getCount() const
    return v_.size();
 }

-inline STBase const&
+inline const STBase&
 STObject::peekAtIndex(int offset) const
 {
    return v_[offset].get();
@@ -993,7 +982,7 @@ STObject::getIndex(int offset)
    return v_[offset].get();
 }

-inline STBase const*
+inline const STBase*
 STObject::peekAtPIndex(int offset) const
 {
    return &v_[offset].get();
@@ -1128,7 +1117,7 @@ STObject::setFieldH160(SField const& field, base_uint<160, Tag> const& v)
 }

 inline bool
-STObject::operator!=(STObject const& o) const
+STObject::operator!=(const STObject& o) const
 {
    return !(*this == o);
 }
@@ -1137,7 +1126,7 @@ template <typename T, typename V>
 V
 STObject::getFieldByValue(SField const& field) const
 {
-    STBase const* rf = peekAtPField(field);
+    const STBase* rf = peekAtPField(field);

    if (!rf)
        throwFieldNotFound(field);
@@ -1147,7 +1136,7 @@ STObject::getFieldByValue(SField const& field) const
    if (id == STI_NOTPRESENT)
        return V();  // optional field not present

-    T const* cf = dynamic_cast<T const*>(rf);
+    const T* cf = dynamic_cast<const T*>(rf);

    if (!cf)
        Throw<std::runtime_error>("Wrong field type");
@@ -1164,7 +1153,7 @@ template <typename T, typename V>
 V const&
 STObject::getFieldByConstRef(SField const& field, V const& empty) const
 {
-    STBase const* rf = peekAtPField(field);
+    const STBase* rf = peekAtPField(field);

    if (!rf)
        throwFieldNotFound(field);
@@ -1174,7 +1163,7 @@ STObject::getFieldByConstRef(SField const& field, V const& empty) const
    if (id == STI_NOTPRESENT)
        return empty;  // optional field not present

-    T const* cf = dynamic_cast<T const*>(rf);
+    const T* cf = dynamic_cast<const T*>(rf);

    if (!cf)
        Throw<std::runtime_error>("Wrong field type");
--- a/include/xrpl/protocol/STPathSet.h
+++ b/include/xrpl/protocol/STPathSet.h
@@ -106,10 +106,10 @@ public:
    getIssuerID() const;

    bool
-    operator==(STPathElement const& t) const;
+    operator==(const STPathElement& t) const;

    bool
-    operator!=(STPathElement const& t) const;
+    operator!=(const STPathElement& t) const;

 private:
    static std::size_t
@@ -164,7 +164,7 @@ public:
    STPathElement&
    operator[](int i);

-    STPathElement const&
+    const STPathElement&
    operator[](int i) const;

    void
@@ -196,7 +196,7 @@ public:
    assembleAdd(STPath const& base, STPathElement const& tail);

    bool
-    isEquivalent(STBase const& t) const override;
+    isEquivalent(const STBase& t) const override;

    bool
    isDefault() const override;
@@ -375,7 +375,7 @@ STPathElement::getIssuerID() const
 }

 inline bool
-STPathElement::operator==(STPathElement const& t) const
+STPathElement::operator==(const STPathElement& t) const
 {
    return (mType & typeAccount) == (t.mType & typeAccount) &&
        hash_value_ == t.hash_value_ && mAccountID == t.mAccountID &&
@@ -383,7 +383,7 @@ STPathElement::operator==(STPathElement const& t) const
 }

 inline bool
-STPathElement::operator!=(STPathElement const& t) const
+STPathElement::operator!=(const STPathElement& t) const
 {
    return !operator==(t);
 }
@@ -455,7 +455,7 @@ STPath::operator[](int i)
    return mPath[i];
 }

-inline STPathElement const&
+inline const STPathElement&
 STPath::operator[](int i) const
 {
    return mPath[i];
--- a/include/xrpl/protocol/STTx.h
+++ b/include/xrpl/protocol/STTx.h
@@ -102,10 +102,6 @@ public:
    SeqProxy
    getSeqProxy() const;

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

@@ -125,16 +121,10 @@ public:
        @return `true` if valid signature. If invalid, the error message string.
    */
    enum class RequireFullyCanonicalSig : bool { no, yes };
-
    Expected<void, std::string>
    checkSign(RequireFullyCanonicalSig requireCanonicalSig, Rules const& rules)
        const;

-    Expected<void, std::string>
-    checkBatchSign(
-        RequireFullyCanonicalSig requireCanonicalSig,
-        Rules const& rules) const;
-
    // SQL Functions with metadata.
    static std::string const&
    getMetaSQLInsertReplaceHeader();
@@ -150,9 +140,6 @@ public:
        char status,
        std::string const& escapedMetaData) const;

-    std::vector<uint256>
-    getBatchTransactionIDs() const;
-
 private:
    Expected<void, std::string>
    checkSingleSign(RequireFullyCanonicalSig requireCanonicalSig) const;
@@ -162,24 +149,12 @@ private:
        RequireFullyCanonicalSig requireCanonicalSig,
        Rules const& rules) const;

-    Expected<void, std::string>
-    checkBatchSingleSign(
-        STObject const& batchSigner,
-        RequireFullyCanonicalSig requireCanonicalSig) const;
-
-    Expected<void, std::string>
-    checkBatchMultiSign(
-        STObject const& batchSigner,
-        RequireFullyCanonicalSig requireCanonicalSig,
-        Rules const& rules) const;
-
    STBase*
    copy(std::size_t n, void* buf) const override;
    STBase*
    move(std::size_t n, void* buf) override;

    friend class detail::STVar;
-    mutable std::vector<uint256> batch_txn_ids_;
 };

 bool
--- a/include/xrpl/protocol/STVector256.h
+++ b/include/xrpl/protocol/STVector256.h
@@ -50,7 +50,7 @@ public:
    Json::Value getJson(JsonOptions) const override;

    bool
-    isEquivalent(STBase const& t) const override;
+    isEquivalent(const STBase& t) const override;

    bool
    isDefault() const override;
@@ -62,7 +62,7 @@ public:
    operator=(std::vector<uint256>&& v);

    void
-    setValue(STVector256 const& v);
+    setValue(const STVector256& v);

    /** Retrieve a copy of the vector we contain */
    explicit
@@ -153,7 +153,7 @@ STVector256::operator=(std::vector<uint256>&& v)
 }

 inline void
-STVector256::setValue(STVector256 const& v)
+STVector256::setValue(const STVector256& v)
 {
    mValue = v.mValue;
 }
--- a/include/xrpl/protocol/STXChainBridge.h
+++ b/include/xrpl/protocol/STXChainBridge.h
@@ -107,7 +107,7 @@ public:
    add(Serializer& s) const override;

    bool
-    isEquivalent(STBase const& t) const override;
+    isEquivalent(const STBase& t) const override;

    bool
    isDefault() const override;
--- a/include/xrpl/protocol/Serializer.h
+++ b/include/xrpl/protocol/Serializer.h
@@ -139,9 +139,9 @@ public:
    int
    addRaw(Slice slice);
    int
-    addRaw(void const* ptr, int len);
+    addRaw(const void* ptr, int len);
    int
-    addRaw(Serializer const& s);
+    addRaw(const Serializer& s);

    int
    addVL(Blob const& vector);
@@ -151,7 +151,7 @@ public:
    int
    addVL(Iter begin, Iter end, int len);
    int
-    addVL(void const* ptr, int len);
+    addVL(const void* ptr, int len);

    // disassemble functions
    bool
@@ -161,7 +161,7 @@ public:
    bool
    getInteger(Integer& number, int offset)
    {
-        static auto const bytes = sizeof(Integer);
+        static const auto bytes = sizeof(Integer);
        if ((offset + bytes) > mData.size())
            return false;
        number = 0;
@@ -220,7 +220,7 @@ public:
    {
        return mData.size();
    }
-    void const*
+    const void*
    getDataPtr() const
    {
        return mData.data();
@@ -238,7 +238,7 @@ public:
    std::string
    getString() const
    {
-        return std::string(static_cast<char const*>(getDataPtr()), size());
+        return std::string(static_cast<const char*>(getDataPtr()), size());
    }
    void
    erase()
@@ -296,12 +296,12 @@ public:
        return v != mData;
    }
    bool
-    operator==(Serializer const& v) const
+    operator==(const Serializer& v) const
    {
        return v.mData == mData;
    }
    bool
-    operator!=(Serializer const& v) const
+    operator!=(const Serializer& v) const
    {
        return v.mData != mData;
    }
--- a/include/xrpl/protocol/TER.h
+++ b/include/xrpl/protocol/TER.h
@@ -139,8 +139,8 @@ enum TEMcodes : TERUnderlyingType {

    temARRAY_EMPTY,
    temARRAY_TOO_LARGE,
+
    temBAD_TRANSFER_FEE,
-    temINVALID_INNER_BATCH,
 };

 //------------------------------------------------------------------------------
@@ -225,8 +225,6 @@ enum TERcodes : TERUnderlyingType {
    terQUEUED,       // Transaction is being held in TxQ until fee drops
    terPRE_TICKET,   // Ticket is not yet in ledger but might be on its way
    terNO_AMM,       // AMM doesn't exist for the asset pair
-    terADDRESS_COLLISION,  // Failed to allocate AccountID when trying to
-                           // create a pseudo-account
 };

 //------------------------------------------------------------------------------
@@ -267,17 +265,6 @@ enum TECcodes : TERUnderlyingType {
    // Otherwise, treated as terRETRY.
    //
    // DO NOT CHANGE THESE NUMBERS: They appear in ledger meta data.
-    //
-    // Note:
-    //   tecNO_ENTRY is often used interchangeably with tecOBJECT_NOT_FOUND.
-    //   While there does not seem to be a clear rule which to use when, the
-    //   following guidance will help to keep errors consistent with the
-    //   majority of (but not all) transaction types:
-    // - tecNO_ENTRY : cannot find the primary ledger object on which the
-    //   transaction is being attempted
-    // - tecOBJECT_NOT_FOUND : cannot find the additional object(s) needed to
-    //   complete the transaction
-
    tecCLAIM = 100,
    tecPATH_PARTIAL = 101,
    tecUNFUNDED_ADD = 102,  // Unused legacy code
@@ -357,11 +344,6 @@ enum TECcodes : TERUnderlyingType {
    tecARRAY_TOO_LARGE = 191,
    tecLOCKED = 192,
    tecBAD_CREDENTIALS = 193,
-    tecWRONG_ASSET = 194,
-    tecLIMIT_EXCEEDED = 195,
-    tecPSEUDO_ACCOUNT = 196,
-    tecPRECISION_LOSS = 197,
-    tecNO_DELEGATE_PERMISSION = 198,
 };

 //------------------------------------------------------------------------------
@@ -647,37 +629,37 @@ using TER = TERSubset<CanCvtToTER>;
 //------------------------------------------------------------------------------

 inline bool
-isTelLocal(TER x) noexcept
+isTelLocal(TER x)
 {
-    return (x >= telLOCAL_ERROR && x < temMALFORMED);
+    return ((x) >= telLOCAL_ERROR && (x) < temMALFORMED);
 }

 inline bool
-isTemMalformed(TER x) noexcept
+isTemMalformed(TER x)
 {
-    return (x >= temMALFORMED && x < tefFAILURE);
+    return ((x) >= temMALFORMED && (x) < tefFAILURE);
 }

 inline bool
-isTefFailure(TER x) noexcept
+isTefFailure(TER x)
 {
-    return (x >= tefFAILURE && x < terRETRY);
+    return ((x) >= tefFAILURE && (x) < terRETRY);
 }

 inline bool
-isTerRetry(TER x) noexcept
+isTerRetry(TER x)
 {
-    return (x >= terRETRY && x < tesSUCCESS);
+    return ((x) >= terRETRY && (x) < tesSUCCESS);
 }

 inline bool
-isTesSuccess(TER x) noexcept
+isTesSuccess(TER x)
 {
-    return (x == tesSUCCESS);
+    return ((x) == tesSUCCESS);
 }

 inline bool
-isTecClaim(TER x) noexcept
+isTecClaim(TER x)
 {
    return ((x) >= tecCLAIM);
 }
--- a/include/xrpl/protocol/TxFlags.h
+++ b/include/xrpl/protocol/TxFlags.h
@@ -58,8 +58,7 @@ namespace ripple {
 // clang-format off
 // Universal Transaction flags:
 constexpr std::uint32_t tfFullyCanonicalSig                = 0x80000000;
-constexpr std::uint32_t tfInnerBatchTxn                    = 0x40000000;
-constexpr std::uint32_t tfUniversal                        = tfFullyCanonicalSig | tfInnerBatchTxn;
+constexpr std::uint32_t tfUniversal                        = tfFullyCanonicalSig;
 constexpr std::uint32_t tfUniversalMask                    = ~tfUniversal;

 // AccountSet flags:
@@ -92,16 +91,14 @@ constexpr std::uint32_t asfDisallowIncomingCheck           = 13;
 constexpr std::uint32_t asfDisallowIncomingPayChan         = 14;
 constexpr std::uint32_t asfDisallowIncomingTrustline       = 15;
 constexpr std::uint32_t asfAllowTrustLineClawback          = 16;
-constexpr std::uint32_t asfAllowTrustLineLocking           = 17;

 // OfferCreate flags:
 constexpr std::uint32_t tfPassive                          = 0x00010000;
 constexpr std::uint32_t tfImmediateOrCancel                = 0x00020000;
 constexpr std::uint32_t tfFillOrKill                       = 0x00040000;
 constexpr std::uint32_t tfSell                             = 0x00080000;
-constexpr std::uint32_t tfHybrid                           = 0x00100000;
 constexpr std::uint32_t tfOfferCreateMask =
-    ~(tfUniversal | tfPassive | tfImmediateOrCancel | tfFillOrKill | tfSell | tfHybrid);
+    ~(tfUniversal | tfPassive | tfImmediateOrCancel | tfFillOrKill | tfSell);

 // Payment flags:
 constexpr std::uint32_t tfNoRippleDirect                   = 0x00010000;
@@ -122,7 +119,6 @@ constexpr std::uint32_t tfClearDeepFreeze                  = 0x00800000;
 constexpr std::uint32_t tfTrustSetMask =
    ~(tfUniversal | tfSetfAuth | tfSetNoRipple | tfClearNoRipple | tfSetFreeze |
      tfClearFreeze | tfSetDeepFreeze | tfClearDeepFreeze);
-constexpr std::uint32_t tfTrustSetPermissionMask = ~(tfUniversal | tfSetfAuth | tfSetFreeze | tfClearFreeze);

 // EnableAmendment flags:
 constexpr std::uint32_t tfGotMajority                      = 0x00010000;
@@ -159,7 +155,6 @@ constexpr std::uint32_t const tfMPTokenAuthorizeMask  = ~(tfUniversal | tfMPTUna
 constexpr std::uint32_t const tfMPTLock                   = 0x00000001;
 constexpr std::uint32_t const tfMPTUnlock                 = 0x00000002;
 constexpr std::uint32_t const tfMPTokenIssuanceSetMask  = ~(tfUniversal | tfMPTLock | tfMPTUnlock);
-constexpr std::uint32_t const tfMPTokenIssuanceSetPermissionMask = ~(tfUniversal | tfMPTLock | tfMPTUnlock);

 // MPTokenIssuanceDestroy flags:
 constexpr std::uint32_t const tfMPTokenIssuanceDestroyMask  = ~tfUniversal;
@@ -229,26 +224,6 @@ constexpr std::uint32_t tfAMMClawbackMask = ~(tfUniversal | tfClawTwoAssets);
 // BridgeModify flags:
 constexpr std::uint32_t tfClearAccountCreateAmount     = 0x00010000;
 constexpr std::uint32_t tfBridgeModifyMask = ~(tfUniversal | tfClearAccountCreateAmount);
-
-// VaultCreate flags:
-constexpr std::uint32_t const tfVaultPrivate               = 0x00010000;
-static_assert(tfVaultPrivate == lsfVaultPrivate);
-constexpr std::uint32_t const tfVaultShareNonTransferable  = 0x00020000;
-constexpr std::uint32_t const tfVaultCreateMask = ~(tfUniversal | tfVaultPrivate | tfVaultShareNonTransferable);
-
-// Batch Flags:
-constexpr std::uint32_t tfAllOrNothing                 = 0x00010000;
-constexpr std::uint32_t tfOnlyOne                      = 0x00020000;
-constexpr std::uint32_t tfUntilFailure                 = 0x00040000;
-constexpr std::uint32_t tfIndependent                  = 0x00080000;
-/**
- * @note If nested Batch transactions are supported in the future, the tfInnerBatchTxn flag
- *  will need to be removed from this mask to allow Batch transaction to be inside 
- *  the sfRawTransactions array.
- */
-constexpr std::uint32_t const tfBatchMask =
-    ~(tfUniversal | tfAllOrNothing | tfOnlyOne | tfUntilFailure | tfIndependent) | tfInnerBatchTxn;
-
 // clang-format on

 }  // namespace ripple
--- a/include/xrpl/protocol/TxFormats.h
+++ b/include/xrpl/protocol/TxFormats.h
@@ -59,7 +59,7 @@ enum TxType : std::uint16_t
 #pragma push_macro("TRANSACTION")
 #undef TRANSACTION

-#define TRANSACTION(tag, value, name, delegatable, fields) tag = value,
+#define TRANSACTION(tag, value, name, fields) tag = value,

 #include <xrpl/protocol/detail/transactions.macro>

--- a/include/xrpl/protocol/TxMeta.h
+++ b/include/xrpl/protocol/TxMeta.h
@@ -46,10 +46,7 @@ private:
        CtorHelper);

 public:
-    TxMeta(
-        uint256 const& transactionID,
-        std::uint32_t ledger,
-        std::optional<uint256> parentBatchId = std::nullopt);
+    TxMeta(uint256 const& transactionID, std::uint32_t ledger);
    TxMeta(uint256 const& txID, std::uint32_t ledger, Blob const&);
    TxMeta(uint256 const& txID, std::uint32_t ledger, std::string const&);
    TxMeta(uint256 const& txID, std::uint32_t ledger, STObject const&);
@@ -133,27 +130,6 @@ public:
        return static_cast<bool>(mDelivered);
    }

-    void
-    setParentBatchId(uint256 const& parentBatchId)
-    {
-        mParentBatchId = parentBatchId;
-    }
-
-    uint256
-    getParentBatchId() const
-    {
-        XRPL_ASSERT(
-            hasParentBatchId(),
-            "ripple::TxMeta::getParentBatchId : non-null batch id");
-        return *mParentBatchId;
-    }
-
-    bool
-    hasParentBatchId() const
-    {
-        return static_cast<bool>(mParentBatchId);
-    }
-
 private:
    uint256 mTransactionID;
    std::uint32_t mLedger;
@@ -161,7 +137,6 @@ private:
    int mResult;

    std::optional<STAmount> mDelivered;
-    std::optional<uint256> mParentBatchId;

    STArray mNodes;
 };
--- a/include/xrpl/protocol/UintTypes.h
+++ b/include/xrpl/protocol/UintTypes.h
@@ -63,9 +63,6 @@ using NodeID = base_uint<160, detail::NodeIDTag>;
 * and a 160-bit account */
 using MPTID = base_uint<192>;

-/** Domain is a 256-bit hash representing a specific domain. */
-using Domain = base_uint<256>;
-
 /** XRP currency. */
 Currency const&
 xrpCurrency();
@@ -122,25 +119,25 @@ namespace std {
 template <>
 struct hash<ripple::Currency> : ripple::Currency::hasher
 {
-    hash() = default;
+    explicit hash() = default;
 };

 template <>
 struct hash<ripple::NodeID> : ripple::NodeID::hasher
 {
-    hash() = default;
+    explicit hash() = default;
 };

 template <>
 struct hash<ripple::Directory> : ripple::Directory::hasher
 {
-    hash() = default;
+    explicit hash() = default;
 };

 template <>
 struct hash<ripple::uint256> : ripple::uint256::hasher
 {
-    hash() = default;
+    explicit hash() = default;
 };

 }  // namespace std
--- a/include/xrpl/protocol/XRPAmount.h
+++ b/include/xrpl/protocol/XRPAmount.h
@@ -267,7 +267,7 @@ XRPAmount::decimalXRP() const
 // Output XRPAmount as just the drops value.
 template <class Char, class Traits>
 std::basic_ostream<Char, Traits>&
-operator<<(std::basic_ostream<Char, Traits>& os, XRPAmount const& q)
+operator<<(std::basic_ostream<Char, Traits>& os, const XRPAmount& q)
 {
    return os << q.drops();
 }
--- a/include/xrpl/protocol/detail/features.macro
+++ b/include/xrpl/protocol/detail/features.macro
@@ -32,13 +32,6 @@
 // If you add an amendment here, then do not forget to increment `numFeatures`
 // in include/xrpl/protocol/Feature.h.

-XRPL_FEATURE(TokenEscrow,                Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (EnforceNFTokenTrustlineV2,  Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (AMMv1_3,                    Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(PermissionedDEX,            Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(Batch,                      Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(SingleAssetVault,           Supported::no, VoteBehavior::DefaultNo)
-XRPL_FEATURE(PermissionDelegation,       Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (PayChanCancelAfter,         Supported::yes, VoteBehavior::DefaultNo)
 // Check flags in Credential transactions
 XRPL_FIX    (InvalidTxFlags,             Supported::yes, VoteBehavior::DefaultNo)
@@ -114,6 +107,7 @@ XRPL_FEATURE(DepositAuth,                Supported::yes, VoteBehavior::DefaultYe
 XRPL_FIX    (1513,                       Supported::yes, VoteBehavior::DefaultYes)
 XRPL_FEATURE(FlowCross,                  Supported::yes, VoteBehavior::DefaultYes)
 XRPL_FEATURE(Flow,                       Supported::yes, VoteBehavior::DefaultYes)
+XRPL_FEATURE(OwnerPaysFee,               Supported::no,  VoteBehavior::DefaultNo)

 // The following amendments are obsolete, but must remain supported
 // because they could potentially get enabled.
@@ -130,8 +124,6 @@ XRPL_FIX    (NFTokenNegOffer,       Supported::yes, VoteBehavior::Obsolete)
 XRPL_FIX    (NFTokenDirV1,          Supported::yes, VoteBehavior::Obsolete)
 XRPL_FEATURE(NonFungibleTokensV1,   Supported::yes, VoteBehavior::Obsolete)
 XRPL_FEATURE(CryptoConditionsSuite, Supported::yes, VoteBehavior::Obsolete)
-// This sits here temporarily and will be moved to another section soon
-XRPL_FEATURE(OwnerPaysFee,          Supported::no,  VoteBehavior::Obsolete)

 // The following amendments have been active for at least two years. Their
 // pre-amendment code has been removed and the identifiers are deprecated.
--- a/include/xrpl/protocol/detail/ledger_entries.macro
+++ b/include/xrpl/protocol/detail/ledger_entries.macro
@@ -165,8 +165,7 @@ LEDGER_ENTRY(ltACCOUNT_ROOT, 0x0061, AccountRoot, account, ({
    {sfMintedNFTokens,       soeDEFAULT},
    {sfBurnedNFTokens,       soeDEFAULT},
    {sfFirstNFTokenSequence, soeOPTIONAL},
-    {sfAMMID,                soeOPTIONAL}, // pseudo-account designator
-    {sfVaultID,              soeOPTIONAL}, // pseudo-account designator
+    {sfAMMID,                soeOPTIONAL},
 }))

 /** A ledger object which contains a list of object identifiers.
@@ -188,7 +187,6 @@ LEDGER_ENTRY(ltDIR_NODE, 0x0064, DirectoryNode, directory, ({
    {sfNFTokenID,            soeOPTIONAL},
    {sfPreviousTxnID,        soeOPTIONAL},
    {sfPreviousTxnLgrSeq,    soeOPTIONAL},
-    {sfDomainID,             soeOPTIONAL}
 }))

 /** The ledger object which lists details about amendments on the network.
@@ -250,8 +248,6 @@ LEDGER_ENTRY(ltOFFER, 0x006f, Offer, offer, ({
    {sfPreviousTxnID,        soeREQUIRED},
    {sfPreviousTxnLgrSeq,    soeREQUIRED},
    {sfExpiration,           soeOPTIONAL},
-    {sfDomainID,             soeOPTIONAL},
-    {sfAdditionalBooks,      soeOPTIONAL},
 }))

 /** A ledger object which describes a deposit preauthorization.
@@ -354,8 +350,6 @@ LEDGER_ENTRY(ltESCROW, 0x0075, Escrow, escrow, ({
    {sfPreviousTxnID,        soeREQUIRED},
    {sfPreviousTxnLgrSeq,    soeREQUIRED},
    {sfDestinationNode,      soeOPTIONAL},
-    {sfTransferRate,         soeOPTIONAL},
-    {sfIssuerNode,           soeOPTIONAL},
 }))

 /** A ledger object describing a single unidirectional XRP payment channel.
@@ -396,37 +390,6 @@ LEDGER_ENTRY(ltAMM, 0x0079, AMM, amm, ({
    {sfPreviousTxnLgrSeq,    soeOPTIONAL},
 }))

-/** A ledger object which tracks MPTokenIssuance
-    \sa keylet::mptIssuance
- */
-LEDGER_ENTRY(ltMPTOKEN_ISSUANCE, 0x007e, MPTokenIssuance, mpt_issuance, ({
-    {sfIssuer,                   soeREQUIRED},
-    {sfSequence,                 soeREQUIRED},
-    {sfTransferFee,              soeDEFAULT},
-    {sfOwnerNode,                soeREQUIRED},
-    {sfAssetScale,               soeDEFAULT},
-    {sfMaximumAmount,            soeOPTIONAL},
-    {sfOutstandingAmount,        soeREQUIRED},
-    {sfLockedAmount,             soeOPTIONAL},
-    {sfMPTokenMetadata,          soeOPTIONAL},
-    {sfPreviousTxnID,            soeREQUIRED},
-    {sfPreviousTxnLgrSeq,        soeREQUIRED},
-    {sfDomainID,                 soeOPTIONAL},
-}))
-
-/** A ledger object which tracks MPToken
-    \sa keylet::mptoken
- */
-LEDGER_ENTRY(ltMPTOKEN, 0x007f, MPToken, mptoken, ({
-    {sfAccount,                  soeREQUIRED},
-    {sfMPTokenIssuanceID,        soeREQUIRED},
-    {sfMPTAmount,                soeDEFAULT},
-    {sfLockedAmount,             soeOPTIONAL},
-    {sfOwnerNode,                soeREQUIRED},
-    {sfPreviousTxnID,            soeREQUIRED},
-    {sfPreviousTxnLgrSeq,        soeREQUIRED},
-}))
-
 /** A ledger object which tracks Oracle
    \sa keylet::oracle
 */
@@ -442,6 +405,34 @@ LEDGER_ENTRY(ltORACLE, 0x0080, Oracle, oracle, ({
    {sfPreviousTxnLgrSeq,    soeREQUIRED},
 }))

+/** A ledger object which tracks MPTokenIssuance
+    \sa keylet::mptIssuance
+ */
+LEDGER_ENTRY(ltMPTOKEN_ISSUANCE, 0x007e, MPTokenIssuance, mpt_issuance, ({
+    {sfIssuer,                   soeREQUIRED},
+    {sfSequence,                 soeREQUIRED},
+    {sfTransferFee,              soeDEFAULT},
+    {sfOwnerNode,                soeREQUIRED},
+    {sfAssetScale,               soeDEFAULT},
+    {sfMaximumAmount,            soeOPTIONAL},
+    {sfOutstandingAmount,        soeREQUIRED},
+    {sfMPTokenMetadata,          soeOPTIONAL},
+    {sfPreviousTxnID,            soeREQUIRED},
+    {sfPreviousTxnLgrSeq,        soeREQUIRED},
+}))
+
+/** A ledger object which tracks MPToken
+    \sa keylet::mptoken
+ */
+LEDGER_ENTRY(ltMPTOKEN, 0x007f, MPToken, mptoken, ({
+    {sfAccount,                  soeREQUIRED},
+    {sfMPTokenIssuanceID,        soeREQUIRED},
+    {sfMPTAmount,                soeDEFAULT},
+    {sfOwnerNode,                soeREQUIRED},
+    {sfPreviousTxnID,            soeREQUIRED},
+    {sfPreviousTxnLgrSeq,        soeREQUIRED},
+}))
+
 /** A ledger object which tracks Credential
    \sa keylet::credential
 */
@@ -469,41 +460,6 @@ LEDGER_ENTRY(ltPERMISSIONED_DOMAIN, 0x0082, PermissionedDomain, permissioned_dom
    {sfPreviousTxnLgrSeq,   soeREQUIRED},
 }))

-/** A ledger object representing permissions an account has delegated to another account.
-    \sa keylet::delegate
- */
-LEDGER_ENTRY(ltDELEGATE, 0x0083, Delegate, delegate, ({
-    {sfAccount,              soeREQUIRED},
-    {sfAuthorize,            soeREQUIRED},
-    {sfPermissions,          soeREQUIRED},
-    {sfOwnerNode,            soeREQUIRED},
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
-}))
-
-/** A ledger object representing a single asset vault.
-
-    \sa keylet::mptoken
- */
-LEDGER_ENTRY(ltVAULT, 0x0084, Vault, vault, ({
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
-    {sfSequence,             soeREQUIRED},
-    {sfOwnerNode,            soeREQUIRED},
-    {sfOwner,                soeREQUIRED},
-    {sfAccount,              soeREQUIRED},
-    {sfData,                 soeOPTIONAL},
-    {sfAsset,                soeREQUIRED},
-    {sfAssetsTotal,          soeREQUIRED},
-    {sfAssetsAvailable,      soeREQUIRED},
-    {sfAssetsMaximum,        soeDEFAULT},
-    {sfLossUnrealized,       soeREQUIRED},
-    {sfShareMPTID,           soeREQUIRED},
-    {sfWithdrawalPolicy,     soeREQUIRED},
-    // no SharesTotal ever (use MPTIssuance.sfOutstandingAmount)
-    // no PermissionedDomainID ever (use MPTIssuance.sfDomainID)
-}))
-
 #undef EXPAND
 #undef LEDGER_ENTRY_DUPLICATE

--- a/include/xrpl/protocol/detail/permissions.macro
+++ b/include/xrpl/protocol/detail/permissions.macro
@@ -1,68 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of rippled: https://github.com/ripple/rippled
-    Copyright (c) 2025 Ripple Labs Inc.
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#if !defined(PERMISSION)
-#error "undefined macro: PERMISSION"
-#endif
-
-/**
- * PERMISSION(name, type, txType, value)
- *
- * This macro defines a permission:
- * name: the name of the permission.
- * type: the GranularPermissionType enum.
- * txType: the corresponding TxType for this permission.
- * value: the uint32 numeric value for the enum type.
- */
-
-/** This permission grants the delegated account the ability to authorize a trustline. */
-PERMISSION(TrustlineAuthorize, ttTRUST_SET, 65537)
-
-/** This permission grants the delegated account the ability to freeze a trustline. */
-PERMISSION(TrustlineFreeze, ttTRUST_SET, 65538)
-
-/** This permission grants the delegated account the ability to unfreeze a trustline. */
-PERMISSION(TrustlineUnfreeze, ttTRUST_SET, 65539)
-
-/** This permission grants the delegated account the ability to set Domain. */
-PERMISSION(AccountDomainSet, ttACCOUNT_SET, 65540)
-
-/** This permission grants the delegated account the ability to set EmailHashSet. */
-PERMISSION(AccountEmailHashSet, ttACCOUNT_SET, 65541)
-
-/** This permission grants the delegated account the ability to set MessageKey. */
-PERMISSION(AccountMessageKeySet, ttACCOUNT_SET, 65542)
-
-/** This permission grants the delegated account the ability to set TransferRate. */
-PERMISSION(AccountTransferRateSet, ttACCOUNT_SET, 65543)
-
-/** This permission grants the delegated account the ability to set TickSize. */
-PERMISSION(AccountTickSizeSet, ttACCOUNT_SET, 65544)
-
-/** This permission grants the delegated account the ability to mint payment, which means sending a payment for a currency where the sending account is the issuer. */
-PERMISSION(PaymentMint, ttPAYMENT, 65545)
-
-/** This permission grants the delegated account the ability to burn payment, which means sending a payment for a currency where the destination account is the issuer */
-PERMISSION(PaymentBurn, ttPAYMENT, 65546)
-
-/** This permission grants the delegated account the ability to lock MPToken. */
-PERMISSION(MPTokenIssuanceLock, ttMPTOKEN_ISSUANCE_SET, 65547)
-
-/** This permission grants the delegated account the ability to unlock MPToken. */
-PERMISSION(MPTokenIssuanceUnlock, ttMPTOKEN_ISSUANCE_SET, 65548)
--- a/include/xrpl/protocol/detail/sfields.macro
+++ b/include/xrpl/protocol/detail/sfields.macro
@@ -42,7 +42,6 @@ TYPED_SFIELD(sfTickSize,                 UINT8,     16)
 TYPED_SFIELD(sfUNLModifyDisabling,       UINT8,     17)
 TYPED_SFIELD(sfHookResult,               UINT8,     18)
 TYPED_SFIELD(sfWasLockingChainSend,      UINT8,     19)
-TYPED_SFIELD(sfWithdrawalPolicy,         UINT8,     20)

 // 16-bit integers (common)
 TYPED_SFIELD(sfLedgerEntryType,          UINT16,     1, SField::sMD_Never)
@@ -113,7 +112,6 @@ TYPED_SFIELD(sfEmitGeneration,           UINT32,    46)
 TYPED_SFIELD(sfVoteWeight,               UINT32,    48)
 TYPED_SFIELD(sfFirstNFTokenSequence,     UINT32,    50)
 TYPED_SFIELD(sfOracleDocumentID,         UINT32,    51)
-TYPED_SFIELD(sfPermissionValue,          UINT32,    52)

 // 64-bit integers (common)
 TYPED_SFIELD(sfIndexNext,                UINT64,     1)
@@ -144,7 +142,6 @@ TYPED_SFIELD(sfOutstandingAmount,        UINT64,    25, SField::sMD_BaseTen|SFie
 TYPED_SFIELD(sfMPTAmount,                UINT64,    26, SField::sMD_BaseTen|SField::sMD_Default)
 TYPED_SFIELD(sfIssuerNode,               UINT64,    27)
 TYPED_SFIELD(sfSubjectNode,              UINT64,    28)
-TYPED_SFIELD(sfLockedAmount,             UINT64,    29, SField::sMD_BaseTen|SField::sMD_Default)

 // 128-bit
 TYPED_SFIELD(sfEmailHash,                UINT128,    1)
@@ -157,7 +154,6 @@ TYPED_SFIELD(sfTakerGetsIssuer,          UINT160,    4)

 // 192-bit (common)
 TYPED_SFIELD(sfMPTokenIssuanceID,        UINT192,    1)
-TYPED_SFIELD(sfShareMPTID,               UINT192,    2)

 // 256-bit (common)
 TYPED_SFIELD(sfLedgerHash,               UINT256,    1)
@@ -195,15 +191,9 @@ 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)
-TYPED_SFIELD(sfParentBatchID,            UINT256,   36)

 // number (common)
 TYPED_SFIELD(sfNumber,                   NUMBER,     1)
-TYPED_SFIELD(sfAssetsAvailable,          NUMBER,     2)
-TYPED_SFIELD(sfAssetsMaximum,            NUMBER,     3)
-TYPED_SFIELD(sfAssetsTotal,              NUMBER,     4)
-TYPED_SFIELD(sfLossUnrealized,           NUMBER,     5)

 // currency amount (common)
 TYPED_SFIELD(sfAmount,                   AMOUNT,     1)
@@ -288,7 +278,6 @@ TYPED_SFIELD(sfRegularKey,               ACCOUNT,    8)
 TYPED_SFIELD(sfNFTokenMinter,            ACCOUNT,    9)
 TYPED_SFIELD(sfEmitCallback,             ACCOUNT,   10)
 TYPED_SFIELD(sfHolder,                   ACCOUNT,   11)
-TYPED_SFIELD(sfDelegate,                 ACCOUNT,   12)

 // account (uncommon)
 TYPED_SFIELD(sfHookAccount,              ACCOUNT,   16)
@@ -338,7 +327,6 @@ UNTYPED_SFIELD(sfSignerEntry,            OBJECT,    11)
 UNTYPED_SFIELD(sfNFToken,                OBJECT,    12)
 UNTYPED_SFIELD(sfEmitDetails,            OBJECT,    13)
 UNTYPED_SFIELD(sfHook,                   OBJECT,    14)
-UNTYPED_SFIELD(sfPermission,             OBJECT,    15)

 // inner object (uncommon)
 UNTYPED_SFIELD(sfSigner,                 OBJECT,    16)
@@ -359,9 +347,6 @@ UNTYPED_SFIELD(sfXChainClaimAttestationCollectionElement, OBJECT, 30)
 UNTYPED_SFIELD(sfXChainCreateAccountAttestationCollectionElement, OBJECT, 31)
 UNTYPED_SFIELD(sfPriceData,              OBJECT,    32)
 UNTYPED_SFIELD(sfCredential,             OBJECT,    33)
-UNTYPED_SFIELD(sfRawTransaction,         OBJECT,    34)
-UNTYPED_SFIELD(sfBatchSigner,            OBJECT,    35)
-UNTYPED_SFIELD(sfBook,                   OBJECT,    36)

 // array of objects (common)
 // ARRAY/1 is reserved for end of array
@@ -377,7 +362,6 @@ UNTYPED_SFIELD(sfMemos,                  ARRAY,      9)
 UNTYPED_SFIELD(sfNFTokens,               ARRAY,     10)
 UNTYPED_SFIELD(sfHooks,                  ARRAY,     11)
 UNTYPED_SFIELD(sfVoteSlots,              ARRAY,     12)
-UNTYPED_SFIELD(sfAdditionalBooks,        ARRAY,     13)

 // array of objects (uncommon)
 UNTYPED_SFIELD(sfMajorities,             ARRAY,     16)
@@ -393,6 +377,3 @@ UNTYPED_SFIELD(sfAuthAccounts,           ARRAY,     25)
 UNTYPED_SFIELD(sfAuthorizeCredentials,   ARRAY,     26)
 UNTYPED_SFIELD(sfUnauthorizeCredentials, ARRAY,     27)
 UNTYPED_SFIELD(sfAcceptedCredentials,    ARRAY,     28)
-UNTYPED_SFIELD(sfPermissions,            ARRAY,     29)
-UNTYPED_SFIELD(sfRawTransactions,        ARRAY,     30)
-UNTYPED_SFIELD(sfBatchSigners,           ARRAY,     31, SField::sMD_Default, SField::notSigning)
--- a/include/xrpl/protocol/detail/token_errors.h
+++ b/include/xrpl/protocol/detail/token_errors.h
@@ -50,7 +50,7 @@ class TokenCodecErrcCategory : public std::error_category
 {
 public:
    // Return a short descriptive name for the category
-    virtual char const*
+    virtual const char*
    name() const noexcept override final
    {
        return "TokenCodecError";
@@ -86,7 +86,7 @@ public:
 };
 }  // namespace detail

-inline ripple::detail::TokenCodecErrcCategory const&
+inline const ripple::detail::TokenCodecErrcCategory&
 TokenCodecErrcCategory()
 {
    static ripple::detail::TokenCodecErrcCategory c;
--- a/include/xrpl/protocol/detail/transactions.macro
+++ b/include/xrpl/protocol/detail/transactions.macro
@@ -22,14 +22,14 @@
 #endif

 /**
- * TRANSACTION(tag, value, name, delegatable, fields)
+ * TRANSACTION(tag, value, name, fields)
 *
 * You must define a transactor class in the `ripple` namespace named `name`,
 * and include its header in `src/xrpld/app/tx/detail/applySteps.cpp`.
 */

 /** This transaction type executes a payment. */
-TRANSACTION(ttPAYMENT, 0, Payment, Delegation::delegatable, ({
+TRANSACTION(ttPAYMENT, 0, Payment, ({
    {sfDestination, soeREQUIRED},
    {sfAmount, soeREQUIRED, soeMPTSupported},
    {sfSendMax, soeOPTIONAL, soeMPTSupported},
@@ -38,13 +38,12 @@ TRANSACTION(ttPAYMENT, 0, Payment, Delegation::delegatable, ({
    {sfDestinationTag, soeOPTIONAL},
    {sfDeliverMin, soeOPTIONAL, soeMPTSupported},
    {sfCredentialIDs, soeOPTIONAL},
-    {sfDomainID, soeOPTIONAL},
 }))

 /** This transaction type creates an escrow object. */
-TRANSACTION(ttESCROW_CREATE, 1, EscrowCreate, Delegation::delegatable, ({
+TRANSACTION(ttESCROW_CREATE, 1, EscrowCreate, ({
    {sfDestination, soeREQUIRED},
-    {sfAmount, soeREQUIRED, soeMPTSupported},
+    {sfAmount, soeREQUIRED},
    {sfCondition, soeOPTIONAL},
    {sfCancelAfter, soeOPTIONAL},
    {sfFinishAfter, soeOPTIONAL},
@@ -52,7 +51,7 @@ TRANSACTION(ttESCROW_CREATE, 1, EscrowCreate, Delegation::delegatable, ({
 }))

 /** This transaction type completes an existing escrow. */
-TRANSACTION(ttESCROW_FINISH, 2, EscrowFinish, Delegation::delegatable, ({
+TRANSACTION(ttESCROW_FINISH, 2, EscrowFinish, ({
    {sfOwner, soeREQUIRED},
    {sfOfferSequence, soeREQUIRED},
    {sfFulfillment, soeOPTIONAL},
@@ -62,7 +61,7 @@ TRANSACTION(ttESCROW_FINISH, 2, EscrowFinish, Delegation::delegatable, ({


 /** This transaction type adjusts various account settings. */
-TRANSACTION(ttACCOUNT_SET, 3, AccountSet, Delegation::notDelegatable, ({
+TRANSACTION(ttACCOUNT_SET, 3, AccountSet, ({
    {sfEmailHash, soeOPTIONAL},
    {sfWalletLocator, soeOPTIONAL},
    {sfWalletSize, soeOPTIONAL},
@@ -76,36 +75,35 @@ TRANSACTION(ttACCOUNT_SET, 3, AccountSet, Delegation::notDelegatable, ({
 }))

 /** This transaction type cancels an existing escrow. */
-TRANSACTION(ttESCROW_CANCEL, 4, EscrowCancel, Delegation::delegatable, ({
+TRANSACTION(ttESCROW_CANCEL, 4, EscrowCancel, ({
    {sfOwner, soeREQUIRED},
    {sfOfferSequence, soeREQUIRED},
 }))

 /** This transaction type sets or clears an account's "regular key". */
-TRANSACTION(ttREGULAR_KEY_SET, 5, SetRegularKey, Delegation::notDelegatable, ({
+TRANSACTION(ttREGULAR_KEY_SET, 5, SetRegularKey, ({
    {sfRegularKey, soeOPTIONAL},
 }))

 // 6 deprecated

 /** This transaction type creates an offer to trade one asset for another. */
-TRANSACTION(ttOFFER_CREATE, 7, OfferCreate, Delegation::delegatable, ({
+TRANSACTION(ttOFFER_CREATE, 7, OfferCreate, ({
    {sfTakerPays, soeREQUIRED},
    {sfTakerGets, soeREQUIRED},
    {sfExpiration, soeOPTIONAL},
    {sfOfferSequence, soeOPTIONAL},
-    {sfDomainID, soeOPTIONAL},
 }))

 /** This transaction type cancels existing offers to trade one asset for another. */
-TRANSACTION(ttOFFER_CANCEL, 8, OfferCancel, Delegation::delegatable, ({
+TRANSACTION(ttOFFER_CANCEL, 8, OfferCancel, ({
    {sfOfferSequence, soeREQUIRED},
 }))

 // 9 deprecated

 /** This transaction type creates a new set of tickets. */
-TRANSACTION(ttTICKET_CREATE, 10, TicketCreate, Delegation::delegatable, ({
+TRANSACTION(ttTICKET_CREATE, 10, TicketCreate, ({
    {sfTicketCount, soeREQUIRED},
 }))

@@ -114,13 +112,13 @@ TRANSACTION(ttTICKET_CREATE, 10, TicketCreate, Delegation::delegatable, ({
 /** This transaction type modifies the signer list associated with an account. */
 // The SignerEntries are optional because a SignerList is deleted by
 // setting the SignerQuorum to zero and omitting SignerEntries.
-TRANSACTION(ttSIGNER_LIST_SET, 12, SignerListSet, Delegation::notDelegatable, ({
+TRANSACTION(ttSIGNER_LIST_SET, 12, SignerListSet, ({
    {sfSignerQuorum, soeREQUIRED},
    {sfSignerEntries, soeOPTIONAL},
 }))

 /** This transaction type creates a new unidirectional XRP payment channel. */
-TRANSACTION(ttPAYCHAN_CREATE, 13, PaymentChannelCreate, Delegation::delegatable, ({
+TRANSACTION(ttPAYCHAN_CREATE, 13, PaymentChannelCreate, ({
    {sfDestination, soeREQUIRED},
    {sfAmount, soeREQUIRED},
    {sfSettleDelay, soeREQUIRED},
@@ -130,14 +128,14 @@ TRANSACTION(ttPAYCHAN_CREATE, 13, PaymentChannelCreate, Delegation::delegatable,
 }))

 /** This transaction type funds an existing unidirectional XRP payment channel. */
-TRANSACTION(ttPAYCHAN_FUND, 14, PaymentChannelFund, Delegation::delegatable, ({
+TRANSACTION(ttPAYCHAN_FUND, 14, PaymentChannelFund, ({
    {sfChannel, soeREQUIRED},
    {sfAmount, soeREQUIRED},
    {sfExpiration, soeOPTIONAL},
 }))

 /** This transaction type submits a claim against an existing unidirectional payment channel. */
-TRANSACTION(ttPAYCHAN_CLAIM, 15, PaymentChannelClaim, Delegation::delegatable, ({
+TRANSACTION(ttPAYCHAN_CLAIM, 15, PaymentChannelClaim, ({
    {sfChannel, soeREQUIRED},
    {sfAmount, soeOPTIONAL},
    {sfBalance, soeOPTIONAL},
@@ -147,7 +145,7 @@ TRANSACTION(ttPAYCHAN_CLAIM, 15, PaymentChannelClaim, Delegation::delegatable, (
 }))

 /** This transaction type creates a new check. */
-TRANSACTION(ttCHECK_CREATE, 16, CheckCreate, Delegation::delegatable, ({
+TRANSACTION(ttCHECK_CREATE, 16, CheckCreate, ({
    {sfDestination, soeREQUIRED},
    {sfSendMax, soeREQUIRED},
    {sfExpiration, soeOPTIONAL},
@@ -156,19 +154,19 @@ TRANSACTION(ttCHECK_CREATE, 16, CheckCreate, Delegation::delegatable, ({
 }))

 /** This transaction type cashes an existing check. */
-TRANSACTION(ttCHECK_CASH, 17, CheckCash, Delegation::delegatable, ({
+TRANSACTION(ttCHECK_CASH, 17, CheckCash, ({
    {sfCheckID, soeREQUIRED},
    {sfAmount, soeOPTIONAL},
    {sfDeliverMin, soeOPTIONAL},
 }))

 /** This transaction type cancels an existing check. */
-TRANSACTION(ttCHECK_CANCEL, 18, CheckCancel, Delegation::delegatable, ({
+TRANSACTION(ttCHECK_CANCEL, 18, CheckCancel, ({
    {sfCheckID, soeREQUIRED},
 }))

 /** This transaction type grants or revokes authorization to transfer funds. */
-TRANSACTION(ttDEPOSIT_PREAUTH, 19, DepositPreauth, Delegation::delegatable, ({
+TRANSACTION(ttDEPOSIT_PREAUTH, 19, DepositPreauth, ({
    {sfAuthorize, soeOPTIONAL},
    {sfUnauthorize, soeOPTIONAL},
    {sfAuthorizeCredentials, soeOPTIONAL},
@@ -176,14 +174,14 @@ TRANSACTION(ttDEPOSIT_PREAUTH, 19, DepositPreauth, Delegation::delegatable, ({
 }))

 /** This transaction type modifies a trustline between two accounts. */
-TRANSACTION(ttTRUST_SET, 20, TrustSet, Delegation::delegatable, ({
+TRANSACTION(ttTRUST_SET, 20, TrustSet, ({
    {sfLimitAmount, soeOPTIONAL},
    {sfQualityIn, soeOPTIONAL},
    {sfQualityOut, soeOPTIONAL},
 }))

 /** This transaction type deletes an existing account. */
-TRANSACTION(ttACCOUNT_DELETE, 21, AccountDelete, Delegation::notDelegatable, ({
+TRANSACTION(ttACCOUNT_DELETE, 21, AccountDelete, ({
    {sfDestination, soeREQUIRED},
    {sfDestinationTag, soeOPTIONAL},
    {sfCredentialIDs, soeOPTIONAL},
@@ -192,7 +190,7 @@ TRANSACTION(ttACCOUNT_DELETE, 21, AccountDelete, Delegation::notDelegatable, ({
 // 22 reserved

 /** This transaction mints a new NFT. */
-TRANSACTION(ttNFTOKEN_MINT, 25, NFTokenMint, Delegation::delegatable, ({
+TRANSACTION(ttNFTOKEN_MINT, 25, NFTokenMint, ({
    {sfNFTokenTaxon, soeREQUIRED},
    {sfTransferFee, soeOPTIONAL},
    {sfIssuer, soeOPTIONAL},
@@ -203,13 +201,13 @@ TRANSACTION(ttNFTOKEN_MINT, 25, NFTokenMint, Delegation::delegatable, ({
 }))

 /** This transaction burns (i.e. destroys) an existing NFT. */
-TRANSACTION(ttNFTOKEN_BURN, 26, NFTokenBurn, Delegation::delegatable, ({
+TRANSACTION(ttNFTOKEN_BURN, 26, NFTokenBurn, ({
    {sfNFTokenID, soeREQUIRED},
    {sfOwner, soeOPTIONAL},
 }))

 /** This transaction creates a new offer to buy or sell an NFT. */
-TRANSACTION(ttNFTOKEN_CREATE_OFFER, 27, NFTokenCreateOffer, Delegation::delegatable, ({
+TRANSACTION(ttNFTOKEN_CREATE_OFFER, 27, NFTokenCreateOffer, ({
    {sfNFTokenID, soeREQUIRED},
    {sfAmount, soeREQUIRED},
    {sfDestination, soeOPTIONAL},
@@ -218,25 +216,25 @@ TRANSACTION(ttNFTOKEN_CREATE_OFFER, 27, NFTokenCreateOffer, Delegation::delegata
 }))

 /** This transaction cancels an existing offer to buy or sell an existing NFT. */
-TRANSACTION(ttNFTOKEN_CANCEL_OFFER, 28, NFTokenCancelOffer, Delegation::delegatable, ({
+TRANSACTION(ttNFTOKEN_CANCEL_OFFER, 28, NFTokenCancelOffer, ({
    {sfNFTokenOffers, soeREQUIRED},
 }))

 /** This transaction accepts an existing offer to buy or sell an existing  NFT. */
-TRANSACTION(ttNFTOKEN_ACCEPT_OFFER, 29, NFTokenAcceptOffer, Delegation::delegatable, ({
+TRANSACTION(ttNFTOKEN_ACCEPT_OFFER, 29, NFTokenAcceptOffer, ({
    {sfNFTokenBuyOffer, soeOPTIONAL},
    {sfNFTokenSellOffer, soeOPTIONAL},
    {sfNFTokenBrokerFee, soeOPTIONAL},
 }))

 /** This transaction claws back issued tokens. */
-TRANSACTION(ttCLAWBACK, 30, Clawback, Delegation::delegatable, ({
+TRANSACTION(ttCLAWBACK, 30, Clawback, ({
    {sfAmount, soeREQUIRED, soeMPTSupported},
    {sfHolder, soeOPTIONAL},
 }))

 /** This transaction claws back tokens from an AMM pool. */
-TRANSACTION(ttAMM_CLAWBACK, 31, AMMClawback, Delegation::delegatable, ({
+TRANSACTION(ttAMM_CLAWBACK, 31, AMMClawback, ({
    {sfHolder, soeREQUIRED},
    {sfAsset, soeREQUIRED},
    {sfAsset2, soeREQUIRED},
@@ -244,14 +242,14 @@ TRANSACTION(ttAMM_CLAWBACK, 31, AMMClawback, Delegation::delegatable, ({
 }))

 /** This transaction type creates an AMM instance */
-TRANSACTION(ttAMM_CREATE, 35, AMMCreate, Delegation::delegatable, ({
+TRANSACTION(ttAMM_CREATE, 35, AMMCreate, ({
    {sfAmount, soeREQUIRED},
    {sfAmount2, soeREQUIRED},
    {sfTradingFee, soeREQUIRED},
 }))

 /** This transaction type deposits into an AMM instance */
-TRANSACTION(ttAMM_DEPOSIT, 36, AMMDeposit, Delegation::delegatable, ({
+TRANSACTION(ttAMM_DEPOSIT, 36, AMMDeposit, ({
    {sfAsset, soeREQUIRED},
    {sfAsset2, soeREQUIRED},
    {sfAmount, soeOPTIONAL},
@@ -262,7 +260,7 @@ TRANSACTION(ttAMM_DEPOSIT, 36, AMMDeposit, Delegation::delegatable, ({
 }))

 /** This transaction type withdraws from an AMM instance */
-TRANSACTION(ttAMM_WITHDRAW, 37, AMMWithdraw, Delegation::delegatable, ({
+TRANSACTION(ttAMM_WITHDRAW, 37, AMMWithdraw, ({
    {sfAsset, soeREQUIRED},
    {sfAsset2, soeREQUIRED},
    {sfAmount, soeOPTIONAL},
@@ -272,14 +270,14 @@ TRANSACTION(ttAMM_WITHDRAW, 37, AMMWithdraw, Delegation::delegatable, ({
 }))

 /** This transaction type votes for the trading fee */
-TRANSACTION(ttAMM_VOTE, 38, AMMVote, Delegation::delegatable, ({
+TRANSACTION(ttAMM_VOTE, 38, AMMVote, ({
    {sfAsset, soeREQUIRED},
    {sfAsset2, soeREQUIRED},
    {sfTradingFee, soeREQUIRED},
 }))

 /** This transaction type bids for the auction slot */
-TRANSACTION(ttAMM_BID, 39, AMMBid, Delegation::delegatable, ({
+TRANSACTION(ttAMM_BID, 39, AMMBid, ({
    {sfAsset, soeREQUIRED},
    {sfAsset2, soeREQUIRED},
    {sfBidMin, soeOPTIONAL},
@@ -288,20 +286,20 @@ TRANSACTION(ttAMM_BID, 39, AMMBid, Delegation::delegatable, ({
 }))

 /** This transaction type deletes AMM in the empty state */
-TRANSACTION(ttAMM_DELETE, 40, AMMDelete, Delegation::delegatable, ({
+TRANSACTION(ttAMM_DELETE, 40, AMMDelete, ({
    {sfAsset, soeREQUIRED},
    {sfAsset2, soeREQUIRED},
 }))

 /** This transactions creates a crosschain sequence number */
-TRANSACTION(ttXCHAIN_CREATE_CLAIM_ID, 41, XChainCreateClaimID, Delegation::delegatable, ({
+TRANSACTION(ttXCHAIN_CREATE_CLAIM_ID, 41, XChainCreateClaimID, ({
    {sfXChainBridge, soeREQUIRED},
    {sfSignatureReward, soeREQUIRED},
    {sfOtherChainSource, soeREQUIRED},
 }))

 /** This transactions initiates a crosschain transaction */
-TRANSACTION(ttXCHAIN_COMMIT, 42, XChainCommit, Delegation::delegatable, ({
+TRANSACTION(ttXCHAIN_COMMIT, 42, XChainCommit, ({
    {sfXChainBridge, soeREQUIRED},
    {sfXChainClaimID, soeREQUIRED},
    {sfAmount, soeREQUIRED},
@@ -309,7 +307,7 @@ TRANSACTION(ttXCHAIN_COMMIT, 42, XChainCommit, Delegation::delegatable, ({
 }))

 /** This transaction completes a crosschain transaction */
-TRANSACTION(ttXCHAIN_CLAIM, 43, XChainClaim, Delegation::delegatable, ({
+TRANSACTION(ttXCHAIN_CLAIM, 43, XChainClaim, ({
    {sfXChainBridge, soeREQUIRED},
    {sfXChainClaimID, soeREQUIRED},
    {sfDestination, soeREQUIRED},
@@ -318,7 +316,7 @@ TRANSACTION(ttXCHAIN_CLAIM, 43, XChainClaim, Delegation::delegatable, ({
 }))

 /** This transaction initiates a crosschain account create transaction */
-TRANSACTION(ttXCHAIN_ACCOUNT_CREATE_COMMIT, 44, XChainAccountCreateCommit, Delegation::delegatable, ({
+TRANSACTION(ttXCHAIN_ACCOUNT_CREATE_COMMIT, 44, XChainAccountCreateCommit, ({
    {sfXChainBridge, soeREQUIRED},
    {sfDestination, soeREQUIRED},
    {sfAmount, soeREQUIRED},
@@ -326,7 +324,7 @@ TRANSACTION(ttXCHAIN_ACCOUNT_CREATE_COMMIT, 44, XChainAccountCreateCommit, Deleg
 }))

 /** This transaction adds an attestation to a claim */
-TRANSACTION(ttXCHAIN_ADD_CLAIM_ATTESTATION, 45, XChainAddClaimAttestation, Delegation::delegatable, ({
+TRANSACTION(ttXCHAIN_ADD_CLAIM_ATTESTATION, 45, XChainAddClaimAttestation, ({
    {sfXChainBridge, soeREQUIRED},

    {sfAttestationSignerAccount, soeREQUIRED},
@@ -342,7 +340,7 @@ TRANSACTION(ttXCHAIN_ADD_CLAIM_ATTESTATION, 45, XChainAddClaimAttestation, Deleg
 }))

 /** This transaction adds an attestation to an account */
-TRANSACTION(ttXCHAIN_ADD_ACCOUNT_CREATE_ATTESTATION, 46, XChainAddAccountCreateAttestation, Delegation::delegatable, ({
+TRANSACTION(ttXCHAIN_ADD_ACCOUNT_CREATE_ATTESTATION, 46, XChainAddAccountCreateAttestation, ({
    {sfXChainBridge, soeREQUIRED},

    {sfAttestationSignerAccount, soeREQUIRED},
@@ -359,31 +357,31 @@ TRANSACTION(ttXCHAIN_ADD_ACCOUNT_CREATE_ATTESTATION, 46, XChainAddAccountCreateA
 }))

 /** This transaction modifies a sidechain */
-TRANSACTION(ttXCHAIN_MODIFY_BRIDGE, 47, XChainModifyBridge, Delegation::delegatable, ({
+TRANSACTION(ttXCHAIN_MODIFY_BRIDGE, 47, XChainModifyBridge, ({
    {sfXChainBridge, soeREQUIRED},
    {sfSignatureReward, soeOPTIONAL},
    {sfMinAccountCreateAmount, soeOPTIONAL},
 }))

 /** This transactions creates a sidechain */
-TRANSACTION(ttXCHAIN_CREATE_BRIDGE, 48, XChainCreateBridge, Delegation::delegatable, ({
+TRANSACTION(ttXCHAIN_CREATE_BRIDGE, 48, XChainCreateBridge, ({
    {sfXChainBridge, soeREQUIRED},
    {sfSignatureReward, soeREQUIRED},
    {sfMinAccountCreateAmount, soeOPTIONAL},
 }))

 /** This transaction type creates or updates a DID */
-TRANSACTION(ttDID_SET, 49, DIDSet, Delegation::delegatable, ({
+TRANSACTION(ttDID_SET, 49, DIDSet, ({
    {sfDIDDocument, soeOPTIONAL},
    {sfURI, soeOPTIONAL},
    {sfData, soeOPTIONAL},
 }))

 /** This transaction type deletes a DID */
-TRANSACTION(ttDID_DELETE, 50, DIDDelete, Delegation::delegatable, ({}))
+TRANSACTION(ttDID_DELETE, 50, DIDDelete, ({}))

 /** This transaction type creates an Oracle instance */
-TRANSACTION(ttORACLE_SET, 51, OracleSet, Delegation::delegatable, ({
+TRANSACTION(ttORACLE_SET, 51, OracleSet, ({
    {sfOracleDocumentID, soeREQUIRED},
    {sfProvider, soeOPTIONAL},
    {sfURI, soeOPTIONAL},
@@ -393,18 +391,18 @@ TRANSACTION(ttORACLE_SET, 51, OracleSet, Delegation::delegatable, ({
 }))

 /** This transaction type deletes an Oracle instance */
-TRANSACTION(ttORACLE_DELETE, 52, OracleDelete, Delegation::delegatable, ({
+TRANSACTION(ttORACLE_DELETE, 52, OracleDelete, ({
    {sfOracleDocumentID, soeREQUIRED},
 }))

 /** This transaction type fixes a problem in the ledger state */
-TRANSACTION(ttLEDGER_STATE_FIX, 53, LedgerStateFix, Delegation::delegatable, ({
+TRANSACTION(ttLEDGER_STATE_FIX, 53, LedgerStateFix, ({
    {sfLedgerFixType, soeREQUIRED},
    {sfOwner, soeOPTIONAL},
 }))

 /** This transaction type creates a MPTokensIssuance instance */
-TRANSACTION(ttMPTOKEN_ISSUANCE_CREATE, 54, MPTokenIssuanceCreate, Delegation::delegatable, ({
+TRANSACTION(ttMPTOKEN_ISSUANCE_CREATE, 54, MPTokenIssuanceCreate, ({
    {sfAssetScale, soeOPTIONAL},
    {sfTransferFee, soeOPTIONAL},
    {sfMaximumAmount, soeOPTIONAL},
@@ -412,24 +410,24 @@ TRANSACTION(ttMPTOKEN_ISSUANCE_CREATE, 54, MPTokenIssuanceCreate, Delegation::de
 }))

 /** This transaction type destroys a MPTokensIssuance instance */
-TRANSACTION(ttMPTOKEN_ISSUANCE_DESTROY, 55, MPTokenIssuanceDestroy, Delegation::delegatable, ({
+TRANSACTION(ttMPTOKEN_ISSUANCE_DESTROY, 55, MPTokenIssuanceDestroy, ({
    {sfMPTokenIssuanceID, soeREQUIRED},
 }))

 /** This transaction type sets flags on a MPTokensIssuance or MPToken instance */
-TRANSACTION(ttMPTOKEN_ISSUANCE_SET, 56, MPTokenIssuanceSet, Delegation::delegatable, ({
+TRANSACTION(ttMPTOKEN_ISSUANCE_SET, 56, MPTokenIssuanceSet, ({
    {sfMPTokenIssuanceID, soeREQUIRED},
    {sfHolder, soeOPTIONAL},
 }))

 /** This transaction type authorizes a MPToken instance */
-TRANSACTION(ttMPTOKEN_AUTHORIZE, 57, MPTokenAuthorize, Delegation::delegatable, ({
+TRANSACTION(ttMPTOKEN_AUTHORIZE, 57, MPTokenAuthorize, ({
    {sfMPTokenIssuanceID, soeREQUIRED},
    {sfHolder, soeOPTIONAL},
 }))

 /** This transaction type create an Credential instance */
-TRANSACTION(ttCREDENTIAL_CREATE, 58, CredentialCreate, Delegation::delegatable, ({
+TRANSACTION(ttCREDENTIAL_CREATE, 58, CredentialCreate, ({
    {sfSubject, soeREQUIRED},
    {sfCredentialType, soeREQUIRED},
    {sfExpiration, soeOPTIONAL},
@@ -437,96 +435,41 @@ TRANSACTION(ttCREDENTIAL_CREATE, 58, CredentialCreate, Delegation::delegatable,
 }))

 /** This transaction type accept an Credential object */
-TRANSACTION(ttCREDENTIAL_ACCEPT, 59, CredentialAccept, Delegation::delegatable, ({
+TRANSACTION(ttCREDENTIAL_ACCEPT, 59, CredentialAccept, ({
    {sfIssuer, soeREQUIRED},
    {sfCredentialType, soeREQUIRED},
 }))

 /** This transaction type delete an Credential object */
-TRANSACTION(ttCREDENTIAL_DELETE, 60, CredentialDelete, Delegation::delegatable, ({
+TRANSACTION(ttCREDENTIAL_DELETE, 60, CredentialDelete, ({
    {sfSubject, soeOPTIONAL},
    {sfIssuer, soeOPTIONAL},
    {sfCredentialType, soeREQUIRED},
 }))

 /** This transaction type modify a NFToken */
-TRANSACTION(ttNFTOKEN_MODIFY, 61, NFTokenModify, Delegation::delegatable, ({
+TRANSACTION(ttNFTOKEN_MODIFY, 61, NFTokenModify, ({
    {sfNFTokenID, soeREQUIRED},
    {sfOwner, soeOPTIONAL},
    {sfURI, soeOPTIONAL},
 }))

 /** This transaction type creates or modifies a Permissioned Domain */
-TRANSACTION(ttPERMISSIONED_DOMAIN_SET, 62, PermissionedDomainSet, Delegation::delegatable, ({
+TRANSACTION(ttPERMISSIONED_DOMAIN_SET, 62, PermissionedDomainSet, ({
    {sfDomainID, soeOPTIONAL},
    {sfAcceptedCredentials, soeREQUIRED},
 }))

 /** This transaction type deletes a Permissioned Domain */
-TRANSACTION(ttPERMISSIONED_DOMAIN_DELETE, 63, PermissionedDomainDelete, Delegation::delegatable, ({
+TRANSACTION(ttPERMISSIONED_DOMAIN_DELETE, 63, PermissionedDomainDelete, ({
    {sfDomainID, soeREQUIRED},
 }))

-/** This transaction type delegates authorized account specified permissions */
-TRANSACTION(ttDELEGATE_SET, 64, DelegateSet, Delegation::notDelegatable, ({
-    {sfAuthorize, soeREQUIRED},
-    {sfPermissions, soeREQUIRED},
-}))
-
-/** This transaction creates a single asset vault. */
-TRANSACTION(ttVAULT_CREATE, 65, VaultCreate, Delegation::delegatable, ({
-    {sfAsset, soeREQUIRED, soeMPTSupported},
-    {sfAssetsMaximum, soeOPTIONAL},
-    {sfMPTokenMetadata, soeOPTIONAL},
-    {sfDomainID, soeOPTIONAL}, // PermissionedDomainID
-    {sfWithdrawalPolicy, soeOPTIONAL},
-    {sfData, soeOPTIONAL},
-}))
-
-/** This transaction updates a single asset vault. */
-TRANSACTION(ttVAULT_SET, 66, VaultSet, Delegation::delegatable, ({
-    {sfVaultID, soeREQUIRED},
-    {sfAssetsMaximum, soeOPTIONAL},
-    {sfDomainID, soeOPTIONAL}, // PermissionedDomainID
-    {sfData, soeOPTIONAL},
-}))
-
-/** This transaction deletes a single asset vault. */
-TRANSACTION(ttVAULT_DELETE, 67, VaultDelete, Delegation::delegatable, ({
-    {sfVaultID, soeREQUIRED},
-}))
-
-/** This transaction trades assets for shares with a vault. */
-TRANSACTION(ttVAULT_DEPOSIT, 68, VaultDeposit, Delegation::delegatable, ({
-    {sfVaultID, soeREQUIRED},
-    {sfAmount, soeREQUIRED, soeMPTSupported},
-}))
-
-/** This transaction trades shares for assets with a vault. */
-TRANSACTION(ttVAULT_WITHDRAW, 69, VaultWithdraw, Delegation::delegatable, ({
-    {sfVaultID, soeREQUIRED},
-    {sfAmount, soeREQUIRED, soeMPTSupported},
-    {sfDestination, soeOPTIONAL},
-}))
-
-/** This transaction claws back tokens from a vault. */
-TRANSACTION(ttVAULT_CLAWBACK, 70, VaultClawback, Delegation::delegatable, ({
-    {sfVaultID, soeREQUIRED},
-    {sfHolder, soeREQUIRED},
-    {sfAmount, soeOPTIONAL, soeMPTSupported},
-}))
-
-/** This transaction type batches together transactions. */
-TRANSACTION(ttBATCH, 71, Batch, Delegation::notDelegatable, ({
-    {sfRawTransactions, soeREQUIRED},
-    {sfBatchSigners, soeOPTIONAL},
-}))
-
 /** This system-generated transaction type is used to update the status of the various amendments.

    For details, see: https://xrpl.org/amendments.html
 */
-TRANSACTION(ttAMENDMENT, 100, EnableAmendment, Delegation::notDelegatable, ({
+TRANSACTION(ttAMENDMENT, 100, EnableAmendment, ({
    {sfLedgerSequence, soeREQUIRED},
    {sfAmendment, soeREQUIRED},
 }))
@@ -534,7 +477,7 @@ TRANSACTION(ttAMENDMENT, 100, EnableAmendment, Delegation::notDelegatable, ({
 /** This system-generated transaction type is used to update the network's fee settings.
    For details, see: https://xrpl.org/fee-voting.html
 */
-TRANSACTION(ttFEE, 101, SetFee, Delegation::notDelegatable, ({
+TRANSACTION(ttFEE, 101, SetFee, ({
    {sfLedgerSequence, soeOPTIONAL},
    // Old version uses raw numbers
    {sfBaseFee, soeOPTIONAL},
@@ -551,8 +494,9 @@ TRANSACTION(ttFEE, 101, SetFee, Delegation::notDelegatable, ({

    For details, see: https://xrpl.org/negative-unl.html
 */
-TRANSACTION(ttUNL_MODIFY, 102, UNLModify, Delegation::notDelegatable, ({
+TRANSACTION(ttUNL_MODIFY, 102, UNLModify, ({
    {sfUNLModifyDisabling, soeREQUIRED},
    {sfLedgerSequence, soeREQUIRED},
    {sfUNLModifyValidator, soeREQUIRED},
 }))
+
--- a/include/xrpl/protocol/json_get_or_throw.h
+++ b/include/xrpl/protocol/json_get_or_throw.h
@@ -20,7 +20,7 @@ struct JsonMissingKeyError : std::exception
    JsonMissingKeyError(Json::StaticString const& k) : key{k.c_str()}
    {
    }
-    char const*
+    const char*
    what() const noexcept override
    {
        if (msg.empty())
@@ -40,7 +40,7 @@ struct JsonTypeMismatchError : std::exception
        : key{k.c_str()}, expectedType{std::move(et)}
    {
    }
-    char const*
+    const char*
    what() const noexcept override
    {
        if (msg.empty())
--- a/include/xrpl/protocol/jss.h
+++ b/include/xrpl/protocol/jss.h
@@ -83,8 +83,6 @@ JSS(PriceDataSeries);                    // field.
 JSS(PriceData);                          // field.
 JSS(Provider);                           // field.
 JSS(QuoteAsset);                         // in: Oracle.
-JSS(RawTransaction);                     // in: Batch
-JSS(RawTransactions);                    // in: Batch
 JSS(SLE_hit_rate);                       // out: GetCounts.
 JSS(Scale);                              // field.
 JSS(SettleDelay);                        // in: TransactionSign
@@ -97,10 +95,10 @@ JSS(SigningPubKey);                      // field.
 JSS(Subject);                            // in: Credential transactions
 JSS(TakerGets);                          // field.
 JSS(TakerPays);                          // field.
+JSS(TxnSignature);                       // field.
 JSS(TradingFee);                         // in/out: AMM trading fee
 JSS(TransactionType);                    // in: TransactionSign.
 JSS(TransferRate);                       // in: TransferRate.
-JSS(TxnSignature);                       // field.
 JSS(URI);                                // field.
 JSS(VoteSlots);                          // out: AMM Vote
 JSS(aborted);                            // out: InboundLedger
@@ -147,7 +145,6 @@ JSS(attestations);
 JSS(attestation_reward_account);
 JSS(auction_slot);            // out: amm_info
 JSS(authorized);              // out: AccountLines
-JSS(authorize);               // out: delegate
 JSS(authorized_credentials);   // in: ledger_entry DepositPreauth
 JSS(auth_accounts);           // out: amm_info
 JSS(auth_change);             // out: AccountInfo
@@ -391,7 +388,6 @@ JSS(load_fee);                // out: LoadFeeTrackImp, NetworkOPs
 JSS(local);                   // out: resource/Logic.h
 JSS(local_txs);               // out: GetCounts
 JSS(local_static_keys);       // out: ValidatorList
-JSS(locked);                  // out: GatewayBalances
 JSS(low);                     // out: BookChanges
 JSS(lowest_sequence);         // out: AccountInfo
 JSS(lowest_ticket);           // out: AccountInfo
@@ -452,7 +448,6 @@ JSS(node_reads_hit);          // out: GetCounts
 JSS(node_reads_total);        // out: GetCounts
 JSS(node_reads_duration_us);  // out: GetCounts
 JSS(node_size);               // out: server_info
-JSS(nodes);                   // out: VaultInfo
 JSS(nodestore);               // out: GetCounts
 JSS(node_writes);             // out: GetCounts
 JSS(node_written_bytes);      // out: GetCounts
@@ -563,7 +558,6 @@ JSS(server_status);           // out: NetworkOPs
 JSS(server_version);          // out: NetworkOPs
 JSS(settle_delay);            // out: AccountChannels
 JSS(severity);                // in: LogLevel
-JSS(shares);                  // out: VaultInfo
 JSS(signature);               // out: NetworkOPs, ChannelAuthorize
 JSS(signature_verified);      // out: ChannelVerify
 JSS(signing_key);             // out: NetworkOPs
@@ -689,7 +683,6 @@ JSS(validations);               // out: AmendmentTableImpl
 JSS(validator_list_threshold);  // out: ValidatorList
 JSS(validator_sites);           // out: ValidatorSites
 JSS(value);                     // out: STAmount
-JSS(vault_id);                  // in: VaultInfo
 JSS(version);                   // out: RPCVersion
 JSS(vetoed);                    // out: AmendmentTableImpl
 JSS(volume_a);                  // out: BookChanges
@@ -706,7 +699,7 @@ JSS(write_load);              // out: GetCounts
 #pragma push_macro("TRANSACTION")
 #undef TRANSACTION

-#define TRANSACTION(tag, value, name, delegatable, fields) JSS(name);
+#define TRANSACTION(tag, value, name, fields) JSS(name);

 #include <xrpl/protocol/detail/transactions.macro>

--- a/include/xrpl/resource/detail/Key.h
+++ b/include/xrpl/resource/detail/Key.h
@@ -53,7 +53,7 @@ struct Key

    struct key_equal
    {
-        key_equal() = default;
+        explicit key_equal() = default;

        bool
        operator()(Key const& lhs, Key const& rhs) const
--- a/src/libxrpl/basics/Archive.cpp
+++ b/src/libxrpl/basics/Archive.cpp
@@ -94,7 +94,7 @@ extractTarLz4(

        if (archive_entry_size(entry) > 0)
        {
-            void const* buf;
+            const void* buf;
            size_t sz;
            la_int64_t offset;
            while (true)
--- a/src/libxrpl/basics/FileUtilities.cpp
+++ b/src/libxrpl/basics/FileUtilities.cpp
@@ -63,7 +63,7 @@ getFileContents(
        return {};
    }

-    std::string const result{
+    const std::string result{
        std::istreambuf_iterator<char>{fileStream},
        std::istreambuf_iterator<char>{}};

--- a/src/libxrpl/basics/Number.cpp
+++ b/src/libxrpl/basics/Number.cpp
@@ -469,7 +469,7 @@ Number::operator/=(Number const& y)
    }
    // Shift by 10^17 gives greatest precision while not overflowing uint128_t
    // or the cast back to int64_t
-    uint128_t const f = 100'000'000'000'000'000;
+    const uint128_t f = 100'000'000'000'000'000;
    mantissa_ = static_cast<std::int64_t>(uint128_t(nm) * f / uint128_t(dm));
    exponent_ = ne - de - 17;
    mantissa_ *= np * dp;
--- a/src/libxrpl/basics/StringUtilities.cpp
+++ b/src/libxrpl/basics/StringUtilities.cpp
@@ -89,13 +89,13 @@ parseUrl(parsedURL& pUrl, std::string const& strUrl)
    boost::algorithm::to_lower(pUrl.scheme);
    pUrl.username = smMatch[2];
    pUrl.password = smMatch[3];
-    std::string const domain = smMatch[4];
+    const std::string domain = smMatch[4];
    // We need to use Endpoint to parse the domain to
    // strip surrounding brackets from IPv6 addresses,
    // e.g. [::1] => ::1.
-    auto const result = beast::IP::Endpoint::from_string_checked(domain);
+    const auto result = beast::IP::Endpoint::from_string_checked(domain);
    pUrl.domain = result ? result->address().to_string() : domain;
-    std::string const port = smMatch[5];
+    const std::string port = smMatch[5];
    if (!port.empty())
    {
        pUrl.port = beast::lexicalCast<std::uint16_t>(port);
--- a/src/libxrpl/basics/UptimeClock.cpp
+++ b/src/libxrpl/basics/UptimeClock.cpp
@@ -67,7 +67,7 @@ UptimeClock::time_point
 UptimeClock::now()
 {
    // start the update thread on first use
-    static auto const init = start_clock();
+    static const auto init = start_clock();

    // Return the number of seconds since rippled start
    return time_point{duration{now_}};
--- a/src/libxrpl/json/Writer.cpp
+++ b/src/libxrpl/json/Writer.cpp
@@ -34,7 +34,7 @@ namespace Json {

 namespace {

-std::map<char, char const*> jsonSpecialCharacterEscape = {
+std::map<char, const char*> jsonSpecialCharacterEscape = {
    {'"', "\\\""},
    {'\\', "\\\\"},
    {'/', "\\/"},
@@ -47,13 +47,13 @@ std::map<char, char const*> jsonSpecialCharacterEscape = {
 static size_t const jsonEscapeLength = 2;

 // All other JSON punctuation.
-char const closeBrace = '}';
-char const closeBracket = ']';
-char const colon = ':';
-char const comma = ',';
-char const openBrace = '{';
-char const openBracket = '[';
-char const quote = '"';
+const char closeBrace = '}';
+const char closeBracket = ']';
+const char colon = ':';
+const char comma = ',';
+const char openBrace = '{';
+const char openBracket = '[';
+const char quote = '"';

 static auto const integralFloatsBecomeInts = false;

--- a/Show More
+++ b/Show More