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/basics/Number.cpp

@@ -222,12 +222,9 @@ Number::Guard::bringIntoRange(
     {
         mantissa *= 10;
         --exponent;
-        std::cout << "bringIntoRange. mantissa*=10: " << mantissa << ", exponent: " << exponent
-                  << std::endl;
     }
     if (exponent < minExponent)
     {
-        std::cout << "bringIntoRange. zero\n";
         constexpr Number zero = Number{};
 
         negative = zero.negative_;
@@ -249,50 +246,13 @@ Number::Guard::doRoundUp(
     auto r = round();
     if (r == 1 || (r == 0 && (mantissa & 1) == 1))
     {
-        std::cout << "doRoundUp. r: " << r << std::endl;
-        if (isFeatureEnabled(fixCleanup3_2_0) || !getCurrentTransactionRules())
+        ++mantissa;
+        // Ensure mantissa after incrementing fits within both the
+        // min/maxMantissa range and is a valid "rep".
+        if (mantissa > maxMantissa || mantissa > maxRep)
         {
-            // Ensure mantissa after incrementing fits within both the
-            // min/maxMantissa range and is a valid "rep".
-            if (mantissa < maxMantissa && mantissa < maxRep)
-            {
-                // Nothing unusual here, just increment the mantissa
-                ++mantissa;
-                std::cout << "\tmantissa++: " << mantissa << std::endl;
-            }
-            else
-            {
-                // Incrementing the mantissa will require dividing, which will require rounding. So
-                // _don't_ increment the mantissa. Instead, divide and round recursively. It should
-                // be impossible to recurse more than once, because once the mantissa is divided by
-                // 10, it will be _well_ under maxMantissa and maxRep, so adding 1 will have no
-                // change of bringing it back over.
-                push(mantissa % 10);
-                mantissa /= 10;
-                ++exponent;
-                XRPL_ASSERT_PARTS(
-                    mantissa < maxMantissa && mantissa < maxRep,
-                    "xrpl::Number::Guard::doRoundUp",
-                    "can't recurse more than once");
-                std::cout << "\tmantissa/=10: " << mantissa << ", exponent: " << exponent
-                          << std::endl;
-                // Here be dragons
-                doRoundUp(negative, mantissa, exponent, minMantissa, maxMantissa, location);
-                return;
-            }
-        }
-        else
-        {
-            // Need to preserve the incorrect behavior until the fix amendment can be retired,
-            // because otherwise would risk an unplanned ledger fork.
-            ++mantissa;
-            // Ensure mantissa after incrementing fits within both the
-            // min/maxMantissa range and is a valid "rep".
-            if (mantissa > maxMantissa || mantissa > maxRep)
-            {
-                mantissa /= 10;
-                ++exponent;
-            }
+            mantissa /= 10;
+            ++exponent;
         }
     }
     bringIntoRange(negative, mantissa, exponent, minMantissa);
@@ -707,8 +667,6 @@ Number::operator*=(Number const& y)
     auto const& minMantissa = range.min;
     auto const& maxMantissa = range.max;
 
-    std::cout << "zn: " << zn << ", zm: " << zm << ", ze: " << ze << std::endl;
-
     while (zm > maxMantissa || zm > maxRep)
     {
         // The following is optimization for:
@@ -717,9 +675,6 @@ Number::operator*=(Number const& y)
         g.push(divu10(zm));
         ++ze;
     }
-
-    std::cout << "zn: " << zn << ", zm: " << zm << ", ze: " << ze << std::endl;
-
     xm = static_cast<internalrep>(zm);
     xe = ze;
     g.doRoundUp(
@@ -832,7 +787,8 @@ Number::operator/=(Number const& y)
     return *this;
 }
 
-Number::operator rep() const
+Number::
+operator rep() const
 {
     rep drops = mantissa();
     int offset = exponent();

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/basics/Number_test.cpp

@@ -1584,101 +1584,3 @@ public:
 BEAST_DEFINE_TESTSUITE(Number, basics, xrpl);
 
 }  // namespace xrpl
-#include <xrpl/basics/Number.h>
-#include <xrpl/beast/unit_test.h>
-#include <xrpl/protocol/AccountID.h>
-#include <xrpl/protocol/MPTIssue.h>
-#include <xrpl/protocol/STAmount.h>
-
-#include <boost/multiprecision/cpp_int.hpp>
-
-#include <cstdint>
-#include <limits>
-#include <sstream>
-#include <string>
-
-namespace xrpl {
-
-class NumberUpwardWrongDirection_test : public beast::unit_test::suite
-{
-    using BigInt = boost::multiprecision::cpp_int;
-
-    static std::string
-    fmt(BigInt const& value)
-    {
-        std::ostringstream os;
-        os << value;
-        auto s = os.str();
-        std::string out;
-        int count = 0;
-        for (auto it = s.rbegin(); it != s.rend(); ++it)
-        {
-            if (count && count % 3 == 0)
-                out.insert(out.begin(), '_');
-            out.insert(out.begin(), *it);
-            ++count;
-        }
-        return out;
-    }
-
-public:
-    void
-    testUpwardRoundsDown()
-    {
-        testcase << "upward rounding produces a value below exact at maxRep cusp";
-
-        auto const origScale = Number::getMantissaScale();
-        auto const origRound = Number::setround(Number::upward);
-        Number::setMantissaScale(MantissaRange::large);
-
-        constexpr std::int64_t aValue = 1'000'000'000'000'049'863LL;
-        constexpr std::int64_t bValue = 9'223'372'036'854'315'903LL;
-
-        // JSON -> STAmount -> Number
-        AccountID const dummyIssuer = AccountID{42u};
-        MPTIssue const issue(/*sequence=*/1u, dummyIssuer);
-
-        STAmount const amountA{MPTAmount{aValue}, issue};
-        STAmount const amountB{MPTAmount{bValue}, issue};
-
-        // Public conversion operator: STAmount::operator Number() const.
-        Number const a = amountA;
-        Number const b = amountB;
-        Number const product = a * b;
-
-        // Exact reference in BigInt.
-        BigInt const exactProduct = BigInt(aValue) * BigInt(bValue);
-
-        // What Number actually stored.
-        BigInt storedValue = BigInt(product.mantissa());
-        for (int i = 0; i < product.exponent(); ++i)
-            storedValue *= 10;
-
-        BigInt const signedDifference = storedValue - exactProduct;
-
-        log << "\n"
-            << "  a              = " << fmt(BigInt(aValue)) << "\n"
-            << "  b              = " << fmt(BigInt(bValue)) << "\n"
-            << "  exact a*b      = " << fmt(exactProduct) << "\n"
-            << "  stored         = " << fmt(storedValue) << "\n"
-            << "  stored - exact = " << fmt(signedDifference) << "\n"
-            << "  upward         = " << (signedDifference >= 0 ? "held" : "VIOLATED") << "\n";
-
-        BEAST_EXPECT(signedDifference >= 0);
-        BEAST_EXPECT(product.mantissa() == (std::numeric_limits<std::int64_t>::max() /10) + 1);
-        BEAST_EXPECT(product.exponent() == 19);
-
-        Number::setround(origRound);
-        Number::setMantissaScale(origScale);
-    }
-
-    void
-    run() override
-    {
-        testUpwardRoundsDown();
-    }
-};
-
-BEAST_DEFINE_TESTSUITE(NumberUpwardWrongDirection, basics, ripple);
-
-}  // namespace xrpl

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_};