diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2017-06-05 19:32:56 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2017-06-05 19:33:01 +0000 |
| commit | 74653a41fee027b1c85b229a2d7460bb862c6b02 (patch) | |
| tree | a0c68f3d637aad0ae6daacf1ef7752e0d56e77ee /src | |
| parent | 21e1ed48989e1d150e9f85770fd098534e0f81f1 (diff) | |
| parent | 71463a7d18bb143da62e790f9194193dfaf8f320 (diff) | |
Merge #10196 via branch 'prioritisetx_gbtcache-0.14' into 0.14.2_fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/txmempool.cpp | 1 | ||||
| -rw-r--r-- | src/txmempool.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 91040fb9b2..72547b5828 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -945,6 +945,7 @@ void CTxMemPool::PrioritiseTransaction(const uint256 hash, const std::string str BOOST_FOREACH(txiter descendantIt, setDescendants) { mapTx.modify(descendantIt, update_ancestor_state(0, nFeeDelta, 0, 0)); } + ++nTransactionsUpdated; } } LogPrintf("PrioritiseTransaction: %s priority += %f, fee += %d\n", strHash, dPriorityDelta, FormatMoney(nFeeDelta)); diff --git a/src/txmempool.h b/src/txmempool.h index db1a02455f..12c9e59f5f 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -432,7 +432,7 @@ class CTxMemPool { private: uint32_t nCheckFrequency; //!< Value n means that n times in 2^32 we check. - unsigned int nTransactionsUpdated; + unsigned int nTransactionsUpdated; //!< Used by getblocktemplate to trigger CreateNewBlock() invocation CBlockPolicyEstimator* minerPolicyEstimator; uint64_t totalTxSize; //!< sum of all mempool tx's virtual sizes. Differs from serialized tx size since witness data is discounted. Defined in BIP 141. |