kad full support + migrate from gossipsub

Author: seun-ja

Cargo.lock

@@ -15,8 +15,8 @@ libp2p = { version = "0.55.0", features = [
     "quic",
     "request-response",
     "cbor",
-    "gossipsub",
     "kad",
+    "mdns",
 ] }
 
 # Serde
@@ -29,7 +29,6 @@ hex = "0.4.3"
 sha256 = "1.5.0"
 
 # Utils
-bytes = "1.10.1"
 chrono = "0.4.40"
 clap = { version = "4.5.28", features = ["derive"] }
 clap_derive = "4.5.32"

Cargo.toml

@@ -76,7 +76,7 @@ pub struct TransactionData {
 
 #[typetag::serde(tag = "type")]
 pub trait Transactable: Debug + Send + Sync + DynClone + Display {
-    // TODO: Implement the _submit method to submit the transaction to the network.
+    // TODO: #9 Implement the _submit method to submit the transaction to the network.
     fn _submit(&self) -> Result<(), TransactionError>;
     fn sign(&self, keypair: &Keypair) -> Result<(), TransactionError>;
 }

src/block/mod.rs

@@ -1,6 +1,5 @@
 use std::fmt::Display;
 
-use bytes::Bytes;
 use libp2p::identity::Keypair;
 use serde::{Deserialize, Serialize};
 
@@ -39,12 +38,6 @@ impl From<String> for Message {
     }
 }
 
-impl From<Message> for Bytes {
-    fn from(val: Message) -> Self {
-        Bytes::copy_from_slice(val.to_string().as_bytes())
-    }
-}
-
 impl Display for Message {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {

src/comms/message.rs

@@ -3,17 +3,14 @@ use std::{error::Error, net::Ipv4Addr, time::Duration};
 use clap::Parser as _;
 use libp2p::{
     Multiaddr, PeerId,
-    gossipsub::{self, AllowAllSubscriptionFilter, Config, IdentityTransform, MessageAuthenticity},
-    kad::{self, store::MemoryStore},
+    kad::{self, Mode, store::MemoryStore},
+    mdns,
     multiaddr::Protocol,
     noise, tcp, yamux,
 };
 use peer_node::{
     cli::Args,
-    network::{
-        behaviour::PeerBehavior,
-        event::{Topic, event_runner},
-    },
+    network::{behaviour::PeerBehavior, event::event_runner},
 };
 
 #[tokio::main]
@@ -39,46 +36,37 @@ async fn main() -> Result<(), Box<dyn Error>> {
             let store: MemoryStore = MemoryStore::new(peer_id);
             let kademlia: kad::Behaviour<MemoryStore> = kad::Behaviour::new(peer_id, store);
 
-            let gossipsub: gossipsub::Behaviour<IdentityTransform, AllowAllSubscriptionFilter> =
-                gossipsub::Behaviour::new(
-                    MessageAuthenticity::Signed(keypair.clone()),
-                    Config::default(),
-                )
-                .expect("Gossipsub initiation fails");
+            let mdns = mdns::tokio::Behaviour::new(mdns::Config::default(), peer_id)
+                .expect("mDNS initiation fails");
 
-            PeerBehavior {
-                kademlia,
-                gossipsub,
-            }
+            PeerBehavior { kademlia, mdns }
         })?
         .with_swarm_config(|cfg| cfg.with_idle_connection_timeout(Duration::from_secs(u64::MAX)))
         .build();
 
-    let topic = gossipsub::IdentTopic::new("peer-network");
-    swarm.behaviour_mut().gossipsub.subscribe(&topic)?;
+    // Roles to transition
+    match args.role {
+        peer_node::cli::Role::BootstapNode => {
+            swarm.behaviour_mut().kademlia.set_mode(Some(Mode::Server))
+        }
+        peer_node::cli::Role::Sender => swarm.behaviour_mut().kademlia.set_mode(Some(Mode::Client)),
+    }
 
     swarm.listen_on(peer_multi_addr)?;
 
-    let bootstrap_peer_id: Option<PeerId> = if let Some(bootstrap_peer_id) = args.bootstrap_peer_id
+    let _bootstrap_peer_id: Option<PeerId> = if let Some(bootstrap_peer_id) = args.bootstrap_peer_id
     {
         Some(bootstrap_peer_id.parse()?)
     } else {
         None
     };
 
-    let bootstrap_peer_mutli_address: Option<Multiaddr> =
+    let _bootstrap_peer_mutli_address: Option<Multiaddr> =
         if let Some(peer_mutli_address) = args.peer_mutli_address {
             Some(peer_mutli_address.parse()?)
         } else {
             None
         };
 
-    event_runner(
-        swarm,
-        args.role,
-        bootstrap_peer_mutli_address,
-        bootstrap_peer_id,
-        Topic(topic.to_string()),
-    )
-    .await
+    event_runner(swarm).await
 }

src/main.rs

@@ -1,12 +1,8 @@
 use libp2p::swarm::NetworkBehaviour;
-use libp2p::{gossipsub, kad};
+use libp2p::{kad, mdns};
 
 #[derive(NetworkBehaviour)]
 pub struct PeerBehavior {
     pub kademlia: kad::Behaviour<kad::store::MemoryStore>,
-    pub gossipsub: gossipsub::Behaviour,
-}
-
-pub struct PeerDht {
-    pub kademlia: kad::PeerRecord,
+    pub mdns: mdns::tokio::Behaviour,
 }