Merge branch 'develop' into Bronek/fortify_pseudo_account

.clang-format

@@ -1,5 +1,5 @@
 ---
-Language: Cpp
+Language:        Cpp
 AccessModifierOffset: -4
 AlignAfterOpenBracket: AlwaysBreak
 AlignConsecutiveAssignments: false
@@ -19,52 +19,52 @@ AlwaysBreakTemplateDeclarations: true
 BinPackArguments: false
 BinPackParameters: false
 BraceWrapping:
-  AfterClass: true
+  AfterClass:      true
   AfterControlStatement: true
-  AfterEnum: false
-  AfterFunction: true
-  AfterNamespace: false
+  AfterEnum:       false
+  AfterFunction:   true
+  AfterNamespace:  false
   AfterObjCDeclaration: true
-  AfterStruct: true
-  AfterUnion: true
-  BeforeCatch: true
-  BeforeElse: true
-  IndentBraces: false
+  AfterStruct:     true
+  AfterUnion:      true
+  BeforeCatch:     true
+  BeforeElse:      true
+  IndentBraces:    false
 BreakBeforeBinaryOperators: false
 BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: true
-ColumnLimit: 80
-CommentPragmas: "^ IWYU pragma:"
+ColumnLimit:     80
+CommentPragmas:  '^ IWYU pragma:'
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
 DerivePointerAlignment: false
-DisableFormat: false
+DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
-ForEachMacros: [Q_FOREACH, BOOST_FOREACH]
-IncludeBlocks: Regroup
+ForEachMacros:   [ Q_FOREACH,  BOOST_FOREACH ]
+IncludeBlocks:   Regroup
 IncludeCategories:
-  - Regex: "^<(test)/"
-    Priority: 0
-  - Regex: "^<(xrpld)/"
-    Priority: 1
-  - Regex: "^<(xrpl)/"
-    Priority: 2
-  - Regex: "^<(boost)/"
-    Priority: 3
-  - Regex: "^.*/"
-    Priority: 4
-  - Regex: '^.*\.h'
-    Priority: 5
-  - Regex: ".*"
-    Priority: 6
-IncludeIsMainRegex: "$"
+  - Regex:           '^<(test)/'
+    Priority:        0
+  - Regex:           '^<(xrpld)/'
+    Priority:        1
+  - Regex:           '^<(xrpl)/'
+    Priority:        2
+  - Regex:           '^<(boost)/'
+    Priority:        3
+  - Regex:           '^.*/'
+    Priority:        4
+  - Regex:           '^.*\.h'
+    Priority:        5
+  - Regex:           '.*'
+    Priority:        6
+IncludeIsMainRegex: '$'
 IndentCaseLabels: true
 IndentFunctionDeclarationAfterType: false
 IndentRequiresClause: true
-IndentWidth: 4
+IndentWidth:     4
 IndentWrappedFunctionNames: false
 KeepEmptyLinesAtTheStartOfBlocks: false
 MaxEmptyLinesToKeep: 1
@@ -78,20 +78,19 @@ PenaltyBreakString: 1000
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
-ReflowComments: true
+ReflowComments:  true
 RequiresClausePosition: OwnLine
-SortIncludes: true
+SortIncludes:    true
 SpaceAfterCStyleCast: false
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: ControlStatements
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 2
-SpacesInAngles: false
+SpacesInAngles:  false
 SpacesInContainerLiterals: true
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard: Cpp11
-TabWidth: 8
-UseTab: Never
-QualifierAlignment: Right
+Standard:        Cpp11
+TabWidth:        8
+UseTab:          Never

.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:

.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

.github/actions/dependencies/action.yml

@@ -17,7 +17,6 @@ runs:
         conan export external/rocksdb rocksdb/9.7.3@
         conan export external/soci soci/4.0.3@
         conan export external/nudb nudb/2.0.8@
-        conan export -k external/wamr wamr/2.2.0@
     - name: add Ripple Conan remote
       shell: bash
       run: |

.github/workflows/clang-format.yml

@@ -1,13 +1,9 @@
 name: clang-format
 
-on:
-  push:
-  pull_request:
-    types: [opened, reopened, synchronize, ready_for_review]
+on: [push, pull_request]
 
 jobs:
   check:
-    if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
     runs-on: ubuntu-24.04
     env:
       CLANG_VERSION: 18

.github/workflows/doxygen.yml

@@ -10,11 +10,11 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  documentation:
+  job:
     runs-on: ubuntu-latest
     permissions:
       contents: write
-    container: ghcr.io/xrplf/rippled-build-ubuntu:aaf5e3e
+    container: rippleci/rippled-build-ubuntu:aaf5e3e
     steps:
       - name: checkout
         uses: actions/checkout@v4

.github/workflows/levelization.yml

@@ -1,13 +1,9 @@
 name: levelization
 
-on:
-  push:
-  pull_request:
-    types: [opened, reopened, synchronize, ready_for_review]
+on: [push, pull_request]
 
 jobs:
   check:
-    if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
     runs-on: ubuntu-latest
     env:
       CLANG_VERSION: 10

.github/workflows/libxrpl.yml

@@ -8,21 +8,19 @@ on:
     paths:
       - 'src/libxrpl/protocol/BuildInfo.cpp'
       - '.github/workflows/libxrpl.yml'
-    types: [opened, reopened, synchronize, ready_for_review]
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   publish:
-    if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
     name: Publish libXRPL
     outputs:
       outcome: ${{ steps.upload.outputs.outcome }}
       version: ${{ steps.version.outputs.version }}
       channel: ${{ steps.channel.outputs.channel }}
     runs-on: [self-hosted, heavy]
-    container: ghcr.io/xrplf/rippled-build-ubuntu:aaf5e3e
+    container: rippleci/rippled-build-ubuntu:aaf5e3e
     steps:
       - name: Wait for essential checks to succeed
         uses: lewagon/wait-on-check-action@v1.3.4

.github/workflows/macos.yml

@@ -1,7 +1,6 @@
 name: macos
 on:
   pull_request:
-    types: [opened, reopened, synchronize, ready_for_review]
   push:
     # If the branches list is ever changed, be sure to change it on all
     # build/test jobs (nix, macos, windows, instrumentation)
@@ -19,7 +18,6 @@ concurrency:
 jobs:
 
   test:
-    if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
     strategy:
       matrix:
         platform:
@@ -71,9 +69,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

.github/workflows/nix.yml

@@ -1,7 +1,6 @@
 name: nix
 on:
   pull_request:
-    types: [opened, reopened, synchronize, ready_for_review]
   push:
     # If the branches list is ever changed, be sure to change it on all
     # build/test jobs (nix, macos, windows)
@@ -40,7 +39,6 @@ concurrency:
 
 jobs:
   dependencies:
-    if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
     strategy:
       fail-fast: false
       matrix:
@@ -64,7 +62,7 @@ jobs:
               cc: /usr/bin/clang-14
               cxx: /usr/bin/clang++-14
     runs-on: [self-hosted, heavy]
-    container: ghcr.io/xrplf/rippled-build-ubuntu:aaf5e3e
+    container: rippleci/rippled-build-ubuntu:aaf5e3e
     env:
       build_dir: .build
     steps:
@@ -126,61 +124,7 @@ jobs:
           - "-Dunity=ON"
     needs: dependencies
     runs-on: [self-hosted, heavy]
