feat: integrate gossipsub by default

package.json

@@ -49,8 +49,10 @@
     "cids": "~0.6.0",
     "debug": "^4.1.1",
     "length-prefixed-stream": "github:jacobheun/length-prefixed-stream#v2.0.0-rc.1",
-    "libp2p": "~0.25.2",
+    "libp2p": "libp2p/js-libp2p#feat/integrate-gossipsub-by-default",
     "libp2p-bootstrap": "~0.9.7",
+    "libp2p-floodsub": "~0.16.1",
+    "libp2p-gossipsub": "ChainSafe/gossipsub-js#master",
     "libp2p-kad-dht": "~0.14.12",
     "libp2p-mplex": "~0.8.5",
     "libp2p-secio": "~0.11.1",

src/cli/bin.js

@@ -77,6 +77,11 @@ const main = async (processArgs) => {
       type: 'boolean',
       default: false
     })
+    .option('pubsubRouter', {
+      desc: 'Specifies the pubsub router implementation',
+      type: 'string',
+      default: 'gossipsub'
+    })
     .fail((msg, err, yargs) => {
       if (err) {
         throw err // preserve stack

src/libp2p.js

@@ -7,6 +7,8 @@ const Bootstrap = require('libp2p-bootstrap')
 const MPLEX = require('libp2p-mplex')
 const SECIO = require('libp2p-secio')
 const KadDHT = require('libp2p-kad-dht')
+const FloodSub = require('libp2p-floodsub')
+const GossipSub = require('libp2p-gossipsub')
 const pullToStream = require('pull-stream-to-stream')
 const PeerBook = require('peer-book')
 const PeerInfo = require('peer-info')
@@ -125,7 +127,7 @@ class Pubsub {
    */
   subscribe (topic, options, handler) {
     return new Promise((resolve, reject) => {
-      this.libp2p._pubsub.subscribe(topic, options, handler, (err) => {
+      this.libp2p._pubSub.subscribe(topic, options, handler, (err) => {
         if (err) return reject(err)
         resolve()
       })
@@ -140,7 +142,7 @@ class Pubsub {
    */
   publish (topic, data) {
     return new Promise((resolve, reject) => {
-      this.libp2p._pubsub.publish(topic, data, (err) => {
+      this.libp2p._pubSub.publish(topic, data, (err) => {
         if (err) return reject(err)
         resolve()
       })
@@ -153,7 +155,7 @@ class Pubsub {
    */
   getTopics () {
     return new Promise((resolve, reject) => {
-      this.libp2p._pubsub.ls((err, topics) => {
+      this.libp2p._pubSub.ls((err, topics) => {
         if (err) return reject(err)
         resolve(topics)
       })
@@ -256,8 +258,8 @@ class DaemonLibp2p extends Libp2p {
   constructor (libp2pOpts, { announceAddrs }) {
     super(libp2pOpts)
     this.announceAddrs = announceAddrs
-    this.needsPullStream = libp2pOpts.config.EXPERIMENTAL.pubsub
-    this._pubsub = this.pubsub
+    this.needsPullStream = libp2pOpts.config.pubsub.enabled
+    this._pubSub = this.pubsub
     this.pubsub = new Pubsub(this)
   }
   get contentRouting () {
@@ -389,6 +391,8 @@ class DaemonLibp2p extends Libp2p {
  * @param {string} opts.id
  * @param {string} opts.bootstrapPeers
  * @param {string} opts.hostAddrs
+ * @param {boolean} opts.pubsub
+ * @param {string} opts.pubsubRouter
  * @returns {Libp2p}
  */
 const createLibp2p = async ({
@@ -402,7 +406,8 @@ const createLibp2p = async ({
   connMgrLo,
   connMgrHi,
   id,
-  pubsub
+  pubsub,
+  pubsubRouter
 } = {}) => {
   const peerInfo = await getPeerInfo(id)
   const peerBook = new PeerBook()
@@ -437,7 +442,8 @@ const createLibp2p = async ({
       peerDiscovery: [
         Bootstrap
       ],
-      dht: KadDHT
+      dht: KadDHT,
+      pubsub: pubsubRouter === 'floodsub' ? GossipSub : FloodSub
     },
     config: {
       peerDiscovery: {
@@ -458,8 +464,8 @@ const createLibp2p = async ({
         enabled: dht,
         kBucketSize: 20
       },
-      EXPERIMENTAL: {
-        pubsub: pubsub
+      pubsub: {
+        enabled: pubsub
       }
     }
   }, {