From 85512541ad78f61555e6f06b8463190a0bbcf908 Mon Sep 17 00:00:00 2001
From: Mayukha Vadari <mvadari@ripple.com>
Date: Thu, 20 Aug 2026 19:25:27 +0000
Subject: [PATCH] refactor: Collapse transactions.macro settings into a
 TxSettings struct (#8001)

Co-authored-by: Timur Yalymov <36795566+tyalymov@users.noreply.github.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Vito Tumas <5780819+Tapanito@users.noreply.github.com>
Co-authored-by: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>
---
 cmake/scripts/codegen/generate_tx_classes.py  |  82 ++-
 include/xrpl/protocol/Permissions.h           |   8 +-
 include/xrpl/protocol/TxSettings.h            |  96 ++++
 .../xrpl/protocol/detail/transactions.macro   | 500 ++++++++----------
 .../protocol_autogen/transactions/AMMBid.h    |   2 +-
 .../transactions/AMMClawback.h                |   2 +-
 .../protocol_autogen/transactions/AMMCreate.h |   2 +-
 .../protocol_autogen/transactions/AMMDelete.h |   2 +-
 .../transactions/AMMDeposit.h                 |   2 +-
 .../protocol_autogen/transactions/AMMVote.h   |   2 +-
 .../transactions/AMMWithdraw.h                |   2 +-
 .../transactions/AccountDelete.h              |   2 +-
 .../transactions/AccountSet.h                 |   2 +-
 .../protocol_autogen/transactions/Batch.h     |   2 +-
 .../transactions/CheckCancel.h                |   2 +-
 .../protocol_autogen/transactions/CheckCash.h |   2 +-
 .../transactions/CheckCreate.h                |   2 +-
 .../protocol_autogen/transactions/Clawback.h  |   2 +-
 .../transactions/ConfidentialMPTClawback.h    |   2 +-
 .../transactions/ConfidentialMPTConvert.h     |   2 +-
 .../transactions/ConfidentialMPTConvertBack.h |   2 +-
 .../transactions/ConfidentialMPTMergeInbox.h  |   2 +-
 .../transactions/ConfidentialMPTSend.h        |   2 +-
 .../transactions/CredentialAccept.h           |   2 +-
 .../transactions/CredentialCreate.h           |   2 +-
 .../transactions/CredentialDelete.h           |   2 +-
 .../protocol_autogen/transactions/DIDDelete.h |   2 +-
 .../protocol_autogen/transactions/DIDSet.h    |   2 +-
 .../transactions/DelegateSet.h                |   2 +-
 .../transactions/DepositPreauth.h             |   2 +-
 .../transactions/EnableAmendment.h            |   2 +-
 .../transactions/EscrowCancel.h               |   2 +-
 .../transactions/EscrowCreate.h               |   2 +-
 .../transactions/EscrowFinish.h               |   2 +-
 .../transactions/LedgerStateFix.h             |   2 +-
 .../transactions/LoanBrokerCoverClawback.h    |   2 +-
 .../transactions/LoanBrokerCoverDeposit.h     |   2 +-
 .../transactions/LoanBrokerCoverWithdraw.h    |   2 +-
 .../transactions/LoanBrokerDelete.h           |   2 +-
 .../transactions/LoanBrokerSet.h              |   2 +-
 .../transactions/LoanDelete.h                 |   2 +-
 .../transactions/LoanManage.h                 |   2 +-
 .../protocol_autogen/transactions/LoanPay.h   |   2 +-
 .../protocol_autogen/transactions/LoanSet.h   |   2 +-
 .../transactions/MPTokenAuthorize.h           |   2 +-
 .../transactions/MPTokenIssuanceCreate.h      |   2 +-
 .../transactions/MPTokenIssuanceDestroy.h     |   2 +-
 .../transactions/MPTokenIssuanceSet.h         |   2 +-
 .../transactions/NFTokenAcceptOffer.h         |   2 +-
 .../transactions/NFTokenBurn.h                |   2 +-
 .../transactions/NFTokenCancelOffer.h         |   2 +-
 .../transactions/NFTokenCreateOffer.h         |   2 +-
 .../transactions/NFTokenMint.h                |   2 +-
 .../transactions/NFTokenModify.h              |   2 +-
 .../transactions/OfferCancel.h                |   2 +-
 .../transactions/OfferCreate.h                |   2 +-
 .../transactions/OracleDelete.h               |   2 +-
 .../protocol_autogen/transactions/OracleSet.h |   2 +-
 .../protocol_autogen/transactions/Payment.h   |   2 +-
 .../transactions/PaymentChannelClaim.h        |   2 +-
 .../transactions/PaymentChannelCreate.h       |   2 +-
 .../transactions/PaymentChannelFund.h         |   2 +-
 .../transactions/PermissionedDomainDelete.h   |   2 +-
 .../transactions/PermissionedDomainSet.h      |   2 +-
 .../protocol_autogen/transactions/SetFee.h    |   2 +-
 .../transactions/SetRegularKey.h              |   2 +-
 .../transactions/SignerListSet.h              |   2 +-
 .../transactions/SponsorshipSet.h             |   2 +-
 .../transactions/SponsorshipTransfer.h        |   2 +-
 .../transactions/TicketCreate.h               |   2 +-
 .../protocol_autogen/transactions/TrustSet.h  |   2 +-
 .../protocol_autogen/transactions/UNLModify.h |   2 +-
 .../transactions/VaultClawback.h              |   2 +-
 .../transactions/VaultCreate.h                |   2 +-
 .../transactions/VaultDelete.h                |   2 +-
 .../transactions/VaultDeposit.h               |   2 +-
 .../protocol_autogen/transactions/VaultSet.h  |   2 +-
 .../transactions/VaultWithdraw.h              |   2 +-
 .../transactions/XChainAccountCreateCommit.h  |   2 +-
 .../XChainAddAccountCreateAttestation.h       |   2 +-
 .../transactions/XChainAddClaimAttestation.h  |   2 +-
 .../transactions/XChainClaim.h                |   2 +-
 .../transactions/XChainCommit.h               |   2 +-
 .../transactions/XChainCreateBridge.h         |   2 +-
 .../transactions/XChainCreateClaimID.h        |   2 +-
 .../transactions/XChainModifyBridge.h         |   2 +-
 .../tx/invariants/InvariantCheckPrivilege.h   |  37 +-
 src/libxrpl/protocol/Permissions.cpp          |  15 +-
 src/libxrpl/protocol/TxFormats.cpp            |   2 +-
 src/libxrpl/tx/invariants/FreezeInvariant.cpp |   3 +-
 src/libxrpl/tx/invariants/InvariantCheck.cpp  |  21 +-
 src/libxrpl/tx/invariants/MPTInvariant.cpp    |  17 +-
 src/libxrpl/tx/invariants/NFTInvariant.cpp    |   2 +-
 src/libxrpl/tx/invariants/VaultInvariant.cpp  |   5 +-
 src/test/app/Delegate_test.cpp                |  14 +-
 95 files changed, 520 insertions(+), 446 deletions(-)
 create mode 100644 include/xrpl/protocol/TxSettings.h

diff --git a/cmake/scripts/codegen/generate_tx_classes.py b/cmake/scripts/codegen/generate_tx_classes.py
index 07baefd8b6..09fb898840 100644
--- a/cmake/scripts/codegen/generate_tx_classes.py
+++ b/cmake/scripts/codegen/generate_tx_classes.py
@@ -8,6 +8,7 @@ Uses pcpp to preprocess the macro file and pyparsing to parse the DSL.
 
 import io
 import argparse
+import re
 from pathlib import Path
 import pyparsing as pp
 
@@ -53,28 +54,89 @@ def create_transaction_parser():
     return macro_parser
 
 
+# Defaults for xrpl::TxSettings members, mirroring
+# include/xrpl/protocol/TxSettings.h. A transaction's settings blob only names
+# the members that differ from these.
+SETTING_DEFAULTS = {
+    "delegable": "Delegation::NotDelegable",
+    "amendment": "uint256{}",
+    "privileges": "Privilege::NoPriv",
+}
+
+
+def parse_settings(settings_str):
+    """Parse a TxSettings blob into a dict, filling in defaults.
+
+    Args:
+        settings_str: A string like '({.delegable = Delegation::NotDelegable,
+                      .privileges = Privilege::CreateAcct})', or '({})'.
+
+    Returns:
+        A dict with a value for every key in SETTING_DEFAULTS.
+    """
+    body = settings_str.strip()
+    if not (body.startswith("(") and body.endswith(")")):
+        raise ValueError(
+            f"Malformed settings blob, expected '({{...}})': {settings_str!r}"
+        )
+    body = body[1:-1].strip()
+    if not (body.startswith("{") and body.endswith("}")):
+        raise ValueError(
+            f"Malformed settings blob, expected '({{...}})': {settings_str!r}"
+        )
+    body = body[1:-1]
+
+    # Strip comments, which may be interleaved with the designated initializers.
+    body = re.sub(r"//[^\n]*", "", body)
+
+    settings = dict(SETTING_DEFAULTS)
+    seen = set()
+    # Each entry runs from '.key =' up to the next '.key =' or the end.
+    for key, value in re.findall(
+        r"\.(\w+)\s*=\s*(.*?)(?=,\s*\.\w+\s*=|,?\s*$)", body, re.S
+    ):
+        if key not in SETTING_DEFAULTS:
+            raise ValueError(f"Unknown TxSettings member '.{key}' in {settings_str!r}")
+        settings[key] = " ".join(value.split()).rstrip(",")
+        seen.add(key)
+
+    # Catch a typo'd or unparsed initializer rather than silently defaulting it.
+    # Every '.member' in the blob must have been consumed above.
+    if len(re.findall(r"\.\w+", body)) != len(seen):
+        raise ValueError(f"Could not parse every setting in {settings_str!r}")
+
+    # A blob with content but no designated initializer is positional, which
+    # would otherwise be read as "all defaults" and silently generate the
+    # wrong output.
+    if body.strip() and not seen:
+        raise ValueError(
+            "TxSettings requires designated initializers (.member = value), "
+            f"got {settings_str!r}"
+        )
+
+    return settings
+
+
 def parse_transaction_args(args_list):
     """Parse the arguments of a TRANSACTION macro call.
 
     Args:
         args_list: A list of parsed arguments from pyparsing, e.g.,
-                   ['ttPAYMENT', '0', 'Payment', 'Delegation::delegable',
-                    'uint256{}', 'createAcct', '({...})']
+                   ['ttPAYMENT', '0', 'Payment',
+                    '({.privileges = Privilege::CreateAcct})', '({...})']
 
     Returns:
         A dict with parsed transaction information.
     """
-    if len(args_list) < 7:
+    if len(args_list) < 5:
         raise ValueError(
-            f"Expected at least 7 parts in TRANSACTION, got {len(args_list)}: {args_list}"
+            f"Expected at least 5 parts in TRANSACTION, got {len(args_list)}: {args_list}"
         )
 
     tag = args_list[0]
     value = args_list[1]
     name = args_list[2]
-    delegable = args_list[3]
-    amendments = args_list[4]
-    privileges = args_list[5]
+    settings = parse_settings(args_list[3])
     fields_str = args_list[-1]
 
     # Parse fields: ({field1, field2, ...})
@@ -84,9 +146,9 @@ def parse_transaction_args(args_list):
         "tag": tag,
         "value": value,
         "name": name,
-        "delegable": delegable,
-        "amendments": amendments,
-        "privileges": privileges,
+        "delegable": settings["delegable"],
+        "amendments": settings["amendment"],
+        "privileges": settings["privileges"],
         "fields": fields,
     }
 
diff --git a/include/xrpl/protocol/Permissions.h b/include/xrpl/protocol/Permissions.h
index 703a0939c9..2a3f561a10 100644
--- a/include/xrpl/protocol/Permissions.h
+++ b/include/xrpl/protocol/Permissions.h
@@ -4,6 +4,7 @@
 #include <xrpl/protocol/Rules.h>
 #include <xrpl/protocol/SOTemplate.h>
 #include <xrpl/protocol/TxFormats.h>
+#include <xrpl/protocol/TxSettings.h>
 
 #include <cstdint>
 #include <functional>
@@ -38,11 +39,6 @@ enum GranularPermissionType : std::uint32_t {
 #pragma pop_macro("GRANULAR_PERMISSION")
 };
 
