Track first recorded height

morcos · morcos · commit 10f7cbd2471a · 2017-05-10T11:47:44.000-04:00
Track the first time we seen txs in a block that we have been tracking in our mempool. Used to evaluate validity of fee estimates for different targets.
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
@@ -477,7 +477,7 @@ bool CBlockPolicyEstimator::removeTx(uint256 hash, bool inBlock)
 }
 
 CBlockPolicyEstimator::CBlockPolicyEstimator()
-    : nBestSeenHeight(0), trackedTxs(0), untrackedTxs(0)
+    : nBestSeenHeight(0), firstRecordedHeight(0), trackedTxs(0), untrackedTxs(0)
 {
     static_assert(MIN_BUCKET_FEERATE > 0, "Min feerate must be nonzero");
     minTrackedFee = CFeeRate(MIN_BUCKET_FEERATE);
@@ -603,6 +603,11 @@ void CBlockPolicyEstimator::processBlock(unsigned int nBlockHeight,
             countedTxs++;
     }
 
+    if (firstRecordedHeight == 0 && countedTxs > 0) {
+        firstRecordedHeight = nBestSeenHeight;
+        LogPrint(BCLog::ESTIMATEFEE, "Blockpolicy first recorded height %u\n", firstRecordedHeight);
+    }
+
 
     LogPrint(BCLog::ESTIMATEFEE, "Blockpolicy after updating estimates for %u of %u txs in block, since last block %u of %u tracked, new mempool map size %u\n",
              countedTxs, entries.size(), trackedTxs, trackedTxs + untrackedTxs, mapMemPoolTxs.size());
diff --git a/src/policy/fees.h b/src/policy/fees.h
@@ -173,6 +173,10 @@ class CBlockPolicyEstimator
 private:
     CFeeRate minTrackedFee;    //!< Passed to constructor to avoid dependency on main
     unsigned int nBestSeenHeight;
+    unsigned int firstRecordedHeight;
+    unsigned int historicalFirst;
+    unsigned int historicalBest;
+
     struct TxStatsInfo
     {
         unsigned int blockHeight;

Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ bool CBlockPolicyEstimator::removeTx(uint256 hash, bool inBlock)`
`477`	`477`	`}`
`478`	`478`
`479`	`479`	`CBlockPolicyEstimator::CBlockPolicyEstimator()`
`480`		`- : nBestSeenHeight(0), trackedTxs(0), untrackedTxs(0)`
	`480`	`+ : nBestSeenHeight(0), firstRecordedHeight(0), trackedTxs(0), untrackedTxs(0)`
`481`	`481`	`{`
`482`	`482`	`static_assert(MIN_BUCKET_FEERATE > 0, "Min feerate must be nonzero");`
`483`	`483`	`minTrackedFee = CFeeRate(MIN_BUCKET_FEERATE);`
`@@ -603,6 +603,11 @@ void CBlockPolicyEstimator::processBlock(unsigned int nBlockHeight,`
`603`	`603`	`countedTxs++;`
`604`	`604`	`}`
`605`	`605`
	`606`	`+ if (firstRecordedHeight == 0 && countedTxs > 0) {`
	`607`	`+ firstRecordedHeight = nBestSeenHeight;`
	`608`	`+ LogPrint(BCLog::ESTIMATEFEE, "Blockpolicy first recorded height %u\n", firstRecordedHeight);`
	`609`	`+ }`
	`610`	`+`
`606`	`611`
`607`	`612`	`LogPrint(BCLog::ESTIMATEFEE, "Blockpolicy after updating estimates for %u of %u txs in block, since last block %u of %u tracked, new mempool map size %u\n",`
`608`	`613`	`countedTxs, entries.size(), trackedTxs, trackedTxs + untrackedTxs, mapMemPoolTxs.size());`