Merge branch 'develop' into mvadari/invariant-perf

src/libxrpl/ledger/helpers/LendingHelpers.cpp

@@ -813,7 +813,7 @@ doOverpayment(
     //   3. The overpayment's penalty interest part (= untrackedInterest
     //      for the overpayment path; see computeOverpaymentComponents):
     //        trackedInterestPart()
-    bool const fix320Enabled = rules.enabled(fixCleanup3_2_0);
+    [[maybe_unused]] bool const fix320Enabled = rules.enabled(fixCleanup3_2_0);
     XRPL_ASSERT_IF(
         fix320Enabled,
         overpaymentComponents.trackedPrincipalDelta ==

src/libxrpl/tx/paths/OfferStream.cpp

@@ -17,6 +17,7 @@
 #include <xrpl/protocol/Asset.h>
 #include <xrpl/protocol/Book.h>
 #include <xrpl/protocol/Concepts.h>
+#include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/IOUAmount.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/MPTAmount.h>
@@ -249,7 +250,13 @@ TOfferStreamBase<TIn, TOut>::step()
             continue;
         }
 
-        if (entry->isFieldPresent(sfDomainID) &&
+        // Pre-fixCleanup3_3_0: validate domain membership for any book.
+        // Post-fixCleanup3_3_0: only validate when walking a domain book.
+        // Hybrid offers carry sfDomainID but also participate in the open
+        // book; expiry of the owner's domain credential should not evict
+        // the offer from the open book.
+        if ((!view_.rules().enabled(fixCleanup3_3_0) || book_.domain.has_value()) &&
+            entry->isFieldPresent(sfDomainID) &&
             !permissioned_dex::offerInDomain(
                 view_, entry->key(), entry->getFieldH256(sfDomainID), j_))
         {