Merge pull request #2029 from eqlabs/chris/protocol-names2

feat: update kad and indentify protocol names
eqlabs · May 22, 2024 · 9332125 · 9332125
2 parents 69cd7c3 + 680ebd3
commit 9332125
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/crates/common/src/lib.rs b/crates/common/src/lib.rs
@@ -413,10 +413,19 @@ impl ChainId {
         })
     }
 
+    /// A hex string representation, eg.: `"0x534e5f4d41494e"` stands for
+    /// Mainnet (`SN_MAIN`)
     pub fn to_hex_str(&self) -> std::borrow::Cow<'static, str> {
         self.0.to_hex_str()
     }
 
+    /// A human readable representation, eg.: `"SN_MAIN"` stands for Mainnet
+    pub fn as_str(&self) -> &str {
+        std::str::from_utf8(self.0.as_be_bytes())
+            .expect("valid utf8")
+            .trim_start_matches(|c| c == '\0')
+    }
+
     pub const MAINNET: Self = Self::from_slice_unwrap(b"SN_MAIN");
     pub const SEPOLIA_TESTNET: Self = Self::from_slice_unwrap(b"SN_SEPOLIA");
     pub const SEPOLIA_INTEGRATION: Self = Self::from_slice_unwrap(b"SN_INTEGRATION_SEPOLIA");

diff --git a/crates/p2p/src/behaviour.rs b/crates/p2p/src/behaviour.rs
@@ -36,12 +36,8 @@ use crate::secret::Secret;
 use crate::sync::codec;
 use crate::Config;
 
-// TODO
-pub const IDENTIFY_PROTOCOL_NAME: &str = "/starknet/id/1.0.0";
-
-// TODO
 pub fn kademlia_protocol_name(chain_id: ChainId) -> String {
-    format!("/starknet/kad/{}/1.0.0", chain_id.to_hex_str())
+    format!("/starknet/kad/{}/1.0.0", chain_id.as_str())
 }
 
 pub struct Behaviour {
@@ -498,7 +494,7 @@ impl Behaviour {
                     ping: ping::Behaviour::new(ping::Config::new()),
                     identify: identify::Behaviour::new(
                         identify::Config::new(
-                            IDENTIFY_PROTOCOL_NAME.to_string(),
+                            identify::PROTOCOL_NAME.to_string(),
                             identity.public(),
                         )
                         .with_agent_version(format!("pathfinder/{}", env!("CARGO_PKG_VERSION"))),

diff --git a/crates/p2p/src/bin/bootstrap/behaviour.rs b/crates/p2p/src/bin/bootstrap/behaviour.rs
@@ -4,7 +4,7 @@ use libp2p::kad::store::MemoryStore;
 use libp2p::kad::{self};
 use libp2p::swarm::NetworkBehaviour;
 use libp2p::{autonat, dcutr, identify, identity, ping, relay, StreamProtocol};
-use p2p::{kademlia_protocol_name, IDENTIFY_PROTOCOL_NAME};
+use p2p::kademlia_protocol_name;
 use pathfinder_common::ChainId;
 
 #[derive(NetworkBehaviour)]
@@ -47,7 +47,7 @@ impl BootstrapBehaviour {
             dcutr: dcutr::Behaviour::new(peer_id),
             ping: ping::Behaviour::new(ping::Config::new()),
             identify: identify::Behaviour::new(
-                identify::Config::new(IDENTIFY_PROTOCOL_NAME.to_string(), pub_key)
+                identify::Config::new(identify::PROTOCOL_NAME.to_string(), pub_key)
                     .with_agent_version(format!("pathfinder/{}", env!("CARGO_PKG_VERSION"))),
             ),
             kademlia,

diff --git a/crates/p2p/src/lib.rs b/crates/p2p/src/lib.rs
@@ -30,7 +30,7 @@ mod test_utils;
 mod tests;
 mod transport;
 
-pub use behaviour::{kademlia_protocol_name, IDENTIFY_PROTOCOL_NAME};
+pub use behaviour::kademlia_protocol_name;
 pub use client::peer_agnostic::PeerData;
 use client::peer_aware::Client;
 pub use libp2p;