zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7174 

96918a2 Don't do mempool lookups for "mempool" command without a filter (Matt Corallo)
This commit is contained in:
Gregory Maxwell 2015-12-05 15:16:25 -08:00
parent a2822b97cb 96918a2f09
commit 075faaebf2
No known key found for this signature in database
GPG Key ID: EAB5AF94D9E9ABE7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main.cpp
View File

@ -4994,12 +4994,13 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
vector<CInv> vInv; vector<CInv> vInv;
BOOST_FOREACH(uint256& hash, vtxid) { BOOST_FOREACH(uint256& hash, vtxid) {
CInv inv(MSG_TX, hash); CInv inv(MSG_TX, hash);
CTransaction tx; if (pfrom->pfilter) {
bool fInMemPool = mempool.lookup(hash, tx); CTransaction tx;
if (!fInMemPool) continue; // another thread removed since queryHashes, maybe... bool fInMemPool = mempool.lookup(hash, tx);
if ((pfrom->pfilter && pfrom->pfilter->IsRelevantAndUpdate(tx)) || if (!fInMemPool) continue; // another thread removed since queryHashes, maybe...
(!pfrom->pfilter)) if (!pfrom->pfilter->IsRelevantAndUpdate(tx)) continue;
vInv.push_back(inv); }
vInv.push_back(inv);
if (vInv.size() == MAX_INV_SZ) { if (vInv.size() == MAX_INV_SZ) {
pfrom->PushMessage("inv", vInv); pfrom->PushMessage("inv", vInv);
vInv.clear(); vInv.clear();