From 37745cb5b2ce01de5c63b89629d251c545726ade Mon Sep 17 00:00:00 2001 From: Ed Hennis Date: Fri, 11 Jul 2025 19:17:11 -0400 Subject: [PATCH] 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. --- src/test/app/AMM_test.cpp | 6 ++-- src/xrpld/app/tx/detail/AMMBid.cpp | 2 +- src/xrpld/app/tx/detail/AMMBid.h | 2 +- src/xrpld/app/tx/detail/AMMClawback.cpp | 2 +- src/xrpld/app/tx/detail/AMMClawback.h | 2 +- src/xrpld/app/tx/detail/AMMCreate.cpp | 2 +- src/xrpld/app/tx/detail/AMMCreate.h | 2 +- src/xrpld/app/tx/detail/AMMDelete.cpp | 2 +- src/xrpld/app/tx/detail/AMMDelete.h | 2 +- src/xrpld/app/tx/detail/AMMDeposit.cpp | 2 +- src/xrpld/app/tx/detail/AMMDeposit.h | 2 +- src/xrpld/app/tx/detail/AMMVote.cpp | 2 +- src/xrpld/app/tx/detail/AMMVote.h | 2 +- src/xrpld/app/tx/detail/AMMWithdraw.cpp | 2 +- src/xrpld/app/tx/detail/AMMWithdraw.h | 2 +- src/xrpld/app/tx/detail/Batch.cpp | 2 +- src/xrpld/app/tx/detail/Batch.h | 2 +- src/xrpld/app/tx/detail/CancelCheck.cpp | 2 +- src/xrpld/app/tx/detail/CancelCheck.h | 2 +- src/xrpld/app/tx/detail/CancelOffer.cpp | 2 +- src/xrpld/app/tx/detail/CancelOffer.h | 2 +- src/xrpld/app/tx/detail/CashCheck.cpp | 2 +- src/xrpld/app/tx/detail/CashCheck.h | 2 +- src/xrpld/app/tx/detail/Change.cpp | 2 +- src/xrpld/app/tx/detail/Clawback.cpp | 2 +- src/xrpld/app/tx/detail/Clawback.h | 2 +- src/xrpld/app/tx/detail/CreateCheck.cpp | 2 +- src/xrpld/app/tx/detail/CreateCheck.h | 2 +- src/xrpld/app/tx/detail/CreateOffer.cpp | 2 +- src/xrpld/app/tx/detail/CreateOffer.h | 2 +- src/xrpld/app/tx/detail/CreateTicket.cpp | 2 +- src/xrpld/app/tx/detail/CreateTicket.h | 2 +- src/xrpld/app/tx/detail/Credentials.cpp | 6 ++-- src/xrpld/app/tx/detail/Credentials.h | 6 ++-- src/xrpld/app/tx/detail/DID.cpp | 4 +-- src/xrpld/app/tx/detail/DID.h | 4 +-- src/xrpld/app/tx/detail/DelegateSet.cpp | 2 +- src/xrpld/app/tx/detail/DelegateSet.h | 2 +- src/xrpld/app/tx/detail/DeleteAccount.cpp | 2 +- src/xrpld/app/tx/detail/DeleteAccount.h | 2 +- src/xrpld/app/tx/detail/DeleteOracle.cpp | 2 +- src/xrpld/app/tx/detail/DeleteOracle.h | 2 +- src/xrpld/app/tx/detail/DepositPreauth.cpp | 2 +- src/xrpld/app/tx/detail/DepositPreauth.h | 2 +- src/xrpld/app/tx/detail/Escrow.cpp | 6 ++-- src/xrpld/app/tx/detail/Escrow.h | 6 ++-- src/xrpld/app/tx/detail/LedgerStateFix.cpp | 2 +- src/xrpld/app/tx/detail/LedgerStateFix.h | 2 +- .../app/tx/detail/LoanBrokerCoverDeposit.cpp | 2 +- .../app/tx/detail/LoanBrokerCoverDeposit.h | 2 +- .../app/tx/detail/LoanBrokerCoverWithdraw.cpp | 2 +- .../app/tx/detail/LoanBrokerCoverWithdraw.h | 2 +- src/xrpld/app/tx/detail/LoanBrokerDelete.cpp | 2 +- src/xrpld/app/tx/detail/LoanBrokerDelete.h | 2 +- src/xrpld/app/tx/detail/LoanBrokerSet.cpp | 2 +- src/xrpld/app/tx/detail/LoanBrokerSet.h | 2 +- src/xrpld/app/tx/detail/LoanDelete.cpp | 2 +- src/xrpld/app/tx/detail/LoanDelete.h | 2 +- src/xrpld/app/tx/detail/LoanDraw.cpp | 2 +- src/xrpld/app/tx/detail/LoanDraw.h | 2 +- src/xrpld/app/tx/detail/LoanManage.cpp | 2 +- src/xrpld/app/tx/detail/LoanManage.h | 2 +- src/xrpld/app/tx/detail/LoanPay.cpp | 2 +- src/xrpld/app/tx/detail/LoanPay.h | 2 +- src/xrpld/app/tx/detail/LoanSet.cpp | 2 +- src/xrpld/app/tx/detail/LoanSet.h | 2 +- src/xrpld/app/tx/detail/MPTokenAuthorize.cpp | 2 +- src/xrpld/app/tx/detail/MPTokenAuthorize.h | 2 +- .../app/tx/detail/MPTokenIssuanceCreate.cpp | 2 +- .../app/tx/detail/MPTokenIssuanceCreate.h | 2 +- .../app/tx/detail/MPTokenIssuanceDestroy.cpp | 2 +- .../app/tx/detail/MPTokenIssuanceDestroy.h | 2 +- .../app/tx/detail/MPTokenIssuanceSet.cpp | 2 +- src/xrpld/app/tx/detail/MPTokenIssuanceSet.h | 2 +- .../app/tx/detail/NFTokenAcceptOffer.cpp | 2 +- src/xrpld/app/tx/detail/NFTokenAcceptOffer.h | 2 +- src/xrpld/app/tx/detail/NFTokenBurn.cpp | 2 +- src/xrpld/app/tx/detail/NFTokenBurn.h | 2 +- .../app/tx/detail/NFTokenCancelOffer.cpp | 2 +- src/xrpld/app/tx/detail/NFTokenCancelOffer.h | 2 +- .../app/tx/detail/NFTokenCreateOffer.cpp | 2 +- src/xrpld/app/tx/detail/NFTokenCreateOffer.h | 2 +- src/xrpld/app/tx/detail/NFTokenMint.cpp | 2 +- src/xrpld/app/tx/detail/NFTokenMint.h | 2 +- src/xrpld/app/tx/detail/NFTokenModify.cpp | 2 +- src/xrpld/app/tx/detail/NFTokenModify.h | 2 +- src/xrpld/app/tx/detail/PayChan.cpp | 6 ++-- src/xrpld/app/tx/detail/PayChan.h | 6 ++-- src/xrpld/app/tx/detail/Payment.cpp | 2 +- src/xrpld/app/tx/detail/Payment.h | 2 +- .../tx/detail/PermissionedDomainDelete.cpp | 2 +- .../app/tx/detail/PermissionedDomainDelete.h | 2 +- .../app/tx/detail/PermissionedDomainSet.cpp | 2 +- .../app/tx/detail/PermissionedDomainSet.h | 2 +- src/xrpld/app/tx/detail/SetAccount.cpp | 2 +- src/xrpld/app/tx/detail/SetAccount.h | 2 +- src/xrpld/app/tx/detail/SetOracle.cpp | 2 +- src/xrpld/app/tx/detail/SetOracle.h | 2 +- src/xrpld/app/tx/detail/SetRegularKey.cpp | 2 +- src/xrpld/app/tx/detail/SetRegularKey.h | 2 +- src/xrpld/app/tx/detail/SetSignerList.cpp | 2 +- src/xrpld/app/tx/detail/SetSignerList.h | 2 +- src/xrpld/app/tx/detail/SetTrust.cpp | 2 +- src/xrpld/app/tx/detail/SetTrust.h | 2 +- src/xrpld/app/tx/detail/Transactor.h | 30 +++++++++++++------ src/xrpld/app/tx/detail/VaultClawback.cpp | 2 +- src/xrpld/app/tx/detail/VaultClawback.h | 2 +- src/xrpld/app/tx/detail/VaultCreate.cpp | 2 +- src/xrpld/app/tx/detail/VaultCreate.h | 2 +- src/xrpld/app/tx/detail/VaultDelete.cpp | 2 +- src/xrpld/app/tx/detail/VaultDelete.h | 2 +- src/xrpld/app/tx/detail/VaultDeposit.cpp | 2 +- src/xrpld/app/tx/detail/VaultDeposit.h | 2 +- src/xrpld/app/tx/detail/VaultSet.cpp | 2 +- src/xrpld/app/tx/detail/VaultSet.h | 2 +- src/xrpld/app/tx/detail/VaultWithdraw.cpp | 2 +- src/xrpld/app/tx/detail/VaultWithdraw.h | 2 +- src/xrpld/app/tx/detail/XChainBridge.cpp | 22 +++++++------- src/xrpld/app/tx/detail/XChainBridge.h | 16 +++++----- src/xrpld/app/tx/detail/applySteps.cpp | 2 +- 120 files changed, 173 insertions(+), 161 deletions(-) diff --git a/src/test/app/AMM_test.cpp b/src/test/app/AMM_test.cpp index 286d1ca425..960f92c071 100644 --- 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(pfctx); + auto pf = Transactor::invokePreflight(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(pfctx); + auto pf = Transactor::invokePreflight(pfctx); BEAST_EXPECT(pf != tesSUCCESS); } @@ -3601,7 +3601,7 @@ private: env.current()->rules(), tapNONE, env.journal); - auto pf = Transactor::preflight(pfctx); + auto pf = Transactor::invokePreflight(pfctx); BEAST_EXPECT(pf == temBAD_AMM_TOKENS); } } diff --git a/src/xrpld/app/tx/detail/AMMBid.cpp b/src/xrpld/app/tx/detail/AMMBid.cpp index d14b668790..2fc420974d 100644 --- 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(), ctx.tx[sfAsset2].get())) diff --git a/src/xrpld/app/tx/detail/AMMBid.h b/src/xrpld/app/tx/detail/AMMBid.h index 9260ae78f2..9e69aca471 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/AMMClawback.cpp b/src/xrpld/app/tx/detail/AMMClawback.cpp index 527af9b471..74cfb673ee 100644 --- 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]; diff --git a/src/xrpld/app/tx/detail/AMMClawback.h b/src/xrpld/app/tx/detail/AMMClawback.h index 828d07343b..0e354ebdc7 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/AMMCreate.cpp b/src/xrpld/app/tx/detail/AMMCreate.cpp index 14bc8f7cda..c2e1503888 100644 --- 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]; diff --git a/src/xrpld/app/tx/detail/AMMCreate.h b/src/xrpld/app/tx/detail/AMMCreate.h index f6313dd8af..aab4a4fb27 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/AMMDelete.cpp b/src/xrpld/app/tx/detail/AMMDelete.cpp index 172a33073e..31e18573fc 100644 --- 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; } diff --git a/src/xrpld/app/tx/detail/AMMDelete.h b/src/xrpld/app/tx/detail/AMMDelete.h index 87abf92c27..1c44571021 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/AMMDeposit.cpp b/src/xrpld/app/tx/detail/AMMDeposit.cpp index 2aad1e05b9..9df16ef12a 100644 --- 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(); diff --git a/src/xrpld/app/tx/detail/AMMDeposit.h b/src/xrpld/app/tx/detail/AMMDeposit.h index 982c2d8abd..09e1f040ff 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/AMMVote.cpp b/src/xrpld/app/tx/detail/AMMVote.cpp index ca3435449d..1c5cd543eb 100644 --- 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(), ctx.tx[sfAsset2].get())) diff --git a/src/xrpld/app/tx/detail/AMMVote.h b/src/xrpld/app/tx/detail/AMMVote.h index bc94517961..af7691a3b4 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/AMMWithdraw.cpp b/src/xrpld/app/tx/detail/AMMWithdraw.cpp index 712695fd61..6f16052de2 100644 --- 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(); diff --git a/src/xrpld/app/tx/detail/AMMWithdraw.h b/src/xrpld/app/tx/detail/AMMWithdraw.h index 7afda43e1e..e70f74bad2 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/Batch.cpp b/src/xrpld/app/tx/detail/Batch.cpp index 00595f55a1..5f05d9919e 100644 --- a/src/xrpld/app/tx/detail/Batch.cpp +++ b/src/xrpld/app/tx/detail/Batch.cpp @@ -210,7 +210,7 @@ Batch::getFlagsMask(PreflightContext const& ctx) * code otherwise. */ NotTEC -Batch::doPreflight(PreflightContext const& ctx) +Batch::preflight(PreflightContext const& ctx) { auto const parentBatchId = ctx.tx.getTransactionID(); auto const outerAccount = ctx.tx.getAccountID(sfAccount); diff --git a/src/xrpld/app/tx/detail/Batch.h b/src/xrpld/app/tx/detail/Batch.h index 858a3d9c3d..c8a264f328 100644 --- a/src/xrpld/app/tx/detail/Batch.h +++ b/src/xrpld/app/tx/detail/Batch.h @@ -47,7 +47,7 @@ public: getFlagsMask(PreflightContext const& ctx); static NotTEC - doPreflight(PreflightContext const& ctx); + preflight(PreflightContext const& ctx); static NotTEC checkSign(PreclaimContext const& ctx); diff --git a/src/xrpld/app/tx/detail/CancelCheck.cpp b/src/xrpld/app/tx/detail/CancelCheck.cpp index 15b647446b..82ec1bbd1e 100644 --- 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; } diff --git a/src/xrpld/app/tx/detail/CancelCheck.h b/src/xrpld/app/tx/detail/CancelCheck.h index 3b40d24008..44cf3e0721 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/CancelOffer.cpp b/src/xrpld/app/tx/detail/CancelOffer.cpp index 6141f63e48..99ca792b3b 100644 --- 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]) { diff --git a/src/xrpld/app/tx/detail/CancelOffer.h b/src/xrpld/app/tx/detail/CancelOffer.h index 8632115026..0813dd0aef 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/CashCheck.cpp b/src/xrpld/app/tx/detail/CashCheck.cpp index 02babcfbe5..7768db31c9 100644 --- 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]; diff --git a/src/xrpld/app/tx/detail/CashCheck.h b/src/xrpld/app/tx/detail/CashCheck.h index 5dbd21a8e3..cc3d564efe 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/Change.cpp b/src/xrpld/app/tx/detail/Change.cpp index 8d4a42e50d..6a816d2b61 100644 --- 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(PreflightContext const& ctx) +Transactor::invokePreflight(PreflightContext const& ctx) { // 0 means "Allow any flags" // The check for tfChangeMask is gated by LendingProtocol because that diff --git a/src/xrpld/app/tx/detail/Clawback.cpp b/src/xrpld/app/tx/detail/Clawback.cpp index 0375b6b718..012565ad95 100644 --- 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( [&](T const&) { return preflightHelper(ctx); }, diff --git a/src/xrpld/app/tx/detail/Clawback.h b/src/xrpld/app/tx/detail/Clawback.h index 6353c79a55..8300d98fde 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/CreateCheck.cpp b/src/xrpld/app/tx/detail/CreateCheck.cpp index 7b19629230..a8ebce4204 100644 --- 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]) { diff --git a/src/xrpld/app/tx/detail/CreateCheck.h b/src/xrpld/app/tx/detail/CreateCheck.h index cb794332ca..1d9a7ce168 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/CreateOffer.cpp b/src/xrpld/app/tx/detail/CreateOffer.cpp index aa54cc81c9..9ddc4d2502 100644 --- a/src/xrpld/app/tx/detail/CreateOffer.cpp +++ b/src/xrpld/app/tx/detail/CreateOffer.cpp @@ -70,7 +70,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; diff --git a/src/xrpld/app/tx/detail/CreateOffer.h b/src/xrpld/app/tx/detail/CreateOffer.h index cff1022a6b..27d0107e41 100644 --- 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 diff --git a/src/xrpld/app/tx/detail/CreateTicket.cpp b/src/xrpld/app/tx/detail/CreateTicket.cpp index 254cf68555..8d88dd7bf8 100644 --- 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) diff --git a/src/xrpld/app/tx/detail/CreateTicket.h b/src/xrpld/app/tx/detail/CreateTicket.h index 746daf7c56..04ad6711c7 100644 --- 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 diff --git a/src/xrpld/app/tx/detail/Credentials.cpp b/src/xrpld/app/tx/detail/Credentials.cpp index 83873a9612..abd5539100 100644 --- 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]) { diff --git a/src/xrpld/app/tx/detail/Credentials.h b/src/xrpld/app/tx/detail/Credentials.h index ee19c5c0a3..31b1ee8cf7 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/DID.cpp b/src/xrpld/app/tx/detail/DID.cpp index d74c9733ae..8c1e23f4d5 100644 --- 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; } diff --git a/src/xrpld/app/tx/detail/DID.h b/src/xrpld/app/tx/detail/DID.h index 1995176d17..c9fbb199b9 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/DelegateSet.cpp b/src/xrpld/app/tx/detail/DelegateSet.cpp index ebd52c113e..5e6b17f187 100644 --- 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) diff --git a/src/xrpld/app/tx/detail/DelegateSet.h b/src/xrpld/app/tx/detail/DelegateSet.h index 87166ab5fb..c95b0f8fd4 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/DeleteAccount.cpp b/src/xrpld/app/tx/detail/DeleteAccount.cpp index 0aa3031130..4f49384b87 100644 --- 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. diff --git a/src/xrpld/app/tx/detail/DeleteAccount.h b/src/xrpld/app/tx/detail/DeleteAccount.h index 42946bfc27..a67267ad7b 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/DeleteOracle.cpp b/src/xrpld/app/tx/detail/DeleteOracle.cpp index 2e49877d9b..ac078e5c9d 100644 --- 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; } diff --git a/src/xrpld/app/tx/detail/DeleteOracle.h b/src/xrpld/app/tx/detail/DeleteOracle.h index 87183268ff..f55b5d0f50 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/DepositPreauth.cpp b/src/xrpld/app/tx/detail/DepositPreauth.cpp index a1bdafa852..3d1cbf7381 100644 --- 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 = diff --git a/src/xrpld/app/tx/detail/DepositPreauth.h b/src/xrpld/app/tx/detail/DepositPreauth.h index 3d969b8df4..384b098aef 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/Escrow.cpp b/src/xrpld/app/tx/detail/Escrow.cpp index e2601dbb76..501fce3d73 100644 --- 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; } diff --git a/src/xrpld/app/tx/detail/Escrow.h b/src/xrpld/app/tx/detail/Escrow.h index 86ae208b67..9696515963 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/LedgerStateFix.cpp b/src/xrpld/app/tx/detail/LedgerStateFix.cpp index 680cc30d95..eeb67bbc91 100644 --- 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]) { diff --git a/src/xrpld/app/tx/detail/LedgerStateFix.h b/src/xrpld/app/tx/detail/LedgerStateFix.h index e67dfd26c9..b93dcd6a00 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/LoanBrokerCoverDeposit.cpp b/src/xrpld/app/tx/detail/LoanBrokerCoverDeposit.cpp index d82a59ed0d..923703a6a0 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerCoverDeposit.cpp +++ b/src/xrpld/app/tx/detail/LoanBrokerCoverDeposit.cpp @@ -49,7 +49,7 @@ LoanBrokerCoverDeposit::isEnabled(PreflightContext const& ctx) } NotTEC -LoanBrokerCoverDeposit::doPreflight(PreflightContext const& ctx) +LoanBrokerCoverDeposit::preflight(PreflightContext const& ctx) { if (ctx.tx[sfLoanBrokerID] == beast::zero) return temINVALID; diff --git a/src/xrpld/app/tx/detail/LoanBrokerCoverDeposit.h b/src/xrpld/app/tx/detail/LoanBrokerCoverDeposit.h index 7e9a10119d..548b873dec 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerCoverDeposit.h +++ b/src/xrpld/app/tx/detail/LoanBrokerCoverDeposit.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); diff --git a/src/xrpld/app/tx/detail/LoanBrokerCoverWithdraw.cpp b/src/xrpld/app/tx/detail/LoanBrokerCoverWithdraw.cpp index b776eea535..a1e1233b89 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerCoverWithdraw.cpp +++ b/src/xrpld/app/tx/detail/LoanBrokerCoverWithdraw.cpp @@ -49,7 +49,7 @@ LoanBrokerCoverWithdraw::isEnabled(PreflightContext const& ctx) } NotTEC -LoanBrokerCoverWithdraw::doPreflight(PreflightContext const& ctx) +LoanBrokerCoverWithdraw::preflight(PreflightContext const& ctx) { if (ctx.tx[sfLoanBrokerID] == beast::zero) return temINVALID; diff --git a/src/xrpld/app/tx/detail/LoanBrokerCoverWithdraw.h b/src/xrpld/app/tx/detail/LoanBrokerCoverWithdraw.h index f7a03f7bb8..ce7eb79abe 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerCoverWithdraw.h +++ b/src/xrpld/app/tx/detail/LoanBrokerCoverWithdraw.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); diff --git a/src/xrpld/app/tx/detail/LoanBrokerDelete.cpp b/src/xrpld/app/tx/detail/LoanBrokerDelete.cpp index f76b1e8a0f..d5eeb9c152 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerDelete.cpp +++ b/src/xrpld/app/tx/detail/LoanBrokerDelete.cpp @@ -49,7 +49,7 @@ LoanBrokerDelete::isEnabled(PreflightContext const& ctx) } NotTEC -LoanBrokerDelete::doPreflight(PreflightContext const& ctx) +LoanBrokerDelete::preflight(PreflightContext const& ctx) { return tesSUCCESS; } diff --git a/src/xrpld/app/tx/detail/LoanBrokerDelete.h b/src/xrpld/app/tx/detail/LoanBrokerDelete.h index 7382106c40..41e1ff6853 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerDelete.h +++ b/src/xrpld/app/tx/detail/LoanBrokerDelete.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); diff --git a/src/xrpld/app/tx/detail/LoanBrokerSet.cpp b/src/xrpld/app/tx/detail/LoanBrokerSet.cpp index 7589a5817a..70f329af16 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerSet.cpp +++ b/src/xrpld/app/tx/detail/LoanBrokerSet.cpp @@ -52,7 +52,7 @@ LoanBrokerSet::isEnabled(PreflightContext const& ctx) } NotTEC -LoanBrokerSet::doPreflight(PreflightContext const& ctx) +LoanBrokerSet::preflight(PreflightContext const& ctx) { auto const& tx = ctx.tx; if (auto const data = tx[~sfData]; data && !data->empty() && diff --git a/src/xrpld/app/tx/detail/LoanBrokerSet.h b/src/xrpld/app/tx/detail/LoanBrokerSet.h index 018833132b..7e4e02211e 100644 --- a/src/xrpld/app/tx/detail/LoanBrokerSet.h +++ b/src/xrpld/app/tx/detail/LoanBrokerSet.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); diff --git a/src/xrpld/app/tx/detail/LoanDelete.cpp b/src/xrpld/app/tx/detail/LoanDelete.cpp index d29c03e969..4cf9e9a929 100644 --- a/src/xrpld/app/tx/detail/LoanDelete.cpp +++ b/src/xrpld/app/tx/detail/LoanDelete.cpp @@ -51,7 +51,7 @@ LoanDelete::isEnabled(PreflightContext const& ctx) } NotTEC -LoanDelete::doPreflight(PreflightContext const& ctx) +LoanDelete::preflight(PreflightContext const& ctx) { if (ctx.tx[sfLoanID] == beast::zero) return temINVALID; diff --git a/src/xrpld/app/tx/detail/LoanDelete.h b/src/xrpld/app/tx/detail/LoanDelete.h index 6909953099..74825b5bcd 100644 --- a/src/xrpld/app/tx/detail/LoanDelete.h +++ b/src/xrpld/app/tx/detail/LoanDelete.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); diff --git a/src/xrpld/app/tx/detail/LoanDraw.cpp b/src/xrpld/app/tx/detail/LoanDraw.cpp index 1f01639fe0..2e957c6f79 100644 --- a/src/xrpld/app/tx/detail/LoanDraw.cpp +++ b/src/xrpld/app/tx/detail/LoanDraw.cpp @@ -51,7 +51,7 @@ LoanDraw::isEnabled(PreflightContext const& ctx) } NotTEC -LoanDraw::doPreflight(PreflightContext const& ctx) +LoanDraw::preflight(PreflightContext const& ctx) { if (ctx.tx[sfLoanID] == beast::zero) return temINVALID; diff --git a/src/xrpld/app/tx/detail/LoanDraw.h b/src/xrpld/app/tx/detail/LoanDraw.h index bb8c5dcf22..a4d0a29b79 100644 --- a/src/xrpld/app/tx/detail/LoanDraw.h +++ b/src/xrpld/app/tx/detail/LoanDraw.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); diff --git a/src/xrpld/app/tx/detail/LoanManage.cpp b/src/xrpld/app/tx/detail/LoanManage.cpp index d44bb5ae7b..a218059ade 100644 --- a/src/xrpld/app/tx/detail/LoanManage.cpp +++ b/src/xrpld/app/tx/detail/LoanManage.cpp @@ -58,7 +58,7 @@ LoanManage::getFlagsMask(PreflightContext const& ctx) } NotTEC -LoanManage::doPreflight(PreflightContext const& ctx) +LoanManage::preflight(PreflightContext const& ctx) { if (ctx.tx[sfLoanID] == beast::zero) return temINVALID; diff --git a/src/xrpld/app/tx/detail/LoanManage.h b/src/xrpld/app/tx/detail/LoanManage.h index 74b8a7299f..7f61008c57 100644 --- a/src/xrpld/app/tx/detail/LoanManage.h +++ b/src/xrpld/app/tx/detail/LoanManage.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); diff --git a/src/xrpld/app/tx/detail/LoanPay.cpp b/src/xrpld/app/tx/detail/LoanPay.cpp index 5ff03b267b..e83e4ae27e 100644 --- a/src/xrpld/app/tx/detail/LoanPay.cpp +++ b/src/xrpld/app/tx/detail/LoanPay.cpp @@ -51,7 +51,7 @@ LoanPay::isEnabled(PreflightContext const& ctx) } NotTEC -LoanPay::doPreflight(PreflightContext const& ctx) +LoanPay::preflight(PreflightContext const& ctx) { if (ctx.tx[sfLoanID] == beast::zero) return temINVALID; diff --git a/src/xrpld/app/tx/detail/LoanPay.h b/src/xrpld/app/tx/detail/LoanPay.h index f608a7fb38..3f4b208aa2 100644 --- a/src/xrpld/app/tx/detail/LoanPay.h +++ b/src/xrpld/app/tx/detail/LoanPay.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); diff --git a/src/xrpld/app/tx/detail/LoanSet.cpp b/src/xrpld/app/tx/detail/LoanSet.cpp index 3ce1c2cd73..c6cfed0335 100644 --- a/src/xrpld/app/tx/detail/LoanSet.cpp +++ b/src/xrpld/app/tx/detail/LoanSet.cpp @@ -59,7 +59,7 @@ LoanSet::getFlagsMask(PreflightContext const& ctx) } NotTEC -LoanSet::doPreflight(PreflightContext const& ctx) +LoanSet::preflight(PreflightContext const& ctx) { auto const& tx = ctx.tx; auto const counterPartySig = ctx.tx.getFieldObject(sfCounterpartySignature); diff --git a/src/xrpld/app/tx/detail/LoanSet.h b/src/xrpld/app/tx/detail/LoanSet.h index 888c1343ff..342f822168 100644 --- a/src/xrpld/app/tx/detail/LoanSet.h +++ b/src/xrpld/app/tx/detail/LoanSet.h @@ -40,7 +40,7 @@ public: getFlagsMask(PreflightContext const& ctx); static NotTEC - doPreflight(PreflightContext const& ctx); + preflight(PreflightContext const& ctx); static NotTEC checkSign(PreclaimContext const& ctx); diff --git a/src/xrpld/app/tx/detail/MPTokenAuthorize.cpp b/src/xrpld/app/tx/detail/MPTokenAuthorize.cpp index f4a93ffb3e..f9dbb0995f 100644 --- 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; diff --git a/src/xrpld/app/tx/detail/MPTokenAuthorize.h b/src/xrpld/app/tx/detail/MPTokenAuthorize.h index 63ca2c8b01..5c386db530 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.cpp b/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.cpp index 8f751015d8..f34b97a6b4 100644 --- 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]) { diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.h b/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.h index 3df61d52ce..ce8f30fda9 100644 --- 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; diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.cpp b/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.cpp index 7c0d5baf31..d52dcca8bf 100644 --- 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; } diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.h b/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.h index 8718caf5b5..dd2131713b 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp b/src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp index a36df80d21..ca09ab9fe1 100644 --- 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(); diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceSet.h b/src/xrpld/app/tx/detail/MPTokenIssuanceSet.h index ac2b2fa6da..55d6110fcd 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp b/src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp index df56b0c763..6cb8e89c40 100644 --- 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]; diff --git a/src/xrpld/app/tx/detail/NFTokenAcceptOffer.h b/src/xrpld/app/tx/detail/NFTokenAcceptOffer.h index 637944af92..b049aad46e 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/NFTokenBurn.cpp b/src/xrpld/app/tx/detail/NFTokenBurn.cpp index 4948ef7f2a..80aec56af6 100644 --- 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; } diff --git a/src/xrpld/app/tx/detail/NFTokenBurn.h b/src/xrpld/app/tx/detail/NFTokenBurn.h index ff930c1be7..f1ae0752db 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp b/src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp index 5c6c406d2d..66edddcc82 100644 --- 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)) diff --git a/src/xrpld/app/tx/detail/NFTokenCancelOffer.h b/src/xrpld/app/tx/detail/NFTokenCancelOffer.h index e112dce6f8..bdd628e58d 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp b/src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp index 46baaf7f49..76ebc9e24d 100644 --- 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(); diff --git a/src/xrpld/app/tx/detail/NFTokenCreateOffer.h b/src/xrpld/app/tx/detail/NFTokenCreateOffer.h index fb1b6a575f..58946bad55 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/NFTokenMint.cpp b/src/xrpld/app/tx/detail/NFTokenMint.cpp index 3dcad38ee1..db49e122e2 100644 --- 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]) { diff --git a/src/xrpld/app/tx/detail/NFTokenMint.h b/src/xrpld/app/tx/detail/NFTokenMint.h index 4af7448532..696ad856ab 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/NFTokenModify.cpp b/src/xrpld/app/tx/detail/NFTokenModify.cpp index 54f26387b1..98cbd5760a 100644 --- 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; diff --git a/src/xrpld/app/tx/detail/NFTokenModify.h b/src/xrpld/app/tx/detail/NFTokenModify.h index a0936c6af1..8a80e422c5 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/PayChan.cpp b/src/xrpld/app/tx/detail/PayChan.cpp index 40c3a22871..d90a661321 100644 --- 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)) diff --git a/src/xrpld/app/tx/detail/PayChan.h b/src/xrpld/app/tx/detail/PayChan.h index 1faa34499b..9390aa52b9 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/Payment.cpp b/src/xrpld/app/tx/detail/Payment.cpp index 34ba3b94f6..da5e185770 100644 --- 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; diff --git a/src/xrpld/app/tx/detail/Payment.h b/src/xrpld/app/tx/detail/Payment.h index 577b7827ae..3f16dd97bc 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/PermissionedDomainDelete.cpp b/src/xrpld/app/tx/detail/PermissionedDomainDelete.cpp index d89831dfe0..6087bae8ad 100644 --- 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) diff --git a/src/xrpld/app/tx/detail/PermissionedDomainDelete.h b/src/xrpld/app/tx/detail/PermissionedDomainDelete.h index 574a99bffa..403d0786e3 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/PermissionedDomainSet.cpp b/src/xrpld/app/tx/detail/PermissionedDomainSet.cpp index 98aedb7304..8e27fdddd6 100644 --- 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), diff --git a/src/xrpld/app/tx/detail/PermissionedDomainSet.h b/src/xrpld/app/tx/detail/PermissionedDomainSet.h index 94761bae26..01e4bb86d0 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/SetAccount.cpp b/src/xrpld/app/tx/detail/SetAccount.cpp index 9d39670130..1641027a8e 100644 --- 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; diff --git a/src/xrpld/app/tx/detail/SetAccount.h b/src/xrpld/app/tx/detail/SetAccount.h index a16d2e0cdf..bcc0a61b1b 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/SetOracle.cpp b/src/xrpld/app/tx/detail/SetOracle.cpp index 4f6b9b700e..411f4b6e49 100644 --- 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()) diff --git a/src/xrpld/app/tx/detail/SetOracle.h b/src/xrpld/app/tx/detail/SetOracle.h index a35ef74c4c..2da10105b2 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/SetRegularKey.cpp b/src/xrpld/app/tx/detail/SetRegularKey.cpp index f4d04ec1c1..4e063e7d1f 100644 --- 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) && diff --git a/src/xrpld/app/tx/detail/SetRegularKey.h b/src/xrpld/app/tx/detail/SetRegularKey.h index 00b9e47169..055748aa25 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/SetSignerList.cpp b/src/xrpld/app/tx/detail/SetSignerList.cpp index 191b947560..a2b310bbd6 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/SetSignerList.h b/src/xrpld/app/tx/detail/SetSignerList.h index 575db5a127..be2df8152e 100644 --- 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; diff --git a/src/xrpld/app/tx/detail/SetTrust.cpp b/src/xrpld/app/tx/detail/SetTrust.cpp index f7ae39c1ae..55e10b2317 100644 --- 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; diff --git a/src/xrpld/app/tx/detail/SetTrust.h b/src/xrpld/app/tx/detail/SetTrust.h index d7ca54d1dc..443080bf74 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/Transactor.h b/src/xrpld/app/tx/detail/Transactor.h index b2ed320c1b..6eda07a387 100644 --- 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 static NotTEC - preflight(PreflightContext const& ctx); + invokePreflight(PreflightContext const& ctx); static TER preclaim(PreclaimContext const& ctx) @@ -320,15 +326,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); }; @@ -366,11 +378,11 @@ preflightCheckSimulateKeys( // Defined in Change.cpp template <> NotTEC -Transactor::preflight(PreflightContext const& ctx); +Transactor::invokePreflight(PreflightContext const& ctx); template NotTEC -Transactor::preflight(PreflightContext const& ctx) +Transactor::invokePreflight(PreflightContext const& ctx) { if (!T::isEnabled(ctx)) return temDISABLED; @@ -378,7 +390,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); diff --git a/src/xrpld/app/tx/detail/VaultClawback.cpp b/src/xrpld/app/tx/detail/VaultClawback.cpp index 39d068e58d..7b4d15c592 100644 --- 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) { diff --git a/src/xrpld/app/tx/detail/VaultClawback.h b/src/xrpld/app/tx/detail/VaultClawback.h index 58ee97db46..58a7e738c3 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/VaultCreate.cpp b/src/xrpld/app/tx/detail/VaultCreate.cpp index 835201cb5f..569c462e7a 100644 --- 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; diff --git a/src/xrpld/app/tx/detail/VaultCreate.h b/src/xrpld/app/tx/detail/VaultCreate.h index effb7cd475..54074c4bce 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/VaultDelete.cpp b/src/xrpld/app/tx/detail/VaultDelete.cpp index 71f1f86bae..02b63c145d 100644 --- 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) { diff --git a/src/xrpld/app/tx/detail/VaultDelete.h b/src/xrpld/app/tx/detail/VaultDelete.h index aa32db48ab..f8b838e02e 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/VaultDeposit.cpp b/src/xrpld/app/tx/detail/VaultDeposit.cpp index 847ba06954..162a314ff2 100644 --- 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) { diff --git a/src/xrpld/app/tx/detail/VaultDeposit.h b/src/xrpld/app/tx/detail/VaultDeposit.h index 79cd8f4a02..e804520595 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/VaultSet.cpp b/src/xrpld/app/tx/detail/VaultSet.cpp index feec2eb160..30a99fe153 100644 --- 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) { diff --git a/src/xrpld/app/tx/detail/VaultSet.h b/src/xrpld/app/tx/detail/VaultSet.h index 2e8004bec1..bce0077802 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/VaultWithdraw.cpp b/src/xrpld/app/tx/detail/VaultWithdraw.cpp index 32ae9fce1c..f628c0aa32 100644 --- 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) { diff --git a/src/xrpld/app/tx/detail/VaultWithdraw.h b/src/xrpld/app/tx/detail/VaultWithdraw.h index 9ac9e420ea..f01a8e4c9d 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/XChainBridge.cpp b/src/xrpld/app/tx/detail/XChainBridge.cpp index 93619e620c..fb35f9b2ad 100644 --- 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 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(ctx); + return attestationpreflight(ctx); } TER @@ -2149,9 +2149,9 @@ XChainAddAccountCreateAttestation::isEnabled(PreflightContext const& ctx) } NotTEC -XChainAddAccountCreateAttestation::doPreflight(PreflightContext const& ctx) +XChainAddAccountCreateAttestation::preflight(PreflightContext const& ctx) { - return attestationDoPreflight(ctx); + return attestationpreflight(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]; diff --git a/src/xrpld/app/tx/detail/XChainBridge.h b/src/xrpld/app/tx/detail/XChainBridge.h index b116418023..e210169bcf 100644 --- 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); diff --git a/src/xrpld/app/tx/detail/applySteps.cpp b/src/xrpld/app/tx/detail/applySteps.cpp index fbb117c372..c2e4e13f08 100644 --- 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(), [&]() { - auto const tec = Transactor::preflight(ctx); + auto const tec = Transactor::invokePreflight(ctx); return std::make_pair( tec, isTesSuccess(tec) ? consequences_helper(ctx)