Add minimum grace period validation (#6133)

Author: Tapanito

src/test/app/Loan_test.cpp

@@ -4050,7 +4050,6 @@ class Loan_test : public beast::unit_test::suite
 
         createJson["CloseInterestRate"] = 55374;
         createJson["ClosePaymentFee"] = "3825205248";
-        createJson["GracePeriod"] = 0;
         createJson["LatePaymentFee"] = "237";
         createJson["LoanOriginationFee"] = "0";
         createJson["OverpaymentFee"] = 35167;
@@ -4726,7 +4725,30 @@ class Loan_test : public beast::unit_test::suite
                         jtx::fee const& loanSetFee,
                         Number const& debtMaximumRequest) {
             // first temBAD_SIGNER: TODO
+            // invalid grace period
+            {
+                // zero grace period
+                env(set(borrower, brokerInfo.brokerID, debtMaximumRequest),
+                    sig(sfCounterpartySignature, lender),
+                    gracePeriod(0),
+                    loanSetFee,
+                    ter(temINVALID));
 
+                // grace period less than default minimum
+                env(set(borrower, brokerInfo.brokerID, debtMaximumRequest),
+                    sig(sfCounterpartySignature, lender),
+                    gracePeriod(LoanSet::defaultGracePeriod - 1),
+                    loanSetFee,
+                    ter(temINVALID));
+
+                // grace period greater than payment interval
+                env(set(borrower, brokerInfo.brokerID, debtMaximumRequest),
+                    sig(sfCounterpartySignature, lender),
+                    paymentInterval(120),
+                    gracePeriod(121),
+                    loanSetFee,
+                    ter(temINVALID));
+            }
             // empty/zero broker ID
             {
                 auto jv = set(borrower, uint256{}, debtMaximumRequest);
@@ -5027,7 +5049,6 @@ class Loan_test : public beast::unit_test::suite
 
         createJson["CloseInterestRate"] = 47299;
         createJson["ClosePaymentFee"] = "3985819770";
-        createJson["GracePeriod"] = 0;
         createJson["InterestRate"] = 92;
         createJson["LatePaymentFee"] = "3866894865";
         createJson["LoanOriginationFee"] = "0";
@@ -5180,7 +5201,6 @@ class Loan_test : public beast::unit_test::suite
             json(sfCounterpartySignature, Json::objectValue));
 
         createJson["ClosePaymentFee"] = "0";
-        createJson["GracePeriod"] = 0;
         createJson["InterestRate"] = 24346;
         createJson["LateInterestRate"] = 65535;
         createJson["LatePaymentFee"] = "0";
@@ -5300,7 +5320,6 @@ class Loan_test : public beast::unit_test::suite
             json(sfCounterpartySignature, Json::objectValue));
 
         createJson["ClosePaymentFee"] = "0";
-        createJson["GracePeriod"] = 0;
         createJson["InterestRate"] = 12833;
         createJson["LateInterestRate"] = 77048;
         createJson["LatePaymentFee"] = "0";
@@ -5394,7 +5413,7 @@ class Loan_test : public beast::unit_test::suite
                 set(borrower, broker.brokerID, Number{55524'81, -2}),
                 fee(loanSetFee),
                 closePaymentFee(0),
-                gracePeriod(0),
+                gracePeriod(LoanSet::defaultGracePeriod),
                 interestRate(TenthBips32(12833)),
                 lateInterestRate(TenthBips32(77048)),
                 latePaymentFee(0),
@@ -6484,8 +6503,7 @@ class Loan_test : public beast::unit_test::suite
             .lateFee = Number{200, -6},
             .interest = TenthBips32{50'000},
             .payTotal = 10,
-            .payInterval = 150,
-            .gracePd = 0};
+            .payInterval = 150};
 
         auto const assetType = AssetType::XRP;
 
@@ -6506,9 +6524,6 @@ class Loan_test : public beast::unit_test::suite
         auto state = getCurrentState(env, broker, loanKeylet);
         if (auto loan = env.le(loanKeylet); BEAST_EXPECT(loan))
         {
-            // log << "loan after create: " << to_string(loan->getJson())
-            //     << std::endl;
-
             env.close(tp{d{
                 loan->at(sfNextPaymentDueDate) + loan->at(sfGracePeriod) + 1}});
         }
@@ -6523,16 +6538,10 @@ class Loan_test : public beast::unit_test::suite
 
         {
             auto const submitParam = to_string(jv);
-            // log << "about to submit: " << submitParam << std::endl;
             auto const jr = env.rpc("submit", borrower.name(), submitParam);
 
-            // log << jr << std::endl;
             BEAST_EXPECT(jr.isMember(jss::result));
             auto const jResult = jr[jss::result];
-            // BEAST_EXPECT(jResult[jss::error] == "invalidTransaction");
-            // BEAST_EXPECT(
-            //     jResult[jss::error_exception] ==
-            //     "fails local checks: Transaction has bad signature.");
         }
 
         env.close();
@@ -6568,8 +6577,7 @@ class Loan_test : public beast::unit_test::suite
             .counter = borrower,
             .principalRequest = Number{100'000, -4},
             .interest = TenthBips32{100'000},
-            .payTotal = 10,
-            .gracePd = 0};
+            .payTotal = 10};
 
         auto const assetType = AssetType::MPT;
 
@@ -7486,6 +7494,8 @@ class Loan_test : public beast::unit_test::suite
         testLoanPayLateFullPaymentBypassesPenalties();
         testLoanCoverMinimumRoundingExploit();
 #endif
+        testInvalidLoanSet();
+
         testCoverDepositWithdrawNonTransferableMPT();
         testPoC_UnsignedUnderflowOnFullPayAfterEarlyPeriodic();
 
@@ -7500,7 +7510,6 @@ class Loan_test : public beast::unit_test::suite
         testInvalidLoanDelete();
         testInvalidLoanManage();
         testInvalidLoanPay();
-        testInvalidLoanSet();
 
         testBatchBypassCounterparty();
         testLoanPayComputePeriodicPaymentValidRateInvariant();

src/xrpld/app/tx/detail/LoanSet.cpp

@@ -88,10 +88,12 @@ LoanSet::preflight(PreflightContext const& ctx)
     if (auto const paymentInterval = tx[~sfPaymentInterval];
         !validNumericMinimum(paymentInterval, LoanSet::minPaymentInterval))
         return temINVALID;
-
-    else if (!validNumericRange(
-                 tx[~sfGracePeriod],
-                 paymentInterval.value_or(LoanSet::defaultPaymentInterval)))
+    // Grace period is between min default value and payment interval
+    else if (auto const gracePeriod = tx[~sfGracePeriod];  //
+             !validNumericRange(
+                 gracePeriod,
+                 paymentInterval.value_or(LoanSet::defaultPaymentInterval),
+                 defaultGracePeriod))
         return temINVALID;
 
     // Copied from preflight2