also consider allow self origin when using a published message ids di…

…ct (libp2p#84)

* also consider allow self origin when using a published message ids dictionary

* make allow_self_origin configurable via the config builder

protocols/gossipsub/src/behaviour.rs

@@ -544,7 +544,9 @@ where
         // If the message is anonymous or has a random author add it to the published message ids
         // cache.
         if let PublishConfig::RandomAuthor | PublishConfig::Anonymous = self.publish_config {
-            self.published_message_ids.insert(msg_id.clone());
+            if !self.config.allow_self_origin() {
+                self.published_message_ids.insert(msg_id.clone());
+            }
         }
 
         // If we are not flood publishing forward the message to mesh peers.
@@ -1429,13 +1431,12 @@ where
         }
 
         // reject messages claiming to be from ourselves but not locally published
-        let self_published = if let Some(own_id) = self.publish_config.get_own_id() {
-            !self.config.allow_self_origin()
-                && own_id != propagation_source
-                && msg.source.as_ref().map_or(false, |s| s == own_id)
-        } else {
-            self.published_message_ids.contains(msg.message_id())
-        };
+        let self_published = !self.config.allow_self_origin()
+            && if let Some(own_id) = self.publish_config.get_own_id() {
+                own_id != propagation_source && msg.source.as_ref().map_or(false, |s| s == own_id)
+            } else {
+                self.published_message_ids.contains(msg.message_id())
+            };
 
         if self_published {
             debug!(

protocols/gossipsub/src/config.rs

@@ -831,6 +831,14 @@ impl<T: Clone> GenericGossipsubConfigBuilder<T> {
         self
     }
 
+    /// By default, gossipsub will reject messages that are sent to us that has the same message
+    /// source as we have specified locally. Enabling this, allows these messages and prevents
+    /// penalizing the peer that sent us the message. Default is false.
+    pub fn allow_self_origin(&mut self, allow_self_origin: bool) -> &mut Self {
+        self.config.allow_self_origin = allow_self_origin;
+        self
+    }
+
     pub fn iwant_followup_time(&mut self, iwant_followup_time: Duration) -> &mut Self {
         self.config.iwant_followup_time = iwant_followup_time;
         self