From 91532bd38223d7d04166e05de11d0d0b55e60f13 Mon Sep 17 00:00:00 2001 From: ismaelsadeeq Date: Fri, 3 Nov 2023 13:23:30 +0100 Subject: tx fees, policy: update `CBlockPolicyEstimator::processBlock` parameter Update `processBlock` parameter to reference to a vector of `RemovedMempoolTransactionInfo`. --- src/policy/fees.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/policy/fees.h') diff --git a/src/policy/fees.h b/src/policy/fees.h index 69bda195be..cff0c4dbe2 100644 --- a/src/policy/fees.h +++ b/src/policy/fees.h @@ -37,6 +37,7 @@ static constexpr bool DEFAULT_ACCEPT_STALE_FEE_ESTIMATES{false}; class AutoFile; class CTxMemPoolEntry; class TxConfirmStats; +struct RemovedMempoolTransactionInfo; /* Identifier for each of the 3 different TxConfirmStats which will track * history over different time horizons. */ @@ -201,8 +202,8 @@ public: ~CBlockPolicyEstimator(); /** Process all the transactions that have been included in a block */ - void processBlock(unsigned int nBlockHeight, - std::vector& entries) + void processBlock(const std::vector& txs_removed_for_block, + unsigned int nBlockHeight) EXCLUSIVE_LOCKS_REQUIRED(!m_cs_fee_estimator); /** Process a transaction accepted to the mempool*/ @@ -290,7 +291,7 @@ private: std::map bucketMap GUARDED_BY(m_cs_fee_estimator); // Map of bucket upper-bound to index into all vectors by bucket /** Process a transaction confirmed in a block*/ - bool processBlockTx(unsigned int nBlockHeight, const CTxMemPoolEntry* entry) EXCLUSIVE_LOCKS_REQUIRED(m_cs_fee_estimator); + bool processBlockTx(unsigned int nBlockHeight, const RemovedMempoolTransactionInfo& tx) EXCLUSIVE_LOCKS_REQUIRED(m_cs_fee_estimator); /** Helper for estimateSmartFee */ double estimateCombinedFee(unsigned int confTarget, double successThreshold, bool checkShorterHorizon, EstimationResult *result) const EXCLUSIVE_LOCKS_REQUIRED(m_cs_fee_estimator); -- cgit v1.2.3