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.h | |
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.h')
-rw-r--r-- | src/txmempool.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/txmempool.h b/src/txmempool.h index 2c2127f326..afb328b5af 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -462,7 +462,7 @@ public: indexed_transaction_set mapTx; typedef indexed_transaction_set::nth_index<0>::type::iterator txiter; - std::vector<std::pair<uint256, txiter> > vTxHashes; //!< All tx hashes/entries in mapTx, in random order + std::vector<std::pair<uint256, txiter> > vTxHashes; //!< All tx witness hashes/entries in mapTx, in random order struct CompareIteratorByHash { bool operator()(const txiter &a, const txiter &b) const { |