net: Strip previous p2p prefix before concatenating addresses by lexnv · Pull Request #11078 · paritytech/polkadot-sdk

lexnv · 2026-02-16T12:35:10Z

This PR ensures that a MultiaddrWithPeerId will always remain valid after a concatenating process.

The litep2p code will concatanate the provided multiaddr-with-peerID regardless if the address already contains a p2p/.. prefix:

polkadot-sdk/substrate/client/network/src/litep2p/service.rs

Lines 427 to 434 in e85be1c

    
           fn add_reserved_peer(&self, peer: MultiaddrWithPeerId) -> Result<(), String> { 
        
           	let _ = self.cmd_tx.unbounded_send(NetworkServiceCommand::AddPeersToReservedSet { 
        
           		protocol: self.block_announce_protocol.clone(), 
        
           		peers: HashSet::from_iter([peer.concat().into()]), 
        
           	}); 
        
           	Ok(()) 
        
           }

This then can lead to addresses for reserved peers to never be dialed by the network backend as they are considered invalid.

This has been discovered by running the networking benchmarks:

polkadot-sdk/substrate/client/network/benches/notifications_protocol.rs

Lines 143 to 148 in e85be1c

    
           network_service1 
        
           	.add_reserved_peer(MultiaddrWithPeerId { 
        
           		multiaddr: listen_address2, 
        
           		peer_id: peer_id2, 
        
           	}) 
        
           	.unwrap();

Part of the cleanups for:

[ElasticScaling] Overarching tracking issue: Enable ElasticScaling on AHKusama and AHPolkadot #10425

Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>

dmitry-markin · 2026-02-16T16:30:10Z

substrate/client/network/src/config.rs

+		if matches!(addr.iter().last(), Some(multiaddr::Protocol::P2p(_))) {
+			addr.pop();
+		}


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.

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

AndreiEres

Not a networking expert but LGTM

AndreiEres · 2026-02-19T12:22:09Z

substrate/client/network/src/config.rs

