tx fees, policy: periodically flush fee estimates to fee_estimates.dat

ismaelsadeeq · fanquake · commit c4dd5989b36e · 2023-10-02T13:09:01.000+01:00
This reduces chances of having old estimates in fee_estimates.dat. Github-Pull: #27622 Rebased-From: 5b886f2
diff --git a/src/init.cpp b/src/init.cpp
@@ -1251,7 +1251,13 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     assert(!node.fee_estimator);
     // Don't initialize fee estimation with old data if we don't relay transactions,
     // as they would never get updated.
-    if (!ignores_incoming_txs) node.fee_estimator = std::make_unique<CBlockPolicyEstimator>(FeeestPath(args));
+    if (!ignores_incoming_txs) {
+        node.fee_estimator = std::make_unique<CBlockPolicyEstimator>(FeeestPath(args));
+
+        // Flush estimates to disk periodically
+        CBlockPolicyEstimator* fee_estimator = node.fee_estimator.get();
+        node.scheduler->scheduleEvery([fee_estimator] { fee_estimator->FlushFeeEstimates(); }, FEE_FLUSH_INTERVAL);
+    }
 
     // Check port numbers
     for (const std::string port_option : {
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
@@ -903,10 +903,16 @@ CFeeRate CBlockPolicyEstimator::estimateSmartFee(int confTarget, FeeCalculation
 
 void CBlockPolicyEstimator::Flush() {
     FlushUnconfirmed();
+    FlushFeeEstimates();
+}
 
+void CBlockPolicyEstimator::FlushFeeEstimates()
+{
     AutoFile est_file{fsbridge::fopen(m_estimation_filepath, "wb")};
     if (est_file.IsNull() || !Write(est_file)) {
         LogPrintf("Failed to write fee estimates to %s. Continue anyway.\n", fs::PathToString(m_estimation_filepath));
+    } else {
+        LogPrintf("Flushed fee estimates to %s.\n", fs::PathToString(m_estimation_filepath.filename()));
     }
 }
 
diff --git a/src/policy/fees.h b/src/policy/fees.h
@@ -14,12 +14,17 @@
 #include <util/fs.h>
 
 #include <array>
+#include <chrono>
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
+
+// How often to flush fee estimates to fee_estimates.dat.
+static constexpr std::chrono::hours FEE_FLUSH_INTERVAL{1};
+
 class AutoFile;
 class CTxMemPoolEntry;
 class TxConfirmStats;
@@ -239,6 +244,10 @@ class CBlockPolicyEstimator
     void Flush()
         EXCLUSIVE_LOCKS_REQUIRED(!m_cs_fee_estimator);
 
+    /** Record current fee estimations. */
+    void FlushFeeEstimates()
+        EXCLUSIVE_LOCKS_REQUIRED(!m_cs_fee_estimator);
+
 private:
     mutable Mutex m_cs_fee_estimator;
 

Original file line number	Diff line number	Diff line change
`@@ -903,10 +903,16 @@ CFeeRate CBlockPolicyEstimator::estimateSmartFee(int confTarget, FeeCalculation`
`903`	`903`
`904`	`904`	`void CBlockPolicyEstimator::Flush() {`
`905`	`905`	`FlushUnconfirmed();`
	`906`	`+ FlushFeeEstimates();`
	`907`	`+}`
`906`	`908`
	`909`	`+void CBlockPolicyEstimator::FlushFeeEstimates()`
	`910`	`+{`
`907`	`911`	`AutoFile est_file{fsbridge::fopen(m_estimation_filepath, "wb")};`
`908`	`912`	`if (est_file.IsNull() \|\| !Write(est_file)) {`
`909`	`913`	`LogPrintf("Failed to write fee estimates to %s. Continue anyway.\n", fs::PathToString(m_estimation_filepath));`
	`914`	`+ } else {`
	`915`	`+ LogPrintf("Flushed fee estimates to %s.\n", fs::PathToString(m_estimation_filepath.filename()));`
`910`	`916`	`}`
`911`	`917`	`}`
`912`	`918`