aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatt Corallo <git@bluematt.me>2015-10-13 00:57:41 -0700
committerMatt Corallo <git@bluematt.me>2015-10-13 01:00:19 -0700
commite8bcdce8a245af235f8be9853c8f81c9bda56412 (patch)
tree2404fef3f821029474459fbf6e5941757581a865 /src
parent9c9b66f771ad904cd665f7f5f68e3279ebb2fa7e (diff)
Track (and define) ::minRelayTxFee in CTxMemPool
Diffstat (limited to 'src')
-rw-r--r--src/txmempool.cpp5
-rw-r--r--src/txmempool.h9
2 files changed, 11 insertions, 3 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index aa5aec0556..e8d76dd2f1 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -305,7 +305,7 @@ void CTxMemPoolEntry::UpdateState(int64_t modifySize, CAmount modifyFee, int64_t
}
}
-CTxMemPool::CTxMemPool(const CFeeRate& _minRelayFee) :
+CTxMemPool::CTxMemPool(const CFeeRate& _minReasonableRelayFee) :
nTransactionsUpdated(0)
{
// Sanity checks off by default for performance, because otherwise
@@ -313,7 +313,8 @@ CTxMemPool::CTxMemPool(const CFeeRate& _minRelayFee) :
// of transactions in the pool
fSanityCheck = false;
- minerPolicyEstimator = new CBlockPolicyEstimator(_minRelayFee);
+ minerPolicyEstimator = new CBlockPolicyEstimator(_minReasonableRelayFee);
+ minReasonableRelayFee = _minReasonableRelayFee;
}
CTxMemPool::~CTxMemPool()
diff --git a/src/txmempool.h b/src/txmempool.h
index cee1a146da..e45867f713 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -285,6 +285,8 @@ private:
uint64_t totalTxSize; //! sum of all mempool tx' byte sizes
uint64_t cachedInnerUsage; //! sum of dynamic memory usage of all the map elements (NOT the maps themselves)
+ CFeeRate minReasonableRelayFee;
+
public:
typedef boost::multi_index_container<
CTxMemPoolEntry,
@@ -334,7 +336,12 @@ public:
std::map<COutPoint, CInPoint> mapNextTx;
std::map<uint256, std::pair<double, CAmount> > mapDeltas;
- CTxMemPool(const CFeeRate& _minRelayFee);
+ /** Create a new CTxMemPool.
+ * minReasonableRelayFee should be a feerate which is, roughly, somewhere
+ * around what it "costs" to relay a transaction around the network and
+ * below which we would reasonably say a transaction has 0-effective-fee.
+ */
+ CTxMemPool(const CFeeRate& _minReasonableRelayFee);
~CTxMemPool();
/**