Skip to content

Portal: use new eth/nat setupAddress #3868

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
kdeme merged 3 commits into from
Dec 11, 2025
Merged

Portal: use new eth/nat setupAddress #3868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79ebe1b
Portal: use new eth/nat setupAddress
kdeme Dec 9, 2025
9f722e5
Use toPort helper + nph
kdeme Dec 9, 2025
adda044
Use the non-deprecated version also for nec and portalcli
kdeme Dec 11, 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
13 changes: 11 additions & 2 deletions execution_chain/nimbus_execution_client.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,17 @@ proc setupP2P(nimbus: NimbusNode, config: ExecutionClientConf, com: CommonRef) =
fatal "Get network keys error", msg = error
quit(QuitFailure)
natId = NimbusName & " " & NimbusVersion
(extIp, extTcpPort, extUdpPort) =
setupAddress(config.nat, config.listenAddress, config.tcpPort, config.udpPort, natId)
(extIp, extPorts) = setupAddress(
config.nat,
config.listenAddress,
@[
(port: config.tcpPort, protocol: PortProtocol.TCP),
(port: config.udpPort, protocol: PortProtocol.UDP),
],
natId,
)
extTcpPort = extPorts[0].toPort()
extUdpPort = extPorts[1].toPort()

bootstrapNodes = config.getBootstrapNodes()
fc = nimbus.fc
Expand Down
9 changes: 6 additions & 3 deletions portal/client/nimbus_portal_client.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,13 @@ proc run(portalClient: PortalClient, config: PortalConf) {.raises: [CatchableErr
let
bindIp = config.listenAddress
udpPort = Port(config.udpPort)
# TODO: allow for no TCP port mapping!
(extIp, _, extUdpPort) = setupAddress(
config.nat, config.listenAddress, udpPort, udpPort, "nimbus_portal_client"
(extIp, extPorts) = setupAddress(
config.nat,
config.listenAddress,
@[(port: udpPort, protocol: PortProtocol.UDP)],
"nimbus_portal_client",
)
extUdpPort = extPorts[0].toPort()
(netkey, newNetKey) =
if config.networkKey.isSome():
(config.networkKey.get(), true)
Expand Down
10 changes: 7 additions & 3 deletions portal/tools/portalcli.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,13 @@ proc run(config: PortalCliConf) =
rng = newRng()
bindIp = config.listenAddress
udpPort = Port(config.udpPort)
# TODO: allow for no TCP port mapping!
(extIp, _, extUdpPort) =
setupAddress(config.nat, config.listenAddress, udpPort, udpPort, "portalcli")
(extIp, extPorts) = setupAddress(
config.nat,
config.listenAddress,
@[(port: udpPort, protocol: PortProtocol.UDP)],
"portalcli",
)
extUdpPort = extPorts[0].toPort()

var bootstrapRecords: seq[Record]
loadBootstrapFile(string config.bootstrapNodesFile, bootstrapRecords)
Expand Down
Loading