-// Injected bare enumerators (xrpl::delegable / xrpl::notDelegable) are required by preprocessor
-// tricks in tests and macro-generated code; enum class would break that.
-// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
-enum Delegation { Delegable, NotDelegable };
-
 class Permission
 {
 private:
@@ -65,7 +61,7 @@ private:
     struct TxDelegationEntry
     {
         uint256 amendment;
-        Delegation delegable{NotDelegable};
+        Delegation delegable{Delegation::NotDelegable};
     };
 
     std::unordered_set<TxType> granularTxTypes_;
diff --git a/include/xrpl/protocol/TxSettings.h b/include/xrpl/protocol/TxSettings.h
new file mode 100644
index 0000000000..8ea249856a
--- /dev/null
+++ b/include/xrpl/protocol/TxSettings.h
@@ -0,0 +1,96 @@
+#pragma once
+
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/basics/safe_cast.h>
+
+#include <cstdint>
+#include <type_traits>
+
+namespace xrpl {
+
+enum class Delegation { Delegable, NotDelegable };
+
+/**
+ * Operations a transaction is permitted to perform, as a bitfield.
+ *
+ * These are declared per-transaction in transactions.macro (via
+ * TxSettings::privileges) and enforced in InvariantCheck.cpp.
+ */
+enum class Privilege : std::uint16_t {
+    NoPriv = 0x0000,              // The transaction can not do any of the enumerated operations
+    CreateAcct = 0x0001,          // The transaction can create a new ACCOUNT_ROOT object.
+    CreatePseudoAcct = 0x0002,    // The transaction can create a pseudo account,
+                                  // which implies createAcct
+    MustDeleteAcct = 0x0004,      // The transaction must delete an ACCOUNT_ROOT object
+    MayDeleteAcct = 0x0008,       // The transaction may delete an ACCOUNT_ROOT
+                                  // object, but does not have to
+    OverrideFreeze = 0x0010,      // The transaction can override some freeze rules
+    ChangeNftCounts = 0x0020,     // The transaction can mint or burn an NFT
+    CreateMptIssuance = 0x0040,   // The transaction can create a new MPT issuance
+    DestroyMptIssuance = 0x0080,  // The transaction can destroy an MPT issuance
+    MustAuthorizeMpt = 0x0100,    // The transaction MUST create or delete an MPT
+                                  // object (except by issuer)
+    MayAuthorizeMpt = 0x0200,     // The transaction MAY create or delete an MPT
+                                  // object (except by issuer)
+    MayDeleteMpt = 0x0400,        // The transaction MAY delete an MPT object. May not create.
+    MustModifyVault = 0x0800,     // The transaction must modify, delete or create, a vault
+    MayModifyVault = 0x1000,      // The transaction MAY modify, delete or create, a vault
+    MayCreateMpt = 0x2000,        // The transaction MAY create an MPT object, except for issuer.
+};
+
+// The inner static_cast is not redundant: the underlying type is narrower than
+// `int`, so the operands integer-promote and the result has to be narrowed back.
+// safeCast rejects that narrowing, but every input bit is a Privilege bit by
+// construction, so the result is always representable.
+constexpr Privilege
+operator|(Privilege lhs, Privilege rhs)
+{
+    using Underlying = std::underlying_type_t<Privilege>;
+    return static_cast<Privilege>(
+        static_cast<Underlying>(safeCast<Underlying>(lhs) | safeCast<Underlying>(rhs)));
+}
+
+constexpr Privilege
+operator&(Privilege lhs, Privilege rhs)
+{
+    using Underlying = std::underlying_type_t<Privilege>;
+    return static_cast<Privilege>(
+        static_cast<Underlying>(safeCast<Underlying>(lhs) & safeCast<Underlying>(rhs)));
+}
+
+/**
+ * Per-transaction metadata declared in transactions.macro.
+ *
+ * Every member has a default, so a transaction only needs to name the settings
+ * that differ from the common case. See the documentation at the top of
+ * transactions.macro for the authoring syntax.
+ *
+ * This is deliberately not a constexpr-friendly type: amendment identifiers are
+ * runtime-initialized `extern uint256 const` globals (see Feature.h), so a
+ * TxSettings can only be built at runtime.
+ */
+struct TxSettings
+{
+    /**
+     * Whether an account may delegate this transaction to another account.
+     */
+    Delegation delegable{Delegation::NotDelegable};
+
+    /**
+     * The amendment gating this transaction, or uint256{} if always available.
+     */
+    // The `{}` looks redundant, because BaseUInt's default constructor already
+    // zeroes the value. It is not: without a default member initializer here,
+    // every partial designated initializer in transactions.macro trips the
+    // missing-designated-field-initializers warning, which the build treats as
+    // an error.
+    // NOLINTNEXTLINE(readability-redundant-member-init)
+    uint256 amendment{};
+
+    /**
+     * Operations this transaction is permitted to perform.
+     */
+    Privilege privileges{Privilege::NoPriv};
+};
+
+}  // namespace xrpl
diff --git a/include/xrpl/protocol/detail/transactions.macro b/include/xrpl/protocol/detail/transactions.macro
index 997f368638..dbf9b66ac7 100644
--- a/include/xrpl/protocol/detail/transactions.macro
+++ b/include/xrpl/protocol/detail/transactions.macro
@@ -3,7 +3,7 @@
 #endif
 
 /**
- * TRANSACTION(tag, value, name, delegable, amendments, privileges, fields)
+ * TRANSACTION(tag, value, name, settings, fields)
  *
  * To ease maintenance, you may replace any unneeded values with "..."
  * e.g. #define TRANSACTION(tag, value, name, ...)
@@ -15,9 +15,31 @@
  * #   include <xrpl/tx/transactors/HEADER.h>
  * #endif
  *
- * The `privileges` parameter of the TRANSACTION macro is a bitfield
- * defining which operations the transaction can perform.
- * The values are defined and used in InvariantCheck.cpp
+ * `settings` is a parenthesized brace-init-list for xrpl::TxSettings, declared
+ * in <xrpl/protocol/TxSettings.h>:
+ *
+ *     struct TxSettings
+ *     {
+ *         Delegation delegable{Delegation::NotDelegable};
+ *         uint256 amendment{};
+ *         Privilege privileges{Privilege::NoPriv};
+ *     };
+ *
+ * Name only the settings that differ from those defaults, in declaration
+ * order; use `({})` when none of them do:
+ *
+ *     ({.delegable = Delegation::Delegable, .amendment = featureFoo})
+ *
+ * You must use designated initializers, as shown above. Positional
+ * initialization such as `({Delegation::NotDelegable})` is not supported,
+ * because the code generator reads these settings by member name.
+ *
+ * The `privileges` setting is a bitfield defining which operations the
+ * transaction can perform. The values are defined in TxSettings.h and
+ * enforced in InvariantCheck.cpp.
+ *
+ * A consumer that only needs some of the settings can unwrap the blob with
+ * `#define UNWRAP(...) __VA_ARGS__` and write `TxSettings UNWRAP settings`.
  */
 
 /** This transaction type executes a payment. */
@@ -25,9 +47,7 @@
 #   include <xrpl/tx/transactors/payment/Payment.h>
 #endif
 TRANSACTION(ttPAYMENT, 0, Payment,
-    Delegation::Delegable,
-    uint256{},
-    CreateAcct | MayCreateMpt,
+    ({.delegable = Delegation::Delegable, .privileges = Privilege::CreateAcct | Privilege::MayCreateMpt}),
     ({
     {sfDestination, SoeRequired},
     {sfAmount, SoeRequired, SoeMptSupported},
@@ -44,11 +64,7 @@ TRANSACTION(ttPAYMENT, 0, Payment,
 #if TRANSACTION_INCLUDE
 #   include <xrpl/tx/transactors/escrow/EscrowCreate.h>
 #endif
-TRANSACTION(ttESCROW_CREATE, 1, EscrowCreate,
-    Delegation::Delegable,
-    uint256{},
-    NoPriv,
-    ({
+TRANSACTION(ttESCROW_CREATE, 1, EscrowCreate, ({.delegable = Delegation::Delegable}), ({
     {sfDestination, SoeRequired},
     {sfAmount, SoeRequired, SoeMptSupported},
     {sfCondition, SoeOptional},
@@ -61,11 +77,7 @@ TRANSACTION(ttESCROW_CREATE, 1, EscrowCreate,
 #if TRANSACTION_INCLUDE
 #   include <xrpl/tx/transactors/escrow/EscrowFinish.h>
 #endif
-TRANSACTION(ttESCROW_FINISH, 2, EscrowFinish,
-    Delegation::Delegable,
-    uint256{},
-    NoPriv,
-    ({
+TRANSACTION(ttESCROW_FINISH, 2, EscrowFinish, ({.delegable = Delegation::Delegable}), ({
     {sfOwner, SoeRequired},
     {sfOfferSequence, SoeRequired},
     {sfFulfillment, SoeOptional},
@@ -79,9 +91,7 @@ TRANSACTION(ttESCROW_FINISH, 2, EscrowFinish,
 #   include <xrpl/tx/transactors/account/AccountSet.h>
 #endif
 TRANSACTION(ttACCOUNT_SET, 3, AccountSet,
-    Delegation::NotDelegable,
-    uint256{},
-    NoPriv,
+    ({}),
     ({
     {sfEmailHash, SoeOptional},
     {sfWalletLocator, SoeOptional},
@@ -99,11 +109,7 @@ TRANSACTION(ttACCOUNT_SET, 3, AccountSet,
 #if TRANSACTION_INCLUDE
 #   include <xrpl/tx/transactors/escrow/EscrowCancel.h>
 #endif
-TRANSACTION(ttESCROW_CANCEL, 4, EscrowCancel,
-    Delegation::Delegable,
-    uint256{},
-    NoPriv,
-    ({
+TRANSACTION(ttESCROW_CANCEL, 4, EscrowCancel, ({.delegable = Delegation::Delegable}), ({
     {sfOwner, SoeRequired},
     {sfOfferSequence, SoeRequired},
 }))
@@ -113,9 +119,7 @@ TRANSACTION(ttESCROW_CANCEL, 4, EscrowCancel,
 #   include <xrpl/tx/transactors/account/SetRegularKey.h>
 #endif
 TRANSACTION(ttREGULAR_KEY_SET, 5, SetRegularKey,
-    Delegation::NotDelegable,
-    uint256{},
-    NoPriv,
+    ({}),
     ({
     {sfRegularKey, SoeOptional},
 }))
@@ -127,9 +131,7 @@ TRANSACTION(ttREGULAR_KEY_SET, 5, SetRegularKey,
 #   include <xrpl/tx/transactors/dex/OfferCreate.h>
 #endif
 TRANSACTION(ttOFFER_CREATE, 7, OfferCreate,
-    Delegation::Delegable,
-    uint256{},
-    MayCreateMpt,
+    ({.delegable = Delegation::Delegable, .privileges = Privilege::MayCreateMpt}),
     ({
     {sfTakerPays, SoeRequired, SoeMptSupported},
     {sfTakerGets, SoeRequired, SoeMptSupported},
@@ -142,11 +144,7 @@ TRANSACTION(ttOFFER_CREATE, 7, OfferCreate,
 #if TRANSACTION_INCLUDE
 #   include <xrpl/tx/transactors/dex/OfferCancel.h>
 #endif
-TRANSACTION(ttOFFER_CANCEL, 8, OfferCancel,
-    Delegation::Delegable,
-    uint256{},
-    NoPriv,
-    ({
+TRANSACTION(ttOFFER_CANCEL, 8, OfferCancel, ({.delegable = Delegation::Delegable}), ({
     {sfOfferSequence, SoeRequired},
 }))
 
@@ -156,11 +154,7 @@ TRANSACTION(ttOFFER_CANCEL, 8, OfferCancel,
 #if TRANSACTION_INCLUDE
 #   include <xrpl/tx/transactors/system/TicketCreate.h>
 #endif
-TRANSACTION(ttTICKET_CREATE, 10, TicketCreate,
-    Delegation::Delegable,
-    uint256{},
-    NoPriv,
-    ({
+TRANSACTION(ttTICKET_CREATE, 10, TicketCreate, ({.delegable = Delegation::Delegable}), ({
     {sfTicketCount, SoeRequired},
 }))
 
@@ -173,9 +167,7 @@ TRANSACTION(ttTICKET_CREATE, 10, TicketCreate,
 #   include <xrpl/tx/transactors/account/SignerListSet.h>
 #endif
 TRANSACTION(ttSIGNER_LIST_SET, 12, SignerListSet,
-    Delegation::NotDelegable,
-    uint256{},
-    NoPriv,
+    ({}),
     ({
     {sfSignerQuorum, SoeRequired},
     {sfSignerEntries, SoeOptional},
@@ -185,11 +177,7 @@ TRANSACTION(ttSIGNER_LIST_SET, 12, SignerListSet,
 #if TRANSACTION_INCLUDE
 #   include <xrpl/tx/transactors/payment_channel/PaymentChannelCreate.h>
 #endif
-TRANSACTION(ttPAYCHAN_CREATE, 13, PaymentChannelCreate,
-    Delegation::Delegable,
-    uint256{},
-    NoPriv,
-    ({
+TRANSACTION(ttPAYCHAN_CREATE, 13, PaymentChannelCreate, ({.delegable = Delegation::Delegable}), ({
     {sfDestination, SoeRequired},
     {sfAmount, SoeRequired},
     {sfSettleDelay, SoeRequired},
@@ -202,11 +190,7 @@ TRANSACTION(ttPAYCHAN_CREATE, 13, PaymentChannelCreate,
 #if TRANSACTION_INCLUDE
 #   include <xrpl/tx/transactors/payment_channel/PaymentChannelFund.h>
 #endif
-TRANSACTION(ttPAYCHAN_FUND, 14, PaymentChannelFund,
-    Delegation::Delegable,
-    uint256{},
-    NoPriv,
-    ({
+TRANSACTION(ttPAYCHAN_FUND, 14, PaymentChannelFund, ({.delegable = Delegation::Delegable}), ({
     {sfChannel, SoeRequired},
     {sfAmount, SoeRequired},
     {sfExpiration, SoeOptional},
@@ -216,11 +200,7 @@ TRANSACTION(ttPAYCHAN_FUND, 14, PaymentChannelFund,
 #if TRANSACTION_INCLUDE
 #   include <xrpl/tx/transactors/payment_channel/PaymentChannelClaim.h>
 #endif
-TRANSACTION(ttPAYCHAN_CLAIM, 15, PaymentChannelClaim,
-    Delegation::Delegable,
-    uint256{},
-    NoPriv,
-    ({
+TRANSACTION(ttPAYCHAN_CLAIM, 15, PaymentChannelClaim, ({.delegable = Delegation::Delegable}), ({
     {sfChannel, SoeRequired},
     {sfAmount, SoeOptional},
     {sfBalance, SoeOptional},
@@ -233,11 +213,7 @@ TRANSACTION(ttPAYCHAN_CLAIM, 15, PaymentChannelClaim,
 #if TRANSACTION_INCLUDE
 #   include <xrpl/tx/transactors/check/CheckCreate.h>
 #endif
-TRANSACTION(ttCHECK_CREATE, 16, CheckCreate,
-    Delegation::Delegable,
-    uint256{},
-    NoPriv,
-    ({
+TRANSACTION(ttCHECK_CREATE, 16, CheckCreate, ({.delegable = Delegation::Delegable}), ({
     {sfDestination, SoeRequired},
     {sfSendMax, SoeRequired, SoeMptSupported},
     {sfExpiration, SoeOptional},
@@ -250,9 +226,7 @@ TRANSACTION(ttCHECK_CREATE, 16, CheckCreate,
 #   include <xrpl/tx/transactors/check/CheckCash.h>
 #endif
 TRANSACTION(ttCHECK_CASH, 17, CheckCash,
-    Delegation::Delegable,
-    uint256{},
-    MayCreateMpt,
+    ({.delegable = Delegation::Delegable, .privileges = Privilege::MayCreateMpt}),
     ({
     {sfCheckID, SoeRequired},
     {sfAmount, SoeOptional, SoeMptSupported},
@@ -263,11 +237,7 @@ TRANSACTION(ttCHECK_CASH, 17, CheckCash,
 #if TRANSACTION_INCLUDE
 #   include <xrpl/tx/transactors/check/CheckCancel.h>
 #endif
-TRANSACTION(ttCHECK_CANCEL, 18, CheckCancel,
-    Delegation::Delegable,
-    uint256{},
-    NoPriv,
-    ({
+TRANSACTION(ttCHECK_CANCEL, 18, CheckCancel, ({.delegable = Delegation::Delegable}), ({
     {sfCheckID, SoeRequired},
 }))
 
@@ -275,11 +245,7 @@ TRANSACTION(ttCHECK_CANCEL, 18, CheckCancel,
 #if TRANSACTION_INCLUDE
 #   include <xrpl/tx/transactors/payment/DepositPreauth.h>
 #endif
-TRANSACTION(ttDEPOSIT_PREAUTH, 19, DepositPreauth,
-    Delegation::Delegable,
-    uint256{},
-    NoPriv,
-    ({
+TRANSACTION(ttDEPOSIT_PREAUTH, 19, DepositPreauth, ({.delegable = Delegation::Delegable}), ({
     {sfAuthorize, SoeOptional},
     {sfUnauthorize, SoeOptional},
     {sfAuthorizeCredentials, SoeOptional},
@@ -290,11 +256,7 @@ TRANSACTION(ttDEPOSIT_PREAUTH, 19, DepositPreauth,
 #if TRANSACTION_INCLUDE
 #   include <xrpl/tx/transactors/token/TrustSet.h>
 #endif
-TRANSACTION(ttTRUST_SET, 20, TrustSet,
-    Delegation::Delegable,
-    uint256{},
-    NoPriv,
-    ({
+TRANSACTION(ttTRUST_SET, 20, TrustSet, ({.delegable = Delegation::Delegable}), ({
     {sfLimitAmount, SoeOptional},
     {sfQualityIn, SoeOptional},
     {sfQualityOut, SoeOptional},
@@ -305,9 +267,9 @@ TRANSACTION(ttTRUST_SET, 20, TrustSet,
 #   include <xrpl/tx/transactors/account/AccountDelete.h>
 #endif
 TRANSACTION(ttACCOUNT_DELETE, 21, AccountDelete,
-    Delegation::NotDelegable,
-    uint256{},
-    MustDeleteAcct,
+    ({
+        .privileges = Privilege::MustDeleteAcct,
+    }),
     ({
     {sfDestination, SoeRequired},
     {sfDestinationTag, SoeOptional},
@@ -321,9 +283,7 @@ TRANSACTION(ttACCOUNT_DELETE, 21, AccountDelete,
 #   include <xrpl/tx/transactors/nft/NFTokenMint.h>
 #endif
 TRANSACTION(ttNFTOKEN_MINT, 25, NFTokenMint,
-    Delegation::Delegable,
-    uint256{},
-    ChangeNftCounts,
+    ({.delegable = Delegation::Delegable, .privileges = Privilege::ChangeNftCounts}),
     ({
     {sfNFTokenTaxon, SoeRequired},
     {sfTransferFee, SoeOptional},
@@ -339,9 +299,7 @@ TRANSACTION(ttNFTOKEN_MINT, 25, NFTokenMint,
 #   include <xrpl/tx/transactors/nft/NFTokenBurn.h>
 #endif
 TRANSACTION(ttNFTOKEN_BURN, 26, NFTokenBurn,
-    Delegation::Delegable,
-    uint256{},
-    ChangeNftCounts,
+    ({.delegable = Delegation::Delegable, .privileges = Privilege::ChangeNftCounts}),
     ({
     {sfNFTokenID, SoeRequired},
     {sfOwner, SoeOptional},
@@ -351,11 +309,7 @@ TRANSACTION(ttNFTOKEN_BURN, 26, NFTokenBurn,
 #if TRANSACTION_INCLUDE
 #   include <xrpl/tx/transactors/nft/NFTokenCreateOffer.h>
 #endif
-TRANSACTION(ttNFTOKEN_CREATE_OFFER, 27, NFTokenCreateOffer,
-    Delegation::Delegable,
-    uint256{},
-    NoPriv,
-    ({
+TRANSACTION(ttNFTOKEN_CREATE_OFFER, 27, NFTokenCreateOffer, ({.delegable = Delegation::Delegable}), ({
     {sfNFTokenID, SoeRequired},
     {sfAmount, SoeRequired},
     {sfDestination, SoeOptional},
@@ -367,11 +321,7 @@ TRANSACTION(ttNFTOKEN_CREATE_OFFER, 27, NFTokenCreateOffer,
 #if TRANSACTION_INCLUDE
 #   include <xrpl/tx/transactors/nft/NFTokenCancelOffer.h>
 #endif
-TRANSACTION(ttNFTOKEN_CANCEL_OFFER, 28, NFTokenCancelOffer,
-    Delegation::Delegable,
-    uint256{},
-    NoPriv,
-    ({
+TRANSACTION(ttNFTOKEN_CANCEL_OFFER, 28, NFTokenCancelOffer, ({.delegable = Delegation::Delegable}), ({
     {sfNFTokenOffers, SoeRequired},
 }))
 
@@ -379,11 +329,7 @@ TRANSACTION(ttNFTOKEN_CANCEL_OFFER, 28, NFTokenCancelOffer,
 #if TRANSACTION_INCLUDE
 #   include <xrpl/tx/transactors/nft/NFTokenAcceptOffer.h>
 #endif
-TRANSACTION(ttNFTOKEN_ACCEPT_OFFER, 29, NFTokenAcceptOffer,
-    Delegation::Delegable,
-    uint256{},
-    NoPriv,
-    ({
+TRANSACTION(ttNFTOKEN_ACCEPT_OFFER, 29, NFTokenAcceptOffer, ({.delegable = Delegation::Delegable}), ({
     {sfNFTokenBuyOffer, SoeOptional},
     {sfNFTokenSellOffer, SoeOptional},
     {sfNFTokenBrokerFee, SoeOptional},
@@ -393,11 +339,7 @@ TRANSACTION(ttNFTOKEN_ACCEPT_OFFER, 29, NFTokenAcceptOffer,
 #if TRANSACTION_INCLUDE
 #   include <xrpl/tx/transactors/token/Clawback.h>
 #endif
-TRANSACTION(ttCLAWBACK, 30, Clawback,
-    Delegation::Delegable,
-    uint256{},
-    NoPriv,
-    ({
+TRANSACTION(ttCLAWBACK, 30, Clawback, ({.delegable = Delegation::Delegable}), ({
     {sfAmount, SoeRequired, SoeMptSupported},
     {sfHolder, SoeOptional},
 }))
@@ -407,9 +349,12 @@ TRANSACTION(ttCLAWBACK, 30, Clawback,
 #   include <xrpl/tx/transactors/dex/AMMClawback.h>
 #endif
 TRANSACTION(ttAMM_CLAWBACK, 31, AMMClawback,
-    Delegation::Delegable,
-    featureAMMClawback,
-    MayDeleteAcct | OverrideFreeze | MayAuthorizeMpt,
+    ({
+        .delegable = Delegation::Delegable,
+        .amendment = featureAMMClawback,
+        .privileges = Privilege::MayDeleteAcct | Privilege::OverrideFreeze |
+            Privilege::MayAuthorizeMpt,
+    }),
     ({
     {sfHolder, SoeRequired},
     {sfAsset, SoeRequired, SoeMptSupported},
@@ -422,9 +367,11 @@ TRANSACTION(ttAMM_CLAWBACK, 31, AMMClawback,
 #   include <xrpl/tx/transactors/dex/AMMCreate.h>
 #endif
 TRANSACTION(ttAMM_CREATE, 35, AMMCreate,
-    Delegation::Delegable,
-    featureAMM,
-    CreatePseudoAcct | MayCreateMpt,
+    ({
+        .delegable = Delegation::Delegable,
+        .amendment = featureAMM,
+        .privileges = Privilege::CreatePseudoAcct | Privilege::MayCreateMpt,
+    }),
     ({
     {sfAmount, SoeRequired, SoeMptSupported},
     {sfAmount2, SoeRequired, SoeMptSupported},
@@ -436,9 +383,7 @@ TRANSACTION(ttAMM_CREATE, 35, AMMCreate,
 #   include <xrpl/tx/transactors/dex/AMMDeposit.h>
 #endif
 TRANSACTION(ttAMM_DEPOSIT, 36, AMMDeposit,
-    Delegation::Delegable,
-    featureAMM,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureAMM}),
     ({
     {sfAsset, SoeRequired, SoeMptSupported},
     {sfAsset2, SoeRequired, SoeMptSupported},
@@ -454,9 +399,11 @@ TRANSACTION(ttAMM_DEPOSIT, 36, AMMDeposit,
 #   include <xrpl/tx/transactors/dex/AMMWithdraw.h>
 #endif
 TRANSACTION(ttAMM_WITHDRAW, 37, AMMWithdraw,
-    Delegation::Delegable,
-    featureAMM,
-    MayDeleteAcct | MayAuthorizeMpt,
+    ({
+        .delegable = Delegation::Delegable,
+        .amendment = featureAMM,
+        .privileges = Privilege::MayDeleteAcct | Privilege::MayAuthorizeMpt,
+    }),
     ({
     {sfAsset, SoeRequired, SoeMptSupported},
     {sfAsset2, SoeRequired, SoeMptSupported},
@@ -471,9 +418,7 @@ TRANSACTION(ttAMM_WITHDRAW, 37, AMMWithdraw,
 #   include <xrpl/tx/transactors/dex/AMMVote.h>
 #endif
 TRANSACTION(ttAMM_VOTE, 38, AMMVote,
-    Delegation::Delegable,
-    featureAMM,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureAMM}),
     ({
     {sfAsset, SoeRequired, SoeMptSupported},
     {sfAsset2, SoeRequired, SoeMptSupported},
@@ -485,9 +430,7 @@ TRANSACTION(ttAMM_VOTE, 38, AMMVote,
 #   include <xrpl/tx/transactors/dex/AMMBid.h>
 #endif
 TRANSACTION(ttAMM_BID, 39, AMMBid,
-    Delegation::Delegable,
-    featureAMM,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureAMM}),
     ({
     {sfAsset, SoeRequired, SoeMptSupported},
     {sfAsset2, SoeRequired, SoeMptSupported},
@@ -501,9 +444,11 @@ TRANSACTION(ttAMM_BID, 39, AMMBid,
 #   include <xrpl/tx/transactors/dex/AMMDelete.h>
 #endif
 TRANSACTION(ttAMM_DELETE, 40, AMMDelete,
-    Delegation::Delegable,
-    featureAMM,
-    MustDeleteAcct | MayDeleteMpt,
+    ({
+        .delegable = Delegation::Delegable,
+        .amendment = featureAMM,
+        .privileges = Privilege::MustDeleteAcct | Privilege::MayDeleteMpt,
+    }),
     ({
     {sfAsset, SoeRequired, SoeMptSupported},
     {sfAsset2, SoeRequired, SoeMptSupported},
@@ -514,9 +459,7 @@ TRANSACTION(ttAMM_DELETE, 40, AMMDelete,
 #   include <xrpl/tx/transactors/bridge/XChainBridge.h>
 #endif
 TRANSACTION(ttXCHAIN_CREATE_CLAIM_ID, 41, XChainCreateClaimID,
-    Delegation::Delegable,
-    featureXChainBridge,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureXChainBridge}),
     ({
     {sfXChainBridge, SoeRequired},
     {sfSignatureReward, SoeRequired},
@@ -525,9 +468,7 @@ TRANSACTION(ttXCHAIN_CREATE_CLAIM_ID, 41, XChainCreateClaimID,
 
 /** This transactions initiates a crosschain transaction */
 TRANSACTION(ttXCHAIN_COMMIT, 42, XChainCommit,
-    Delegation::Delegable,
-    featureXChainBridge,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureXChainBridge}),
     ({
     {sfXChainBridge, SoeRequired},
     {sfXChainClaimID, SoeRequired},
@@ -537,9 +478,7 @@ TRANSACTION(ttXCHAIN_COMMIT, 42, XChainCommit,
 
 /** This transaction completes a crosschain transaction */
 TRANSACTION(ttXCHAIN_CLAIM, 43, XChainClaim,
-    Delegation::Delegable,
-    featureXChainBridge,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureXChainBridge}),
     ({
     {sfXChainBridge, SoeRequired},
     {sfXChainClaimID, SoeRequired},
@@ -550,9 +489,7 @@ TRANSACTION(ttXCHAIN_CLAIM, 43, XChainClaim,
 
 /** This transaction initiates a crosschain account create transaction */
 TRANSACTION(ttXCHAIN_ACCOUNT_CREATE_COMMIT, 44, XChainAccountCreateCommit,
-    Delegation::Delegable,
-    featureXChainBridge,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureXChainBridge}),
     ({
     {sfXChainBridge, SoeRequired},
     {sfDestination, SoeRequired},
@@ -562,9 +499,11 @@ TRANSACTION(ttXCHAIN_ACCOUNT_CREATE_COMMIT, 44, XChainAccountCreateCommit,
 
 /** This transaction adds an attestation to a claim */
 TRANSACTION(ttXCHAIN_ADD_CLAIM_ATTESTATION, 45, XChainAddClaimAttestation,
-    Delegation::Delegable,
-    featureXChainBridge,
-    CreateAcct,
+    ({
+        .delegable = Delegation::Delegable,
+        .amendment = featureXChainBridge,
+        .privileges = Privilege::CreateAcct,
+    }),
     ({
     {sfXChainBridge, SoeRequired},
 
@@ -581,11 +520,12 @@ TRANSACTION(ttXCHAIN_ADD_CLAIM_ATTESTATION, 45, XChainAddClaimAttestation,
 }))
 
 /** This transaction adds an attestation to an account */
-TRANSACTION(ttXCHAIN_ADD_ACCOUNT_CREATE_ATTESTATION, 46,
-    XChainAddAccountCreateAttestation,
-    Delegation::Delegable,
-    featureXChainBridge,
-    CreateAcct,
+TRANSACTION(ttXCHAIN_ADD_ACCOUNT_CREATE_ATTESTATION, 46, XChainAddAccountCreateAttestation,
+    ({
+        .delegable = Delegation::Delegable,
+        .amendment = featureXChainBridge,
+        .privileges = Privilege::CreateAcct,
+    }),
     ({
     {sfXChainBridge, SoeRequired},
 
@@ -604,9 +544,7 @@ TRANSACTION(ttXCHAIN_ADD_ACCOUNT_CREATE_ATTESTATION, 46,
 
 /** This transaction modifies a sidechain */
 TRANSACTION(ttXCHAIN_MODIFY_BRIDGE, 47, XChainModifyBridge,
-    Delegation::Delegable,
-    featureXChainBridge,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureXChainBridge}),
     ({
     {sfXChainBridge, SoeRequired},
     {sfSignatureReward, SoeOptional},
@@ -615,9 +553,7 @@ TRANSACTION(ttXCHAIN_MODIFY_BRIDGE, 47, XChainModifyBridge,
 
 /** This transactions creates a sidechain */
 TRANSACTION(ttXCHAIN_CREATE_BRIDGE, 48, XChainCreateBridge,
-    Delegation::Delegable,
-    featureXChainBridge,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureXChainBridge}),
     ({
     {sfXChainBridge, SoeRequired},
     {sfSignatureReward, SoeRequired},
@@ -629,9 +565,7 @@ TRANSACTION(ttXCHAIN_CREATE_BRIDGE, 48, XChainCreateBridge,
 #   include <xrpl/tx/transactors/did/DIDSet.h>
 #endif
 TRANSACTION(ttDID_SET, 49, DIDSet,
-    Delegation::Delegable,
-    featureDID,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureDID}),
     ({
     {sfDIDDocument, SoeOptional},
     {sfURI, SoeOptional},
@@ -643,9 +577,7 @@ TRANSACTION(ttDID_SET, 49, DIDSet,
 #   include <xrpl/tx/transactors/did/DIDDelete.h>
 #endif
 TRANSACTION(ttDID_DELETE, 50, DIDDelete,
-    Delegation::Delegable,
-    featureDID,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureDID}),
     ({}))
 
 /** This transaction type creates an Oracle instance */
@@ -653,9 +585,7 @@ TRANSACTION(ttDID_DELETE, 50, DIDDelete,
 #   include <xrpl/tx/transactors/oracle/OracleSet.h>
 #endif
 TRANSACTION(ttORACLE_SET, 51, OracleSet,
-    Delegation::Delegable,
-    featurePriceOracle,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featurePriceOracle}),
     ({
     {sfOracleDocumentID, SoeRequired},
     {sfProvider, SoeOptional},
@@ -670,9 +600,7 @@ TRANSACTION(ttORACLE_SET, 51, OracleSet,
 #   include <xrpl/tx/transactors/oracle/OracleDelete.h>
 #endif
 TRANSACTION(ttORACLE_DELETE, 52, OracleDelete,
-    Delegation::Delegable,
-    featurePriceOracle,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featurePriceOracle}),
     ({
     {sfOracleDocumentID, SoeRequired},
 }))
@@ -682,9 +610,7 @@ TRANSACTION(ttORACLE_DELETE, 52, OracleDelete,
 #   include <xrpl/tx/transactors/system/LedgerStateFix.h>
 #endif
 TRANSACTION(ttLEDGER_STATE_FIX, 53, LedgerStateFix,
-    Delegation::Delegable,
-    fixNFTokenPageLinks,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = fixNFTokenPageLinks}),
     ({
     {sfLedgerFixType, SoeRequired},
     {sfOwner, SoeOptional},
@@ -696,9 +622,11 @@ TRANSACTION(ttLEDGER_STATE_FIX, 53, LedgerStateFix,
 #   include <xrpl/tx/transactors/token/MPTokenIssuanceCreate.h>
 #endif
 TRANSACTION(ttMPTOKEN_ISSUANCE_CREATE, 54, MPTokenIssuanceCreate,
-    Delegation::Delegable,
-    featureMPTokensV1,
-    CreateMptIssuance,
+    ({
+        .delegable = Delegation::Delegable,
+        .amendment = featureMPTokensV1,
+        .privileges = Privilege::CreateMptIssuance,
+    }),
     ({
     {sfAssetScale, SoeOptional},
     {sfTransferFee, SoeOptional},
@@ -713,9 +641,11 @@ TRANSACTION(ttMPTOKEN_ISSUANCE_CREATE, 54, MPTokenIssuanceCreate,
 #   include <xrpl/tx/transactors/token/MPTokenIssuanceDestroy.h>
 #endif
 TRANSACTION(ttMPTOKEN_ISSUANCE_DESTROY, 55, MPTokenIssuanceDestroy,
-    Delegation::Delegable,
-    featureMPTokensV1,
-    DestroyMptIssuance,
+    ({
+        .delegable = Delegation::Delegable,
+        .amendment = featureMPTokensV1,
+        .privileges = Privilege::DestroyMptIssuance,
+    }),
     ({
     {sfMPTokenIssuanceID, SoeRequired},
 }))
@@ -725,9 +655,7 @@ TRANSACTION(ttMPTOKEN_ISSUANCE_DESTROY, 55, MPTokenIssuanceDestroy,
 #   include <xrpl/tx/transactors/token/MPTokenIssuanceSet.h>
 #endif
 TRANSACTION(ttMPTOKEN_ISSUANCE_SET, 56, MPTokenIssuanceSet,
-    Delegation::Delegable,
-    featureMPTokensV1,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureMPTokensV1}),
     ({
     {sfMPTokenIssuanceID, SoeRequired},
     {sfHolder, SoeOptional},
@@ -744,9 +672,11 @@ TRANSACTION(ttMPTOKEN_ISSUANCE_SET, 56, MPTokenIssuanceSet,
 #   include <xrpl/tx/transactors/token/MPTokenAuthorize.h>
 #endif
 TRANSACTION(ttMPTOKEN_AUTHORIZE, 57, MPTokenAuthorize,
-    Delegation::Delegable,
-    featureMPTokensV1,
-    MustAuthorizeMpt,
+    ({
+        .delegable = Delegation::Delegable,
+        .amendment = featureMPTokensV1,
+        .privileges = Privilege::MustAuthorizeMpt,
+    }),
     ({
     {sfMPTokenIssuanceID, SoeRequired},
     {sfHolder, SoeOptional},
@@ -757,9 +687,7 @@ TRANSACTION(ttMPTOKEN_AUTHORIZE, 57, MPTokenAuthorize,
 #   include <xrpl/tx/transactors/credentials/CredentialCreate.h>
 #endif
 TRANSACTION(ttCREDENTIAL_CREATE, 58, CredentialCreate,
-    Delegation::Delegable,
-    featureCredentials,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureCredentials}),
     ({
     {sfSubject, SoeRequired},
     {sfCredentialType, SoeRequired},
@@ -772,9 +700,7 @@ TRANSACTION(ttCREDENTIAL_CREATE, 58, CredentialCreate,
 #   include <xrpl/tx/transactors/credentials/CredentialAccept.h>
 #endif
 TRANSACTION(ttCREDENTIAL_ACCEPT, 59, CredentialAccept,
-    Delegation::Delegable,
-    featureCredentials,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureCredentials}),
     ({
     {sfIssuer, SoeRequired},
     {sfCredentialType, SoeRequired},
@@ -785,9 +711,7 @@ TRANSACTION(ttCREDENTIAL_ACCEPT, 59, CredentialAccept,
 #   include <xrpl/tx/transactors/credentials/CredentialDelete.h>
 #endif
 TRANSACTION(ttCREDENTIAL_DELETE, 60, CredentialDelete,
-    Delegation::Delegable,
-    featureCredentials,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureCredentials}),
     ({
     {sfSubject, SoeOptional},
     {sfIssuer, SoeOptional},
@@ -799,9 +723,7 @@ TRANSACTION(ttCREDENTIAL_DELETE, 60, CredentialDelete,
 #   include <xrpl/tx/transactors/nft/NFTokenModify.h>
 #endif
 TRANSACTION(ttNFTOKEN_MODIFY, 61, NFTokenModify,
-    Delegation::Delegable,
-    featureDynamicNFT,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureDynamicNFT}),
     ({
     {sfNFTokenID, SoeRequired},
     {sfOwner, SoeOptional},
@@ -813,9 +735,7 @@ TRANSACTION(ttNFTOKEN_MODIFY, 61, NFTokenModify,
 #   include <xrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.h>
 #endif
 TRANSACTION(ttPERMISSIONED_DOMAIN_SET, 62, PermissionedDomainSet,
-    Delegation::Delegable,
-    featurePermissionedDomains,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featurePermissionedDomains}),
     ({
     {sfDomainID, SoeOptional},
     {sfAcceptedCredentials, SoeRequired},
@@ -826,9 +746,7 @@ TRANSACTION(ttPERMISSIONED_DOMAIN_SET, 62, PermissionedDomainSet,
 #   include <xrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.h>
 #endif
 TRANSACTION(ttPERMISSIONED_DOMAIN_DELETE, 63, PermissionedDomainDelete,
-    Delegation::Delegable,
-    featurePermissionedDomains,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featurePermissionedDomains}),
     ({
     {sfDomainID, SoeRequired},
 }))
@@ -838,9 +756,9 @@ TRANSACTION(ttPERMISSIONED_DOMAIN_DELETE, 63, PermissionedDomainDelete,
 #   include <xrpl/tx/transactors/delegate/DelegateSet.h>
 #endif
 TRANSACTION(ttDELEGATE_SET, 64, DelegateSet,
-    Delegation::NotDelegable,
-    featurePermissionDelegationV1_1,
-    NoPriv,
+    ({
+        .amendment = featurePermissionDelegationV1_1,
+    }),
     ({
     {sfAuthorize, SoeRequired},
     {sfPermissions, SoeRequired},
@@ -851,9 +769,11 @@ TRANSACTION(ttDELEGATE_SET, 64, DelegateSet,
 #   include <xrpl/tx/transactors/vault/VaultCreate.h>
 #endif
 TRANSACTION(ttVAULT_CREATE, 65, VaultCreate,
-    Delegation::NotDelegable,
-    featureSingleAssetVault,
-    CreatePseudoAcct | CreateMptIssuance | MustModifyVault,
+    ({
+        .amendment = featureSingleAssetVault,
+        .privileges = Privilege::CreatePseudoAcct | Privilege::CreateMptIssuance |
+            Privilege::MustModifyVault,
+    }),
     ({
     {sfAsset, SoeRequired, SoeMptSupported},
     {sfAssetsMaximum, SoeOptional},
@@ -872,9 +792,10 @@ TRANSACTION(ttVAULT_CREATE, 65, VaultCreate,
 #   include <xrpl/tx/transactors/vault/VaultSet.h>
 #endif
 TRANSACTION(ttVAULT_SET, 66, VaultSet,
-    Delegation::NotDelegable,
-    featureSingleAssetVault,
-    MustModifyVault,
+    ({
+        .amendment = featureSingleAssetVault,
+        .privileges = Privilege::MustModifyVault,
+    }),
     ({
     {sfVaultID, SoeRequired},
     {sfAssetsMaximum, SoeOptional},
@@ -887,9 +808,11 @@ TRANSACTION(ttVAULT_SET, 66, VaultSet,
 #   include <xrpl/tx/transactors/vault/VaultDelete.h>
 #endif
 TRANSACTION(ttVAULT_DELETE, 67, VaultDelete,
-    Delegation::NotDelegable,
-    featureSingleAssetVault,
-    MustDeleteAcct | DestroyMptIssuance | MustModifyVault,
+    ({
+        .amendment = featureSingleAssetVault,
+        .privileges = Privilege::MustDeleteAcct | Privilege::DestroyMptIssuance |
+            Privilege::MustModifyVault,
+    }),
     ({
     {sfVaultID, SoeRequired},
     {sfMemoData, SoeOptional},
@@ -900,9 +823,10 @@ TRANSACTION(ttVAULT_DELETE, 67, VaultDelete,
 #   include <xrpl/tx/transactors/vault/VaultDeposit.h>
 #endif
 TRANSACTION(ttVAULT_DEPOSIT, 68, VaultDeposit,
-    Delegation::NotDelegable,
-    featureSingleAssetVault,
-    MayAuthorizeMpt | MustModifyVault,
+    ({
+        .amendment = featureSingleAssetVault,
+        .privileges = Privilege::MayAuthorizeMpt | Privilege::MustModifyVault,
+    }),
     ({
     {sfVaultID, SoeRequired},
     {sfAmount, SoeRequired, SoeMptSupported},
@@ -913,9 +837,11 @@ TRANSACTION(ttVAULT_DEPOSIT, 68, VaultDeposit,
 #   include <xrpl/tx/transactors/vault/VaultWithdraw.h>
 #endif
 TRANSACTION(ttVAULT_WITHDRAW, 69, VaultWithdraw,
-    Delegation::NotDelegable,
-    featureSingleAssetVault,
-    MayDeleteMpt | MayAuthorizeMpt | MustModifyVault,
+    ({
+        .amendment = featureSingleAssetVault,
+        .privileges = Privilege::MayDeleteMpt | Privilege::MayAuthorizeMpt |
+            Privilege::MustModifyVault,
+    }),
     ({
     {sfVaultID, SoeRequired},
     {sfAmount, SoeRequired, SoeMptSupported},
@@ -929,9 +855,10 @@ TRANSACTION(ttVAULT_WITHDRAW, 69, VaultWithdraw,
 #   include <xrpl/tx/transactors/vault/VaultClawback.h>
 #endif
 TRANSACTION(ttVAULT_CLAWBACK, 70, VaultClawback,
-    Delegation::NotDelegable,
-    featureSingleAssetVault,
-    MayDeleteMpt | MustModifyVault,
+    ({
+        .amendment = featureSingleAssetVault,
+        .privileges = Privilege::MayDeleteMpt | Privilege::MustModifyVault,
+    }),
     ({
     {sfVaultID, SoeRequired},
     {sfHolder, SoeRequired},
@@ -943,9 +870,9 @@ TRANSACTION(ttVAULT_CLAWBACK, 70, VaultClawback,
 #   include <xrpl/tx/transactors/system/Batch.h>
 #endif
 TRANSACTION(ttBATCH, 71, Batch,
-    Delegation::NotDelegable,
-    featureBatchV1_1,
-    NoPriv,
+    ({
+        .amendment = featureBatchV1_1,
+    }),
     ({
     {sfRawTransactions, SoeRequired},
     {sfBatchSigners, SoeOptional},
@@ -958,9 +885,11 @@ TRANSACTION(ttBATCH, 71, Batch,
 #   include <xrpl/tx/transactors/lending/LoanBrokerSet.h>
 #endif
 TRANSACTION(ttLOAN_BROKER_SET, 74, LoanBrokerSet,
-    Delegation::NotDelegable,
-    featureLendingProtocol,
-    CreatePseudoAcct | MayAuthorizeMpt, ({
+    ({
+        .amendment = featureLendingProtocol,
+        .privileges = Privilege::CreatePseudoAcct | Privilege::MayAuthorizeMpt,
+    }),
+    ({
     {sfVaultID, SoeRequired},
     {sfLoanBrokerID, SoeOptional},
     {sfData, SoeOptional},
@@ -975,9 +904,11 @@ TRANSACTION(ttLOAN_BROKER_SET, 74, LoanBrokerSet,
 #   include <xrpl/tx/transactors/lending/LoanBrokerDelete.h>
 #endif
 TRANSACTION(ttLOAN_BROKER_DELETE, 75, LoanBrokerDelete,
-    Delegation::NotDelegable,
-    featureLendingProtocol,
-    MustDeleteAcct | MayAuthorizeMpt, ({
+    ({
+        .amendment = featureLendingProtocol,
+        .privileges = Privilege::MustDeleteAcct | Privilege::MayAuthorizeMpt,
+    }),
+    ({
     {sfLoanBrokerID, SoeRequired},
 }))
 
@@ -986,9 +917,10 @@ TRANSACTION(ttLOAN_BROKER_DELETE, 75, LoanBrokerDelete,
 #   include <xrpl/tx/transactors/lending/LoanBrokerCoverDeposit.h>
 #endif
 TRANSACTION(ttLOAN_BROKER_COVER_DEPOSIT, 76, LoanBrokerCoverDeposit,
-    Delegation::NotDelegable,
-    featureLendingProtocol,
-    NoPriv, ({
+    ({
+        .amendment = featureLendingProtocol,
+    }),
+    ({
     {sfLoanBrokerID, SoeRequired},
     {sfAmount, SoeRequired, SoeMptSupported},
 }))
@@ -998,9 +930,11 @@ TRANSACTION(ttLOAN_BROKER_COVER_DEPOSIT, 76, LoanBrokerCoverDeposit,
 #   include <xrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.h>
 #endif
 TRANSACTION(ttLOAN_BROKER_COVER_WITHDRAW, 77, LoanBrokerCoverWithdraw,
-    Delegation::NotDelegable,
-    featureLendingProtocol,
-    MayAuthorizeMpt, ({
+    ({
+        .amendment = featureLendingProtocol,
+        .privileges = Privilege::MayAuthorizeMpt,
+    }),
+    ({
     {sfLoanBrokerID, SoeRequired},
     {sfAmount, SoeRequired, SoeMptSupported},
     {sfDestination, SoeOptional},
@@ -1014,9 +948,10 @@ TRANSACTION(ttLOAN_BROKER_COVER_WITHDRAW, 77, LoanBrokerCoverWithdraw,
 #   include <xrpl/tx/transactors/lending/LoanBrokerCoverClawback.h>
 #endif
 TRANSACTION(ttLOAN_BROKER_COVER_CLAWBACK, 78, LoanBrokerCoverClawback,
-    Delegation::NotDelegable,
-    featureLendingProtocol,
-    NoPriv, ({
+    ({
+        .amendment = featureLendingProtocol,
+    }),
+    ({
     {sfLoanBrokerID, SoeOptional},
     {sfAmount, SoeOptional, SoeMptSupported},
 }))
@@ -1026,9 +961,11 @@ TRANSACTION(ttLOAN_BROKER_COVER_CLAWBACK, 78, LoanBrokerCoverClawback,
 #   include <xrpl/tx/transactors/lending/LoanSet.h>
 #endif
 TRANSACTION(ttLOAN_SET, 80, LoanSet,
-    Delegation::NotDelegable,
-    featureLendingProtocol,
-    MayAuthorizeMpt | MustModifyVault, ({
+    ({
+        .amendment = featureLendingProtocol,
+        .privileges = Privilege::MayAuthorizeMpt | Privilege::MustModifyVault,
+    }),
+    ({
     {sfLoanBrokerID, SoeRequired},
     {sfData, SoeOptional},
     {sfCounterparty, SoeOptional},
@@ -1053,9 +990,10 @@ TRANSACTION(ttLOAN_SET, 80, LoanSet,
 #   include <xrpl/tx/transactors/lending/LoanDelete.h>
 #endif
 TRANSACTION(ttLOAN_DELETE, 81, LoanDelete,
-    Delegation::NotDelegable,
-    featureLendingProtocol,
-    NoPriv, ({
+    ({
+        .amendment = featureLendingProtocol,
+    }),
+    ({
     {sfLoanID, SoeRequired},
 }))
 
@@ -1064,12 +1002,14 @@ TRANSACTION(ttLOAN_DELETE, 81, LoanDelete,
 #   include <xrpl/tx/transactors/lending/LoanManage.h>
 #endif
 TRANSACTION(ttLOAN_MANAGE, 82, LoanManage,
-    Delegation::NotDelegable,
-    featureLendingProtocol,
-    // All of the LoanManage options will modify the vault, but the
-    // transaction can succeed without options, essentially making it
-    // a noop.
-    MayModifyVault, ({
+    ({
+        .amendment = featureLendingProtocol,
+        // All of the LoanManage options will modify the vault, but the
+        // transaction can succeed without options, essentially making it
+        // a noop.
+        .privileges = Privilege::MayModifyVault,
+    }),
+    ({
     {sfLoanID, SoeRequired},
 }))
 
@@ -1078,9 +1018,11 @@ TRANSACTION(ttLOAN_MANAGE, 82, LoanManage,
 #   include <xrpl/tx/transactors/lending/LoanPay.h>
 #endif
 TRANSACTION(ttLOAN_PAY, 84, LoanPay,
-    Delegation::NotDelegable,
-    featureLendingProtocol,
-    MayAuthorizeMpt | MustModifyVault, ({
+    ({
+        .amendment = featureLendingProtocol,
+        .privileges = Privilege::MayAuthorizeMpt | Privilege::MustModifyVault,
+    }),
+    ({
     {sfLoanID, SoeRequired},
     {sfAmount, SoeRequired, SoeMptSupported},
 }))
@@ -1090,9 +1032,9 @@ TRANSACTION(ttLOAN_PAY, 84, LoanPay,
 #   include <xrpl/tx/transactors/token/ConfidentialMPTConvert.h>
 #endif
 TRANSACTION(ttCONFIDENTIAL_MPT_CONVERT, 85, ConfidentialMPTConvert,
-    Delegation::NotDelegable,
-    featureConfidentialTransfer,
-    NoPriv,
+    ({
+        .amendment = featureConfidentialTransfer,
+    }),
     ({
     {sfMPTokenIssuanceID, SoeRequired},
     {sfMPTAmount, SoeRequired},
@@ -1109,9 +1051,7 @@ TRANSACTION(ttCONFIDENTIAL_MPT_CONVERT, 85, ConfidentialMPTConvert,
 #   include <xrpl/tx/transactors/token/ConfidentialMPTMergeInbox.h>
 #endif
 TRANSACTION(ttCONFIDENTIAL_MPT_MERGE_INBOX, 86, ConfidentialMPTMergeInbox,
-    Delegation::Delegable,
-    featureConfidentialTransfer,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureConfidentialTransfer}),
     ({
     {sfMPTokenIssuanceID, SoeRequired},
 }))
@@ -1121,9 +1061,7 @@ TRANSACTION(ttCONFIDENTIAL_MPT_MERGE_INBOX, 86, ConfidentialMPTMergeInbox,
 #   include <xrpl/tx/transactors/token/ConfidentialMPTConvertBack.h>
 #endif
 TRANSACTION(ttCONFIDENTIAL_MPT_CONVERT_BACK, 87, ConfidentialMPTConvertBack,
-    Delegation::Delegable,
-    featureConfidentialTransfer,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureConfidentialTransfer}),
     ({
     {sfMPTokenIssuanceID, SoeRequired},
     {sfMPTAmount, SoeRequired},
@@ -1139,9 +1077,7 @@ TRANSACTION(ttCONFIDENTIAL_MPT_CONVERT_BACK, 87, ConfidentialMPTConvertBack,
 #   include <xrpl/tx/transactors/token/ConfidentialMPTSend.h>
 #endif
 TRANSACTION(ttCONFIDENTIAL_MPT_SEND, 88, ConfidentialMPTSend,
-    Delegation::Delegable,
-    featureConfidentialTransfer,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureConfidentialTransfer}),
     ({
     {sfMPTokenIssuanceID, SoeRequired},
     {sfDestination, SoeRequired},
@@ -1160,9 +1096,7 @@ TRANSACTION(ttCONFIDENTIAL_MPT_SEND, 88, ConfidentialMPTSend,
 #   include <xrpl/tx/transactors/token/ConfidentialMPTClawback.h>
 #endif
 TRANSACTION(ttCONFIDENTIAL_MPT_CLAWBACK, 89, ConfidentialMPTClawback,
-    Delegation::Delegable,
-    featureConfidentialTransfer,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureConfidentialTransfer}),
     ({
     {sfMPTokenIssuanceID, SoeRequired},
     {sfHolder, SoeRequired},
@@ -1175,9 +1109,9 @@ TRANSACTION(ttCONFIDENTIAL_MPT_CLAWBACK, 89, ConfidentialMPTClawback,
 #   include <xrpl/tx/transactors/sponsor/SponsorshipTransfer.h>
 #endif
 TRANSACTION(ttSPONSORSHIP_TRANSFER, 90, SponsorshipTransfer,
-    Delegation::NotDelegable,
-    featureSponsor,
-    NoPriv,
+    ({
+        .amendment = featureSponsor,
+    }),
     ({
     {sfObjectID, SoeOptional},
     {sfSponsee, SoeOptional},
@@ -1188,9 +1122,7 @@ TRANSACTION(ttSPONSORSHIP_TRANSFER, 90, SponsorshipTransfer,
 #   include <xrpl/tx/transactors/sponsor/SponsorshipSet.h>
 #endif
 TRANSACTION(ttSPONSORSHIP_SET, 91, SponsorshipSet,
-    Delegation::Delegable,
-    featureSponsor,
-    NoPriv,
+    ({.delegable = Delegation::Delegable, .amendment = featureSponsor}),
     ({
     {sfCounterpartySponsor, SoeOptional},
     {sfSponsee, SoeOptional},
@@ -1207,9 +1139,7 @@ TRANSACTION(ttSPONSORSHIP_SET, 91, SponsorshipSet,
 #   include <xrpl/tx/transactors/system/Change.h>
 #endif
 TRANSACTION(ttAMENDMENT, 100, EnableAmendment,
-    Delegation::NotDelegable,
-    uint256{},
-    NoPriv,
+    ({}),
     ({
     {sfLedgerSequence, SoeRequired},
     {sfAmendment, SoeRequired},
@@ -1219,9 +1149,7 @@ TRANSACTION(ttAMENDMENT, 100, EnableAmendment,
     For details, see: https://xrpl.org/fee-voting.html
  */
 TRANSACTION(ttFEE, 101, SetFee,
-    Delegation::NotDelegable,
-    uint256{},
-    NoPriv,
+    ({}),
     ({
     {sfLedgerSequence, SoeOptional},
     // Old version uses raw numbers
@@ -1240,9 +1168,7 @@ TRANSACTION(ttFEE, 101, SetFee,
     For details, see: https://xrpl.org/negative-unl.html
  */
 TRANSACTION(ttUNL_MODIFY, 102, UNLModify,
-    Delegation::NotDelegable,
-    uint256{},
-    NoPriv,
+    ({}),
     ({
     {sfUNLModifyDisabling, SoeRequired},
     {sfLedgerSequence, SoeRequired},
diff --git a/include/xrpl/protocol_autogen/transactions/AMMBid.h b/include/xrpl/protocol_autogen/transactions/AMMBid.h
index 30a2b6f2ab..94d0672699 100644
--- a/include/xrpl/protocol_autogen/transactions/AMMBid.h
+++ b/include/xrpl/protocol_autogen/transactions/AMMBid.h
@@ -21,7 +21,7 @@ class AMMBidBuilder;
  * Type: ttAMM_BID (39)
  * Delegable: Delegation::Delegable
  * Amendment: featureAMM
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use AMMBidBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/AMMClawback.h b/include/xrpl/protocol_autogen/transactions/AMMClawback.h
index 38aba892c4..c837b5cee6 100644
--- a/include/xrpl/protocol_autogen/transactions/AMMClawback.h
+++ b/include/xrpl/protocol_autogen/transactions/AMMClawback.h
@@ -21,7 +21,7 @@ class AMMClawbackBuilder;
  * Type: ttAMM_CLAWBACK (31)
  * Delegable: Delegation::Delegable
  * Amendment: featureAMMClawback
- * Privileges: MayDeleteAcct | OverrideFreeze | MayAuthorizeMpt
+ * Privileges: Privilege::MayDeleteAcct | Privilege::OverrideFreeze | Privilege::MayAuthorizeMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use AMMClawbackBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/AMMCreate.h b/include/xrpl/protocol_autogen/transactions/AMMCreate.h
index c6ccd4e860..e2e50f87ff 100644
--- a/include/xrpl/protocol_autogen/transactions/AMMCreate.h
+++ b/include/xrpl/protocol_autogen/transactions/AMMCreate.h
@@ -21,7 +21,7 @@ class AMMCreateBuilder;
  * Type: ttAMM_CREATE (35)
  * Delegable: Delegation::Delegable
  * Amendment: featureAMM
- * Privileges: CreatePseudoAcct | MayCreateMpt
+ * Privileges: Privilege::CreatePseudoAcct | Privilege::MayCreateMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use AMMCreateBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/AMMDelete.h b/include/xrpl/protocol_autogen/transactions/AMMDelete.h
index 05899a46c8..86e91bf52b 100644
--- a/include/xrpl/protocol_autogen/transactions/AMMDelete.h
+++ b/include/xrpl/protocol_autogen/transactions/AMMDelete.h
@@ -21,7 +21,7 @@ class AMMDeleteBuilder;
  * Type: ttAMM_DELETE (40)
  * Delegable: Delegation::Delegable
  * Amendment: featureAMM
- * Privileges: MustDeleteAcct | MayDeleteMpt
+ * Privileges: Privilege::MustDeleteAcct | Privilege::MayDeleteMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use AMMDeleteBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/AMMDeposit.h b/include/xrpl/protocol_autogen/transactions/AMMDeposit.h
index 5416547dab..fed1bd3195 100644
--- a/include/xrpl/protocol_autogen/transactions/AMMDeposit.h
+++ b/include/xrpl/protocol_autogen/transactions/AMMDeposit.h
@@ -21,7 +21,7 @@ class AMMDepositBuilder;
  * Type: ttAMM_DEPOSIT (36)
  * Delegable: Delegation::Delegable
  * Amendment: featureAMM
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use AMMDepositBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/AMMVote.h b/include/xrpl/protocol_autogen/transactions/AMMVote.h
index 7dce3c252f..3fca42a232 100644
--- a/include/xrpl/protocol_autogen/transactions/AMMVote.h
+++ b/include/xrpl/protocol_autogen/transactions/AMMVote.h
@@ -21,7 +21,7 @@ class AMMVoteBuilder;
  * Type: ttAMM_VOTE (38)
  * Delegable: Delegation::Delegable
  * Amendment: featureAMM
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use AMMVoteBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/AMMWithdraw.h b/include/xrpl/protocol_autogen/transactions/AMMWithdraw.h
index 81258f22d6..e177011801 100644
--- a/include/xrpl/protocol_autogen/transactions/AMMWithdraw.h
+++ b/include/xrpl/protocol_autogen/transactions/AMMWithdraw.h
@@ -21,7 +21,7 @@ class AMMWithdrawBuilder;
  * Type: ttAMM_WITHDRAW (37)
  * Delegable: Delegation::Delegable
  * Amendment: featureAMM
- * Privileges: MayDeleteAcct | MayAuthorizeMpt
+ * Privileges: Privilege::MayDeleteAcct | Privilege::MayAuthorizeMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use AMMWithdrawBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/AccountDelete.h b/include/xrpl/protocol_autogen/transactions/AccountDelete.h
index cf6e97bb63..87ecab0c7b 100644
--- a/include/xrpl/protocol_autogen/transactions/AccountDelete.h
+++ b/include/xrpl/protocol_autogen/transactions/AccountDelete.h
@@ -21,7 +21,7 @@ class AccountDeleteBuilder;
  * Type: ttACCOUNT_DELETE (21)
  * Delegable: Delegation::NotDelegable
  * Amendment: uint256{}
- * Privileges: MustDeleteAcct
+ * Privileges: Privilege::MustDeleteAcct
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use AccountDeleteBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/AccountSet.h b/include/xrpl/protocol_autogen/transactions/AccountSet.h
index 55c449e78e..9f85603e22 100644
--- a/include/xrpl/protocol_autogen/transactions/AccountSet.h
+++ b/include/xrpl/protocol_autogen/transactions/AccountSet.h
@@ -21,7 +21,7 @@ class AccountSetBuilder;
  * Type: ttACCOUNT_SET (3)
  * Delegable: Delegation::NotDelegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use AccountSetBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/Batch.h b/include/xrpl/protocol_autogen/transactions/Batch.h
index 1a59d2b4c0..f92aaa5348 100644
--- a/include/xrpl/protocol_autogen/transactions/Batch.h
+++ b/include/xrpl/protocol_autogen/transactions/Batch.h
@@ -21,7 +21,7 @@ class BatchBuilder;
  * Type: ttBATCH (71)
  * Delegable: Delegation::NotDelegable
  * Amendment: featureBatchV1_1
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use BatchBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/CheckCancel.h b/include/xrpl/protocol_autogen/transactions/CheckCancel.h
index b75b717e3f..cf300d3b9b 100644
--- a/include/xrpl/protocol_autogen/transactions/CheckCancel.h
+++ b/include/xrpl/protocol_autogen/transactions/CheckCancel.h
@@ -21,7 +21,7 @@ class CheckCancelBuilder;
  * Type: ttCHECK_CANCEL (18)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use CheckCancelBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/CheckCash.h b/include/xrpl/protocol_autogen/transactions/CheckCash.h
index c742a15154..b80429875f 100644
--- a/include/xrpl/protocol_autogen/transactions/CheckCash.h
+++ b/include/xrpl/protocol_autogen/transactions/CheckCash.h
@@ -21,7 +21,7 @@ class CheckCashBuilder;
  * Type: ttCHECK_CASH (17)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: MayCreateMpt
+ * Privileges: Privilege::MayCreateMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use CheckCashBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/CheckCreate.h b/include/xrpl/protocol_autogen/transactions/CheckCreate.h
index 63e55f8604..db51b5eb5f 100644
--- a/include/xrpl/protocol_autogen/transactions/CheckCreate.h
+++ b/include/xrpl/protocol_autogen/transactions/CheckCreate.h
@@ -21,7 +21,7 @@ class CheckCreateBuilder;
  * Type: ttCHECK_CREATE (16)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use CheckCreateBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/Clawback.h b/include/xrpl/protocol_autogen/transactions/Clawback.h
index 9a3a7f9feb..ad79f1d1fe 100644
--- a/include/xrpl/protocol_autogen/transactions/Clawback.h
+++ b/include/xrpl/protocol_autogen/transactions/Clawback.h
@@ -21,7 +21,7 @@ class ClawbackBuilder;
  * Type: ttCLAWBACK (30)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use ClawbackBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/ConfidentialMPTClawback.h b/include/xrpl/protocol_autogen/transactions/ConfidentialMPTClawback.h
index c80fc81dc5..bf204a35cb 100644
--- a/include/xrpl/protocol_autogen/transactions/ConfidentialMPTClawback.h
+++ b/include/xrpl/protocol_autogen/transactions/ConfidentialMPTClawback.h
@@ -21,7 +21,7 @@ class ConfidentialMPTClawbackBuilder;
  * Type: ttCONFIDENTIAL_MPT_CLAWBACK (89)
  * Delegable: Delegation::Delegable
  * Amendment: featureConfidentialTransfer
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use ConfidentialMPTClawbackBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/ConfidentialMPTConvert.h b/include/xrpl/protocol_autogen/transactions/ConfidentialMPTConvert.h
index 284b7f9e70..d23e6409d9 100644
--- a/include/xrpl/protocol_autogen/transactions/ConfidentialMPTConvert.h
+++ b/include/xrpl/protocol_autogen/transactions/ConfidentialMPTConvert.h
@@ -21,7 +21,7 @@ class ConfidentialMPTConvertBuilder;
  * Type: ttCONFIDENTIAL_MPT_CONVERT (85)
  * Delegable: Delegation::NotDelegable
  * Amendment: featureConfidentialTransfer
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use ConfidentialMPTConvertBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/ConfidentialMPTConvertBack.h b/include/xrpl/protocol_autogen/transactions/ConfidentialMPTConvertBack.h
index 53a8e64125..80ec81e6f3 100644
--- a/include/xrpl/protocol_autogen/transactions/ConfidentialMPTConvertBack.h
+++ b/include/xrpl/protocol_autogen/transactions/ConfidentialMPTConvertBack.h
@@ -21,7 +21,7 @@ class ConfidentialMPTConvertBackBuilder;
  * Type: ttCONFIDENTIAL_MPT_CONVERT_BACK (87)
  * Delegable: Delegation::Delegable
  * Amendment: featureConfidentialTransfer
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use ConfidentialMPTConvertBackBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/ConfidentialMPTMergeInbox.h b/include/xrpl/protocol_autogen/transactions/ConfidentialMPTMergeInbox.h
index 848da42a41..e3ec886acf 100644
--- a/include/xrpl/protocol_autogen/transactions/ConfidentialMPTMergeInbox.h
+++ b/include/xrpl/protocol_autogen/transactions/ConfidentialMPTMergeInbox.h
@@ -21,7 +21,7 @@ class ConfidentialMPTMergeInboxBuilder;
  * Type: ttCONFIDENTIAL_MPT_MERGE_INBOX (86)
  * Delegable: Delegation::Delegable
  * Amendment: featureConfidentialTransfer
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use ConfidentialMPTMergeInboxBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/ConfidentialMPTSend.h b/include/xrpl/protocol_autogen/transactions/ConfidentialMPTSend.h
index 806a2586e9..b8aac2bd48 100644
--- a/include/xrpl/protocol_autogen/transactions/ConfidentialMPTSend.h
+++ b/include/xrpl/protocol_autogen/transactions/ConfidentialMPTSend.h
@@ -21,7 +21,7 @@ class ConfidentialMPTSendBuilder;
  * Type: ttCONFIDENTIAL_MPT_SEND (88)
  * Delegable: Delegation::Delegable
  * Amendment: featureConfidentialTransfer
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use ConfidentialMPTSendBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/CredentialAccept.h b/include/xrpl/protocol_autogen/transactions/CredentialAccept.h
index f2ab546320..7ee2464460 100644
--- a/include/xrpl/protocol_autogen/transactions/CredentialAccept.h
+++ b/include/xrpl/protocol_autogen/transactions/CredentialAccept.h
@@ -21,7 +21,7 @@ class CredentialAcceptBuilder;
  * Type: ttCREDENTIAL_ACCEPT (59)
  * Delegable: Delegation::Delegable
  * Amendment: featureCredentials
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use CredentialAcceptBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/CredentialCreate.h b/include/xrpl/protocol_autogen/transactions/CredentialCreate.h
index 6cf09c852b..6ccc4e3059 100644
--- a/include/xrpl/protocol_autogen/transactions/CredentialCreate.h
+++ b/include/xrpl/protocol_autogen/transactions/CredentialCreate.h
@@ -21,7 +21,7 @@ class CredentialCreateBuilder;
  * Type: ttCREDENTIAL_CREATE (58)
  * Delegable: Delegation::Delegable
  * Amendment: featureCredentials
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use CredentialCreateBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/CredentialDelete.h b/include/xrpl/protocol_autogen/transactions/CredentialDelete.h
index 24a2bfa62a..74039e50bf 100644
--- a/include/xrpl/protocol_autogen/transactions/CredentialDelete.h
+++ b/include/xrpl/protocol_autogen/transactions/CredentialDelete.h
@@ -21,7 +21,7 @@ class CredentialDeleteBuilder;
  * Type: ttCREDENTIAL_DELETE (60)
  * Delegable: Delegation::Delegable
  * Amendment: featureCredentials
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use CredentialDeleteBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/DIDDelete.h b/include/xrpl/protocol_autogen/transactions/DIDDelete.h
index 304287883d..885f84718d 100644
--- a/include/xrpl/protocol_autogen/transactions/DIDDelete.h
+++ b/include/xrpl/protocol_autogen/transactions/DIDDelete.h
@@ -21,7 +21,7 @@ class DIDDeleteBuilder;
  * Type: ttDID_DELETE (50)
  * Delegable: Delegation::Delegable
  * Amendment: featureDID
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use DIDDeleteBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/DIDSet.h b/include/xrpl/protocol_autogen/transactions/DIDSet.h
index 67e5ba23c5..0679170780 100644
--- a/include/xrpl/protocol_autogen/transactions/DIDSet.h
+++ b/include/xrpl/protocol_autogen/transactions/DIDSet.h
@@ -21,7 +21,7 @@ class DIDSetBuilder;
  * Type: ttDID_SET (49)
  * Delegable: Delegation::Delegable
  * Amendment: featureDID
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use DIDSetBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/DelegateSet.h b/include/xrpl/protocol_autogen/transactions/DelegateSet.h
index 592a778952..1d70166920 100644
--- a/include/xrpl/protocol_autogen/transactions/DelegateSet.h
+++ b/include/xrpl/protocol_autogen/transactions/DelegateSet.h
@@ -21,7 +21,7 @@ class DelegateSetBuilder;
  * Type: ttDELEGATE_SET (64)
  * Delegable: Delegation::NotDelegable
  * Amendment: featurePermissionDelegationV1_1
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use DelegateSetBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/DepositPreauth.h b/include/xrpl/protocol_autogen/transactions/DepositPreauth.h
index b5d575aac5..66c5b390e6 100644
--- a/include/xrpl/protocol_autogen/transactions/DepositPreauth.h
+++ b/include/xrpl/protocol_autogen/transactions/DepositPreauth.h
@@ -21,7 +21,7 @@ class DepositPreauthBuilder;
  * Type: ttDEPOSIT_PREAUTH (19)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use DepositPreauthBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/EnableAmendment.h b/include/xrpl/protocol_autogen/transactions/EnableAmendment.h
index e811ca16df..08a57540ec 100644
--- a/include/xrpl/protocol_autogen/transactions/EnableAmendment.h
+++ b/include/xrpl/protocol_autogen/transactions/EnableAmendment.h
@@ -21,7 +21,7 @@ class EnableAmendmentBuilder;
  * Type: ttAMENDMENT (100)
  * Delegable: Delegation::NotDelegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use EnableAmendmentBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/EscrowCancel.h b/include/xrpl/protocol_autogen/transactions/EscrowCancel.h
index e7e49eca0d..3727bbaa2a 100644
--- a/include/xrpl/protocol_autogen/transactions/EscrowCancel.h
+++ b/include/xrpl/protocol_autogen/transactions/EscrowCancel.h
@@ -21,7 +21,7 @@ class EscrowCancelBuilder;
  * Type: ttESCROW_CANCEL (4)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use EscrowCancelBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/EscrowCreate.h b/include/xrpl/protocol_autogen/transactions/EscrowCreate.h
index b994e4ec07..3d28a12cee 100644
--- a/include/xrpl/protocol_autogen/transactions/EscrowCreate.h
+++ b/include/xrpl/protocol_autogen/transactions/EscrowCreate.h
@@ -21,7 +21,7 @@ class EscrowCreateBuilder;
  * Type: ttESCROW_CREATE (1)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use EscrowCreateBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/EscrowFinish.h b/include/xrpl/protocol_autogen/transactions/EscrowFinish.h
index 2476def5c2..1cbc60c738 100644
--- a/include/xrpl/protocol_autogen/transactions/EscrowFinish.h
+++ b/include/xrpl/protocol_autogen/transactions/EscrowFinish.h
@@ -21,7 +21,7 @@ class EscrowFinishBuilder;
  * Type: ttESCROW_FINISH (2)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use EscrowFinishBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/LedgerStateFix.h b/include/xrpl/protocol_autogen/transactions/LedgerStateFix.h
index af86dea0b0..4c02989f09 100644
--- a/include/xrpl/protocol_autogen/transactions/LedgerStateFix.h
+++ b/include/xrpl/protocol_autogen/transactions/LedgerStateFix.h
@@ -21,7 +21,7 @@ class LedgerStateFixBuilder;
  * Type: ttLEDGER_STATE_FIX (53)
  * Delegable: Delegation::Delegable
  * Amendment: fixNFTokenPageLinks
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use LedgerStateFixBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverClawback.h b/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverClawback.h
index 875e0a4c5e..468ce054c2 100644
--- a/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverClawback.h
+++ b/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverClawback.h
@@ -21,7 +21,7 @@ class LoanBrokerCoverClawbackBuilder;
  * Type: ttLOAN_BROKER_COVER_CLAWBACK (78)
  * Delegable: Delegation::NotDelegable
  * Amendment: featureLendingProtocol
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use LoanBrokerCoverClawbackBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverDeposit.h b/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverDeposit.h
index 38cc113844..0fe1bd7b91 100644
--- a/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverDeposit.h
+++ b/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverDeposit.h
@@ -21,7 +21,7 @@ class LoanBrokerCoverDepositBuilder;
  * Type: ttLOAN_BROKER_COVER_DEPOSIT (76)
  * Delegable: Delegation::NotDelegable
  * Amendment: featureLendingProtocol
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use LoanBrokerCoverDepositBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverWithdraw.h b/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverWithdraw.h
index 148db4292c..4992fb8bbd 100644
--- a/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverWithdraw.h
+++ b/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverWithdraw.h
@@ -21,7 +21,7 @@ class LoanBrokerCoverWithdrawBuilder;
  * Type: ttLOAN_BROKER_COVER_WITHDRAW (77)
  * Delegable: Delegation::NotDelegable
  * Amendment: featureLendingProtocol
- * Privileges: MayAuthorizeMpt
+ * Privileges: Privilege::MayAuthorizeMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use LoanBrokerCoverWithdrawBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/LoanBrokerDelete.h b/include/xrpl/protocol_autogen/transactions/LoanBrokerDelete.h
index 29b3a787fd..c449ebaff0 100644
--- a/include/xrpl/protocol_autogen/transactions/LoanBrokerDelete.h
+++ b/include/xrpl/protocol_autogen/transactions/LoanBrokerDelete.h
@@ -21,7 +21,7 @@ class LoanBrokerDeleteBuilder;
  * Type: ttLOAN_BROKER_DELETE (75)
  * Delegable: Delegation::NotDelegable
  * Amendment: featureLendingProtocol
- * Privileges: MustDeleteAcct | MayAuthorizeMpt
+ * Privileges: Privilege::MustDeleteAcct | Privilege::MayAuthorizeMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use LoanBrokerDeleteBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/LoanBrokerSet.h b/include/xrpl/protocol_autogen/transactions/LoanBrokerSet.h
index 41c87c281d..18f14b7a37 100644
--- a/include/xrpl/protocol_autogen/transactions/LoanBrokerSet.h
+++ b/include/xrpl/protocol_autogen/transactions/LoanBrokerSet.h
@@ -21,7 +21,7 @@ class LoanBrokerSetBuilder;
  * Type: ttLOAN_BROKER_SET (74)
  * Delegable: Delegation::NotDelegable
  * Amendment: featureLendingProtocol
- * Privileges: CreatePseudoAcct | MayAuthorizeMpt
+ * Privileges: Privilege::CreatePseudoAcct | Privilege::MayAuthorizeMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use LoanBrokerSetBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/LoanDelete.h b/include/xrpl/protocol_autogen/transactions/LoanDelete.h
index 8ed537b37a..2696b542da 100644
--- a/include/xrpl/protocol_autogen/transactions/LoanDelete.h
+++ b/include/xrpl/protocol_autogen/transactions/LoanDelete.h
@@ -21,7 +21,7 @@ class LoanDeleteBuilder;
  * Type: ttLOAN_DELETE (81)
  * Delegable: Delegation::NotDelegable
  * Amendment: featureLendingProtocol
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use LoanDeleteBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/LoanManage.h b/include/xrpl/protocol_autogen/transactions/LoanManage.h
index 5eb95d21b1..4a665b372f 100644
--- a/include/xrpl/protocol_autogen/transactions/LoanManage.h
+++ b/include/xrpl/protocol_autogen/transactions/LoanManage.h
@@ -21,7 +21,7 @@ class LoanManageBuilder;
  * Type: ttLOAN_MANAGE (82)
  * Delegable: Delegation::NotDelegable
  * Amendment: featureLendingProtocol
- * Privileges: MayModifyVault
+ * Privileges: Privilege::MayModifyVault
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use LoanManageBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/LoanPay.h b/include/xrpl/protocol_autogen/transactions/LoanPay.h
index 8e1faeb981..c9224fd697 100644
--- a/include/xrpl/protocol_autogen/transactions/LoanPay.h
+++ b/include/xrpl/protocol_autogen/transactions/LoanPay.h
@@ -21,7 +21,7 @@ class LoanPayBuilder;
  * Type: ttLOAN_PAY (84)
  * Delegable: Delegation::NotDelegable
  * Amendment: featureLendingProtocol
- * Privileges: MayAuthorizeMpt | MustModifyVault
+ * Privileges: Privilege::MayAuthorizeMpt | Privilege::MustModifyVault
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use LoanPayBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/LoanSet.h b/include/xrpl/protocol_autogen/transactions/LoanSet.h
index 2cadebd02e..eb04a468f0 100644
--- a/include/xrpl/protocol_autogen/transactions/LoanSet.h
+++ b/include/xrpl/protocol_autogen/transactions/LoanSet.h
@@ -21,7 +21,7 @@ class LoanSetBuilder;
  * Type: ttLOAN_SET (80)
  * Delegable: Delegation::NotDelegable
  * Amendment: featureLendingProtocol
- * Privileges: MayAuthorizeMpt | MustModifyVault
+ * Privileges: Privilege::MayAuthorizeMpt | Privilege::MustModifyVault
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use LoanSetBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/MPTokenAuthorize.h b/include/xrpl/protocol_autogen/transactions/MPTokenAuthorize.h
index 2fb93eaf35..89d026928d 100644
--- a/include/xrpl/protocol_autogen/transactions/MPTokenAuthorize.h
+++ b/include/xrpl/protocol_autogen/transactions/MPTokenAuthorize.h
@@ -21,7 +21,7 @@ class MPTokenAuthorizeBuilder;
  * Type: ttMPTOKEN_AUTHORIZE (57)
  * Delegable: Delegation::Delegable
  * Amendment: featureMPTokensV1
- * Privileges: MustAuthorizeMpt
+ * Privileges: Privilege::MustAuthorizeMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use MPTokenAuthorizeBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceCreate.h b/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceCreate.h
index 82ffba9996..b83de9d843 100644
--- a/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceCreate.h
+++ b/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceCreate.h
@@ -21,7 +21,7 @@ class MPTokenIssuanceCreateBuilder;
  * Type: ttMPTOKEN_ISSUANCE_CREATE (54)
  * Delegable: Delegation::Delegable
  * Amendment: featureMPTokensV1
- * Privileges: CreateMptIssuance
+ * Privileges: Privilege::CreateMptIssuance
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use MPTokenIssuanceCreateBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceDestroy.h b/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceDestroy.h
index cbcd206097..6d1c9b1eaa 100644
--- a/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceDestroy.h
+++ b/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceDestroy.h
@@ -21,7 +21,7 @@ class MPTokenIssuanceDestroyBuilder;
  * Type: ttMPTOKEN_ISSUANCE_DESTROY (55)
  * Delegable: Delegation::Delegable
  * Amendment: featureMPTokensV1
- * Privileges: DestroyMptIssuance
+ * Privileges: Privilege::DestroyMptIssuance
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use MPTokenIssuanceDestroyBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceSet.h b/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceSet.h
index ed7e1f0f6c..43def05194 100644
--- a/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceSet.h
+++ b/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceSet.h
@@ -21,7 +21,7 @@ class MPTokenIssuanceSetBuilder;
  * Type: ttMPTOKEN_ISSUANCE_SET (56)
  * Delegable: Delegation::Delegable
  * Amendment: featureMPTokensV1
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use MPTokenIssuanceSetBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/NFTokenAcceptOffer.h b/include/xrpl/protocol_autogen/transactions/NFTokenAcceptOffer.h
index 325d2d7fbd..6c858be721 100644
--- a/include/xrpl/protocol_autogen/transactions/NFTokenAcceptOffer.h
+++ b/include/xrpl/protocol_autogen/transactions/NFTokenAcceptOffer.h
@@ -21,7 +21,7 @@ class NFTokenAcceptOfferBuilder;
  * Type: ttNFTOKEN_ACCEPT_OFFER (29)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use NFTokenAcceptOfferBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/NFTokenBurn.h b/include/xrpl/protocol_autogen/transactions/NFTokenBurn.h
index ec423ea468..ac831bf45e 100644
--- a/include/xrpl/protocol_autogen/transactions/NFTokenBurn.h
+++ b/include/xrpl/protocol_autogen/transactions/NFTokenBurn.h
@@ -21,7 +21,7 @@ class NFTokenBurnBuilder;
  * Type: ttNFTOKEN_BURN (26)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: ChangeNftCounts
+ * Privileges: Privilege::ChangeNftCounts
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use NFTokenBurnBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/NFTokenCancelOffer.h b/include/xrpl/protocol_autogen/transactions/NFTokenCancelOffer.h
index 4c4fb1dc65..81f4f3a848 100644
--- a/include/xrpl/protocol_autogen/transactions/NFTokenCancelOffer.h
+++ b/include/xrpl/protocol_autogen/transactions/NFTokenCancelOffer.h
@@ -21,7 +21,7 @@ class NFTokenCancelOfferBuilder;
  * Type: ttNFTOKEN_CANCEL_OFFER (28)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use NFTokenCancelOfferBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/NFTokenCreateOffer.h b/include/xrpl/protocol_autogen/transactions/NFTokenCreateOffer.h
index a535a578e0..683436f4fd 100644
--- a/include/xrpl/protocol_autogen/transactions/NFTokenCreateOffer.h
+++ b/include/xrpl/protocol_autogen/transactions/NFTokenCreateOffer.h
@@ -21,7 +21,7 @@ class NFTokenCreateOfferBuilder;
  * Type: ttNFTOKEN_CREATE_OFFER (27)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use NFTokenCreateOfferBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/NFTokenMint.h b/include/xrpl/protocol_autogen/transactions/NFTokenMint.h
index 5af41eb3dd..5a4e3b5b1c 100644
--- a/include/xrpl/protocol_autogen/transactions/NFTokenMint.h
+++ b/include/xrpl/protocol_autogen/transactions/NFTokenMint.h
@@ -21,7 +21,7 @@ class NFTokenMintBuilder;
  * Type: ttNFTOKEN_MINT (25)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: ChangeNftCounts
+ * Privileges: Privilege::ChangeNftCounts
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use NFTokenMintBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/NFTokenModify.h b/include/xrpl/protocol_autogen/transactions/NFTokenModify.h
index 9b9701fed6..84f1e395d4 100644
--- a/include/xrpl/protocol_autogen/transactions/NFTokenModify.h
+++ b/include/xrpl/protocol_autogen/transactions/NFTokenModify.h
@@ -21,7 +21,7 @@ class NFTokenModifyBuilder;
  * Type: ttNFTOKEN_MODIFY (61)
  * Delegable: Delegation::Delegable
  * Amendment: featureDynamicNFT
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use NFTokenModifyBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/OfferCancel.h b/include/xrpl/protocol_autogen/transactions/OfferCancel.h
index 5e6010e0dd..3e52ebf24b 100644
--- a/include/xrpl/protocol_autogen/transactions/OfferCancel.h
+++ b/include/xrpl/protocol_autogen/transactions/OfferCancel.h
@@ -21,7 +21,7 @@ class OfferCancelBuilder;
  * Type: ttOFFER_CANCEL (8)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use OfferCancelBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/OfferCreate.h b/include/xrpl/protocol_autogen/transactions/OfferCreate.h
index ffc1216297..774921d87a 100644
--- a/include/xrpl/protocol_autogen/transactions/OfferCreate.h
+++ b/include/xrpl/protocol_autogen/transactions/OfferCreate.h
@@ -21,7 +21,7 @@ class OfferCreateBuilder;
  * Type: ttOFFER_CREATE (7)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: MayCreateMpt
+ * Privileges: Privilege::MayCreateMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use OfferCreateBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/OracleDelete.h b/include/xrpl/protocol_autogen/transactions/OracleDelete.h
index ebdc8fb7e9..e50b6f6b02 100644
--- a/include/xrpl/protocol_autogen/transactions/OracleDelete.h
+++ b/include/xrpl/protocol_autogen/transactions/OracleDelete.h
@@ -21,7 +21,7 @@ class OracleDeleteBuilder;
  * Type: ttORACLE_DELETE (52)
  * Delegable: Delegation::Delegable
  * Amendment: featurePriceOracle
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use OracleDeleteBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/OracleSet.h b/include/xrpl/protocol_autogen/transactions/OracleSet.h
index 0ec6d5cad0..03e4ffc518 100644
--- a/include/xrpl/protocol_autogen/transactions/OracleSet.h
+++ b/include/xrpl/protocol_autogen/transactions/OracleSet.h
@@ -21,7 +21,7 @@ class OracleSetBuilder;
  * Type: ttORACLE_SET (51)
  * Delegable: Delegation::Delegable
  * Amendment: featurePriceOracle
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use OracleSetBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/Payment.h b/include/xrpl/protocol_autogen/transactions/Payment.h
index 389900bf12..cb177a8d08 100644
--- a/include/xrpl/protocol_autogen/transactions/Payment.h
+++ b/include/xrpl/protocol_autogen/transactions/Payment.h
@@ -21,7 +21,7 @@ class PaymentBuilder;
  * Type: ttPAYMENT (0)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: CreateAcct | MayCreateMpt
+ * Privileges: Privilege::CreateAcct | Privilege::MayCreateMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use PaymentBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/PaymentChannelClaim.h b/include/xrpl/protocol_autogen/transactions/PaymentChannelClaim.h
index 4c567b13f4..06892955db 100644
--- a/include/xrpl/protocol_autogen/transactions/PaymentChannelClaim.h
+++ b/include/xrpl/protocol_autogen/transactions/PaymentChannelClaim.h
@@ -21,7 +21,7 @@ class PaymentChannelClaimBuilder;
  * Type: ttPAYCHAN_CLAIM (15)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use PaymentChannelClaimBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/PaymentChannelCreate.h b/include/xrpl/protocol_autogen/transactions/PaymentChannelCreate.h
index 0a513d575a..2a3aebca4c 100644
--- a/include/xrpl/protocol_autogen/transactions/PaymentChannelCreate.h
+++ b/include/xrpl/protocol_autogen/transactions/PaymentChannelCreate.h
@@ -21,7 +21,7 @@ class PaymentChannelCreateBuilder;
  * Type: ttPAYCHAN_CREATE (13)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use PaymentChannelCreateBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/PaymentChannelFund.h b/include/xrpl/protocol_autogen/transactions/PaymentChannelFund.h
index 51210dd796..9a8c452b0b 100644
--- a/include/xrpl/protocol_autogen/transactions/PaymentChannelFund.h
+++ b/include/xrpl/protocol_autogen/transactions/PaymentChannelFund.h
@@ -21,7 +21,7 @@ class PaymentChannelFundBuilder;
  * Type: ttPAYCHAN_FUND (14)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use PaymentChannelFundBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/PermissionedDomainDelete.h b/include/xrpl/protocol_autogen/transactions/PermissionedDomainDelete.h
index 3db921776c..1b16b13116 100644
--- a/include/xrpl/protocol_autogen/transactions/PermissionedDomainDelete.h
+++ b/include/xrpl/protocol_autogen/transactions/PermissionedDomainDelete.h
@@ -21,7 +21,7 @@ class PermissionedDomainDeleteBuilder;
  * Type: ttPERMISSIONED_DOMAIN_DELETE (63)
  * Delegable: Delegation::Delegable
  * Amendment: featurePermissionedDomains
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use PermissionedDomainDeleteBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/PermissionedDomainSet.h b/include/xrpl/protocol_autogen/transactions/PermissionedDomainSet.h
index 3e352cad76..30832aec8c 100644
--- a/include/xrpl/protocol_autogen/transactions/PermissionedDomainSet.h
+++ b/include/xrpl/protocol_autogen/transactions/PermissionedDomainSet.h
@@ -21,7 +21,7 @@ class PermissionedDomainSetBuilder;
  * Type: ttPERMISSIONED_DOMAIN_SET (62)
  * Delegable: Delegation::Delegable
  * Amendment: featurePermissionedDomains
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use PermissionedDomainSetBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/SetFee.h b/include/xrpl/protocol_autogen/transactions/SetFee.h
index 177f39199b..9513723e94 100644
--- a/include/xrpl/protocol_autogen/transactions/SetFee.h
+++ b/include/xrpl/protocol_autogen/transactions/SetFee.h
@@ -21,7 +21,7 @@ class SetFeeBuilder;
  * Type: ttFEE (101)
  * Delegable: Delegation::NotDelegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use SetFeeBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/SetRegularKey.h b/include/xrpl/protocol_autogen/transactions/SetRegularKey.h
index a943bb0279..042676251b 100644
--- a/include/xrpl/protocol_autogen/transactions/SetRegularKey.h
+++ b/include/xrpl/protocol_autogen/transactions/SetRegularKey.h
@@ -21,7 +21,7 @@ class SetRegularKeyBuilder;
  * Type: ttREGULAR_KEY_SET (5)
  * Delegable: Delegation::NotDelegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use SetRegularKeyBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/SignerListSet.h b/include/xrpl/protocol_autogen/transactions/SignerListSet.h
index 6e9d0e41ba..253bcccc1a 100644
--- a/include/xrpl/protocol_autogen/transactions/SignerListSet.h
+++ b/include/xrpl/protocol_autogen/transactions/SignerListSet.h
@@ -21,7 +21,7 @@ class SignerListSetBuilder;
  * Type: ttSIGNER_LIST_SET (12)
  * Delegable: Delegation::NotDelegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use SignerListSetBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/SponsorshipSet.h b/include/xrpl/protocol_autogen/transactions/SponsorshipSet.h
index dfd12a329f..bb3eb2ccf0 100644
--- a/include/xrpl/protocol_autogen/transactions/SponsorshipSet.h
+++ b/include/xrpl/protocol_autogen/transactions/SponsorshipSet.h
@@ -21,7 +21,7 @@ class SponsorshipSetBuilder;
  * Type: ttSPONSORSHIP_SET (91)
  * Delegable: Delegation::Delegable
  * Amendment: featureSponsor
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use SponsorshipSetBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/SponsorshipTransfer.h b/include/xrpl/protocol_autogen/transactions/SponsorshipTransfer.h
index ab26e887e3..5bd5bc1319 100644
--- a/include/xrpl/protocol_autogen/transactions/SponsorshipTransfer.h
+++ b/include/xrpl/protocol_autogen/transactions/SponsorshipTransfer.h
@@ -21,7 +21,7 @@ class SponsorshipTransferBuilder;
  * Type: ttSPONSORSHIP_TRANSFER (90)
  * Delegable: Delegation::NotDelegable
  * Amendment: featureSponsor
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use SponsorshipTransferBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/TicketCreate.h b/include/xrpl/protocol_autogen/transactions/TicketCreate.h
index 0d8670a76a..4cb109b8f2 100644
--- a/include/xrpl/protocol_autogen/transactions/TicketCreate.h
+++ b/include/xrpl/protocol_autogen/transactions/TicketCreate.h
@@ -21,7 +21,7 @@ class TicketCreateBuilder;
  * Type: ttTICKET_CREATE (10)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use TicketCreateBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/TrustSet.h b/include/xrpl/protocol_autogen/transactions/TrustSet.h
index 22891b94ec..9d939eb1d0 100644
--- a/include/xrpl/protocol_autogen/transactions/TrustSet.h
+++ b/include/xrpl/protocol_autogen/transactions/TrustSet.h
@@ -21,7 +21,7 @@ class TrustSetBuilder;
  * Type: ttTRUST_SET (20)
  * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use TrustSetBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/UNLModify.h b/include/xrpl/protocol_autogen/transactions/UNLModify.h
index 6569e4bf7d..f5c94071d7 100644
--- a/include/xrpl/protocol_autogen/transactions/UNLModify.h
+++ b/include/xrpl/protocol_autogen/transactions/UNLModify.h
@@ -21,7 +21,7 @@ class UNLModifyBuilder;
  * Type: ttUNL_MODIFY (102)
  * Delegable: Delegation::NotDelegable
  * Amendment: uint256{}
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use UNLModifyBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/VaultClawback.h b/include/xrpl/protocol_autogen/transactions/VaultClawback.h
index 270ccc94bb..d859b4a446 100644
--- a/include/xrpl/protocol_autogen/transactions/VaultClawback.h
+++ b/include/xrpl/protocol_autogen/transactions/VaultClawback.h
@@ -21,7 +21,7 @@ class VaultClawbackBuilder;
  * Type: ttVAULT_CLAWBACK (70)
  * Delegable: Delegation::NotDelegable
  * Amendment: featureSingleAssetVault
- * Privileges: MayDeleteMpt | MustModifyVault
+ * Privileges: Privilege::MayDeleteMpt | Privilege::MustModifyVault
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use VaultClawbackBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/VaultCreate.h b/include/xrpl/protocol_autogen/transactions/VaultCreate.h
index e206925e02..2925302dec 100644
--- a/include/xrpl/protocol_autogen/transactions/VaultCreate.h
+++ b/include/xrpl/protocol_autogen/transactions/VaultCreate.h
@@ -21,7 +21,7 @@ class VaultCreateBuilder;
  * Type: ttVAULT_CREATE (65)
  * Delegable: Delegation::NotDelegable
  * Amendment: featureSingleAssetVault
- * Privileges: CreatePseudoAcct | CreateMptIssuance | MustModifyVault
+ * Privileges: Privilege::CreatePseudoAcct | Privilege::CreateMptIssuance | Privilege::MustModifyVault
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use VaultCreateBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/VaultDelete.h b/include/xrpl/protocol_autogen/transactions/VaultDelete.h
index 67cc32f543..3cef0ce599 100644
--- a/include/xrpl/protocol_autogen/transactions/VaultDelete.h
+++ b/include/xrpl/protocol_autogen/transactions/VaultDelete.h
@@ -21,7 +21,7 @@ class VaultDeleteBuilder;
  * Type: ttVAULT_DELETE (67)
  * Delegable: Delegation::NotDelegable
  * Amendment: featureSingleAssetVault
- * Privileges: MustDeleteAcct | DestroyMptIssuance | MustModifyVault
+ * Privileges: Privilege::MustDeleteAcct | Privilege::DestroyMptIssuance | Privilege::MustModifyVault
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use VaultDeleteBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/VaultDeposit.h b/include/xrpl/protocol_autogen/transactions/VaultDeposit.h
index 5bb5362114..099342aa0c 100644
--- a/include/xrpl/protocol_autogen/transactions/VaultDeposit.h
+++ b/include/xrpl/protocol_autogen/transactions/VaultDeposit.h
@@ -21,7 +21,7 @@ class VaultDepositBuilder;
  * Type: ttVAULT_DEPOSIT (68)
  * Delegable: Delegation::NotDelegable
  * Amendment: featureSingleAssetVault
- * Privileges: MayAuthorizeMpt | MustModifyVault
+ * Privileges: Privilege::MayAuthorizeMpt | Privilege::MustModifyVault
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use VaultDepositBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/VaultSet.h b/include/xrpl/protocol_autogen/transactions/VaultSet.h
index 14df70f13b..33dfe8bf21 100644
--- a/include/xrpl/protocol_autogen/transactions/VaultSet.h
+++ b/include/xrpl/protocol_autogen/transactions/VaultSet.h
@@ -21,7 +21,7 @@ class VaultSetBuilder;
  * Type: ttVAULT_SET (66)
  * Delegable: Delegation::NotDelegable
  * Amendment: featureSingleAssetVault
- * Privileges: MustModifyVault
+ * Privileges: Privilege::MustModifyVault
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use VaultSetBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/VaultWithdraw.h b/include/xrpl/protocol_autogen/transactions/VaultWithdraw.h
index 17208cd76c..dfa662f8fd 100644
--- a/include/xrpl/protocol_autogen/transactions/VaultWithdraw.h
+++ b/include/xrpl/protocol_autogen/transactions/VaultWithdraw.h
@@ -21,7 +21,7 @@ class VaultWithdrawBuilder;
  * Type: ttVAULT_WITHDRAW (69)
  * Delegable: Delegation::NotDelegable
  * Amendment: featureSingleAssetVault
- * Privileges: MayDeleteMpt | MayAuthorizeMpt | MustModifyVault
+ * Privileges: Privilege::MayDeleteMpt | Privilege::MayAuthorizeMpt | Privilege::MustModifyVault
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use VaultWithdrawBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/XChainAccountCreateCommit.h b/include/xrpl/protocol_autogen/transactions/XChainAccountCreateCommit.h
index b8d551c5e1..a9aa7c2343 100644
--- a/include/xrpl/protocol_autogen/transactions/XChainAccountCreateCommit.h
+++ b/include/xrpl/protocol_autogen/transactions/XChainAccountCreateCommit.h
@@ -21,7 +21,7 @@ class XChainAccountCreateCommitBuilder;
  * Type: ttXCHAIN_ACCOUNT_CREATE_COMMIT (44)
  * Delegable: Delegation::Delegable
  * Amendment: featureXChainBridge
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use XChainAccountCreateCommitBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/XChainAddAccountCreateAttestation.h b/include/xrpl/protocol_autogen/transactions/XChainAddAccountCreateAttestation.h
index 22b57803dc..9cb1f2eaaf 100644
--- a/include/xrpl/protocol_autogen/transactions/XChainAddAccountCreateAttestation.h
+++ b/include/xrpl/protocol_autogen/transactions/XChainAddAccountCreateAttestation.h
@@ -21,7 +21,7 @@ class XChainAddAccountCreateAttestationBuilder;
  * Type: ttXCHAIN_ADD_ACCOUNT_CREATE_ATTESTATION (46)
  * Delegable: Delegation::Delegable
  * Amendment: featureXChainBridge
- * Privileges: CreateAcct
+ * Privileges: Privilege::CreateAcct
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use XChainAddAccountCreateAttestationBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/XChainAddClaimAttestation.h b/include/xrpl/protocol_autogen/transactions/XChainAddClaimAttestation.h
index 5e80c05aae..9184c83958 100644
--- a/include/xrpl/protocol_autogen/transactions/XChainAddClaimAttestation.h
+++ b/include/xrpl/protocol_autogen/transactions/XChainAddClaimAttestation.h
@@ -21,7 +21,7 @@ class XChainAddClaimAttestationBuilder;
  * Type: ttXCHAIN_ADD_CLAIM_ATTESTATION (45)
  * Delegable: Delegation::Delegable
  * Amendment: featureXChainBridge
- * Privileges: CreateAcct
+ * Privileges: Privilege::CreateAcct
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use XChainAddClaimAttestationBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/XChainClaim.h b/include/xrpl/protocol_autogen/transactions/XChainClaim.h
index ec403b5eb8..e49434c878 100644
--- a/include/xrpl/protocol_autogen/transactions/XChainClaim.h
+++ b/include/xrpl/protocol_autogen/transactions/XChainClaim.h
@@ -21,7 +21,7 @@ class XChainClaimBuilder;
  * Type: ttXCHAIN_CLAIM (43)
  * Delegable: Delegation::Delegable
  * Amendment: featureXChainBridge
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use XChainClaimBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/XChainCommit.h b/include/xrpl/protocol_autogen/transactions/XChainCommit.h
index 48b2263645..471a58dc53 100644
--- a/include/xrpl/protocol_autogen/transactions/XChainCommit.h
+++ b/include/xrpl/protocol_autogen/transactions/XChainCommit.h
@@ -21,7 +21,7 @@ class XChainCommitBuilder;
  * Type: ttXCHAIN_COMMIT (42)
  * Delegable: Delegation::Delegable
  * Amendment: featureXChainBridge
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use XChainCommitBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/XChainCreateBridge.h b/include/xrpl/protocol_autogen/transactions/XChainCreateBridge.h
index 9614b0bd88..ae1269e825 100644
--- a/include/xrpl/protocol_autogen/transactions/XChainCreateBridge.h
+++ b/include/xrpl/protocol_autogen/transactions/XChainCreateBridge.h
@@ -21,7 +21,7 @@ class XChainCreateBridgeBuilder;
  * Type: ttXCHAIN_CREATE_BRIDGE (48)
  * Delegable: Delegation::Delegable
  * Amendment: featureXChainBridge
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use XChainCreateBridgeBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/XChainCreateClaimID.h b/include/xrpl/protocol_autogen/transactions/XChainCreateClaimID.h
index d17759619f..4c6f98e48f 100644
--- a/include/xrpl/protocol_autogen/transactions/XChainCreateClaimID.h
+++ b/include/xrpl/protocol_autogen/transactions/XChainCreateClaimID.h
@@ -21,7 +21,7 @@ class XChainCreateClaimIDBuilder;
  * Type: ttXCHAIN_CREATE_CLAIM_ID (41)
  * Delegable: Delegation::Delegable
  * Amendment: featureXChainBridge
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use XChainCreateClaimIDBuilder to construct new transactions.
diff --git a/include/xrpl/protocol_autogen/transactions/XChainModifyBridge.h b/include/xrpl/protocol_autogen/transactions/XChainModifyBridge.h
index e79c9139ce..a3f2930668 100644
--- a/include/xrpl/protocol_autogen/transactions/XChainModifyBridge.h
+++ b/include/xrpl/protocol_autogen/transactions/XChainModifyBridge.h
@@ -21,7 +21,7 @@ class XChainModifyBridgeBuilder;
  * Type: ttXCHAIN_MODIFY_BRIDGE (47)
  * Delegable: Delegation::Delegable
  * Amendment: featureXChainBridge
- * Privileges: NoPriv
+ * Privileges: Privilege::NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use XChainModifyBridgeBuilder to construct new transactions.
diff --git a/include/xrpl/tx/invariants/InvariantCheckPrivilege.h b/include/xrpl/tx/invariants/InvariantCheckPrivilege.h
index b2f1c62a54..ca9755ea1c 100644
--- a/include/xrpl/tx/invariants/InvariantCheckPrivilege.h
+++ b/include/xrpl/tx/invariants/InvariantCheckPrivilege.h
@@ -1,9 +1,7 @@
 #pragma once
 
-#include <xrpl/basics/safe_cast.h>
 #include <xrpl/protocol/STTx.h>
-
-#include <type_traits>
+#include <xrpl/protocol/TxSettings.h>  // IWYU pragma: export
 
 namespace xrpl {
 
@@ -26,37 +24,8 @@ not have the relevant amendments enabled_. It's intentionally a pain in the neck
 so that bad code gets caught and fixed as early as possible.
 */
 
-// Bitwise flags, 86 files, used in macros files
-// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
-enum Privilege {
-    NoPriv = 0x0000,              // The transaction can not do any of the enumerated operations
-    CreateAcct = 0x0001,          // The transaction can create a new ACCOUNT_ROOT object.
-    CreatePseudoAcct = 0x0002,    // The transaction can create a pseudo account,
-                                  // which implies createAcct
-    MustDeleteAcct = 0x0004,      // The transaction must delete an ACCOUNT_ROOT object
-    MayDeleteAcct = 0x0008,       // The transaction may delete an ACCOUNT_ROOT
-                                  // object, but does not have to
-    OverrideFreeze = 0x0010,      // The transaction can override some freeze rules
-    ChangeNftCounts = 0x0020,     // The transaction can mint or burn an NFT
-    CreateMptIssuance = 0x0040,   // The transaction can create a new MPT issuance
-    DestroyMptIssuance = 0x0080,  // The transaction can destroy an MPT issuance
-    MustAuthorizeMpt = 0x0100,    // The transaction MUST create or delete an MPT
-                                  // object (except by issuer)
-    MayAuthorizeMpt = 0x0200,     // The transaction MAY create or delete an MPT
-                                  // object (except by issuer)
-    MayDeleteMpt = 0x0400,        // The transaction MAY delete an MPT object. May not create.
-    MustModifyVault = 0x0800,     // The transaction must modify, delete or create, a vault
-    MayModifyVault = 0x1000,      // The transaction MAY modify, delete or create, a vault
-    MayCreateMpt = 0x2000,        // The transaction MAY create an MPT object, except for issuer.
-};
-
-constexpr Privilege
-operator|(Privilege lhs, Privilege rhs)
-{
-    return safeCast<Privilege>(
-        safeCast<std::underlying_type_t<Privilege>>(lhs) |
-        safeCast<std::underlying_type_t<Privilege>>(rhs));
-}
+// `enum Privilege` and its `operator|` live in <xrpl/protocol/TxSettings.h>,
+// alongside the TxSettings struct that carries them out of transactions.macro.
 
 bool
 hasPrivilege(STTx const& tx, Privilege priv);
diff --git a/src/libxrpl/protocol/Permissions.cpp b/src/libxrpl/protocol/Permissions.cpp
index 2f3e25f823..a5adb294e9 100644
--- a/src/libxrpl/protocol/Permissions.cpp
+++ b/src/libxrpl/protocol/Permissions.cpp
@@ -10,6 +10,7 @@
 #include <xrpl/protocol/STTx.h>
 #include <xrpl/protocol/TxFlags.h>  // IWYU pragma: keep
 #include <xrpl/protocol/TxFormats.h>
+#include <xrpl/protocol/TxSettings.h>
 
 #include <algorithm>
 #include <cstdint>
@@ -40,16 +41,24 @@ Permission::GranularPermissionEntry::GranularPermissionEntry(
 Permission::Permission()
 {
     {
+#pragma push_macro("UNWRAP")
+#undef UNWRAP
 #pragma push_macro("TRANSACTION")
 #undef TRANSACTION
 
-#define TRANSACTION(tag, value, name, delegable, amendment, ...) \
-    txDelegationMap_[static_cast<TxType>(value)] = {amendment, delegable};
+#define UNWRAP(...) __VA_ARGS__
+#define TRANSACTION(tag, value, name, settings, ...)                               \
+    {                                                                              \
+        TxSettings const s = UNWRAP settings;                                      \
+        txDelegationMap_[static_cast<TxType>(value)] = {s.amendment, s.delegable}; \
+    }
 
 #include <xrpl/protocol/detail/transactions.macro>
 
 #undef TRANSACTION
 #pragma pop_macro("TRANSACTION")
+#undef UNWRAP
+#pragma pop_macro("UNWRAP")
     }
 
     granularPermissionsByName_ = {
@@ -242,7 +251,7 @@ Permission::isDelegable(std::uint32_t permissionValue, Rules const& rules) const
 
     // Tx-level permissions require the transaction type itself to be delegable, and
     // the corresponding amendment enabled.
-    return txIt != txDelegationMap_.end() && txIt->second.delegable != NotDelegable &&
+    return txIt != txDelegationMap_.end() && txIt->second.delegable != Delegation::NotDelegable &&
         amendmentEnabled(txIt->second);
 }
 
diff --git a/src/libxrpl/protocol/TxFormats.cpp b/src/libxrpl/protocol/TxFormats.cpp
index e4d4c4b03c..c393c606fe 100644
--- a/src/libxrpl/protocol/TxFormats.cpp
+++ b/src/libxrpl/protocol/TxFormats.cpp
@@ -45,7 +45,7 @@ TxFormats::TxFormats()
 #undef TRANSACTION
 
 #define UNWRAP(...) __VA_ARGS__
-#define TRANSACTION(tag, value, name, delegable, amendment, privileges, fields) \
+#define TRANSACTION(tag, value, name, settings, fields) \
     add(jss::name, tag, UNWRAP fields, getCommonFields());
 
 #include <xrpl/protocol/detail/transactions.macro>
diff --git a/src/libxrpl/tx/invariants/FreezeInvariant.cpp b/src/libxrpl/tx/invariants/FreezeInvariant.cpp
index d6039eabd8..272e52f09a 100644
--- a/src/libxrpl/tx/invariants/FreezeInvariant.cpp
+++ b/src/libxrpl/tx/invariants/FreezeInvariant.cpp
@@ -288,7 +288,8 @@ TransfersNotFrozen::validateFrozenState(
     // individually-frozen or deep-frozen AMM trust lines.
     // Post-fixCleanup3_4_0: AMMClawbacks are allowed to override all freeze types.
     bool const isAMMLine = change.line->isFlag(lsfAMMNode);
-    if ((fixOverrideFreeze || !isAMMLine || globalFreeze) && hasPrivilege(tx, OverrideFreeze))
+    if ((fixOverrideFreeze || !isAMMLine || globalFreeze) &&
+        hasPrivilege(tx, Privilege::OverrideFreeze))
     {
         JLOG(j.debug()) << "Invariant check allowing funds to be moved "
                         << (change.balanceChangeSign > 0 ? "to" : "from")
diff --git a/src/libxrpl/tx/invariants/InvariantCheck.cpp b/src/libxrpl/tx/invariants/InvariantCheck.cpp
index 369206d9e6..aa4df8db42 100644
--- a/src/libxrpl/tx/invariants/InvariantCheck.cpp
+++ b/src/libxrpl/tx/invariants/InvariantCheck.cpp
@@ -25,6 +25,7 @@
 #include <xrpl/protocol/SystemParameters.h>
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxFormats.h>
+#include <xrpl/protocol/TxSettings.h>
 #include <xrpl/protocol/UintTypes.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/invariants/InvariantCheckPrivilege.h>
@@ -40,12 +41,15 @@
 
 namespace xrpl {
 
+#pragma push_macro("UNWRAP")
+#undef UNWRAP
 #pragma push_macro("TRANSACTION")
 #undef TRANSACTION
 
-#define TRANSACTION(tag, value, name, delegable, amendment, privileges, ...) \
-    case tag: {                                                              \
-        return (privileges) & priv;                                          \
+#define UNWRAP(...) __VA_ARGS__
+#define TRANSACTION(tag, value, name, settings, ...)                                  \
+    case tag: {                                                                       \
+        return ((TxSettings UNWRAP settings).privileges & priv) != Privilege::NoPriv; \
     }
 
 bool
@@ -63,6 +67,8 @@ hasPrivilege(STTx const& tx, Privilege priv)
 
 #undef TRANSACTION
 #pragma pop_macro("TRANSACTION")
+#undef UNWRAP
+#pragma pop_macro("UNWRAP")
 
 // Returns the human-readable name of a ledger entry's type, falling back to
 // the numeric type if the format is somehow unknown.
@@ -436,7 +442,7 @@ AccountRootsNotDeleted::finalize(
     // transaction when the total AMM LP Tokens balance goes to 0.
     // A successful AccountDelete or AMMDelete MUST delete exactly
     // one account root.
-    if (hasPrivilege(tx, MustDeleteAcct) && isTesSuccess(result))
+    if (hasPrivilege(tx, Privilege::MustDeleteAcct) && isTesSuccess(result))
     {
         if (accountsDeleted_ == 1)
             return true;
@@ -457,7 +463,7 @@ AccountRootsNotDeleted::finalize(
     // A successful AMMWithdraw/AMMClawback MAY delete one account root
     // when the total AMM LP Tokens balance goes to 0. Not every AMM withdraw
     // deletes the AMM account, accountsDeleted_ is set if it is deleted.
-    if (hasPrivilege(tx, MayDeleteAcct) && isTesSuccess(result) && accountsDeleted_ == 1)
+    if (hasPrivilege(tx, Privilege::MayDeleteAcct) && isTesSuccess(result) && accountsDeleted_ == 1)
         return true;
 
     if (accountsDeleted_ == 0)
@@ -760,14 +766,15 @@ ValidNewAccountRoot::finalize(
     }
 
     // From this point on we know exactly one account was created.
-    if (hasPrivilege(tx, CreateAcct | CreatePseudoAcct) && isTesSuccess(result))
+    if (hasPrivilege(tx, Privilege::CreateAcct | Privilege::CreatePseudoAcct) &&
+        isTesSuccess(result))
     {
         bool const pseudoAccount =
             (pseudoAccount_ &&
              (view.rules().enabled(featureSingleAssetVault) ||
               view.rules().enabled(featureLendingProtocol)));
 
-        if (pseudoAccount && !hasPrivilege(tx, CreatePseudoAcct))
+        if (pseudoAccount && !hasPrivilege(tx, Privilege::CreatePseudoAcct))
         {
             JLOG(j.fatal()) << "Invariant failed: pseudo-account created by a "
                                "wrong transaction type";
diff --git a/src/libxrpl/tx/invariants/MPTInvariant.cpp b/src/libxrpl/tx/invariants/MPTInvariant.cpp
index 045d03ab02..89ade024e6 100644
--- a/src/libxrpl/tx/invariants/MPTInvariant.cpp
+++ b/src/libxrpl/tx/invariants/MPTInvariant.cpp
@@ -211,7 +211,7 @@ ValidMPTIssuance::finalize(
         }
 
         auto const txnType = tx.getTxnType();
-        if (hasPrivilege(tx, CreateMptIssuance))
+        if (hasPrivilege(tx, Privilege::CreateMptIssuance))
         {
             if (mptIssuancesCreated_ == 0)
             {
@@ -232,7 +232,7 @@ ValidMPTIssuance::finalize(
             return mptIssuancesCreated_ == 1 && mptIssuancesDeleted_ == 0;
         }
 
-        if (hasPrivilege(tx, DestroyMptIssuance))
+        if (hasPrivilege(tx, Privilege::DestroyMptIssuance))
         {
             if (mptIssuancesDeleted_ == 0)
             {
@@ -259,7 +259,8 @@ ValidMPTIssuance::finalize(
         // non-amendment-gated side effects.
         bool const enforceEscrowFinish = (txnType == ttESCROW_FINISH) &&
             (rules.enabled(featureSingleAssetVault) || lendingProtocolEnabled);
-        if (hasPrivilege(tx, MustAuthorizeMpt | MayAuthorizeMpt) || enforceEscrowFinish)
+        if (hasPrivilege(tx, Privilege::MustAuthorizeMpt | Privilege::MayAuthorizeMpt) ||
+            enforceEscrowFinish)
         {
             bool const submittedByIssuer = tx.isFieldPresent(sfHolder);
 
@@ -275,7 +276,7 @@ ValidMPTIssuance::finalize(
                                    "succeeded but deleted issuances";
                 return false;
             }
-            if (mptV2Enabled && hasPrivilege(tx, MayAuthorizeMpt) &&
+            if (mptV2Enabled && hasPrivilege(tx, Privilege::MayAuthorizeMpt) &&
                 (txnType == ttAMM_WITHDRAW || txnType == ttAMM_CLAWBACK))
             {
                 if (submittedByIssuer && txnType == ttAMM_WITHDRAW && mptokensCreated_ > 0)
@@ -311,7 +312,7 @@ ValidMPTIssuance::finalize(
                 return false;
             }
             else if (
-                !submittedByIssuer && hasPrivilege(tx, MustAuthorizeMpt) &&
+                !submittedByIssuer && hasPrivilege(tx, Privilege::MustAuthorizeMpt) &&
                 (mptokensCreated_ + mptokensDeleted_ != 1))
             {
                 // if the holder submitted this tx, then a mptoken must be
@@ -324,7 +325,7 @@ ValidMPTIssuance::finalize(
             return true;
         }
 
-        if (hasPrivilege(tx, MayCreateMpt))
+        if (hasPrivilege(tx, Privilege::MayCreateMpt))
         {
             bool const submittedByIssuer = tx.isFieldPresent(sfHolder);
 
@@ -379,7 +380,7 @@ ValidMPTIssuance::finalize(
             return true;
         }
 
-        if (hasPrivilege(tx, MayDeleteMpt) &&
+        if (hasPrivilege(tx, Privilege::MayDeleteMpt) &&
             ((txnType == ttAMM_DELETE && mptokensDeleted_ <= 2) || mptokensDeleted_ == 1) &&
             mptokensCreated_ == 0 && mptIssuancesCreated_ == 0 && mptIssuancesDeleted_ == 0)
             return true;
@@ -856,7 +857,7 @@ ValidMPTTransfer::finalize(
     ReadView const& view,
     beast::Journal const& j)
 {
-    if (hasPrivilege(tx, OverrideFreeze))
+    if (hasPrivilege(tx, Privilege::OverrideFreeze))
         return true;
 
     // XLS-0066: a broker must be able to default an already-late loan
diff --git a/src/libxrpl/tx/invariants/NFTInvariant.cpp b/src/libxrpl/tx/invariants/NFTInvariant.cpp
index 52ecbcd9d1..b3b1601018 100644
--- a/src/libxrpl/tx/invariants/NFTInvariant.cpp
+++ b/src/libxrpl/tx/invariants/NFTInvariant.cpp
@@ -206,7 +206,7 @@ NFTokenCountTracking::finalize(
     ReadView const& view,
     beast::Journal const& j) const
 {
-    if (!hasPrivilege(tx, ChangeNftCounts))
+    if (!hasPrivilege(tx, Privilege::ChangeNftCounts))
     {
         if (beforeMintedTotal_ != afterMintedTotal_)
         {
diff --git a/src/libxrpl/tx/invariants/VaultInvariant.cpp b/src/libxrpl/tx/invariants/VaultInvariant.cpp
index 5c25a22987..7ba42383ad 100644
--- a/src/libxrpl/tx/invariants/VaultInvariant.cpp
+++ b/src/libxrpl/tx/invariants/VaultInvariant.cpp
@@ -346,7 +346,7 @@ ValidVault::finalize(
 
     if (afterVault_.empty() && beforeVault_.empty())
     {
-        if (hasPrivilege(tx, MustModifyVault))
+        if (hasPrivilege(tx, Privilege::MustModifyVault))
         {
             JLOG(j.fatal()) <<  //
                 "Invariant failed: vault operation succeeded without modifying "
@@ -357,7 +357,8 @@ ValidVault::finalize(
 
         return true;  // Not a vault operation
     }
-    if (!(hasPrivilege(tx, MustModifyVault) || hasPrivilege(tx, MayModifyVault)))
+    if (!(hasPrivilege(tx, Privilege::MustModifyVault) ||
+          hasPrivilege(tx, Privilege::MayModifyVault)))
     {
         JLOG(j.fatal()) <<  //
             "Invariant failed: vault updated by a wrong transaction type";
diff --git a/src/test/app/Delegate_test.cpp b/src/test/app/Delegate_test.cpp
index 1166816115..3ff90c2a8f 100644
--- a/src/test/app/Delegate_test.cpp
+++ b/src/test/app/Delegate_test.cpp
@@ -47,6 +47,7 @@
 #include <xrpl/protocol/SecretKey.h>
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/TxSettings.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/protocol/jss.h>
 
@@ -2718,19 +2719,24 @@ class Delegate_test : public beast::unit_test::Suite
 
         std::size_t delegableCount = 0;
 
+#pragma push_macro("UNWRAP")
+#undef UNWRAP
 #pragma push_macro("TRANSACTION")
 #undef TRANSACTION
 
-#define TRANSACTION(tag, value, name, txDelegable, ...) \
-    if (txDelegable == xrpl::Delegable)                 \
-    {                                                   \
-        delegableCount++;                               \
+#define UNWRAP(...) __VA_ARGS__
+#define TRANSACTION(tag, value, name, settings, ...)                                 \
+    if ((xrpl::TxSettings UNWRAP settings).delegable == xrpl::Delegation::Delegable) \
+    {                                                                                \
+        delegableCount++;                                                            \
     }
 
 #include <xrpl/protocol/detail/transactions.macro>
 
 #undef TRANSACTION
 #pragma pop_macro("TRANSACTION")
+#undef UNWRAP
+#pragma pop_macro("UNWRAP")
 
         // ====================================================================
         // IMPORTANT NOTICE: