diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-06-25 19:17:45 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-13 20:15:17 +0200 |
| commit | fe1975a9740f30f1a1152276d7f93f3ca9fa611d (patch) | |
| tree | 55c8fcc221f4451c6fc228586de61661074195cd /src/txmempool.cpp | |
| parent | 611cc5096e5777502e18ba516d7a0eec93ac9c63 (diff) | |
| download | bitcoin-fe1975a9740f30f1a1152276d7f93f3ca9fa611d.tar.xz | |
Use cmpctblock type 2 for segwit-enabled transfer
Contains version negotiation logic by Matt Corallo and bugfixes by
Suhas Daftuar.
Github-Pull: #8393
Rebased-From: 6aa28abf53ef4694692474b4a3b0a8fa7559b50b
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 8b974d7312..59afb2cf5a 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; |