-    container: ghcr.io/xrplf/rippled-build-ubuntu:aaf5e3e
-    env:
-      build_dir: .build
-    steps:
-      - name: upgrade conan
-        run: |
-          pip install --upgrade "conan<2"
-      - name: download cache
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ matrix.platform }}-${{ matrix.compiler }}-${{ matrix.configuration }}
-      - name: extract cache
-        run: |
-          mkdir -p ~/.conan
-          tar -xzf conan.tar -C ~/.conan
-      - name: check environment
-        run: |
-          env | sort
-          echo ${PATH} | tr ':' '\n'
-          conan --version
-          cmake --version
-      - name: checkout
-        uses: actions/checkout@v4
-      - name: dependencies
-        uses: ./.github/actions/dependencies
-        env:
-          CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/conan-non-prod
-        with:
-          configuration: ${{ matrix.configuration }}
-      - name: build
-        uses: ./.github/actions/build
-        with:
-          generator: Ninja
-          configuration: ${{ matrix.configuration }}
-          cmake-args: "-Dassert=TRUE -Dwerr=TRUE ${{ matrix.cmake-args }}"
-      - name: test
-        run: |
-          ${build_dir}/rippled --unittest --unittest-jobs $(nproc)
-
-  reference-fee-test:
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          - linux
-        compiler:
-          - gcc
-        configuration:
-          - Debug
-        cmake-args:
-          - "-DUNIT_TEST_REFERENCE_FEE=200"
-          - "-DUNIT_TEST_REFERENCE_FEE=1000"
-    needs: dependencies
-    runs-on: [self-hosted, heavy]
-    container: ghcr.io/xrplf/rippled-build-ubuntu:aaf5e3e
+    container: rippleci/rippled-build-ubuntu:aaf5e3e
     env:
       build_dir: .build
     steps:
@@ -231,7 +175,7 @@ jobs:
           - Debug
     needs: dependencies
     runs-on: [self-hosted, heavy]
-    container: ghcr.io/xrplf/rippled-build-ubuntu:aaf5e3e
+    container: rippleci/rippled-build-ubuntu:aaf5e3e
     env:
       build_dir: .build
     steps:
@@ -247,7 +191,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'
@@ -305,7 +249,7 @@ jobs:
   conan:
     needs: dependencies
     runs-on: [self-hosted, heavy]
-    container: ghcr.io/xrplf/rippled-build-ubuntu:aaf5e3e
+    container: rippleci/rippled-build-ubuntu:aaf5e3e
     env:
       build_dir: .build
       configuration: Release
@@ -360,7 +304,6 @@ jobs:
   # later
 
   instrumentation-build:
-    if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
     env:
       CLANG_RELEASE: 16
     strategy:
@@ -408,7 +351,6 @@ jobs:
             conan profile update 'conf.tools.build:cxxflags+=["-DBOOST_ASIO_DISABLE_CONCEPTS"]' default
             conan export external/snappy snappy/1.1.10@
             conan export external/soci soci/4.0.3@
-            conan export -k external/wamr wamr/2.2.0@
 
         - name: build dependencies
           run: |

.github/workflows/windows.yml

@@ -2,7 +2,6 @@ name: windows
 
 on:
   pull_request:
-    types: [opened, reopened, synchronize, ready_for_review]
   push:
     # If the branches list is ever changed, be sure to change it on all
     # build/test jobs (nix, macos, windows, instrumentation)
@@ -22,7 +21,6 @@ concurrency:
 jobs:
 
   test:
-    if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
     strategy:
       fail-fast: false
       matrix:

API-CHANGELOG.md

