Always update fee estimates on new blocks.

morcos · morcos · commit d825838e6472 · 2017-01-04T12:09:34.000-05:00
All decisions about whether the transactions are valid data points are made at the time the transaction arrives. Updating on blocks all the time will now cause stale fee estimates to decay quickly when we restart a node.
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
@@ -359,7 +359,7 @@ void CBlockPolicyEstimator::processBlockTx(unsigned int nBlockHeight, const CTxM
 }
 
 void CBlockPolicyEstimator::processBlock(unsigned int nBlockHeight,
-                                         std::vector<CTxMemPoolEntry>& entries, bool fCurrentEstimate)
+                                         std::vector<CTxMemPoolEntry>& entries)
 {
     if (nBlockHeight <= nBestSeenHeight) {
         // Ignore side chains and re-orgs; assuming they are random
@@ -370,11 +370,6 @@ void CBlockPolicyEstimator::processBlock(unsigned int nBlockHeight,
         return;
     }
 
-    // Only want to be updating estimates when our blockchain is synced,
-    // otherwise we'll miscalculate how many blocks its taking to get included.
-    if (!fCurrentEstimate)
-        return;
-
     // Must update nBestSeenHeight in sync with ClearCurrent so that
     // calls to removeTx (via processBlockTx) correctly calculate age
     // of unconfirmed txs to remove from tracking.
diff --git a/src/policy/fees.h b/src/policy/fees.h
@@ -203,7 +203,7 @@ class CBlockPolicyEstimator
 
     /** Process all the transactions that have been included in a block */
     void processBlock(unsigned int nBlockHeight,
-                      std::vector<CTxMemPoolEntry>& entries, bool fCurrentEstimate);
+                      std::vector<CTxMemPoolEntry>& entries);
 
     /** Process a transaction confirmed in a block*/
     void processBlockTx(unsigned int nBlockHeight, const CTxMemPoolEntry& entry);
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
@@ -591,8 +591,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx)
 /**
  * Called when a block is connected. Removes from mempool and updates the miner fee estimator.
  */
-void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight,
-                                bool fCurrentEstimate)
+void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight)
 {
     LOCK(cs);
     std::vector<CTxMemPoolEntry> entries;
@@ -605,7 +604,7 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne
             entries.push_back(*i);
     }
     // Before the txs in the new block have been removed from the mempool, update policy estimates
-    minerPolicyEstimator->processBlock(nBlockHeight, entries, fCurrentEstimate);
+    minerPolicyEstimator->processBlock(nBlockHeight, entries);
     for (const auto& tx : vtx)
     {
         txiter it = mapTx.find(tx->GetHash());
diff --git a/src/txmempool.h b/src/txmempool.h
@@ -529,8 +529,7 @@ class CTxMemPool
     void removeRecursive(const CTransaction &tx);
     void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags);
     void removeConflicts(const CTransaction &tx);
-    void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight,
-                        bool fCurrentEstimate = true);
+    void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight);
     void clear();
     void _clear(); //lock free
     bool CompareDepthAndScore(const uint256& hasha, const uint256& hashb);
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2204,7 +2204,7 @@ bool static ConnectTip(CValidationState& state, const CChainParams& chainparams,
     int64_t nTime5 = GetTimeMicros(); nTimeChainState += nTime5 - nTime4;
     LogPrint("bench", "  - Writing chainstate: %.2fms [%.2fs]\n", (nTime5 - nTime4) * 0.001, nTimeChainState * 0.000001);
     // Remove conflicting transactions from the mempool.;
-    mempool.removeForBlock(blockConnecting.vtx, pindexNew->nHeight, !IsInitialBlockDownload());
+    mempool.removeForBlock(blockConnecting.vtx, pindexNew->nHeight);
     // Update chainActive & related variables.
     UpdateTip(pindexNew, chainparams);
 

Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ void CBlockPolicyEstimator::processBlockTx(unsigned int nBlockHeight, const CTxM`
`359`	`359`	`}`
`360`	`360`
`361`	`361`	`void CBlockPolicyEstimator::processBlock(unsigned int nBlockHeight,`
`362`		`- std::vector<CTxMemPoolEntry>& entries, bool fCurrentEstimate)`
	`362`	`+ std::vector<CTxMemPoolEntry>& entries)`
`363`	`363`	`{`
`364`	`364`	`if (nBlockHeight <= nBestSeenHeight) {`
`365`	`365`	`// Ignore side chains and re-orgs; assuming they are random`
`@@ -370,11 +370,6 @@ void CBlockPolicyEstimator::processBlock(unsigned int nBlockHeight,`
`370`	`370`	`return;`
`371`	`371`	`}`
`372`	`372`
`373`		`- // Only want to be updating estimates when our blockchain is synced,`
`374`		`- // otherwise we'll miscalculate how many blocks its taking to get included.`
`375`		`- if (!fCurrentEstimate)`
`376`		`- return;`
`377`		`-`
`378`	`373`	`// Must update nBestSeenHeight in sync with ClearCurrent so that`
`379`	`374`	`// calls to removeTx (via processBlockTx) correctly calculate age`
`380`	`375`	`// of unconfirmed txs to remove from tracking.`
Original file line number	Diff line number	Diff line change
`@@ -591,8 +591,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx)`
`591`	`591`	`/**`
`592`	`592`	`* Called when a block is connected. Removes from mempool and updates the miner fee estimator.`
`593`	`593`	`*/`
`594`		`-void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight,`
`595`		`- bool fCurrentEstimate)`
	`594`	`+void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight)`
`596`	`595`	`{`
`597`	`596`	`LOCK(cs);`
`598`	`597`	`std::vector<CTxMemPoolEntry> entries;`
`@@ -605,7 +604,7 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne`
`605`	`604`	`entries.push_back(*i);`
`606`	`605`	`}`
`607`	`606`	`// Before the txs in the new block have been removed from the mempool, update policy estimates`
`608`		`- minerPolicyEstimator->processBlock(nBlockHeight, entries, fCurrentEstimate);`
	`607`	`+ minerPolicyEstimator->processBlock(nBlockHeight, entries);`
`609`	`608`	`for (const auto& tx : vtx)`
`610`	`609`	`{`
`611`	`610`	`txiter it = mapTx.find(tx->GetHash());`