diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2017-05-17 13:17:28 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2017-05-17 13:25:22 -0700 |
| commit | bee35299716cc72cb7d5bd4daa9fddca05c58378 (patch) | |
| tree | 7557f3bc4d11de23e84662dee891b36a204732bc /src | |
| parent | 318ea50a1c2f612e750a93e36620dd0c4531e9cf (diff) | |
| parent | 6c2e25caf6b6e55bbb4161f815f1c6402ac10d10 (diff) | |
Merge #10196: Bugfix: PrioritiseTransaction updates the mempool tx counter
6c2e25c [qa] Test prioritise_transaction / getblocktemplate interaction (Suhas Daftuar)
acc2e4b Bugfix: PrioritiseTransaction updates the mempool tx counter (Suhas Daftuar)
Tree-SHA512: dcf834df52d84d5eb86acb847c3f28d3cffd1f78f3092b8ff8913c2c400675a071c48a19cd852fdbaac1582aa1dba23433e0e16055831ef2a5e76dde91199941
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 a83805267b..f7d248da31 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -865,6 +865,7 @@ void CTxMemPool::PrioritiseTransaction(const uint256& hash, const CAmount& nFeeD BOOST_FOREACH(txiter descendantIt, setDescendants) { mapTx.modify(descendantIt, update_ancestor_state(0, nFeeDelta, 0, 0)); } + ++nTransactionsUpdated; } } LogPrintf("PrioritiseTransaction: %s feerate += %s\n", hash.ToString(), FormatMoney(nFeeDelta)); diff --git a/src/txmempool.h b/src/txmempool.h index 9cb73fcc0c..a91eb5be54 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -397,7 +397,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. |