From 2315b3c79b4a34ffce110545c838d267e101dd66 Mon Sep 17 00:00:00 2001
From: Luke Parker <lukeparker5132@gmail.com>
Date: Thu, 3 Nov 2022 00:20:50 -0400
Subject: [PATCH] Localize the LibP2P protocol to the blockchain

Follows convention by doing so. Theoretically enables running multiple
blockchains over a single LibP2P connection.
---
 Cargo.lock                             |  2 ++
 substrate/node/src/service.rs          | 11 ++++-------
 substrate/tendermint/client/Cargo.toml |  2 ++
 substrate/tendermint/client/src/lib.rs | 25 ++++++++++++++++++++++---
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d5adcdbf..35225434 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7327,12 +7327,14 @@ version = "0.1.0"
 dependencies = [
  "async-trait",
  "futures",
+ "hex",
  "log",
  "sc-block-builder",
  "sc-client-api",
  "sc-consensus",
  "sc-executor",
  "sc-network",
+ "sc-network-common",
  "sc-network-gossip",
  "sc-service",
  "sc-transaction-pool",
diff --git a/substrate/node/src/service.rs b/substrate/node/src/service.rs
index c3d570db..7d768fab 100644
--- a/substrate/node/src/service.rs
+++ b/substrate/node/src/service.rs
@@ -168,13 +168,10 @@ pub async fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceE
   ) = new_partial(&config)?;
 
   if config.role.is_authority() {
-    // Block size + 1 KiB
-    let mut cfg = sc_service::config::NonDefaultSetConfig::new(
-      sc_tendermint::PROTOCOL_NAME.into(),
-      (1024 * 1024) + 1024,
-    );
-    cfg.allow_non_reserved(25, 25);
-    config.network.extra_sets.push(cfg);
+    config.network.extra_sets.push(sc_tendermint::set_config(
+      client.block_hash(0).unwrap().unwrap(),
+      config.chain_spec.fork_id(),
+    ));
   }
 
   let (network, system_rpc_tx, tx_handler_controller, network_starter) =
diff --git a/substrate/tendermint/client/Cargo.toml b/substrate/tendermint/client/Cargo.toml
index 80215310..f20b2279 100644
--- a/substrate/tendermint/client/Cargo.toml
+++ b/substrate/tendermint/client/Cargo.toml
@@ -15,6 +15,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 [dependencies]
 async-trait = "0.1"
 
+hex = "0.4"
 log = "0.4"
 
 futures = "0.3"
@@ -34,6 +35,7 @@ sp-tendermint = { path = "../primitives" }
 
 sc-transaction-pool = { git = "https://github.com/serai-dex/substrate" }
 sc-executor = { git = "https://github.com/serai-dex/substrate" }
+sc-network-common = { git = "https://github.com/serai-dex/substrate" }
 sc-network = { git = "https://github.com/serai-dex/substrate" }
 sc-network-gossip = { git = "https://github.com/serai-dex/substrate" }
 sc-service = { git = "https://github.com/serai-dex/substrate" }
diff --git a/substrate/tendermint/client/src/lib.rs b/substrate/tendermint/client/src/lib.rs
index 5a9e1fdd..63b563e0 100644
--- a/substrate/tendermint/client/src/lib.rs
+++ b/substrate/tendermint/client/src/lib.rs
@@ -10,7 +10,9 @@ use sp_consensus::{Error, Environment};
 use sc_client_api::{BlockBackend, Backend, Finalizer};
 use sc_block_builder::BlockBuilderApi;
 use sc_consensus::{BlockImport, BasicQueue};
-use sc_network::NetworkBlock;
+
+use sc_network_common::config::NonDefaultSetConfig;
+use sc_network::{ProtocolName, NetworkBlock};
 use sc_network_gossip::Network;
 
 use sp_tendermint::TendermintApi;
@@ -29,8 +31,25 @@ pub(crate) mod authority;
 pub use authority::TendermintAuthority;
 
 pub const CONSENSUS_ID: [u8; 4] = *b"tend";
-pub const KEY_TYPE_ID: KeyTypeId = KeyTypeId(CONSENSUS_ID);
-pub const PROTOCOL_NAME: &str = "/serai/tendermint/1";
+pub(crate) const KEY_TYPE_ID: KeyTypeId = KeyTypeId(CONSENSUS_ID);
+
+const PROTOCOL_NAME: &str = "/tendermint/1";
+
+fn protocol_name<Hash: AsRef<[u8]>>(genesis: Hash, fork: Option<&str>) -> ProtocolName {
+  let mut name = format!("/{}", hex::encode(genesis.as_ref()));
+  if let Some(fork) = fork {
+    name += &format!("/{}", fork);
+  }
+  name += PROTOCOL_NAME;
+  name.into()
+}
+
+pub fn set_config<Hash: AsRef<[u8]>>(genesis: Hash, fork: Option<&str>) -> NonDefaultSetConfig {
+  // TODO: 1 MiB Block Size + 1 KiB
+  let mut cfg = NonDefaultSetConfig::new(protocol_name(genesis, fork), (1024 * 1024) + 1024);
+  cfg.allow_non_reserved(25, 25);
+  cfg
+}
 
 /// Trait consolidating all generics required by sc_tendermint for processing.
 pub trait TendermintClient: Send + Sync + 'static {