Add Offer invariant for consumed not to exceed the offer amounts. Fix…

… AMMOffer invariant for consumed.

src/xrpld/app/paths/detail/AMMOffer.cpp

@@ -141,9 +141,6 @@ AMMOffer<TIn, TOut>::checkInvariant(
     TAmounts<TIn, TOut> const& consumed,
     beast::Journal j) const
 {
-    if (isFeatureEnabled(fixAMMv1_3))
-        return true;
-
     if (consumed.in > amounts_.in || consumed.out > amounts_.out)
     {
         JLOG(j.error()) << "AMMOffer::checkInvariant failed: consumed "
@@ -155,6 +152,10 @@ AMMOffer<TIn, TOut>::checkInvariant(
         return false;
     }
 
+    // The invariant check below is moved to InvariantCheck
+    if (isFeatureEnabled(fixAMMv1_3))
+        return true;
+
     Number const product = balances_.in * balances_.out;
     auto const newBalances = TAmounts<TIn, TOut>{
         balances_.in + consumed.in, balances_.out - consumed.out};

src/xrpld/app/tx/detail/Offer.h

@@ -21,6 +21,7 @@
 #define RIPPLE_APP_BOOK_OFFER_H_INCLUDED
 
 #include <xrpld/ledger/View.h>
+#include <xrpl/basics/Log.h>
 #include <xrpl/basics/contract.h>
 #include <xrpl/protocol/Quality.h>
 #include <xrpl/protocol/Rules.h>
@@ -169,8 +170,24 @@ class TOffer : private TOfferBase<TIn, TOut>
      * always returns true.
      */
     bool
-    checkInvariant(TAmounts<TIn, TOut> const&, beast::Journal j) const
+    checkInvariant(TAmounts<TIn, TOut> const& consumed, beast::Journal j) const
     {
+        if (!isFeatureEnabled(fixAMMv1_3))
+            return true;
+
+        if (consumed.in > m_amounts.in || consumed.out > m_amounts.out)
+        {
+            // LCOV_EXCL_START
+            JLOG(j.error())
+                << "AMMOffer::checkInvariant failed: consumed "
+                << to_string(consumed.in) << " " << to_string(consumed.out)
+                << " amounts " << to_string(m_amounts.in) << " "
+                << to_string(m_amounts.out);
+
+            return false;
+            // LCOV_EXCL_STOP
+        }
+
         return true;
     }
 };