eth: check snap satelliteness, delegate drop to eth #22235
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
holiman
approved these changes
Feb 2, 2021
Contributor
holiman
left a comment
holiman
left a comment
There was a problem hiding this comment.
Looks good enough to me it seems OK to merge it and get more testing on master
This was referenced Mar 9, 2021
Closed
9 tasks
9 tasks
This was referenced Sep 23, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In the current code, a peer is allowed to join both on the
ethandsnapprotocols. Although both protocol handlers enforces thatsnap-requires-eth, this is done with a timeout mechanism after the peer was added to all internal structs. Since we allowed a peer to (maliciously) connect with onlysnap, we needed the snap handler to clean out the peer on disconnect, similar to howethdoes when peer is dropped. This resulted in double-cleanups during normal disconnects since both protocols tries to racily clean.This PR solves the issue by adding doing eth/snap registration in two phases. Snap is registered as a protocol extension in the peerset and eth consumes (or blocks until it can) this registration. Only then will eth proceed. All submodule (downloader, syncer, fetcher) registrations and removals are done on the main
ethpathways.