-		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(_))) {


Maybe worth adding a comment why we do it

substrate/client/network/src/config.rs

Co-authored-by: Bastian Köcher <git@kchr.de>

bkchr · 2026-02-20T21:53:06Z

/cmd prdoc --audience node_dev --bump patch

…e_dev --bump patch'

This PR ensures that a `MultiaddrWithPeerId` will always remain valid after a concatenating process. The litep2p code will concatanate the provided multiaddr-with-peerID regardless if the address already contains a `p2p/..` prefix: https://github.com/paritytech/polkadot-sdk/blob/e85be1c07adedcc86554affa4f6af536c4a2efc1/substrate/client/network/src/litep2p/service.rs#L427-L434 This then can lead to addresses for reserved peers to never be dialed by the network backend as they are considered invalid. This has been discovered by running the networking benchmarks: https://github.com/paritytech/polkadot-sdk/blob/e85be1c07adedcc86554affa4f6af536c4a2efc1/substrate/client/network/benches/notifications_protocol.rs#L143-L148 Part of the cleanups for: - #10425 --------- Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com> (cherry picked from commit e30a412)

paritytech-release-backport-bot · 2026-02-22T20:37:38Z

Successfully created backport PR for stable2512:

[stable2512] Backport #11078 #11145

Backport #11078 into `stable2512` from lexnv. See the [documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md) on how to use this bot.  Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> Co-authored-by: Alexandru Vasile <60601340+lexnv@users.noreply.github.com> Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>

This PR ensures that a `MultiaddrWithPeerId` will always remain valid after a concatenating process. The litep2p code will concatanate the provided multiaddr-with-peerID regardless if the address already contains a `p2p/..` prefix: https://github.com/paritytech/polkadot-sdk/blob/e85be1c07adedcc86554affa4f6af536c4a2efc1/substrate/client/network/src/litep2p/service.rs#L427-L434 This then can lead to addresses for reserved peers to never be dialed by the network backend as they are considered invalid. This has been discovered by running the networking benchmarks: https://github.com/paritytech/polkadot-sdk/blob/e85be1c07adedcc86554affa4f6af536c4a2efc1/substrate/client/network/benches/notifications_protocol.rs#L143-L148 Part of the cleanups for: - #10425 --------- Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com> (cherry picked from commit e30a412)

paritytech-release-backport-bot · 2026-03-09T13:32:17Z

Successfully created backport PR for stable2506:

[stable2506] Backport #11078 #11310

paritytech-release-backport-bot · 2026-03-09T13:32:21Z

Backport failed for stable2512, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin stable2512
git worktree add -d .worktree/backport-11078-to-stable2512 origin/stable2512
cd .worktree/backport-11078-to-stable2512
git switch --create backport-11078-to-stable2512
git cherry-pick -x e30a412c6cd957afedbb3157dac9cf4b424b0fa6

Backport #11078 into `stable2506` from lexnv. See the [documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md) on how to use this bot.  Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> Co-authored-by: Alexandru Vasile <60601340+lexnv@users.noreply.github.com> Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Backport paritytech#11078 into `stable2512` from lexnv. See the [documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md) on how to use this bot.  Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> Co-authored-by: Alexandru Vasile <60601340+lexnv@users.noreply.github.com> Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>

net: Strip previous p2p prefix before concatenating addresses

e85be1c

Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>

lexnv self-assigned this Feb 16, 2026

lexnv added T0-node This PR/Issue is related to the topic “node”. A4-backport-stable2509 Pull request must be backported to the stable2509 release branch A4-backport-stable2512 Pull request must be backported to the stable2512 release branch labels Feb 16, 2026

Merge branch 'master' into lenxv/multiaddr-concat

d4ed260

lexnv requested review from AndreiEres and dmitry-markin February 16, 2026 12:35

dmitry-markin reviewed Feb 16, 2026

View reviewed changes

lexnv mentioned this pull request Feb 17, 2026

listen: Remove p2p prefix from the listen addresses paritytech/litep2p#536

Closed

AndreiEres approved these changes Feb 19, 2026

View reviewed changes

bkchr approved these changes Feb 20, 2026

View reviewed changes

substrate/client/network/src/config.rs Show resolved Hide resolved

Update substrate/client/network/src/config.rs

284f333

Co-authored-by: Bastian Köcher <git@kchr.de>

lexnv enabled auto-merge February 20, 2026 10:33

bkchr removed the A4-backport-stable2509 Pull request must be backported to the stable2509 release branch label Feb 20, 2026

skunert approved these changes Feb 20, 2026

View reviewed changes

Update from github-actions[bot] running command 'prdoc --audience nod…

f64d79c

…e_dev --bump patch'

lexnv added this pull request to the merge queue Feb 20, 2026

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Feb 20, 2026

bkchr added this pull request to the merge queue Feb 22, 2026

Merged via the queue into master with commit e30a412 Feb 22, 2026
242 of 245 checks passed

bkchr deleted the lenxv/multiaddr-concat branch February 22, 2026 20:37

paritytech-release-backport-bot bot mentioned this pull request Feb 22, 2026

[stable2512] Backport #11078 #11145

Merged

lexnv added the A4-backport-stable2506 Pull request must be backported to the stable2506 release branch label Mar 9, 2026

paritytech-release-backport-bot bot mentioned this pull request Mar 9, 2026

[stable2506] Backport #11078 #11310

Merged

lexnv mentioned this pull request Mar 13, 2026

[ElasticScaling] Overarching tracking issue: Enable ElasticScaling on AHKusama and AHPolkadot #10425

Closed

pgherveou added this to [preview] release tracker Mar 18, 2026

github-project-automation bot moved this to Done in [preview] release tracker Mar 18, 2026

pgherveou removed this from [preview] release tracker Mar 19, 2026

pgherveou added this to [preview] release tracker Mar 19, 2026

github-project-automation bot moved this to Done in [preview] release tracker Mar 19, 2026

pgherveou removed this from [preview] release tracker Mar 20, 2026

pgherveou added this to [preview] release tracker Mar 25, 2026

github-project-automation bot moved this to Todo in [preview] release tracker Mar 25, 2026

github-project-automation bot moved this from Todo to Done in [preview] release tracker Mar 25, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

net: Strip previous p2p prefix before concatenating addresses#11078

net: Strip previous p2p prefix before concatenating addresses#11078
bkchr merged 4 commits intomasterfrom
lenxv/multiaddr-concat

lexnv commented Feb 16, 2026

Uh oh!

dmitry-markin Feb 16, 2026 •

edited

Loading

Uh oh!

lexnv Feb 17, 2026

Uh oh!

AndreiEres left a comment

Uh oh!

AndreiEres Feb 19, 2026

Uh oh!

Uh oh!

bkchr commented Feb 20, 2026

Uh oh!

Uh oh!

Uh oh!

paritytech-release-backport-bot bot commented Feb 22, 2026

Uh oh!

paritytech-release-backport-bot bot commented Mar 9, 2026

Uh oh!

paritytech-release-backport-bot bot commented Mar 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

	fn add_reserved_peer(&self, peer: MultiaddrWithPeerId) -> Result<(), String> {
	let _ = self.cmd_tx.unbounded_send(NetworkServiceCommand::AddPeersToReservedSet {
	protocol: self.block_announce_protocol.clone(),
	peers: HashSet::from_iter([peer.concat().into()]),
	});

	Ok(())
	}

	network_service1
	.add_reserved_peer(MultiaddrWithPeerId {
	multiaddr: listen_address2,
	peer_id: peer_id2,
	})
	.unwrap();

Conversation

lexnv commented Feb 16, 2026

Uh oh!

dmitry-markin Feb 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lexnv Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

AndreiEres left a comment

Choose a reason for hiding this comment

Uh oh!

AndreiEres Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

bkchr commented Feb 20, 2026

Uh oh!

Uh oh!

Uh oh!

paritytech-release-backport-bot bot commented Feb 22, 2026

Uh oh!

paritytech-release-backport-bot bot commented Mar 9, 2026

Uh oh!

paritytech-release-backport-bot bot commented Mar 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

dmitry-markin Feb 16, 2026 •

edited

Loading