diff options
| author | Pieter Wuille <[email protected]> | 2016-10-10 12:32:17 +0200 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2016-10-10 13:16:40 +0200 |
| commit | 6429cfa8a70308241c576aeb92ffe3db5203b2ef (patch) | |
| tree | 12128520a1c638291d0dd133bcbceb1694e51385 /src/txmempool.cpp | |
| parent | Merge #8891: [Doc] Update bips.md for Segregated Witness (diff) | |
| parent | [qa] Update p2p-compactblocks.py for compactblocks v2 (diff) | |
| download | discoin-6429cfa8a70308241c576aeb92ffe3db5203b2ef.tar.xz discoin-6429cfa8a70308241c576aeb92ffe3db5203b2ef.zip | |
Merge #8393: Support for compact blocks together with segwit
27acfc1 [qa] Update p2p-compactblocks.py for compactblocks v2 (Suhas Daftuar)
422fac6 [qa] Add support for compactblocks v2 to mininode (Suhas Daftuar)
f5b9b8f [qa] Fix bug in mininode witness deserialization (Suhas Daftuar)
6aa28ab Use cmpctblock type 2 for segwit-enabled transfer (Pieter Wuille)
be7555f Fix overly-prescriptive p2p-segwit test for new fetch logic (Matt Corallo)
06128da Make GetFetchFlags always request witness objects from witness peers (Matt Corallo)
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 3586123d3..15fa6fbca 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -444,7 +444,7 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, totalTxSize += entry.GetTxSize(); minerPolicyEstimator->processTransaction(entry, fCurrentEstimate); - vTxHashes.emplace_back(hash, newit); + vTxHashes.emplace_back(tx.GetWitnessHash(), newit); newit->vTxHashesIdx = vTxHashes.size() - 1; return true; |