From 267b537a1341c37d4739f769a8ab2a5936cde310 Mon Sep 17 00:00:00 2001 From: Ed Hennis Date: Sat, 20 Sep 2025 17:09:48 -0400 Subject: [PATCH] Review feedback from @Bronek - Fix a moved assert message - Rename `Transactor::isEnabled` to `checkExtraFeatures`, and finish cleaning up a few classes I missed on the first pass (Vault* & XChainBridge*). --- src/libxrpl/protocol/Permissions.cpp | 2 +- src/xrpld/app/tx/detail/AMMBid.cpp | 2 +- src/xrpld/app/tx/detail/AMMBid.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/CreateOffer.cpp | 2 +- src/xrpld/app/tx/detail/CreateOffer.h | 2 +- src/xrpld/app/tx/detail/DeleteAccount.cpp | 2 +- src/xrpld/app/tx/detail/DeleteAccount.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 | 2 +- src/xrpld/app/tx/detail/Escrow.h | 2 +- .../app/tx/detail/MPTokenIssuanceCreate.cpp | 2 +- .../app/tx/detail/MPTokenIssuanceCreate.h | 2 +- .../app/tx/detail/MPTokenIssuanceSet.cpp | 2 +- src/xrpld/app/tx/detail/MPTokenIssuanceSet.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 | 2 +- src/xrpld/app/tx/detail/PayChan.h | 2 +- src/xrpld/app/tx/detail/Payment.cpp | 2 +- src/xrpld/app/tx/detail/Payment.h | 2 +- .../app/tx/detail/PermissionedDomainSet.cpp | 2 +- .../app/tx/detail/PermissionedDomainSet.h | 2 +- src/xrpld/app/tx/detail/Transactor.h | 10 ++-- src/xrpld/app/tx/detail/VaultClawback.cpp | 6 --- src/xrpld/app/tx/detail/VaultClawback.h | 3 -- src/xrpld/app/tx/detail/VaultCreate.cpp | 5 +- src/xrpld/app/tx/detail/VaultCreate.h | 2 +- src/xrpld/app/tx/detail/VaultDelete.cpp | 6 --- src/xrpld/app/tx/detail/VaultDelete.h | 3 -- src/xrpld/app/tx/detail/VaultDeposit.cpp | 6 --- src/xrpld/app/tx/detail/VaultDeposit.h | 3 -- src/xrpld/app/tx/detail/VaultSet.cpp | 5 +- src/xrpld/app/tx/detail/VaultSet.h | 2 +- src/xrpld/app/tx/detail/VaultWithdraw.cpp | 6 --- src/xrpld/app/tx/detail/VaultWithdraw.h | 3 -- src/xrpld/app/tx/detail/XChainBridge.cpp | 48 ------------------- src/xrpld/app/tx/detail/XChainBridge.h | 24 ---------- 50 files changed, 45 insertions(+), 157 deletions(-) diff --git a/src/libxrpl/protocol/Permissions.cpp b/src/libxrpl/protocol/Permissions.cpp index af4b7e42c4..eb0c0489d1 100644 --- a/src/libxrpl/protocol/Permissions.cpp +++ b/src/libxrpl/protocol/Permissions.cpp @@ -137,7 +137,7 @@ Permission::getTxFeature(TxType txType) const auto const txFeaturesIt = txFeatureMap_.find(txType); XRPL_ASSERT( txFeaturesIt != txFeatureMap_.end(), - "ripple::Permissions::isDelegatable : tx exists in txFeatureMap_"); + "ripple::Permissions::getTxFeature : tx exists in txFeatureMap_"); if (txFeaturesIt->second == uint256{}) return std::nullopt; diff --git a/src/xrpld/app/tx/detail/AMMBid.cpp b/src/xrpld/app/tx/detail/AMMBid.cpp index 169292ab45..769668b07b 100644 --- a/src/xrpld/app/tx/detail/AMMBid.cpp +++ b/src/xrpld/app/tx/detail/AMMBid.cpp @@ -31,7 +31,7 @@ namespace ripple { bool -AMMBid::isEnabled(PreflightContext const& ctx) +AMMBid::checkExtraFeatures(PreflightContext const& ctx) { return ammEnabled(ctx.rules); } diff --git a/src/xrpld/app/tx/detail/AMMBid.h b/src/xrpld/app/tx/detail/AMMBid.h index 9e69aca471..4a527b6a93 100644 --- a/src/xrpld/app/tx/detail/AMMBid.h +++ b/src/xrpld/app/tx/detail/AMMBid.h @@ -72,7 +72,7 @@ public: } static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); static NotTEC preflight(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/AMMCreate.cpp b/src/xrpld/app/tx/detail/AMMCreate.cpp index 3c6a57cd19..63e20b42fb 100644 --- a/src/xrpld/app/tx/detail/AMMCreate.cpp +++ b/src/xrpld/app/tx/detail/AMMCreate.cpp @@ -32,7 +32,7 @@ namespace ripple { bool -AMMCreate::isEnabled(PreflightContext const& ctx) +AMMCreate::checkExtraFeatures(PreflightContext const& ctx) { return ammEnabled(ctx.rules); } diff --git a/src/xrpld/app/tx/detail/AMMCreate.h b/src/xrpld/app/tx/detail/AMMCreate.h index aab4a4fb27..98231e5554 100644 --- a/src/xrpld/app/tx/detail/AMMCreate.h +++ b/src/xrpld/app/tx/detail/AMMCreate.h @@ -64,7 +64,7 @@ public: } static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); static NotTEC preflight(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/AMMDelete.cpp b/src/xrpld/app/tx/detail/AMMDelete.cpp index f1338d5275..663a4c4b0a 100644 --- a/src/xrpld/app/tx/detail/AMMDelete.cpp +++ b/src/xrpld/app/tx/detail/AMMDelete.cpp @@ -28,7 +28,7 @@ namespace ripple { bool -AMMDelete::isEnabled(PreflightContext const& ctx) +AMMDelete::checkExtraFeatures(PreflightContext const& ctx) { return ammEnabled(ctx.rules); } diff --git a/src/xrpld/app/tx/detail/AMMDelete.h b/src/xrpld/app/tx/detail/AMMDelete.h index 1c44571021..36dace2e18 100644 --- a/src/xrpld/app/tx/detail/AMMDelete.h +++ b/src/xrpld/app/tx/detail/AMMDelete.h @@ -40,7 +40,7 @@ public: } static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); static NotTEC preflight(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/AMMDeposit.cpp b/src/xrpld/app/tx/detail/AMMDeposit.cpp index 23c0f1a5a2..8a3e50ed63 100644 --- a/src/xrpld/app/tx/detail/AMMDeposit.cpp +++ b/src/xrpld/app/tx/detail/AMMDeposit.cpp @@ -30,7 +30,7 @@ namespace ripple { bool -AMMDeposit::isEnabled(PreflightContext const& ctx) +AMMDeposit::checkExtraFeatures(PreflightContext const& ctx) { return ammEnabled(ctx.rules); } diff --git a/src/xrpld/app/tx/detail/AMMDeposit.h b/src/xrpld/app/tx/detail/AMMDeposit.h index 09e1f040ff..c1a37be452 100644 --- a/src/xrpld/app/tx/detail/AMMDeposit.h +++ b/src/xrpld/app/tx/detail/AMMDeposit.h @@ -69,7 +69,7 @@ public: } static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); static std::uint32_t getFlagsMask(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/AMMVote.cpp b/src/xrpld/app/tx/detail/AMMVote.cpp index 4fc7a5b3d5..0ffbb38b37 100644 --- a/src/xrpld/app/tx/detail/AMMVote.cpp +++ b/src/xrpld/app/tx/detail/AMMVote.cpp @@ -28,7 +28,7 @@ namespace ripple { bool -AMMVote::isEnabled(PreflightContext const& ctx) +AMMVote::checkExtraFeatures(PreflightContext const& ctx) { return ammEnabled(ctx.rules); } diff --git a/src/xrpld/app/tx/detail/AMMVote.h b/src/xrpld/app/tx/detail/AMMVote.h index af7691a3b4..dc99480111 100644 --- a/src/xrpld/app/tx/detail/AMMVote.h +++ b/src/xrpld/app/tx/detail/AMMVote.h @@ -57,7 +57,7 @@ public: } static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); static NotTEC preflight(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/AMMWithdraw.cpp b/src/xrpld/app/tx/detail/AMMWithdraw.cpp index d6590178ba..f5af9dfb9c 100644 --- a/src/xrpld/app/tx/detail/AMMWithdraw.cpp +++ b/src/xrpld/app/tx/detail/AMMWithdraw.cpp @@ -29,7 +29,7 @@ namespace ripple { bool -AMMWithdraw::isEnabled(PreflightContext const& ctx) +AMMWithdraw::checkExtraFeatures(PreflightContext const& ctx) { return ammEnabled(ctx.rules); } diff --git a/src/xrpld/app/tx/detail/AMMWithdraw.h b/src/xrpld/app/tx/detail/AMMWithdraw.h index 5cb8f4de31..31a7904626 100644 --- a/src/xrpld/app/tx/detail/AMMWithdraw.h +++ b/src/xrpld/app/tx/detail/AMMWithdraw.h @@ -77,7 +77,7 @@ public: } static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); static std::uint32_t getFlagsMask(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/CreateOffer.cpp b/src/xrpld/app/tx/detail/CreateOffer.cpp index cf8c22bdbc..5bd2752222 100644 --- a/src/xrpld/app/tx/detail/CreateOffer.cpp +++ b/src/xrpld/app/tx/detail/CreateOffer.cpp @@ -44,7 +44,7 @@ CreateOffer::makeTxConsequences(PreflightContext const& ctx) } bool -CreateOffer::isEnabled(PreflightContext const& ctx) +CreateOffer::checkExtraFeatures(PreflightContext const& ctx) { if (ctx.tx.isFieldPresent(sfDomainID) && !ctx.rules.enabled(featurePermissionedDEX)) diff --git a/src/xrpld/app/tx/detail/CreateOffer.h b/src/xrpld/app/tx/detail/CreateOffer.h index 3a20cd9ea1..c38e244b34 100644 --- a/src/xrpld/app/tx/detail/CreateOffer.h +++ b/src/xrpld/app/tx/detail/CreateOffer.h @@ -44,7 +44,7 @@ public: makeTxConsequences(PreflightContext const& ctx); static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); static std::uint32_t getFlagsMask(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/DeleteAccount.cpp b/src/xrpld/app/tx/detail/DeleteAccount.cpp index a5a8bd592f..364a53b50b 100644 --- a/src/xrpld/app/tx/detail/DeleteAccount.cpp +++ b/src/xrpld/app/tx/detail/DeleteAccount.cpp @@ -39,7 +39,7 @@ namespace ripple { bool -DeleteAccount::isEnabled(PreflightContext const& ctx) +DeleteAccount::checkExtraFeatures(PreflightContext const& ctx) { if (!ctx.rules.enabled(featureDeletableAccounts)) return false; diff --git a/src/xrpld/app/tx/detail/DeleteAccount.h b/src/xrpld/app/tx/detail/DeleteAccount.h index a67267ad7b..ee9db97d50 100644 --- a/src/xrpld/app/tx/detail/DeleteAccount.h +++ b/src/xrpld/app/tx/detail/DeleteAccount.h @@ -34,7 +34,7 @@ public: } static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); static NotTEC preflight(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/DepositPreauth.cpp b/src/xrpld/app/tx/detail/DepositPreauth.cpp index e666ac996e..bbbec3cbe7 100644 --- a/src/xrpld/app/tx/detail/DepositPreauth.cpp +++ b/src/xrpld/app/tx/detail/DepositPreauth.cpp @@ -31,7 +31,7 @@ namespace ripple { bool -DepositPreauth::isEnabled(PreflightContext const& ctx) +DepositPreauth::checkExtraFeatures(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 384b098aef..ead17742cd 100644 --- a/src/xrpld/app/tx/detail/DepositPreauth.h +++ b/src/xrpld/app/tx/detail/DepositPreauth.h @@ -34,7 +34,7 @@ public: } static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); static NotTEC preflight(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/Escrow.cpp b/src/xrpld/app/tx/detail/Escrow.cpp index e6b7ad05a6..969fd4dd4c 100644 --- a/src/xrpld/app/tx/detail/Escrow.cpp +++ b/src/xrpld/app/tx/detail/Escrow.cpp @@ -631,7 +631,7 @@ checkCondition(Slice f, Slice c) } bool -EscrowFinish::isEnabled(PreflightContext const& ctx) +EscrowFinish::checkExtraFeatures(PreflightContext const& ctx) { return !ctx.tx.isFieldPresent(sfCredentialIDs) || ctx.rules.enabled(featureCredentials); diff --git a/src/xrpld/app/tx/detail/Escrow.h b/src/xrpld/app/tx/detail/Escrow.h index fd08b4764a..8956be2939 100644 --- a/src/xrpld/app/tx/detail/Escrow.h +++ b/src/xrpld/app/tx/detail/Escrow.h @@ -61,7 +61,7 @@ public: } static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); static std::uint32_t getFlagsMask(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.cpp b/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.cpp index b4e457b606..eec4187573 100644 --- a/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.cpp +++ b/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.cpp @@ -26,7 +26,7 @@ namespace ripple { bool -MPTokenIssuanceCreate::isEnabled(PreflightContext const& ctx) +MPTokenIssuanceCreate::checkExtraFeatures(PreflightContext const& ctx) { if (ctx.tx.isFieldPresent(sfDomainID) && !(ctx.rules.enabled(featurePermissionedDomains) && diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.h b/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.h index fc79134a78..842ed88641 100644 --- a/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.h +++ b/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.h @@ -51,7 +51,7 @@ public: } static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); static std::uint32_t getFlagsMask(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp b/src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp index 1c25490dc1..c406a8ec5f 100644 --- a/src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp +++ b/src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp @@ -27,7 +27,7 @@ namespace ripple { bool -MPTokenIssuanceSet::isEnabled(PreflightContext const& ctx) +MPTokenIssuanceSet::checkExtraFeatures(PreflightContext const& ctx) { return !ctx.tx.isFieldPresent(sfDomainID) || (ctx.rules.enabled(featurePermissionedDomains) && diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceSet.h b/src/xrpld/app/tx/detail/MPTokenIssuanceSet.h index 55d6110fcd..f63812097e 100644 --- a/src/xrpld/app/tx/detail/MPTokenIssuanceSet.h +++ b/src/xrpld/app/tx/detail/MPTokenIssuanceSet.h @@ -34,7 +34,7 @@ public: } static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); static std::uint32_t getFlagsMask(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/NFTokenMint.cpp b/src/xrpld/app/tx/detail/NFTokenMint.cpp index 34d42830a8..8149d3b59d 100644 --- a/src/xrpld/app/tx/detail/NFTokenMint.cpp +++ b/src/xrpld/app/tx/detail/NFTokenMint.cpp @@ -47,7 +47,7 @@ hasOfferFields(PreflightContext const& ctx) } bool -NFTokenMint::isEnabled(PreflightContext const& ctx) +NFTokenMint::checkExtraFeatures(PreflightContext const& ctx) { return ctx.rules.enabled(featureNFTokenMintOffer) || !hasOfferFields(ctx); } diff --git a/src/xrpld/app/tx/detail/NFTokenMint.h b/src/xrpld/app/tx/detail/NFTokenMint.h index 696ad856ab..1606514559 100644 --- a/src/xrpld/app/tx/detail/NFTokenMint.h +++ b/src/xrpld/app/tx/detail/NFTokenMint.h @@ -37,7 +37,7 @@ public: } static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); static std::uint32_t getFlagsMask(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/NFTokenModify.cpp b/src/xrpld/app/tx/detail/NFTokenModify.cpp index 2a1a348187..6ae095411b 100644 --- a/src/xrpld/app/tx/detail/NFTokenModify.cpp +++ b/src/xrpld/app/tx/detail/NFTokenModify.cpp @@ -26,7 +26,7 @@ namespace ripple { bool -NFTokenModify::isEnabled(PreflightContext const& ctx) +NFTokenModify::checkExtraFeatures(PreflightContext const& ctx) { return ctx.rules.enabled(featureNonFungibleTokensV1_1); } diff --git a/src/xrpld/app/tx/detail/NFTokenModify.h b/src/xrpld/app/tx/detail/NFTokenModify.h index 8a80e422c5..04784381fb 100644 --- a/src/xrpld/app/tx/detail/NFTokenModify.h +++ b/src/xrpld/app/tx/detail/NFTokenModify.h @@ -34,7 +34,7 @@ public: } static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); static NotTEC preflight(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/PayChan.cpp b/src/xrpld/app/tx/detail/PayChan.cpp index 3255df878a..32c0abeb93 100644 --- a/src/xrpld/app/tx/detail/PayChan.cpp +++ b/src/xrpld/app/tx/detail/PayChan.cpp @@ -423,7 +423,7 @@ PayChanFund::doApply() //------------------------------------------------------------------------------ bool -PayChanClaim::isEnabled(PreflightContext const& ctx) +PayChanClaim::checkExtraFeatures(PreflightContext const& ctx) { return !ctx.tx.isFieldPresent(sfCredentialIDs) || ctx.rules.enabled(featureCredentials); diff --git a/src/xrpld/app/tx/detail/PayChan.h b/src/xrpld/app/tx/detail/PayChan.h index 9390aa52b9..b25a4529be 100644 --- a/src/xrpld/app/tx/detail/PayChan.h +++ b/src/xrpld/app/tx/detail/PayChan.h @@ -89,7 +89,7 @@ public: } static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); static std::uint32_t getFlagsMask(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/Payment.cpp b/src/xrpld/app/tx/detail/Payment.cpp index 6c77b7b7f8..8bc0e891d0 100644 --- a/src/xrpld/app/tx/detail/Payment.cpp +++ b/src/xrpld/app/tx/detail/Payment.cpp @@ -66,7 +66,7 @@ getMaxSourceAmount( } bool -Payment::isEnabled(PreflightContext const& ctx) +Payment::checkExtraFeatures(PreflightContext const& ctx) { if (ctx.tx.isFieldPresent(sfCredentialIDs) && !ctx.rules.enabled(featureCredentials)) diff --git a/src/xrpld/app/tx/detail/Payment.h b/src/xrpld/app/tx/detail/Payment.h index 3f16dd97bc..04bba390e2 100644 --- a/src/xrpld/app/tx/detail/Payment.h +++ b/src/xrpld/app/tx/detail/Payment.h @@ -43,7 +43,7 @@ public: makeTxConsequences(PreflightContext const& ctx); static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); static std::uint32_t getFlagsMask(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/PermissionedDomainSet.cpp b/src/xrpld/app/tx/detail/PermissionedDomainSet.cpp index 2f7f4f49a8..d9fa481bb6 100644 --- a/src/xrpld/app/tx/detail/PermissionedDomainSet.cpp +++ b/src/xrpld/app/tx/detail/PermissionedDomainSet.cpp @@ -29,7 +29,7 @@ namespace ripple { bool -PermissionedDomainSet::isEnabled(PreflightContext const& ctx) +PermissionedDomainSet::checkExtraFeatures(PreflightContext const& ctx) { return ctx.rules.enabled(featureCredentials); } diff --git a/src/xrpld/app/tx/detail/PermissionedDomainSet.h b/src/xrpld/app/tx/detail/PermissionedDomainSet.h index 01e4bb86d0..ed27896a3b 100644 --- a/src/xrpld/app/tx/detail/PermissionedDomainSet.h +++ b/src/xrpld/app/tx/detail/PermissionedDomainSet.h @@ -34,7 +34,7 @@ public: } static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); static NotTEC preflight(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/Transactor.h b/src/xrpld/app/tx/detail/Transactor.h index 939b23cf93..88b0664ea2 100644 --- a/src/xrpld/app/tx/detail/Transactor.h +++ b/src/xrpld/app/tx/detail/Transactor.h @@ -206,7 +206,7 @@ public: // Optional if the transaction is gated on an amendment that // isn't specified in transactions.macro static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); // Optional if the transaction uses any flags other than tfUniversal static std::uint32_t @@ -222,7 +222,7 @@ public: * Do not try to call preflight1 or preflight2 directly. * Do not check whether relevant amendments are enabled in preflight. - Instead, define isEnabled. + Instead, define checkExtraFeatures. * Do not check flags in preflight. Instead, define getFlagsMask. */ template @@ -283,7 +283,7 @@ protected: // Base class always returns true static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); // Base class always returns tfUniversalMask static std::uint32_t @@ -352,7 +352,7 @@ private: }; inline bool -Transactor::isEnabled(PreflightContext const& ctx) +Transactor::checkExtraFeatures(PreflightContext const& ctx) { return true; } @@ -398,7 +398,7 @@ Transactor::invokePreflight(PreflightContext const& ctx) if (feature && !ctx.rules.enabled(*feature)) return temDISABLED; - if (!T::isEnabled(ctx)) + if (!T::checkExtraFeatures(ctx)) return temDISABLED; if (auto const ret = preflight1(ctx, T::getFlagsMask(ctx))) diff --git a/src/xrpld/app/tx/detail/VaultClawback.cpp b/src/xrpld/app/tx/detail/VaultClawback.cpp index e2ed24a096..45a56a6292 100644 --- a/src/xrpld/app/tx/detail/VaultClawback.cpp +++ b/src/xrpld/app/tx/detail/VaultClawback.cpp @@ -32,12 +32,6 @@ namespace ripple { -bool -VaultClawback::isEnabled(PreflightContext const& ctx) -{ - return ctx.rules.enabled(featureSingleAssetVault); -} - NotTEC VaultClawback::preflight(PreflightContext const& ctx) { diff --git a/src/xrpld/app/tx/detail/VaultClawback.h b/src/xrpld/app/tx/detail/VaultClawback.h index 58a7e738c3..65f0164686 100644 --- a/src/xrpld/app/tx/detail/VaultClawback.h +++ b/src/xrpld/app/tx/detail/VaultClawback.h @@ -33,9 +33,6 @@ public: { } - static bool - isEnabled(PreflightContext const& ctx); - static NotTEC preflight(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/VaultCreate.cpp b/src/xrpld/app/tx/detail/VaultCreate.cpp index 29bf91907f..9447976a32 100644 --- a/src/xrpld/app/tx/detail/VaultCreate.cpp +++ b/src/xrpld/app/tx/detail/VaultCreate.cpp @@ -36,10 +36,9 @@ namespace ripple { bool -VaultCreate::isEnabled(PreflightContext const& ctx) +VaultCreate::checkExtraFeatures(PreflightContext const& ctx) { - if (!ctx.rules.enabled(featureSingleAssetVault) || - !ctx.rules.enabled(featureMPTokensV1)) + if (!ctx.rules.enabled(featureMPTokensV1)) return false; return !ctx.tx.isFieldPresent(sfDomainID) || diff --git a/src/xrpld/app/tx/detail/VaultCreate.h b/src/xrpld/app/tx/detail/VaultCreate.h index 54074c4bce..3f952d540a 100644 --- a/src/xrpld/app/tx/detail/VaultCreate.h +++ b/src/xrpld/app/tx/detail/VaultCreate.h @@ -34,7 +34,7 @@ public: } static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); static std::uint32_t getFlagsMask(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/VaultDelete.cpp b/src/xrpld/app/tx/detail/VaultDelete.cpp index 31ca73e389..ab7db78956 100644 --- a/src/xrpld/app/tx/detail/VaultDelete.cpp +++ b/src/xrpld/app/tx/detail/VaultDelete.cpp @@ -28,12 +28,6 @@ namespace ripple { -bool -VaultDelete::isEnabled(PreflightContext const& ctx) -{ - return ctx.rules.enabled(featureSingleAssetVault); -} - NotTEC VaultDelete::preflight(PreflightContext const& ctx) { diff --git a/src/xrpld/app/tx/detail/VaultDelete.h b/src/xrpld/app/tx/detail/VaultDelete.h index f8b838e02e..2b77e84469 100644 --- a/src/xrpld/app/tx/detail/VaultDelete.h +++ b/src/xrpld/app/tx/detail/VaultDelete.h @@ -33,9 +33,6 @@ public: { } - static bool - isEnabled(PreflightContext const& ctx); - static NotTEC preflight(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/VaultDeposit.cpp b/src/xrpld/app/tx/detail/VaultDeposit.cpp index d583f2e6e6..75cf81b0b0 100644 --- a/src/xrpld/app/tx/detail/VaultDeposit.cpp +++ b/src/xrpld/app/tx/detail/VaultDeposit.cpp @@ -33,12 +33,6 @@ namespace ripple { -bool -VaultDeposit::isEnabled(PreflightContext const& ctx) -{ - return ctx.rules.enabled(featureSingleAssetVault); -} - NotTEC VaultDeposit::preflight(PreflightContext const& ctx) { diff --git a/src/xrpld/app/tx/detail/VaultDeposit.h b/src/xrpld/app/tx/detail/VaultDeposit.h index e804520595..50515ce3d8 100644 --- a/src/xrpld/app/tx/detail/VaultDeposit.h +++ b/src/xrpld/app/tx/detail/VaultDeposit.h @@ -33,9 +33,6 @@ public: { } - static bool - isEnabled(PreflightContext const& ctx); - static NotTEC preflight(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/VaultSet.cpp b/src/xrpld/app/tx/detail/VaultSet.cpp index e1a0c58b56..6057e40cfa 100644 --- a/src/xrpld/app/tx/detail/VaultSet.cpp +++ b/src/xrpld/app/tx/detail/VaultSet.cpp @@ -31,11 +31,8 @@ namespace ripple { bool -VaultSet::isEnabled(PreflightContext const& ctx) +VaultSet::checkExtraFeatures(PreflightContext const& ctx) { - if (!ctx.rules.enabled(featureSingleAssetVault)) - return false; - return !ctx.tx.isFieldPresent(sfDomainID) || ctx.rules.enabled(featurePermissionedDomains); } diff --git a/src/xrpld/app/tx/detail/VaultSet.h b/src/xrpld/app/tx/detail/VaultSet.h index bce0077802..b3eecbbab5 100644 --- a/src/xrpld/app/tx/detail/VaultSet.h +++ b/src/xrpld/app/tx/detail/VaultSet.h @@ -34,7 +34,7 @@ public: } static bool - isEnabled(PreflightContext const& ctx); + checkExtraFeatures(PreflightContext const& ctx); static NotTEC preflight(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/VaultWithdraw.cpp b/src/xrpld/app/tx/detail/VaultWithdraw.cpp index e4b1f3bdb2..509b795058 100644 --- a/src/xrpld/app/tx/detail/VaultWithdraw.cpp +++ b/src/xrpld/app/tx/detail/VaultWithdraw.cpp @@ -30,12 +30,6 @@ namespace ripple { -bool -VaultWithdraw::isEnabled(PreflightContext const& ctx) -{ - return ctx.rules.enabled(featureSingleAssetVault); -} - NotTEC VaultWithdraw::preflight(PreflightContext const& ctx) { diff --git a/src/xrpld/app/tx/detail/VaultWithdraw.h b/src/xrpld/app/tx/detail/VaultWithdraw.h index f01a8e4c9d..0b713d403b 100644 --- a/src/xrpld/app/tx/detail/VaultWithdraw.h +++ b/src/xrpld/app/tx/detail/VaultWithdraw.h @@ -33,9 +33,6 @@ public: { } - static bool - isEnabled(PreflightContext const& ctx); - static NotTEC preflight(PreflightContext const& ctx); diff --git a/src/xrpld/app/tx/detail/XChainBridge.cpp b/src/xrpld/app/tx/detail/XChainBridge.cpp index 4f8c2ab624..2587845df5 100644 --- a/src/xrpld/app/tx/detail/XChainBridge.cpp +++ b/src/xrpld/app/tx/detail/XChainBridge.cpp @@ -1367,12 +1367,6 @@ attestationDoApply(ApplyContext& ctx) } // namespace //------------------------------------------------------------------------------ -bool -XChainCreateBridge::isEnabled(PreflightContext const& ctx) -{ - return ctx.rules.enabled(featureXChainBridge); -} - NotTEC XChainCreateBridge::preflight(PreflightContext const& ctx) { @@ -1545,12 +1539,6 @@ XChainCreateBridge::doApply() //------------------------------------------------------------------------------ -bool -BridgeModify::isEnabled(PreflightContext const& ctx) -{ - return ctx.rules.enabled(featureXChainBridge); -} - std::uint32_t BridgeModify::getFlagsMask(PreflightContext const& ctx) { @@ -1658,12 +1646,6 @@ BridgeModify::doApply() //------------------------------------------------------------------------------ -bool -XChainClaim::isEnabled(PreflightContext const& ctx) -{ - return ctx.rules.enabled(featureXChainBridge); -} - NotTEC XChainClaim::preflight(PreflightContext const& ctx) { @@ -1893,12 +1875,6 @@ XChainCommit::makeTxConsequences(PreflightContext const& ctx) return TxConsequences{ctx.tx, maxSpend}; } -bool -XChainCommit::isEnabled(PreflightContext const& ctx) -{ - return ctx.rules.enabled(featureXChainBridge); -} - NotTEC XChainCommit::preflight(PreflightContext const& ctx) { @@ -2004,12 +1980,6 @@ XChainCommit::doApply() //------------------------------------------------------------------------------ -bool -XChainCreateClaimID::isEnabled(PreflightContext const& ctx) -{ - return ctx.rules.enabled(featureXChainBridge); -} - NotTEC XChainCreateClaimID::preflight(PreflightContext const& ctx) { @@ -2116,12 +2086,6 @@ XChainCreateClaimID::doApply() //------------------------------------------------------------------------------ -bool -XChainAddClaimAttestation::isEnabled(PreflightContext const& ctx) -{ - return ctx.rules.enabled(featureXChainBridge); -} - NotTEC XChainAddClaimAttestation::preflight(PreflightContext const& ctx) { @@ -2142,12 +2106,6 @@ XChainAddClaimAttestation::doApply() //------------------------------------------------------------------------------ -bool -XChainAddAccountCreateAttestation::isEnabled(PreflightContext const& ctx) -{ - return ctx.rules.enabled(featureXChainBridge); -} - NotTEC XChainAddAccountCreateAttestation::preflight(PreflightContext const& ctx) { @@ -2168,12 +2126,6 @@ XChainAddAccountCreateAttestation::doApply() //------------------------------------------------------------------------------ -bool -XChainCreateAccountCommit::isEnabled(PreflightContext const& ctx) -{ - return ctx.rules.enabled(featureXChainBridge); -} - NotTEC XChainCreateAccountCommit::preflight(PreflightContext const& ctx) { diff --git a/src/xrpld/app/tx/detail/XChainBridge.h b/src/xrpld/app/tx/detail/XChainBridge.h index e210169bcf..0e9c0358d2 100644 --- a/src/xrpld/app/tx/detail/XChainBridge.h +++ b/src/xrpld/app/tx/detail/XChainBridge.h @@ -39,9 +39,6 @@ public: { } - static bool - isEnabled(PreflightContext const& ctx); - static NotTEC preflight(PreflightContext const& ctx); @@ -61,9 +58,6 @@ public: { } - static bool - isEnabled(PreflightContext const& ctx); - static std::uint32_t getFlagsMask(PreflightContext const& ctx); @@ -100,9 +94,6 @@ public: { } - static bool - isEnabled(PreflightContext const& ctx); - static NotTEC preflight(PreflightContext const& ctx); @@ -130,9 +121,6 @@ public: { } - static bool - isEnabled(PreflightContext const& ctx); - static NotTEC preflight(PreflightContext const& ctx); @@ -162,9 +150,6 @@ public: { } - static bool - isEnabled(PreflightContext const& ctx); - static NotTEC preflight(PreflightContext const& ctx); @@ -194,9 +179,6 @@ public: { } - static bool - isEnabled(PreflightContext const& ctx); - static NotTEC preflight(PreflightContext const& ctx); @@ -218,9 +200,6 @@ public: { } - static bool - isEnabled(PreflightContext const& ctx); - static NotTEC preflight(PreflightContext const& ctx); @@ -265,9 +244,6 @@ public: { } - static bool - isEnabled(PreflightContext const& ctx); - static NotTEC preflight(PreflightContext const& ctx);