p2p/forkid: remove polygon specific forks from Gatherforks#160
Merged
Conversation
marcello33
approved these changes
Jun 5, 2026
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
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.
Summary
This PR fixes the
forkidresolution for Polygon Mainnet and Amoy chains. Makes it equivalent to bor to avoid p2p handshake failures.In one of the earlier PRs, bor specific hard forks were added in
GatherForks. While some polygon related forks were already added, it sounded like a natural addition but it can cause issues in p2p handshake with other bor nodes.Bor as of now doesn't include any bor specific forks. Hence, we remove all polygon specific forks except few selected ones. In erigon, we have to set a polygon specific hard fork for any ethereum equivalent hard fork we activate.
In bor, we directly activate the ethereum forks (as we can exclude EIPs safely) but that was not the case with erigon (due to it being maintained in original erigon repo). Hence, we need to include these forks to match with bor's response of
GatherForks.This might also fix some issues operators are seeing after v3.6.0 which changed these forks.