diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-06-25 19:17:45 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-10-04 19:10:41 +0200 |
| commit | 6aa28abf53ef4694692474b4a3b0a8fa7559b50b (patch) | |
| tree | dca0f5961ecf9a1ddc75e642b5e862183f434fb9 /src/txmempool.cpp | |
| parent | be7555f0c03057bb5537cc42ca9d4937389f0670 (diff) | |
| download | bitcoin-6aa28abf53ef4694692474b4a3b0a8fa7559b50b.tar.xz | |
Use cmpctblock type 2 for segwit-enabled transfer
Contains version negotiation logic by Matt Corallo and bugfixes by
Suhas Daftuar.
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 3586123d3e..15fa6fbca3 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; |