feat: fix Amoy P2P connectivity — genesis, fork ID, eth/69 handshake#86
Merged
VAIBHAVJINDAL3012 merged 1 commit intomainfrom Mar 12, 2026
Merged
Conversation
…9 handshake Three issues prevented connecting to Go-Bor Amoy peers: 1. Non-standard eth/69 Status: Go-Bor includes a TD field (8 fields) that standard eth/69 (EIP-7642) removed. Added BorRlpxHandshake that decodes both formats. 2. Fork ID mismatch: Go-Bor's internal gatherForks() only includes standard Ethereum forks in the EIP-2124 checksum, not Bor-specific forks. Also, Shanghai/Cancun/Prague are block-based on Polygon (not timestamp-based like mainnet Ethereum). Fixed eth_fork_blocks() to exclude Bor forks and configured post-merge forks as block-based. 3. Wrong genesis hash: Was using Genesis::default() instead of the real Amoy genesis with system contract alloc. Embedded the complete genesis JSON from Go-Bor to produce the correct state root. Verified: all 4 Amoy bootnodes complete handshake and establish sessions.
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
1 participant
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
BorRlpxHandshakehandles both Go-Bor and standard formats with fallback decoding.gatherForks()), and configure Shanghai/Cancun/Prague as block-based forks (not timestamp-based, since Polygon is PoA).0x7202b2b5...).Test plan
bor-chainspectests pass8b7e4175)🤖 Generated with Claude Code