Enable enr field in GetPeers and GetPeerById #8641
Merged
Conversation
This file contains 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
* spotless * fix compiler warns * make tests compile
* Add DiscoveryPeer.getNodeId() * Use the correct NodeId (from Discovery) instead of wrong Libp2p PeerId when calculating DAS subnets * Add Eth2Peer.getDiscoveryNodeId() method.
rolfyone
reviewed
Sep 25, 2024
| @@ -139,6 +144,18 @@ public Eth2P2PNetwork build() { | |||
| // Setup eth2 handlers | |||
| final SubnetSubscriptionService attestationSubnetService = new SubnetSubscriptionService(); | |||
| final SubnetSubscriptionService syncCommitteeSubnetService = new SubnetSubscriptionService(); | |||
|
|
|||
| // TODO a bit hacky solution, subject to be refactored | |||
There was a problem hiding this comment.
also would prefer to not have 'hacky solution' in a comment...
There was a problem hiding this comment.
It's draft yet, it was PoC, I wanted to check if it works first, because it's not very straightforward
rolfyone
reviewed
Sep 25, 2024
Comment on lines
151
to
153
| LibP2PPeer libP2PPeer = (LibP2PPeer) peer; | ||
| PubKey libP2PPubKey = libP2PPeer.getPubKey(); | ||
| Bytes discoveryNodeIdBytes = |
There was a problem hiding this comment.
we'd also at least want finals... i'd probably just make this a private function that gives a response, or package private and we can easily test it then...
There was a problem hiding this comment.
nice idea, thank you!
rolfyone
reviewed
Sep 25, 2024
| @@ -34,6 +37,16 @@ | |||
| public class NodeRecordConverter { | |||
| private static final Logger LOG = LogManager.getLogger(); | |||
|
|
|||
| public Bytes convertPublicKeyToNodeId(final Bytes publicKey) { | |||
| // TODO need to open an additional API in discovery instead of this hack | |||
| NodeRecord tempNodeRecord = | |||
rolfyone
approved these changes
Sep 30, 2024
zilm13
added a commit
to zilm13/teku
that referenced
this pull request
Sep 30, 2024
* Expose discovery NodeId to DiscoveryPeer and LibP2PPeer (Consensys#38) * Add DiscoveryPeer.getNodeId() * Add Eth2Peer.getDiscoveryNodeId() method. * Refactoring, discovery updated to 24.9.1 --------- Co-authored-by: Anton Nashatyrev <Nashatyrev@users.noreply.github.com>
zilm13
added a commit
to Nashatyrev/teku
that referenced
this pull request
Oct 1, 2024
* Expose discovery NodeId to DiscoveryPeer and LibP2PPeer (#38) * Add DiscoveryPeer.getNodeId() * Add Eth2Peer.getDiscoveryNodeId() method. * Refactoring, discovery updated to 24.9.1 --------- Co-authored-by: Anton Nashatyrev <Nashatyrev@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PR Description
Fixed Issue(s)
Fixes #7473
Documentation
doc-change-requiredlabel to this PR if updates are required.Changelog