Merge branch 'develop' into ximinez/fix/validator-cache

* XRPLF/develop:
  chore: Remove empty Taker.h (6984)
  chore: Enable clang-tidy modernize checks (6975)
  ci: Upload clang-tidy git diff (6983)
  fix: Add rounding to Vault invariants (6217) (6955)

include/xrpl/ledger/helpers/NFTokenHelpers.h

@@ -20,6 +20,10 @@ removeTokenOffersWithLimit(
     Keylet const& directory,
     std::size_t maxDeletableOffers);
 
+/** Returns tesSUCCESS if NFToken has few enough offers that it can be burned */
+TER
+notTooManyOffers(ReadView const& view, uint256 const& nftokenID);
+
 /** Finds the specified token in the owner's token directory. */
 std::optional<STObject>
 findToken(ReadView const& view, AccountID const& owner, uint256 const& nftokenID);

src/libxrpl/ledger/helpers/LendingHelpers.cpp

@@ -644,6 +644,9 @@ doOverpayment(
         "xrpl::detail::doOverpayment",
         "principal change agrees");
 
+    // I'm not 100% sure the following asserts are correct. If in doubt, and
+    // everything else works, remove any that cause trouble.
+
     JLOG(j.debug()) << "valueChange: " << loanPaymentParts.valueChange
                     << ", totalValue before: " << *totalValueOutstandingProxy
                     << ", totalValue after: " << newRoundedLoanState.valueOutstanding
