Gossipsub message signing

examples/gossipsub-chat.rs

@@ -50,15 +50,15 @@ use async_std::{io, task};
 use env_logger::{Builder, Env};
 use futures::prelude::*;
 use libp2p::gossipsub::protocol::MessageId;
-use libp2p::gossipsub::{GossipsubEvent, GossipsubMessage, Topic};
-use libp2p::{
-    gossipsub, identity,
-    PeerId,
-};
+use libp2p::gossipsub::{GossipsubEvent, GossipsubMessage, MessageAuthenticity, Topic};
+use libp2p::{gossipsub, identity, PeerId};
 use std::collections::hash_map::DefaultHasher;
 use std::hash::{Hash, Hasher};
 use std::time::Duration;
-use std::{error::Error, task::{Context, Poll}};
+use std::{
+    error::Error,
+    task::{Context, Poll},
+};
 
 fn main() -> Result<(), Box<dyn Error>> {
     Builder::from_env(Env::default().default_filter_or("info")).init();
@@ -69,7 +69,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     println!("Local peer id: {:?}", local_peer_id);
 
     // Set up an encrypted TCP Transport over the Mplex and Yamux protocols
-    let transport = libp2p::build_development_transport(local_key)?;
+    let transport = libp2p::build_development_transport(local_key.clone())?;
 
     // Create a Gossipsub topic
     let topic = Topic::new("test-net".into());
@@ -83,7 +83,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         let message_id_fn = |message: &GossipsubMessage| {
             let mut s = DefaultHasher::new();
             message.data.hash(&mut s);
-            MessageId(s.finish().to_string())
+            MessageId::from(s.finish().to_string())
         };
 
         // set custom gossipsub
@@ -93,7 +93,8 @@ fn main() -> Result<(), Box<dyn Error>> {
             //same content will be propagated.
             .build();
         // build a gossipsub network behaviour
-        let mut gossipsub = gossipsub::Gossipsub::new(local_peer_id.clone(), gossipsub_config);
+        let mut gossipsub =
+            gossipsub::Gossipsub::new(MessageAuthenticity::Signed(local_key), gossipsub_config);
         gossipsub.subscribe(topic.clone());
         libp2p::Swarm::new(transport, gossipsub, local_peer_id)
     };
@@ -120,11 +121,13 @@ fn main() -> Result<(), Box<dyn Error>> {
     let mut listening = false;
     task::block_on(future::poll_fn(move |cx: &mut Context<'_>| {
         loop {
-            match stdin.try_poll_next_unpin(cx)? {
+            if let Err(e) = match stdin.try_poll_next_unpin(cx)? {
                 Poll::Ready(Some(line)) => swarm.publish(&topic, line.as_bytes()),
                 Poll::Ready(None) => panic!("Stdin closed"),
                 Poll::Pending => break,
-            };
+            } {
+                println!("Publish error: {:?}", e);
+            }
         }
 
         loop {

examples/ipfs-private.rs

@@ -35,7 +35,7 @@ use async_std::{io, task};
 use futures::{future, prelude::*};
 use libp2p::{
     core::{either::EitherTransport, transport::upgrade::Version, StreamMuxer},
-    gossipsub::{self, Gossipsub, GossipsubConfigBuilder, GossipsubEvent},
+    gossipsub::{self, Gossipsub, GossipsubConfigBuilder, GossipsubEvent, MessageAuthenticity},
     identify::{Identify, IdentifyEvent},
     identity,
     multiaddr::Protocol,
@@ -178,18 +178,14 @@ fn main() -> Result<(), Box<dyn Error>> {
         ping: Ping,
     }
 
-    impl NetworkBehaviourEventProcess<IdentifyEvent>
-        for MyBehaviour
-    {
+    impl NetworkBehaviourEventProcess<IdentifyEvent> for MyBehaviour {
         // Called when `identify` produces an event.
         fn inject_event(&mut self, event: IdentifyEvent) {
             println!("identify: {:?}", event);
         }
     }
 
-    impl NetworkBehaviourEventProcess<GossipsubEvent>
-        for MyBehaviour
-    {
+    impl NetworkBehaviourEventProcess<GossipsubEvent> for MyBehaviour {
         // Called when `gossipsub` produces an event.
         fn inject_event(&mut self, event: GossipsubEvent) {
             match event {
@@ -204,9 +200,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         }
     }
 
-    impl NetworkBehaviourEventProcess<PingEvent>
-        for MyBehaviour
-    {
+    impl NetworkBehaviourEventProcess<PingEvent> for MyBehaviour {
         // Called when `ping` produces an event.
         fn inject_event(&mut self, event: PingEvent) {
             use ping::handler::{PingFailure, PingSuccess};
@@ -245,11 +239,11 @@ fn main() -> Result<(), Box<dyn Error>> {
 
     // Create a Swarm to manage peers and events
     let mut swarm = {
-        let gossipsub_config = GossipsubConfigBuilder::default()
+        let gossipsub_config = GossipsubConfigBuilder::new()
             .max_transmit_size(262144)
             .build();
         let mut behaviour = MyBehaviour {
-            gossipsub: Gossipsub::new(local_peer_id.clone(), gossipsub_config),
+            gossipsub: Gossipsub::new(MessageAuthenticity::Signed(local_key.clone()), gossipsub_config),
             identify: Identify::new(
                 "/ipfs/0.1.0".into(),
                 "rust-ipfs-example".into(),
@@ -280,12 +274,14 @@ fn main() -> Result<(), Box<dyn Error>> {
     let mut listening = false;
     task::block_on(future::poll_fn(move |cx: &mut Context<'_>| {
         loop {
-            match stdin.try_poll_next_unpin(cx)? {
+            if let Err(e) = match stdin.try_poll_next_unpin(cx)? {
                 Poll::Ready(Some(line)) => {
-                    swarm.gossipsub.publish(&gossipsub_topic, line.as_bytes());
+                    swarm.gossipsub.publish(&gossipsub_topic, line.as_bytes())
                 }
                 Poll::Ready(None) => panic!("Stdin closed"),
                 Poll::Pending => break,
+            } {
+                println!("Publish error: {:?}", e);
             }
         }
         loop {

protocols/gossipsub/Cargo.toml

@@ -23,16 +23,18 @@ unsigned-varint = { version = "0.4.0", features = ["futures-codec"] }
 log = "0.4.8"
 sha2 = "0.8.1"
 base64 = "0.11.0"
-lru = "0.4.3"
 smallvec = "1.1.0"
 prost = "0.6.1"
+hex_fmt = "0.3.0"
+lru_time_cache = "0.10.0"
 
 [dev-dependencies]
 async-std = "1.6.2"
 env_logger = "0.7.1"
 libp2p-plaintext = { path = "../plaintext" }
 libp2p-yamux = { path = "../../muxers/yamux" }
 quickcheck = "0.9.2"
+hex = "0.4.2"
 
 [build-dependencies]
 prost-build = "0.6"