This repository has been archived by the owner on Sep 26, 2019. It is now read-only.
Ensure devp2p ports are written to ports file correctly #1020
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
…wn before we write the ports file Include the P2P TCP port in ports file even when peer discovery is disabled. Load information from the advertised peer rather than the discovery listening socket. Fix admin_nodeInfo to include the ?discport param in the enode URI when the discovery port differs from the P2P port.
ajsutton
commented
Mar 1, 2019
| @@ -89,7 +84,7 @@ public void start() { | |||
| if (started.compareAndSet(false, true)) { | |||
| LOG.info("Starting Network."); | |||
| setupHandlers(); | |||
| networkExecutor.submit(network); | |||
There was a problem hiding this comment.
Not entirely sure why this ever had its own dedicated executor - starting the network is actually very quick as it basically just opens a port and returns.
mbaxter
approved these changes
Mar 4, 2019
| final PeerInfo peerInfo = peerNetwork.getLocalPeerInfo(); | ||
| final BytesValue nodeId = peerInfo.getNodeId(); | ||
| final Peer advertisedPeer = peerNetwork.getAdvertisedPeer(); | ||
| if (advertisedPeer != null) { |
There was a problem hiding this comment.
Should we update getAdvertisedPeer to return an Optional?
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
Start P2P network synchronously so the ports are guaranteed to be known before we write the ports file.
Include the P2P TCP port in ports file even when peer discovery is disabled.
Load information from the advertised peer rather than the discovery listening socket so we get the right IP instead of 0.0.0.0.
Fix admin_nodeInfo to include the ?discport param in the enode URI when the discovery port differs from the P2P port and not fail with internal server error when p2p is enabled but discovery is disabled.