@@ -655,28 +658,11 @@ doOverpayment(
                     << overpaymentComponents.trackedPrincipalDelta -
             (totalValueOutstandingProxy - newRoundedLoanState.valueOutstanding);
 
-    // The valueChange returned by tryOverpayment satisfies
-    //   valueChange = (newInterestDue - oldInterestDue) + untrackedInterest.
-    // Using the loan-state identity v = p + i + m and the adjacent
-    // `principal change agrees` assertion (dp = oldP - newP), this
-    // rearranges into three independently-computable terms:
-    //
-    //   1. TVO change beyond what principal repayment alone explains:
-    //        newTVO - (oldTVO - dp)
-    //   2. Management fee released by re-amortization (positive when
-    //      mfee decreased; zero when managementFeeRate == 0):
-    //        oldMfee - newMfee
-    //   3. The overpayment's penalty interest part (= untrackedInterest
-    //      for the overpayment path; see computeOverpaymentComponents):
-    //        trackedInterestPart()
-    [[maybe_unused]] Number const tvoChange = newRoundedLoanState.valueOutstanding -
-        (totalValueOutstandingProxy - overpaymentComponents.trackedPrincipalDelta);
-    [[maybe_unused]] Number const mfeeReleased =
-        managementFeeOutstandingProxy - newRoundedLoanState.managementFeeDue;
-    [[maybe_unused]] Number const interestPart = overpaymentComponents.trackedInterestPart();
-
     XRPL_ASSERT_PARTS(
-        loanPaymentParts.valueChange == tvoChange + mfeeReleased + interestPart,
+        loanPaymentParts.valueChange ==
+            newRoundedLoanState.valueOutstanding -
+                (totalValueOutstandingProxy - overpaymentComponents.trackedPrincipalDelta) +
+                overpaymentComponents.trackedInterestPart(),
         "xrpl::detail::doOverpayment",
         "interest paid agrees");
 
@@ -1881,57 +1867,50 @@ loanMakePayment(
         // It shouldn't be possible for the overpayment to be greater than
         // totalValueOutstanding, because that would have been processed as
         // another normal payment. But cap it just in case.
-        Number const overpaymentRaw = std::min(amount - totalPaid, *totalValueOutstandingProxy);
-        Number const overpayment = view.rules().enabled(fixCleanup3_2_0)
-            ? roundToAsset(asset, overpaymentRaw, loanScale, Number::downward)
-            : overpaymentRaw;
+        Number const overpayment = std::min(amount - totalPaid, *totalValueOutstandingProxy);
 
-        // Due to rounding, overpayment could be zero
-        if (overpayment > 0)
+        detail::ExtendedPaymentComponents 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.
+        if (overpaymentComponents.trackedPrincipalDelta > 0)
         {
-            detail::ExtendedPaymentComponents const overpaymentComponents =
-                detail::computeOverpaymentComponents(
+            XRPL_ASSERT_PARTS(
+                overpaymentComponents.untrackedInterest >= beast::zero,
+                "xrpl::loanMakePayment",
+                "overpayment penalty did not reduce value of loan");
+            // Can't just use `periodicPayment` here, because it might
+            // change
+            auto periodicPaymentProxy = loan->at(sfPeriodicPayment);
+            if (auto const overResult = detail::doOverpayment(
                     asset,
                     loanScale,
-                    overpayment,
-                    overpaymentInterestRate,
-                    overpaymentFeeRate,
-                    managementFeeRate);
-
-            // Don't process an overpayment if the whole amount (or more!)
-            // gets eaten by fees and interest.
-            if (overpaymentComponents.trackedPrincipalDelta > 0)
+                    overpaymentComponents,
+                    totalValueOutstandingProxy,
+                    principalOutstandingProxy,
+                    managementFeeOutstandingProxy,
+                    periodicPaymentProxy,
+                    periodicRate,
+                    paymentRemainingProxy,
+                    managementFeeRate,
+                    j))
             {
-                XRPL_ASSERT_PARTS(
-                    overpaymentComponents.untrackedInterest >= beast::zero,
-                    "xrpl::loanMakePayment",
-                    "overpayment penalty did not reduce value of loan");
-                // Can't just use `periodicPayment` here, because it might
-                // change
-                auto periodicPaymentProxy = loan->at(sfPeriodicPayment);
-                if (auto const overResult = detail::doOverpayment(
-                        asset,
-                        loanScale,
-                        overpaymentComponents,
-                        totalValueOutstandingProxy,
-                        principalOutstandingProxy,
-                        managementFeeOutstandingProxy,
-                        periodicPaymentProxy,
-                        periodicRate,
-                        paymentRemainingProxy,
-                        managementFeeRate,
-                        j))
-                {
-                    totalParts += *overResult;
-                }
-                else if (overResult.error())
-                {
-                    // error() will be the TER returned if a payment is not
-                    // made. It will only evaluate to true if it's unsuccessful.
-                    // Otherwise, tesSUCCESS means nothing was done, so
-                    // continue.
-                    return Unexpected(overResult.error());
-                }
+                totalParts += *overResult;
+            }
+            else if (overResult.error())
+            {
+                // error() will be the TER returned if a payment is not
+                // made. It will only evaluate to true if it's unsuccessful.
+                // Otherwise, tesSUCCESS means nothing was done, so
+                // continue.
+                return Unexpected(overResult.error());
             }
         }
     }

src/libxrpl/ledger/helpers/NFTokenHelpers.cpp

@@ -621,6 +621,33 @@ removeTokenOffersWithLimit(ApplyView& view, Keylet const& directory, std::size_t
     return deletedOffersCount;
 }
 
+TER
+notTooManyOffers(ReadView const& view, uint256 const& nftokenID)
+{
+    std::size_t totalOffers = 0;
+
+    {
+        Dir const buys(view, keylet::nft_buys(nftokenID));
+        for (auto iter = buys.begin(); iter != buys.end(); iter.next_page())
+        {
+            totalOffers += iter.page_size();
+            if (totalOffers > maxDeletableTokenOfferEntries)
+                return tefTOO_BIG;
+        }
+    }
+
+    {
+        Dir const sells(view, keylet::nft_sells(nftokenID));
+        for (auto iter = sells.begin(); iter != sells.end(); iter.next_page())
+        {
+            totalOffers += iter.page_size();
+            if (totalOffers > maxDeletableTokenOfferEntries)
+                return tefTOO_BIG;
+        }
+    }
+    return tesSUCCESS;
+}
+
 bool
 deleteTokenOffer(ApplyView& view, std::shared_ptr<SLE> const& offer)
 {

src/test/app/Loan_test.cpp

@@ -7198,89 +7198,6 @@ protected:
         attemptWithdrawShares(depositorB, sharesLpB, tesSUCCESS);
     }
 
-    // An overpayment whose residual amount has more precision than loanScale
-    // fires the isRounded(asset, overpayment, loanScale) assertion in
-    // computeOverpaymentComponents (and a downstream "interest paid agrees"
-    // assertion in doOverpayment). fixCleanup3_2_0 rounds the residual down
-    // to loanScale before passing it in. The pre-amendment path can't be
-    // tested here because the assertion fires in Debug builds and aborts
-    // the test process — see the PR description for context.
-    void
-    testBugOverpayUnroundedAmount()
-    {
-        testcase("bug: computeOverpaymentComponents isRounded assertion");
-
-        using namespace jtx;
-        Env env(*this, all);
-
-        Account const issuer{"issuer"};
-        Account const vaultOwner{"vaultOwner"};
-        Account const depositor{"depositor"};
-        Account const borrower{"borrower"};
-
-        env.fund(XRP(1'000'000), issuer, vaultOwner, depositor, borrower);
-        env.close();
-        env(fset(issuer, asfDefaultRipple));
-        env.close();
-
-        PrettyAsset const iouAsset = issuer["USD"];
-        STAmount const iouLimit{iouAsset.raw(), Number{9'999'999'999'999'999LL}};
-        env(trust(vaultOwner, iouLimit));
-        env(trust(depositor, iouLimit));
-        env(trust(borrower, iouLimit));
-        env.close();
-        env(pay(issuer, vaultOwner, iouAsset(1'000'000)));
-        env(pay(issuer, depositor, iouAsset(1'000'000)));
-        env(pay(issuer, borrower, iouAsset(1'000'000)));
-        env.close();
-
-        Vault const vault{env};
-        auto [vaultTx, vaultKeylet] = vault.create({.owner = vaultOwner, .asset = iouAsset});
-        vaultTx[sfScale] = 1;
-        env(vaultTx);
-        env.close();
-        env(vault.deposit(
-            {.depositor = depositor, .id = vaultKeylet.key, .amount = iouAsset(100'000)}));
-        env.close();
-
-        auto const brokerKeylet = keylet::loanbroker(vaultOwner.id(), env.seq(vaultOwner));
-        {
-            using namespace loanBroker;
-            env(set(vaultOwner, vaultKeylet.key),
-                managementFeeRate(TenthBips16{1000}),
-                debtMaximum(Number{5000}),
-                fee(env.current()->fees().base * 2));
-        }
-        env.close();
-
-        auto const brokerStateBefore = env.le(brokerKeylet);
-        auto const loanSequence = brokerStateBefore->at(sfLoanSequence);
-        auto const loanKeylet = keylet::loan(brokerKeylet.key, loanSequence);
-
-        using namespace loan;
-        auto createJson = env.json(
-            set(borrower, brokerKeylet.key, Number{1000}, tfLoanOverpayment),
-            fee(env.current()->fees().base * 2),
-            json(sfCounterpartySignature, Json::objectValue));
-
-        createJson["InterestRate"] = 10000;
-        createJson["PaymentTotal"] = 12;
-        createJson["PaymentInterval"] = 60;
-        createJson["GracePeriod"] = 60;
-        createJson["OverpaymentFee"] = 1000;
-        createJson["OverpaymentInterestRate"] = 1000;
-        createJson = env.json(createJson, sig(sfCounterpartySignature, vaultOwner));
-        env(createJson, ter(tesSUCCESS));
-        env.close();
-
-        // periodic * 1.5 at 15-sig-digit precision: 125.000154585042. This
-        // has too many digits to round cleanly to loanScale=-10, so the
-        // overpayment residual fails the isRounded check.
-        STAmount const payAmount{iouAsset.raw(), Number{125'000'154'585'042LL, -12}};
-        env(pay(borrower, loanKeylet.key, payAmount), txflags(tfLoanOverpayment), ter(tesSUCCESS));
-        env.close();
-    }
-
 public:
     void
     run() override
@@ -7289,8 +7206,6 @@ public:
         testLoanPayLateFullPaymentBypassesPenalties();
         testLoanCoverMinimumRoundingExploit();
 #endif
-        testBugOverpayUnroundedAmount();
-
         testWithdrawReflectsUnrealizedLoss();
         testInvalidLoanSet();
 

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

@@ -161,7 +161,11 @@ ValidatorSite::load(
     {
         try
         {
-            sites_.emplace_back(uri);
+            // This is not super efficient, but it doesn't happen often.
+            bool found = std::ranges::any_of(
+                sites_, [&uri](auto const& site) { return site.loadedResource->uri == uri; });
+            if (!found)
+                sites_.emplace_back(uri);
         }
         catch (std::exception const& e)
         {
@@ -222,7 +226,17 @@ ValidatorSite::setTimer(
     std::lock_guard<std::mutex> const& site_lock,
     std::lock_guard<std::mutex> const& state_lock)
 {
-    auto next = std::ranges::min_element(
+    if (!sites_.empty() &&  //
+        std::ranges::all_of(
+            sites_, [](auto const& site) { return site.lastRefreshStatus.has_value(); }))
+    {
+        // If all of the sites have been handled at least once (including
+        // errors and timeouts), call missingSite, which will load the cache
+        // files for any lists that are still unavailable.
+        missingSite(site_lock);
+    }
+
+    auto const next = std::ranges::min_element(
         sites_, [](Site const& a, Site const& b) { return a.nextRefresh < b.nextRefresh; });
 
     if (next != sites_.end())
@@ -333,7 +347,7 @@ ValidatorSite::onRequestTimeout(std::size_t siteIdx, error_code const& ec)
         // processes a network error. Usually, this function runs first,
         // but on extremely rare occasions, the response handler can run
         // first, which will leave activeResource empty.
-        auto const& site = sites_[siteIdx];
+        auto& site = sites_[siteIdx];
         if (site.activeResource)
         {
             JLOG(j_.warn()) << "Request for " << site.activeResource->uri << " took too long";
@@ -341,6 +355,9 @@ ValidatorSite::onRequestTimeout(std::size_t siteIdx, error_code const& ec)
         else
             JLOG(j_.error()) << "Request took too long, but a response has "
                                 "already been processed";
+        if (!site.lastRefreshStatus)
+            site.lastRefreshStatus.emplace(
+                Site::Status{clock_type::now(), ListDisposition::invalid, "timeout"});
     }
 
     std::lock_guard const lock_state{state_mutex_};