From 9f0e8f044aec599206bc73871c11397425ec8611 Mon Sep 17 00:00:00 2001
From: Alexandru Vasile <60601340+lexnv@users.noreply.github.com>
Date: Fri, 15 Nov 2024 12:03:24 +0200
Subject: [PATCH]  BACKPORT-CONFLICT

---
 Cargo.lock                                  | 30 +++++++++++++++++++++
 Cargo.toml                                  |  5 ++++
 prdoc/pr_6484.prdoc                         | 10 +++++++
 substrate/client/network/src/litep2p/mod.rs |  8 +++++-
 4 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 prdoc/pr_6484.prdoc

diff --git a/Cargo.lock b/Cargo.lock
index 7968ba6bff24..45346aa2a0c4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8156,9 +8156,15 @@ dependencies = [
 
 [[package]]
 name = "litep2p"
+<<<<<<< HEAD
 version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f46c51c205264b834ceed95c8b195026e700494bc3991aaba3b4ea9e20626d9"
+=======
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b67484b8ac41e1cfdf012f65fa81e88c2ef5f8a7d6dec0e2678c2d06dc04530"
+>>>>>>> 8bea091 (network/litep2p: Update litep2p network backend to version 0.8.1 (#6484))
 dependencies = [
  "async-trait",
  "bs58 0.4.0",
@@ -15375,7 +15381,11 @@ checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1"
 dependencies = [
  "bytes",
  "heck 0.5.0",
+<<<<<<< HEAD
  "itertools 0.11.0",
+=======
+ "itertools 0.13.0",
+>>>>>>> 8bea091 (network/litep2p: Update litep2p network backend to version 0.8.1 (#6484))
  "log",
  "multimap",
  "once_cell",
@@ -15408,10 +15418,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
 dependencies = [
  "anyhow",
+<<<<<<< HEAD
  "itertools 0.11.0",
  "proc-macro2 1.0.82",
  "quote 1.0.35",
  "syn 2.0.61",
+=======
+ "itertools 0.12.1",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac"
+dependencies = [
+ "anyhow",
+ "itertools 0.13.0",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.87",
+>>>>>>> 8bea091 (network/litep2p: Update litep2p network backend to version 0.8.1 (#6484))
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index e5547b8a3e94..0bf012e07a35 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -815,8 +815,13 @@ 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 }
+<<<<<<< HEAD
 litep2p = { version = "0.6.2" }
 log = { version = "0.4.21", default-features = false }
+=======
+litep2p = { version = "0.8.1", features = ["websocket"] }
+log = { version = "0.4.22", default-features = false }
+>>>>>>> 8bea091 (network/litep2p: Update litep2p network backend to version 0.8.1 (#6484))
 macro_magic = { version = "0.5.1" }
 maplit = { version = "1.0.2" }
 memmap2 = { version = "0.9.3" }
diff --git a/prdoc/pr_6484.prdoc b/prdoc/pr_6484.prdoc
new file mode 100644
index 000000000000..c212692e6ab4
--- /dev/null
+++ b/prdoc/pr_6484.prdoc
@@ -0,0 +1,10 @@
+title: Update litep2p network backend to version 0.8.1
+
+doc:
+  - audience: [ Node Dev, Node Operator ]
+    description: |
+      Release 0.8.1 of litep2p includes critical fixes to further enhance the stability and performance of the litep2p network backend.
+
+crates:
+  - name: sc-network
+    bump: patch
diff --git a/substrate/client/network/src/litep2p/mod.rs b/substrate/client/network/src/litep2p/mod.rs
index 34ca5b716101..40ff5f693a5a 100644
--- a/substrate/client/network/src/litep2p/mod.rs
+++ b/substrate/client/network/src/litep2p/mod.rs
@@ -1017,7 +1017,13 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkBackend<B, H> for Litep2pNetworkBac
 							metrics.pending_connections_errors_total.with_label_values(&[reason]).inc();
 						}
 					}
-					_ => {}
+					None => {
+						log::error!(
+								target: LOG_TARGET,
+								"Litep2p backend terminated"
+						);
+						return
+					}
 				},
 			}
 		}