merge queue: embarking unstable (9e587bd) and #432 together #439
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=80&v=4){kind=small}
This commit fully integrates the peer blocking features from the block-peers branch into the new modular peer manager architecture. Key changes: Blocking Infrastructure: - Add BlockingManager wrapping libp2p-allow-block-list for connection denial - Integrate blocking checks into all connection handlers (pending/established) - Add automatic peer unblocking after RETAIN_SCORE_EPOCH_MULTIPLIER duration Score-Based Blocking: - Implement check_and_block_peers_by_score() to automatically block peers with gossipsub scores below GRAYLIST_THRESHOLD - Integrate peer score checking into heartbeat system for periodic execution - Automatically disconnect blocked peers immediately Connection Prevention: - Update should_dial_peer() to check blocked peers before dialing - Filter blocked peers in discovery and subnet peer selection - Ensure all connection paths respect the blocked peer list Event System Updates: - Replace ConnectActions events with PeerManagerHeartbeat events - Consolidate peer management actions and score checking into single heartbeat - Update Network to handle new event structure with integrated score checking API Cleanup: - Remove unused manual blocking API methods (block_peer, unblock_peer) - Keep essential methods for score-based blocking and status queries - Maintain clean separation between manual and automatic blocking The implementation ensures that peers with poor gossipsub scores are automatically blocked and prevented from connecting, while maintaining the modular architecture and ensuring no behavioral changes from the original peer manager.
- Remove redundant HeartbeatManager::heartbeat() wrapper function - Consolidate all heartbeat logic directly in PeerManager::heartbeat() - Simplify HeartbeatManager to only handle timing (poll_tick) - Clean up unused imports in heartbeat.rs - Improve code organization with clear separation of concerns: - HeartbeatManager: Timer management only - PeerManager: All heartbeat logic and orchestration - PeerDiscovery: Peer discovery/connection logic This eliminates an unnecessary layer of indirection and centralizes heartbeat functionality for better maintainability.
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.
🎉 This pull request has been checked successfully and will be merged soon. 🎉
Branch unstable (9e587bd) and #432 are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #432.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue
defaultfor merge:#approved-reviews-by >= 1[🛡 GitHub repository ruleset rule]#changes-requested-reviews-by = 0[🛡 GitHub repository ruleset rule]check-success=test-suite-successcheck-success = license/clacheck-neutral = license/clacheck-skipped = license/claRequired conditions to stay in the queue:
#approved-reviews-by >= 1#approved-reviews-by >= 1[🛡 GitHub repository ruleset rule]#changes-requested-reviews-by = 0[🛡 GitHub repository ruleset rule]check-success=license/clacheck-success=target-branch-checklabel!=do-not-mergecheck-success = license/clacheck-neutral = license/clacheck-skipped = license/cla