Skip to content

Conversation

@str4d
Copy link
Contributor

@str4d str4d commented Feb 19, 2021

Cherry-picked from bitcoin/bitcoin#7133.

Part of #2074.

gmaxwell and others added 5 commits February 19, 2021 20:16
Mruset setInventoryKnown was reduced to a remarkably small 1000
 entries as a side effect of sendbuffer size reductions in 2012.

This removes setInventoryKnown filtering from merkleBlock responses
 because false positives there are especially unattractive and
 also because I'm not sure if there aren't race conditions around
 the relay pool that would cause some transactions there to
 be suppressed. (Also, ProcessGetData was accessing
 setInventoryKnown without taking the required lock.)
Previously this logic could erroneously filter a MSG_BLOCK inventory message.
Previously this logic could erroneously filter a MSG_BLOCK inventory message.
@str4d str4d added C-upstream-port Category: Changes that are ported from the Bitcoin Core codebase. A-networking Area: Networking code labels Feb 19, 2021
Copy link
Contributor

@nuttycom nuttycom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK, verified against bitcoin/bitcoin#7133

@str4d
Copy link
Contributor Author

str4d commented Feb 19, 2021

Not merging this until after the 4.3.0 release.

@str4d
Copy link
Contributor Author

str4d commented Feb 22, 2021

But in the meantime:

@zkbot try

@zkbot
Copy link
Contributor

zkbot commented Feb 22, 2021

⌛ Trying commit 227933f with merge 9dd5561...

zkbot added a commit that referenced this pull request Feb 22, 2021
Replace setInventoryKnown with a rolling bloom filter

Cherry-picked from bitcoin/bitcoin#7133.
- Excluding for last commit, which needs bitcoin/bitcoin#7129.

Part of #2074.
@zkbot
Copy link
Contributor

zkbot commented Feb 22, 2021

☀️ Test successful - pr-try
State: approved= try=True

Copy link
Contributor

@daira daira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK. @str4d is checking whether there have been any upstream changes to CRollingBloomFilter.

@str4d str4d added this to the Core Sprint 2021-08 milestone Mar 5, 2021
@str4d
Copy link
Contributor Author

str4d commented Mar 5, 2021

There have been; I will backport them in a separate PR.

@zkbot r+

@zkbot
Copy link
Contributor

zkbot commented Mar 5, 2021

📌 Commit 227933f has been approved by str4d

@zkbot
Copy link
Contributor

zkbot commented Mar 5, 2021

⌛ Testing commit 227933f with merge 2aa9fbb...

@zkbot
Copy link
Contributor

zkbot commented Mar 5, 2021

☀️ Test successful - pr-merge
Approved by: str4d
Pushing 2aa9fbb to master...

@zkbot zkbot merged commit 2aa9fbb into zcash:master Mar 5, 2021
@str4d str4d deleted the 2074-net-setInventoryKnown branch March 5, 2021 13:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-networking Area: Networking code C-upstream-port Category: Changes that are ported from the Bitcoin Core codebase.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants