ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-06-05 17:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Pull computeOverpaymentComponents into a separate function

Browse Source
This commit is contained in:
Ed Hennis
2025-10-24 16:00:32 -04:00
parent 0950d41fce
commit a3b82023d6
1 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/xrpld/app/misc/detail/LendingHelpers.cpp
View File

@@ -1125,6 +1125,51 @@ computePaymentComponents(
};
}
PaymentComponentsPlus
computeOverpaymentComponents(
Asset const& asset,
int32_t const loanScale,
Number const& overpayment,
TenthBips32 const overpaymentInterestRate,
TenthBips32 const overpaymentFeeRate,
TenthBips16 const managementFeeRate)
{
XRPL_ASSERT(
overpayment > 0 && isRounded(asset, overpayment, loanScale),
"ripple::loanMakePayment : valid overpayment amount");
Number const fee = roundToAsset(
asset, tenthBipsOfValue(overpayment, overpaymentFeeRate), loanScale);
Number const payment = overpayment - fee;
auto const [rawOverpaymentInterest, rawOverpaymentManagementFee] = [&]() {
Number const interest =
tenthBipsOfValue(payment, overpaymentInterestRate);
return detail::computeInterestAndFeeParts(interest, managementFeeRate);
}();
auto const [roundedOverpaymentInterest, roundedOverpaymentManagementFee] =
[&]() {
Number const interest =
roundToAsset(asset, rawOverpaymentInterest, loanScale);
return detail::computeInterestAndFeeParts(
asset, interest, managementFeeRate, loanScale);
}();
return detail::PaymentComponentsPlus{
detail::PaymentComponents{
.rawInterest = rawOverpaymentInterest,
.rawPrincipal = payment - rawOverpaymentInterest,
.rawManagementFee = 0,
.trackedValueDelta = payment,
.trackedPrincipalDelta = payment - roundedOverpaymentInterest -
roundedOverpaymentManagementFee,
.trackedManagementFeeDelta = roundedOverpaymentManagementFee,
.specialCase = detail::PaymentSpecialCase::extra},
fee,
roundedOverpaymentInterest};
}
} // namespace detail
Number
@@ -1680,45 +1725,15 @@ loanMakePayment(
TenthBips32 const overpaymentFeeRate{loan->at(sfOverpaymentFee)};
Number const overpayment = amount - totalPaid;
XRPL_ASSERT(
overpayment > 0 && isRounded(asset, overpayment, loanScale),
"ripple::loanMakePayment : valid overpayment amount");
Number const fee = roundToAsset(
asset,
tenthBipsOfValue(overpayment, overpaymentFeeRate),
loanScale);
Number const payment = overpayment - fee;
auto const [rawOverpaymentInterest, rawOverpaymentManagementFee] =
[&]() {
Number const interest =
tenthBipsOfValue(payment, overpaymentInterestRate);
return detail::computeInterestAndFeeParts(
interest, managementFeeRate);
}();
auto const
[roundedOverpaymentInterest, roundedOverpaymentManagementFee] =
[&]() {
Number const interest =
roundToAsset(asset, rawOverpaymentInterest, loanScale);
return detail::computeInterestAndFeeParts(
asset, interest, managementFeeRate, loanScale);
}();
detail::PaymentComponentsPlus overpaymentComponents{
detail::PaymentComponents{
.rawInterest = rawOverpaymentInterest,
.rawPrincipal = payment - rawOverpaymentInterest,
.rawManagementFee = 0,
.trackedValueDelta = payment,
.trackedPrincipalDelta = payment - roundedOverpaymentInterest -
roundedOverpaymentManagementFee,
.trackedManagementFeeDelta = roundedOverpaymentManagementFee,
.specialCase = detail::PaymentSpecialCase::extra},
fee,
roundedOverpaymentInterest};
detail::PaymentComponentsPlus const overpaymentComponents =
detail::computeOverpaymentComponents(
asset,
loanScale,
overpayment,
overpaymentInterestRate,
overpaymentFeeRate,
managementFeeRate);
// Don't process an overpayment if the whole amount (or more!)
// gets eaten by fees and interest.