From 772ced80f7051778cc9d4f885d91276ca157e33f Mon Sep 17 00:00:00 2001
From: Dmitry Lavrenov <lawrenowdima@gmail.com>
Date: Wed, 13 Mar 2024 16:35:21 +0300
Subject: [PATCH] [substrate-apply] humanode-peer:service: Prepare sc-network
 for ProtocolController/NotificationService #14080

---
 Cargo.lock                              |  1 +
 crates/humanode-peer/Cargo.toml         |  1 +
 crates/humanode-peer/src/service/mod.rs | 13 ++++++-------
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cb3779c41..d7f93e3bc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3653,6 +3653,7 @@ dependencies = [
  "sc-consensus-babe",
  "sc-consensus-grandpa",
  "sc-executor",
+ "sc-network",
  "sc-service",
  "sc-telemetry",
  "sc-transaction-pool",
diff --git a/crates/humanode-peer/Cargo.toml b/crates/humanode-peer/Cargo.toml
index 345735024..1538df368 100644
--- a/crates/humanode-peer/Cargo.toml
+++ b/crates/humanode-peer/Cargo.toml
@@ -55,6 +55,7 @@ sc-consensus = { workspace = true }
 sc-consensus-babe = { workspace = true }
 sc-consensus-grandpa = { workspace = true }
 sc-executor = { workspace = true }
+sc-network = { workspace = true }
 sc-service = { workspace = true }
 sc-telemetry = { workspace = true }
 sc-transaction-pool = { workspace = true }
diff --git a/crates/humanode-peer/src/service/mod.rs b/crates/humanode-peer/src/service/mod.rs
index 31679b091..b9644c5e7 100644
--- a/crates/humanode-peer/src/service/mod.rs
+++ b/crates/humanode-peer/src/service/mod.rs
@@ -230,7 +230,7 @@ pub async fn new_full(config: Configuration) -> Result<TaskManager, ServiceError
             ),
     } = new_partial(&config)?;
     let Configuration {
-        substrate: mut config,
+        substrate: config,
         bioauth_flow: bioauth_flow_config,
         ethereum_rpc: ethereum_rpc_config,
         ..
@@ -245,12 +245,10 @@ pub async fn new_full(config: Configuration) -> Result<TaskManager, ServiceError
         &config.chain_spec,
     );
 
-    config
-        .network
-        .extra_sets
-        .push(sc_consensus_grandpa::grandpa_peers_set_config(
-            grandpa_protocol_name.clone(),
-        ));
+    let mut net_config = sc_network::config::FullNetworkConfiguration::new(&config.network);
+    net_config.add_notification_protocol(sc_consensus_grandpa::grandpa_peers_set_config(
+        grandpa_protocol_name.clone(),
+    ));
 
     let warp_sync = Arc::new(sc_consensus_grandpa::warp_proof::NetworkProvider::new(
         Arc::clone(&backend),
@@ -297,6 +295,7 @@ pub async fn new_full(config: Configuration) -> Result<TaskManager, ServiceError
     let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) =
         sc_service::build_network(sc_service::BuildNetworkParams {
             config: &config,
+            net_config,
             client: Arc::clone(&client),
             transaction_pool: Arc::clone(&transaction_pool),
             spawn_handle: task_manager.spawn_handle(),