Merge branch 'develop' into ximinez/acquireAsyncDispatch

Co-authored-by: Bart <11445373+bthomee@users.noreply.github.com>

.pre-commit-config.yaml

@@ -17,7 +17,6 @@ repos:
         args: [--maxkb=400, --enforce-all]
       - id: trailing-whitespace
       - id: end-of-file-fixer
-      - id: mixed-line-ending
       - id: check-merge-conflict
         args: [--assume-in-merge]
 
@@ -38,6 +37,7 @@ repos:
     rev: c2bc67fe8f8f549cc489e00ba8b45aa18ee713b1 # frozen: v3.8.1
     hooks:
       - id: prettier
+        args: [--end-of-line=auto]
 
   - repo: https://github.com/psf/black-pre-commit-mirror
     rev: ea488cebbfd88a5f50b8bd95d5c829d0bb76feb8 # frozen: 26.1.0

CMakeLists.txt

@@ -88,7 +88,6 @@ find_package(ed25519 REQUIRED)
 find_package(gRPC REQUIRED)
 find_package(LibArchive REQUIRED)
 find_package(lz4 REQUIRED)
-find_package(mpt-crypto REQUIRED)
 find_package(nudb REQUIRED)
 find_package(OpenSSL REQUIRED)
 find_package(secp256k1 REQUIRED)
@@ -101,7 +100,6 @@ target_link_libraries(
     INTERFACE
         ed25519::ed25519
         lz4::lz4
-        mpt-crypto::mpt-crypto
         OpenSSL::Crypto
         OpenSSL::SSL
         secp256k1::secp256k1

conan.lock

@@ -12,7 +12,6 @@
         "protobuf/6.33.5#d96d52ba5baaaa532f47bda866ad87a5%1774467363.12",
         "openssl/3.6.1#e6399de266349245a4542fc5f6c71552%1774458290.139",
         "nudb/2.0.9#11149c73f8f2baff9a0198fe25971fc7%1774883011.384",
-        "mpt-crypto/0.2.0-rc2#2236dfc0cc11be70d84a5fa17a50bfb1%1775853786.434",
         "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504%1765850143.914",
         "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1765842973.492",
         "libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1765842973.03",
@@ -35,7 +34,6 @@
         "msys2/cci.latest#d22fe7b2808f5fd34d0a7923ace9c54f%1770657326.649",
         "m4/1.4.19#5d7a4994e5875d76faf7acf3ed056036%1774365463.87",
         "cmake/4.3.0#b939a42e98f593fb34d3a8c5cc860359%1774439249.183",
-        "cmake/3.31.10#313d16a1aa16bbdb2ca0792467214b76%1765850153.479",
         "b2/5.4.2#ffd6084a119587e70f11cd45d1a386e2%1774439233.447",
         "automake/1.16.5#b91b7c384c3deaa9d535be02da14d04f%1755524470.56",
         "autoconf/2.71#51077f068e61700d65bb05541ea1e4b0%1731054366.86",
@@ -60,12 +58,6 @@
         ],
         "lz4/[>=1.9.4 <2]": [
             "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504"
-        ],
-        "openssl/3.5.5": [
-            "openssl/3.6.1"
-        ],
-        "openssl/[>=3 <4]": [
-            "openssl/3.6.1"
         ]
     },
     "config_requires": []

conanfile.py

@@ -31,7 +31,6 @@ class Xrpl(ConanFile):
         "ed25519/2015.03",
         "grpc/1.78.1",
         "libarchive/3.8.1",
-        "mpt-crypto/0.2.0-rc2",
         "nudb/2.0.9",
         "openssl/3.6.1",
         "secp256k1/0.7.1",
@@ -215,7 +214,6 @@ class Xrpl(ConanFile):
             "grpc::grpc++",
             "libarchive::libarchive",
             "lz4::lz4",
-            "mpt-crypto::mpt-crypto",
             "nudb::nudb",
             "openssl::crypto",
             "protobuf::libprotobuf",

cspell.config.yaml

@@ -59,7 +59,6 @@ words:
   - autobridging
   - bimap
   - bindir
-  - blindings
   - bookdir
   - Bougalis
   - Britto
@@ -92,7 +91,6 @@ words:
   - daria
   - dcmake
   - dearmor
-  - decryptor
   - deleteme
   - demultiplexer
   - deserializaton
@@ -102,7 +100,6 @@ words:
   - distro
   - doxyfile
   - dxrpl
-  - elgamal
   - enabled
   - endmacro
   - exceptioned
@@ -113,7 +110,6 @@ words:
   - fmtdur
   - fsanitize
   - funclets
-  - Gamal
   - gcov
   - gcovr
   - ghead
@@ -203,7 +199,6 @@ words:
   - partitioner
   - paychan
   - paychans
-  - Pedersen
   - permdex
   - perminute
   - permissioned
@@ -240,7 +235,6 @@ words:
   - sahyadri
   - Satoshi
   - scons
-  - Schnorr
   - secp
   - sendq
   - seqit
@@ -255,8 +249,6 @@ words:
   - sles
   - soci
   - socidb
-  - sponsee
-  - sponsees
   - sslws
   - statsd
   - STATSDCOLLECTOR
@@ -270,7 +262,6 @@ words:
   - stvar
   - stvector
   - stxchainattestations
-  - summands
   - superpeer
   - superpeers
   - takergets

include/xrpl/basics/CanProcess.h

@@ -0,0 +1,139 @@
+//------------------------------------------------------------------------------
+/*
+    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.
+*/
+//==============================================================================
+
+#ifndef RIPPLE_BASICS_CANPROCESS_H_INCLUDED
+#define RIPPLE_BASICS_CANPROCESS_H_INCLUDED
+
+#include <functional>
+#include <mutex>
+#include <set>
+
+/** RAII class to check if an Item is already being processed on another thread,
+ * as indicated by it's presence in a Collection.
+ *
+ * If the Item is not in the Collection, it will be added under lock in the
+ * ctor, and removed under lock in the dtor. The object will be considered
+ * "usable" and evaluate to `true`.
+ *
+ * If the Item is in the Collection, no changes will be made to the collection,
+ * and the CanProcess object will be considered "unusable".
+ *
+ * It's up to the caller to decide what "usable" and "unusable" mean. (e.g.
+ * Process or skip a block of code, or set a flag.)
+ *
+ * The current use is to avoid lock contention that would be involved in
+ * processing something associated with the Item.
+ *
+ * Examples:
+ *
+ * void IncomingLedgers::acquireAsync(LedgerHash const& hash, ...)
+ * {
+ *    if (CanProcess check{acquiresMutex_, pendingAcquires_, hash})
+ *    {
+ *      acquire(hash, ...);
+ *    }
+ * }
+ *
+ * bool
+ * NetworkOPsImp::recvValidation(
+ *   std::shared_ptr<STValidation> const& val,
+ *   std::string const& source)
+ *   {
+ *       CanProcess check(
+ *           validationsMutex_, pendingValidations_, val->getLedgerHash());
+ *       BypassAccept bypassAccept =
+ *           check ? BypassAccept::no : BypassAccept::yes;
+ *       handleNewValidation(app_, val, source, bypassAccept, m_journal);
+ *   }
+ *
+ */
+class CanProcess
+{
+public:
+    template <class Mutex, class Collection, class Item>
+    CanProcess(Mutex& mtx, Collection& collection, Item const& item)
+        : cleanup_(insert(mtx, collection, item))
+    {
+    }
+
+    ~CanProcess()
+    {
+        if (cleanup_)
+            cleanup_();
+    }
+
+    CanProcess(CanProcess const&) = delete;
+
+    CanProcess&
+    operator=(CanProcess const&) = delete;
+
+    explicit
+    operator bool() const
+    {
+        return static_cast<bool>(cleanup_);
+    }
+
+private:
+    template <bool useIterator, class Mutex, class Collection, class Item>
+    std::function<void()>
+    doInsert(Mutex& mtx, Collection& collection, Item const& item)
+    {
+        std::unique_lock<Mutex> lock(mtx);
+        // TODO: Use structured binding once LLVM 16 is the minimum supported
+        // version. See also: https://github.com/llvm/llvm-project/issues/48582
+        // https://github.com/llvm/llvm-project/commit/127bf44385424891eb04cff8e52d3f157fc2cb7c
+        auto const insertResult = collection.insert(item);
+        auto const it = insertResult.first;
+        if (!insertResult.second)
+            return {};
+        if constexpr (useIterator)
+            return [&, it]() {
+                std::unique_lock<Mutex> lock(mtx);
+                collection.erase(it);
+            };
+        else
+            return [&]() {
+                std::unique_lock<Mutex> lock(mtx);
+                collection.erase(item);
+            };
+    }
+
+    // Generic insert() function doesn't use iterators because they may get
+    // invalidated
+    template <class Mutex, class Collection, class Item>
+    std::function<void()>
+    insert(Mutex& mtx, Collection& collection, Item const& item)
+    {
+        return doInsert<false>(mtx, collection, item);
+    }
+
+    // Specialize insert() for std::set, which does not invalidate iterators for
+    // insert and erase
+    template <class Mutex, class Item>
+    std::function<void()>
+    insert(Mutex& mtx, std::set<Item>& collection, Item const& item)
+    {
+        return doInsert<true>(mtx, collection, item);
+    }
+
+    // If set, then the item is "usable"
+    std::function<void()> cleanup_;
+};
+
+#endif

include/xrpl/core/HashRouter.h

@@ -199,7 +199,7 @@ public:
 
     /** Add a suppression peer and get message's relay status.
      * Return pair:
-     * element 1: true if the peer is added.
+     * element 1: true if the key is added.
      * element 2: optional is seated to the relay time point or
      * is unseated if has not relayed yet. */
     std::pair<bool, std::optional<Stopwatch::time_point>>

include/xrpl/ledger/OpenView.h

@@ -28,7 +28,7 @@ inline constexpr struct open_ledger_t
 /** Batch view construction tag.
 
     Views constructed with this tag are part of a stack of views
-    used during batch transaction application.
+    used during batch transaction applied.
  */
 inline constexpr struct batch_view_t
 {

include/xrpl/ledger/View.h

@@ -125,22 +125,6 @@ areCompatible(
     beast::Journal::Stream& s,
     char const* reason);
 
-uint32_t
-ownerCount(SLE::const_ref sponsorSle);
-
-XRPAmount
-calculateReserve(SLE::const_ref sle, Fees const& fees);
-
-TER
-checkInsufficientReserve(
-    ReadView const& view,
-    STTx const& tx,
-    std::shared_ptr<SLE const> accSle,
-    STAmount const& accBalance,
-    std::shared_ptr<SLE const> const& sponsorSle,
-    std::int32_t ownerCountDelta,
-    std::int32_t accountCountDelta = 0);
-
 //------------------------------------------------------------------------------
 //
 // Modifiers

include/xrpl/ledger/helpers/AccountRootHelpers.h

@@ -38,27 +38,10 @@ xrpLiquid(ReadView const& view, AccountID const& id, std::int32_t ownerCountAdj,
 void
 adjustOwnerCount(
     ApplyView& view,
-    std::shared_ptr<SLE> const& accountSle,
-    std::shared_ptr<SLE> const& sponsorSle,
+    std::shared_ptr<SLE> const& sle,
     std::int32_t amount,
     beast::Journal j);
 
-inline void
-adjustOwnerCount(
-    ApplyView& view,
-    AccountID const& account,
-    std::optional<AccountID> const& sponsor,
-    std::int32_t amount,
-    beast::Journal j)
-{
-    return adjustOwnerCount(
-        view,
-        view.peek(keylet::account(account)),
-        sponsor ? view.peek(keylet::account(*sponsor)) : std::shared_ptr<SLE>(),
-        amount,
-        j);
-}
-
 /** Returns IOU issuer transfer fee as Rate. Rate specifies
  * the fee as fractions of 1 billion. For example, 1% transfer rate
  * is represented as 1,010,000,000.

include/xrpl/ledger/helpers/DelegateHelpers.h

@@ -26,7 +26,10 @@ checkTxPermission(std::shared_ptr<SLE const> const& delegate, STTx const& tx);
  * @param granularPermissions Granted granular permissions tied to the
  * transaction type.
  */
-std::unordered_set<GranularPermissionType>
-getGranularPermission(std::shared_ptr<SLE const> const& delegate, TxType const& type);
+void
+loadGranularPermission(
+    std::shared_ptr<SLE const> const& delegate,
+    TxType const& type,
+    std::unordered_set<GranularPermissionType>& granularPermissions);
 
 }  // namespace xrpl

include/xrpl/ledger/helpers/EscrowHelpers.h

@@ -6,7 +6,6 @@
 #include <xrpl/ledger/helpers/AccountRootHelpers.h>
 #include <xrpl/ledger/helpers/MPTokenHelpers.h>
 #include <xrpl/ledger/helpers/RippleStateHelpers.h>
-#include <xrpl/ledger/helpers/SponsorHelpers.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/MPTAmount.h>
@@ -18,7 +17,6 @@ template <ValidIssueType T>
 TER
 escrowUnlockApplyHelper(
     ApplyView& view,
-    STTx const& tx,
     Rate lockedRate,
     std::shared_ptr<SLE> const& sleDest,
     STAmount const& xrpBalance,
@@ -33,7 +31,6 @@ template <>
 inline TER
 escrowUnlockApplyHelper<Issue>(
     ApplyView& view,
-    STTx const& tx,
     Rate lockedRate,
     std::shared_ptr<SLE> const& sleDest,
     STAmount const& xrpBalance,
@@ -59,12 +56,8 @@ escrowUnlockApplyHelper<Issue>(
     if (!view.exists(trustLineKey) && createAsset)
     {
         // Can the account cover the trust line's reserve?
-        auto const sponsorAccountID = getTxReserveSponsorAccountID(tx);
-        std::shared_ptr<SLE> sponsorSle = {};
-        if (sponsorAccountID)
-            sponsorSle = view.peek(keylet::account(*sponsorAccountID));
-        if (auto const ret = checkInsufficientReserve(view, tx, sleDest, xrpBalance, sponsorSle, 1);
-            !isTesSuccess(ret))
+        if (std::uint32_t const ownerCount = {sleDest->at(sfOwnerCount)};
+            xrpBalance < view.fees().accountReserve(ownerCount + 1))
         {
             JLOG(journal.trace()) << "Trust line does not exist. "
                                      "Insufficient reserve to create line.";
@@ -91,7 +84,6 @@ escrowUnlockApplyHelper<Issue>(
                 Issue(currency, receiver),                      // limit of zero
                 0,                                              // quality in
                 0,                                              // quality out
-                sponsorAccountID,                               // sponsor
                 journal);                                       // journal
             !isTesSuccess(ter))
         {
@@ -169,7 +161,6 @@ template <>
 inline TER
 escrowUnlockApplyHelper<MPTIssue>(
     ApplyView& view,
-    STTx const& tx,
     Rate lockedRate,
     std::shared_ptr<SLE> const& sleDest,
     STAmount const& xrpBalance,
@@ -185,30 +176,24 @@ escrowUnlockApplyHelper<MPTIssue>(
 
     auto const mptID = amount.get<MPTIssue>().getMptID();
     auto const issuanceKey = keylet::mptIssuance(mptID);
-    auto const mptKeylet = keylet::mptoken(issuanceKey.key, receiver);
-    if (!view.exists(mptKeylet) && createAsset && !receiverIssuer)
+    if (!view.exists(keylet::mptoken(issuanceKey.key, receiver)) && createAsset && !receiverIssuer)
     {
-        auto const sponsorAccountID = getTxReserveSponsorAccountID(tx);
-        std::shared_ptr<SLE> sponsorSle = {};
-        if (sponsorAccountID)
-            sponsorSle = view.peek(keylet::account(*sponsorAccountID));
-        if (auto const ret = checkInsufficientReserve(view, tx, sleDest, xrpBalance, sponsorSle, 1);
-            !isTesSuccess(ret))
-            return ret;
+        if (std::uint32_t const ownerCount = {sleDest->at(sfOwnerCount)};
+            xrpBalance < view.fees().accountReserve(ownerCount + 1))
+        {
+            return tecINSUFFICIENT_RESERVE;
+        }
 
-        if (auto const ter = createMPToken(view, mptID, receiver, sponsorAccountID, 0);
-            !isTesSuccess(ter))
+        if (auto const ter = createMPToken(view, mptID, receiver, 0); !isTesSuccess(ter))
         {
             return ter;  // LCOV_EXCL_LINE
         }
 
         // update owner count.
-        adjustOwnerCount(view, sleDest, sponsorSle, 1, journal);
-        auto mptSle = view.peek(mptKeylet);
-        addSponsorToLedgerEntry(mptSle, sponsorSle);
+        adjustOwnerCount(view, sleDest, 1, journal);
     }
 
-    if (!view.exists(mptKeylet) && !receiverIssuer)
+    if (!view.exists(keylet::mptoken(issuanceKey.key, receiver)) && !receiverIssuer)
         return tecNO_PERMISSION;
 
     auto const xferRate = transferRate(view, amount);

include/xrpl/ledger/helpers/MPTokenHelpers.h

@@ -68,7 +68,6 @@ canAddHolding(ReadView const& view, MPTIssue const& mptIssue);
 [[nodiscard]] TER
 authorizeMPToken(
     ApplyView& view,
-    STTx const& tx,
     XRPAmount const& priorBalance,
     MPTID const& mptIssuanceID,
     AccountID const& account,
@@ -100,7 +99,6 @@ requireAuth(
 [[nodiscard]] TER
 enforceMPTokenAuthorization(
     ApplyView& view,
-    STTx const& tx,
     MPTID const& mptIssuanceID,
     AccountID const& account,
     XRPAmount const& priorBalance,
@@ -123,15 +121,6 @@ canTransfer(
 [[nodiscard]] TER
 canTrade(ReadView const& view, Asset const& asset);
 
-/** Convenience to combine canTrade/Transfer. Returns tesSUCCESS if Asset is Issue.
- */
-[[nodiscard]] TER
-canMPTTradeAndTransfer(
-    ReadView const& v,
-    Asset const& asset,
-    AccountID const& from,
-    AccountID const& to);
-
 //------------------------------------------------------------------------------
 //
 // Empty holding operations (MPT-specific)
@@ -141,7 +130,6 @@ canMPTTradeAndTransfer(
 [[nodiscard]] TER
 addEmptyHolding(
     ApplyView& view,
-    STTx const& tx,
     AccountID const& accountID,
     XRPAmount priorBalance,
     MPTIssue const& mptIssue,
@@ -150,7 +138,6 @@ addEmptyHolding(
 [[nodiscard]] TER
 removeEmptyHolding(
     ApplyView& view,
-    STTx const& tx,
     AccountID const& accountID,
     MPTIssue const& mptIssue,
     beast::Journal journal);
@@ -182,7 +169,6 @@ createMPToken(
     ApplyView& view,
     MPTID const& mptIssuanceID,
     AccountID const& account,
-    std::optional<AccountID> const& sponsor,
     std::uint32_t const flags);
 
 TER
@@ -190,7 +176,6 @@ checkCreateMPT(
     xrpl::ApplyView& view,
     xrpl::MPTIssue const& mptIssue,
     xrpl::AccountID const& holder,
-    std::optional<xrpl::AccountID> const& sponsor,
     beast::Journal j);
 
 //------------------------------------------------------------------------------
@@ -242,4 +227,17 @@ issuerFundsToSelfIssue(ReadView const& view, MPTIssue const& issue);
 void
 issuerSelfDebitHookMPT(ApplyView& view, MPTIssue const& issue, std::uint64_t amount);
 
+//------------------------------------------------------------------------------
+//
+// MPT DEX
+//
+//------------------------------------------------------------------------------
+
+/* Return true if a transaction is allowed for the specified MPT/account. The
+ * function checks MPTokenIssuance and MPToken objects flags to determine if the
+ * transaction is allowed.
+ */
+TER
+checkMPTTxAllowed(ReadView const& v, TxType tx, Asset const& asset, AccountID const& accountID);
+
 }  // namespace xrpl

include/xrpl/ledger/helpers/NFTokenHelpers.h

@@ -44,12 +44,7 @@ findTokenAndPage(ApplyView& view, AccountID const& owner, uint256 const& nftoken
 
 /** Insert the token in the owner's token directory. */
 TER
-insertToken(
-    ApplyView& view,
-    STTx const& tx,
-    AccountID owner,
-    std::optional<AccountID> const& sponsor,
-    STObject&& nft);
+insertToken(ApplyView& view, AccountID owner, STObject&& nft);
 
 /** Remove the token from the owner's token directory. */
 TER
@@ -121,7 +116,6 @@ tokenOfferCreatePreclaim(
 TER
 tokenOfferCreateApply(
     ApplyView& view,
-    STTx const& tx,
     AccountID const& acctID,
     STAmount const& amount,
     std::optional<AccountID> const& dest,

include/xrpl/ledger/helpers/RippleStateHelpers.h

@@ -149,7 +149,6 @@ trustCreate(
                                 // Issuer should be the account being set.
     std::uint32_t uQualityIn,
     std::uint32_t uQualityOut,
-    std::optional<AccountID> const& sponsorAccountID,
     beast::Journal j);
 
 [[nodiscard]] TER
@@ -230,7 +229,6 @@ canTransfer(ReadView const& view, Issue const& issue, AccountID const& from, Acc
 [[nodiscard]] TER
 addEmptyHolding(
     ApplyView& view,
-    STTx const& tx,
     AccountID const& accountID,
     XRPAmount priorBalance,
     Issue const& issue,

include/xrpl/ledger/helpers/SponsorHelpers.h

@@ -1,114 +0,0 @@
-#pragma once
-
-#include <xrpl/basics/Log.h>
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/View.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/SField.h>
-#include <xrpl/protocol/STTx.h>
-#include <xrpl/protocol/TxFlags.h>
-
-namespace xrpl {
-
-inline bool
-isReserveSponsored(STTx const& tx)
-{
-    return tx.getFieldU32(sfSponsorFlags) & spfSponsorReserve;
-}
-
-inline bool
-isSponsorReserveCoSigning(STTx const& tx)
-{
-    if (!tx.isFieldPresent(sfSponsorSignature))
-        return false;
-    return isReserveSponsored(tx);
-}
-
-inline std::optional<AccountID>
-getTxReserveSponsorAccountID(STTx const& tx)
-{
-    if (tx.isFieldPresent(sfSponsor) && isReserveSponsored(tx))
-    {
-        return tx.getAccountID(sfSponsor);
-    }
-    return {};
-}
-
-inline std::shared_ptr<SLE>
-getTxReserveSponsor(ApplyView& view, STTx const& tx)
-{
-    auto const sponsorID = getTxReserveSponsorAccountID(tx);
-    if (sponsorID)
-        return view.peek(keylet::account(*sponsorID));
-    return {};
-}
-
-inline std::shared_ptr<SLE const>
-getTxReserveSponsor(ReadView const& view, STTx const& tx)
-{
-    auto const sponsorID = getTxReserveSponsorAccountID(tx);
-    if (sponsorID)
-        return view.read(keylet::account(*sponsorID));
-    return {};
-}
-
-inline std::optional<AccountID>
-getLedgerEntryReserveSponsorAccountID(
-    std::shared_ptr<SLE const> const& sle,
-    SF_ACCOUNT const& field = sfSponsor)
-{
-    if (sle->isFieldPresent(field))
-        return sle->getAccountID(field);
-    return {};
-}
-
-inline std::shared_ptr<SLE>
-getLedgerEntryReserveSponsor(
-    ApplyView& view,
-    std::shared_ptr<SLE> const& sle,
-    SF_ACCOUNT const& field = sfSponsor)
-{
-    auto const sponsorID = getLedgerEntryReserveSponsorAccountID(sle, field);
-    if (sponsorID)
-        return view.peek(keylet::account(*sponsorID));
-    return {};
-}
-
-inline std::shared_ptr<SLE const>
-getLedgerEntryReserveSponsor(
-    ReadView const& view,
-    std::shared_ptr<SLE const> const& sle,
-    SF_ACCOUNT const& field = sfSponsor)
-{
-    auto const sponsorID = getLedgerEntryReserveSponsorAccountID(sle, field);
-    if (sponsorID)
-        return view.read(keylet::account(*sponsorID));
-    return {};
-}
-
-inline void
-addSponsorToLedgerEntry(
-    std::shared_ptr<SLE> const& sle,
-    std::shared_ptr<SLE> const& sponsorSle,
-    SF_ACCOUNT const& field = sfSponsor)
-{
-    XRPL_ASSERT(
-        (sle->getType() == ltRIPPLE_STATE && (field == sfHighSponsor || field == sfLowSponsor)) ||
-            (sle->getType() != ltRIPPLE_STATE && field == sfSponsor),
-        "addSponsorToLedgerEntry : Invalid field to the LedgerEntry");
-    if (sponsorSle)
-        sle->setAccountID(field, sponsorSle->getAccountID(sfAccount));
-}
-
-inline void
-removeSponsorFromLedgerEntry(std::shared_ptr<SLE> const& sle, SF_ACCOUNT const& field = sfSponsor)
-{
-    XRPL_ASSERT(
-        (sle->getType() == ltRIPPLE_STATE && (field == sfHighSponsor || field == sfLowSponsor)) ||
-            (sle->getType() != ltRIPPLE_STATE && field == sfSponsor),
-        "removeSponsorFromLedgerEntry : Invalid field to the LedgerEntry");
-    if (sle->isFieldPresent(field))
-        sle->makeFieldAbsent(field);
-}
-
-}  // namespace xrpl

include/xrpl/ledger/helpers/TokenHelpers.h

@@ -54,15 +54,9 @@ enum class AuthType { StrongAuth, WeakAuth, Legacy };
 [[nodiscard]] bool
 isGlobalFrozen(ReadView const& view, Asset const& asset);
 
-[[nodiscard]] TER
-checkGlobalFrozen(ReadView const& view, Asset const& asset);
-
 [[nodiscard]] bool
 isIndividualFrozen(ReadView const& view, AccountID const& account, Asset const& asset);
 
-[[nodiscard]] TER
-checkIndividualFrozen(ReadView const& view, AccountID const& account, Asset const& asset);
-
 /**
  *   isFrozen check is recursive for MPT shares in a vault, descending to
  *   assets in the vault, up to maxAssetCheckDepth recursion depth. This is
@@ -214,7 +208,6 @@ canAddHolding(ReadView const& view, Asset const& asset);
 [[nodiscard]] TER
 addEmptyHolding(
     ApplyView& view,
-    STTx const& tx,
     AccountID const& accountID,
     XRPAmount priorBalance,
     Asset const& asset,
@@ -223,7 +216,6 @@ addEmptyHolding(
 [[nodiscard]] TER
 removeEmptyHolding(
     ApplyView& view,
-    STTx const& tx,
     AccountID const& accountID,
     Asset const& asset,
     beast::Journal journal);
@@ -278,7 +270,6 @@ accountSend(
     AccountID const& to,
     STAmount const& saAmount,
     beast::Journal j,
-    std::optional<AccountID> const& sponsorAccountID = std::nullopt,
     WaiveTransferFee waiveFee = WaiveTransferFee::No,
     AllowMPTOverflow allowOverflow = AllowMPTOverflow::No);
 
@@ -296,7 +287,6 @@ accountSendMulti(
     Asset const& asset,
     MultiplePaymentDestinations const& receivers,
     beast::Journal j,
-    std::optional<AccountID> const& sponsorAccountID,
     WaiveTransferFee waiveFee = WaiveTransferFee::No);
 
 [[nodiscard]] TER

include/xrpl/protocol/Batch.h

@@ -1,5 +1,3 @@
-#pragma once
-
 #include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/STVector256.h>
 #include <xrpl/protocol/Serializer.h>

include/xrpl/protocol/ConfidentialTransfer.h

@@ -1,391 +0,0 @@
-#pragma once
-
-#include <xrpl/basics/Slice.h>
-#include <xrpl/protocol/Indexes.h>
-#include <xrpl/protocol/MPTIssue.h>
-#include <xrpl/protocol/Protocol.h>
-#include <xrpl/protocol/Rate.h>
-#include <xrpl/protocol/STLedgerEntry.h>
-#include <xrpl/protocol/STObject.h>
-#include <xrpl/protocol/Serializer.h>
-#include <xrpl/protocol/TER.h>
-#include <xrpl/protocol/TxFormats.h>
-#include <xrpl/protocol/detail/secp256k1.h>
-
-#include <secp256k1_mpt.h>
-
-namespace xrpl {
-
-/**
- * @brief Bundles an ElGamal public key with its associated encrypted amount.
- *
- * Used to represent a recipient in confidential transfers, containing both
- * the recipient's ElGamal public key and the ciphertext encrypting the
- * transfer amount under that key.
- */
-struct ConfidentialRecipient
-{
-    Slice publicKey;        ///< The recipient's ElGamal public key (size=xrpl::ecPubKeyLength).
-    Slice encryptedAmount;  ///< The encrypted amount ciphertext
-                            ///< (size=xrpl::ecGamalEncryptedTotalLength).
-};
-
-/// Holds two secp256k1 public key components representing an ElGamal ciphertext (C1, C2).
-struct EcPair
-{
-    secp256k1_pubkey c1;
-    secp256k1_pubkey c2;
-};
-
-/**
- * @brief Increments the confidential balance version counter on an MPToken.
- *
- * The version counter is used to prevent replay attacks by binding proofs
- * to a specific state of the account's confidential balance. Wraps to 0
- * on overflow (defined behavior for unsigned integers).
- *
- * @param mptoken The MPToken ledger entry to update.
- */
-inline void
-incrementConfidentialVersion(STObject& mptoken)
-{
-    // Retrieve current version and increment.
-    // Unsigned integer overflow is defined behavior in C++ (wraps to 0),
-    // which is acceptable here.
-    mptoken[sfConfidentialBalanceVersion] =
-        mptoken[~sfConfidentialBalanceVersion].value_or(0u) + 1u;
-}
-
-/**
- * @brief Generates the context hash for ConfidentialMPTSend transactions.
- *
- * Creates a unique 256-bit hash that binds the zero-knowledge proofs to
- * this specific send transaction, preventing proof reuse across transactions.
- *
- * @param account     The sender's account ID.
- * @param issuanceID  The MPToken Issuance ID.
- * @param sequence    The transaction sequence number or ticket number.
- * @param destination The destination account ID.
- * @param version     The sender's confidential balance version.
- * @return A 256-bit context hash unique to this transaction.
- */
-uint256
-getSendContextHash(
-    AccountID const& account,
-    uint192 const& issuanceID,
-    std::uint32_t sequence,
-    AccountID const& destination,
-    std::uint32_t version);
-
-/**
- * @brief Generates the context hash for ConfidentialMPTClawback transactions.
- *
- * Creates a unique 256-bit hash that binds the equality proof to this
- * specific clawback transaction.
- *
- * @param account    The issuer's account ID.
- * @param issuanceID The MPToken Issuance ID.
- * @param sequence   The transaction sequence number or ticket number.
- * @param holder     The holder's account ID being clawed back from.
- * @return A 256-bit context hash unique to this transaction.
- */
-uint256
-getClawbackContextHash(
-    AccountID const& account,
-    uint192 const& issuanceID,
-    std::uint32_t sequence,
-    AccountID const& holder);
-
-/**
- * @brief Generates the context hash for ConfidentialMPTConvert transactions.
- *
- * Creates a unique 256-bit hash that binds the Schnorr proof (for key
- * registration) to this specific convert transaction.
- *
- * @param account    The holder's account ID.
- * @param issuanceID The MPToken Issuance ID.
- * @param sequence   The transaction sequence number or a ticket number.
- * @return A 256-bit context hash unique to this transaction.
- */
-uint256
-getConvertContextHash(AccountID const& account, uint192 const& issuanceID, std::uint32_t sequence);
-
-/**
- * @brief Generates the context hash for ConfidentialMPTConvertBack transactions.
- *
- * Creates a unique 256-bit hash that binds the zero-knowledge proofs to
- * this specific convert-back transaction.
- *
- * @param account    The holder's account ID.
- * @param issuanceID The MPToken Issuance ID.
- * @param sequence   The transaction sequence number or a ticket number.
- * @param version    The holder's confidential balance version.
- * @return A 256-bit context hash unique to this transaction.
- */
-uint256
-getConvertBackContextHash(
-    AccountID const& account,
-    uint192 const& issuanceID,
-    std::uint32_t sequence,
-    std::uint32_t version);
-
-/**
- * @brief Parses an ElGamal ciphertext into two secp256k1 public key components.
- *
- * Breaks a 66-byte encrypted amount (two 33-byte compressed EC points) into
- * a pair containing (C1, C2) for use in cryptographic operations.
- *
- * @param buffer The 66-byte buffer containing the compressed ciphertext.
- * @return The parsed pair (c1, c2) if successful, std::nullopt if the buffer is invalid.
- */
-std::optional<EcPair>
-makeEcPair(Slice const& buffer);
-
-/**
- * @brief Serializes an EcPair into compressed form.
- *
- * Converts an EcPair (C1, C2) back into a 66-byte buffer containing
- * two 33-byte compressed EC points.
- *
- * @param pair The EcPair to serialize.
- * @return The 66-byte buffer, or std::nullopt if serialization fails.
- */
-std::optional<Buffer>
-serializeEcPair(EcPair const& pair);
-
-/**
- * @brief Verifies that a buffer contains two valid, parsable EC public keys.
- *
- * @param buffer The input buffer containing two concatenated components.
- * @return true if both components can be parsed successfully, false otherwise.
- */
-bool
-isValidCiphertext(Slice const& buffer);
-
-/**
- * @brief Verifies that a buffer contains a valid, parsable compressed EC point.
- *
- * Can be used to validate both compressed public keys and Pedersen commitments.
- * Fails early if the prefix byte is not 0x02 or 0x03.
- *
- * @param buffer The input buffer containing a compressed EC point (33 bytes).
- * @return true if the point can be parsed successfully, false otherwise.
- */
-bool
-isValidCompressedECPoint(Slice const& buffer);
-
-/**
- * @brief Homomorphically adds two ElGamal ciphertexts.
- *
- * Uses the additive homomorphic property of ElGamal encryption to compute
- * Enc(a + b) from Enc(a) and Enc(b) without decryption.
- *
- * @param a The first ciphertext (66 bytes).
- * @param b The second ciphertext (66 bytes).
- * @return The resulting ciphertext Enc(a + b), or std::nullopt on failure.
- */
-std::optional<Buffer>
-homomorphicAdd(Slice const& a, Slice const& b);
-
-/**
- * @brief Homomorphically subtracts two ElGamal ciphertexts.
- *
- * Uses the additive homomorphic property of ElGamal encryption to compute
- * Enc(a - b) from Enc(a) and Enc(b) without decryption.
- *
- * @param a The minuend ciphertext (66 bytes).
- * @param b The subtrahend ciphertext (66 bytes).
- * @return The resulting ciphertext Enc(a - b), or std::nullopt on failure.
- */
-std::optional<Buffer>
-homomorphicSubtract(Slice const& a, Slice const& b);
-
-/**
- * @brief Encrypts an amount using ElGamal encryption.
- *
- * Produces a ciphertext C = (C1, C2) where C1 = r*G and C2 = m*G + r*Pk,
- * using the provided blinding factor r.
- *
- * @param amt            The plaintext amount to encrypt.
- * @param pubKeySlice    The recipient's ElGamal public key (size=xrpl::ecPubKeyLength).
- * @param blindingFactor The randomness used as blinding factor r
- * (size=xrpl::ecBlindingFactorLength).
- * @return The ciphertext (size=xrpl::ecGamalEncryptedTotalLength), or std::nullopt on failure.
- */
-std::optional<Buffer>
-encryptAmount(uint64_t const amt, Slice const& pubKeySlice, Slice const& blindingFactor);
-
-/**
- * @brief Generates the canonical zero encryption for a specific MPToken.
- *
- * Creates a deterministic encryption of zero that is unique to the account
- * and MPT issuance. Used to initialize confidential balance fields.
- *
- * @param pubKeySlice The holder's ElGamal public key (size=xrpl::ecPubKeyLength).
- * @param account     The account ID of the token holder.
- * @param mptId       The MPToken Issuance ID.
- * @return The canonical zero ciphertext (size=xrpl::ecGamalEncryptedTotalLength), or std::nullopt
- * on failure.
- */
-std::optional<Buffer>
-encryptCanonicalZeroAmount(Slice const& pubKeySlice, AccountID const& account, MPTID const& mptId);
-
-/**
- * @brief Verifies a Schnorr proof of knowledge of an ElGamal private key.
- *
- * Proves that the submitter knows the secret key corresponding to the
- * provided public key, without revealing the secret key itself.
- *
- * @param pubKeySlice The ElGamal public key (size=xrpl::ecPubKeyLength).
- * @param proofSlice  The Schnorr proof (size=xrpl::ecSchnorrProofLength).
- * @param contextHash The 256-bit context hash binding the proof.
- * @return tesSUCCESS if valid, or an error code otherwise.
- */
-TER
-verifySchnorrProof(Slice const& pubKeySlice, Slice const& proofSlice, uint256 const& contextHash);
-
-/**
- * @brief Validates the format of encrypted amount fields in a transaction.
- *
- * Checks that all ciphertext fields in the transaction object have the
- * correct length and contain valid EC points. This function is only used
- * by ConfidentialMPTConvert and ConfidentialMPTConvertBack transactions.
- *
- * @param object The transaction object containing encrypted amount fields.
- * @return tesSUCCESS if all formats are valid, temMALFORMED if required fields
- *         are missing, or temBAD_CIPHERTEXT if format validation fails.
- */
-NotTEC
-checkEncryptedAmountFormat(STObject const& object);
-
-/**
- * @brief Verifies revealed amount encryptions for all recipients.
- *
- * Validates that the same amount was correctly encrypted for the holder,
- * issuer, and optionally the auditor using their respective public keys.
- *
- * @param amount         The revealed plaintext amount.
- * @param blindingFactor The blinding factor used in all encryptions
- * (size=xrpl::ecBlindingFactorLength).
- * @param holder         The holder's public key and encrypted amount.
- * @param issuer         The issuer's public key and encrypted amount.
- * @param auditor        Optional auditor's public key and encrypted amount.
- * @return tesSUCCESS if all encryptions are valid, or an error code otherwise.
- */
-TER
-verifyRevealedAmount(
-    uint64_t const amount,
-    Slice const& blindingFactor,
-    ConfidentialRecipient const& holder,
-    ConfidentialRecipient const& issuer,
-    std::optional<ConfidentialRecipient> const& auditor);
-
-/**
- * @brief Returns the number of recipients in a confidential transfer.
- *
- * Returns 4 if an auditor is present (sender, destination, issuer, auditor),
- * or 3 if no auditor (sender, destination, issuer).
- *
- * @param hasAuditor Whether the issuance has an auditor configured.
- * @return The number of recipients (3 or 4).
- */
-constexpr std::size_t
-getConfidentialRecipientCount(bool hasAuditor)
-{
-    return hasAuditor ? 4 : 3;
-}
-
-/**
- * @brief Verifies a compact sigma clawback proof.
- *
- * Proves that the issuer knows the exact amount encrypted in the holder's
- * balance ciphertext. Used in ConfidentialMPTClawback to verify the issuer
- * can decrypt the balance using their private key.
- *
- * @param amount      The revealed plaintext amount.
- * @param proof       The zero-knowledge proof bytes (ecCompactClawbackProofLength).
- * @param pubKeySlice The issuer's ElGamal public key (ecPubKeyLength bytes).
- * @param ciphertext  The issuer's encrypted balance on the holder's account
- * (ecGamalEncryptedTotalLength bytes).
- * @param contextHash The 256-bit context hash binding the proof.
- * @return tesSUCCESS if the proof is valid, or an error code otherwise.
- */
-TER
-verifyClawbackProof(
-    uint64_t const amount,
-    Slice const& proof,
-    Slice const& pubKeySlice,
-    Slice const& ciphertext,
-    uint256 const& contextHash);
-
-/**
- * @brief Generates a cryptographically secure 32-byte blinding factor.
- *
- * Produces random bytes suitable for use as an ElGamal blinding factor
- * or Pedersen commitment randomness.
- *
- * @return A 32-byte buffer containing the random blinding factor.
- */
-Buffer
-generateBlindingFactor();
-
-/**
- * @brief Verifies all zero-knowledge proofs for a ConfidentialMPTSend transaction.
- *
- * This function calls mpt_verify_send_proof API in the mpt-crypto utility lib, which verifies the
- * equality proof, amount linkage, balance linkage, and range proof.
- * Equality proof: Proves the same value is encrypted for the sender, receiver, issuer, and auditor.
- * Amount linkage: Proves the send amount matches the amount Pedersen commitment.
- * Balance linkage: Proves the sender's balance matches the balance Pedersen
- * commitment.
- * Range proof: Proves the amount and the remaining balance are within range [0, 2^64-1].
- *
- * @param proof             The full proof blob.
- * @param sender            The sender's public key and encrypted amount.
- * @param destination       The destination's public key and encrypted amount.
- * @param issuer            The issuer's public key and encrypted amount.
- * @param auditor           The auditor's public key and encrypted amount if present.
- * @param spendingBalance   The sender's current spending balance ciphertext.
- * @param amountCommitment  The Pedersen commitment to the send amount.
- * @param balanceCommitment The Pedersen commitment to the sender's balance.
- * @param contextHash       The context hash binding the proof.
- * @return tesSUCCESS if all proofs are valid, or an error code otherwise.
- */
-TER
-verifySendProof(
-    Slice const& proof,
-    ConfidentialRecipient const& sender,
-    ConfidentialRecipient const& destination,
-    ConfidentialRecipient const& issuer,
-    std::optional<ConfidentialRecipient> const& auditor,
-    Slice const& spendingBalance,
-    Slice const& amountCommitment,
-    Slice const& balanceCommitment,
-    uint256 const& contextHash);
-
-/**
- * @brief Verifies all zero-knowledge proofs for a ConfidentialMPTConvertBack transaction.
- *
- * This function calls mpt_verify_convert_back_proof API in the mpt-crypto utility lib, which
- * verifies the balance linkage proof and range proof. Balance linkage proof: proves the balance
- * commitment matches the spending ciphertext. Range proof: proves the remaining balance after
- * convert back is within range [0, 2^64-1].
- *
- * @param proof             The full proof blob.
- * @param pubKeySlice       The holder's public key.
- * @param spendingBalance   The holder's spending balance ciphertext.
- * @param balanceCommitment The Pedersen commitment to the balance.
- * @param amount            The amount being converted back to public.
- * @param contextHash       The context hash binding the proof.
- * @return tesSUCCESS if all proofs are valid, or an error code otherwise.
- */
-TER
-verifyConvertBackProof(
-    Slice const& proof,
-    Slice const& pubKeySlice,
-    Slice const& spendingBalance,
-    Slice const& balanceCommitment,
-    uint64_t amount,
-    uint256 const& contextHash);
-
-}  // namespace xrpl

include/xrpl/protocol/Fees.h

@@ -40,23 +40,9 @@ struct Fees
         the reserve increment times the number of increments.
     */
     XRPAmount
-    accountReserve(
-        std::size_t ownerCount,
-        std::size_t sponsoredOwnerCount = 0,
-        std::size_t sponsoringOwnerCount = 0,
-        bool isAccountSponsored = false,
-        std::size_t sponsoringAccountCount = 0) const
+    accountReserve(std::size_t ownerCount) const
     {
-        auto const accountReserveUnits = (isAccountSponsored ? 0 : 1) + sponsoringAccountCount;
-
-        XRPL_ASSERT(
-            ownerCount >= sponsoredOwnerCount,
-            "xrpl::Fees::accountReserve : OwnerCount must be greater than or equal to "
-            "SponsoredOwnerCount");
-
-        auto const ownerReserveUnits = (ownerCount - sponsoredOwnerCount) + sponsoringOwnerCount;
-
-        return (reserve * accountReserveUnits) + (increment * ownerReserveUnits);
+        return reserve + ownerCount * increment;
     }
 };
 

include/xrpl/protocol/Indexes.h

@@ -151,10 +151,6 @@ static ticket_t const ticket{};
 Keylet
 signers(AccountID const& account) noexcept;
 
-/** A Sponsor */
-Keylet
-sponsor(AccountID const& sponsor, AccountID const& sponsee) noexcept;
-
 /** A Check */
 /** @{ */
 Keylet

include/xrpl/protocol/LedgerFormats.h

@@ -135,7 +135,7 @@ enum LedgerEntryType : std::uint16_t {
         LSF_FLAG(lsfDisallowIncomingPayChan, 0x10000000)        /* True, reject new paychans */                                    \
         LSF_FLAG(lsfDisallowIncomingTrustline, 0x20000000)      /* True, reject new trustlines (only if no issued assets) */       \
         LSF_FLAG(lsfAllowTrustLineLocking, 0x40000000)          /* True, enable trustline locking */                               \
-        LSF_FLAG(lsfAllowTrustLineClawback, 0x80000000))         /* True, enable clawback */                                       \
+        LSF_FLAG(lsfAllowTrustLineClawback, 0x80000000))        /* True, enable clawback */                                        \
                                                                                                                                    \
     LEDGER_OBJECT(Offer,                                                                                                           \
         LSF_FLAG(lsfPassive, 0x00010000)                                                                                           \
@@ -173,8 +173,7 @@ enum LedgerEntryType : std::uint16_t {
         LSF_FLAG(lsfMPTCanEscrow, 0x00000008)                                                                                      \
         LSF_FLAG(lsfMPTCanTrade, 0x00000010)                                                                                       \
         LSF_FLAG(lsfMPTCanTransfer, 0x00000020)                                                                                    \
-        LSF_FLAG(lsfMPTCanClawback, 0x00000040)                                                                                    \
-        LSF_FLAG(lsfMPTCanConfidentialAmount, 0x00000080))                                                                                    \
+        LSF_FLAG(lsfMPTCanClawback, 0x00000040))                                                                                   \
                                                                                                                                    \
     LEDGER_OBJECT(MPTokenIssuanceMutable,                                                                                          \
         LSF_FLAG(lsmfMPTCanMutateCanLock, 0x00000002)                                                                              \
@@ -184,8 +183,7 @@ enum LedgerEntryType : std::uint16_t {
         LSF_FLAG(lsmfMPTCanMutateCanTransfer, 0x00000020)                                                                          \
         LSF_FLAG(lsmfMPTCanMutateCanClawback, 0x00000040)                                                                          \
         LSF_FLAG(lsmfMPTCanMutateMetadata, 0x00010000)                                                                             \
-        LSF_FLAG(lsmfMPTCanMutateTransferFee, 0x00020000)                                                                          \
-        LSF_FLAG(lsmfMPTCannotMutateCanConfidentialAmount, 0x00040000))                                                                          \
+        LSF_FLAG(lsmfMPTCanMutateTransferFee, 0x00020000))                                                                         \
                                                                                                                                    \
     LEDGER_OBJECT(MPToken,                                                                                                         \
         LSF_FLAG2(lsfMPTLocked, 0x00000001)                                                                                        \
@@ -201,11 +199,7 @@ enum LedgerEntryType : std::uint16_t {
     LEDGER_OBJECT(Loan,                                                                                                            \
         LSF_FLAG(lsfLoanDefault, 0x00010000)                                                                                       \
         LSF_FLAG(lsfLoanImpaired, 0x00020000)                                                                                      \
-        LSF_FLAG(lsfLoanOverpayment, 0x00040000))               /* True, loan allows overpayments */                               \
-                                                                                                                                   \
-    LEDGER_OBJECT(Sponsorship,                                                                                                         \
-        LSF_FLAG(lsfSponsorshipRequireSignForFee, 0x00010000)                                                                      \
-        LSF_FLAG(lsfSponsorshipRequireSignForReserve, 0x00020000))
+        LSF_FLAG(lsfLoanOverpayment, 0x00040000))               /* True, loan allows overpayments */
 
 // clang-format on
 

include/xrpl/protocol/LedgerHeader.h

@@ -35,6 +35,8 @@ struct LedgerHeader
 
     // If validated is false, it means "not yet validated."
     // Once validated is true, it will never be set false at a later time.
+    // NOTE: If you are accessing this directly, you are probably doing it
+    //   wrong. Use LedgerMaster::isValidated().
     // VFALCO TODO Make this not mutable
     bool mutable validated = false;
     bool accepted = false;

include/xrpl/protocol/Permissions.h

@@ -7,12 +7,8 @@
 #include <optional>
 #include <string>
 #include <unordered_map>
-#include <unordered_set>
 
 namespace xrpl {
-
-class STTx;
-
 /**
  * We have both transaction type permissions and granular type permissions.
  * Since we will reuse the TransactionFormats to parse the Transaction
@@ -21,15 +17,15 @@ class STTx;
  * greater than the maximum value of uint16.
  */
 enum GranularPermissionType : std::uint32_t {
-#pragma push_macro("GRANULAR_PERMISSION")
-#undef GRANULAR_PERMISSION
+#pragma push_macro("PERMISSION")
+#undef PERMISSION
 
-#define GRANULAR_PERMISSION(name, txType, value, allowedFlags, allowedFields) name = value,
+#define PERMISSION(type, txType, value) type = value,
 
 #include <xrpl/protocol/detail/permissions.macro>
 
-#undef GRANULAR_PERMISSION
-#pragma pop_macro("GRANULAR_PERMISSION")
+#undef PERMISSION
+#pragma pop_macro("PERMISSION")
 };
 
 enum Delegation { delegable, notDelegable };
@@ -40,15 +36,14 @@ private:
     Permission();
 
     std::unordered_map<std::uint16_t, uint256> txFeatureMap_;
+
     std::unordered_map<std::uint16_t, Delegation> delegableTx_;
+
     std::unordered_map<std::string, GranularPermissionType> granularPermissionMap_;
 
     std::unordered_map<GranularPermissionType, std::string> granularNameMap_;
-    std::unordered_map<GranularPermissionType, TxType> granularTxTypeMap_;
 
-    std::unordered_map<GranularPermissionType, std::uint32_t> granularPermittedFlags_;
-    std::unordered_map<GranularPermissionType, SOTemplate> granularTemplates_;
-    std::unordered_set<TxType> granularTxTypes_;
+    std::unordered_map<GranularPermissionType, TxType> granularTxTypeMap_;
 
 public:
     static Permission const&
@@ -76,9 +71,6 @@ public:
     bool
     isDelegable(std::uint32_t const& permissionValue, Rules const& rules) const;
 
-    bool
-    hasGranularPermissions(TxType txType) const;
-
     // for tx level permission, permission value is equal to tx type plus one
     static uint32_t
     txToPermissionType(TxType const& type);
@@ -86,23 +78,6 @@ public:
     // tx type value is permission value minus one
     static TxType
     permissionToTxType(uint32_t const& value);
-
-    /**
-     * @brief Verifies a delegated transaction against its granular permission template.
-     *
-     * @note WARNING: Do not move this check before standard transaction-level
-     * format checks, which is in preclaim. This function assumes the transaction's
-     * base structural integrity (fees, sequence, signatures) has already been
-     * validated.
-     *
-     * @param tx The transaction to verify.
-     * @param heldPermissions The granular permissions that the sender hold.
-     * @return true if the transaction fields and flags comply with the granular template.
-     */
-    [[nodiscard]] bool
-    checkGranularSandbox(
-        STTx const& tx,
-        std::unordered_set<GranularPermissionType> const& heldPermissions) const;
 };
 
 }  // namespace xrpl

include/xrpl/protocol/Protocol.h

@@ -307,51 +307,4 @@ std::size_t constexpr permissionMaxSize = 10;
 /** The maximum number of transactions that can be in a batch. */
 std::size_t constexpr maxBatchTxCount = 8;
 
-/** Length of one component of EC ElGamal ciphertext */
-std::size_t constexpr ecGamalEncryptedLength = 33;
-
-/** EC ElGamal ciphertext length: two 33-byte components concatenated */
-std::size_t constexpr ecGamalEncryptedTotalLength = ecGamalEncryptedLength * 2;
-
-/** Length of EC point (compressed) */
-std::size_t constexpr compressedECPointLength = 33;
-
-/** Length of EC public key (compressed) */
-std::size_t constexpr ecPubKeyLength = compressedECPointLength;
-
-/** Length of EC private key in bytes */
-std::size_t constexpr ecPrivKeyLength = 32;
-
-/** Length of the EC blinding factor in bytes */
-std::size_t constexpr ecBlindingFactorLength = 32;
-
-/** Length of Schnorr ZKProof for public key registration (compact form) in bytes */
-std::size_t constexpr ecSchnorrProofLength = 64;
-
-/** Length of Pedersen Commitment (compressed) */
-std::size_t constexpr ecPedersenCommitmentLength = compressedECPointLength;
-
-/** Length of single bulletproof (range proof for 1 commitment) in bytes */
-std::size_t constexpr ecSingleBulletproofLength = 688;
-
-/** Length of double bulletproof (range proof for 2 commitments) in bytes */
-std::size_t constexpr ecDoubleBulletproofLength = 754;
-
-/** Length of compact AND-composed sigma proof for ConfidentialMPTSend.
- *  192 bytes compact sigma proof + 754 bytes double bulletproof. */
-std::size_t constexpr ecCompactSendProofLength = 946;
-
-/** Length of compact AND-composed sigma proof for ConfidentialMPTConvertBack.
- *  128 bytes compact sigma proof + 688 bytes single bulletproof. */
-std::size_t constexpr ecCompactConvertBackProofLength = 816;
-
-/** Length of compact sigma proof for ConfidentialMPTClawback. */
-std::size_t constexpr ecCompactClawbackProofLength = 64;
-
-/** Compressed EC point prefix for even y-coordinate */
-std::uint8_t constexpr ecCompressedPrefixEvenY = 0x02;
-
-/** Compressed EC point prefix for odd y-coordinate */
-std::uint8_t constexpr ecCompressedPrefixOddY = 0x03;
-
 }  // namespace xrpl

include/xrpl/protocol/STTx.h

@@ -153,16 +153,13 @@ private:
     Expected<void, std::string>
     checkBatchMultiSign(STObject const& batchSigner, Rules const& rules) const;
 
-    void
-    buildBatchTxnIds();
-
     STBase*
     copy(std::size_t n, void* buf) const override;
     STBase*
     move(std::size_t n, void* buf) override;
 
     friend class detail::STVar;
-    std::vector<uint256> batchTxnIds_;
+    mutable std::vector<uint256> batchTxnIds_;
 };
 
 bool

include/xrpl/protocol/TER.h

@@ -122,7 +122,6 @@ enum TEMcodes : TERUnderlyingType {
     temBAD_TRANSFER_FEE,
     temINVALID_INNER_BATCH,
     temBAD_MPT,
-    temBAD_CIPHERTEXT,
 };
 
 //------------------------------------------------------------------------------
@@ -211,7 +210,6 @@ enum TERcodes : TERUnderlyingType {
                                 // create a pseudo-account
     terNO_DELEGATE_PERMISSION,  // Delegate does not have permission
     terLOCKED,                  // MPT is locked
-    terNO_SPONSORSHIP,          // No sponsorship found
 };
 
 //------------------------------------------------------------------------------
@@ -346,12 +344,6 @@ enum TECcodes : TERUnderlyingType {
     tecLIMIT_EXCEEDED = 195,
     tecPSEUDO_ACCOUNT = 196,
     tecPRECISION_LOSS = 197,
-    // DEPRECATED: This error code tecNO_DELEGATE_PERMISSION is reserved for
-    // backward compatibility with historical data on non-prod networks, can be
-    // reclaimed after those networks reset.
-    tecNO_DELEGATE_PERMISSION = 198,
-    tecBAD_PROOF = 199,
-    tecNO_SPONSOR_PERMISSION = 200,
 };
 
 //------------------------------------------------------------------------------

include/xrpl/protocol/TxFlags.h

@@ -100,8 +100,7 @@ inline constexpr FlagValue tfUniversalMask = ~tfUniversal;
     TRANSACTION(Payment,                                                                                                                                       \
         TF_FLAG(tfNoRippleDirect, 0x00010000)                                                                                                                  \
         TF_FLAG(tfPartialPayment, 0x00020000)                                                                                                                  \
-        TF_FLAG(tfLimitQuality, 0x00040000)                                                                                                                    \
-        TF_FLAG(tfSponsorCreatedAccount, 0x00080000),                                                                                                          \
+        TF_FLAG(tfLimitQuality, 0x00040000),                                                                                                                   \
         MASK_ADJ(0))                                                                                                                                           \
                                                                                                                                                                \
     TRANSACTION(TrustSet,                                                                                                                                      \
@@ -139,8 +138,7 @@ inline constexpr FlagValue tfUniversalMask = ~tfUniversal;
         TF_FLAG(tfMPTCanEscrow, lsfMPTCanEscrow)                                                                                                               \
         TF_FLAG(tfMPTCanTrade, lsfMPTCanTrade)                                                                                                                 \
         TF_FLAG(tfMPTCanTransfer, lsfMPTCanTransfer)                                                                                                           \
-        TF_FLAG(tfMPTCanClawback, lsfMPTCanClawback)                                                                                                           \
-        TF_FLAG(tfMPTCanConfidentialAmount, lsfMPTCanConfidentialAmount),                                                                                                            \
+        TF_FLAG(tfMPTCanClawback, lsfMPTCanClawback),                                                                                                          \
         MASK_ADJ(0))                                                                                                                                           \
                                                                                                                                                                \
     TRANSACTION(MPTokenAuthorize,                                                                                                                              \
@@ -214,20 +212,6 @@ inline constexpr FlagValue tfUniversalMask = ~tfUniversal;
         TF_FLAG(tfLoanDefault, 0x00010000)                                                                                                                     \
         TF_FLAG(tfLoanImpair, 0x00020000)                                                                                                                      \
         TF_FLAG(tfLoanUnimpair, 0x00040000),                                                                                                                   \
-        MASK_ADJ(0))                                                                                                                                           \
-                                                                                                                                                               \
-    TRANSACTION(SponsorshipSet,                                                                                                                                \
-        TF_FLAG(tfSponsorshipSetRequireSignForFee, 0x00010000)                                                                                                 \
-        TF_FLAG(tfSponsorshipClearRequireSignForFee, 0x00020000)                                                                                               \
-        TF_FLAG(tfSponsorshipSetRequireSignForReserve, 0x00040000)                                                                                             \
-        TF_FLAG(tfSponsorshipClearRequireSignForReserve, 0x00080000)                                                                                          \
-        TF_FLAG(tfDeleteObject, 0x00100000),                                                                                                                   \
-        MASK_ADJ(0))                                                                                                                                           \
-                                                                                                                                                               \
-    TRANSACTION(SponsorshipTransfer,                                                                                                                           \
-        TF_FLAG(tfSponsorshipEnd, 0x00000001)                                                                                                                  \
-        TF_FLAG(tfSponsorshipCreate, 0x00000002)                                                                                                               \
-        TF_FLAG(tfSponsorshipReassign, 0x00000004),                                                                                                            \
         MASK_ADJ(0))
 
 // clang-format on
@@ -352,9 +336,6 @@ getAllTxFlags()
 inline constexpr FlagValue tfMPTPaymentMask = ~(tfUniversal | tfPartialPayment);
 inline constexpr FlagValue tfTrustSetPermissionMask =
     ~(tfUniversal | tfSetfAuth | tfSetFreeze | tfClearFreeze);
-inline constexpr FlagValue tfSponsorshipSetPermissionMask =
-    ~(tfUniversal | tfSponsorshipSetRequireSignForFee | tfSponsorshipSetRequireSignForReserve |
-      tfSponsorshipClearRequireSignForFee | tfSponsorshipClearRequireSignForReserve);
 
 // MPTokenIssuanceCreate MutableFlags:
 // Indicating specific fields or flags may be changed after issuance.
@@ -366,12 +347,10 @@ inline constexpr FlagValue tmfMPTCanMutateCanTransfer = lsmfMPTCanMutateCanTrans
 inline constexpr FlagValue tmfMPTCanMutateCanClawback = lsmfMPTCanMutateCanClawback;
 inline constexpr FlagValue tmfMPTCanMutateMetadata = lsmfMPTCanMutateMetadata;
 inline constexpr FlagValue tmfMPTCanMutateTransferFee = lsmfMPTCanMutateTransferFee;
-inline constexpr FlagValue tmfMPTCannotMutateCanConfidentialAmount =
-    lsmfMPTCannotMutateCanConfidentialAmount;
-inline constexpr FlagValue tmfMPTokenIssuanceCreateMutableMask = ~(
-    tmfMPTCanMutateCanLock | tmfMPTCanMutateRequireAuth | tmfMPTCanMutateCanEscrow |
-    tmfMPTCanMutateCanTrade | tmfMPTCanMutateCanTransfer | tmfMPTCanMutateCanClawback |
-    tmfMPTCanMutateMetadata | tmfMPTCanMutateTransferFee | tmfMPTCannotMutateCanConfidentialAmount);
+inline constexpr FlagValue tmfMPTokenIssuanceCreateMutableMask =
+    ~(tmfMPTCanMutateCanLock | tmfMPTCanMutateRequireAuth | tmfMPTCanMutateCanEscrow |
+      tmfMPTCanMutateCanTrade | tmfMPTCanMutateCanTransfer | tmfMPTCanMutateCanClawback |
+      tmfMPTCanMutateMetadata | tmfMPTCanMutateTransferFee);
 
 // MPTokenIssuanceSet MutableFlags:
 // Set or Clear flags.
@@ -388,13 +367,10 @@ inline constexpr FlagValue tmfMPTSetCanTransfer = 0x00000100;
 inline constexpr FlagValue tmfMPTClearCanTransfer = 0x00000200;
 inline constexpr FlagValue tmfMPTSetCanClawback = 0x00000400;
 inline constexpr FlagValue tmfMPTClearCanClawback = 0x00000800;
-inline constexpr FlagValue tmfMPTSetCanConfidentialAmount = 0x00001000;
-inline constexpr FlagValue tmfMPTClearCanConfidentialAmount = 0x00002000;
-inline constexpr FlagValue tmfMPTokenIssuanceSetMutableMask =
-    ~(tmfMPTSetCanLock | tmfMPTClearCanLock | tmfMPTSetRequireAuth | tmfMPTClearRequireAuth |
-      tmfMPTSetCanEscrow | tmfMPTClearCanEscrow | tmfMPTSetCanTrade | tmfMPTClearCanTrade |
-      tmfMPTSetCanTransfer | tmfMPTClearCanTransfer | tmfMPTSetCanClawback |
-      tmfMPTClearCanClawback | tmfMPTSetCanConfidentialAmount | tmfMPTClearCanConfidentialAmount);
+inline constexpr FlagValue tmfMPTokenIssuanceSetMutableMask = ~(
+    tmfMPTSetCanLock | tmfMPTClearCanLock | tmfMPTSetRequireAuth | tmfMPTClearRequireAuth |
+    tmfMPTSetCanEscrow | tmfMPTClearCanEscrow | tmfMPTSetCanTrade | tmfMPTClearCanTrade |
+    tmfMPTSetCanTransfer | tmfMPTClearCanTransfer | tmfMPTSetCanClawback | tmfMPTClearCanClawback);
 
 // Prior to fixRemoveNFTokenAutoTrustLine, transfer of an NFToken between accounts allowed a
 // TrustLine to be added to the issuer of that token without explicit permission from that issuer.
@@ -467,33 +443,4 @@ getAsfFlagMap()
 #pragma pop_macro("ACCOUNTSET_FLAG_TO_MAP")
 #pragma pop_macro("ACCOUNTSET_FLAGS")
 
-#pragma push_macro("SPONSOR_FLAGS")
-#pragma push_macro("SPONSOR_FLAG_TO_VALUE")
-#pragma push_macro("SPONSOR_FLAG_TO_MAP")
-
-// Sponsor Flag values
-#define SPONSOR_FLAGS(SPF_FLAG) \
-    SPF_FLAG(spfSponsorFee, 1)  \
-    SPF_FLAG(spfSponsorReserve, 2)
-
-#define SPONSOR_FLAG_TO_VALUE(name, value) inline constexpr FlagValue name = value;
-#define SPONSOR_FLAG_TO_MAP(name, value) {#name, value},
-
-SPONSOR_FLAGS(SPONSOR_FLAG_TO_VALUE)
-
-inline std::map<std::string, FlagValue> const&
-getspfFlagMap()
-{
-    static std::map<std::string, FlagValue> const flags = {SPONSOR_FLAGS(SPONSOR_FLAG_TO_MAP)};
-    return flags;
-}
-
-#undef SPONSOR_FLAG_TO_VALUE
-#undef SPONSOR_FLAG_TO_MAP
-#undef SPONSOR_FLAGS
-
-#pragma pop_macro("SPONSOR_FLAG_TO_VALUE")
-#pragma pop_macro("SPONSOR_FLAG_TO_MAP")
-#pragma pop_macro("SPONSOR_FLAGS")
-
 }  // namespace xrpl

include/xrpl/protocol/detail/features.macro

@@ -15,18 +15,16 @@
 // Add new amendments to the top of this list.
 // Keep it sorted in reverse chronological order.
 
-XRPL_FEATURE(Sponsor,                     Supported::yes,  VoteBehavior::DefaultNo)
-XRPL_FEATURE(BatchV1_1,                   Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(ConfidentialTransfer,        Supported::yes,  VoteBehavior::DefaultNo)
-XRPL_FEATURE(MPTokensV2,                  Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (Security3_1_3,               Supported::yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(MPTokensV2,                  Supported::no, VoteBehavior::DefaultNo)
+XRPL_FIX    (Security3_1_3,               Supported::no, VoteBehavior::DefaultNo)
 XRPL_FIX    (PermissionedDomainInvariant, Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (ExpiredNFTokenOfferRemoval,  Supported::yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (BatchInnerSigs,              Supported::no, VoteBehavior::DefaultNo)
 XRPL_FEATURE(LendingProtocol,             Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(PermissionDelegationV1_1,    Supported::yes,  VoteBehavior::DefaultNo)
+XRPL_FEATURE(PermissionDelegationV1_1,    Supported::no,  VoteBehavior::DefaultNo)
 XRPL_FIX    (DirectoryLimit,              Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (IncludeKeyletFields,         Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(DynamicMPT,                  Supported::yes,  VoteBehavior::DefaultNo)
+XRPL_FEATURE(DynamicMPT,                  Supported::no,  VoteBehavior::DefaultNo)
 XRPL_FIX    (TokenEscrowV1,               Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (PriceOracleOrder,            Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (MPTDeliveredAmount,          Supported::yes, VoteBehavior::DefaultNo)
@@ -35,6 +33,7 @@ XRPL_FEATURE(TokenEscrow,                 Supported::yes, VoteBehavior::DefaultN
 XRPL_FIX    (EnforceNFTokenTrustlineV2,   Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (AMMv1_3,                     Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(PermissionedDEX,             Supported::yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(Batch,                       Supported::no,  VoteBehavior::DefaultNo)
 XRPL_FEATURE(SingleAssetVault,            Supported::yes,  VoteBehavior::DefaultNo)
 XRPL_FIX    (PayChanCancelAfter,          Supported::yes, VoteBehavior::DefaultNo)
 // Check flags in Credential transactions

include/xrpl/protocol/detail/ledger_entries.macro

@@ -150,9 +150,6 @@ LEDGER_ENTRY(ltACCOUNT_ROOT, 0x0061, AccountRoot, account, ({
     {sfAMMID,                soeOPTIONAL}, // pseudo-account designator
     {sfVaultID,              soeOPTIONAL}, // pseudo-account designator
     {sfLoanBrokerID,         soeOPTIONAL}, // pseudo-account designator
-    {sfSponsoredOwnerCount,  soeDEFAULT},
-    {sfSponsoringOwnerCount, soeDEFAULT},
-    {sfSponsoringAccountCount,soeDEFAULT},
 }))
 
 /** A ledger object which contains a list of object identifiers.
@@ -289,8 +286,6 @@ LEDGER_ENTRY(ltRIPPLE_STATE, 0x0072, RippleState, state, ({
     {sfHighNode,             soeOPTIONAL},
     {sfHighQualityIn,        soeOPTIONAL},
     {sfHighQualityOut,       soeOPTIONAL},
-    {sfHighSponsor,          soeOPTIONAL},
-    {sfLowSponsor,           soeOPTIONAL},
 }))
 
 /** The ledger object which lists the network's fee settings.
@@ -392,41 +387,32 @@ LEDGER_ENTRY(ltAMM, 0x0079, AMM, amm, ({
     \sa keylet::mptIssuance
  */
 LEDGER_ENTRY(ltMPTOKEN_ISSUANCE, 0x007e, MPTokenIssuance, mpt_issuance, ({
-    {sfIssuer,                        soeREQUIRED},
-    {sfSequence,                      soeREQUIRED},
-    {sfTransferFee,                   soeDEFAULT},
-    {sfOwnerNode,                     soeREQUIRED},
-    {sfAssetScale,                    soeDEFAULT},
-    {sfMaximumAmount,                 soeOPTIONAL},
-    {sfOutstandingAmount,             soeREQUIRED},
-    {sfLockedAmount,                  soeOPTIONAL},
-    {sfMPTokenMetadata,               soeOPTIONAL},
-    {sfPreviousTxnID,                 soeREQUIRED},
-    {sfPreviousTxnLgrSeq,             soeREQUIRED},
-    {sfDomainID,                      soeOPTIONAL},
-    {sfMutableFlags,                  soeDEFAULT},
-    {sfIssuerEncryptionKey,           soeOPTIONAL},
-    {sfAuditorEncryptionKey,          soeOPTIONAL},
-    {sfConfidentialOutstandingAmount, soeDEFAULT},
+    {sfIssuer,                   soeREQUIRED},
+    {sfSequence,                 soeREQUIRED},
+    {sfTransferFee,              soeDEFAULT},
+    {sfOwnerNode,                soeREQUIRED},
+    {sfAssetScale,               soeDEFAULT},
+    {sfMaximumAmount,            soeOPTIONAL},
+    {sfOutstandingAmount,        soeREQUIRED},
+    {sfLockedAmount,             soeOPTIONAL},
+    {sfMPTokenMetadata,          soeOPTIONAL},
+    {sfPreviousTxnID,            soeREQUIRED},
+    {sfPreviousTxnLgrSeq,        soeREQUIRED},
+    {sfDomainID,                 soeOPTIONAL},
+    {sfMutableFlags,             soeDEFAULT},
 }))
 
 /** A ledger object which tracks MPToken
     \sa keylet::mptoken
  */
 LEDGER_ENTRY(ltMPTOKEN, 0x007f, MPToken, mptoken, ({
-    {sfAccount,                     soeREQUIRED},
-    {sfMPTokenIssuanceID,           soeREQUIRED},
-    {sfMPTAmount,                   soeDEFAULT},
-    {sfLockedAmount,                soeOPTIONAL},
-    {sfOwnerNode,                   soeREQUIRED},
-    {sfPreviousTxnID,               soeREQUIRED},
-    {sfPreviousTxnLgrSeq,           soeREQUIRED},
-    {sfConfidentialBalanceInbox,    soeOPTIONAL},
-    {sfConfidentialBalanceSpending, soeOPTIONAL},
-    {sfConfidentialBalanceVersion,  soeDEFAULT},
-    {sfIssuerEncryptedBalance,      soeOPTIONAL},
-    {sfAuditorEncryptedBalance,     soeOPTIONAL},
-    {sfHolderEncryptionKey,         soeOPTIONAL},
+    {sfAccount,                  soeREQUIRED},
+    {sfMPTokenIssuanceID,        soeREQUIRED},
+    {sfMPTAmount,                soeDEFAULT},
+    {sfLockedAmount,             soeOPTIONAL},
+    {sfOwnerNode,                soeREQUIRED},
+    {sfPreviousTxnID,            soeREQUIRED},
+    {sfPreviousTxnLgrSeq,        soeREQUIRED},
 }))
 
 /** A ledger object which tracks Oracle
@@ -480,7 +466,6 @@ LEDGER_ENTRY(ltDELEGATE, 0x0083, Delegate, delegate, ({
     {sfAuthorize,            soeREQUIRED},
     {sfPermissions,          soeREQUIRED},
     {sfOwnerNode,            soeREQUIRED},
-    {sfDestinationNode,      soeOPTIONAL},
     {sfPreviousTxnID,        soeREQUIRED},
     {sfPreviousTxnLgrSeq,    soeREQUIRED},
 }))
@@ -620,20 +605,5 @@ LEDGER_ENTRY(ltLOAN, 0x0089, Loan, loan, ({
     {sfLoanScale,                soeDEFAULT},
 }))
 
-/** A ledger object representing a sponsorship.
-    \sa keylet::sponsor
- */
-LEDGER_ENTRY(ltSPONSORSHIP, 0x0090, Sponsorship, sponsorship, ({
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
-    {sfOwner,                soeREQUIRED},
-    {sfSponsee,              soeREQUIRED},
-    {sfFeeAmount,            soeOPTIONAL},
-    {sfMaxFee,               soeOPTIONAL},
-    {sfReserveCount,         soeDEFAULT},
-    {sfOwnerNode,            soeREQUIRED},
-    {sfSponseeNode,          soeREQUIRED},
-}))
-
 #undef EXPAND
 #undef LEDGER_ENTRY_DUPLICATE

include/xrpl/protocol/detail/permissions.macro

@@ -1,95 +1,49 @@
-#if !defined(GRANULAR_PERMISSION)
-#error "undefined macro: GRANULAR_PERMISSION"
+#if !defined(PERMISSION)
+#error "undefined macro: PERMISSION"
 #endif
 
 /**
- * GRANULAR_PERMISSION(name, txType, value, allowedFlags, allowedFields)
+ * PERMISSION(name, type, txType, value)
  *
- * Defines a granular permission:
- *   name:          the granular permission name.
- *   txType:        the corresponding TxType for this permission.
- *   value:         the uint32 numeric value for the enum type.
- *   allowedFlags:  transaction flags permitted under this permission.
- *   allowedFields: transaction fields permitted under this permission.
+ * 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.
  */
 
-/** Grants the ability to authorize a trustline. */
-GRANULAR_PERMISSION(TrustlineAuthorize, ttTRUST_SET, 65537, tfUniversal | tfSetfAuth,
-    ({{sfLimitAmount, soeREQUIRED}}))
+/** This permission grants the delegated account the ability to authorize a trustline. */
+PERMISSION(TrustlineAuthorize, ttTRUST_SET, 65537)
 
-/** Grants the ability to freeze a trustline. */
-GRANULAR_PERMISSION(TrustlineFreeze, ttTRUST_SET, 65538, tfUniversal | tfSetFreeze,
-    ({{sfLimitAmount, soeREQUIRED}}))
+/** This permission grants the delegated account the ability to freeze a trustline. */
+PERMISSION(TrustlineFreeze, ttTRUST_SET, 65538)
 
-/** Grants the ability to unfreeze a trustline. */
-GRANULAR_PERMISSION(TrustlineUnfreeze, ttTRUST_SET, 65539, tfUniversal | tfClearFreeze,
-    ({{sfLimitAmount, soeREQUIRED}}))
+/** This permission grants the delegated account the ability to unfreeze a trustline. */
+PERMISSION(TrustlineUnfreeze, ttTRUST_SET, 65539)
 
-/** Grants the ability to set Domain. */
-GRANULAR_PERMISSION(AccountDomainSet, ttACCOUNT_SET, 65540, tfUniversal,
-    ({{sfDomain, soeOPTIONAL}}))
+/** This permission grants the delegated account the ability to set Domain. */
+PERMISSION(AccountDomainSet, ttACCOUNT_SET, 65540)
 
-/** Grants the ability to set EmailHash. */
-GRANULAR_PERMISSION(AccountEmailHashSet, ttACCOUNT_SET, 65541, tfUniversal,
-    ({{sfEmailHash, soeOPTIONAL}}))
+/** This permission grants the delegated account the ability to set EmailHashSet. */
+PERMISSION(AccountEmailHashSet, ttACCOUNT_SET, 65541)
 
-/** Grants the ability to set MessageKey. */
-GRANULAR_PERMISSION(AccountMessageKeySet, ttACCOUNT_SET, 65542, tfUniversal,
-    ({{sfMessageKey, soeOPTIONAL}}))
+/** This permission grants the delegated account the ability to set MessageKey. */
+PERMISSION(AccountMessageKeySet, ttACCOUNT_SET, 65542)
 
-/** Grants the ability to set TransferRate. */
-GRANULAR_PERMISSION(AccountTransferRateSet, ttACCOUNT_SET, 65543, tfUniversal,
-    ({{sfTransferRate, soeOPTIONAL}}))
+/** This permission grants the delegated account the ability to set TransferRate. */
+PERMISSION(AccountTransferRateSet, ttACCOUNT_SET, 65543)
 
-/** Grants the ability to set TickSize. */
-GRANULAR_PERMISSION(AccountTickSizeSet, ttACCOUNT_SET, 65544, tfUniversal,
-    ({{sfTickSize, soeOPTIONAL}}))
+/** This permission grants the delegated account the ability to set TickSize. */
+PERMISSION(AccountTickSizeSet, ttACCOUNT_SET, 65544)
 
-/** Grants the ability to mint payment (sending account is the issuer). Cross-currency payments are disallowed. */
-GRANULAR_PERMISSION(PaymentMint, ttPAYMENT, 65545,
-    tfUniversal | tfPartialPayment | tfLimitQuality | tfNoRippleDirect,
-    ({{sfDestination, soeREQUIRED},
-      {sfAmount, soeREQUIRED},
-      {sfSendMax, soeOPTIONAL},
-      {sfInvoiceID, soeOPTIONAL},
-      {sfDestinationTag, soeOPTIONAL},
-      {sfDeliverMin, soeOPTIONAL},
-      {sfCredentialIDs, soeOPTIONAL},
-      {sfDomainID, soeOPTIONAL}}))
+/** 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)
 
-/** Grants the ability to burn payment (destination account is the issuer). Cross-currency payments are disallowed. */
-GRANULAR_PERMISSION(PaymentBurn, ttPAYMENT, 65546,
-    tfUniversal | tfPartialPayment | tfLimitQuality | tfNoRippleDirect,
-    ({{sfDestination, soeREQUIRED},
-      {sfAmount, soeREQUIRED},
-      {sfSendMax, soeOPTIONAL},
-      {sfInvoiceID, soeOPTIONAL},
-      {sfDestinationTag, soeOPTIONAL},
-      {sfDeliverMin, soeOPTIONAL},
-      {sfCredentialIDs, soeOPTIONAL},
-      {sfDomainID, soeOPTIONAL}}))
+/** 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)
 
-/** Grants the ability to lock an MPToken. */
-GRANULAR_PERMISSION(MPTokenIssuanceLock, ttMPTOKEN_ISSUANCE_SET, 65547, tfUniversal | tfMPTLock,
-    ({{sfMPTokenIssuanceID, soeREQUIRED},
-      {sfHolder, soeOPTIONAL}}))
+/** This permission grants the delegated account the ability to lock MPToken. */
+PERMISSION(MPTokenIssuanceLock, ttMPTOKEN_ISSUANCE_SET, 65547)
 
-/** Grants the ability to unlock an MPToken. */
-GRANULAR_PERMISSION(MPTokenIssuanceUnlock, ttMPTOKEN_ISSUANCE_SET, 65548, tfUniversal | tfMPTUnlock,
-    ({{sfMPTokenIssuanceID, soeREQUIRED},
-      {sfHolder, soeOPTIONAL}}))
-
-/** Grants the ability to set SponsorFee. */
-GRANULAR_PERMISSION(SponsorFee, ttSPONSORSHIP_SET, 65549,
-    tfUniversal | tfSponsorshipSetRequireSignForFee | tfSponsorshipClearRequireSignForFee,
-    ({{sfFeeAmount, soeOPTIONAL},
-      {sfMaxFee, soeOPTIONAL},
-      {sfSponsee, soeOPTIONAL},
-      {sfCounterpartySponsor, soeOPTIONAL}}))
-
-/** Grants the ability to set SponsorReserve. */
-GRANULAR_PERMISSION(SponsorReserve, ttSPONSORSHIP_SET, 65550,
-    tfUniversal | tfSponsorshipSetRequireSignForReserve | tfSponsorshipClearRequireSignForReserve,
-    ({{sfReserveCount, soeOPTIONAL},
-      {sfSponsee, soeOPTIONAL},
-      {sfCounterpartySponsor, soeOPTIONAL}}))
+/** This permission grants the delegated account the ability to unlock MPToken. */
+PERMISSION(MPTokenIssuanceUnlock, ttMPTOKEN_ISSUANCE_SET, 65548)

include/xrpl/protocol/detail/secp256k1.h

@@ -11,10 +11,7 @@ secp256k1Context()
     struct holder
     {
         secp256k1_context* impl;
-        // SECP256K1_CONTEXT_SIGN and SECP256K1_CONTEXT_VERIFY were
-        // deprecated. All contexts support both signing and verification, so
-        // SECP256K1_CONTEXT_NONE is the correct flag to use.
-        holder() : impl(secp256k1_context_create(SECP256K1_CONTEXT_NONE))
+        holder() : impl(secp256k1_context_create(SECP256K1_CONTEXT_VERIFY | SECP256K1_CONTEXT_SIGN))
         {
         }
 

include/xrpl/protocol/detail/sfields.macro

@@ -113,12 +113,6 @@ TYPED_SFIELD(sfInterestRate,             UINT32,    65) // 1/10 basis points (bi
 TYPED_SFIELD(sfLateInterestRate,         UINT32,    66) // 1/10 basis points (bips)
 TYPED_SFIELD(sfCloseInterestRate,        UINT32,    67) // 1/10 basis points (bips)
 TYPED_SFIELD(sfOverpaymentInterestRate,  UINT32,    68) // 1/10 basis points (bips)
-TYPED_SFIELD(sfConfidentialBalanceVersion, UINT32,  69)
-TYPED_SFIELD(sfSponsoredOwnerCount,      UINT32,    70)
-TYPED_SFIELD(sfSponsoringOwnerCount,     UINT32,    71)
-TYPED_SFIELD(sfSponsoringAccountCount,   UINT32,    72)
-TYPED_SFIELD(sfReserveCount,             UINT32,    73)
-TYPED_SFIELD(sfSponsorFlags,             UINT32,    74)
 
 // 64-bit integers (common)
 TYPED_SFIELD(sfIndexNext,                UINT64,     1)
@@ -152,8 +146,6 @@ TYPED_SFIELD(sfSubjectNode,              UINT64,    28)
 TYPED_SFIELD(sfLockedAmount,             UINT64,    29, SField::sMD_BaseTen|SField::sMD_Default)
 TYPED_SFIELD(sfVaultNode,                UINT64,    30)
 TYPED_SFIELD(sfLoanBrokerNode,           UINT64,    31)
-TYPED_SFIELD(sfConfidentialOutstandingAmount, UINT64, 32, SField::sMD_BaseTen|SField::sMD_Default)
-TYPED_SFIELD(sfSponseeNode,              UINT64,    33)
 
 // 128-bit
 TYPED_SFIELD(sfEmailHash,                UINT128,    1)
@@ -213,8 +205,6 @@ TYPED_SFIELD(sfParentBatchID,            UINT256,   36)
 TYPED_SFIELD(sfLoanBrokerID,             UINT256,   37,
     SField::sMD_PseudoAccount | SField::sMD_Default)
 TYPED_SFIELD(sfLoanID,                   UINT256,   38)
-TYPED_SFIELD(sfBlindingFactor,           UINT256,   39)
-TYPED_SFIELD(sfObjectID,                 UINT256,   40)
 
 // number (common)
 TYPED_SFIELD(sfNumber,                   NUMBER,     1)
@@ -274,8 +264,6 @@ TYPED_SFIELD(sfPrice,                    AMOUNT,    28)
 TYPED_SFIELD(sfSignatureReward,          AMOUNT,    29)
 TYPED_SFIELD(sfMinAccountCreateAmount,   AMOUNT,    30)
 TYPED_SFIELD(sfLPTokenBalance,           AMOUNT,    31)
-TYPED_SFIELD(sfFeeAmount,                AMOUNT,    32)
-TYPED_SFIELD(sfMaxFee,                   AMOUNT,    33)
 
 // variable length (common)
 TYPED_SFIELD(sfPublicKey,                VL,         1)
@@ -310,21 +298,6 @@ TYPED_SFIELD(sfAssetClass,               VL,        28)
 TYPED_SFIELD(sfProvider,                 VL,        29)
 TYPED_SFIELD(sfMPTokenMetadata,          VL,        30)
 TYPED_SFIELD(sfCredentialType,           VL,        31)
-TYPED_SFIELD(sfConfidentialBalanceInbox, VL,        32)
-TYPED_SFIELD(sfConfidentialBalanceSpending, VL,     33)
-TYPED_SFIELD(sfIssuerEncryptedBalance,   VL,        34)
-TYPED_SFIELD(sfIssuerEncryptionKey,      VL,        35)
-TYPED_SFIELD(sfHolderEncryptionKey,      VL,        36)
-TYPED_SFIELD(sfZKProof,                  VL,        37)
-TYPED_SFIELD(sfHolderEncryptedAmount,    VL,        38)
-TYPED_SFIELD(sfIssuerEncryptedAmount,    VL,        39)
-TYPED_SFIELD(sfSenderEncryptedAmount,    VL,        40)
-TYPED_SFIELD(sfDestinationEncryptedAmount, VL,      41)
-TYPED_SFIELD(sfAuditorEncryptedBalance,  VL,        42)
-TYPED_SFIELD(sfAuditorEncryptedAmount,   VL,        43)
-TYPED_SFIELD(sfAuditorEncryptionKey,     VL,        44)
-TYPED_SFIELD(sfAmountCommitment,         VL,        45)
-TYPED_SFIELD(sfBalanceCommitment,        VL,        46)
 
 // account (common)
 TYPED_SFIELD(sfAccount,                  ACCOUNT,    1)
@@ -351,11 +324,6 @@ TYPED_SFIELD(sfIssuingChainDoor,         ACCOUNT,   23)
 TYPED_SFIELD(sfSubject,                  ACCOUNT,   24)
 TYPED_SFIELD(sfBorrower,                 ACCOUNT,   25)
 TYPED_SFIELD(sfCounterparty,             ACCOUNT,   26)
-TYPED_SFIELD(sfSponsor,                  ACCOUNT,   27)
-TYPED_SFIELD(sfHighSponsor,              ACCOUNT,   28)
-TYPED_SFIELD(sfLowSponsor,               ACCOUNT,   29)
-TYPED_SFIELD(sfCounterpartySponsor,      ACCOUNT,   30)
-TYPED_SFIELD(sfSponsee,                  ACCOUNT,   31)
 
 // vector of 256-bit
 TYPED_SFIELD(sfIndexes,                  VECTOR256,  1, SField::sMD_Never)
@@ -420,7 +388,6 @@ UNTYPED_SFIELD(sfRawTransaction,         OBJECT,    34)
 UNTYPED_SFIELD(sfBatchSigner,            OBJECT,    35)
 UNTYPED_SFIELD(sfBook,                   OBJECT,    36)
 UNTYPED_SFIELD(sfCounterpartySignature,  OBJECT,    37, SField::sMD_Default, SField::notSigning)
-UNTYPED_SFIELD(sfSponsorSignature,       OBJECT,    38, SField::sMD_Default, SField::notSigning)
 
 // array of objects (common)
 // ARRAY/1 is reserved for end of array

include/xrpl/protocol/detail/transactions.macro

@@ -734,8 +734,6 @@ TRANSACTION(ttMPTOKEN_ISSUANCE_SET, 56, MPTokenIssuanceSet,
     {sfMPTokenMetadata, soeOPTIONAL},
     {sfTransferFee, soeOPTIONAL},
     {sfMutableFlags, soeOPTIONAL},
-    {sfIssuerEncryptionKey, soeOPTIONAL},
-    {sfAuditorEncryptionKey, soeOPTIONAL},
 }))
 
 /** This transaction type authorizes a MPToken instance */
@@ -938,7 +936,7 @@ TRANSACTION(ttVAULT_CLAWBACK, 70, VaultClawback,
 #endif
 TRANSACTION(ttBATCH, 71, Batch,
     Delegation::notDelegable,
-    featureBatchV1_1,
+    featureBatch,
     noPriv,
     ({
     {sfRawTransactions, soeREQUIRED},
@@ -1078,119 +1076,6 @@ TRANSACTION(ttLOAN_PAY, 84, LoanPay,
     {sfAmount, soeREQUIRED, soeMPTSupported},
 }))
 
-/** This transaction type converts into confidential MPT balance. */
-#if TRANSACTION_INCLUDE
-#   include <xrpl/tx/transactors/token/ConfidentialMPTConvert.h>
-#endif
-TRANSACTION(ttCONFIDENTIAL_MPT_CONVERT, 85, ConfidentialMPTConvert,
-    Delegation::delegable,
-    featureConfidentialTransfer,
-    noPriv,
-    ({
-    {sfMPTokenIssuanceID, soeREQUIRED},
-    {sfMPTAmount, soeREQUIRED},
-    {sfHolderEncryptionKey, soeOPTIONAL},
-    {sfHolderEncryptedAmount, soeREQUIRED},
-    {sfIssuerEncryptedAmount, soeREQUIRED},
-    {sfAuditorEncryptedAmount, soeOPTIONAL},
-    {sfBlindingFactor, soeREQUIRED},
-    {sfZKProof, soeOPTIONAL},
-}))
-
-/** This transaction type merges MPT inbox. */
-#if TRANSACTION_INCLUDE
-#   include <xrpl/tx/transactors/token/ConfidentialMPTMergeInbox.h>
-#endif
-TRANSACTION(ttCONFIDENTIAL_MPT_MERGE_INBOX, 86, ConfidentialMPTMergeInbox,
-    Delegation::delegable,
-    featureConfidentialTransfer,
-    noPriv,
-    ({
-    {sfMPTokenIssuanceID, soeREQUIRED},
-}))
-
-/** This transaction type converts back into public MPT balance. */
-#if TRANSACTION_INCLUDE
-#   include <xrpl/tx/transactors/token/ConfidentialMPTConvertBack.h>
-#endif
-TRANSACTION(ttCONFIDENTIAL_MPT_CONVERT_BACK, 87, ConfidentialMPTConvertBack,
-    Delegation::delegable,
-    featureConfidentialTransfer,
-    noPriv,
-    ({
-    {sfMPTokenIssuanceID, soeREQUIRED},
-    {sfMPTAmount, soeREQUIRED},
-    {sfHolderEncryptedAmount, soeREQUIRED},
-    {sfIssuerEncryptedAmount, soeREQUIRED},
-    {sfAuditorEncryptedAmount, soeOPTIONAL},
-    {sfBlindingFactor, soeREQUIRED},
-    {sfZKProof, soeREQUIRED},
-    {sfBalanceCommitment, soeREQUIRED},
-}))
-
-#if TRANSACTION_INCLUDE
-#   include <xrpl/tx/transactors/token/ConfidentialMPTSend.h>
-#endif
-TRANSACTION(ttCONFIDENTIAL_MPT_SEND, 88, ConfidentialMPTSend,
-    Delegation::delegable,
-    featureConfidentialTransfer,
-    noPriv,
-    ({
-    {sfMPTokenIssuanceID, soeREQUIRED},
-    {sfDestination, soeREQUIRED},
-    {sfSenderEncryptedAmount, soeREQUIRED},
-    {sfDestinationEncryptedAmount, soeREQUIRED},
-    {sfIssuerEncryptedAmount, soeREQUIRED},
-    {sfAuditorEncryptedAmount, soeOPTIONAL},
-    {sfZKProof, soeREQUIRED},
-    {sfAmountCommitment, soeREQUIRED},
-    {sfBalanceCommitment, soeREQUIRED},
-    {sfCredentialIDs, soeOPTIONAL},
-}))
-
-#if TRANSACTION_INCLUDE
-#   include <xrpl/tx/transactors/token/ConfidentialMPTClawback.h>
-#endif
-TRANSACTION(ttCONFIDENTIAL_MPT_CLAWBACK, 89, ConfidentialMPTClawback,
-    Delegation::delegable,
-    featureConfidentialTransfer,
-    noPriv,
-    ({
-    {sfMPTokenIssuanceID, soeREQUIRED},
-    {sfHolder, soeREQUIRED},
-    {sfMPTAmount, soeREQUIRED},
-    {sfZKProof, soeREQUIRED},
-}))
-
-/** This transaction transfer sponsorship */
-#if TRANSACTION_INCLUDE
-#   include <xrpl/tx/transactors/sponsor/SponsorshipTransfer.h>
-#endif
-TRANSACTION(ttSPONSORSHIP_TRANSFER, 90, SponsorshipTransfer,
-    Delegation::delegable,
-    featureSponsor,
-    noPriv,
-    ({
-    {sfObjectID, soeOPTIONAL},
-    {sfSponsee, soeOPTIONAL},
-}))
-
-/** This transaction create sponsorship object */
-#if TRANSACTION_INCLUDE
-#   include <xrpl/tx/transactors/sponsor/SponsorshipSet.h>
-#endif
-TRANSACTION(ttSPONSORSHIP_SET, 91, SponsorshipSet,
-    Delegation::delegable,
-    featureSponsor,
-    noPriv,
-    ({
-    {sfCounterpartySponsor, soeOPTIONAL},
-    {sfSponsee, soeOPTIONAL},
-    {sfFeeAmount, soeOPTIONAL},
-    {sfMaxFee, soeOPTIONAL},
-    {sfReserveCount, soeOPTIONAL},
-}))
-
 /** This system-generated transaction type is used to update the status of the various amendments.
 
     For details, see: https://xrpl.org/amendments.html

include/xrpl/protocol/jss.h

@@ -137,7 +137,6 @@ JSS(authorized_credentials);      // in: ledger_entry DepositPreauth
 JSS(auth_accounts);               // out: amm_info
 JSS(auth_change);                 // out: AccountInfo
 JSS(auth_change_queued);          // out: AccountInfo
-JSS(auditor_encrypted_balance);   // out: mpt_holders (confidential MPT)
 JSS(available);                   // out: ValidatorList
 JSS(avg_bps_recv);                // out: Peers
 JSS(avg_bps_sent);                // out: Peers
@@ -162,6 +161,9 @@ JSS(build_path);                  // in: TransactionSign
 JSS(build_version);               // out: NetworkOPs
 JSS(cancel_after);                // out: AccountChannels
 JSS(can_delete);                  // out: CanDelete
+JSS(mpt_amount);                  // out: mpt_holders
+JSS(mpt_issuance_id);             // in: Payment, mpt_holders
+JSS(mptoken_index);               // out: mpt_holders
 JSS(changes);                     // out: BookChanges
 JSS(channel_id);                  // out: AccountChannels
 JSS(channels);                    // out: AccountChannels
@@ -183,170 +185,165 @@ JSS(command);                     // in: RPCHandler
 JSS(common);                      // out: RPC server_definitions
 JSS(complete);                    // out: NetworkOPs, InboundLedger
 JSS(complete_ledgers);            // out: NetworkOPs, PeerImp
-JSS(confidential_balance_inbox);  // out: mpt_holders (confidential MPT)
-JSS(confidential_balance_spending);  // out: mpt_holders (confidential MPT)
-JSS(confidential_balance_version);   // out: mpt_holders (confidential MPT)
-JSS(consensus);                      // out: NetworkOPs, LedgerConsensus
-JSS(converge_time);                  // out: NetworkOPs
-JSS(converge_time_s);                // out: NetworkOPs
-JSS(cookie);                         // out: NetworkOPs
-JSS(count);                          // in: AccountTx*, ValidatorList
-JSS(counters);                       // in/out: retrieve counters
-JSS(credentials);                    // in: deposit_authorized
-JSS(credential_type);                // in: LedgerEntry DepositPreauth
-JSS(ctid);                           // in/out: Tx RPC
-JSS(currency_a);                     // out: BookChanges
-JSS(currency_b);                     // out: BookChanges
-JSS(currency);                       // in: paths/PathRequest, STAmount
-                                     // out: STPathSet, STAmount, AccountLines
-JSS(current);                        // out: OwnerInfo
-JSS(current_activities);             //
-JSS(current_ledger_size);            // out: TxQ
-JSS(current_queue_size);             // out: TxQ
-JSS(data);                           // out: LedgerData
-JSS(date);                           // out: tx/Transaction, NetworkOPs
-JSS(dbKBLedger);                     // out: getCounts
-JSS(dbKBTotal);                      // out: getCounts
-JSS(dbKBTransaction);                // out: getCounts
-JSS(debug_signing);                  // in: TransactionSign
-JSS(deletion_blockers_only);         // in: AccountObjects
-JSS(delivered_amount);               // out: insertDeliveredAmount
-JSS(deposit_authorized);             // out: deposit_authorized
-JSS(deprecated);                     //
-JSS(descending);                     // in: AccountTx*
-JSS(description);                    // in/out: Reservations
-JSS(destination);                    // in: nft_buy_offers, nft_sell_offers
-JSS(destination_account);            // in: PathRequest, RipplePathFind, account_lines
-                                     // out: AccountChannels
-JSS(destination_amount);             // in: PathRequest, RipplePathFind
-JSS(destination_currencies);         // in: PathRequest, RipplePathFind
-JSS(destination_tag);                // in: PathRequest
-                                     // out: AccountChannels
-JSS(details);                        // out: Manifest, server_info
-JSS(dir_entry);                      // out: DirectoryEntryIterator
-JSS(dir_index);                      // out: DirectoryEntryIterator
-JSS(dir_root);                       // out: DirectoryEntryIterator
-JSS(discounted_fee);                 // out: amm_info
-JSS(domain);                         // out: ValidatorInfo, Manifest
-JSS(drops);                          // out: TxQ
-JSS(duration_us);                    // out: NetworkOPs
-JSS(effective);                      // out: ValidatorList
-                                     // in: UNL
-JSS(enabled);                        // out: AmendmentTable
-JSS(engine_result);                  // out: NetworkOPs, TransactionSign, Submit
-JSS(engine_result_code);             // out: NetworkOPs, TransactionSign, Submit
-JSS(engine_result_message);          // out: NetworkOPs, TransactionSign, Submit
-JSS(entire_set);                     // out: get_aggregate_price
-JSS(ephemeral_key);                  // out: ValidatorInfo
-                                     // in/out: Manifest
-JSS(error);                          // out: error
-JSS(errored);                        //
-JSS(error_code);                     // out: error
-JSS(error_exception);                // out: Submit
-JSS(error_message);                  // out: error
-JSS(expand);                         // in: handler/Ledger
-JSS(expected_date);                  // out: any (warnings)
-JSS(expected_date_UTC);              // out: any (warnings)
-JSS(expected_ledger_size);           // out: TxQ
-JSS(expiration);                     // out: AccountOffers, AccountChannels, ValidatorList, amm_info
-JSS(fail_hard);                      // in: Sign, Submit
-JSS(failed);                         // out: InboundLedger
-JSS(feature);                        // in: Feature
-JSS(features);                       // out: Feature
-JSS(fee_base);                       // out: NetworkOPs
-JSS(fee_div_max);                    // in: TransactionSign
-JSS(fee_level);                      // out: AccountInfo
-JSS(fee_mult_max);                   // in: TransactionSign
-JSS(fee_ref);                        // out: NetworkOPs, DEPRECATED
-JSS(fetch_pack);                     // out: NetworkOPs
-JSS(FIELDS);                         // out: RPC server_definitions
-                                     // matches definitions.json format
-JSS(first);                          // out: rpc/Version
-JSS(finished);                       //
-JSS(fix_txns);                       // in: LedgerCleaner
-JSS(flags);                          // out: AccountOffers, NetworkOPs
-JSS(forward);                        // in: AccountTx
-JSS(freeze);                         // out: AccountLines
-JSS(freeze_peer);                    // out: AccountLines
-JSS(deep_freeze);                    // out: AccountLines
-JSS(deep_freeze_peer);               // out: AccountLines
-JSS(frozen_balances);                // out: GatewayBalances
-JSS(full);                           // in: LedgerClearer, handlers/Ledger
-JSS(full_reply);                     // out: PathFind
-JSS(fullbelow_size);                 // out: GetCounts
-JSS(git);                            // out: server_info
-JSS(good);                           // out: RPCVersion
-JSS(hash);                           // out: NetworkOPs, InboundLedger, LedgerToJson, STTx; field
-JSS(have_header);                    // out: InboundLedger
-JSS(have_state);                     // out: InboundLedger
-JSS(have_transactions);              // out: InboundLedger
-JSS(high);                           // out: BookChanges
-JSS(highest_sequence);               // out: AccountInfo
-JSS(highest_ticket);                 // out: AccountInfo
-JSS(historical_perminute);           // historical_perminute.
-JSS(holders);                        // out: MPTHolders
-JSS(holder_encryption_key);          // out: mpt_holders (confidential MPT)
-JSS(hostid);                         // out: NetworkOPs
-JSS(hotwallet);                      // in: GatewayBalances
-JSS(id);                             // websocket.
-JSS(ident);                          // in: AccountCurrencies, AccountInfo, OwnerInfo
-JSS(ignore_default);                 // in: AccountLines
-JSS(in);                             // out: OverlayImpl
-JSS(inLedger);                       // out: tx/Transaction
-JSS(inbound);                        // out: PeerImp
-JSS(index);                          // in: LedgerEntry
-                                     // out: STLedgerEntry, LedgerEntry, TxHistory, LedgerData
-JSS(info);                           // out: ServerInfo, ConsensusInfo, FetchInfo
-JSS(initial_sync_duration_us);       //
-JSS(internal_command);               // in: Internal
-JSS(invalid_API_version);            // out: Many, when a request has an invalid version
-JSS(io_latency_ms);                  // out: NetworkOPs
-JSS(ip);                             // in: Connect, out: OverlayImpl
-JSS(is_burned);                      // out: nft_info (clio)
-JSS(isSerialized);                   // out: RPC server_definitions
-                                     // matches definitions.json format
-JSS(isSigningField);                 // out: RPC server_definitions
-                                     // matches definitions.json format
-JSS(isVLEncoded);                    // out: RPC server_definitions
-                                     // matches definitions.json format
-JSS(issuer);                         // in: RipplePathFind, Subscribe, Unsubscribe, BookOffers
-                                     // out: STPathSet, STAmount
-JSS(issuer_encrypted_balance);       // out: mpt_holders (confidential MPT)
-JSS(job);                            //
-JSS(job_queue);                      //
-JSS(jobs);                           //
-JSS(jsonrpc);                        // json version
-JSS(jq_trans_overflow);              // JobQueue transaction limit overflow.
-JSS(kept);                           // out: SubmitTransaction
-JSS(key);                            // out
-JSS(key_type);                       // in/out: WalletPropose, TransactionSign
-JSS(latency);                        // out: PeerImp
-JSS(last);                           // out: RPCVersion
-JSS(last_close);                     // out: NetworkOPs
-JSS(last_refresh_time);              // out: ValidatorSite
-JSS(last_refresh_status);            // out: ValidatorSite
-JSS(last_refresh_message);           // out: ValidatorSite
-JSS(ledger);                         // in: NetworkOPs, LedgerCleaner, RPCHelpers
-                                     // out: NetworkOPs, PeerImp
-JSS(ledger_current_index);           // out: NetworkOPs, RPCHelpers, LedgerCurrent, LedgerAccept,
-                                     //      AccountLines
-JSS(ledger_data);                    // out: LedgerHeader
-JSS(ledger_hash);                    // in: RPCHelpers, LedgerRequest, RipplePathFind,
-                                     //     TransactionEntry, handlers/Ledger
-                                     // out: NetworkOPs, RPCHelpers, LedgerClosed, LedgerData,
-                                     //      AccountLines
-JSS(ledger_hit_rate);                // out: GetCounts
-JSS(ledger_index);                   // in/out: many
-JSS(ledger_index_max);               // in, out: AccountTx*
-JSS(ledger_index_min);               // in, out: AccountTx*
-JSS(ledger_max);                     // in, out: AccountTx*
-JSS(ledger_min);                     // in, out: AccountTx*
-JSS(ledger_time);                    // out: NetworkOPs
-JSS(LEDGER_ENTRY_TYPES);             // out: RPC server_definitions
-                                     // matches definitions.json format
-JSS(LEDGER_ENTRY_FLAGS);             // out: RPC server_definitions
-JSS(LEDGER_ENTRY_FORMATS);           // out: RPC server_definitions
-JSS(levels);                         // LogLevels
+JSS(consensus);                   // out: NetworkOPs, LedgerConsensus
+JSS(converge_time);               // out: NetworkOPs
+JSS(converge_time_s);             // out: NetworkOPs
+JSS(cookie);                      // out: NetworkOPs
+JSS(count);                       // in: AccountTx*, ValidatorList
+JSS(counters);                    // in/out: retrieve counters
+JSS(credentials);                 // in: deposit_authorized
+JSS(credential_type);             // in: LedgerEntry DepositPreauth
+JSS(ctid);                        // in/out: Tx RPC
+JSS(currency_a);                  // out: BookChanges
+JSS(currency_b);                  // out: BookChanges
+JSS(currency);                    // in: paths/PathRequest, STAmount
+                                  // out: STPathSet, STAmount, AccountLines
+JSS(current);                     // out: OwnerInfo
+JSS(current_activities);          //
+JSS(current_ledger_size);         // out: TxQ
+JSS(current_queue_size);          // out: TxQ
+JSS(data);                        // out: LedgerData
+JSS(date);                        // out: tx/Transaction, NetworkOPs
+JSS(dbKBLedger);                  // out: getCounts
+JSS(dbKBTotal);                   // out: getCounts
+JSS(dbKBTransaction);             // out: getCounts
+JSS(debug_signing);               // in: TransactionSign
+JSS(deletion_blockers_only);      // in: AccountObjects
+JSS(delivered_amount);            // out: insertDeliveredAmount
+JSS(deposit_authorized);          // out: deposit_authorized
+JSS(deprecated);                  //
+JSS(descending);                  // in: AccountTx*
+JSS(description);                 // in/out: Reservations
+JSS(destination);                 // in: nft_buy_offers, nft_sell_offers
+JSS(destination_account);         // in: PathRequest, RipplePathFind, account_lines
+                                  // out: AccountChannels
+JSS(destination_amount);          // in: PathRequest, RipplePathFind
+JSS(destination_currencies);      // in: PathRequest, RipplePathFind
+JSS(destination_tag);             // in: PathRequest
+                                  // out: AccountChannels
+JSS(details);                     // out: Manifest, server_info
+JSS(dir_entry);                   // out: DirectoryEntryIterator
+JSS(dir_index);                   // out: DirectoryEntryIterator
+JSS(dir_root);                    // out: DirectoryEntryIterator
+JSS(discounted_fee);              // out: amm_info
+JSS(domain);                      // out: ValidatorInfo, Manifest
+JSS(drops);                       // out: TxQ
+JSS(duration_us);                 // out: NetworkOPs
+JSS(effective);                   // out: ValidatorList
+                                  // in: UNL
+JSS(enabled);                     // out: AmendmentTable
+JSS(engine_result);               // out: NetworkOPs, TransactionSign, Submit
+JSS(engine_result_code);          // out: NetworkOPs, TransactionSign, Submit
+JSS(engine_result_message);       // out: NetworkOPs, TransactionSign, Submit
+JSS(entire_set);                  // out: get_aggregate_price
+JSS(ephemeral_key);               // out: ValidatorInfo
+                                  // in/out: Manifest
+JSS(error);                       // out: error
+JSS(errored);                     //
+JSS(error_code);                  // out: error
+JSS(error_exception);             // out: Submit
+JSS(error_message);               // out: error
+JSS(expand);                      // in: handler/Ledger
+JSS(expected_date);               // out: any (warnings)
+JSS(expected_date_UTC);           // out: any (warnings)
+JSS(expected_ledger_size);        // out: TxQ
+JSS(expiration);                  // out: AccountOffers, AccountChannels, ValidatorList, amm_info
+JSS(fail_hard);                   // in: Sign, Submit
+JSS(failed);                      // out: InboundLedger
+JSS(feature);                     // in: Feature
+JSS(features);                    // out: Feature
+JSS(fee_base);                    // out: NetworkOPs
+JSS(fee_div_max);                 // in: TransactionSign
+JSS(fee_level);                   // out: AccountInfo
+JSS(fee_mult_max);                // in: TransactionSign
+JSS(fee_ref);                     // out: NetworkOPs, DEPRECATED
+JSS(fetch_pack);                  // out: NetworkOPs
+JSS(FIELDS);                      // out: RPC server_definitions
+                                  // matches definitions.json format
+JSS(first);                       // out: rpc/Version
+JSS(finished);                    //
+JSS(fix_txns);                    // in: LedgerCleaner
+JSS(flags);                       // out: AccountOffers, NetworkOPs
+JSS(forward);                     // in: AccountTx
+JSS(freeze);                      // out: AccountLines
+JSS(freeze_peer);                 // out: AccountLines
+JSS(deep_freeze);                 // out: AccountLines
+JSS(deep_freeze_peer);            // out: AccountLines
+JSS(frozen_balances);             // out: GatewayBalances
+JSS(full);                        // in: LedgerClearer, handlers/Ledger
+JSS(full_reply);                  // out: PathFind
+JSS(fullbelow_size);              // out: GetCounts
+JSS(git);                         // out: server_info
+JSS(good);                        // out: RPCVersion
+JSS(hash);                        // out: NetworkOPs, InboundLedger, LedgerToJson, STTx; field
+JSS(have_header);                 // out: InboundLedger
+JSS(have_state);                  // out: InboundLedger
+JSS(have_transactions);           // out: InboundLedger
+JSS(high);                        // out: BookChanges
+JSS(highest_sequence);            // out: AccountInfo
+JSS(highest_ticket);              // out: AccountInfo
+JSS(historical_perminute);        // historical_perminute.
+JSS(holders);                     // out: MPTHolders
+JSS(hostid);                      // out: NetworkOPs
+JSS(hotwallet);                   // in: GatewayBalances
+JSS(id);                          // websocket.
+JSS(ident);                       // in: AccountCurrencies, AccountInfo, OwnerInfo
+JSS(ignore_default);              // in: AccountLines
+JSS(in);                          // out: OverlayImpl
+JSS(inLedger);                    // out: tx/Transaction
+JSS(inbound);                     // out: PeerImp
+JSS(index);                       // in: LedgerEntry
+                                  // out: STLedgerEntry, LedgerEntry, TxHistory, LedgerData
+JSS(info);                        // out: ServerInfo, ConsensusInfo, FetchInfo
+JSS(initial_sync_duration_us);    //
+JSS(internal_command);            // in: Internal
+JSS(invalid_API_version);         // out: Many, when a request has an invalid version
+JSS(io_latency_ms);               // out: NetworkOPs
+JSS(ip);                          // in: Connect, out: OverlayImpl
+JSS(is_burned);                   // out: nft_info (clio)
+JSS(isSerialized);                // out: RPC server_definitions
+                                  // matches definitions.json format
+JSS(isSigningField);              // out: RPC server_definitions
+                                  // matches definitions.json format
+JSS(isVLEncoded);                 // out: RPC server_definitions
+                                  // matches definitions.json format
+JSS(issuer);                      // in: RipplePathFind, Subscribe, Unsubscribe, BookOffers
+                                  // out: STPathSet, STAmount
+JSS(job);                         //
+JSS(job_queue);                   //
+JSS(jobs);                        //
+JSS(jsonrpc);                     // json version
+JSS(jq_trans_overflow);           // JobQueue transaction limit overflow.
+JSS(kept);                        // out: SubmitTransaction
+JSS(key);                         // out
+JSS(key_type);                    // in/out: WalletPropose, TransactionSign
+JSS(latency);                     // out: PeerImp
+JSS(last);                        // out: RPCVersion
+JSS(last_close);                  // out: NetworkOPs
+JSS(last_refresh_time);           // out: ValidatorSite
+JSS(last_refresh_status);         // out: ValidatorSite
+JSS(last_refresh_message);        // out: ValidatorSite
+JSS(ledger);                      // in: NetworkOPs, LedgerCleaner, RPCHelpers
+                                  // out: NetworkOPs, PeerImp
+JSS(ledger_current_index);        // out: NetworkOPs, RPCHelpers, LedgerCurrent, LedgerAccept,
+                                  //      AccountLines
+JSS(ledger_data);                 // out: LedgerHeader
+JSS(ledger_hash);                 // in: RPCHelpers, LedgerRequest, RipplePathFind,
+                                  //     TransactionEntry, handlers/Ledger
+                                  // out: NetworkOPs, RPCHelpers, LedgerClosed, LedgerData,
+                                  //      AccountLines
+JSS(ledger_hit_rate);             // out: GetCounts
+JSS(ledger_index);                // in/out: many
+JSS(ledger_index_max);            // in, out: AccountTx*
+JSS(ledger_index_min);            // in, out: AccountTx*
+JSS(ledger_max);                  // in, out: AccountTx*
+JSS(ledger_min);                  // in, out: AccountTx*
+JSS(ledger_time);                 // out: NetworkOPs
+JSS(LEDGER_ENTRY_TYPES);          // out: RPC server_definitions
+                                  // matches definitions.json format
+JSS(LEDGER_ENTRY_FLAGS);          // out: RPC server_definitions
+JSS(LEDGER_ENTRY_FORMATS);        // out: RPC server_definitions
+JSS(levels);                      // LogLevels
 JSS(limit);                       // in/out: AccountTx*, AccountOffers, AccountLines, AccountObjects
                                   // in: LedgerData, BookOffers
 JSS(limit_peer);                  // out: AccountLines
@@ -404,9 +401,6 @@ JSS(min_ledger);                  // in: LedgerCleaner
 JSS(minimum_fee);                 // out: TxQ
 JSS(minimum_level);               // out: TxQ
 JSS(missingCommand);              // error
-JSS(mpt_amount);                  // out: mpt_holders
-JSS(mpt_issuance_id);             // in: Payment, mpt_holders
-JSS(mptoken_index);               // out: mpt_holders
 JSS(mpt_issuance_id_a);           // out: BookChanges
 JSS(mpt_issuance_id_b);           // out: BookChanges
 JSS(name);                        // out: AmendmentTableImpl, PeerImp
@@ -558,9 +552,6 @@ JSS(source_account);              // in: PathRequest, RipplePathFind
 JSS(source_amount);               // in: PathRequest, RipplePathFind
 JSS(source_currencies);           // in: PathRequest, RipplePathFind
 JSS(source_tag);                  // out: AccountChannels
-JSS(sponsee);                     // in: LedgerEntry
-JSS(sponsor);                     // in: LedgerEntry
-JSS(sponsored);                   // in: AccountObjects
 JSS(stand_alone);                 // out: NetworkOPs
 JSS(standard_deviation);          // out: get_aggregate_price
 JSS(start);                       // in: TxHistory

include/xrpl/protocol_autogen/ledger_entries/AccountRoot.h

@@ -518,78 +518,6 @@ public:
     {
         return this->sle_->isFieldPresent(sfLoanBrokerID);
     }
-
-    /**
-     * @brief Get sfSponsoredOwnerCount (soeDEFAULT)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getSponsoredOwnerCount() const
-    {
-        if (hasSponsoredOwnerCount())
-            return this->sle_->at(sfSponsoredOwnerCount);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfSponsoredOwnerCount is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasSponsoredOwnerCount() const
-    {
-        return this->sle_->isFieldPresent(sfSponsoredOwnerCount);
-    }
-
-    /**
-     * @brief Get sfSponsoringOwnerCount (soeDEFAULT)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getSponsoringOwnerCount() const
-    {
-        if (hasSponsoringOwnerCount())
-            return this->sle_->at(sfSponsoringOwnerCount);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfSponsoringOwnerCount is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasSponsoringOwnerCount() const
-    {
-        return this->sle_->isFieldPresent(sfSponsoringOwnerCount);
-    }
-
-    /**
-     * @brief Get sfSponsoringAccountCount (soeDEFAULT)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getSponsoringAccountCount() const
-    {
-        if (hasSponsoringAccountCount())
-            return this->sle_->at(sfSponsoringAccountCount);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfSponsoringAccountCount is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasSponsoringAccountCount() const
-    {
-        return this->sle_->isFieldPresent(sfSponsoringAccountCount);
-    }
 };
 
 /**
@@ -891,39 +819,6 @@ public:
         return *this;
     }
 
-    /**
-     * @brief Set sfSponsoredOwnerCount (soeDEFAULT)
-     * @return Reference to this builder for method chaining.
-     */
-    AccountRootBuilder&
-    setSponsoredOwnerCount(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfSponsoredOwnerCount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfSponsoringOwnerCount (soeDEFAULT)
-     * @return Reference to this builder for method chaining.
-     */
-    AccountRootBuilder&
-    setSponsoringOwnerCount(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfSponsoringOwnerCount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfSponsoringAccountCount (soeDEFAULT)
-     * @return Reference to this builder for method chaining.
-     */
-    AccountRootBuilder&
-    setSponsoringAccountCount(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfSponsoringAccountCount] = value;
-        return *this;
-    }
-
     /**
      * @brief Build and return the completed AccountRoot wrapper.
      * @param index The ledger entry index.

include/xrpl/protocol_autogen/ledger_entries/Delegate.h

@@ -90,30 +90,6 @@ public:
         return this->sle_->at(sfOwnerNode);
     }
 
-    /**
-     * @brief Get sfDestinationNode (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT64::type::value_type>
-    getDestinationNode() const
-    {
-        if (hasDestinationNode())
-            return this->sle_->at(sfDestinationNode);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfDestinationNode is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasDestinationNode() const
-    {
-        return this->sle_->isFieldPresent(sfDestinationNode);
-    }
-
     /**
      * @brief Get sfPreviousTxnID (soeREQUIRED)
      * @return The field value.
@@ -227,17 +203,6 @@ public:
         return *this;
     }
 
-    /**
-     * @brief Set sfDestinationNode (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    DelegateBuilder&
-    setDestinationNode(std::decay_t<typename SF_UINT64::type::value_type> const& value)
-    {
-        object_[sfDestinationNode] = value;
-        return *this;
-    }
-
     /**
      * @brief Set sfPreviousTxnID (soeREQUIRED)
      * @return Reference to this builder for method chaining.

include/xrpl/protocol_autogen/ledger_entries/MPToken.h

@@ -147,150 +147,6 @@ public:
     {
         return this->sle_->at(sfPreviousTxnLgrSeq);
     }
-
-    /**
-     * @brief Get sfConfidentialBalanceInbox (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_VL::type::value_type>
-    getConfidentialBalanceInbox() const
-    {
-        if (hasConfidentialBalanceInbox())
-            return this->sle_->at(sfConfidentialBalanceInbox);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfConfidentialBalanceInbox is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasConfidentialBalanceInbox() const
-    {
-        return this->sle_->isFieldPresent(sfConfidentialBalanceInbox);
-    }
-
-    /**
-     * @brief Get sfConfidentialBalanceSpending (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_VL::type::value_type>
-    getConfidentialBalanceSpending() const
-    {
-        if (hasConfidentialBalanceSpending())
-            return this->sle_->at(sfConfidentialBalanceSpending);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfConfidentialBalanceSpending is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasConfidentialBalanceSpending() const
-    {
-        return this->sle_->isFieldPresent(sfConfidentialBalanceSpending);
-    }
-
-    /**
-     * @brief Get sfConfidentialBalanceVersion (soeDEFAULT)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getConfidentialBalanceVersion() const
-    {
-        if (hasConfidentialBalanceVersion())
-            return this->sle_->at(sfConfidentialBalanceVersion);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfConfidentialBalanceVersion is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasConfidentialBalanceVersion() const
-    {
-        return this->sle_->isFieldPresent(sfConfidentialBalanceVersion);
-    }
-
-    /**
-     * @brief Get sfIssuerEncryptedBalance (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_VL::type::value_type>
-    getIssuerEncryptedBalance() const
-    {
-        if (hasIssuerEncryptedBalance())
-            return this->sle_->at(sfIssuerEncryptedBalance);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfIssuerEncryptedBalance is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasIssuerEncryptedBalance() const
-    {
-        return this->sle_->isFieldPresent(sfIssuerEncryptedBalance);
-    }
-
-    /**
-     * @brief Get sfAuditorEncryptedBalance (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_VL::type::value_type>
-    getAuditorEncryptedBalance() const
-    {
-        if (hasAuditorEncryptedBalance())
-            return this->sle_->at(sfAuditorEncryptedBalance);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfAuditorEncryptedBalance is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasAuditorEncryptedBalance() const
-    {
-        return this->sle_->isFieldPresent(sfAuditorEncryptedBalance);
-    }
-
-    /**
-     * @brief Get sfHolderEncryptionKey (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_VL::type::value_type>
-    getHolderEncryptionKey() const
-    {
-        if (hasHolderEncryptionKey())
-            return this->sle_->at(sfHolderEncryptionKey);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfHolderEncryptionKey is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasHolderEncryptionKey() const
-    {
-        return this->sle_->isFieldPresent(sfHolderEncryptionKey);
-    }
 };
 
 /**
@@ -414,72 +270,6 @@ public:
         return *this;
     }
 
-    /**
-     * @brief Set sfConfidentialBalanceInbox (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    MPTokenBuilder&
-    setConfidentialBalanceInbox(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfConfidentialBalanceInbox] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfConfidentialBalanceSpending (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    MPTokenBuilder&
-    setConfidentialBalanceSpending(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfConfidentialBalanceSpending] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfConfidentialBalanceVersion (soeDEFAULT)
-     * @return Reference to this builder for method chaining.
-     */
-    MPTokenBuilder&
-    setConfidentialBalanceVersion(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfConfidentialBalanceVersion] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfIssuerEncryptedBalance (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    MPTokenBuilder&
-    setIssuerEncryptedBalance(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfIssuerEncryptedBalance] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfAuditorEncryptedBalance (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    MPTokenBuilder&
-    setAuditorEncryptedBalance(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfAuditorEncryptedBalance] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfHolderEncryptionKey (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    MPTokenBuilder&
-    setHolderEncryptionKey(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfHolderEncryptionKey] = value;
-        return *this;
-    }
-
     /**
      * @brief Build and return the completed MPToken wrapper.
      * @param index The ledger entry index.

include/xrpl/protocol_autogen/ledger_entries/MPTokenIssuance.h

@@ -278,78 +278,6 @@ public:
     {
         return this->sle_->isFieldPresent(sfMutableFlags);
     }
-
-    /**
-     * @brief Get sfIssuerEncryptionKey (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_VL::type::value_type>
-    getIssuerEncryptionKey() const
-    {
-        if (hasIssuerEncryptionKey())
-            return this->sle_->at(sfIssuerEncryptionKey);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfIssuerEncryptionKey is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasIssuerEncryptionKey() const
-    {
-        return this->sle_->isFieldPresent(sfIssuerEncryptionKey);
-    }
-
-    /**
-     * @brief Get sfAuditorEncryptionKey (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_VL::type::value_type>
-    getAuditorEncryptionKey() const
-    {
-        if (hasAuditorEncryptionKey())
-            return this->sle_->at(sfAuditorEncryptionKey);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfAuditorEncryptionKey is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasAuditorEncryptionKey() const
-    {
-        return this->sle_->isFieldPresent(sfAuditorEncryptionKey);
-    }
-
-    /**
-     * @brief Get sfConfidentialOutstandingAmount (soeDEFAULT)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT64::type::value_type>
-    getConfidentialOutstandingAmount() const
-    {
-        if (hasConfidentialOutstandingAmount())
-            return this->sle_->at(sfConfidentialOutstandingAmount);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfConfidentialOutstandingAmount is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasConfidentialOutstandingAmount() const
-    {
-        return this->sle_->isFieldPresent(sfConfidentialOutstandingAmount);
-    }
 };
 
 /**
@@ -541,39 +469,6 @@ public:
         return *this;
     }
 
-    /**
-     * @brief Set sfIssuerEncryptionKey (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    MPTokenIssuanceBuilder&
-    setIssuerEncryptionKey(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfIssuerEncryptionKey] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfAuditorEncryptionKey (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    MPTokenIssuanceBuilder&
-    setAuditorEncryptionKey(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfAuditorEncryptionKey] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfConfidentialOutstandingAmount (soeDEFAULT)
-     * @return Reference to this builder for method chaining.
-     */
-    MPTokenIssuanceBuilder&
-    setConfidentialOutstandingAmount(std::decay_t<typename SF_UINT64::type::value_type> const& value)
-    {
-        object_[sfConfidentialOutstandingAmount] = value;
-        return *this;
-    }
-
     /**
      * @brief Build and return the completed MPTokenIssuance wrapper.
      * @param index The ledger entry index.

include/xrpl/protocol_autogen/ledger_entries/RippleState.h

@@ -243,54 +243,6 @@ public:
     {
         return this->sle_->isFieldPresent(sfHighQualityOut);
     }
-
-    /**
-     * @brief Get sfHighSponsor (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_ACCOUNT::type::value_type>
-    getHighSponsor() const
-    {
-        if (hasHighSponsor())
-            return this->sle_->at(sfHighSponsor);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfHighSponsor is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasHighSponsor() const
-    {
-        return this->sle_->isFieldPresent(sfHighSponsor);
-    }
-
-    /**
-     * @brief Get sfLowSponsor (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_ACCOUNT::type::value_type>
-    getLowSponsor() const
-    {
-        if (hasLowSponsor())
-            return this->sle_->at(sfLowSponsor);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfLowSponsor is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasLowSponsor() const
-    {
-        return this->sle_->isFieldPresent(sfLowSponsor);
-    }
 };
 
 /**
@@ -458,28 +410,6 @@ public:
         return *this;
     }
 
-    /**
-     * @brief Set sfHighSponsor (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    RippleStateBuilder&
-    setHighSponsor(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
-    {
-        object_[sfHighSponsor] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfLowSponsor (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    RippleStateBuilder&
-    setLowSponsor(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
-    {
-        object_[sfLowSponsor] = value;
-        return *this;
-    }
-
     /**
      * @brief Build and return the completed RippleState wrapper.
      * @param index The ledger entry index.

include/xrpl/protocol_autogen/ledger_entries/Sponsorship.h

@@ -1,344 +0,0 @@
-// This file is auto-generated. Do not edit.
-#pragma once
-
-#include <xrpl/protocol/STLedgerEntry.h>
-#include <xrpl/protocol/STParsedJSON.h>
-#include <xrpl/protocol/jss.h>
-#include <xrpl/protocol_autogen/LedgerEntryBase.h>
-#include <xrpl/protocol_autogen/LedgerEntryBuilderBase.h>
-#include <xrpl/json/json_value.h>
-
-#include <stdexcept>
-#include <optional>
-
-namespace xrpl::ledger_entries {
-
-class SponsorshipBuilder;
-
-/**
- * @brief Ledger Entry: Sponsorship
- *
- * Type: ltSPONSORSHIP (0x0090)
- * RPC Name: sponsorship
- *
- * Immutable wrapper around SLE providing type-safe field access.
- * Use SponsorshipBuilder to construct new ledger entries.
- */
-class Sponsorship : public LedgerEntryBase
-{
-public:
-    static constexpr LedgerEntryType entryType = ltSPONSORSHIP;
-
-    /**
-     * @brief Construct a Sponsorship ledger entry wrapper from an existing SLE object.
-     * @throws std::runtime_error if the ledger entry type doesn't match.
-     */
-    explicit Sponsorship(std::shared_ptr<SLE const> sle)
-        : LedgerEntryBase(std::move(sle))
-    {
-        // Verify ledger entry type
-        if (sle_->getType() != entryType)
-        {
-            throw std::runtime_error("Invalid ledger entry type for Sponsorship");
-        }
-    }
-
-    // Ledger entry-specific field getters
-
-    /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_UINT256::type::value_type
-    getPreviousTxnID() const
-    {
-        return this->sle_->at(sfPreviousTxnID);
-    }
-
-    /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_UINT32::type::value_type
-    getPreviousTxnLgrSeq() const
-    {
-        return this->sle_->at(sfPreviousTxnLgrSeq);
-    }
-
-    /**
-     * @brief Get sfOwner (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_ACCOUNT::type::value_type
-    getOwner() const
-    {
-        return this->sle_->at(sfOwner);
-    }
-
-    /**
-     * @brief Get sfSponsee (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_ACCOUNT::type::value_type
-    getSponsee() const
-    {
-        return this->sle_->at(sfSponsee);
-    }
-
-    /**
-     * @brief Get sfFeeAmount (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_AMOUNT::type::value_type>
-    getFeeAmount() const
-    {
-        if (hasFeeAmount())
-            return this->sle_->at(sfFeeAmount);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfFeeAmount is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasFeeAmount() const
-    {
-        return this->sle_->isFieldPresent(sfFeeAmount);
-    }
-
-    /**
-     * @brief Get sfMaxFee (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_AMOUNT::type::value_type>
-    getMaxFee() const
-    {
-        if (hasMaxFee())
-            return this->sle_->at(sfMaxFee);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfMaxFee is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasMaxFee() const
-    {
-        return this->sle_->isFieldPresent(sfMaxFee);
-    }
-
-    /**
-     * @brief Get sfReserveCount (soeDEFAULT)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getReserveCount() const
-    {
-        if (hasReserveCount())
-            return this->sle_->at(sfReserveCount);
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfReserveCount is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasReserveCount() const
-    {
-        return this->sle_->isFieldPresent(sfReserveCount);
-    }
-
-    /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_UINT64::type::value_type
-    getOwnerNode() const
-    {
-        return this->sle_->at(sfOwnerNode);
-    }
-
-    /**
-     * @brief Get sfSponseeNode (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_UINT64::type::value_type
-    getSponseeNode() const
-    {
-        return this->sle_->at(sfSponseeNode);
-    }
-};
-
-/**
- * @brief Builder for Sponsorship ledger entries.
- *
- * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
- * Inherits common field setters from LedgerEntryBuilderBase.
- */
-class SponsorshipBuilder : public LedgerEntryBuilderBase<SponsorshipBuilder>
-{
-public:
-    /**
-     * @brief Construct a new SponsorshipBuilder with required fields.
-     * @param previousTxnID The sfPreviousTxnID field value.
-     * @param previousTxnLgrSeq The sfPreviousTxnLgrSeq field value.
-     * @param owner The sfOwner field value.
-     * @param sponsee The sfSponsee field value.
-     * @param ownerNode The sfOwnerNode field value.
-     * @param sponseeNode The sfSponseeNode field value.
-     */
-    SponsorshipBuilder(std::decay_t<typename SF_UINT256::type::value_type> const& previousTxnID,std::decay_t<typename SF_UINT32::type::value_type> const& previousTxnLgrSeq,std::decay_t<typename SF_ACCOUNT::type::value_type> const& owner,std::decay_t<typename SF_ACCOUNT::type::value_type> const& sponsee,std::decay_t<typename SF_UINT64::type::value_type> const& ownerNode,std::decay_t<typename SF_UINT64::type::value_type> const& sponseeNode)
-        : LedgerEntryBuilderBase<SponsorshipBuilder>(ltSPONSORSHIP)
-    {
-        setPreviousTxnID(previousTxnID);
-        setPreviousTxnLgrSeq(previousTxnLgrSeq);
-        setOwner(owner);
-        setSponsee(sponsee);
-        setOwnerNode(ownerNode);
-        setSponseeNode(sponseeNode);
-    }
-
-    /**
-     * @brief Construct a SponsorshipBuilder from an existing SLE object.
-     * @param sle The existing ledger entry to copy from.
-     * @throws std::runtime_error if the ledger entry type doesn't match.
-     */
-    SponsorshipBuilder(std::shared_ptr<SLE const> sle)
-    {
-        if (sle->at(sfLedgerEntryType) != ltSPONSORSHIP)
-        {
-            throw std::runtime_error("Invalid ledger entry type for Sponsorship");
-        }
-        object_ = *sle;
-    }
-
-    /** @brief Ledger entry-specific field setters */
-
-    /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    SponsorshipBuilder&
-    setPreviousTxnID(std::decay_t<typename SF_UINT256::type::value_type> const& value)
-    {
-        object_[sfPreviousTxnID] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    SponsorshipBuilder&
-    setPreviousTxnLgrSeq(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfPreviousTxnLgrSeq] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfOwner (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    SponsorshipBuilder&
-    setOwner(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
-    {
-        object_[sfOwner] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfSponsee (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    SponsorshipBuilder&
-    setSponsee(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
-    {
-        object_[sfSponsee] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfFeeAmount (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    SponsorshipBuilder&
-    setFeeAmount(std::decay_t<typename SF_AMOUNT::type::value_type> const& value)
-    {
-        object_[sfFeeAmount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfMaxFee (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    SponsorshipBuilder&
-    setMaxFee(std::decay_t<typename SF_AMOUNT::type::value_type> const& value)
-    {
-        object_[sfMaxFee] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfReserveCount (soeDEFAULT)
-     * @return Reference to this builder for method chaining.
-     */
-    SponsorshipBuilder&
-    setReserveCount(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfReserveCount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    SponsorshipBuilder&
-    setOwnerNode(std::decay_t<typename SF_UINT64::type::value_type> const& value)
-    {
-        object_[sfOwnerNode] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfSponseeNode (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    SponsorshipBuilder&
-    setSponseeNode(std::decay_t<typename SF_UINT64::type::value_type> const& value)
-    {
-        object_[sfSponseeNode] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Build and return the completed Sponsorship wrapper.
-     * @param index The ledger entry index.
-     * @return The constructed ledger entry wrapper.
-     */
-    Sponsorship
-    build(uint256 const& index)
-    {
-        return Sponsorship{std::make_shared<SLE>(std::move(object_), index)};
-    }
-};
-
-}  // namespace xrpl::ledger_entries

include/xrpl/protocol_autogen/transactions/Batch.h

@@ -20,7 +20,7 @@ class BatchBuilder;
  *
  * Type: ttBATCH (71)
  * Delegable: Delegation::notDelegable
- * Amendment: featureBatchV1_1
+ * Amendment: featureBatch
  * Privileges: noPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.

include/xrpl/protocol_autogen/transactions/ConfidentialMPTClawback.h

@@ -1,201 +0,0 @@
-// This file is auto-generated. Do not edit.
-#pragma once
-
-#include <xrpl/protocol/STTx.h>
-#include <xrpl/protocol/STParsedJSON.h>
-#include <xrpl/protocol/jss.h>
-#include <xrpl/protocol_autogen/TransactionBase.h>
-#include <xrpl/protocol_autogen/TransactionBuilderBase.h>
-#include <xrpl/json/json_value.h>
-
-#include <stdexcept>
-#include <optional>
-
-namespace xrpl::transactions {
-
-class ConfidentialMPTClawbackBuilder;
-
-/**
- * @brief Transaction: ConfidentialMPTClawback
- *
- * Type: ttCONFIDENTIAL_MPT_CLAWBACK (89)
- * Delegable: Delegation::delegable
- * Amendment: featureConfidentialTransfer
- * Privileges: noPriv
- *
- * Immutable wrapper around STTx providing type-safe field access.
- * Use ConfidentialMPTClawbackBuilder to construct new transactions.
- */
-class ConfidentialMPTClawback : public TransactionBase
-{
-public:
-    static constexpr xrpl::TxType txType = ttCONFIDENTIAL_MPT_CLAWBACK;
-
-    /**
-     * @brief Construct a ConfidentialMPTClawback transaction wrapper from an existing STTx object.
-     * @throws std::runtime_error if the transaction type doesn't match.
-     */
-    explicit ConfidentialMPTClawback(std::shared_ptr<STTx const> tx)
-        : TransactionBase(std::move(tx))
-    {
-        // Verify transaction type
-        if (tx_->getTxnType() != txType)
-        {
-            throw std::runtime_error("Invalid transaction type for ConfidentialMPTClawback");
-        }
-    }
-
-    // Transaction-specific field getters
-
-    /**
-     * @brief Get sfMPTokenIssuanceID (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_UINT192::type::value_type
-    getMPTokenIssuanceID() const
-    {
-        return this->tx_->at(sfMPTokenIssuanceID);
-    }
-
-    /**
-     * @brief Get sfHolder (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_ACCOUNT::type::value_type
-    getHolder() const
-    {
-        return this->tx_->at(sfHolder);
-    }
-
-    /**
-     * @brief Get sfMPTAmount (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_UINT64::type::value_type
-    getMPTAmount() const
-    {
-        return this->tx_->at(sfMPTAmount);
-    }
-
-    /**
-     * @brief Get sfZKProof (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_VL::type::value_type
-    getZKProof() const
-    {
-        return this->tx_->at(sfZKProof);
-    }
-};
-
-/**
- * @brief Builder for ConfidentialMPTClawback transactions.
- *
- * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
- * Inherits common field setters from TransactionBuilderBase.
- */
-class ConfidentialMPTClawbackBuilder : public TransactionBuilderBase<ConfidentialMPTClawbackBuilder>
-{
-public:
-    /**
-     * @brief Construct a new ConfidentialMPTClawbackBuilder with required fields.
-     * @param account The account initiating the transaction.
-     * @param mPTokenIssuanceID The sfMPTokenIssuanceID field value.
-     * @param holder The sfHolder field value.
-     * @param mPTAmount The sfMPTAmount field value.
-     * @param zKProof The sfZKProof field value.
-     * @param sequence Optional sequence number for the transaction.
-     * @param fee Optional fee for the transaction.
-     */
-    ConfidentialMPTClawbackBuilder(SF_ACCOUNT::type::value_type account,
-                     std::decay_t<typename SF_UINT192::type::value_type> const& mPTokenIssuanceID,                     std::decay_t<typename SF_ACCOUNT::type::value_type> const& holder,                     std::decay_t<typename SF_UINT64::type::value_type> const& mPTAmount,                     std::decay_t<typename SF_VL::type::value_type> const& zKProof,                    std::optional<SF_UINT32::type::value_type> sequence = std::nullopt,
-                    std::optional<SF_AMOUNT::type::value_type> fee = std::nullopt
-)
-        : TransactionBuilderBase<ConfidentialMPTClawbackBuilder>(ttCONFIDENTIAL_MPT_CLAWBACK, account, sequence, fee)
-    {
-        setMPTokenIssuanceID(mPTokenIssuanceID);
-        setHolder(holder);
-        setMPTAmount(mPTAmount);
-        setZKProof(zKProof);
-    }
-
-    /**
-     * @brief Construct a ConfidentialMPTClawbackBuilder from an existing STTx object.
-     * @param tx The existing transaction to copy from.
-     * @throws std::runtime_error if the transaction type doesn't match.
-     */
-    ConfidentialMPTClawbackBuilder(std::shared_ptr<STTx const> tx)
-    {
-        if (tx->getTxnType() != ttCONFIDENTIAL_MPT_CLAWBACK)
-        {
-            throw std::runtime_error("Invalid transaction type for ConfidentialMPTClawbackBuilder");
-        }
-        object_ = *tx;
-    }
-
-    /** @brief Transaction-specific field setters */
-
-    /**
-     * @brief Set sfMPTokenIssuanceID (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTClawbackBuilder&
-    setMPTokenIssuanceID(std::decay_t<typename SF_UINT192::type::value_type> const& value)
-    {
-        object_[sfMPTokenIssuanceID] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfHolder (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTClawbackBuilder&
-    setHolder(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
-    {
-        object_[sfHolder] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfMPTAmount (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTClawbackBuilder&
-    setMPTAmount(std::decay_t<typename SF_UINT64::type::value_type> const& value)
-    {
-        object_[sfMPTAmount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfZKProof (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTClawbackBuilder&
-    setZKProof(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfZKProof] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Build and return the ConfidentialMPTClawback wrapper.
-     * @param publicKey The public key for signing.
-     * @param secretKey The secret key for signing.
-     * @return The constructed transaction wrapper.
-     */
-    ConfidentialMPTClawback
-    build(PublicKey const& publicKey, SecretKey const& secretKey)
-    {
-        sign(publicKey, secretKey);
-        return ConfidentialMPTClawback{std::make_shared<STTx>(std::move(object_))};
-    }
-};
-
-}  // namespace xrpl::transactions

include/xrpl/protocol_autogen/transactions/ConfidentialMPTConvert.h

@@ -1,336 +0,0 @@
-// This file is auto-generated. Do not edit.
-#pragma once
-
-#include <xrpl/protocol/STTx.h>
-#include <xrpl/protocol/STParsedJSON.h>
-#include <xrpl/protocol/jss.h>
-#include <xrpl/protocol_autogen/TransactionBase.h>
-#include <xrpl/protocol_autogen/TransactionBuilderBase.h>
-#include <xrpl/json/json_value.h>
-
-#include <stdexcept>
-#include <optional>
-
-namespace xrpl::transactions {
-
-class ConfidentialMPTConvertBuilder;
-
-/**
- * @brief Transaction: ConfidentialMPTConvert
- *
- * Type: ttCONFIDENTIAL_MPT_CONVERT (85)
- * Delegable: Delegation::delegable
- * Amendment: featureConfidentialTransfer
- * Privileges: noPriv
- *
- * Immutable wrapper around STTx providing type-safe field access.
- * Use ConfidentialMPTConvertBuilder to construct new transactions.
- */
-class ConfidentialMPTConvert : public TransactionBase
-{
-public:
-    static constexpr xrpl::TxType txType = ttCONFIDENTIAL_MPT_CONVERT;
-
-    /**
-     * @brief Construct a ConfidentialMPTConvert transaction wrapper from an existing STTx object.
-     * @throws std::runtime_error if the transaction type doesn't match.
-     */
-    explicit ConfidentialMPTConvert(std::shared_ptr<STTx const> tx)
-        : TransactionBase(std::move(tx))
-    {
-        // Verify transaction type
-        if (tx_->getTxnType() != txType)
-        {
-            throw std::runtime_error("Invalid transaction type for ConfidentialMPTConvert");
-        }
-    }
-
-    // Transaction-specific field getters
-
-    /**
-     * @brief Get sfMPTokenIssuanceID (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_UINT192::type::value_type
-    getMPTokenIssuanceID() const
-    {
-        return this->tx_->at(sfMPTokenIssuanceID);
-    }
-
-    /**
-     * @brief Get sfMPTAmount (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_UINT64::type::value_type
-    getMPTAmount() const
-    {
-        return this->tx_->at(sfMPTAmount);
-    }
-
-    /**
-     * @brief Get sfHolderEncryptionKey (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_VL::type::value_type>
-    getHolderEncryptionKey() const
-    {
-        if (hasHolderEncryptionKey())
-        {
-            return this->tx_->at(sfHolderEncryptionKey);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfHolderEncryptionKey is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasHolderEncryptionKey() const
-    {
-        return this->tx_->isFieldPresent(sfHolderEncryptionKey);
-    }
-
-    /**
-     * @brief Get sfHolderEncryptedAmount (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_VL::type::value_type
-    getHolderEncryptedAmount() const
-    {
-        return this->tx_->at(sfHolderEncryptedAmount);
-    }
-
-    /**
-     * @brief Get sfIssuerEncryptedAmount (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_VL::type::value_type
-    getIssuerEncryptedAmount() const
-    {
-        return this->tx_->at(sfIssuerEncryptedAmount);
-    }
-
-    /**
-     * @brief Get sfAuditorEncryptedAmount (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_VL::type::value_type>
-    getAuditorEncryptedAmount() const
-    {
-        if (hasAuditorEncryptedAmount())
-        {
-            return this->tx_->at(sfAuditorEncryptedAmount);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfAuditorEncryptedAmount is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasAuditorEncryptedAmount() const
-    {
-        return this->tx_->isFieldPresent(sfAuditorEncryptedAmount);
-    }
-
-    /**
-     * @brief Get sfBlindingFactor (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_UINT256::type::value_type
-    getBlindingFactor() const
-    {
-        return this->tx_->at(sfBlindingFactor);
-    }
-
-    /**
-     * @brief Get sfZKProof (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_VL::type::value_type>
-    getZKProof() const
-    {
-        if (hasZKProof())
-        {
-            return this->tx_->at(sfZKProof);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfZKProof is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasZKProof() const
-    {
-        return this->tx_->isFieldPresent(sfZKProof);
-    }
-};
-
-/**
- * @brief Builder for ConfidentialMPTConvert transactions.
- *
- * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
- * Inherits common field setters from TransactionBuilderBase.
- */
-class ConfidentialMPTConvertBuilder : public TransactionBuilderBase<ConfidentialMPTConvertBuilder>
-{
-public:
-    /**
-     * @brief Construct a new ConfidentialMPTConvertBuilder with required fields.
-     * @param account The account initiating the transaction.
-     * @param mPTokenIssuanceID The sfMPTokenIssuanceID field value.
-     * @param mPTAmount The sfMPTAmount field value.
-     * @param holderEncryptedAmount The sfHolderEncryptedAmount field value.
-     * @param issuerEncryptedAmount The sfIssuerEncryptedAmount field value.
-     * @param blindingFactor The sfBlindingFactor field value.
-     * @param sequence Optional sequence number for the transaction.
-     * @param fee Optional fee for the transaction.
-     */
-    ConfidentialMPTConvertBuilder(SF_ACCOUNT::type::value_type account,
-                     std::decay_t<typename SF_UINT192::type::value_type> const& mPTokenIssuanceID,                     std::decay_t<typename SF_UINT64::type::value_type> const& mPTAmount,                     std::decay_t<typename SF_VL::type::value_type> const& holderEncryptedAmount,                     std::decay_t<typename SF_VL::type::value_type> const& issuerEncryptedAmount,                     std::decay_t<typename SF_UINT256::type::value_type> const& blindingFactor,                    std::optional<SF_UINT32::type::value_type> sequence = std::nullopt,
-                    std::optional<SF_AMOUNT::type::value_type> fee = std::nullopt
-)
-        : TransactionBuilderBase<ConfidentialMPTConvertBuilder>(ttCONFIDENTIAL_MPT_CONVERT, account, sequence, fee)
-    {
-        setMPTokenIssuanceID(mPTokenIssuanceID);
-        setMPTAmount(mPTAmount);
-        setHolderEncryptedAmount(holderEncryptedAmount);
-        setIssuerEncryptedAmount(issuerEncryptedAmount);
-        setBlindingFactor(blindingFactor);
-    }
-
-    /**
-     * @brief Construct a ConfidentialMPTConvertBuilder from an existing STTx object.
-     * @param tx The existing transaction to copy from.
-     * @throws std::runtime_error if the transaction type doesn't match.
-     */
-    ConfidentialMPTConvertBuilder(std::shared_ptr<STTx const> tx)
-    {
-        if (tx->getTxnType() != ttCONFIDENTIAL_MPT_CONVERT)
-        {
-            throw std::runtime_error("Invalid transaction type for ConfidentialMPTConvertBuilder");
-        }
-        object_ = *tx;
-    }
-
-    /** @brief Transaction-specific field setters */
-
-    /**
-     * @brief Set sfMPTokenIssuanceID (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTConvertBuilder&
-    setMPTokenIssuanceID(std::decay_t<typename SF_UINT192::type::value_type> const& value)
-    {
-        object_[sfMPTokenIssuanceID] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfMPTAmount (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTConvertBuilder&
-    setMPTAmount(std::decay_t<typename SF_UINT64::type::value_type> const& value)
-    {
-        object_[sfMPTAmount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfHolderEncryptionKey (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTConvertBuilder&
-    setHolderEncryptionKey(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfHolderEncryptionKey] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfHolderEncryptedAmount (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTConvertBuilder&
-    setHolderEncryptedAmount(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfHolderEncryptedAmount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfIssuerEncryptedAmount (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTConvertBuilder&
-    setIssuerEncryptedAmount(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfIssuerEncryptedAmount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfAuditorEncryptedAmount (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTConvertBuilder&
-    setAuditorEncryptedAmount(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfAuditorEncryptedAmount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfBlindingFactor (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTConvertBuilder&
-    setBlindingFactor(std::decay_t<typename SF_UINT256::type::value_type> const& value)
-    {
-        object_[sfBlindingFactor] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfZKProof (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTConvertBuilder&
-    setZKProof(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfZKProof] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Build and return the ConfidentialMPTConvert wrapper.
-     * @param publicKey The public key for signing.
-     * @param secretKey The secret key for signing.
-     * @return The constructed transaction wrapper.
-     */
-    ConfidentialMPTConvert
-    build(PublicKey const& publicKey, SecretKey const& secretKey)
-    {
-        sign(publicKey, secretKey);
-        return ConfidentialMPTConvert{std::make_shared<STTx>(std::move(object_))};
-    }
-};
-
-}  // namespace xrpl::transactions

include/xrpl/protocol_autogen/transactions/ConfidentialMPTConvertBack.h

@@ -1,310 +0,0 @@
-// This file is auto-generated. Do not edit.
-#pragma once
-
-#include <xrpl/protocol/STTx.h>
-#include <xrpl/protocol/STParsedJSON.h>
-#include <xrpl/protocol/jss.h>
-#include <xrpl/protocol_autogen/TransactionBase.h>
-#include <xrpl/protocol_autogen/TransactionBuilderBase.h>
-#include <xrpl/json/json_value.h>
-
-#include <stdexcept>
-#include <optional>
-
-namespace xrpl::transactions {
-
-class ConfidentialMPTConvertBackBuilder;
-
-/**
- * @brief Transaction: ConfidentialMPTConvertBack
- *
- * Type: ttCONFIDENTIAL_MPT_CONVERT_BACK (87)
- * Delegable: Delegation::delegable
- * Amendment: featureConfidentialTransfer
- * Privileges: noPriv
- *
- * Immutable wrapper around STTx providing type-safe field access.
- * Use ConfidentialMPTConvertBackBuilder to construct new transactions.
- */
-class ConfidentialMPTConvertBack : public TransactionBase
-{
-public:
-    static constexpr xrpl::TxType txType = ttCONFIDENTIAL_MPT_CONVERT_BACK;
-
-    /**
-     * @brief Construct a ConfidentialMPTConvertBack transaction wrapper from an existing STTx object.
-     * @throws std::runtime_error if the transaction type doesn't match.
-     */
-    explicit ConfidentialMPTConvertBack(std::shared_ptr<STTx const> tx)
-        : TransactionBase(std::move(tx))
-    {
-        // Verify transaction type
-        if (tx_->getTxnType() != txType)
-        {
-            throw std::runtime_error("Invalid transaction type for ConfidentialMPTConvertBack");
-        }
-    }
-
-    // Transaction-specific field getters
-
-    /**
-     * @brief Get sfMPTokenIssuanceID (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_UINT192::type::value_type
-    getMPTokenIssuanceID() const
-    {
-        return this->tx_->at(sfMPTokenIssuanceID);
-    }
-
-    /**
-     * @brief Get sfMPTAmount (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_UINT64::type::value_type
-    getMPTAmount() const
-    {
-        return this->tx_->at(sfMPTAmount);
-    }
-
-    /**
-     * @brief Get sfHolderEncryptedAmount (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_VL::type::value_type
-    getHolderEncryptedAmount() const
-    {
-        return this->tx_->at(sfHolderEncryptedAmount);
-    }
-
-    /**
-     * @brief Get sfIssuerEncryptedAmount (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_VL::type::value_type
-    getIssuerEncryptedAmount() const
-    {
-        return this->tx_->at(sfIssuerEncryptedAmount);
-    }
-
-    /**
-     * @brief Get sfAuditorEncryptedAmount (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_VL::type::value_type>
-    getAuditorEncryptedAmount() const
-    {
-        if (hasAuditorEncryptedAmount())
-        {
-            return this->tx_->at(sfAuditorEncryptedAmount);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfAuditorEncryptedAmount is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasAuditorEncryptedAmount() const
-    {
-        return this->tx_->isFieldPresent(sfAuditorEncryptedAmount);
-    }
-
-    /**
-     * @brief Get sfBlindingFactor (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_UINT256::type::value_type
-    getBlindingFactor() const
-    {
-        return this->tx_->at(sfBlindingFactor);
-    }
-
-    /**
-     * @brief Get sfZKProof (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_VL::type::value_type
-    getZKProof() const
-    {
-        return this->tx_->at(sfZKProof);
-    }
-
-    /**
-     * @brief Get sfBalanceCommitment (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_VL::type::value_type
-    getBalanceCommitment() const
-    {
-        return this->tx_->at(sfBalanceCommitment);
-    }
-};
-
-/**
- * @brief Builder for ConfidentialMPTConvertBack transactions.
- *
- * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
- * Inherits common field setters from TransactionBuilderBase.
- */
-class ConfidentialMPTConvertBackBuilder : public TransactionBuilderBase<ConfidentialMPTConvertBackBuilder>
-{
-public:
-    /**
-     * @brief Construct a new ConfidentialMPTConvertBackBuilder with required fields.
-     * @param account The account initiating the transaction.
-     * @param mPTokenIssuanceID The sfMPTokenIssuanceID field value.
-     * @param mPTAmount The sfMPTAmount field value.
-     * @param holderEncryptedAmount The sfHolderEncryptedAmount field value.
-     * @param issuerEncryptedAmount The sfIssuerEncryptedAmount field value.
-     * @param blindingFactor The sfBlindingFactor field value.
-     * @param zKProof The sfZKProof field value.
-     * @param balanceCommitment The sfBalanceCommitment field value.
-     * @param sequence Optional sequence number for the transaction.
-     * @param fee Optional fee for the transaction.
-     */
-    ConfidentialMPTConvertBackBuilder(SF_ACCOUNT::type::value_type account,
-                     std::decay_t<typename SF_UINT192::type::value_type> const& mPTokenIssuanceID,                     std::decay_t<typename SF_UINT64::type::value_type> const& mPTAmount,                     std::decay_t<typename SF_VL::type::value_type> const& holderEncryptedAmount,                     std::decay_t<typename SF_VL::type::value_type> const& issuerEncryptedAmount,                     std::decay_t<typename SF_UINT256::type::value_type> const& blindingFactor,                     std::decay_t<typename SF_VL::type::value_type> const& zKProof,                     std::decay_t<typename SF_VL::type::value_type> const& balanceCommitment,                    std::optional<SF_UINT32::type::value_type> sequence = std::nullopt,
-                    std::optional<SF_AMOUNT::type::value_type> fee = std::nullopt
-)
-        : TransactionBuilderBase<ConfidentialMPTConvertBackBuilder>(ttCONFIDENTIAL_MPT_CONVERT_BACK, account, sequence, fee)
-    {
-        setMPTokenIssuanceID(mPTokenIssuanceID);
-        setMPTAmount(mPTAmount);
-        setHolderEncryptedAmount(holderEncryptedAmount);
-        setIssuerEncryptedAmount(issuerEncryptedAmount);
-        setBlindingFactor(blindingFactor);
-        setZKProof(zKProof);
-        setBalanceCommitment(balanceCommitment);
-    }
-
-    /**
-     * @brief Construct a ConfidentialMPTConvertBackBuilder from an existing STTx object.
-     * @param tx The existing transaction to copy from.
-     * @throws std::runtime_error if the transaction type doesn't match.
-     */
-    ConfidentialMPTConvertBackBuilder(std::shared_ptr<STTx const> tx)
-    {
-        if (tx->getTxnType() != ttCONFIDENTIAL_MPT_CONVERT_BACK)
-        {
-            throw std::runtime_error("Invalid transaction type for ConfidentialMPTConvertBackBuilder");
-        }
-        object_ = *tx;
-    }
-
-    /** @brief Transaction-specific field setters */
-
-    /**
-     * @brief Set sfMPTokenIssuanceID (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTConvertBackBuilder&
-    setMPTokenIssuanceID(std::decay_t<typename SF_UINT192::type::value_type> const& value)
-    {
-        object_[sfMPTokenIssuanceID] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfMPTAmount (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTConvertBackBuilder&
-    setMPTAmount(std::decay_t<typename SF_UINT64::type::value_type> const& value)
-    {
-        object_[sfMPTAmount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfHolderEncryptedAmount (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTConvertBackBuilder&
-    setHolderEncryptedAmount(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfHolderEncryptedAmount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfIssuerEncryptedAmount (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTConvertBackBuilder&
-    setIssuerEncryptedAmount(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfIssuerEncryptedAmount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfAuditorEncryptedAmount (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTConvertBackBuilder&
-    setAuditorEncryptedAmount(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfAuditorEncryptedAmount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfBlindingFactor (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTConvertBackBuilder&
-    setBlindingFactor(std::decay_t<typename SF_UINT256::type::value_type> const& value)
-    {
-        object_[sfBlindingFactor] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfZKProof (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTConvertBackBuilder&
-    setZKProof(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfZKProof] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfBalanceCommitment (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTConvertBackBuilder&
-    setBalanceCommitment(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfBalanceCommitment] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Build and return the ConfidentialMPTConvertBack wrapper.
-     * @param publicKey The public key for signing.
-     * @param secretKey The secret key for signing.
-     * @return The constructed transaction wrapper.
-     */
-    ConfidentialMPTConvertBack
-    build(PublicKey const& publicKey, SecretKey const& secretKey)
-    {
-        sign(publicKey, secretKey);
-        return ConfidentialMPTConvertBack{std::make_shared<STTx>(std::move(object_))};
-    }
-};
-
-}  // namespace xrpl::transactions

include/xrpl/protocol_autogen/transactions/ConfidentialMPTMergeInbox.h

@@ -1,129 +0,0 @@
-// This file is auto-generated. Do not edit.
-#pragma once
-
-#include <xrpl/protocol/STTx.h>
-#include <xrpl/protocol/STParsedJSON.h>
-#include <xrpl/protocol/jss.h>
-#include <xrpl/protocol_autogen/TransactionBase.h>
-#include <xrpl/protocol_autogen/TransactionBuilderBase.h>
-#include <xrpl/json/json_value.h>
-
-#include <stdexcept>
-#include <optional>
-
-namespace xrpl::transactions {
-
-class ConfidentialMPTMergeInboxBuilder;
-
-/**
- * @brief Transaction: ConfidentialMPTMergeInbox
- *
- * Type: ttCONFIDENTIAL_MPT_MERGE_INBOX (86)
- * Delegable: Delegation::delegable
- * Amendment: featureConfidentialTransfer
- * Privileges: noPriv
- *
- * Immutable wrapper around STTx providing type-safe field access.
- * Use ConfidentialMPTMergeInboxBuilder to construct new transactions.
- */
-class ConfidentialMPTMergeInbox : public TransactionBase
-{
-public:
-    static constexpr xrpl::TxType txType = ttCONFIDENTIAL_MPT_MERGE_INBOX;
-
-    /**
-     * @brief Construct a ConfidentialMPTMergeInbox transaction wrapper from an existing STTx object.
-     * @throws std::runtime_error if the transaction type doesn't match.
-     */
-    explicit ConfidentialMPTMergeInbox(std::shared_ptr<STTx const> tx)
-        : TransactionBase(std::move(tx))
-    {
-        // Verify transaction type
-        if (tx_->getTxnType() != txType)
-        {
-            throw std::runtime_error("Invalid transaction type for ConfidentialMPTMergeInbox");
-        }
-    }
-
-    // Transaction-specific field getters
-
-    /**
-     * @brief Get sfMPTokenIssuanceID (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_UINT192::type::value_type
-    getMPTokenIssuanceID() const
-    {
-        return this->tx_->at(sfMPTokenIssuanceID);
-    }
-};
-
-/**
- * @brief Builder for ConfidentialMPTMergeInbox transactions.
- *
- * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
- * Inherits common field setters from TransactionBuilderBase.
- */
-class ConfidentialMPTMergeInboxBuilder : public TransactionBuilderBase<ConfidentialMPTMergeInboxBuilder>
-{
-public:
-    /**
-     * @brief Construct a new ConfidentialMPTMergeInboxBuilder with required fields.
-     * @param account The account initiating the transaction.
-     * @param mPTokenIssuanceID The sfMPTokenIssuanceID field value.
-     * @param sequence Optional sequence number for the transaction.
-     * @param fee Optional fee for the transaction.
-     */
-    ConfidentialMPTMergeInboxBuilder(SF_ACCOUNT::type::value_type account,
-                     std::decay_t<typename SF_UINT192::type::value_type> const& mPTokenIssuanceID,                    std::optional<SF_UINT32::type::value_type> sequence = std::nullopt,
-                    std::optional<SF_AMOUNT::type::value_type> fee = std::nullopt
-)
-        : TransactionBuilderBase<ConfidentialMPTMergeInboxBuilder>(ttCONFIDENTIAL_MPT_MERGE_INBOX, account, sequence, fee)
-    {
-        setMPTokenIssuanceID(mPTokenIssuanceID);
-    }
-
-    /**
-     * @brief Construct a ConfidentialMPTMergeInboxBuilder from an existing STTx object.
-     * @param tx The existing transaction to copy from.
-     * @throws std::runtime_error if the transaction type doesn't match.
-     */
-    ConfidentialMPTMergeInboxBuilder(std::shared_ptr<STTx const> tx)
-    {
-        if (tx->getTxnType() != ttCONFIDENTIAL_MPT_MERGE_INBOX)
-        {
-            throw std::runtime_error("Invalid transaction type for ConfidentialMPTMergeInboxBuilder");
-        }
-        object_ = *tx;
-    }
-
-    /** @brief Transaction-specific field setters */
-
-    /**
-     * @brief Set sfMPTokenIssuanceID (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTMergeInboxBuilder&
-    setMPTokenIssuanceID(std::decay_t<typename SF_UINT192::type::value_type> const& value)
-    {
-        object_[sfMPTokenIssuanceID] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Build and return the ConfidentialMPTMergeInbox wrapper.
-     * @param publicKey The public key for signing.
-     * @param secretKey The secret key for signing.
-     * @return The constructed transaction wrapper.
-     */
-    ConfidentialMPTMergeInbox
-    build(PublicKey const& publicKey, SecretKey const& secretKey)
-    {
-        sign(publicKey, secretKey);
-        return ConfidentialMPTMergeInbox{std::make_shared<STTx>(std::move(object_))};
-    }
-};
-
-}  // namespace xrpl::transactions

include/xrpl/protocol_autogen/transactions/ConfidentialMPTSend.h

@@ -1,371 +0,0 @@
-// This file is auto-generated. Do not edit.
-#pragma once
-
-#include <xrpl/protocol/STTx.h>
-#include <xrpl/protocol/STParsedJSON.h>
-#include <xrpl/protocol/jss.h>
-#include <xrpl/protocol_autogen/TransactionBase.h>
-#include <xrpl/protocol_autogen/TransactionBuilderBase.h>
-#include <xrpl/json/json_value.h>
-
-#include <stdexcept>
-#include <optional>
-
-namespace xrpl::transactions {
-
-class ConfidentialMPTSendBuilder;
-
-/**
- * @brief Transaction: ConfidentialMPTSend
- *
- * Type: ttCONFIDENTIAL_MPT_SEND (88)
- * Delegable: Delegation::delegable
- * Amendment: featureConfidentialTransfer
- * Privileges: noPriv
- *
- * Immutable wrapper around STTx providing type-safe field access.
- * Use ConfidentialMPTSendBuilder to construct new transactions.
- */
-class ConfidentialMPTSend : public TransactionBase
-{
-public:
-    static constexpr xrpl::TxType txType = ttCONFIDENTIAL_MPT_SEND;
-
-    /**
-     * @brief Construct a ConfidentialMPTSend transaction wrapper from an existing STTx object.
-     * @throws std::runtime_error if the transaction type doesn't match.
-     */
-    explicit ConfidentialMPTSend(std::shared_ptr<STTx const> tx)
-        : TransactionBase(std::move(tx))
-    {
-        // Verify transaction type
-        if (tx_->getTxnType() != txType)
-        {
-            throw std::runtime_error("Invalid transaction type for ConfidentialMPTSend");
-        }
-    }
-
-    // Transaction-specific field getters
-
-    /**
-     * @brief Get sfMPTokenIssuanceID (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_UINT192::type::value_type
-    getMPTokenIssuanceID() const
-    {
-        return this->tx_->at(sfMPTokenIssuanceID);
-    }
-
-    /**
-     * @brief Get sfDestination (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_ACCOUNT::type::value_type
-    getDestination() const
-    {
-        return this->tx_->at(sfDestination);
-    }
-
-    /**
-     * @brief Get sfSenderEncryptedAmount (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_VL::type::value_type
-    getSenderEncryptedAmount() const
-    {
-        return this->tx_->at(sfSenderEncryptedAmount);
-    }
-
-    /**
-     * @brief Get sfDestinationEncryptedAmount (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_VL::type::value_type
-    getDestinationEncryptedAmount() const
-    {
-        return this->tx_->at(sfDestinationEncryptedAmount);
-    }
-
-    /**
-     * @brief Get sfIssuerEncryptedAmount (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_VL::type::value_type
-    getIssuerEncryptedAmount() const
-    {
-        return this->tx_->at(sfIssuerEncryptedAmount);
-    }
-
-    /**
-     * @brief Get sfAuditorEncryptedAmount (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_VL::type::value_type>
-    getAuditorEncryptedAmount() const
-    {
-        if (hasAuditorEncryptedAmount())
-        {
-            return this->tx_->at(sfAuditorEncryptedAmount);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfAuditorEncryptedAmount is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasAuditorEncryptedAmount() const
-    {
-        return this->tx_->isFieldPresent(sfAuditorEncryptedAmount);
-    }
-
-    /**
-     * @brief Get sfZKProof (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_VL::type::value_type
-    getZKProof() const
-    {
-        return this->tx_->at(sfZKProof);
-    }
-
-    /**
-     * @brief Get sfAmountCommitment (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_VL::type::value_type
-    getAmountCommitment() const
-    {
-        return this->tx_->at(sfAmountCommitment);
-    }
-
-    /**
-     * @brief Get sfBalanceCommitment (soeREQUIRED)
-     * @return The field value.
-     */
-    [[nodiscard]]
-    SF_VL::type::value_type
-    getBalanceCommitment() const
-    {
-        return this->tx_->at(sfBalanceCommitment);
-    }
-
-    /**
-     * @brief Get sfCredentialIDs (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_VECTOR256::type::value_type>
-    getCredentialIDs() const
-    {
-        if (hasCredentialIDs())
-        {
-            return this->tx_->at(sfCredentialIDs);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfCredentialIDs is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasCredentialIDs() const
-    {
-        return this->tx_->isFieldPresent(sfCredentialIDs);
-    }
-};
-
-/**
- * @brief Builder for ConfidentialMPTSend transactions.
- *
- * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
- * Inherits common field setters from TransactionBuilderBase.
- */
-class ConfidentialMPTSendBuilder : public TransactionBuilderBase<ConfidentialMPTSendBuilder>
-{
-public:
-    /**
-     * @brief Construct a new ConfidentialMPTSendBuilder with required fields.
-     * @param account The account initiating the transaction.
-     * @param mPTokenIssuanceID The sfMPTokenIssuanceID field value.
-     * @param destination The sfDestination field value.
-     * @param senderEncryptedAmount The sfSenderEncryptedAmount field value.
-     * @param destinationEncryptedAmount The sfDestinationEncryptedAmount field value.
-     * @param issuerEncryptedAmount The sfIssuerEncryptedAmount field value.
-     * @param zKProof The sfZKProof field value.
-     * @param amountCommitment The sfAmountCommitment field value.
-     * @param balanceCommitment The sfBalanceCommitment field value.
-     * @param sequence Optional sequence number for the transaction.
-     * @param fee Optional fee for the transaction.
-     */
-    ConfidentialMPTSendBuilder(SF_ACCOUNT::type::value_type account,
-                     std::decay_t<typename SF_UINT192::type::value_type> const& mPTokenIssuanceID,                     std::decay_t<typename SF_ACCOUNT::type::value_type> const& destination,                     std::decay_t<typename SF_VL::type::value_type> const& senderEncryptedAmount,                     std::decay_t<typename SF_VL::type::value_type> const& destinationEncryptedAmount,                     std::decay_t<typename SF_VL::type::value_type> const& issuerEncryptedAmount,                     std::decay_t<typename SF_VL::type::value_type> const& zKProof,                     std::decay_t<typename SF_VL::type::value_type> const& amountCommitment,                     std::decay_t<typename SF_VL::type::value_type> const& balanceCommitment,                    std::optional<SF_UINT32::type::value_type> sequence = std::nullopt,
-                    std::optional<SF_AMOUNT::type::value_type> fee = std::nullopt
-)
-        : TransactionBuilderBase<ConfidentialMPTSendBuilder>(ttCONFIDENTIAL_MPT_SEND, account, sequence, fee)
-    {
-        setMPTokenIssuanceID(mPTokenIssuanceID);
-        setDestination(destination);
-        setSenderEncryptedAmount(senderEncryptedAmount);
-        setDestinationEncryptedAmount(destinationEncryptedAmount);
-        setIssuerEncryptedAmount(issuerEncryptedAmount);
-        setZKProof(zKProof);
-        setAmountCommitment(amountCommitment);
-        setBalanceCommitment(balanceCommitment);
-    }
-
-    /**
-     * @brief Construct a ConfidentialMPTSendBuilder from an existing STTx object.
-     * @param tx The existing transaction to copy from.
-     * @throws std::runtime_error if the transaction type doesn't match.
-     */
-    ConfidentialMPTSendBuilder(std::shared_ptr<STTx const> tx)
-    {
-        if (tx->getTxnType() != ttCONFIDENTIAL_MPT_SEND)
-        {
-            throw std::runtime_error("Invalid transaction type for ConfidentialMPTSendBuilder");
-        }
-        object_ = *tx;
-    }
-
-    /** @brief Transaction-specific field setters */
-
-    /**
-     * @brief Set sfMPTokenIssuanceID (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTSendBuilder&
-    setMPTokenIssuanceID(std::decay_t<typename SF_UINT192::type::value_type> const& value)
-    {
-        object_[sfMPTokenIssuanceID] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfDestination (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTSendBuilder&
-    setDestination(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
-    {
-        object_[sfDestination] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfSenderEncryptedAmount (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTSendBuilder&
-    setSenderEncryptedAmount(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfSenderEncryptedAmount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfDestinationEncryptedAmount (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTSendBuilder&
-    setDestinationEncryptedAmount(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfDestinationEncryptedAmount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfIssuerEncryptedAmount (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTSendBuilder&
-    setIssuerEncryptedAmount(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfIssuerEncryptedAmount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfAuditorEncryptedAmount (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTSendBuilder&
-    setAuditorEncryptedAmount(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfAuditorEncryptedAmount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfZKProof (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTSendBuilder&
-    setZKProof(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfZKProof] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfAmountCommitment (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTSendBuilder&
-    setAmountCommitment(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfAmountCommitment] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfBalanceCommitment (soeREQUIRED)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTSendBuilder&
-    setBalanceCommitment(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfBalanceCommitment] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfCredentialIDs (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    ConfidentialMPTSendBuilder&
-    setCredentialIDs(std::decay_t<typename SF_VECTOR256::type::value_type> const& value)
-    {
-        object_[sfCredentialIDs] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Build and return the ConfidentialMPTSend wrapper.
-     * @param publicKey The public key for signing.
-     * @param secretKey The secret key for signing.
-     * @return The constructed transaction wrapper.
-     */
-    ConfidentialMPTSend
-    build(PublicKey const& publicKey, SecretKey const& secretKey)
-    {
-        sign(publicKey, secretKey);
-        return ConfidentialMPTSend{std::make_shared<STTx>(std::move(object_))};
-    }
-};
-
-}  // namespace xrpl::transactions

include/xrpl/protocol_autogen/transactions/MPTokenIssuanceSet.h

@@ -187,58 +187,6 @@ public:
     {
         return this->tx_->isFieldPresent(sfMutableFlags);
     }
-
-    /**
-     * @brief Get sfIssuerEncryptionKey (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_VL::type::value_type>
-    getIssuerEncryptionKey() const
-    {
-        if (hasIssuerEncryptionKey())
-        {
-            return this->tx_->at(sfIssuerEncryptionKey);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfIssuerEncryptionKey is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasIssuerEncryptionKey() const
-    {
-        return this->tx_->isFieldPresent(sfIssuerEncryptionKey);
-    }
-
-    /**
-     * @brief Get sfAuditorEncryptionKey (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_VL::type::value_type>
-    getAuditorEncryptionKey() const
-    {
-        if (hasAuditorEncryptionKey())
-        {
-            return this->tx_->at(sfAuditorEncryptionKey);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfAuditorEncryptionKey is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasAuditorEncryptionKey() const
-    {
-        return this->tx_->isFieldPresent(sfAuditorEncryptionKey);
-    }
 };
 
 /**
@@ -349,28 +297,6 @@ public:
         return *this;
     }
 
-    /**
-     * @brief Set sfIssuerEncryptionKey (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    MPTokenIssuanceSetBuilder&
-    setIssuerEncryptionKey(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfIssuerEncryptionKey] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfAuditorEncryptionKey (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    MPTokenIssuanceSetBuilder&
-    setAuditorEncryptionKey(std::decay_t<typename SF_VL::type::value_type> const& value)
-    {
-        object_[sfAuditorEncryptionKey] = value;
-        return *this;
-    }
-
     /**
      * @brief Build and return the MPTokenIssuanceSet wrapper.
      * @param publicKey The public key for signing.

include/xrpl/protocol_autogen/transactions/SponsorshipSet.h

@@ -1,290 +0,0 @@
-// This file is auto-generated. Do not edit.
-#pragma once
-
-#include <xrpl/protocol/STTx.h>
-#include <xrpl/protocol/STParsedJSON.h>
-#include <xrpl/protocol/jss.h>
-#include <xrpl/protocol_autogen/TransactionBase.h>
-#include <xrpl/protocol_autogen/TransactionBuilderBase.h>
-#include <xrpl/json/json_value.h>
-
-#include <stdexcept>
-#include <optional>
-
-namespace xrpl::transactions {
-
-class SponsorshipSetBuilder;
-
-/**
- * @brief Transaction: SponsorshipSet
- *
- * Type: ttSPONSORSHIP_SET (91)
- * Delegable: Delegation::delegable
- * Amendment: featureSponsor
- * Privileges: noPriv
- *
- * Immutable wrapper around STTx providing type-safe field access.
- * Use SponsorshipSetBuilder to construct new transactions.
- */
-class SponsorshipSet : public TransactionBase
-{
-public:
-    static constexpr xrpl::TxType txType = ttSPONSORSHIP_SET;
-
-    /**
-     * @brief Construct a SponsorshipSet transaction wrapper from an existing STTx object.
-     * @throws std::runtime_error if the transaction type doesn't match.
-     */
-    explicit SponsorshipSet(std::shared_ptr<STTx const> tx)
-        : TransactionBase(std::move(tx))
-    {
-        // Verify transaction type
-        if (tx_->getTxnType() != txType)
-        {
-            throw std::runtime_error("Invalid transaction type for SponsorshipSet");
-        }
-    }
-
-    // Transaction-specific field getters
-
-    /**
-     * @brief Get sfCounterpartySponsor (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_ACCOUNT::type::value_type>
-    getCounterpartySponsor() const
-    {
-        if (hasCounterpartySponsor())
-        {
-            return this->tx_->at(sfCounterpartySponsor);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfCounterpartySponsor is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasCounterpartySponsor() const
-    {
-        return this->tx_->isFieldPresent(sfCounterpartySponsor);
-    }
-
-    /**
-     * @brief Get sfSponsee (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_ACCOUNT::type::value_type>
-    getSponsee() const
-    {
-        if (hasSponsee())
-        {
-            return this->tx_->at(sfSponsee);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfSponsee is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasSponsee() const
-    {
-        return this->tx_->isFieldPresent(sfSponsee);
-    }
-
-    /**
-     * @brief Get sfFeeAmount (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_AMOUNT::type::value_type>
-    getFeeAmount() const
-    {
-        if (hasFeeAmount())
-        {
-            return this->tx_->at(sfFeeAmount);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfFeeAmount is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasFeeAmount() const
-    {
-        return this->tx_->isFieldPresent(sfFeeAmount);
-    }
-
-    /**
-     * @brief Get sfMaxFee (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_AMOUNT::type::value_type>
-    getMaxFee() const
-    {
-        if (hasMaxFee())
-        {
-            return this->tx_->at(sfMaxFee);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfMaxFee is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasMaxFee() const
-    {
-        return this->tx_->isFieldPresent(sfMaxFee);
-    }
-
-    /**
-     * @brief Get sfReserveCount (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT32::type::value_type>
-    getReserveCount() const
-    {
-        if (hasReserveCount())
-        {
-            return this->tx_->at(sfReserveCount);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfReserveCount is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasReserveCount() const
-    {
-        return this->tx_->isFieldPresent(sfReserveCount);
-    }
-};
-
-/**
- * @brief Builder for SponsorshipSet transactions.
- *
- * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
- * Inherits common field setters from TransactionBuilderBase.
- */
-class SponsorshipSetBuilder : public TransactionBuilderBase<SponsorshipSetBuilder>
-{
-public:
-    /**
-     * @brief Construct a new SponsorshipSetBuilder with required fields.
-     * @param account The account initiating the transaction.
-     * @param sequence Optional sequence number for the transaction.
-     * @param fee Optional fee for the transaction.
-     */
-    SponsorshipSetBuilder(SF_ACCOUNT::type::value_type account,
-                    std::optional<SF_UINT32::type::value_type> sequence = std::nullopt,
-                    std::optional<SF_AMOUNT::type::value_type> fee = std::nullopt
-)
-        : TransactionBuilderBase<SponsorshipSetBuilder>(ttSPONSORSHIP_SET, account, sequence, fee)
-    {
-    }
-
-    /**
-     * @brief Construct a SponsorshipSetBuilder from an existing STTx object.
-     * @param tx The existing transaction to copy from.
-     * @throws std::runtime_error if the transaction type doesn't match.
-     */
-    SponsorshipSetBuilder(std::shared_ptr<STTx const> tx)
-    {
-        if (tx->getTxnType() != ttSPONSORSHIP_SET)
-        {
-            throw std::runtime_error("Invalid transaction type for SponsorshipSetBuilder");
-        }
-        object_ = *tx;
-    }
-
-    /** @brief Transaction-specific field setters */
-
-    /**
-     * @brief Set sfCounterpartySponsor (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    SponsorshipSetBuilder&
-    setCounterpartySponsor(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
-    {
-        object_[sfCounterpartySponsor] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfSponsee (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    SponsorshipSetBuilder&
-    setSponsee(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
-    {
-        object_[sfSponsee] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfFeeAmount (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    SponsorshipSetBuilder&
-    setFeeAmount(std::decay_t<typename SF_AMOUNT::type::value_type> const& value)
-    {
-        object_[sfFeeAmount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfMaxFee (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    SponsorshipSetBuilder&
-    setMaxFee(std::decay_t<typename SF_AMOUNT::type::value_type> const& value)
-    {
-        object_[sfMaxFee] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfReserveCount (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    SponsorshipSetBuilder&
-    setReserveCount(std::decay_t<typename SF_UINT32::type::value_type> const& value)
-    {
-        object_[sfReserveCount] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Build and return the SponsorshipSet wrapper.
-     * @param publicKey The public key for signing.
-     * @param secretKey The secret key for signing.
-     * @return The constructed transaction wrapper.
-     */
-    SponsorshipSet
-    build(PublicKey const& publicKey, SecretKey const& secretKey)
-    {
-        sign(publicKey, secretKey);
-        return SponsorshipSet{std::make_shared<STTx>(std::move(object_))};
-    }
-};
-
-}  // namespace xrpl::transactions

include/xrpl/protocol_autogen/transactions/SponsorshipTransfer.h

@@ -1,179 +0,0 @@
-// This file is auto-generated. Do not edit.
-#pragma once
-
-#include <xrpl/protocol/STTx.h>
-#include <xrpl/protocol/STParsedJSON.h>
-#include <xrpl/protocol/jss.h>
-#include <xrpl/protocol_autogen/TransactionBase.h>
-#include <xrpl/protocol_autogen/TransactionBuilderBase.h>
-#include <xrpl/json/json_value.h>
-
-#include <stdexcept>
-#include <optional>
-
-namespace xrpl::transactions {
-
-class SponsorshipTransferBuilder;
-
-/**
- * @brief Transaction: SponsorshipTransfer
- *
- * Type: ttSPONSORSHIP_TRANSFER (90)
- * Delegable: Delegation::delegable
- * Amendment: featureSponsor
- * Privileges: noPriv
- *
- * Immutable wrapper around STTx providing type-safe field access.
- * Use SponsorshipTransferBuilder to construct new transactions.
- */
-class SponsorshipTransfer : public TransactionBase
-{
-public:
-    static constexpr xrpl::TxType txType = ttSPONSORSHIP_TRANSFER;
-
-    /**
-     * @brief Construct a SponsorshipTransfer transaction wrapper from an existing STTx object.
-     * @throws std::runtime_error if the transaction type doesn't match.
-     */
-    explicit SponsorshipTransfer(std::shared_ptr<STTx const> tx)
-        : TransactionBase(std::move(tx))
-    {
-        // Verify transaction type
-        if (tx_->getTxnType() != txType)
-        {
-            throw std::runtime_error("Invalid transaction type for SponsorshipTransfer");
-        }
-    }
-
-    // Transaction-specific field getters
-
-    /**
-     * @brief Get sfObjectID (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_UINT256::type::value_type>
-    getObjectID() const
-    {
-        if (hasObjectID())
-        {
-            return this->tx_->at(sfObjectID);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfObjectID is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasObjectID() const
-    {
-        return this->tx_->isFieldPresent(sfObjectID);
-    }
-
-    /**
-     * @brief Get sfSponsee (soeOPTIONAL)
-     * @return The field value, or std::nullopt if not present.
-     */
-    [[nodiscard]]
-    protocol_autogen::Optional<SF_ACCOUNT::type::value_type>
-    getSponsee() const
-    {
-        if (hasSponsee())
-        {
-            return this->tx_->at(sfSponsee);
-        }
-        return std::nullopt;
-    }
-
-    /**
-     * @brief Check if sfSponsee is present.
-     * @return True if the field is present, false otherwise.
-     */
-    [[nodiscard]]
-    bool
-    hasSponsee() const
-    {
-        return this->tx_->isFieldPresent(sfSponsee);
-    }
-};
-
-/**
- * @brief Builder for SponsorshipTransfer transactions.
- *
- * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
- * Inherits common field setters from TransactionBuilderBase.
- */
-class SponsorshipTransferBuilder : public TransactionBuilderBase<SponsorshipTransferBuilder>
-{
-public:
-    /**
-     * @brief Construct a new SponsorshipTransferBuilder with required fields.
-     * @param account The account initiating the transaction.
-     * @param sequence Optional sequence number for the transaction.
-     * @param fee Optional fee for the transaction.
-     */
-    SponsorshipTransferBuilder(SF_ACCOUNT::type::value_type account,
-                    std::optional<SF_UINT32::type::value_type> sequence = std::nullopt,
-                    std::optional<SF_AMOUNT::type::value_type> fee = std::nullopt
-)
-        : TransactionBuilderBase<SponsorshipTransferBuilder>(ttSPONSORSHIP_TRANSFER, account, sequence, fee)
-    {
-    }
-
-    /**
-     * @brief Construct a SponsorshipTransferBuilder from an existing STTx object.
-     * @param tx The existing transaction to copy from.
-     * @throws std::runtime_error if the transaction type doesn't match.
-     */
-    SponsorshipTransferBuilder(std::shared_ptr<STTx const> tx)
-    {
-        if (tx->getTxnType() != ttSPONSORSHIP_TRANSFER)
-        {
-            throw std::runtime_error("Invalid transaction type for SponsorshipTransferBuilder");
-        }
-        object_ = *tx;
-    }
-
-    /** @brief Transaction-specific field setters */
-
-    /**
-     * @brief Set sfObjectID (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    SponsorshipTransferBuilder&
-    setObjectID(std::decay_t<typename SF_UINT256::type::value_type> const& value)
-    {
-        object_[sfObjectID] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Set sfSponsee (soeOPTIONAL)
-     * @return Reference to this builder for method chaining.
-     */
-    SponsorshipTransferBuilder&
-    setSponsee(std::decay_t<typename SF_ACCOUNT::type::value_type> const& value)
-    {
-        object_[sfSponsee] = value;
-        return *this;
-    }
-
-    /**
-     * @brief Build and return the SponsorshipTransfer wrapper.
-     * @param publicKey The public key for signing.
-     * @param secretKey The secret key for signing.
-     * @return The constructed transaction wrapper.
-     */
-    SponsorshipTransfer
-    build(PublicKey const& publicKey, SecretKey const& secretKey)
-    {
-        sign(publicKey, secretKey);
-        return SponsorshipTransfer{std::make_shared<STTx>(std::move(object_))};
-    }
-};
-
-}  // namespace xrpl::transactions

include/xrpl/server/NetworkOPs.h

@@ -185,7 +185,7 @@ public:
     virtual bool
     isFull() = 0;
     virtual void
-    setMode(OperatingMode om) = 0;
+    setMode(OperatingMode om, char const* reason) = 0;
     virtual bool
     isBlocked() = 0;
     virtual bool

include/xrpl/tx/ApplyContext.h

@@ -122,7 +122,7 @@ private:
     ApplyFlags flags_;
     std::optional<ApplyViewImpl> view_;
 
-    // The ID of the batch transaction we are executing under, if set.
+    // The ID of the batch transaction we are executing under, if seated.
     std::optional<uint256 const> parentBatchId_;
 };
 

include/xrpl/tx/Transactor.h

@@ -2,7 +2,6 @@
 
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/beast/utility/WrappedSink.h>
-#include <xrpl/ledger/helpers/SponsorHelpers.h>
 #include <xrpl/protocol/Permissions.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/ApplyContext.h>
@@ -107,20 +106,6 @@ struct PreflightResult;
 // Needed for preflight specialization
 class Change;
 
-enum class FeePayerType {
-    Account,
-    Delegate,
-    SponsorCoSigned,
-    SponsorPreFunded,
-};
-
-struct FeePayer
-{
-    Keylet entry;
-    SF_AMOUNT const& balanceField;
-    FeePayerType type{FeePayerType::Account};
-};
-
 class Transactor
 {
 protected:
@@ -177,6 +162,9 @@ public:
     static NotTEC
     checkSign(PreclaimContext const& ctx);
 
+    static NotTEC
+    checkBatchSign(PreclaimContext const& ctx);
+
     // Returns the fee in fee units, not scaled for load.
     static XRPAmount
     calculateBaseFee(ReadView const& view, STTx const& tx);
@@ -218,50 +206,8 @@ public:
         return tesSUCCESS;
     }
 
-    /**
-     * This function can be overridden to introduce additional semantic constraints beyond the
-     * granular template validation for granular permissions. It is called by the base
-     * checkPermission method only after the transaction has successfully passed
-     * checkGranularSandbox.
-     */
     static NotTEC
-    checkGranularSemantics(
-        ReadView const& view,
-        STTx const& tx,
-        std::unordered_set<GranularPermissionType> const& heldGranularPermissions)
-    {
-        return tesSUCCESS;
-    }
-
-    /**
-     * Checks whether the transaction is authorized to be executed by the delegated account.
-     * This function enforces the strict permission check hierarchy. It is explicitly
-     * designed NOT to be overridden. Derived transactors must instead implement
-     * checkGranularSemantics to add custom validation logic for granular permissions.
-     *
-     * The evaluation proceeds as follows:
-     * - If transaction-level permission is granted, the function immediately returns tesSUCCESS.
-     * - If transaction-level permission is not granted, the function checks whether the transaction
-     * matches the granular permission template defined in permissions.macro. If it does, it then
-     * calls checkGranularSemantics to perform any additional, fine-grained validation.
-     *
-     */
-    template <class T>
-    static NotTEC
-    checkPermission(ReadView const& view, STTx const& tx)
-    {
-        std::unordered_set<GranularPermissionType> heldGranularPermissions;
-        if (NotTEC const result = checkPermissionImpl(view, tx, heldGranularPermissions);
-            !isTesSuccess(result) || heldGranularPermissions.empty())
-        {
-            return result;
-        }
-
-        return T::checkGranularSemantics(view, tx, heldGranularPermissions);
-    }
-
-    static NotTEC
-    checkSponsor(ReadView const& view, STTx const& tx);
+    checkPermission(ReadView const& view, STTx const& tx);
     /////////////////////////////////////////////////////
 
     // Interface used by AccountDelete
@@ -347,7 +293,14 @@ protected:
         std::optional<T> value,
         unit::ValueUnit<Unit, T> min = unit::ValueUnit<Unit, T>{});
 
-protected:
+private:
+    std::pair<TER, XRPAmount>
+    reset(XRPAmount fee);
+
+    TER
+    consumeSeqProxy(SLE::pointer const& sleAccount);
+    TER
+    payFee();
     static NotTEC
     checkSingleSign(
         ReadView const& view,
@@ -363,24 +316,6 @@ protected:
         STObject const& sigObject,
         beast::Journal const j);
 
-private:
-    static NotTEC
-    checkPermissionImpl(
-        ReadView const& view,
-        STTx const& tx,
-        std::unordered_set<GranularPermissionType>& heldGranularPermissions);
-
-    std::pair<TER, XRPAmount>
-    reset(XRPAmount fee);
-
-    static FeePayer
-    getFeePayer(ReadView const& view, STTx const& tx);
-
-    TER
-    consumeSeqProxy(SLE::pointer const& sleAccount);
-    TER
-    payFee();
-
     void trapTransaction(uint256) const;
 
     /** Performs early sanity checks on the account and fee fields.

include/xrpl/tx/invariants/InvariantCheck.h

@@ -13,7 +13,6 @@
 #include <xrpl/tx/invariants/NFTInvariant.h>
 #include <xrpl/tx/invariants/PermissionedDEXInvariant.h>
 #include <xrpl/tx/invariants/PermissionedDomainInvariant.h>
-#include <xrpl/tx/invariants/SponsorshipInvariant.h>
 #include <xrpl/tx/invariants/VaultInvariant.h>
 
 #include <cstdint>
@@ -400,11 +399,7 @@ using InvariantChecks = std::tuple<
     ValidLoanBroker,
     ValidLoan,
     ValidVault,
-    ValidConfidentialMPToken,
-    ValidMPTPayment,
-    ValidMPTTransfer,
-    SponsorshipOwnerCountsMatch,
-    SponsorshipAccountCountMatchesField>;
+    ValidMPTPayment>;
 
 /**
  * @brief get a tuple of all invariant checks

include/xrpl/tx/invariants/MPTInvariant.h

@@ -56,65 +56,4 @@ public:
     finalize(STTx const&, TER const, XRPAmount const, ReadView const&, beast::Journal const&);
 };
 
-/**
- * @brief Invariants: Confidential MPToken consistency
- *
- * - Convert/ConvertBack symmetry:
- * Regular MPToken balance change (±X) == COA (Confidential Outstanding Amount) change (∓X)
- * - Cannot delete MPToken with non-zero confidential state:
- * Cannot delete if sfIssuerEncryptedBalance exists
- * Cannot delete if sfConfidentialBalanceInbox and sfConfidentialBalanceSpending exist
- * - Privacy flag consistency:
- * MPToken can only have encrypted fields if lsfMPTCanConfidentialAmount is set on
- * issuance.
- * - Encrypted field existence consistency:
- * If sfConfidentialBalanceSpending/sfConfidentialBalanceInbox exists, then
- * sfIssuerEncryptedBalance must also exist (and vice versa).
- * - COA <= OutstandingAmount:
- * Confidential outstanding balance cannot exceed total outstanding.
- * - Verifies sfConfidentialBalanceVersion is changed whenever sfConfidentialBalanceSpending is
- * modified on an MPToken.
- */
-class ValidConfidentialMPToken
-{
-    struct Changes
-    {
-        std::int64_t mptAmountDelta = 0;
-        std::int64_t coaDelta = 0;
-        std::int64_t outstandingDelta = 0;
-        SLE::const_pointer issuance;
-        bool deletedWithEncrypted = false;
-        bool badConsistency = false;
-        bool badCOA = false;
-        bool requiresPrivacyFlag = false;
-        bool badVersion = false;
-    };
-    std::map<uint192, Changes> changes_;
-
-public:
-    void
-    visitEntry(bool, std::shared_ptr<SLE const> const&, std::shared_ptr<SLE const> const&);
-
-    bool
-    finalize(STTx const&, TER const, XRPAmount const, ReadView const&, beast::Journal const&);
-};
-
-class ValidMPTTransfer
-{
-    struct Value
-    {
-        std::optional<std::uint64_t> amtBefore;
-        std::optional<std::uint64_t> amtAfter;
-    };
-    // MPTID: {holder: Value}
-    hash_map<uint192, hash_map<AccountID, Value>> amount_;
-
-public:
-    void
-    visitEntry(bool, std::shared_ptr<SLE const> const&, std::shared_ptr<SLE const> const&);
-
-    bool
-    finalize(STTx const&, TER const, XRPAmount const, ReadView const&, beast::Journal const&);
-};
-
 }  // namespace xrpl

include/xrpl/tx/invariants/SponsorshipInvariant.h

@@ -1,55 +0,0 @@
-#pragma once
-
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/ReadView.h>
-#include <xrpl/protocol/STTx.h>
-#include <xrpl/protocol/TER.h>
-
-#include <cstdint>
-
-namespace xrpl {
-
-/**
- * @brief Invariant: Sponsored owner counts are balanced.
- *
- * The following check is made for every transaction:
- *  - The sum of all per-account deltas of `sfSponsoredOwnerCount` equals
- *    the sum of all per-account deltas of `sfSponsoringOwnerCount`.
- *  - Account OwnerCount must be greater than or equal to SponsoredOwnerCount.
- */
-class SponsorshipOwnerCountsMatch
-{
-    std::int64_t deltaSponsoredOwnerCount_ = 0;
-    std::int64_t deltaSponsoringOwnerCount_ = 0;
-    std::uint64_t invalidOwnerCountLessThanSponsoredOwnerCount_ = 0;
-
-public:
-    void
-    visitEntry(bool, std::shared_ptr<SLE const> const&, std::shared_ptr<SLE const> const&);
-
-    bool
-    finalize(STTx const&, TER const, XRPAmount const, ReadView const&, beast::Journal const&);
-};
-
-/**
- * @brief Invariant: Sponsoring account relationships tracked consistently.
- *
- * The following check is made for every transaction:
- *  - The net delta of `sfSponsoringAccountCount` across all accounts equals
- *    the net delta of the count of ltACCOUNT_ROOT entries having
- *    `sfSponsor` present (presence transitions only: add/remove).
- */
-class SponsorshipAccountCountMatchesField
-{
-    std::int64_t deltaSponsoringAccountCount_ = 0;
-    std::int64_t deltaSponsorFieldPresence_ = 0;
-
-public:
-    void
-    visitEntry(bool, std::shared_ptr<SLE const> const&, std::shared_ptr<SLE const> const&);
-
-    bool
-    finalize(STTx const&, TER const, XRPAmount const, ReadView const&, beast::Journal const&);
-};
-
-}  // namespace xrpl

include/xrpl/tx/paths/AMMOffer.h

@@ -104,10 +104,7 @@ public:
     send(Args&&... args)
     {
         return accountSend(
-            std::forward<Args>(args)...,
-            std::nullopt,
-            WaiveTransferFee::Yes,
-            AllowMPTOverflow::Yes);
+            std::forward<Args>(args)..., WaiveTransferFee::Yes, AllowMPTOverflow::Yes);
     }
 
     bool

include/xrpl/tx/paths/Offer.h

@@ -213,8 +213,7 @@ template <typename... Args>
 TER
 TOffer<TIn, TOut>::send(Args&&... args)
 {
-    return accountSend(
-        std::forward<Args>(args)..., std::nullopt, WaiveTransferFee::No, AllowMPTOverflow::Yes);
+    return accountSend(std::forward<Args>(args)..., WaiveTransferFee::No, AllowMPTOverflow::Yes);
 }
 
 template <StepAmount TIn, StepAmount TOut>

include/xrpl/tx/transactors/account/AccountSet.h

@@ -23,6 +23,9 @@ public:
     static NotTEC
     preflight(PreflightContext const& ctx);
 
+    static NotTEC
+    checkPermission(ReadView const& view, STTx const& tx);
+
     static TER
     preclaim(PreclaimContext const& ctx);
 

include/xrpl/tx/transactors/delegate/DelegateSet.h

@@ -24,7 +24,11 @@ public:
 
     // Interface used by AccountDelete
     static TER
-    deleteDelegate(ApplyView& view, std::shared_ptr<SLE> const& sle, beast::Journal j);
+    deleteDelegate(
+        ApplyView& view,
+        std::shared_ptr<SLE> const& sle,
+        AccountID const& account,
+        beast::Journal j);
 };
 
 }  // namespace xrpl

include/xrpl/tx/transactors/dex/AMMWithdraw.h

@@ -89,7 +89,6 @@ public:
     static std::tuple<TER, STAmount, STAmount, std::optional<STAmount>>
     equalWithdrawTokens(
         Sandbox& view,
-        STTx const& tx,
         SLE const& ammSle,
         AccountID const account,
         AccountID const& ammAccount,
@@ -124,7 +123,6 @@ public:
     static std::tuple<TER, STAmount, STAmount, std::optional<STAmount>>
     withdraw(
         Sandbox& view,
-        STTx const& tx,
         SLE const& ammSle,
         AccountID const& ammAccount,
         AccountID const& account,
@@ -168,7 +166,6 @@ private:
     std::pair<TER, STAmount>
     withdraw(
         Sandbox& view,
-        STTx const& tx,
         SLE const& ammSle,
         AccountID const& ammAccount,
         STAmount const& amountBalance,
@@ -194,7 +191,6 @@ private:
     std::pair<TER, STAmount>
     equalWithdrawTokens(
         Sandbox& view,
-        STTx const& tx,
         SLE const& ammSle,
         AccountID const& ammAccount,
         STAmount const& amountBalance,
@@ -220,7 +216,6 @@ private:
     std::pair<TER, STAmount>
     equalWithdrawLimit(
         Sandbox& view,
-        STTx const& tx,
         SLE const& ammSle,
         AccountID const& ammAccount,
         STAmount const& amountBalance,
@@ -243,7 +238,6 @@ private:
     std::pair<TER, STAmount>
     singleWithdraw(
         Sandbox& view,
-        STTx const& tx,
         SLE const& ammSle,
         AccountID const& ammAccount,
         STAmount const& amountBalance,
@@ -265,7 +259,6 @@ private:
     std::pair<TER, STAmount>
     singleWithdrawTokens(
         Sandbox& view,
-        STTx const& tx,
         SLE const& ammSle,
         AccountID const& ammAccount,
         STAmount const& amountBalance,
@@ -288,7 +281,6 @@ private:
     std::pair<TER, STAmount>
     singleWithdrawEPrice(
         Sandbox& view,
-        STTx const& tx,
         SLE const& ammSle,
         AccountID const& ammAccount,
         STAmount const& amountBalance,

include/xrpl/tx/transactors/oracle/OracleSet.h

@@ -22,9 +22,6 @@ public:
     {
     }
 
-    static uint32_t
-    calculateOracleReserve(std::size_t count);
-
     static NotTEC
     preflight(PreflightContext const& ctx);
 

include/xrpl/tx/transactors/payment/Payment.h

@@ -32,10 +32,7 @@ public:
     preflight(PreflightContext const& ctx);
 
     static NotTEC
-    checkGranularSemantics(
-        ReadView const& view,
-        STTx const& tx,
-        std::unordered_set<GranularPermissionType> const& heldGranularPermissions);
+    checkPermission(ReadView const& view, STTx const& tx);
 
     static TER
     preclaim(PreclaimContext const& ctx);

include/xrpl/tx/transactors/sponsor/SponsorshipSet.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#include <xrpl/tx/Transactor.h>
-
-namespace xrpl {
-
-class SponsorshipSet : public Transactor
-{
-public:
-    static constexpr ConsequencesFactoryType ConsequencesFactory{Normal};
-
-    explicit SponsorshipSet(ApplyContext& ctx) : Transactor(ctx)
-    {
-    }
-
-    static std::uint32_t
-    getFlagsMask(PreflightContext const& ctx);
-
-    static NotTEC
-    preflight(PreflightContext const& ctx);
-
-    static TER
-    preclaim(PreclaimContext const& ctx);
-
-    TER
-    doApply() override;
-};
-
-}  // namespace xrpl

include/xrpl/tx/transactors/sponsor/SponsorshipTransfer.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#include <xrpl/tx/Transactor.h>
-
-namespace xrpl {
-
-class SponsorshipTransfer : public Transactor
-{
-public:
-    static constexpr ConsequencesFactoryType ConsequencesFactory{Normal};
-
-    explicit SponsorshipTransfer(ApplyContext& ctx) : Transactor(ctx)
-    {
-    }
-
-    static std::uint32_t
-    getFlagsMask(PreflightContext const& ctx);
-
-    static NotTEC
-    preflight(PreflightContext const& ctx);
-
-    static TER
-    preclaim(PreclaimContext const& ctx);
-
-    TER
-    doApply() override;
-};
-
-}  // namespace xrpl

include/xrpl/tx/transactors/system/Batch.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <xrpl/basics/Log.h>
+#include <xrpl/protocol/Indexes.h>
 #include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
@@ -25,31 +27,29 @@ public:
     static NotTEC
     preflightSigValidated(PreflightContext const& ctx);
 
-    static NotTEC
-    checkBatchSign(PreclaimContext const& ctx);
-
     static NotTEC
     checkSign(PreclaimContext const& ctx);
 
     TER
     doApply() override;
 
-    static constexpr auto disabledTxTypes = std::to_array<TxType>(
-        {ttVAULT_CREATE,
-         ttVAULT_SET,
-         ttVAULT_DELETE,
-         ttVAULT_DEPOSIT,
-         ttVAULT_WITHDRAW,
-         ttVAULT_CLAWBACK,
-         ttLOAN_BROKER_SET,
-         ttLOAN_BROKER_DELETE,
-         ttLOAN_BROKER_COVER_DEPOSIT,
-         ttLOAN_BROKER_COVER_WITHDRAW,
-         ttLOAN_BROKER_COVER_CLAWBACK,
-         ttLOAN_SET,
-         ttLOAN_DELETE,
-         ttLOAN_MANAGE,
-         ttLOAN_PAY});
+    static constexpr auto disabledTxTypes = std::to_array<TxType>({
+        ttVAULT_CREATE,
+        ttVAULT_SET,
+        ttVAULT_DELETE,
+        ttVAULT_DEPOSIT,
+        ttVAULT_WITHDRAW,
+        ttVAULT_CLAWBACK,
+        ttLOAN_BROKER_SET,
+        ttLOAN_BROKER_DELETE,
+        ttLOAN_BROKER_COVER_DEPOSIT,
+        ttLOAN_BROKER_COVER_WITHDRAW,
+        ttLOAN_BROKER_COVER_CLAWBACK,
+        ttLOAN_SET,
+        ttLOAN_DELETE,
+        ttLOAN_MANAGE,
+        ttLOAN_PAY,
+    });
 };
 
 }  // namespace xrpl

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

@@ -1,42 +0,0 @@
-#pragma once
-
-#include <xrpl/tx/Transactor.h>
-
-namespace xrpl {
-
-/**
- * @brief Allows an MPT issuer to clawback confidential balances from a holder.
- *
- * This transaction enables the issuer of an MPToken Issuance (with clawback
- * enabled) to reclaim confidential tokens from a holder's account. Unlike
- * regular clawback, the issuer cannot see the holder's balance directly.
- * Instead, the issuer must provide a zero-knowledge proof that demonstrates
- * they know the exact encrypted balance amount.
- *
- * @par Cryptographic Operations:
- * - **Equality Proof Verification**: Verifies that the issuer's revealed
- *   amount matches the holder's encrypted balance using the issuer's
- *   ElGamal private key.
- *
- * @see ConfidentialMPTSend, ConfidentialMPTConvert
- */
-class ConfidentialMPTClawback : public Transactor
-{
-public:
-    static constexpr ConsequencesFactoryType ConsequencesFactory{Normal};
-
-    explicit ConfidentialMPTClawback(ApplyContext& ctx) : Transactor(ctx)
-    {
-    }
-
-    static NotTEC
-    preflight(PreflightContext const& ctx);
-
-    static TER
-    preclaim(PreclaimContext const& ctx);
-
-    TER
-    doApply() override;
-};
-
-}  // namespace xrpl

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

@@ -1,44 +0,0 @@
-#pragma once
-
-#include <xrpl/tx/Transactor.h>
-
-namespace xrpl {
-
-/**
- * @brief Converts public (plaintext) MPT balance to confidential (encrypted)
- * balance.
- *
- * This transaction allows a token holder to convert their publicly visible
- * MPToken balance into an encrypted confidential balance. Once converted,
- * the balance can only be spent using ConfidentialMPTSend transactions and
- * remains hidden from public view on the ledger.
- *
- * @par Cryptographic Operations:
- * - **Schnorr Proof Verification**: When registering a new ElGamal public key,
- *   verifies proof of knowledge of the corresponding private key.
- * - **Revealed Amount Verification**: Verifies that the provided encrypted
- *   amounts (for holder, issuer, and optionally auditor) all encrypt the
- *   same plaintext amount using the provided blinding factor.
- *
- * @see ConfidentialMPTConvertBack, ConfidentialMPTSend
- */
-class ConfidentialMPTConvert : public Transactor
-{
-public:
-    static constexpr ConsequencesFactoryType ConsequencesFactory{Normal};
-
-    explicit ConfidentialMPTConvert(ApplyContext& ctx) : Transactor(ctx)
-    {
-    }
-
-    static NotTEC
-    preflight(PreflightContext const& ctx);
-
-    static TER
-    preclaim(PreclaimContext const& ctx);
-
-    TER
-    doApply() override;
-};
-
-}  // namespace xrpl

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

@@ -1,45 +0,0 @@
-#pragma once
-
-#include <xrpl/tx/Transactor.h>
-
-namespace xrpl {
-
-/**
- * @brief Converts confidential (encrypted) MPT balance back to public
- * (plaintext) balance.
- *
- * This transaction allows a token holder to convert their encrypted
- * confidential balance back into a publicly visible MPToken balance. The
- * holder must prove they have sufficient confidential balance without
- * revealing the actual balance amount.
- *
- * @par Cryptographic Operations:
- * - **Revealed Amount Verification**: Verifies that the provided encrypted
- *   amounts correctly encrypt the conversion amount.
- * - **Pedersen Linkage Proof**: Verifies that the provided balance commitment
- *   correctly links to the holder's encrypted spending balance.
- * - **Bulletproof Range Proof**: Verifies that the remaining balance (after
- *   conversion) is non-negative, ensuring the holder has sufficient funds.
- *
- * @see ConfidentialMPTConvert, ConfidentialMPTSend
- */
-class ConfidentialMPTConvertBack : public Transactor
-{
-public:
-    static constexpr ConsequencesFactoryType ConsequencesFactory{Normal};
-
-    explicit ConfidentialMPTConvertBack(ApplyContext& ctx) : Transactor(ctx)
-    {
-    }
-
-    static NotTEC
-    preflight(PreflightContext const& ctx);
-
-    static TER
-    preclaim(PreclaimContext const& ctx);
-
-    TER
-    doApply() override;
-};
-
-}  // namespace xrpl

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

@@ -1,46 +0,0 @@
-#pragma once
-
-#include <xrpl/tx/Transactor.h>
-
-namespace xrpl {
-
-/**
- * @brief Merges the confidential inbox balance into the spending balance.
- *
- * In the confidential transfer system, incoming funds are deposited into an
- * "inbox" balance that the recipient cannot immediately spend. This prevents
- * front-running attacks where an attacker could invalidate a pending
- * transaction by sending funds to the sender. This transaction merges the
- * inbox into the spending balance, making those funds available for spending.
- *
- * @par Cryptographic Operations:
- * - **Homomorphic Addition**: Adds the encrypted inbox balance to the
- *   encrypted spending balance using ElGamal homomorphic properties.
- * - **Zero Encryption**: Resets the inbox to an encryption of zero.
- *
- * @note This transaction requires no zero-knowledge proofs because it only
- *       combines encrypted values that the holder already owns. The
- *       homomorphic properties of ElGamal encryption ensure correctness.
- *
- * @see ConfidentialMPTSend, ConfidentialMPTConvert
- */
-class ConfidentialMPTMergeInbox : public Transactor
-{
-public:
-    static constexpr ConsequencesFactoryType ConsequencesFactory{Normal};
-
-    explicit ConfidentialMPTMergeInbox(ApplyContext& ctx) : Transactor(ctx)
-    {
-    }
-
-    static NotTEC
-    preflight(PreflightContext const& ctx);
-
-    static TER
-    preclaim(PreclaimContext const& ctx);
-
-    TER
-    doApply() override;
-};
-
-}  // namespace xrpl

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

@@ -1,52 +0,0 @@
-#pragma once
-
-#include <xrpl/tx/Transactor.h>
-
-namespace xrpl {
-
-/**
- * @brief Transfers confidential MPT tokens between holders privately.
- *
- * This transaction enables private token transfers where the transfer amount
- * is hidden from public view. Both sender and recipient must have initialized
- * confidential balances. The transaction provides encrypted amounts for all
- * parties (sender, destination, issuer, and optionally auditor) along with
- * zero-knowledge proofs that verify correctness without revealing the amount.
- *
- * @par Cryptographic Operations:
- * - **Multi-Ciphertext Equality Proof**: Verifies that all encrypted amounts
- *   (sender, destination, issuer, auditor) encrypt the same plaintext value.
- * - **Amount Pedersen Linkage Proof**: Verifies that the amount commitment
- *   correctly links to the sender's encrypted amount.
- * - **Balance Pedersen Linkage Proof**: Verifies that the balance commitment
- *   correctly links to the sender's encrypted spending balance.
- * - **Bulletproof Range Proof**: Verifies remaining balance and
- *   transfer amount are non-negative.
- *
- * @note Funds are deposited into the destination's inbox, not spending
- *       balance. The recipient must call ConfidentialMPTMergeInbox to make
- *       received funds spendable.
- *
- * @see ConfidentialMPTMergeInbox, ConfidentialMPTConvert,
- * ConfidentialMPTConvertBack
- */
-class ConfidentialMPTSend : public Transactor
-{
-public:
-    static constexpr ConsequencesFactoryType ConsequencesFactory{Normal};
-
-    explicit ConfidentialMPTSend(ApplyContext& ctx) : Transactor(ctx)
-    {
-    }
-
-    static NotTEC
-    preflight(PreflightContext const& ctx);
-
-    static TER
-    preclaim(PreclaimContext const& ctx);
-
-    TER
-    doApply() override;
-};
-
-}  // namespace xrpl

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

@@ -42,7 +42,7 @@ public:
     doApply() override;
 
     static Expected<MPTID, TER>
-    create(ApplyView& view, STTx const& tx, beast::Journal journal, MPTCreateArgs const& args);
+    create(ApplyView& view, beast::Journal journal, MPTCreateArgs const& args);
 };
 
 }  // namespace xrpl

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

@@ -22,6 +22,9 @@ public:
     static NotTEC
     preflight(PreflightContext const& ctx);
 
+    static NotTEC
+    checkPermission(ReadView const& view, STTx const& tx);
+
     static TER
     preclaim(PreclaimContext const& ctx);
 

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

@@ -21,10 +21,7 @@ public:
     preflight(PreflightContext const& ctx);
 
     static NotTEC
-    checkGranularSemantics(
-        ReadView const& view,
-        STTx const& tx,
-        std::unordered_set<GranularPermissionType> const& heldGranularPermissions);
+    checkPermission(ReadView const& view, STTx const& tx);
 
     static TER
     preclaim(PreclaimContext const& ctx);

src/libxrpl/basics/Log.cpp

@@ -59,8 +59,7 @@ Logs::File::open(boost::filesystem::path const& path)
     bool wasOpened = false;
 
     // VFALCO TODO Make this work with Unicode file paths
-    std::unique_ptr<std::ofstream> stream =
-        std::make_unique<std::ofstream>(path.c_str(), std::fstream::app);
+    std::unique_ptr<std::ofstream> stream(new std::ofstream(path.c_str(), std::fstream::app));
 
     if (stream->good())
     {

src/libxrpl/ledger/OpenView.cpp

@@ -185,7 +185,7 @@ OpenView::txsEnd() const -> std::unique_ptr<txs_type::iter_base>
 bool
 OpenView::txExists(key_type const& key) const
 {
-    return txs_.contains(key) || base_->txExists(key);
+    return txs_.contains(key);
 }
 
 auto

src/libxrpl/ledger/View.cpp

@@ -8,7 +8,6 @@
 #include <xrpl/ledger/helpers/CredentialHelpers.h>
 #include <xrpl/ledger/helpers/DirectoryHelpers.h>
 #include <xrpl/ledger/helpers/RippleStateHelpers.h>
-#include <xrpl/ledger/helpers/SponsorHelpers.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/LedgerFormats.h>
@@ -286,93 +285,6 @@ hashOfSeq(ReadView const& ledger, LedgerIndex seq, beast::Journal journal)
     return std::nullopt;
 }
 
-uint32_t
-ownerCount(std::shared_ptr<SLE const> const& sponsorSle)
-{
-    auto const ownerCount = sponsorSle->getFieldU32(sfOwnerCount);
-    auto const sponsoredOwnerCount = sponsorSle->getFieldU32(sfSponsoredOwnerCount);
-    auto const sponsoringOwnerCount = sponsorSle->getFieldU32(sfSponsoringOwnerCount);
-
-    return ownerCount + sponsoringOwnerCount - sponsoredOwnerCount;
-}
-
-XRPAmount
-calculateReserve(std::shared_ptr<SLE const> const& sle, Fees const& fees)
-{
-    XRPL_ASSERT(sle->getType() == ltACCOUNT_ROOT, "xrpl::calculateReserve : valid sle type");
-
-    return fees.accountReserve(
-        sle->getFieldU32(sfOwnerCount),
-        sle->getFieldU32(sfSponsoredOwnerCount),
-        sle->getFieldU32(sfSponsoringOwnerCount),
-        sle->isFieldPresent(sfSponsor),
-        sle->getFieldU32(sfSponsoringAccountCount));
-}
-
-TER
-checkInsufficientReserve(
-    ReadView const& view,
-    STTx const& tx,
-    std::shared_ptr<SLE const> accSle,
-    STAmount const& accBalance,
-    std::shared_ptr<SLE const> const& sponsorSle,
-    std::int32_t ownerCountDelta,
-    std::int32_t accountCountDelta)
-{
-    if (sponsorSle)
-    {
-        auto const isCoSigning = isSponsorReserveCoSigning(tx);
-
-        auto const sle = view.read(
-            keylet::sponsor(sponsorSle->getAccountID(sfAccount), accSle->getAccountID(sfAccount)));
-
-        if (isCoSigning)
-        {
-            if (sle)
-            {
-                auto const reserveCountAllowed = sle->getFieldU32(sfReserveCount);
-                if (reserveCountAllowed < ownerCountDelta)
-                    return tecINSUFFICIENT_RESERVE;
-
-                return tesSUCCESS;
-            }
-            auto const sponsorBalance = sponsorSle->getFieldAmount(sfBalance);
-            STAmount const sponsorReserve{view.fees().accountReserve(
-                sponsorSle->getFieldU32(sfOwnerCount),
-                sponsorSle->getFieldU32(sfSponsoredOwnerCount),
-                sponsorSle->getFieldU32(sfSponsoringOwnerCount) + ownerCountDelta,
-                sponsorSle->isFieldPresent(sfSponsor),
-                sponsorSle->getFieldU32(sfSponsoringAccountCount) + accountCountDelta)};
-
-            if (sponsorBalance < sponsorReserve)
-                return tecINSUFFICIENT_RESERVE;
-        }
-        else
-        {
-            // pre funded
-            if (!sle)
-                return tecINTERNAL;  // LCOV_EXCL_LINE
-
-            auto const reserveCountAllowed = sle->getFieldU32(sfReserveCount);
-            if (reserveCountAllowed < ownerCountDelta)
-                return tecINSUFFICIENT_RESERVE;
-        }
-    }
-    else
-    {
-        STAmount const reserve{view.fees().accountReserve(
-            accSle->getFieldU32(sfOwnerCount) + ownerCountDelta,
-            accSle->getFieldU32(sfSponsoredOwnerCount),
-            accSle->getFieldU32(sfSponsoringOwnerCount),
-            accSle->isFieldPresent(sfSponsor),
-            accSle->getFieldU32(sfSponsoringAccountCount) + accountCountDelta)};
-
-        if (accBalance < reserve)
-            return tecINSUFFICIENT_RESERVE;
-    }
-    return tesSUCCESS;
-}
-
 //------------------------------------------------------------------------------
 //
 // Modifiers
@@ -496,7 +408,7 @@ doWithdraw(
     // Create trust line or MPToken for the receiving account
     if (dstAcct == senderAcct)
     {
-        if (auto const ter = addEmptyHolding(view, tx, senderAcct, priorBalance, amount.asset(), j);
+        if (auto const ter = addEmptyHolding(view, senderAcct, priorBalance, amount.asset(), j);
             !isTesSuccess(ter) && ter != tecDUPLICATE)
             return ter;
     }
@@ -522,12 +434,9 @@ doWithdraw(
         // LCOV_EXCL_STOP
     }
 
-    auto const sponsorAccountID = getTxReserveSponsorAccountID(tx);
-
     // Move the funds directly from the broker's pseudo-account to the
     // dstAcct
-    return accountSend(
-        view, sourceAcct, dstAcct, amount, j, sponsorAccountID, WaiveTransferFee::Yes);
+    return accountSend(view, sourceAcct, dstAcct, amount, j, WaiveTransferFee::Yes);
 }
 
 TER

src/libxrpl/ledger/helpers/AccountRootHelpers.cpp

@@ -74,19 +74,9 @@ xrpLiquid(ReadView const& view, AccountID const& id, std::int32_t ownerCountAdj,
     std::uint32_t const ownerCount =
         confineOwnerCount(view.ownerCountHook(id, sle->getFieldU32(sfOwnerCount)), ownerCountAdj);
 
-    std::uint32_t const sponsoredOwnerCount = sle->getFieldU32(sfSponsoredOwnerCount);
-    std::uint32_t const sponsoringOwnerCount = sle->getFieldU32(sfSponsoringOwnerCount);
-    bool const isAccountSponsored = sle->isFieldPresent(sfSponsor);
-    std::uint32_t const sponsoringAccountCount = sle->getFieldU32(sfSponsoringAccountCount);
-
     // Pseudo-accounts have no reserve requirement
-    auto const reserve = isPseudoAccount(sle) ? XRPAmount{0}
-                                              : view.fees().accountReserve(
-                                                    ownerCount,
-                                                    sponsoredOwnerCount,
-                                                    sponsoringOwnerCount,
-                                                    isAccountSponsored,
-                                                    sponsoringAccountCount);
+    auto const reserve =
+        isPseudoAccount(sle) ? XRPAmount{0} : view.fees().accountReserve(ownerCount);
 
     auto const fullBalance = sle->getFieldAmount(sfBalance);
 
@@ -114,70 +104,22 @@ transferRate(ReadView const& view, AccountID const& issuer)
     return parityRate;
 }
 
-void
-adjustSponsorOwnerCountHlp(
-    ApplyView& view,
-    std::shared_ptr<SLE> const& sle,
-    SField const& sfield,
-    std::int32_t amount,
-    beast::Journal j)
-{
-    auto const accID = sle->getAccountID(sfAccount);
-    std::uint32_t const current{(sle)->getFieldU32(sfield)};
-    std::uint32_t const adjusted = confineOwnerCount(current, amount, accID, j);
-    view.adjustOwnerCountHook(accID, current, adjusted);
-    if (adjusted == 0)
-        sle->makeFieldAbsent(sfield);
-    else
-        sle->setFieldU32(sfield, adjusted);
-    view.update(sle);
-}
-
 void
 adjustOwnerCount(
     ApplyView& view,
-    std::shared_ptr<SLE> const& accountSle,
-    std::shared_ptr<SLE> const& sponsorSle,
+    std::shared_ptr<SLE> const& sle,
     std::int32_t amount,
     beast::Journal j)
 {
-    if (!accountSle)
+    if (!sle)
         return;
     XRPL_ASSERT(amount, "xrpl::adjustOwnerCount : nonzero amount input");
-
-    if (sponsorSle)
-    {
-        adjustSponsorOwnerCountHlp(view, sponsorSle, sfSponsoringOwnerCount, amount, j);
-        adjustSponsorOwnerCountHlp(view, accountSle, sfSponsoredOwnerCount, amount, j);
-
-        auto const account = accountSle->getAccountID(sfAccount);
-        auto const sponsorAccountID = (sponsorSle)->getAccountID(sfAccount);
-
-        auto sponsorObjSle = view.peek(keylet::sponsor(sponsorAccountID, account));
-
-        if (sponsorObjSle)
-        {
-            // pre funded
-            // update the pre-funded ReserveCount on Sponsorship ledger object
-
-            std::uint32_t const currentReserveCount = sponsorObjSle->getFieldU32(sfReserveCount);
-            // Reserve count moves opposite to amount: +amount => consume reserve (-), -amount =>
-            // payback (+)
-            std::uint32_t const adjusted =
-                confineOwnerCount(currentReserveCount, -amount, sponsorAccountID, j);
-            if (adjusted == 0)
-                sponsorObjSle->makeFieldAbsent(sfReserveCount);
-            else
-                sponsorObjSle->setFieldU32(sfReserveCount, adjusted);
-            view.update(sponsorObjSle);
-        }
-    }
-    std::uint32_t const current{accountSle->getFieldU32(sfOwnerCount)};
-    AccountID const id = (*accountSle)[sfAccount];
+    std::uint32_t const current{sle->getFieldU32(sfOwnerCount)};
+    AccountID const id = (*sle)[sfAccount];
     std::uint32_t const adjusted = confineOwnerCount(current, amount, id, j);
     view.adjustOwnerCountHook(id, current, adjusted);
-    accountSle->at(sfOwnerCount) = adjusted;
-    view.update(accountSle);
+    sle->at(sfOwnerCount) = adjusted;
+    view.update(sle);
 }
 
 AccountID

src/libxrpl/ledger/helpers/CredentialHelpers.cpp

@@ -2,7 +2,6 @@
 //
 #include <xrpl/ledger/View.h>
 #include <xrpl/ledger/helpers/AccountRootHelpers.h>
-#include <xrpl/ledger/helpers/SponsorHelpers.h>
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/digest.h>
 
@@ -72,10 +71,7 @@ deleteSLE(ApplyView& view, std::shared_ptr<SLE> const& sleCredential, beast::Jou
         }
 
         if (isOwner)
-        {
-            auto const sponsorSle = getLedgerEntryReserveSponsor(view, sleCredential);
-            adjustOwnerCount(view, sleAccount, sponsorSle, -1, j);
-        }
+            adjustOwnerCount(view, sleAccount, -1, j);
 
         return tesSUCCESS;
     };

src/libxrpl/ledger/helpers/MPTokenHelpers.cpp

@@ -5,7 +5,6 @@
 #include <xrpl/ledger/helpers/AccountRootHelpers.h>
 #include <xrpl/ledger/helpers/CredentialHelpers.h>
 #include <xrpl/ledger/helpers/DirectoryHelpers.h>
-#include <xrpl/ledger/helpers/SponsorHelpers.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/LedgerFormats.h>
@@ -95,7 +94,6 @@ canAddHolding(ReadView const& view, MPTIssue const& mptIssue)
 [[nodiscard]] TER
 addEmptyHolding(
     ApplyView& view,
-    STTx const& tx,
     AccountID const& accountID,
     XRPAmount priorBalance,
     MPTIssue const& mptIssue,
@@ -112,13 +110,12 @@ addEmptyHolding(
     if (accountID == mptIssue.getIssuer())
         return tesSUCCESS;
 
-    return authorizeMPToken(view, tx, priorBalance, mptID, accountID, journal);
+    return authorizeMPToken(view, priorBalance, mptID, accountID, journal);
 }
 
 [[nodiscard]] TER
 authorizeMPToken(
     ApplyView& view,
-    STTx const& tx,
     XRPAmount const& priorBalance,
     MPTID const& mptIssuanceID,
     AccountID const& account,
@@ -151,8 +148,7 @@ authorizeMPToken(
                     keylet::ownerDir(account), (*sleMpt)[sfOwnerNode], sleMpt->key(), false))
                 return tecINTERNAL;  // LCOV_EXCL_LINE
 
-            auto const sponsor = getLedgerEntryReserveSponsor(view, sleMpt);
-            adjustOwnerCount(view, sleAcct, sponsor, -1, journal);
+            adjustOwnerCount(view, sleAcct, -1, journal);
 
             view.erase(sleMpt);
             return tesSUCCESS;
@@ -162,24 +158,18 @@ authorizeMPToken(
         //      - add the new mptokenKey to the owner directory
         //      - create the MPToken object for the holder
 
-        auto const sponsor = getTxReserveSponsor(view, tx);
-
-        auto const isSponsoredAndPreFunded = sponsor && !isSponsorReserveCoSigning(tx);
-
         // The reserve that is required to create the MPToken. Note
         // that although the reserve increases with every item
         // an account owns, in the case of MPTokens we only
         // *enforce* a reserve if the user owns more than two
         // items. This is similar to the reserve requirements of trust lines.
-        // If PreFunded Sponsor, it must be checked whether sufficient
-        // ReserveCount exists.
-        if (ownerCount(sponsor ? sponsor : sleAcct) >= 2 || isSponsoredAndPreFunded)
-        {
-            if (auto const ret =
-                    checkInsufficientReserve(view, tx, sleAcct, priorBalance, sponsor, 1);
-                !isTesSuccess(ret))
-                return ret;
-        }
+        std::uint32_t const uOwnerCount = sleAcct->getFieldU32(sfOwnerCount);
+        XRPAmount const reserveCreate(
+            (uOwnerCount < 2) ? XRPAmount(beast::zero)
+                              : view.fees().accountReserve(uOwnerCount + 1));
+
+        if (priorBalance < reserveCreate)
+            return tecINSUFFICIENT_RESERVE;
 
         // Defensive check before we attempt to create MPToken for the issuer
         auto const mpt = view.read(keylet::mptIssuance(mptIssuanceID));
@@ -203,8 +193,7 @@ authorizeMPToken(
         view.insert(mptoken);
 
         // Update owner count.
-        adjustOwnerCount(view, sleAcct, sponsor, 1, journal);
-        addSponsorToLedgerEntry(mptoken, sponsor);
+        adjustOwnerCount(view, sleAcct, 1, journal);
 
         return tesSUCCESS;
     }
@@ -249,7 +238,6 @@ authorizeMPToken(
 [[nodiscard]] TER
 removeEmptyHolding(
     ApplyView& view,
-    STTx const& tx,
     AccountID const& accountID,
     MPTIssue const& mptIssue,
     beast::Journal journal)
@@ -270,16 +258,8 @@ removeEmptyHolding(
         (view.rules().enabled(fixSecurity3_1_3) && (*mptoken)[~sfLockedAmount].value_or(0) != 0))
         return tecHAS_OBLIGATIONS;
 
-    // Don't delete if the token still has confidential balances
-    if (mptoken->isFieldPresent(sfConfidentialBalanceInbox) ||
-        mptoken->isFieldPresent(sfConfidentialBalanceSpending))
-    {
-        return tecHAS_OBLIGATIONS;
-    }
-
     return authorizeMPToken(
         view,
-        tx,
         {},  // priorBalance
         mptID,
         accountID,
@@ -348,24 +328,9 @@ requireAuth(
     auto const maybeDomainID = sleIssuance->at(~sfDomainID);
     if (maybeDomainID)
     {
-        // Defensive check: An issuance with sfDomainID must strictly enforce lsfMPTRequireAuth.
-        // While preclaim checks prevent clearing this flag when sfDomainID is set, we verify here
-        // to guard against potential logic regressions in the future changes.
-        if (view.rules().enabled(fixSecurity3_1_3))
-        {
-            // Post-fixSecurity3_1_3: Return a proper error code instead of asserting.
-            if (!(sleIssuance->getFieldU32(sfFlags) & lsfMPTRequireAuth))
-                return tefINTERNAL;  // LCOV_EXCL_LINE
-        }
-        else
-        {
-            // Pre-fixSecurity3_1_3: Fault via assertion in Debug mode;
-            // potentially fall through in Release mode.
-            XRPL_ASSERT(
-                sleIssuance->getFieldU32(sfFlags) & lsfMPTRequireAuth,
-                "xrpl::requireAuth : issuance requires authorization");
-        }
-
+        XRPL_ASSERT(
+            sleIssuance->getFieldU32(sfFlags) & lsfMPTRequireAuth,
+            "xrpl::requireAuth : issuance requires authorization");
         // ter = tefINTERNAL | tecOBJECT_NOT_FOUND | tecNO_AUTH | tecEXPIRED
         auto const ter = credentials::validDomain(view, *maybeDomainID, account);
         if (isTesSuccess(ter))
@@ -398,7 +363,6 @@ requireAuth(
 [[nodiscard]] TER
 enforceMPTokenAuthorization(
     ApplyView& view,
-    STTx const& tx,
     MPTID const& mptIssuanceID,
     AccountID const& account,
     XRPAmount const& priorBalance,  // for MPToken authorization
@@ -480,7 +444,6 @@ enforceMPTokenAuthorization(
             "xrpl::enforceMPTokenAuthorization : new MPToken for domain");
         if (auto const err = authorizeMPToken(
                 view,
-                tx,
                 priorBalance,   // priorBalance
                 mptIssuanceID,  // mptIssuanceID
                 account,        // account
@@ -532,22 +495,6 @@ canTrade(ReadView const& view, Asset const& asset)
         });
 }
 
-TER
-canMPTTradeAndTransfer(
-    ReadView const& view,
-    Asset const& asset,
-    AccountID const& from,
-    AccountID const& to)
-{
-    if (!asset.holds<MPTIssue>())
-        return tesSUCCESS;
-
-    if (auto const ter = canTrade(view, asset); !isTesSuccess(ter))
-        return ter;
-
-    return canTransfer(view, asset, from, to);
-}
-
 TER
 lockEscrowMPT(ApplyView& view, AccountID const& sender, STAmount const& amount, beast::Journal j)
 {
@@ -810,7 +757,6 @@ createMPToken(
     ApplyView& view,
     MPTID const& mptIssuanceID,
     AccountID const& account,
-    std::optional<AccountID> const& sponsor,
     std::uint32_t const flags)
 {
     auto const mptokenKey = keylet::mptoken(mptIssuanceID, account);
@@ -827,14 +773,6 @@ createMPToken(
     (*mptoken)[sfFlags] = flags;
     (*mptoken)[sfOwnerNode] = *ownerNode;
 
-    if (sponsor)
-    {
-        auto const sponsorSle = view.peek(keylet::account(*sponsor));
-        if (!sponsorSle)
-            return tecINTERNAL;
-        addSponsorToLedgerEntry(mptoken, sponsorSle);
-    }
-
     view.insert(mptoken);
 
     return tesSUCCESS;
@@ -845,7 +783,6 @@ checkCreateMPT(
     xrpl::ApplyView& view,
     xrpl::MPTIssue const& mptIssue,
     xrpl::AccountID const& holder,
-    std::optional<xrpl::AccountID> const& sponsor,
     beast::Journal j)
 {
     if (mptIssue.getIssuer() == holder)
@@ -855,7 +792,7 @@ checkCreateMPT(
     auto const mptokenID = keylet::mptoken(mptIssuanceID.key, holder);
     if (!view.exists(mptokenID))
     {
-        if (auto const err = createMPToken(view, mptIssue.getMptID(), holder, sponsor, 0);
+        if (auto const err = createMPToken(view, mptIssue.getMptID(), holder, 0);
             !isTesSuccess(err))
         {
             return err;
@@ -865,9 +802,7 @@ checkCreateMPT(
         {
             return tecINTERNAL;
         }
-        auto const sleSponsor =
-            sponsor ? view.peek(keylet::account(*sponsor)) : std::shared_ptr<SLE>();
-        adjustOwnerCount(view, sleAcct, sleSponsor, 1, j);
+        adjustOwnerCount(view, sleAcct, 1, j);
     }
     return tesSUCCESS;
 }
@@ -927,4 +862,65 @@ issuerSelfDebitHookMPT(ApplyView& view, MPTIssue const& issue, std::uint64_t amo
     view.issuerSelfDebitHookMPT(issue, amount, available);
 }
 
+static TER
+checkMPTAllowed(ReadView const& view, TxType txType, Asset const& asset, AccountID const& accountID)
+{
+    if (!asset.holds<MPTIssue>())
+        return tesSUCCESS;
+
+    auto const& issuanceID = asset.get<MPTIssue>().getMptID();
+    auto const validTx = txType == ttAMM_CREATE || txType == ttAMM_DEPOSIT ||
+        txType == ttAMM_WITHDRAW || txType == ttOFFER_CREATE || txType == ttCHECK_CREATE ||
+        txType == ttCHECK_CASH || txType == ttPAYMENT;
+    XRPL_ASSERT(validTx, "xrpl::checkMPTAllowed : all MPT tx or DEX");
+    if (!validTx)
+        return tefINTERNAL;  // LCOV_EXCL_LINE
+
+    auto const& issuer = asset.getIssuer();
+    if (!view.exists(keylet::account(issuer)))
+        return tecNO_ISSUER;  // LCOV_EXCL_LINE
+
+    auto const issuanceKey = keylet::mptIssuance(issuanceID);
+    auto const issuanceSle = view.read(issuanceKey);
+    if (!issuanceSle)
+        return tecOBJECT_NOT_FOUND;  // LCOV_EXCL_LINE
+
+    auto const flags = issuanceSle->getFlags();
+
+    if ((flags & lsfMPTLocked) != 0u)
+        return tecLOCKED;  // LCOV_EXCL_LINE
+    // Offer crossing and Payment
+    if ((flags & lsfMPTCanTrade) == 0)
+        return tecNO_PERMISSION;
+
+    if (accountID != issuer)
+    {
+        if ((flags & lsfMPTCanTransfer) == 0)
+            return tecNO_PERMISSION;
+
+        auto const mptSle = view.read(keylet::mptoken(issuanceKey.key, accountID));
+        // Allow to succeed since some tx create MPToken if it doesn't exist.
+        // Tx's have their own check for missing MPToken.
+        if (!mptSle)
+            return tesSUCCESS;
+
+        if (mptSle->isFlag(lsfMPTLocked))
+            return tecLOCKED;
+    }
+
+    return tesSUCCESS;
+}
+
+TER
+checkMPTTxAllowed(
+    ReadView const& view,
+    TxType txType,
+    Asset const& asset,
+    AccountID const& accountID)
+{
+    // use isDEXAllowed for payment/offer crossing
+    XRPL_ASSERT(txType != ttPAYMENT, "xrpl::checkMPTTxAllowed : not payment");
+    return checkMPTAllowed(view, txType, asset, accountID);
+}
+
 }  // namespace xrpl

src/libxrpl/ledger/helpers/NFTokenHelpers.cpp

@@ -6,7 +6,6 @@
 #include <xrpl/ledger/helpers/DirectoryHelpers.h>
 #include <xrpl/ledger/helpers/NFTokenHelpers.h>
 #include <xrpl/ledger/helpers/RippleStateHelpers.h>
-#include <xrpl/ledger/helpers/SponsorHelpers.h>
 #include <xrpl/ledger/helpers/TokenHelpers.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/STArray.h>
@@ -46,19 +45,12 @@ locatePage(ApplyView& view, AccountID const& owner, uint256 const& id)
         Keylet(ltNFTOKEN_PAGE, view.succ(first.key, last.key.next()).value_or(last.key)));
 }
 
-static Expected<std::shared_ptr<SLE>, TER>
+static std::shared_ptr<SLE>
 getPageForToken(
     ApplyView& view,
-    STTx const& tx,
     AccountID const& owner,
-    std::optional<AccountID> const& sponsor,
     uint256 const& id,
-    std::function<
-        TER(ApplyView&,
-            STTx const&,
-            std::shared_ptr<SLE> const&,
-            AccountID const&,
-            std::optional<AccountID> const&)> const& createCallback)
+    std::function<void(ApplyView&, AccountID const&)> const& createCallback)
 {
     auto const base = keylet::nftpage_min(owner);
     auto const first = keylet::nftpage(base, id);
@@ -77,9 +69,7 @@ getPageForToken(
         cp = std::make_shared<SLE>(last);
         cp->setFieldArray(sfNFTokens, arr);
         view.insert(cp);
-
-        if (auto const ret = createCallback(view, tx, cp, owner, sponsor); !isTesSuccess(ret))
-            return Unexpected(ret);
+        createCallback(view, owner);
         return cp;
     }
 
@@ -192,8 +182,7 @@ getPageForToken(
     cp->setFieldH256(sfPreviousPageMin, np->key());
     view.update(cp);
 
-    if (auto const ret = createCallback(view, tx, np, owner, sponsor); ret != tesSUCCESS)
-        return Unexpected(ret);
+    createCallback(view, owner);
 
     return (first.key < np->key()) ? np : cp;
 }
@@ -250,69 +239,37 @@ changeTokenURI(
 
 /** Insert the token in the owner's token directory. */
 TER
-insertToken(
-    ApplyView& view,
-    STTx const& tx,
-    AccountID owner,
-    std::optional<AccountID> const& sponsor,
-    STObject&& nft)
+insertToken(ApplyView& view, AccountID owner, STObject&& nft)
 {
     XRPL_ASSERT(nft.isFieldPresent(sfNFTokenID), "xrpl::nft::insertToken : has NFT token");
 
     // First, we need to locate the page the NFT belongs to, creating it
     // if necessary. This operation may fail if it is impossible to insert
     // the NFT.
-    Expected<std::shared_ptr<SLE>, TER> const page = getPageForToken(
-        view,
-        tx,
-        owner,
-        sponsor,
-        nft[sfNFTokenID],
-        [](ApplyView& view,
-           STTx const& tx,
-           std::shared_ptr<SLE> const& newPage,
-           AccountID const& owner,
-           std::optional<AccountID> const& sponsor) -> TER {
-            std::shared_ptr<SLE> const sponsorSle =
-                sponsor ? view.peek(keylet::account(*sponsor)) : std::shared_ptr<SLE>();
-
-            if (isReserveSponsored(tx))
-            {
-                auto const ownerSle = view.read(keylet::account(owner));
-                auto const ownerBalance = ownerSle->getFieldAmount(sfBalance);
-                if (auto const ret =
-                        checkInsufficientReserve(view, tx, ownerSle, ownerBalance, sponsorSle, 1);
-                    !isTesSuccess(ret))
-                    return ret;
-            }
+    std::shared_ptr<SLE> const page =
+        getPageForToken(view, owner, nft[sfNFTokenID], [](ApplyView& view, AccountID const& owner) {
             adjustOwnerCount(
                 view,
                 view.peek(keylet::account(owner)),
-                sponsorSle,
                 1,
                 beast::Journal{beast::Journal::getNullSink()});
-            addSponsorToLedgerEntry(newPage, sponsorSle);
-            return tesSUCCESS;
         });
 
-    if (!page.has_value())
-        return page.error();
-
-    if (!(*page))
+    if (!page)
         return tecNO_SUITABLE_NFTOKEN_PAGE;
 
     {
-        auto arr = (*page)->getFieldArray(sfNFTokens);
+        auto arr = page->getFieldArray(sfNFTokens);
         arr.push_back(std::move(nft));
 
         arr.sort([](STObject const& o1, STObject const& o2) {
             return compareTokens(o1.getFieldH256(sfNFTokenID), o2.getFieldH256(sfNFTokenID));
         });
 
-        (*page)->setFieldArray(sfNFTokens, arr);
+        page->setFieldArray(sfNFTokens, arr);
     }
 
-    view.update((*page));
+    view.update(page);
 
     return tesSUCCESS;
 }
@@ -443,25 +400,20 @@ removeToken(
         curr->setFieldArray(sfNFTokens, arr);
         view.update(curr);
 
+        int cnt = 0;
+
         if (prev && mergePages(view, prev, curr))
-        {
-            auto const sponsor = getLedgerEntryReserveSponsor(view, prev);
-            adjustOwnerCount(
-                view,
-                view.peek(keylet::account(owner)),
-                sponsor,
-                -1,
-                beast::Journal{beast::Journal::getNullSink()});
-        }
+            cnt--;
 
         if (next && mergePages(view, curr, next))
+            cnt--;
+
+        if (cnt != 0)
         {
-            auto const sponsor = getLedgerEntryReserveSponsor(view, curr);
             adjustOwnerCount(
                 view,
                 view.peek(keylet::account(owner)),
-                sponsor,
-                -1,
+                cnt,
                 beast::Journal{beast::Journal::getNullSink()});
         }
 
@@ -497,11 +449,9 @@ removeToken(
                 curr->makeFieldAbsent(sfPreviousPageMin);
             }
 
-            auto const sponsor = getLedgerEntryReserveSponsor(view, prev);
             adjustOwnerCount(
                 view,
                 view.peek(keylet::account(owner)),
-                sponsor,
                 -1,
                 beast::Journal{beast::Journal::getNullSink()});
 
@@ -539,16 +489,10 @@ removeToken(
         view.update(next);
     }
 
-    auto const sponsor = getLedgerEntryReserveSponsor(view, curr);
-    adjustOwnerCount(
-        view,
-        view.peek(keylet::account(owner)),
-        sponsor,
-        -1,
-        beast::Journal{beast::Journal::getNullSink()});
-
     view.erase(curr);
 
+    int cnt = 1;
+
     // Since we're here, try to consolidate the previous and current pages
     // of the page we removed (if any) into one.  mergePages() _should_
     // always return false.  Since tokens are burned one at a time, there
@@ -562,14 +506,13 @@ removeToken(
             view,
             view.peek(Keylet(ltNFTOKEN_PAGE, prev->key())),
             view.peek(Keylet(ltNFTOKEN_PAGE, next->key()))))
-    {
-        adjustOwnerCount(
-            view,
-            view.peek(keylet::account(owner)),
-            getLedgerEntryReserveSponsor(view, prev),
-            -1,
-            beast::Journal{beast::Journal::getNullSink()});
-    }
+        cnt++;
+
+    adjustOwnerCount(
+        view,
+        view.peek(keylet::account(owner)),
+        -1 * cnt,
+        beast::Journal{beast::Journal::getNullSink()});
 
     return tesSUCCESS;
 }
@@ -712,13 +655,8 @@ deleteTokenOffer(ApplyView& view, std::shared_ptr<SLE> const& offer)
             false))
         return false;
 
-    auto const sponsor = getLedgerEntryReserveSponsor(view, offer);
     adjustOwnerCount(
-        view,
-        view.peek(keylet::account(owner)),
-        sponsor,
-        -1,
-        beast::Journal{beast::Journal::getNullSink()});
+        view, view.peek(keylet::account(owner)), -1, beast::Journal{beast::Journal::getNullSink()});
 
     view.erase(offer);
     return true;
@@ -997,7 +935,6 @@ tokenOfferCreatePreclaim(
 TER
 tokenOfferCreateApply(
     ApplyView& view,
-    STTx const& tx,
     AccountID const& acctID,
     STAmount const& amount,
     std::optional<AccountID> const& dest,
@@ -1009,11 +946,9 @@ tokenOfferCreateApply(
     std::uint32_t txFlags)
 {
     Keylet const acctKeylet = keylet::account(acctID);
-    auto const acct = view.read(acctKeylet);
-    auto const sponsor = getTxReserveSponsor(view, tx);
-    if (auto const ret = checkInsufficientReserve(view, tx, acct, priorBalance, sponsor, 1);
-        !isTesSuccess(ret))
-        return ret;
+    if (auto const acct = view.read(acctKeylet);
+        priorBalance < view.fees().accountReserve((*acct)[sfOwnerCount] + 1))
+        return tecINSUFFICIENT_RESERVE;
 
     auto const offerID = keylet::nftoffer(acctID, seqProxy.value());
 
@@ -1060,13 +995,11 @@ tokenOfferCreateApply(
         if (dest)
             (*offer)[sfDestination] = *dest;
 
-        addSponsorToLedgerEntry(offer, sponsor);
-
         view.insert(offer);
     }
 
     // Update owner count.
-    adjustOwnerCount(view, view.peek(acctKeylet), sponsor, 1, j);
+    adjustOwnerCount(view, view.peek(acctKeylet), 1, j);
 
     return tesSUCCESS;
 }

src/libxrpl/ledger/helpers/OfferHelpers.cpp

@@ -1,7 +1,6 @@
 #include <xrpl/ledger/helpers/OfferHelpers.h>
 //
 #include <xrpl/ledger/helpers/AccountRootHelpers.h>
-#include <xrpl/ledger/helpers/SponsorHelpers.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/st.h>
@@ -49,8 +48,7 @@ offerDelete(ApplyView& view, std::shared_ptr<SLE> const& sle, beast::Journal j)
         }
     }
 
-    auto const sponsor = getLedgerEntryReserveSponsor(view, sle);
-    adjustOwnerCount(view, view.peek(keylet::account(owner)), sponsor, -1, j);
+    adjustOwnerCount(view, view.peek(keylet::account(owner)), -1, j);
 
     view.erase(sle);
 

src/libxrpl/ledger/helpers/PaymentChannelHelpers.cpp

@@ -2,7 +2,6 @@
 #include <xrpl/ledger/View.h>
 #include <xrpl/ledger/helpers/AccountRootHelpers.h>
 #include <xrpl/ledger/helpers/PaymentChannelHelpers.h>
-#include <xrpl/ledger/helpers/SponsorHelpers.h>
 #include <xrpl/protocol/Indexes.h>
 
 namespace xrpl {
@@ -48,8 +47,7 @@ closeChannel(
     XRPL_ASSERT(
         (*slep)[sfAmount] >= (*slep)[sfBalance], "xrpl::closeChannel : minimum channel amount");
     (*sle)[sfBalance] = (*sle)[sfBalance] + (*slep)[sfAmount] - (*slep)[sfBalance];
-    auto const sponsor = getLedgerEntryReserveSponsor(view, slep);
-    adjustOwnerCount(view, sle, sponsor, -1, j);
+    adjustOwnerCount(view, sle, -1, j);
     view.update(sle);
 
     // Remove PayChan from ledger

src/libxrpl/ledger/helpers/RippleStateHelpers.cpp

@@ -5,7 +5,6 @@
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/ledger/helpers/AccountRootHelpers.h>
 #include <xrpl/ledger/helpers/DirectoryHelpers.h>
-#include <xrpl/ledger/helpers/SponsorHelpers.h>
 #include <xrpl/protocol/AmountConversions.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
@@ -177,7 +176,6 @@ trustCreate(
                                 // Issuer should be the account being set.
     std::uint32_t uQualityIn,
     std::uint32_t uQualityOut,
-    std::optional<AccountID> const& sponsorAccountID,
     beast::Journal j)
 {
     JLOG(j.trace()) << "trustCreate: " << to_string(uSrcAccountID) << ", "
@@ -263,14 +261,8 @@ trustCreate(
         uFlags |= (bSetHigh ? lsfLowNoRipple : lsfHighNoRipple);
     }
 
-    std::shared_ptr<SLE> sponsorSle = {};
-    if (sponsorAccountID)
-        sponsorSle = view.peek(keylet::account(*sponsorAccountID));
-
     sleRippleState->setFieldU32(sfFlags, uFlags);
-    adjustOwnerCount(view, sleAccount, sponsorSle, 1, j);
-
-    addSponsorToLedgerEntry(sleRippleState, sponsorSle, bSetHigh ? sfHighSponsor : sfLowSponsor);
+    adjustOwnerCount(view, sleAccount, 1, j);
 
     // ONLY: Create ripple balance.
     sleRippleState->setFieldAmount(sfBalance, bSetHigh ? -saBalance : saBalance);
@@ -306,9 +298,6 @@ trustDelete(
         return tefBAD_LEDGER;  // LCOV_EXCL_LINE
     }
 
-    removeSponsorFromLedgerEntry(sleRippleState, sfHighSponsor);
-    removeSponsorFromLedgerEntry(sleRippleState, sfLowSponsor);
-
     JLOG(j.trace()) << "trustDelete: Deleting ripple line: state";
     view.erase(sleRippleState);
 
@@ -358,15 +347,11 @@ updateTrustLine(
     {
         // VFALCO Where is the line being deleted?
         // Clear the reserve of the sender, possibly delete the line!
-        auto const currentSponsor =
-            getLedgerEntryReserveSponsor(view, state, !bSenderHigh ? sfLowSponsor : sfHighSponsor);
-        adjustOwnerCount(view, sle, currentSponsor, -1, j);
+        adjustOwnerCount(view, sle, -1, j);
 
         // Clear reserve flag.
         state->setFieldU32(sfFlags, flags & (!bSenderHigh ? ~lsfLowReserve : ~lsfHighReserve));
 
-        removeSponsorFromLedgerEntry(state, !bSenderHigh ? sfLowSponsor : sfHighSponsor);
-
         // Balance is zero, receiver reserve is clear.
         if (!after  // Balance is zero.
             && ((flags & (bSenderHigh ? lsfLowReserve : lsfHighReserve)) == 0u))
@@ -466,7 +451,6 @@ issueIOU(
         limit,
         0,
         0,
-        {},
         j);
 }
 
@@ -617,7 +601,6 @@ canTransfer(ReadView const& view, Issue const& issue, AccountID const& from, Acc
 TER
 addEmptyHolding(
     ApplyView& view,
-    STTx const& tx,
     AccountID const& accountID,
     XRPAmount priorBalance,
     Issue const& issue,
@@ -645,19 +628,10 @@ addEmptyHolding(
     // If the line already exists, don't create it again.
     if (view.read(index))
         return tecDUPLICATE;
-    auto const& sponsorAccountID =
-        !isPseudoAccount(sleDst) ? getTxReserveSponsorAccountID(tx) : std::nullopt;
 
     // Can the account cover the trust line reserve ?
-    if (auto const ret = checkInsufficientReserve(
-            view,
-            tx,
-            sleDst,
-            priorBalance,
-            sponsorAccountID ? view.read(keylet::account(*sponsorAccountID))
-                             : std::shared_ptr<SLE>(),
-            1);
-        !isTesSuccess(ret))
+    std::uint32_t const ownerCount = sleDst->at(sfOwnerCount);
+    if (priorBalance < view.fees().accountReserve(ownerCount + 1))
         return tecNO_LINE_INSUF_RESERVE;
 
     return trustCreate(
@@ -675,7 +649,6 @@ addEmptyHolding(
         /*saLimit=*/STAmount{Issue{currency, dstId}},
         /*uQualityIn=*/0,
         /*uQualityOut=*/0,
-        sponsorAccountID,
         journal);
 }
 
@@ -717,14 +690,11 @@ removeEmptyHolding(
         if (!sleLowAccount)
             return tecINTERNAL;  // LCOV_EXCL_LINE
 
-        auto const currentLowSponsor = getLedgerEntryReserveSponsor(view, line, sfLowSponsor);
-
-        adjustOwnerCount(view, sleLowAccount, currentLowSponsor, -1, journal);
+        adjustOwnerCount(view, sleLowAccount, -1, journal);
         // It's not really necessary to clear the reserve flag, since the line
         // is about to be deleted, but this will make the metadata reflect an
         // accurate state at the time of deletion.
         line->clearFlag(lsfLowReserve);
-        removeSponsorFromLedgerEntry(line, sfLowSponsor);
     }
 
     if (line->isFlag(lsfHighReserve))
@@ -734,14 +704,11 @@ removeEmptyHolding(
         if (!sleHighAccount)
             return tecINTERNAL;  // LCOV_EXCL_LINE
 
-        auto const currentHighSponsor = getLedgerEntryReserveSponsor(view, line, sfHighSponsor);
-
-        adjustOwnerCount(view, sleHighAccount, currentHighSponsor, -1, journal);
+        adjustOwnerCount(view, sleHighAccount, -1, journal);
         // It's not really necessary to clear the reserve flag, since the line
         // is about to be deleted, but this will make the metadata reflect an
         // accurate state at the time of deletion.
         line->clearFlag(lsfHighReserve);
-        removeSponsorFromLedgerEntry(line, sfHighSponsor);
     }
 
     return trustDelete(
@@ -781,9 +748,6 @@ deleteAMMTrustLine(
     if (ammAccountID && (low != *ammAccountID && high != *ammAccountID))
         return terNO_AMM;
 
-    auto const sponsorSle =
-        getLedgerEntryReserveSponsor(view, sleState, !ammLow ? sfLowSponsor : sfHighSponsor);
-
     if (auto const ter = trustDelete(view, sleState, low, high, j); !isTesSuccess(ter))
     {
         JLOG(j.error()) << "deleteAMMTrustLine: failed to delete the trustline.";
@@ -794,7 +758,7 @@ deleteAMMTrustLine(
     if ((sleState->getFlags() & uFlags) == 0u)
         return tecINTERNAL;  // LCOV_EXCL_LINE
 
-    adjustOwnerCount(view, !ammLow ? sleLow : sleHigh, sponsorSle, -1, j);
+    adjustOwnerCount(view, !ammLow ? sleLow : sleHigh, -1, j);
 
     return tesSUCCESS;
 }

src/libxrpl/ledger/helpers/TokenHelpers.cpp

@@ -5,7 +5,6 @@
 #include <xrpl/ledger/helpers/AccountRootHelpers.h>
 #include <xrpl/ledger/helpers/MPTokenHelpers.h>
 #include <xrpl/ledger/helpers/RippleStateHelpers.h>
-#include <xrpl/ledger/helpers/SponsorHelpers.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/LedgerFormats.h>
@@ -41,14 +40,6 @@ isGlobalFrozen(ReadView const& view, Asset const& asset)
         [&](MPTIssue const& issue) { return isGlobalFrozen(view, issue); });
 }
 
-TER
-checkGlobalFrozen(ReadView const& view, Asset const& asset)
-{
-    if (isGlobalFrozen(view, asset))
-        return asset.holds<MPTIssue>() ? tecLOCKED : tecFROZEN;
-    return tesSUCCESS;
-}
-
 bool
 isIndividualFrozen(ReadView const& view, AccountID const& account, Asset const& asset)
 {
@@ -56,14 +47,6 @@ isIndividualFrozen(ReadView const& view, AccountID const& account, Asset const&
         [&](auto const& issue) { return isIndividualFrozen(view, account, issue); }, asset.value());
 }
 
-TER
-checkIndividualFrozen(ReadView const& view, AccountID const& account, Asset const& asset)
-{
-    if (isIndividualFrozen(view, account, asset))
-        return asset.holds<MPTIssue>() ? tecLOCKED : tecFROZEN;
-    return tesSUCCESS;
-}
-
 bool
 isFrozen(ReadView const& view, AccountID const& account, Asset const& asset, int depth)
 {
@@ -330,8 +313,7 @@ accountHolds(
         // Only if auth check is needed, as it needs to do an additional read
         // operation. Note featureSingleAssetVault will affect error codes.
         if (zeroIfUnauthorized == ahZERO_IF_UNAUTHORIZED &&
-            (view.rules().enabled(featureSingleAssetVault) ||
-             view.rules().enabled(featureConfidentialTransfer)))
+            view.rules().enabled(featureSingleAssetVault))
         {
             if (auto const err = requireAuth(view, mptIssue, account, AuthType::StrongAuth);
                 !isTesSuccess(err))
@@ -454,7 +436,6 @@ canAddHolding(ReadView const& view, Asset const& asset)
 TER
 addEmptyHolding(
     ApplyView& view,
-    STTx const& tx,
     AccountID const& accountID,
     XRPAmount priorBalance,
     Asset const& asset,
@@ -462,7 +443,7 @@ addEmptyHolding(
 {
     return std::visit(
         [&]<ValidIssueType TIss>(TIss const& issue) -> TER {
-            return addEmptyHolding(view, tx, accountID, priorBalance, issue, journal);
+            return addEmptyHolding(view, accountID, priorBalance, issue, journal);
         },
         asset.value());
 }
@@ -470,17 +451,13 @@ addEmptyHolding(
 TER
 removeEmptyHolding(
     ApplyView& view,
-    STTx const& tx,
     AccountID const& accountID,
     Asset const& asset,
     beast::Journal journal)
 {
     return std::visit(
         [&]<ValidIssueType TIss>(TIss const& issue) -> TER {
-            if constexpr (std::is_same_v<TIss, Issue>)
-                return removeEmptyHolding(view, accountID, issue, journal);
-            else
-                return removeEmptyHolding(view, tx, accountID, issue, journal);
+            return removeEmptyHolding(view, accountID, issue, journal);
         },
         asset.value());
 }
@@ -528,7 +505,6 @@ directSendNoFeeIOU(
     AccountID const& uReceiverID,
     STAmount const& saAmount,
     bool bCheckIssuer,
-    std::optional<AccountID> const& sponsorAccountID,
     beast::Journal j)
 {
     AccountID const& issuer = saAmount.getIssuer();
@@ -596,12 +572,7 @@ directSendNoFeeIOU(
         // Sender quality out is 0.
         {
             // Clear the reserve of the sender, possibly delete the line!
-            auto const currentSponsor = getLedgerEntryReserveSponsor(
-                view, sleRippleState, !bSenderHigh ? sfLowSponsor : sfHighSponsor);
-            adjustOwnerCount(view, view.peek(keylet::account(uSenderID)), currentSponsor, -1, j);
-
-            removeSponsorFromLedgerEntry(
-                sleRippleState, !bSenderHigh ? sfLowSponsor : sfHighSponsor);
+            adjustOwnerCount(view, view.peek(keylet::account(uSenderID)), -1, j);
 
             // Clear reserve flag.
             sleRippleState->setFieldU32(
@@ -665,7 +636,6 @@ directSendNoFeeIOU(
         saReceiverLimit,
         0,
         0,
-        sponsorAccountID,
         j);
 }
 
@@ -680,7 +650,6 @@ directSendNoLimitIOU(
     STAmount const& saAmount,
     STAmount& saActual,
     beast::Journal j,
-    std::optional<AccountID> const& sponsorAccountID,
     WaiveTransferFee waiveFee)
 {
     auto const& issuer = saAmount.getIssuer();
@@ -693,8 +662,7 @@ directSendNoLimitIOU(
     if (uSenderID == issuer || uReceiverID == issuer || issuer == noAccount())
     {
         // Direct send: redeeming IOUs and/or sending own IOUs.
-        auto const ter =
-            directSendNoFeeIOU(view, uSenderID, uReceiverID, saAmount, false, sponsorAccountID, j);
+        auto const ter = directSendNoFeeIOU(view, uSenderID, uReceiverID, saAmount, false, j);
         if (!isTesSuccess(ter))
             return ter;
         saActual = saAmount;
@@ -712,12 +680,10 @@ directSendNoLimitIOU(
                     << to_string(uReceiverID) << " : deliver=" << saAmount.getFullText()
                     << " cost=" << saActual.getFullText();
 
-    TER terResult =
-        directSendNoFeeIOU(view, issuer, uReceiverID, saAmount, true, sponsorAccountID, j);
+    TER terResult = directSendNoFeeIOU(view, issuer, uReceiverID, saAmount, true, j);
 
     if (tesSUCCESS == terResult)
-        terResult =
-            directSendNoFeeIOU(view, uSenderID, issuer, saActual, true, sponsorAccountID, j);
+        terResult = directSendNoFeeIOU(view, uSenderID, issuer, saActual, true, j);
 
     return terResult;
 }
@@ -733,7 +699,6 @@ directSendNoLimitMultiIOU(
     MultiplePaymentDestinations const& receivers,
     STAmount& actual,
     beast::Journal j,
-    std::optional<AccountID> const& sponsorAccountID,
     WaiveTransferFee waiveFee)
 {
     auto const& issuer = issue.getIssuer();
@@ -761,8 +726,7 @@ directSendNoLimitMultiIOU(
         if (senderID == issuer || receiverID == issuer || issuer == noAccount())
         {
             // Direct send: redeeming IOUs and/or sending own IOUs.
-            if (auto const ter = directSendNoFeeIOU(
-                    view, senderID, receiverID, amount, false, sponsorAccountID, j))
+            if (auto const ter = directSendNoFeeIOU(view, senderID, receiverID, amount, false, j))
                 return ter;
             actual += amount;
             // Do not add amount to takeFromSender, because directSendNoFeeIOU took
@@ -785,15 +749,14 @@ directSendNoLimitMultiIOU(
                         << to_string(receiverID) << " : deliver=" << amount.getFullText()
                         << " cost=" << actual.getFullText();
 
-        if (TER const terResult =
-                directSendNoFeeIOU(view, issuer, receiverID, amount, true, sponsorAccountID, j))
+        if (TER const terResult = directSendNoFeeIOU(view, issuer, receiverID, amount, true, j))
             return terResult;
     }
 
     if (senderID != issuer && takeFromSender)
     {
-        if (TER const terResult = directSendNoFeeIOU(
-                view, senderID, issuer, takeFromSender, true, sponsorAccountID, j))
+        if (TER const terResult =
+                directSendNoFeeIOU(view, senderID, issuer, takeFromSender, true, j))
             return terResult;
     }
 
@@ -807,7 +770,6 @@ accountSendIOU(
     AccountID const& uReceiverID,
     STAmount const& saAmount,
     beast::Journal j,
-    std::optional<AccountID> const& sponsorAccountID,
     WaiveTransferFee waiveFee)
 {
     if (view.rules().enabled(fixAMMv1_1))
@@ -839,8 +801,7 @@ accountSendIOU(
         JLOG(j.trace()) << "accountSendIOU: " << to_string(uSenderID) << " -> "
                         << to_string(uReceiverID) << " : " << saAmount.getFullText();
 
-        return directSendNoLimitIOU(
-            view, uSenderID, uReceiverID, saAmount, saActual, j, sponsorAccountID, waiveFee);
+        return directSendNoLimitIOU(view, uSenderID, uReceiverID, saAmount, saActual, j, waiveFee);
     }
 
     /* XRP send which does not check reserve and can do pure adjustment.
@@ -928,7 +889,6 @@ accountSendMultiIOU(
     Issue const& issue,
     MultiplePaymentDestinations const& receivers,
     beast::Journal j,
-    std::optional<AccountID> const& sponsorAccountID,
     WaiveTransferFee waiveFee)
 {
     XRPL_ASSERT_PARTS(
@@ -940,8 +900,7 @@ accountSendMultiIOU(
         JLOG(j.trace()) << "accountSendMultiIOU: " << to_string(senderID) << " sending "
                         << receivers.size() << " IOUs";
 
-        return directSendNoLimitMultiIOU(
-            view, senderID, issue, receivers, actual, j, sponsorAccountID, waiveFee);
+        return directSendNoLimitMultiIOU(view, senderID, issue, receivers, actual, j, waiveFee);
     }
 
     /* XRP send which does not check reserve and can do pure adjustment.
@@ -1366,8 +1325,7 @@ directSendNoFee(
 {
     return saAmount.asset().visit(
         [&](Issue const&) {
-            return directSendNoFeeIOU(
-                view, uSenderID, uReceiverID, saAmount, bCheckIssuer, std::nullopt, j);
+            return directSendNoFeeIOU(view, uSenderID, uReceiverID, saAmount, bCheckIssuer, j);
         },
         [&](MPTIssue const&) {
             XRPL_ASSERT(!bCheckIssuer, "xrpl::directSendNoFee : not checking issuer");
@@ -1382,14 +1340,12 @@ accountSend(
     AccountID const& uReceiverID,
     STAmount const& saAmount,
     beast::Journal j,
-    std::optional<AccountID> const& sponsorAccountID,
     WaiveTransferFee waiveFee,
     AllowMPTOverflow allowOverflow)
 {
     return saAmount.asset().visit(
         [&](Issue const&) {
-            return accountSendIOU(
-                view, uSenderID, uReceiverID, saAmount, j, sponsorAccountID, waiveFee);
+            return accountSendIOU(view, uSenderID, uReceiverID, saAmount, j, waiveFee);
         },
         [&](MPTIssue const&) {
             return accountSendMPT(
@@ -1404,15 +1360,13 @@ accountSendMulti(
     Asset const& asset,
     MultiplePaymentDestinations const& receivers,
     beast::Journal j,
-    std::optional<AccountID> const& sponsorAccountID,
     WaiveTransferFee waiveFee)
 {
     XRPL_ASSERT_PARTS(
         receivers.size() > 1, "xrpl::accountSendMulti", "multiple recipients provided");
     return asset.visit(
         [&](Issue const& issue) {
-            return accountSendMultiIOU(
-                view, senderID, issue, receivers, j, sponsorAccountID, waiveFee);
+            return accountSendMultiIOU(view, senderID, issue, receivers, j, waiveFee);
         },
         [&](MPTIssue const& issue) {
             return accountSendMultiMPT(view, senderID, issue, receivers, j, waiveFee);

src/libxrpl/protocol/ConfidentialTransfer.cpp

@@ -1,444 +0,0 @@
-#include <xrpl/protocol/ConfidentialTransfer.h>
-#include <xrpl/protocol/Protocol.h>
-
-#include <openssl/rand.h>
-#include <utility/mpt_utility.h>
-
-#include <secp256k1_mpt.h>
-
-namespace xrpl {
-
-/**
- * @brief Converts an XRPL AccountID to mpt-crypto lib C struct.
- *
- * @param account The AccountID.
- * @return The equivalent mpt-crypto lib account_id struct.
- */
-account_id
-toAccountId(AccountID const& account)
-{
-    account_id res;
-    std::memcpy(res.bytes, account.data(), kMPT_ACCOUNT_ID_SIZE);
-    return res;
-}
-
-/**
- * @brief Converts an XRPL uint192 to mpt-crypto lib C struct.
- *
- * @param i The XRPL MPTokenIssuance ID.
- * @return The equivalent mpt-crypto lib mpt_issuance_id struct.
- */
-mpt_issuance_id
-toIssuanceId(uint192 const& issuance)
-{
-    mpt_issuance_id res;
-    std::memcpy(res.bytes, issuance.data(), kMPT_ISSUANCE_ID_SIZE);
-    return res;
-}
-
-uint256
-getSendContextHash(
-    AccountID const& account,
-    uint192 const& issuanceID,
-    std::uint32_t sequence,
-    AccountID const& destination,
-    std::uint32_t version)
-{
-    uint256 result;
-    mpt_get_send_context_hash(
-        toAccountId(account),
-        toIssuanceId(issuanceID),
-        sequence,
-        toAccountId(destination),
-        version,
-        result.data());
-    return result;
-}
-
-uint256
-getClawbackContextHash(
-    AccountID const& account,
-    uint192 const& issuanceID,
-    std::uint32_t sequence,
-    AccountID const& holder)
-{
-    uint256 result;
-    mpt_get_clawback_context_hash(
-        toAccountId(account),
-        toIssuanceId(issuanceID),
-        sequence,
-        toAccountId(holder),
-        result.data());
-    return result;
-}
-
-uint256
-getConvertContextHash(AccountID const& account, uint192 const& issuanceID, std::uint32_t sequence)
-{
-    uint256 result;
-    mpt_get_convert_context_hash(
-        toAccountId(account), toIssuanceId(issuanceID), sequence, result.data());
-    return result;
-}
-
-uint256
-getConvertBackContextHash(
-    AccountID const& account,
-    uint192 const& issuanceID,
-    std::uint32_t sequence,
-    std::uint32_t version)
-{
-    uint256 result;
-    mpt_get_convert_back_context_hash(
-        toAccountId(account), toIssuanceId(issuanceID), sequence, version, result.data());
-    return result;
-}
-
-std::optional<EcPair>
-makeEcPair(Slice const& buffer)
-{
-    if (buffer.length() != 2 * ecGamalEncryptedLength)
-        return std::nullopt;  // LCOV_EXCL_LINE
-
-    auto parsePubKey = [](Slice const& slice, secp256k1_pubkey& out) {
-        return secp256k1_ec_pubkey_parse(
-            secp256k1Context(),
-            &out,
-            reinterpret_cast<unsigned char const*>(slice.data()),
-            slice.length());
-    };
-
-    Slice const s1{buffer.data(), ecGamalEncryptedLength};
-    Slice const s2{buffer.data() + ecGamalEncryptedLength, ecGamalEncryptedLength};
-
-    EcPair pair{};
-    if (parsePubKey(s1, pair.c1) != 1 || parsePubKey(s2, pair.c2) != 1)
-        return std::nullopt;
-
-    return pair;
-}
-
-std::optional<Buffer>
-serializeEcPair(EcPair const& pair)
-{
-    auto serializePubKey = [](secp256k1_pubkey const& pub, unsigned char* out) {
-        size_t outLen = ecGamalEncryptedLength;  // 33 bytes
-        int const ret = secp256k1_ec_pubkey_serialize(
-            secp256k1Context(), out, &outLen, &pub, SECP256K1_EC_COMPRESSED);
-        return ret == 1 && outLen == ecGamalEncryptedLength;
-    };
-
-    Buffer buffer(ecGamalEncryptedTotalLength);
-    unsigned char* ptr = buffer.data();
-    bool const res1 = serializePubKey(pair.c1, ptr);
-    bool const res2 = serializePubKey(pair.c2, ptr + ecGamalEncryptedLength);
-
-    if (!res1 || !res2)
-        return std::nullopt;
-
-    return buffer;
-}
-
-bool
-isValidCiphertext(Slice const& buffer)
-{
-    return makeEcPair(buffer).has_value();
-}
-
-bool
-isValidCompressedECPoint(Slice const& buffer)
-{
-    if (buffer.size() != compressedECPointLength)
-        return false;
-
-    // Compressed EC points must start with 0x02 or 0x03
-    if (buffer[0] != ecCompressedPrefixEvenY && buffer[0] != ecCompressedPrefixOddY)
-        return false;
-
-    secp256k1_pubkey point;
-    return secp256k1_ec_pubkey_parse(secp256k1Context(), &point, buffer.data(), buffer.size()) == 1;
-}
-
-std::optional<Buffer>
-homomorphicAdd(Slice const& a, Slice const& b)
-{
-    if (a.length() != ecGamalEncryptedTotalLength || b.length() != ecGamalEncryptedTotalLength)
-        return std::nullopt;
-
-    auto const pairA = makeEcPair(a);
-    auto const pairB = makeEcPair(b);
-
-    if (!pairA || !pairB)
-        return std::nullopt;
-
-    EcPair sum{};
-    if (auto res = secp256k1_elgamal_add(
-            secp256k1Context(), &sum.c1, &sum.c2, &pairA->c1, &pairA->c2, &pairB->c1, &pairB->c2);
-        res != 1)
-    {
-        return std::nullopt;
-    }
-
-    return serializeEcPair(sum);
-}
-
-std::optional<Buffer>
-homomorphicSubtract(Slice const& a, Slice const& b)
-{
-    if (a.length() != ecGamalEncryptedTotalLength || b.length() != ecGamalEncryptedTotalLength)
-        return std::nullopt;
-
-    auto const pairA = makeEcPair(a);
-    auto const pairB = makeEcPair(b);
-
-    if (!pairA || !pairB)
-        return std::nullopt;
-
-    EcPair diff{};
-    if (auto res = secp256k1_elgamal_subtract(
-            secp256k1Context(), &diff.c1, &diff.c2, &pairA->c1, &pairA->c2, &pairB->c1, &pairB->c2);
-        res != 1)
-    {
-        return std::nullopt;
-    }
-
-    return serializeEcPair(diff);
-}
-
-Buffer
-generateBlindingFactor()
-{
-    unsigned char blindingFactor[ecBlindingFactorLength];
-
-    // todo: might need to be updated using another RNG
-    if (RAND_bytes(blindingFactor, ecBlindingFactorLength) != 1)
-        Throw<std::runtime_error>("Failed to generate random number");
-
-    return Buffer(blindingFactor, ecBlindingFactorLength);
-}
-
-std::optional<Buffer>
-encryptAmount(uint64_t const amt, Slice const& pubKeySlice, Slice const& blindingFactor)
-{
-    if (blindingFactor.size() != ecBlindingFactorLength || pubKeySlice.size() != ecPubKeyLength)
-        return std::nullopt;
-
-    Buffer out(ecGamalEncryptedTotalLength);
-    if (mpt_encrypt_amount(amt, pubKeySlice.data(), blindingFactor.data(), out.data()) != 0)
-        return std::nullopt;
-
-    return out;
-}
-
-std::optional<Buffer>
-encryptCanonicalZeroAmount(Slice const& pubKeySlice, AccountID const& account, MPTID const& mptId)
-{
-    if (pubKeySlice.size() != ecPubKeyLength)
-        return std::nullopt;  // LCOV_EXCL_LINE
-
-    EcPair pair{};
-    secp256k1_pubkey pubKey;
-    if (auto res = secp256k1_ec_pubkey_parse(
-            secp256k1Context(), &pubKey, pubKeySlice.data(), ecPubKeyLength);
-        res != 1)
-    {
-        return std::nullopt;  // LCOV_EXCL_LINE
-    }
-
-    if (auto res = generate_canonical_encrypted_zero(
-            secp256k1Context(), &pair.c1, &pair.c2, &pubKey, account.data(), mptId.data());
-        res != 1)
-    {
-        return std::nullopt;  // LCOV_EXCL_LINE
-    }
-
-    return serializeEcPair(pair);
-}
-
-TER
-verifyRevealedAmount(
-    uint64_t const amount,
-    Slice const& blindingFactor,
-    ConfidentialRecipient const& holder,
-    ConfidentialRecipient const& issuer,
-    std::optional<ConfidentialRecipient> const& auditor)
-{
-    if (blindingFactor.size() != ecBlindingFactorLength ||
-        holder.publicKey.size() != ecPubKeyLength ||
-        holder.encryptedAmount.size() != ecGamalEncryptedTotalLength ||
-        issuer.publicKey.size() != ecPubKeyLength ||
-        issuer.encryptedAmount.size() != ecGamalEncryptedTotalLength)
-        return tecINTERNAL;  // LCOV_EXCL_LINE
-
-    secp256k1_context* ctx = mpt_secp256k1_context();
-    if (!ctx)
-        return tecINTERNAL;  // LCOV_EXCL_LINE
-
-    // All calls are evaluated before combining results to prevent timing attacks.
-    auto verifyCiphertext = [&](ConfidentialRecipient const& r) -> bool {
-        secp256k1_pubkey pk, c1, c2;
-        if (secp256k1_ec_pubkey_parse(ctx, &pk, r.publicKey.data(), r.publicKey.size()) != 1)
-            return false;
-        if (!mpt_make_ec_pair(r.encryptedAmount.data(), &c1, &c2))
-            return false;
-        return secp256k1_elgamal_verify_encryption(
-                   ctx, &c1, &c2, &pk, amount, blindingFactor.data()) == 1;
-    };
-
-    bool const holderOk = verifyCiphertext(holder);
-    bool const issuerOk = verifyCiphertext(issuer);
-    bool valid = holderOk && issuerOk;
-    if (auditor)
-    {
-        if (auditor->publicKey.size() != ecPubKeyLength ||
-            auditor->encryptedAmount.size() != ecGamalEncryptedTotalLength)
-            return tecINTERNAL;  // LCOV_EXCL_LINE
-        bool const auditorOk = verifyCiphertext(*auditor);
-        valid = valid && auditorOk;
-    }
-
-    return valid ? TER{tesSUCCESS} : TER{tecBAD_PROOF};
-}
-
-NotTEC
-checkEncryptedAmountFormat(STObject const& object)
-{
-    // Current usage of this function is only for ConfidentialMPTConvert and
-    // ConfidentialMPTConvertBack transactions, which already enforce that these fields
-    // are present.
-    if (!object.isFieldPresent(sfHolderEncryptedAmount) ||
-        !object.isFieldPresent(sfIssuerEncryptedAmount))
-        return temMALFORMED;  // LCOV_EXCL_LINE
-
-    if (object[sfHolderEncryptedAmount].length() != ecGamalEncryptedTotalLength ||
-        object[sfIssuerEncryptedAmount].length() != ecGamalEncryptedTotalLength)
-        return temBAD_CIPHERTEXT;
-
-    bool const hasAuditor = object.isFieldPresent(sfAuditorEncryptedAmount);
-    if (hasAuditor && object[sfAuditorEncryptedAmount].length() != ecGamalEncryptedTotalLength)
-        return temBAD_CIPHERTEXT;
-
-    if (!isValidCiphertext(object[sfHolderEncryptedAmount]) ||
-        !isValidCiphertext(object[sfIssuerEncryptedAmount]))
-        return temBAD_CIPHERTEXT;
-
-    if (hasAuditor && !isValidCiphertext(object[sfAuditorEncryptedAmount]))
-        return temBAD_CIPHERTEXT;
-
-    return tesSUCCESS;
-}
-
-TER
-verifySchnorrProof(Slice const& pubKeySlice, Slice const& proofSlice, uint256 const& contextHash)
-{
-    if (proofSlice.size() != ecSchnorrProofLength || pubKeySlice.size() != ecPubKeyLength)
-        return tecINTERNAL;  // LCOV_EXCL_LINE
-
-    if (mpt_verify_convert_proof(proofSlice.data(), pubKeySlice.data(), contextHash.data()) != 0)
-        return tecBAD_PROOF;
-
-    return tesSUCCESS;
-}
-
-TER
-verifyClawbackProof(
-    uint64_t const amount,
-    Slice const& proof,
-    Slice const& pubKeySlice,
-    Slice const& ciphertext,
-    uint256 const& contextHash)
-{
-    if (ciphertext.size() != ecGamalEncryptedTotalLength || pubKeySlice.size() != ecPubKeyLength ||
-        proof.size() != ecCompactClawbackProofLength)
-        return tecINTERNAL;  // LCOV_EXCL_LINE
-
-    if (mpt_verify_clawback_proof(
-            proof.data(), amount, pubKeySlice.data(), ciphertext.data(), contextHash.data()) != 0)
-        return tecBAD_PROOF;
-
-    return tesSUCCESS;
-}
-
-TER
-verifySendProof(
-    Slice const& proof,
-    ConfidentialRecipient const& sender,
-    ConfidentialRecipient const& destination,
-    ConfidentialRecipient const& issuer,
-    std::optional<ConfidentialRecipient> const& auditor,
-    Slice const& spendingBalance,
-    Slice const& amountCommitment,
-    Slice const& balanceCommitment,
-    uint256 const& contextHash)
-{
-    auto const recipientCount = getConfidentialRecipientCount(auditor.has_value());
-    if (proof.size() != ecCompactSendProofLength || sender.publicKey.size() != ecPubKeyLength ||
-        sender.encryptedAmount.size() != ecGamalEncryptedTotalLength ||
-        destination.publicKey.size() != ecPubKeyLength ||
-        destination.encryptedAmount.size() != ecGamalEncryptedTotalLength ||
-        issuer.publicKey.size() != ecPubKeyLength ||
-        issuer.encryptedAmount.size() != ecGamalEncryptedTotalLength ||
-        spendingBalance.size() != ecGamalEncryptedTotalLength ||
-        amountCommitment.size() != ecPedersenCommitmentLength ||
-        balanceCommitment.size() != ecPedersenCommitmentLength)
-        return tecINTERNAL;  // LCOV_EXCL_LINE
-
-    auto makeParticipant = [](ConfidentialRecipient const& r) {
-        mpt_confidential_participant p;
-        std::memcpy(p.pubkey, r.publicKey.data(), kMPT_PUBKEY_SIZE);
-        std::memcpy(p.ciphertext, r.encryptedAmount.data(), kMPT_ELGAMAL_TOTAL_SIZE);
-        return p;
-    };
-
-    std::vector<mpt_confidential_participant> participants(recipientCount);
-    participants[0] = makeParticipant(sender);
-    participants[1] = makeParticipant(destination);
-    participants[2] = makeParticipant(issuer);
-    if (auditor)
-    {
-        if (auditor->publicKey.size() != ecPubKeyLength ||
-            auditor->encryptedAmount.size() != ecGamalEncryptedTotalLength)
-            return tecINTERNAL;
-        participants[3] = makeParticipant(*auditor);
-    }
-
-    if (mpt_verify_send_proof(
-            proof.data(),
-            participants.data(),
-            static_cast<uint8_t>(recipientCount),
-            spendingBalance.data(),
-            amountCommitment.data(),
-            balanceCommitment.data(),
-            contextHash.data()) != 0)
-        return tecBAD_PROOF;
-
-    return tesSUCCESS;
-}
-
-TER
-verifyConvertBackProof(
-    Slice const& proof,
-    Slice const& pubKeySlice,
-    Slice const& spendingBalance,
-    Slice const& balanceCommitment,
-    uint64_t amount,
-    uint256 const& contextHash)
-{
-    if (proof.size() != ecCompactConvertBackProofLength || pubKeySlice.size() != ecPubKeyLength ||
-        spendingBalance.size() != ecGamalEncryptedTotalLength ||
-        balanceCommitment.size() != ecPedersenCommitmentLength)
-        return tecINTERNAL;  // LCOV_EXCL_LINE
-
-    if (mpt_verify_convert_back_proof(
-            proof.data(),
-            pubKeySlice.data(),
-            spendingBalance.data(),
-            balanceCommitment.data(),
-            amount,
-            contextHash.data()) != 0)
-        return tecBAD_PROOF;
-
-    return tesSUCCESS;
-}
-
-}  // namespace xrpl

src/libxrpl/protocol/Indexes.cpp

@@ -79,7 +79,6 @@ enum class LedgerNameSpace : std::uint16_t {
     VAULT = 'V',
     LOAN_BROKER = 'l',  // lower-case L
     LOAN = 'L',
-    SPONSORSHIP = '>',
 
     // No longer used or supported. Left here to reserve the space
     // to avoid accidental reuse.
@@ -315,12 +314,6 @@ signers(AccountID const& account) noexcept
     return signers(account, 0);
 }
 
-Keylet
-sponsor(AccountID const& sponsor, AccountID const& sponsee) noexcept
-{
-    return {ltSPONSORSHIP, indexHash(LedgerNameSpace::SPONSORSHIP, sponsor, sponsee)};
-}
-
 Keylet
 check(AccountID const& id, std::uint32_t seq) noexcept
 {

src/libxrpl/protocol/InnerObjectFormats.cpp

@@ -159,14 +159,6 @@ InnerObjectFormats::InnerObjectFormats()
             {sfTxnSignature, soeOPTIONAL},
             {sfSigners, soeOPTIONAL},
         });
-
-    add(sfSponsorSignature.jsonName.c_str(),
-        sfSponsorSignature.getCode(),
-        {
-            {sfSigningPubKey, soeOPTIONAL},
-            {sfTxnSignature, soeOPTIONAL},
-            {sfSigners, soeOPTIONAL},
-        });
 }
 
 InnerObjectFormats const&

src/libxrpl/protocol/LedgerFormats.cpp

@@ -14,7 +14,6 @@ LedgerFormats::getCommonFields()
         {sfLedgerIndex, soeOPTIONAL},
         {sfLedgerEntryType, soeREQUIRED},
         {sfFlags, soeREQUIRED},
-        {sfSponsor, soeOPTIONAL},
     };
     return commonFields;
 }

src/libxrpl/protocol/Permissions.cpp

@@ -1,8 +1,6 @@
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Permissions.h>
-#include <xrpl/protocol/STTx.h>
-#include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/jss.h>
 
 namespace xrpl {
@@ -34,70 +32,41 @@ Permission::Permission()
     };
 
     granularPermissionMap_ = {
-#pragma push_macro("GRANULAR_PERMISSION")
-#undef GRANULAR_PERMISSION
+#pragma push_macro("PERMISSION")
+#undef PERMISSION
 
-#define GRANULAR_PERMISSION(type, txType, value, flags, fields) {#type, type},
+#define PERMISSION(type, txType, value) {#type, type},
 
 #include <xrpl/protocol/detail/permissions.macro>
 
-#undef GRANULAR_PERMISSION
-#pragma pop_macro("GRANULAR_PERMISSION")
+#undef PERMISSION
+#pragma pop_macro("PERMISSION")
     };
 
     granularNameMap_ = {
-#pragma push_macro("GRANULAR_PERMISSION")
-#undef GRANULAR_PERMISSION
+#pragma push_macro("PERMISSION")
+#undef PERMISSION
 
-#define GRANULAR_PERMISSION(type, txType, value, flags, fields) {type, #type},
+#define PERMISSION(type, txType, value) {type, #type},
 
 #include <xrpl/protocol/detail/permissions.macro>
 
-#undef GRANULAR_PERMISSION
-#pragma pop_macro("GRANULAR_PERMISSION")
+#undef PERMISSION
+#pragma pop_macro("PERMISSION")
     };
 
     granularTxTypeMap_ = {
-#pragma push_macro("GRANULAR_PERMISSION")
-#undef GRANULAR_PERMISSION
+#pragma push_macro("PERMISSION")
+#undef PERMISSION
 
-#define GRANULAR_PERMISSION(type, txType, value, flags, fields) {type, txType},
+#define PERMISSION(type, txType, value) {type, txType},
 
 #include <xrpl/protocol/detail/permissions.macro>
 
-#undef GRANULAR_PERMISSION
-#pragma pop_macro("GRANULAR_PERMISSION")
+#undef PERMISSION
+#pragma pop_macro("PERMISSION")
     };
 
-    {
-#pragma push_macro("GRANULAR_PERMISSION")
-#undef GRANULAR_PERMISSION
-
-#define GRANULAR_PERMISSION(type, txType, value, flags, fields) \
-    granularPermittedFlags_[type] = (flags);
-
-#include <xrpl/protocol/detail/permissions.macro>
-
-#undef GRANULAR_PERMISSION
-#pragma pop_macro("GRANULAR_PERMISSION")
-    }
-
-    {
-#pragma push_macro("GRANULAR_PERMISSION")
-#undef GRANULAR_PERMISSION
-
-#define GRANULAR_PERMISSION(type, txType, value, flags, fields) \
-    granularTemplates_.emplace(                                 \
-        std::piecewise_construct,                               \
-        std::forward_as_tuple(type),                            \
-        std::forward_as_tuple(std::vector<SOElement> fields, TxFormats::getCommonFields()));
-
-#include <xrpl/protocol/detail/permissions.macro>
-
-#undef GRANULAR_PERMISSION
-#pragma pop_macro("GRANULAR_PERMISSION")
-    }
-
     XRPL_ASSERT(
         txFeatureMap_.size() == delegableTx_.size(),
         "xrpl::Permission : txFeatureMap_ and delegableTx_ must have same "
@@ -110,9 +79,6 @@ Permission::Permission()
             "xrpl::Permission::granularPermissionMap_ : granular permission "
             "value must not exceed the maximum uint16_t value.");
     }
-
-    for (auto const& [gp, txType] : granularTxTypeMap_)
-        granularTxTypes_.insert(txType);
 }
 
 Permission const&
@@ -167,12 +133,6 @@ Permission::getGranularTxType(GranularPermissionType const& gpType) const
     return std::nullopt;
 }
 
-bool
-Permission::hasGranularPermissions(TxType txType) const
-{
-    return granularTxTypes_.contains(txType);
-}
-
 std::optional<std::reference_wrapper<uint256 const>>
 Permission::getTxFeature(TxType txType) const
 {
@@ -232,48 +192,4 @@ Permission::permissionToTxType(uint32_t const& value)
     return static_cast<TxType>(value - 1);
 }
 
-bool
-Permission::checkGranularSandbox(
-    STTx const& tx,
-    std::unordered_set<GranularPermissionType> const& heldPermissions) const
-{
-    auto const txFlags = tx.getFlags();
-
-    // Build union of flags and templates across all held permissions.
-    std::uint32_t unionFlags = 0;
-    for (auto const& gp : heldPermissions)
-    {
-        auto const it = granularPermittedFlags_.find(gp);
-        if (it != granularPermittedFlags_.end())
-            unionFlags |= it->second;
-    }
-
-    // Check if flags are permitted
-    if ((txFlags & ~unionFlags) != 0)
-        return false;
-
-    // Check if fields are permitted. Every present field must appear in at least one held
-    // permission's template. The common fields are included in the constructor.
-    for (auto const& field : tx)
-    {
-        if (field.getSType() == STI_NOTPRESENT)
-            continue;
-
-        bool fieldAllowed = false;
-        for (auto const& gp : heldPermissions)
-        {
-            auto const it = granularTemplates_.find(gp);
-            if (it != granularTemplates_.end() && it->second.getIndex(field.getFName()) != -1)
-            {
-                fieldAllowed = true;
-                break;
-            }
-        }
-        if (!fieldAllowed)
-            return false;
-    }
-
-    return true;
-}
-
 }  // namespace xrpl

src/libxrpl/protocol/PublicKey.cpp

@@ -3,7 +3,6 @@
 #include <xrpl/basics/contract.h>
 #include <xrpl/basics/strHex.h>
 #include <xrpl/protocol/KeyType.h>
-#include <xrpl/protocol/Protocol.h>
 #include <xrpl/protocol/PublicKey.h>
 #include <xrpl/protocol/UintTypes.h>
 #include <xrpl/protocol/detail/secp256k1.h>
@@ -209,7 +208,7 @@ publicKeyType(Slice const& slice)
         if (slice[0] == 0xED)
             return KeyType::ed25519;
 
-        if (slice[0] == ecCompressedPrefixEvenY || slice[0] == ecCompressedPrefixOddY)
+        if (slice[0] == 0x02 || slice[0] == 0x03)
             return KeyType::secp256k1;
     }
 

src/libxrpl/protocol/STTx.cpp

@@ -73,7 +73,6 @@ STTx::STTx(STObject&& object) : STObject(std::move(object))
     tx_type_ = safe_cast<TxType>(getFieldU16(sfTransactionType));
     applyTemplate(getTxFormat(tx_type_)->getSOTemplate());  //  may throw
     tid_ = getHash(HashPrefix::transactionID);
-    buildBatchTxnIds();
 }
 
 STTx::STTx(SerialIter& sit) : STObject(sfTransaction)
@@ -90,7 +89,6 @@ STTx::STTx(SerialIter& sit) : STObject(sfTransaction)
 
     applyTemplate(getTxFormat(tx_type_)->getSOTemplate());  // May throw
     tid_ = getHash(HashPrefix::transactionID);
-    buildBatchTxnIds();
 }
 
 STTx::STTx(TxType type, std::function<void(STObject&)> assembler) : STObject(sfTransaction)
@@ -108,7 +106,6 @@ STTx::STTx(TxType type, std::function<void(STObject&)> assembler) : STObject(sfT
         LogicError("Transaction type was mutated during assembly");
 
     tid_ = getHash(HashPrefix::transactionID);
-    buildBatchTxnIds();
 }
 
 STBase*
@@ -283,14 +280,6 @@ STTx::checkSign(Rules const& rules) const
         if (auto const ret = checkSign(rules, counterSig); !ret)
             return Unexpected("Counterparty: " + ret.error());
     }
-
-    if (isFieldPresent(sfSponsorSignature))
-    {
-        auto const sponsorSignatureObj = getFieldObject(sfSponsorSignature);
-        if (auto const ret = checkSign(rules, sponsorSignatureObj); !ret)
-            return Unexpected("Sponsor: " + ret.error());
-    }
-
     return {};
 }
 
@@ -305,8 +294,6 @@ STTx::checkBatchSign(Rules const& rules) const
             JLOG(debugLog().fatal()) << "not a batch transaction";
             return Unexpected("Not a batch transaction.");
         }
-        if (!isFieldPresent(sfBatchSigners))
-            return Unexpected("Missing BatchSigners field.");
         STArray const& signers{getFieldArray(sfBatchSigners)};
         for (auto const& signer : signers)
         {
@@ -321,8 +308,9 @@ STTx::checkBatchSign(Rules const& rules) const
     }
     catch (std::exception const& e)
     {
-        return Unexpected(std::string("Internal batch signature check failure: ") + e.what());
+        JLOG(debugLog().error()) << "Batch signature check failed: " << e.what();
     }
+    return Unexpected("Internal batch signature check failure.");
 }
 
 Json::Value
@@ -444,7 +432,6 @@ STTx::checkBatchSingleSign(STObject const& batchSigner) const
 {
     Serializer msg;
     serializeBatch(msg, getFlags(), getBatchTransactionIDs());
-    finishMultiSigningData(batchSigner.getAccountID(sfAccount), msg);
     return singleSignHelper(batchSigner, msg.slice());
 }
 
@@ -518,7 +505,7 @@ multiSignHelper(
         {
             return Unexpected(
                 std::string("Invalid signature on account ") + toBase58(accountID) +
-                (errorWhat ? ": " + *errorWhat : "") + ".");
+                errorWhat.value_or("") + ".");
         }
     }
     // All signatures verified.
@@ -567,24 +554,41 @@ STTx::checkMultiSign(Rules const& rules, STObject const& sigObject) const
         rules);
 }
 
-void
-STTx::buildBatchTxnIds()
-{
-    if (tx_type_ != ttBATCH || !isFieldPresent(sfRawTransactions))
-        return;
-
-    auto const& raw = getFieldArray(sfRawTransactions);
-    batchTxnIds_.reserve(raw.size());
-    for (STObject const& rb : raw)
-        batchTxnIds_.push_back(rb.getHash(HashPrefix::transactionID));
-}
-
+/**
+ * @brief Retrieves a batch of transaction IDs from the STTx.
+ *
+ * This function returns a vector of transaction IDs by extracting them from
+ * the field array `sfRawTransactions` within the STTx. If the batch
+ * transaction IDs have already been computed and cached in `batchTxnIds_`,
+ * it returns the cached vector. Otherwise, it computes the transaction IDs,
+ * caches them, and then returns the vector.
+ *
+ * @return A vector of `uint256` containing the batch transaction IDs.
+ *
+ * @note The function asserts that the `sfRawTransactions` field array is not
+ * empty and that the size of the computed batch transaction IDs matches the
+ * size of the `sfRawTransactions` field array.
+ */
 std::vector<uint256> const&
 STTx::getBatchTransactionIDs() const
 {
     XRPL_ASSERT(getTxnType() == ttBATCH, "STTx::getBatchTransactionIDs : not a batch transaction");
     XRPL_ASSERT(
-        !batchTxnIds_.empty(), "STTx::getBatchTransactionIDs : batch transaction IDs not built");
+        !getFieldArray(sfRawTransactions).empty(),
+        "STTx::getBatchTransactionIDs : empty raw transactions");
+
+    // The list of inner ids is built once, then reused on subsequent calls.
+    // After the list is built, it must always have the same size as the array
+    // `sfRawTransactions`. The assert below verifies that.
+    if (batchTxnIds_.empty())
+    {
+        for (STObject const& rb : getFieldArray(sfRawTransactions))
+            batchTxnIds_.push_back(rb.getHash(HashPrefix::transactionID));
+    }
+
+    XRPL_ASSERT(
+        batchTxnIds_.size() == getFieldArray(sfRawTransactions).size(),
+        "STTx::getBatchTransactionIDs : batch transaction IDs size mismatch");
     return batchTxnIds_;
 }
 
@@ -752,9 +756,6 @@ isRawTransactionOkay(STObject const& st, std::string& reason)
             }
 
             raw.applyTemplate(getTxFormat(tt)->getSOTemplate());
-
-            if (!passesLocalChecks(raw, reason))
-                return false;
         }
         catch (std::exception const& e)
         {

src/libxrpl/protocol/TER.cpp

@@ -106,8 +106,6 @@ transResults()
         MAKE_ERROR(tecLIMIT_EXCEEDED,                "Limit exceeded."),
         MAKE_ERROR(tecPSEUDO_ACCOUNT,                "This operation is not allowed against a pseudo-account."),
         MAKE_ERROR(tecPRECISION_LOSS,                "The amounts used by the transaction cannot interact."),
-        MAKE_ERROR(tecBAD_PROOF,                     "Proof cannot be verified"),
-        MAKE_ERROR(tecNO_SPONSOR_PERMISSION,         "Sponsor has not authorized this transaction."),
 
         MAKE_ERROR(tefALREADY,                     "The exact transaction was already in this ledger."),
         MAKE_ERROR(tefBAD_ADD_AUTH,                "Not authorized to add account."),
@@ -201,7 +199,6 @@ transResults()
         MAKE_ERROR(temARRAY_TOO_LARGE,           "Malformed: Array is too large."),
         MAKE_ERROR(temBAD_TRANSFER_FEE,          "Malformed: Transfer fee is outside valid range."),
         MAKE_ERROR(temINVALID_INNER_BATCH,       "Malformed: Invalid inner batch transaction."),
-        MAKE_ERROR(temBAD_CIPHERTEXT,            "Malformed: Invalid ciphertext."),
 
         MAKE_ERROR(terRETRY,                  "Retry transaction."),
         MAKE_ERROR(terFUNDS_SPENT,            "DEPRECATED."),
@@ -219,7 +216,6 @@ transResults()
         MAKE_ERROR(terADDRESS_COLLISION,      "Failed to allocate an unique account address."),
         MAKE_ERROR(terNO_DELEGATE_PERMISSION, "Delegated account lacks permission to perform this transaction."),
         MAKE_ERROR(terLOCKED,                 "Fund is locked."),
-        MAKE_ERROR(terNO_SPONSORSHIP,         "No sponsorship found."),
 
         MAKE_ERROR(tesSUCCESS,                "The transaction was applied. Only final in a validated ledger."),
     };

src/libxrpl/protocol/TxFormats.cpp

@@ -28,9 +28,6 @@ TxFormats::getCommonFields()
         {sfSigners, soeOPTIONAL},  // submit_multisigned
         {sfNetworkID, soeOPTIONAL},
         {sfDelegate, soeOPTIONAL},
-        {sfSponsor, soeOPTIONAL},
-        {sfSponsorFlags, soeOPTIONAL},
-        {sfSponsorSignature, soeOPTIONAL},
     };
     return commonFields;
 }

src/libxrpl/tx/Transactor.cpp

@@ -11,7 +11,6 @@
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Protocol.h>
-#include <xrpl/protocol/STAccount.h>
 #include <xrpl/protocol/SystemParameters.h>
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/UintTypes.h>
@@ -148,49 +147,6 @@ Transactor::preflight1(PreflightContext const& ctx, std::uint32_t flagMask)
             return temBAD_SIGNER;
     }
 
-    bool const hasSponsor = ctx.tx.isFieldPresent(sfSponsor);
-    bool const hasSponsorFlags = ctx.tx.isFieldPresent(sfSponsorFlags);
-    bool const hasSponsorSig = ctx.tx.isFieldPresent(sfSponsorSignature);
-
-    if ((hasSponsor || hasSponsorFlags || hasSponsorSig) && !ctx.rules.enabled(featureSponsor))
-        return temDISABLED;
-
-    if (hasSponsorFlags &&
-        ctx.tx.getFieldU32(sfSponsorFlags) & ~(spfSponsorFee | spfSponsorReserve))
-    {
-        JLOG(ctx.j.debug()) << "preflight1: invalid sponsor flags";
-        return temINVALID_FLAG;
-    }
-
-    if (!hasSponsor)
-    {
-        if (hasSponsorFlags)
-        {
-            JLOG(ctx.j.debug()) << "preflight1: sponsor flags without sponsor definition";
-            return temINVALID_FLAG;
-        }
-
-        if (hasSponsorSig)
-        {
-            JLOG(ctx.j.debug()) << "preflight1: sponsor signature without sponsor definition";
-            return temMALFORMED;
-        }
-    }
-    else if (hasSponsorFlags)
-    {
-        auto const sponsorFlags = ctx.tx.getFieldU32(sfSponsorFlags);
-        if ((sponsorFlags & ~(spfSponsorFee | spfSponsorReserve)) || sponsorFlags == 0)
-        {
-            JLOG(ctx.j.debug()) << "preflight1: invalid sponsor flags";
-            return temINVALID_FLAG;
-        }
-    }
-    else
-    {
-        JLOG(ctx.j.debug()) << "preflight1: no sponsor flags";
-        return temINVALID_FLAG;
-    }
-
     if (auto const ret = preflight0(ctx, flagMask))
         return ret;
 
@@ -221,23 +177,13 @@ Transactor::preflight1(PreflightContext const& ctx, std::uint32_t flagMask)
     if (ctx.tx.getSeqProxy().isTicket() && ctx.tx.isFieldPresent(sfAccountTxnID))
         return temINVALID;
 
-    if (ctx.tx.isFlag(tfInnerBatchTxn) && !ctx.rules.enabled(featureBatchV1_1))
+    if (ctx.tx.isFlag(tfInnerBatchTxn) && !ctx.rules.enabled(featureBatch))
         return temINVALID_FLAG;
 
-    // Reject if the inner batch flag and parentBatchId are inconsistent.
-    // A standalone tx with tfInnerBatchTxn but no parentBatchId is an
-    // attack attempt. A tx with parentBatchId but without tfInnerBatchTxn
-    // is a programming error.
-    if (ctx.tx.isFlag(tfInnerBatchTxn) != ctx.parentBatchId.has_value())
-        return temINVALID_INNER_BATCH;
-
-    // Sponsor checks
-    if (hasSponsor && ctx.tx.getAccountID(sfSponsor) == id)
-    {
-        JLOG(ctx.j.debug()) << "preflight1: Sponsor account cannot be the "
-                               "same as the transaction originator";
-        return temMALFORMED;
-    }
+    XRPL_ASSERT(
+        ctx.tx.isFlag(tfInnerBatchTxn) == ctx.parentBatchId.has_value() ||
+            !ctx.rules.enabled(featureBatch),
+        "Inner batch transaction must have a parent batch ID.");
 
     return tesSUCCESS;
 }
@@ -253,18 +199,15 @@ Transactor::preflight2(PreflightContext const& ctx)
         return *ret;
     }
 
-    // Skip signature check on batch inner transactions, but only if
-    // this tx was actually submitted through the batch apply path
-    // (parentBatchId is set). Without this check, a standalone tx
-    // with tfInnerBatchTxn could bypass signature verification.
-    if (ctx.tx.isFlag(tfInnerBatchTxn))
-    {
-        if (!ctx.rules.enabled(featureBatchV1_1))
-            return temINVALID_FLAG;
-        if (!ctx.parentBatchId.has_value())
-            return temINVALID_INNER_BATCH;
+    // It should be impossible for the InnerBatchTxn flag to be set without
+    // featureBatch being enabled
+    XRPL_ASSERT_PARTS(
+        !ctx.tx.isFlag(tfInnerBatchTxn) || ctx.rules.enabled(featureBatch),
+        "xrpl::Transactor::preflight2",
+        "InnerBatch flag only set if feature enabled");
+    // Skip signature check on batch inner transactions
+    if (ctx.tx.isFlag(tfInnerBatchTxn) && ctx.rules.enabled(featureBatch))
         return tesSUCCESS;
-    }
     // Do not add any checks after this point that are relevant for
     // batch inner transactions. They will be skipped.
 
@@ -313,62 +256,19 @@ Transactor::preflightSigValidated(PreflightContext const& ctx)
 }
 
 NotTEC
-Transactor::checkPermissionImpl(
-    ReadView const& view,
-    STTx const& tx,
-    std::unordered_set<GranularPermissionType>& heldGranularPermissions)
+Transactor::checkPermission(ReadView const& view, STTx const& tx)
 {
     auto const delegate = tx[~sfDelegate];
     if (!delegate)
         return tesSUCCESS;
 
-    auto const sle = view.read(keylet::delegate(tx[sfAccount], *delegate));
+    auto const delegateKey = keylet::delegate(tx[sfAccount], *delegate);
+    auto const sle = view.read(delegateKey);
+
     if (!sle)
         return terNO_DELEGATE_PERMISSION;
 
-    if (isTesSuccess(checkTxPermission(sle, tx)))
-        return tesSUCCESS;
-
-    if (!Permission::getInstance().hasGranularPermissions(tx.getTxnType()))
-        return terNO_DELEGATE_PERMISSION;
-
-    heldGranularPermissions = getGranularPermission(sle, tx.getTxnType());
-    if (heldGranularPermissions.empty())
-        return terNO_DELEGATE_PERMISSION;
-
-    if (!Permission::getInstance().checkGranularSandbox(tx, heldGranularPermissions))
-        return terNO_DELEGATE_PERMISSION;
-
-    return tesSUCCESS;
-}
-
-NotTEC
-Transactor::checkSponsor(ReadView const& view, STTx const& tx)
-{
-    if (!tx.isFieldPresent(sfSponsor))
-        return tesSUCCESS;
-
-    auto const hasSponsorSignature = tx.isFieldPresent(sfSponsorSignature);
-
-    if (hasSponsorSignature)
-        return tesSUCCESS;
-
-    auto const sponsorSle =
-        view.read(keylet::sponsor(tx.getAccountID(sfSponsor), tx.getAccountID(sfAccount)));
-
-    // sponsorship object missing for pre-funded tx
-    if (!sponsorSle)
-        return terNO_SPONSORSHIP;
-
-    auto const sponsorFlags = tx.getFieldU32(sfSponsorFlags);
-
-    if (sponsorFlags & spfSponsorFee && sponsorSle->isFlag(lsfSponsorshipRequireSignForFee))
-        return terNO_SPONSORSHIP;
-
-    if (sponsorFlags & spfSponsorReserve && sponsorSle->isFlag(lsfSponsorshipRequireSignForReserve))
-        return terNO_SPONSORSHIP;
-
-    return tesSUCCESS;
+    return checkTxPermission(sle, tx);
 }
 
 XRPAmount
@@ -379,7 +279,6 @@ Transactor::calculateBaseFee(ReadView const& view, STTx const& tx)
     // The computation has two parts:
     //  * The base fee, which is the same for most transactions.
     //  * The additional cost of each multisignature on the transaction.
-    //  * The additional cost of each multisignature on the sponsor.
     XRPAmount const baseFee = view.fees().base;
 
     // Each signer adds one more baseFee to the minimum required fee
@@ -387,15 +286,7 @@ Transactor::calculateBaseFee(ReadView const& view, STTx const& tx)
     std::size_t const signerCount =
         tx.isFieldPresent(sfSigners) ? tx.getFieldArray(sfSigners).size() : 0;
 
-    std::size_t sponsorSignerCount = 0;
-    if (tx.isFieldPresent(sfSponsorSignature))
-    {
-        auto const sponsorObj = tx.getFieldObject(sfSponsorSignature);
-        sponsorSignerCount +=
-            sponsorObj.isFieldPresent(sfSigners) ? sponsorObj.getFieldArray(sfSigners).size() : 0;
-    }
-
-    return baseFee + ((signerCount + sponsorSignerCount) * baseFee);
+    return baseFee + (signerCount * baseFee);
 }
 
 // Returns the fee in fee units, not scaled for load.
@@ -465,41 +356,12 @@ Transactor::checkFee(PreclaimContext const& ctx, XRPAmount baseFee)
     if (feePaid == beast::zero)
         return tesSUCCESS;
 
-    auto const payer = getFeePayer(ctx.view, ctx.tx);
-    auto const payerSle = ctx.view.read(payer.entry);
-
-    if (!payerSle)
-    {
-        if (payer.type == FeePayerType::SponsorPreFunded)
-            // Sanity check: already checked in checkSponsor
-            return tefINTERNAL;  // LCOV_EXCL_LINE
-
+    auto const id = ctx.tx.getFeePayer();
+    auto const sle = ctx.view.read(keylet::account(id));
+    if (!sle)
         return terNO_ACCOUNT;
-    }
 
-    XRPAmount maxSpendable = beast::zero;
-
-    if (payer.type == FeePayerType::SponsorPreFunded)
-    {
-        if (payerSle->getType() != ltSPONSORSHIP)
-            return tefINTERNAL;  // LCOV_EXCL_LINE
-
-        if (payerSle->isFieldPresent(payer.balanceField))
-            maxSpendable = payerSle->getFieldAmount(payer.balanceField).xrp();
-
-        if (payerSle->isFieldPresent(sfMaxFee))
-        {
-            auto const cap = payerSle->getFieldAmount(sfMaxFee).xrp();
-            maxSpendable = std::min(maxSpendable, cap);
-        }
-    }
-    else
-    {
-        if (payerSle->getType() != ltACCOUNT_ROOT)
-            return tefINTERNAL;  // LCOV_EXCL_LINE
-
-        maxSpendable = payerSle->getFieldAmount(payer.balanceField).xrp();
-    }
+    auto const balance = (*sle)[sfBalance].xrp();
 
     // NOTE: Because preclaim evaluates against a static readview, it
     // does not reflect fee deductions from other transactions paid by
@@ -508,12 +370,12 @@ Transactor::checkFee(PreclaimContext const& ctx, XRPAmount baseFee)
     // transactions, this check may pass optimistically.
     // The fee shortfall will be handled by the Transactor::reset mechanism,
     // which caps the fee to the remaining actual balance.
-    if (maxSpendable < feePaid)
+    if (balance < feePaid)
     {
-        JLOG(ctx.j.trace()) << "Insufficient balance:" << " balance=" << to_string(maxSpendable)
+        JLOG(ctx.j.trace()) << "Insufficient balance:" << " balance=" << to_string(balance)
                             << " paid=" << to_string(feePaid);
 
-        if ((maxSpendable > beast::zero) && !ctx.view.open())
+        if ((balance > beast::zero) && !ctx.view.open())
         {
             // Closed ledger, non-zero balance, less than fee
             return tecINSUFF_FEE;
@@ -530,23 +392,16 @@ Transactor::payFee()
 {
     auto const feePaid = ctx_.tx[sfFee].xrp();
 
-    auto const payer = getFeePayer(view(), ctx_.tx);
-    auto const sle = view().peek(payer.entry);
-
-    JLOG(j_.trace()) << "Fee payer: " + to_string(payer.entry.key);
-
+    auto const feePayer = ctx_.tx.getFeePayer();
+    auto const sle = view().peek(keylet::account(feePayer));
     if (!sle)
         return tefINTERNAL;  // LCOV_EXCL_LINE
 
-    auto const feeAmountAfter = sle->getFieldAmount(payer.balanceField) - feePaid;
-
-    if (feeAmountAfter == beast::zero && payer.balanceField == sfFeeAmount)
-        // Because ltSponsorship.sfFeeAmount is soeOptional
-        sle->makeFieldAbsent(payer.balanceField);
-    else
-        sle->setFieldAmount(payer.balanceField, feeAmountAfter);
-
-    view().update(sle);
+    // Deduct the fee, so it's not available during the transaction.
+    // Will only write the account back if the transaction succeeds.
+    sle->setFieldAmount(sfBalance, sle->getFieldAmount(sfBalance) - feePaid);
+    if (feePayer != account_)
+        view().update(sle);  // done in `apply()` for the account
 
     // VFALCO Should we call view().rawDestroyXRP() here as well?
     return tesSUCCESS;
@@ -720,8 +575,7 @@ Transactor::ticketDelete(
     }
 
     // Update the Ticket owner's reserve.
-    auto const sponsor = getLedgerEntryReserveSponsor(view, sleTicket);
-    adjustOwnerCount(view, sleAccount, sponsor, -1, j);
+    adjustOwnerCount(view, sleAccount, -1, j);
 
     // Remove Ticket from ledger.
     view.erase(sleTicket);
@@ -794,7 +648,7 @@ Transactor::checkSign(
 
     auto const pkSigner = sigObject.getFieldVL(sfSigningPubKey);
     // Ignore signature check on batch inner transactions
-    if (parentBatchId && view.rules().enabled(featureBatchV1_1))
+    if (parentBatchId && view.rules().enabled(featureBatch))
     {
         // Defensive Check: These values are also checked in Batch::preflight
         if (sigObject.isFieldPresent(sfTxnSignature) || !pkSigner.empty() ||
@@ -812,22 +666,6 @@ Transactor::checkSign(
         return tesSUCCESS;
     }
 
-    if (sigObject.isFieldPresent(sfSponsorSignature))
-    {
-        // Co-signed sponsorship
-
-        // Sanity check: already checked in preflight1
-        if (!sigObject.isFieldPresent(sfSponsor))
-            return tefINTERNAL;  // LCOV_EXCL_LINE
-
-        auto const sponsorAccountID = sigObject.getAccountID(sfSponsor);
-        auto const sponsorSignature = sigObject.getFieldObject(sfSponsorSignature);
-        if (auto const ret =
-                checkSign(view, flags, std::nullopt, sponsorAccountID, sponsorSignature, j);
-            !isTesSuccess(ret))
-            return ret;
-    }
-
     // If the pk is empty and not simulate or simulate and signers,
     // then we must be multi-signing.
     if (sigObject.isFieldPresent(sfSigners))
@@ -861,6 +699,50 @@ Transactor::checkSign(PreclaimContext const& ctx)
     return checkSign(ctx.view, ctx.flags, ctx.parentBatchId, idAccount, ctx.tx, ctx.j);
 }
 
+NotTEC
+Transactor::checkBatchSign(PreclaimContext const& ctx)
+{
+    NotTEC ret = tesSUCCESS;
+    STArray const& signers{ctx.tx.getFieldArray(sfBatchSigners)};
+    for (auto const& signer : signers)
+    {
+        auto const idAccount = signer.getAccountID(sfAccount);
+
+        Blob const& pkSigner = signer.getFieldVL(sfSigningPubKey);
+        if (pkSigner.empty())
+        {
+            if (ret = checkMultiSign(ctx.view, ctx.flags, idAccount, signer, ctx.j);
+                !isTesSuccess(ret))
+                return ret;
+        }
+        else
+        {
+            // LCOV_EXCL_START
+            if (!publicKeyType(makeSlice(pkSigner)))
+                return tefBAD_AUTH;
+            // LCOV_EXCL_STOP
+
+            auto const idSigner = calcAccountID(PublicKey(makeSlice(pkSigner)));
+            auto const sleAccount = ctx.view.read(keylet::account(idAccount));
+
+            // A batch can include transactions from an un-created account ONLY
+            // when the account master key is the signer
+            if (!sleAccount)
+            {
+                if (idAccount != idSigner)
+                    return tefBAD_AUTH;
+
+                return tesSUCCESS;
+            }
+
+            if (ret = checkSingleSign(ctx.view, idSigner, idAccount, sleAccount, ctx.j);
+                !isTesSuccess(ret))
+                return ret;
+        }
+    }
+    return ret;
+}
+
 NotTEC
 Transactor::checkSingleSign(
     ReadView const& view,
@@ -1161,17 +1043,15 @@ Transactor::reset(XRPAmount fee)
     if (!txnAcct)
         return {tefINTERNAL, beast::zero};
 
-    auto const payer = getFeePayer(view(), ctx_.tx);
-    auto const payerSle = view().peek(payer.entry);
-
+    auto const payerSle = view().peek(keylet::account(ctx_.tx.getFeePayer()));
     if (!payerSle)
         return {tefINTERNAL, beast::zero};  // LCOV_EXCL_LINE
 
-    auto const balance = payerSle->getFieldAmount(payer.balanceField).xrp();
+    auto const balance = payerSle->getFieldAmount(sfBalance).xrp();
 
     // balance should have already been checked in checkFee / preFlight.
     XRPL_ASSERT(
-        (fee == beast::zero || balance != beast::zero) && (!view().open() || balance >= fee),
+        balance != beast::zero && (!view().open() || balance >= fee),
         "xrpl::Transactor::reset : valid balance");
 
     // We retry/reject the transaction if the account balance is zero or
@@ -1186,13 +1066,7 @@ Transactor::reset(XRPAmount fee)
     // If for some reason we are unable to consume the ticket or sequence
     // then the ledger is corrupted.  Rather than make things worse we
     // reject the transaction.
-    auto const feeAmountAfter = balance - fee;
-    if (feeAmountAfter == beast::zero && payer.balanceField == sfFeeAmount)
-        // Because ltSponsorship.sfFeeAmount is soeOptional
-        payerSle->makeFieldAbsent(payer.balanceField);
-    else
-        payerSle->setFieldAmount(payer.balanceField, feeAmountAfter);
-
+    payerSle->setFieldAmount(sfBalance, balance - fee);
     TER const ter{consumeSeqProxy(txnAcct)};
     XRPL_ASSERT(isTesSuccess(ter), "xrpl::Transactor::reset : result is tesSUCCESS");
 
@@ -1206,33 +1080,6 @@ Transactor::reset(XRPAmount fee)
     return {ter, fee};
 }
 
-FeePayer
-Transactor::getFeePayer(ReadView const& view, STTx const& tx)
-{
-    if (tx.isFieldPresent(sfSponsor) && (tx.getFieldU32(sfSponsorFlags) & spfSponsorFee))
-    {
-        auto const sponsorAccountID = tx.getAccountID(sfSponsor);
-        auto const sponseeAccountID = tx.getAccountID(sfAccount);
-        auto const hasSponsorSignature = tx.isFieldPresent(sfSponsorSignature);
-        auto const sponsorshipKeylet = keylet::sponsor(sponsorAccountID, sponseeAccountID);
-
-        // if pre-funded sponsorship exists, prefer it
-        if (hasSponsorSignature && !view.exists(sponsorshipKeylet))
-            // co-signed
-            return FeePayer{
-                keylet::account(sponsorAccountID), sfBalance, FeePayerType::SponsorCoSigned};
-
-        // pre funded
-        return FeePayer{sponsorshipKeylet, sfFeeAmount, FeePayerType::SponsorPreFunded};
-    }
-
-    auto const payerAccountKeylet = keylet::account(tx.getFeePayer());
-    auto const payerType =
-        tx.isFieldPresent(sfDelegate) ? FeePayerType::Delegate : FeePayerType::Account;
-
-    return FeePayer{payerAccountKeylet, sfBalance, payerType};
-}
-
 // The sole purpose of this function is to provide a convenient, named
 // location to set a breakpoint, to be used when replaying transactions.
 void

src/libxrpl/tx/apply.cpp

@@ -24,12 +24,29 @@ checkValidity(HashRouter& router, STTx const& tx, Rules const& rules)
     auto const flags = router.getFlags(id);
 
     // Ignore signature check on batch inner transactions
-    if (tx.isFlag(tfInnerBatchTxn) && rules.enabled(featureBatchV1_1))
+    if (tx.isFlag(tfInnerBatchTxn) && rules.enabled(featureBatch))
     {
         // Defensive Check: These values are also checked in Batch::preflight
         if (tx.isFieldPresent(sfTxnSignature) || !tx.getSigningPubKey().empty() ||
             tx.isFieldPresent(sfSigners))
             return {Validity::SigBad, "Malformed: Invalid inner batch transaction."};
+
+        // This block should probably have never been included in the
+        // original `Batch` implementation. An inner transaction never
+        // has a valid signature.
+        bool const neverValid = rules.enabled(fixBatchInnerSigs);
+        if (!neverValid)
+        {
+            std::string reason;
+            if (!passesLocalChecks(tx, reason))
+            {
+                router.setFlags(id, SF_LOCALBAD);
+                return {Validity::SigGoodOnly, reason};
+            }
+
+            router.setFlags(id, SF_SIGGOOD);
+            return {Validity::Valid, ""};
+        }
     }
 
     if (any(flags & SF_SIGBAD))

src/libxrpl/tx/applySteps.cpp

@@ -174,10 +174,7 @@ invoke_preclaim(PreclaimContext const& ctx)
                         if (NotTEC const result = T::checkPriorTxAndLastLedger(ctx))
                             return result;
 
-                        if (NotTEC const result = T::checkSponsor(ctx.view, ctx.tx))
-                            return result;
-
-                        if (NotTEC const result = Transactor::checkPermission<T>(ctx.view, ctx.tx))
+                        if (NotTEC const result = T::checkPermission(ctx.view, ctx.tx))
                             return result;
 
                         if (NotTEC const result = T::checkSign(ctx))

src/libxrpl/tx/invariants/InvariantCheck.cpp

@@ -117,10 +117,6 @@ XRPNotCreated::visitEntry(
                 if (isXRP((*before)[sfAmount]))
                     drops_ -= (*before)[sfAmount].xrp().drops();
                 break;
-            case ltSPONSORSHIP:
-                if (before->isFieldPresent(sfFeeAmount))
-                    drops_ -= (*before)[sfFeeAmount].xrp().drops();
-                break;
             default:
                 break;
         }
@@ -141,10 +137,6 @@ XRPNotCreated::visitEntry(
                 if (!isDelete && isXRP((*after)[sfAmount]))
                     drops_ += (*after)[sfAmount].xrp().drops();
                 break;
-            case ltSPONSORSHIP:
-                if (!isDelete && after->isFieldPresent(sfFeeAmount))
-                    drops_ += (*after)[sfFeeAmount].xrp().drops();
-                break;
             default:
                 break;
         }
@@ -503,20 +495,6 @@ AccountRootsDeletedClean::finalize(
             if (enforce)
                 return false;
         }
-        // An account should not be deleted with sponsorship fields
-        if (after->isFieldPresent(sfSponsoredOwnerCount) ||
-            after->isFieldPresent(sfSponsoringOwnerCount) ||
-            after->isFieldPresent(sfSponsoringAccountCount) || after->isFieldPresent(sfSponsor))
-        {
-            JLOG(j.fatal()) << "Invariant failed: account deletion left "
-                               "behind a sponsorship field";
-            XRPL_ASSERT(
-                enforce,
-                "xrpl::AccountRootsDeletedClean::finalize : "
-                "deleted account has no sponsorship fields");
-            if (enforce)
-                return false;
-        }
         // Simple types
         for (auto const& [keyletfunc, _1, _2] : directAccountKeylets)
         {
@@ -875,10 +853,8 @@ ValidPseudoAccounts::visitEntry(
             // 1. Exactly one of the pseudo-account fields is set.
             // 2. The sequence number is not changed.
             // 3. The lsfDisableMaster, lsfDefaultRipple, and lsfDepositAuth
-            //    flags are set.
+            // flags are set.
             // 4. The RegularKey is not set.
-            // 5. The SponsoredOwnerCount, SponsoringOwnerCount, SponsoringAccountCount, Sponsor
-            //    fields are not set.
             {
                 std::vector<SField const*> const& fields = getPseudoAccountFields();
 
@@ -905,12 +881,6 @@ ValidPseudoAccounts::visitEntry(
             {
                 errors_.emplace_back("pseudo-account has a regular key");
             }
-            if (after->isFieldPresent(sfSponsoredOwnerCount) ||
-                after->isFieldPresent(sfSponsoringOwnerCount) || after->isFieldPresent(sfSponsor) ||
-                after->isFieldPresent(sfSponsoringAccountCount))
-            {
-                errors_.emplace_back("pseudo-account has a sponsorship field");
-            }
         }
     }
 }

src/libxrpl/tx/invariants/MPTInvariant.cpp

@@ -9,19 +9,8 @@
 #include <xrpl/protocol/TxFormats.h>
 #include <xrpl/tx/invariants/InvariantCheckPrivilege.h>
 
-#include <algorithm>
-#include <array>
-
 namespace xrpl {
 
-static constexpr auto confidentialMPTTxTypes = std::to_array<TxType>({
-    ttCONFIDENTIAL_MPT_SEND,
-    ttCONFIDENTIAL_MPT_CONVERT,
-    ttCONFIDENTIAL_MPT_CONVERT_BACK,
-    ttCONFIDENTIAL_MPT_MERGE_INBOX,
-    ttCONFIDENTIAL_MPT_CLAWBACK,
-});
-
 void
 ValidMPTIssuance::visitEntry(
     bool isDelete,
@@ -352,14 +341,6 @@ ValidMPTPayment::finalize(
 {
     if (isTesSuccess(result))
     {
-        // Confidential transactions are validated by ValidConfidentialMPToken.
-        // They modify encrypted fields and sfConfidentialOutstandingAmount
-        // rather than sfMPTAmount/sfOutstandingAmount in the standard way,
-        // so ValidMPTPayment's accounting does not apply to them.
-        if (std::ranges::find(confidentialMPTTxTypes, tx.getTxnType()) !=
-            confidentialMPTTxTypes.end())
-            return true;
-
         bool const enforce = view.rules().enabled(featureMPTokensV2);
         if (overflow_)
         {
@@ -388,324 +369,4 @@ ValidMPTPayment::finalize(
     return true;
 }
 
-void
-ValidConfidentialMPToken::visitEntry(
-    bool isDelete,
-    std::shared_ptr<SLE const> const& before,
-    std::shared_ptr<SLE const> const& after)
-{
-    // Helper to get MPToken Issuance ID safely
-    auto const getMptID = [](std::shared_ptr<SLE const> const& sle) -> uint192 {
-        if (!sle)
-            return beast::zero;
-        if (sle->getType() == ltMPTOKEN)
-            return sle->getFieldH192(sfMPTokenIssuanceID);
-        if (sle->getType() == ltMPTOKEN_ISSUANCE)
-            return makeMptID(sle->getFieldU32(sfSequence), sle->getAccountID(sfIssuer));
-        return beast::zero;
-    };
-
-    if (before && before->getType() == ltMPTOKEN)
-    {
-        uint192 const id = getMptID(before);
-        changes_[id].mptAmountDelta -= before->getFieldU64(sfMPTAmount);
-
-        // Cannot delete MPToken with non-zero confidential state or non-zero public amount
-        if (isDelete)
-        {
-            bool const hasPublicBalance = before->getFieldU64(sfMPTAmount) > 0;
-            bool const hasEncryptedFields = before->isFieldPresent(sfConfidentialBalanceSpending) ||
-                before->isFieldPresent(sfConfidentialBalanceInbox) ||
-                before->isFieldPresent(sfIssuerEncryptedBalance);
-
-            if (hasPublicBalance || hasEncryptedFields)
-                changes_[id].deletedWithEncrypted = true;
-        }
-    }
-
-    if (after && after->getType() == ltMPTOKEN)
-    {
-        uint192 const id = getMptID(after);
-        changes_[id].mptAmountDelta += after->getFieldU64(sfMPTAmount);
-
-        // Encrypted field existence consistency
-        bool const hasIssuerBalance = after->isFieldPresent(sfIssuerEncryptedBalance);
-        bool const hasHolderInbox = after->isFieldPresent(sfConfidentialBalanceInbox);
-        bool const hasHolderSpending = after->isFieldPresent(sfConfidentialBalanceSpending);
-
-        bool const hasAnyHolder = hasHolderInbox || hasHolderSpending;
-
-        if (hasAnyHolder != hasIssuerBalance)
-        {
-            changes_[id].badConsistency = true;
-        }
-
-        // Privacy flag consistency
-        bool const hasEncrypted = hasAnyHolder || hasIssuerBalance;
-        if (hasEncrypted)
-            changes_[id].requiresPrivacyFlag = true;
-    }
-
-    if (before && before->getType() == ltMPTOKEN_ISSUANCE)
-    {
-        uint192 const id = getMptID(before);
-        if (before->isFieldPresent(sfConfidentialOutstandingAmount))
-            changes_[id].coaDelta -= before->getFieldU64(sfConfidentialOutstandingAmount);
-        changes_[id].outstandingDelta -= before->getFieldU64(sfOutstandingAmount);
-    }
-
-    if (after && after->getType() == ltMPTOKEN_ISSUANCE)
-    {
-        uint192 const id = getMptID(after);
-        auto& change = changes_[id];
-
-        bool const hasCOA = after->isFieldPresent(sfConfidentialOutstandingAmount);
-        std::uint64_t const coa = (*after)[~sfConfidentialOutstandingAmount].value_or(0);
-        std::uint64_t const oa = after->getFieldU64(sfOutstandingAmount);
-
-        if (hasCOA)
-            change.coaDelta += coa;
-
-        change.outstandingDelta += oa;
-        change.issuance = after;
-
-        // COA <= OutstandingAmount
-        if (coa > oa)
-            change.badCOA = true;
-    }
-
-    if (before && after && before->getType() == ltMPTOKEN && after->getType() == ltMPTOKEN)
-    {
-        uint192 const id = getMptID(after);
-
-        // sfConfidentialBalanceVersion must change when spending changes
-        auto const spendingBefore = (*before)[~sfConfidentialBalanceSpending];
-        auto const spendingAfter = (*after)[~sfConfidentialBalanceSpending];
-        auto const versionBefore = (*before)[~sfConfidentialBalanceVersion];
-        auto const versionAfter = (*after)[~sfConfidentialBalanceVersion];
-
-        if (spendingBefore.has_value() && spendingBefore != spendingAfter)
-        {
-            if (versionBefore == versionAfter)
-            {
-                changes_[id].badVersion = true;
-            }
-        }
-    }
-}
-
-bool
-ValidConfidentialMPToken::finalize(
-    STTx const& tx,
-    TER const result,
-    XRPAmount const,
-    ReadView const& view,
-    beast::Journal const& j)
-{
-    if (result != tesSUCCESS)
-        return true;
-
-    for (auto const& [id, checks] : changes_)
-    {
-        // Find the MPTokenIssuance
-        auto const issuance = [&]() -> std::shared_ptr<SLE const> {
-            if (checks.issuance)
-                return checks.issuance;
-            return view.read(keylet::mptIssuance(id));
-        }();
-
-        // Skip all invariance checks if issuance doesn't exist because that means the MPT has been
-        // deleted
-        if (!issuance)
-            continue;
-
-        // Cannot delete MPToken with non-zero confidential state
-        if (checks.deletedWithEncrypted)
-        {
-            if ((*issuance)[~sfConfidentialOutstandingAmount].value_or(0) > 0)
-            {
-                JLOG(j.fatal())
-                    << "Invariant failed: MPToken deleted with encrypted fields while COA > 0";
-                return false;
-            }
-        }
-
-        // Encrypted field existence consistency
-        if (checks.badConsistency)
-        {
-            JLOG(j.fatal()) << "Invariant failed: MPToken encrypted field "
-                               "existence inconsistency";
-            return false;
-        }
-
-        // COA <= OutstandingAmount
-        if (checks.badCOA)
-        {
-            JLOG(j.fatal()) << "Invariant failed: Confidential outstanding amount "
-                               "exceeds total outstanding amount";
-            return false;
-        }
-
-        // Privacy flag consistency
-        if (checks.requiresPrivacyFlag)
-        {
-            if (!issuance->isFlag(lsfMPTCanConfidentialAmount))
-            {
-                JLOG(j.fatal()) << "Invariant failed: MPToken has encrypted "
-                                   "fields but Issuance does not have "
-                                   "lsfMPTCanConfidentialAmount set";
-                return false;
-            }
-        }
-
-        // We only enforce this when Confidential Outstanding Amount changes (Convert, ConvertBack,
-        // ConfidentialClawback). This avoids falsely failing on Escrow or AMM operations that lock
-        // public tokens outside of ltMPTOKEN. Convert / ConvertBack:
-        // - COA and MPTAmount must have opposite deltas, which cancel each other out to zero.
-        // - OA remains unchanged.
-        // - Therefore, the net delta on both sides of the equation is zero.
-        //
-        // Clawback:
-        // - MPTAmount remains unchanged.
-        // - COA and OA must have identical deltas (mirrored on each side).
-        // - The equation remains balanced as both sides have equal offsets.
-        if (checks.coaDelta != 0)
-        {
-            if (checks.mptAmountDelta + checks.coaDelta != checks.outstandingDelta)
-            {
-                JLOG(j.fatal()) << "Invariant failed: Token conservation "
-                                   "violation for MPT "
-                                << to_string(id);
-                return false;
-            }
-        }
-
-        if (checks.badVersion)
-        {
-            JLOG(j.fatal())
-                << "Invariant failed: MPToken sfConfidentialBalanceVersion not updated when "
-                   "sfConfidentialBalanceSpending changed";
-            return false;
-        }
-    }
-
-    return true;
-}
-
-void
-ValidMPTTransfer::visitEntry(
-    bool,
-    std::shared_ptr<SLE const> const& before,
-    std::shared_ptr<SLE const> const& after)
-{
-    // Record the before/after MPTAmount for each (issuanceID, account) pair
-    // so finalize() can determine whether a transfer actually occurred.
-    auto update = [&](SLE const& sle, bool isBefore) {
-        if (sle.getType() == ltMPTOKEN)
-        {
-            auto const issuanceID = sle[sfMPTokenIssuanceID];
-            auto const account = sle[sfAccount];
-            auto const amount = sle[sfMPTAmount];
-            if (isBefore)
-            {
-                amount_[issuanceID][account].amtBefore = amount;
-            }
-            else
-            {
-                amount_[issuanceID][account].amtAfter = amount;
-            }
-        }
-    };
-
-    if (before)
-        update(*before, true);
-
-    if (after)
-        update(*after, false);
-}
-
-bool
-ValidMPTTransfer::finalize(
-    STTx const& tx,
-    TER const,
-    XRPAmount const,
-    ReadView const& view,
-    beast::Journal const& j)
-{
-    // AMMClawback is called by the issuer, so freeze restrictions do not apply.
-    auto const txnType = tx.getTxnType();
-    if (txnType == ttAMM_CLAWBACK)
-        return true;
-
-    // DEX transactions (AMM[Create,Deposit,Withdraw], cross-currency payments, offer creates) are
-    // subject to the MPTCanTrade flag in addition to the standard transfer rules.
-    // A payment is only DEX if it is a cross-currency payment.
-    auto const isDEX = [&tx, &txnType] {
-        if (txnType == ttPAYMENT)
-        {
-            // A payment is cross-currency (and thus DEX) only if SendMax is present
-            // and its asset differs from the destination asset.
-            auto const amount = tx[sfAmount];
-            return tx[~sfSendMax].value_or(amount).asset() != amount.asset();
-        }
-        return txnType == ttAMM_CREATE || txnType == ttAMM_DEPOSIT || txnType == ttAMM_WITHDRAW ||
-            txnType == ttOFFER_CREATE;
-    }();
-
-    // Only enforce once MPTokensV2 is enabled to preserve consensus with non-V2 nodes.
-    // Log invariant failure error even if MPTokensV2 is disabled.
-    auto const enforce = !view.rules().enabled(featureMPTokensV2);
-
-    for (auto const& [mptID, values] : amount_)
-    {
-        std::uint16_t senders = 0;
-        std::uint16_t receivers = 0;
-        bool frozen = false;
-        auto const sleIssuance = view.read(keylet::mptIssuance(mptID));
-        if (!sleIssuance)
-        {
-            continue;
-        }
-
-        auto const canTransfer = sleIssuance->isFlag(lsfMPTCanTransfer);
-        auto const canTrade = sleIssuance->isFlag(lsfMPTCanTrade);
-
-        for (auto const& [account, value] : values)
-        {
-            // Classify each account as a sender or receiver based on whether their MPTAmount
-            // decreased or increased. Count new MPToken holders (no amtBefore) as receivers.
-            // Skip deleted MPToken holders (amtAfter is nullopt); deletion requires zero balance.
-            if (value.amtAfter.has_value() && value.amtBefore.value_or(0) != *value.amtAfter)
-            {
-                if (!value.amtBefore.has_value() || *value.amtAfter > *value.amtBefore)
-                {
-                    ++receivers;
-                }
-                else
-                {
-                    ++senders;
-                }
-
-                // Check once: if any involved account is frozen, the whole
-                // issuance transfer is considered frozen. Only need to check for
-                // frozen if there is a transfer of funds.
-                if (!frozen && isFrozen(view, account, MPTIssue{mptID}))
-                {
-                    frozen = true;
-                }
-            }
-        }
-        // A transfer between holders has occurred (senders > 0 && receivers > 0).
-        // Fail if the issuance is frozen, does not permit transfers, or — for
-        // DEX transactions — does not permit trading.
-        if ((frozen || !canTransfer || (isDEX && !canTrade)) && senders > 0 && receivers > 0)
-        {
-            JLOG(j.fatal()) << "Invariant failed: invalid MPToken transfer between holders";
-            return enforce;
-        }
-    }
-
-    return true;
-}
-
 }  // namespace xrpl

src/libxrpl/tx/invariants/PermissionedDomainInvariant.cpp

@@ -138,18 +138,6 @@ ValidPermissionedDomain::finalize(
                 }
                 return true;
             }
-            case ttSPONSORSHIP_TRANSFER: {
-                if (sleStatus_.empty())
-                    return true;
-
-                if (sleStatus_[0].isDelete_)
-                {
-                    JLOG(j.fatal()) << "Invariant failed: domain object "
-                                       "deleted by SponsorshipTransfer";
-                    return false;
-                }
-                return true;
-            }
             default: {
                 if (!sleStatus_.empty())
                 {