Rename Transactor preflight functions

- Rename Transactor::preflight to invokePreflight. - Rename doPreflight back to preflight. - Update instructions. - With preflight1 & 2 now uncallable, in-flight code in other branches should be easier to convert.
2026-07-30 02:20:39 +00:00 · 2025-07-11 19:17:11 -04:00
parent 021bee8dd4
commit c76e485d01
100 changed files with 153 additions and 141 deletions
--- a/src/test/app/AMM_test.cpp
+++ b/src/test/app/AMM_test.cpp
@@ -3571,7 +3571,7 @@ private:
                    env.current()->rules(),
                    tapNONE,
                    env.journal);
-                auto pf = Transactor::preflight<AMMBid>(pfctx);
+                auto pf = Transactor::invokePreflight<AMMBid>(pfctx);
                BEAST_EXPECT(pf == temDISABLED);
                env.app().config().features.insert(featureAMM);
            }
@@ -3586,7 +3586,7 @@ private:
                    env.current()->rules(),
                    tapNONE,
                    env.journal);
-                auto pf = Transactor::preflight<AMMBid>(pfctx);
+                auto pf = Transactor::invokePreflight<AMMBid>(pfctx);
                BEAST_EXPECT(pf != tesSUCCESS);
            }

@@ -3601,7 +3601,7 @@ private:
                    env.current()->rules(),
                    tapNONE,
                    env.journal);
-                auto pf = Transactor::preflight<AMMBid>(pfctx);
+                auto pf = Transactor::invokePreflight<AMMBid>(pfctx);
                BEAST_EXPECT(pf == temBAD_AMM_TOKENS);
            }
        }
