Skip to content

net: Strip previous p2p prefix before concatenating addresses #11078

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
bkchr merged 4 commits into from
Feb 22, 2026
Merged

net: Strip previous p2p prefix before concatenating addresses #11078

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e85be1c
net: Strip previous p2p prefix before concatenating addresses
lexnv Feb 16, 2026
d4ed260
Merge branch 'master' into lenxv/multiaddr-concat
lexnv Feb 16, 2026
284f333
Update substrate/client/network/src/config.rs
lexnv Feb 20, 2026
f64d79c
Update from github-actions[bot] running command 'prdoc --audience nod…
github-actions[bot] Feb 20, 2026
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
7 changes: 5 additions & 2 deletions substrate/client/network/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,11 @@ pub struct MultiaddrWithPeerId {
impl MultiaddrWithPeerId {
/// Concatenates the multiaddress and peer ID into one multiaddress containing both.
pub fn concat(&self) -> Multiaddr {
let proto = multiaddr::Protocol::P2p(From::from(self.peer_id));
self.multiaddr.clone().with(proto)
let mut addr = self.multiaddr.clone();
if matches!(addr.iter().last(), Some(multiaddr::Protocol::P2p(_))) {
Copy link
Copy Markdown
Contributor

@AndreiEres AndreiEres Feb 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe worth adding a comment why we do it

addr.pop();
}
Comment on lines +175 to +177
Copy link
Copy Markdown
Contributor

@dmitry-markin dmitry-markin Feb 16, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be difficult to ensure that self.multiaddr never contains the peer ID in the first place?

We should investigate how peer IDs end up in the address that is supposed to be without a peer ID.

Copy link
Copy Markdown
Contributor Author

@lexnv lexnv Feb 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Litep2p appends the /p2p prefix on all listen addresses on initialization:

https://github.com/paritytech/litep2p/blob/5ec893959bc64a479545a3a6b6a5090fa84c796b/src/lib.rs#L334

I don't believe this will cause issues since we are dialing from the transport manager either way:

  • a different peer cannot trick us into dialing since we compare the addresses stripped of /p2p prefix
  • don't believe other protocols make use of this

I would still keep this one as a tiny defensive check for future proofing

addr.with(multiaddr::Protocol::P2p(From::from(self.peer_id)))
}
}

Expand Down
Loading