feat: add IPv6 support #5758
Merged
feat: add IPv6 support #5758
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
Performance Report✔️ no performance regression detected Full benchmark results
|
nflaig
reviewed
Jul 14, 2023
wemeetagain
commented
Jul 14, 2023
| "port6", | ||
| "discoveryPort6", | ||
| ] as (keyof typeof muArgs)[]) { | ||
| validateMultiaddrArg(muArgs, key); |
There was a problem hiding this comment.
this allows us to fail fast if the user sets an incorrect ip address or port
eg: --listenAddress :: and --listenAddress6 0.0.0.0 should error
wemeetagain
commented
Jul 14, 2023
| @@ -63,7 +120,7 @@ export function parseArgs(args: NetworkArgs): IBeaconNodeOptions["network"] { | |||
| : null, | |||
| maxPeers: maxPeers ?? defaultOptions.network.maxPeers, | |||
| targetPeers: targetPeers ?? defaultOptions.network.targetPeers, | |||
| localMultiaddrs: [`/ip4/${listenAddress}/tcp/${tcpPort}`], | |||
| localMultiaddrs: [localMu, localMu6].filter(Boolean) as string[], | |||
There was a problem hiding this comment.
libp2p was already configured to listen to an array of multiaddrs.
So nothing further than passing both multiaddrs here needs to be done.
wemeetagain
commented
Jul 14, 2023
Comment on lines
+51
to
+54
| bindAddrs: { | ||
| ip4: (workerData.bindAddrs.ip4 ? multiaddr(workerData.bindAddrs.ip4) : undefined) as Multiaddr, | ||
| ip6: workerData.bindAddrs.ip6 ? multiaddr(workerData.bindAddrs.ip6) : undefined, | ||
| }, |
There was a problem hiding this comment.
discv5 5.0.0 now requires bindAddrs to be passed in like so.
So we thread this through to the cli layer.
nflaig
approved these changes
Jul 14, 2023
twoeths
approved these changes
Jul 17, 2023
This was referenced Jul 17, 2023
twoeths
pushed a commit
that referenced
this pull request
Jul 18, 2023
* feat: add IPv6 support * fix: ip -> ip4 * fix: add parens * fix: update cli flag descriptions
|
🎉 This PR is included in v1.10.0 🎉 |
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.
Motivation
Description
--listenAddress6,--port6,--discoveryPort6port6anddiscoveryPort6follow the same behavior asportanddiscoveryPortport6is 9090listenAddressnorlistenAddress6is set, a defaultlistenAddresswill be usedlistenAddressorlistenAddress6is set explicitly, only those that are set will be used--port 9090- listen on IPv4 on port 9090 for both libp2p and discv5 connections, no IPv6--listenAddress6 :: --port6 9000- listen on IPv6 on port 9000 for both libp2p and discv5 connections, no IPv4--listenAddress 0.0.0.0 --listenAddress6 ::- listen on IPv4 on port 9000, IPv6 on port 9090 for both libp2p and discv5 connections