Merge pull request #1 from comit-network/make-it-work-with-asb-and-cli

Author: thomaseizinger

Cargo.lock

@@ -7,6 +7,6 @@ edition = "2018"
 [dependencies]
 anyhow = "1"
 futures = { version = "0.3", default-features = false }
-libp2p = { git = "https://github.com/comit-network/rust-libp2p.git", rev = "96002105b0a7019330413826a332b3a12a7e8a57", default-features = false, features = [ "rendezvous", "tcp-tokio", "yamux", "mplex", "dns-tokio", "noise", "identify" ] }
+libp2p = { git = "https://github.com/comit-network/rust-libp2p.git", rev = "4cacaf215b334d447faca8f4e361fe19c30d2162", default-features = false, features = [ "rendezvous", "tcp-tokio", "yamux", "mplex", "dns-tokio", "noise", "ping" ] }
 structopt = { version = "0.3", default-features = false }
 tokio = { version = "1", features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs", "net" ] }

Cargo.toml

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use libp2p::dns::TokioDnsConfig;
 use libp2p::futures::StreamExt;
-use libp2p::rendezvous::{Config, Rendezvous};
+use libp2p::rendezvous::{Config, Namespace, Rendezvous};
 use libp2p::swarm::{SwarmBuilder, SwarmEvent};
 use libp2p::tcp::TokioTcpConfig;
 use libp2p::{identity, rendezvous, Multiaddr, PeerId, Transport};
@@ -54,7 +54,7 @@ async fn main() -> Result<()> {
                 );
 
                 swarm.behaviour_mut().discover(
-                    Some(cli.namespace.to_string()),
+                    Some(Namespace::new(cli.namespace.clone())?),
                     None,
                     None,
                     rendezvous_point,

examples/discover.rs

@@ -2,9 +2,8 @@ use anyhow::Result;
 use libp2p::core::identity::ed25519::SecretKey;
 use libp2p::dns::TokioDnsConfig;
 use libp2p::futures::StreamExt;
-use libp2p::identify::{Identify, IdentifyConfig, IdentifyEvent};
-use libp2p::rendezvous::{Config, Rendezvous};
-use libp2p::swarm::{SwarmBuilder, SwarmEvent};
+use libp2p::rendezvous::{Config, Namespace, Rendezvous};
+use libp2p::swarm::{AddressScore, SwarmBuilder, SwarmEvent};
 use libp2p::tcp::TokioTcpConfig;
 use libp2p::{identity, rendezvous, Multiaddr, PeerId, Transport};
 use rendezvous_server::transport::authenticate_and_multiplex;
@@ -17,9 +16,14 @@ struct Cli {
     pub rendezvous_peer_id: PeerId,
     #[structopt(long = "rendezvous-addr")]
     pub rendezvous_addr: Multiaddr,
+    #[structopt(
+        long = "external-addr",
+        help = "A public facing address is registered with the rendezvous server"
+    )]
+    pub external_addr: Multiaddr,
     #[structopt(long = "secret-key", parse(try_from_str = parse_secret_key))]
     pub secret_key: SecretKey,
-    #[structopt(long = "port")]
+    #[structopt(long = "port", help = "Listen port")]
     pub port: u16,
 }
 
