chore: release version v0.26.0-rc.1

chore: update contributors
chore: promisify pubsub start and stop (#392 )
2025-07-23 04:21:55 +00:00 · 2019-07-31 14:35:43 +02:00 · 2019-07-31 14:35:42 +02:00 · 2019-07-31 14:33:00 +02:00 · 2019-07-31 09:47:06 +02:00 · 2019-07-31 09:47:06 +02:00
52 changed files with 1591 additions and 712 deletions
--- a/.aegir.js
+++ b/.aegir.js
@@ -22,13 +22,12 @@ const before = (done) => {
      sigServer.start({
        port: WRTC_RENDEZVOUS_MULTIADDR.nodeAddress().port
        // cryptoChallenge: true TODO: needs https://github.com/libp2p/js-libp2p-webrtc-star/issues/128
-      }, (err, server) => {
-        if (err) {
-          return cb(err)
-        }
+      })
+      .then(server => {
        wrtcRendezvous = server
        cb()
      })
+      .catch(cb)
    },
    (cb) => {
      WebSocketStarRendezvous.start({
@@ -72,14 +71,16 @@ const before = (done) => {

 const after = (done) => {
  setTimeout(() =>
-    parallel(
-      [node, wrtcRendezvous, wsRendezvous].map((s) => (cb) => s.stop(cb)),
-      done),
-  2000)
+    parallel([
+      (cb) => wrtcRendezvous.stop().then(cb).catch(cb),
+      ...[node, wsRendezvous].map((s) => (cb) => s.stop(cb)),
+    ], done),
+    2000
+  )
 }

 module.exports = {
-  bundlesize: { maxSize: '215kB' },
+  bundlesize: { maxSize: '220kB' },
  hooks: {
    pre: before,
    post: after
--- a/.npmignore
+++ b/.npmignore
@@ -1,37 +0,0 @@
-**/node_modules/
-**/*.log
-test/repo-tests*
-img
-docs
-examples
-
-# Logs
-logs
-*.log
-
-coverage
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-build
-
-# Dependency directory
-# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
-node_modules
-
-test
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,12 @@ stages:

 node_js:
  - '10'
+  - '12'

 os:
  - linux
  - osx
-  
+
 script: npx nyc -s npm run test:node -- --bail
 after_success: npx nyc report --reporter=text-lcov > coverage.lcov && npx codecov

@@ -20,7 +21,6 @@ jobs:
    - stage: check
      script:
        - npx aegir build --bundlesize
-        - npx aegir commitlint --travis
        - npx aegir dep-check -- -i wrtc -i electron-webrtc
        - npm run lint

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,138 @@
+<a name="0.26.0-rc.1"></a>
+# [0.26.0-rc.1](https://github.com/libp2p/js-libp2p/compare/v0.26.0-rc.0...v0.26.0-rc.1) (2019-07-31)
+
+
+
+<a name="0.26.0-rc.0"></a>
+# [0.26.0-rc.0](https://github.com/libp2p/js-libp2p/compare/v0.25.5...v0.26.0-rc.0) (2019-07-31)
+
+
+### Bug Fixes
+
+* make subscribe comply with ipfs interface ([#389](https://github.com/libp2p/js-libp2p/issues/389)) ([9554b05](https://github.com/libp2p/js-libp2p/commit/9554b05))
+
+
+### Features
+
+* integrate gossipsub by default ([#365](https://github.com/libp2p/js-libp2p/issues/365)) ([791f39a](https://github.com/libp2p/js-libp2p/commit/791f39a))
+* promisify all api methods that accept callbacks ([#381](https://github.com/libp2p/js-libp2p/issues/381)) ([df6ef45](https://github.com/libp2p/js-libp2p/commit/df6ef45))
+
+
+### BREAKING CHANGES
+
+* new configuration for deciding the implementation of pubsub to be used.
+In this context, the experimental flags were also removed. See the README for the latest usage.
+* The ipfs interface specified that options
+should be provided after the handler, not before.
+https://github.com/ipfs/interface-js-ipfs-core/blob/v0.109.0/SPEC/PUBSUB.md#pubsubsubscribe
+
+This corrects the order of parameters. See the jsdocs examples
+for subscribe to see how it should be used.
+
+
+
+<a name="0.25.5"></a>
+## [0.25.5](https://github.com/libp2p/js-libp2p/compare/v0.25.4...v0.25.5) (2019-07-12)
+
+
+### Bug Fixes
+
+* peer routing for delegate router ([#377](https://github.com/libp2p/js-libp2p/issues/377)) ([905c911](https://github.com/libp2p/js-libp2p/commit/905c911)), closes [/github.com/libp2p/go-libp2p-core/blob/6e566d10f4a5447317a66d64c7459954b969bdab/routing/query.go#L15-L24](https://github.com//github.com/libp2p/go-libp2p-core/blob/6e566d10f4a5447317a66d64c7459954b969bdab/routing/query.go/issues/L15-L24)
+
+
+
+<a name="0.25.4"></a>
+## [0.25.4](https://github.com/libp2p/js-libp2p/compare/v0.25.3...v0.25.4) (2019-06-07)
+
+
+### Features
+
+* add createLibp2p to generate a PeerInfo instance ([#367](https://github.com/libp2p/js-libp2p/issues/367)) ([04faf18](https://github.com/libp2p/js-libp2p/commit/04faf18))
+* pass libp2p as option to transport creation ([#363](https://github.com/libp2p/js-libp2p/issues/363)) ([b06ca1b](https://github.com/libp2p/js-libp2p/commit/b06ca1b))
+
+
+
+<a name="0.25.3"></a>
+## [0.25.3](https://github.com/libp2p/js-libp2p/compare/v0.25.2...v0.25.3) (2019-05-07)
+
+
+### Features
+
+* sign pubsub messages ([#362](https://github.com/libp2p/js-libp2p/issues/362)) ([40978a1](https://github.com/libp2p/js-libp2p/commit/40978a1))
+
+
+
+<a name="0.25.2"></a>
+## [0.25.2](https://github.com/libp2p/js-libp2p/compare/v0.25.1...v0.25.2) (2019-04-17)
+
+
+### Bug Fixes
+
+* dht config ([#359](https://github.com/libp2p/js-libp2p/issues/359)) ([f3801f0](https://github.com/libp2p/js-libp2p/commit/f3801f0))
+
+
+
+<a name="0.25.1"></a>
+## [0.25.1](https://github.com/libp2p/js-libp2p/compare/v0.25.0...v0.25.1) (2019-04-16)
+
+
+### Bug Fixes
+
+* bail when discovering self ([#357](https://github.com/libp2p/js-libp2p/issues/357)) ([f28dffb](https://github.com/libp2p/js-libp2p/commit/f28dffb))
+
+
+
+<a name="0.25.0"></a>
+# [0.25.0](https://github.com/libp2p/js-libp2p/compare/v0.25.0-rc.6...v0.25.0) (2019-04-12)
+
+
+### Bug Fixes
+
+* allow switch to be configured ([#354](https://github.com/libp2p/js-libp2p/issues/354)) ([eb5aa03](https://github.com/libp2p/js-libp2p/commit/eb5aa03))
+
+
+
+<a name="0.25.0-rc.6"></a>
+# [0.25.0-rc.6](https://github.com/libp2p/js-libp2p/compare/v0.25.0-rc.5...v0.25.0-rc.6) (2019-04-11)
+
+
+### Bug Fixes
+
+* connection emits ([#352](https://github.com/libp2p/js-libp2p/issues/352)) ([313b1ea](https://github.com/libp2p/js-libp2p/commit/313b1ea))
+* remove unneeded peerbook puts ([#348](https://github.com/libp2p/js-libp2p/issues/348)) ([e5f19e8](https://github.com/libp2p/js-libp2p/commit/e5f19e8))
+
+
+### Features
+
+* auto dial discovered peers ([#349](https://github.com/libp2p/js-libp2p/issues/349)) ([01aa447](https://github.com/libp2p/js-libp2p/commit/01aa447))
+
+
+
+<a name="0.25.0-rc.5"></a>
+# [0.25.0-rc.5](https://github.com/libp2p/js-libp2p/compare/v0.25.0-rc.4...v0.25.0-rc.5) (2019-03-21)
+
+
+### Bug Fixes
+
+* disable dht by default [#338](https://github.com/libp2p/js-libp2p/issues/338) ([#339](https://github.com/libp2p/js-libp2p/issues/339)) ([e52ce66](https://github.com/libp2p/js-libp2p/commit/e52ce66))
+
+
+### Features
+
+* update to the latest switch ([#336](https://github.com/libp2p/js-libp2p/issues/336)) ([eee60ed](https://github.com/libp2p/js-libp2p/commit/eee60ed))
+
+
+
+<a name="0.25.0-rc.4"></a>
+# [0.25.0-rc.4](https://github.com/libp2p/js-libp2p/compare/v0.25.0-rc.3...v0.25.0-rc.4) (2019-03-06)
+
+
+
+<a name="0.25.0-rc.3"></a>
+# [0.25.0-rc.3](https://github.com/libp2p/js-libp2p/compare/v0.25.0-rc.2...v0.25.0-rc.3) (2019-02-26)
+
+
+
 <a name="0.25.0-rc.2"></a>
 # [0.25.0-rc.2](https://github.com/libp2p/js-libp2p/compare/v0.25.0-rc.1...v0.25.0-rc.2) (2019-02-26)

--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -39,5 +39,5 @@ One of following:
 This is for you! Please read, and then delete this text before posting it.
 The js-ipfs issues are only for bug reports and directly actionable features.

-Read https://github.com/ipfs/community/blob/master/contributing.md#reporting-issues if your issue doesn't fit either of those categories.
+Read https://github.com/ipfs/community/blob/master/CONTRIBUTING.md#reporting-issues if your issue doesn't fit either of those categories.
 -->
--- a/PEER_DISCOVERY.md
+++ b/PEER_DISCOVERY.md
@@ -0,0 +1,60 @@
+# Peer Discovery and Auto Dial
+
+**Synopsis**:
+* All peers discovered are emitted via `peer:discovery` so applications can take any desired action.
+* Libp2p defaults to automatically connecting to new peers, when under the [ConnectionManager](https://github.com/libp2p/js-libp2p-connection-manager) low watermark (minimum peers).
+  * Applications can disable this via the `peerDiscovery.autoDial` config property, and handle connections themselves.
+  * Applications who have not disabled this should **never** connect on peer discovery. Applications should use the `peer:connect` event if they wish to take a specific action on new peers.
+
+## Scenarios
+In any scenario, if a peer is discovered it should be added to the PeerBook. This ensures that even if we don't dial to a node when we discover it, we know about it in the event that it becomes known as a provider for something we need. The scenarios listed below detail what actions the auto dialer will take when peers are discovered.
+
+### 1. Joining the network
+The node is new and needs to join the network. It currently has 0 peers.
+**Discovery Mechanisms**: [Ambient Discovery](#ambient-discovery)
+
+### Action to take
+Connect to discovered peers. This should have some degree of concurrency limiting. While the case should be low, if we immediately discover more peers than our high watermark we should avoid dialing them all.
+
+### 2. Connected to some
+The node is connected to other nodes. The current number of connections is less than the desired low watermark.
+**Discovery Mechanisms**: [Ambient Discovery](#ambient-discovery) and [Active Discovery](#active-discovery)
+
+### Action to take
+Connect to discovered peers. This should have some degree of concurrency limiting. The concurrency may need to be modified to reflect the current number of peers connected. The more peers we have, the lower the concurrency may need to be.
+
+### 3. Connected to enough
+**Discovery Mechanisms**: [Ambient Discovery](#ambient-discovery) and [Active Discovery](#active-discovery)
+
+### Action to take
+None. If we are connected to enough peers, the low watermark, we should not connect to discovered peers. As other peers discover us, they may connect to us based on their current scenario.
+
+For example, a long running node with adequate peers is on an MDNS network. A new peer joins the network and both become aware of each other. The new peer should be the peer that dials, as it has too few peers. The existing node has no reason to dial the new peer, but should keep a record of it in case it later becomes an important node due to its contents/capabilities.
+
+Avoiding dials above the low watermark also allows for a pool of connections to be reserved for application specific actions, such as connecting to a specific content provider via a DHT query to find that content (ipfs-bitswap).
+
+### 4. Connected to too many
+The node has more connections than it wants. The current number of connections is greater than the high watermark.
+
+[WIP Connection Manager v2 spec](https://github.com/libp2p/specs/pull/161)
+**Discovery Mechanisms**: [Ambient Discovery](#ambient-discovery) and [Active Discovery](#active-discovery)
+
+### Action to take
+None, the `ConnectionManager` will automatically prune connections.
+
+## Discovery Mechanisms
+Means of which a libp2p node discovers other peers.
+
+### Active Discovery
+Through active use of the libp2p network, a node may discovery peers.
+
+* Content/Peer routing (DHT, delegated, etc) provider and peer queries
+* DHT random walk
+* Rendezvous servers
+
+### Ambient Discovery
+Leveraging known addresses, or network discovery mechanisms, a node may discover peers outside of the bounds of the libp2p network.
+
+* Bootstrap
+* MDNS
+* proximity based (bluetooth, sound, etc)
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@
  <a href="http://ipn.io"><img src="https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square" /></a>
  <a href="http://libp2p.io/"><img src="https://img.shields.io/badge/project-libp2p-yellow.svg?style=flat-square" /></a>
  <a href="http://webchat.freenode.net/?channels=%23libp2p"><img src="https://img.shields.io/badge/freenode-%23libp2p-yellow.svg?style=flat-square" /></a>
+  <a href="https://discuss.libp2p.io"><img src="https://img.shields.io/discourse/https/discuss.libp2p.io/posts.svg" /></a>
  <a href="https://waffle.io/libp2p/libp2p"><img src="https://img.shields.io/badge/pm-waffle-yellow.svg?style=flat-square" /></a>
 </p>

@@ -64,7 +65,9 @@ libp2p is the product of a long and arduous quest to understand the evolution of
 We are in the process of writing better documentation, blog posts, tutorials and a formal specification. Today you can find:

 - [libp2p.io](https://libp2p.io)
+- [docs.libp2p.io](https://docs.libp2p.io)
 - [Specification (WIP)](https://github.com/libp2p/specs)
+- [Discussion Forums](https://discuss.libp2p.io)
 - Talks
  - [`libp2p <3 ethereum` at DEVCON2](https://ethereumfoundation.org/devcon/?session=libp2p) [📼 video](https://www.youtube.com/watch?v=HxueJbeMVG4) [slides](https://ethereumfoundation.org/devcon/wp-content/uploads/2016/10/libp2p-HEART-devp2p-IPFS-PLUS-Ethereum-networking.pdf) [📼 demo-1](https://ethereumfoundation.org/devcon/wp-content/uploads/2016/10/libp2p_demo1-1.mp4) [📼 demo-2](https://ethereumfoundation.org/devcon/wp-content/uploads/2016/10/libp2p_demo2-1.mp4)
 - Articles
@@ -97,7 +100,7 @@ You can find multiple examples on the [examples folder](/examples) that will gui

 ### Creating your own libp2p bundle

-The libp2p module acts as a glue for every libp2p module that you can use top create your own libp2p bundle. Creating your own libp2p bundle gives you a lot of freedom when it comes to customize it with features and default setup. We recommend creating your own libp2p bundle for the app you are developing that takes in account your needs (e.g. for a browser working version of libp2p that acts as the network layer of IPFS, we have a built one that leverages the Browser transports).
+The libp2p module acts as a glue for every libp2p module that you can use to create your own libp2p bundle. Creating your own libp2p bundle gives you a lot of freedom when it comes to customize it with features and default setup. We recommend creating your own libp2p bundle for the app you are developing that takes in account your needs (e.g. for a browser working version of libp2p that acts as the network layer of IPFS, we have a built one that leverages the Browser transports).

 **Example:**

@@ -108,7 +111,7 @@ The libp2p module acts as a glue for every libp2p module that you can use top cr
 //   crypto-channel: secio
 //   discovery: multicast-dns

-const libp2p = require('libp2p')
+const Libp2p = require('libp2p')
 const TCP = require('libp2p-tcp')
 const WS = require('libp2p-websockets')
 const SPDY = require('libp2p-spdy')
@@ -116,12 +119,13 @@ const MPLEX = require('libp2p-mplex')
 const SECIO = require('libp2p-secio')
 const MulticastDNS = require('libp2p-mdns')
 const DHT = require('libp2p-kad-dht')
+const GossipSub = require('libp2p-gossipsub')
 const defaultsDeep = require('@nodeutils/defaults-deep')
 const Protector = require('libp2p-pnet')
 const DelegatedPeerRouter = require('libp2p-delegated-peer-routing')
 const DelegatedContentRouter = require('libp2p-delegated-content-routing')

-class Node extends libp2p {
+class Node extends Libp2p {
  constructor (_options) {
    const peerInfo = _options.peerInfo
    const defaults = {
@@ -151,12 +155,14 @@ class Node extends libp2p {
        peerDiscovery: [
          MulticastDNS
        ],
-        dht: DHT                      // DHT enables PeerRouting, ContentRouting and DHT itself components
+        dht: DHT,                      // DHT enables PeerRouting, ContentRouting and DHT itself components
+        pubsub: GossipSub
      },

      // libp2p config options (typically found on a config.json)
      config: {                       // The config object is the part of the config that can go into a file, config.json.
        peerDiscovery: {
+          autoDial: true,             // Auto connect to discovered peers (limited by ConnectionManager minPeers)
          mdns: {                     // mdns options
            interval: 1000,           // ms
            enabled: true
@@ -177,11 +183,14 @@ class Node extends libp2p {
        dht: {
          kBucketSize: 20,
          enabled: true,
-          enabledDiscovery: true      // Allows to disable discovery (enabled by default)
+          randomWalk: {
+            enabled: true,      // Allows to disable discovery (enabled by default)
+            interval: 300e3,
+            timeout: 10e3
+          }
        },
-        // Enable/Disable Experimental features
-        EXPERIMENTAL: {               // Experimental features ("behind a flag")
-          pubsub: false
+        pubsub: {
+          enabled: true
        }
      }
    }
@@ -196,13 +205,33 @@ class Node extends libp2p {

 ### API

-#### Create a Node - `new libp2p.Node(options)`
+**IMPORTANT NOTE**: All the methods listed in the API section that take a callback are also now Promisified. Libp2p is migrating away from callbacks to async/await, and in a future release (that will be announced in advance), callback support will be removed entirely. You can follow progress of the async/await endeavor at https://github.com/ipfs/js-ipfs/issues/1670.

-> Creates an instance of the libp2p.Node.
+#### Create a Node - `Libp2p.createLibp2p(options, callback)`
+
+> Behaves exactly like `new Libp2p(options)`, but doesn't require a PeerInfo. One will be generated instead
+
+```js
+const { createLibp2p } = require('libp2p')
+createLibp2p(options, (err, libp2p) => {
+  if (err) throw err
+  libp2p.start((err) => {
+    if (err) throw err
+  })
+})
+```
+
+- `options`: Object of libp2p configuration options
+- `callback`: Function with signature `function (Error, Libp2p) {}`
+
+#### Create a Node alternative - `new Libp2p(options)`
+
+> Creates an instance of Libp2p with a custom `PeerInfo` provided via `options.peerInfo`.

 Required keys in the `options` object:

 - `peerInfo`: instance of [PeerInfo][] that contains the [PeerId][], Keys and [multiaddrs][multiaddr] of the libp2p Node.
+- `modules.transport`: An array that must include at least 1 transport, such as `libp2p-tcp`.

 #### `libp2p.start(callback)`

@@ -302,17 +331,32 @@ Required keys in the `options` object:

 > Peer has been discovered.

+If `autoDial` is `true`, applications should **not** attempt to connect to the peer
+unless they are performing a specific action. See [peer discovery and auto dial](./PEER_DISCOVERY.md) for more information.
+
 - `peer`: instance of [PeerInfo][]

 ##### `libp2p.on('peer:connect', (peer) => {})`

-> We connected to a new peer
+> We have a new muxed connection to a peer

 - `peer`: instance of [PeerInfo][]

 ##### `libp2p.on('peer:disconnect', (peer) => {})`

-> We disconnected from Peer
+> We have closed a connection to a peer
+
+- `peer`: instance of [PeerInfo][]
+
+##### `libp2p.on('connection:start', (peer) => {})`
+
+> We created a new connection to a peer
+
+- `peer`: instance of [PeerInfo][]
+
+##### `libp2p.on('connection:end', (peer) => {})`
+
+> We closed a connection to a peer

 - `peer`: instance of [PeerInfo][]

@@ -506,18 +550,6 @@ Some available network protectors:
 > npm run test:browser
 ```

-#### Run interop tests
-
-```sh
-N/A
-```
-
-#### Run benchmark tests
-
-```sh
-N/A
-```
-
 ### Packages

 List of packages currently in existence for libp2p
@@ -527,66 +559,66 @@ List of packages currently in existence for libp2p
 | Package | Version | Deps | CI | Coverage | Lead Maintainer |
 | ---------|---------|---------|---------|---------|--------- |
 | **Libp2p** |
-| [`interface-libp2p`](//github.com/libp2p/interface-libp2p) | [![npm](https://img.shields.io/npm/v/interface-libp2p.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-libp2p/releases) | [![Deps](https://david-dm.org/libp2p/interface-libp2p.svg?style=flat-square)](https://david-dm.org/libp2p/interface-libp2p) | N/A | [![codecov](https://codecov.io/gh/libp2p/interface-libp2p/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-libp2p) | N/A |
-| [`libp2p`](//github.com/libp2p/js-libp2p) | [![npm](https://img.shields.io/npm/v/libp2p.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p) | [Jacob Heun](mailto:jacobheun@gmail.com) |
+| [`interface-libp2p`](//github.com/libp2p/interface-libp2p) | [![npm](https://img.shields.io/npm/v/interface-libp2p.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-libp2p/releases) | [![Deps](https://david-dm.org/libp2p/interface-libp2p.svg?style=flat-square)](https://david-dm.org/libp2p/interface-libp2p) | [![Travis CI](https://travis-ci.com/libp2p/interface-libp2p.svg?branch=master)](https://travis-ci.com/libp2p/interface-libp2p) | [![codecov](https://codecov.io/gh/libp2p/interface-libp2p/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-libp2p) | N/A |
+| [`libp2p`](//github.com/libp2p/js-libp2p) | [![npm](https://img.shields.io/npm/v/libp2p.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p) | [Jacob Heun](mailto:jacobheun@gmail.com) |
 | **Connection** |
-| [`interface-connection`](//github.com/libp2p/interface-connection) | [![npm](https://img.shields.io/npm/v/interface-connection.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-connection/releases) | [![Deps](https://david-dm.org/libp2p/interface-connection.svg?style=flat-square)](https://david-dm.org/libp2p/interface-connection) | N/A | [![codecov](https://codecov.io/gh/libp2p/interface-connection/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-connection) | N/A |
+| [`interface-connection`](//github.com/libp2p/interface-connection) | [![npm](https://img.shields.io/npm/v/interface-connection.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-connection/releases) | [![Deps](https://david-dm.org/libp2p/interface-connection.svg?style=flat-square)](https://david-dm.org/libp2p/interface-connection) | [![Travis CI](https://travis-ci.com/libp2p/interface-connection.svg?branch=master)](https://travis-ci.com/libp2p/interface-connection) | [![codecov](https://codecov.io/gh/libp2p/interface-connection/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-connection) | [Jacob Heun](mailto:jacobheun@gmail.com) |
 | **Transport** |
-| [`interface-transport`](//github.com/libp2p/interface-transport) | [![npm](https://img.shields.io/npm/v/interface-transport.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-transport/releases) | [![Deps](https://david-dm.org/libp2p/interface-transport.svg?style=flat-square)](https://david-dm.org/libp2p/interface-transport) | N/A | [![codecov](https://codecov.io/gh/libp2p/interface-transport/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-transport) | N/A |
-| [`libp2p-tcp`](//github.com/libp2p/js-libp2p-tcp) | [![npm](https://img.shields.io/npm/v/libp2p-tcp.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-tcp/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-tcp.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-tcp) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-tcp/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-tcp/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-tcp/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-tcp) | [Jacob Heun](mailto:jacobheun@gmail.com) |
-| [`libp2p-udp`](//github.com/libp2p/js-libp2p-udp) | [![npm](https://img.shields.io/npm/v/libp2p-udp.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-udp/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-udp.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-udp) | N/A | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-udp/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-udp) | N/A |
-| [`libp2p-udt`](//github.com/libp2p/js-libp2p-udt) | [![npm](https://img.shields.io/npm/v/libp2p-udt.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-udt/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-udt.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-udt) | N/A | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-udt/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-udt) | N/A |
-| [`libp2p-utp`](//github.com/libp2p/js-libp2p-utp) | [![npm](https://img.shields.io/npm/v/libp2p-utp.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-utp/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-utp.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-utp) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-utp/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-utp/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-utp/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-utp) | N/A |
-| [`libp2p-webrtc-direct`](//github.com/libp2p/js-libp2p-webrtc-direct) | [![npm](https://img.shields.io/npm/v/libp2p-webrtc-direct.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-webrtc-direct/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-webrtc-direct.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-webrtc-direct) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-webrtc-direct/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-webrtc-direct/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-webrtc-direct/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-webrtc-direct) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
-| [`libp2p-webrtc-star`](//github.com/libp2p/js-libp2p-webrtc-star) | [![npm](https://img.shields.io/npm/v/libp2p-webrtc-star.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-webrtc-star/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-webrtc-star.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-webrtc-star) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-webrtc-star/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-webrtc-star/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-webrtc-star/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-webrtc-star) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
-| [`libp2p-websockets`](//github.com/libp2p/js-libp2p-websockets) | [![npm](https://img.shields.io/npm/v/libp2p-websockets.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-websockets/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-websockets.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websockets) | N/A | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-websockets/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-websockets) | N/A |
-| [`libp2p-websocket-star`](//github.com/libp2p/js-libp2p-websocket-star) | [![npm](https://img.shields.io/npm/v/libp2p-websocket-star.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-websocket-star/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-websocket-star.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websocket-star) | N/A | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-websocket-star/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-websocket-star) | [Jacob Heun](mailto:jacobheun@gmail.com) |
-| [`libp2p-websocket-star-rendezvous`](//github.com/libp2p/js-libp2p-websocket-star-rendezvous) | [![npm](https://img.shields.io/npm/v/libp2p-websocket-star-rendezvous.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-websocket-star-rendezvous/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-websocket-star-rendezvous.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websocket-star-rendezvous) | N/A | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-websocket-star-rendezvous/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-websocket-star-rendezvous) | N/A |
+| [`interface-transport`](//github.com/libp2p/interface-transport) | [![npm](https://img.shields.io/npm/v/interface-transport.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-transport/releases) | [![Deps](https://david-dm.org/libp2p/interface-transport.svg?style=flat-square)](https://david-dm.org/libp2p/interface-transport) | [![Travis CI](https://travis-ci.com/libp2p/interface-transport.svg?branch=master)](https://travis-ci.com/libp2p/interface-transport) | [![codecov](https://codecov.io/gh/libp2p/interface-transport/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-transport) | [Jacob Heun](mailto:jacobheun@gmail.com) |
+| [`libp2p-tcp`](//github.com/libp2p/js-libp2p-tcp) | [![npm](https://img.shields.io/npm/v/libp2p-tcp.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-tcp/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-tcp.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-tcp) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-tcp.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-tcp) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-tcp/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-tcp) | [Jacob Heun](mailto:jacobheun@gmail.com) |
+| [`libp2p-udp`](//github.com/libp2p/js-libp2p-udp) | [![npm](https://img.shields.io/npm/v/libp2p-udp.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-udp/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-udp.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-udp) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-udp.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-udp) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-udp/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-udp) | N/A |
+| [`libp2p-udt`](//github.com/libp2p/js-libp2p-udt) | [![npm](https://img.shields.io/npm/v/libp2p-udt.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-udt/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-udt.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-udt) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-udt.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-udt) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-udt/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-udt) | N/A |
+| [`libp2p-utp`](//github.com/libp2p/js-libp2p-utp) | [![npm](https://img.shields.io/npm/v/libp2p-utp.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-utp/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-utp.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-utp) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-utp.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-utp) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-utp/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-utp) | N/A |
+| [`libp2p-webrtc-direct`](//github.com/libp2p/js-libp2p-webrtc-direct) | [![npm](https://img.shields.io/npm/v/libp2p-webrtc-direct.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-webrtc-direct/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-webrtc-direct.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-webrtc-direct) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-webrtc-direct.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-webrtc-direct) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-webrtc-direct/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-webrtc-direct) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
+| [`libp2p-webrtc-star`](//github.com/libp2p/js-libp2p-webrtc-star) | [![npm](https://img.shields.io/npm/v/libp2p-webrtc-star.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-webrtc-star/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-webrtc-star.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-webrtc-star) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-webrtc-star.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-webrtc-star) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-webrtc-star/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-webrtc-star) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
+| [`libp2p-websockets`](//github.com/libp2p/js-libp2p-websockets) | [![npm](https://img.shields.io/npm/v/libp2p-websockets.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-websockets/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-websockets.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websockets) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-websockets.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-websockets) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-websockets/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-websockets) | [Jacob Heun](mailto:jacobheun@gmail.com) |
+| [`libp2p-websocket-star`](//github.com/libp2p/js-libp2p-websocket-star) | [![npm](https://img.shields.io/npm/v/libp2p-websocket-star.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-websocket-star/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-websocket-star.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websocket-star) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-websocket-star.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-websocket-star) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-websocket-star/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-websocket-star) | [Jacob Heun](mailto:jacobheun@gmail.com) |
+| [`libp2p-websocket-star-rendezvous`](//github.com/libp2p/js-libp2p-websocket-star-rendezvous) | [![npm](https://img.shields.io/npm/v/libp2p-websocket-star-rendezvous.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-websocket-star-rendezvous/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-websocket-star-rendezvous.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websocket-star-rendezvous) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-websocket-star-rendezvous.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-websocket-star-rendezvous) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-websocket-star-rendezvous/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-websocket-star-rendezvous) | [Jacob Heun](mailto:jacobheun@gmail.com) |
 | **Crypto Channels** |
-| [`libp2p-secio`](//github.com/libp2p/js-libp2p-secio) | [![npm](https://img.shields.io/npm/v/libp2p-secio.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-secio/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-secio.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-secio) | N/A | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-secio/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-secio) | N/A |
+| [`libp2p-secio`](//github.com/libp2p/js-libp2p-secio) | [![npm](https://img.shields.io/npm/v/libp2p-secio.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-secio/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-secio.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-secio) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-secio.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-secio) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-secio/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-secio) | [Friedel Ziegelmayer](mailto:dignifiedquire@gmail.com) |
 | **Stream Muxers** |
-| [`interface-stream-muxer`](//github.com/libp2p/interface-stream-muxer) | [![npm](https://img.shields.io/npm/v/interface-stream-muxer.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-stream-muxer/releases) | [![Deps](https://david-dm.org/libp2p/interface-stream-muxer.svg?style=flat-square)](https://david-dm.org/libp2p/interface-stream-muxer) | N/A | [![codecov](https://codecov.io/gh/libp2p/interface-stream-muxer/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-stream-muxer) | N/A |
-| [`libp2p-mplex`](//github.com/libp2p/js-libp2p-mplex) | [![npm](https://img.shields.io/npm/v/libp2p-mplex.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-mplex/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-mplex.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-mplex) | N/A | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-mplex/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-mplex) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
-| [`libp2p-spdy`](//github.com/libp2p/js-libp2p-spdy) | [![npm](https://img.shields.io/npm/v/libp2p-spdy.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-spdy/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-spdy.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-spdy) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-spdy/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-spdy/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-spdy/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-spdy) | N/A |
+| [`interface-stream-muxer`](//github.com/libp2p/interface-stream-muxer) | [![npm](https://img.shields.io/npm/v/interface-stream-muxer.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-stream-muxer/releases) | [![Deps](https://david-dm.org/libp2p/interface-stream-muxer.svg?style=flat-square)](https://david-dm.org/libp2p/interface-stream-muxer) | [![Travis CI](https://travis-ci.com/libp2p/interface-stream-muxer.svg?branch=master)](https://travis-ci.com/libp2p/interface-stream-muxer) | [![codecov](https://codecov.io/gh/libp2p/interface-stream-muxer/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-stream-muxer) | [Jacob Heun](mailto:jacobheun@gmail.com) |
+| [`libp2p-mplex`](//github.com/libp2p/js-libp2p-mplex) | [![npm](https://img.shields.io/npm/v/libp2p-mplex.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-mplex/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-mplex.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-mplex) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-mplex.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-mplex) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-mplex/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-mplex) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
+| [`libp2p-spdy`](//github.com/libp2p/js-libp2p-spdy) | [![npm](https://img.shields.io/npm/v/libp2p-spdy.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-spdy/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-spdy.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-spdy) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-spdy.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-spdy) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-spdy/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-spdy) | [Jacob Heun](mailto:jacobheun@gmail.com) |
 | **Discovery** |
-| [`interface-peer-discovery`](//github.com/libp2p/interface-peer-discovery) | [![npm](https://img.shields.io/npm/v/interface-peer-discovery.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-peer-discovery/releases) | [![Deps](https://david-dm.org/libp2p/interface-peer-discovery.svg?style=flat-square)](https://david-dm.org/libp2p/interface-peer-discovery) | N/A | [![codecov](https://codecov.io/gh/libp2p/interface-peer-discovery/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-peer-discovery) | N/A |
-| [`libp2p-bootstrap`](//github.com/libp2p/js-libp2p-bootstrap) | [![npm](https://img.shields.io/npm/v/libp2p-bootstrap.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-bootstrap/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-bootstrap.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-bootstrap) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-bootstrap/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-bootstrap/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-bootstrap/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-bootstrap) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
-| [`libp2p-kad-dht`](//github.com/libp2p/js-libp2p-kad-dht) | [![npm](https://img.shields.io/npm/v/libp2p-kad-dht.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-kad-dht/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-kad-dht.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-kad-dht) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-kad-dht/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-kad-dht/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-kad-dht/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-kad-dht) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
-| [`libp2p-mdns`](//github.com/libp2p/js-libp2p-mdns) | [![npm](https://img.shields.io/npm/v/libp2p-mdns.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-mdns/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-mdns.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-mdns) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-mdns/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-mdns/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-mdns/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-mdns) | N/A |
-| [`libp2p-rendezvous`](//github.com/libp2p/js-libp2p-rendezvous) | [![npm](https://img.shields.io/npm/v/libp2p-rendezvous.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-rendezvous/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-rendezvous.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-rendezvous) | N/A | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-rendezvous/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-rendezvous) | N/A |
-| [`libp2p-webrtc-star`](//github.com/libp2p/js-libp2p-webrtc-star) | [![npm](https://img.shields.io/npm/v/libp2p-webrtc-star.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-webrtc-star/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-webrtc-star.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-webrtc-star) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-webrtc-star/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-webrtc-star/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-webrtc-star/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-webrtc-star) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
-| [`libp2p-websocket-star`](//github.com/libp2p/js-libp2p-websocket-star) | [![npm](https://img.shields.io/npm/v/libp2p-websocket-star.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-websocket-star/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-websocket-star.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websocket-star) | N/A | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-websocket-star/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-websocket-star) | [Jacob Heun](mailto:jacobheun@gmail.com) |
+| [`interface-peer-discovery`](//github.com/libp2p/interface-peer-discovery) | [![npm](https://img.shields.io/npm/v/interface-peer-discovery.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-peer-discovery/releases) | [![Deps](https://david-dm.org/libp2p/interface-peer-discovery.svg?style=flat-square)](https://david-dm.org/libp2p/interface-peer-discovery) | [![Travis CI](https://travis-ci.com/libp2p/interface-peer-discovery.svg?branch=master)](https://travis-ci.com/libp2p/interface-peer-discovery) | [![codecov](https://codecov.io/gh/libp2p/interface-peer-discovery/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-peer-discovery) | N/A |
+| [`libp2p-bootstrap`](//github.com/libp2p/js-libp2p-bootstrap) | [![npm](https://img.shields.io/npm/v/libp2p-bootstrap.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-bootstrap/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-bootstrap.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-bootstrap) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-bootstrap.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-bootstrap) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-bootstrap/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-bootstrap) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
+| [`libp2p-kad-dht`](//github.com/libp2p/js-libp2p-kad-dht) | [![npm](https://img.shields.io/npm/v/libp2p-kad-dht.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-kad-dht/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-kad-dht.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-kad-dht) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-kad-dht.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-kad-dht) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-kad-dht/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-kad-dht) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
+| [`libp2p-mdns`](//github.com/libp2p/js-libp2p-mdns) | [![npm](https://img.shields.io/npm/v/libp2p-mdns.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-mdns/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-mdns.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-mdns) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-mdns.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-mdns) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-mdns/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-mdns) | [Jacob Heun](mailto:jacobheun@gmail.com) |
+| [`libp2p-rendezvous`](//github.com/libp2p/js-libp2p-rendezvous) | [![npm](https://img.shields.io/npm/v/libp2p-rendezvous.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-rendezvous/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-rendezvous.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-rendezvous) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-rendezvous.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-rendezvous) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-rendezvous/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-rendezvous) | N/A |
+| [`libp2p-webrtc-star`](//github.com/libp2p/js-libp2p-webrtc-star) | [![npm](https://img.shields.io/npm/v/libp2p-webrtc-star.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-webrtc-star/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-webrtc-star.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-webrtc-star) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-webrtc-star.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-webrtc-star) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-webrtc-star/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-webrtc-star) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
+| [`libp2p-websocket-star`](//github.com/libp2p/js-libp2p-websocket-star) | [![npm](https://img.shields.io/npm/v/libp2p-websocket-star.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-websocket-star/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-websocket-star.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websocket-star) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-websocket-star.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-websocket-star) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-websocket-star/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-websocket-star) | [Jacob Heun](mailto:jacobheun@gmail.com) |
 | **NAT Traversal** |
-| [`libp2p-circuit`](//github.com/libp2p/js-libp2p-circuit) | [![npm](https://img.shields.io/npm/v/libp2p-circuit.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-circuit/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-circuit.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-circuit) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-circuit/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-circuit/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-circuit/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-circuit) | [Jacob Heun](mailto:jacobheun@gmail.com) |
-| [`libp2p-nat-mngr`](//github.com/libp2p/js-libp2p-nat-mngr) | [![npm](https://img.shields.io/npm/v/libp2p-nat-mngr.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-nat-mngr/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-nat-mngr.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-nat-mngr) | N/A | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-nat-mngr/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-nat-mngr) | N/A |
+| [`libp2p-circuit`](//github.com/libp2p/js-libp2p-circuit) | [![npm](https://img.shields.io/npm/v/libp2p-circuit.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-circuit/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-circuit.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-circuit) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-circuit.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-circuit) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-circuit/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-circuit) | [Jacob Heun](mailto:jacobheun@gmail.com) |
+| [`libp2p-nat-mngr`](//github.com/libp2p/js-libp2p-nat-mngr) | [![npm](https://img.shields.io/npm/v/libp2p-nat-mngr.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-nat-mngr/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-nat-mngr.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-nat-mngr) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-nat-mngr.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-nat-mngr) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-nat-mngr/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-nat-mngr) | N/A |
 | **Data Types** |
-| [`peer-book`](//github.com/libp2p/js-peer-book) | [![npm](https://img.shields.io/npm/v/peer-book.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-peer-book/releases) | [![Deps](https://david-dm.org/libp2p/js-peer-book.svg?style=flat-square)](https://david-dm.org/libp2p/js-peer-book) | N/A | [![codecov](https://codecov.io/gh/libp2p/js-peer-book/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-peer-book) | [Pedro Teixeira](mailto:i@pgte.me) |
-| [`peer-id`](//github.com/libp2p/js-peer-id) | [![npm](https://img.shields.io/npm/v/peer-id.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-peer-id/releases) | [![Deps](https://david-dm.org/libp2p/js-peer-id.svg?style=flat-square)](https://david-dm.org/libp2p/js-peer-id) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-peer-id/master)](https://ci.ipfs.team/job/libp2p/job/js-peer-id/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-peer-id/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-peer-id) | [Pedro Teixeira](mailto:i@pgte.me) |
-| [`peer-info`](//github.com/libp2p/js-peer-info) | [![npm](https://img.shields.io/npm/v/peer-info.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-peer-info/releases) | [![Deps](https://david-dm.org/libp2p/js-peer-info.svg?style=flat-square)](https://david-dm.org/libp2p/js-peer-info) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-peer-info/master)](https://ci.ipfs.team/job/libp2p/job/js-peer-info/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-peer-info/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-peer-info) | N/A |
+| [`peer-book`](//github.com/libp2p/js-peer-book) | [![npm](https://img.shields.io/npm/v/peer-book.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-peer-book/releases) | [![Deps](https://david-dm.org/libp2p/js-peer-book.svg?style=flat-square)](https://david-dm.org/libp2p/js-peer-book) | [![Travis CI](https://travis-ci.com/libp2p/js-peer-book.svg?branch=master)](https://travis-ci.com/libp2p/js-peer-book) | [![codecov](https://codecov.io/gh/libp2p/js-peer-book/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-peer-book) | [Pedro Teixeira](mailto:i@pgte.me) |
+| [`peer-id`](//github.com/libp2p/js-peer-id) | [![npm](https://img.shields.io/npm/v/peer-id.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-peer-id/releases) | [![Deps](https://david-dm.org/libp2p/js-peer-id.svg?style=flat-square)](https://david-dm.org/libp2p/js-peer-id) | [![Travis CI](https://travis-ci.com/libp2p/js-peer-id.svg?branch=master)](https://travis-ci.com/libp2p/js-peer-id) | [![codecov](https://codecov.io/gh/libp2p/js-peer-id/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-peer-id) | [Pedro Teixeira](mailto:i@pgte.me) |
+| [`peer-info`](//github.com/libp2p/js-peer-info) | [![npm](https://img.shields.io/npm/v/peer-info.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-peer-info/releases) | [![Deps](https://david-dm.org/libp2p/js-peer-info.svg?style=flat-square)](https://david-dm.org/libp2p/js-peer-info) | [![Travis CI](https://travis-ci.com/libp2p/js-peer-info.svg?branch=master)](https://travis-ci.com/libp2p/js-peer-info) | [![codecov](https://codecov.io/gh/libp2p/js-peer-info/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-peer-info) | [Pedro Teixeira](mailto:i@pgte.me) |
 | **Content Routing** |
-| [`interface-content-routing`](//github.com/libp2p/interface-content-routing) | [![npm](https://img.shields.io/npm/v/interface-content-routing.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-content-routing/releases) | [![Deps](https://david-dm.org/libp2p/interface-content-routing.svg?style=flat-square)](https://david-dm.org/libp2p/interface-content-routing) | N/A | [![codecov](https://codecov.io/gh/libp2p/interface-content-routing/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-content-routing) | N/A |
-| [`libp2p-delegated-content-routing`](//github.com/libp2p/js-libp2p-delegated-content-routing) | [![npm](https://img.shields.io/npm/v/libp2p-delegated-content-routing.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-delegated-content-routing/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-delegated-content-routing.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-delegated-content-routing) | N/A | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-delegated-content-routing/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-delegated-content-routing) | [Jacob Heun](mailto:jacobheun@gmail.com) |
-| [`libp2p-kad-dht`](//github.com/libp2p/js-libp2p-kad-dht) | [![npm](https://img.shields.io/npm/v/libp2p-kad-dht.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-kad-dht/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-kad-dht.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-kad-dht) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-kad-dht/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-kad-dht/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-kad-dht/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-kad-dht) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
+| [`interface-content-routing`](//github.com/libp2p/interface-content-routing) | [![npm](https://img.shields.io/npm/v/interface-content-routing.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-content-routing/releases) | [![Deps](https://david-dm.org/libp2p/interface-content-routing.svg?style=flat-square)](https://david-dm.org/libp2p/interface-content-routing) | [![Travis CI](https://travis-ci.com/libp2p/interface-content-routing.svg?branch=master)](https://travis-ci.com/libp2p/interface-content-routing) | [![codecov](https://codecov.io/gh/libp2p/interface-content-routing/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-content-routing) | N/A |
+| [`libp2p-delegated-content-routing`](//github.com/libp2p/js-libp2p-delegated-content-routing) | [![npm](https://img.shields.io/npm/v/libp2p-delegated-content-routing.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-delegated-content-routing/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-delegated-content-routing.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-delegated-content-routing) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-delegated-content-routing.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-delegated-content-routing) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-delegated-content-routing/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-delegated-content-routing) | [Jacob Heun](mailto:jacobheun@gmail.com) |
+| [`libp2p-kad-dht`](//github.com/libp2p/js-libp2p-kad-dht) | [![npm](https://img.shields.io/npm/v/libp2p-kad-dht.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-kad-dht/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-kad-dht.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-kad-dht) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-kad-dht.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-kad-dht) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-kad-dht/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-kad-dht) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
 | **Peer Routing** |
-| [`interface-peer-routing`](//github.com/libp2p/interface-peer-routing) | [![npm](https://img.shields.io/npm/v/interface-peer-routing.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-peer-routing/releases) | [![Deps](https://david-dm.org/libp2p/interface-peer-routing.svg?style=flat-square)](https://david-dm.org/libp2p/interface-peer-routing) | N/A | [![codecov](https://codecov.io/gh/libp2p/interface-peer-routing/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-peer-routing) | N/A |
-| [`libp2p-delegated-peer-routing`](//github.com/libp2p/js-libp2p-delegated-peer-routing) | [![npm](https://img.shields.io/npm/v/libp2p-delegated-peer-routing.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-delegated-peer-routing/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-delegated-peer-routing.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-delegated-peer-routing) | N/A | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-delegated-peer-routing/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-delegated-peer-routing) | [Jacob Heun](mailto:jacobheun@gmail.com) |
-| [`libp2p-kad-dht`](//github.com/libp2p/js-libp2p-kad-dht) | [![npm](https://img.shields.io/npm/v/libp2p-kad-dht.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-kad-dht/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-kad-dht.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-kad-dht) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-kad-dht/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-kad-dht/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-kad-dht/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-kad-dht) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
+| [`interface-peer-routing`](//github.com/libp2p/interface-peer-routing) | [![npm](https://img.shields.io/npm/v/interface-peer-routing.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-peer-routing/releases) | [![Deps](https://david-dm.org/libp2p/interface-peer-routing.svg?style=flat-square)](https://david-dm.org/libp2p/interface-peer-routing) | [![Travis CI](https://travis-ci.com/libp2p/interface-peer-routing.svg?branch=master)](https://travis-ci.com/libp2p/interface-peer-routing) | [![codecov](https://codecov.io/gh/libp2p/interface-peer-routing/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-peer-routing) | N/A |
+| [`libp2p-delegated-peer-routing`](//github.com/libp2p/js-libp2p-delegated-peer-routing) | [![npm](https://img.shields.io/npm/v/libp2p-delegated-peer-routing.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-delegated-peer-routing/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-delegated-peer-routing.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-delegated-peer-routing) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-delegated-peer-routing.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-delegated-peer-routing) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-delegated-peer-routing/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-delegated-peer-routing) | [Jacob Heun](mailto:jacobheun@gmail.com) |
+| [`libp2p-kad-dht`](//github.com/libp2p/js-libp2p-kad-dht) | [![npm](https://img.shields.io/npm/v/libp2p-kad-dht.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-kad-dht/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-kad-dht.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-kad-dht) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-kad-dht.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-kad-dht) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-kad-dht/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-kad-dht) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
 | **Record Store** |
-| [`interface-record-store`](//github.com/libp2p/interface-record-store) | [![npm](https://img.shields.io/npm/v/interface-record-store.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-record-store/releases) | [![Deps](https://david-dm.org/libp2p/interface-record-store.svg?style=flat-square)](https://david-dm.org/libp2p/interface-record-store) | N/A | [![codecov](https://codecov.io/gh/libp2p/interface-record-store/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-record-store) | N/A |
-| [`libp2p-record`](//github.com/libp2p/js-libp2p-record) | [![npm](https://img.shields.io/npm/v/libp2p-record.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-record/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-record.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-record) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-record/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-record/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-record/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-record) | N/A |
+| [`interface-record-store`](//github.com/libp2p/interface-record-store) | [![npm](https://img.shields.io/npm/v/interface-record-store.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-record-store/releases) | [![Deps](https://david-dm.org/libp2p/interface-record-store.svg?style=flat-square)](https://david-dm.org/libp2p/interface-record-store) | [![Travis CI](https://travis-ci.com/libp2p/interface-record-store.svg?branch=master)](https://travis-ci.com/libp2p/interface-record-store) | [![codecov](https://codecov.io/gh/libp2p/interface-record-store/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-record-store) | N/A |
+| [`libp2p-record`](//github.com/libp2p/js-libp2p-record) | [![npm](https://img.shields.io/npm/v/libp2p-record.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-record/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-record.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-record) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-record.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-record) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-record/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-record) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
 | **Generics** |
-| [`libp2p-connection-manager`](//github.com/libp2p/js-libp2p-connection-manager) | [![npm](https://img.shields.io/npm/v/libp2p-connection-manager.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-connection-manager/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-connection-manager.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-connection-manager) | N/A | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-connection-manager/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-connection-manager) | N/A |
-| [`libp2p-crypto`](//github.com/libp2p/js-libp2p-crypto) | [![npm](https://img.shields.io/npm/v/libp2p-crypto.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-crypto/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-crypto.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-crypto) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-crypto/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-crypto/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-crypto/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-crypto) | [Friedel Ziegelmayer](mailto:dignifiedquire@gmail.com) |
-| [`libp2p-crypto-secp256k1`](//github.com/libp2p/js-libp2p-crypto-secp256k1) | [![npm](https://img.shields.io/npm/v/libp2p-crypto-secp256k1.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-crypto-secp256k1/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-crypto-secp256k1.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-crypto-secp256k1) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-crypto-secp256k1/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-crypto-secp256k1/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-crypto-secp256k1/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-crypto-secp256k1) | N/A |
-| [`libp2p-switch`](//github.com/libp2p/js-libp2p-switch) | [![npm](https://img.shields.io/npm/v/libp2p-switch.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-switch/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-switch.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-switch) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-switch/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-switch/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-switch/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-switch) | [Jacob Heun](mailto:jacobheun@gmail.com) |
+| [`libp2p-connection-manager`](//github.com/libp2p/js-libp2p-connection-manager) | [![npm](https://img.shields.io/npm/v/libp2p-connection-manager.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-connection-manager/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-connection-manager.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-connection-manager) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-connection-manager.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-connection-manager) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-connection-manager/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-connection-manager) | N/A |
+| [`libp2p-crypto`](//github.com/libp2p/js-libp2p-crypto) | [![npm](https://img.shields.io/npm/v/libp2p-crypto.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-crypto/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-crypto.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-crypto) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-crypto.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-crypto) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-crypto/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-crypto) | [Friedel Ziegelmayer](mailto:dignifiedquire@gmail.com) |
+| [`libp2p-crypto-secp256k1`](//github.com/libp2p/js-libp2p-crypto-secp256k1) | [![npm](https://img.shields.io/npm/v/libp2p-crypto-secp256k1.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-crypto-secp256k1/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-crypto-secp256k1.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-crypto-secp256k1) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-crypto-secp256k1.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-crypto-secp256k1) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-crypto-secp256k1/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-crypto-secp256k1) | [Friedel Ziegelmayer](mailto:dignifiedquire@gmail.com) |
+| [`libp2p-switch`](//github.com/libp2p/js-libp2p-switch) | [![npm](https://img.shields.io/npm/v/libp2p-switch.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-switch/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-switch.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-switch) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-switch.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-switch) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-switch/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-switch) | [Jacob Heun](mailto:jacobheun@gmail.com) |
 | **Extensions** |
-| [`libp2p-floodsub`](//github.com/libp2p/js-libp2p-floodsub) | [![npm](https://img.shields.io/npm/v/libp2p-floodsub.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-floodsub/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-floodsub.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-floodsub) | N/A | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-floodsub/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-floodsub) | N/A |
-| [`libp2p-identify`](//github.com/libp2p/js-libp2p-identify) | [![npm](https://img.shields.io/npm/v/libp2p-identify.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-identify/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-identify.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-identify) | N/A | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-identify/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-identify) | [Jacob Heun](mailto:jacobheun@gmail.com) |
-| [`libp2p-keychain`](//github.com/libp2p/js-libp2p-keychain) | [![npm](https://img.shields.io/npm/v/libp2p-keychain.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-keychain/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-keychain.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-keychain) | N/A | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-keychain/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-keychain) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
-| [`libp2p-ping`](//github.com/libp2p/js-libp2p-ping) | [![npm](https://img.shields.io/npm/v/libp2p-ping.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-ping/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-ping.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-ping) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-ping/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-ping/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-ping/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-ping) | N/A |
-| [`libp2p-pnet`](//github.com/libp2p/js-libp2p-pnet) | [![npm](https://img.shields.io/npm/v/libp2p-pnet.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-pnet/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-pnet.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-pnet) | N/A | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-pnet/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-pnet) | [Jacob Heun](mailto:jacobheun@gmail.com) |
+| [`libp2p-floodsub`](//github.com/libp2p/js-libp2p-floodsub) | [![npm](https://img.shields.io/npm/v/libp2p-floodsub.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-floodsub/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-floodsub.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-floodsub) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-floodsub.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-floodsub) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-floodsub/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-floodsub) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
+| [`libp2p-identify`](//github.com/libp2p/js-libp2p-identify) | [![npm](https://img.shields.io/npm/v/libp2p-identify.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-identify/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-identify.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-identify) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-identify.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-identify) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-identify/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-identify) | [Jacob Heun](mailto:jacobheun@gmail.com) |
+| [`libp2p-keychain`](//github.com/libp2p/js-libp2p-keychain) | [![npm](https://img.shields.io/npm/v/libp2p-keychain.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-keychain/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-keychain.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-keychain) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-keychain.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-keychain) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-keychain/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-keychain) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
+| [`libp2p-ping`](//github.com/libp2p/js-libp2p-ping) | [![npm](https://img.shields.io/npm/v/libp2p-ping.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-ping/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-ping.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-ping) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-ping.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-ping) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-ping/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-ping) | [Jacob Heun](mailto:jacobheun@gmail.com) |
+| [`libp2p-pnet`](//github.com/libp2p/js-libp2p-pnet) | [![npm](https://img.shields.io/npm/v/libp2p-pnet.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-pnet/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-pnet.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-pnet) | [![Travis CI](https://travis-ci.com/libp2p/js-libp2p-pnet.svg?branch=master)](https://travis-ci.com/libp2p/js-libp2p-pnet) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-pnet/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-pnet) | [Jacob Heun](mailto:jacobheun@gmail.com) |
 | **Utilities** |
-| [`p2pcat`](//github.com/libp2p/js-p2pcat) | [![npm](https://img.shields.io/npm/v/p2pcat.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-p2pcat/releases) | [![Deps](https://david-dm.org/libp2p/js-p2pcat.svg?style=flat-square)](https://david-dm.org/libp2p/js-p2pcat) | N/A | [![codecov](https://codecov.io/gh/libp2p/js-p2pcat/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-p2pcat) | N/A |
+| [`p2pcat`](//github.com/libp2p/js-p2pcat) | [![npm](https://img.shields.io/npm/v/p2pcat.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-p2pcat/releases) | [![Deps](https://david-dm.org/libp2p/js-p2pcat.svg?style=flat-square)](https://david-dm.org/libp2p/js-p2pcat) | [![Travis CI](https://travis-ci.com/libp2p/js-p2pcat.svg?branch=master)](https://travis-ci.com/libp2p/js-p2pcat) | [![codecov](https://codecov.io/gh/libp2p/js-p2pcat/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-p2pcat) | N/A |

 ## Contribute

--- a/RELEASE.md
+++ b/RELEASE.md
@@ -33,7 +33,7 @@
    - [ ] Twitter
    - [ ] IRC
    - [ ] Reddit
-    - [ ] [discuss.ipfs.io](https://discuss.ipfs.io/c/announcements)
+    - [ ] [discuss.libp2p.io](https://discuss.libp2p.io/c/news)
  - [ ] Blog post
  - [ ] Copy release notes to the [GitHub Release description](https://github.com/libp2p/js-libp2p/releases)

@@ -47,7 +47,7 @@ In alphabetical order, here are all the humans that contributed to the release:

 Would you like to contribute to the libp2p project and don't know how? Well, there are a few places you can get started:

- Check the issues with the `help wanted` label at the Ready column in our waffle board - https://waffle.io/libp2p/js-libp2p?label=help%20wanted
+- Check the issues with the `help wanted` label in the [libp2p repo](https://github.com/libp2p/js-libp2p/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)
 - Join an IPFS All Hands, introduce yourself and let us know where you would like to contribute - https://github.com/ipfs/team-mgmt#all-hands-call
 - Hack with IPFS and show us what you made! The All Hands call is also the perfect venue for demos, join in and show us what you built
 - Join the discussion at http://discuss.ipfs.io/ and help users finding their answers.
@@ -55,4 +55,4 @@ Would you like to contribute to the libp2p project and don't know how? Well, the

 # ⁉️ Do you have questions?

-The best place to ask your questions about libp2p, how it works and what you can do with it is at [discuss.ipfs.io](http://discuss.ipfs.io). We are also available at the #libp2p channel on Freenode.
+The best place to ask your questions about libp2p, how it works and what you can do with it is at [discuss.libp2p.io](https://discuss.libp2p.io). We are also available at the #libp2p channel on Freenode.
--- a/examples/chat/README.md
+++ b/examples/chat/README.md
@@ -3,8 +3,8 @@
 This example creates a simple chat app in your terminal.

 ## Setup
-1. Install the modules, `npm install`.
-2. Open 2 terminal windows in the `./src` directory.
+1. Install the modules in the libp2p root directory, `npm install`.
+2. Open 2 terminal windows in the `./examples/chat/src` directory.

 ## Running
 1. Run the listener in window 1, `node listener.js`
--- a/examples/delegated-routing/package.json
+++ b/examples/delegated-routing/package.json
@@ -3,21 +3,27 @@
  "version": "0.1.0",
  "private": true,
  "dependencies": {
-    "ipfs": "~0.32.2",
-    "libp2p": "../../",
+    "ipfs": "~0.34.4",
+    "libp2p": "github:libp2p/js-libp2p#master",
    "libp2p-delegated-content-routing": "~0.2.2",
    "libp2p-delegated-peer-routing": "~0.2.2",
-    "libp2p-kad-dht": "~0.10.4",
-    "libp2p-mplex": "~0.8.0",
-    "libp2p-secio": "~0.10.0",
-    "libp2p-webrtc-star": "~0.15.5",
-    "libp2p-websocket-star": "~0.8.1",
-    "libp2p-websockets": "~0.12.0",
-    "react": "^16.5.2",
-    "react-dom": "^16.5.2",
-    "react-scripts": "1.1.5"
+    "libp2p-kad-dht": "~0.14.12",
+    "libp2p-mplex": "~0.8.5",
+    "libp2p-secio": "~0.11.1",
+    "libp2p-webrtc-star": "~0.15.8",
+    "libp2p-websocket-star": "~0.10.2",
+    "libp2p-websockets": "~0.12.2",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
+    "react-scripts": "2.1.8"
  },
  "scripts": {
    "start": "react-scripts start"
-  }
+  },
+  "browserslist": [
+    ">0.2%",
+    "not dead",
+    "not ie <= 11",
+    "not op_mini all"
+  ]
 }
--- a/examples/delegated-routing/src/App.js
+++ b/examples/delegated-routing/src/App.js
@@ -1,11 +1,10 @@
 // eslint-disable-next-line
 'use strict'

-const React = require('react')
+import React from 'react'
+import Ipfs from 'ipfs'
+import libp2pBundle from './libp2p-bundle'
 const Component = React.Component
-const Ipfs = require('ipfs')
-const libp2pBundle = require('./libp2p-bundle')
-// require('./App.css')

 const BootstrapNode = '/ip4/127.0.0.1/tcp/8081/ws/p2p/QmdoG8DpzYUZMVP5dGmgmigZwR1RE8Cf6SxMPg1SBXJAQ8'

@@ -150,4 +149,4 @@ class App extends Component {
  }
 }

-module.exports = App
+export default App
--- a/examples/delegated-routing/src/index.js
+++ b/examples/delegated-routing/src/index.js
@@ -1,9 +1,8 @@
 // eslint-disable-next-line
 'use strict'

-const React = require('react') // eslint-disable-line no-unused-vars
-const ReactDOM = require('react-dom')
-const App = require('./App') // eslint-disable-line no-unused-vars
-// require('index.css')
+import React from 'react' // eslint-disable-line no-unused-vars
+import ReactDOM from 'react-dom'
+import App from './App' // eslint-disable-line no-unused-vars

 ReactDOM.render(<App />, document.getElementById('root'))
--- a/examples/delegated-routing/src/libp2p-bundle.js
+++ b/examples/delegated-routing/src/libp2p-bundle.js
@@ -11,7 +11,7 @@ const KadDHT = require('libp2p-kad-dht')
 const DelegatedPeerRouter = require('libp2p-delegated-peer-routing')
 const DelegatedContentRouter = require('libp2p-delegated-content-routing')

-module.exports = ({peerInfo, peerBook}) => {
+export default function Libp2pBundle ({peerInfo, peerBook}) {
  const wrtcstar = new WebRTCStar({id: peerInfo.id})
  const wsstar = new WebSocketStar({id: peerInfo.id})
  const delegatedApiOptions = {
@@ -54,6 +54,7 @@ module.exports = ({peerInfo, peerBook}) => {
    },
    config: {
      peerDiscovery: {
+        autoDial: false,
        webrtcStar: {
          enabled: false
        },
@@ -62,16 +63,13 @@ module.exports = ({peerInfo, peerBook}) => {
        }
      },
      dht: {
-        kBucketSize: 20
+        enabled: false
      },
      relay: {
        enabled: true,
        hop: {
          enabled: false
        }
-      },
-      EXPERIMENTAL: {
-        dht: false
      }
    }
  })
--- a/examples/discovery-mechanisms/1.js
+++ b/examples/discovery-mechanisms/1.js
@@ -34,8 +34,9 @@ class MyBundle extends libp2p {
      },
      config: {
        peerDiscovery: {
+          autoDial: true,
          bootstrap: {
-            interval: 2000,
+            interval: 20e3,
            enabled: true,
            list: bootstrapers
          }
@@ -62,8 +63,8 @@ waterfall([
  if (err) { throw err }

  node.on('peer:discovery', (peer) => {
+    // No need to dial, autoDial is on
    console.log('Discovered:', peer.id.toB58String())
-    node.dial(peer, () => {})
  })

  node.on('peer:connect', (peer) => {
--- a/examples/discovery-mechanisms/2.js
+++ b/examples/discovery-mechanisms/2.js
@@ -23,7 +23,7 @@ class MyBundle extends libp2p {
      config: {
        peerDiscovery: {
          mdns: {
-            interval: 1000,
+            interval: 20e3,
            enabled: true
          }
        }
--- a/examples/echo/README.md
+++ b/examples/echo/README.md
@@ -3,7 +3,7 @@
 This example performs a simple echo from the listener to the dialer.

 ## Setup
-1. Install the modules, `npm install`.
+1. Install the modules from libp2p root, `npm install`.
 2. Open 2 terminal windows in the `./src` directory.

 ## Running
--- a/examples/libp2p-in-the-browser/1/package.json
+++ b/examples/libp2p-in-the-browser/1/package.json
@@ -17,13 +17,15 @@
  },
  "dependencies": {
    "detect-dom-ready": "^1.0.2",
-    "libp2p-bootstrap": "~0.9.3",
-    "libp2p-mplex": "~0.8.0",
-    "libp2p-secio": "~0.10.0",
-    "libp2p-spdy": "~0.12.1",
-    "libp2p-webrtc-star": "~0.15.3",
-    "libp2p-websocket-star": "~0.8.1",
-    "libp2p-websockets": "~0.12.0",
+    "libp2p": "../../../",
+    "libp2p-bootstrap": "~0.9.7",
+    "libp2p-kad-dht": "^0.15.3",
+    "libp2p-mplex": "~0.8.5",
+    "libp2p-secio": "~0.11.1",
+    "libp2p-spdy": "~0.13.3",
+    "libp2p-webrtc-star": "~0.15.8",
+    "libp2p-websocket-star": "~0.10.2",
+    "libp2p-websockets": "~0.12.2",
    "peer-info": "~0.15.1"
  }
 }
--- a/examples/libp2p-in-the-browser/1/src/browser-bundle.js
+++ b/examples/libp2p-in-the-browser/1/src/browser-bundle.js
@@ -7,8 +7,8 @@ const Mplex = require('libp2p-mplex')
 const SPDY = require('libp2p-spdy')
 const SECIO = require('libp2p-secio')
 const Bootstrap = require('libp2p-bootstrap')
-const defaultsDeep = require('@nodeutils/defaults-deep')
-const libp2p = require('../../../../')
+const DHT = require('libp2p-kad-dht')
+const libp2p = require('libp2p')

 // Find this list at: https://github.com/ipfs/js-ipfs/blob/master/src/core/runtime/config-browser.json
 const bootstrapList = [
@@ -25,9 +25,9 @@ const bootstrapList = [
 ]

 class Node extends libp2p {
-  constructor (_options) {
-    const wrtcStar = new WebRTCStar({ id: _options.peerInfo.id })
-    const wsstar = new WebSocketStar({ id: _options.peerInfo.id })
+  constructor ({ peerInfo }) {
+    const wrtcStar = new WebRTCStar({ id: peerInfo.id })
+    const wsstar = new WebSocketStar({ id: peerInfo.id })

    const defaults = {
      modules: {
@@ -47,10 +47,12 @@ class Node extends libp2p {
          wrtcStar.discovery,
          wsstar.discovery,
          Bootstrap
-        ]
+        ],
+        dht: DHT
      },
      config: {
        peerDiscovery: {
+          autoDial: true,
          webRTCStar: {
            enabled: true
          },
@@ -58,7 +60,7 @@ class Node extends libp2p {
            enabled: true
          },
          bootstrap: {
-            interval: 10000,
+            interval: 20e3,
            enabled: true,
            list: bootstrapList
          }
@@ -66,21 +68,24 @@ class Node extends libp2p {
        relay: {
          enabled: true,
          hop: {
-            enabled: true,
+            enabled: false,
            active: false
          }
        },
+        dht: {
+          enabled: false
+        },
        EXPERIMENTAL: {
-          dht: false,
          pubsub: false
        }
      },
      connectionManager: {
+        minPeers: 10,
        maxPeers: 50
      }
    }

-    super(defaultsDeep(_options, defaults))
+    super({ ...defaults, peerInfo })
  }
 }

--- a/examples/libp2p-in-the-browser/1/src/create-node.js
+++ b/examples/libp2p-in-the-browser/1/src/create-node.js
@@ -10,9 +10,11 @@ function createNode (callback) {
    }

    const peerIdStr = peerInfo.id.toB58String()
-    const ma = `/dns4/star-signal.cloud.ipfs.team/tcp/443/wss/p2p-webrtc-star/p2p/${peerIdStr}`
+    const webrtcAddr = `/dns4/star-signal.cloud.ipfs.team/tcp/443/wss/p2p-webrtc-star/p2p/${peerIdStr}`
+    const wsAddr = `/dns4/ws-star.discovery.libp2p.io/tcp/443/wss/p2p-websocket-star`

-    peerInfo.multiaddrs.add(ma)
+    peerInfo.multiaddrs.add(webrtcAddr)
+    peerInfo.multiaddrs.add(wsAddr)

    const node = new Node({
      peerInfo
--- a/examples/libp2p-in-the-browser/1/src/index.js
+++ b/examples/libp2p-in-the-browser/1/src/index.js
@@ -14,26 +14,8 @@ domReady(() => {
      return console.log('Could not create the Node, check if your browser has WebRTC Support', err)
    }

-    let connections = {}
-
    node.on('peer:discovery', (peerInfo) => {
-      const idStr = peerInfo.id.toB58String()
-      if (connections[idStr]) {
-        // If we're already trying to connect to this peer, dont dial again
-        return
-      }
-      console.log('Discovered a peer:', idStr)
-
-      connections[idStr] = true
-      node.dial(peerInfo, (err, conn) => {
-        if (err) {
-          // Prevent immediate connection retries from happening
-          // and include a 10s jitter
-          const timeToNextDial = 25 * 1000 + (Math.random(0) * 10000).toFixed(0)
-          console.log('Failed to dial:', idStr)
-          setTimeout(() => delete connections[idStr], timeToNextDial)
-        }
-      })
+      console.log('Discovered a peer:', peerInfo.id.toB58String())
    })

    node.on('peer:connect', (peerInfo) => {
@@ -47,15 +29,13 @@ domReady(() => {

    node.on('peer:disconnect', (peerInfo) => {
      const idStr = peerInfo.id.toB58String()
-      delete connections[idStr]
-      console.log('Lost connection to: ' + idStr)
      const el = document.getElementById(idStr)
      el && el.remove()
    })

    node.start((err) => {
      if (err) {
-        return console.log('WebRTC not supported')
+        return console.log(err)
      }

      const idStr = node.peerInfo.id.toB58String()
@@ -66,6 +46,9 @@ domReady(() => {
      myPeerDiv.append(idDiv)

      console.log('Node is listening o/')
+      node.peerInfo.multiaddrs.toArray().forEach(ma => {
+        console.log(ma.toString())
+      })

      // NOTE: to stop the node
      // node.stop((err) => {})
--- a/examples/libp2p-in-the-browser/README.md
+++ b/examples/libp2p-in-the-browser/README.md
@@ -20,5 +20,3 @@ Then simply go into the folder [1](./1) and execute the following
 > npm start
 # open your browser in port :9090
 ```
-
-[Version Published on IPFS](http://ipfs.io/ipfs/Qmbc1J7ehw1dNYachbkCWPto4RsnVvqCKNVzmYEod2gXcy)
--- a/examples/peer-and-content-routing/1.js
+++ b/examples/peer-and-content-routing/1.js
@@ -23,10 +23,8 @@ class MyBundle extends libp2p {
      },
      config: {
        dht: {
+          enabled: true,
          kBucketSize: 20
-        },
-        EXPERIMENTAL: {
-          dht: true
        }
      }
    }
--- a/examples/peer-and-content-routing/2.js
+++ b/examples/peer-and-content-routing/2.js
@@ -24,10 +24,8 @@ class MyBundle extends libp2p {
      },
      config: {
        dht: {
+          enabled: true,
          kBucketSize: 20
-        },
-        EXPERIMENTAL: {
-          dht: true
        }
      }
    }
--- a/examples/peer-and-content-routing/README.md
+++ b/examples/peer-and-content-routing/README.md
@@ -25,11 +25,9 @@ class MyBundle extends libp2p {
      },
      config: {
        dht: {
-          kBucketSize: 20
-        },
-        EXPERIMENTAL: {
          // dht must be enabled
-          dht: true
+          enabled: true,
+          kBucketSize: 20
        }
      }
    }
--- a/examples/pubsub/1.js
+++ b/examples/pubsub/1.js
@@ -62,11 +62,8 @@ parallel([
  const node1 = nodes[0]
  const node2 = nodes[1]

-  series([
-    (cb) => node1.once('peer:discovery', (peer) => node1.dial(peer, cb)),
-    (cb) => setTimeout(cb, 500)
-  ], (err) => {
-    if (err) { throw err }
+  node1.once('peer:connect', (peer) => {
+    console.log('connected to %s', peer.id.toB58String())

    // Subscribe to the topic 'news'
    node1.pubsub.subscribe('news',
--- a/examples/pubsub/README.md
+++ b/examples/pubsub/README.md
@@ -12,14 +12,11 @@ We've seen many interesting use cases appear with this, here are some highlights

 For this example, we will use MulticastDNS for automatic Peer Discovery. This example is based the previous examples found in [Discovery Mechanisms](../discovery-mechanisms). You can find the complete version at [1.js](./1.js).

-Using PubSub is super simple, all you have to do is start a libp2p node, PubSub will be enabled by default.
+Using PubSub is super simple, all you have to do is start a libp2p node with `EXPERIMENTAL.pubsub` set to true.

 ```JavaScript
-series([
-  (cb) => node1.once('peer:discovery', (peer) => node1.dial(peer, cb)),
-  (cb) => setTimeout(cb, 500)
-], (err) => {
-  if (err) { throw err }
+node1.once('peer:connect', (peer) => {
+  console.log('connected to %s', peer.id.toB58String())

  // Subscribe to the topic 'news'
  node1.pubsub.subscribe('news',
@@ -42,6 +39,7 @@ The output of the program should look like:

 ```
 > node 1.js
+connected to QmWpvkKm6qHLhoxpWrTswY6UMNWDyn8hN265Qp9ZYvgS82
 QmWpvkKm6qHLhoxpWrTswY6UMNWDyn8hN265Qp9ZYvgS82 Bird bird bird, bird is the word!
 QmWpvkKm6qHLhoxpWrTswY6UMNWDyn8hN265Qp9ZYvgS82 Bird bird bird, bird is the word!
 QmWpvkKm6qHLhoxpWrTswY6UMNWDyn8hN265Qp9ZYvgS82 Bird bird bird, bird is the word!
--- a/package-list.json
+++ b/package-list.json
@@ -3,7 +3,7 @@
    "Package",
    "Version",
    "Deps",
-    "CI",
+    "CI/Travis",
    "Coverage",
    "Lead Maintainer"
  ],
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "libp2p",
-  "version": "0.25.0-rc.2",
-  "description": "JavaScript base class for libp2p bundles",
+  "version": "0.26.0-rc.1",
+  "description": "JavaScript implementation of libp2p, a modular peer to peer network stack",
  "leadMaintainer": "Jacob Heun <jacobheun@gmail.com>",
  "main": "src/index.js",
  "files": [
@@ -23,72 +23,83 @@
    "url": "https://github.com/libp2p/js-libp2p.git"
  },
  "keywords": [
+    "libp2p",
+    "network",
+    "p2p",
+    "peer",
+    "peer-to-peer",
    "IPFS"
  ],
-  "engines": {
-    "node": ">=6.0.0",
-    "npm": ">=3.0.0"
-  },
-  "license": "MIT",
  "bugs": {
    "url": "https://github.com/libp2p/js-libp2p/issues"
  },
-  "homepage": "https://github.com/libp2p/js-libp2p",
+  "homepage": "https://libp2p.io",
+  "license": "MIT",
  "browser": {
    "./test/utils/bundle-nodejs": "./test/utils/bundle-browser"
  },
+  "engines": {
+    "node": ">=10.0.0",
+    "npm": ">=6.0.0"
+  },
  "dependencies": {
-    "async": "^2.6.1",
-    "debug": "^4.1.0",
+    "async": "^2.6.2",
+    "debug": "^4.1.1",
    "err-code": "^1.1.2",
    "fsm-event": "^2.1.0",
-    "libp2p-connection-manager": "~0.0.2",
-    "libp2p-floodsub": "~0.15.7",
-    "libp2p-ping": "~0.8.5",
-    "libp2p-switch": "~0.41.5",
-    "libp2p-websockets": "~0.12.1",
-    "mafmt": "^6.0.4",
-    "multiaddr": "^6.0.3",
+    "libp2p-connection-manager": "^0.1.0",
+    "libp2p-ping": "^0.8.5",
+    "libp2p-switch": "^0.42.12",
+    "libp2p-websockets": "^0.12.2",
+    "mafmt": "^6.0.7",
+    "multiaddr": "^6.1.0",
    "once": "^1.4.0",
-    "peer-book": "~0.9.1",
-    "peer-id": "~0.12.2",
-    "peer-info": "~0.15.1",
-    "superstruct": "~0.6.0"
+    "peer-book": "^0.9.1",
+    "peer-id": "^0.12.2",
+    "peer-info": "^0.15.1",
+    "promisify-es6": "^1.0.3",
+    "superstruct": "^0.6.0"
  },
  "devDependencies": {
    "@nodeutils/defaults-deep": "^1.1.0",
-    "aegir": "^18.2.0",
+    "aegir": "^20.0.0",
    "chai": "^4.2.0",
    "chai-checkmark": "^1.0.1",
-    "cids": "~0.5.5",
+    "cids": "^0.7.1",
    "dirty-chai": "^2.0.1",
-    "electron-webrtc": "~0.3.0",
-    "interface-datastore": "~0.6.0",
-    "libp2p-bootstrap": "~0.9.3",
-    "libp2p-circuit": "~0.3.0",
-    "libp2p-delegated-content-routing": "~0.2.2",
-    "libp2p-delegated-peer-routing": "~0.2.2",
-    "libp2p-kad-dht": "~0.14.5",
-    "libp2p-mdns": "~0.12.0",
-    "libp2p-mplex": "~0.8.4",
-    "libp2p-secio": "~0.11.0",
-    "libp2p-spdy": "~0.13.0",
-    "libp2p-tcp": "~0.13.0",
-    "libp2p-webrtc-star": "~0.15.5",
-    "libp2p-websocket-star": "~0.10.1",
+    "electron-webrtc": "^0.3.0",
+    "interface-datastore": "^0.6.0",
+    "libp2p-bootstrap": "^0.9.7",
+    "libp2p-circuit": "^0.3.7",
+    "libp2p-delegated-content-routing": "^0.2.2",
+    "libp2p-delegated-peer-routing": "^0.2.2",
+    "libp2p-floodsub": "~0.17.0",
+    "libp2p-gossipsub": "~0.0.4",
+    "libp2p-kad-dht": "^0.15.3",
+    "libp2p-mdns": "^0.12.3",
+    "libp2p-mplex": "^0.8.4",
+    "libp2p-secio": "^0.11.1",
+    "libp2p-spdy": "^0.13.2",
+    "libp2p-tcp": "^0.13.0",
+    "libp2p-webrtc-star": "^0.16.1",
+    "libp2p-websocket-star": "~0.10.2",
    "libp2p-websocket-star-rendezvous": "~0.3.0",
    "lodash.times": "^4.3.2",
-    "nock": "^10.0.2",
+    "merge-options": "^1.0.1",
+    "nock": "^10.0.6",
    "pull-goodbye": "0.0.2",
-    "pull-mplex": "~0.1.0",
-    "pull-serializer": "~0.3.2",
-    "pull-stream": "^3.6.9",
-    "sinon": "^7.2.4",
-    "wrtc": "~0.3.2"
+    "pull-mplex": "^0.1.2",
+    "pull-serializer": "^0.3.2",
+    "pull-stream": "^3.6.12",
+    "sinon": "^7.2.7",
+    "wrtc": "^0.4.1"
  },
  "contributors": [
+    "Aditya Bose <13054902+adbose@users.noreply.github.com>",
    "Alan Shaw <alan.shaw@protocol.ai>",
    "Alan Shaw <alan@tableflip.io>",
+    "Alex Potsides <alex@achingbrain.net>",
+    "Andrew Nesbitt <andrewnez@gmail.com>",
    "Chris Bratlien <chrisbratlien@gmail.com>",
    "Chris Dostert <chrisdostert@users.noreply.github.com>",
    "Daijiro Wachi <daijiro.wachi@gmail.com>",
@@ -99,6 +110,7 @@
    "Florian-Merle <florian.david.merle@gmail.com>",
    "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
    "Giovanni T. Parra <fiatjaf@gmail.com>",
+    "Guy Sviry <32539816+guysv@users.noreply.github.com>",
    "Henrique Dias <hacdias@gmail.com>",
    "Hugo Dias <mail@hugodias.me>",
    "Hugo Dias <hugomrdias@gmail.com>",
@@ -124,6 +136,7 @@
    "Vasco Santos <vasco.santos@moxy.studio>",
    "Vasco Santos <vasco.santos@ua.pt>",
    "Volker Mische <volker.mische@gmail.com>",
+    "Yusef Napora <yusef@napora.org>",
    "Zane Starr <zcstarr@gmail.com>",
    "ebinks <elizabethjbinks@gmail.com>",
    "greenkeeperio-bot <support@greenkeeper.io>",
--- a/src/config.js
+++ b/src/config.js
@@ -12,54 +12,72 @@ const transport = s.union([
  }),
  'function'
 ])
+const modulesSchema = s({
+  connEncryption: optional(list([s('object|function')])),
+  // this is hacky to simulate optional because interface doesnt work correctly with it
+  // change to optional when fixed upstream
+  connProtector: s.union(['undefined', s.interface({ protect: 'function' })]),
+  contentRouting: optional(list(['object'])),
+  dht: optional(s('null|function|object')),
+  pubsub: optional(s('null|function|object')),
+  peerDiscovery: optional(list([s('object|function')])),
+  peerRouting: optional(list(['object'])),
+  streamMuxer: optional(list([s('object|function')])),
+  transport: s.intersection([[transport], s.interface({
+    length (v) {
+      return v > 0 ? true : 'ERROR_EMPTY'
+    }
+  })])
+})

-const optionsSchema = s(
-  {
-    connectionManager: 'object?',
-    datastore: 'object?',
-    peerInfo: 'object',
-    peerBook: 'object?',
-    modules: s({
-      connEncryption: optional(list([s('object|function')])),
-      // this is hacky to simulate optional because interface doesnt work correctly with it
-      // change to optional when fixed upstream
-      connProtector: s.union(['undefined', s.interface({ protect: 'function' })]),
-      contentRouting: optional(list(['object'])),
-      dht: optional(s('null|function|object')),
-      peerDiscovery: optional(list([s('object|function')])),
-      peerRouting: optional(list(['object'])),
-      streamMuxer: optional(list([s('object|function')])),
-      transport: list([transport])
-    }),
-    config: s({
-      peerDiscovery: 'object?',
-      relay: s({
-        enabled: 'boolean',
-        hop: optional(s({
-          enabled: 'boolean',
-          active: 'boolean'
-        },
-        { enabled: false, active: false }))
-      }, { enabled: true, hop: {} }),
-      dht: s({
-        kBucketSize: 'number',
-        enabled: 'boolean?',
-        randomWalk: optional(s({
-          enabled: 'boolean?',
-          queriesPerPeriod: 'number?',
-          interval: 'number?',
-          timeout: 'number?'
-        }, { enabled: true, queriesPerPeriod: 1, interval: 30000, timeout: 10000 })),
-        validators: 'object?',
-        selectors: 'object?'
-      }, { enabled: true, kBucketSize: 20, enabledDiscovery: true }),
-      EXPERIMENTAL: s({
-        pubsub: 'boolean'
-      }, { pubsub: false })
-    }, { relay: {}, dht: {}, EXPERIMENTAL: {} })
-  },
-  { config: {}, modules: {} }
-)
+const configSchema = s({
+  peerDiscovery: s('object', {
+    autoDial: true
+  }),
+  relay: s({
+    enabled: 'boolean',
+    hop: optional(s({
+      enabled: 'boolean',
+      active: 'boolean'
+    }, {
+      // HOP defaults
+      enabled: false,
+      active: false
+    }))
+  }, {
+    // Relay defaults
+    enabled: true
+  }),
+  // DHT config
+  dht: s('object?', {
+    // DHT defaults
+    enabled: false,
+    kBucketSize: 20,
+    randomWalk: {
+      enabled: false, // disabled waiting for https://github.com/libp2p/js-libp2p-kad-dht/issues/86
+      queriesPerPeriod: 1,
+      interval: 300e3,
+      timeout: 10e3
+    }
+  }),
+  // Pubsub config
+  pubsub: s('object?', {
+    // DHT defaults
+    enabled: false
+  })
+}, {})
+
+const optionsSchema = s({
+  switch: 'object?',
+  connectionManager: s('object', {
+    minPeers: 25
+  }),
+  datastore: 'object?',
+  peerInfo: 'object',
+  peerBook: 'object?',
+  modules: modulesSchema,
+  config: configSchema
+})

 module.exports.validate = (opts) => {
  const [error, options] = optionsSchema.validate(opts)
@@ -74,5 +92,9 @@ module.exports.validate = (opts) => {
    }
  }

+  if (options.config.peerDiscovery.autoDial === undefined) {
+    options.config.peerDiscovery.autoDial = true
+  }
+
  return options
 }
--- a/src/content-routing.js
+++ b/src/content-routing.js
@@ -3,6 +3,7 @@
 const tryEach = require('async/tryEach')
 const parallel = require('async/parallel')
 const errCode = require('err-code')
+const promisify = require('promisify-es6')

 module.exports = (node) => {
  const routers = node._modules.contentRouting || []
@@ -24,7 +25,7 @@ module.exports = (node) => {
     * @param {function(Error, Result<Array>)} callback
     * @returns {void}
     */
-    findProviders: (key, options, callback) => {
+    findProviders: promisify((key, options, callback) => {
      if (typeof options === 'function') {
        callback = options
        options = {}
@@ -60,7 +61,7 @@ module.exports = (node) => {
        results = results || []
        callback(null, results)
      })
-    },
+    }),

    /**
     * Iterates over all content routers in parallel to notify it is
@@ -70,7 +71,7 @@ module.exports = (node) => {
     * @param {function(Error)} callback
     * @returns {void}
     */
-    provide: (key, callback) => {
+    provide: promisify((key, callback) => {
      if (!routers.length) {
        return callback(errCode(new Error('No content routers available'), 'NO_ROUTERS_AVAILABLE'))
      }
@@ -78,6 +79,6 @@ module.exports = (node) => {
      parallel(routers.map((router) => {
        return (cb) => router.provide(key, cb)
      }), callback)
-    }
+    })
  }
 }
--- a/src/dht.js
+++ b/src/dht.js
@@ -1,37 +1,43 @@
 'use strict'

+const nextTick = require('async/nextTick')
+const errCode = require('err-code')
+const promisify = require('promisify-es6')
+
+const { messages, codes } = require('./errors')
+
 module.exports = (node) => {
  return {
-    put: (key, value, callback) => {
+    put: promisify((key, value, callback) => {
      if (!node._dht) {
-        return callback(new Error('DHT is not available'))
+        return nextTick(callback, errCode(new Error(messages.DHT_DISABLED), codes.DHT_DISABLED))
      }

      node._dht.put(key, value, callback)
-    },
-    get: (key, options, callback) => {
+    }),
+    get: promisify((key, options, callback) => {
      if (typeof options === 'function') {
        callback = options
        options = {}
      }

      if (!node._dht) {
-        return callback(new Error('DHT is not available'))
+        return nextTick(callback, errCode(new Error(messages.DHT_DISABLED), codes.DHT_DISABLED))
      }

      node._dht.get(key, options, callback)
-    },
-    getMany: (key, nVals, options, callback) => {
+    }),
+    getMany: promisify((key, nVals, options, callback) => {
      if (typeof options === 'function') {
        callback = options
        options = {}
      }

      if (!node._dht) {
-        return callback(new Error('DHT is not available'))
+        return nextTick(callback, errCode(new Error(messages.DHT_DISABLED), codes.DHT_DISABLED))
      }

      node._dht.getMany(key, nVals, options, callback)
-    }
+    })
  }
 }
--- a/src/error-messages.js
+++ b/src/error-messages.js
@@ -1,3 +0,0 @@
-'use strict'
-
-exports.NOT_STARTED_YET = 'The libp2p node is not started yet'
--- a/src/errors.js
+++ b/src/errors.js
@@ -0,0 +1,13 @@
+'use strict'
+
+exports.messages = {
+  NOT_STARTED_YET: 'The libp2p node is not started yet',
+  DHT_DISABLED: 'DHT is not available'
+}
+
+exports.codes = {
+  DHT_DISABLED: 'ERR_DHT_DISABLED',
+  PUBSUB_NOT_STARTED: 'ERR_PUBSUB_NOT_STARTED',
+  ERR_NODE_NOT_STARTED: 'ERR_NODE_NOT_STARTED',
+  ERR_DISCOVERED_SELF: 'ERR_DISCOVERED_SELF'
+}
--- a/src/get-peer-info.js
+++ b/src/get-peer-info.js
@@ -4,12 +4,13 @@ const PeerId = require('peer-id')
 const PeerInfo = require('peer-info')
 const multiaddr = require('multiaddr')
 const errCode = require('err-code')
+const promisify = require('promisify-es6')

 module.exports = (node) => {
  /*
   * Helper method to check the data type of peer and convert it to PeerInfo
   */
-  return function (peer, callback) {
+  return promisify(function (peer, callback) {
    let p
    // PeerInfo
    if (PeerInfo.isPeerInfo(peer)) {
@@ -62,5 +63,5 @@ module.exports = (node) => {
    }

    callback(null, p)
-  }
+  })
 }
--- a/src/index.js
+++ b/src/index.js
@@ -6,12 +6,15 @@ const debug = require('debug')
 const log = debug('libp2p')
 log.error = debug('libp2p:error')
 const errCode = require('err-code')
+const promisify = require('promisify-es6')

 const each = require('async/each')
 const series = require('async/series')
 const parallel = require('async/parallel')
+const nextTick = require('async/nextTick')

 const PeerBook = require('peer-book')
+const PeerInfo = require('peer-info')
 const Switch = require('libp2p-switch')
 const Ping = require('libp2p-ping')
 const WebSockets = require('libp2p-websockets')
@@ -24,48 +27,49 @@ const dht = require('./dht')
 const pubsub = require('./pubsub')
 const getPeerInfo = require('./get-peer-info')
 const validateConfig = require('./config').validate
+const { codes } = require('./errors')

 const notStarted = (action, state) => {
  return errCode(
    new Error(`libp2p cannot ${action} when not started; state is ${state}`),
-    'ERR_NODE_NOT_STARTED'
+    codes.ERR_NODE_NOT_STARTED
  )
 }

 /**
- * @fires Node#error Emitted when an error occurs
- * @fires Node#peer:connect Emitted when a peer is connected to this node
- * @fires Node#peer:disconnect Emitted when a peer disconnects from this node
- * @fires Node#peer:discovery Emitted when a peer is discovered
- * @fires Node#start Emitted when the node and its services has started
- * @fires Node#stop Emitted when the node and its services has stopped
+ * @fires Libp2p#error Emitted when an error occurs
+ * @fires Libp2p#peer:connect Emitted when a peer is connected to this node
+ * @fires Libp2p#peer:disconnect Emitted when a peer disconnects from this node
+ * @fires Libp2p#peer:discovery Emitted when a peer is discovered
+ * @fires Libp2p#start Emitted when the node and its services has started
+ * @fires Libp2p#stop Emitted when the node and its services has stopped
 */
-class Node extends EventEmitter {
+class Libp2p extends EventEmitter {
  constructor (_options) {
    super()
    // validateConfig will ensure the config is correct,
    // and add default values where appropriate
-    _options = validateConfig(_options)
+    this._options = validateConfig(_options)

-    this.datastore = _options.datastore
-    this.peerInfo = _options.peerInfo
-    this.peerBook = _options.peerBook || new PeerBook()
+    this.datastore = this._options.datastore
+    this.peerInfo = this._options.peerInfo
+    this.peerBook = this._options.peerBook || new PeerBook()

-    this._modules = _options.modules
-    this._config = _options.config
+    this._modules = this._options.modules
+    this._config = this._options.config
    this._transport = [] // Transport instances/references
    this._discovery = [] // Discovery service instances/references

    // create the switch, and listen for errors
-    this._switch = new Switch(this.peerInfo, this.peerBook, _options.switch)
+    this._switch = new Switch(this.peerInfo, this.peerBook, this._options.switch)
    this._switch.on('error', (...args) => this.emit('error', ...args))

    this.stats = this._switch.stats
-    this.connectionManager = new ConnectionManager(this, _options.connectionManager)
+    this.connectionManager = new ConnectionManager(this, this._options.connectionManager)

    // Attach stream multiplexers
    if (this._modules.streamMuxer) {
-      let muxers = this._modules.streamMuxer
+      const muxers = this._modules.streamMuxer
      muxers.forEach((muxer) => this._switch.connection.addStreamMuxer(muxer))

      // If muxer exists
@@ -78,7 +82,6 @@ class Node extends EventEmitter {
      // reuse this muxed connection
      this._switch.on('peer-mux-established', (peerInfo) => {
        this.emit('peer:connect', peerInfo)
-        this.peerBook.put(peerInfo)
      })

      this._switch.on('peer-mux-closed', (peerInfo) => {
@@ -86,9 +89,17 @@ class Node extends EventEmitter {
      })
    }

+    // Events for anytime connections are created/removed
+    this._switch.on('connection:start', (peerInfo) => {
+      this.emit('connection:start', peerInfo)
+    })
+    this._switch.on('connection:end', (peerInfo) => {
+      this.emit('connection:end', peerInfo)
+    })
+
    // Attach crypto channels
    if (this._modules.connEncryption) {
-      let cryptos = this._modules.connEncryption
+      const cryptos = this._modules.connEncryption
      cryptos.forEach((crypto) => {
        this._switch.connection.crypto(crypto.tag, crypto.encrypt)
      })
@@ -111,9 +122,9 @@ class Node extends EventEmitter {
      })
    }

-    // enable/disable pubsub
-    if (this._config.EXPERIMENTAL.pubsub) {
-      this.pubsub = pubsub(this)
+    // start pubsub
+    if (this._modules.pubsub && this._config.pubsub.enabled !== false) {
+      this.pubsub = pubsub(this, this._modules.pubsub)
    }

    // Attach remaining APIs
@@ -166,6 +177,23 @@ class Node extends EventEmitter {
      log.error(err)
      this.emit('error', err)
    })
+
+    // Once we start, emit and dial any peers we may have already discovered
+    this.state.on('STARTED', () => {
+      this.peerBook.getAllArray().forEach((peerInfo) => {
+        this.emit('peer:discovery', peerInfo)
+        this._maybeConnect(peerInfo)
+      })
+    })
+
+    this._peerDiscovered = this._peerDiscovered.bind(this)
+
+    // promisify all instance methods
+    ;['start', 'stop', 'dial', 'dialProtocol', 'dialFSM', 'hangUp', 'ping'].forEach(method => {
+      this[method] = promisify(this[method], {
+        context: this
+      })
+    })
  }

  /**
@@ -244,11 +272,7 @@ class Node extends EventEmitter {
    this._getPeerInfo(peer, (err, peerInfo) => {
      if (err) { return callback(err) }

-      this._switch.dial(peerInfo, protocol, (err, conn) => {
-        if (err) { return callback(err) }
-        this.peerBook.put(peerInfo)
-        callback(null, conn)
-      })
+      this._switch.dial(peerInfo, protocol, callback)
    })
  }

@@ -274,13 +298,7 @@ class Node extends EventEmitter {
    this._getPeerInfo(peer, (err, peerInfo) => {
      if (err) { return callback(err) }

-      const connFSM = this._switch.dialFSM(peerInfo, protocol, (err) => {
-        if (!err) {
-          this.peerBook.put(peerInfo)
-        }
-      })
-
-      callback(null, connFSM)
+      this._switch.dialFSM(peerInfo, protocol, callback)
    })
  }

@@ -337,7 +355,7 @@ class Node extends EventEmitter {
      let t

      if (typeof Transport === 'function') {
-        t = new Transport()
+        t = new Transport({ libp2p: this })
      } else {
        t = Transport
      }
@@ -363,58 +381,6 @@ class Node extends EventEmitter {
          this._switch.transport.add(ws.tag || ws.constructor.name, ws)
        }

-        // all transports need to be setup before discover starts
-        if (this._modules.peerDiscovery) {
-          each(this._modules.peerDiscovery, (D, _cb) => {
-            let config = {}
-
-            if (D.tag &&
-              this._config.peerDiscovery &&
-              this._config.peerDiscovery[D.tag]) {
-              config = this._config.peerDiscovery[D.tag]
-            }
-
-            // If not configured to be enabled/disabled then enable by default
-            const enabled = config.enabled == null ? true : config.enabled
-
-            // If enabled then start it
-            if (enabled) {
-              let d
-
-              if (typeof D === 'function') {
-                d = new D(Object.assign({}, config, { peerInfo: this.peerInfo }))
-              } else {
-                d = D
-              }
-
-              d.on('peer', (peerInfo) => this.emit('peer:discovery', peerInfo))
-              this._discovery.push(d)
-              d.start(_cb)
-            } else {
-              _cb()
-            }
-          }, cb)
-        } else {
-          cb()
-        }
-      },
-      (cb) => {
-        if (this._dht) {
-          this._dht.start(() => {
-            this._dht.on('peer', (peerInfo) => this.emit('peer:discovery', peerInfo))
-            cb()
-          })
-        } else {
-          cb()
-        }
-      },
-      (cb) => {
-        if (this._floodSub) {
-          return this._floodSub.start(cb)
-        }
-        cb()
-      },
-      (cb) => {
        // detect which multiaddrs we don't have a transport for and remove them
        const multiaddrs = this.peerInfo.multiaddrs.toArray()

@@ -425,6 +391,30 @@ class Node extends EventEmitter {
          }
        })
        cb()
+      },
+      (cb) => {
+        if (this._dht) {
+          this._dht.start(() => {
+            this._dht.on('peer', this._peerDiscovered)
+            cb()
+          })
+        } else {
+          cb()
+        }
+      },
+      (cb) => {
+        if (this.pubsub) {
+          return this.pubsub.start(cb)
+        }
+        cb()
+      },
+      // Peer Discovery
+      (cb) => {
+        if (this._modules.peerDiscovery) {
+          this._setupPeerDiscovery(cb)
+        } else {
+          cb()
+        }
      }
    ], (err) => {
      if (err) {
@@ -439,25 +429,27 @@ class Node extends EventEmitter {
  _onStopping () {
    series([
      (cb) => {
-        if (this._modules.peerDiscovery) {
-          // stop all discoveries before continuing with shutdown
-          return parallel(
-            this._discovery.map((d) => {
-              return (_cb) => d.stop(() => { _cb() })
-            }),
-            cb
-          )
-        }
-        cb()
+        // stop all discoveries before continuing with shutdown
+        parallel(
+          this._discovery.map((d) => {
+            d.removeListener('peer', this._peerDiscovered)
+            return (_cb) => d.stop((err) => {
+              log.error('an error occurred stopping the discovery service', err)
+              _cb()
+            })
+          }),
+          cb
+        )
      },
      (cb) => {
-        if (this._floodSub) {
-          return this._floodSub.stop(cb)
+        if (this.pubsub) {
+          return this.pubsub.stop(cb)
        }
        cb()
      },
      (cb) => {
        if (this._dht) {
+          this._dht.removeListener('peer', this._peerDiscovered)
          return this._dht.stop(cb)
        }
        cb()
@@ -479,6 +471,107 @@ class Node extends EventEmitter {
      this.state('done')
    })
  }
+
+  /**
+   * Handles discovered peers. Each discovered peer will be emitted via
+   * the `peer:discovery` event. If auto dial is enabled for libp2p
+   * and the current connection count is under the low watermark, the
+   * peer will be dialed.
+   *
+   * TODO: If `peerBook.put` becomes centralized, https://github.com/libp2p/js-libp2p/issues/345,
+   * it would be ideal if only new peers were emitted. Currently, with
+   * other modules adding peers to the `PeerBook` we have no way of knowing
+   * if a peer is new or not, so it has to be emitted.
+   *
+   * @private
+   * @param {PeerInfo} peerInfo
+   */
+  _peerDiscovered (peerInfo) {
+    if (peerInfo.id.toB58String() === this.peerInfo.id.toB58String()) {
+      log.error(new Error(codes.ERR_DISCOVERED_SELF))
+      return
+    }
+    peerInfo = this.peerBook.put(peerInfo)
+
+    if (!this.isStarted()) return
+
+    this.emit('peer:discovery', peerInfo)
+    this._maybeConnect(peerInfo)
+  }
+
+  /**
+   * Will dial to the given `peerInfo` if the current number of
+   * connected peers is less than the configured `ConnectionManager`
+   * minPeers.
+   * @private
+   * @param {PeerInfo} peerInfo
+   */
+  _maybeConnect (peerInfo) {
+    // If auto dialing is on, check if we should dial
+    if (this._config.peerDiscovery.autoDial === true && !peerInfo.isConnected()) {
+      const minPeers = this._options.connectionManager.minPeers || 0
+      if (minPeers > Object.keys(this._switch.connection.connections).length) {
+        log('connecting to discovered peer')
+        this._switch.dialer.connect(peerInfo, (err) => {
+          err && log.error('could not connect to discovered peer', err)
+        })
+      }
+    }
+  }
+
+  /**
+   * Initializes and starts peer discovery services
+   *
+   * @private
+   * @param {function(Error)} callback
+   */
+  _setupPeerDiscovery (callback) {
+    for (const DiscoveryService of this._modules.peerDiscovery) {
+      let config = {
+        enabled: true // on by default
+      }
+
+      if (DiscoveryService.tag &&
+        this._config.peerDiscovery &&
+        this._config.peerDiscovery[DiscoveryService.tag]) {
+        config = { ...config, ...this._config.peerDiscovery[DiscoveryService.tag] }
+      }
+
+      if (config.enabled) {
+        let discoveryService
+
+        if (typeof DiscoveryService === 'function') {
+          discoveryService = new DiscoveryService(Object.assign({}, config, { peerInfo: this.peerInfo }))
+        } else {
+          discoveryService = DiscoveryService
+        }
+
+        discoveryService.on('peer', this._peerDiscovered)
+        this._discovery.push(discoveryService)
+      }
+    }
+
+    each(this._discovery, (d, cb) => {
+      d.start(cb)
+    }, callback)
+  }
 }

-module.exports = Node
+module.exports = Libp2p
+/**
+ * Like `new Libp2p(options)` except it will create a `PeerInfo`
+ * instance if one is not provided in options.
+ * @param {object} options Libp2p configuration options
+ * @param {function(Error, Libp2p)} callback
+ * @returns {void}
+ */
+module.exports.createLibp2p = promisify((options, callback) => {
+  if (options.peerInfo) {
+    return nextTick(callback, null, new Libp2p(options))
+  }
+  PeerInfo.create((err, peerInfo) => {
+    if (err) return callback(err)
+    options.peerInfo = peerInfo
+    callback(null, new Libp2p(options))
+  })
+})
--- a/src/peer-routing.js
+++ b/src/peer-routing.js
@@ -2,6 +2,7 @@

 const tryEach = require('async/tryEach')
 const errCode = require('err-code')
+const promisify = require('promisify-es6')

 module.exports = (node) => {
  const routers = node._modules.peerRouting || []
@@ -21,7 +22,7 @@ module.exports = (node) => {
     * @param {function(Error, Result<Array>)} callback
     * @returns {void}
     */
-    findPeer: (id, options, callback) => {
+    findPeer: promisify((id, options, callback) => {
      if (typeof options === 'function') {
        callback = options
        options = {}
@@ -47,12 +48,12 @@ module.exports = (node) => {
      })

      tryEach(tasks, (err, results) => {
-        if (err && err.code !== 'NOT_FOUND') {
+        if (err) {
          return callback(err)
        }
        results = results || []
        callback(null, results)
      })
-    }
+    })
  }
 }
--- a/src/pubsub.js
+++ b/src/pubsub.js
@@ -1,84 +1,130 @@
 'use strict'

-const setImmediate = require('async/setImmediate')
-const NOT_STARTED_YET = require('./error-messages').NOT_STARTED_YET
-const FloodSub = require('libp2p-floodsub')
+const nextTick = require('async/nextTick')
+const { messages, codes } = require('./errors')
+const promisify = require('promisify-es6')

-module.exports = (node) => {
-  const floodSub = new FloodSub(node)
+const errCode = require('err-code')

-  node._floodSub = floodSub
+module.exports = (node, Pubsub) => {
+  const pubsub = new Pubsub(node, { emitSelf: true })

  return {
-    subscribe: (topic, options, handler, callback) => {
+    /**
+     * Subscribe the given handler to a pubsub topic
+     *
+     * @param {string} topic
+     * @param {function} handler The handler to subscribe
+     * @param {object|null} [options]
+     * @param {function} [callback] An optional callback
+     *
+     * @returns {Promise|void} A promise is returned if no callback is provided
+     *
+     * @example <caption>Subscribe a handler to a topic</caption>
+     *
+     * // `null` must be passed for options until subscribe is no longer using promisify
+     * const handler = (message) => { }
+     * await libp2p.subscribe(topic, handler, null)
+     *
+     * @example <caption>Use a callback instead of the Promise api</caption>
+     *
+     * // `options` may be passed or omitted when supplying a callback
+     * const handler = (message) => { }
+     * libp2p.subscribe(topic, handler, callback)
+     */
+    subscribe: promisify((topic, handler, options, callback) => {
      if (typeof options === 'function') {
-        callback = handler
-        handler = options
+        callback = options
        options = {}
      }

-      if (!node.isStarted() && !floodSub.started) {
-        return setImmediate(() => callback(new Error(NOT_STARTED_YET)))
+      if (!node.isStarted() && !pubsub.started) {
+        return nextTick(callback, errCode(new Error(messages.NOT_STARTED_YET), codes.PUBSUB_NOT_STARTED))
      }

      function subscribe (cb) {
-        if (floodSub.listenerCount(topic) === 0) {
-          floodSub.subscribe(topic)
+        if (pubsub.listenerCount(topic) === 0) {
+          pubsub.subscribe(topic)
        }

-        floodSub.on(topic, handler)
-        setImmediate(cb)
+        pubsub.on(topic, handler)
+        nextTick(cb)
      }

      subscribe(callback)
-    },
+    }),

-    unsubscribe: (topic, handler, callback) => {
-      if (!node.isStarted() && !floodSub.started) {
-        throw new Error(NOT_STARTED_YET)
+    /**
+     * Unsubscribes from a pubsub topic
+     *
+     * @param {string} topic
+     * @param {function|null} handler The handler to unsubscribe from
+     * @param {function} [callback] An optional callback
+     *
+     * @returns {Promise|void} A promise is returned if no callback is provided
+     *
+     * @example <caption>Unsubscribe a topic for all handlers</caption>
+     *
+     * // `null` must be passed until unsubscribe is no longer using promisify
+     * await libp2p.unsubscribe(topic, null)
+     *
+     * @example <caption>Unsubscribe a topic for 1 handler</caption>
+     *
+     * await libp2p.unsubscribe(topic, handler)
+     *
+     * @example <caption>Use a callback instead of the Promise api</caption>
+     *
+     * libp2p.unsubscribe(topic, handler, callback)
+     */
+    unsubscribe: promisify((topic, handler, callback) => {
+      if (!node.isStarted() && !pubsub.started) {
+        return nextTick(callback, errCode(new Error(messages.NOT_STARTED_YET), codes.PUBSUB_NOT_STARTED))
      }
-      if (!handler && !callback) {
-        floodSub.removeAllListeners(topic)
+
+      if (!handler) {
+        pubsub.removeAllListeners(topic)
      } else {
-        floodSub.removeListener(topic, handler)
+        pubsub.removeListener(topic, handler)
      }

-      if (floodSub.listenerCount(topic) === 0) {
-        floodSub.unsubscribe(topic)
+      if (pubsub.listenerCount(topic) === 0) {
+        pubsub.unsubscribe(topic)
      }

      if (typeof callback === 'function') {
-        setImmediate(() => callback())
-      }
-    },
-
-    publish: (topic, data, callback) => {
-      if (!node.isStarted() && !floodSub.started) {
-        return setImmediate(() => callback(new Error(NOT_STARTED_YET)))
+        return nextTick(() => callback())
      }

-      if (!Buffer.isBuffer(data)) {
-        return setImmediate(() => callback(new Error('data must be a Buffer')))
+      return Promise.resolve()
+    }),
+
+    publish: promisify((topic, data, callback) => {
+      if (!node.isStarted() && !pubsub.started) {
+        return nextTick(callback, errCode(new Error(messages.NOT_STARTED_YET), codes.PUBSUB_NOT_STARTED))
      }

-      floodSub.publish(topic, data)
-
-      setImmediate(() => callback())
-    },
-
-    ls: (callback) => {
-      if (!node.isStarted() && !floodSub.started) {
-        return setImmediate(() => callback(new Error(NOT_STARTED_YET)))
+      try {
+        data = Buffer.from(data)
+      } catch (err) {
+        return nextTick(callback, errCode(new Error('data must be convertible to a Buffer'), 'ERR_DATA_IS_NOT_VALID'))
      }

-      const subscriptions = Array.from(floodSub.subscriptions)
+      pubsub.publish(topic, data, callback)
+    }),

-      setImmediate(() => callback(null, subscriptions))
-    },
+    ls: promisify((callback) => {
+      if (!node.isStarted() && !pubsub.started) {
+        return nextTick(callback, errCode(new Error(messages.NOT_STARTED_YET), codes.PUBSUB_NOT_STARTED))
+      }

-    peers: (topic, callback) => {
-      if (!node.isStarted() && !floodSub.started) {
-        return setImmediate(() => callback(new Error(NOT_STARTED_YET)))
+      const subscriptions = Array.from(pubsub.subscriptions)
+
+      nextTick(() => callback(null, subscriptions))
+    }),
+
+    peers: promisify((topic, callback) => {
+      if (!node.isStarted() && !pubsub.started) {
+        return nextTick(callback, errCode(new Error(messages.NOT_STARTED_YET), codes.PUBSUB_NOT_STARTED))
      }

      if (typeof topic === 'function') {
@@ -86,15 +132,19 @@ module.exports = (node) => {
        topic = null
      }

-      const peers = Array.from(floodSub.peers.values())
+      const peers = Array.from(pubsub.peers.values())
        .filter((peer) => topic ? peer.topics.has(topic) : true)
        .map((peer) => peer.info.id.toB58String())

-      setImmediate(() => callback(null, peers))
-    },
+      nextTick(() => callback(null, peers))
+    }),

    setMaxListeners (n) {
-      return floodSub.setMaxListeners(n)
-    }
+      return pubsub.setMaxListeners(n)
+    },
+
+    start: promisify((cb) => pubsub.start(cb)),
+
+    stop: promisify((cb) => pubsub.stop(cb))
  }
 }
--- a/test/circuit-relay.node.js
+++ b/test/circuit-relay.node.js
@@ -16,7 +16,7 @@ const tryEcho = require('./utils/try-echo')
 const echo = require('./utils/echo')

 describe('circuit relay', () => {
-  let handlerSpies = []
+  const handlerSpies = []
  let relayNode1
  let relayNode2
  let nodeWS1
@@ -114,10 +114,9 @@ describe('circuit relay', () => {
        nodeWS2 = node
        cb()
      }),
-      // set up node with TCP and listening on relay1
+      // set up node with TCP
      (cb) => setupNode([
-        '/ip4/0.0.0.0/tcp/0',
-        `/p2p/${relayNode1.peerInfo.id.toB58String()}/p2p-circuit`
+        '/ip4/0.0.0.0/tcp/0'
      ], {
        config: {
          relay: {
@@ -128,10 +127,9 @@ describe('circuit relay', () => {
        nodeTCP1 = node
        cb()
      }),
-      // set up node with TCP and listening on relay2 over TCP transport
+      // set up node with TCP
      (cb) => setupNode([
-        '/ip4/0.0.0.0/tcp/0',
-        `/ip4/0.0.0.0/tcp/0/p2p/${relayNode2.peerInfo.id.toB58String()}/p2p-circuit`
+        '/ip4/0.0.0.0/tcp/0'
      ], {
        config: {
          relay: {
--- a/test/config.spec.js
+++ b/test/config.spec.js
@@ -33,7 +33,7 @@ describe('configuration', () => {
    expect(() => {
      validateConfig({
        modules: {
-          transport: [ WS ]
+          transport: [WS]
        }
      })
    }).to.throw()
@@ -52,54 +52,46 @@ describe('configuration', () => {
      validateConfig({
        peerInfo,
        modules: {
-          transport: [ ]
+          transport: []
        }
      })
-    }).to.throw()
+    }).to.throw('ERROR_EMPTY')
  })

-  it('should add defaults to missing items', () => {
+  it('should add defaults to config', () => {
    const options = {
      peerInfo,
      modules: {
-        transport: [ WS ],
-        peerDiscovery: [ Bootstrap ],
+        transport: [WS],
+        peerDiscovery: [Bootstrap],
        dht: DHT
-      },
-      config: {
-        peerDiscovery: {
-          bootstrap: {
-            interval: 1000,
-            enabled: true
-          }
-        }
      }
    }

    const expected = {
      peerInfo,
+      connectionManager: {
+        minPeers: 25
+      },
      modules: {
-        transport: [ WS ],
-        peerDiscovery: [ Bootstrap ],
+        transport: [WS],
+        peerDiscovery: [Bootstrap],
        dht: DHT
      },
      config: {
        peerDiscovery: {
-          bootstrap: {
-            interval: 1000,
-            enabled: true
-          }
+          autoDial: true
        },
-        EXPERIMENTAL: {
-          pubsub: false
+        pubsub: {
+          enabled: false
        },
        dht: {
          kBucketSize: 20,
-          enabled: true,
+          enabled: false,
          randomWalk: {
-            enabled: true,
+            enabled: false,
            queriesPerPeriod: 1,
-            interval: 30000,
+            interval: 300000,
            timeout: 10000
          }
        },
@@ -116,6 +108,95 @@ describe('configuration', () => {
    expect(validateConfig(options)).to.deep.equal(expected)
  })

+  it('should add defaults to missing items', () => {
+    const options = {
+      peerInfo,
+      modules: {
+        transport: [WS],
+        peerDiscovery: [Bootstrap],
+        dht: DHT
+      },
+      config: {
+        peerDiscovery: {
+          bootstrap: {
+            interval: 1000,
+            enabled: true
+          }
+        }
+      }
+    }
+
+    const expected = {
+      peerInfo,
+      connectionManager: {
+        minPeers: 25
+      },
+      modules: {
+        transport: [WS],
+        peerDiscovery: [Bootstrap],
+        dht: DHT
+      },
+      config: {
+        peerDiscovery: {
+          autoDial: true,
+          bootstrap: {
+            interval: 1000,
+            enabled: true
+          }
+        },
+        pubsub: {
+          enabled: false
+        },
+        dht: {
+          kBucketSize: 20,
+          enabled: false,
+          randomWalk: {
+            enabled: false,
+            queriesPerPeriod: 1,
+            interval: 300000,
+            timeout: 10000
+          }
+        },
+        relay: {
+          enabled: true,
+          hop: {
+            active: false,
+            enabled: false
+          }
+        }
+      }
+    }
+
+    expect(validateConfig(options)).to.deep.equal(expected)
+  })
+
+  it('should allow for configuring the switch', () => {
+    const options = {
+      peerInfo,
+      switch: {
+        blacklistTTL: 60e3,
+        blackListAttempts: 5,
+        maxParallelDials: 100,
+        maxColdCalls: 50,
+        dialTimeout: 30e3
+      },
+      modules: {
+        transport: [WS],
+        peerDiscovery: []
+      }
+    }
+
+    expect(validateConfig(options)).to.deep.include({
+      switch: {
+        blacklistTTL: 60e3,
+        blackListAttempts: 5,
+        maxParallelDials: 100,
+        maxColdCalls: 50,
+        dialTimeout: 30e3
+      }
+    })
+  })
+
  it('should allow for delegated content and peer routing', () => {
    const peerRouter = new DelegatedPeerRouter()
    const contentRouter = new DelegatedContentRouter(peerInfo)
@@ -123,10 +204,10 @@ describe('configuration', () => {
    const options = {
      peerInfo,
      modules: {
-        transport: [ WS ],
-        peerDiscovery: [ Bootstrap ],
-        peerRouting: [ peerRouter ],
-        contentRouting: [ contentRouter ],
+        transport: [WS],
+        peerDiscovery: [Bootstrap],
+        peerRouting: [peerRouter],
+        contentRouting: [contentRouter],
        dht: DHT
      },
      config: {
@@ -140,8 +221,8 @@ describe('configuration', () => {
    }

    expect(validateConfig(options).modules).to.deep.include({
-      peerRouting: [ peerRouter ],
-      contentRouting: [ contentRouter ]
+      peerRouting: [peerRouter],
+      contentRouting: [contentRouter]
    })
  })

@@ -149,11 +230,11 @@ describe('configuration', () => {
    const options = {
      peerInfo,
      modules: {
-        transport: [ WS ]
+        transport: [WS]
      },
      config: {
-        EXPERIMENTAL: {
-          dht: true
+        dht: {
+          enabled: true
        }
      }
    }
@@ -161,7 +242,7 @@ describe('configuration', () => {
    expect(() => validateConfig(options)).to.throw()
  })

-  it('should add defaults, validators and selectors for dht', () => {
+  it('should be able to add validators and selectors for dht', () => {
    const selectors = {}
    const validators = {}

@@ -180,13 +261,19 @@ describe('configuration', () => {
    }
    const expected = {
      peerInfo,
+      connectionManager: {
+        minPeers: 25
+      },
      modules: {
        transport: [WS],
        dht: DHT
      },
      config: {
-        EXPERIMENTAL: {
-          pubsub: false
+        pubsub: {
+          enabled: false
+        },
+        peerDiscovery: {
+          autoDial: true
        },
        relay: {
          enabled: true,
@@ -196,14 +283,6 @@ describe('configuration', () => {
          }
        },
        dht: {
-          kBucketSize: 20,
-          enabled: true,
-          randomWalk: {
-            enabled: true,
-            queriesPerPeriod: 1,
-            interval: 30000,
-            timeout: 10000
-          },
          selectors,
          validators
        }
@@ -211,4 +290,43 @@ describe('configuration', () => {
    }
    expect(validateConfig(options)).to.deep.equal(expected)
  })
+
+  it('should support new properties for the dht config', () => {
+    const options = {
+      peerInfo,
+      modules: {
+        transport: [WS],
+        dht: DHT
+      },
+      config: {
+        dht: {
+          kBucketSize: 20,
+          enabled: false,
+          myNewDHTConfigProperty: true,
+          randomWalk: {
+            enabled: false,
+            queriesPerPeriod: 1,
+            interval: 300000,
+            timeout: 10000
+          }
+        }
+      }
+    }
+
+    const expected = {
+      kBucketSize: 20,
+      enabled: false,
+      myNewDHTConfigProperty: true,
+      randomWalk: {
+        enabled: false,
+        queriesPerPeriod: 1,
+        interval: 300000,
+        timeout: 10000
+      }
+    }
+
+    const actual = validateConfig(options).config.dht
+
+    expect(actual).to.deep.equal(expected)
+  })
 })
--- a/test/content-routing.node.js
+++ b/test/content-routing.node.js
@@ -121,8 +121,9 @@ describe('.contentRouting', () => {
        const cid = new CID('QmTp9VkYvnHyrqKQuFPiuZkiX9gPcqj6x5LJ1rmWuSnnnn')

        nodeE.contentRouting.findProviders(cid, { maxTimeout: 5000 }, (err, providers) => {
-          expect(err).to.not.exist()
-          expect(providers).to.have.length(0)
+          expect(err).to.exist()
+          expect(err.code).to.eql('ERR_NOT_FOUND')
+          expect(providers).to.not.exist()
          done()
        })
      })
@@ -150,7 +151,7 @@ describe('.contentRouting', () => {
          nodeA = new Node({
            peerInfo,
            modules: {
-              contentRouting: [ delegate ]
+              contentRouting: [delegate]
            },
            config: {
              dht: {
@@ -185,19 +186,10 @@ describe('.contentRouting', () => {
      it('should be able to register as a provider', (done) => {
        const cid = new CID('QmU621oD8AhHw6t25vVyfYKmL9VV3PTgc52FngEhTGACFB')
        const mockApi = nock('http://0.0.0.0:60197')
-          // mock the swarm connect
-          .post('/api/v0/swarm/connect')
-          .query({
-            arg: `/ip4/0.0.0.0/tcp/60194/p2p-circuit/ipfs/${nodeA.peerInfo.id.toB58String()}`,
-            'stream-channels': true
-          })
-          .reply(200, {
-            Strings: [`connect ${nodeA.peerInfo.id.toB58String()} success`]
-          }, ['Content-Type', 'application/json'])
          // mock the refs call
          .post('/api/v0/refs')
          .query({
-            recursive: true,
+            recursive: false,
            arg: cid.toBaseEncodedString(),
            'stream-channels': true
          })
@@ -216,10 +208,11 @@ describe('.contentRouting', () => {
      it('should handle errors when registering as a provider', (done) => {
        const cid = new CID('QmU621oD8AhHw6t25vVyfYKmL9VV3PTgc52FngEhTGACFB')
        const mockApi = nock('http://0.0.0.0:60197')
-          // mock the swarm connect
-          .post('/api/v0/swarm/connect')
+          // mock the refs call
+          .post('/api/v0/refs')
          .query({
-            arg: `/ip4/0.0.0.0/tcp/60194/p2p-circuit/ipfs/${nodeA.peerInfo.id.toB58String()}`,
+            recursive: false,
+            arg: cid.toBaseEncodedString(),
            'stream-channels': true
          })
          .reply(502, 'Bad Gateway', ['Content-Type', 'application/json'])
@@ -251,7 +244,7 @@ describe('.contentRouting', () => {
            timeout: '1000ms',
            'stream-channels': true
          })
-          .reply(200, `{"Extra":"","ID":"QmWKqWXCtRXEeCQTo3FoZ7g4AfnGiauYYiczvNxFCHicbB","Responses":[{"Addrs":["/ip4/0.0.0.0/tcp/0"],"ID":"${provider}"}],"Type":1}\n`, [
+          .reply(200, `{"Extra":"","ID":"QmWKqWXCtRXEeCQTo3FoZ7g4AfnGiauYYiczvNxFCHicbB","Responses":[{"Addrs":["/ip4/0.0.0.0/tcp/0"],"ID":"${provider}"}],"Type":4}\n`, [
            'Content-Type', 'application/json',
            'X-Chunked-Output', '1'
          ])
@@ -308,7 +301,7 @@ describe('.contentRouting', () => {
          nodeA = new Node({
            peerInfo,
            modules: {
-              contentRouting: [ delegate ]
+              contentRouting: [delegate]
            },
            config: {
              relay: {
--- a/test/create.spec.js
+++ b/test/create.spec.js
@@ -7,13 +7,20 @@ const expect = chai.expect
 const series = require('async/series')
 const createNode = require('./utils/create-node')
 const sinon = require('sinon')
+const { createLibp2p } = require('../src')
+const WS = require('libp2p-websockets')
+const PeerInfo = require('peer-info')

 describe('libp2p creation', () => {
+  afterEach(() => {
+    sinon.restore()
+  })
+
  it('should be able to start and stop successfully', (done) => {
    createNode([], {
      config: {
-        EXPERIMENTAL: {
-          pubsub: true
+        pubsub: {
+          enabled: true
        },
        dht: {
          enabled: true
@@ -22,10 +29,10 @@ describe('libp2p creation', () => {
    }, (err, node) => {
      expect(err).to.not.exist()

-      let sw = node._switch
-      let cm = node.connectionManager
-      let dht = node._dht
-      let pub = node._floodSub
+      const sw = node._switch
+      const cm = node.connectionManager
+      const dht = node._dht
+      const pub = node.pubsub

      sinon.spy(sw, 'start')
      sinon.spy(cm, 'start')
@@ -70,13 +77,13 @@ describe('libp2p creation', () => {
  it('should not create disabled modules', (done) => {
    createNode([], {
      config: {
-        EXPERIMENTAL: {
-          pubsub: false
+        pubsub: {
+          enabled: false
        }
      }
    }, (err, node) => {
      expect(err).to.not.exist()
-      expect(node._floodSub).to.not.exist()
+      expect(node._pubsub).to.not.exist()
      done()
    })
  })
@@ -101,4 +108,36 @@ describe('libp2p creation', () => {
      node._switch.emit('error', error)
    })
  })
+
+  it('createLibp2p should create a peerInfo instance', function (done) {
+    this.timeout(10e3)
+    createLibp2p({
+      modules: {
+        transport: [WS]
+      }
+    }, (err, libp2p) => {
+      expect(err).to.not.exist()
+      expect(libp2p).to.exist()
+      done()
+    })
+  })
+
+  it('createLibp2p should allow for a provided peerInfo instance', function (done) {
+    this.timeout(10e3)
+    PeerInfo.create((err, peerInfo) => {
+      expect(err).to.not.exist()
+      sinon.spy(PeerInfo, 'create')
+      createLibp2p({
+        peerInfo,
+        modules: {
+          transport: [WS]
+        }
+      }, (err, libp2p) => {
+        expect(err).to.not.exist()
+        expect(libp2p).to.exist()
+        expect(PeerInfo.create.callCount).to.eql(0)
+        done()
+      })
+    })
+  })
 })
--- a/test/dht.node.js
+++ b/test/dht.node.js
@@ -140,6 +140,7 @@ describe('.dht', () => {

      nodeA.dht.put(key, value, (err) => {
        expect(err).to.exist()
+        expect(err.code).to.equal('ERR_DHT_DISABLED')
        done()
      })
    })
@@ -149,6 +150,7 @@ describe('.dht', () => {

      nodeA.dht.get(key, (err) => {
        expect(err).to.exist()
+        expect(err.code).to.equal('ERR_DHT_DISABLED')
        done()
      })
    })
@@ -158,6 +160,7 @@ describe('.dht', () => {

      nodeA.dht.getMany(key, 10, (err) => {
        expect(err).to.exist()
+        expect(err.code).to.equal('ERR_DHT_DISABLED')
        done()
      })
    })
--- a/test/fsm.spec.js
+++ b/test/fsm.spec.js
@@ -60,9 +60,9 @@ describe('libp2p state machine (fsm)', () => {
        node.once('stop', done)

        // stop the stopped node
-        node.stop()
+        node.stop(() => {})
      })
-      node.start()
+      node.start(() => {})
    })

    it('should callback with an error when it occurs on stop', (done) => {
@@ -79,7 +79,7 @@ describe('libp2p state machine (fsm)', () => {
      expect(2).checks(done)

      sinon.stub(node._switch, 'stop').callsArgWith(0, error)
-      node.start()
+      node.start(() => {})
    })

    it('should noop when starting a started node', (done) => {
@@ -89,17 +89,17 @@ describe('libp2p state machine (fsm)', () => {
        })
        node.once('start', () => {
          node.once('stop', done)
-          node.stop()
+          node.stop(() => {})
        })

        // start the started node
-        node.start()
+        node.start(() => {})
      })
-      node.start()
+      node.start(() => {})
    })

    it('should error on start with no transports', (done) => {
-      let transports = node._modules.transport
+      const transports = node._modules.transport
      node._modules.transport = null

      node.on('stop', () => {
@@ -115,7 +115,7 @@ describe('libp2p state machine (fsm)', () => {

      expect(2).checks(done)

-      node.start()
+      node.start(() => {})
    })

    it('should not start if the switch fails to start', (done) => {
@@ -150,7 +150,7 @@ describe('libp2p state machine (fsm)', () => {
        })
      })

-      node.stop()
+      node.stop(() => {})
    })

    it('should not dial (fsm) when the node is stopped', (done) => {
@@ -162,7 +162,7 @@ describe('libp2p state machine (fsm)', () => {
        })
      })

-      node.stop()
+      node.stop(() => {})
    })
  })
 })
--- a/test/peer-discovery.node.js
+++ b/test/peer-discovery.node.js
@@ -5,36 +5,24 @@ const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
 const sinon = require('sinon')
-const signalling = require('libp2p-webrtc-star/src/sig-server')
 const parallel = require('async/parallel')
 const crypto = require('crypto')

-const PeerId = require('peer-id')
-const PeerInfo = require('peer-info')
-
 const createNode = require('./utils/create-node')
 const echo = require('./utils/echo')
+const { WRTC_RENDEZVOUS_MULTIADDR } = require('./utils/constants')

 describe('peer discovery', () => {
  let nodeA
  let nodeB
-  let port = 24642
-  let ss
+  let nodeC

  function setup (options) {
    before((done) => {
-      port++
      parallel([
-        (cb) => {
-          signalling.start({ port: port }, (err, server) => {
-            expect(err).to.not.exist()
-            ss = server
-            cb()
-          })
-        },
        (cb) => createNode([
          '/ip4/0.0.0.0/tcp/0',
-          `/ip4/127.0.0.1/tcp/${port}/ws/p2p-webrtc-star`
+          `${WRTC_RENDEZVOUS_MULTIADDR.toString()}/p2p-webrtc-star`
        ], options, (err, node) => {
          expect(err).to.not.exist()
          nodeA = node
@@ -43,12 +31,21 @@ describe('peer discovery', () => {
        }),
        (cb) => createNode([
          '/ip4/0.0.0.0/tcp/0',
-          `/ip4/127.0.0.1/tcp/${port}/ws/p2p-webrtc-star`
+          `${WRTC_RENDEZVOUS_MULTIADDR.toString()}/p2p-webrtc-star`
        ], options, (err, node) => {
          expect(err).to.not.exist()
          nodeB = node
          node.handle('/echo/1.0.0', echo)
          node.start(cb)
+        }),
+        (cb) => createNode([
+          '/ip4/0.0.0.0/tcp/0',
+          `${WRTC_RENDEZVOUS_MULTIADDR.toString()}/p2p-webrtc-star`
+        ], options, (err, node) => {
+          expect(err).to.not.exist()
+          nodeC = node
+          node.handle('/echo/1.0.0', echo)
+          node.start(cb)
        })
      ], done)
    })
@@ -57,20 +54,25 @@ describe('peer discovery', () => {
      parallel([
        (cb) => nodeA.stop(cb),
        (cb) => nodeB.stop(cb),
-        (cb) => ss.stop(cb)
+        (cb) => nodeC.stop(cb)
      ], done)
    })
+
+    afterEach(() => {
+      sinon.restore()
+    })
  }

  describe('module registration', () => {
    it('should enable by default a module passed as an object', (done) => {
      const mockDiscovery = {
        on: sinon.stub(),
+        removeListener: sinon.stub(),
        start: sinon.stub().callsArg(0),
        stop: sinon.stub().callsArg(0)
      }

-      const options = { modules: { peerDiscovery: [ mockDiscovery ] } }
+      const options = { modules: { peerDiscovery: [mockDiscovery] } }

      createNode(['/ip4/0.0.0.0/tcp/0'], options, (err, node) => {
        expect(err).to.not.exist()
@@ -86,13 +88,14 @@ describe('peer discovery', () => {
    it('should enable by default a module passed as a function', (done) => {
      const mockDiscovery = {
        on: sinon.stub(),
+        removeListener: sinon.stub(),
        start: sinon.stub().callsArg(0),
        stop: sinon.stub().callsArg(0)
      }

      const MockDiscovery = sinon.stub().returns(mockDiscovery)

-      const options = { modules: { peerDiscovery: [ MockDiscovery ] } }
+      const options = { modules: { peerDiscovery: [MockDiscovery] } }

      createNode(['/ip4/0.0.0.0/tcp/0'], options, (err, node) => {
        expect(err).to.not.exist()
@@ -108,6 +111,7 @@ describe('peer discovery', () => {
    it('should enable module by configutation', (done) => {
      const mockDiscovery = {
        on: sinon.stub(),
+        removeListener: sinon.stub(),
        start: sinon.stub().callsArg(0),
        stop: sinon.stub().callsArg(0),
        tag: 'mockDiscovery'
@@ -116,7 +120,7 @@ describe('peer discovery', () => {
      const enabled = sinon.stub().returns(true)

      const options = {
-        modules: { peerDiscovery: [ mockDiscovery ] },
+        modules: { peerDiscovery: [mockDiscovery] },
        config: {
          peerDiscovery: {
            mockDiscovery: {
@@ -143,6 +147,7 @@ describe('peer discovery', () => {
    it('should disable module by configutation', (done) => {
      const mockDiscovery = {
        on: sinon.stub(),
+        removeListener: sinon.stub(),
        start: sinon.stub().callsArg(0),
        stop: sinon.stub().callsArg(0),
        tag: 'mockDiscovery'
@@ -151,7 +156,7 @@ describe('peer discovery', () => {
      const disabled = sinon.stub().returns(false)

      const options = {
-        modules: { peerDiscovery: [ mockDiscovery ] },
+        modules: { peerDiscovery: [mockDiscovery] },
        config: {
          peerDiscovery: {
            mockDiscovery: {
@@ -178,6 +183,7 @@ describe('peer discovery', () => {
    it('should register module passed as function', (done) => {
      const mockDiscovery = {
        on: sinon.stub(),
+        removeListener: sinon.stub(),
        start: sinon.stub().callsArg(0),
        stop: sinon.stub().callsArg(0)
      }
@@ -186,7 +192,7 @@ describe('peer discovery', () => {
      MockDiscovery.tag = 'mockDiscovery'

      const options = {
-        modules: { peerDiscovery: [ MockDiscovery ] },
+        modules: { peerDiscovery: [MockDiscovery] },
        config: {
          peerDiscovery: {
            mockDiscovery: {
@@ -215,13 +221,14 @@ describe('peer discovery', () => {
    it('should register module passed as object', (done) => {
      const mockDiscovery = {
        on: sinon.stub(),
+        removeListener: sinon.stub(),
        start: sinon.stub().callsArg(0),
        stop: sinon.stub().callsArg(0),
        tag: 'mockDiscovery'
      }

      const options = {
-        modules: { peerDiscovery: [ mockDiscovery ] },
+        modules: { peerDiscovery: [mockDiscovery] },
        config: {
          peerDiscovery: {
            mockDiscovery: { enabled: true }
@@ -241,6 +248,33 @@ describe('peer discovery', () => {
    })
  })

+  describe('discovery scenarios', () => {
+    setup({
+      config: {
+        dht: {
+          enabled: false
+        },
+        peerDiscovery: {
+          autoDial: false,
+          bootstrap: {
+            enabled: true,
+            list: []
+          }
+        }
+      }
+    })
+
+    it('should ignore self on discovery', function () {
+      const discoverySpy = sinon.spy()
+      nodeA.on('peer:discovery', discoverySpy)
+      nodeA._discovery[0].emit('peer', nodeA.peerInfo)
+
+      expect(discoverySpy.called).to.eql(false)
+      expect(nodeA.peerBook.getAllArray()).to.have.length(0)
+      expect()
+    })
+  })
+
  describe('MulticastDNS', () => {
    setup({
      config: {
@@ -248,8 +282,10 @@ describe('peer discovery', () => {
          enabled: false
        },
        peerDiscovery: {
+          autoDial: true,
          mdns: {
            enabled: true,
+            interval: 200, // discover quickly
            // use a random tag to prevent CI collision
            serviceTag: crypto.randomBytes(10).toString('hex')
          }
@@ -257,13 +293,23 @@ describe('peer discovery', () => {
      }
    })

-    it('find a peer', function (done) {
-      this.timeout(15 * 1000)
+    it('find peers', function (done) {
+      const expectedPeers = new Set([
+        nodeB.peerInfo.id.toB58String(),
+        nodeC.peerInfo.id.toB58String()
+      ])

-      nodeA.once('peer:discovery', (peerInfo) => {
-        expect(nodeB.peerInfo.id.toB58String())
-          .to.eql(peerInfo.id.toB58String())
+      function finish () {
+        nodeA.removeAllListeners('peer:discovery')
+        expect(expectedPeers.size).to.eql(0)
        done()
+      }
+
+      nodeA.on('peer:discovery', (peerInfo) => {
+        expectedPeers.delete(peerInfo.id.toB58String())
+        if (expectedPeers.size === 0) {
+          finish()
+        }
      })
    })
  })
@@ -276,6 +322,7 @@ describe('peer discovery', () => {
          enabled: false
        },
        peerDiscovery: {
+          autoDial: true,
          webRTCStar: {
            enabled: true
          }
@@ -283,12 +330,24 @@ describe('peer discovery', () => {
      }
    })

-    it('find a peer', function (done) {
-      this.timeout(15 * 1000)
-      nodeA.once('peer:discovery', (peerInfo) => {
-        expect(nodeB.peerInfo.id.toB58String())
-          .to.eql(peerInfo.id.toB58String())
+    it('find peers', function (done) {
+      this.timeout(20e3)
+      const expectedPeers = new Set([
+        nodeB.peerInfo.id.toB58String(),
+        nodeC.peerInfo.id.toB58String()
+      ])
+
+      function finish () {
+        nodeA.removeAllListeners('peer:discovery')
+        expect(expectedPeers.size).to.eql(0)
        done()
+      }
+
+      nodeA.on('peer:discovery', (peerInfo) => {
+        expectedPeers.delete(peerInfo.id.toB58String())
+        if (expectedPeers.size === 0) {
+          finish()
+        }
      })
    })
  })
@@ -300,8 +359,10 @@ describe('peer discovery', () => {
          enabled: false
        },
        peerDiscovery: {
+          autoDial: true,
          mdns: {
            enabled: true,
+            interval: 200, // discovery quickly
            // use a random tag to prevent CI collision
            serviceTag: crypto.randomBytes(10).toString('hex')
          },
@@ -312,12 +373,23 @@ describe('peer discovery', () => {
      }
    })

-    it('find a peer', function (done) {
-      this.timeout(15 * 1000)
-      nodeA.once('peer:discovery', (peerInfo) => {
-        expect(nodeB.peerInfo.id.toB58String())
-          .to.eql(peerInfo.id.toB58String())
+    it('find peers', function (done) {
+      const expectedPeers = new Set([
+        nodeB.peerInfo.id.toB58String(),
+        nodeC.peerInfo.id.toB58String()
+      ])
+
+      function finish () {
+        nodeA.removeAllListeners('peer:discovery')
+        expect(expectedPeers.size).to.eql(0)
        done()
+      }
+
+      nodeA.on('peer:discovery', (peerInfo) => {
+        expectedPeers.delete(peerInfo.id.toB58String())
+        if (expectedPeers.size === 0) {
+          finish()
+        }
      })
    })
  })
@@ -326,32 +398,97 @@ describe('peer discovery', () => {
    setup({
      config: {
        peerDiscovery: {
+          autoDial: true,
          mdns: {
            enabled: false
          },
          webRTCStar: {
            enabled: false
          }
+        },
+        dht: {
+          enabled: true,
+          kBucketSize: 20,
+          randomWalk: {
+            enabled: true,
+            queriesPerPeriod: 1,
+            delay: 100,
+            interval: 200, // start the query sooner
+            timeout: 3000
+          }
        }
      }
    })

-    it('find a peer', function (done) {
-      this.timeout(15 * 1000)
+    it('find peers through the dht', function (done) {
+      const expectedPeers = new Set([
+        nodeB.peerInfo.id.toB58String(),
+        nodeC.peerInfo.id.toB58String()
+      ])

-      nodeA.once('peer:discovery', (peerInfo) => {
-        expect(nodeB.peerInfo.id.toB58String())
-          .to.eql(peerInfo.id.toB58String())
+      function finish () {
+        nodeA.removeAllListeners('peer:discovery')
+        expect(expectedPeers.size).to.eql(0)
        done()
+      }
+
+      nodeA.on('peer:discovery', (peerInfo) => {
+        expectedPeers.delete(peerInfo.id.toB58String())
+        if (expectedPeers.size === 0) {
+          finish()
+        }
      })

-      // connect two dhts
-      const publicPeerId = new PeerId(nodeB._dht.peerInfo.id.id, null, nodeB._dht.peerInfo.id.pubKey)
-      const target = new PeerInfo(publicPeerId)
-      target.multiaddrs = nodeB._dht.peerInfo.multiaddrs
-      nodeA._dht.switch.dial(target, (err) => {
+      // Topology:
+      // A -> B
+      // C -> B
+      nodeA.dial(nodeB.peerInfo, (err) => {
+        expect(err).to.not.exist()
+      })
+      nodeC.dial(nodeB.peerInfo, (err) => {
        expect(err).to.not.exist()
      })
    })
  })
+
+  describe('auto dial', () => {
+    setup({
+      connectionManager: {
+        minPeers: 1
+      },
+      config: {
+        peerDiscovery: {
+          autoDial: true,
+          mdns: {
+            enabled: false
+          },
+          webRTCStar: {
+            enabled: false
+          },
+          bootstrap: {
+            enabled: true,
+            list: []
+          }
+        },
+        dht: {
+          enabled: false
+        }
+      }
+    })
+
+    it('should only dial when the peer count is below the low watermark', (done) => {
+      const bootstrap = nodeA._discovery[0]
+      sinon.stub(nodeA._switch.dialer, 'connect').callsFake((peerInfo) => {
+        nodeA._switch.connection.connections[peerInfo.id.toB58String()] = []
+      })
+
+      bootstrap.emit('peer', nodeB.peerInfo)
+      bootstrap.emit('peer', nodeC.peerInfo)
+
+      // Only nodeB should get dialed
+      expect(nodeA._switch.dialer.connect.callCount).to.eql(1)
+      expect(nodeA._switch.dialer.connect.getCall(0).args[0]).to.eql(nodeB.peerInfo)
+      done()
+    })
+  })
 })
--- a/test/peer-routing.node.js
+++ b/test/peer-routing.node.js
@@ -105,7 +105,7 @@ describe('.peerRouting', () => {
          })
          createNode('/ip4/0.0.0.0/tcp/0', {
            modules: {
-              peerRouting: [ delegate ]
+              peerRouting: [delegate]
            },
            config: {
              dht: {
@@ -211,7 +211,7 @@ describe('.peerRouting', () => {
          })
          createNode('/ip4/0.0.0.0/tcp/0', {
            modules: {
-              peerRouting: [ delegate ]
+              peerRouting: [delegate]
            }
          }, (err, node) => {
            expect(err).to.not.exist()
--- a/test/pnet.node.js
+++ b/test/pnet.node.js
@@ -24,7 +24,7 @@ describe('private network', () => {
        config = {
          peerInfo,
          modules: {
-            transport: [ WS ],
+            transport: [WS],
            dht: DHT
          }
        }
@@ -50,14 +50,14 @@ describe('private network', () => {

    it('should create a libp2p node with a provided protector', () => {
      let node
-      let protector = {
+      const protector = {
        psk: '123',
        tag: '/psk/1.0.0',
        protect: () => { }
      }

      expect(() => {
-        let options = defaultsDeep(config, {
+        const options = defaultsDeep(config, {
          modules: {
            connProtector: protector
          }
@@ -71,7 +71,7 @@ describe('private network', () => {

    it('should throw an error if the protector does not have a protect method', () => {
      expect(() => {
-        let options = defaultsDeep(config, {
+        const options = defaultsDeep(config, {
          modules: {
            connProtector: { }
          }
--- a/test/pubsub.node.js
+++ b/test/pubsub.node.js
@@ -11,22 +11,31 @@ const parallel = require('async/parallel')
 const series = require('async/series')
 const _times = require('lodash.times')

+const Floodsub = require('libp2p-floodsub')
+const mergeOptions = require('merge-options')
+
+const { codes } = require('../src/errors')
 const createNode = require('./utils/create-node')

-function startTwo (callback) {
+function startTwo (options, callback) {
+  if (typeof options === 'function') {
+    callback = options
+    options = {}
+  }
+
  const tasks = _times(2, () => (cb) => {
-    createNode('/ip4/0.0.0.0/tcp/0', {
+    createNode('/ip4/0.0.0.0/tcp/0', mergeOptions({
      config: {
        peerDiscovery: {
          mdns: {
            enabled: false
          }
        },
-        EXPERIMENTAL: {
-          pubsub: true
+        pubsub: {
+          enabled: true
        }
      }
-    }, (err, node) => {
+    }, options), (err, node) => {
      expect(err).to.not.exist()
      node.start((err) => cb(err, node))
    })
@@ -46,22 +55,17 @@ function stopTwo (nodes, callback) {
  ], callback)
 }

-// There is a vast test suite on PubSub through js-ipfs
-// https://github.com/ipfs/interface-ipfs-core/blob/master/js/src/pubsub.js
-// and libp2p-floodsub itself
-// https://github.com/libp2p/js-libp2p-floodsub/tree/master/test
-// TODO: consider if all or some of those should come here
 describe('.pubsub', () => {
-  describe('.pubsub on (default)', (done) => {
+  describe('.pubsub on (default)', () => {
    it('start two nodes and send one message, then unsubscribe', (done) => {
      // Check the final series error, and the publish handler
      expect(2).checks(done)

      let nodes
-      const data = Buffer.from('test')
+      const data = 'test'
      const handler = (msg) => {
        // verify the data is correct and mark the expect
-        expect(msg.data).to.eql(data).mark()
+        expect(msg.data.toString()).to.eql(data).mark()
      }

      series([
@@ -71,7 +75,7 @@ describe('.pubsub', () => {
          cb(err)
        }),
        // subscribe on the first
-        (cb) => nodes[0].pubsub.subscribe('pubsub', handler, cb),
+        (cb) => nodes[0].pubsub.subscribe('pubsub', handler, null, cb),
        // Wait a moment before publishing
        (cb) => setTimeout(cb, 500),
        // publish on the second
@@ -105,19 +109,19 @@ describe('.pubsub', () => {
          cb(err)
        }),
        // subscribe on the first
-        (cb) => nodes[0].pubsub.subscribe('pubsub', handler, cb),
+        (cb) => nodes[0].pubsub.subscribe('pubsub', handler, {}, cb),
        // Wait a moment before publishing
        (cb) => setTimeout(cb, 500),
        // publish on the second
        (cb) => nodes[1].pubsub.publish('pubsub', data, cb),
+        // ls subscripts
+        (cb) => nodes[1].pubsub.ls(cb),
+        // get subscribed peers
+        (cb) => nodes[1].pubsub.peers('pubsub', cb),
        // Wait a moment before unsubscribing
        (cb) => setTimeout(cb, 500),
-        // unsubscribe on the first
-        (cb) => {
-          nodes[0].pubsub.unsubscribe('pubsub')
-          // Wait a moment to make sure the ubsubscribe-from-all worked
-          setTimeout(cb, 500)
-        },
+        // unsubscribe from all
+        (cb) => nodes[0].pubsub.unsubscribe('pubsub', null, cb),
        // Verify unsubscribed
        (cb) => {
          nodes[0].pubsub.ls((err, topics) => {
@@ -132,6 +136,149 @@ describe('.pubsub', () => {
        expect(err).to.not.exist().mark()
      })
    })
+    it('publish should fail if data is not a buffer nor a string', (done) => {
+      createNode('/ip4/0.0.0.0/tcp/0', {
+        config: {
+          peerDiscovery: {
+            mdns: {
+              enabled: false
+            }
+          },
+          pubsub: {
+            enabled: true
+          }
+        }
+      }, (err, node) => {
+        expect(err).to.not.exist()
+
+        node.start((err) => {
+          expect(err).to.not.exist()
+
+          node.pubsub.publish('pubsub', 10, (err) => {
+            expect(err).to.exist()
+            expect(err.code).to.equal('ERR_DATA_IS_NOT_VALID')
+
+            done()
+          })
+        })
+      })
+    })
+  })
+
+  describe('.pubsub on using floodsub', () => {
+    it('start two nodes and send one message, then unsubscribe', (done) => {
+      // Check the final series error, and the publish handler
+      expect(2).checks(done)
+
+      let nodes
+      const data = Buffer.from('test')
+      const handler = (msg) => {
+        // verify the data is correct and mark the expect
+        expect(msg.data).to.eql(data).mark()
+      }
+
+      series([
+        // Start the nodes
+        (cb) => startTwo({
+          modules: {
+            pubsub: Floodsub
+          }
+        }, (err, _nodes) => {
+          nodes = _nodes
+          cb(err)
+        }),
+        // subscribe on the first
+        (cb) => nodes[0].pubsub.subscribe('pubsub', handler, cb),
+        // Wait a moment before publishing
+        (cb) => setTimeout(cb, 500),
+        // publish on the second
+        (cb) => nodes[1].pubsub.publish('pubsub', data, cb),
+        // Wait a moment before unsubscribing
+        (cb) => setTimeout(cb, 500),
+        // unsubscribe on the first
+        (cb) => nodes[0].pubsub.unsubscribe('pubsub', handler, cb),
+        // Stop both nodes
+        (cb) => stopTwo(nodes, cb)
+      ], (err) => {
+        // Verify there was no error, and mark the expect
+        expect(err).to.not.exist().mark()
+      })
+    })
+    it('start two nodes and send one message, then unsubscribe without handler', (done) => {
+      // Check the final series error, and the publish handler
+      expect(3).checks(done)
+
+      let nodes
+      const data = Buffer.from('test')
+      const handler = (msg) => {
+        // verify the data is correct and mark the expect
+        expect(msg.data).to.eql(data).mark()
+      }
+
+      series([
+        // Start the nodes
+        (cb) => startTwo({
+          modules: {
+            pubsub: Floodsub
+          }
+        }, (err, _nodes) => {
+          nodes = _nodes
+          cb(err)
+        }),
+        // subscribe on the first
+        (cb) => nodes[0].pubsub.subscribe('pubsub', handler, cb),
+        // Wait a moment before publishing
+        (cb) => setTimeout(cb, 500),
+        // publish on the second
+        (cb) => nodes[1].pubsub.publish('pubsub', data, cb),
+        // Wait a moment before unsubscribing
+        (cb) => setTimeout(cb, 500),
+        // unsubscribe from all
+        (cb) => nodes[0].pubsub.unsubscribe('pubsub', null, cb),
+        // Verify unsubscribed
+        (cb) => {
+          nodes[0].pubsub.ls((err, topics) => {
+            expect(topics.length).to.eql(0).mark()
+            cb(err)
+          })
+        },
+        // Stop both nodes
+        (cb) => stopTwo(nodes, cb)
+      ], (err) => {
+        // Verify there was no error, and mark the expect
+        expect(err).to.not.exist().mark()
+      })
+    })
+    it('publish should fail if data is not a buffer', (done) => {
+      createNode('/ip4/0.0.0.0/tcp/0', {
+        config: {
+          peerDiscovery: {
+            mdns: {
+              enabled: false
+            }
+          },
+          pubsub: {
+            enabled: true
+          }
+        },
+        modules: {
+          pubsub: Floodsub
+        }
+      }, (err, node) => {
+        expect(err).to.not.exist()
+
+        node.start((err) => {
+          expect(err).to.not.exist()
+
+          node.pubsub.publish('pubsub', 10, (err) => {
+            expect(err).to.exist()
+            expect(err.code).to.equal('ERR_DATA_IS_NOT_VALID')
+
+            done()
+          })
+        })
+      })
+    })
  })

  describe('.pubsub off', () => {
@@ -142,9 +289,6 @@ describe('.pubsub', () => {
            mdns: {
              enabled: false
            }
-          },
-          EXPERIMENTAL: {
-            pubsub: false
          }
        }
      }, (err, node) => {
@@ -154,4 +298,73 @@ describe('.pubsub', () => {
      })
    })
  })
+
+  describe('.pubsub on and node not started', () => {
+    let libp2pNode
+
+    before(function (done) {
+      createNode('/ip4/0.0.0.0/tcp/0', {
+        config: {
+          peerDiscovery: {
+            mdns: {
+              enabled: false
+            }
+          },
+          pubsub: {
+            enabled: true
+          }
+        }
+      }, (err, node) => {
+        expect(err).to.not.exist()
+
+        libp2pNode = node
+        done()
+      })
+    })
+
+    it('fail to subscribe if node not started yet', (done) => {
+      libp2pNode.pubsub.subscribe('pubsub', () => { }, (err) => {
+        expect(err).to.exist()
+        expect(err.code).to.equal(codes.PUBSUB_NOT_STARTED)
+
+        done()
+      })
+    })
+
+    it('fail to unsubscribe if node not started yet', (done) => {
+      libp2pNode.pubsub.unsubscribe('pubsub', () => { }, (err) => {
+        expect(err).to.exist()
+        expect(err.code).to.equal(codes.PUBSUB_NOT_STARTED)
+
+        done()
+      })
+    })
+
+    it('fail to publish if node not started yet', (done) => {
+      libp2pNode.pubsub.publish('pubsub', Buffer.from('data'), (err) => {
+        expect(err).to.exist()
+        expect(err.code).to.equal(codes.PUBSUB_NOT_STARTED)
+
+        done()
+      })
+    })
+
+    it('fail to ls if node not started yet', (done) => {
+      libp2pNode.pubsub.ls((err) => {
+        expect(err).to.exist()
+        expect(err.code).to.equal(codes.PUBSUB_NOT_STARTED)
+
+        done()
+      })
+    })
+
+    it('fail to get subscribed peers to a topic if node not started yet', (done) => {
+      libp2pNode.pubsub.peers('pubsub', (err) => {
+        expect(err).to.exist()
+        expect(err.code).to.equal(codes.PUBSUB_NOT_STARTED)
+
+        done()
+      })
+    })
+  })
 })
--- a/test/stream-muxing.node.js
+++ b/test/stream-muxing.node.js
@@ -36,7 +36,7 @@ describe('stream muxing', () => {
      parallel([
        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
          modules: {
-            streamMuxer: [ SPDY ]
+            streamMuxer: [SPDY]
          }
        }, (err, node) => {
          expect(err).to.not.exist()
@@ -46,7 +46,7 @@ describe('stream muxing', () => {
        }),
        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
          modules: {
-            streamMuxer: [ SPDY ]
+            streamMuxer: [SPDY]
          }
        }, (err, node) => {
          expect(err).to.not.exist()
@@ -72,7 +72,7 @@ describe('stream muxing', () => {
      parallel([
        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
          modules: {
-            streamMuxer: [ Mplex ]
+            streamMuxer: [Mplex]
          }
        }, (err, node) => {
          expect(err).to.not.exist()
@@ -82,7 +82,7 @@ describe('stream muxing', () => {
        }),
        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
          modules: {
-            streamMuxer: [ Mplex ]
+            streamMuxer: [Mplex]
          }
        }, (err, node) => {
          expect(err).to.not.exist()
@@ -108,7 +108,7 @@ describe('stream muxing', () => {
      parallel([
        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
          modules: {
-            streamMuxer: [ pMplex ]
+            streamMuxer: [pMplex]
          }
        }, (err, node) => {
          expect(err).to.not.exist()
@@ -118,7 +118,7 @@ describe('stream muxing', () => {
        }),
        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
          modules: {
-            streamMuxer: [ pMplex ]
+            streamMuxer: [pMplex]
          }
        }, (err, node) => {
          expect(err).to.not.exist()
@@ -146,7 +146,7 @@ describe('stream muxing', () => {
      parallel([
        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
          modules: {
-            streamMuxer: [ Mplex ]
+            streamMuxer: [Mplex]
          }
        }, (err, node) => {
          expect(err).to.not.exist()
@@ -156,7 +156,7 @@ describe('stream muxing', () => {
        }),
        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
          modules: {
-            streamMuxer: [ SPDY, Mplex ]
+            streamMuxer: [SPDY, Mplex]
          }
        }, (err, node) => {
          expect(err).to.not.exist()
@@ -184,7 +184,7 @@ describe('stream muxing', () => {
      parallel([
        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
          modules: {
-            streamMuxer: [ Mplex ]
+            streamMuxer: [Mplex]
          }
        }, (err, node) => {
          expect(err).to.not.exist()
@@ -194,7 +194,7 @@ describe('stream muxing', () => {
        }),
        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
          modules: {
-            streamMuxer: [ pMplex ]
+            streamMuxer: [pMplex]
          }
        }, (err, node) => {
          expect(err).to.not.exist()
@@ -222,7 +222,7 @@ describe('stream muxing', () => {
      parallel([
        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
          modules: {
-            streamMuxer: [ SPDY, Mplex ]
+            streamMuxer: [SPDY, Mplex]
          }
        }, (err, node) => {
          expect(err).to.not.exist()
@@ -232,7 +232,7 @@ describe('stream muxing', () => {
        }),
        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
          modules: {
-            streamMuxer: [ Mplex, SPDY ]
+            streamMuxer: [Mplex, SPDY]
          }
        }, (err, node) => {
          expect(err).to.not.exist()
@@ -260,7 +260,7 @@ describe('stream muxing', () => {
      parallel([
        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
          modules: {
-            streamMuxer: [ SPDY, pMplex ]
+            streamMuxer: [SPDY, pMplex]
          }
        }, (err, node) => {
          expect(err).to.not.exist()
@@ -270,7 +270,7 @@ describe('stream muxing', () => {
        }),
        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
          modules: {
-            streamMuxer: [ pMplex, SPDY ]
+            streamMuxer: [pMplex, SPDY]
          }
        }, (err, node) => {
          expect(err).to.not.exist()
@@ -298,7 +298,7 @@ describe('stream muxing', () => {
      parallel([
        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
          modules: {
-            streamMuxer: [ SPDY ]
+            streamMuxer: [SPDY]
          }
        }, (err, node) => {
          expect(err).to.not.exist()
@@ -308,7 +308,7 @@ describe('stream muxing', () => {
        }),
        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
          modules: {
-            streamMuxer: [ Mplex ]
+            streamMuxer: [Mplex]
          }
        }, (err, node) => {
          expect(err).to.not.exist()
@@ -326,10 +326,10 @@ describe('stream muxing', () => {
        expect(Object.keys(nodeA._switch.muxers)).to.have.length(1)
        expect(Object.keys(nodeB._switch.muxers)).to.have.length(1)

-        nodeA.dial(nodeB.peerInfo, (err) => {
+        nodeA.dialFSM(nodeB.peerInfo, (err, connFSM) => {
          expect(err).to.not.exist()
-          expect(nodeA._switch.connection.getAll()).to.have.length(0)
-          cb()
+          // The connection should fall back to 'unmuxed'
+          connFSM.once('unmuxed', () => cb())
        })
      },
      (cb) => teardown(nodeA, nodeB, cb)
--- a/test/transports.browser.js
+++ b/test/transports.browser.js
@@ -4,6 +4,7 @@

 const chai = require('chai')
 chai.use(require('dirty-chai'))
+chai.use(require('chai-checkmark'))
 const expect = chai.expect
 const PeerInfo = require('peer-info')
 const PeerId = require('peer-id')
@@ -54,7 +55,7 @@ describe('transports', () => {
        const b = new Node({
          peerInfo: peerInfo,
          modules: {
-            streamMuxer: [ Mplex ]
+            streamMuxer: [Mplex]
          }
        })
        expect(b._modules.streamMuxer).to.eql([require('pull-mplex')])
@@ -413,29 +414,19 @@ describe('transports', () => {
    it('node1 hangUp node2', (done) => {
      node1.hangUp(peer2, (err) => {
        expect(err).to.not.exist()
-        setTimeout(check, 500)
-
-        function check () {
-          const peers = node1.peerBook.getAll()
-          expect(Object.keys(peers)).to.have.length(1)
-          expect(node1._switch.connection.getAll()).to.have.length(0)
-          done()
-        }
+        const peers = node1.peerBook.getAll()
+        expect(Object.keys(peers)).to.have.length(1)
+        expect(node1._switch.connection.getAll()).to.have.length(0)
+        done()
      })
    })

    it('create a third node and check that discovery works', function (done) {
      this.timeout(10 * 1000)
-
-      let counter = 0
-
-      function check () {
-        if (++counter === 3) {
-          expect(node1._switch.connection.getAll()).to.have.length(1)
-          expect(node2._switch.connection.getAll()).to.have.length(1)
-          done()
-        }
-      }
+      const expectedPeers = [
+        node1.peerInfo.id.toB58String(),
+        node2.peerInfo.id.toB58String()
+      ]

      PeerId.create((err, id3) => {
        expect(err).to.not.exist()
@@ -444,13 +435,18 @@ describe('transports', () => {
        const ma3 = '/ip4/127.0.0.1/tcp/14444/ws/p2p-websocket-star/p2p/' + id3.toB58String()
        peer3.multiaddrs.add(ma3)

-        node1.on('peer:discovery', (peerInfo) => node1.dial(peerInfo, check))
-        node2.on('peer:discovery', (peerInfo) => node2.dial(peerInfo, check))
+        // 2 connects and 1 start
+        expect(3).checks(done)

        const node3 = new Node({
          peerInfo: peer3
        })
-        node3.start(check)
+        node3.on('peer:connect', (peerInfo) => {
+          expect(expectedPeers).to.include(peerInfo.id.toB58String()).mark()
+        })
+        node3.start((err) => {
+          expect(err).to.not.exist().mark()
+        })
      })
    })
  })
--- a/test/transports.node.js
+++ b/test/transports.node.js
@@ -6,7 +6,6 @@ chai.use(require('dirty-chai'))
 const expect = chai.expect
 const parallel = require('async/parallel')
 const series = require('async/series')
-const signalling = require('libp2p-webrtc-star/src/sig-server')
 const rendezvous = require('libp2p-websocket-star-rendezvous')
 const TCP = require('libp2p-tcp')
 const WS = require('libp2p-websockets')
@@ -18,6 +17,8 @@ const createNode = require('./utils/create-node.js')
 const tryEcho = require('./utils/try-echo')
 const echo = require('./utils/echo')

+const { WRTC_RENDEZVOUS_MULTIADDR } = require('./utils/constants')
+
 describe('transports', () => {
  describe('TCP only', () => {
    let nodeA
@@ -409,24 +410,17 @@ describe('transports', () => {
    let nodeWS
    let nodeWebRTCStar

-    let ss
-
    before(function (done) {
      this.timeout(5 * 1000)

      parallel([
-        (cb) => signalling.start({ port: 24642 }, (err, server) => {
-          expect(err).to.not.exist()
-          ss = server
-          cb()
-        }),
        (cb) => {
          const wstar = new WRTCStar({ wrtc: wrtc })

          createNode([
            '/ip4/0.0.0.0/tcp/0',
            '/ip4/127.0.0.1/tcp/25011/ws',
-            '/ip4/127.0.0.1/tcp/24642/ws/p2p-webrtc-star'
+            `${WRTC_RENDEZVOUS_MULTIADDR.toString()}/p2p-webrtc-star`
          ], {
            modules: {
              transport: [
@@ -438,6 +432,7 @@ describe('transports', () => {
            },
            config: {
              peerDiscovery: {
+                autoDial: false,
                [wstar.discovery.tag]: {
                  enabled: true
                }
@@ -452,7 +447,13 @@ describe('transports', () => {
        },
        (cb) => createNode([
          '/ip4/0.0.0.0/tcp/0'
-        ], (err, node) => {
+        ], {
+          config: {
+            peerDiscovery: {
+              autoDial: false
+            }
+          }
+        }, (err, node) => {
          expect(err).to.not.exist()
          nodeTCP = node
          node.handle('/echo/1.0.0', echo)
@@ -460,18 +461,23 @@ describe('transports', () => {
        }),
        (cb) => createNode([
          '/ip4/127.0.0.1/tcp/25022/ws'
-        ], (err, node) => {
+        ], {
+          config: {
+            peerDiscovery: {
+              autoDial: false
+            }
+          }
+        }, (err, node) => {
          expect(err).to.not.exist()
          nodeWS = node
          node.handle('/echo/1.0.0', echo)
          node.start(cb)
        }),
-
        (cb) => {
          const wstar = new WRTCStar({ wrtc: wrtc })

          createNode([
-            '/ip4/127.0.0.1/tcp/24642/ws/p2p-webrtc-star'
+            `${WRTC_RENDEZVOUS_MULTIADDR.toString()}/p2p-webrtc-star`
          ], {
            modules: {
              transport: [wstar],
@@ -479,6 +485,7 @@ describe('transports', () => {
            },
            config: {
              peerDiscovery: {
+                autoDial: false,
                [wstar.discovery.tag]: {
                  enabled: true
                }
@@ -501,8 +508,7 @@ describe('transports', () => {
        (cb) => nodeAll.stop(cb),
        (cb) => nodeTCP.stop(cb),
        (cb) => nodeWS.stop(cb),
-        (cb) => nodeWebRTCStar.stop(cb),
-        (cb) => ss.stop(cb)
+        (cb) => nodeWebRTCStar.stop(cb)
      ], done)
    })

--- a/test/utils/bundle-browser.js
+++ b/test/utils/bundle-browser.js
@@ -8,6 +8,7 @@ const SPDY = require('libp2p-spdy')
 const MPLEX = require('libp2p-mplex')
 const PULLMPLEX = require('pull-mplex')
 const KadDHT = require('libp2p-kad-dht')
+const GossipSub = require('libp2p-gossipsub')
 const SECIO = require('libp2p-secio')
 const defaultsDeep = require('@nodeutils/defaults-deep')
 const libp2p = require('../..')
@@ -57,10 +58,12 @@ class Node extends libp2p {
          wsStar.discovery,
          Bootstrap
        ],
-        dht: KadDHT
+        dht: KadDHT,
+        pubsub: GossipSub
      },
      config: {
        peerDiscovery: {
+          autoDial: true,
          webRTCStar: {
            enabled: true
          },
@@ -87,8 +90,8 @@ class Node extends libp2p {
          },
          enabled: false
        },
-        EXPERIMENTAL: {
-          pubsub: false
+        pubsub: {
+          enabled: false
        }
      }
    }
--- a/test/utils/bundle-nodejs.js
+++ b/test/utils/bundle-nodejs.js
@@ -6,6 +6,7 @@ const WS = require('libp2p-websockets')
 const Bootstrap = require('libp2p-bootstrap')
 const SPDY = require('libp2p-spdy')
 const KadDHT = require('libp2p-kad-dht')
+const GossipSub = require('libp2p-gossipsub')
 const MPLEX = require('libp2p-mplex')
 const PULLMPLEX = require('pull-mplex')
 const SECIO = require('libp2p-secio')
@@ -52,10 +53,12 @@ class Node extends libp2p {
          MulticastDNS,
          Bootstrap
        ],
-        dht: KadDHT
+        dht: KadDHT,
+        pubsub: GossipSub
      },
      config: {
        peerDiscovery: {
+          autoDial: true,
          mdns: {
            interval: 10000,
            enabled: false
@@ -80,8 +83,8 @@ class Node extends libp2p {
          },
          enabled: true
        },
-        EXPERIMENTAL: {
-          pubsub: false
+        pubsub: {
+          enabled: false
        }
      }
    }
Author	SHA1	Message	Date
Jacob Heun	7c2c852fc0	chore: release version v0.26.0-rc.1	2019-07-31 14:35:43 +02:00
Jacob Heun	e8d8aab278	chore: update contributors	2019-07-31 14:35:42 +02:00
Vasco Santos	dd48d268ec	chore: promisify pubsub start and stop (#392 )	2019-07-31 14:33:00 +02:00
Jacob Heun	99a53592e2	chore: release version v0.26.0-rc.0	2019-07-31 09:47:06 +02:00
Jacob Heun	2a2e7a1012	chore: update contributors	2019-07-31 09:47:06 +02:00
Vasco Santos	791f39a09b	feat: integrate gossipsub by default (#365 ) BREAKING CHANGE: new configuration for deciding the implementation of pubsub to be used. In this context, the experimental flags were also removed. See the README for the latest usage.	2019-07-31 09:38:14 +02:00
Jacob Heun	65d52857a5	test(fix): correct findProviders test for missing provider (#391 ) * test(fix): correct findProviders test for missing provider * chore: fix lint	2019-07-30 15:11:24 +02:00
Jacob Heun	48b1b442e9	docs: libp2p in browser example (#390 ) * docs: improve browser example * docs: remove bad ipfs link	2019-07-30 12:38:02 +02:00
Jacob Heun	9554b05c6f	fix: make subscribe comply with ipfs interface (#389 ) BREAKING CHANGE: The ipfs interface specified that options should be provided after the handler, not before. https://github.com/ipfs/interface-js-ipfs-core/blob/v0.109.0/SPEC/PUBSUB.md#pubsubsubscribe This corrects the order of parameters. See the jsdocs examples for subscribe to see how it should be used.	2019-07-30 12:36:23 +02:00
Alex Potsides	df6ef45a2d	feat: promisify all api methods that accept callbacks (#381 ) * feat: promisify all api methods that accept callbacks This is a stop-gap until the full async/await migration can be completed. It means we can refactor tests of other modules that depend on this module without having to mix async flow control strategies. N.b. some methods that were previously callable without callbacks (e.g. `node.start()`, `node.stop()`, etc) now require callbacks otherwise a promise is returned which, if rejected, can cause `unhandledPromiseRejection` events and lead to memory leaks. * docs: add a global note to the api about promisify * fix: update the logic for unsubscribe * test(fix): correct pubsub unsubscribe usage for api change * test(fix): update content routing tests for latest delegate version	2019-07-29 15:40:40 +02:00
Jacob Heun	b4a70ea476	chore: release version v0.25.5	2019-07-12 13:10:55 +01:00
Jacob Heun	45716da465	chore: update contributors	2019-07-12 13:10:53 +01:00
Vasco Santos	905c911946	fix: peer routing for delegate router (#377 ) * fix: peer routing tests * test: fix mock payload type Provider results are type 4, not type 1: `6e566d10f4/routing/query.go (L15-L24)`	2019-07-12 13:02:03 +01:00
Jacob Heun	10811e9ced	chore: update keywords and description (#370 ) * chore: update keywords and description chore: reorganize package.json fields * test: bump timeouts for peer generation	2019-06-12 14:18:34 +02:00
Jacob Heun	9c2789bc15	chore: release version v0.25.4	2019-06-07 17:10:07 +02:00
Jacob Heun	24be691bc1	chore: update contributors	2019-06-07 17:10:07 +02:00
Jacob Heun	9433c6c398	docs: add createLibp2p to readme (#368 ) * chore: update deps * test(fix): account for wrtcrendezvous now being thenable	2019-06-07 15:50:23 +02:00
Jacob Heun	04faf1806c	feat: add createLibp2p to generate a PeerInfo instance (#367 ) createLibp2p is a new exported helper function that allows users to create a libp2p instance without worrying about creating a PeerInfo instance first.	2019-06-06 12:21:31 +02:00
Guy Sviry	b06ca1b3c7	feat: pass libp2p as option to transport creation (#363 )	2019-05-17 12:11:22 +02:00
Jacob Heun	bde30cac45	chore: remove commitlint from travis Commit messages should be fixed on PR squash and merge	2019-05-17 10:31:16 +02:00
Jacob Heun	28c054c21e	chore: release version v0.25.3	2019-05-07 13:49:03 +02:00
Jacob Heun	c346e8066b	chore: update contributors	2019-05-07 13:49:02 +02:00
Jacob Heun	40978a1940	feat: sign pubsub messages (#362 ) * fix: forward pubsub publish callback to floodsub chore: update floodsub version * test: add random walk delay to config * chore: update floodsub	2019-05-07 13:45:59 +02:00
Jacob Heun	71dcaafcac	chore: release version v0.25.2	2019-04-17 15:06:47 +02:00
Jacob Heun	5319e065ec	chore: update contributors	2019-04-17 15:06:47 +02:00
Jacob Heun	f3801f0e6c	fix: dht config (#359 )	2019-04-17 15:04:35 +02:00
Jacob Heun	51cc993876	docs: fix incorrect references for enabling dht discovery (#358 )	2019-04-16 15:04:23 +02:00
Jacob Heun	a800c1ad91	chore: release version v0.25.1	2019-04-16 12:40:41 +02:00
Jacob Heun	54c474de98	chore: update contributors	2019-04-16 12:40:41 +02:00
Jacob Heun	f28dffb268	fix: bail when discovering self (#357 )	2019-04-16 12:05:22 +02:00
Jacob Heun	c049074cb5	chore: update release template (#355 )	2019-04-12 13:05:13 +02:00
Jacob Heun	1bde70f1b5	chore: release version v0.25.0	2019-04-12 11:15:34 +02:00
Jacob Heun	cfa4df6e11	chore: update contributors	2019-04-12 11:15:33 +02:00
Jacob Heun	eb5aa03232	fix: allow switch to be configured (#354 )	2019-04-12 11:10:09 +02:00
Jacob Heun	4cb541ddae	docs: update examples for latest libp2p rc (#353 ) * docs: update chat example readme * docs: update discovery test for autodial * docs: fix delegated routing example * docs: update echo example readme * docs: fix libp2p in the browser example * docs: update examples for peer/content routing * docs: update the pubsub example	2019-04-11 15:52:04 +02:00
Jacob Heun	aa1d9b273a	chore: release version v0.25.0-rc.6	2019-04-11 13:54:40 +02:00
Jacob Heun	7313f781fc	chore: update contributors	2019-04-11 13:54:39 +02:00
Jacob Heun	313b1eae20	fix: connection emits (#352 ) * fix: add connection tracking events * chore: update dependencies	2019-04-11 13:49:31 +02:00
Jacob Heun	01aa44724e	feat: auto dial discovered peers (#349 )	2019-04-11 12:44:58 +02:00
Vasco Santos	8b627797e2	chore: add discourse badge (#351 )	2019-04-10 11:53:19 +02:00
Jacob Heun	e5f19e860b	fix: remove unneeded peerbook puts (#348 )	2019-04-05 14:27:35 +02:00
Yusef Napora	5204da73f7	chore: update readme with links to docs & discuss (#347 )	2019-04-04 10:49:40 +02:00
Andrew Nesbitt	66130ccba8	docs: fix link to contributing guidelines in issue template (#343 )	2019-03-26 17:41:43 +01:00
Jacob Heun	aa1bb3ab75	chore: release version v0.25.0-rc.5	2019-03-21 14:27:36 +01:00
Jacob Heun	813a59b9ce	chore: update contributors	2019-03-21 14:27:35 +01:00
Jacob Heun	eee60ed37d	feat: update to the latest switch (#336 )	2019-03-21 14:23:00 +01:00
Jacob Heun	e52ce66ab7	fix: disable dht by default #338 (#339 ) fix: correct transport config check	2019-03-20 09:12:02 +01:00
Andrew Nesbitt	da52af704e	docs: update package table in readme (#337 )	2019-03-15 16:18:27 +01:00
Hugo Dias	282ce62703	chore: remove npmignore because we have files prop in package.json (#335 )	2019-03-12 18:17:13 +01:00
Aditya Bose	ef3238bdee	docs: update README.md (#334 ) Fixed a typo in the Tutorials and Examples section.	2019-03-12 08:55:24 +01:00
Jacob Heun	4c06c54fc5	chore: release version v0.25.0-rc.4	2019-03-06 11:28:20 +01:00
Jacob Heun	bb0c45d704	chore: update contributors	2019-03-06 11:28:19 +01:00
Vasco Santos	eb10b5c6d2	chore: disable dht discovery (#333 )	2019-03-06 11:21:43 +01:00
Jacob Heun	a282fbe139	chore: release version v0.25.0-rc.3	2019-02-26 15:24:55 +01:00
Jacob Heun	6cfb0b2692	chore: update contributors	2019-02-26 15:24:55 +01:00
Vasco Santos	de84ee473c	chore: add error codes to dht and pubsub errors (#328 ) * chore: add error codes to dht and pubsub errors * fix: code review	2019-02-26 15:15:30 +01:00