From b7012eda85b3a56d2e8d9f0106bcfcb873403f8d Mon Sep 17 00:00:00 2001 From: Dmitry Markin Date: Mon, 2 Mar 2026 16:13:16 +0200 Subject: [PATCH 1/4] BACKPORT-CONFLICT --- Cargo.lock | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index dc2c2e12704c5..f8bfb94bb897e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10054,7 +10054,58 @@ dependencies = [ "async-trait", "bs58", "bytes", +<<<<<<< HEAD "cid", +======= + "cid 0.11.1", + "ed25519-dalek", + "futures", + "futures-timer", + "hickory-resolver 0.25.2", + "indexmap 2.9.0", + "libc", + "mockall", + "multiaddr 0.17.1", + "multihash 0.17.0", + "network-interface", + "parking_lot 0.12.3", + "pin-project", + "prost 0.13.5", + "prost-build 0.13.2", + "rand 0.8.5", + "serde", + "sha2 0.10.9", + "simple-dns 0.9.3", + "smallvec", + "snow", + "socket2 0.5.9", + "thiserror 2.0.12", + "tokio", + "tokio-stream", + "tokio-tungstenite 0.27.0", + "tokio-util", + "tracing", + "uint 0.10.0", + "unsigned-varint 0.8.0", + "url", + "x25519-dalek", + "x509-parser 0.17.0", + "yamux 0.13.9", + "yasna", + "zeroize", +] + +[[package]] +name = "litep2p" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb34d4675b8eadc4a473c46b788439d34d30c247cd5f3f286162ee25e3c4f97" +dependencies = [ + "async-trait", + "bs58", + "bytes", + "cid 0.11.1", +>>>>>>> a5473371 (Upgrade litep2p v0.13.0 -> v0.13.2 (#11204)) "ed25519-dalek", "enum-display", "futures", @@ -20525,7 +20576,11 @@ dependencies = [ "ip_network", "libp2p", "linked_hash_set", +<<<<<<< HEAD "litep2p", +======= + "litep2p 0.13.2", +>>>>>>> a5473371 (Upgrade litep2p v0.13.0 -> v0.13.2 (#11204)) "log", "mockall", "multistream-select", @@ -20737,7 +20792,11 @@ dependencies = [ "ed25519-dalek", "libp2p-identity", "libp2p-kad", +<<<<<<< HEAD "litep2p", +======= + "litep2p 0.13.2", +>>>>>>> a5473371 (Upgrade litep2p v0.13.0 -> v0.13.2 (#11204)) "log", "multiaddr 0.18.1", "multihash 0.19.1", From 029e5cf504dc5a244f2c1ca050cff5f2b0f8cccf Mon Sep 17 00:00:00 2001 From: Alexandru Vasile Date: Wed, 11 Mar 2026 12:13:29 +0000 Subject: [PATCH 2/4] Update Cargo.lock Signed-off-by: Alexandru Vasile --- Cargo.lock | 59 ------------------------------------------------------ 1 file changed, 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f8bfb94bb897e..dc2c2e12704c5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10054,58 +10054,7 @@ dependencies = [ "async-trait", "bs58", "bytes", -<<<<<<< HEAD "cid", -======= - "cid 0.11.1", - "ed25519-dalek", - "futures", - "futures-timer", - "hickory-resolver 0.25.2", - "indexmap 2.9.0", - "libc", - "mockall", - "multiaddr 0.17.1", - "multihash 0.17.0", - "network-interface", - "parking_lot 0.12.3", - "pin-project", - "prost 0.13.5", - "prost-build 0.13.2", - "rand 0.8.5", - "serde", - "sha2 0.10.9", - "simple-dns 0.9.3", - "smallvec", - "snow", - "socket2 0.5.9", - "thiserror 2.0.12", - "tokio", - "tokio-stream", - "tokio-tungstenite 0.27.0", - "tokio-util", - "tracing", - "uint 0.10.0", - "unsigned-varint 0.8.0", - "url", - "x25519-dalek", - "x509-parser 0.17.0", - "yamux 0.13.9", - "yasna", - "zeroize", -] - -[[package]] -name = "litep2p" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb34d4675b8eadc4a473c46b788439d34d30c247cd5f3f286162ee25e3c4f97" -dependencies = [ - "async-trait", - "bs58", - "bytes", - "cid 0.11.1", ->>>>>>> a5473371 (Upgrade litep2p v0.13.0 -> v0.13.2 (#11204)) "ed25519-dalek", "enum-display", "futures", @@ -20576,11 +20525,7 @@ dependencies = [ "ip_network", "libp2p", "linked_hash_set", -<<<<<<< HEAD "litep2p", -======= - "litep2p 0.13.2", ->>>>>>> a5473371 (Upgrade litep2p v0.13.0 -> v0.13.2 (#11204)) "log", "mockall", "multistream-select", @@ -20792,11 +20737,7 @@ dependencies = [ "ed25519-dalek", "libp2p-identity", "libp2p-kad", -<<<<<<< HEAD "litep2p", -======= - "litep2p 0.13.2", ->>>>>>> a5473371 (Upgrade litep2p v0.13.0 -> v0.13.2 (#11204)) "log", "multiaddr 0.18.1", "multihash 0.19.1", From 59a3eeb3aaa5c48f07fcd765be7a598517249a29 Mon Sep 17 00:00:00 2001 From: Alexandru Vasile Date: Wed, 11 Mar 2026 12:14:13 +0000 Subject: [PATCH 3/4] Update litep2p to latest 0.13.3 Signed-off-by: Alexandru Vasile --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 33789c7849e42..6651ddf738af4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -910,7 +910,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.13.2", features = ["rsa", "websocket"] } +litep2p = { version = "0.13.3", features = ["rsa", "websocket"] } log = { version = "0.4.22", default-features = false } macro_magic = { version = "0.5.1" } maplit = { version = "1.0.2" } From 01dfa8de8a0f5ffede04897a28522eaa87355932 Mon Sep 17 00:00:00 2001 From: Alexandru Vasile Date: Wed, 11 Mar 2026 12:14:20 +0000 Subject: [PATCH 4/4] Update cargo lock Signed-off-by: Alexandru Vasile --- Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dc2c2e12704c5..c4cbee0667b22 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9870,7 +9870,7 @@ dependencies = [ "thiserror 1.0.65", "tracing", "yamux 0.12.1", - "yamux 0.13.9", + "yamux 0.13.10", ] [[package]] @@ -10047,9 +10047,9 @@ checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "litep2p" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb34d4675b8eadc4a473c46b788439d34d30c247cd5f3f286162ee25e3c4f97" +checksum = "cbf3924cf539a761465543592b34c4198d60db2cda16594769edd43451e5ab41" dependencies = [ "async-trait", "bs58", @@ -10090,7 +10090,7 @@ dependencies = [ "url", "x25519-dalek", "x509-parser 0.17.0", - "yamux 0.13.9", + "yamux 0.13.10", "yasna", "zeroize", ] @@ -28514,9 +28514,9 @@ dependencies = [ [[package]] name = "yamux" -version = "0.13.9" +version = "0.13.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c650efd29044140aa63caaf80129996a9e2659a2ab7045a7e061807d02fc8549" +checksum = "1991f6690292030e31b0144d73f5e8368936c58e45e7068254f7138b23b00672" dependencies = [ "futures", "log",