diff options
| author | Wladimir J. van der Laan <[email protected]> | 2017-05-30 18:42:22 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2017-05-30 18:43:03 +0200 |
| commit | acd9957b72a21def0445d8a414ac39d88efe5d78 (patch) | |
| tree | f0d010656f37f06ad761e13010af8730ea3d1fa6 /src/txmempool.cpp | |
| parent | Merge #10460: Broadcast address every day, not 9 hours (diff) | |
| parent | Add RecursiveDynamicUsage overload for std::shared_ptr (diff) | |
| download | discoin-acd9957b72a21def0445d8a414ac39d88efe5d78.tar.xz discoin-acd9957b72a21def0445d8a414ac39d88efe5d78.zip | |
Merge #9208: Improve DisconnectTip performance
c1235e3 Add RecursiveDynamicUsage overload for std::shared_ptr (Russell Yanofsky)
71f1903 Store disconnected block transactions outside mempool during reorg (Suhas Daftuar)
9decd64 [qa] Relax assumptions on mempool behavior during reorg (Suhas Daftuar)
Tree-SHA512: c160ad853a5cd060d0307af7606a0c77907497ed7033c9599b95e73d83f68fdfcd4214bd8a83db1c5b7a58022722b9de1ed2e6ea2e02f38a7b6c717f079dd0c6
Diffstat (limited to 'src/txmempool.cpp')
| -rw-r--r-- | src/txmempool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 33df0536d..852984426 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -24,7 +24,7 @@ CTxMemPoolEntry::CTxMemPoolEntry(const CTransactionRef& _tx, const CAmount& _nFe spendsCoinbase(_spendsCoinbase), sigOpCost(_sigOpsCost), lockPoints(lp) { nTxWeight = GetTransactionWeight(*tx); - nUsageSize = RecursiveDynamicUsage(*tx) + memusage::DynamicUsage(tx); + nUsageSize = RecursiveDynamicUsage(tx); nCountWithDescendants = 1; nSizeWithDescendants = GetTxSize(); |