test(fix): fix listening test for ci

chore: release version v0.27.0-rc.0
chore: update contributors
2025-07-16 09:01:58 +00:00 · 2020-01-24 14:31:38 +01:00 · 2020-01-24 11:55:59 +01:00 · 2020-01-24 11:55:59 +01:00 · 2020-01-24 11:43:56 +01:00 · 2020-01-23 17:12:41 +01:00
67 changed files with 1895 additions and 1806 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ docs
 **/*.log
 test/repo-tests*
 **/bundle.js
+.cache

 # Logs
 logs
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+<a name="0.27.0-rc.0"></a>
+# [0.27.0-rc.0](https://github.com/libp2p/js-libp2p/compare/v0.27.0-pre.2...v0.27.0-rc.0) (2020-01-24)
+
+
+### Bug Fixes
+
+* registrar should filter the disconnected conn ([#532](https://github.com/libp2p/js-libp2p/issues/532)) ([83409de](https://github.com/libp2p/js-libp2p/commit/83409de))
+* stop discoveries ([#530](https://github.com/libp2p/js-libp2p/issues/530)) ([c44e6e3](https://github.com/libp2p/js-libp2p/commit/c44e6e3))
+* use toB58String everywhere to be consistent ([#537](https://github.com/libp2p/js-libp2p/issues/537)) ([31d1b23](https://github.com/libp2p/js-libp2p/commit/31d1b23))
+
+
+
+<a name="0.27.0-pre.2"></a>
+# [0.27.0-pre.2](https://github.com/libp2p/js-libp2p/compare/v0.27.0-pre.1...v0.27.0-pre.2) (2020-01-07)
+
+
+### Bug Fixes
+
+* conn mngr min/max connection values ([#528](https://github.com/libp2p/js-libp2p/issues/528)) ([a1717da](https://github.com/libp2p/js-libp2p/commit/a1717da))
+* make dialer configurable ([#521](https://github.com/libp2p/js-libp2p/issues/521)) ([24c3ce6](https://github.com/libp2p/js-libp2p/commit/24c3ce6))
+* upgrader should not need muxers ([#517](https://github.com/libp2p/js-libp2p/issues/517)) ([56a1825](https://github.com/libp2p/js-libp2p/commit/56a1825))
+
+
+### Features
+
+* add libp2p.connections getter ([#522](https://github.com/libp2p/js-libp2p/issues/522)) ([6ca19c5](https://github.com/libp2p/js-libp2p/commit/6ca19c5))
+* allow transport options to be passed on creation ([#524](https://github.com/libp2p/js-libp2p/issues/524)) ([0d4b2bd](https://github.com/libp2p/js-libp2p/commit/0d4b2bd))
+
+
+
 <a name="0.27.0-pre.1"></a>
 # [0.27.0-pre.1](https://github.com/libp2p/js-libp2p/compare/v0.27.0-pre.0...v0.27.0-pre.1) (2019-12-15)

--- a/README.md
+++ b/README.md
@@ -49,6 +49,7 @@ We've come a long way, but this project is still in Alpha, lots of development i
 - [Usage](#usage)
  - [Configuration](#configuration)
  - [API](#api)
+  - [Getting Started](#getting-started)
  - [Tutorials and Examples](#tutorials-and-examples)
 - [Development](#development)
  - [Tests](#tests)
@@ -89,6 +90,10 @@ For all the information on how you can configure libp2p see [CONFIGURATION.md](.

 The specification is available on [API.md](./doc/API.md).

+### Getting started
+
+If you are starting your journey with `js-libp2p`, read the [GETTING_STARTED.md](./doc/GETTING_STARTED.md) guide.
+
 ### Tutorials and Examples

 You can find multiple examples on the [examples folder](./examples) that will guide you through using libp2p for several scenarios.
--- a/doc/API.md
+++ b/doc/API.md
@@ -28,6 +28,7 @@
  * [`metrics.protocols`](#metricsprotocols)
  * [`metrics.forPeer`](#metricsforpeer)
  * [`metrics.forProtocol`](#metricsforprotocol)
+* [Events](#events)
 * [Types](#types)
  * [`Stats`](#stats)

@@ -46,7 +47,10 @@ Creates an instance of Libp2p.
 | options | `Object` | libp2p options |
 | options.modules | `Array<Object>` | libp2p modules to use |
 | [options.config] | `Object` | libp2p modules configuration and core configuration |
+| [options.connectionManager] | `Object` | libp2p Connection Manager configuration |
 | [options.datastore] | `Object` | must implement [ipfs/interface-datastore](https://github.com/ipfs/interface-datastore) (in memory datastore will be used if not provided) |
+| [options.dialer] | `Object` | libp2p Dialer configuration
+| [options.metrics] | `Object` | libp2p Metrics configuration
 | [options.peerInfo] | [PeerInfo](https://github.com/libp2p/js-peer-info) | peerInfo instance (it will be created if not provided) |

 For Libp2p configurations and modules details read the [Configuration Document](./CONFIGURATION.md).
@@ -93,39 +97,6 @@ Required keys in the `options` object:

 </details>

-Once you have a libp2p instance, you are able to listen to several events it emits, so that you can be noticed of relevant network events.
-
-<details><summary>Events</summary>
-
-#### An error has occurred
-
-`libp2p.on('error', (err) => {})`
-
- `err`: instance of `Error`
-
-#### A peer has been discovered
-
-`libp2p.on('peer:discovery', (peer) => {})`
-
-If `autoDial` option 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][https://github.com/libp2p/js-peer-info]
-
-#### We have a new connection to a peer
-
-`libp2p.on('peer:connect', (peer) => {})`
-
- `peer`: instance of [PeerInfo][https://github.com/libp2p/js-peer-info]
-
-#### We have closed a connection to a peer
-
-`libp2p.on('peer:disconnect', (peer) => {})`
-
- `peer`: instance of [PeerInfo][https://github.com/libp2p/js-peer-info]
-
-</details>
-
 ## Libp2p Instance Methods

 ### start
@@ -178,6 +149,29 @@ const libp2p = await Libp2p.create(options)
 await libp2p.stop()
 ```

+### connections
+
+A Getter that returns a Map of the current Connections libp2p has to other peers.
+
+`libp2p.connections`
+
+#### Returns
+
+| Type | Description |
+|------|-------------|
+| `Map<string, Array<Connection>>` | A map of [`PeerId`][peer-id] strings to [`Connection`][connection] Arrays |
+
+#### Example
+
+```js
+for (const [peerId, connections] of libp2p.connections) {
+  for (const connection of connections) {
+    console.log(peerId, connection.remoteAddr.toString())
+    // Logs the PeerId string and the observed remote multiaddr of each Connection
+  }
+}
+```
+
 ### dial

 Dials to another peer in the network and establishes the connection.
@@ -188,7 +182,7 @@ Dials to another peer in the network and establishes the connection.

 | Name | Type | Description |
 |------|------|-------------|
-| peer | [PeerInfo](https://github.com/libp2p/js-peer-info), [PeerId](https://github.com/libp2p/js-peer-id), [multiaddr](https://github.com/multiformats/js-multiaddr), `string` | peer to dial |
+| peer | [PeerInfo](https://github.com/libp2p/js-peer-info), [PeerId][peer-id], [multiaddr](https://github.com/multiformats/js-multiaddr), `string` | peer to dial |
 | [options] | `Object` | dial options |
 | [options.signal] | [`AbortSignal`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal) | An `AbortSignal` instance obtained from an [`AbortController`](https://developer.mozilla.org/en-US/docs/Web/API/AbortController) that can be used to abort the connection before it completes |

@@ -196,7 +190,7 @@ Dials to another peer in the network and establishes the connection.

 | Type | Description |
 |------|-------------|
-| `Promise<Connection>` | Promise resolves with the [Connection](https://github.com/libp2p/js-interfaces/tree/master/src/connection) instance |
+| `Promise<Connection>` | Promise resolves with the [Connection][connection] instance |

 #### Example

@@ -223,7 +217,7 @@ Dials to another peer in the network and selects a protocol to communicate with

 | Name | Type | Description |
 |------|------|-------------|
-| peer | [PeerInfo](https://github.com/libp2p/js-peer-info), [PeerId](https://github.com/libp2p/js-peer-id), [multiaddr](https://github.com/multiformats/js-multiaddr), `string` | peer to dial |
+| peer | [PeerInfo](https://github.com/libp2p/js-peer-info), [PeerId][peer-id], [multiaddr](https://github.com/multiformats/js-multiaddr), `string` | peer to dial |
 | protocols | `String|Array<String>` |  A list of protocols (or single protocol) to negotiate with. Protocols are attempted in order until a match is made. (e.g '/ipfs/bitswap/1.1.0') |
 | [options] | `Object` | dial options |
 | [options.signal] | [`AbortSignal`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal) | An `AbortSignal` instance obtained from an [`AbortController`](https://developer.mozilla.org/en-US/docs/Web/API/AbortController) that can be used to abort the connection before it completes |
@@ -256,7 +250,7 @@ Attempts to gracefully close an open connection to the given peer. If the connec

 | Name | Type | Description |
 |------|------|-------------|
-| peer | [PeerInfo](https://github.com/libp2p/js-peer-info), [PeerId](https://github.com/libp2p/js-peer-id), [multiaddr](https://github.com/multiformats/js-multiaddr), `string` | peer to hang up |
+| peer | [PeerInfo](https://github.com/libp2p/js-peer-info), [PeerId][peer-id], [multiaddr](https://github.com/multiformats/js-multiaddr), `string` | peer to hang up |

 #### Returns

@@ -352,7 +346,7 @@ Iterates over all peer routers in series to find the given peer. If the DHT is e

 | Name | Type | Description |
 |------|------|-------------|
-| peerId | [`PeerId`](https://github.com/libp2p/js-peer-id) | ID of the peer to find |
+| peerId | [`PeerId`][peer-id] | ID of the peer to find |
 | options | `Object` | operation options |
 | options.timeout | `number` | maximum time the query should run |

@@ -751,6 +745,41 @@ const peerStats = libp2p.metrics.forProtocol('/meshsub/1.0.0')
 console.log(peerStats.toJSON())
 ```

+## Events
+
+Once you have a libp2p instance, you can listen to several events it emits, so that you can be notified of relevant network events.
+
+#### An error has occurred
+
+`libp2p.on('error', (err) => {})`
+
+- `err`: instance of `Error`
+
+#### A peer has been discovered
+
+`libp2p.on('peer:discovery', (peer) => {})`
+
+If `autoDial` option 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][https://github.com/libp2p/js-peer-info]
+
+#### A new connection to a peer has been opened
+
+This event will be triggered anytime a new Connection is established to another peer.
+
+`libp2p.on('peer:connect', (peer) => {})`
+
+- `peer`: instance of [PeerInfo][https://github.com/libp2p/js-peer-info]
+
+#### An existing connection to a peer has been closed
+
+This event will be triggered anytime we are disconnected from another peer, regardless of the circumstances of that disconnection. If we happen to have multiple connections to a peer, this event will **only** be triggered when the last connection is closed.
+
+`libp2p.on('peer:disconnect', (peer) => {})`
+
+- `peer`: instance of [PeerInfo][https://github.com/libp2p/js-peer-info]
+
 ## Types

 ### Stats
@@ -770,3 +799,6 @@ console.log(peerStats.toJSON())
    - `['60000']<MovingAverage>`: The [MovingAverage](https://www.npmjs.com/package/moving-averages) at a 1 minute interval.
    - `['300000']<MovingAverage>`: The [MovingAverage](https://www.npmjs.com/package/moving-averages) at a 5 minute interval.
    - `['900000']<MovingAverage>`: The [MovingAverage](https://www.npmjs.com/package/moving-averages) at a 15 minute interval.
+
+[connection]: https://github.com/libp2p/js-interfaces/tree/master/src/connection
+[peer-id]: https://github.com/libp2p/js-peer-id
--- a/doc/CONFIGURATION.md
+++ b/doc/CONFIGURATION.md
@@ -20,8 +20,10 @@
      - [Customizing DHT](#customizing-dht)
      - [Setup with Content and Peer Routing](#setup-with-content-and-peer-routing)
      - [Setup with Relay](#setup-with-relay)
+      - [Configuring Dialing](#configuring-dialing)
      - [Configuring Connection Manager](#configuring-connection-manager)
      - [Configuring Metrics](#configuring-metrics)
+      - [Customizing Transports](#customizing-transports)
  - [Configuration examples](#configuration-examples)

 ## Overview
@@ -127,7 +129,7 @@ If you want to know more about libp2p peer discovery, you should read the follow
 Some available content routing modules are:

 - [js-libp2p-kad-dht](https://github.com/libp2p/js-libp2p-kad-dht)
- [js-libp2p-delegated-peer-routing](https://github.com/libp2p/js-libp2p-delegated-peer-routing)
+- [js-libp2p-delegated-content-routing](https://github.com/libp2p/js-libp2p-delegated-content-routing)

 If none of the available content routing protocols fulfills your needs, you can create a libp2p compatible one. A libp2p content routing protocol just needs to be compliant with the [Content Routing Interface](https://github.com/libp2p/js-interfaces/tree/master/src/content-routing). **(WIP: This module is not yet implemented)**

@@ -414,6 +416,29 @@ const node = await Libp2p.create({
 })
 ```

+#### Configuring Dialing
+
+Dialing in libp2p can be configured to limit the rate of dialing, and how long dials are allowed to take. The below configuration example shows the default values for the dialer.
+
+```js
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const SECIO = require('libp2p-secio')
+
+const node = await Libp2p.create({
+  modules: {
+    transport: [TCP],
+    streamMuxer: [MPLEX],
+    connEncryption: [SECIO]
+  },
+  dialer: {
+    maxParallelDials: 100, // How many multiaddrs we can dial in parallel
+    maxDialsPerPeer: 4, // How many multiaddrs we can dial per peer, in parallel
+    dialTimeout: 30e3 // 30 second dial timeout per peer
+  }
+```
+
 #### Configuring Connection Manager

 The Connection Manager prunes Connections in libp2p whenever certain limits are exceeded. If Metrics are enabled, you can also configure the Connection Manager to monitor the bandwidth of libp2p and prune connections as needed. You can read more about what Connection Manager does at [./CONNECTION_MANAGER.md](./CONNECTION_MANAGER.md). The configuration values below show the defaults for Connection Manager. See [./CONNECTION_MANAGER.md](./CONNECTION_MANAGER.md#options) for a full description of the parameters.
@@ -475,6 +500,34 @@ const node = await Libp2p.create({
 })
 ```

+#### Customizing Transports
+
+Some Transports can be passed additional options when they are created. For example, `libp2p-webrtc-star` accepts an optional, custom `wrtc` implementation. In addition to libp2p passing itself and an `Upgrader` to handle connection upgrading, libp2p will also pass the options, if they are provided, from `config.transport`.
+
+```js
+const Libp2p = require('libp2p')
+const WebRTCStar = require('libp2p-webrtc-star')
+const MPLEX = require('libp2p-mplex')
+const SECIO = require('libp2p-secio')
+const wrtc = require('wrtc')
+
+const transportKey = WebRTCStar.prototype[Symbol.toStringTag]
+const node = await Libp2p.create({
+  modules: {
+    transport: [WebRTCStar],
+    streamMuxer: [MPLEX],
+    connEncryption: [SECIO]
+  },
+  config: {
+    transport: {
+      [transportKey]: {
+        wrtc // You can use `wrtc` when running in Node.js
+      }
+    }
+  }
+})
+```
+
 ## Configuration examples

 As libp2p is designed to be a modular networking library, its usage will vary based on individual project needs. We've included links to some existing project configurations for your reference, in case you wish to replicate their configuration:
--- a/doc/GETTING_STARTED.md
+++ b/doc/GETTING_STARTED.md
@@ -0,0 +1,247 @@
+# Getting Started
+
+Welcome to libp2p! This guide will walk you through setting up a fully functional libp2p node 🚀
+
+- [Getting Started](#getting-started)
+  - [Install](#install)
+  - [Configuring libp2p](#configuring-libp2p)
+    - [Basic setup](#basic-setup)
+      - [Transports](#transports)
+      - [Connection Encryption](#connection-encryption)
+      - [Multiplexing](#multiplexing)
+      - [Running Libp2p](#running-libp2p)
+    - [Custom setup](#custom-setup)
+      - [Peer Discovery](#peer-discovery)
+      - [Pubsub](#pubsub)
+  - [What is next](#what-is-next)
+
+## Install
+
+The first step is to install libp2p in your project:
+
+```sh
+npm install libp2p
+```
+
+## Configuring libp2p
+
+If you're new to libp2p, we recommend configuring your node in stages, as this can make troubleshooting configuration issues much easier. In this guide, we'll do just that. If you're more experienced with libp2p, you may wish to jump to the [Configuration readme](./CONFIGURATION.md).
+
+### Basic setup
+
+Now that we have libp2p installed, let's configure the minimum needed to get your node running. The only modules libp2p requires are a [**Transport**][transport] and [**Crypto**][crypto] module. However, we recommend that a basic setup should also have a [**Stream Multiplexer**](streamMuxer) configured, which we will explain shortly. Let's start by setting up a Transport.
+
+#### Transports
+
+Libp2p uses Transports to establish connections between peers over the network. Transports are the components responsible for performing the actual exchange of data between libp2p nodes. You can configure any number of Transports, but you only need 1 to start with. Supporting more Transports will improve the ability of your node to speak to a larger number of nodes on the network, as matching Transports are required for two nodes to communicate with one another.
+
+You should select Transports according to the runtime of your application; Node.js or the browser. You can see a list of some of the available Transports in the [configuration readme](./CONFIGURATION.md#transport). For this guide let's install `libp2p-websockets`, as it can be used in both Node.js and the browser.
+
+Start by installing `libp2p-websockets`:
+
+```sh
+npm install libp2p-websockets
+```
+
+Now that we have the module installed, let's configure libp2p to use the Transport. We'll use the [`Libp2p.create`](./API.md#create) method, which takes a single configuration object as its only parameter. We can add the Transport by passing it into the `modules.transport` array:
+
+```js
+const Libp2p = require('libp2p')
+const WebSockets = require('libp2p-websockets')
+
+const node = await Libp2p.create({
+  modules: {
+    transport: [WebSockets]
+  }
+})
+```
+
+There are multiple libp2p transports available, you should evaluate the needs of your application and select the Transport(s) that best suit your requirements. You can add as many transports as you like to `modules.transport` in order to establish connections with as many peers as possible.
+
+<details><summary>Read More</summary>
+If you want to know more about libp2p transports, you should read the following content:
+
+- https://docs.libp2p.io/concepts/transport
+- https://github.com/libp2p/specs/tree/master/connections
+</details>
+
+#### Connection Encryption
+
+Encryption is an important part of communicating on the libp2p network. Every connection must be encrypted to help ensure security for everyone. As such, Connection Encryption (Crypto) is a required component of libp2p.
+
+There are a growing number of Crypto modules being developed for libp2p. As those are released they will be tracked in the [Connection Encryption section of the configuration readme](./CONFIGURATION.md#connection-encryption). For now, we are going to configure our node to use the `libp2p-secio` module, which is widely supported across the various libp2p implementations.
+
+```sh
+npm install libp2p-secio
+```
+
+With `libp2p-secio` installed, we can add it to our existing configuration by importing it and adding it to the `modules.connEncryption` array:
+
+```js
+const Libp2p = require('libp2p')
+const WebSockets = require('libp2p-websockets')
+const SECIO = require('libp2p-secio')
+
+const node = await Libp2p.create({
+  modules: {
+    transport: [WebSockets],
+    connEncryption: [SECIO]
+  }
+})
+```
+
+<details><summary>Read More</summary>
+If you want to know more about libp2p connection encryption, you should read the following content:
+
+- https://docs.libp2p.io/concepts/secure-comms
+- https://github.com/libp2p/specs/tree/master/connections
+</details>
+
+#### Multiplexing
+
+While multiplexers are not strictly required, they are highly recommended as they improve the effectiveness and efficiency of connections for the various protocols libp2p runs. Adding a multiplexer to your configuration will allow libp2p to run several of its internal protocols, like Identify, as well as allow your application to easily run any number of protocols over a single connection.
+
+Looking at the [available stream multiplexing](./CONFIGURATION.md#stream-multiplexing) modules, js-libp2p currently only supports `libp2p-mplex`, so we will use that here. Bear in mind that future libp2p Transports might have `multiplexing` capabilities already built-in (such as `QUIC`).
+
+You can install `libp2p-mplex` and add it to your libp2p node as follows in the next example.
+
+```sh
+npm install libp2p-mplex
+```
+
+```js
+const Libp2p = require('libp2p')
+const WebSockets = require('libp2p-websockets')
+const SECIO = require('libp2p-secio')
+const MPLEX = require('libp2p-mplex')
+
+const node = await Libp2p.create({
+  modules: {
+    transport: [WebSockets],
+    connEncryption: [SECIO],
+    streamMuxer: [MPLEX]
+  }
+})
+```
+
+<details><summary>Read More</summary>
+If you want to know more about libp2p stream multiplexing, you should read the following content:
+
+- https://docs.libp2p.io/concepts/stream-multiplexing
+- https://github.com/libp2p/specs/tree/master/connections
+- https://github.com/libp2p/specs/tree/master/mplex
+</details>
+
+#### Running Libp2p
+
+Now that you have configured a [**Transport**][transport], [**Crypto**][crypto] and [**Stream Multiplexer**](streamMuxer) module, you can start your libp2p node. We can start and stop libp2p using the [`libp2p.start()`](./API.md#start) and [`libp2p.stop()`](./API.md#stop) methods.
+
+```js
+const Libp2p = require('libp2p')
+const WebSockets = require('libp2p-websockets')
+const SECIO = require('libp2p-secio')
+const MPLEX = require('libp2p-mplex')
+
+const node = await Libp2p.create({
+  modules: {
+    transport: [WebSockets],
+    connEncryption: [SECIO],
+    streamMuxer: [MPLEX]
+  }
+})
+
+// start libp2p
+await node.start()
+console.log('libp2p has started')
+
+// stop libp2p
+await node.stop()
+console.log('libp2p has stopped')
+```
+
+### Custom setup
+
+Once your libp2p node is running, it is time to get it connected to the public network. We can do this via peer discovery.
+
+#### Peer Discovery
+
+Peer discovery is an important part of creating a well connected libp2p node. A static list of peers will often be used to join the network, but it's useful to couple other discovery mechanisms to ensure you're able to discover other peers that are important to your application.
+
+For each discovered peer libp2p will emit a `peer:discovery` event which includes metadata about that peer. You can read the [Events](./API.md#events) in the API doc to learn more.
+
+Looking at the [available peer discovery](./CONFIGURATION.md#peer-discovery) protocols, there are several options to be considered:
+- If you already know the addresses of some other network peers, you should consider using `libp2p-bootstrap` as this is the easiest way of getting your peer into the network.
+- If it is likely that you will have other peers on your local network, `libp2p-mdns` is a must if you're node is not running in the browser. It allows peers to discover each other when on the same local network.
+- If your application is browser based you can use the `libp2p-webrtc-star` Transport, which includes a rendezvous based peer sharing service.
+- A random walk approach can be used via `libp2p-kad-dht`, to crawl the network and find new peers along the way.
+
+For this guide we will configure `libp2p-bootstrap` as this is useful for joining the public network.
+
+Let's install `libp2p-bootstrap`.
+
+```sh
+npm install libp2p-bootstrap
+```
+
+We can provide specific configurations for each protocol within a `config.peerDiscovery` property in the options as shown below.
+
+```js
+const Libp2p = require('libp2p')
+const WebSockets = require('libp2p-websockets')
+const SECIO = require('libp2p-secio')
+const MPLEX = require('libp2p-mplex')
+
+const Bootstrap = require('libp2p-bootstrap')
+
+// Known peers addresses
+const bootstrapMultiaddrs = [
+  '/dns4/ams-1.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
+  '/dns4/lon-1.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3'
+]
+
+const node = await Libp2p.create({
+  modules: {
+    transport: [WebSockets],
+    connEncryption: [SECIO],
+    streamMuxer: [MPLEX],
+    peerDiscovery: [Bootstrap]
+  },
+  config: {
+    peerDiscovery: {
+      autoDial: true, // Auto connect to discovered peers (limited by ConnectionManager minPeers)
+      // The `tag` property will be searched when creating the instance of your Peer Discovery service.
+      // The associated object, will be passed to the service when it is instantiated.
+      [Bootstrap.tag]: {
+        enabled: true,
+        list: bootstrapMultiaddrs // provide array of multiaddrs
+      }
+    }
+  }
+})
+
+node.on('peer:discovery', (peer) => {
+  console.log('Discovered %s', peer.id.toB58String()) // Log discovered peer
+})
+
+node.on('peer:connect', (peer) => {
+    console.log('Connected to %s', peer.id.toB58String()) // Log connected peer
+  })
+
+// start libp2p
+await node.start()
+```
+
+<details><summary>Read More</summary>
+If you want to know more about libp2p peer discovery, you should read the following content:
+
+- https://github.com/libp2p/specs/blob/master/discovery/mdns.md
+</details>
+
+## What is next
+
+There are a lot of other concepts within `libp2p`, that are not covered in this guide. For additional configuration options we recommend checking out the [Configuration Readme](./CONFIGURATION.md) and the [examples folder](../examples). If you have any problems getting started, or if anything isn't clear, please let us know by submitting an issue!
+
+
+[transport]: https://github.com/libp2p/js-interfaces/tree/master/src/transport
+[crypto]: https://github.com/libp2p/js-interfaces/tree/master/src/crypto
+[streamMuxer]: https://github.com/libp2p/js-interfaces/tree/master/src/stream-muxer
--- a/examples/discovery-mechanisms/1.js
+++ b/examples/discovery-mechanisms/1.js
@@ -1,14 +1,11 @@
 /* eslint-disable no-console */
 'use strict'

-const libp2p = require('../../')
+const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
 const SECIO = require('libp2p-secio')
-const PeerInfo = require('peer-info')
 const Bootstrap = require('libp2p-bootstrap')
-const waterfall = require('async/waterfall')
-const defaultsDeep = require('@nodeutils/defaults-deep')

 // Find this list at: https://github.com/ipfs/js-ipfs/blob/master/src/core/runtime/config-nodejs.json
 const bootstrapers = [
@@ -23,51 +20,35 @@ const bootstrapers = [
  '/ip4/104.236.151.122/tcp/4001/p2p/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx'
 ]

-class MyBundle extends libp2p {
-  constructor (_options) {
-    const defaults = {
-      modules: {
-        transport: [ TCP ],
-        streamMuxer: [ Mplex ],
-        connEncryption: [ SECIO ],
-        peerDiscovery: [ Bootstrap ]
-      },
-      config: {
-        peerDiscovery: {
-          autoDial: true,
-          bootstrap: {
-            interval: 20e3,
-            enabled: true,
-            list: bootstrapers
-          }
+;(async () => {
+  const node = await Libp2p.create({
+    modules: {
+      transport: [TCP],
+      streamMuxer: [Mplex],
+      connEncryption: [SECIO],
+      peerDiscovery: [Bootstrap]
+    },
+    config: {
+      peerDiscovery: {
+        bootstrap: {
+          interval: 60e3,
+          enabled: true,
+          list: bootstrapers
        }
      }
    }
+  })

-    super(defaultsDeep(_options, defaults))
-  }
-}
+  node.peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')

-let node
-
-waterfall([
-  (cb) => PeerInfo.create(cb),
-  (peerInfo, cb) => {
-    peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-    node = new MyBundle({
-      peerInfo
-    })
-    node.start(cb)
-  }
-], (err) => {
-  if (err) { throw err }
+  node.on('peer:connect', (peer) => {
+    console.log('Connection established to:', peer.id.toB58String())	// Emitted when a peer has been found
+  })

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

-  node.on('peer:connect', (peer) => {
-    console.log('Connection established to:', peer.id.toB58String())
-  })
-})
+  await node.start()
+})();
--- a/examples/discovery-mechanisms/2.js
+++ b/examples/discovery-mechanisms/2.js
@@ -1,63 +1,45 @@
 /* eslint-disable no-console */
 'use strict'

-const libp2p = require('../../')
+const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
 const SECIO = require('libp2p-secio')
-const PeerInfo = require('peer-info')
 const MulticastDNS = require('libp2p-mdns')
-const waterfall = require('async/waterfall')
-const parallel = require('async/parallel')
-const defaultsDeep = require('@nodeutils/defaults-deep')

-class MyBundle extends libp2p {
-  constructor (_options) {
-    const defaults = {
-      modules: {
-        transport: [ TCP ],
-        streamMuxer: [ Mplex ],
-        connEncryption: [ SECIO ],
-        peerDiscovery: [ MulticastDNS ]
-      },
-      config: {
-        peerDiscovery: {
-          mdns: {
-            interval: 20e3,
-            enabled: true
-          }
+const createNode = async () => {
+  const node = await Libp2p.create({
+    modules: {
+      transport: [TCP],
+      streamMuxer: [Mplex],
+      connEncryption: [SECIO],
+      peerDiscovery: [MulticastDNS]
+    },
+    config: {
+      peerDiscovery: {
+        mdns: {
+          interval: 20e3,
+          enabled: true
        }
      }
    }
+  })
+  node.peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')

-    super(defaultsDeep(_options, defaults))
-  }
+  return node
 }

-function createNode (callback) {
-  let node
-
-  waterfall([
-    (cb) => PeerInfo.create(cb),
-    (peerInfo, cb) => {
-      peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-      node = new MyBundle({
-        peerInfo
-      })
-      node.start(cb)
-    }
-  ], (err) => callback(err, node))
-}
-
-parallel([
-  (cb) => createNode(cb),
-  (cb) => createNode(cb)
-], (err, nodes) => {
-  if (err) { throw err }
-
-  const node1 = nodes[0]
-  const node2 = nodes[1]
+;(async () => {
+  const [node1, node2] = await Promise.all([
+    createNode(),
+    createNode()
+  ])

  node1.on('peer:discovery', (peer) => console.log('Discovered:', peer.id.toB58String()))
  node2.on('peer:discovery', (peer) => console.log('Discovered:', peer.id.toB58String()))
-})
+
+  await Promise.all([
+    node1.start(),
+    node2.start()
+  ])
+})();
--- a/examples/discovery-mechanisms/README.md
+++ b/examples/discovery-mechanisms/README.md
@@ -10,36 +10,32 @@ These mechanisms save configuration and enable a node to operate without any exp

 For this demo, we will connect to IPFS default bootstrapper nodes and so, we will need to support the same set of features those nodes have, that are: TCP, mplex and SECIO. You can see the complete example at [1.js](./1.js).

-First, we create our libp2p bundle.
+First, we create our libp2p node.

 ```JavaScript
-const Bootstrap = require('libp2p-railing')
-class MyBundle extends libp2p {
-  constructor (peerInfo) {
-    const defaults = {
-      modules: {
-        transport: [ TCP ],
-        streamMuxer: [ Mplex ],
-        connEncryption: [ SECIO ],
-        peerDiscovery: [ Bootstrap ]
-      },
-      config: {
-        peerDiscovery: {
-          bootstrap: {
-            interval: 2000,
-            enabled: true,
-            list: bootstrapers
-          }
-        }
+const Libp2p = require('libp2p')
+const Bootstrap = require('libp2p-bootstrap')
+
+const node = Libp2p.create({
+  modules: {
+    transport: [ TCP ],
+    streamMuxer: [ Mplex ],
+    connEncryption: [ SECIO ],
+    peerDiscovery: [ Bootstrap ]
+  },
+  config: {
+    peerDiscovery: {
+      bootstrap: {
+        interval: 60e3,
+        enabled: true,
+        list: bootstrapers
      }
    }
-
-    super(defaultsDeep(_options, defaults))
  }
-}
+})
 ```

-In this bundle, we use a `bootstrappers` array listing peers to connect _on boot_. Here is the list used by js-ipfs and go-ipfs.
+In this configuration, we use a `bootstrappers` array listing peers to connect _on boot_. Here is the list used by js-ipfs and go-ipfs.

 ```JavaScript
 const bootstrapers = [
@@ -58,34 +54,37 @@ const bootstrapers = [
 Now, once we create and start the node, we can listen for events such as `peer:discovery` and `peer:connect`, these events tell us when we found a peer, independently of the discovery mechanism used and when we actually dialed to that peer.

 ```JavaScript
-let node
-
-waterfall([
-  (cb) => PeerInfo.create(cb),
-  (peerInfo, cb) => {
-    peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-    node = new MyBundle({
-      peerInfo
-    })
-    node.start(cb)
+const node = await Libp2p.create({
+  peerInfo,
+  modules: {
+    transport: [ TCP ],
+    streamMuxer: [ Mplex ],
+    connEncryption: [ SECIO ],
+    peerDiscovery: [ Bootstrap ]
+  },
+  config: {
+    peerDiscovery: {
+      bootstrap: {
+        interval: 60e3,
+        enabled: true,
+        list: bootstrapers
+      }
+    }
  }
-], (err) => {
-  if (err) { throw err }
-
-  // Emitted when a peer has been found
-  node.on('peer:discovery', (peer) => {
-    console.log('Discovered:', peer.id.toB58String())
-    // Note how we need to dial, even if just to warm up the Connection (by not
-    // picking any protocol) in order to get a full Connection. The Peer Discovery
-    // doesn't make any decisions for you.
-    node.dial(peer, () => {})
-  })
-
-  // Once the dial is complete, this event is emitted.
-  node.on('peer:connect', (peer) => {
-    console.log('Connection established to:', peer.id.toB58String())
-  })
 })
+
+node.peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
+
+node.on('peer:connect', (peer) => {
+  console.log('Connection established to:', peer.id.toB58String())	// Emitted when a peer has been found
+})
+
+// Emitted when a peer has been found
+node.on('peer:discovery', (peer) => {
+  console.log('Discovered:', peer.id.toB58String())
+})
+
+await node.start()
 ```

 From running [1.js](./1.js), you should see the following:
@@ -101,76 +100,56 @@ Discovered: QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64
 Discovered: QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd
 Discovered: QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3
 Discovered: QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx
-Connection established to: QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3
-Connection established to: QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd
-Connection established to: QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64
-Connection established to: QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm
-Connection established to: QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM
-Connection established to: QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx
-Connection established to: QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ
-Connection established to: QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z
-Connection established to: QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu
 ```

 ## 2. MulticastDNS to find other peers in the network

 For this example, we need `libp2p-mdns`, go ahead and `npm install` it. You can find the complete solution at [2.js](./2.js).

-Update your libp2p bundle to include MulticastDNS.
+Update your libp2p configuration to include MulticastDNS.

 ```JavaScript
-class MyBundle extends libp2p {
-  constructor (peerInfo) {
-    const defaults = {
-      modules: {
-        transport: [ TCP ],
-        streamMuxer: [ Mplex ],
-        connEncryption: [ SECIO ],
-        peerDiscovery: [ MulticastDNS ]
-      },
-      config: {
-        peerDiscovery: {
-          mdns: {
-            // Run at 1s so we can observe more quickly, default is 10s
-            interval: 1000,
-            enabled: true
-          }
+const Libp2p = require('libp2p')
+const MulticastDNS = require('libp2p-mdns')
+
+const createNode = () => {
+  return Libp2p.create({
+    modules: {
+      transport: [ TCP ],
+      streamMuxer: [ Mplex ],
+      connEncryption: [ SECIO ],
+      peerDiscovery: [ MulticastDNS ]
+    },
+    config: {
+      peerDiscovery: {
+        mdns: {
+          interval: 20e3,
+          enabled: true
        }
      }
    }
-
-    super(defaultsDeep(_options, defaults))
-  }
+  })
 }
 ```

 To observe it working, spawn two nodes.

 ```JavaScript
-parallel([
-  (cb) => createNode(cb),
-  (cb) => createNode(cb)
-], (err, nodes) => {
-  if (err) { throw err }
+const [node1, node2] = await Promise.all([
+  createNode(),
+  createNode()
+])

-  const node1 = nodes[0]
-  const node2 = nodes[1]
-
-  node1.on('peer:discovery', (peer) => console.log('Discovered:', peer.id.toB58String()))
-  node2.on('peer:discovery', (peer) => console.log('Discovered:', peer.id.toB58String()))
-})
+node1.on('peer:discovery', (peer) => console.log('Discovered:', peer.id.toB58String()))
+node2.on('peer:discovery', (peer) => console.log('Discovered:', peer.id.toB58String()))
 ```

-If you run this example, you will see a continuous stream of each peer discovering each other.
+If you run this example, you will see the other peers being discovered.

 ```bash
 > node 2.js
 Discovered: QmSSbQpuKrxkoXHm1v4Pi35hPN5hUHMZoBoawEs2Nhvi8m
 Discovered: QmRcXXhtG8vTqwVBRonKWtV4ovDoC1Fe56WYtcrw694eiJ
-Discovered: QmSSbQpuKrxkoXHm1v4Pi35hPN5hUHMZoBoawEs2Nhvi8m
-Discovered: QmRcXXhtG8vTqwVBRonKWtV4ovDoC1Fe56WYtcrw694eiJ
-Discovered: QmSSbQpuKrxkoXHm1v4Pi35hPN5hUHMZoBoawEs2Nhvi8m
-Discovered: QmRcXXhtG8vTqwVBRonKWtV4ovDoC1Fe56WYtcrw694eiJ
 ```

 ## 3. Where to find other Peer Discovery Mechanisms
--- a/examples/encrypted-communications/1.js
+++ b/examples/encrypted-communications/1.js
@@ -1,63 +1,52 @@
 'use strict'

-const libp2p = require('../../')
+const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
-const SPDY = require('libp2p-spdy')
+const Mplex = require('libp2p-mplex')
 const SECIO = require('libp2p-secio')
 const PeerInfo = require('peer-info')
-const waterfall = require('async/waterfall')
-const parallel = require('async/parallel')
-const pull = require('pull-stream')
-const defaultsDeep = require('@nodeutils/defaults-deep')

-class MyBundle extends libp2p {
-  constructor (_options) {
-    const defaults = {
-      modules: {
-        transport: [ TCP ],
-        streamMuxer: [ SPDY ],
-        connEncryption: [ SECIO ]
+const pipe = require('it-pipe')
+
+const createNode = async () => {
+  const peerInfo = await PeerInfo.create()
+  peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
+
+  const node = await Libp2p.create({
+    peerInfo,
+    modules: {
+      transport: [TCP],
+      streamMuxer: [Mplex],
+      connEncryption: [SECIO]
+    }
+  })
+
+  await node.start()
+
+  return node
+}
+
+;(async () => {
+  const [node1, node2] = await Promise.all([
+    createNode(),
+    createNode()
+  ])
+
+  node2.handle('/a-protocol', ({ stream }) => {
+    pipe(
+      stream,
+      async function (source) {
+        for await (const msg of source) {
+          console.log(msg.toString())
+        }
      }
-    }
-
-    super(defaultsDeep(_options, defaults))
-  }
-}
-
-function createNode (callback) {
-  let node
-
-  waterfall([
-    (cb) => PeerInfo.create(cb),
-    (peerInfo, cb) => {
-      peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-      node = new MyBundle({
-        peerInfo
-      })
-      node.start(cb)
-    }
-  ], (err) => callback(err, node))
-}
-
-parallel([
-  (cb) => createNode(cb),
-  (cb) => createNode(cb)
-], (err, nodes) => {
-  if (err) { throw err }
-
-  const node1 = nodes[0]
-  const node2 = nodes[1]
-
-  node2.handle('/a-protocol', (protocol, conn) => {
-    pull(
-      conn,
-      pull.map((v) => v.toString()),
-      pull.log()
    )
  })

-  node1.dialProtocol(node2.peerInfo, '/a-protocol', (err, conn) => {
-    if (err) { throw err }
-    pull(pull.values(['This information is sent out encrypted to the other peer']), conn)
-  })
-})
+  const { stream } = await node1.dialProtocol(node2.peerInfo, '/a-protocol')
+
+  await pipe(
+    ['This information is sent out encrypted to the other peer'],
+    stream
+  )
+})();
--- a/examples/encrypted-communications/README.md
+++ b/examples/encrypted-communications/README.md
@@ -4,7 +4,7 @@ libp2p can leverage the encrypted communications from the transports it uses (i.

 We call this usage a _connection upgrade_ where given a connection between peer A to peer B, a protocol handshake can be performed that gives that connection new properties.

-A byproduct of having these encrypted communications modules is that we can authenticate the peers we are dialing to. You might have noticed that every time we dial to a peer in libp2p space, we always use its PeerId at the end (e.g /ip4/127.0.0.1/tcp/89765/ipfs/QmWCbVw1XZ8hiYBwwshPce2yaTDYTqTaP7GCHGpry3ykWb), this PeerId is generated by hashing the Public Key of the peer. With this, we can create a crypto challenge when dialing to another peer and prove that peer is the owner of a PrivateKey that matches the Public Key we know.
+A byproduct of having these encrypted communications modules is that we can authenticate the peers we are dialing to. You might have noticed that every time we dial to a peer in libp2p space, we always use its PeerId at the end (e.g /ip4/127.0.0.1/tcp/89765/p2p/QmWCbVw1XZ8hiYBwwshPce2yaTDYTqTaP7GCHGpry3ykWb), this PeerId is generated by hashing the Public Key of the peer. With this, we can create a crypto challenge when dialing to another peer and prove that peer is the owner of a PrivateKey that matches the Public Key we know.

 # 1. Set up encrypted communications with SECIO

@@ -12,24 +12,21 @@ We will build this example on top of example for [Protocol and Stream Multiplexi

 SECIO is the crypto channel developed for IPFS, it is a TLS 1.3 like crypto channel that established an encrypted communication channel between two peers.

-To add it to your libp2p bundle, all you have to do is:
+To add it to your libp2p configuration, all you have to do is:

 ```JavaScript
+const Libp2p = require('libp2p')
 const SECIO = require('libp2p-secio')

-class MyBundle extends libp2p {
-  constructor (peerInfo) {
-    const defaults = {
-      modules: {
-        transport: [ TCP ],
-        streamMuxer: [ SPDY ],
-        // Attach secio as the crypto channel to use
-        connEncryption: [ SECIO ]
-      }
+const createNode = () => {
+  return Libp2p.create({
+    modules: {
+      transport: [ TCP ],
+      streamMuxer: [ Mplex ],
+      // Attach secio as the crypto channel to use
+      connEncryption: [ SECIO ]
    }
-
-    super(defaultsDeep(_options, defaults))
-  }
+  })
 }
 ```

--- a/examples/libp2p-in-the-browser/.babelrc
+++ b/examples/libp2p-in-the-browser/.babelrc
@@ -0,0 +1,4 @@
+{
+  "presets": ["@babel/preset-env"],
+  "plugins": ["syntax-async-functions","transform-regenerator"]
+}
--- a/examples/libp2p-in-the-browser/1/.gitignore
+++ b/examples/libp2p-in-the-browser/1/.gitignore
@@ -1 +0,0 @@
-bundle.js
--- a/examples/libp2p-in-the-browser/1/package.json
+++ b/examples/libp2p-in-the-browser/1/package.json
@@ -1,32 +0,0 @@
-{
-  "name": "libp2p-in-the-browser",
-  "version": "0.1.0",
-  "description": "See other nodes in the network using WebRTC Star discovery mechanism",
-  "main": "src/index.js",
-  "scripts": {
-    "bundle": "browserify src/index.js > public/bundle.js",
-    "serve": "static public -p 9090 -H '{\"Cache-Control\": \"no-cache, must-revalidate\"}'",
-    "start": "npm run bundle && npm run serve"
-  },
-  "license": "MIT",
-  "devDependencies": {
-    "browserify": "^14.5.0",
-    "concat-stream": "^1.6.0",
-    "detect-dom-ready": "^1.0.2",
-    "node-static": "~0.7.10"
-  },
-  "dependencies": {
-    "detect-dom-ready": "^1.0.2",
-    "libp2p": "../../../",
-    "libp2p-bootstrap": "~0.9.7",
-    "libp2p-gossipsub": "~0.0.4",
-    "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/public/index.html
+++ b/examples/libp2p-in-the-browser/1/public/index.html
@@ -1,14 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8"/>
-    <title>libp2p in the browser</title>
-  </head>
-  <body>
-    <h1>libp2p node running \o/</h1>
-    <div id="my-peer"></div>
-    <div id="swarm"></div>
-
-    <script src="bundle.js"></script>
-  </body>
-</html>
--- a/examples/libp2p-in-the-browser/1/src/browser-bundle.js
+++ b/examples/libp2p-in-the-browser/1/src/browser-bundle.js
@@ -1,94 +0,0 @@
-'use strict'
-
-const WebRTCStar = require('libp2p-webrtc-star')
-const WebSockets = require('libp2p-websockets')
-const WebSocketStar = require('libp2p-websocket-star')
-const Mplex = require('libp2p-mplex')
-const SPDY = require('libp2p-spdy')
-const SECIO = require('libp2p-secio')
-const Bootstrap = require('libp2p-bootstrap')
-const DHT = require('libp2p-kad-dht')
-const Gossipsub = require('libp2p-gossipsub')
-const libp2p = require('libp2p')
-
-// Find this list at: https://github.com/ipfs/js-ipfs/blob/master/src/core/runtime/config-browser.json
-const bootstrapList = [
-  '/dns4/ams-1.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
-  '/dns4/sfo-1.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx',
-  '/dns4/lon-1.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3',
-  '/dns4/sfo-2.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z',
-  '/dns4/sfo-3.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
-  '/dns4/sgp-1.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
-  '/dns4/nyc-1.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
-  '/dns4/nyc-2.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64',
-  '/dns4/node0.preload.ipfs.io/tcp/443/wss/p2p/QmZMxNdpMkewiVZLMRxaNxUeZpDUb34pWjZ1kZvsd16Zic',
-  '/dns4/node0.preload.ipfs.io/tcp/443/wss/p2p/Qmbut9Ywz9YEDrz8ySBSgWyJk41Uvm2QJPhwDJzJyGFsD6'
-]
-
-class Node extends libp2p {
-  constructor ({ peerInfo }) {
-    const wrtcStar = new WebRTCStar({ id: peerInfo.id })
-    const wsstar = new WebSocketStar({ id: peerInfo.id })
-
-    const defaults = {
-      modules: {
-        transport: [
-          wrtcStar,
-          WebSockets,
-          wsstar
-        ],
-        streamMuxer: [
-          Mplex,
-          SPDY
-        ],
-        connEncryption: [
-          SECIO
-        ],
-        peerDiscovery: [
-          wrtcStar.discovery,
-          wsstar.discovery,
-          Bootstrap
-        ],
-        dht: DHT,
-        pubsub: Gossipsub
-      },
-      config: {
-        peerDiscovery: {
-          autoDial: true,
-          webRTCStar: {
-            enabled: true
-          },
-          websocketStar: {
-            enabled: true
-          },
-          bootstrap: {
-            interval: 20e3,
-            enabled: true,
-            list: bootstrapList
-          }
-        },
-        relay: {
-          enabled: true,
-          hop: {
-            enabled: false,
-            active: false
-          }
-        },
-        dht: {
-          enabled: false
-        },
-        pubsub: {
-          enabled: false
-        }
-      },
-      connectionManager: {
-        minPeers: 10,
-        maxPeers: 50
-      }
-    }
-
-    super({ ...defaults, peerInfo })
-  }
-}
-
-module.exports = Node
--- a/examples/libp2p-in-the-browser/1/src/create-node.js
+++ b/examples/libp2p-in-the-browser/1/src/create-node.js
@@ -1,28 +0,0 @@
-'use strict'
-
-const PeerInfo = require('peer-info')
-const Node = require('./browser-bundle')
-
-function createNode (callback) {
-  PeerInfo.create((err, peerInfo) => {
-    if (err) {
-      return callback(err)
-    }
-
-    const peerIdStr = peerInfo.id.toB58String()
-    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(webrtcAddr)
-    peerInfo.multiaddrs.add(wsAddr)
-
-    const node = new Node({
-      peerInfo
-    })
-
-    node.idStr = peerIdStr
-    callback(null, node)
-  })
-}
-
-module.exports = createNode
--- a/examples/libp2p-in-the-browser/1/src/index.js
+++ b/examples/libp2p-in-the-browser/1/src/index.js
@@ -1,57 +0,0 @@
-/* eslint no-console: ["error", { allow: ["log"] }] */
-/* eslint max-nested-callbacks: ["error", 5] */
-'use strict'
-
-const domReady = require('detect-dom-ready')
-const createNode = require('./create-node')
-
-domReady(() => {
-  const myPeerDiv = document.getElementById('my-peer')
-  const swarmDiv = document.getElementById('swarm')
-
-  createNode((err, node) => {
-    if (err) {
-      return console.log('Could not create the Node, check if your browser has WebRTC Support', err)
-    }
-
-    node.on('peer:discovery', (peerInfo) => {
-      console.log('Discovered a peer:', peerInfo.id.toB58String())
-    })
-
-    node.on('peer:connect', (peerInfo) => {
-      const idStr = peerInfo.id.toB58String()
-      console.log('Got connection to: ' + idStr)
-      const connDiv = document.createElement('div')
-      connDiv.innerHTML = 'Connected to: ' + idStr
-      connDiv.id = idStr
-      swarmDiv.append(connDiv)
-    })
-
-    node.on('peer:disconnect', (peerInfo) => {
-      const idStr = peerInfo.id.toB58String()
-      const el = document.getElementById(idStr)
-      el && el.remove()
-    })
-
-    node.start((err) => {
-      if (err) {
-        return console.log(err)
-      }
-
-      const idStr = node.peerInfo.id.toB58String()
-
-      const idDiv = document
-        .createTextNode('Node is ready. ID: ' + idStr)
-
-      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
@@ -1,22 +1,55 @@
-# libp2p running in the Browser
+# libp2p in the browser

-One of the primary goals with libp2p P2P was to get it fully working in the browser and interopable with the versions running in Go and in Node.js.
+This example leverages the [Parcel.js bundler](https://parceljs.org/) to compile and serve the libp2p code in the browser. Parcel uses [Babel](https://babeljs.io/) to handle transpilation of the code. You can use other bundlers such as Webpack or Browserify, but we will not be covering them here.

-# 1. Setting up a simple app that lists connections to other nodes
+## Setup

-Start by installing libp2p's dependencies.
+In order to run the example, first install the dependencies from same directory as this README:

-```bash
-> cd ../../
-> npm install
-> cd examples/libp2p-in-the-browser
+```
+cd ./examples/libp2p-in-the-browser
+npm install
 ```

-Then simply go into the folder [1](./1) and execute the following
+## Signaling Server

-```bash
-> cd 1
-> npm install
-> npm start
-# open your browser in port :9090
+This example uses the `libp2p-webrtc-star` module, which enables libp2p browser nodes to establish direct connections to one another via a central signaling server. For this example, we are using the signaling server that ships with `libp2p-webrtc-star`.
+
+You can start the server by running `npm run server`. This will start a signaling server locally on port `9090`. If you'd like to run a signaling server outside of this example, you can see instructions on how to do so in the [`libp2p-webrtc-star` README](https://github.com/libp2p/js-libp2p-webrtc-star).
+
+When you run the server, you should see output that looks something like this:
+
+```log
+$ npm run server
+
+> libp2p-in-browser@1.0.0 server
+> star-signal
+
+Listening on: http://0.0.0.0:9090
 ```
+
+## Running the examples
+
+Once you have started the signaling server, you can run the Parcel server.
+
+```
+npm start
+```
+
+The output should look something like this:
+
+```log
+$ npm start
+
+> libp2p-in-browser@1.0.0 start
+> parcel index.html
+
+Server running at http://localhost:1234
+✨  Built in 1000ms.
+```
+
+This will compile the code and start a server listening on port [http://localhost:1234](http://localhost:1234). Now open your browser to `http://localhost:1234`. You should see a log of your node's Peer ID, the discovered peers from the Bootstrap module, and connections to those peers as they are created.
+
+Now, if you open a second browser tab to `http://localhost:1234`, you should discover your node from the previous tab. This is due to the fact that the `libp2p-webrtc-star` transport also acts as a Peer Discovery interface. Your node will be notified of any peer that connects to the same signaling server you are connected to. Once libp2p discovers this new peer, it will attempt to establish a direct WebRTC connection.
+
+**Note**: In the example we assign libp2p to `window.libp2p`, in case you would like to play around with the API directly in the browser. You can of course make changes to `index.js` and Parcel will automatically rebuild and reload the browser tabs.
--- a/examples/libp2p-in-the-browser/index.html
+++ b/examples/libp2p-in-the-browser/index.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+
+<html lang="en">
+
+  <head>
+    <meta charset="utf-8">
+    <title>js-libp2p parcel.js browser example</title>
+  </head>
+
+  <body>
+    <header>
+      <h1 id="status">Starting libp2p...</h1>
+    </header>
+
+    <main>
+      <pre id="output"></pre>
+    </main>
+
+    <script src="./index.js"></script>
+
+  </body>
+
+</html>
--- a/examples/libp2p-in-the-browser/index.js
+++ b/examples/libp2p-in-the-browser/index.js
@@ -0,0 +1,73 @@
+import 'babel-polyfill'
+import Libp2p from 'libp2p'
+import Websockets from 'libp2p-websockets'
+import WebRTCStar from 'libp2p-webrtc-star'
+import Secio from 'libp2p-secio'
+import Mplex from 'libp2p-mplex'
+import Boostrap from 'libp2p-bootstrap'
+
+document.addEventListener('DOMContentLoaded', async () => {
+  // Create our libp2p node
+  const libp2p = await Libp2p.create({
+    modules: {
+      transport: [Websockets, WebRTCStar],
+      connEncryption: [Secio],
+      streamMuxer: [Mplex],
+      peerDiscovery: [Boostrap]
+    },
+    config: {
+      peerDiscovery: {
+        bootstrap: {
+          enabled: true,
+          list: [
+            '/dns4/ams-1.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
+            '/dns4/lon-1.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3',
+            '/dns4/sfo-3.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
+            '/dns4/sgp-1.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
+            '/dns4/nyc-1.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
+            '/dns4/nyc-2.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64'
+          ]
+        }
+      }
+    }
+  })
+
+  // UI elements
+  const status = document.getElementById('status')
+  const output = document.getElementById('output')
+
+  output.textContent = ''
+
+  function log (txt) {
+    console.info(txt)
+    output.textContent += `${txt.trim()}\n`
+  }
+
+  // Add the signaling server address, along with our PeerId to our multiaddrs list
+  // libp2p will automatically attempt to dial to the signaling server so that it can
+  // receive inbound connections from other peers
+  const webrtcAddr = '/ip4/0.0.0.0/tcp/9090/wss/p2p-webrtc-star'
+  libp2p.peerInfo.multiaddrs.add(webrtcAddr)
+
+  // Listen for new peers
+  libp2p.on('peer:discovery', (peerInfo) => {
+    log(`Found peer ${peerInfo.id.toB58String()}`)
+  })
+
+  // Listen for new connections to peers
+  libp2p.on('peer:connect', (peerInfo) => {
+    log(`Connected to ${peerInfo.id.toB58String()}`)
+  })
+
+  // Listen for peers disconnecting
+  libp2p.on('peer:disconnect', (peerInfo) => {
+    log(`Disconnected from ${peerInfo.id.toB58String()}`)
+  })
+
+  await libp2p.start()
+  status.innerText = 'libp2p started!'
+  log(`libp2p id is ${libp2p.peerInfo.id.toB58String()}`)
+
+  // Export libp2p to the window so you can play with the API
+  window.libp2p = libp2p
+})
--- a/examples/libp2p-in-the-browser/package.json
+++ b/examples/libp2p-in-the-browser/package.json
@@ -0,0 +1,34 @@
+{
+  "name": "libp2p-in-browser",
+  "version": "1.0.0",
+  "description": "A libp2p node running in the browser",
+  "main": "index.js",
+  "browserslist": [
+    "last 2 Chrome versions"
+  ],
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "start": "parcel index.html",
+    "server": "star-signal"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@babel/preset-env": "^7.8.3",
+    "libp2p": "../../",
+    "libp2p-bootstrap": "^0.10.3",
+    "libp2p-mplex": "^0.9.3",
+    "libp2p-secio": "^0.12.2",
+    "libp2p-webrtc-star": "^0.17.3",
+    "libp2p-websockets": "^0.13.2"
+  },
+  "devDependencies": {
+    "@babel/cli": "^7.8.3",
+    "@babel/core": "^7.8.3",
+    "babel-plugin-syntax-async-functions": "^6.13.0",
+    "babel-plugin-transform-regenerator": "^6.26.0",
+    "babel-polyfill": "^6.26.0",
+    "parcel-bundler": "^1.12.4"
+  }
+}
--- a/examples/peer-and-content-routing/1.js
+++ b/examples/peer-and-content-routing/1.js
@@ -1,77 +1,55 @@
 /* eslint-disable no-console */
 'use strict'

-const libp2p = require('../../')
+const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
 const SECIO = require('libp2p-secio')
 const PeerInfo = require('peer-info')
 const KadDHT = require('libp2p-kad-dht')
-const defaultsDeep = require('@nodeutils/defaults-deep')
-const waterfall = require('async/waterfall')
-const parallel = require('async/parallel')

-class MyBundle extends libp2p {
-  constructor (_options) {
-    const defaults = {
-      modules: {
-        transport: [ TCP ],
-        streamMuxer: [ Mplex ],
-        connEncryption: [ SECIO ],
-        // we add the DHT module that will enable Peer and Content Routing
-        dht: KadDHT
-      },
-      config: {
-        dht: {
-          enabled: true,
-          kBucketSize: 20
-        }
+const delay = require('delay')
+
+const createNode = async () => {
+  const peerInfo = await PeerInfo.create()
+  peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
+
+  const node = await Libp2p.create({
+    peerInfo,
+    modules: {
+      transport: [TCP],
+      streamMuxer: [Mplex],
+      connEncryption: [SECIO],
+      dht: KadDHT
+    },
+    config: {
+      dht: {
+        enabled: true
      }
    }
-
-    super(defaultsDeep(_options, defaults))
-  }
-}
-
-function createNode (callback) {
-  let node
-
-  waterfall([
-    (cb) => PeerInfo.create(cb),
-    (peerInfo, cb) => {
-      peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-      node = new MyBundle({
-        peerInfo
-      })
-      node.start(cb)
-    }
-  ], (err) => callback(err, node))
-}
-
-parallel([
-  (cb) => createNode(cb),
-  (cb) => createNode(cb),
-  (cb) => createNode(cb)
-], (err, nodes) => {
-  if (err) { throw err }
-
-  const node1 = nodes[0]
-  const node2 = nodes[1]
-  const node3 = nodes[2]
-
-  parallel([
-    (cb) => node1.dial(node2.peerInfo, cb),
-    (cb) => node2.dial(node3.peerInfo, cb),
-    // Set up of the cons might take time
-    (cb) => setTimeout(cb, 300)
-  ], (err) => {
-    if (err) { throw err }
-
-    node1.peerRouting.findPeer(node3.peerInfo.id, (err, peer) => {
-      if (err) { throw err }
-
-      console.log('Found it, multiaddrs are:')
-      peer.multiaddrs.forEach((ma) => console.log(ma.toString()))
-    })
  })
-})
+
+  await node.start()
+  return node
+}
+
+;(async () => {
+  const [node1, node2, node3] = await Promise.all([
+    createNode(),
+    createNode(),
+    createNode()
+  ])
+
+  await Promise.all([
+    node1.dial(node2.peerInfo),
+    node2.dial(node3.peerInfo)
+  ])
+
+  // The DHT routing tables need a moment to populate
+  await delay(100)
+
+  const peer = await node1.peerRouting.findPeer(node3.peerInfo.id)
+
+  console.log('Found it, multiaddrs are:')
+  peer.multiaddrs.forEach((ma) => console.log(ma.toString()))
+})();
--- a/examples/peer-and-content-routing/2.js
+++ b/examples/peer-and-content-routing/2.js
@@ -1,85 +1,61 @@
 /* eslint-disable no-console */
 'use strict'

-const libp2p = require('../../')
+const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
 const SECIO = require('libp2p-secio')
 const PeerInfo = require('peer-info')
 const CID = require('cids')
 const KadDHT = require('libp2p-kad-dht')
-const defaultsDeep = require('@nodeutils/defaults-deep')
-const waterfall = require('async/waterfall')
-const parallel = require('async/parallel')

-class MyBundle extends libp2p {
-  constructor (_options) {
-    const defaults = {
-      modules: {
-        transport: [ TCP ],
-        streamMuxer: [ Mplex ],
-        connEncryption: [ SECIO ],
-        // we add the DHT module that will enable Peer and Content Routing
-        dht: KadDHT
-      },
-      config: {
-        dht: {
-          enabled: true,
-          kBucketSize: 20
-        }
+const all = require('it-all')
+const delay = require('delay')
+
+const createNode = async () => {
+  const peerInfo = await PeerInfo.create()
+  peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
+
+  const node = await Libp2p.create({
+    peerInfo,
+    modules: {
+      transport: [TCP],
+      streamMuxer: [Mplex],
+      connEncryption: [SECIO],
+      dht: KadDHT
+    },
+    config: {
+      dht: {
+        enabled: true
      }
    }
-
-    super(defaultsDeep(_options, defaults))
-  }
-}
-
-function createNode (callback) {
-  let node
-
-  waterfall([
-    (cb) => PeerInfo.create(cb),
-    (peerInfo, cb) => {
-      peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-      node = new MyBundle({
-        peerInfo
-      })
-      node.start(cb)
-    }
-  ], (err) => callback(err, node))
-}
-
-parallel([
-  (cb) => createNode(cb),
-  (cb) => createNode(cb),
-  (cb) => createNode(cb)
-], (err, nodes) => {
-  if (err) { throw err }
-
-  const node1 = nodes[0]
-  const node2 = nodes[1]
-  const node3 = nodes[2]
-
-  parallel([
-    (cb) => node1.dial(node2.peerInfo, cb),
-    (cb) => node2.dial(node3.peerInfo, cb),
-    // Set up of the cons might take time
-    (cb) => setTimeout(cb, 300)
-  ], (err) => {
-    if (err) { throw err }
-
-    const cid = new CID('QmTp9VkYvnHyrqKQuFPiuZkiX9gPcqj6x5LJ1rmWuSySnL')
-
-    node1.contentRouting.provide(cid, (err) => {
-      if (err) { throw err }
-
-      console.log('Node %s is providing %s', node1.peerInfo.id.toB58String(), cid.toBaseEncodedString())
-
-      node3.contentRouting.findProviders(cid, 5000, (err, providers) => {
-        if (err) { throw err }
-
-        console.log('Found provider:', providers[0].id.toB58String())
-      })
-    })
  })
-})
+
+  await node.start()
+  return node
+}
+
+;(async () => {
+  const [node1, node2, node3] = await Promise.all([
+    createNode(),
+    createNode(),
+    createNode()
+  ])
+
+  await Promise.all([
+    node1.dial(node2.peerInfo),
+    node2.dial(node3.peerInfo)
+  ])
+
+  const cid = new CID('QmTp9VkYvnHyrqKQuFPiuZkiX9gPcqj6x5LJ1rmWuSySnL')
+  await node1.contentRouting.provide(cid)
+
+  console.log('Node %s is providing %s', node1.peerInfo.id.toB58String(), cid.toBaseEncodedString())
+
+  // wait for propagation
+  await delay(300)
+
+  const providers = await all(node3.contentRouting.findProviders(cid, { timeout: 3000 }))
+
+  console.log('Found provider:', providers[0].id.toB58String())
+})();
--- a/examples/peer-and-content-routing/README.md
+++ b/examples/peer-and-content-routing/README.md
@@ -10,31 +10,27 @@ Content Routing is the category of modules that offer a way to find where conten

 This example builds on top of the [Protocol and Stream Muxing](../protocol-and-stream-muxing). We need to install `libp2p-kad-dht`, go ahead and `npm install libp2p-kad-dht`. If you want to see the final version, open [1.js](./1.js).

-First, let's update our bundle to support Peer Routing and Content Routing.
+First, let's update our config to support Peer Routing and Content Routing.

 ```JavaScript
-class MyBundle extends libp2p {
-  constructor (_options) {
-    const defaults = {
-      modules: {
-        transport: [ TCP ],
-        streamMuxer: [ Mplex ],
-        connEncryption: [ SECIO ],
-        // we add the DHT module that will enable Peer and Content Routing
-        dht: KadDHT
-      },
-      config: {
-        dht: {
-          // dht must be enabled
-          enabled: true,
-          kBucketSize: 20
-        }
-      }
-    }
+const Libp2p = require('libp2p')
+const KadDHT = require('libp2p-kad-dht')

-    super(defaultsDeep(_options, defaults))
+const node = await Libp2p.create({
+  modules: {
+    transport: [ TCP ],
+    streamMuxer: [ Mplex ],
+    connEncryption: [ SECIO ],
+    // we add the DHT module that will enable Peer and Content Routing
+    dht: KadDHT
+  },
+  config: {
+    dht: {
+      // dht must be enabled
+      enabled: true
+    }
  }
-}
+})
 ```

 Once that is done, we can use the createNode function we developed in the previous example to create 3 nodes. Connect node 1 to node 2 and node 2 to node 3. We will use node 2 as a way to find the whereabouts of node 3
@@ -44,22 +40,18 @@ const node1 = nodes[0]
 const node2 = nodes[1]
 const node3 = nodes[2]

-parallel([
-  (cb) => node1.dial(node2.peerInfo, cb),
-  (cb) => node2.dial(node3.peerInfo, cb),
-  // Set up of the cons might take time
-  (cb) => setTimeout(cb, 100)
-], (err) => {
-  if (err) { throw err }
+await Promise.all([
+  node1.dial(node2.peerInfo),
+  node2.dial(node3.peerInfo)
+])

-  //
-  node1.peerRouting.findPeer(node3.peerInfo.id, (err, peer) => {
-    if (err) { throw err }
+// Set up of the cons might take time
+await delay(100)

-    console.log('Found it, multiaddrs are:')
-    peer.multiaddrs.forEach((ma) => console.log(ma.toString()))
-  })
-})
+const peer = await node1.peerRouting.findPeer(node3.peerInfo.id)
+
+console.log('Found it, multiaddrs are:')
+peer.multiaddrs.forEach((ma) => console.log(ma.toString()))
 ```

 You should see the output being something like:
@@ -82,17 +74,12 @@ You can find this example completed in [2.js](./2.js), however as you will see i
 Instead of calling `peerRouting.findPeer`, we will use `contentRouting.provide` and `contentRouting.findProviders`.

 ```JavaScript
-node1.contentRouting.provide(cid, (err) => {
-  if (err) { throw err }
+await node1.contentRouting.provide(cid)
+console.log('Node %s is providing %s', node1.peerInfo.id.toB58String(), cid.toBaseEncodedString())

-  console.log('Node %s is providing %s', node1.peerInfo.id.toB58String(), cid.toBaseEncodedString())
+const provs = await all(node3.contentRouting.findProviders(cid, { timeout: 5000 }))

-  node3.contentRouting.findProviders(cid, 5000, (err, providers) => {
-    if (err) { throw err }
-
-    console.log('Found provider:', providers[0].id.toB58String())
-  })
-})
+console.log('Found provider:', providers[0].id.toB58String())
 ```

 The output of your program should look like:
--- a/examples/pnet-ipfs/index.js
+++ b/examples/pnet-ipfs/index.js
@@ -1,145 +0,0 @@
-/* eslint no-console: ["off"] */
-'use strict'
-
-const IPFS = require('ipfs')
-const assert = require('assert').strict
-const { generate: writeKey } = require('libp2p/src/pnet')
-const path = require('path')
-const fs = require('fs')
-const privateLibp2pBundle = require('./libp2p-bundle')
-const { mkdirp } = require('./utils')
-
-// Create two separate repo paths so we can run two nodes and check their output
-const repo1 = path.resolve('./tmp', 'repo1', '.ipfs')
-const repo2 = path.resolve('./tmp', 'repo2', '.ipfs')
-mkdirp(repo1)
-mkdirp(repo2)
-
-// Create a buffer and write the swarm key to it
-const swarmKey = Buffer.alloc(95)
-writeKey(swarmKey)
-
-// This key is for the `TASK` mentioned in the writeFileSync calls below
-const otherSwarmKey = Buffer.alloc(95)
-writeKey(otherSwarmKey)
-
-// Add the swarm key to both repos
-const swarmKey1Path = path.resolve(repo1, 'swarm.key')
-const swarmKey2Path = path.resolve(repo2, 'swarm.key')
-fs.writeFileSync(swarmKey1Path, swarmKey)
-// TASK: switch the commented out line below so we're using a different key, to see the nodes fail to connect
-fs.writeFileSync(swarmKey2Path, swarmKey)
-// fs.writeFileSync(swarmKey2Path, otherSwarmKey)
-
-// Create the first ipfs node
-const node1 = new IPFS({
-  repo: repo1,
-  libp2p: privateLibp2pBundle(swarmKey1Path),
-  config: {
-    Addresses: {
-      // Set the swarm address so we dont get port collision on the nodes
-      Swarm: ['/ip4/0.0.0.0/tcp/9101']
-    }
-  }
-})
-
-// Create the second ipfs node
-const node2 = new IPFS({
-  repo: repo2,
-  libp2p: privateLibp2pBundle(swarmKey2Path),
-  config: {
-    Addresses: {
-      // Set the swarm address so we dont get port collision on the nodes
-      Swarm: ['/ip4/0.0.0.0/tcp/9102']
-    }
-  }
-})
-
-console.log('auto starting the nodes...')
-
-// `nodesStarted` keeps track of how many of our nodes have started
-let nodesStarted = 0
-/**
- * Calls `connectAndTalk` when both nodes have started
- * @returns {void}
- */
-const didStartHandler = () => {
-  if (++nodesStarted === 2) {
-    // If both nodes are up, start talking
-    connectAndTalk()
-  }
-}
-
-/**
- * Exits the process when all started nodes have stopped
- * @returns {void}
- */
-const didStopHandler = () => {
-  if (--nodesStarted < 1) {
-    console.log('all nodes stopped, exiting.')
-    process.exit(0)
-  }
-}
-
-/**
- * Stops the running nodes
- * @param {Error} err An optional error to log to the console
- * @returns {void}
- */
-const doStop = (err) => {
-  if (err) {
-    console.error(err)
-  }
-
-  console.log('Shutting down...')
-  node1.stop()
-  node2.stop()
-}
-
-/**
- * Connects the IPFS nodes and transfers data between them
- * @returns {void}
- */
-const connectAndTalk = async () => {
-  console.log('connecting the nodes...')
-  const node2Id = await node2.id()
-  const dataToAdd = Buffer.from('Hello, private friend!')
-
-  // Connect the nodes
-  // This will error when different private keys are used
-  try {
-    await node1.swarm.connect(node2Id.addresses[0])
-  } catch (err) {
-    return doStop(err)
-  }
-  console.log('the nodes are connected, let\'s add some data')
-
-  // Add some data to node 1
-  let addedCID
-  try {
-    addedCID = await node1.add(dataToAdd)
-  } catch (err) {
-    return doStop(err)
-  }
-  console.log(`added ${addedCID[0].path} to the node1`)
-
-  // Retrieve the data from node 2
-  let cattedData
-  try {
-    cattedData = await node2.cat(addedCID[0].path)
-  } catch (err) {
-    return doStop(err)
-  }
-  assert.deepEqual(cattedData.toString(), dataToAdd.toString(), 'Should have equal data')
-  console.log(`successfully retrieved "${dataToAdd.toString()}" from node2`)
-
-  doStop()
-}
-
-// Wait for the nodes to boot
-node1.once('start', didStartHandler)
-node2.once('start', didStartHandler)
-
-// Listen for the nodes stopping so we can cleanup
-node1.once('stop', didStopHandler)
-node2.once('stop', didStopHandler)
--- a/examples/pnet-ipfs/libp2p-bundle.js
+++ b/examples/pnet-ipfs/libp2p-bundle.js
@@ -1,60 +0,0 @@
-'use strict'
-
-const Libp2p = require('libp2p')
-const TCP = require('libp2p-tcp')
-const MPLEX = require('libp2p-mplex')
-const SECIO = require('libp2p-secio')
-const fs = require('fs')
-const Protector = require('libp2p/src/pnet')
-
-/**
- * Options for the libp2p bundle
- * @typedef {Object} libp2pBundle~options
- * @property {PeerInfo} peerInfo - The PeerInfo of the IPFS node
- * @property {PeerBook} peerBook - The PeerBook of the IPFS node
- * @property {Object} config - The config of the IPFS node
- * @property {Object} options - The options given to the IPFS node
- */
-
-/**
- * privateLibp2pBundle returns a libp2p bundle function that will use the swarm
- * key at the given `swarmKeyPath` to create the Protector
- *
- * @param {string} swarmKeyPath The path to our swarm key
- * @returns {libp2pBundle} Returns a libp2pBundle function for use in IPFS creation
- */
-const privateLibp2pBundle = (swarmKeyPath) => {
-  /**
-   * This is the bundle we will use to create our fully customized libp2p bundle.
-   *
-   * @param {libp2pBundle~options} opts The options to use when generating the libp2p node
-   * @returns {Libp2p} Our new libp2p node
-   */
-  const libp2pBundle = (opts) => {
-    // Set convenience variables to clearly showcase some of the useful things that are available
-    const peerInfo = opts.peerInfo
-    const peerBook = opts.peerBook
-
-    // Build and return our libp2p node
-    return new Libp2p({
-      peerInfo,
-      peerBook,
-      modules: {
-        transport: [TCP], // We're only using the TCP transport for this example
-        streamMuxer: [MPLEX], // We're only using mplex muxing
-        // Let's make sure to use identifying crypto in our pnet since the protector doesn't
-        // care about node identity, and only the presence of private keys
-        connEncryption: [SECIO],
-        // Leave peer discovery empty, we don't want to find peers. We could omit the property, but it's
-        // being left in for explicit readability.
-        // We should explicitly dial pnet peers, or use a custom discovery service for finding nodes in our pnet
-        peerDiscovery: [],
-        connProtector: new Protector(fs.readFileSync(swarmKeyPath))
-      }
-    })
-  }
-
-  return libp2pBundle
-}
-
-module.exports = privateLibp2pBundle
--- a/examples/pnet-ipfs/.gitignore
+++ b/examples/pnet-ipfs/.gitignore
--- a/examples/pnet-ipfs/README.md
+++ b/examples/pnet-ipfs/README.md
@@ -1,5 +1,5 @@
-# Private Networking with IPFS
-This example shows how to set up a private network of IPFS nodes.
+# Private Networking
+This example shows how to set up a private network of libp2p nodes.

 ## Setup
 Install dependencies:
--- a/examples/pnet/index.js
+++ b/examples/pnet/index.js
@@ -0,0 +1,50 @@
+/* eslint no-console: ["off"] */
+'use strict'
+
+const { generate } = require('libp2p/src/pnet')
+const privateLibp2pNode = require('./libp2p-node')
+
+const pipe = require('it-pipe')
+
+// Create a buffer and write the swarm key to it
+const swarmKey = Buffer.alloc(95)
+generate(swarmKey)
+
+// This key is for testing a different key not working
+const otherSwarmKey = Buffer.alloc(95)
+generate(otherSwarmKey)
+
+;(async () => {
+  const node1 = await privateLibp2pNode(swarmKey)
+
+  // TASK: switch the commented out line below so we're using a different key, to see the nodes fail to connect	
+  const node2 = await privateLibp2pNode(swarmKey)
+  // const node2 = await privateLibp2pNode(otherSwarmKey)
+
+  await Promise.all([
+    node1.start(),
+    node2.start()
+  ])
+
+  console.log('nodes started...')
+
+  await node1.dial(node2.peerInfo)
+
+  node2.handle('/private', ({ stream }) => {
+    pipe(
+      stream,
+      async function (source) {
+        for await (const msg of source) {
+          console.log(msg.toString())
+        }
+      }
+    )
+  })
+
+  const { stream } = await node1.dialProtocol(node2.peerInfo, '/private')
+
+  await pipe(
+    ['This message is sent on a private network'],
+    stream
+  )
+})();
--- a/examples/pnet/libp2p-node.js
+++ b/examples/pnet/libp2p-node.js
@@ -0,0 +1,36 @@
+'use strict'
+
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const SECIO = require('libp2p-secio')
+const Protector = require('libp2p/src/pnet')
+
+/**
+ * privateLibp2pNode returns a libp2p node function that will use the swarm
+ * key at the given `swarmKeyPath` to create the Protector
+ *
+ * @param {Buffer} swarmKey
+ * @returns {Promise<libp2p>} Returns a libp2pNode function for use in IPFS creation
+ */
+const privateLibp2pNode = async (swarmKeyPath) => {
+  const node = await Libp2p.create({
+    modules: {
+      transport: [TCP], // We're only using the TCP transport for this example
+      streamMuxer: [MPLEX], // We're only using mplex muxing
+      // Let's make sure to use identifying crypto in our pnet since the protector doesn't
+      // care about node identity, and only the presence of private keys
+      connEncryption: [SECIO],
+      // Leave peer discovery empty, we don't want to find peers. We could omit the property, but it's
+      // being left in for explicit readability.
+      // We should explicitly dial pnet peers, or use a custom discovery service for finding nodes in our pnet
+      peerDiscovery: [],
+      connProtector: new Protector(swarmKeyPath)
+    }
+  })
+
+  node.peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
+  return node
+}
+
+module.exports = privateLibp2pNode
--- a/examples/pnet-ipfs/package.json
+++ b/examples/pnet-ipfs/package.json
@@ -11,10 +11,9 @@
  "author": "",
  "license": "ISC",
  "dependencies": {
-    "ipfs": "^0.38.0",
-    "libp2p": "^0.26.2",
-    "libp2p-mplex": "^0.8.5",
-    "libp2p-secio": "^0.11.1",
-    "libp2p-tcp": "^0.13.2"
+    "libp2p": "../..",
+    "libp2p-mplex": "^0.9.3",
+    "libp2p-secio": "^0.12.1",
+    "libp2p-tcp": "^0.14.2"
  }
 }
--- a/examples/pnet-ipfs/utils.js
+++ b/examples/pnet-ipfs/utils.js
--- a/examples/protocol-and-stream-muxing/1.js
+++ b/examples/protocol-and-stream-muxing/1.js
@@ -1,102 +1,79 @@
 'use strict'

-const libp2p = require('../../')
+const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
+const SECIO = require('libp2p-secio')
 const PeerInfo = require('peer-info')
-const waterfall = require('async/waterfall')
-const parallel = require('async/parallel')
-const pull = require('pull-stream')
-const defaultsDeep = require('@nodeutils/defaults-deep')

-class MyBundle extends libp2p {
-  constructor (_options) {
-    const defaults = {
-      modules: {
-        transport: [ TCP ]
-      }
+const pipe = require('it-pipe')
+
+const createNode = async () => {
+  const peerInfo = await PeerInfo.create()
+  peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
+
+  const node = await Libp2p.create({
+    peerInfo,
+    modules: {
+      transport: [TCP],
+      streamMuxer: [MPLEX],
+      connEncryption: [SECIO]
    }
+  })

-    super(defaultsDeep(_options, defaults))
-  }
+  await node.start()
+
+  return node
 }

-function createNode (callback) {
-  let node
-
-  waterfall([
-    (cb) => PeerInfo.create(cb),
-    (peerInfo, cb) => {
-      peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-      node = new MyBundle({
-        peerInfo
-      })
-      node.start(cb)
-    }
-  ], (err) => callback(err, node))
-}
-
-parallel([
-  (cb) => createNode(cb),
-  (cb) => createNode(cb)
-], (err, nodes) => {
-  if (err) { throw err }
-
-  const node1 = nodes[0]
-  const node2 = nodes[1]
+;(async () => {
+  const [node1, node2] = await Promise.all([
+    createNode(),
+    createNode()
+  ])

  // exact matching
-  node2.handle('/your-protocol', (protocol, conn) => {
-    pull(
-      conn,
-      pull.map((v) => v.toString()),
-      pull.log()
+  node2.handle('/your-protocol', ({ stream }) => {
+    pipe(
+      stream,
+      async function (source) {
+        for await (const msg of source) {
+          console.log(msg.toString())
+        }
+      }
    )
  })

-  // semver matching
+  // multiple protocols
  /*
-  node2.handle('/another-protocol/1.0.1', (protocol, conn) => {
-    pull(
-      conn,
-      pull.map((v) => v.toString()),
-      pull.log()
-    )
-  })
-  */
-
-  // custom func matching
-  /*
-  node2.handle('/custom-match-func', (protocol, conn) => {
-    pull(
-      conn,
-      pull.map((v) => v.toString()),
-      pull.log()
-    )
-  }, (myProtocol, requestedProtocol, callback) => {
-    if (myProtocol.indexOf(requestedProtocol)) {
-      callback(null, true)
-    } else {
-      callback(null, false)
+  node2.handle(['/another-protocol/1.0.0', '/another-protocol/2.0.0'], ({ protocol, stream }) => {
+    if (protocol === '/another-protocol/2.0.0') {
+      // handle backwards compatibility
    }
+
+    pipe(
+      stream,
+      async function (source) {
+        for await (const msg of source) {
+          console.log(msg.toString())
+        }
+      }
+    )
  })
  */

-  node1.dialProtocol(node2.peerInfo, '/your-protocol', (err, conn) => {
-    if (err) { throw err }
-    pull(pull.values(['my own protocol, wow!']), conn)
-  })
+  const { stream } = await node1.dialProtocol(node2.peerInfo, ['/your-protocol'])
+  await pipe(
+    ['my own protocol, wow!'],
+    stream
+  )

  /*
-  node1.dialProtocol(node2.peerInfo, '/another-protocol/1.0.0', (err, conn) => {
-    if (err) { throw err }
-    pull(pull.values(['semver me please']), conn)
-  })
-  */
+  const { stream } = node1.dialProtocol(node2.peerInfo, ['/another-protocol/1.0.0'])

-  /*
-  node1.dialProtocol(node2.peerInfo, '/custom-match-func/some-query', (err, conn) => {
-    if (err) { throw err }
-    pull(pull.values(['do I fall into your criteria?']), conn)
-  })
+  await pipe(
+    ['my own protocol, wow!'],
+    stream
+  )
  */
-})
+})();
--- a/examples/protocol-and-stream-muxing/2.js
+++ b/examples/protocol-and-stream-muxing/2.js
@@ -1,83 +1,63 @@
 'use strict'

-const libp2p = require('../../')
+const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
-const SPDY = require('libp2p-spdy')
+const MPLEX = require('libp2p-mplex')
+const SECIO = require('libp2p-secio')
 const PeerInfo = require('peer-info')
-const waterfall = require('async/waterfall')
-const parallel = require('async/parallel')
-const series = require('async/series')
-const pull = require('pull-stream')
-const defaultsDeep = require('@nodeutils/defaults-deep')

-class MyBundle extends libp2p {
-  constructor (_options) {
-    const defaults = {
-      modules: {
-        transport: [ TCP ],
-        streamMuxer: [ SPDY ]
-      }
+const pipe = require('it-pipe')
+
+const createNode = async () => {
+  const peerInfo = await PeerInfo.create()
+  peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
+
+  const node = await Libp2p.create({
+    peerInfo,
+    modules: {
+      transport: [TCP],
+      streamMuxer: [MPLEX],
+      connEncryption: [SECIO]
    }
-
-    super(defaultsDeep(_options, defaults))
-  }
-}
-
-function createNode (callback) {
-  let node
-
-  waterfall([
-    (cb) => PeerInfo.create(cb),
-    (peerInfo, cb) => {
-      peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-      node = new MyBundle({
-        peerInfo
-      })
-      node.start(cb)
-    }
-  ], (err) => callback(err, node))
-}
-
-parallel([
-  (cb) => createNode(cb),
-  (cb) => createNode(cb)
-], (err, nodes) => {
-  if (err) { throw err }
-
-  const node1 = nodes[0]
-  const node2 = nodes[1]
-
-  node2.handle('/a', (protocol, conn) => {
-    pull(
-      conn,
-      pull.map((v) => v.toString()),
-      pull.log()
-    )
  })

-  node2.handle('/b', (protocol, conn) => {
-    pull(
-      conn,
-      pull.map((v) => v.toString()),
-      pull.log()
-    )
-  })
+  await node.start()

-  series([
-    (cb) => node1.dialProtocol(node2.peerInfo, '/a', (err, conn) => {
-      if (err) { throw err }
-      pull(pull.values(['protocol (a)']), conn)
-      cb()
-    }),
-    (cb) => node1.dialProtocol(node2.peerInfo, '/b', (err, conn) => {
-      if (err) { throw err }
-      pull(pull.values(['protocol (b)']), conn)
-      cb()
-    }),
-    (cb) => node1.dialProtocol(node2.peerInfo, '/b', (err, conn) => {
-      if (err) { throw err }
-      pull(pull.values(['another conn on protocol (b)']), conn)
-      cb()
-    })
+  return node
+}
+
+;(async () => {
+  const [node1, node2] = await Promise.all([
+    createNode(),
+    createNode()
  ])
-})
+
+  node2.handle(['/a', '/b'], ({ protocol, stream }) => {
+    pipe(
+      stream,
+      async function (source) {
+        for await (const msg of source) {
+          console.log(`from: ${protocol}, msg: ${msg.toString()}`)
+        }
+      }
+    )
+  })
+
+  const { stream: stream1 } = await node1.dialProtocol(node2.peerInfo, ['/a'])
+  await pipe(
+    ['protocol (a)'],
+    stream1
+  )
+
+  const { stream: stream2 } = await node1.dialProtocol(node2.peerInfo, ['/b'])
+  await pipe(
+    ['protocol (b)'],
+    stream2
+  )
+
+  const { stream: stream3 } = await node1.dialProtocol(node2.peerInfo, ['/b'])
+  await pipe(
+    ['another stream on protocol (b)'],
+    stream3
+  )
+})();
--- a/examples/protocol-and-stream-muxing/3.js
+++ b/examples/protocol-and-stream-muxing/3.js
@@ -1,88 +1,69 @@
 /* eslint-disable no-console */
 'use strict'

-const libp2p = require('../../')
+const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
-const SPDY = require('libp2p-spdy')
+const MPLEX = require('libp2p-mplex')
+const SECIO = require('libp2p-secio')
 const PeerInfo = require('peer-info')
-const waterfall = require('async/waterfall')
-const parallel = require('async/parallel')
-const series = require('async/series')
-const pull = require('pull-stream')
-const defaultsDeep = require('@nodeutils/defaults-deep')

-class MyBundle extends libp2p {
-  constructor (_options) {
-    const defaults = {
-      modules: {
-        transport: [ TCP ],
-        streamMuxer: [ SPDY ]
+const pipe = require('it-pipe')
+
+const createNode = async () => {
+  const peerInfo = await PeerInfo.create()
+  peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
+
+  const node = await Libp2p.create({
+    peerInfo,
+    modules: {
+      transport: [TCP],
+      streamMuxer: [MPLEX],
+      connEncryption: [SECIO]
+    }
+  })
+
+  await node.start()
+
+  return node
+}
+
+;(async () => {
+  const [node1, node2] = await Promise.all([
+    createNode(),
+    createNode()
+  ])
+  
+  node1.handle('/node-1', ({ stream }) => {
+    pipe(
+      stream,
+      async function (source) {
+        for await (const msg of source) {
+          console.log(msg.toString())
+        }
      }
-    }
-
-    super(defaultsDeep(_options, defaults))
-  }
-}
-
-function createNode (callback) {
-  let node
-
-  waterfall([
-    (cb) => PeerInfo.create(cb),
-    (peerInfo, cb) => {
-      peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-      node = new MyBundle({
-        peerInfo
-      })
-      node.start(cb)
-    }
-  ], (err) => callback(err, node))
-}
-
-parallel([
-  (cb) => createNode(cb),
-  (cb) => createNode(cb)
-], (err, nodes) => {
-  if (err) { throw err }
-
-  const node1 = nodes[0]
-  const node2 = nodes[1]
-
-  node1.handle('/node-1', (protocol, conn) => {
-    pull(
-      conn,
-      pull.map((v) => v.toString()),
-      pull.log()
    )
  })

-  node2.handle('/node-2', (protocol, conn) => {
-    pull(
-      conn,
-      pull.map((v) => v.toString()),
-      pull.log()
+  node2.handle('/node-2', ({ stream }) => {
+    pipe(
+      stream,
+      async function (source) {
+        for await (const msg of source) {
+          console.log(msg.toString())
+        }
+      }
    )
  })

-  series([
-    (cb) => node1.dialProtocol(node2.peerInfo, '/node-2', (err, conn) => {
-      if (err) { throw err }
-      pull(pull.values(['from 1 to 2']), conn)
-      cb()
-    }),
-    (cb) => node2.dialProtocol(node1.peerInfo, '/node-1', (err, conn) => {
-      if (err) { throw err }
-      pull(pull.values(['from 2 to 1']), conn)
-      cb()
-    })
-  ], (err) => {
-    if (err) { throw err }
-    console.log('Addresses by which both peers are connected')
-    node1.peerBook
-      .getAllArray()
-      .forEach((peer) => console.log('node 1 to node 2:', peer.isConnected().toString()))
-    node2.peerBook
-      .getAllArray()
-      .forEach((peer) => console.log('node 2 to node 1:', peer.isConnected().toString()))
-  })
-})
+  const { stream: stream1 } = await node1.dialProtocol(node2.peerInfo, ['/node-2'])
+  await pipe(
+    ['from 1 to 2'],
+    stream1
+  )
+
+  const { stream: stream2 } = await node2.dialProtocol(node1.peerInfo, ['/node-1'])
+  await pipe(
+    ['from 2 to 1'],
+    stream2
+  )
+})();
--- a/examples/protocol-and-stream-muxing/README.md
+++ b/examples/protocol-and-stream-muxing/README.md
@@ -6,23 +6,30 @@ The feature of agreeing on a protocol over an established connection is what we

 # 1. Handle multiple protocols

-Let's see _protocol multiplexing_ in action! You will need the following modules for this example: `libp2p`, `libp2p-tcp`, `peer-info`, `async` and `pull-stream`. This example reuses the base left by the [Transports](../transports) example. You can see the complete solution at [1.js](./1.js).
+Let's see _protocol multiplexing_ in action! You will need the following modules for this example: `libp2p`, `libp2p-tcp`, `peer-info`, `it-pipe`, `it-buffer` and `streaming-iterables`. This example reuses the base left by the [Transports](../transports) example. You can see the complete solution at [1.js](./1.js).

 After creating the nodes, we need to tell libp2p which protocols to handle.

 ```JavaScript
+const pipe = require('it-pipe')
+const { map } = require('streaming-iterables')
+const { toBuffer } = require('it-buffer')
+
 // ...
 const node1 = nodes[0]
 const node2 = nodes[1]

-// Here we are telling libp2p that is someone dials this node to talk with the `/your-protocol`
-// multicodec, the protocol identifier, please call this callback and give it the connection
+// Here we are telling libp2p that if someone dials this node to talk with the `/your-protocol`
+// multicodec, the protocol identifier, please call this handler and give it the stream
 // so that incomming data can be handled
-node2.handle('/your-protocol', (protocol, conn) => {
-  pull(
-    conn,
-    pull.map((v) => v.toString()),
-    pull.log()
+node2.handle('/your-protocol', ({ stream }) => {
+  pipe(
+    stream,
+    source => (async function () {
+      for await (const msg of source) {
+        console.log(msg.toString())
+      }
+    })()
  )
 })
 ```
@@ -30,53 +37,54 @@ node2.handle('/your-protocol', (protocol, conn) => {
 After the protocol is _handled_, now we can dial to it.

 ```JavaScript
-node1.dialProtocol(node2.peerInfo, '/your-protocol', (err, conn) => {
-  if (err) { throw err }
-  pull(pull.values(['my own protocol, wow!']), conn)
-})
+const { stream } = await node1.dialProtocol(node2.peerInfo, ['/your-protocol'])
+
+await pipe(
+  ['my own protocol, wow!'],
+  stream
+)
 ```

 You might have seen this in the [Transports](../transports) examples. However, what it was not explained is that you can do more than exact string matching, for example, you can use semver.

 ```JavaScript
-node2.handle('/another-protocol/1.0.1', (protocol, conn) => {
-  pull(
-    conn,
-    pull.map((v) => v.toString()),
-    pull.log()
+node2.handle('/another-protocol/1.0.1', ({ stream }) => {
+  pipe(
+    stream,
+    async function (source) {
+      for await (const msg of source) {
+        console.log(msg.toString())
+      }
+    }
  )
 })
 // ...
-node1.dialProtocol(node2.peerInfo, '/another-protocol/1.0.0', (err, conn) => {
-  if (err) { throw err }
-  pull(pull.values(['semver me please']), conn)
-})
+const { stream } = await node1.dialProtocol(node2.peerInfo, ['/another-protocol/1.0.0'])
+
+await pipe(
+  ['my own protocol, wow!'],
+  stream
+)
 ```

 This feature is super power for network protocols. It works in the same way as versioning your RPC/REST API, but for anything that goes in the wire. We had to use this feature to upgrade protocols within the IPFS Stack (i.e Bitswap) and we successfully managed to do so without any network splits.

-There is still one last feature, you can create your custom match functions.
+There is still one last feature, you can provide multiple protocols for the same handler. If you have a backwards incompatible change, but it only requires minor changes to the code, you may prefer to do protocol checking instead of having multiple handlers

 ```JavaScript
-node2.handle('/custom-match-func', (protocol, conn) => {
-  pull(
-    conn,
-    pull.map((v) => v.toString()),
-    pull.log()
-  )
-}, (myProtocol, requestedProtocol, callback) => {
-  // This is all custom. I'm checking the base path matches, think of this
-  // as a HTTP routing table.
-  if (myProtocol.indexOf(requestedProtocol)) {
-    callback(null, true)
-  } else {
-    callback(null, false)
+node2.handle(['/another-protocol/1.0.0', '/another-protocol/2.0.0'], ({ protocol, stream }) => {
+  if (protocol === '/another-protocol/2.0.0') {
+    // handle backwards compatibility
  }
-})
-// ...
-node1.dialProtocol(node2.peerInfo, '/custom-match-func/some-query', (err, conn) => {
-  if (err) { throw err }
-  pull(pull.values(['do I fall into your criteria?']), conn)
+
+  pipe(
+    stream,
+    async function (source) {
+      for await (const msg of source) {
+        console.log(msg.toString())
+      }
+    }
+  )
 })
 ```

@@ -84,77 +92,68 @@ Try all of this out by executing [1.js](./1.js).

 # 2. Reuse existing connection

-The example above would require a node to create a whole new connection for every time it dials in one of the protocols, this is a waste of resources and also it might be simply not possible (e.g lack of file descriptors, not enough ports being open, etc). What we really want is to dial a connection once and then multiplex several virtual connections (stream) over a single connection, this is where _stream multiplexing_ comes into play.
+The examples above would require a node to create a whole new connection for every time it dials in one of the protocols, this is a waste of resources and also it might be simply not possible (e.g lack of file descriptors, not enough ports being open, etc). What we really want is to dial a connection once and then multiplex several virtual connections (stream) over a single connection, this is where _stream multiplexing_ comes into play.

-Stream multiplexing is a old concept, in fact it happens in many of the layers of the [OSI System](https://en.wikipedia.org/wiki/OSI_model), in libp2p we make this feature to our avail by letting the user pick which module for stream multiplexing to use.
+Stream multiplexing is an old concept, in fact it happens in many of the layers of the [OSI System](https://en.wikipedia.org/wiki/OSI_model). In libp2p, we make this feature to our avail by letting the user pick which module for stream multiplexing to use.

-Currently, we have two available [libp2p-spdy](https://github.com/libp2p/js-libp2p-spdy) and [libp2p-mplex](https://github.com/libp2p/js-libp2p-mplex) and pluging them in is as easy as adding another transport. Let's revisit our libp2p bundle.
+Currently, we have [libp2p-mplex](https://github.com/libp2p/js-libp2p-mplex) and pluging it in is as easy as adding a transport. Let's revisit our libp2p configuration.

 ```JavaScript
-const SPDY = require('libp2p-spdy')
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const MPLEX = require('libp2p-mplex')
 //...
-class MyBundle extends libp2p {
-  constructor (_options) {
-    const defaults = {
-      modules: {
-        transport: [ TCP ],
-        // Here we are adding the SPDY muxer to our libp2p bundle.
-      // Thanks to protocol muxing, a libp2p bundle can support multiple Stream Muxers at the same
-      // time and pick the right one when dialing to a node
-        streamMuxer: [ SPDY ]
-      }
-    }

-    super(defaultsDeep(_options, defaults))
-  }
+const createNode = () => {
+  return Libp2p.create({
+    modules: {
+      transport: [ TCP ],
+      streamMuxer: [ Mplex ]
+    }
+  })
 }
 ```

 With this, we can dial as many times as we want to a peer and always reuse the same established underlying connection.

 ```JavaScript
-node2.handle('/a', (protocol, conn) => {
-  pull(
-    conn,
-    pull.map((v) => v.toString()),
-    pull.log()
+node2.handle(['/a', '/b'], ({ protocol, stream }) => {
+  pipe(
+    stream,
+    async function (source) {
+      for await (const msg of source) {
+        console.log(`from: ${protocol}, msg: ${msg.toString()}`)
+      }
+    }
  )
 })

-node2.handle('/b', (protocol, conn) => {
-  pull(
-    conn,
-    pull.map((v) => v.toString()),
-    pull.log()
-  )
-})
+const { stream } = await node1.dialProtocol(node2.peerInfo, ['/a'])
+await pipe(
+  ['protocol (a)'],
+  stream
+)

-series([
-  (cb) => node1.dialProtocol(node2.peerInfo, '/a', (err, conn) => {
-    if (err) { throw err }
-    pull(pull.values(['protocol (a)']), conn)
-    cb()
-  }),
-  (cb) => node1.dialProtocol(node2.peerInfo, '/b', (err, conn) => {
-    if (err) { throw err }
-    pull(pull.values(['protocol (b)']), conn)
-    cb()
-  }),
-  (cb) => node1.dialProtocol(node2.peerInfo, '/b', (err, conn) => {
-    if (err) { throw err }
-    pull(pull.values(['another conn on protocol (b)']), conn)
-    cb()
-  })
-])
+const { stream: stream2 } = await node1.dialProtocol(node2.peerInfo, ['/b'])
+await pipe(
+  ['protocol (b)'],
+  stream2
+)
+
+const { stream: stream3 } = await node1.dialProtocol(node2.peerInfo, ['/b'])
+await pipe(
+  ['another stream on protocol (b)'],
+  stream3
+)
 ```

 By running [2.js](./2.js) you should see the following result:

 ```
 > node 2.js
-protocol (a)
-protocol (b)
-another protocol (b)
+from: /a, msg: protocol (a)
+from: /b, msg: protocol (b)
+from: /b, msg: another stream on protocol (b)
 ```

 # 3. Bidirectional connections
@@ -168,8 +167,5 @@ You can see this working on example [3.js](./3.js). The result should look like
 ```Bash
 > node 3.js
 from 1 to 2
-Addresses by which both peers are connected
-node 1 to node 2: /ip4/127.0.0.1/tcp/50629/p2p/QmZwMKTo6wG4Te9A6M2eJnWDpR8uhsGed4YRegnV5DcKiv
-node 2 to node 1: /ip4/127.0.0.1/tcp/50630/p2p/QmRgormJQeDyXhDKma11eUtksoh8vWmeBoxghVt4meauW9
 from 2 to 1
 ```
--- a/examples/pubsub/1.js
+++ b/examples/pubsub/1.js
@@ -1,103 +1,51 @@
 /* eslint-disable no-console */
 'use strict'

-const libp2p = require('../../')
+const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
 const SECIO = require('libp2p-secio')
 const PeerInfo = require('peer-info')
-const MulticastDNS = require('libp2p-mdns')
 const Gossipsub = require('libp2p-gossipsub')
-const defaultsDeep = require('@nodeutils/defaults-deep')
-const waterfall = require('async/waterfall')
-const parallel = require('async/parallel')
-const series = require('async/series')

-class MyBundle extends libp2p {
-  constructor (_options) {
-    const defaults = {
-      modules: {
-        transport: [ TCP ],
-        streamMuxer: [ Mplex ],
-        connEncryption: [ SECIO ],
-        peerDiscovery: [ MulticastDNS ],
-        pubsub: Gossipsub
-      },
-      config: {
-        peerDiscovery: {
-          mdns: {
-            interval: 2000,
-            enabled: true
-          }
-        },
-        pubsub: {
-          enabled: true,
-          emitSelf: true
-        }
-      }
+const createNode = async () => {
+  const peerInfo = await PeerInfo.create()
+  peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
+
+  const node = await Libp2p.create({
+    peerInfo,
+    modules: {
+      transport: [TCP],
+      streamMuxer: [Mplex],
+      connEncryption: [SECIO],
+      pubsub: Gossipsub
    }
-
-    super(defaultsDeep(_options, defaults))
-  }
-}
-
-function createNode (callback) {
-  let node
-
-  waterfall([
-    (cb) => PeerInfo.create(cb),
-    (peerInfo, cb) => {
-      peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-      node = new MyBundle({
-        peerInfo
-      })
-      node.start(cb)
-    }
-  ], (err) => callback(err, node))
-}
-
-parallel([
-  (cb) => createNode(cb),
-  (cb) => createNode(cb)
-], (err, nodes) => {
-  if (err) { throw err }
-
-  const node1 = nodes[0]
-  const node2 = nodes[1]
-
-  node1.once('peer:connect', (peer) => {
-    console.log('connected to %s', peer.id.toB58String())
-
-    series([
-      // node1 subscribes to "news"
-      (cb) => node1.pubsub.subscribe(
-        'news',
-        (msg) => console.log(`node1 received: ${msg.data.toString()}`),
-        cb
-      ),
-      (cb) => setTimeout(cb, 500),
-      // node2 subscribes to "news"
-      (cb) => node2.pubsub.subscribe(
-        'news',
-        (msg) => console.log(`node2 received: ${msg.data.toString()}`),
-        cb
-      ),
-      (cb) => setTimeout(cb, 500),
-      // node2 publishes "news" every second
-      (cb) => {
-        setInterval(() => {
-          node2.pubsub.publish(
-            'news',
-            Buffer.from('Bird bird bird, bird is the word!'),
-            (err) => {
-              if (err) { throw err }
-            }
-          )
-        }, 1000)
-        cb()
-      },
-    ], (err) => {
-      if (err) { throw err }
-    })
  })
-})
+
+  await node.start()
+  return node
+}
+
+;(async () => {
+  const topic = 'news'
+
+  const [node1, node2] = await Promise.all([
+    createNode(),
+    createNode(),
+  ])
+
+  await node1.dial(node2.peerInfo)
+
+  await node1.pubsub.subscribe(topic, (msg) => {
+    console.log(`node1 received: ${msg.data.toString()}`)
+  })
+
+  await node2.pubsub.subscribe(topic, (msg) => {
+    console.log(`node2 received: ${msg.data.toString()}`)
+  })
+
+  // node2 publishes "news" every second
+  setInterval(() => {
+    node2.pubsub.publish(topic, Buffer.from('Bird bird bird, bird is the word!'))
+  }, 1000)
+})();
--- a/examples/pubsub/README.md
+++ b/examples/pubsub/README.md
@@ -14,44 +14,47 @@ For this example, we will use MulticastDNS for automatic Peer Discovery. This ex

 Using PubSub is super simple, you only need to provide the implementation of your choice and you are ready to go. No need for extra configuration.

-```JavaScript
-node1.once('peer:connect', (peer) => {
-  console.log('connected to %s', peer.id.toB58String())
+First, let's update our libp2p configuration with a pubsub implementation.

-  series([
-    // node1 subscribes to "news"
-    (cb) => node1.pubsub.subscribe(
-      'news',
-      (msg) => console.log(`node1 received: ${msg.data.toString()}`),
-      cb
-    ),
-    (cb) => setTimeout(cb, 500),
-    // node2 subscribes to "news"
-    (cb) => node2.pubsub.subscribe(
-      'news',
-      (msg) => console.log(`node2 received: ${msg.data.toString()}`),
-      cb
-    ),
-    (cb) => setTimeout(cb, 500),
-    // node2 publishes "news" every second
-    (cb) => {
-      setInterval(() => {
-        node2.pubsub.publish(
-          'news',
-          Buffer.from('Bird bird bird, bird is the word!'),
-          (err) => {
-            if (err) { throw err }
-          }
-        )
-      }, 1000)
-      cb()
-    },
-  ], (err) => {
-    if (err) { throw err }
-  })
+```JavaScript
+const Libp2p = require('libp2p')
+const Gossipsub = require('libp2p-gossipsub')
+
+const node = await Libp2p.create({
+  modules: {
+    transport: [ TCP ],
+    streamMuxer: [ Mplex ],
+    connEncryption: [ SECIO ],
+    // we add the Pubsub module we want
+    pubsub: Gossipsub
+  }
 })
 ```

+Once that is done, we only need to create a few libp2p nodes, connect them and everything is ready to start using pubsub.
+
+```JavaScript
+const topic = 'news'
+
+const node1 = nodes[0]
+const node2 = nodes[1]
+
+await node1.dial(node2.peerInfo)
+
+await node1.pubsub.subscribe(topic, (msg) => {
+  console.log(`node1 received: ${msg.data.toString()}`)
+})
+
+await node2.pubsub.subscribe(topic, (msg) => {
+  console.log(`node2 received: ${msg.data.toString()}`)
+})
+
+// node2 publishes "news" every second
+setInterval(() => {
+  node2.pubsub.publish(topic, Buffer.from('Bird bird bird, bird is the word!'))
+}, 1000)
+```
+
 The output of the program should look like:

 ```
@@ -68,12 +71,6 @@ You can change the pubsub `emitSelf` option if you don't want the publishing nod
 ```JavaScript
 const defaults = {
  config: {
-    peerDiscovery: {
-      mdns: {
-        interval: 2000,
-        enabled: true
-      }
-    },
    pubsub: {
      enabled: true,
      emitSelf: false
--- a/examples/transports/1.js
+++ b/examples/transports/1.js
@@ -1,39 +1,33 @@
 /* eslint-disable no-console */
 'use strict'

-const libp2p = require('../../')
+const Libp2p = require('../..')
 const TCP = require('libp2p-tcp')
+const SECIO = require('libp2p-secio')
 const PeerInfo = require('peer-info')
-const waterfall = require('async/waterfall')
-const defaultsDeep = require('@nodeutils/defaults-deep')

-class MyBundle extends libp2p {
-  constructor (_options) {
-    const defaults = {
-      modules: {
-        transport: [
-          TCP
-        ]
-      }
+const createNode = async (peerInfo) => {
+  // To signall the addresses we want to be available, we use
+  // the multiaddr format, a self describable address
+  peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
+
+  const node = await Libp2p.create({
+    peerInfo,
+    modules: {
+      transport: [TCP],
+      connEncryption: [SECIO]
    }
+  })

-    super(defaultsDeep(_options, defaults))
-  }
+  await node.start()
+  return node
 }

-let node
-
-waterfall([
-  (cb) => PeerInfo.create(cb),
-  (peerInfo, cb) => {
-    peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-    node = new MyBundle({ peerInfo: peerInfo })
-    node.start(cb)
-  }
-], (err) => {
-  if (err) { throw err }
+;(async () => {
+  const peerInfo = await PeerInfo.create()
+  const node = await createNode(peerInfo)

  console.log('node has started (true/false):', node.isStarted())
  console.log('listening on:')
  node.peerInfo.multiaddrs.forEach((ma) => console.log(ma.toString()))
-})
+})();
--- a/examples/transports/2.js
+++ b/examples/transports/2.js
@@ -1,39 +1,31 @@
 /* eslint-disable no-console */
 'use strict'

-const libp2p = require('../../')
+const Libp2p = require('../..')
 const TCP = require('libp2p-tcp')
+const SECIO = require('libp2p-secio')
+const MPLEX = require('libp2p-mplex')
 const PeerInfo = require('peer-info')
-const waterfall = require('async/waterfall')
-const defaultsDeep = require('@nodeutils/defaults-deep')
-const parallel = require('async/parallel')
-const pull = require('pull-stream')

-class MyBundle extends libp2p {
-  constructor (_options) {
-    const defaults = {
-      modules: {
-        transport: [
-          TCP
-        ]
-      }
+const pipe = require('it-pipe')
+const concat = require('it-concat')
+
+const createNode = async (peerInfo) => {
+  // To signall the addresses we want to be available, we use
+  // the multiaddr format, a self describable address
+  peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
+
+  const node = await Libp2p.create({
+    peerInfo,
+    modules: {
+      transport: [TCP],
+      connEncryption: [SECIO],
+      streamMuxer: [MPLEX]
    }
+  })

-    super(defaultsDeep(_options, defaults))
-  }
-}
-
-function createNode (callback) {
-  let node
-
-  waterfall([
-    (cb) => PeerInfo.create(cb),
-    (peerInfo, cb) => {
-      peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-      node = new MyBundle({ peerInfo: peerInfo })
-      node.start(cb)
-    }
-  ], (err) => callback(err, node))
+  await node.start()
+  return node
 }

 function printAddrs (node, number) {
@@ -41,29 +33,31 @@ function printAddrs (node, number) {
  node.peerInfo.multiaddrs.forEach((ma) => console.log(ma.toString()))
 }

-parallel([
-  (cb) => createNode(cb),
-  (cb) => createNode(cb)
-], (err, nodes) => {
-  if (err) { throw err }
-
-  const node1 = nodes[0]
-  const node2 = nodes[1]
+;(async () => {
+  const [peerInfo1, peerInfo2] = await Promise.all([
+    PeerInfo.create(),
+    PeerInfo.create()
+  ])
+  const [node1, node2] = await Promise.all([
+    createNode(peerInfo1),
+    createNode(peerInfo2)
+  ])

  printAddrs(node1, '1')
  printAddrs(node2, '2')

-  node2.handle('/print', (protocol, conn) => {
-    pull(
-      conn,
-      pull.map((v) => v.toString()),
-      pull.log()
+  node2.handle('/print', async ({ stream }) => {
+    const result = await pipe(
+      stream,
+      concat
    )
+    console.log(result.toString())
  })

-  node1.dialProtocol(node2.peerInfo, '/print', (err, conn) => {
-    if (err) { throw err }
+  const { stream } = await node1.dialProtocol(node2.peerInfo, '/print')

-    pull(pull.values(['Hello', ' ', 'p2p', ' ', 'world', '!']), conn)
-  })
-})
+  await pipe(
+    ['Hello', ' ', 'p2p', ' ', 'world', '!'],
+    stream
+  )
+})();
--- a/examples/transports/3.js
+++ b/examples/transports/3.js
@@ -1,70 +1,62 @@
 /* eslint-disable no-console */
 'use strict'

-const libp2p = require('../../')
+const Libp2p = require('../..')
 const TCP = require('libp2p-tcp')
 const WebSockets = require('libp2p-websockets')
+const SECIO = require('libp2p-secio')
+const MPLEX = require('libp2p-mplex')
 const PeerInfo = require('peer-info')
-const waterfall = require('async/waterfall')
-const defaultsDeep = require('@nodeutils/defaults-deep')
-const parallel = require('async/parallel')
-const pull = require('pull-stream')

-class MyBundle extends libp2p {
-  constructor (_options) {
-    const defaults = {
-      modules: {
-        transport: [
-          TCP,
-          WebSockets
-        ]
-      }
-    }
+const pipe = require('it-pipe')

-    super(defaultsDeep(_options, defaults))
-  }
-}
-
-function createNode (addrs, callback) {
-  if (!Array.isArray(addrs)) {
-    addrs = [addrs]
+const createNode = async (peerInfo, transports, multiaddrs = []) => {
+  if (!Array.isArray(multiaddrs)) {
+    multiaddrs = [multiaddrs]
  }

-  let node
+  multiaddrs.forEach((addr) => peerInfo.multiaddrs.add(addr))

-  waterfall([
-    (cb) => PeerInfo.create(cb),
-    (peerInfo, cb) => {
-      addrs.forEach((addr) => peerInfo.multiaddrs.add(addr))
-      node = new MyBundle({ peerInfo: peerInfo })
-      node.start(cb)
+  const node = await Libp2p.create({
+    peerInfo,
+    modules: {
+      transport: transports,
+      connEncryption: [SECIO],
+      streamMuxer: [MPLEX]
    }
-  ], (err) => callback(err, node))
+  })
+
+  await node.start()
+  return node
 }

-function printAddrs (node, number) {
+function printAddrs(node, number) {
  console.log('node %s is listening on:', number)
  node.peerInfo.multiaddrs.forEach((ma) => console.log(ma.toString()))
 }

-function print (protocol, conn) {
-  pull(
-    conn,
-    pull.map((v) => v.toString()),
-    pull.log()
+function print ({ stream }) {
+  pipe(
+    stream,
+    async function (source) {
+      for await (const msg of source) {
+        console.log(msg.toString())
+      }
+    }
  )
 }

-parallel([
-  (cb) => createNode('/ip4/0.0.0.0/tcp/0', cb),
-  (cb) => createNode(['/ip4/0.0.0.0/tcp/0', '/ip4/127.0.0.1/tcp/10000/ws'], cb),
-  (cb) => createNode('/ip4/127.0.0.1/tcp/20000/ws', cb)
-], (err, nodes) => {
-  if (err) { throw err }
-
-  const node1 = nodes[0]
-  const node2 = nodes[1]
-  const node3 = nodes[2]
+;(async () => {
+  const [peerInfo1, peerInfo2, peerInfo3] = await Promise.all([
+    PeerInfo.create(),
+    PeerInfo.create(),
+    PeerInfo.create()
+  ])
+  const [node1, node2, node3] = await Promise.all([
+    createNode(peerInfo1, [TCP], '/ip4/0.0.0.0/tcp/0'),
+    createNode(peerInfo2, [TCP, WebSockets], ['/ip4/0.0.0.0/tcp/0', '/ip4/127.0.0.1/tcp/10000/ws']),
+    createNode(peerInfo3, [WebSockets], '/ip4/127.0.0.1/tcp/20000/ws')
+  ])

  printAddrs(node1, '1')
  printAddrs(node2, '2')
@@ -74,21 +66,24 @@ parallel([
  node2.handle('/print', print)
  node3.handle('/print', print)

-  node1.dialProtocol(node2.peerInfo, '/print', (err, conn) => {
-    if (err) { throw err }
+  // node 1 (TCP) dials to node 2 (TCP+WebSockets)
+  const { stream } = await node1.dialProtocol(node2.peerInfo, '/print')
+  await pipe(
+    ['node 1 dialed to node 2 successfully'],
+    stream
+  )

-    pull(pull.values(['node 1 dialed to node 2 successfully']), conn)
-  })
+  // node 2 (TCP+WebSockets) dials to node 2 (WebSockets)
+  const { stream: stream2 } = await node2.dialProtocol(node3.peerInfo, '/print')
+  await pipe(
+    ['node 2 dialed to node 3 successfully'],
+    stream2
+  )

-  node2.dialProtocol(node3.peerInfo, '/print', (err, conn) => {
-    if (err) { throw err }
-
-    pull(pull.values(['node 2 dialed to node 3 successfully']), conn)
-  })
-
-  node3.dialProtocol(node1.peerInfo, '/print', (err, conn) => {
-    if (err) {
-      console.log('node 3 failed to dial to node 1 with:', err.message)
-    }
-  })
-})
+  // node 3 (listening WebSockets) can dial node 1 (TCP)
+  try {
+    await node3.dialProtocol(node1.peerInfo, '/print')
+  } catch (err) {
+    console.log('node 3 failed to dial to node 1 with:', err.message)
+  }
+})();
--- a/examples/transports/README.md
+++ b/examples/transports/README.md
@@ -1,85 +1,65 @@
 # [Transports](http://libp2p.io/implementations/#transports)

-libp2p doesn't make assumptions for you, instead, it enables you as the developer of the application to pick the modules you need to run your application, which can vary depending on the runtime you are executing. A libp2p node can use one or more Transports to dial and listen for Connections. These transports are modules that offer a clean interface for dialing and listening, defined by the [interface-transport](https://github.com/libp2p/interface-transport) specification. Some examples of possible transports are: TCP, UTP, WebRTC, QUIC, HTTP, Pigeon and so on.
+libp2p doesn't make assumptions for you, instead, it enables you as the developer of the application to pick the modules you need to run your application, which can vary depending on the runtime you are executing. A libp2p node can use one or more Transports to dial and listen for Connections. These transports are modules that offer a clean interface for dialing and listening, defined by the [interface-transport](https://github.com/libp2p/js-interfaces/tree/master/src/transport) specification. Some examples of possible transports are: TCP, UTP, WebRTC, QUIC, HTTP, Pigeon and so on.

-A more complete definition of what is a transport can be found on the [interface-transport](https://github.com/libp2p/interface-transport) specification. A way to recognize a candidate transport is through the badge:
+A more complete definition of what is a transport can be found on the [interface-transport](https://github.com/libp2p/js-interfaces/tree/master/src/transport) specification. A way to recognize a candidate transport is through the badge:

 [![](https://raw.githubusercontent.com/diasdavid/interface-transport/master/img/badge.png)](https://raw.githubusercontent.com/diasdavid/interface-transport/master/img/badge.png)

-## 1. Creating a libp2p Bundle with TCP
+## 1. Creating a libp2p node with TCP

-When using libp2p, you always want to create your own libp2p Bundle, that is, pick your set of modules and create your network stack with the properties you need. In this example, we will create a bundle with TCP. You can find the complete solution on the file [1.js](./1.js).
+When using libp2p, you need properly configure it, that is, pick your set of modules and create your network stack with the properties you need. In this example, we will create a libp2p node TCP. You can find the complete solution on the file [1.js](./1.js).

-You will need 5 deps total, so go ahead and install all of them with:
+You will need 4 dependencies total, so go ahead and install all of them with:

 ```bash
-> npm install libp2p libp2p-tcp peer-info async @nodeutils/defaults-deep
+> npm install libp2p libp2p-tcp libp2p-secio peer-info
 ```

 Then, on your favorite text editor create a file with the `.js` extension. I've called mine `1.js`.

-First thing is to create our own bundle! Insert:
+First thing is to create our own libp2p node! Insert:

 ```JavaScript
 'use strict'

-const libp2p = require('libp2p')
+const Libp2p = require('libp2p')
 const TCP = require('libp2p-tcp')
-const PeerInfo = require('peer-info')
-const waterfall = require('async/waterfall')
-const defaultsDeep = require('@nodeutils/defaults-deep')
+const SECIO = require('libp2p-secio')

-// This MyBundle class is your libp2p bundle packed with TCP
-class MyBundle extends libp2p {
-  constructor (_options) {
-    const defaults = {
-      // modules is a JS object that will describe the components
-      // we want for our libp2p bundle
-      modules: {
-        transport: [
-          TCP
-        ]
-      }
+const createNode = async (peerInfo) => {
+  // To signall the addresses we want to be available, we use
+  // the multiaddr format, a self describable address
+  peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
+
+  const node = await Libp2p.create({
+    peerInfo,
+    modules: {
+      transport: [ TCP ],
+      connEncryption: [ SECIO ]
    }
+  })

-    super(defaultsDeep(_options, defaults))
-  }
+  await node.start()
+  return node
 }
 ```

-Now that we have our own MyBundle class that extends libp2p, let's create a node with it. We will use `async/waterfall` just for code structure, but you don't need to. Append to the same file:
+Now that we have a function to create our own libp2p node, let's create a node with it.

 ```JavaScript
-let node
+const peerInfo = await PeerInfo.create()
+const node = await createNode(peerInfo)

-waterfall([
-  // First we create a PeerInfo object, which will pack the
-  // info about our peer. Creating a PeerInfo is an async
-  // operation because we use the WebCrypto API
-  // (yeei Universal JS)
-  (cb) => PeerInfo.create(cb),
-  (peerInfo, cb) => {
-    // To signall the addresses we want to be available, we use
-    // the multiaddr format, a self describable address
-    peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-    // Now we can create a node with that PeerInfo object
-    node = new MyBundle({ peerInfo: peerInfo })
-    // Last, we start the node!
-    node.start(cb)
-  }
-], (err) => {
-  if (err) { throw err }
-
-  // At this point the node has started
-  console.log('node has started (true/false):', node.isStarted())
-  // And we can print the now listening addresses.
-  // If you are familiar with TCP, you might have noticed
-  // that we specified the node to listen in 0.0.0.0 and port
-  // 0, which means "listen in any network interface and pick
-  // a port for me
-  console.log('listening on:')
-  node.peerInfo.multiaddrs.forEach((ma) => console.log(ma.toString()))
-})
+// At this point the node has started
+console.log('node has started (true/false):', node.isStarted())
+// And we can print the now listening addresses.
+// If you are familiar with TCP, you might have noticed
+// that we specified the node to listen in 0.0.0.0 and port
+// 0, which means "listen in any network interface and pick
+// a port for me
+console.log('listening on:')
+node.peerInfo.multiaddrs.forEach((ma) => console.log(ma.toString()))
 ```

 Running this should result in something like:
@@ -96,78 +76,64 @@ That `QmW2cKTakTYqbQkUzBTEGXgWYFj1YEPeUndE1YWs6CBzDQ` is the PeerId that was cre

 ## 2. Dialing from one node to another node

-Now that we have our bundle, let's create two nodes and make them dial to each other! You can find the complete solution at [2.js](./2.js).
+Now that we have our `createNode` function, let's create two nodes and make them dial to each other! You can find the complete solution at [2.js](./2.js).

 For this step, we will need one more dependency.

 ```bash
-> npm install pull-stream
+> npm install it-pipe it-buffer
 ```

 And we also need to import the module on our .js file:

 ```js
-const pull = require('pull-stream')
+const pipe = require('it-pipe')
+const { toBuffer } = require('it-buffer')
 ```

-We are going to reuse the MyBundle class from step 1, but this time to make things simpler, we will create two functions, one to create nodes and another to print the addrs to avoid duplicating code.
+We are going to reuse the `createNode` function from step 1, but this time to make things simpler, we will create another function to print the addrs to avoid duplicating code.

 ```JavaScript
-function createNode (callback) {
-  let node
-
-  waterfall([
-    (cb) => PeerInfo.create(cb),
-    (peerInfo, cb) => {
-      peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-      node = new MyBundle({ peerInfo: peerInfo })
-      node.start(cb)
-    }
-  ], (err) => callback(err, node))
-}
-
 function printAddrs (node, number) {
  console.log('node %s is listening on:', number)
  node.peerInfo.multiaddrs.forEach((ma) => console.log(ma.toString()))
 }
-
-```
-
-Now we are going to use `async/parallel` to create two nodes, print their addresses and dial from one node to the other. We already added `async` as a dependency, but still need to import `async/parallel`:
-
-```js
-const parallel = require('async/parallel')
 ```

 Then,

 ```js
-parallel([
-  (cb) => createNode(cb),
-  (cb) => createNode(cb)
-], (err, nodes) => {
-  if (err) { throw err }
-
-  const node1 = nodes[0]
-  const node2 = nodes[1]
+;(async () => {
+  const [peerInfo1, peerInfo2] = await Promise.all([
+    PeerInfo.create(),
+    PeerInfo.create()
+  ])
+  const [node1, node2] = await Promise.all([
+    createNode(),
+    createNode()
+  ])

  printAddrs(node1, '1')
  printAddrs(node2, '2')

-  node2.handle('/print', (protocol, conn) => {
-    pull(
-      conn,
-      pull.map((v) => v.toString()),
-      pull.log()
+  node2.handle('/print', ({ stream }) => {
+    pipe(
+      stream,
+      async function (source) {
+        for await (const msg of source) {
+          console.log(msg.toString())
+        }
+      }
    )
  })

-  node1.dialProtocol(node2.peerInfo, '/print', (err, conn) => {
-    if (err) { throw err }
+  const { stream } = await node1.dialProtocol(node2.peerInfo, '/print')

-    pull(pull.values(['Hello', ' ', 'p2p', ' ', 'world', '!']), conn)
-  })
-})
+  await pipe(
+    ['Hello', ' ', 'p2p', ' ', 'world', '!'],
+    stream
+  )
+})();
 ```

 The result should be look like:
@@ -195,46 +161,28 @@ In this example, we will need to also install `libp2p-websockets`, go ahead and
 > npm install libp2p-websockets
 ```

-We want to create 3 nodes, one with TCP, one with TCP+WebSockets and one with just WebSockets. We need to update our `MyBundle` class to contemplate WebSockets as well:
+We want to create 3 nodes, one with TCP, one with TCP+WebSockets and one with just WebSockets. We need to update our `createNode` function to contemplate WebSockets as well. Moreover, let's upgrade our function to enable us to pick the addrs in which a node will start a listener:

 ```JavaScript
-const WebSockets = require('libp2p-websockets')
 // ...

-class MyBundle extends libp2p {
-  constructor (_options) {
-    const defaults = {
-      modules: {
-        transport: [
-          TCP,
-          WebSockets
-        ]
-      }
-    }
-
-    super(defaultsDeep(_options, defaults))
-  }
-}
-```
-
-Now that we have our bundle ready, let's upgrade our createNode function to enable us to pick the addrs in which a node will start a listener.
-
-```JavaScript
-function createNode (addrs, callback) {
-  if (!Array.isArray(addrs)) {
-    addrs = [addrs]
+const createNode = async (peerInfo, transports, multiaddrs = []) => {
+  if (!Array.isArray(multiaddrs)) {
+    multiaddrs = [multiaddrs]
  }

-  let node
+  multiaddrs.forEach((addr) => peerInfo.multiaddrs.add(addr))

-  waterfall([
-    (cb) => PeerInfo.create(cb),
-    (peerInfo, cb) => {
-      addrs.forEach((addr) => peerInfo.multiaddrs.add(addr))
-      node = new MyBundle({ peerInfo: peerInfo })
-      node.start(cb)
+  const node = await Libp2p.create({
+    peerInfo,
+    modules: {
+      transport: transports,
+      connEncryption: [ SECIO ]
    }
-  ], (err) => callback(err, node))
+  })
+
+  await node.start()
+  return node
 }
 ```

@@ -243,58 +191,61 @@ As a rule, a libp2p node will only be capable of using a transport if: a) it has
 Let's update our flow to create nodes and see how they behave when dialing to each other:

 ```JavaScript
-parallel([
-  (cb) => createNode('/ip4/0.0.0.0/tcp/0', cb),
-  // Here we add an extra multiaddr that has a /ws at the end, this means that we want
-  // to create a TCP socket, but mount it as WebSockets instead.
-  (cb) => createNode(['/ip4/0.0.0.0/tcp/0', '/ip4/127.0.0.1/tcp/10000/ws'], cb),
-  (cb) => createNode('/ip4/127.0.0.1/tcp/20000/ws', cb)
-], (err, nodes) => {
-  if (err) { throw err }
+const WebSockets = require('libp2p-websockets')
+const TCP = require('libp2p-tcp')

-  const node1 = nodes[0]
-  const node2 = nodes[1]
-  const node3 = nodes[2]
+const [peerInfo1, peerInfo2, peerInfo3] = await Promise.all([
+  PeerInfo.create(),
+  PeerInfo.create(),
+  PeerInfo.create()
+])
+const [node1, node2, node3] = await Promise.all([
+  createNode(peerInfo1, [TCP], '/ip4/0.0.0.0/tcp/0'),
+  createNode(peerInfo2, [TCP, WebSockets], ['/ip4/0.0.0.0/tcp/0', '/ip4/127.0.0.1/tcp/10000/ws']),
+  createNode(peerInfo3, [WebSockets], '/ip4/127.0.0.1/tcp/20000/ws')
+])

-  printAddrs(node1, '1')
-  printAddrs(node2, '2')
-  printAddrs(node3, '3')
+printAddrs(node1, '1')
+printAddrs(node2, '2')
+printAddrs(node3, '3')

-  node1.handle('/print', print)
-  node2.handle('/print', print)
-  node3.handle('/print', print)
+node1.handle('/print', print)
+node2.handle('/print', print)
+node3.handle('/print', print)

-  // node 1 (TCP) dials to node 2 (TCP+WebSockets)
-  node1.dialProtocol(node2.peerInfo, '/print', (err, conn) => {
-    if (err) { throw err }
+// node 1 (TCP) dials to node 2 (TCP+WebSockets)
+const { stream } = await node1.dialProtocol(node2.peerInfo, '/print')
+await pipe(
+  ['node 1 dialed to node 2 successfully'],
+  stream
+)

-    pull(pull.values(['node 1 dialed to node 2 successfully']), conn)
-  })
+// node 2 (TCP+WebSockets) dials to node 2 (WebSockets)
+const { stream: stream2 } = await node2.dialProtocol(node3.peerInfo, '/print')
+await pipe(
+  ['node 2 dialed to node 3 successfully'],
+  stream2
+)

-  // node 2 (TCP+WebSockets) dials to node 2 (WebSockets)
-  node2.dialProtocol(node3.peerInfo, '/print', (err, conn) => {
-    if (err) { throw err }
-
-    pull(pull.values(['node 2 dialed to node 3 successfully']), conn)
-  })
-
-  // node 3 (WebSockets) attempts to dial to node 1 (TCP)
-  node3.dialProtocol(node1.peerInfo, '/print', (err, conn) => {
-    if (err) {
-      console.log('node 3 failed to dial to node 1 with:', err.message)
-    }
-  })
-})
+// node 3 (WebSockets) attempts to dial to node 1 (TCP)
+try {
+  await node3.dialProtocol(node1.peerInfo, '/print')
+} catch (err) {
+  console.log('node 3 failed to dial to node 1 with:', err.message)
+}
 ```

 `print` is a function created using the code from 2.js, but factored into its own function to save lines, here it is:

 ```JavaScript
-function print (protocol, conn) {
-  pull(
-    conn,
-    pull.map((v) => v.toString()),
-    pull.log()
+function print ({ stream }) {
+  pipe(
+    stream,
+    async function (source) {
+      for await (const msg of source) {
+        console.log(msg.toString())
+      }
+    }
  )
 }
 ```
@@ -312,18 +263,19 @@ node 2 is listening on:
 /ip4/192.168.2.156/tcp/62619/p2p/QmWAQtWdzWXibgfyc7WRHhhv6MdqVKzXvyfSTnN2aAvixX
 node 3 is listening on:
 /ip4/127.0.0.1/tcp/20000/ws/p2p/QmVq1PWh3VSDYdFqYMtqp4YQyXcrH27N7968tGdM1VQPj1
-node 3 failed to dial to node 1 with: No available transport to dial to
 node 1 dialed to node 2 successfully
 node 2 dialed to node 3 successfully
+node 3 failed to dial to node 1 with:
+    Error: No transport available for address /ip4/127.0.0.1/tcp/51482
 ```

 As expected, we created 3 nodes, node 1 with TCP, node 2 with TCP+WebSockets and node 3 with just WebSockets. node 1 -> node 2 and node 2 -> node 3 managed to dial correctly because they shared a common transport, however, node 3 -> node 1 failed because they didn't share any.

 ## 4. How to create a new libp2p transport

-Today there are already 3 transports available, one in the works and plenty to come, you can find these at [interface-transport implementations](https://github.com/libp2p/interface-transport#modules-that-implement-the-interface) list.
+Today there are already several transports available and plenty to come, you can find these at [interface-transport implementations](https://github.com/libp2p/js-interfaces/tree/master/src/transport#modules-that-implement-the-interface) list.

-Adding more transports is done through the same way as you added TCP and WebSockets. Some transports might offer extra functionalities, but as far as libp2p is concerned, if it follows the interface defined at the [spec](https://github.com/libp2p/interface-transport#api) it will be able to use it.
+Adding more transports is done through the same way as you added TCP and WebSockets. Some transports might offer extra functionalities, but as far as libp2p is concerned, if it follows the interface defined at the [spec](https://github.com/libp2p/js-interfaces/tree/master/src/transport#api) it will be able to use it.

 If you decide to implement a transport yourself, please consider adding to the list so that others can use it as well.

--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "libp2p",
-  "version": "0.27.0-pre.1",
+  "version": "0.27.0-rc.0",
  "description": "JavaScript implementation of libp2p, a modular peer to peer network stack",
  "leadMaintainer": "Jacob Heun <jacobheun@gmail.com>",
  "main": "src/index.js",
@@ -57,9 +57,9 @@
    "it-protocol-buffers": "^0.2.0",
    "latency-monitor": "~0.2.1",
    "libp2p-crypto": "^0.17.1",
-    "libp2p-interfaces": "^0.1.5",
+    "libp2p-interfaces": "^0.2.3",
    "mafmt": "^7.0.0",
-    "merge-options": "^1.0.1",
+    "merge-options": "^2.0.0",
    "moving-average": "^1.0.0",
    "multiaddr": "^7.2.1",
    "multistream-select": "^0.15.0",
@@ -77,7 +77,7 @@
  "devDependencies": {
    "@nodeutils/defaults-deep": "^1.1.0",
    "abortable-iterator": "^2.1.0",
-    "aegir": "^20.4.1",
+    "aegir": "^20.5.1",
    "chai": "^4.2.0",
    "chai-as-promised": "^7.1.1",
    "cids": "^0.7.1",
@@ -102,7 +102,7 @@
    "p-defer": "^3.0.0",
    "p-times": "^2.1.0",
    "p-wait-for": "^3.1.0",
-    "sinon": "^7.2.7",
+    "sinon": "^8.1.0",
    "streaming-iterables": "^4.1.0",
    "wrtc": "^0.4.1"
  },
--- a/src/config.js
+++ b/src/config.js
@@ -1,11 +1,17 @@
 'use strict'

 const mergeOptions = require('merge-options')
+const Constants = require('./constants')

 const DefaultConfig = {
  connectionManager: {
    minPeers: 25
  },
+  dialer: {
+    maxParallelDials: Constants.MAX_PARALLEL_DIALS,
+    maxDialsPerPeer: Constants.MAX_PER_PEER_DIALS,
+    dialTimeout: Constants.DIAL_TIMEOUT
+  },
  metrics: {
    enabled: false
  },
@@ -35,7 +41,8 @@ const DefaultConfig = {
        enabled: false,
        active: false
      }
-    }
+    },
+    transport: {}
  }
 }

--- a/src/connection-manager/index.js
+++ b/src/connection-manager/index.js
@@ -36,8 +36,8 @@ class ConnectionManager {
  constructor (libp2p, options) {
    this._libp2p = libp2p
    this._registrar = libp2p.registrar
-    this._peerId = libp2p.peerInfo.id.toString()
-    this._options = mergeOptions(defaultOptions, options)
+    this._peerId = libp2p.peerInfo.id.toB58String()
+    this._options = mergeOptions.call({ ignoreUndefined: true }, defaultOptions, options)
    assert(
      this._options.maxConnections > this._options.minConnections,
      'Connection Manager maxConnections must be greater than minConnections'
@@ -91,8 +91,8 @@ class ConnectionManager {
    if (value < 0 || value > 1) {
      throw new Error('value should be a number between 0 and 1')
    }
-    if (peerId.toString) {
-      peerId = peerId.toString()
+    if (peerId.toB58String) {
+      peerId = peerId.toB58String()
    }
    this._peerValues.set(peerId, value)
  }
@@ -119,7 +119,7 @@ class ConnectionManager {
   * @param {Connection} connection
   */
  onConnect (connection) {
-    const peerId = connection.remotePeer.toString()
+    const peerId = connection.remotePeer.toB58String()
    this._connections.set(connection.id, connection)
    if (!this._peerValues.has(peerId)) {
      this._peerValues.set(peerId, this._options.defaultPeerValue)
@@ -133,7 +133,7 @@ class ConnectionManager {
   */
  onDisconnect (connection) {
    this._connections.delete(connection.id)
-    this._peerValues.delete(connection.remotePeer.toString())
+    this._peerValues.delete(connection.remotePeer.toB58String())
  }

  /**
@@ -175,7 +175,7 @@ class ConnectionManager {
        debug('%s: lowest value peer is %s', this._peerId, peerId)
        debug('%s: closing a connection to %j', this._peerId, peerId)
        for (const connection of this._connections.values()) {
-          if (connection.remotePeer.toString() === peerId) {
+          if (connection.remotePeer.toB58String() === peerId) {
            connection.close()
            break
          }
--- a/src/constants.js
+++ b/src/constants.js
@@ -1,15 +1,9 @@
 'use strict'

 module.exports = {
-  DENY_TTL: 5 * 60 * 1e3, // How long before an errored peer can be dialed again
-  DENY_ATTEMPTS: 5, // Num of unsuccessful dials before a peer is permanently denied
  DIAL_TIMEOUT: 30e3, // How long in ms a dial attempt is allowed to take
-  MAX_COLD_CALLS: 50, // How many dials w/o protocols that can be queued
  MAX_PARALLEL_DIALS: 100, // Maximum allowed concurrent dials
  MAX_PER_PEER_DIALS: 4, // Allowed parallel dials per DialRequest
-  QUARTER_HOUR: 15 * 60e3,
-  PRIORITY_HIGH: 10,
-  PRIORITY_LOW: 20,
  METRICS: {
    computeThrottleMaxQueueSize: 1000,
    computeThrottleTimeout: 2000,
--- a/src/dialer/index.js
+++ b/src/dialer/index.js
@@ -113,7 +113,7 @@ class Dialer {
    }
    const addrs = this.peerStore.multiaddrsForPeer(dialable)
    return {
-      id: dialable.id.toString(),
+      id: dialable.id.toB58String(),
      addrs
    }
  }
--- a/src/identify/index.js
+++ b/src/identify/index.js
@@ -180,7 +180,7 @@ class IdentifyService {

    const id = await PeerId.createFromPubKey(publicKey)
    const peerInfo = new PeerInfo(id)
-    if (connection.remotePeer.toString() !== id.toString()) {
+    if (connection.remotePeer.toB58String() !== id.toB58String()) {
      throw errCode(new Error('identified peer does not match the expected peer'), codes.ERR_INVALID_PEER)
    }

--- a/src/index.js
+++ b/src/index.js
@@ -107,14 +107,21 @@ class Libp2p extends EventEmitter {

    this.dialer = new Dialer({
      transportManager: this.transportManager,
-      peerStore: this.peerStore
+      peerStore: this.peerStore,
+      concurrency: this._options.dialer.maxParallelDials,
+      perPeerLimit: this._options.dialer.maxDialsPerPeer,
+      timeout: this._options.dialer.dialTimeout
    })

    this._modules.transport.forEach((Transport) => {
-      this.transportManager.add(Transport.prototype[Symbol.toStringTag], Transport)
+      const key = Transport.prototype[Symbol.toStringTag]
+      const transportOptions = this._config.transport[key]
+      this.transportManager.add(key, Transport, transportOptions)
    })
-    // TODO: enable relay if enabled
-    this.transportManager.add(Circuit.prototype[Symbol.toStringTag], Circuit)
+
+    if (this._config.relay.enabled) {
+      this.transportManager.add(Circuit.prototype[Symbol.toStringTag], Circuit)
+    }

    // Attach stream multiplexers
    if (this._modules.streamMuxer) {
@@ -211,7 +218,14 @@ class Libp2p extends EventEmitter {
    log('libp2p is stopping')

    try {
+      for (const service of this._discovery.values()) {
+        service.removeListener('peer', this._onDiscoveryPeer)
+      }
+
+      await Promise.all(Array.from(this._discovery.values(), s => s.stop()))
+
      this.connectionManager.stop()
+
      await Promise.all([
        this.pubsub && this.pubsub.stop(),
        this._dht && this._dht.stop(),
@@ -237,6 +251,15 @@ class Libp2p extends EventEmitter {
    return this._isStarted
  }

+  /**
+   * Gets a Map of the current connections. The keys are the stringified
+   * `PeerId` of the peer. The value is an array of Connections to that peer.
+   * @returns {Map<string, Connection[]>}
+   */
+  get connections () {
+    return this.registrar.connections
+  }
+
  /**
   * Dials to the provided peer. If successful, the `PeerInfo` of the
   * peer will be added to the nodes `peerStore`
@@ -285,12 +308,13 @@ class Libp2p extends EventEmitter {
  /**
   * Disconnects all connections to the given `peer`
   *
-   * @param {PeerId} peer The PeerId to close connections to
+   * @param {PeerInfo|PeerId|multiaddr|string} peer the peer to close connections to
   * @returns {Promise<void>}
   */
  hangUp (peer) {
+    const peerInfo = getPeerInfo(peer, this.peerStore)
    return Promise.all(
-      this.registrar.connections.get(peer.toString()).map(connection => {
+      this.registrar.connections.get(peerInfo.id.toB58String()).map(connection => {
        return connection.close()
      })
    )
@@ -402,7 +426,7 @@ class Libp2p extends EventEmitter {
   * @param {PeerInfo} peerInfo
   */
  _onDiscoveryPeer (peerInfo) {
-    if (peerInfo.id.toString() === this.peerInfo.id.toString()) {
+    if (peerInfo.id.toB58String() === this.peerInfo.id.toB58String()) {
      log.error(new Error(codes.ERR_DISCOVERED_SELF))
      return
    }
@@ -421,7 +445,7 @@ class Libp2p extends EventEmitter {
    if (this._config.peerDiscovery.autoDial === true && !this.registrar.getConnection(peerInfo)) {
      const minPeers = this._options.connectionManager.minPeers || 0
      if (minPeers > this.connectionManager._connections.size) {
-        log('connecting to discovered peer %s', peerInfo.id.toString())
+        log('connecting to discovered peer %s', peerInfo.id.toB58String())
        try {
          await this.dialer.connectToPeer(peerInfo)
        } catch (err) {
--- a/src/metrics/index.js
+++ b/src/metrics/index.js
@@ -82,7 +82,7 @@ class Metrics {
   * @returns {Stats}
   */
  forPeer (peerId) {
-    const idString = peerId.toString()
+    const idString = peerId.toB58String()
    return this._peerStats.get(idString) || this._oldPeers.get(idString)
  }

@@ -110,7 +110,7 @@ class Metrics {
   * @param {PeerId} peerId
   */
  onPeerDisconnected (peerId) {
-    const idString = peerId.toString()
+    const idString = peerId.toB58String()
    const peerStats = this._peerStats.get(idString)
    if (peerStats) {
      peerStats.stop()
@@ -140,7 +140,7 @@ class Metrics {
    let peerStats = this.forPeer(remotePeer)
    if (!peerStats) {
      peerStats = new Stats(initialCounters, this._options)
-      this._peerStats.set(remotePeer.toString(), peerStats)
+      this._peerStats.set(remotePeer.toB58String(), peerStats)
    }

    // Peer and global stats
@@ -162,13 +162,13 @@ class Metrics {
   * Replaces the `PeerId` string with the given `peerId`.
   * If stats are already being tracked for the given `peerId`, the
   * placeholder stats will be merged with the existing stats.
-   * @param {string} placeholder A peerId string
+   * @param {PeerId} placeholder A peerId string
   * @param {PeerId} peerId
   */
  updatePlaceholder (placeholder, peerId) {
    if (!this._running) return
    const placeholderStats = this.forPeer(placeholder)
-    const peerIdString = peerId.toString()
+    const peerIdString = peerId.toB58String()
    const existingStats = this.forPeer(peerId)
    let mergedStats = placeholderStats

@@ -180,7 +180,7 @@ class Metrics {
      this._oldPeers.delete(peerIdString)
    }

-    this._peerStats.delete(placeholder.toString())
+    this._peerStats.delete(placeholder.toB58String())
    this._peerStats.set(peerIdString, mergedStats)
    mergedStats.start()
  }
--- a/src/registrar.js
+++ b/src/registrar.js
@@ -74,7 +74,7 @@ class Registrar {
    assert(PeerInfo.isPeerInfo(peerInfo), 'peerInfo must be an instance of peer-info')
    assert(Connection.isConnection(conn), 'conn must be an instance of interface-connection')

-    const id = peerInfo.id.toString()
+    const id = peerInfo.id.toB58String()
    const storedConn = this.connections.get(id)

    if (storedConn) {
@@ -95,18 +95,18 @@ class Registrar {
  onDisconnect (peerInfo, connection, error) {
    assert(PeerInfo.isPeerInfo(peerInfo), 'peerInfo must be an instance of peer-info')

-    const id = peerInfo.id.toString()
+    const id = peerInfo.id.toB58String()
    let storedConn = this.connections.get(id)

    if (storedConn && storedConn.length > 1) {
-      storedConn = storedConn.filter((conn) => conn.id === connection.id)
+      storedConn = storedConn.filter((conn) => conn.id !== connection.id)
      this.connections.set(id, storedConn)
    } else if (storedConn) {
      for (const [, topology] of this.topologies) {
        topology.disconnect(peerInfo, error)
      }

-      this.connections.delete(peerInfo.id.toString())
+      this.connections.delete(peerInfo.id.toB58String())
    }
  }

@@ -118,7 +118,7 @@ class Registrar {
  getConnection (peerInfo) {
    assert(PeerInfo.isPeerInfo(peerInfo), 'peerInfo must be an instance of peer-info')

-    const connections = this.connections.get(peerInfo.id.toString())
+    const connections = this.connections.get(peerInfo.id.toB58String())
    // Return the first, open connection
    if (connections) {
      return connections.find(connection => connection.stat.status === 'open')
--- a/src/transport-manager.js
+++ b/src/transport-manager.js
@@ -26,9 +26,10 @@ class TransportManager {
   *
   * @param {String} key
   * @param {Transport} Transport
+   * @param {*} transportOptions Additional options to pass to the transport
   * @returns {void}
   */
-  add (key, Transport) {
+  add (key, Transport, transportOptions = {}) {
    log('adding %s', key)
    if (!key) {
      throw errCode(new Error(`Transport must have a valid key, was given '${key}'`), codes.ERR_INVALID_KEY)
@@ -38,6 +39,7 @@ class TransportManager {
    }

    const transport = new Transport({
+      ...transportOptions,
      libp2p: this.libp2p,
      upgrader: this.upgrader
    })
@@ -84,8 +86,8 @@ class TransportManager {
    try {
      return await transport.dial(ma, options)
    } catch (err) {
-      if (err.code) throw err
-      throw errCode(err, codes.ERR_TRANSPORT_DIAL_FAILED)
+      if (!err.code) err.code = codes.ERR_TRANSPORT_DIAL_FAILED
+      throw err
    }
  }

--- a/src/upgrader.js
+++ b/src/upgrader.js
@@ -64,7 +64,7 @@ class Upgrader {
  async upgradeInbound (maConn) {
    let encryptedConn
    let remotePeer
-    let muxedConnection
+    let upgradedConn
    let Muxer
    let cryptoProtocol
    let setPeer
@@ -73,7 +73,7 @@ class Upgrader {
    if (this.metrics) {
      ({ setTarget: setPeer, proxy: proxyPeer } = mutableProxy())
      const idString = (parseInt(Math.random() * 1e9)).toString(36) + Date.now()
-      setPeer({ toString: () => idString })
+      setPeer({ toB58String: () => idString })
      maConn = this.metrics.trackStream({ stream: maConn, remotePeer: proxyPeer })
    }

@@ -94,7 +94,11 @@ class Upgrader {
      } = await this._encryptInbound(this.localPeer, protectedConn, this.cryptos))

      // Multiplex the connection
-      ;({ stream: muxedConnection, Muxer } = await this._multiplexInbound(encryptedConn, this.muxers))
+      if (this.muxers.size) {
+        ({ stream: upgradedConn, Muxer } = await this._multiplexInbound(encryptedConn, this.muxers))
+      } else {
+        upgradedConn = encryptedConn
+      }
    } catch (err) {
      log.error('Failed to upgrade inbound connection', err)
      await maConn.close(err)
@@ -112,7 +116,7 @@ class Upgrader {
      cryptoProtocol,
      direction: 'inbound',
      maConn,
-      muxedConnection,
+      upgradedConn,
      Muxer,
      remotePeer
    })
@@ -134,7 +138,7 @@ class Upgrader {

    let encryptedConn
    let remotePeer
-    let muxedConnection
+    let upgradedConn
    let cryptoProtocol
    let Muxer
    let setPeer
@@ -143,7 +147,7 @@ class Upgrader {
    if (this.metrics) {
      ({ setTarget: setPeer, proxy: proxyPeer } = mutableProxy())
      const idString = (parseInt(Math.random() * 1e9)).toString(36) + Date.now()
-      setPeer({ toString: () => idString })
+      setPeer({ toB58String: () => idString })
      maConn = this.metrics.trackStream({ stream: maConn, remotePeer: proxyPeer })
    }

@@ -164,7 +168,11 @@ class Upgrader {
      } = await this._encryptOutbound(this.localPeer, protectedConn, remotePeerId, this.cryptos))

      // Multiplex the connection
-      ;({ stream: muxedConnection, Muxer } = await this._multiplexOutbound(encryptedConn, this.muxers))
+      if (this.muxers.size) {
+        ({ stream: upgradedConn, Muxer } = await this._multiplexOutbound(encryptedConn, this.muxers))
+      } else {
+        upgradedConn = encryptedConn
+      }
    } catch (err) {
      log.error('Failed to upgrade outbound connection', err)
      await maConn.close(err)
@@ -182,7 +190,7 @@ class Upgrader {
      cryptoProtocol,
      direction: 'outbound',
      maConn,
-      muxedConnection,
+      upgradedConn,
      Muxer,
      remotePeer
    })
@@ -195,7 +203,7 @@ class Upgrader {
   * @param {string} cryptoProtocol The crypto protocol that was negotiated
   * @param {string} direction One of ['inbound', 'outbound']
   * @param {MultiaddrConnection} maConn The transport layer connection
-   * @param {*} muxedConnection A duplex connection returned from multiplexer selection
+   * @param {*} upgradedConn A duplex connection returned from multiplexer and/or crypto selection
   * @param {Muxer} Muxer The muxer to be used for muxing
   * @param {PeerId} remotePeer The peer the connection is with
   * @returns {Connection}
@@ -204,53 +212,59 @@ class Upgrader {
    cryptoProtocol,
    direction,
    maConn,
-    muxedConnection,
+    upgradedConn,
    Muxer,
    remotePeer
  }) {
-    // Create the muxer
-    const muxer = new Muxer({
-      // Run anytime a remote stream is created
-      onStream: async muxedStream => {
-        const mss = new Multistream.Listener(muxedStream)
-        try {
-          const { stream, protocol } = await mss.handle(Array.from(this.protocols.keys()))
-          log('%s: incoming stream opened on %s', direction, protocol)
-          if (this.metrics) this.metrics.trackStream({ stream, remotePeer, protocol })
-          connection.addStream(stream, protocol)
-          this._onStream({ connection, stream, protocol })
-        } catch (err) {
-          log.error(err)
-        }
-      },
-      // Run anytime a stream closes
-      onStreamEnd: muxedStream => {
-        connection.removeStream(muxedStream.id)
-      }
-    })
+    let muxer
+    let newStream
+    // eslint-disable-next-line prefer-const
+    let connection

-    const newStream = async protocols => {
-      log('%s: starting new stream on %s', direction, protocols)
-      const muxedStream = muxer.newStream()
-      const mss = new Multistream.Dialer(muxedStream)
-      try {
-        const { stream, protocol } = await mss.select(protocols)
-        if (this.metrics) this.metrics.trackStream({ stream, remotePeer, protocol })
-        return { stream: { ...muxedStream, ...stream }, protocol }
-      } catch (err) {
-        log.error('could not create new stream', err)
-        throw errCode(err, codes.ERR_UNSUPPORTED_PROTOCOL)
+    if (Muxer) {
+      // Create the muxer
+      muxer = new Muxer({
+        // Run anytime a remote stream is created
+        onStream: async muxedStream => {
+          const mss = new Multistream.Listener(muxedStream)
+          try {
+            const { stream, protocol } = await mss.handle(Array.from(this.protocols.keys()))
+            log('%s: incoming stream opened on %s', direction, protocol)
+            if (this.metrics) this.metrics.trackStream({ stream, remotePeer, protocol })
+            connection.addStream(stream, protocol)
+            this._onStream({ connection, stream, protocol })
+          } catch (err) {
+            log.error(err)
+          }
+        },
+        // Run anytime a stream closes
+        onStreamEnd: muxedStream => {
+          connection.removeStream(muxedStream.id)
+        }
+      })
+
+      newStream = async protocols => {
+        log('%s: starting new stream on %s', direction, protocols)
+        const muxedStream = muxer.newStream()
+        const mss = new Multistream.Dialer(muxedStream)
+        try {
+          const { stream, protocol } = await mss.select(protocols)
+          if (this.metrics) this.metrics.trackStream({ stream, remotePeer, protocol })
+          return { stream: { ...muxedStream, ...stream }, protocol }
+        } catch (err) {
+          log.error('could not create new stream', err)
+          throw errCode(err, codes.ERR_UNSUPPORTED_PROTOCOL)
+        }
      }
+
+      // Pipe all data through the muxer
+      pipe(upgradedConn, muxer, upgradedConn)
    }

-    // Pipe all data through the muxer
-    pipe(muxedConnection, muxer, muxedConnection)
-
-    maConn.timeline.upgraded = Date.now()
    const _timeline = maConn.timeline
    maConn.timeline = new Proxy(_timeline, {
      set: (...args) => {
-        if (args[1] === 'close' && args[2] && !_timeline.close) {
+        if (connection && args[1] === 'close' && args[2] && !_timeline.close) {
          connection.stat.status = 'closed'
          this.onConnectionEnd(connection)
        }
@@ -258,9 +272,14 @@ class Upgrader {
        return Reflect.set(...args)
      }
    })
+    maConn.timeline.upgraded = Date.now()
+
+    const errConnectionNotMultiplexed = () => {
+      throw errCode(new Error('connection is not multiplexed'), 'ERR_CONNECTION_NOT_MULTIPLEXED')
+    }

    // Create the connection
-    const connection = new Connection({
+    connection = new Connection({
      localAddr: maConn.localAddr,
      remoteAddr: maConn.remoteAddr,
      localPeer: this.localPeer,
@@ -268,11 +287,11 @@ class Upgrader {
      stat: {
        direction,
        timeline: maConn.timeline,
-        multiplexer: Muxer.multicodec,
+        multiplexer: Muxer && Muxer.multicodec,
        encryption: cryptoProtocol
      },
-      newStream,
-      getStreams: () => muxer.streams,
+      newStream: newStream || errConnectionNotMultiplexed,
+      getStreams: () => muxer ? muxer.streams : errConnectionNotMultiplexed,
      close: err => maConn.close(err)
    })

--- a/test/connection-manager/index.spec.js
+++ b/test/connection-manager/index.spec.js
@@ -75,7 +75,7 @@ describe('Connection Manager', () => {
      const spy = sinon.spy(connection, 'close')
      // The connections have the same remote id, give them random ones
      // so that we can verify the correct connection was closed
-      sinon.stub(connection.remotePeer, 'toString').returns(index)
+      sinon.stub(connection.remotePeer, 'toB58String').returns(index)
      const value = Math.random()
      spies.set(value, spy)
      libp2p.connectionManager.setPeerValue(connection.remotePeer, value)
--- a/test/core/listening.node.js
+++ b/test/core/listening.node.js
@@ -41,16 +41,13 @@ describe('Listening', () => {
    // Should get something like:
    //   /ip4/127.0.0.1/tcp/50866
    //   /ip4/192.168.1.2/tcp/50866
-    expect(addrs.length).to.equal(2)
-
-    const opts = [addrs[0].toOptions(), addrs[1].toOptions()]
-    expect(opts[0].family).to.equal('ipv4')
-    expect(opts[1].family).to.equal('ipv4')
-    expect(opts[0].transport).to.equal('tcp')
-    expect(opts[1].transport).to.equal('tcp')
-    expect(opts[0].host).to.match(/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/)
-    expect(opts[1].host).to.match(/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/)
-    expect(opts[0].port).to.be.gt(0)
-    expect(opts[1].port).to.be.gt(0)
+    expect(addrs.length).to.be.at.least(2)
+    for (const addr of addrs) {
+      const opts = addr.toOptions()
+      expect(opts.family).to.equal('ipv4')
+      expect(opts.transport).to.equal('tcp')
+      expect(opts.host).to.match(/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/)
+      expect(opts.port).to.be.gt(0)
+    }
  })
 })
--- a/test/dialing/direct.node.js
+++ b/test/dialing/direct.node.js
@@ -296,6 +296,23 @@ describe('Dialing (direct, TCP)', () => {
      expect(connection.stat.timeline.close).to.exist()
    })

+    it('should be able to use hangup by address string to close connections', async () => {
+      libp2p = new Libp2p({
+        peerInfo,
+        modules: {
+          transport: [Transport],
+          streamMuxer: [Muxer],
+          connEncryption: [Crypto]
+        }
+      })
+
+      const connection = await libp2p.dial(`${remoteAddr.toString()}/p2p/${remotePeerInfo.id.toB58String()}`)
+      expect(connection).to.exist()
+      expect(connection.stat.timeline.close).to.not.exist()
+      await libp2p.hangUp(connection.remotePeer)
+      expect(connection.stat.timeline.close).to.exist()
+    })
+
    it('should use the protectors when provided for connecting', async () => {
      const protector = new Protector(swarmKeyBuffer)
      libp2p = new Libp2p({
@@ -358,7 +375,7 @@ describe('Dialing (direct, TCP)', () => {
      })
      const dials = 10

-      const fullAddress = remoteAddr.encapsulate(`/p2p/${remoteLibp2p.peerInfo.id.toString()}`)
+      const fullAddress = remoteAddr.encapsulate(`/p2p/${remoteLibp2p.peerInfo.id.toB58String()}`)
      const dialResults = await Promise.all([...new Array(dials)].map((_, index) => {
        if (index % 2 === 0) return libp2p.dial(remoteLibp2p.peerInfo)
        return libp2p.dial(fullAddress)
@@ -388,7 +405,7 @@ describe('Dialing (direct, TCP)', () => {
      const error = new Error('Boom')
      sinon.stub(libp2p.transportManager, 'dial').callsFake(() => Promise.reject(error))

-      const fullAddress = remoteAddr.encapsulate(`/p2p/${remoteLibp2p.peerInfo.id.toString()}`)
+      const fullAddress = remoteAddr.encapsulate(`/p2p/${remoteLibp2p.peerInfo.id.toB58String()}`)
      const dialResults = await pSettle([...new Array(dials)].map((_, index) => {
        if (index % 2 === 0) return libp2p.dial(remoteLibp2p.peerInfo)
        return libp2p.dial(fullAddress)
--- a/test/dialing/direct.spec.js
+++ b/test/dialing/direct.spec.js
@@ -273,10 +273,35 @@ describe('Dialing (direct, WebSockets)', () => {
      })

      expect(libp2p.dialer).to.exist()
+      expect(libp2p.dialer.concurrency).to.equal(Constants.MAX_PARALLEL_DIALS)
+      expect(libp2p.dialer.perPeerLimit).to.equal(Constants.MAX_PER_PEER_DIALS)
+      expect(libp2p.dialer.timeout).to.equal(Constants.DIAL_TIMEOUT)
      // Ensure the dialer also has the transport manager
      expect(libp2p.transportManager).to.equal(libp2p.dialer.transportManager)
    })

+    it('should be able to override dialer options', async () => {
+      const config = {
+        peerInfo,
+        modules: {
+          transport: [Transport],
+          streamMuxer: [Muxer],
+          connEncryption: [Crypto]
+        },
+        dialer: {
+          maxParallelDials: 10,
+          maxDialsPerPeer: 1,
+          dialTimeout: 1e3 // 30 second dial timeout per peer
+        }
+      }
+      libp2p = await Libp2p.create(config)
+
+      expect(libp2p.dialer).to.exist()
+      expect(libp2p.dialer.concurrency).to.equal(config.dialer.maxParallelDials)
+      expect(libp2p.dialer.perPeerLimit).to.equal(config.dialer.maxDialsPerPeer)
+      expect(libp2p.dialer.timeout).to.equal(config.dialer.dialTimeout)
+    })
+
    it('should use the dialer for connecting', async () => {
      libp2p = new Libp2p({
        peerInfo,
--- a/test/dialing/relay.node.js
+++ b/test/dialing/relay.node.js
@@ -59,11 +59,11 @@ describe('Dialing (via relay, TCP)', () => {

  it('should be able to connect to a peer over a relay with active connections', async () => {
    const relayAddr = relayLibp2p.transportManager.getAddrs()[0]
-    const relayIdString = relayLibp2p.peerInfo.id.toString()
+    const relayIdString = relayLibp2p.peerInfo.id.toB58String()

    const dialAddr = relayAddr
      .encapsulate(`/p2p/${relayIdString}`)
-      .encapsulate(`/p2p-circuit/p2p/${dstLibp2p.peerInfo.id.toString()}`)
+      .encapsulate(`/p2p-circuit/p2p/${dstLibp2p.peerInfo.id.toB58String()}`)

    const tcpAddrs = dstLibp2p.transportManager.getAddrs()
    await dstLibp2p.transportManager.listen([multiaddr(`/p2p-circuit${relayAddr}/p2p/${relayIdString}`)])
@@ -94,11 +94,11 @@ describe('Dialing (via relay, TCP)', () => {

  it('should fail to connect to a peer over a relay with inactive connections', async () => {
    const relayAddr = relayLibp2p.transportManager.getAddrs()[0]
-    const relayIdString = relayLibp2p.peerInfo.id.toString()
+    const relayIdString = relayLibp2p.peerInfo.id.toB58String()

    const dialAddr = relayAddr
      .encapsulate(`/p2p/${relayIdString}`)
-      .encapsulate(`/p2p-circuit/p2p/${dstLibp2p.peerInfo.id.toString()}`)
+      .encapsulate(`/p2p-circuit/p2p/${dstLibp2p.peerInfo.id.toB58String()}`)

    await expect(srcLibp2p.dial(dialAddr))
      .to.eventually.be.rejectedWith(AggregateError)
@@ -107,11 +107,11 @@ describe('Dialing (via relay, TCP)', () => {

  it('should not stay connected to a relay when not already connected and HOP fails', async () => {
    const relayAddr = relayLibp2p.transportManager.getAddrs()[0]
-    const relayIdString = relayLibp2p.peerInfo.id.toString()
+    const relayIdString = relayLibp2p.peerInfo.id.toB58String()

    const dialAddr = relayAddr
      .encapsulate(`/p2p/${relayIdString}`)
-      .encapsulate(`/p2p-circuit/p2p/${dstLibp2p.peerInfo.id.toString()}`)
+      .encapsulate(`/p2p-circuit/p2p/${dstLibp2p.peerInfo.id.toB58String()}`)

    await expect(srcLibp2p.dial(dialAddr))
      .to.eventually.be.rejectedWith(AggregateError)
@@ -124,11 +124,11 @@ describe('Dialing (via relay, TCP)', () => {

  it('dialer should stay connected to an already connected relay on hop failure', async () => {
    const relayAddr = relayLibp2p.transportManager.getAddrs()[0]
-    const relayIdString = relayLibp2p.peerInfo.id.toString()
+    const relayIdString = relayLibp2p.peerInfo.id.toB58String()

    const dialAddr = relayAddr
      .encapsulate(`/p2p/${relayIdString}`)
-      .encapsulate(`/p2p-circuit/p2p/${dstLibp2p.peerInfo.id.toString()}`)
+      .encapsulate(`/p2p-circuit/p2p/${dstLibp2p.peerInfo.id.toB58String()}`)

    await srcLibp2p.dial(relayAddr)

@@ -143,11 +143,11 @@ describe('Dialing (via relay, TCP)', () => {

  it('destination peer should stay connected to an already connected relay on hop failure', async () => {
    const relayAddr = relayLibp2p.transportManager.getAddrs()[0]
-    const relayIdString = relayLibp2p.peerInfo.id.toString()
+    const relayIdString = relayLibp2p.peerInfo.id.toB58String()

    const dialAddr = relayAddr
      .encapsulate(`/p2p/${relayIdString}`)
-      .encapsulate(`/p2p-circuit/p2p/${dstLibp2p.peerInfo.id.toString()}`)
+      .encapsulate(`/p2p-circuit/p2p/${dstLibp2p.peerInfo.id.toB58String()}`)

    // Connect the destination peer and the relay
    const tcpAddrs = dstLibp2p.transportManager.getAddrs()
--- a/test/identify/index.spec.js
+++ b/test/identify/index.spec.js
@@ -84,7 +84,12 @@ describe('Identify', () => {
  it('should throw if identified peer is the wrong peer', async () => {
    const localIdentify = new IdentifyService({
      peerInfo: localPeer,
-      protocols
+      protocols,
+      registrar: {
+        peerStore: {
+          replace: () => {}
+        }
+      }
    })
    const remoteIdentify = new IdentifyService({
      peerInfo: remotePeer,
@@ -92,7 +97,7 @@ describe('Identify', () => {
    })

    const observedAddr = multiaddr('/ip4/127.0.0.1/tcp/1234')
-    const localConnectionMock = { newStream: () => {}, remotePeer }
+    const localConnectionMock = { newStream: () => {}, remotePeer: localPeer.id }
    const remoteConnectionMock = { remoteAddr: observedAddr }

    const [local, remote] = duplexPair()
--- a/test/metrics/index.spec.js
+++ b/test/metrics/index.spec.js
@@ -104,7 +104,7 @@ describe('Metrics', () => {
    expect(results.length).to.eql(bytes.length * 10)

    const stats = metrics.forPeer(peerId)
-    expect(metrics.peers).to.eql([peerId.toString()])
+    expect(metrics.peers).to.eql([peerId.toB58String()])
    expect(stats.snapshot.dataReceived.toNumber()).to.equal(results.length)
    expect(stats.snapshot.dataSent.toNumber()).to.equal(results.length)

@@ -148,7 +148,7 @@ describe('Metrics', () => {
    // Flush the call stack
    await delay(0)

-    expect(metrics.peers).to.eql([peerId.toString(), peerId2.toString()])
+    expect(metrics.peers).to.eql([peerId.toB58String(), peerId2.toB58String()])
    // Verify global metrics
    const globalStats = metrics.global
    expect(globalStats.snapshot.dataReceived.toNumber()).to.equal(bytes.length * 2)
@@ -181,7 +181,7 @@ describe('Metrics', () => {
    pipe(remote, remote)

    const mockPeer = {
-      toString: () => 'a temporary id'
+      toB58String: () => 'a temporary id'
    }
    metrics.trackStream({
      stream: local,
@@ -197,8 +197,8 @@ describe('Metrics', () => {

    await delay(0)

-    metrics.updatePlaceholder(mockPeer.toString(), peerId)
-    mockPeer.toString = peerId.toString.bind(peerId)
+    metrics.updatePlaceholder(mockPeer, peerId)
+    mockPeer.toB58String = peerId.toB58String.bind(peerId)

    input.push(bytes)
    input.end()
@@ -206,7 +206,7 @@ describe('Metrics', () => {
    await deferredPromise
    await delay(0)

-    expect(metrics.peers).to.eql([peerId.toString()])
+    expect(metrics.peers).to.eql([peerId.toB58String()])
    // Verify global metrics
    const globalStats = metrics.global
    expect(globalStats.snapshot.dataReceived.toNumber()).to.equal(bytes.length * 2)
@@ -237,7 +237,7 @@ describe('Metrics', () => {
    // Disconnect every peer
    for (const id of trackedPeers.keys()) {
      metrics.onPeerDisconnected({
-        toString: () => id
+        toB58String: () => id
      })
    }

@@ -245,7 +245,9 @@ describe('Metrics', () => {
    expect(metrics.peers).to.have.length(0)
    const retainedPeers = []
    for (const id of trackedPeers.keys()) {
-      const stat = metrics.forPeer(id)
+      const stat = metrics.forPeer({
+        toB58String: () => id
+      })
      if (stat) retainedPeers.push(id)
    }
    expect(retainedPeers).to.eql(['45', '46', '47', '48', '49'])
--- a/test/peer-discovery/index.spec.js
+++ b/test/peer-discovery/index.spec.js
@@ -65,6 +65,32 @@ describe('peer discovery', () => {

      expect(discoverySpy.called).to.eql(false)
    })
+
+    it('should stop discovery on libp2p start/stop', async () => {
+      const mockDiscovery = {
+        tag: 'mock',
+        start: () => {},
+        stop: () => {},
+        on: () => {},
+        removeListener: () => {}
+      }
+      const startSpy = sinon.spy(mockDiscovery, 'start')
+      const stopSpy = sinon.spy(mockDiscovery, 'stop')
+
+      libp2p = new Libp2p(mergeOptions(baseOptions, {
+        peerInfo,
+        modules: {
+          peerDiscovery: [mockDiscovery]
+        }
+      }))
+
+      await libp2p.start()
+      expect(startSpy).to.have.property('callCount', 1)
+      expect(stopSpy).to.have.property('callCount', 0)
+      await libp2p.stop()
+      expect(startSpy).to.have.property('callCount', 1)
+      expect(stopSpy).to.have.property('callCount', 1)
+    })
  })

  describe('discovery modules from transports', () => {
--- a/test/registrar/registrar.node.js
+++ b/test/registrar/registrar.node.js
@@ -61,12 +61,12 @@ describe('registrar on dial', () => {
    }))

    await libp2p.dial(remoteAddr)
-    expect(libp2p.registrar.connections.size).to.equal(1)
+    expect(libp2p.connections.size).to.equal(1)

    sinon.spy(libp2p.registrar, 'close')

    await libp2p.stop()
    expect(libp2p.registrar.close.callCount).to.equal(1)
-    expect(libp2p.registrar.connections.size).to.equal(0)
+    expect(libp2p.connections.size).to.equal(0)
  })
 })
--- a/test/registrar/registrar.spec.js
+++ b/test/registrar/registrar.spec.js
@@ -11,6 +11,7 @@ const Topology = require('libp2p-interfaces/src/topology/multicodec-topology')
 const PeerStore = require('../../src/peer-store')
 const Registrar = require('../../src/registrar')
 const { createMockConnection } = require('./utils')
+const peerUtils = require('../utils/creators/peer')

 const multicodec = '/test/1.0.0'

@@ -170,5 +171,44 @@ describe('registrar', () => {

      await onDisconnectDefer.promise
    })
+
+    it('should filter connections on disconnect, removing the closed one', async () => {
+      const onDisconnectDefer = pDefer()
+
+      const topologyProps = new Topology({
+        multicodecs: multicodec,
+        handlers: {
+          onConnect: () => {},
+          onDisconnect: () => {
+            onDisconnectDefer.resolve()
+          }
+        }
+      })
+
+      // Register protocol
+      registrar.register(topologyProps)
+
+      // Setup connections before registrar
+      const [localPeer, remotePeer] = await peerUtils.createPeerInfo({ number: 2 })
+
+      const conn1 = await createMockConnection({ localPeer: localPeer.id, remotePeer: remotePeer.id })
+      const conn2 = await createMockConnection({ localPeer: localPeer.id, remotePeer: remotePeer.id })
+      const peerInfo = await PeerInfo.create(remotePeer.id)
+      const id = peerInfo.id.toB58String()
+
+      // Add connection to registrar
+      peerStore.put(peerInfo)
+      registrar.onConnect(peerInfo, conn1)
+      registrar.onConnect(peerInfo, conn2)
+
+      expect(registrar.connections.get(id).length).to.eql(2)
+
+      conn2._stat.status = 'closed'
+      registrar.onDisconnect(peerInfo, conn2)
+
+      const peerConnections = registrar.connections.get(id)
+      expect(peerConnections.length).to.eql(1)
+      expect(peerConnections[0]._stat.status).to.eql('open')
+    })
  })
 })
--- a/test/registrar/utils.js
+++ b/test/registrar/utils.js
@@ -27,7 +27,8 @@ module.exports.createMockConnection = async (properties = {}) => {
      },
      direction: 'outbound',
      encryption: '/secio/1.0.0',
-      multiplexer: '/mplex/6.7.0'
+      multiplexer: '/mplex/6.7.0',
+      status: 'open'
    },
    newStream: (protocols) => {
      const id = streamId++
--- a/test/transports/transport-manager.spec.js
+++ b/test/transports/transport-manager.spec.js
@@ -115,6 +115,35 @@ describe('libp2p.transportManager', () => {
    expect(libp2p.transportManager._transports.size).to.equal(2)
  })

+  it('should be able to customize a transport', () => {
+    const spy = sinon.spy()
+    const key = spy.prototype[Symbol.toStringTag] = 'TransportSpy'
+    const customOptions = {
+      another: 'value'
+    }
+    libp2p = new Libp2p({
+      peerInfo,
+      modules: {
+        transport: [spy]
+      },
+      config: {
+        transport: {
+          [key]: customOptions
+        }
+      }
+    })
+
+    expect(libp2p.transportManager).to.exist()
+    // Our transport and circuit relay
+    expect(libp2p.transportManager._transports.size).to.equal(2)
+    expect(spy).to.have.property('callCount', 1)
+    expect(spy.getCall(0)).to.have.deep.property('args', [{
+      ...customOptions,
+      libp2p,
+      upgrader: libp2p.upgrader
+    }])
+  })
+
  it('starting and stopping libp2p should start and stop TransportManager', async () => {
    libp2p = new Libp2p({
      peerInfo,
--- a/test/upgrading/upgrader.spec.js
+++ b/test/upgrading/upgrader.spec.js
@@ -116,6 +116,35 @@ describe('Upgrader', () => {
    expect(result).to.eql([hello])
  })

+  it('should upgrade with only crypto', async () => {
+    const { inbound, outbound } = mockMultiaddrConnPair({ addrs, remotePeer })
+
+    // No available muxers
+    const muxers = new Map()
+    sinon.stub(localUpgrader, 'muxers').value(muxers)
+    sinon.stub(remoteUpgrader, 'muxers').value(muxers)
+
+    const cryptos = new Map([[Crypto.protocol, Crypto]])
+    sinon.stub(localUpgrader, 'cryptos').value(cryptos)
+    sinon.stub(remoteUpgrader, 'cryptos').value(cryptos)
+
+    const connections = await Promise.all([
+      localUpgrader.upgradeOutbound(outbound),
+      remoteUpgrader.upgradeInbound(inbound)
+    ])
+
+    expect(connections).to.have.length(2)
+
+    await expect(connections[0].newStream('/echo/1.0.0')).to.be.rejected()
+
+    // Verify the MultiaddrConnection close method is called
+    sinon.spy(inbound, 'close')
+    sinon.spy(outbound, 'close')
+    await Promise.all(connections.map(conn => conn.close()))
+    expect(inbound.close.callCount).to.equal(1)
+    expect(outbound.close.callCount).to.equal(1)
+  })
+
  it('should use a private connection protector when provided', async () => {
    const { inbound, outbound } = mockMultiaddrConnPair({ addrs, remotePeer })
Author	SHA1	Message	Date
Jacob Heun	7e1a9d677b	test(fix): fix listening test for ci	2020-01-24 14:31:38 +01:00
Jacob Heun	1ba1ca7714	chore: release version v0.27.0-rc.0	2020-01-24 11:55:59 +01:00
Jacob Heun	691e9b7f7b	chore: update contributors	2020-01-24 11:55:59 +01:00
Vasco Santos	751a22741f	refactor: examples-browser (#508 ) * refactor: examples-browser * chore: add information to use signalling server * chore: apply suggestions from code review Co-Authored-By: Jacob Heun <jacobheun@gmail.com> * chore: update deps * docs: refactor libp2p browser example * docs(examples): add back websockets and boostrap nodes docs(examples): redo the browser readme * fix: handle edge case of connections closing early * chore: fix lint * chore: update example deps and readme * chore: update webrtc-star * chore: apply suggestions from code review Co-Authored-By: Alan Shaw <alan.shaw@protocol.ai> Co-authored-by: Jacob Heun <jacobheun@gmail.com> Co-authored-by: Alan Shaw <alan.shaw@protocol.ai>	2020-01-24 11:43:56 +01:00
Vasco Santos	461faca1ca	docs: getting started (#514 ) * docs: getting started * docs: review getting started (#520) * doc: initial review of getting started Co-Authored-By: Vasco Santos <vasco.santos@moxy.studio> * chore: move multiplexing to basic setup * chore: add read more cta * chore: apply suggestions from code review Co-Authored-By: Jacob Heun <jacobheun@gmail.com> * chore: just configure multiplexer * chore: apply suggestions from code review Co-Authored-By: Jacob Heun <jacobheun@gmail.com> * chore: just use websockets and changed dht module introduction * chore: add reference for events in the API doc * docs: simplify getting started guide and clean up language * chore: apply suggestions from code review Co-Authored-By: Alan Shaw <alan.shaw@protocol.ai> * docs(fix): address review comments Co-authored-by: Jacob Heun <jacobheun@gmail.com> Co-authored-by: Alan Shaw <alan.shaw@protocol.ai>	2020-01-23 17:12:41 +01:00
Jacob Heun	31d1b2369a	fix: use toB58String everywhere to be consistent (#537 ) * chore: update deps * fix: consistently use b58 peerid string The migration to base32 will happen at a later date	2020-01-22 11:47:30 +01:00
Vasco Santos	83409deaa6	fix: registrar should filter the disconnected conn (#532 ) * fix: registrar on disconnect only when no connections * chore: add test	2020-01-14 12:26:24 +01:00
Alan Shaw	c44e6e33ed	fix: stop discoveries (#530 ) * fix: stop discoveries * test: add discovery stop test * chore: fix lint Co-authored-by: Jacob Heun <jacobheun@gmail.com>	2020-01-07 16:27:32 +01:00
Jacob Heun	999d086278	chore: release version v0.27.0-pre.2	2020-01-07 15:31:13 +01:00
Jacob Heun	122a114d96	chore: update contributors	2020-01-07 15:30:59 +01:00
Vasco Santos	21362b5cbe	refactor: examples transports (#503 ) * refactor: examples-transports * chore: apply suggestions from code review Co-Authored-By: Jacob Heun <jacobheun@gmail.com> * chore: address review * chore: address review Co-authored-by: Jacob Heun <jacobheun@gmail.com>	2020-01-07 14:56:05 +01:00
Vasco Santos	0840739a00	refactor: examples/pnet (#523 ) * refactor: examples/pnet * chore: rename pnet-ipfs to pnet * chore: address review	2020-01-07 14:53:27 +01:00
Vasco Santos	f182f5bcd9	refactor: examples/discovery-mechanisms (#498 ) * refactor: examples-discovery-mechanisms * chore: apply suggestions from code review Co-Authored-By: Jacob Heun <jacobheun@gmail.com> * chore: suggestion interval Co-Authored-By: Jacob Heun <jacobheun@gmail.com> * chore: add peer connected event Co-authored-by: Jacob Heun <jacobheun@gmail.com>	2020-01-06 10:01:28 -07:00
Alan Shaw	a1717dac6a	fix: conn mngr min/max connection values (#528 ) Fixes the case when options are passed with `maxConnections` and/or `minConnections` set to `undefined`: ```console { defaultOptions: { maxConnections: Infinity, minConnections: 0, maxData: Infinity, maxSentData: Infinity, maxReceivedData: Infinity, maxEventLoopDelay: Infinity, pollInterval: 2000, movingAverageInterval: 60000, defaultPeerValue: 1 }, options: { minPeers: 25, maxConnections: undefined, minConnections: undefined } } { maxConnections: undefined, minConnections: undefined } 1) "before all" hook in "custom config" (node:67176) UnhandledPromiseRejectionWarning: AssertionError [ERR_ASSERTION]: Connection Manager maxConnections must be greater than minConnections at new ConnectionManager (node_modules/libp2p/src/connection-manager/index.js:43:5) at new Libp2p (node_modules/libp2p/src/index.js:92:30) at Object.module.exports [as libp2p] (src/core/components/libp2p.js:27:10) at Proxy.start (src/core/components/start.js:48:31) at async Daemon.start (src/cli/daemon.js:63:31) at async startHttpAPI (test/http-api/routes.js:29:5) at async Context.<anonymous> (test/http-api/routes.js:48:7) ```	2020-01-06 07:03:07 -07:00
Vasco Santos	dec8dc450f	refactor: examples/protocol-and-stream-muxing (#502 )	2020-01-02 21:51:02 +01:00
Jacob Heun	0d4b2bd23d	feat: allow transport options to be passed on creation (#524 ) * feat: allow transport options to be passed on creation * fix: only add circuit transport if enabled * chore: fix lint	2019-12-20 08:32:46 -08:00
Vasco Santos	fdb48c8df5	refactor: examples/peer-and-content-routing (#500 ) * refactor: examples-peer-and-content-routing * chore: address review * chore: review suggestions Co-Authored-By: Jacob Heun <jacobheun@gmail.com>	2019-12-18 03:37:36 +01:00
Vasco Santos	506af15b6b	refactor: examples/encrypted-communications (#499 ) * refactor: examples/encrypted-communications * chore: address review	2019-12-18 03:35:49 +01:00
Vasco Santos	9f0f08f586	refactor: examples-pubsub (#504 )	2019-12-16 23:28:35 +01:00
Jacob Heun	6ca19c5ef4	feat: add libp2p.connections getter (#522 ) * fix: make hangup accept what the API says it does * feat: add libp2p.connections getter * chore: fix typo	2019-12-16 19:24:35 +01:00
Jacob Heun	24c3ce6f8d	fix: make dialer configurable (#521 ) docs: update configuration and api docs	2019-12-16 16:49:29 +01:00
Vasco Santos	56a1825639	fix: upgrader should not need muxers (#517 ) * fix: upgrader should not need muxers * chore: address review * chore: apply suggestions from code review Co-Authored-By: Jacob Heun <jacobheun@gmail.com>	2019-12-16 12:26:38 +01:00