mirror of
https://github.com/XRPLF/rippled.git
synced 2025-11-18 18:15:50 +00:00
Compare commits
16 Commits
gregtatcam
...
tapanito/l
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4fc346ff3f | ||
|
|
fc23199619 | ||
|
|
ef75e0efdd | ||
|
|
e76ce57f04 | ||
|
|
dd1ed63b90 | ||
|
|
c6b26aa63f | ||
|
|
b6710a99fc | ||
|
|
173b736187 | ||
|
|
04203196dc | ||
|
|
32f5a945f2 | ||
|
|
e9fd82559a | ||
|
|
0c073ffb4c | ||
|
|
36cc8d2595 | ||
|
|
ba6a706b63 | ||
|
|
f1edda7fd3 | ||
|
|
01a6b1081f |
@@ -25,22 +25,55 @@ roundPeriodicPayment(
|
||||
return roundToAsset(asset, periodicPayment, scale, Number::upward);
|
||||
}
|
||||
|
||||
/// This structure is explained in the XLS-66 spec, section 3.2.4.4 (Failure
|
||||
/// Conditions)
|
||||
/* Represents the breakdown of amounts paid and changes applied during a loan
|
||||
* payment.
|
||||
*
|
||||
* This structure is returned after processing a loan payment transaction and
|
||||
* captures the actual amounts that were paid to each recipient (Vault and
|
||||
* Borrower) and any changes to the loan's total value. It provides a complete
|
||||
* accounting of where the payment funds went.
|
||||
*
|
||||
* This structure is explained in the XLS-66 spec, section 3.2.4.4 (Failure
|
||||
* Conditions).
|
||||
*
|
||||
* The sum of principalPaid, interestPaid, and feePaid represents the total
|
||||
* amount deducted from the borrower's account. The valueChange field tracks
|
||||
* whether the loan's total value increased or decreased beyond normal
|
||||
* amortization.
|
||||
*/
|
||||
struct LoanPaymentParts
|
||||
{
|
||||
/// principal_paid is the amount of principal that the payment covered.
|
||||
// The amount of principal paid that reduces the loan balance.
|
||||
// This amount is subtracted from sfPrincipalOutstanding in the Loan object
|
||||
// and paid to the Vault
|
||||
Number principalPaid = numZero;
|
||||
/// interest_paid is the amount of interest that the payment covered.
|
||||
|
||||
// The total amount of interest paid to the Vault.
|
||||
// This includes:
|
||||
// - Tracked interest from the amortization schedule
|
||||
// - Untracked interest (e.g., late payment penalty interest)
|
||||
// This value is always non-negative.
|
||||
Number interestPaid = numZero;
|
||||
/**
|
||||
* value_change is the amount by which the total value of the Loan changed.
|
||||
* If value_change < 0, Loan value decreased.
|
||||
* If value_change > 0, Loan value increased.
|
||||
* This is 0 for regular payments.
|
||||
*/
|
||||
|
||||
// The change in the loan's total value outstanding.
|
||||
// - If valueChange < 0: Loan value decreased
|
||||
// - If valueChange > 0: Loan value increased
|
||||
// - If valueChange = 0: No value adjustment
|
||||
//
|
||||
// For regular on-time payments, this is always 0. Non-zero values occur
|
||||
// when:
|
||||
// - Overpayments reduce the loan balance beyond the scheduled amount
|
||||
// - Late payments add penalty interest to the loan value
|
||||
// - Early full payment may increase or decrease the loan value based on
|
||||
// terms
|
||||
Number valueChange = numZero;
|
||||
/// feePaid is amount of fee that is paid to the broker
|
||||
|
||||
/* The total amount of fees paid to the Broker.
|
||||
* This includes:
|
||||
* - Tracked management fees from the amortization schedule
|
||||
* - Untracked fees (e.g., late payment fees, service fees, origination
|
||||
* fees) This value is always non-negative.
|
||||
*/
|
||||
Number feePaid = numZero;
|
||||
|
||||
LoanPaymentParts&
|
||||
@@ -50,46 +83,69 @@ struct LoanPaymentParts
|
||||
operator==(LoanPaymentParts const& other) const;
|
||||
};
|
||||
|
||||
/** This structure describes the initial "computed" properties of a loan.
|
||||
/* Describes the initial computed properties of a loan.
|
||||
*
|
||||
* It is used at loan creation and when the terms of a loan change, such as
|
||||
* after an overpayment.
|
||||
* This structure contains the fundamental calculated values that define a
|
||||
* loan's payment structure and amortization schedule. These properties are
|
||||
* computed:
|
||||
* - At loan creation (LoanSet transaction)
|
||||
* - When loan terms change (e.g., after an overpayment that reduces the loan
|
||||
* balance)
|
||||
*/
|
||||
struct LoanProperties
|
||||
{
|
||||
// The amount the borrower must pay for each regular payment period.
|
||||
// Calculated using the standard amortization formula
|
||||
// based on principal, interest rate, and number of payments.
|
||||
Number periodicPayment;
|
||||
|
||||
// The total amount the borrower will pay over the life of the loan.
|
||||
// Equal to periodicPayment * paymentsRemaining.
|
||||
// This includes principal, interest, and management fees.
|
||||
Number totalValueOutstanding;
|
||||
|
||||
// The total management fee that will be paid to the broker over the
|
||||
// loan's lifetime. This is a percentage of the total interest (gross)
|
||||
// as specified by the broker's management fee rate.
|
||||
Number managementFeeOwedToBroker;
|
||||
|
||||
// The scale (decimal places) used for rounding all loan amounts.
|
||||
// This is the maximum of:
|
||||
// - The asset's native scale
|
||||
// - A minimum scale required to represent the periodic payment accurately
|
||||
// All loan state values (principal, interest, fees) are rounded to this
|
||||
// scale.
|
||||
std::int32_t loanScale;
|
||||
|
||||
// The principal portion of the first payment.
|
||||
Number firstPaymentPrincipal;
|
||||
};
|
||||
|
||||
/** This structure captures the current state of a loan and all the
|
||||
relevant parts.
|
||||
|
||||
Whether the values are raw (unrounded) or rounded will
|
||||
depend on how it was computed.
|
||||
|
||||
Many of the fields can be derived from each other, but they're all provided
|
||||
here to reduce code duplication and possible mistakes.
|
||||
e.g.
|
||||
* interestOutstanding = valueOutstanding - principalOutstanding
|
||||
* interestDue = interestOutstanding - managementFeeDue
|
||||
/** This structure captures the parts of a loan state.
|
||||
*
|
||||
* Whether the values are raw (unrounded) or rounded will depend on how it was
|
||||
* computed.
|
||||
*
|
||||
* Many of the fields can be derived from each other, but they're all provided
|
||||
* here to reduce code duplication and possible mistakes.
|
||||
* e.g.
|
||||
* * interestOutstanding = valueOutstanding - principalOutstanding
|
||||
* * interestDue = interestOutstanding - managementFeeDue
|
||||
*/
|
||||
struct LoanState
|
||||
{
|
||||
/// Total value still due to be paid by the borrower.
|
||||
// Total value still due to be paid by the borrower.
|
||||
Number valueOutstanding;
|
||||
/// Prinicipal still due to be paid by the borrower.
|
||||
// Principal still due to be paid by the borrower.
|
||||
Number principalOutstanding;
|
||||
/// Interest still due to be paid TO the Vault.
|
||||
// Interest still due to be paid to the Vault.
|
||||
// This is a portion of interestOutstanding
|
||||
Number interestDue;
|
||||
/// Management fee still due to be paid TO the broker.
|
||||
// Management fee still due to be paid to the broker.
|
||||
// This is a portion of interestOutstanding
|
||||
Number managementFeeDue;
|
||||
|
||||
/// Interest still due to be paid by the borrower.
|
||||
// Interest still due to be paid by the borrower.
|
||||
Number
|
||||
interestOutstanding() const
|
||||
{
|
||||
@@ -160,39 +216,140 @@ namespace detail {
|
||||
|
||||
enum class PaymentSpecialCase { none, final, extra };
|
||||
|
||||
/// This structure is used internally to compute the breakdown of a
|
||||
/// single loan payment
|
||||
/* Represents a single loan payment component parts.
|
||||
|
||||
* This structure captures the "delta" (change) values that will be applied to
|
||||
* the tracked fields in the Loan ledger object when a payment is processed.
|
||||
*
|
||||
* These are called "deltas" because they represent the amount by which each
|
||||
* corresponding field in the Loan object will be reduced.
|
||||
* They are "tracked" as they change tracked loan values.
|
||||
*/
|
||||
struct PaymentComponents
|
||||
{
|
||||
// tracked values are rounded to the asset and loan scale, and correspond to
|
||||
// fields in the Loan ledger object.
|
||||
// trackedValueDelta modifies sfTotalValueOutstanding.
|
||||
// The change in total value outstanding for this payment.
|
||||
// This amount will be subtracted from sfTotalValueOutstanding in the Loan
|
||||
// object. Equal to the sum of trackedPrincipalDelta,
|
||||
// trackedInterestPart(), and trackedManagementFeeDelta.
|
||||
Number trackedValueDelta;
|
||||
// trackedPrincipalDelta modifies sfPrincipalOutstanding.
|
||||
|
||||
// The change in principal outstanding for this payment.
|
||||
// This amount will be subtracted from sfPrincipalOutstanding in the Loan
|
||||
// object, representing the portion of the payment that reduces the
|
||||
// original loan amount.
|
||||
Number trackedPrincipalDelta;
|
||||
// trackedManagementFeeDelta modifies sfManagementFeeOutstanding. It will
|
||||
// not include any "extra" fees that go directly to the broker, such as late
|
||||
// fees.
|
||||
|
||||
// The change in management fee outstanding for this payment.
|
||||
// This amount will be subtracted from sfManagementFeeOutstanding in the
|
||||
// Loan object. This represents only the tracked management fees from the
|
||||
// amortization schedule and does not include additional untracked fees
|
||||
// (such as late payment fees) that go directly to the broker.
|
||||
Number trackedManagementFeeDelta;
|
||||
|
||||
// Indicates if this payment has special handling requirements.
|
||||
// - none: Regular scheduled payment
|
||||
// - final: The last payment that closes out the loan
|
||||
// - extra: An additional payment beyond the regular schedule (overpayment)
|
||||
PaymentSpecialCase specialCase = PaymentSpecialCase::none;
|
||||
|
||||
// Calculates the tracked interest portion of this payment.
|
||||
// This is derived from the other components as:
|
||||
// trackedValueDelta - trackedPrincipalDelta - trackedManagementFeeDelta
|
||||
//
|
||||
// @return The amount of tracked interest included in this payment that
|
||||
// will be paid to the vault.
|
||||
Number
|
||||
trackedInterestPart() const;
|
||||
};
|
||||
|
||||
/* Extends PaymentComponents with untracked payment amounts.
|
||||
*
|
||||
* This structure adds untracked fees and interest to the base
|
||||
* PaymentComponents, representing amounts that don't affect the Loan object's
|
||||
* tracked state but are still part of the total payment due from the borrower.
|
||||
*
|
||||
* Untracked amounts include:
|
||||
* - Late payment fees that go directly to the Broker
|
||||
* - Late payment penalty interest that goes directly to the Vault
|
||||
* - Service fees
|
||||
* - Origination fees (on first payment)
|
||||
*
|
||||
* The key distinction is that tracked amounts reduce the Loan object's state
|
||||
* (sfTotalValueOutstanding, sfPrincipalOutstanding,
|
||||
* sfManagementFeeOutstanding), while untracked amounts are paid directly to the
|
||||
* recipient without affecting the loan's amortization schedule.
|
||||
*/
|
||||
struct ExtendedPaymentComponents : public PaymentComponents
|
||||
{
|
||||
// Additional management fees that go directly to the Broker.
|
||||
// This includes fees not part of the standard amortization schedule
|
||||
// (e.g., late fees, service fees, origination fees).
|
||||
// This value may be negative, though the final value returned in
|
||||
// LoanPaymentParts.feePaid will never be negative.
|
||||
Number untrackedManagementFee;
|
||||
|
||||
// Additional interest that goes directly to the Vault.
|
||||
// This includes interest not part of the standard amortization schedule
|
||||
// (e.g., late payment penalty interest).
|
||||
// This value may be negative, though the final value returned in
|
||||
// LoanPaymentParts.interestPaid will never be negative.
|
||||
Number untrackedInterest;
|
||||
|
||||
// The complete amount due from the borrower for this payment.
|
||||
// Calculated as: trackedValueDelta + untrackedInterest +
|
||||
// untrackedManagementFee
|
||||
//
|
||||
// This value is used to validate that the payment amount provided by the
|
||||
// borrower is sufficient to cover all components of the payment.
|
||||
Number totalDue;
|
||||
|
||||
ExtendedPaymentComponents(
|
||||
PaymentComponents const& p,
|
||||
Number fee,
|
||||
Number interest = numZero)
|
||||
: PaymentComponents(p)
|
||||
, untrackedManagementFee(fee)
|
||||
, untrackedInterest(interest)
|
||||
, totalDue(
|
||||
trackedValueDelta + untrackedInterest + untrackedManagementFee)
|
||||
{
|
||||
}
|
||||
};
|
||||
|
||||
/* Represents the differences between two loan states.
|
||||
*
|
||||
* This structure is used to capture the change in each component of a loan's
|
||||
* state, typically when computing the difference between two LoanState objects
|
||||
* (e.g., before and after a payment). It is a convenient way to capture changes
|
||||
* in each component.
|
||||
*
|
||||
* LoanDeltas is primarily used for:
|
||||
* - Computing the actual amounts paid during a payment transaction
|
||||
* - Validating that loan state changes are correct
|
||||
* - Applying incremental changes to a loan state
|
||||
*
|
||||
*/
|
||||
struct LoanDeltas
|
||||
{
|
||||
// The difference in principal outstanding between two loan states.
|
||||
Number principal;
|
||||
|
||||
// The difference in interest due between two loan states.
|
||||
Number interest;
|
||||
|
||||
// The difference in management fee outstanding between two loan states.
|
||||
Number managementFee;
|
||||
|
||||
/* Calculates the total change across all components.
|
||||
* @return The sum of principal, interest, and management fee deltas.
|
||||
*/
|
||||
Number
|
||||
total() const
|
||||
{
|
||||
return principal + interest + managementFee;
|
||||
}
|
||||
|
||||
// Ensures all delta values are non-negative.
|
||||
void
|
||||
nonNegative();
|
||||
};
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -268,7 +268,9 @@ LoanPay::doApply()
|
||||
// Normally freeze status is checked in preflight, but we do it here to
|
||||
// avoid duplicating the check. It'll claim a fee either way.
|
||||
bool const sendBrokerFeeToOwner = [&]() {
|
||||
// Always round the minimum required up.
|
||||
// Round the minimum required cover up to be conservative. This ensures
|
||||
// CoverAvailable never drops below the theoretical minimum, protecting
|
||||
// the broker's solvency.
|
||||
NumberRoundModeGuard mg(Number::upward);
|
||||
return coverAvailableProxy >=
|
||||
roundToAsset(
|
||||
|
||||
@@ -515,7 +515,9 @@ LoanSet::doApply()
|
||||
}
|
||||
TenthBips32 const coverRateMinimum{brokerSle->at(sfCoverRateMinimum)};
|
||||
{
|
||||
// Always round the minimum required up.
|
||||
// Round the minimum required cover up to be conservative. This ensures
|
||||
// CoverAvailable never drops below the theoretical minimum, protecting
|
||||
// the broker's solvency.
|
||||
NumberRoundModeGuard mg(Number::upward);
|
||||
if (brokerSle->at(sfCoverAvailable) <
|
||||
tenthBipsOfValue(newDebtTotal, coverRateMinimum))
|
||||
|
||||
Reference in New Issue
Block a user