@@ -36,16 +40,11 @@ async fn main() -> Result<()> {
 
     let transport = authenticate_and_multiplex(tcp_with_dns.boxed(), &identity).unwrap();
 
-    let identify = Identify::new(IdentifyConfig::new(
-        "rendezvous/1.0.0".to_string(),
-        identity.public(),
-    ));
-
     let rendezvous = Rendezvous::new(identity.clone(), Config::default());
 
     let peer_id = PeerId::from(identity.public());
 
-    let mut swarm = SwarmBuilder::new(transport, Behaviour::new(identify, rendezvous), peer_id)
+    let mut swarm = SwarmBuilder::new(transport, Behaviour::new(rendezvous), peer_id)
         .executor(Box::new(|f| {
             tokio::spawn(f);
         }))
@@ -55,6 +54,8 @@ async fn main() -> Result<()> {
 
     let _ = swarm.listen_on(format!("/ip4/0.0.0.0/tcp/{}", cli.port).parse().unwrap());
 
+    let _ = swarm.add_external_address(cli.external_addr, AddressScore::Infinite);
+
     swarm.dial_addr(rendezvous_point_address).unwrap();
 
     while let Some(event) = swarm.next().await {
@@ -69,13 +70,14 @@ async fn main() -> Result<()> {
             } if peer_id == rendezvous_point => {
                 println!("Lost connection to rendezvous point {}", error);
             }
-            // once `/identify` did its job, we know our external address and can register
-            SwarmEvent::Behaviour(Event::Identify(IdentifyEvent::Received { .. })) => {
-                swarm
-                    .behaviour_mut()
-                    .rendezvous
-                    .register("rendezvous".to_string(), rendezvous_point, None)
-                    .unwrap();
+            SwarmEvent::ConnectionEstablished { peer_id, .. } => {
+                if peer_id == cli.rendezvous_peer_id {
+                    swarm.behaviour_mut().rendezvous.register(
+                        Namespace::new("rendezvous".to_string())?,
+                        rendezvous_point,
+                        None,
+                    );
+                }
             }
             SwarmEvent::Behaviour(Event::Rendezvous(rendezvous::Event::Registered {
                 namespace,

examples/register_once.rs

@@ -2,13 +2,12 @@ use anyhow::Result;
 use libp2p::core::identity::ed25519::SecretKey;
 use libp2p::dns::TokioDnsConfig;
 use libp2p::futures::StreamExt;
-use libp2p::identify::{Identify, IdentifyConfig};
 use libp2p::rendezvous::{Config, Rendezvous};
-use libp2p::swarm::SwarmBuilder;
+use libp2p::swarm::{SwarmBuilder, SwarmEvent};
 use libp2p::tcp::TokioTcpConfig;
 use libp2p::{identity, PeerId, Transport};
 use rendezvous_server::transport::authenticate_and_multiplex;
-use rendezvous_server::{parse_secret_key, Behaviour};
+use rendezvous_server::{parse_secret_key, Behaviour, Event};
 use structopt::StructOpt;
 
 #[derive(Debug, StructOpt)]
@@ -29,15 +28,11 @@ async fn main() -> Result<()> {
 
     let transport = authenticate_and_multiplex(tcp_with_dns.boxed(), &identity).unwrap();
 
-    let identify = Identify::new(IdentifyConfig::new(
-        "rendezvous/1.0.0".to_string(),
-        identity.public(),
-    ));
     let rendezvous = Rendezvous::new(identity.clone(), Config::default());
 
     let peer_id = PeerId::from(identity.public());
 
-    let mut swarm = SwarmBuilder::new(transport, Behaviour::new(identify, rendezvous), peer_id)
+    let mut swarm = SwarmBuilder::new(transport, Behaviour::new(rendezvous), peer_id)
         .executor(Box::new(|f| {
             tokio::spawn(f);
         }))
@@ -51,6 +46,12 @@ async fn main() -> Result<()> {
 
     loop {
         let event = swarm.next().await;
-        println!("swarm event: {:?}", event);
+
+        if let Some(event) = event {
+            match event {
+                SwarmEvent::Behaviour(Event::Ping(_)) => {}
+                event => println!("swarm event: {:?}", event),
+            }
+        }
     }
 }

src/bin/rendezvous_server.rs

@@ -1,8 +1,9 @@
 use anyhow::Result;
 use libp2p::core::identity::ed25519::SecretKey;
-use libp2p::identify::{Identify, IdentifyEvent};
+use libp2p::ping::{Ping, PingConfig, PingEvent};
 use libp2p::rendezvous::Rendezvous;
 use libp2p::{rendezvous, NetworkBehaviour};
+use std::time::Duration;
 
 pub mod transport;
 
@@ -15,7 +16,7 @@ pub fn parse_secret_key(s: &str) -> Result<SecretKey> {
 #[derive(Debug)]
 pub enum Event {
     Rendezvous(rendezvous::Event),
-    Identify(IdentifyEvent),
+    Ping(PingEvent),
 }
 
 impl From<rendezvous::Event> for Event {
@@ -24,24 +25,30 @@ impl From<rendezvous::Event> for Event {
     }
 }
 
-impl From<IdentifyEvent> for Event {
-    fn from(event: IdentifyEvent) -> Self {
-        Event::Identify(event)
+impl From<PingEvent> for Event {
+    fn from(event: PingEvent) -> Self {
+        Event::Ping(event)
     }
 }
 
 #[derive(NetworkBehaviour)]
 #[behaviour(event_process = false)]
 #[behaviour(out_event = "Event")]
 pub struct Behaviour {
-    identify: Identify,
+    ping: Ping,
     pub rendezvous: Rendezvous,
 }
 
 impl Behaviour {
-    pub fn new(identify: Identify, rendezvous: Rendezvous) -> Self {
+    pub fn new(rendezvous: Rendezvous) -> Self {
         Self {
-            identify,
+            // TODO: Remove Ping behaviour once https://github.com/libp2p/rust-libp2p/issues/2109 is fixed
+            // interval for sending Ping set to 24 hours
+            ping: Ping::new(
+                PingConfig::new()
+                    .with_keep_alive(false)
+                    .with_interval(Duration::from_secs(86_400)),
+            ),
             rendezvous,
         }
     }