aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSuhas Daftuar <[email protected]>2017-04-03 16:31:51 -0400
committerLuke Dashjr <[email protected]>2017-04-19 20:10:02 +0000
commitd28d58382076c77dc7f8ec59997c5ce2fde99f70 (patch)
treed32478f70ec654f1f485fb0a9ddd62880f276755 /src
parentdoc: Update release notes pre-rc2 (diff)
downloaddiscoin-d28d58382076c77dc7f8ec59997c5ce2fde99f70.tar.xz
discoin-d28d58382076c77dc7f8ec59997c5ce2fde99f70.zip
Bugfix: PrioritiseTransaction updates the mempool tx counter
The mempool's nTransactionsUpdated is used by getblocktemplate to trigger new invocations of CreateNewBlock(). Github-Pull: #10196 Rebased-From: 909306cde3770ed7019e7b635e24cedbd9de66ce
Diffstat (limited to 'src')
-rw-r--r--src/txmempool.cpp1
-rw-r--r--src/txmempool.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 91040fb9b..72547b582 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 db1a02455..12c9e59f5 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.