diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-15 07:24:05 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-15 07:29:04 +0200 |
| commit | 2ec82e94e6b49a0e74243559b96ee736c0c54de7 (patch) | |
| tree | de499243eaa1d1563ba9c342299f5018cc5fa43d /src/txmempool.cpp | |
| parent | a0a8700bc84cf10d99d9d3699e7b0fdfc323cf1c (diff) | |
| parent | c26649f9ed03fa9505e44aaf7f8cfdaa81f734cc (diff) | |
| download | bitcoin-2ec82e94e6b49a0e74243559b96ee736c0c54de7.tar.xz | |
Merge pull request #4817
c26649f Track modified size in TxMemPoolEntry so that we can correctly compute priority. (Alex Morcos)
Diffstat (limited to 'src/txmempool.cpp')
| -rw-r--r-- | src/txmempool.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 6bbadc8345..119509ae3c 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -23,6 +23,8 @@ CTxMemPoolEntry::CTxMemPoolEntry(const CTransaction& _tx, int64_t _nFee, tx(_tx), nFee(_nFee), nTime(_nTime), dPriority(_dPriority), nHeight(_nHeight) { nTxSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION); + + nModSize = tx.CalculateModifiedSize(nTxSize); } CTxMemPoolEntry::CTxMemPoolEntry(const CTxMemPoolEntry& other) @@ -34,7 +36,7 @@ double CTxMemPoolEntry::GetPriority(unsigned int currentHeight) const { int64_t nValueIn = tx.GetValueOut()+nFee; - double deltaPriority = ((double)(currentHeight-nHeight)*nValueIn)/nTxSize; + double deltaPriority = ((double)(currentHeight-nHeight)*nValueIn)/nModSize; double dResult = dPriority + deltaPriority; return dResult; } |