From e9d2dfe329c573c80e5c1a030f3c11d5235ead8e Mon Sep 17 00:00:00 2001 From: Ed Hennis Date: Fri, 11 Jul 2025 17:14:53 -0400 Subject: [PATCH] fixup! Make a few tweaks to the changes in merge cc83ea8 --- src/libxrpl/protocol/STTx.cpp | 2 +- src/xrpld/app/tx/detail/CreateOffer.cpp | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/libxrpl/protocol/STTx.cpp b/src/libxrpl/protocol/STTx.cpp index a1d30c63e5..d51a63a092 100644 --- a/src/libxrpl/protocol/STTx.cpp +++ b/src/libxrpl/protocol/STTx.cpp @@ -622,7 +622,7 @@ STTx::getBatchTransactionIDs() const XRPL_ASSERT( getFieldArray(sfRawTransactions).size() != 0, "STTx::getBatchTransactionIDs : empty raw transactions"); - // Don't early return so that the size check is always done. + // Don't early return so that the size assert is always hit. if (batch_txn_ids_.size() == 0) { for (STObject const& rb : getFieldArray(sfRawTransactions)) diff --git a/src/xrpld/app/tx/detail/CreateOffer.cpp b/src/xrpld/app/tx/detail/CreateOffer.cpp index 3734f0787e..aa54cc81c9 100644 --- a/src/xrpld/app/tx/detail/CreateOffer.cpp +++ b/src/xrpld/app/tx/detail/CreateOffer.cpp @@ -46,11 +46,18 @@ CreateOffer::makeTxConsequences(PreflightContext const& ctx) bool CreateOffer::isEnabled(PreflightContext const& ctx) { + // TODO: Remove or update this check. Even though FlowCross was enabled a + // long time ago, if a network did manage to enable PermissionedDex and not + // FlowCross, then no offers of any kind would be allowed. + // // Permissioned offers should use the PE (which must be enabled by // featureFlowCross amendment) + if (ctx.rules.enabled(featurePermissionedDEX) && + !ctx.rules.enabled(featureFlowCross)) + return false; + return (!ctx.tx.isFieldPresent(sfDomainID)) || - (ctx.rules.enabled(featurePermissionedDEX) && - ctx.rules.enabled(featureFlowCross)); + ctx.rules.enabled(featurePermissionedDEX); } std::uint32_t