sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Track (and define) ::minRelayTxFee in CTxMemPool

Browse Source
This commit is contained in:
Matt Corallo 2015-10-13 00:57:41 -07:00
parent 9c9b66f771
commit e8bcdce8a2
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/txmempool.cpp
View File

@ -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) nTransactionsUpdated(0)
{ {
// Sanity checks off by default for performance, because otherwise // Sanity checks off by default for performance, because otherwise
@ -313,7 +313,8 @@ CTxMemPool::CTxMemPool(const CFeeRate& _minRelayFee) :
// of transactions in the pool // of transactions in the pool
fSanityCheck = false; fSanityCheck = false;
minerPolicyEstimator = new CBlockPolicyEstimator(_minRelayFee); minerPolicyEstimator = new CBlockPolicyEstimator(_minReasonableRelayFee);
minReasonableRelayFee = _minReasonableRelayFee;
} }
CTxMemPool::~CTxMemPool() CTxMemPool::~CTxMemPool()

9
src/txmempool.h
View File

@ -285,6 +285,8 @@ private:
uint64_t totalTxSize; //! sum of all mempool tx' byte sizes 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) uint64_t cachedInnerUsage; //! sum of dynamic memory usage of all the map elements (NOT the maps themselves)
CFeeRate minReasonableRelayFee;
public: public:
typedef boost::multi_index_container< typedef boost::multi_index_container<
CTxMemPoolEntry, CTxMemPoolEntry,
@ -334,7 +336,12 @@ public:
std::map<COutPoint, CInPoint> mapNextTx; std::map<COutPoint, CInPoint> mapNextTx;
std::map<uint256, std::pair<double, CAmount> > mapDeltas; 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(); ~CTxMemPool();
/** /**