From 1aa7c05a21e92a29cb0ca4c455eb0b17e70231ae Mon Sep 17 00:00:00 2001 From: Dmitry Markin Date: Mon, 20 Oct 2025 15:19:38 +0300 Subject: [PATCH 1/5] Upgrade litep2p 0.10.0 -> 0.11.0 --- Cargo.lock | 28 +++++++++---------- Cargo.toml | 2 +- .../client/network/src/litep2p/service.rs | 5 ++-- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6ee5718427628..e3a6b4f36deaa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7936,7 +7936,7 @@ dependencies = [ "ipnet", "once_cell", "rand 0.9.0", - "ring 0.17.8", + "ring 0.17.14", "thiserror 2.0.12", "tinyvec", "tokio", @@ -9690,7 +9690,7 @@ dependencies = [ "parking_lot 0.12.3", "quinn", "rand 0.8.5", - "ring 0.17.8", + "ring 0.17.14", "rustls 0.23.18", "socket2 0.5.9", "thiserror 1.0.65", @@ -9782,7 +9782,7 @@ dependencies = [ "libp2p-core", "libp2p-identity", "rcgen", - "ring 0.17.8", + "ring 0.17.14", "rustls 0.23.18", "rustls-webpki 0.101.4", "thiserror 1.0.65", @@ -10016,9 +10016,9 @@ checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "litep2p" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c666ef772d123a7643323ad4979c30dd825e9c68ec1aa5b387a6c9a9871c11ea" +checksum = "766f82624163f63b3df107fcdd014acb28fc9e4990d2a70e56dc454287fd4565" dependencies = [ "async-trait", "bs58", @@ -10039,6 +10039,7 @@ dependencies = [ "prost 0.13.5", "prost-build", "rand 0.8.5", + "ring 0.17.14", "serde", "sha2 0.10.9", "simple-dns", @@ -18246,7 +18247,7 @@ checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ "bytes", "rand 0.8.5", - "ring 0.17.8", + "ring 0.17.14", "rustc-hash 2.1.1", "rustls 0.23.18", "slab", @@ -18982,15 +18983,14 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.8" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", "getrandom 0.2.10", "libc", - "spin 0.9.8", "untrusted 0.9.0", "windows-sys 0.52.0", ] @@ -19507,7 +19507,7 @@ checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f" dependencies = [ "log", "once_cell", - "ring 0.17.8", + "ring 0.17.14", "rustls-pki-types", "rustls-webpki 0.102.8", "subtle 2.5.0", @@ -19620,7 +19620,7 @@ version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ - "ring 0.17.8", + "ring 0.17.14", "rustls-pki-types", "untrusted 0.9.0", ] @@ -22202,7 +22202,7 @@ dependencies = [ "chacha20poly1305", "curve25519-dalek", "rand_core 0.6.4", - "ring 0.17.8", + "ring 0.17.14", "rustc_version 0.4.0", "sha2 0.10.9", "subtle 2.5.0", @@ -25992,9 +25992,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", diff --git a/Cargo.toml b/Cargo.toml index ae44a6b191be1..0f1627f1c9021 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -908,7 +908,7 @@ linked-hash-map = { version = "0.5.4" } linked_hash_set = { version = "0.1.4" } linregress = { version = "0.5.1" } lite-json = { version = "0.2.0", default-features = false } -litep2p = { version = "0.10.0", features = ["websocket"] } +litep2p = { version = "0.11.0", features = ["rsa", "websocket"] } log = { version = "0.4.22", default-features = false } macro_magic = { version = "0.5.1" } maplit = { version = "1.0.2" } diff --git a/substrate/client/network/src/litep2p/service.rs b/substrate/client/network/src/litep2p/service.rs index c2a994d532956..307d071cd00cb 100644 --- a/substrate/client/network/src/litep2p/service.rs +++ b/substrate/client/network/src/litep2p/service.rs @@ -264,11 +264,12 @@ impl NetworkSigner for Litep2pNetworkService { signature: &Vec, message: &Vec, ) -> Result { - let public_key = litep2p::crypto::PublicKey::from_protobuf_encoding(&public_key) + let identity = litep2p::PeerId::from_public_key_protobuf(&public_key); + let public_key = litep2p::crypto::RemotePublicKey::from_protobuf_encoding(&public_key) .map_err(|error| error.to_string())?; let peer: litep2p::PeerId = peer.into(); - Ok(peer == public_key.to_peer_id() && public_key.verify(message, signature)) + Ok(peer == identity && public_key.verify(message, signature)) } } From 402f9bde5e016969b68e9bf7ae31df8ec21d6b8a Mon Sep 17 00:00:00 2001 From: "cmd[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 20 Oct 2025 12:36:09 +0000 Subject: [PATCH 2/5] Update from github-actions[bot] running command 'prdoc --audience node_dev --bump patch' --- prdoc/pr_10056.prdoc | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 prdoc/pr_10056.prdoc diff --git a/prdoc/pr_10056.prdoc b/prdoc/pr_10056.prdoc new file mode 100644 index 0000000000000..82cb9608f3b61 --- /dev/null +++ b/prdoc/pr_10056.prdoc @@ -0,0 +1,10 @@ +title: Upgrade litep2p 0.10.0 -> 0.11.0 +doc: +- audience: Node Dev + description: This upgrade fixes the initialization of mDNS in the environment with + no multicast addresses available and compatibility with kubo IPFS >= 0.37 when + run with `--ipfs-server`. It also enables communication with remote peers having + RSA network identity keys. +crates: +- name: sc-network + bump: patch From 045338d64cea7bc4c63890a6acdf16f11635449c Mon Sep 17 00:00:00 2001 From: Dmitry Markin Date: Mon, 20 Oct 2025 15:51:01 +0300 Subject: [PATCH 3/5] prdoc: patch -> major --- prdoc/pr_10056.prdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prdoc/pr_10056.prdoc b/prdoc/pr_10056.prdoc index 82cb9608f3b61..974e7b0f56195 100644 --- a/prdoc/pr_10056.prdoc +++ b/prdoc/pr_10056.prdoc @@ -7,4 +7,4 @@ doc: RSA network identity keys. crates: - name: sc-network - bump: patch + bump: major From df4ec27dd68d754212a11236bbb978ff62a6be23 Mon Sep 17 00:00:00 2001 From: Dmitry Markin Date: Mon, 20 Oct 2025 16:11:48 +0300 Subject: [PATCH 4/5] Update prdoc --- prdoc/pr_10056.prdoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/prdoc/pr_10056.prdoc b/prdoc/pr_10056.prdoc index 974e7b0f56195..76bb6dd149b83 100644 --- a/prdoc/pr_10056.prdoc +++ b/prdoc/pr_10056.prdoc @@ -8,3 +8,5 @@ doc: crates: - name: sc-network bump: major +- name: sc-network-types + bump: minor From 859b694fa4bd52f8915bb5a19ed1de56b4205d0d Mon Sep 17 00:00:00 2001 From: Dmitry Markin Date: Mon, 20 Oct 2025 16:21:21 +0300 Subject: [PATCH 5/5] minor: make semver check happy --- prdoc/pr_10056.prdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prdoc/pr_10056.prdoc b/prdoc/pr_10056.prdoc index 76bb6dd149b83..f46be95954b0c 100644 --- a/prdoc/pr_10056.prdoc +++ b/prdoc/pr_10056.prdoc @@ -9,4 +9,4 @@ crates: - name: sc-network bump: major - name: sc-network-types - bump: minor + bump: major