Skip to content

fix: support dual stack on same port #8190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wemeetagain merged 2 commits into from
Aug 13, 2025
Merged

fix: support dual stack on same port #8190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cecd0e
fix: support dual stack on same port
wemeetagain Aug 12, 2025
cc88b87
chore: fix build issues
wemeetagain Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/beacon-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@
"dependencies": {
"@chainsafe/as-sha256": "^1.2.0",
"@chainsafe/blst": "^2.2.0",
"@chainsafe/discv5": "^11.0.0",
"@chainsafe/enr": "^5.0.0",
"@chainsafe/discv5": "^11.0.3",
"@chainsafe/enr": "^5.0.1",
"@chainsafe/libp2p-gossipsub": "^14.1.1",
"@chainsafe/libp2p-noise": "^16.1.0",
"@chainsafe/persistent-merkle-tree": "^1.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"@chainsafe/bls-keygen": "^0.4.0",
"@chainsafe/bls-keystore": "^3.1.0",
"@chainsafe/blst": "^2.2.0",
"@chainsafe/discv5": "^11.0.0",
"@chainsafe/enr": "^5.0.0",
"@chainsafe/discv5": "^11.0.3",
"@chainsafe/enr": "^5.0.1",
"@chainsafe/persistent-merkle-tree": "^1.2.0",
"@chainsafe/ssz": "^1.2.1",
"@chainsafe/threads": "^1.11.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/cmds/bootnode/options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {CliCommandOptions, CliOptionDefinition} from "@lodestar/utils";
import {MetricsArgs, options as metricsOptions} from "../../options/beaconNodeOptions/metrics.js";
import {defaultListenAddress, defaultP2pPort, defaultP2pPort6} from "../../options/beaconNodeOptions/network.js";
import {defaultListenAddress, defaultP2pPort} from "../../options/beaconNodeOptions/network.js";
import {LogArgs, logOptions} from "../../options/logOptions.js";

type BootnodeExtraArgs = {
Expand Down Expand Up @@ -44,7 +44,7 @@ export const bootnodeExtraOptions: CliCommandOptions<BootnodeExtraArgs> = {
alias: "discoveryPort6",
description: "The UDP port to listen on",
type: "number",
defaultDescription: String(defaultP2pPort6),
defaultDescription: String(defaultP2pPort),
group: "network",
},

Expand Down
7 changes: 3 additions & 4 deletions packages/cli/src/options/beaconNodeOptions/network.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {YargsError} from "../../util/index.js";

export const defaultListenAddress = "0.0.0.0";
export const defaultP2pPort = 9000;
export const defaultP2pPort6 = 9090;

export type NetworkArgs = {
discv5?: boolean;
Expand Down Expand Up @@ -67,8 +66,8 @@ export function parseListenArgs(args: NetworkArgs) {

// Only use listenAddress6 if it is explicitly set
const listenAddress6 = args.listenAddress6;
const port6 = listenAddress6 ? (args.port6 ?? defaultP2pPort6) : undefined;
const discoveryPort6 = listenAddress6 ? (args.discoveryPort6 ?? args.port6 ?? defaultP2pPort6) : undefined;
const port6 = listenAddress6 ? (args.port6 ?? defaultP2pPort) : undefined;
const discoveryPort6 = listenAddress6 ? (args.discoveryPort6 ?? args.port6 ?? defaultP2pPort) : undefined;

return {listenAddress, port, discoveryPort, listenAddress6, port6, discoveryPort6};
}
Expand Down Expand Up @@ -199,7 +198,7 @@ export const options: CliCommandOptions<NetworkArgs> = {
description: "The TCP/UDP port to listen on. The UDP port can be modified by the --discoveryPort6 flag.",
type: "number",
// TODO: Derive from BeaconNode defaults
defaultDescription: String(defaultP2pPort6),
defaultDescription: String(defaultP2pPort),
group: "network",
},

Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,12 +550,12 @@
"@chainsafe/blst-linux-x64-musl" "2.2.0"
"@chainsafe/blst-win32-x64-msvc" "2.2.0"

"@chainsafe/discv5@^11.0.0":
version "11.0.0"
resolved "https://registry.yarnpkg.com/@chainsafe/discv5/-/discv5-11.0.0.tgz#346a11ad25f552d29e8b1956b539e08d14bde361"
integrity sha512-g/x79Y5b7g6CrNuWazSzXTtnNguC0Sl8xkf9CPMlZ0BrsXmXPzwTp3zgtAiuJcG9x7zDUSDFOejrb4iFcJ0/FQ==
"@chainsafe/discv5@^11.0.3":
version "11.0.3"
resolved "https://registry.yarnpkg.com/@chainsafe/discv5/-/discv5-11.0.3.tgz#0f53d2f8a7f015bf2c0c8d897c01e8cb5466c916"
integrity sha512-bDvpiHfg7th/YGoOx7+W6x/28kfE/Cob7uE0XWpyPMQ0RTmJmzMYMfT1eulg5unlggALABvKgsct/gQDQT/hFw==
dependencies:
"@chainsafe/enr" "^5.0.0"
"@chainsafe/enr" "^5.0.1"
"@ethereumjs/rlp" "^5.0.2"
"@libp2p/crypto" "^5.0.1"
"@libp2p/interface" "^2.0.1"
Expand All @@ -566,10 +566,10 @@
lru-cache "^10.1.0"
strict-event-emitter-types "^2.0.0"

"@chainsafe/enr@^5.0.0":
version "5.0.0"
resolved "https://registry.yarnpkg.com/@chainsafe/enr/-/enr-5.0.0.tgz#0486d6d3ba9cb8c4a6e2190921b2dd33ec60bb7b"
integrity sha512-xqWBsdFFHy/sLqddsyCT4BH/5PFheyK8Grho27tmiwg/a95nANYANsqXXUP8/HbgCx3F5VDl0/xFacV3Ik7kDA==
"@chainsafe/enr@^5.0.1":
version "5.0.1"
resolved "https://registry.yarnpkg.com/@chainsafe/enr/-/enr-5.0.1.tgz#ac7622ee381475110239af75073969fad1faf412"
integrity sha512-RP5XxJOSYt0f775ne6NqlaG33Qia+IaMjWlP7PlWagz6SOpXlfbm+vaqHx3by6lKPb9aW4UQtO+fiRxz85XwaQ==
dependencies:
"@ethereumjs/rlp" "^5.0.2"
"@libp2p/crypto" "^5.0.1"
Expand Down
Loading