Merge pull request #634 from evoskuil/master

Adapt to db ren of get_branch_fees, comments, style, delint.

Author: evoskuil

include/bitcoin/server/estimator.hpp

@@ -34,7 +34,7 @@ class BCS_API estimator
     enum class mode
     {
         basic,
-        markov,
+        geometric,
         economical,
         conservative
     };
@@ -110,18 +110,20 @@ class BCS_API estimator
         std::array<bucket<horizon::large>,  sizing::count> large{};
     };
 
-    // C++23: make consteval (std::pow).
+    // C++23: make consteval.
     static inline double decay_rate() NOEXCEPT
     {
         static const auto rate = std::pow(0.5, 1.0 / sizing::count);
         return rate;
     }
 
+    // C++23: make constexpr.
     static inline double to_scale_term(size_t age) NOEXCEPT
     {
         return std::pow(decay_rate(), age);
     }
 
+    // C++23: make constexpr.
     static inline double to_scale_factor(bool push) NOEXCEPT
     {
         return std::pow(decay_rate(), push ? +1.0 : -1.0);
@@ -132,7 +134,7 @@ class BCS_API estimator
     bool push(const rates& block) NOEXCEPT;
     bool pop(const rates& block) NOEXCEPT;
     uint64_t compute(size_t target, double confidence,
-        bool markov=false) const NOEXCEPT;
+        bool geometric=false) const NOEXCEPT;
 
 private:
     bool update(const rates& block, size_t height, bool push) NOEXCEPT;

src/estimator.cpp

@@ -52,7 +52,7 @@ uint64_t estimator::estimate(size_t target, mode mode) const NOEXCEPT
             estimate = compute(target, confidence::high);
             break;
         }
-        case mode::markov:
+        case mode::geometric:
         {
             estimate = compute(target, confidence::high, true);
             break;
@@ -88,7 +88,7 @@ bool estimator::initialize(std::atomic_bool& cancel, const node::query& query,
     size_t top, size_t count) NOEXCEPT
 {
     rate_sets blocks{};
-    return query.get_block_fees(cancel, blocks, top, count) &&
+    return query.get_branch_fees(cancel, blocks, top, count) &&
         initialize(blocks);
 }
 
@@ -160,33 +160,35 @@ bool estimator::pop(const rates& block) NOEXCEPT
 }
 
 uint64_t estimator::compute(size_t target, double confidence,
-    bool markov) const NOEXCEPT
+    bool geometric) const NOEXCEPT
 {
     const auto threshold = [](double part, double total, size_t) NOEXCEPT
     {
         return part / total;
     };
 
     // Geometric distribution approximation, not a full Markov process.
-    const auto geometric = [](double part, double total, size_t target) NOEXCEPT
+    const auto markov = [](double part, double total, size_t target) NOEXCEPT
     {
         return system::power(part / total, target);
     };
 
     const auto call = [&](const auto& buckets) NOEXCEPT
     {
+        BC_PUSH_WARNING(NO_UNGUARDED_POINTERS)
+        const auto& contribution = geometric ? markov : threshold;
+        BC_POP_WARNING()
+
         constexpr auto magic_number = 2u;
         const auto at_least_four = magic_number * add1(target);
-        const auto& contribution = markov ? geometric : threshold;
-
         double total{}, part{};
         auto index = buckets.size();
         auto found = index;
         for (const auto& bucket: std::views::reverse(buckets))
         {
             --index;
             total += to_floating(bucket.total.load(relaxed));
-            part += to_floating(bucket.confirmed[target].load(relaxed));
+            part += to_floating(bucket.confirmed.at(target).load(relaxed));
             if (total < at_least_four)
                 continue;
 
@@ -258,7 +260,7 @@ bool estimator::update(const rates& block, size_t height, bool push) NOEXCEPT
 
         // Clamp overflow to last bin.
         const auto bin = std::log(rate / sizing::min) / growth;
-        ++counts[std::min(to_floored_integer(bin), sub1(sizing::count))];
+        ++counts.at(std::min(to_floored_integer(bin), sub1(sizing::count)));
     }
 
     // At age zero scale term is one.
@@ -278,13 +280,13 @@ bool estimator::update(const rates& block, size_t height, bool push) NOEXCEPT
                 continue;
             }
 
-            auto& bucket = buckets[bin++];
+            auto& bucket = buckets.at(bin++);
             const auto scaled = to_floored_integer(count * scale);
             const auto signed_term = push ? scaled : twos_complement(scaled);
 
             bucket.total.fetch_add(signed_term, relaxed);
             for (auto target = age; target < depth; ++target)
-                bucket.confirmed[target].fetch_add(signed_term, relaxed);
+                bucket.confirmed.at(target).fetch_add(signed_term, relaxed);
         }
     };