Merge branch 'ximinez/lending-XLS-66-ongoing' into ximinez/lending-shortages

* XRPLF/ximinez/develop-nolending:
  Revert "Implement Lending Protocol (unsupported) (5270)"
  Implement Lending Protocol (unsupported) (5270)

src/test/app/Loan_test.cpp

@@ -2738,8 +2738,12 @@ protected:
                             broker.params.managementFeeRate);
 
                     BEAST_EXPECT(
-                        paymentComponents.trackedValueDelta <=
-                        roundedPeriodicPayment);
+                        paymentComponents.trackedValueDelta ==
+                            roundedPeriodicPayment ||
+                        (paymentComponents.specialCase ==
+                             detail::PaymentSpecialCase::final &&
+                         paymentComponents.trackedValueDelta <
+                             roundedPeriodicPayment));
 
                     ripple::LoanState const nextTrueState = computeRawLoanState(
                         state.periodicPayment,

src/test/rpc/Feature_test.cpp

@@ -187,9 +187,9 @@ class Feature_test : public beast::unit_test::suite
         BEAST_EXPECTS(jrr[jss::status] == jss::success, "status");
         jrr.removeMember(jss::status);
         BEAST_EXPECT(jrr.size() == 1);
-        BEAST_EXPECT(
-            jrr.isMember("12523DF04B553A0B1AD74F42DDB741DE8DC06A03FC089A0EF197E"
-                         "2A87F1D8107"));
+        BEAST_EXPECT(jrr.isMember(
+            "740352F2412A9909880C23A559FCECEDA3BE2126FED62FC7660D6"
+            "28A06927F11"));
         auto feature = *(jrr.begin());
 
         BEAST_EXPECTS(feature[jss::name] == "fixAMMOverflowOffer", "name");

src/xrpld/app/misc/detail/LendingHelpers.cpp

@@ -1075,6 +1075,23 @@ computePaymentComponents(
             "ripple::detail::computePaymentComponents",
             "excess non-negative");
     };
+    auto giveTo =
+        [](Number& component, Number& shortage, Number const& maximum) {
+            if (shortage > beast::zero)
+            {
+                // Put as much of the shortage as we can into the provided part
+                // and the total
+                auto part = std::min(maximum - component, shortage);
+                component += part;
+                shortage -= part;
+            }
+            // If the shortage goes negative, we put too much, which should be
+            // impossible
+            XRPL_ASSERT_PARTS(
+                shortage >= beast::zero,
+                "ripple::detail::computePaymentComponents",
+                "excess non-negative");
+        };
     // Helper to reduce deltas when they collectively exceed a limit.
     // Order matters: we prefer to reduce interest first (most flexible),
     // then management fee, then principal (least flexible).
@@ -1084,6 +1101,19 @@ computePaymentComponents(
         takeFrom(deltas.managementFee, excess);
         takeFrom(deltas.principal, excess);
     };
+    // Helper to increase deltas when they collectively do not reach an
+    // expected value.
+    // Order matters: we prefer to increase interest first (most flexible),
+    // then management fee, then principal (least flexible).
+    auto addressShortage = [&giveTo](
+                               LoanDeltas& deltas,
+                               Number& shortage,
+                               LoanState const& current) {
+        giveTo(deltas.interestDueDelta, shortage, current.interestDue);
+        giveTo(
+            deltas.managementFeeDueDelta, shortage, current.managementFeeDue);
+        giveTo(deltas.principalDelta, shortage, current.principalOutstanding);
+    };
 
     // Check if deltas exceed the total outstanding value. This should never
     // happen due to earlier caps, but handle it defensively.
@@ -1115,12 +1145,19 @@ computePaymentComponents(
         addressExcess(deltas, excess);
         shortage = -excess;
     }
+    else if (shortage > beast::zero && totalOverpayment < beast::zero)
+    {
+        // If there's a shortage, and there's room in the loan itself, we can
+        // top up the parts to make the payment correct.
+        shortage = std::min(-totalOverpayment, shortage);
+        addressShortage(deltas, shortage, currentLedgerState);
+    }
 
     // At this point, shortage >= 0 means we're paying less than the full
     // periodic payment (due to rounding or component caps).
-    // shortage < 0 would mean we're trying to pay more than allowed (bug).
+    // shortage < 0 means mean we're trying to pay more than allowed (bug).
     XRPL_ASSERT_PARTS(
-        shortage >= beast::zero,
+        shortage == beast::zero,
         "ripple::detail::computePaymentComponents",
         "no shortage or excess");