@@ -83,17 +83,9 @@ The [commandline](https://xrpl.org/docs/references/http-websocket-apis/api-conve
 
 The `network_id` field was added in the `server_info` response in version 1.5.0 (2019), but it is not returned in [reporting mode](https://xrpl.org/rippled-server-modes.html#reporting-mode). However, use of reporting mode is now discouraged, in favor of using [Clio](https://github.com/XRPLF/clio) instead.
 
-## XRP Ledger server version 2.5.0
-
-As of 2025-04-04, version 2.5.0 is in development. You can use a pre-release version by building from source or [using the `nightly` package](https://xrpl.org/docs/infrastructure/installation/install-rippled-on-ubuntu).
-
-### Additions and bugfixes in 2.5.0
-
-- `channel_authorize`: If `signing_support` is not enabled in the config, the RPC is disabled.
-
 ## XRP Ledger server version 2.4.0
 
-[Version 2.4.0](https://github.com/XRPLF/rippled/releases/tag/2.4.0) was released on March 4, 2025.
+As of 2025-01-28, version 2.4.0 is in development. You can use a pre-release version by building from source or [using the `nightly` package](https://xrpl.org/docs/infrastructure/installation/install-rippled-on-ubuntu).
 
 ### Additions and bugfixes in 2.4.0
 

BUILD.md

@@ -204,17 +204,6 @@ It fixes some source files to add missing `#include`s.
    conan export --version 2.0.8 external/nudb
    ```
 
-Export our [Conan recipe for WAMR](./external/wamr).
-It add metering and expose some internal structures.
-
-
-   ```
-   # Conan 1.x
-   conan export external/wamr wamr/2.2.0@
-   # Conan 2.x
-   conan export --version 2.2.0 external/wamr
-   ```
-
 ### Build and Test
 
 1. Create a build directory and move into it.
@@ -299,7 +288,7 @@ It add metering and expose some internal structures.
    Single-config generators:
 
    ```
-   cmake --build . -j $(nproc)
+   cmake --build .
    ```
 
    Multi-config generators:

CMakeLists.txt

@@ -115,7 +115,6 @@ endif()
 find_package(nudb REQUIRED)
 find_package(date REQUIRED)
 find_package(xxHash REQUIRED)
-find_package(wamr REQUIRED)
 
 target_link_libraries(ripple_libs INTERFACE
   ed25519::ed25519

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.

cfg/rippled-example.cfg

@@ -1249,39 +1249,6 @@
 #       Example:
 #           owner_reserve = 2000000      # 2 XRP
 #
-#   extension_compute_limit = <gas>
-#
-#       The extension compute limit is the maximum amount of gas that can be
-#       consumed by a single transaction. The gas limit is used to prevent
-#       transactions from consuming too many resources.
-#
-#       If this parameter is unspecified, rippled will use an internal
-#       default. Don't change this without understanding the consequences.
-#
-#       Example:
-#           extension_compute_limit = 1000000      # 1 million gas
-#
-#   extension_size_limit = <bytes>
-#
-#       The extension size limit is the maximum size of a WASM extension in
-#       bytes. The size limit is used to prevent extensions from consuming
-#       too many resources.
-#
-#       If this parameter is unspecified, rippled will use an internal
-#       default. Don't change this without understanding the consequences.
-#
-#       Example:
-#           extension_size_limit = 100000      # 100 kb
-#
-#   gas_price = <bytes>
-#
-#       The gas price is the conversion between WASM gas and its price in drops.
-#
-#       If this parameter is unspecified, rippled will use an internal
-#       default. Don't change this without understanding the consequences.
-#
-#       Example:
-#           gas_price = 1000000      # 1 drop per gas
 #-------------------------------------------------------------------------------
 #
 # 9. Misc Settings

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
 #

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

cmake/RippledCore.cmake

@@ -65,7 +65,6 @@ target_link_libraries(xrpl.imports.main
     xrpl.libpb
     xxHash::xxhash
     $<$<BOOL:${voidstar}>:antithesis-sdk-cpp>
-    wamr::wamr
 )
 
 include(add_module)
@@ -137,9 +136,6 @@ if(xrpld)
   add_executable(rippled)
   if(tests)
     target_compile_definitions(rippled PUBLIC ENABLE_TESTS)
-    target_compile_definitions(rippled PRIVATE
-                                       UNIT_TEST_REFERENCE_FEE=${UNIT_TEST_REFERENCE_FEE}
-    )
   endif()
   target_include_directories(rippled
     PRIVATE

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 \

cmake/RippledSettings.cmake

@@ -11,12 +11,6 @@ option(assert "Enables asserts, even in release builds" OFF)
 option(xrpld "Build xrpld" ON)
 
 option(tests "Build tests" ON)
-if(tests)
-  # This setting allows making a separate workflow to test fees other than default 10
-  if(NOT UNIT_TEST_REFERENCE_FEE)
-    set(UNIT_TEST_REFERENCE_FEE "10" CACHE STRING "")
-  endif()
-endif()
 
 option(unity "Creates a build using UNITY support in cmake. This is the default" ON)
 if(unity)

conanfile.py

@@ -2,7 +2,6 @@ from conan import ConanFile
 from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
 import re
 
-
 class Xrpl(ConanFile):
     name = 'xrpl'
 
@@ -33,7 +32,6 @@ class Xrpl(ConanFile):
         'soci/4.0.3',
         'xxhash/0.8.2',
         'zlib/1.3.1',
-        'wamr/2.2.0',
     ]
 
     tool_requires = [
@@ -127,7 +125,6 @@ class Xrpl(ConanFile):
         self.folders.generators = 'build/generators'
 
     generators = 'CMakeDeps'
-
     def generate(self):
         tc = CMakeToolchain(self)
         tc.variables['tests'] = self.options.tests

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

external/wamr/conandata.yml

@@ -1,6 +0,0 @@
-patches:
-  2.2.0:
-  - patch_description: add metering to iwasm interpreter
-    patch_file: patches/ripp_metering.patch
-    patch_type: conan
-

external/wamr/conanfile.py

@@ -1,91 +0,0 @@
-from conans import ConanFile, tools
-from conan.tools.cmake import CMake, CMakeToolchain, CMakeDeps, cmake_layout
-from conan.tools.files import (
-    apply_conandata_patches,
-    export_conandata_patches,
-    # get,
-)
-
-# import os
-
-required_conan_version = ">=1.55.0"
-
-
-class WamrConan(ConanFile):
-    name = "wamr"
-    version = "2.2.0"
-    license = "Apache License v2.0"
-    url = "https://github.com/bytecodealliance/wasm-micro-runtime.git"
-    description = "Webassembly micro runtime"
-    package_type = "library"
-    settings = "os", "compiler", "build_type", "arch"
-    options = {"shared": [True, False], "fPIC": [True, False]}
-    default_options = {"shared": False, "fPIC": True}
-    generators = "CMakeToolchain", "CMakeDeps"
-    # requires = [("llvm/20.1.1@")]
-
-    def export_sources(self):
-        export_conandata_patches(self)
-        pass
-
-    # def build_requirements(self):
-    #    self.tool_requires("llvm/20.1.1")
-
-    def config_options(self):
-        if self.settings.os == "Windows":
-            del self.options.fPIC
-
-    def layout(self):
-        cmake_layout(self, src_folder="src")
-
-    def source(self):
-        git = tools.Git()
-        git.clone(
-            "https://github.com/bytecodealliance/wasm-micro-runtime.git",
-            "c883fafead005e87ad3122b05409886f507c1cb0",
-            shallow=True,
-        )
-        # get(self, **self.conan_data["sources"][self.version], strip_root=True)
-
-    def generate(self):
-        tc = CMakeToolchain(self)
-
-        tc.variables["WAMR_BUILD_INTERP"] = 1
-        tc.variables["WAMR_BUILD_FAST_INTERP"] = 1
-        tc.variables["WAMR_BUILD_INSTRUCTION_METERING"] = 1
-        tc.variables["WAMR_BUILD_AOT"] = 0
-        tc.variables["WAMR_BUILD_JIT"] = 0
-        tc.variables["WAMR_BUILD_FAST_JIT"] = 0
-        tc.variables["WAMR_DISABLE_HW_BOUND_CHECK"] = 1
-        tc.variables["WAMR_DISABLE_STACK_HW_BOUND_CHECK"] = 1
-        tc.variables["WAMR_BH_LOG"] = "wamr_log_to_rippled"
-        # tc.variables["WAMR_BUILD_FAST_JIT"] = 0 if self.settings.os == "Windows" else 1
-        # ll_dep = self.dependencies["llvm"]
-        # self.output.info(f"-----------package_folder: {type(ll_dep.__dict__)}")
-        # tc.variables["LLVM_DIR"] = os.path.join(ll_dep.package_folder, "lib", "cmake", "llvm")
-        tc.generate()
-
-        # This generates "foo-config.cmake" and "bar-config.cmake" in self.generators_folder
-        deps = CMakeDeps(self)
-        deps.generate()
-
-    def build(self):
-        apply_conandata_patches(self)
-        cmake = CMake(self)
-        cmake.verbose = True
-        cmake.configure()
-        cmake.build()
-        # self.run(f'echo {self.source_folder}')
-        # Explicit way:
-        # self.run('cmake %s/hello %s' % (self.source_folder, cmake.command_line))
-        # self.run("cmake --build . %s" % cmake.build_config)
-
-    def package(self):
-        cmake = CMake(self)
-        cmake.verbose = True
-        cmake.install()
-
-    def package_info(self):
-        self.cpp_info.libs = ["iwasm"]
-        self.cpp_info.names["cmake_find_package"] = "wamr"
-        self.cpp_info.names["cmake_find_package_multi"] = "wamr"

external/wamr/patches/ripp_metering.patch

@@ -1,470 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 551991f8..5f48a0b8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # Copyright (C) 2019 Intel Corporation.  All rights reserved.
- # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
- 
--cmake_minimum_required (VERSION 3.14)
-+cmake_minimum_required (VERSION 3.20)
- 
- option(BUILD_SHARED_LIBS "Build using shared libraries" OFF)
- 
-diff --git a/build-scripts/config_common.cmake b/build-scripts/config_common.cmake
-index 1cb50235..bd103022 100644
---- a/build-scripts/config_common.cmake
-+++ b/build-scripts/config_common.cmake
-@@ -669,6 +669,10 @@ if (WAMR_BUILD_AOT_VALIDATOR EQUAL 1)
-   message ("     AOT validator enabled")
-   add_definitions (-DWASM_ENABLE_AOT_VALIDATOR=1)
- endif ()
-+if (WAMR_BUILD_INSTRUCTION_METERING EQUAL 1)
-+  message ("     Instruction metering enabled")
-+  add_definitions (-DWASM_ENABLE_INSTRUCTION_METERING=1)
-+endif ()
- 
- ########################################
- # Show Phase4 Wasm proposals status.
-diff --git a/core/config.h b/core/config.h
-index cb1189c9..a4e1499e 100644
---- a/core/config.h
-+++ b/core/config.h
-@@ -716,4 +716,8 @@ unless used elsewhere */
- #define WASM_ENABLE_AOT_VALIDATOR 0
- #endif
- 
-+#ifndef WASM_ENABLE_INSTRUCTION_METERING
-+#define WASM_ENABLE_INSTRUCTION_METERING 0
-+#endif
-+
- #endif /* end of _CONFIG_H_ */
-diff --git a/core/iwasm/common/wasm_c_api.c b/core/iwasm/common/wasm_c_api.c
-index 269ec577..bc6fd01b 100644
---- a/core/iwasm/common/wasm_c_api.c
-+++ b/core/iwasm/common/wasm_c_api.c
-@@ -5389,3 +5389,8 @@ wasm_instance_get_wasm_func_exec_time(const wasm_instance_t *instance,
-     return -1.0;
- #endif
- }
-+
-+wasm_exec_env_t wasm_instance_exec_env(const wasm_instance_t*instance)
-+{
-+    return wasm_runtime_get_exec_env_singleton(instance->inst_comm_rt);
-+}
-diff --git a/core/iwasm/common/wasm_exec_env.c b/core/iwasm/common/wasm_exec_env.c
-index e33fd9f3..d1ff9c41 100644
---- a/core/iwasm/common/wasm_exec_env.c
-+++ b/core/iwasm/common/wasm_exec_env.c
-@@ -85,6 +85,12 @@ wasm_exec_env_create_internal(struct WASMModuleInstanceCommon *module_inst,
-     wasm_runtime_dump_exec_env_mem_consumption(exec_env);
- #endif
- 
-+#if WASM_ENABLE_INSTRUCTION_METERING != 0
-+    exec_env->instructions_to_execute = -1;
-+    for(int i = 0; i < 256; ++i)
-+        exec_env->instructions_schedule[i] = 1;
-+#endif
-+
-     return exec_env;
- 
- #ifdef OS_ENABLE_HW_BOUND_CHECK
-diff --git a/core/iwasm/common/wasm_exec_env.h b/core/iwasm/common/wasm_exec_env.h
-index ce0c1fa7..2713a092 100644
---- a/core/iwasm/common/wasm_exec_env.h
-+++ b/core/iwasm/common/wasm_exec_env.h
-@@ -87,6 +87,12 @@ typedef struct WASMExecEnv {
-         uint8 *bottom;
-     } wasm_stack;
- 
-+#if WASM_ENABLE_INSTRUCTION_METERING != 0
-+    /* instructions to execute */
-+    int64 instructions_to_execute;
-+    int64 instructions_schedule[256];
-+#endif
-+
- #if WASM_ENABLE_FAST_JIT != 0
-     /**
-      * Cache for
-diff --git a/core/iwasm/common/wasm_runtime_common.c b/core/iwasm/common/wasm_runtime_common.c
-index d33c0272..21bfdf29 100644
---- a/core/iwasm/common/wasm_runtime_common.c
-+++ b/core/iwasm/common/wasm_runtime_common.c
-@@ -2285,6 +2285,31 @@ wasm_runtime_access_exce_check_guard_page()
- }
- #endif
- 
-+#if WASM_ENABLE_INSTRUCTION_METERING != 0
-+
-+void
-+wasm_runtime_set_instruction_count_limit(WASMExecEnv *exec_env,
-+                                         int64 instructions_to_execute)
-+{
-+    exec_env->instructions_to_execute = instructions_to_execute;
-+}
-+
-+int64
-+wasm_runtime_get_instruction_count_limit(WASMExecEnv *exec_env)
-+{
-+    return exec_env->instructions_to_execute;
-+}
-+
-+void
-+wasm_runtime_set_instruction_schedule(WASMExecEnv *exec_env,
-+                                         int64 const *instructions_schedule)
-+{
-+    for(int i = 0; i < 256; ++i)
-+        exec_env->instructions_schedule[i] = instructions_schedule[i];
-+}
-+
-+#endif
-+
- WASMFuncType *
- wasm_runtime_get_function_type(const WASMFunctionInstanceCommon *function,
-                                uint32 module_type)
-@@ -7792,13 +7817,14 @@ wasm_runtime_get_module_name(wasm_module_t module)
- bool
- wasm_runtime_detect_native_stack_overflow(WASMExecEnv *exec_env)
- {
-+#if WASM_DISABLE_STACK_HW_BOUND_CHECK == 0
-     uint8 *boundary = exec_env->native_stack_boundary;
-     RECORD_STACK_USAGE(exec_env, (uint8 *)&boundary);
-     if (boundary == NULL) {
-         /* the platform doesn't support os_thread_get_stack_boundary */
-         return true;
-     }
--#if defined(OS_ENABLE_HW_BOUND_CHECK) && WASM_DISABLE_STACK_HW_BOUND_CHECK == 0
-+#if defined(OS_ENABLE_HW_BOUND_CHECK)
-     uint32 page_size = os_getpagesize();
-     uint32 guard_page_count = STACK_OVERFLOW_CHECK_GUARD_PAGE_COUNT;
-     boundary = boundary + page_size * guard_page_count;
-@@ -7808,6 +7834,7 @@ wasm_runtime_detect_native_stack_overflow(WASMExecEnv *exec_env)
-                                    "native stack overflow");
-         return false;
-     }
-+#endif
-     return true;
- }
- 
-@@ -7830,7 +7857,7 @@ wasm_runtime_detect_native_stack_overflow_size(WASMExecEnv *exec_env,
-     boundary = boundary - WASM_STACK_GUARD_SIZE + requested_size;
-     if ((uint8 *)&boundary < boundary) {
-         wasm_runtime_set_exception(wasm_runtime_get_module_inst(exec_env),
--                                   "native stack overflow");
-+                                   "native s stack overflow");
-         return false;
-     }
-     return true;
-diff --git a/core/iwasm/common/wasm_runtime_common.h b/core/iwasm/common/wasm_runtime_common.h
-index 8ac032bf..5ca5d489 100644
---- a/core/iwasm/common/wasm_runtime_common.h
-+++ b/core/iwasm/common/wasm_runtime_common.h
-@@ -791,9 +791,25 @@ WASM_RUNTIME_API_EXTERN void
- wasm_runtime_set_native_stack_boundary(WASMExecEnv *exec_env,
-                                        uint8 *native_stack_boundary);
- 
--#if WASM_CONFIGURABLE_BOUNDS_CHECKS != 0
-+#if WASM_ENABLE_INSTRUCTION_METERING != 0
-+
- /* See wasm_export.h for description */
- WASM_RUNTIME_API_EXTERN void
-+wasm_runtime_set_instruction_count_limit(WASMExecEnv *exec_env,
-+                                         int64 instructions_to_execute);
-+WASM_RUNTIME_API_EXTERN int64
-+wasm_runtime_get_instruction_count_limit(WASMExecEnv *exec_env);
-+
-+WASM_RUNTIME_API_EXTERN void
-+wasm_runtime_set_instruction_schedule(WASMExecEnv *exec_env,
-+                                      int64 const *instructions_schedule);
-+
-+#endif
-+
-+#if WASM_CONFIGURABLE_BOUNDS_CHECKS != 0
-+/* See wasm_export.h for description */
-+WASM_RUNTIME_API_EXTERN
-+void
- wasm_runtime_set_bounds_checks(WASMModuleInstanceCommon *module_inst,
-                                bool enable);
- 
-diff --git a/core/iwasm/include/wasm_c_api.h b/core/iwasm/include/wasm_c_api.h
-index 241a0eec..9eb0dde1 100644
---- a/core/iwasm/include/wasm_c_api.h
-+++ b/core/iwasm/include/wasm_c_api.h
-@@ -19,8 +19,10 @@
- #if defined(_MSC_BUILD)
- #if defined(COMPILING_WASM_RUNTIME_API)
- #define WASM_API_EXTERN __declspec(dllexport)
--#else
-+#elif defined(_DLL)
- #define WASM_API_EXTERN __declspec(dllimport)
-+#else
-+#define WASM_API_EXTERN
- #endif
- #else
- #define WASM_API_EXTERN
-@@ -701,6 +703,11 @@ WASM_API_EXTERN double wasm_instance_sum_wasm_exec_time(const wasm_instance_t*);
- // func_name. If the function is not found, return 0.
- WASM_API_EXTERN double wasm_instance_get_wasm_func_exec_time(const wasm_instance_t*, const char *);
- 
-+struct WASMExecEnv;
-+typedef struct WASMExecEnv *wasm_exec_env_t;
-+
-+WASM_API_EXTERN wasm_exec_env_t wasm_instance_exec_env(const wasm_instance_t*);
-+
- ///////////////////////////////////////////////////////////////////////////////
- // Convenience
- 
-diff --git a/core/iwasm/include/wasm_export.h b/core/iwasm/include/wasm_export.h
-index b73a0364..3fd0949f 100644
---- a/core/iwasm/include/wasm_export.h
-+++ b/core/iwasm/include/wasm_export.h
-@@ -20,8 +20,10 @@
- #if defined(_MSC_BUILD)
- #if defined(COMPILING_WASM_RUNTIME_API)
- #define WASM_RUNTIME_API_EXTERN __declspec(dllexport)
--#else
-+#elif defined(_DLL)
- #define WASM_RUNTIME_API_EXTERN __declspec(dllimport)
-+#else
-+#define WASM_RUNTIME_API_EXTERN
- #endif
- #elif defined(__GNUC__) || defined(__clang__)
- #define WASM_RUNTIME_API_EXTERN __attribute__((visibility("default")))
-@@ -1821,6 +1823,27 @@ WASM_RUNTIME_API_EXTERN void
- wasm_runtime_set_native_stack_boundary(wasm_exec_env_t exec_env,
-                                        uint8_t *native_stack_boundary);
- 
-+/**
-+ * Set the instruction count limit to the execution environment.
-+ * By default the instruction count limit is -1, which means no limit.
-+ * However, if the instruction count limit is set to a positive value,
-+ * the execution will be terminated when the instruction count reaches
-+ * the limit.
-+ *
-+ * @param exec_env the execution environment
-+ * @param instruction_count the instruction count limit
-+ */
-+WASM_RUNTIME_API_EXTERN void
-+wasm_runtime_set_instruction_count_limit(wasm_exec_env_t exec_env,
-+                                         int64_t instruction_count);
-+
-+WASM_RUNTIME_API_EXTERN int64_t
-+wasm_runtime_get_instruction_count_limit(wasm_exec_env_t exec_env);
-+
-+WASM_RUNTIME_API_EXTERN void
-+wasm_runtime_set_instruction_schedule(wasm_exec_env_t exec_env,
-+                                      int64_t const *instructions_schedule);
-+
- /**
-  * Dump runtime memory consumption, including:
-  *     Exec env memory consumption
-diff --git a/core/iwasm/interpreter/wasm_interp_classic.c b/core/iwasm/interpreter/wasm_interp_classic.c
-index 41ac4c72..bd8f714a 100644
---- a/core/iwasm/interpreter/wasm_interp_classic.c
-+++ b/core/iwasm/interpreter/wasm_interp_classic.c
-@@ -1516,10 +1516,13 @@ wasm_interp_call_func_import(WASMModuleInstance *module_inst,
-             }                                                                 \
-             os_mutex_unlock(&exec_env->wait_lock);                            \
-         }                                                                     \
-+        CHECK_INSTRUCTION_LIMIT();                                            \
-         goto *handle_table[*frame_ip++];                                      \
-     } while (0)
- #else
--#define HANDLE_OP_END() FETCH_OPCODE_AND_DISPATCH()
-+#define HANDLE_OP_END()        \
-+    CHECK_INSTRUCTION_LIMIT(); \
-+    FETCH_OPCODE_AND_DISPATCH()
- #endif
- 
- #else /* else of WASM_ENABLE_LABELS_AS_VALUES */
-@@ -1542,9 +1545,12 @@ wasm_interp_call_func_import(WASMModuleInstance *module_inst,
-         }                                                                 \
-         os_mutex_unlock(&exec_env->wait_lock);                            \
-     }                                                                     \
-+    CHECK_INSTRUCTION_LIMIT();                                            \
-     continue;
- #else
--#define HANDLE_OP_END() continue
-+#define HANDLE_OP_END()        \
-+    CHECK_INSTRUCTION_LIMIT(); \
-+    continue;
- #endif
- 
- #endif /* end of WASM_ENABLE_LABELS_AS_VALUES */
-@@ -1562,6 +1568,20 @@ get_global_addr(uint8 *global_data, WASMGlobalInstance *global)
- #endif
- }
- 
-+#if WASM_ENABLE_INSTRUCTION_METERING != 0
-+#define CHECK_INSTRUCTION_LIMIT()                                         \
-+    if (instructions_to_execute >= 0)                                     \
-+    {                                                                     \
-+        instructions_to_execute -= instructions_schedule[opcode];\
-+        if (instructions_to_execute < 0) {                                \
-+                wasm_set_exception(module, "instruction limit exceeded"); \
-+                goto got_exception;                                       \
-+        }                                                                 \
-+    }
-+#else
-+#define CHECK_INSTRUCTION_LIMIT() (void)0
-+#endif
-+
- static void
- wasm_interp_call_func_bytecode(WASMModuleInstance *module,
-                                WASMExecEnv *exec_env,
-@@ -1605,6 +1625,17 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
-     uint32 local_idx, local_offset, global_idx;
-     uint8 local_type, *global_addr;
-     uint32 cache_index, type_index, param_cell_num, cell_num;
-+
-+#if WASM_ENABLE_INSTRUCTION_METERING != 0
-+    int64 instructions_to_execute = -1;
-+    int64 const *instructions_schedule = NULL;
-+    if(exec_env)
-+    {
-+        instructions_to_execute = exec_env->instructions_to_execute;
-+        instructions_schedule = exec_env->instructions_schedule;
-+    }
-+#endif
-+
- #if WASM_ENABLE_EXCE_HANDLING != 0
-     int32_t exception_tag_index;
- #endif
-@@ -6859,6 +6890,11 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
-         FREE_FRAME(exec_env, frame);
-         wasm_exec_env_set_cur_frame(exec_env, prev_frame);
- 
-+#if WASM_ENABLE_INSTRUCTION_METERING != 0
-+        if(exec_env)
-+            exec_env->instructions_to_execute = instructions_to_execute;
-+#endif
-+
-         if (!prev_frame->ip) {
-             /* Called from native. */
-             return;
-@@ -6899,6 +6935,12 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
-         }
- #endif
-         SYNC_ALL_TO_FRAME();
-+
-+#if WASM_ENABLE_INSTRUCTION_METERING != 0
-+        if(exec_env)
-+            exec_env->instructions_to_execute = instructions_to_execute;
-+#endif
-+
-         return;
- 
- #if WASM_ENABLE_LABELS_AS_VALUES == 0
-diff --git a/core/iwasm/interpreter/wasm_interp_fast.c b/core/iwasm/interpreter/wasm_interp_fast.c
-index f33ad60e..9cbf2010 100644
---- a/core/iwasm/interpreter/wasm_interp_fast.c
-+++ b/core/iwasm/interpreter/wasm_interp_fast.c
-@@ -105,6 +105,19 @@ typedef float64 CellType_F64;
-             goto unaligned_atomic;                 \
-     } while (0)
- 
-+#if WASM_ENABLE_INSTRUCTION_METERING != 0
-+#define CHECK_INSTRUCTION_LIMIT()                                     \
-+    if (instructions_to_execute >= 0) {                               \
-+        instructions_to_execute -= instructions_schedule[opcode];     \
-+        if (instructions_to_execute < 0) {                            \
-+            wasm_set_exception(module, "instruction limit exceeded"); \
-+            goto got_exception;                                       \
-+        }                                                             \
-+    }
-+#else
-+#define CHECK_INSTRUCTION_LIMIT() (void)0
-+#endif
-+
- static inline uint32
- rotl32(uint32 n, uint32 c)
- {
-@@ -1466,12 +1479,14 @@ wasm_interp_dump_op_count()
-     } while (0)
- #endif
- #endif /* end of WASM_CPU_SUPPORTS_UNALIGNED_ADDR_ACCESS */
--#define HANDLE_OP_END() FETCH_OPCODE_AND_DISPATCH()
-+#define HANDLE_OP_END() CHECK_INSTRUCTION_LIMIT(); FETCH_OPCODE_AND_DISPATCH()
- 
- #else /* else of WASM_ENABLE_LABELS_AS_VALUES */
- 
- #define HANDLE_OP(opcode) case opcode:
--#define HANDLE_OP_END() continue
-+#define HANDLE_OP_END()        \
-+    CHECK_INSTRUCTION_LIMIT(); \
-+    continue
- 
- #endif /* end of WASM_ENABLE_LABELS_AS_VALUES */
- 
-@@ -1538,6 +1553,16 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
-     uint8 *maddr = NULL;
-     uint32 local_idx, local_offset, global_idx;
-     uint8 opcode = 0, local_type, *global_addr;
-+
-+#if WASM_ENABLE_INSTRUCTION_METERING != 0
-+    int64 instructions_to_execute = -1;
-+    int64 const *instructions_schedule = NULL;
-+    if (exec_env) {
-+        instructions_to_execute = exec_env->instructions_to_execute;
-+        instructions_schedule = exec_env->instructions_schedule;
-+    }
-+#endif
-+
- #if !defined(OS_ENABLE_HW_BOUND_CHECK) \
-     || WASM_CPU_SUPPORTS_UNALIGNED_ADDR_ACCESS == 0
- #if WASM_CONFIGURABLE_BOUNDS_CHECKS != 0
-@@ -7761,6 +7786,11 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
-         FREE_FRAME(exec_env, frame);
-         wasm_exec_env_set_cur_frame(exec_env, (WASMRuntimeFrame *)prev_frame);
- 
-+#if WASM_ENABLE_INSTRUCTION_METERING != 0
-+        if (exec_env)
-+            exec_env->instructions_to_execute = instructions_to_execute;
-+#endif
-+
-         if (!prev_frame->ip)
-             /* Called from native. */
-             return;
-@@ -7789,6 +7819,10 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
- 
-     got_exception:
-         SYNC_ALL_TO_FRAME();
-+#if WASM_ENABLE_INSTRUCTION_METERING != 0
-+        if (exec_env)
-+            exec_env->instructions_to_execute = instructions_to_execute;
-+#endif
-         return;
- 
- #if WASM_ENABLE_LABELS_AS_VALUES == 0
-diff --git a/core/shared/platform/include/platform_wasi_types.h b/core/shared/platform/include/platform_wasi_types.h
-index ac1a95ea..e23b500e 100644
---- a/core/shared/platform/include/platform_wasi_types.h
-+++ b/core/shared/platform/include/platform_wasi_types.h
-@@ -36,7 +36,11 @@ extern "C" {
- #if WASM_ENABLE_UVWASI != 0 || WASM_ENABLE_LIBC_WASI == 0
- #define assert_wasi_layout(expr, message) /* nothing */
- #else
--#define assert_wasi_layout(expr, message) _Static_assert(expr, message)
-+    #ifndef _MSC_VER
-+        #define assert_wasi_layout(expr, message) _Static_assert(expr, message)
-+    #else
-+        #define assert_wasi_layout(expr, message) static_assert(expr, message)
-+    #endif
- #endif
-
- assert_wasi_layout(_Alignof(int8_t) == 1, "non-wasi data layout");
-diff --git a/doc/build_wamr.md b/doc/build_wamr.md
-index 6425450b..94dd9628 100644
---- a/doc/build_wamr.md
-+++ b/doc/build_wamr.md
-@@ -327,6 +327,10 @@ And the wasm app can calls below APIs to allocate/free memory from/to the shared
- - **WAMR_BUILD_SHRUNK_MEMORY**=1/0, default to enable if not set
- > Note: When enabled, this feature will reduce memory usage by decreasing the size of the linear memory, particularly when the `memory.grow` opcode is not used and memory usage is somewhat predictable.
- 
-+## **Instruction metering**
-+- **WAMR_BUILD_INSTRUCTION_METERING**=1/0, default to disable if not set
-+> Note: Enabling this feature allows limiting the number of instructions a wasm module instance can execute. Use the `wasm_runtime_set_instruction_count_limit(...)` API before calling `wasm_runtime_call_*(...)` APIs to enforce this limit.
-+
- ## **Combination of configurations:**
- 
- We can combine the configurations. For example, if we want to disable interpreter, enable AOT and WASI, we can run command:

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
     {

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)

include/xrpl/basics/Expected.h

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

include/xrpl/basics/IntrusiveRefCounts.h

@@ -294,7 +294,7 @@ IntrusiveRefCounts::releaseStrongRef() const
         }
 
         if (refCounts.compare_exchange_weak(
-                prevIntVal, nextIntVal, std::memory_order_acq_rel))
+                prevIntVal, nextIntVal, std::memory_order_release))
         {
             // Can't be in partial destroy because only decrementing the strong
             // count to zero can start a partial destroy, and that can't happen
@@ -351,7 +351,7 @@ IntrusiveRefCounts::addWeakReleaseStrongRef() const
             }
         }
         if (refCounts.compare_exchange_weak(
-                prevIntVal, nextIntVal, std::memory_order_acq_rel))
+                prevIntVal, nextIntVal, std::memory_order_release))
         {
             XRPL_ASSERT(
                 (!(prevIntVal & partialDestroyStartedMask)),
@@ -374,7 +374,7 @@ IntrusiveRefCounts::releaseWeakRef() const
             // This case should only be hit if the partialDestroyStartedBit is
             // set non-atomically (and even then very rarely). The code is kept
             // in case we need to set the flag non-atomically for perf reasons.
-            refCounts.wait(prevIntVal, std::memory_order_acquire);
+            refCounts.wait(prevIntVal, std::memory_order_acq_rel);
             prevIntVal = refCounts.load(std::memory_order_acquire);
             prev = RefCountPair{prevIntVal};
         }
@@ -382,7 +382,7 @@ IntrusiveRefCounts::releaseWeakRef() const
         {
             // partial destroy MUST finish before running a full destroy (when
             // using weak pointers)
-            refCounts.wait(prevIntVal - weakDelta, std::memory_order_acquire);
+            refCounts.wait(prevIntVal - weakDelta, std::memory_order_acq_rel);
         }
         return ReleaseWeakRefAction::destroy;
     }
@@ -396,7 +396,7 @@ IntrusiveRefCounts::checkoutStrongRefFromWeak() const noexcept
     auto desiredValue = RefCountPair{2, 1}.combinedValue();
 
     while (!refCounts.compare_exchange_weak(
-        curValue, desiredValue, std::memory_order_acq_rel))
+        curValue, desiredValue, std::memory_order_release))
     {
         RefCountPair const prev{curValue};
         if (!prev.strong)

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;

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);

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});
     }

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);
     }

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_;

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;

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;
 

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

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.

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

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)

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);
 
 //------------------------------------------------------------------------------
 

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
 

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

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

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

include/xrpl/protocol/Book.h

@@ -104,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;
@@ -131,7 +131,7 @@ private:
     hasher m_hasher;
 
 public:
-    hash() = default;
+    explicit hash() = default;
 
     using value_type = std::size_t;
     using argument_type = ripple::Book;
@@ -154,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
@@ -164,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

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,

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();
 }
@@ -451,8 +451,8 @@ mulDivU(Source1 value, Dest mul, Source2 div)
     }
 
     using namespace boost::multiprecision;
-    using uint128 = boost::multiprecision::uint128_t;
-    uint128 product;
+
+    uint128_t product;
     product = multiply(
         product,
         static_cast<std::uint64_t>(value.value()),

include/xrpl/protocol/Fees.h

@@ -24,8 +24,6 @@
 
 namespace ripple {
 
-constexpr std::uint32_t MICRO_DROPS_PER_DROP{1'000'000};
-
 /** Reflects the fee settings for a particular ledger.
 
     The fees are always the same for any transactions applied
@@ -36,10 +34,6 @@ struct Fees
     XRPAmount base{0};       // Reference tx cost (drops)
     XRPAmount reserve{0};    // Reserve base (drops)
     XRPAmount increment{0};  // Reserve increment (drops)
-    std::uint32_t extensionComputeLimit{
-        0};  // Extension compute limit (instructions)
-    std::uint32_t extensionSizeLimit{0};  // Extension size limit (bytes)
-    std::uint32_t gasPrice{0};            // price of WASM gas (micro-drops)
 
     explicit Fees() = default;
     Fees(Fees const&) = default;

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>

include/xrpl/protocol/IOUAmount.h

@@ -28,6 +28,7 @@
 
 #include <cstdint>
 #include <string>
+#include <utility>
 
 namespace ripple {
 

include/xrpl/protocol/Indexes.h

@@ -230,12 +230,6 @@ page(Keylet const& root, std::uint64_t index = 0) noexcept
 Keylet
 escrow(AccountID const& src, std::uint32_t seq) noexcept;
 
-inline Keylet
-escrow(uint256 const& key) noexcept
-{
-    return {ltESCROW, key};
-}
-
 /** A PaymentChannel */
 Keylet
 payChan(AccountID const& src, AccountID const& dst, std::uint32_t seq) noexcept;
@@ -285,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);
 
@@ -340,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;
 

include/xrpl/protocol/LedgerFormats.h

@@ -132,7 +132,7 @@ enum LedgerSpecificFlags {
     lsfNoFreeze = 0x00200000,       // True, cannot freeze ripple states
     lsfGlobalFreeze = 0x00400000,   // True, all assets frozen
     lsfDefaultRipple =
-        0x00800000,               // True, incoming trust lines allow rippling by default
+        0x00800000,               // True, trust lines allow rippling by default
     lsfDepositAuth = 0x01000000,  // True, all deposits require authorization
 /*  // reserved for Hooks amendment
     lsfTshCollect = 0x02000000,     // True, allow TSH collect-calls to acc hooks
@@ -191,9 +191,6 @@ enum LedgerSpecificFlags {
 
     // ltCREDENTIAL
     lsfAccepted = 0x00010000,
-
-    // ltVAULT
-    lsfVaultPrivate = 0x00010000,
 };
 
 //------------------------------------------------------------------------------

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 {
 
@@ -149,12 +152,11 @@ mulRatio(
     bool roundUp)
 {
     using namespace boost::multiprecision;
-    using int128 = boost::multiprecision::int128_t;
 
     if (!den)
         Throw<std::runtime_error>("division by zero");
 
-    int128 const amt128(amt.value());
+    int128_t const amt128(amt.value());
     auto const neg = amt.value() < 0;
     auto const m = amt128 * num;
     auto r = m / den;

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;

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)

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

include/xrpl/protocol/Protocol.h

@@ -116,20 +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;
-
-/** The maximum length of a Data field in Escrow object that can be updated by
- * Wasm code */
-std::size_t constexpr maxWasmDataLength = 4 * 1024;
-
 /** A ledger index. */
 using LedgerIndex = std::uint32_t;
 
@@ -169,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

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

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()

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;

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()
 {

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_;
 }

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&

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_);
 }
 

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;

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;

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_);
 }
 

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;

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);

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

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");

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];

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

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;
 }

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;

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;
     }

include/xrpl/protocol/TER.h

@@ -139,8 +139,8 @@ enum TEMcodes : TERUnderlyingType {
 
     temARRAY_EMPTY,
     temARRAY_TOO_LARGE,
+
     temBAD_TRANSFER_FEE,
-    temINVALID_INNER_BATCH,
 };
 
 //------------------------------------------------------------------------------
@@ -185,8 +185,6 @@ enum TEFcodes : TERUnderlyingType {
     tefNO_TICKET,
     tefNFTOKEN_IS_NOT_TRANSFERABLE,
     tefINVALID_LEDGER_FIX_TYPE,
-    tefNO_WASM,
-    tefWASM_FIELD_NOT_INCLUDED,
 };
 
 //------------------------------------------------------------------------------
@@ -269,17 +267,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
@@ -359,10 +346,6 @@ enum TECcodes : TERUnderlyingType {
     tecARRAY_TOO_LARGE = 191,
     tecLOCKED = 192,
     tecBAD_CREDENTIALS = 193,
-    tecWRONG_ASSET = 194,
-    tecLIMIT_EXCEEDED = 195,
-    tecPSEUDO_ACCOUNT = 196,
-    tecWASM_REJECTED = 197,
 };
 
 //------------------------------------------------------------------------------
@@ -648,37 +631,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);
 }

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:
@@ -98,7 +97,6 @@ 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 tfOfferCreateMask =
     ~(tfUniversal | tfPassive | tfImmediateOrCancel | tfFillOrKill | tfSell);
 
@@ -122,13 +120,6 @@ constexpr std::uint32_t tfTrustSetMask =
     ~(tfUniversal | tfSetfAuth | tfSetNoRipple | tfClearNoRipple | tfSetFreeze |
       tfClearFreeze | tfSetDeepFreeze | tfClearDeepFreeze);
 
-// valid flags for granular permission
-constexpr std::uint32_t tfTrustSetGranularMask = tfSetfAuth | tfSetFreeze | tfClearFreeze;
-
-// bits representing supportedGranularMask are set to 0 and the bits
-// representing other flags are set to 1 in tfPermissionMask.
-constexpr std::uint32_t tfTrustSetPermissionMask = (~tfTrustSetMask) & (~tfTrustSetGranularMask);
-
 // EnableAmendment flags:
 constexpr std::uint32_t tfGotMajority                      = 0x00010000;
 constexpr std::uint32_t tfLostMajority                     = 0x00020000;
@@ -164,8 +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 tfMPTokenIssuanceSetGranularMask = tfMPTLock | tfMPTUnlock;
-constexpr std::uint32_t const tfMPTokenIssuanceSetPermissionMask = (~tfMPTokenIssuanceSetMask) & (~tfMPTokenIssuanceSetGranularMask);
 
 // MPTokenIssuanceDestroy flags:
 constexpr std::uint32_t const tfMPTokenIssuanceDestroyMask  = ~tfUniversal;
@@ -235,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

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>
 

include/xrpl/protocol/TxMeta.h

@@ -130,47 +130,6 @@ public:
         return static_cast<bool>(mDelivered);
     }
 
-    void
-    setParentBatchId(uint256 const& parentBatchId)
-    {
-        parentBatchId_ = parentBatchId;
-    }
-
-    uint256
-    getParentBatchId() const
-    {
-        XRPL_ASSERT(
-            hasParentBatchId(),
-            "ripple::TxMeta::getParentBatchId : non-null batch id");
-        return *parentBatchId_;
-    }
-
-    bool
-    hasParentBatchId() const
-    {
-        return static_cast<bool>(parentBatchId_);
-    }
-
-    void
-    setGasUsed(std::uint32_t const& gasUsed)
-    {
-        gasUsed_ = gasUsed;
-    }
-
-    std::uint32_t
-    getGasUsed() const
-    {
-        XRPL_ASSERT(
-            hasGasUsed(), "ripple::TxMeta::getGasUsed : non-null batch id");
-        return *gasUsed_;
-    }
-
-    bool
-    hasGasUsed() const
-    {
-        return static_cast<bool>(gasUsed_);
-    }
-
 private:
     uint256 mTransactionID;
     std::uint32_t mLedger;
@@ -178,8 +137,6 @@ private:
     int mResult;
 
     std::optional<STAmount> mDelivered;
-    std::optional<std::uint32_t> gasUsed_;
-    std::optional<uint256> parentBatchId_;
 
     STArray mNodes;
 };

include/xrpl/protocol/UintTypes.h

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

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();
 }
@@ -286,12 +286,11 @@ mulRatio(
     bool roundUp)
 {
     using namespace boost::multiprecision;
-    using int128 = boost::multiprecision::int128_t;
 
     if (!den)
         Throw<std::runtime_error>("division by zero");
 
-    int128 const amt128(amt.drops());
+    int128_t const amt128(amt.drops());
     auto const neg = amt.drops() < 0;
     auto const m = amt128 * num;
     auto r = m / den;

include/xrpl/protocol/detail/features.macro

@@ -32,11 +32,8 @@
 // If you add an amendment here, then do not forget to increment `numFeatures`
 // in include/xrpl/protocol/Feature.h.
 
-XRPL_FEATURE(SmartEscrow,                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    (PseudoAccount,              Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (InvalidTxFlags,             Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (FrozenLPTokenTransfer,      Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(DeepFreeze,                 Supported::yes, VoteBehavior::DefaultNo)

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.
@@ -316,12 +315,6 @@ LEDGER_ENTRY(ltFEE_SETTINGS, 0x0073, FeeSettings, fee, ({
     {sfBaseFeeDrops,           soeOPTIONAL},
     {sfReserveBaseDrops,       soeOPTIONAL},
     {sfReserveIncrementDrops,  soeOPTIONAL},
-
-    // New fields
-    {sfExtensionComputeLimit,  soeOPTIONAL},
-    {sfExtensionSizeLimit,     soeOPTIONAL},
-    {sfGasPrice,               soeOPTIONAL},
-
     {sfPreviousTxnID,          soeOPTIONAL},
     {sfPreviousTxnLgrSeq,      soeOPTIONAL},
 }))
@@ -351,8 +344,6 @@ LEDGER_ENTRY(ltESCROW, 0x0075, Escrow, escrow, ({
     {sfCondition,            soeOPTIONAL},
     {sfCancelAfter,          soeOPTIONAL},
     {sfFinishAfter,          soeOPTIONAL},
-    {sfFinishFunction,       soeOPTIONAL},
-    {sfData,                 soeOPTIONAL},
     {sfSourceTag,            soeOPTIONAL},
     {sfDestinationTag,       soeOPTIONAL},
     {sfOwnerNode,            soeREQUIRED},
@@ -399,6 +390,21 @@ LEDGER_ENTRY(ltAMM, 0x0079, AMM, amm, ({
     {sfPreviousTxnLgrSeq,    soeOPTIONAL},
 }))
 
+/** A ledger object which tracks Oracle
+    \sa keylet::oracle
+ */
+LEDGER_ENTRY(ltORACLE, 0x0080, Oracle, oracle, ({
+    {sfOwner,                soeREQUIRED},
+    {sfProvider,             soeREQUIRED},
+    {sfPriceDataSeries,      soeREQUIRED},
+    {sfAssetClass,           soeREQUIRED},
+    {sfLastUpdateTime,       soeREQUIRED},
+    {sfURI,                  soeOPTIONAL},
+    {sfOwnerNode,            soeREQUIRED},
+    {sfPreviousTxnID,        soeREQUIRED},
+    {sfPreviousTxnLgrSeq,    soeREQUIRED},
+}))
+
 /** A ledger object which tracks MPTokenIssuance
     \sa keylet::mptIssuance
  */
@@ -413,7 +419,6 @@ LEDGER_ENTRY(ltMPTOKEN_ISSUANCE, 0x007e, MPTokenIssuance, mpt_issuance, ({
     {sfMPTokenMetadata,          soeOPTIONAL},
     {sfPreviousTxnID,            soeREQUIRED},
     {sfPreviousTxnLgrSeq,        soeREQUIRED},
-    {sfDomainID,                 soeOPTIONAL},
 }))
 
 /** A ledger object which tracks MPToken
@@ -428,21 +433,6 @@ LEDGER_ENTRY(ltMPTOKEN, 0x007f, MPToken, mptoken, ({
     {sfPreviousTxnLgrSeq,        soeREQUIRED},
 }))
 
-/** A ledger object which tracks Oracle
-    \sa keylet::oracle
- */
-LEDGER_ENTRY(ltORACLE, 0x0080, Oracle, oracle, ({
-    {sfOwner,                soeREQUIRED},
-    {sfProvider,             soeREQUIRED},
-    {sfPriceDataSeries,      soeREQUIRED},
-    {sfAssetClass,           soeREQUIRED},
-    {sfLastUpdateTime,       soeREQUIRED},
-    {sfURI,                  soeOPTIONAL},
-    {sfOwnerNode,            soeREQUIRED},
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
-}))
-
 /** A ledger object which tracks Credential
     \sa keylet::credential
  */
@@ -470,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
 

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)

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,12 +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)
-TYPED_SFIELD(sfExtensionComputeLimit,    UINT32,    53)
-TYPED_SFIELD(sfExtensionSizeLimit,       UINT32,    54)
-TYPED_SFIELD(sfGasPrice,                 UINT32,    55)
-TYPED_SFIELD(sfComputationAllowance,     UINT32,    56)
-TYPED_SFIELD(sfGasUsed,                  UINT32,    57)
 
 // 64-bit integers (common)
 TYPED_SFIELD(sfIndexNext,                UINT64,     1)
@@ -161,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)
@@ -199,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)
@@ -237,7 +223,7 @@ TYPED_SFIELD(sfBaseFeeDrops,             AMOUNT,    22)
 TYPED_SFIELD(sfReserveBaseDrops,         AMOUNT,    23)
 TYPED_SFIELD(sfReserveIncrementDrops,    AMOUNT,    24)
 
-// currency amount (more)
+// currency amount (AMM)
 TYPED_SFIELD(sfLPTokenOut,               AMOUNT,    25)
 TYPED_SFIELD(sfLPTokenIn,                AMOUNT,    26)
 TYPED_SFIELD(sfEPrice,                   AMOUNT,    27)
@@ -279,7 +265,6 @@ TYPED_SFIELD(sfAssetClass,               VL,        28)
 TYPED_SFIELD(sfProvider,                 VL,        29)
 TYPED_SFIELD(sfMPTokenMetadata,          VL,        30)
 TYPED_SFIELD(sfCredentialType,           VL,        31)
-TYPED_SFIELD(sfFinishFunction,           VL,        32)
 
 // account (common)
 TYPED_SFIELD(sfAccount,                  ACCOUNT,    1)
@@ -293,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)
@@ -343,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)
@@ -364,8 +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)
 
 // array of objects (common)
 // ARRAY/1 is reserved for end of array
@@ -396,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)

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;

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},
@@ -41,30 +41,27 @@ TRANSACTION(ttPAYMENT, 0, Payment, Delegation::delegatable, ({
 }))
 
 /** This transaction type creates an escrow object. */
-TRANSACTION(ttESCROW_CREATE, 1, EscrowCreate, Delegation::delegatable, ({
+TRANSACTION(ttESCROW_CREATE, 1, EscrowCreate, ({
     {sfDestination, soeREQUIRED},
     {sfAmount, soeREQUIRED},
-    {sfDestinationTag, soeOPTIONAL},
     {sfCondition, soeOPTIONAL},
     {sfCancelAfter, soeOPTIONAL},
     {sfFinishAfter, soeOPTIONAL},
-    {sfFinishFunction, soeOPTIONAL},
-    {sfData,           soeOPTIONAL},
+    {sfDestinationTag, soeOPTIONAL},
 }))
 
 /** 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},
     {sfCondition, soeOPTIONAL},
     {sfCredentialIDs, soeOPTIONAL},
-    {sfComputationAllowance, soeOPTIONAL},
 }))
 
 
 /** 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},
@@ -78,20 +75,20 @@ 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},
@@ -99,14 +96,14 @@ TRANSACTION(ttOFFER_CREATE, 7, OfferCreate, Delegation::delegatable, ({
 }))
 
 /** 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},
 }))
 
@@ -115,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},
@@ -131,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},
@@ -148,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},
@@ -157,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},
@@ -177,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},
@@ -193,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},
@@ -204,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},
@@ -219,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},
@@ -245,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},
@@ -263,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},
@@ -273,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},
@@ -289,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},
@@ -310,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},
@@ -319,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},
@@ -327,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},
@@ -343,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},
@@ -360,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},
@@ -394,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},
@@ -413,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},
@@ -438,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},
 }))
@@ -535,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},
@@ -546,17 +488,15 @@ TRANSACTION(ttFEE, 101, SetFee, Delegation::notDelegatable, ({
     {sfBaseFeeDrops, soeOPTIONAL},
     {sfReserveBaseDrops, soeOPTIONAL},
     {sfReserveIncrementDrops, soeOPTIONAL},
-    {sfExtensionComputeLimit, soeOPTIONAL},
-    {sfExtensionSizeLimit, soeOPTIONAL},
-    {sfGasPrice, soeOPTIONAL},
 }))
 
 /** This system-generated transaction type is used to update the network's negative UNL
 
     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},
 }))
+

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())

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
@@ -268,9 +265,6 @@ JSS(expected_date_UTC);       // out: any (warnings)
 JSS(expected_ledger_size);    // out: TxQ
 JSS(expiration);              // out: AccountOffers, AccountChannels,
                               //      ValidatorList, amm_info
-JSS(extension_compute);       // out: NetworkOps
-JSS(extension_size);          // out: NetworkOps
-JSS(gas_price);               // out: NetworkOps
 JSS(fail_hard);               // in: Sign, Submit
 JSS(failed);                  // out: InboundLedger
 JSS(feature);                 // in: Feature
@@ -454,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
@@ -565,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
@@ -691,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
@@ -708,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>
 

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

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)

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>{}};
 

src/libxrpl/basics/Number.cpp

@@ -31,13 +31,12 @@
 #include <type_traits>
 #include <utility>
 
-#ifdef _MSC_VER
-#pragma message("Using boost::multiprecision::uint128_t")
+#ifdef BOOST_COMP_MSVC
 #include <boost/multiprecision/cpp_int.hpp>
 using uint128_t = boost::multiprecision::uint128_t;
-#else   // !defined(_MSC_VER)
+#else   // !defined(_MSVC_LANG)
 using uint128_t = __uint128_t;
-#endif  // !defined(_MSC_VER)
+#endif  // !defined(_MSVC_LANG)
 
 namespace ripple {
 
@@ -469,7 +468,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;

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);

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_}};

src/libxrpl/basics/mulDiv.cpp

@@ -31,7 +31,9 @@ namespace ripple {
 std::optional<std::uint64_t>
 mulDiv(std::uint64_t value, std::uint64_t mul, std::uint64_t div)
 {
-    boost::multiprecision::uint128_t result;
+    using namespace boost::multiprecision;
+
+    uint128_t result;
     result = multiply(result, value, mul);
 
     result /= div;

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;