--- a/src/xrpld/app/tx/detail/AMMBid.cpp
+++ b/src/xrpld/app/tx/detail/AMMBid.cpp
@@ -37,7 +37,7 @@ AMMBid::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-AMMBid::doPreflight(PreflightContext const& ctx)
+AMMBid::preflight(PreflightContext const& ctx)
 {
    if (auto const res = invalidAMMAssetPair(
            ctx.tx[sfAsset].get<Issue>(), ctx.tx[sfAsset2].get<Issue>()))
--- a/src/xrpld/app/tx/detail/AMMBid.h
+++ b/src/xrpld/app/tx/detail/AMMBid.h
@@ -75,7 +75,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/AMMClawback.cpp
+++ b/src/xrpld/app/tx/detail/AMMClawback.cpp
@@ -46,7 +46,7 @@ AMMClawback::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-AMMClawback::doPreflight(PreflightContext const& ctx)
+AMMClawback::preflight(PreflightContext const& ctx)
 {
    AccountID const issuer = ctx.tx[sfAccount];
    AccountID const holder = ctx.tx[sfHolder];
--- a/src/xrpld/app/tx/detail/AMMClawback.h
+++ b/src/xrpld/app/tx/detail/AMMClawback.h
@@ -40,7 +40,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/AMMCreate.cpp
+++ b/src/xrpld/app/tx/detail/AMMCreate.cpp
@@ -38,7 +38,7 @@ AMMCreate::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-AMMCreate::doPreflight(PreflightContext const& ctx)
+AMMCreate::preflight(PreflightContext const& ctx)
 {
    auto const amount = ctx.tx[sfAmount];
    auto const amount2 = ctx.tx[sfAmount2];
--- a/src/xrpld/app/tx/detail/AMMCreate.h
+++ b/src/xrpld/app/tx/detail/AMMCreate.h
@@ -67,7 +67,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static XRPAmount
    calculateBaseFee(ReadView const& view, STTx const& tx);
--- a/src/xrpld/app/tx/detail/AMMDelete.cpp
+++ b/src/xrpld/app/tx/detail/AMMDelete.cpp
@@ -34,7 +34,7 @@ AMMDelete::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-AMMDelete::doPreflight(PreflightContext const& ctx)
+AMMDelete::preflight(PreflightContext const& ctx)
 {
    return tesSUCCESS;
 }
--- a/src/xrpld/app/tx/detail/AMMDelete.h
+++ b/src/xrpld/app/tx/detail/AMMDelete.h
@@ -43,7 +43,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/AMMDeposit.cpp
+++ b/src/xrpld/app/tx/detail/AMMDeposit.cpp
@@ -43,7 +43,7 @@ AMMDeposit::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-AMMDeposit::doPreflight(PreflightContext const& ctx)
+AMMDeposit::preflight(PreflightContext const& ctx)
 {
    auto const flags = ctx.tx.getFlags();

--- a/src/xrpld/app/tx/detail/AMMDeposit.h
+++ b/src/xrpld/app/tx/detail/AMMDeposit.h
@@ -75,7 +75,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/AMMVote.cpp
+++ b/src/xrpld/app/tx/detail/AMMVote.cpp
@@ -34,7 +34,7 @@ AMMVote::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-AMMVote::doPreflight(PreflightContext const& ctx)
+AMMVote::preflight(PreflightContext const& ctx)
 {
    if (auto const res = invalidAMMAssetPair(
            ctx.tx[sfAsset].get<Issue>(), ctx.tx[sfAsset2].get<Issue>()))
--- a/src/xrpld/app/tx/detail/AMMVote.h
+++ b/src/xrpld/app/tx/detail/AMMVote.h
@@ -60,7 +60,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/AMMWithdraw.cpp
+++ b/src/xrpld/app/tx/detail/AMMWithdraw.cpp
@@ -41,7 +41,7 @@ AMMWithdraw::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-AMMWithdraw::doPreflight(PreflightContext const& ctx)
+AMMWithdraw::preflight(PreflightContext const& ctx)
 {
    auto const flags = ctx.tx.getFlags();

--- a/src/xrpld/app/tx/detail/AMMWithdraw.h
+++ b/src/xrpld/app/tx/detail/AMMWithdraw.h
@@ -82,7 +82,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/CancelCheck.cpp
+++ b/src/xrpld/app/tx/detail/CancelCheck.cpp
@@ -36,7 +36,7 @@ CancelCheck::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-CancelCheck::doPreflight(PreflightContext const& ctx)
+CancelCheck::preflight(PreflightContext const& ctx)
 {
    return tesSUCCESS;
 }
--- a/src/xrpld/app/tx/detail/CancelCheck.h
+++ b/src/xrpld/app/tx/detail/CancelCheck.h
@@ -37,7 +37,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/CancelOffer.cpp
+++ b/src/xrpld/app/tx/detail/CancelOffer.cpp
@@ -26,7 +26,7 @@
 namespace ripple {

 NotTEC
-CancelOffer::doPreflight(PreflightContext const& ctx)
+CancelOffer::preflight(PreflightContext const& ctx)
 {
    if (!ctx.tx[sfOfferSequence])
    {
--- a/src/xrpld/app/tx/detail/CancelOffer.h
+++ b/src/xrpld/app/tx/detail/CancelOffer.h
@@ -36,7 +36,7 @@ public:
    }

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/CashCheck.cpp
+++ b/src/xrpld/app/tx/detail/CashCheck.cpp
@@ -39,7 +39,7 @@ CashCheck::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-CashCheck::doPreflight(PreflightContext const& ctx)
+CashCheck::preflight(PreflightContext const& ctx)
 {
    // Exactly one of Amount or DeliverMin must be present.
    auto const optAmount = ctx.tx[~sfAmount];
--- a/src/xrpld/app/tx/detail/CashCheck.h
+++ b/src/xrpld/app/tx/detail/CashCheck.h
@@ -37,7 +37,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/Change.cpp
+++ b/src/xrpld/app/tx/detail/Change.cpp
@@ -35,7 +35,7 @@ namespace ripple {

 template <>
 NotTEC
-Transactor::preflight<Change>(PreflightContext const& ctx)
+Transactor::invokePreflight<Change>(PreflightContext const& ctx)
 {
    // 0 means "Allow any flags"
    if (auto const ret = preflight0(ctx, 0))
--- a/src/xrpld/app/tx/detail/Clawback.cpp
+++ b/src/xrpld/app/tx/detail/Clawback.cpp
@@ -88,7 +88,7 @@ Clawback::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-Clawback::doPreflight(PreflightContext const& ctx)
+Clawback::preflight(PreflightContext const& ctx)
 {
    if (auto const ret = std::visit(
            [&]<typename T>(T const&) { return preflightHelper<T>(ctx); },
--- a/src/xrpld/app/tx/detail/Clawback.h
+++ b/src/xrpld/app/tx/detail/Clawback.h
@@ -40,7 +40,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/CreateCheck.cpp
+++ b/src/xrpld/app/tx/detail/CreateCheck.cpp
@@ -35,7 +35,7 @@ CreateCheck::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-CreateCheck::doPreflight(PreflightContext const& ctx)
+CreateCheck::preflight(PreflightContext const& ctx)
 {
    if (ctx.tx[sfAccount] == ctx.tx[sfDestination])
    {
--- a/src/xrpld/app/tx/detail/CreateCheck.h
+++ b/src/xrpld/app/tx/detail/CreateCheck.h
@@ -37,7 +37,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/CreateOffer.cpp
+++ b/src/xrpld/app/tx/detail/CreateOffer.cpp
@@ -63,7 +63,7 @@ CreateOffer::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-CreateOffer::doPreflight(PreflightContext const& ctx)
+CreateOffer::preflight(PreflightContext const& ctx)
 {
    auto& tx = ctx.tx;
    auto& j = ctx.j;
--- a/src/xrpld/app/tx/detail/CreateOffer.h
+++ b/src/xrpld/app/tx/detail/CreateOffer.h
@@ -52,7 +52,7 @@ public:

    /** Enforce constraints beyond those of the Transactor base class. */
    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    /** Enforce constraints beyond those of the Transactor base class. */
    static TER
--- a/src/xrpld/app/tx/detail/CreateTicket.cpp
+++ b/src/xrpld/app/tx/detail/CreateTicket.cpp
@@ -40,7 +40,7 @@ CreateTicket::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-CreateTicket::doPreflight(PreflightContext const& ctx)
+CreateTicket::preflight(PreflightContext const& ctx)
 {
    if (std::uint32_t const count = ctx.tx[sfTicketCount];
        count < minValidCount || count > maxValidCount)
--- a/src/xrpld/app/tx/detail/CreateTicket.h
+++ b/src/xrpld/app/tx/detail/CreateTicket.h
@@ -74,7 +74,7 @@ public:

    /** Enforce constraints beyond those of the Transactor base class. */
    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    /** Enforce constraints beyond those of the Transactor base class. */
    static TER
--- a/src/xrpld/app/tx/detail/Credentials.cpp
+++ b/src/xrpld/app/tx/detail/Credentials.cpp
@@ -62,7 +62,7 @@ CredentialCreate::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-CredentialCreate::doPreflight(PreflightContext const& ctx)
+CredentialCreate::preflight(PreflightContext const& ctx)
 {
    auto const& tx = ctx.tx;
    auto& j = ctx.j;
@@ -213,7 +213,7 @@ CredentialDelete::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-CredentialDelete::doPreflight(PreflightContext const& ctx)
+CredentialDelete::preflight(PreflightContext const& ctx)
 {
    auto const subject = ctx.tx[~sfSubject];
    auto const issuer = ctx.tx[~sfIssuer];
@@ -297,7 +297,7 @@ CredentialAccept::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-CredentialAccept::doPreflight(PreflightContext const& ctx)
+CredentialAccept::preflight(PreflightContext const& ctx)
 {
    if (!ctx.tx[sfIssuer])
    {
--- a/src/xrpld/app/tx/detail/Credentials.h
+++ b/src/xrpld/app/tx/detail/Credentials.h
@@ -40,7 +40,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
@@ -67,7 +67,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
@@ -94,7 +94,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/DID.cpp
+++ b/src/xrpld/app/tx/detail/DID.cpp
@@ -49,7 +49,7 @@ DIDSet::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-DIDSet::doPreflight(PreflightContext const& ctx)
+DIDSet::preflight(PreflightContext const& ctx)
 {
    if (!ctx.tx.isFieldPresent(sfURI) &&
        !ctx.tx.isFieldPresent(sfDIDDocument) && !ctx.tx.isFieldPresent(sfData))
@@ -175,7 +175,7 @@ DIDDelete::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-DIDDelete::doPreflight(PreflightContext const& ctx)
+DIDDelete::preflight(PreflightContext const& ctx)
 {
    return tesSUCCESS;
 }
--- a/src/xrpld/app/tx/detail/DID.h
+++ b/src/xrpld/app/tx/detail/DID.h
@@ -37,7 +37,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    TER
    doApply() override;
@@ -58,7 +58,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    deleteSLE(ApplyContext& ctx, Keylet sleKeylet, AccountID const owner);
--- a/src/xrpld/app/tx/detail/DelegateSet.cpp
+++ b/src/xrpld/app/tx/detail/DelegateSet.cpp
@@ -35,7 +35,7 @@ DelegateSet::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-DelegateSet::doPreflight(PreflightContext const& ctx)
+DelegateSet::preflight(PreflightContext const& ctx)
 {
    auto const& permissions = ctx.tx.getFieldArray(sfPermissions);
    if (permissions.size() > permissionMaxSize)
--- a/src/xrpld/app/tx/detail/DelegateSet.h
+++ b/src/xrpld/app/tx/detail/DelegateSet.h
@@ -37,7 +37,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/DeleteAccount.cpp
+++ b/src/xrpld/app/tx/detail/DeleteAccount.cpp
@@ -49,7 +49,7 @@ DeleteAccount::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-DeleteAccount::doPreflight(PreflightContext const& ctx)
+DeleteAccount::preflight(PreflightContext const& ctx)
 {
    if (ctx.tx[sfAccount] == ctx.tx[sfDestination])
        // An account cannot be deleted and give itself the resulting XRP.
--- a/src/xrpld/app/tx/detail/DeleteAccount.h
+++ b/src/xrpld/app/tx/detail/DeleteAccount.h
@@ -37,7 +37,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static XRPAmount
    calculateBaseFee(ReadView const& view, STTx const& tx);
--- a/src/xrpld/app/tx/detail/DeleteOracle.cpp
+++ b/src/xrpld/app/tx/detail/DeleteOracle.cpp
@@ -33,7 +33,7 @@ DeleteOracle::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-DeleteOracle::doPreflight(PreflightContext const& ctx)
+DeleteOracle::preflight(PreflightContext const& ctx)
 {
    return tesSUCCESS;
 }
--- a/src/xrpld/app/tx/detail/DeleteOracle.h
+++ b/src/xrpld/app/tx/detail/DeleteOracle.h
@@ -46,7 +46,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/DepositPreauth.cpp
+++ b/src/xrpld/app/tx/detail/DepositPreauth.cpp
@@ -46,7 +46,7 @@ DepositPreauth::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-DepositPreauth::doPreflight(PreflightContext const& ctx)
+DepositPreauth::preflight(PreflightContext const& ctx)
 {
    bool const authArrPresent = ctx.tx.isFieldPresent(sfAuthorizeCredentials);
    bool const unauthArrPresent =
--- a/src/xrpld/app/tx/detail/DepositPreauth.h
+++ b/src/xrpld/app/tx/detail/DepositPreauth.h
@@ -37,7 +37,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/Escrow.cpp
+++ b/src/xrpld/app/tx/detail/Escrow.cpp
@@ -126,7 +126,7 @@ EscrowCreate::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-EscrowCreate::doPreflight(PreflightContext const& ctx)
+EscrowCreate::preflight(PreflightContext const& ctx)
 {
    STAmount const amount{ctx.tx[sfAmount]};
    if (!isXRP(amount))
@@ -640,7 +640,7 @@ EscrowFinish::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-EscrowFinish::doPreflight(PreflightContext const& ctx)
+EscrowFinish::preflight(PreflightContext const& ctx)
 {
    auto const cb = ctx.tx[~sfCondition];
    auto const fb = ctx.tx[~sfFulfillment];
@@ -1202,7 +1202,7 @@ EscrowCancel::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-EscrowCancel::doPreflight(PreflightContext const& ctx)
+EscrowCancel::preflight(PreflightContext const& ctx)
 {
    return tesSUCCESS;
 }
--- a/src/xrpld/app/tx/detail/Escrow.h
+++ b/src/xrpld/app/tx/detail/Escrow.h
@@ -40,7 +40,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
@@ -67,7 +67,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static XRPAmount
    calculateBaseFee(ReadView const& view, STTx const& tx);
@@ -94,7 +94,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/LedgerStateFix.cpp
+++ b/src/xrpld/app/tx/detail/LedgerStateFix.cpp
@@ -34,7 +34,7 @@ LedgerStateFix::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-LedgerStateFix::doPreflight(PreflightContext const& ctx)
+LedgerStateFix::preflight(PreflightContext const& ctx)
 {
    switch (ctx.tx[sfLedgerFixType])
    {
--- a/src/xrpld/app/tx/detail/LedgerStateFix.h
+++ b/src/xrpld/app/tx/detail/LedgerStateFix.h
@@ -41,7 +41,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static XRPAmount
    calculateBaseFee(ReadView const& view, STTx const& tx);
--- a/src/xrpld/app/tx/detail/MPTokenAuthorize.cpp
+++ b/src/xrpld/app/tx/detail/MPTokenAuthorize.cpp
@@ -39,7 +39,7 @@ MPTokenAuthorize::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-MPTokenAuthorize::doPreflight(PreflightContext const& ctx)
+MPTokenAuthorize::preflight(PreflightContext const& ctx)
 {
    if (ctx.tx[sfAccount] == ctx.tx[~sfHolder])
        return temMALFORMED;
--- a/src/xrpld/app/tx/detail/MPTokenAuthorize.h
+++ b/src/xrpld/app/tx/detail/MPTokenAuthorize.h
@@ -49,7 +49,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.cpp
+++ b/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.cpp
@@ -38,7 +38,7 @@ MPTokenIssuanceCreate::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-MPTokenIssuanceCreate::doPreflight(PreflightContext const& ctx)
+MPTokenIssuanceCreate::preflight(PreflightContext const& ctx)
 {
    if (auto const fee = ctx.tx[~sfTransferFee])
    {
--- a/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.h
+++ b/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.h
@@ -56,7 +56,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    TER
    doApply() override;
--- a/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.cpp
+++ b/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.cpp
@@ -38,7 +38,7 @@ MPTokenIssuanceDestroy::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-MPTokenIssuanceDestroy::doPreflight(PreflightContext const& ctx)
+MPTokenIssuanceDestroy::preflight(PreflightContext const& ctx)
 {
    return tesSUCCESS;
 }
--- a/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.h
+++ b/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.h
@@ -40,7 +40,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp
+++ b/src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp
@@ -38,7 +38,7 @@ MPTokenIssuanceSet::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-MPTokenIssuanceSet::doPreflight(PreflightContext const& ctx)
+MPTokenIssuanceSet::preflight(PreflightContext const& ctx)
 {
    auto const txFlags = ctx.tx.getFlags();

--- a/src/xrpld/app/tx/detail/MPTokenIssuanceSet.h
+++ b/src/xrpld/app/tx/detail/MPTokenIssuanceSet.h
@@ -40,7 +40,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    checkPermission(ReadView const& view, STTx const& tx);
--- a/src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp
@@ -40,7 +40,7 @@ NFTokenAcceptOffer::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-NFTokenAcceptOffer::doPreflight(PreflightContext const& ctx)
+NFTokenAcceptOffer::preflight(PreflightContext const& ctx)
 {
    auto const bo = ctx.tx[~sfNFTokenBuyOffer];
    auto const so = ctx.tx[~sfNFTokenSellOffer];
--- a/src/xrpld/app/tx/detail/NFTokenAcceptOffer.h
+++ b/src/xrpld/app/tx/detail/NFTokenAcceptOffer.h
@@ -58,7 +58,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/NFTokenBurn.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenBurn.cpp
@@ -33,7 +33,7 @@ NFTokenBurn::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-NFTokenBurn::doPreflight(PreflightContext const& ctx)
+NFTokenBurn::preflight(PreflightContext const& ctx)
 {
    return tesSUCCESS;
 }
--- a/src/xrpld/app/tx/detail/NFTokenBurn.h
+++ b/src/xrpld/app/tx/detail/NFTokenBurn.h
@@ -37,7 +37,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp
@@ -41,7 +41,7 @@ NFTokenCancelOffer::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-NFTokenCancelOffer::doPreflight(PreflightContext const& ctx)
+NFTokenCancelOffer::preflight(PreflightContext const& ctx)
 {
    if (auto const& ids = ctx.tx[sfNFTokenOffers];
        ids.empty() || (ids.size() > maxTokenOfferCancelCount))
--- a/src/xrpld/app/tx/detail/NFTokenCancelOffer.h
+++ b/src/xrpld/app/tx/detail/NFTokenCancelOffer.h
@@ -40,7 +40,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp
@@ -39,7 +39,7 @@ NFTokenCreateOffer::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-NFTokenCreateOffer::doPreflight(PreflightContext const& ctx)
+NFTokenCreateOffer::preflight(PreflightContext const& ctx)
 {
    auto const txFlags = ctx.tx.getFlags();

--- a/src/xrpld/app/tx/detail/NFTokenCreateOffer.h
+++ b/src/xrpld/app/tx/detail/NFTokenCreateOffer.h
@@ -40,7 +40,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/NFTokenMint.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenMint.cpp
@@ -84,7 +84,7 @@ NFTokenMint::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-NFTokenMint::doPreflight(PreflightContext const& ctx)
+NFTokenMint::preflight(PreflightContext const& ctx)
 {
    if (auto const f = ctx.tx[~sfTransferFee])
    {
--- a/src/xrpld/app/tx/detail/NFTokenMint.h
+++ b/src/xrpld/app/tx/detail/NFTokenMint.h
@@ -43,7 +43,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/NFTokenModify.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenModify.cpp
@@ -33,7 +33,7 @@ NFTokenModify::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-NFTokenModify::doPreflight(PreflightContext const& ctx)
+NFTokenModify::preflight(PreflightContext const& ctx)
 {
    if (auto owner = ctx.tx[~sfOwner]; owner == ctx.tx[sfAccount])
        return temMALFORMED;
--- a/src/xrpld/app/tx/detail/NFTokenModify.h
+++ b/src/xrpld/app/tx/detail/NFTokenModify.h
@@ -37,7 +37,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/PayChan.cpp
+++ b/src/xrpld/app/tx/detail/PayChan.cpp
@@ -179,7 +179,7 @@ PayChanCreate::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-PayChanCreate::doPreflight(PreflightContext const& ctx)
+PayChanCreate::preflight(PreflightContext const& ctx)
 {
    if (!isXRP(ctx.tx[sfAmount]) || (ctx.tx[sfAmount] <= beast::zero))
        return temBAD_AMOUNT;
@@ -335,7 +335,7 @@ PayChanFund::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-PayChanFund::doPreflight(PreflightContext const& ctx)
+PayChanFund::preflight(PreflightContext const& ctx)
 {
    if (!isXRP(ctx.tx[sfAmount]) || (ctx.tx[sfAmount] <= beast::zero))
        return temBAD_AMOUNT;
@@ -433,7 +433,7 @@ PayChanClaim::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-PayChanClaim::doPreflight(PreflightContext const& ctx)
+PayChanClaim::preflight(PreflightContext const& ctx)
 {
    auto const bal = ctx.tx[~sfBalance];
    if (bal && (!isXRP(*bal) || *bal <= beast::zero))
--- a/src/xrpld/app/tx/detail/PayChan.h
+++ b/src/xrpld/app/tx/detail/PayChan.h
@@ -40,7 +40,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
@@ -69,7 +69,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    TER
    doApply() override;
@@ -95,7 +95,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/Payment.cpp
+++ b/src/xrpld/app/tx/detail/Payment.cpp
@@ -90,7 +90,7 @@ Payment::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-Payment::doPreflight(PreflightContext const& ctx)
+Payment::preflight(PreflightContext const& ctx)
 {
    auto& tx = ctx.tx;
    auto& j = ctx.j;
--- a/src/xrpld/app/tx/detail/Payment.h
+++ b/src/xrpld/app/tx/detail/Payment.h
@@ -49,7 +49,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    checkPermission(ReadView const& view, STTx const& tx);
--- a/src/xrpld/app/tx/detail/PermissionedDomainDelete.cpp
+++ b/src/xrpld/app/tx/detail/PermissionedDomainDelete.cpp
@@ -31,7 +31,7 @@ PermissionedDomainDelete::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-PermissionedDomainDelete::doPreflight(PreflightContext const& ctx)
+PermissionedDomainDelete::preflight(PreflightContext const& ctx)
 {
    auto const domain = ctx.tx.getFieldH256(sfDomainID);
    if (domain == beast::zero)
--- a/src/xrpld/app/tx/detail/PermissionedDomainDelete.h
+++ b/src/xrpld/app/tx/detail/PermissionedDomainDelete.h
@@ -37,7 +37,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/PermissionedDomainSet.cpp
+++ b/src/xrpld/app/tx/detail/PermissionedDomainSet.cpp
@@ -36,7 +36,7 @@ PermissionedDomainSet::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-PermissionedDomainSet::doPreflight(PreflightContext const& ctx)
+PermissionedDomainSet::preflight(PreflightContext const& ctx)
 {
    if (auto err = credentials::checkArray(
            ctx.tx.getFieldArray(sfAcceptedCredentials),
--- a/src/xrpld/app/tx/detail/PermissionedDomainSet.h
+++ b/src/xrpld/app/tx/detail/PermissionedDomainSet.h
@@ -37,7 +37,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/SetAccount.cpp
+++ b/src/xrpld/app/tx/detail/SetAccount.cpp
@@ -64,7 +64,7 @@ SetAccount::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-SetAccount::doPreflight(PreflightContext const& ctx)
+SetAccount::preflight(PreflightContext const& ctx)
 {
    auto& tx = ctx.tx;
    auto& j = ctx.j;
--- a/src/xrpld/app/tx/detail/SetAccount.h
+++ b/src/xrpld/app/tx/detail/SetAccount.h
@@ -42,7 +42,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    checkPermission(ReadView const& view, STTx const& tx);
--- a/src/xrpld/app/tx/detail/SetOracle.cpp
+++ b/src/xrpld/app/tx/detail/SetOracle.cpp
@@ -43,7 +43,7 @@ SetOracle::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-SetOracle::doPreflight(PreflightContext const& ctx)
+SetOracle::preflight(PreflightContext const& ctx)
 {
    auto const& dataSeries = ctx.tx.getFieldArray(sfPriceDataSeries);
    if (dataSeries.empty())
--- a/src/xrpld/app/tx/detail/SetOracle.h
+++ b/src/xrpld/app/tx/detail/SetOracle.h
@@ -46,7 +46,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/SetRegularKey.cpp
+++ b/src/xrpld/app/tx/detail/SetRegularKey.cpp
@@ -49,7 +49,7 @@ SetRegularKey::calculateBaseFee(ReadView const& view, STTx const& tx)
 }

 NotTEC
-SetRegularKey::doPreflight(PreflightContext const& ctx)
+SetRegularKey::preflight(PreflightContext const& ctx)
 {
    if (ctx.rules.enabled(fixMasterKeyAsRegularKey) &&
        ctx.tx.isFieldPresent(sfRegularKey) &&
--- a/src/xrpld/app/tx/detail/SetRegularKey.h
+++ b/src/xrpld/app/tx/detail/SetRegularKey.h
@@ -34,7 +34,7 @@ public:
    }

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static XRPAmount
    calculateBaseFee(ReadView const& view, STTx const& tx);
--- a/src/xrpld/app/tx/detail/SetSignerList.cpp
+++ b/src/xrpld/app/tx/detail/SetSignerList.cpp
@@ -85,7 +85,7 @@ SetSignerList::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-SetSignerList::doPreflight(PreflightContext const& ctx)
+SetSignerList::preflight(PreflightContext const& ctx)
 {
    auto const result = determineOperation(ctx.tx, ctx.flags, ctx.j);

--- a/src/xrpld/app/tx/detail/SetSignerList.h
+++ b/src/xrpld/app/tx/detail/SetSignerList.h
@@ -55,7 +55,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    TER
    doApply() override;
--- a/src/xrpld/app/tx/detail/SetTrust.cpp
+++ b/src/xrpld/app/tx/detail/SetTrust.cpp
@@ -74,7 +74,7 @@ SetTrust::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-SetTrust::doPreflight(PreflightContext const& ctx)
+SetTrust::preflight(PreflightContext const& ctx)
 {
    auto& tx = ctx.tx;
    auto& j = ctx.j;
--- a/src/xrpld/app/tx/detail/SetTrust.h
+++ b/src/xrpld/app/tx/detail/SetTrust.h
@@ -39,7 +39,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    checkPermission(ReadView const& view, STTx const& tx);
--- a/src/xrpld/app/tx/detail/Transactor.h
+++ b/src/xrpld/app/tx/detail/Transactor.h
@@ -200,8 +200,8 @@ public:
    static XRPAmount
    calculateBaseFee(ReadView const& view, STTx const& tx);

-    /* Do NOT define a preflight function in a derived class.
-       Instead, define
+    /* Do NOT define an invokePreflight function in a derived class.
+       Instead, define:

        // Optional if the transaction is gated on an amendment
        static bool
@@ -211,12 +211,18 @@ public:
        static std::uint32_t
        getFlagsMask(PreflightContext const& ctx);

+        // Required, even if it just returns tesSUCCESS.
        static NotTEC
-        doPreflight(PreflightContext const& ctx);
+        preflight(PreflightContext const& ctx);
+
+       * Do not try to call preflight1 or preflight2 directly.
+       * Do not check whether relevant amendments are enabled in preflight.
+         Instead, define isEnabled.
+       * Do not check flags in preflight. Instead, define getFlagsMask.
    */
    template <class T>
    static NotTEC
-    preflight(PreflightContext const& ctx);
+    invokePreflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx)
@@ -317,15 +323,21 @@ private:

    void trapTransaction(uint256) const;

-    // Helper functions for preflight checks. Do not use directly.
    /** Performs early sanity checks on the account and fee fields.

        (And passes flagMask to preflight0)
+
+        Do not try to call preflight1 from preflight() in derived classes. See
+        the description of invokePreflight for details.
    */
    static NotTEC
    preflight1(PreflightContext const& ctx, std::uint32_t flagMask);

-    /** Checks whether the signature appears valid */
+    /** Checks whether the signature appears valid
+
+        Do not try to call preflight2 from preflight() in derived classes. See
+        the description of invokePreflight for details.
+    */
    static NotTEC
    preflight2(PreflightContext const& ctx);
 };
@@ -363,11 +375,11 @@ preflightCheckSimulateKeys(
 // Defined in Change.cpp
 template <>
 NotTEC
-Transactor::preflight<Change>(PreflightContext const& ctx);
+Transactor::invokePreflight<Change>(PreflightContext const& ctx);

 template <class T>
 NotTEC
-Transactor::preflight(PreflightContext const& ctx)
+Transactor::invokePreflight(PreflightContext const& ctx)
 {
    if (!T::isEnabled(ctx))
        return temDISABLED;
@@ -375,7 +387,7 @@ Transactor::preflight(PreflightContext const& ctx)
    if (auto const ret = preflight1(ctx, T::getFlagsMask(ctx)))
        return ret;

-    if (auto const ret = T::doPreflight(ctx))
+    if (auto const ret = T::preflight(ctx))
        return ret;

    return preflight2(ctx);
--- a/src/xrpld/app/tx/detail/VaultClawback.cpp
+++ b/src/xrpld/app/tx/detail/VaultClawback.cpp
@@ -37,7 +37,7 @@ VaultClawback::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-VaultClawback::doPreflight(PreflightContext const& ctx)
+VaultClawback::preflight(PreflightContext const& ctx)
 {
    if (ctx.tx[sfVaultID] == beast::zero)
    {
--- a/src/xrpld/app/tx/detail/VaultClawback.h
+++ b/src/xrpld/app/tx/detail/VaultClawback.h
@@ -37,7 +37,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/VaultCreate.cpp
+++ b/src/xrpld/app/tx/detail/VaultCreate.cpp
@@ -51,7 +51,7 @@ VaultCreate::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-VaultCreate::doPreflight(PreflightContext const& ctx)
+VaultCreate::preflight(PreflightContext const& ctx)
 {
    if (!validDataLength(ctx.tx[~sfData], maxDataPayloadLength))
        return temMALFORMED;
--- a/src/xrpld/app/tx/detail/VaultCreate.h
+++ b/src/xrpld/app/tx/detail/VaultCreate.h
@@ -40,7 +40,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static XRPAmount
    calculateBaseFee(ReadView const& view, STTx const& tx);
--- a/src/xrpld/app/tx/detail/VaultDelete.cpp
+++ b/src/xrpld/app/tx/detail/VaultDelete.cpp
@@ -34,7 +34,7 @@ VaultDelete::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-VaultDelete::doPreflight(PreflightContext const& ctx)
+VaultDelete::preflight(PreflightContext const& ctx)
 {
    if (ctx.tx[sfVaultID] == beast::zero)
    {
--- a/src/xrpld/app/tx/detail/VaultDelete.h
+++ b/src/xrpld/app/tx/detail/VaultDelete.h
@@ -37,7 +37,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/VaultDeposit.cpp
+++ b/src/xrpld/app/tx/detail/VaultDeposit.cpp
@@ -39,7 +39,7 @@ VaultDeposit::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-VaultDeposit::doPreflight(PreflightContext const& ctx)
+VaultDeposit::preflight(PreflightContext const& ctx)
 {
    if (ctx.tx[sfVaultID] == beast::zero)
    {
--- a/src/xrpld/app/tx/detail/VaultDeposit.h
+++ b/src/xrpld/app/tx/detail/VaultDeposit.h
@@ -37,7 +37,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/VaultSet.cpp
+++ b/src/xrpld/app/tx/detail/VaultSet.cpp
@@ -41,7 +41,7 @@ VaultSet::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-VaultSet::doPreflight(PreflightContext const& ctx)
+VaultSet::preflight(PreflightContext const& ctx)
 {
    if (ctx.tx[sfVaultID] == beast::zero)
    {
--- a/src/xrpld/app/tx/detail/VaultSet.h
+++ b/src/xrpld/app/tx/detail/VaultSet.h
@@ -37,7 +37,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/VaultWithdraw.cpp
+++ b/src/xrpld/app/tx/detail/VaultWithdraw.cpp
@@ -37,7 +37,7 @@ VaultWithdraw::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-VaultWithdraw::doPreflight(PreflightContext const& ctx)
+VaultWithdraw::preflight(PreflightContext const& ctx)
 {
    if (ctx.tx[sfVaultID] == beast::zero)
    {
--- a/src/xrpld/app/tx/detail/VaultWithdraw.h
+++ b/src/xrpld/app/tx/detail/VaultWithdraw.h
@@ -37,7 +37,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/XChainBridge.cpp
+++ b/src/xrpld/app/tx/detail/XChainBridge.cpp
@@ -1210,7 +1210,7 @@ toClaim(STTx const& tx)

 template <class TAttestation>
 NotTEC
-attestationDoPreflight(PreflightContext const& ctx)
+attestationpreflight(PreflightContext const& ctx)
 {
    if (!publicKeyType(ctx.tx[sfPublicKey]))
        return temMALFORMED;
@@ -1374,7 +1374,7 @@ XChainCreateBridge::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-XChainCreateBridge::doPreflight(PreflightContext const& ctx)
+XChainCreateBridge::preflight(PreflightContext const& ctx)
 {
    auto const account = ctx.tx[sfAccount];
    auto const reward = ctx.tx[sfSignatureReward];
@@ -1558,7 +1558,7 @@ BridgeModify::getFlagsMask(PreflightContext const& ctx)
 }

 NotTEC
-BridgeModify::doPreflight(PreflightContext const& ctx)
+BridgeModify::preflight(PreflightContext const& ctx)
 {
    auto const account = ctx.tx[sfAccount];
    auto const reward = ctx.tx[~sfSignatureReward];
@@ -1665,7 +1665,7 @@ XChainClaim::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-XChainClaim::doPreflight(PreflightContext const& ctx)
+XChainClaim::preflight(PreflightContext const& ctx)
 {
    STXChainBridge const bridgeSpec = ctx.tx[sfXChainBridge];
    auto const amount = ctx.tx[sfAmount];
@@ -1900,7 +1900,7 @@ XChainCommit::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-XChainCommit::doPreflight(PreflightContext const& ctx)
+XChainCommit::preflight(PreflightContext const& ctx)
 {
    auto const amount = ctx.tx[sfAmount];
    auto const bridgeSpec = ctx.tx[sfXChainBridge];
@@ -2011,7 +2011,7 @@ XChainCreateClaimID::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-XChainCreateClaimID::doPreflight(PreflightContext const& ctx)
+XChainCreateClaimID::preflight(PreflightContext const& ctx)
 {
    auto const reward = ctx.tx[sfSignatureReward];

@@ -2123,9 +2123,9 @@ XChainAddClaimAttestation::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-XChainAddClaimAttestation::doPreflight(PreflightContext const& ctx)
+XChainAddClaimAttestation::preflight(PreflightContext const& ctx)
 {
-    return attestationDoPreflight<Attestations::AttestationClaim>(ctx);
+    return attestationpreflight<Attestations::AttestationClaim>(ctx);
 }

 TER
@@ -2149,9 +2149,9 @@ XChainAddAccountCreateAttestation::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-XChainAddAccountCreateAttestation::doPreflight(PreflightContext const& ctx)
+XChainAddAccountCreateAttestation::preflight(PreflightContext const& ctx)
 {
-    return attestationDoPreflight<Attestations::AttestationCreateAccount>(ctx);
+    return attestationpreflight<Attestations::AttestationCreateAccount>(ctx);
 }

 TER
@@ -2175,7 +2175,7 @@ XChainCreateAccountCommit::isEnabled(PreflightContext const& ctx)
 }

 NotTEC
-XChainCreateAccountCommit::doPreflight(PreflightContext const& ctx)
+XChainCreateAccountCommit::preflight(PreflightContext const& ctx)
 {
    auto const amount = ctx.tx[sfAmount];

--- a/src/xrpld/app/tx/detail/XChainBridge.h
+++ b/src/xrpld/app/tx/detail/XChainBridge.h
@@ -43,7 +43,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
@@ -68,7 +68,7 @@ public:
    getFlagsMask(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
@@ -104,7 +104,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
@@ -134,7 +134,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
@@ -166,7 +166,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
@@ -198,7 +198,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
@@ -222,7 +222,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
@@ -269,7 +269,7 @@ public:
    isEnabled(PreflightContext const& ctx);

    static NotTEC
-    doPreflight(PreflightContext const& ctx);
+    preflight(PreflightContext const& ctx);

    static TER
    preclaim(PreclaimContext const& ctx);
--- a/src/xrpld/app/tx/detail/applySteps.cpp
+++ b/src/xrpld/app/tx/detail/applySteps.cpp
@@ -119,7 +119,7 @@ invoke_preflight(PreflightContext const& ctx)
    try
    {
        return with_txn_type(ctx.tx.getTxnType(), [&]<typename T>() {
-            auto const tec = Transactor::preflight<T>(ctx);
+            auto const tec = Transactor::invokePreflight<T>(ctx);
            return std::make_pair(
                tec,
                isTesSuccess(tec) ? consequences_helper<T>(ctx)