chore: add links from getting started and readme

docs: discoverability and connectivity
chore: store self protocols in protobook (#760 )
2025-07-08 05:11:33 +00:00 · 2020-11-09 15:17:02 +01:00 · 2020-11-09 15:17:02 +01:00 · 2020-11-09 14:11:48 +01:00 · 2020-11-09 14:11:48 +01:00 · 2020-11-09 14:11:48 +01:00
243 changed files with 2831 additions and 12338 deletions
--- a/.aegir.js
+++ b/.aegir.js
@ -1,13 +1,12 @@
 'use strict'

-const path = require('path')
 const Libp2p = require('./src')
 const { MULTIADDRS_WEBSOCKETS } = require('./test/fixtures/browser')
 const Peers = require('./test/fixtures/peers')
 const PeerId = require('peer-id')
 const WebSockets = require('libp2p-websockets')
 const Muxer = require('libp2p-mplex')
-const { NOISE: Crypto } = require('@chainsafe/libp2p-noise')
+const { NOISE: Crypto } = require('libp2p-noise')
 const pipe = require('it-pipe')
 let libp2p

@ -32,9 +31,6 @@ const before = async () => {
          enabled: true,
          active: false
        }
-      },
-      nat: {
-        enabled: false
      }
    }
  })
@ -48,23 +44,16 @@ const after = async () => {
  await libp2p.stop()
 }

-/** @type {import('aegir').Options["build"]["config"]} */
-const esbuild = {
-  inject: [path.join(__dirname, './scripts/node-globals.js')]
-}
-
-/** @type {import('aegir').PartialOptions} */
 module.exports = {
-  build: {
-    bundlesizeMax: '253kB'
+  bundlesize: { maxSize: '225kB' },
+  hooks: {
+    pre: before,
+    post: after
  },
-  test: {
-    before,
-    after,
-    browser: {
-      config: {
-        buildConfig: esbuild
-      }
+  webpack: {
+    node: {
+      // needed by bcrypto
+      Buffer: true
    }
  }
 }
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
- - name: libp2p Official Forum
-   url: https://discuss.libp2p.io
-   about: For general questions, support requests and discussions
--- a/.github/ISSUE_TEMPLATE/open_an_issue.md
+++ b/.github/ISSUE_TEMPLATE/open_an_issue.md
@ -1,55 +0,0 @@
---
-name: Open an issue
-about: For reporting bugs or errors in the JavaScript libp2p implementation
-title: ''
-labels: need/triage
-assignees: ''
---
-
-<!--
-Thank you for reporting an issue.
-
-This issue tracker is for bugs found within the JavaScript implementation of libp2p.
-
-If you are asking a question about how to use libp2p, please ask on https://discuss.libp2p.io
-
-Otherwise please fill in as much of the template below as possible.
-->
-
- **Version**:
-<!--
-Check package.json version
-->
-
- **Platform**:
-<!--
-Output of `uname -a` (UNIX), or version and 32 or 64-bit (Windows). If using in a Browser, please share the browser version as well
-->
-
- **Subsystem**:
-<!--
-If known, please specify affected core module name (e.g Dialer, Pubsub, Relay etc)
-->
-
-#### Severity:
-<!--
-One of following:
-  Critical - System crash, application panic.
-  High - The main functionality of the application does not work, API breakage, repo format breakage, etc.
-  Medium - A non-essential functionality does not work, performance issues, etc.
-  Low - An optional functionality does not work.
-  Very Low - Translation or documentation mistake. Something that won't give anyone a bad day.
-->
-
-#### Description:
-<!--
- What you did
- What happened
- What you expected to happen
-->
-
-#### Steps to reproduce the error:
-<!--
-If possible, please provide code that demonstrates the problem, keeping it as simple and free of external dependencies as you are able
-->
-
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -1,8 +0,0 @@
-version: 2
-updates:
- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "11:00"
-  open-pull-requests-limit: 10
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@ -1,141 +0,0 @@
-name: examples
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - '**'
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
-      with:
-        node-version: 16
-    - run: npm install
-    - run: npx aegir lint
-    - run: npx aegir ts -p check
-    - run: npx aegir build
-  test-auto-relay-example:
-    needs: check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 16
-      - run: npm install
-      - run: cd examples && npm i && npm run test -- auto-relay
-  test-chat-example:
-    needs: check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 16
-      - run: npm install
-      - run: cd examples && npm i && npm run test -- chat
-  test-connection-encryption-example:
-    needs: check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 16
-      - run: npm install
-      - run: cd examples && npm i && npm run test -- connection-encryption
-  test-discovery-mechanisms-example:
-    needs: check
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 16
-      - run: npm install
-      - run: cd examples && npm i && npm run test -- discovery-mechanisms
-  test-echo-example:
-    needs: check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 16
-      - run: npm install
-      - run: cd examples && npm i && npm run test -- echo
-  test-libp2p-in-the-browser-example:
-    needs: check
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 16
-      - run: npm install
-      - run: cd examples && npm i && npm run test -- libp2p-in-the-browser
-  test-peer-and-content-routing-example:
-    needs: check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-            node-version: 16
-      - run: npm install
-      - run: cd examples && npm i && npm run test -- peer-and-content-routing
-  test-pnet-example:
-    needs: check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-            node-version: 16
-      - run: npm install
-      - run: cd examples && npm i && npm run test -- pnet
-  test-protocol-and-stream-muxing-example:
-    needs: check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-            node-version: 16
-      - run: npm install
-      - run: cd examples && npm i && npm run test -- protocol-and-stream-muxing
-  test-pubsub-example:
-    needs: check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-            node-version: 16
-      - run: npm install
-      - run: cd examples && npm i && npm run test -- pubsub
-  test-transports-example:
-    needs: check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-            node-version: 16
-      - run: npm install
-      - run: cd examples && npm i && npm run test -- transports
-  test-webrtc-direct-example:
-    needs: check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-            node-version: 16
-      - run: npm install -g @mapbox/node-pre-gyp && npm install
-      - run: cd examples && npm i && npm run test -- webrtc-direct
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -1,81 +0,0 @@
-name: ci
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - '**'
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
-      with:
-        node-version: 16
-    - run: npm install
-    - run: npx aegir lint
-    - run: npx aegir build
-    - run: npx aegir dep-check
-    - uses: ipfs/aegir/actions/bundle-size@v32.1.0
-      name: size
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-  test-node:
-    needs: check
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [windows-latest, ubuntu-latest, macos-latest]
-        node: [16]
-      fail-fast: true
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: ${{ matrix.node }}
-      - run: npm install
-      - run: npx aegir test -t node --cov --bail
-      - uses: codecov/codecov-action@v1
-  test-chrome:
-    needs: check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: lts/*
-      - run: npm install
-      - run: npx aegir test -t browser -t webworker --bail
-  test-firefox:
-    needs: check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: lts/*
-      - run: npm install
-      - run: npx aegir test -t browser -t webworker --bail -- --browser firefox
-  test-ts:
-    needs: check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: lts/*
-      - run: npm install
-      - run: npm run test:ts
-  test-interop:
-    needs: check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: lts/*
-      - run: npm install
-      - run: npm run test:interop -- --bail -- --exit
--- a/.gitignore
+++ b/.gitignore
@ -4,7 +4,6 @@ docs
 test/repo-tests*
 **/bundle.js
 .cache
-.parcel-cache

 # Logs
 logs
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,50 @@
+language: node_js
+cache: npm
+stages:
+  - check
+  - test
+  - cov
+
+node_js:
+  - 'lts/*'
+  - '14'
+
+os:
+  - linux
+  - osx
+
+script: npx nyc -s npm run test:node -- --bail
+after_success: npx nyc report --reporter=text-lcov > coverage.lcov && npx codecov
+
+jobs:
+  include:
+    - stage: check
+      script:
+        - npx aegir build --bundlesize
+        # Remove pull libs once ping is async
+        - npx aegir dep-check -- -i pull-handshake -i pull-stream
+        - npm run lint
+
+    - stage: test
+      name: chrome
+      addons:
+        chrome: stable
+      script:
+        - npx aegir test -t browser -t webworker
+
+    - stage: test
+      name: firefox
+      addons:
+        firefox: latest
+      script:
+        - npx aegir test -t browser -t webworker -- --browsers FirefoxHeadless
+
+    - stage: test
+      name: interop
+      script:
+        - cd node_modules/interop-libp2p
+        - npm install
+        - LIBP2P_JS=${TRAVIS_BUILD_DIR}/src/index.js npx aegir test -t node --bail
+
+notifications:
+  email: false
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,464 +1,3 @@
-## [0.35.1](https://github.com/libp2p/js-libp2p/compare/v0.35.0...v0.35.1) (2021-12-03)
-
-
-### Bug Fixes
-
-* do not let closest peers run forever ([#1047](https://github.com/libp2p/js-libp2p/issues/1047)) ([91c2ec9](https://github.com/libp2p/js-libp2p/commit/91c2ec9856a3e972b7b2c9c4d9a4eda1d431c7ef))
-
-
-
-# [0.35.0](https://github.com/libp2p/js-libp2p/compare/v0.34.0...v0.35.0) (2021-12-02)
-
-
-### Bug Fixes
-
-* stop dht before connection manager ([#1041](https://github.com/libp2p/js-libp2p/issues/1041)) ([3a9d5f6](https://github.com/libp2p/js-libp2p/commit/3a9d5f64d96719ebb4d3b083c4f5832db4fa0816)), closes [#1039](https://github.com/libp2p/js-libp2p/issues/1039)
-
-
-### chore
-
-* update peer id and libp2p crypto ([#1042](https://github.com/libp2p/js-libp2p/issues/1042)) ([9cbf36f](https://github.com/libp2p/js-libp2p/commit/9cbf36fcb54099e6fed35ceccc4a2376f0926c1f))
-
-
-### BREAKING CHANGES
-
-* requires node 15+
-
-
-
-# [0.34.0](https://github.com/libp2p/js-libp2p/compare/v0.33.0...v0.34.0) (2021-11-25)
-
-
-### Bug Fixes
-
-* private ip ts compile has no call signatures ([#1020](https://github.com/libp2p/js-libp2p/issues/1020)) ([77d7cb8](https://github.com/libp2p/js-libp2p/commit/77d7cb8f0815f2cdd3bfdfa8b641a7a186fe9520))
-
-
-### Features
-
-* update dht ([#1009](https://github.com/libp2p/js-libp2p/issues/1009)) ([2f598eb](https://github.com/libp2p/js-libp2p/commit/2f598eba09cff4301474af08196158065e3602d8))
-
-
-### BREAKING CHANGES
-
-* libp2p-kad-dht has a new event-based API which is exposed as `_dht`
-
-
-
-# [0.33.0](https://github.com/libp2p/js-libp2p/compare/v0.32.5...v0.33.0) (2021-09-24)
-
-
-### chore
-
-* update datastore ([#990](https://github.com/libp2p/js-libp2p/issues/990)) ([83734ef](https://github.com/libp2p/js-libp2p/commit/83734ef52061ad61ddb5ca49aae27e3a8b937058))
-
-
-### BREAKING CHANGES
-
-* datastore implementations provided to libp2p must be compliant with interface-datastore@6.0.0
-
-
-
-## [0.32.5](https://github.com/libp2p/js-libp2p/compare/v0.32.4...v0.32.5) (2021-09-21)
-
-
-### Bug Fixes
-
-* move abortable-iterator to dependencies ([#992](https://github.com/libp2p/js-libp2p/issues/992)) ([122c89d](https://github.com/libp2p/js-libp2p/commit/122c89dd0df55a59edaae078e3dc7c31b5603715)), closes [#986](https://github.com/libp2p/js-libp2p/issues/986)
-
-
-
-## [0.32.4](https://github.com/libp2p/js-libp2p/compare/v0.32.3...v0.32.4) (2021-08-20)
-
-
-
-## [0.32.3](https://github.com/libp2p/js-libp2p/compare/v0.32.2...v0.32.3) (2021-08-16)
-
-
-### Bug Fixes
-
-* uint8arrays is a dep ([#964](https://github.com/libp2p/js-libp2p/issues/964)) ([ba2b4d4](https://github.com/libp2p/js-libp2p/commit/ba2b4d4b28f1d9940b457de344aed44537f9eabd))
-
-
-
-## [0.32.2](https://github.com/libp2p/js-libp2p/compare/v0.32.1...v0.32.2) (2021-08-13)
-
-
-### Bug Fixes
-
-* browser example ci ([3b33fb4](https://github.com/libp2p/js-libp2p/commit/3b33fb4b73ba8065e432fb59f758fe138fd23d9e))
-
-
-### Features
-
-* custom protocol name ([#962](https://github.com/libp2p/js-libp2p/issues/962)) ([ef24fab](https://github.com/libp2p/js-libp2p/commit/ef24fabf0269fd079888e92eedb458e23ef1c733))
-
-
-
-## [0.32.1](https://github.com/libp2p/js-libp2p/compare/v0.32.0...v0.32.1) (2021-07-22)
-
-
-### Bug Fixes
-
-* turn compliance tests into devDependency ([#960](https://github.com/libp2p/js-libp2p/issues/960)) ([0701de4](https://github.com/libp2p/js-libp2p/commit/0701de40b1ebdf319959846d8c4fdd30b3cf34a4))
-
-
-
-# [0.32.0](https://github.com/libp2p/js-libp2p/compare/v0.32.0-rc.0...v0.32.0) (2021-07-15)
-
-
-
-# [0.32.0-rc.0](https://github.com/libp2p/js-libp2p/compare/v0.31.7...v0.32.0-rc.0) (2021-07-09)
-
-
-### Bug Fixes
-
-* do not allow dial to large number of multiaddrs ([#954](https://github.com/libp2p/js-libp2p/issues/954)) ([af723b3](https://github.com/libp2p/js-libp2p/commit/af723b355e1ddf4aecf439f81c3aa67613d45fa4))
-
-
-### chore
-
-* update to new multiformats ([#948](https://github.com/libp2p/js-libp2p/issues/948)) ([13cf476](https://github.com/libp2p/js-libp2p/commit/13cf4761489d59b22924bb8ec2ec6dbe207b280c))
-
-
-### BREAKING CHANGES
-
-* uses the CID class from the new multiformats module
-
-Co-authored-by: Vasco Santos <vasco.santos@moxy.studio>
-
-
-
-## [0.31.7](https://github.com/libp2p/js-libp2p/compare/v0.31.6...v0.31.7) (2021-06-14)
-
-
-### Bug Fixes
-
-* chat example with new multiaddr ([#946](https://github.com/libp2p/js-libp2p/issues/946)) ([d8ba284](https://github.com/libp2p/js-libp2p/commit/d8ba2848833d9fb8a963d1b7c8d27062c6f829da))
-* dialer leaking resources after stopping ([#947](https://github.com/libp2p/js-libp2p/issues/947)) ([b291bc0](https://github.com/libp2p/js-libp2p/commit/b291bc06ec13feeb6e010730edfad754a3b2dc1b))
-
-
-
-## [0.31.6](https://github.com/libp2p/js-libp2p/compare/v0.31.5...v0.31.6) (2021-05-27)
-
-
-### Features
-
-* keychain rotate passphrase ([#944](https://github.com/libp2p/js-libp2p/issues/944)) ([478963a](https://github.com/libp2p/js-libp2p/commit/478963ad2d195444494c0acc54cb3847a29e117c))
-
-
-
-## [0.31.5](https://github.com/libp2p/js-libp2p/compare/v0.31.4...v0.31.5) (2021-05-12)
-
-
-### Bug Fixes
-
-* store remote agent and protocol version during identify ([#943](https://github.com/libp2p/js-libp2p/issues/943)) ([818d2b2](https://github.com/libp2p/js-libp2p/commit/818d2b2a98736f4242694479089396f6070cdad5))
-
-
-
-## [0.31.4](https://github.com/libp2p/js-libp2p/compare/v0.31.3...v0.31.4) (2021-05-12)
-
-
-### Bug Fixes
-
-* peerRouting.findPeer() trying to find self ([#941](https://github.com/libp2p/js-libp2p/issues/941)) ([a79c6b5](https://github.com/libp2p/js-libp2p/commit/a79c6b50d7fddbcdb1af53efae922cecad4c9a83))
-
-
-
-## [0.31.3](https://github.com/libp2p/js-libp2p/compare/v0.31.2...v0.31.3) (2021-05-04)
-
-
-
-## [0.31.2](https://github.com/libp2p/js-libp2p/compare/v0.31.1...v0.31.2) (2021-04-30)
-
-
-### Bug Fixes
-
-* moving averages record types ([#935](https://github.com/libp2p/js-libp2p/issues/935)) ([b5a9eb2](https://github.com/libp2p/js-libp2p/commit/b5a9eb208763efa027d0b4caae87c515b6f5869b))
-
-
-
-## [0.31.1](https://github.com/libp2p/js-libp2p/compare/v0.31.0...v0.31.1) (2021-04-30)
-
-
-### Bug Fixes
-
-* event emitter and interfaces types for discovery and routing ([#934](https://github.com/libp2p/js-libp2p/issues/934)) ([302bb90](https://github.com/libp2p/js-libp2p/commit/302bb9005891aa06b70a5f354bfac6b2d5a3c3b8))
-
-
-
-# [0.31.0](https://github.com/libp2p/js-libp2p/compare/v0.31.0-rc.7...v0.31.0) (2021-04-28)
-
-
-
-# [0.31.0-rc.7](https://github.com/libp2p/js-libp2p/compare/v0.31.0-rc.6...v0.31.0-rc.7) (2021-04-27)
-
-
-### Bug Fixes
-
-* address book guarantees no replicated entries are added ([#927](https://github.com/libp2p/js-libp2p/issues/927)) ([ac370fc](https://github.com/libp2p/js-libp2p/commit/ac370fc9679b51da8cee3791b6dd268d0695d136))
-
-
-
-# [0.31.0-rc.6](https://github.com/libp2p/js-libp2p/compare/v0.31.0-rc.5...v0.31.0-rc.6) (2021-04-22)
-
-
-### Bug Fixes
-
-* keychain optional pw and use interfaces for validators and selectors instead ([#924](https://github.com/libp2p/js-libp2p/issues/924)) ([88b0415](https://github.com/libp2p/js-libp2p/commit/88b04156bf614650c2b14d49b12e969c5eecf04d))
-
-
-
-# [0.31.0-rc.5](https://github.com/libp2p/js-libp2p/compare/v0.31.0-rc.4...v0.31.0-rc.5) (2021-04-21)
-
-
-### Bug Fixes
-
-* address book should not emit peer event if no addresses are known ([b4fb9b7](https://github.com/libp2p/js-libp2p/commit/b4fb9b7bf266ba03c4462c0a41b1c2691e4e88d4))
-* demand pubsub subclass instead of pubsub instance ([#922](https://github.com/libp2p/js-libp2p/issues/922)) ([086b0ec](https://github.com/libp2p/js-libp2p/commit/086b0ec0df2fac93845d0a0a6b2e2464e869afcd))
-* dht configuration selectors and validators ([#919](https://github.com/libp2p/js-libp2p/issues/919)) ([cc1f4af](https://github.com/libp2p/js-libp2p/commit/cc1f4af879a58e94538591851d0085ff98cd2641))
-
-
-
-# [0.31.0-rc.4](https://github.com/libp2p/js-libp2p/compare/v0.31.0-rc.3...v0.31.0-rc.4) (2021-04-20)
-
-
-### Bug Fixes
-
-* add clientMode dht arg and upgrade interface-datastore ([#918](https://github.com/libp2p/js-libp2p/issues/918)) ([975e779](https://github.com/libp2p/js-libp2p/commit/975e77991e67dd9bff790b83df7bd6fa5ddcfc67))
-* do not add abort signals to useless addresses ([#913](https://github.com/libp2p/js-libp2p/issues/913)) ([06e8f3d](https://github.com/libp2p/js-libp2p/commit/06e8f3dd42432e4b37ab7904b02abde7d1cadda3))
-* specify pbjs root ([#917](https://github.com/libp2p/js-libp2p/issues/917)) ([b043bca](https://github.com/libp2p/js-libp2p/commit/b043bca607565cf534771e6cf975288a8ff3030b))
-
-
-
-# [0.31.0-rc.3](https://github.com/libp2p/js-libp2p/compare/v0.31.0-rc.2...v0.31.0-rc.3) (2021-04-19)
-
-
-### Bug Fixes
-
-* remove inline arg types from function definitions ([#916](https://github.com/libp2p/js-libp2p/issues/916)) ([2af692f](https://github.com/libp2p/js-libp2p/commit/2af692fb4de572168524ae684608fc6526de4ef7))
-
-
-
-# [0.31.0-rc.2](https://github.com/libp2p/js-libp2p/compare/v0.31.0-rc.1...v0.31.0-rc.2) (2021-04-16)
-
-
-### Bug Fixes
-
-* metrics stats and moving averages types ([#915](https://github.com/libp2p/js-libp2p/issues/915)) ([3d0a79e](https://github.com/libp2p/js-libp2p/commit/3d0a79eff3bc34a5bdc8ffa31e9b09345a02ad9d))
-
-
-
-# [0.31.0-rc.1](https://github.com/libp2p/js-libp2p/compare/v0.31.0-rc.0...v0.31.0-rc.1) (2021-04-16)
-
-
-### Bug Fixes
-
-* dial protocol should throw if no protocol is provided ([#914](https://github.com/libp2p/js-libp2p/issues/914)) ([21c9aee](https://github.com/libp2p/js-libp2p/commit/21c9aeecb13440238aa6b0fb5a6731d2f87d4938))
-
-
-### BREAKING CHANGES
-
-* dialProtocol does not return connection when no protocols are provided
-
-
-
-# [0.31.0-rc.0](https://github.com/libp2p/js-libp2p/compare/v0.30.12...v0.31.0-rc.0) (2021-04-15)
-
-
-
-## [0.30.12](https://github.com/libp2p/js-libp2p/compare/v0.30.11...v0.30.12) (2021-03-27)
-
-
-### Bug Fixes
-
-* the API of es6-promisify is not the same as promisify-es6 ([#905](https://github.com/libp2p/js-libp2p/issues/905)) ([a7128f0](https://github.com/libp2p/js-libp2p/commit/a7128f07ec8d4b729145ecfc6ad1d585ffddea46))
-
-
-
-## [0.30.11](https://github.com/libp2p/js-libp2p/compare/v0.30.10...v0.30.11) (2021-03-23)
-
-
-### Bug Fixes
-
-* connection direction should be only inbound or outbound ([9504f19](https://github.com/libp2p/js-libp2p/commit/9504f1951a3cca55bb7b4e25e4934e4024034ee8))
-* interface-datastore update ([f5c1cd1](https://github.com/libp2p/js-libp2p/commit/f5c1cd1fb07bc73cf9d9da3c2eb4327bed4279a4))
-
-
-
-## [0.30.10](https://github.com/libp2p/js-libp2p/compare/v0.30.9...v0.30.10) (2021-03-09)
-
-
-### Bug Fixes
-
-* conn mgr access to moving averages record object ([#897](https://github.com/libp2p/js-libp2p/issues/897)) ([5f702f3](https://github.com/libp2p/js-libp2p/commit/5f702f3481afd4ad4fbc89f0e9b75a6d56b03520))
-
-
-
-## [0.30.9](https://github.com/libp2p/js-libp2p/compare/v0.30.8...v0.30.9) (2021-02-25)
-
-
-### Bug Fixes
-
-* transport manager fault tolerance should include tolerance to transport listen fail ([#893](https://github.com/libp2p/js-libp2p/issues/893)) ([3f314d5](https://github.com/libp2p/js-libp2p/commit/3f314d5e90f74583b721386d0c9c5d8363cd4de7))
-
-
-
-## [0.30.8](https://github.com/libp2p/js-libp2p/compare/v0.30.7...v0.30.8) (2021-02-11)
-
-
-### Bug Fixes
-
-* routers should only use dht if enabled ([#885](https://github.com/libp2p/js-libp2p/issues/885)) ([a34d2bb](https://github.com/libp2p/js-libp2p/commit/a34d2bbcc3d69ec3006137a909a7e8c53b9d378e))
-
-
-
-## [0.30.7](https://github.com/libp2p/js-libp2p/compare/v0.30.6...v0.30.7) (2021-02-01)
-
-
-### Bug Fixes
-
-* do not add observed address received from peers ([#882](https://github.com/libp2p/js-libp2p/issues/882)) ([a36b211](https://github.com/libp2p/js-libp2p/commit/a36b2112aafcee309a02de0cff5440cf69cd53a7))
-
-
-
-## [0.30.6](https://github.com/libp2p/js-libp2p/compare/v0.30.5...v0.30.6) (2021-01-29)
-
-
-### Bug Fixes
-
-* peer discovery type in config ([#878](https://github.com/libp2p/js-libp2p/issues/878)) ([3e7594f](https://github.com/libp2p/js-libp2p/commit/3e7594f69733bf374b374a6065458fa6cae81c5f))
-* unref nat manager retries ([#877](https://github.com/libp2p/js-libp2p/issues/877)) ([ce2a624](https://github.com/libp2p/js-libp2p/commit/ce2a624a09b3107c0b2b4752e666804ecea54fb5))
-
-
-
-## [0.30.5](https://github.com/libp2p/js-libp2p/compare/v0.30.4...v0.30.5) (2021-01-28)
-
-
-### Bug Fixes
-
-* create has optional peer id type ([#875](https://github.com/libp2p/js-libp2p/issues/875)) ([eeda056](https://github.com/libp2p/js-libp2p/commit/eeda05688330c17b810bf47544ef977386623317))
-
-
-
-## [0.30.4](https://github.com/libp2p/js-libp2p/compare/v0.30.3...v0.30.4) (2021-01-27)
-
-
-### Features
-
-* add UPnP NAT manager ([#810](https://github.com/libp2p/js-libp2p/issues/810)) ([0a6bc0d](https://github.com/libp2p/js-libp2p/commit/0a6bc0d1013dfd80ab600e8f74c1544b433ece29))
-
-
-
-## [0.30.3](https://github.com/libp2p/js-libp2p/compare/v0.30.2...v0.30.3) (2021-01-27)
-
-
-
-## [0.30.2](https://github.com/libp2p/js-libp2p/compare/v0.30.1...v0.30.2) (2021-01-21)
-
-
-### Bug Fixes
-
-* store multiaddrs during content and peer routing queries ([#865](https://github.com/libp2p/js-libp2p/issues/865)) ([45c3367](https://github.com/libp2p/js-libp2p/commit/45c33675a7412c66d0fd4e113ef8506077b6f492))
-
-
-
-## [0.30.1](https://github.com/libp2p/js-libp2p/compare/v0.30.0...v0.30.1) (2021-01-18)
-
-
-### Bug Fixes
-
-* event emitter types with local types ([#864](https://github.com/libp2p/js-libp2p/issues/864)) ([6c41e30](https://github.com/libp2p/js-libp2p/commit/6c41e3045608bcae8061d20501be5751dad8157a))
-
-
-
-# [0.30.0](https://github.com/libp2p/js-libp2p/compare/v0.29.4...v0.30.0) (2020-12-16)
-
-
-### Bug Fixes
-
-* remove test/dialing/utils extra file ([689c35e](https://github.com/libp2p/js-libp2p/commit/689c35ed1c68e514293a9895d496e2e8440454e9))
-* types from ipfs integration ([#832](https://github.com/libp2p/js-libp2p/issues/832)) ([9ae1b75](https://github.com/libp2p/js-libp2p/commit/9ae1b758e99e3fc9067e26b4eae4c15ccb1ba303))
-
-
-### chore
-
-* update pubsub ([#801](https://github.com/libp2p/js-libp2p/issues/801)) ([e50c6ab](https://github.com/libp2p/js-libp2p/commit/e50c6abcf2ebc80ebf2dfadd015ab21a20cffadc))
-
-
-### Features
-
-* auto relay ([#723](https://github.com/libp2p/js-libp2p/issues/723)) ([caf66ea](https://github.com/libp2p/js-libp2p/commit/caf66ea1439f6b75a0c321a16bd5c5d7d6a2bd47))
-* auto relay network query for new relays ([0bf0b7c](https://github.com/libp2p/js-libp2p/commit/0bf0b7cf8968d55002ac4c559ffb59985feeb092))
-* custom announce filter ([ef9d3ca](https://github.com/libp2p/js-libp2p/commit/ef9d3ca2c6f35d692d6079e74088c5146d46eebe))
-* custom dialer addr sorter ([#792](https://github.com/libp2p/js-libp2p/issues/792)) ([585ad52](https://github.com/libp2p/js-libp2p/commit/585ad52b4c71dd7514e99a287e0318b2b837ec48))
-* discover and connect to closest peers ([#798](https://github.com/libp2p/js-libp2p/issues/798)) ([baedf3f](https://github.com/libp2p/js-libp2p/commit/baedf3fe5ab946e938db1415d1662452cdfc0cc1))
-
-
-### BREAKING CHANGES
-
-* pubsub signing policy properties were changed according to libp2p-interfaces changes to a single property. The emitSelf option default value was also modified to match the routers value
-
-
-
-# [0.30.0-rc.2](https://github.com/libp2p/js-libp2p/compare/v0.30.0-rc.1...v0.30.0-rc.2) (2020-12-15)
-
-
-
-# [0.30.0-rc.1](https://github.com/libp2p/js-libp2p/compare/v0.30.0-rc.0...v0.30.0-rc.1) (2020-12-11)
-
-
-### Bug Fixes
-
-* types from ipfs integration ([#832](https://github.com/libp2p/js-libp2p/issues/832)) ([216eb97](https://github.com/libp2p/js-libp2p/commit/216eb9730ef473f73a974c3dbaf306ecdc815c8b))
-
-
-
-# [0.30.0-rc.0](https://github.com/libp2p/js-libp2p/compare/v0.29.4...v0.30.0-rc.0) (2020-12-10)
-
-
-### Bug Fixes
-
-* remove test/dialing/utils extra file ([3f1dc20](https://github.com/libp2p/js-libp2p/commit/3f1dc20caf1c80078f403deb9174cd06d08567ab))
-
-
-### chore
-
-* update pubsub ([#801](https://github.com/libp2p/js-libp2p/issues/801)) ([9205fce](https://github.com/libp2p/js-libp2p/commit/9205fce34d0cd8dd5d32988be34c110fc0a5b6e2))
-
-
-### Features
-
-* auto relay ([#723](https://github.com/libp2p/js-libp2p/issues/723)) ([65ec267](https://github.com/libp2p/js-libp2p/commit/65ec267e7f4826caacd042213c3fbacce589ab5b))
-* auto relay network query for new relays ([9faf1bf](https://github.com/libp2p/js-libp2p/commit/9faf1bfcf61581acc715b9be78b71dc14501835a))
-* custom announce filter ([48476d5](https://github.com/libp2p/js-libp2p/commit/48476d504a98b7b51b3e2dc64eab93670fde0c7b))
-* custom dialer addr sorter ([#792](https://github.com/libp2p/js-libp2p/issues/792)) ([91b15b6](https://github.com/libp2p/js-libp2p/commit/91b15b6790952b4db11264961d9c6f2a96d1fe43))
-* discover and connect to closest peers ([#798](https://github.com/libp2p/js-libp2p/issues/798)) ([b73106e](https://github.com/libp2p/js-libp2p/commit/b73106eba2d559621f427f7aa788e9b0ef47d135))
-
-
-### BREAKING CHANGES
-
-* pubsub signing policy properties were changed according to libp2p-interfaces changes to a single property. The emitSelf option default value was also modified to match the routers value
-
-
-
-<a name="0.29.4"></a>
-## [0.29.4](https://github.com/libp2p/js-libp2p/compare/v0.29.3...v0.29.4) (2020-12-09)
-
-
-### Bug Fixes
-
-* dial self ([#826](https://github.com/libp2p/js-libp2p/issues/826)) ([6350a18](https://github.com/libp2p/js-libp2p/commit/6350a18))
-
-
-### Features
-
-* custom and store self agent version + store self protocol version ([#800](https://github.com/libp2p/js-libp2p/issues/800)) ([d0a9fad](https://github.com/libp2p/js-libp2p/commit/d0a9fad))
-* support custom listener options ([#822](https://github.com/libp2p/js-libp2p/issues/822)) ([8691465](https://github.com/libp2p/js-libp2p/commit/8691465))
-
-
-
 <a name="0.29.3"></a>
 ## [0.29.3](https://github.com/libp2p/js-libp2p/compare/v0.29.2...v0.29.3) (2020-11-04)

--- a/README.md
+++ b/README.md
@ -16,8 +16,8 @@
 </p>

 <p align="center">
-  <a href="https://github.com/libp2p/js-libp2p/actions?query=branch%3Amaster+workflow%3Aci+"><img src="https://img.shields.io/github/workflow/status/libp2p/js-libp2p/ci?label=ci&style=flat-square" /></a>
-  <a href="https://codecov.io/gh/libp2p/js-libp2p"><img src="https://img.shields.io/codecov/c/github/libp2p/js-libp2p/master.svg?style=flat-square"></a>
+  <a href="https://travis-ci.com/libp2p/js-libp2p"><img src="https://flat.badgen.net/travis/libp2p/js-libp2p" /></a>
+  <a href="https://codecov.io/gh/libp2p/js-libp2p"><img src="https://img.shields.io/codecov/c/github/ipfs/js-ipfs-multipart/master.svg?style=flat-square"></a>
  <a href="https://bundlephobia.com/result?p=ipfsd-ctl"><img src="https://flat.badgen.net/bundlephobia/minzip/ipfsd-ctl"></a>
  <br>
  <a href="https://david-dm.org/libp2p/js-libp2p"><img src="https://david-dm.org/libp2p/js-libp2p.svg?style=flat-square" /></a>
@ -35,7 +35,7 @@ We've come a long way, but this project is still in Alpha, lots of development i
 The documentation in the master branch may contain changes from a pre-release.
 If you are looking for the documentation of the latest release, you can view the latest release on [**npm**](https://www.npmjs.com/package/libp2p), or select the tag in github that matches the version you are looking for.

-**Want to get started?** Check our [GETTING_STARTED.md](./doc/GETTING_STARTED.md) guide and [examples folder](/examples).
+**Want to get started?** Check our [GETTING_STARTED.md](./doc/GETTING_STARTED.md) guide, [Discoverability and Connectivity Readme](./DISCOVERABILITY_AND_CONNECTIVITY.md) and [examples folder](/examples).

 **Want to update libp2p in your project?** Check our [migrations folder](./doc/migrations).

@ -147,6 +147,7 @@ List of packages currently in existence for libp2p
 | [`libp2p-websockets`](//github.com/libp2p/js-libp2p-websockets) | [![npm](https://img.shields.io/npm/v/libp2p-websockets.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-websockets/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-websockets.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websockets) | [![Travis CI](https://flat.badgen.net/travis/libp2p/js-libp2p-websockets/master)](https://travis-ci.com/libp2p/js-libp2p-websockets) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-websockets/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p-websockets) | [Jacob Heun](mailto:jacobheun@gmail.com) |
 | **secure channels** |
 | [`libp2p-noise`](//github.com/NodeFactoryIo/js-libp2p-noise) | [![npm](https://img.shields.io/npm/v/libp2p-noise.svg?maxAge=86400&style=flat-square)](//github.com/NodeFactoryIo/js-libp2p-noise/releases) | [![Deps](https://david-dm.org/NodeFactoryIo/js-libp2p-noise.svg?style=flat-square)](https://david-dm.org/NodeFactoryIo/js-libp2p-noise) | [![Travis CI](https://flat.badgen.net/travis/NodeFactoryIo/js-libp2p-noise/master)](https://travis-ci.com/NodeFactoryIo/js-libp2p-noise) | [![codecov](https://codecov.io/gh/NodeFactoryIo/js-libp2p-noise/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/NodeFactoryIo/js-libp2p-noise) | N/A |
+| [`libp2p-secio`](//github.com/libp2p/js-libp2p-secio) | [![npm](https://img.shields.io/npm/v/libp2p-secio.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-secio/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-secio.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-secio) | [![Travis CI](https://flat.badgen.net/travis/libp2p/js-libp2p-secio/master)](https://travis-ci.com/libp2p/js-libp2p-secio) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-secio/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p-secio) | [Friedel Ziegelmayer](mailto:dignifiedquire@gmail.com) |
 | **stream multiplexers** |
 | [`libp2p-mplex`](//github.com/libp2p/js-libp2p-mplex) | [![npm](https://img.shields.io/npm/v/libp2p-mplex.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-mplex/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-mplex.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-mplex) | [![Travis CI](https://flat.badgen.net/travis/libp2p/js-libp2p-mplex/master)](https://travis-ci.com/libp2p/js-libp2p-mplex) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-mplex/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p-mplex) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
 | **peer discovery** |
@ -163,9 +164,9 @@ List of packages currently in existence for libp2p
 | [`libp2p-kad-dht`](//github.com/libp2p/js-libp2p-kad-dht) | [![npm](https://img.shields.io/npm/v/libp2p-kad-dht.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-kad-dht/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-kad-dht.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-kad-dht) | [![Travis CI](https://flat.badgen.net/travis/libp2p/js-libp2p-kad-dht/master)](https://travis-ci.com/libp2p/js-libp2p-kad-dht) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-kad-dht/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p-kad-dht) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
 | **utilities** |
 | [`libp2p-crypto`](//github.com/libp2p/js-libp2p-crypto) | [![npm](https://img.shields.io/npm/v/libp2p-crypto.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-crypto/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-crypto.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-crypto) | [![Travis CI](https://flat.badgen.net/travis/libp2p/js-libp2p-crypto/master)](https://travis-ci.com/libp2p/js-libp2p-crypto) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-crypto/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p-crypto) | [Jacob Heun](mailto:jacobheun@gmail.com) |
+| [`libp2p-crypto-secp256k1`](//github.com/libp2p/js-libp2p-crypto-secp256k1) | [![npm](https://img.shields.io/npm/v/libp2p-crypto-secp256k1.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-crypto-secp256k1/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-crypto-secp256k1.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-crypto-secp256k1) | [![Travis CI](https://flat.badgen.net/travis/libp2p/js-libp2p-crypto-secp256k1/master)](https://travis-ci.com/libp2p/js-libp2p-crypto-secp256k1) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-crypto-secp256k1/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p-crypto-secp256k1) | [Friedel Ziegelmayer](mailto:dignifiedquire@gmail.com) |
 | **data types** |
 | [`peer-id`](//github.com/libp2p/js-peer-id) | [![npm](https://img.shields.io/npm/v/peer-id.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-peer-id/releases) | [![Deps](https://david-dm.org/libp2p/js-peer-id.svg?style=flat-square)](https://david-dm.org/libp2p/js-peer-id) | [![Travis CI](https://flat.badgen.net/travis/libp2p/js-peer-id/master)](https://travis-ci.com/libp2p/js-peer-id) | [![codecov](https://codecov.io/gh/libp2p/js-peer-id/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-peer-id) | [Vasco Santos](mailto:santos.vasco10@gmail.com) |
-| [`libp2p-record`](//github.com/libp2p/js-libp2p-record) | [![npm](https://img.shields.io/npm/v/libp2p-record.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-record/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-record.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-record) | [![Travis CI](https://flat.badgen.net/travis/libp2p/js-libp2p-record/master)](https://travis-ci.com/libp2p/js-libp2p-record) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-record/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p-record) | [Jacob Heun](mailto:santos.vasco10@gmail.com) |
 | **pubsub** |
 | [`libp2p-floodsub`](//github.com/libp2p/js-libp2p-floodsub) | [![npm](https://img.shields.io/npm/v/libp2p-floodsub.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-floodsub/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-floodsub.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-floodsub) | [![Travis CI](https://flat.badgen.net/travis/libp2p/js-libp2p-floodsub/master)](https://travis-ci.com/libp2p/js-libp2p-floodsub) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-floodsub/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p-floodsub) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
 | [`libp2p-gossipsub`](//github.com/ChainSafe/js-libp2p-gossipsub) | [![npm](https://img.shields.io/npm/v/libp2p-gossipsub.svg?maxAge=86400&style=flat-square)](//github.com/ChainSafe/js-libp2p-gossipsub/releases) | [![Deps](https://david-dm.org/ChainSafe/js-libp2p-gossipsub.svg?style=flat-square)](https://david-dm.org/ChainSafe/js-libp2p-gossipsub) | [![Travis CI](https://flat.badgen.net/travis/ChainSafe/js-libp2p-gossipsub/master)](https://travis-ci.com/ChainSafe/js-libp2p-gossipsub) | [![codecov](https://codecov.io/gh/ChainSafe/js-libp2p-gossipsub/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/ChainSafe/js-libp2p-gossipsub) | [Cayman Nava](mailto:caymannava@gmail.com) |
--- a/.github/ISSUE_TEMPLATE/release.md
+++ b/.github/ISSUE_TEMPLATE/release.md
@ -25,6 +25,8 @@
    - [ ] [js-ipfs](https://github.com/ipfs/js-ipfs)
 - Documentation
  - [ ] Ensure that README.md is up to date
+  - [ ] Ensure that all the examples run
+  - [ ] Ensure [libp2p/js-libp2p-examples](https://github.com/libp2p/js-libp2p-examples) is updated
  - [ ] Ensure that [libp2p/docs](https://github.com/libp2p/docs) is updated
 - Communication
  - [ ] Create the release issue
--- a/doc/API.md
+++ b/doc/API.md
@ -13,14 +13,14 @@
  * [`ping`](#ping)
  * [`multiaddrs`](#multiaddrs)
  * [`addressManager.getListenAddrs`](#addressmanagergetlistenaddrs)
-  * [`addressManager.getAnnounceAddrs`](#addressmanagergetannounceaddrs)
+  * [`addressmger.getAnnounceAddrs`](#addressmanagergetannounceaddrs)
+  * [`addressManager.getNoAnnounceAddrs`](#addressmanagergetnoannounceaddrs)
  * [`contentRouting.findProviders`](#contentroutingfindproviders)
  * [`contentRouting.provide`](#contentroutingprovide)
  * [`contentRouting.put`](#contentroutingput)
  * [`contentRouting.get`](#contentroutingget)
  * [`contentRouting.getMany`](#contentroutinggetmany)
  * [`peerRouting.findPeer`](#peerroutingfindpeer)
-  * [`peerRouting.getClosestPeers`](#peerroutinggetclosestpeers)
  * [`peerStore.addressBook.add`](#peerstoreaddressbookadd)
  * [`peerStore.addressBook.delete`](#peerstoreaddressbookdelete)
  * [`peerStore.addressBook.get`](#peerstoreaddressbookget)
@ -91,9 +91,8 @@ Creates an instance of Libp2p.
 |------|------|-------------|
 | options | `object` | libp2p options |
 | options.modules | [`Array<object>`](./CONFIGURATION.md#modules) | libp2p [modules](./CONFIGURATION.md#modules) to use |
-| [options.addresses] | `{ listen: Array<string>, announce: Array<string>, announceFilter: (ma: Array<multiaddr>) => Array<multiaddr> }` | Addresses for transport listening and to advertise to the network |
+| [options.addresses] | `{ listen: Array<string>, announce: Array<string>, noAnnounce: Array<string> }` | Addresses for transport listening and to advertise to the network |
 | [options.config] | `object` | libp2p modules configuration and core configuration |
-| [options.host] | `{ agentVersion: string }` | libp2p host options |
 | [options.connectionManager] | [`object`](./CONFIGURATION.md#configuring-connection-manager) | libp2p Connection Manager [configuration](./CONFIGURATION.md#configuring-connection-manager) |
 | [options.transportManager] | [`object`](./CONFIGURATION.md#configuring-transport-manager) | libp2p transport manager [configuration](./CONFIGURATION.md#configuring-transport-manager) |
 | [options.datastore] | `object` | must implement [ipfs/interface-datastore](https://github.com/ipfs/interface-datastore) (in memory datastore will be used if not provided) |
@ -101,7 +100,6 @@ Creates an instance of Libp2p.
 | [options.keychain] | [`object`](./CONFIGURATION.md#setup-with-keychain) | keychain [configuration](./CONFIGURATION.md#setup-with-keychain) |
 | [options.metrics] | [`object`](./CONFIGURATION.md#configuring-metrics) | libp2p Metrics [configuration](./CONFIGURATION.md#configuring-metrics) |
 | [options.peerId] | [`PeerId`][peer-id] | peerId instance (it will be created if not provided) |
-| [options.peerRouting] | [`object`](./CONFIGURATION.md#setup-with-content-and-peer-routing) | libp2p Peer routing service [configuration](./CONFIGURATION.md#setup-with-content-and-peer-routing) |
 | [options.peerStore] | [`object`](./CONFIGURATION.md#configuring-peerstore) | libp2p PeerStore [configuration](./CONFIGURATION.md#configuring-peerstore) |

 For Libp2p configurations and modules details read the [Configuration Document](./CONFIGURATION.md).
@ -116,25 +114,12 @@ For Libp2p configurations and modules details read the [Configuration Document](

 ```js
 const Libp2p = require('libp2p')
-const TCP = require('libp2p-tcp')
-const MPLEX = require('libp2p-mplex')
-const { NOISE } = require('libp2p-noise')

-async function main () {
 // specify options
-  const options = {
-    modules: {
-      transport: [TCP],
-      streamMuxer: [MPLEX],
-      connEncryption: [NOISE]
-    }
-  }
+const options = {}

 // create libp2p
 const libp2p = await Libp2p.create(options)
-}
-
-main()
 ```

 Note: The [`PeerId`][peer-id] option is not required and will be generated if it is not provided.
@ -146,30 +131,12 @@ As an alternative, it is possible to create a Libp2p instance with the construct

 ```js
 const Libp2p = require('libp2p')
-const TCP = require('libp2p-tcp')
-const MPLEX = require('libp2p-mplex')
-const { NOISE } = require('libp2p-noise')
-const PeerId = require('peer-id')
-
-async function main () {
-  const peerId = await PeerId.create();

 // specify options
-  // peerId is required when Libp2p is instantiated via the constructor
-  const options = {
-    peerId,
-    modules: {
-      transport: [TCP],
-      streamMuxer: [MPLEX],
-      connEncryption: [NOISE]
-    }
-  }
+const options = {}

 // create libp2p
 const libp2p = new Libp2p(options)
-}
-
-main()
 ```

 Required keys in the `options` object:
@ -516,6 +483,26 @@ const announceMa = libp2p.addressManager.getAnnounceAddrs()
 // [ <Multiaddr 047f00000106f9ba - /dns4/peer.io/...> ]
 ```

+### addressManager.getNoAnnounceAddrs
+
+Get the multiaddrs that were provided to not announce to the network.
+
+`libp2p.addressManager.getNoAnnounceAddrs()`
+
+#### Returns
+
+| Type | Description |
+|------|-------------|
+| `Array<Multiaddr>` | Provided noAnnounce multiaddrs |
+
+#### Example
+
+```js
+// ...
+const noAnnounceMa = libp2p.addressManager.getNoAnnounceAddrs()
+// [ <Multiaddr 047f00000106f9ba - /ip4/127.0.0.1/tcp/63930> ]
+```
+
 ### transportManager.getAddrs

 Get the multiaddrs that libp2p transports are using to listen on.
@ -679,7 +666,7 @@ Queries the DHT for the n values stored for the given key (without sorting).
 // ...

 const key = '/key'
-const records = await libp2p.contentRouting.getMany(key, 2)
+const { from, val } = await libp2p.contentRouting.get(key)
 ```

 ### peerRouting.findPeer
@ -709,36 +696,6 @@ Iterates over all peer routers in series to find the given peer. If the DHT is e
 const peer = await libp2p.peerRouting.findPeer(peerId, options)
 ```

-### peerRouting.getClosestPeers
-
-Iterates over all content routers in series to get the closest peers of the given key.
-Once a content router succeeds, the iteration will stop. If the DHT is enabled, it will be queried first.
-
-`libp2p.peerRouting.getClosestPeers(cid, options)`
-
-#### Parameters
-
-| Name | Type | Description |
-|------|------|-------------|
-| key | `Uint8Array` | A CID like key |
-| options | `object` | operation options |
-| options.timeout | `number` | How long the query can take (ms). |
-
-#### Returns
-
-| Type | Description |
-|------|-------------|
-| `AsyncIterable<{ id: PeerId, multiaddrs: Multiaddr[] }` |  Async iterator for peer data |
-
-#### Example
-
-```js
-// Iterate over the closest peers found for the given key
-for await (const peer of libp2p.peerRouting.getClosestPeers(key)) {
-  console.log(peer.id, peer.multiaddrs)
-}
-```
-
 ### peerStore.addressBook.add

 Adds known `multiaddrs` of a given peer. If the peer is not known, it will be set with the provided multiaddrs.
@ -2055,15 +2012,6 @@ This event will be triggered anytime we are disconnected from another peer, rega
 - `peerId`: instance of [`PeerId`][peer-id]
 - `protocols`: array of known, supported protocols for the peer (string identifiers)

-### libp2p.addressManager
-
-#### Our addresses have changed
-
-This could be in response to a peer telling us about addresses they have observed, or
-the NatManager performing NAT hole punching.
-
-`libp2p.addressManager.on('change:addresses', () => {})`
-
 ## Types

 ### Stats
@ -2086,7 +2034,7 @@ the NatManager performing NAT hole punching.

 [address]: https://github.com/libp2p/js-libp2p/tree/master/src/peer-store/address-book.js
 [cid]: https://github.com/multiformats/js-cid
-[connection]: https://github.com/libp2p/js-libp2p-interfaces/tree/master/packages/interfaces/src/connection
+[connection]: https://github.com/libp2p/js-interfaces/tree/master/src/connection
 [multiaddr]: https://github.com/multiformats/js-multiaddr
 [peer-id]: https://github.com/libp2p/js-peer-id
 [keys]: https://github.com/libp2p/js-libp2p-crypto/tree/master/src/keys
--- a/doc/CONFIGURATION.md
+++ b/doc/CONFIGURATION.md
@ -1,5 +1,6 @@
-#
+# Configuration

+- [Configuration](#configuration)
  - [Overview](#overview)
  - [Modules](#modules)
    - [Transport](#transport)
@ -27,10 +28,6 @@
      - [Configuring Metrics](#configuring-metrics)
      - [Configuring PeerStore](#configuring-peerstore)
      - [Customizing Transports](#customizing-transports)
-    - [Configuring the NAT Manager](#configuring-the-nat-manager)
-      - [Browser support](#browser-support)
-      - [UPnP and NAT-PMP](#upnp-and-nat-pmp)
-    - [Configuring protocol name](#configuring-protocol-name)
  - [Configuration examples](#configuration-examples)

 ## Overview
@ -210,14 +207,14 @@ const modules = {
 Moreover, the majority of the modules can be customized via option parameters. This way, it is also possible to provide this options through a `config` object. This config object should have the property name of each building block to configure, the same way as the modules specification.

 Besides the `modules` and `config`, libp2p allows other internal options and configurations:
- `datastore`: an instance of [ipfs/interface-datastore](https://github.com/ipfs/js-ipfs-interfaces/tree/master/packages/interface-datastore) modules.
+- `datastore`: an instance of [ipfs/interface-datastore](https://github.com/ipfs/interface-datastore/) modules.
  - This is used in modules such as the DHT. If it is not provided, `js-libp2p` will use an in memory datastore.
 - `peerId`: the identity of the node, an instance of [libp2p/js-peer-id](https://github.com/libp2p/js-peer-id).
  - This is particularly useful if you want to reuse the same `peer-id`, as well as for modules like `libp2p-delegated-content-routing`, which need a `peer-id` in their instantiation.
- `addresses`: an object containing `listen`, `announce` and `announceFilter`:
+- `addresses`: an object containing `listen`, `announce` and `noAnnounce` properties with `Array<string>`:
  - `listen` addresses will be provided to the libp2p underlying transports for listening on them.
  - `announce` addresses will be used to compute the advertises that the node should advertise to the network.
-  - `announceFilter`: filter function used to filter announced addresses programmatically: `(ma: Array<multiaddr>) => Array<multiaddr>`. Default: returns all addresses. [`libp2p-utils`](https://github.com/libp2p/js-libp2p-utils) provides useful [multiaddr utilities](https://github.com/libp2p/js-libp2p-utils/blob/master/API.md#multiaddr-isloopbackma) to create your filters.
+  - `noAnnounce` addresses will be used as a filter to compute the advertises that the node should advertise to the network.

 ### Examples

@ -264,14 +261,13 @@ const TCP = require('libp2p-tcp')
 const MPLEX = require('libp2p-mplex')
 const { NOISE } = require('libp2p-noise')
 const MulticastDNS = require('libp2p-mdns')
-const Bootstrap = require('libp2p-bootstrap')

 const node = await Libp2p.create({
  modules: {
    transport: [TCP],
    streamMuxer: [MPLEX],
    connEncryption: [NOISE],
-    peerDiscovery: [MulticastDNS, Bootstrap]
+    peerDiscovery: [MulticastDNS]
  },
  config: {
    peerDiscovery: {
@ -281,15 +277,6 @@ const node = await Libp2p.create({
      [MulticastDNS.tag]: {
        interval: 1000,
        enabled: true
-      },
-      [Bootstrap.tag]: {
-        list: [ // A list of bootstrap peers to connect to starting up the node
-          "/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ",
-          "/dnsaddr/bootstrap.libp2p.io/ipfs/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN",
-          "/dnsaddr/bootstrap.libp2p.io/ipfs/QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa",
-        ],
-        interval: 2000,
-        enabled: true
      }
      // .. other discovery module options.
    }
@ -335,8 +322,6 @@ const MPLEX = require('libp2p-mplex')
 const { NOISE } = require('libp2p-noise')
 const GossipSub = require('libp2p-gossipsub')

-const { SignaturePolicy } = require('libp2p-interfaces/src/pubsub/signature-policy')
-
 const node = await Libp2p.create({
  modules: {
    transport: [TCP],
@ -347,8 +332,9 @@ const node = await Libp2p.create({
  config: {
    pubsub: {                     // The pubsub options (and defaults) can be found in the pubsub router documentation
      enabled: true,
-      emitSelf: false,                                  // whether the node should emit to self on publish
-      globalSignaturePolicy: SignaturePolicy.StrictSign // message signing policy
+      emitSelf: true,             // whether the node should emit to self on publish
+      signMessages: true,         // if messages should be signed
+      strictSigning: true         // if message signing should be required
    }
  }
 })
@ -373,8 +359,12 @@ const node = await Libp2p.create({
  config: {
    dht: {                        // The DHT options (and defaults) can be found in its documentation
      kBucketSize: 20,
-      enabled: true,              // This flag is required for DHT to run (disabled by default)
-      clientMode: false           // Whether to run the WAN DHT in client or server mode (default: client mode)
+      enabled: true,
+      randomWalk: {
+        enabled: true,            // Allows to disable discovery (enabled by default)
+        interval: 300e3,
+        timeout: 10e3
+      }
    }
  }
 })
@ -387,7 +377,6 @@ const Libp2p = require('libp2p')
 const TCP = require('libp2p-tcp')
 const MPLEX = require('libp2p-mplex')
 const { NOISE } = require('libp2p-noise')
-const ipfsHttpClient = require('ipfs-http-client')
 const DelegatedPeerRouter = require('libp2p-delegated-peer-routing')
 const DelegatedContentRouter = require('libp2p-delegated-content-routing')
 const PeerId = require('peer-id')
@ -395,34 +384,19 @@ const PeerId = require('peer-id')
 // create a peerId
 const peerId = await PeerId.create()

-const delegatedPeerRouting = new DelegatedPeerRouter(ipfsHttpClient.create({
-  host: 'node0.delegate.ipfs.io', // In production you should setup your own delegates
-  protocol: 'https',
-  port: 443
-}))
-
-const delegatedContentRouting = new DelegatedContentRouter(peerId, ipfsHttpClient.create({
-  host: 'node0.delegate.ipfs.io', // In production you should setup your own delegates
-  protocol: 'https',
-  port: 443
-}))
-
 const node = await Libp2p.create({
  modules: {
    transport: [TCP],
    streamMuxer: [MPLEX],
    connEncryption: [NOISE],
-    contentRouting: [delegatedContentRouting],
-    peerRouting: [delegatedPeerRouting],
+    contentRouting: [
+      new DelegatedContentRouter(peerId)
+    ],
+    peerRouting: [
+      new DelegatedPeerRouter()
+    ],
  },
-  peerId,
-  peerRouting: { // Peer routing configuration
-    refreshManager: { // Refresh known and connected closest peers
-      enabled: true, // Should find the closest peers.
-      interval: 6e5, // Interval for getting the new for closest peers of 10min
-      bootDelay: 10e3 // Delay for the initial query for closest peers
-    }
-  }
+  peerId
 })
 ```

@ -463,13 +437,13 @@ const node = await Libp2p.create({
 const Libp2p = require('libp2p')
 const TCP = require('libp2p-tcp')
 const MPLEX = require('libp2p-mplex')
-const { NOISE } = require('libp2p-noise')
+const SECIO = require('libp2p-secio')

 const node = await Libp2p.create({
  modules: {
    transport: [TCP],
    streamMuxer: [MPLEX],
-    connEncryption: [NOISE]
+    connEncryption: [SECIO]
  },
  config: {
    relay: {                   // Circuit Relay options (this config is part of libp2p core configurations)
@ -499,9 +473,6 @@ const MPLEX = require('libp2p-mplex')
 const { NOISE } = require('libp2p-noise')
 const LevelStore = require('datastore-level')

-const datastore = new LevelStore('path/to/store')
-await datastore.open()
-
 const node = await Libp2p.create({
  modules: {
    transport: [TCP],
@ -510,11 +481,11 @@ const node = await Libp2p.create({
  },
  keychain: {
    pass: 'notsafepassword123456789',
-    datastore: dsInstant,
+    datastore: new LevelStore('path/to/store')
  }
 })

-await node.loadKeychain()
+await libp2p.loadKeychain()
 ```

 #### Configuring Dialing
@ -524,11 +495,9 @@ Dialing in libp2p can be configured to limit the rate of dialing, and how long d
 | Name | Type | Description |
 |------|------|-------------|
 | maxParallelDials | `number` | How many multiaddrs we can dial in parallel. |
-| maxAddrsToDial | `number` | How many multiaddrs is the dial allowed to dial for a single peer. |
 | maxDialsPerPeer | `number` | How many multiaddrs we can dial per peer, in parallel. |
 | dialTimeout | `number` | Second dial timeout per peer in ms. |
 | resolvers | `object` | Dial [Resolvers](https://github.com/multiformats/js-multiaddr/blob/master/src/resolvers/index.js) for resolving multiaddrs |
-| addressSorter | `(Array<Address>) => Array<Address>` | Sort the known addresses of a peer before trying to dial. |

 The below configuration example shows how the dialer should be configured, with the current defaults:

@ -539,7 +508,6 @@ const MPLEX = require('libp2p-mplex')
 const { NOISE } = require('libp2p-noise')

 const { dnsaddrResolver } = require('multiaddr/src/resolvers')
-const { publicAddressesFirst } = require('libp2p-utils/src/address-sort')

 const node = await Libp2p.create({
  modules: {
@ -549,13 +517,11 @@ const node = await Libp2p.create({
  },
  dialer: {
    maxParallelDials: 100,
-    maxAddrsToDial: 25,
    maxDialsPerPeer: 4,
    dialTimeout: 30e3,
    resolvers: {
      dnsaddr: dnsaddrResolver
-    },
-    addressSorter: publicAddressesFirst
+    }
  }
 ```

@ -600,7 +566,7 @@ const TCP = require('libp2p-tcp')
 const MPLEX = require('libp2p-mplex')
 const { NOISE } = require('libp2p-noise')

-const { FaultTolerance } = require('libp2p/src/transport-manager')
+const { FaultTolerance } = require('libp2p/src/transport-manager')}

 const node = await Libp2p.create({
  modules: {
@ -672,10 +638,8 @@ const Libp2p = require('libp2p')
 const TCP = require('libp2p-tcp')
 const MPLEX = require('libp2p-mplex')
 const { NOISE } = require('libp2p-noise')
-const LevelStore = require('datastore-level')

-const datastore = new LevelStore('path/to/store')
-const dsInstant = await datastore.open()
+const LevelStore = require('datastore-level')

 const node = await Libp2p.create({
  modules: {
@ -683,7 +647,7 @@ const node = await Libp2p.create({
    streamMuxer: [MPLEX],
    connEncryption: [NOISE]
  },
-  datastore: dsInstant,
+  datastore: new LevelStore('path/to/store'),
  peerStore: {
    persistence: true,
    threshold: 5
@ -719,89 +683,6 @@ const node = await Libp2p.create({
 })
 ```

-During Libp2p startup, transport listeners will be created for the configured listen multiaddrs.  Some transports support custom listener options and you can set them using the `listenerOptions` in the transport configuration. For example, [libp2p-webrtc-star](https://github.com/libp2p/js-libp2p-webrtc-star) transport listener supports the configuration of its underlying [simple-peer](https://github.com/feross/simple-peer) ice server(STUN/TURN) config as follows:
-
-```js
-const transportKey = WebRTCStar.prototype[Symbol.toStringTag]
-const node = await Libp2p.create({
-  modules: {
-    transport: [WebRTCStar],
-    streamMuxer: [MPLEX],
-    connEncryption: [NOISE]
-  },
-  addresses: {
-    listen: ['/dns4/your-wrtc-star.pub/tcp/443/wss/p2p-webrtc-star'] // your webrtc dns multiaddr
-  },
-  config: {
-    transport: {
-      [transportKey]: {
-        listenerOptions: {
-          config: {
-            iceServers: [
-              {"urls": ["turn:YOUR.TURN.SERVER:3478"], "username": "YOUR.USER", "credential": "YOUR.PASSWORD"},
-              {"urls": ["stun:YOUR.STUN.SERVER:3478"], "username": "", "credential": ""}]
-          }
-        }
-      }
-    }
-  }
-})
-```
-
-#### Configuring the NAT Manager
-
-Network Address Translation (NAT) is a function performed by your router to enable multiple devices on your local network to share a single IPv4 address. It's done transparently for outgoing connections, ensuring the correct response traffic is routed to your computer, but if you wish to accept incoming connections some configuration is necessary.
-
-The NAT manager can be configured as follows:
-
-```js
-const node = await Libp2p.create({
-  config: {
-    nat: {
-      description: 'my-node', // set as the port mapping description on the router, defaults the current libp2p version and your peer id
-      enabled: true, // defaults to true
-      gateway: '192.168.1.1', // leave unset to auto-discover
-      externalIp: '80.1.1.1', // leave unset to auto-discover
-      ttl: 7200, // TTL for port mappings (min 20 minutes)
-      keepAlive: true, // Refresh port mapping after TTL expires
-      pmp: {
-        enabled: false, // defaults to false
-      }
-    }
-  }
-})
-```
-
-##### Browser support
-
-Browsers cannot open TCP ports or send the UDP datagrams necessary to configure external port mapping - to accept incoming connections in the browser please use a WebRTC transport.
-
-##### UPnP and NAT-PMP
-
-By default under nodejs libp2p will attempt to use [UPnP](https://en.wikipedia.org/wiki/Universal_Plug_and_Play) to configure your router to allow incoming connections to any TCP transports that have been configured.
-
-[NAT-PMP](http://miniupnp.free.fr/nat-pmp.html) is a feature of some modern routers which performs a similar job to UPnP. NAT-PMP is disabled by default, if enabled libp2p will try to use NAT-PMP and will fall back to UPnP if it fails.
-
-#### Configuring protocol name
-
-Changing the protocol name prefix can isolate default public network (IPFS) for custom purposes.
-
-```js
-const node = await Libp2p.create({
-  config: {
-    protocolPrefix: 'ipfs' // default
-  }
-})
-/*
-protocols: [
-  "/ipfs/id/1.0.0", // identify service protocol (if we have multiplexers)
-  "/ipfs/id/push/1.0.0", // identify service push protocol (if we have multiplexers)
-  "/ipfs/ping/1.0.0", // built-in ping protocol
-]
-*/
-```
-
-
 ## 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/DISCOVERABILITY_AND_CONNECTIVITY.md
+++ b/doc/DISCOVERABILITY_AND_CONNECTIVITY.md
@ -0,0 +1,99 @@
+# Discoverability and Connectivity
+
+While different p2p applications have different needs and requirements, they might also run in different environments and have different hardware capabilities. These characteristics will influence how other peers can be discovered, as well as how connections are established and kept open.
+
+This document contains a set of guidelines to setup libp2p for the most common use cases, in the context of the typical environments where you can run a `js-libp2p` node.
+
+## Table of Contents
+
+[Background](#background)
+  - [Discovery](#discovery)
+  - [Connectivity](#connectivity)
+[Browser](#browser)
+  - [Discovery](#discovery)
+  - [Connectivity](#connectivity)
+  - [Routing](#routing)
+  - [Overview](#overview)
+[Node](#node)
+
+## Background
+
+### Discovery
+
+Libp2p offers a variety of options to discover other peers on the network. They range from specifying well known peer addresses, to issue queries in a local network or exchanging peer addresses with other previously discovered peers.
+
+To enable peer addresses exchange, peers need to specify their own announce addresses. Accordingly, announce addresses should be reachable from other peers to be valuable.
+
+### Connectivity
+
+A libp2p node cannot keep a unlimited number of connections over time due to hardware and network constraints. As a consequence, a node must keep the most important connections open at any moment. While certain connections will probably be important over longer periods of time, others might only be important for a smaller interval. Accordingly, libp2p needs to keep track of its open connections over time and verify if there are better connections to establish while keeping an healthy number open.
+
+Well known peers are important for bootstrapping and getting to know other peers in the network. However, they will become less important over time since their main purpose is usually to bootstrap the network and not to provide other services. Moreover, as they will be reached by most of the network, they should be disconnected when they do not provide any more clear value to keep the network healthy.
+
+Libp2p is able to automatically identify the importance of some connections over time, but the application layer should also flag important connections manually to improve the node's sensing of the network. For instance, libp2p will protect connections that are used in their listening addresses, in order to be reachable by other nodes, as well as connections with relevant peers for core protocols like gossipsub. 
+
+## Browser
+
+Regarding enabling p2p applications, browsers currently have limitations that have impact on how libp2p should be setup.
+
+### Discovery
+
+Taking into account that a web browser does not offer any mDNS-like local discovery method to find peers on the same network and/or on the same web origin, a browser node will need to know other peers' addresses beforehand, so that it can bootstrap its network. These initial nodes should be used as a way to get to know other peers in the network and establish connections with them. Moreover, some of these peers can also advertise the browser peer to other nodes in the network, so that they can connect to it.
+
+### Connectivity
+
+Browser nodes do not have the ability to "listen" for incoming connections, nor a permanent address that can be dialed later for quick resume. However, Libp2p provides a set of possibilities to overcome these limitations. These solutions usually rely on other nodes to listen for connections on its behalf, as well as to advertise its information to other peers.
+
+A browser node should start by establishing a connection with a known machine. As a result of this connection, the browser node will likely be interested to have its addresses announced to other peers in the network. Given that a browser cannot be dialed, the announced addresses of the node will be addresses that rely on this previously connection as the entry point of a dial request. For example, a circuit relay address from a connected peer. Shortly, browser nodes should have auto-relay enabled, so that they can bind to relay nodes that support HOP and become diable via them.
+
+### Routing
+
+DHTs are an essential building block of a p2p system to provide a lookup mechanism similar to a key-value hash table.
+
+As browsers cannot handle large pools of open connections at the same time, as well as establish direct connections to each others, browser nodes cannot participate efficiently in DHTs. Once again, the best way to circumvent this limitation is to rely on more capable nodes in the network to handle DHT queries on their behalf. Browser nodes can rely on delegate nodes or use the DHT in client mode.
+
+### Overview
+
+The base connections to have a fully functional libp2p browser node are:
+- nodes that can listen for incoming connections
+  - Relay nodes, Webrtc-star servers, ...
+- nodes that can enable peer discovery and service discovery
+  - Webrtc-star servers, Rendezvous servers, DHT server Nodes, ...
+- closest nodes
+- nodes that can enable efficient routing
+  - DHT server nodes
+- nodes from the pubsub topics mesh
+- application protocol peers (as needed via `MulticodecTopology`)
+
+While the first three points are important in any context, the last three points depend on the application use case and if the mentioned subsystems are needed. 
+
+TODO: Clearly define what libp2p handles and how it is handled
+
+- Libp2p will protect connections used in their listening addresses like connections to a `webrtc-star` server or connections to a node acting as a relay through the `AutoRelay`, as well as nodes used for peer and service discovery
+- Libp2p pubsub routers will protect the most important peer connections
+  - How to control and avoid excess
+- Libp2p will protect connections to n DHT servers
+- Libp2p will protect the n (configurable) closest peers on the network and refresh them over time, if needed
+- Application protocol peers should be protected
+  - TODO: define how
+
+## Node
+
+In a Node.js context, there are less limitations that need to be considered regarding discoverability and connectivity compared to browser nodes.
+
+The most common issue is when Libp2p nodes are behind NATs. While NAT is usually transparent for outgoing connections, listening for incoming connections might require some configuration. While it’s usually possible to manually configure routers, not everyone that wants to run a peer-to-peer application or other network service will have the ability to do so. Moreover, libp2p applications should run everywhere, not just in data centers or on machines with stable public IP addresses.
+
+The best approach at the moment to circumvent this limitation is to rely on relay to communicate indirectly via an intermediary peer.
+
+### Overview
+
+The base connections to have a fully functional libp2p browser node are:
+- nodes that can listen for incoming connections when behind a NAT
+  - Relay nodes, ...
+- nodes that can enable service discovery
+  - Rendezvous servers, DHT server Nodes, ...
+- closest nodes
+- nodes that can enable efficient routing
+  - DHT server nodes
+- nodes from the pubsub topics mesh
+- application protocol peers (as needed via `MulticodecTopology`)
--- a/doc/GETTING_STARTED.md
+++ b/doc/GETTING_STARTED.md
@ -248,7 +248,9 @@ If you want to know more about libp2p peer discovery, you should read the follow

 ## 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!
+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).
+For guidelines on how to enable discoverability and connectivity for your node environment and use case, you can check the [Discoverability and Connectivity Readme](./DISCOVERABILITY_AND_CONNECTIVITY.md).
+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
--- a/doc/migrations/v0.29-v0.30.md
+++ b/doc/migrations/v0.29-v0.30.md
@ -1,185 +0,0 @@
-<!--Specify versions for migration below-->
-# Migrating to libp2p@30
-
-A migration guide for refactoring your application code from libp2p v0.29.x to v0.30.0.
-
-## Table of Contents
-
- [API](#api)
- [Development and Testing](#development-and-testing)
- [Module Updates](#module-updates)
-
-## API
-
-### Pubsub
-
-`js-libp2p` nodes prior to this version were emitting to self on publish by default.
-This default value was changed on the pubsub router layer in the past, but we kept it overwritten in libp2p to avoid an upstream breaking change.
-Now `js-libp2p` does not overwrite the pubsub router options anymore. Upstream projects that want this feature should enable it on their libp2p configuration.
-
-**Before**
-
-```js
-const Gossipsub = require('libp2p-gossipsub')
-const Libp2p = require('libp2p')
-
-const libp2p = await Libp2p.create({
-  modules: {
-    // ... Add required modules according to the Configuration docs
-    pubsub: Gossipsub
-  }
-})
-```
-
-**After**
-
-```js
-const Gossipsub = require('libp2p-gossipsub')
-const Libp2p = require('libp2p')
-
-const libp2p = await Libp2p.create({
-  modules: {
-    // ... Add required modules according to the Configuration docs
-    pubsub: Gossipsub
-  },
-  config: {
-    pubsub: {
-      emitSelf: true
-    }
-  }
-})
-```
-
-The [Pubsub interface](https://github.com/libp2p/js-libp2p-interfaces/tree/master/src/pubsub) was updated on its message signing properties, taking into account the Gossipsub spec updates on [libp2p/specs#294](https://github.com/libp2p/specs/pull/294) and [libp2p/specs#299](https://github.com/libp2p/specs/pull/299)
-
-The signing property is now based on a `globalSignaturePolicy` option instead of the previous `signMessages` and `strictSigning` options. The default to strict signing pubsub messages was kept, but if you would like to disable it, the properties should be changed as follows:
-
-**Before**
-
-```js
-const Gossipsub = require('libp2p-gossipsub')
-const Libp2p = require('libp2p')
-
-const libp2p = await Libp2p.create({
-  modules: {
-    // ... Add required modules according to the Configuration docs
-    pubsub: Gossipsub
-  },
-  config: {
-    pubsub: {
-      signMessages: false,
-      strictSigning: false
-    }
-  }
-})
-```
-
-**After**
-
-```js
-const Gossipsub = require('libp2p-gossipsub')
-const { SignaturePolicy } = require('libp2p-interfaces/src/pubsub/signature-policy')
-const Libp2p = require('libp2p')
-
-const libp2p = await Libp2p.create({
-  modules: {
-    // ... Add required modules according to the Configuration docs
-    pubsub: Gossipsub
-  },
-  config: {
-    pubsub: {
-      globalSignaturePolicy: SignaturePolicy.StrictNoSign
-    }
-  }
-})
-```
-
-### Addresses
-
-Libp2p has supported `noAnnounce` addresses configuration for some time now. However, it did not provide the best developer experience. In this release, we dropped the `noAnnounce` configuration property in favor of an `announceFilter` property function.
-
-**Before**
-
-```js
-const Libp2p = require('libp2p')
-
-const libp2p = await Libp2p.create({
-  addresses: {
-    listen: ['/ip4/127.0.0.1/tcp/8000/ws'],
-    noAnnounce: ['/ip4/127.0.0.1/tcp/8000/ws'],
-  },
-  // ... additional configuration per the Configuration docs
-})
-```
-
-**After**
-
-```js
-const Libp2p = require('libp2p')
-
-// Libp2p utils has several multiaddr utils you can leverage
-const isPrivate = require('libp2p-utils/src/multiaddr/is-private')
-
-const libp2p = await Libp2p.create({
-  addresses: {
-    listen: ['/ip4/127.0.0.1/tcp/8000/ws'],
-    // Filter function: (ma: Array<multiaddr>) => Array<multiaddr>
-    announceFilter: (multiaddrs) => multiaddrs.filter(m => !isPrivate(m))
-  },
-  // ... additional configuration per the Configuration docs
-})
-```
-
-It is important pointing out another change regarding address advertising. This is not an API breaking change, but it might have influence on your libp2p setup.
-Previously, when using the addresses `announce` property, its multiaddrs were concatenated with the `listen` multiaddrs and then they were filtered out by the `noAnnounce` multiaddrs, in order to create the list of multiaddrs to advertise. 
-In `libp2p@0.30` the logic now operates as follows:
-
- If `announce` addresses are provided, only they will be announced (no filters are applied)
- If `announce` is not provided, the transport addresses will be filtered (if a filter is provided)
-  - if the `announceFilter` is provide it will be passed the transport addresses
-
-## Development and Testing
-
-While this is not an API breaking change, there was a behavioral breaking change on the Websockets transport when in a browser environment. This change might create issues on local test setups.
-`libp2p-websockets` has allowed `TCP` and `DNS` addresses, both with `ws` or `wss` to be used for dial purposes. Taking into account security (and browser policies), we are now restricting addresses to `DNS` + `wss` in the browser
-With this new behavior, if you need to use non DNS addresses, you can configure your libp2p node as follows:
-
-```js
-const Websockets = require('libp2p-websockets')
-const filters = require('libp2p-websockets/src/filters')
-const Libp2p = require('libp2p')
-
-const transportKey = Websockets.prototype[Symbol.toStringTag]
-const libp2p = await Libp2p.create({
-  modules: {
-    transport: [Websockets]
-    // ... Add required modules according to the Configuration docs
-  },
-  config: {
-    transport: {
-      [transportKey]: {
-        filter: filters.all
-      }
-    }
-  }
-})
-```
-
-## Module Updates
-
-With this release you should update the following libp2p modules if you are relying on them:
-
-<!--Specify module versions in JSON for migration below.
-It's recommended to check package.json changes for this: 
-`git diff <release> <prev> -- package.json`
-->
-
-```json
-"libp2p-delegated-content-routing": "^0.8.0",
-"libp2p-delegated-peer-routing": "^0.8.0",
-"libp2p-floodsub": "^0.24.0",
-"libp2p-gossipsub": "^0.7.0",
-"libp2p-websockets": "^0.15.0",
-```
-
-Note that some of them do not need to be updated for this libp2p version to work as expected, but we suggest you to keep them updated as part of this release.
--- a/doc/migrations/v0.30-v0.31.md
+++ b/doc/migrations/v0.30-v0.31.md
@ -1,123 +0,0 @@
-<!--Specify versions for migration below-->
-# Migrating to libp2p@31
-
-A migration guide for refactoring your application code from libp2p v0.30.x to v0.31.0.
-
-## Table of Contents
-
- [Types](#types)
- [API](#api)
- [Module Updates](#module-updates)
-
-## Types
-
-Most of the type definitions in the libp2p configuration were `any` or were not included before this release. This might cause breaking changes on upstream projects relying on the previous provided types, as well as to libp2p modules implemented by the libp2p community.
-
-## API
-
-### Core API
-
-`libp2p.dialProtocol` does not accept empty or null protocols returning a connection anymore and `dial` must be used instead.
-
-```js
-const connection = await libp2p.dialProtocol(peerId)
-```
-
-**After**
-
-```js
-const connection = await libp2p.dial(peerId)
-```
-
-### Connection Manager Options
-
-We updated the connection manager options naming in `libp2p@0.29` but kept it backward compatible until now.
-
-**Before**
-
-```js
-const node = await Libp2p.create({
-  connectionManager: {
-    minPeers: 0
-  }
-})
-```
-
-**After**
-
-```js
-const node = await Libp2p.create({
-  connectionManager: {
-    minConnections: 0
-  }
-})
-```
-
-You can see full details on how to configure the connection manager [here](https://github.com/libp2p/js-libp2p/blob/master/doc/CONFIGURATION.md#configuring-connection-manager).
-
-### Dialer and Keychain components
-
-Internal property names to create a libp2p `Dialer` and `Keychain` were updated to reflect the properties naming in the libp2p configuration. These are internal modules of libp2p core and should not impact most of the users, but as it is possible to use them separately here follow the changes:
-
-***Before**
-
-```js
-const dialer = new Dialer({
-  transportManager,
-  peerStore,
-  concurrency,
-  perPeerLimit,
-  timeout,
-  resolvers,
-  addressSorter
-})
-
-const keychain = new Keychain(datastore, {
-  passPhrase
-})
-```
-
-**After**
-
-```js
-this.dialer = new Dialer({
-  transportManager,
-  peerStore,
-  maxParallelDials,
-  maxDialsPerPeer,
-  dialTimeout,
-  resolvers,
-  addressSorter
-})
-
-const keychain = new Keychain(datastore, {
-  pass
-})
-```
-
-## Module Updates
-
-With this release you should update the following libp2p modules if you are relying on them:
-
-<!--Specify module versions in JSON for migration below.
-It's recommended to check package.json changes for this: 
-`git diff <release> <prev> -- package.json`
-->
-
-```json
-"libp2p-bootstrap": "^0.12.3",
-"libp2p-crypto": "^0.19.4",
-"libp2p-interfaces": "^0.10.0",
-"libp2p-delegated-content-routing": "^0.10.0",
-"libp2p-delegated-peer-routing": "^0.9.0",
-"libp2p-floodsub": "^0.25.1",
-"libp2p-gossipsub": "^0.9.0",
-"libp2p-kad-dht": "^0.22.0",
-"libp2p-mdns": "^0.16.0",
-"libp2p-noise": "^3.0.0",
-"libp2p-tcp": "^0.15.4",
-"libp2p-webrtc-star": "^0.22.2",
-"libp2p-websockets": "^0.15.6"
-```
-
-One of the main changes in this new release is the update to `multiaddr@9.0.0`. This should also be updated in upstream projects to avoid several multiaddr versions in the bundle and to avoid potential problems when libp2p interacts with provided outdated multiaddr instances.
--- a/doc/migrations/v0.31-v0.32.md
+++ b/doc/migrations/v0.31-v0.32.md
@ -1,36 +0,0 @@
-<!--Specify versions for migration below-->
-# Migrating to libp2p@32
-
-A migration guide for refactoring your application code from libp2p v0.31.x to v0.32.0.
-
-## Table of Contents
-
- [Module Updates](#module-updates)
-
-## Module Updates
-
-With this release you should update the following libp2p modules if you are relying on them:
-
-<!--Specify module versions in JSON for migration below.
-It's recommended to check package.json changes for this: 
-`git diff <release> <prev> -- package.json`
-->
-
-```json
-"libp2p-bootstrap": "^0.13.0",
-"libp2p-crypto": "^0.19.4",
-"libp2p-interfaces": "^1.0.0",
-"libp2p-delegated-content-routing": "^0.11.0",
-"libp2p-delegated-peer-routing": "^0.10.0",
-"libp2p-floodsub": "^0.27.0",
-"libp2p-gossipsub": "^0.11.0",
-"libp2p-kad-dht": "^0.23.0",
-"libp2p-mdns": "^0.17.0",
-"libp2p-noise": "^4.0.0",
-"libp2p-tcp": "^0.17.0",
-"libp2p-webrtc-direct": "^0.7.0",
-"libp2p-webrtc-star": "^0.23.0",
-"libp2p-websockets": "^0.16.0"
-```
-
-One of the main changes in this new release is the update to `multiaddr@10.0.0`. This should also be updated in upstream projects to avoid several multiaddr versions in the bundle and to avoid potential problems when libp2p interacts with provided outdated multiaddr instances.
--- a/doc/migrations/v0.32-v0.33.md
+++ b/doc/migrations/v0.32-v0.33.md
@ -1,14 +0,0 @@
-<!--Specify versions for migration below-->
-# Migrating to libp2p@33
-
-A migration guide for refactoring your application code from libp2p v0.32.x to v0.33.0.
-
-## Table of Contents
-
- [Module Updates](#module-updates)
-
-## Module Updates
-
-Libp2p uses a datastore implementation for Peerstore persistence and for the DHT state. While libp2p defaults to a datastore implementation, it can receive any implementation of a datastore compliant with the [interface-datastore](https://github.com/ipfs/js-ipfs-interfaces/tree/master/packages/interface-datastore) via its configuration.
-
-In this release, we updated to `interface-datastore@6.0.0`. As a result, libp2p users relying on a configured datastore should update it to a compliant implementation for updating libp2p.
--- a/doc/production/DELEGATE_NODES.md
+++ b/doc/production/DELEGATE_NODES.md
@ -1,3 +0,0 @@
-# Delegate Nodes
-
-[TODO](https://github.com/libp2p/js-libp2p/pull/718)
--- a/doc/production/README.md
+++ b/doc/production/README.md
@ -1,65 +0,0 @@
-# Production
-
-Nowadays, you can run JavaScript code in several different environments, some of them with their own particularities. Moreover, you can use `js-libp2p` for a wide range of use cases. Different environments and different use cases mean different configurations and challenges in the network.
-
-Libp2p nodes can vary from nodes behind an application, to infrastructure nodes that enable the network to operate and to be efficient. In this context, the Libp2p project provides public infrastructure to boost the network, enable nodes connectivity and improve constrained nodes performance. This public infrastructure should be leveraged for learning the concepts and experimenting. When an application on top of libp2p aims to move into production, its own infrastructure should be setup as the public nodes will be intensively used by others and its availability is not guaranteed.
-
-This guide aims to guide you from using the public infrastructure into setting up your own.
-
-## Table of Contents
-
-* [Joining the Network](#joining-the-network)
-* [Connecting to Nodes with connectivity limitations](#connecting-to-nodes-with-connectivity-limitations)
-  * [`webrtc-star` servers](#webrtc-star-servers)
-  * [Circuit Relay](#circuit-relay)
-* [Querying the network from the browser](#querying-the-network-from-the-browser)
-* [Others](#others)
-  * [SSL](#ssl)
-
-## Joining the Network
-
-Once a libp2p node stars, it will need to connect to a set of peers in order to establish its overlay network.
-
-Currently `js-libp2p` is not the best choice for being a bootstrap node. Its DHT needs to be improved, in order to become an effective server to enable other nodes to properly bootstrap their network.
-
-Setting up a fleet of [`go-libp2p`](https://github.com/libp2p/go-libp2p) nodes is the recommended way to proceed here. 
-
-## Connecting to Nodes with connectivity limitations
-
-While the libp2p core codebase aims to work in multiple environments, there are some limitations that are not possible to overcome at the time of writing. These limitations include browser nodes, nodes behind NAT, reverse proxies, firewalls, or lack of compatible transports.
-
-In the browser, libp2p supports two transports: `websockets` and `webrtc-star`. Nowadays, browsers do not support listening for connections, but only to dial known addresses. `webrtc-star` servers can be used to enable libp2p nodes to discover other nodes running on the browser and to help them establish a connection.
-
-For nodes that cannot be dialed (including browser), circuit relay nodes should be used.
-
-### `webrtc-star` servers
-
-Regarding `webRTC` connections, a set of star servers are needed to act as a rendezvous point, where peers can learn about other peers (`peer-discovery`), as well as exchange their SDP offers (signaling data).
-
-You can read on how to setup your own star servers in [libp2p/js-libp2p-webrtc-star/DEPLOYMENT.md](https://github.com/libp2p/js-libp2p-webrtc-star/blob/master/DEPLOYMENT.md).
-
-It is worth pointing out that with new discovery protocols on the way, as well as support for distributed signaling, the star servers should be deprecated on the long run.
-
-### Circuit Relay
-
-Libp2p nodes acting as circuit relay aim to establish connectivity between libp2p nodes (e.g. IPFS nodes) that wouldn't otherwise be able to establish a direct connection to each other.
-
-A relay is needed in situations where nodes are behind NAT, reverse proxies, firewalls and/or simply don't support the same transports (e.g. go-libp2p vs. browser-libp2p). The circuit relay protocol exists to overcome those scenarios. Nodes with the `auto-relay` feature enabled can automatically bind themselves on a relay to listen for connections on their behalf.
-
-You can use [libp2p/js-libp2p-relay-server](https://github.com/libp2p/js-libp2p-relay-server) to setup your own relay server. This also includes an easy to customize Docker setup for a HOP Relay.
-
-## Querying the network from the browser
-
-Libp2p nodes in scenarios such as browser environment and constrained devices will not be an efficient node in the libp2p DHT overlay, as a consequence of their known limitations regarding connectivity and performance.
-
-Aiming to support these type of nodes to find other peers and content in the network, delegate nodes can be setup. With a set of well known IPFS delegate nodes, nodes with limitations in the network can leverage them to perform peer and content routing queries.
-
-Currently, delegate nodes must be IPFS nodes as the IPFS HTTP API is leveraged by them to make routing queries.
-
-You can read on how to setup your own set of delegated nodes in [DELEGATE_NODES.md](./DELEGATE_NODES.md).
-
-## Others
-
-### SSL
-
-TODO
--- a/examples/README.md
+++ b/examples/README.md
@ -8,7 +8,7 @@ Let us know if you find any issues, or if you want to contribute and add a new t

 - [Transports](./transports)
 - [Protocol and Stream Muxing](./protocol-and-stream-muxing)
- [Connection Encryption](./connection-encryption)
+- [Encrypted Communications](./encrypted-communications)
 - [Discovery Mechanisms](./discovery-mechanisms)
 - [Peer and Content Routing](./peer-and-content-routing)
 - [PubSub](./pubsub)
--- a/examples/auto-relay/README.md
+++ b/examples/auto-relay/README.md
@ -1,192 +0,0 @@
-# Auto relay
-
-Auto Relay enables libp2p nodes to dynamically find and bind to relays on the network. Once binding (listening) is done, the node can and should advertise its addresses on the network, allowing any other node to dial it over its bound relay(s).
-While direct connections to nodes are preferable, it's not always possible to do so due to NATs or browser limitations.
-
-## 0. Setup the example
-
-Before moving into the examples, you should run `npm install` on the top level `js-libp2p` folder, in order to install all the dependencies needed for this example. Once the install finishes, you should move into the example folder with `cd examples/auto-relay`.
-
-This example comes with 3 main files. A `relay.js` file to be used in the first step, a `listener.js` file to be used in the second step and a `dialer.js` file to be used on the third step. All of these scripts will run their own libp2p node, which will interact with the previous ones. All nodes must be running in order for you to proceed.
-
-## 1. Set up a relay node
-
-In the first step of this example, we need to configure and run a relay node in order for our target node to bind to for accepting inbound connections.
-
-The relay node will need to have its relay subsystem enabled, as well as its HOP capability. It can be configured as follows:
-
-```js
-const Libp2p = require('libp2p')
-const Websockets = require('libp2p-websockets')
-const { NOISE } = require('@chainsafe/libp2p-noise')
-const MPLEX = require('libp2p-mplex')
-
-const node = await Libp2p.create({
-  modules: {
-    transport: [Websockets],
-    connEncryption: [NOISE],
-    streamMuxer: [MPLEX]
-  },
-  addresses: {
-    listen: ['/ip4/0.0.0.0/tcp/0/ws']
-    // TODO check "What is next?" section
-    // announce: ['/dns4/auto-relay.libp2p.io/tcp/443/wss/p2p/QmWDn2LY8nannvSWJzruUYoLZ4vV83vfCBwd8DipvdgQc3']
-  },
-  config: {
-    relay: {
-      enabled: true,
-      hop: {
-        enabled: true
-      },
-      advertise: {
-        enabled: true,
-      }
-    }
-  }
-})
-
-await node.start()
-
-console.log(`Node started with id ${node.peerId.toB58String()}`)
-console.log('Listening on:')
-node.multiaddrs.forEach((ma) => console.log(`${ma.toString()}/p2p/${node.peerId.toB58String()}`))
-```
-
-The Relay HOP advertise functionality is **NOT** required to be enabled. However, if you are interested in advertising on the network that this node is available to be used as a HOP Relay you can enable it. A content router module or Rendezvous needs to be configured to leverage this option.
-
-You should now run the following to start the relay node:
-
-```sh
-node relay.js
-```
-
-This should print out something similar to the following:
-
-```sh
-Node started with id QmWDn2LY8nannvSWJzruUYoLZ4vV83vfCBwd8DipvdgQc3
-Listening on:
-/ip4/127.0.0.1/tcp/61592/ws/p2p/QmWDn2LY8nannvSWJzruUYoLZ4vV83vfCBwd8DipvdgQc3
-/ip4/192.168.1.120/tcp/61592/ws/p2p/QmWDn2LY8nannvSWJzruUYoLZ4vV83vfCBwd8DipvdgQc3
-```
-
-## 2. Set up a listener node with Auto Relay Enabled
-
-One of the typical use cases for Auto Relay is nodes behind a NAT or browser nodes due to their inability to expose a public address. For running a libp2p node that automatically binds itself to connected HOP relays, you can see the following:
-
-```js
-const Libp2p = require('libp2p')
-const Websockets = require('libp2p-websockets')
-const { NOISE } = require('@chainsafe/libp2p-noise')
-const MPLEX = require('libp2p-mplex')
-
-const relayAddr = process.argv[2]
-if (!relayAddr) {
-  throw new Error('the relay address needs to be specified as a parameter')
-}
-
-const node = await Libp2p.create({
-  modules: {
-    transport: [Websockets],
-    connEncryption: [NOISE],
-    streamMuxer: [MPLEX]
-  },
-  config: {
-    relay: {
-      enabled: true,
-      autoRelay: {
-        enabled: true,
-        maxListeners: 2
-      }
-    }
-  }
-})
-
-await node.start()
-console.log(`Node started with id ${node.peerId.toB58String()}`)
-
-const conn = await node.dial(relayAddr)
-
-// Wait for connection and relay to be bind for the example purpose
-await new Promise((resolve) => {
-  node.peerStore.on('change:multiaddrs', ({ peerId }) => {
-    // Updated self multiaddrs?
-    if (peerId.equals(node.peerId)) {
-      resolve()
-    }
-  })
-})
-
-console.log(`Connected to the HOP relay ${conn.remotePeer.toString()}`)
-console.log(`Advertising with a relay address of ${node.multiaddrs[0].toString()}/p2p/${node.peerId.toB58String()}`)
-```
-
-As you can see in the code, we need to provide the relay address, `relayAddr`, as a process argument. This node will dial the provided relay address and automatically bind to it.
-
-You should now run the following to start the node running Auto Relay:
-
-```sh
-node listener.js /ip4/192.168.1.120/tcp/61592/ws/p2p/QmWDn2LY8nannvSWJzruUYoLZ4vV83vfCBwd8DipvdgQc3
-```
-
-This should print out something similar to the following:
-
-```sh
-Node started with id QmerrWofKF358JE6gv3z74cEAyL7z1KqhuUoVfGEynqjRm
-Connected to the HOP relay QmWDn2LY8nannvSWJzruUYoLZ4vV83vfCBwd8DipvdgQc3
-Advertising with a relay address of /ip4/192.168.1.120/tcp/61592/ws/p2p/QmWDn2LY8nannvSWJzruUYoLZ4vV83vfCBwd8DipvdgQc3/p2p-circuit/p2p/QmerrWofKF358JE6gv3z74cEAyL7z1KqhuUoVfGEynqjRm
-```
-
-Per the address, it is possible to verify that the auto relay node is listening on the circuit relay node address.
-
-Instead of dialing this relay manually, you could set up this node with the Bootstrap module and provide it in the bootstrap list. Moreover, you can use other `peer-discovery` modules to discover peers in the network and the node will automatically bind to the relays that support HOP until reaching the maximum number of listeners.
-
-## 3. Set up a dialer node for testing connectivity
-
-Now that you have a relay node and a node bound to that relay, you can test connecting to the auto relay node via the relay.
-
-```js
-const Libp2p = require('libp2p')
-const Websockets = require('libp2p-websockets')
-const { NOISE } = require('@chainsafe/libp2p-noise')
-const MPLEX = require('libp2p-mplex')
-
-const autoRelayNodeAddr = process.argv[2]
-if (!autoRelayNodeAddr) {
-  throw new Error('the auto relay node address needs to be specified')
-}
-
-const node = await Libp2p.create({
-  modules: {
-    transport: [Websockets],
-    connEncryption: [NOISE],
-    streamMuxer: [MPLEX]
-  }
-})
-
-await node.start()
-console.log(`Node started with id ${node.peerId.toB58String()}`)
-
-const conn = await node.dial(autoRelayNodeAddr)
-console.log(`Connected to the auto relay node via ${conn.remoteAddr.toString()}`)
-```
-
-You should now run the following to start the relay node using the listen address from step 2:
-
-```sh
-node dialer.js /ip4/192.168.1.120/tcp/61592/ws/p2p/QmWDn2LY8nannvSWJzruUYoLZ4vV83vfCBwd8DipvdgQc3
-```
-
-Once you start your test node, it should print out something similar to the following:
-
-```sh
-Node started: Qme7iEzDxFoFhhkrsrkHkMnM11aPYjysaehP4NZeUfVMKG
-Connected to the auto relay node via /ip4/192.168.1.120/tcp/61592/ws/p2p/QmWDn2LY8nannvSWJzruUYoLZ4vV83vfCBwd8DipvdgQc3/p2p-circuit/p2p/QmerrWofKF358JE6gv3z74cEAyL7z1KqhuUoVfGEynqjRm
-```
-
-As you can see from the output, the remote address of the established connection uses the relayed connection.
-
-## 4. What is next?
-
-Before moving into production, there are a few things that you should take into account.
-
-A relay node should not advertise its private address in a real world scenario, as the node would not be reachable by others. You should provide an array of public addresses in the libp2p `addresses.announce` option. If you are using websockets, bear in mind that due to browser’s security policies you cannot establish unencrypted connection from secure context. The simplest solution is to setup SSL with nginx and proxy to the node and setup a domain name for the certificate.
--- a/examples/auto-relay/dialer.js
+++ b/examples/auto-relay/dialer.js
@ -1,29 +0,0 @@
-'use strict'
-
-const Libp2p = require('libp2p')
-const Websockets = require('libp2p-websockets')
-const { NOISE } = require('@chainsafe/libp2p-noise')
-const MPLEX = require('libp2p-mplex')
-
-async function main () {
-  const autoRelayNodeAddr = process.argv[2]
-  if (!autoRelayNodeAddr) {
-    throw new Error('the auto relay node address needs to be specified')
-  }
-
-  const node = await Libp2p.create({
-    modules: {
-      transport: [Websockets],
-      connEncryption: [NOISE],
-      streamMuxer: [MPLEX]
-    }
-  })
-
-  await node.start()
-  console.log(`Node started with id ${node.peerId.toB58String()}`)
-
-  const conn = await node.dial(autoRelayNodeAddr)
-  console.log(`Connected to the auto relay node via ${conn.remoteAddr.toString()}`)
-}
-
-main()
--- a/examples/auto-relay/listener.js
+++ b/examples/auto-relay/listener.js
@ -1,47 +0,0 @@
-'use strict'
-
-const Libp2p = require('libp2p')
-const Websockets = require('libp2p-websockets')
-const { NOISE } = require('@chainsafe/libp2p-noise')
-const MPLEX = require('libp2p-mplex')
-
-async function main () {
-  const relayAddr = process.argv[2]
-  if (!relayAddr) {
-    throw new Error('the relay address needs to be specified as a parameter')
-  }
-
-  const node = await Libp2p.create({
-    modules: {
-      transport: [Websockets],
-      connEncryption: [NOISE],
-      streamMuxer: [MPLEX]
-    },
-    config: {
-      relay: {
-        enabled: true,
-        autoRelay: {
-          enabled: true,
-          maxListeners: 2
-        }
-      }
-    }
-  })
-
-  await node.start()
-  console.log(`Node started with id ${node.peerId.toB58String()}`)
-
-  const conn = await node.dial(relayAddr)
-
-  console.log(`Connected to the HOP relay ${conn.remotePeer.toString()}`)
-
-  // Wait for connection and relay to be bind for the example purpose
-  node.peerStore.on('change:multiaddrs', ({ peerId }) => {
-    // Updated self multiaddrs?
-    if (peerId.equals(node.peerId)) {
-      console.log(`Advertising with a relay address of ${node.multiaddrs[0].toString()}/p2p/${node.peerId.toB58String()}`)
-    }
-  })  
-}
-
-main()
--- a/examples/auto-relay/relay.js
+++ b/examples/auto-relay/relay.js
@ -1,40 +0,0 @@
-'use strict'
-
-const Libp2p = require('libp2p')
-const Websockets = require('libp2p-websockets')
-const { NOISE } = require('@chainsafe/libp2p-noise')
-const MPLEX = require('libp2p-mplex')
-
-async function main () {
-  const node = await Libp2p.create({
-    modules: {
-      transport: [Websockets],
-      connEncryption: [NOISE],
-      streamMuxer: [MPLEX]
-    },
-    addresses: {
-      listen: ['/ip4/0.0.0.0/tcp/0/ws']
-      // TODO check "What is next?" section
-      // announce: ['/dns4/auto-relay.libp2p.io/tcp/443/wss/p2p/QmWDn2LY8nannvSWJzruUYoLZ4vV83vfCBwd8DipvdgQc3']
-    },
-    config: {
-      relay: {
-        enabled: true,
-        hop: {
-          enabled: true
-        },
-        advertise: {
-          enabled: true,
-        }
-      }
-    }
-  })
-
-  await node.start()
-
-  console.log(`Node started with id ${node.peerId.toB58String()}`)
-  console.log('Listening on:')
-  node.multiaddrs.forEach((ma) => console.log(`${ma.toString()}/p2p/${node.peerId.toB58String()}`))
-}
-
-main()
--- a/examples/auto-relay/test.js
+++ b/examples/auto-relay/test.js
@ -1,94 +0,0 @@
-'use strict'
-
-const path = require('path')
-const execa = require('execa')
-const pDefer = require('p-defer')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
-
-function startProcess (name, args = []) {
-  return execa('node', [path.join(__dirname, name), ...args], {
-    cwd: path.resolve(__dirname),
-    all: true
-  })
-}
-
-async function test () {
-  let output1 = ''
-  let output2 = ''
-  let output3 = ''
-  let relayAddr
-  let autoRelayAddr
-
-  const proc1Ready = pDefer()
-  const proc2Ready = pDefer()
-
-  // Step 1 process
-  process.stdout.write('relay.js\n')
-
-  const proc1 = startProcess('relay.js')
-  proc1.all.on('data', async (data) => {
-    process.stdout.write(data)
-
-    output1 += uint8ArrayToString(data)
-
-    if (output1.includes('Listening on:') && output1.includes('/p2p/')) {
-      relayAddr = output1.trim().split('Listening on:\n')[1].split('\n')[0]
-      proc1Ready.resolve()
-    }
-  })
-
-  await proc1Ready.promise
-  process.stdout.write('==================================================================\n')
-
-  // Step 2 process
-  process.stdout.write('listener.js\n')
-
-  const proc2 = startProcess('listener.js', [relayAddr])
-  proc2.all.on('data', async (data) => {
-    process.stdout.write(data)
-
-    output2 += uint8ArrayToString(data)
-
-    if (output2.includes('Advertising with a relay address of') && output2.includes('/p2p/')) {
-      autoRelayAddr = output2.trim().split('Advertising with a relay address of ')[1]
-      proc2Ready.resolve()
-    }
-  })
-
-  await proc2Ready.promise
-  process.stdout.write('==================================================================\n')
-
-  // Step 3 process
-  process.stdout.write('dialer.js\n')
-
-  const proc3 = startProcess('dialer.js', [autoRelayAddr])
-  proc3.all.on('data', async (data) => {
-    process.stdout.write(data)
-
-    output3 += uint8ArrayToString(data)
-
-    if (output3.includes('Connected to the auto relay node via')) {
-      const remoteAddr = output3.trim().split('Connected to the auto relay node via ')[1]
-
-      if (remoteAddr === autoRelayAddr) {
-        proc3.kill()
-        proc2.kill()
-        proc1.kill()
-      } else {
-        throw new Error('dialer did not dial through the relay')
-      }
-    }
-  })
-
-  await Promise.all([
-    proc1,
-    proc2,
-    proc3
-  ]).catch((err) => {
-    if (err.signal !== 'SIGTERM') {
-      throw err
-    }
-  })
-}
-
-module.exports = test
--- a/examples/chat/src/dialer.js
+++ b/examples/chat/src/dialer.js
@ -2,8 +2,8 @@
 /* eslint-disable no-console */

 const PeerId = require('peer-id')
-const { Multiaddr } = require('multiaddr')
-const createLibp2p = require('./libp2p')
+const multiaddr = require('multiaddr')
+const Node = require('./libp2p-bundle')
 const { stdinToStream, streamToConsole } = require('./stream')

 async function run() {
@ -13,7 +13,7 @@ async function run () {
  ])

  // Create a new libp2p node on localhost with a randomly chosen port
-  const nodeDialer = await createLibp2p({
+  const nodeDialer = new Node({
    peerId: idDialer,
    addresses: {
      listen: ['/ip4/0.0.0.0/tcp/0']
@ -30,7 +30,7 @@ async function run () {
  })

  // Dial to the remote peer (the "listener")
-  const listenerMa = new Multiaddr(`/ip4/127.0.0.1/tcp/10333/p2p/${idListener.toB58String()}`)
+  const listenerMa = multiaddr(`/ip4/127.0.0.1/tcp/10333/p2p/${idListener.toB58String()}`)
  const { stream } = await nodeDialer.dialProtocol(listenerMa, '/chat/1.0.0')

  console.log('Dialer dialed to listener on protocol: /chat/1.0.0')
--- a/examples/chat/src/libp2p-bundle.js
+++ b/examples/chat/src/libp2p-bundle.js
@ -0,0 +1,27 @@
+'use strict'
+
+const TCP = require('libp2p-tcp')
+const WS = require('libp2p-websockets')
+const mplex = require('libp2p-mplex')
+const { NOISE } = require('libp2p-noise')
+const defaultsDeep = require('@nodeutils/defaults-deep')
+const libp2p = require('../../..')
+
+class Node extends libp2p {
+  constructor (_options) {
+    const defaults = {
+      modules: {
+        transport: [
+          TCP,
+          WS
+        ],
+        streamMuxer: [ mplex ],
+        connEncryption: [ NOISE ]
+      }
+    }
+
+    super(defaultsDeep(_options, defaults))
+  }
+}
+
+module.exports = Node
--- a/examples/chat/src/libp2p.js
+++ b/examples/chat/src/libp2p.js
@ -1,22 +0,0 @@
-'use strict'
-
-const TCP = require('libp2p-tcp')
-const WS = require('libp2p-websockets')
-const mplex = require('libp2p-mplex')
-const { NOISE } = require('@chainsafe/libp2p-noise')
-const defaultsDeep = require('@nodeutils/defaults-deep')
-const libp2p = require('../../..')
-
-async function createLibp2p(_options) {
-  const defaults = {
-    modules: {
-      transport: [TCP, WS],
-      streamMuxer: [mplex],
-      connEncryption: [NOISE],
-    },
-  }
-
-  return libp2p.create(defaultsDeep(_options, defaults))
-}
-
-module.exports = createLibp2p
--- a/examples/chat/src/listener.js
+++ b/examples/chat/src/listener.js
@ -2,13 +2,13 @@
 /* eslint-disable no-console */

 const PeerId = require('peer-id')
-const createLibp2p = require('./libp2p.js')
+const Node = require('./libp2p-bundle.js')
 const { stdinToStream, streamToConsole } = require('./stream')

 async function run() {
  // Create a new libp2p node with the given multi-address
  const idListener = await PeerId.createFromJSON(require('./peer-id-listener'))
-  const nodeListener = await createLibp2p({
+  const nodeListener = new Node({
    peerId: idListener,
    addresses: {
      listen: ['/ip4/0.0.0.0/tcp/10333']
--- a/examples/chat/test.js
+++ b/examples/chat/test.js
@ -1,77 +0,0 @@
-'use strict'
-
-const path = require('path')
-const execa = require('execa')
-const pDefer = require('p-defer')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
-
-function startProcess(name) {
-  return execa('node', [path.join(__dirname, name)], {
-    cwd: path.resolve(__dirname),
-    all: true
-  })
-}
-
-async function test () {
-  const message = 'test message'
-  let listenerOutput = ''
-  let dialerOutput = ''
-
-  let isListening = false
-  let messageSent = false
-  const listenerReady = pDefer()
-  const dialerReady = pDefer()
-  const messageReceived = pDefer()
-
-  // Step 1 process
-  process.stdout.write('node listener.js\n')
-  const listenerProc = startProcess('src/listener.js')
-  listenerProc.all.on('data', async (data) => {
-    process.stdout.write(data)
-
-    listenerOutput += uint8ArrayToString(data)
-
-    if (!isListening && listenerOutput.includes('Listener ready, listening on')) {
-      listenerReady.resolve()
-      isListening = true
-    } else if (isListening && listenerOutput.includes(message)) {
-      messageReceived.resolve()
-    }
-  })
-
-  await listenerReady.promise
-  process.stdout.write('==================================================================\n')
-
-  // Step 2 process
-  process.stdout.write('node dialer.js\n')
-  const dialerProc = startProcess('src/dialer.js')
-  dialerProc.all.on('data', async (data) => {
-    process.stdout.write(data)
-    dialerOutput += uint8ArrayToString(data)
-
-    if (!messageSent && dialerOutput.includes('Type a message and see what happens')) {
-      dialerReady.resolve()
-      dialerProc.stdin.write(message)
-      dialerProc.stdin.write('\n')
-      messageSent = true
-    }
-  })
-
-  await dialerReady.promise
-  process.stdout.write('==================================================================\n')
-  await messageReceived.promise
-  process.stdout.write('chat message received\n')
-
-  listenerProc.kill()
-  dialerProc.kill()
-  await Promise.all([
-    listenerProc,
-    dialerProc
-  ]).catch((err) => {
-    if (err.signal !== 'SIGTERM') {
-      throw err
-    }
-  })
-}
-
-module.exports = test
--- a/examples/connection-encryption/test.js
+++ b/examples/connection-encryption/test.js
@ -1,30 +0,0 @@
-'use strict'
-
-const path = require('path')
-const execa = require('execa')
-const pDefer = require('p-defer')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
-
-async function test () {
-  const messageReceived = pDefer()
-  process.stdout.write('1.js\n')
-
-  const proc = execa('node', [path.join(__dirname, '1.js')], {
-    cwd: path.resolve(__dirname),
-    all: true
-  })
-
-  proc.all.on('data', async (data) => {
-    process.stdout.write(data)
-
-    const s = uint8ArrayToString(data)
-    if (s.includes('This information is sent out encrypted to the other peer')) {
-      messageReceived.resolve()
-    }
-  })
-
-  await messageReceived.promise
-  proc.kill()
-}
-
-module.exports = test
--- a/examples/delegated-routing/package.json
+++ b/examples/delegated-routing/package.json
@ -7,7 +7,7 @@
    "libp2p": "github:libp2p/js-libp2p#master",
    "libp2p-delegated-content-routing": "~0.2.2",
    "libp2p-delegated-peer-routing": "~0.2.2",
-    "libp2p-kad-dht": "^0.26.5",
+    "libp2p-kad-dht": "~0.14.12",
    "libp2p-mplex": "~0.8.5",
    "libp2p-secio": "~0.11.1",
    "libp2p-webrtc-star": "~0.15.8",
--- a/examples/discovery-mechanisms/1.js
+++ b/examples/discovery-mechanisms/1.js
@ -4,10 +4,21 @@
 const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
-const { NOISE } = require('@chainsafe/libp2p-noise')
+const { NOISE } = require('libp2p-noise')
 const Bootstrap = require('libp2p-bootstrap')

-const bootstrapers = require('./bootstrapers')
+// Find this list at: https://github.com/ipfs/js-ipfs/blob/master/src/core/runtime/config-nodejs.json
+const bootstrapers = [
+  '/ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
+  '/ip4/104.236.176.52/tcp/4001/p2p/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z',
+  '/ip4/104.236.179.241/tcp/4001/p2p/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
+  '/ip4/162.243.248.213/tcp/4001/p2p/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
+  '/ip4/128.199.219.111/tcp/4001/p2p/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
+  '/ip4/104.236.76.40/tcp/4001/p2p/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64',
+  '/ip4/178.62.158.247/tcp/4001/p2p/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
+  '/ip4/178.62.61.185/tcp/4001/p2p/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3',
+  '/ip4/104.236.151.122/tcp/4001/p2p/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx'
+]

 ;(async () => {
  const node = await Libp2p.create({
--- a/examples/discovery-mechanisms/2.js
+++ b/examples/discovery-mechanisms/2.js
@ -4,7 +4,7 @@
 const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
-const { NOISE } = require('@chainsafe/libp2p-noise')
+const { NOISE } = require('libp2p-noise')
 const MulticastDNS = require('libp2p-mdns')

 const createNode = async () => {
--- a/examples/discovery-mechanisms/3.js
+++ b/examples/discovery-mechanisms/3.js
@ -1,68 +0,0 @@
-/* eslint-disable no-console */
-'use strict'
-
-const Libp2p = require('../../')
-const TCP = require('libp2p-tcp')
-const Mplex = require('libp2p-mplex')
-const { NOISE } = require('@chainsafe/libp2p-noise')
-const Gossipsub = require('libp2p-gossipsub')
-const Bootstrap = require('libp2p-bootstrap')
-const PubsubPeerDiscovery = require('libp2p-pubsub-peer-discovery')
-
-const createRelayServer = require('libp2p-relay-server')
-
-const createNode = async (bootstrapers) => {
-  const node = await Libp2p.create({
-    addresses: {
-      listen: ['/ip4/0.0.0.0/tcp/0']
-    },
-    modules: {
-      transport: [TCP],
-      streamMuxer: [Mplex],
-      connEncryption: [NOISE],
-      pubsub: Gossipsub,
-      peerDiscovery: [Bootstrap, PubsubPeerDiscovery]
-    },
-    config: {
-      peerDiscovery: {
-        [PubsubPeerDiscovery.tag]: {
-          interval: 1000,
-          enabled: true
-        },
-        [Bootstrap.tag]: {
-          enabled: true,
-          list: bootstrapers
-        }
-      }
-    }
-  })
-
-  return node
-}
-
-;(async () => {
-  const relay = await createRelayServer({
-    listenAddresses: ['/ip4/0.0.0.0/tcp/0']
-  })
-  console.log(`libp2p relay starting with id: ${relay.peerId.toB58String()}`)
-  await relay.start()
-  const relayMultiaddrs = relay.multiaddrs.map((m) => `${m.toString()}/p2p/${relay.peerId.toB58String()}`)
-
-  const [node1, node2] = await Promise.all([
-    createNode(relayMultiaddrs),
-    createNode(relayMultiaddrs)
-  ])
-
-  node1.on('peer:discovery', (peerId) => {
-    console.log(`Peer ${node1.peerId.toB58String()} discovered: ${peerId.toB58String()}`)
-  })
-  node2.on('peer:discovery', (peerId) => {
-    console.log(`Peer ${node2.peerId.toB58String()} discovered: ${peerId.toB58String()}`)
-  })
-
-  ;[node1, node2].forEach((node, index) => console.log(`Node ${index} starting with id: ${node.peerId.toB58String()}`))
-  await Promise.all([
-    node1.start(),
-    node2.start()
-  ])
-})();
--- a/examples/discovery-mechanisms/README.md
+++ b/examples/discovery-mechanisms/README.md
@ -2,13 +2,13 @@

 A Peer Discovery module enables libp2p to find peers to connect to. Think of these mechanisms as ways to join the rest of the network, as railing points.

-With this system, a libp2p node can both have a set of nodes to always connect on boot (bootstraper nodes), discover nodes through locality (e.g connected in the same LAN) or through serendipity (random walks on a DHT).
+With these system, a libp2p node can both have a set of nodes to always connect on boot (bootstraper nodes), discover nodes through locality (e.g connected in the same LAN) or through serendipity (random walks on a DHT).

 These mechanisms save configuration and enable a node to operate without any explicit dials, it will just work. Once new peers are discovered, their known data is stored in the peer's PeerStore.

 ## 1. Bootstrap list of Peers when booting a node

-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 NOISE. You can see the complete example at [1.js](./1.js).
+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 NOISE. You can see the complete example at [1.js](./1.js).

 First, we create our libp2p node.

@ -16,7 +16,7 @@ First, we create our libp2p node.
 const Libp2p = require('libp2p')
 const Bootstrap = require('libp2p-bootstrap')

-const node = await Libp2p.create({
+const node = Libp2p.create({
  modules: {
    transport: [ TCP ],
    streamMuxer: [ Mplex ],
@ -40,11 +40,14 @@ In this configuration, we use a `bootstrappers` array listing peers to connect _
 ```JavaScript
 const bootstrapers = [
  '/ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
-  '/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN',
-  '/dnsaddr/bootstrap.libp2p.io/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb',
-  '/dnsaddr/bootstrap.libp2p.io/p2p/QmZa1sAxajnQjVM8WjWXoMbmPd7NsWhfKsPkErzpm9wGkp',
-  '/dnsaddr/bootstrap.libp2p.io/p2p/QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa',
-  '/dnsaddr/bootstrap.libp2p.io/p2p/QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt'
+  '/ip4/104.236.176.52/tcp/4001/p2p/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z',
+  '/ip4/104.236.179.241/tcp/4001/p2p/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
+  '/ip4/162.243.248.213/tcp/4001/p2p/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
+  '/ip4/128.199.219.111/tcp/4001/p2p/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
+  '/ip4/104.236.76.40/tcp/4001/p2p/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64',
+  '/ip4/178.62.158.247/tcp/4001/p2p/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
+  '/ip4/178.62.61.185/tcp/4001/p2p/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3',
+  '/ip4/104.236.151.122/tcp/4001/p2p/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx'
 ]
 ```

@ -55,7 +58,7 @@ const node = await Libp2p.create({
  peerId,
  addresses: {
    listen: ['/ip4/0.0.0.0/tcp/0']
-  },
+  }
  modules: {
    transport: [ TCP ],
    streamMuxer: [ Mplex ],
@ -90,17 +93,23 @@ From running [1.js](./1.js), you should see the following:
 ```bash
 > node 1.js
 Discovered: QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ
-Discovered: QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN
-Discovered: QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb
-Discovered: QmZa1sAxajnQjVM8WjWXoMbmPd7NsWhfKsPkErzpm9wGkp
-Discovered: QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa
-Discovered: QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt
+Discovered: QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z
+Discovered: QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM
+Discovered: QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm
+Discovered: QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu
+Discovered: QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64
+Discovered: QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd
+Discovered: QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3
+Discovered: QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx
 Connection established to: QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ
-Connection established to: QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN
-Connection established to: QmZa1sAxajnQjVM8WjWXoMbmPd7NsWhfKsPkErzpm9wGkp
-Connection established to: QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa
-Connection established to: QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt
-Connection established to: QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb
+Connection established to: QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z
+Connection established to: QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM
+Connection established to: QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm
+Connection established to: QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu
+Connection established to: QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64
+Connection established to: QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd
+Connection established to: QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3
+Connection established to: QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx
 ```

 ## 2. MulticastDNS to find other peers in the network
@ -117,7 +126,7 @@ const createNode = () => {
  return Libp2p.create({
    addresses: {
      listen: ['/ip4/0.0.0.0/tcp/0']
-    },
+    }
    modules: {
      transport: [ TCP ],
      streamMuxer: [ Mplex ],
@ -144,13 +153,8 @@ const [node1, node2] = await Promise.all([
  createNode()
 ])

-node1.on('peer:discovery', (peer) => console.log('Discovered:', peerId.toB58String()))
-node2.on('peer:discovery', (peer) => console.log('Discovered:', peerId.toB58String()))
-
-await Promise.all([
-  node1.start(),
-  node2.start()
-])
+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 the other peers being discovered.
@ -161,103 +165,10 @@ Discovered: QmSSbQpuKrxkoXHm1v4Pi35hPN5hUHMZoBoawEs2Nhvi8m
 Discovered: QmRcXXhtG8vTqwVBRonKWtV4ovDoC1Fe56WYtcrw694eiJ
 ```

-## 3. Pubsub based Peer Discovery
-
-For this example, we need [`libp2p-pubsub-peer-discovery`](https://github.com/libp2p/js-libp2p-pubsub-peer-discovery/), go ahead and `npm install` it. You also need to spin up a set of [`libp2p-relay-servers`](https://github.com/libp2p/js-libp2p-relay-server). These servers act as relay servers and a peer discovery source.
-
-In the context of this example, we will create and run the `libp2p-relay-server` in the same code snippet. You can find the complete solution at [3.js](./3.js).
-
-You can create your libp2p nodes as follows:
-
-```js
-const Libp2p = require('libp2p')
-const TCP = require('libp2p-tcp')
-const Mplex = require('libp2p-mplex')
-const { NOISE } = require('@chainsafe/libp2p-noise')
-const Gossipsub = require('libp2p-gossipsub')
-const Bootstrap = require('libp2p-bootstrap')
-const PubsubPeerDiscovery = require('libp2p-pubsub-peer-discovery')
-
-const createNode = async (bootstrapers) => {
-  const node = await Libp2p.create({
-    addresses: {
-      listen: ['/ip4/0.0.0.0/tcp/0']
-    },
-    modules: {
-      transport: [TCP],
-      streamMuxer: [Mplex],
-      connEncryption: [NOISE],
-      pubsub: Gossipsub,
-      peerDiscovery: [Bootstrap, PubsubPeerDiscovery]
-    },
-    config: {
-      peerDiscovery: {
-        [PubsubPeerDiscovery.tag]: {
-          interval: 1000,
-          enabled: true
-        },
-        [Bootstrap.tag]: {
-          enabled: true,
-          list: bootstrapers
-        }
-      }
-    }
-  })
-
-  return node
-}
-```
-
-We will use the `libp2p-relay-server` as bootstrap nodes for the libp2p nodes, so that they establish a connection with the relay after starting. As a result, after they establish a connection with the relay, the pubsub discovery will kick in and the relay will advertise them.
-
-```js
-const relay = await createRelayServer({
-  listenAddresses: ['/ip4/0.0.0.0/tcp/0']
-})
-console.log(`libp2p relay starting with id: ${relay.peerId.toB58String()}`)
-await relay.start()
-const relayMultiaddrs = relay.multiaddrs.map((m) => `${m.toString()}/p2p/${relay.peerId.toB58String()}`)
-
-const [node1, node2] = await Promise.all([
-  createNode(relayMultiaddrs),
-  createNode(relayMultiaddrs)
-])
-
-node1.on('peer:discovery', (peerId) => {
-  console.log(`Peer ${node1.peerId.toB58String()} discovered: ${peerId.toB58String()}`)
-})
-node2.on('peer:discovery', (peerId) => {
-  console.log(`Peer ${node2.peerId.toB58String()} discovered: ${peerId.toB58String()}`)
-})
-
-;[node1, node2].forEach((node, index) => console.log(`Node ${index} starting with id: ${node.peerId.toB58String()}`))
-await Promise.all([
-  node1.start(),
-  node2.start()
-])
-```
-
-If you run this example, you will see the other peers being discovered.
-
-```bash
-> node 3.js
-libp2p relay starting with id: QmW6FqVV6RsyoGC5zaeFGW9gSWA3LcBRVZrjkKMruh38Bo
-Node 0 starting with id: QmezqDTmEjZ5BfMgVqjSpLY19mVVLTQ9bE9mRpZwtGxL8N
-Node 1 starting with id: QmYWeom2odTkm79DzB68NHULqVHDaNDqHhoyqLdcV1fqdv
-Peer QmezqDTmEjZ5BfMgVqjSpLY19mVVLTQ9bE9mRpZwtGxL8N discovered: QmW6FqVV6RsyoGC5zaeFGW9gSWA3LcBRVZrjkKMruh38Bo
-Peer QmYWeom2odTkm79DzB68NHULqVHDaNDqHhoyqLdcV1fqdv discovered: QmW6FqVV6RsyoGC5zaeFGW9gSWA3LcBRVZrjkKMruh38Bo
-Peer QmYWeom2odTkm79DzB68NHULqVHDaNDqHhoyqLdcV1fqdv discovered: QmezqDTmEjZ5BfMgVqjSpLY19mVVLTQ9bE9mRpZwtGxL8N
-Peer QmezqDTmEjZ5BfMgVqjSpLY19mVVLTQ9bE9mRpZwtGxL8N discovered: QmYWeom2odTkm79DzB68NHULqVHDaNDqHhoyqLdcV1fqdv
-```
-
-Taking into account the output, after the relay and both libp2p nodes start, both libp2p nodes will discover the bootstrap node (relay) and connect with it. After establishing a connection with the relay, they will discover each other.
-
-This is really useful when running libp2p in constrained environments like a browser. You can run a set of `libp2p-relay-server` nodes that will be responsible for both relaying websocket connections between browser nodes and for discovering other browser peers.
-
-## 4. Where to find other Peer Discovery Mechanisms
+## 3. Where to find other Peer Discovery Mechanisms

 There are plenty more Peer Discovery Mechanisms out there, you can:

 - Find one in [libp2p-webrtc-star](https://github.com/libp2p/js-libp2p-webrtc-star). Yes, a transport with discovery capabilities! This happens because WebRTC requires a rendezvous point for peers to exchange [SDP](https://tools.ietf.org/html/rfc4317) offer, which means we have one or more points that can introduce peers to each other. Think of it as MulticastDNS for the Web, as in MulticastDNS only works in LAN.
- Any DHT will offer you a discovery capability. You can simple _random-walk_ the routing tables to find other peers to connect to. For example [libp2p-kad-dht](https://github.com/libp2p/js-libp2p-kad-dht) can be used for peer discovery. An example of how to configure it to enable random walks can be found [here](https://github.com/libp2p/js-libp2p/blob/v0.28.4/doc/CONFIGURATION.md#customizing-dht).
+- Any DHT will offer you a discovery capability. You can simple _random-walk_ the routing tables to find other peers to connect to. For example [libp2p-kad-dht](https://github.com/libp2p/js-libp2p-kad-dht) can be used for peer discovery. An example how to configure it to enable random walks can be found [here](https://github.com/libp2p/js-libp2p/blob/v0.28.4/doc/CONFIGURATION.md#customizing-dht).
 - You can create your own Discovery service, a registry, a list, a radio beacon, you name it!
--- a/examples/discovery-mechanisms/bootstrapers.js
+++ b/examples/discovery-mechanisms/bootstrapers.js
@ -1,13 +0,0 @@
-'use strict'
-
-// Find this list at: https://github.com/ipfs/js-ipfs/blob/master/packages/ipfs-core/src/runtime/config-nodejs.js
-const bootstrapers = [
-  '/ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
-  '/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN',
-  '/dnsaddr/bootstrap.libp2p.io/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb',
-  '/dnsaddr/bootstrap.libp2p.io/p2p/QmZa1sAxajnQjVM8WjWXoMbmPd7NsWhfKsPkErzpm9wGkp',
-  '/dnsaddr/bootstrap.libp2p.io/p2p/QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa',
-  '/dnsaddr/bootstrap.libp2p.io/p2p/QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt'
-]
-
-module.exports = bootstrapers
--- a/examples/discovery-mechanisms/test-1.js
+++ b/examples/discovery-mechanisms/test-1.js
@ -1,42 +0,0 @@
-'use strict'
-
-const path = require('path')
-const execa = require('execa')
-const pWaitFor = require('p-wait-for')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
-const bootstrapers = require('./bootstrapers')
-
-const discoveredCopy = 'Discovered:'
-const connectedCopy = 'Connection established to:'
-
-async function test () {
-  const discoveredNodes = []
-  const connectedNodes = []
-
-  process.stdout.write('1.js\n')
-
-  const proc = execa('node', [path.join(__dirname, '1.js')], {
-    cwd: path.resolve(__dirname),
-    all: true
-  })
-
-  proc.all.on('data', async (data) => {
-    process.stdout.write(data)
-    const line = uint8ArrayToString(data)
-
-    // Discovered or Connected
-    if (line.includes(discoveredCopy)) {
-      const id = line.trim().split(discoveredCopy)[1]
-      discoveredNodes.push(id)
-    } else if (line.includes(connectedCopy)) {
-      const id = line.trim().split(connectedCopy)[1]
-      connectedNodes.push(id)
-    }
-  })
-
-  await pWaitFor(() => discoveredNodes.length === bootstrapers.length && connectedNodes.length === bootstrapers.length)
-
-  proc.kill()
-}
-
-module.exports = test
--- a/examples/discovery-mechanisms/test-2.js
+++ b/examples/discovery-mechanisms/test-2.js
@ -1,35 +0,0 @@
-'use strict'
-
-const path = require('path')
-const execa = require('execa')
-const pWaitFor = require('p-wait-for')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
-
-const discoveredCopy = 'Discovered:'
-
-async function test() {
-  const discoveredNodes = []
-
-  process.stdout.write('2.js\n')
-
-  const proc = execa('node', [path.join(__dirname, '2.js')], {
-    cwd: path.resolve(__dirname),
-    all: true
-  })
-
-  proc.all.on('data', async (data) => {
-    process.stdout.write(data)
-    const line = uint8ArrayToString(data)
-
-    if (line.includes(discoveredCopy)) {
-      const id = line.trim().split(discoveredCopy)[1]
-      discoveredNodes.push(id)
-    }
-  })
-
-  await pWaitFor(() => discoveredNodes.length === 2)
-
-  proc.kill()
-}
-
-module.exports = test
--- a/examples/discovery-mechanisms/test-3.js
+++ b/examples/discovery-mechanisms/test-3.js
@ -1,35 +0,0 @@
-'use strict'
-
-const path = require('path')
-const execa = require('execa')
-const pWaitFor = require('p-wait-for')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
-
-const discoveredCopy = 'discovered:'
-
-async function test() {
-  let discoverCount = 0
-
-  process.stdout.write('3.js\n')
-
-  const proc = execa('node', [path.join(__dirname, '3.js')], {
-    cwd: path.resolve(__dirname),
-    all: true
-  })
-
-  proc.all.on('data', async (data) => {
-    process.stdout.write(data)
-    const line = uint8ArrayToString(data)
-
-    // Discovered or Connected
-    if (line.includes(discoveredCopy)) {
-      discoverCount++
-    }
-  })
-
-  await pWaitFor(() => discoverCount === 4)
-
-  proc.kill()
-}
-
-module.exports = test
--- a/examples/discovery-mechanisms/test.js
+++ b/examples/discovery-mechanisms/test.js
@ -1,13 +0,0 @@
-'use strict'
-
-const test1 = require('./test-1')
-const test2 = require('./test-2')
-const test3 = require('./test-3')
-
-async function test () {
-  await test1()
-  await test2()
-  await test3()
-}
-
-module.exports = test
--- a/examples/echo/src/dialer.js
+++ b/examples/echo/src/dialer.js
@ -5,8 +5,9 @@
 * Dialer Node
 */

+const multiaddr = require('multiaddr')
 const PeerId = require('peer-id')
-const createLibp2p = require('./libp2p')
+const Node = require('./libp2p-bundle')
 const pipe = require('it-pipe')

 async function run() {
@ -16,7 +17,7 @@ async function run() {
  ])

  // Dialer
-  const dialerNode = await createLibp2p({
+  const dialerNode = new Node({
    addresses: {
      listen: ['/ip4/0.0.0.0/tcp/0']
    },
--- a/examples/echo/src/libp2p-bundle.js
+++ b/examples/echo/src/libp2p-bundle.js
@ -0,0 +1,28 @@
+'use strict'
+
+const TCP = require('libp2p-tcp')
+const WS = require('libp2p-websockets')
+const mplex = require('libp2p-mplex')
+const { NOISE } = require('libp2p-noise')
+
+const defaultsDeep = require('@nodeutils/defaults-deep')
+const libp2p = require('../../..')
+
+class Node extends libp2p {
+  constructor (_options) {
+    const defaults = {
+      modules: {
+        transport: [
+          TCP,
+          WS
+        ],
+        streamMuxer: [ mplex ],
+        connEncryption: [ NOISE ]
+      }
+    }
+
+    super(defaultsDeep(_options, defaults))
+  }
+}
+
+module.exports = Node
--- a/examples/echo/src/libp2p.js
+++ b/examples/echo/src/libp2p.js
@ -1,23 +0,0 @@
-'use strict'
-
-const TCP = require('libp2p-tcp')
-const WS = require('libp2p-websockets')
-const mplex = require('libp2p-mplex')
-const { NOISE } = require('@chainsafe/libp2p-noise')
-
-const defaultsDeep = require('@nodeutils/defaults-deep')
-const libp2p = require('../../..')
-
-async function createLibp2p(_options) {
-  const defaults = {
-    modules: {
-      transport: [TCP, WS],
-      streamMuxer: [mplex],
-      connEncryption: [NOISE],
-    },
-  }
-
-  return libp2p.create(defaultsDeep(_options, defaults))
-}
-
-module.exports = createLibp2p
--- a/examples/echo/src/listener.js
+++ b/examples/echo/src/listener.js
@ -6,14 +6,14 @@
 */

 const PeerId = require('peer-id')
-const createLibp2p = require('./libp2p')
+const Node = require('./libp2p-bundle')
 const pipe = require('it-pipe')

 async function run() {
  const listenerId = await PeerId.createFromJSON(require('./id-l'))

  // Listener libp2p node
-  const listenerNode = await createLibp2p({
+  const listenerNode = new Node({
    addresses: {
      listen: ['/ip4/0.0.0.0/tcp/10333']
    },
--- a/examples/echo/test.js
+++ b/examples/echo/test.js
@ -1,61 +0,0 @@
-'use strict'
-
-const path = require('path')
-const execa = require('execa')
-const pDefer = require('p-defer')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
-
-function startProcess(name) {
-  return execa('node', [path.join(__dirname, name)], {
-    cwd: path.resolve(__dirname),
-    all: true
-  })
-}
-
-async function test () {
-  const listenerReady = pDefer()
-  const messageReceived = pDefer()
-
-  // Step 1 process
-  process.stdout.write('node listener.js\n')
-  const listenerProc = startProcess('src/listener.js')
-  listenerProc.all.on('data', async (data) => {
-    process.stdout.write(data)
-    const s = uint8ArrayToString(data)
-
-    if (s.includes('Listener ready, listening on:')) {
-      listenerReady.resolve()
-    }
-  })
-
-  await listenerReady.promise
-  process.stdout.write('==================================================================\n')
-
-  // Step 2 process
-  process.stdout.write('node dialer.js\n')
-  const dialerProc = startProcess('src/dialer.js')
-  dialerProc.all.on('data', async (data) => {
-    process.stdout.write(data)
-    const s = uint8ArrayToString(data)
-
-    if (s.includes('received echo:')) {
-      messageReceived.resolve()
-    }
-  })
-
-  await messageReceived.promise
-  process.stdout.write('echo message received\n')
-
-  listenerProc.kill()
-  dialerProc.kill()
-  await Promise.all([
-    listenerProc,
-    dialerProc
-  ]).catch((err) => {
-    if (err.signal !== 'SIGTERM') {
-      throw err
-    }
-  })
-}
-
-module.exports = test
--- a/examples/encrypted-communications/1.js
+++ b/examples/encrypted-communications/1.js
@ -1,9 +1,9 @@
 'use strict'

-const Libp2p = require('../..')
+const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
-const { NOISE } = require('@chainsafe/libp2p-noise')
+const { NOISE } = require('libp2p-noise')

 const pipe = require('it-pipe')

--- a/examples/encrypted-communications/README.md
+++ b/examples/encrypted-communications/README.md
@ -1,4 +1,4 @@
-# Connection Encryption
+# Encrypted Communications

 libp2p can leverage the encrypted communications from the transports it uses (i.e WebRTC). To ensure that every connection is encrypted, independently of how it was set up, libp2p also supports a set of modules that encrypt every communication established.

@ -8,13 +8,13 @@ A byproduct of having these encrypted communications modules is that we can auth

 # 1. Set up encrypted communications

-We will build this example on top of example for [Protocol and Stream Multiplexing](../protocol-and-stream-multiplexing). You will need the `@chainsafe/libp2p-noise` module to complete it, go ahead and `npm install @chainsafe/libp2p-noise`.
+We will build this example on top of example for [Protocol and Stream Multiplexing](../protocol-and-stream-multiplexing). You will need the `libp2p-noise` module to complete it, go ahead and `npm install libp2p-noise`.

 To add them to your libp2p configuration, all you have to do is:

 ```JavaScript
 const Libp2p = require('libp2p')
-const { NOISE } = require('@chainsafe/libp2p-noise')
+const { NOISE } = require('libp2p-noise')

 const createNode = () => {
  return Libp2p.create({
--- a/examples/libp2p-in-the-browser/README.md
+++ b/examples/libp2p-in-the-browser/README.md
@ -4,13 +4,9 @@ This example leverages the [Parcel.js bundler](https://parceljs.org/) to compile

 ## Setup

-In order to run the example:
-
- Install dependencey at the root of the js-libp2p repository (if not already done), 
- then, install the dependencies from same directory as this README:
+In order to run the example, first install the dependencies from same directory as this README:

 ```
-npm install
 cd ./examples/libp2p-in-the-browser
 npm install
 ```
--- a/examples/libp2p-in-the-browser/index.html
+++ b/examples/libp2p-in-the-browser/index.html
@ -16,7 +16,7 @@
      <pre id="output"></pre>
    </main>

-    <script type="module" src="./index.js"></script>
+    <script src="./index.js"></script>

  </body>

--- a/examples/libp2p-in-the-browser/index.js
+++ b/examples/libp2p-in-the-browser/index.js
@ -2,7 +2,7 @@ import 'babel-polyfill'
 import Libp2p from 'libp2p'
 import Websockets from 'libp2p-websockets'
 import WebRTCStar from 'libp2p-webrtc-star'
-import { NOISE } from '@chainsafe/libp2p-noise'
+import { NOISE } from 'libp2p-noise'
 import Mplex from 'libp2p-mplex'
 import Bootstrap from 'libp2p-bootstrap'

--- a/examples/libp2p-in-the-browser/package.json
+++ b/examples/libp2p-in-the-browser/package.json
@ -2,32 +2,32 @@
  "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",
-    "build": "parcel build index.html",
    "start": "parcel index.html"
  },
  "keywords": [],
  "author": "",
  "license": "ISC",
  "dependencies": {
-    "@babel/preset-env": "^7.13.0",
+    "@babel/preset-env": "^7.8.3",
    "libp2p": "../../",
-    "libp2p-bootstrap": "^0.13.0",
-    "libp2p-mplex": "^0.10.4",
-    "@chainsafe/libp2p-noise": "^4.1.0",
-    "libp2p-webrtc-star": "^0.23.0",
-    "libp2p-websockets": "^0.16.1"
+    "libp2p-bootstrap": "^0.12.1",
+    "libp2p-mplex": "^0.10.0",
+    "libp2p-noise": "^2.0.0",
+    "libp2p-webrtc-star": "^0.20.0",
+    "libp2p-websockets": "^0.14.0"
  },
  "devDependencies": {
-    "@babel/cli": "^7.13.10",
-    "@babel/core": "^7.13.0",
+    "@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": "^2.0.1"
+    "parcel-bundler": "^1.12.4"
  }
 }
--- a/examples/libp2p-in-the-browser/test.js
+++ b/examples/libp2p-in-the-browser/test.js
@ -1,52 +0,0 @@
-'use strict'
-
-const execa = require('execa')
-const { chromium } = require('playwright');
-
-async function run() {
-  let url = ''
-  const proc = execa('parcel', ['./index.html'], {
-    preferLocal: true,
-    localDir: __dirname,
-    cwd: __dirname,
-    all: true
-  })
-
-  proc.all.on('data', async (chunk) => {
-    /**@type {string} */
-    const out = chunk.toString()
-
-    if (out.includes('Server running at')) {
-      url = out.split('Server running at ')[1]
-    }
-
-    if (out.includes('Built in')) {
-      try {
-        const browser = await chromium.launch();
-        const page = await browser.newPage();
-        await page.goto(url);
-        await page.waitForFunction(selector => document.querySelector(selector).innerText === 'libp2p started!', '#status')
-        await page.waitForFunction(
-          selector => {
-            const text = document.querySelector(selector).innerText
-            return text.includes('libp2p id is') &&
-              text.includes('Found peer') &&
-              text.includes('Connected to')
-          },
-          '#output',
-          { timeout: 5000 }
-        )
-        await browser.close();
-
-      } catch (/** @type {any} */ err) {
-        console.error(err)
-        process.exit(1)
-      } finally {
-        proc.cancel()
-      }
-    }
-  })
-
-}
-
-module.exports = run
--- a/examples/package.json
+++ b/examples/package.json
@ -1,25 +0,0 @@
-{
-  "name": "libp2p-examples",
-  "version": "1.0.0",
-  "description": "Examples of how to use libp2p",
-  "scripts": {
-    "test": "node ./test.js",
-    "test:all": "node ./test-all.js"
-  },
-  "license": "MIT",
-  "dependencies": {
-    "execa": "^2.1.0",
-    "fs-extra": "^8.1.0",
-    "libp2p": "../src",
-    "libp2p-pubsub-peer-discovery": "^4.0.0",
-    "libp2p-relay-server": "^0.3.0",
-    "libp2p-gossipsub": "^0.11.0",
-    "p-defer": "^3.0.0",
-    "uint8arrays": "^3.0.0",
-    "which": "^2.0.1"
-  },
-  "devDependencies": {
-    "https": "^1.0.0",
-    "playwright": "^1.7.1"
-  }
-}
--- a/examples/peer-and-content-routing/1.js
+++ b/examples/peer-and-content-routing/1.js
@ -4,7 +4,7 @@
 const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
-const { NOISE } = require('@chainsafe/libp2p-noise')
+const { NOISE } = require('libp2p-noise')
 const KadDHT = require('libp2p-kad-dht')

 const delay = require('delay')
--- a/examples/peer-and-content-routing/2.js
+++ b/examples/peer-and-content-routing/2.js
@ -4,8 +4,8 @@
 const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
-const { NOISE } = require('@chainsafe/libp2p-noise')
-const { CID } = require('multiformats/cid')
+const { NOISE } = require('libp2p-noise')
+const CID = require('cids')
 const KadDHT = require('libp2p-kad-dht')

 const all = require('it-all')
@ -51,10 +51,10 @@ const createNode = async () => {
  // Wait for onConnect handlers in the DHT
  await delay(100)

-  const cid = CID.parse('QmTp9VkYvnHyrqKQuFPiuZkiX9gPcqj6x5LJ1rmWuSySnL')
+  const cid = new CID('QmTp9VkYvnHyrqKQuFPiuZkiX9gPcqj6x5LJ1rmWuSySnL')
  await node1.contentRouting.provide(cid)

-  console.log('Node %s is providing %s', node1.peerId.toB58String(), cid.toString())
+  console.log('Node %s is providing %s', node1.peerId.toB58String(), cid.toBaseEncodedString())

  // wait for propagation
  await delay(300)
--- a/examples/peer-and-content-routing/README.md
+++ b/examples/peer-and-content-routing/README.md
@ -81,7 +81,7 @@ Instead of calling `peerRouting.findPeer`, we will use `contentRouting.provide`

 ```JavaScript
 await node1.contentRouting.provide(cid)
-console.log('Node %s is providing %s', node1.peerId.toB58String(), cid.toString())
+console.log('Node %s is providing %s', node1.peerId.toB58String(), cid.toBaseEncodedString())

 const provs = await all(node3.contentRouting.findProviders(cid, { timeout: 5000 }))

--- a/examples/peer-and-content-routing/test-1.js
+++ b/examples/peer-and-content-routing/test-1.js
@ -1,36 +0,0 @@
-'use strict'
-
-const path = require('path')
-const execa = require('execa')
-const pWaitFor = require('p-wait-for')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
-
-async function test() {
-  process.stdout.write('1.js\n')
-
-  const addrs = []
-  let foundIt = false
-  const proc = execa('node', [path.join(__dirname, '1.js')], {
-    cwd: path.resolve(__dirname),
-    all: true
-  })
-
-  proc.all.on('data', async (data) => {
-    process.stdout.write(data)
-
-    const line = uint8ArrayToString(data)
-
-    // Discovered peer
-    if (!foundIt && line.includes('Found it, multiaddrs are:')) {
-      foundIt = true
-    }
-
-    addrs.push(line)
-  })
-
-  await pWaitFor(() => addrs.length === 2)
-
-  proc.kill()
-}
-
-module.exports = test
--- a/examples/peer-and-content-routing/test-2.js
+++ b/examples/peer-and-content-routing/test-2.js
@ -1,40 +0,0 @@
-'use strict'
-
-const path = require('path')
-const execa = require('execa')
-const pDefer = require('p-defer')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
-
-const providedCopy = 'is providing'
-const foundCopy = 'Found provider:'
-
-async function test() {
-  process.stdout.write('2.js\n')
-  const providedDefer = pDefer()
-  const foundDefer = pDefer()
-
-  const proc = execa('node', [path.join(__dirname, '2.js')], {
-    cwd: path.resolve(__dirname),
-    all: true
-  })
-
-  proc.all.on('data', async (data) => {
-    process.stdout.write(data)
-
-    const line = uint8ArrayToString(data)
-
-    if (line.includes(providedCopy)) {
-      providedDefer.resolve()
-    } else if (line.includes(foundCopy)) {
-      foundDefer.resolve()
-    }
-  })
-
-  await Promise.all([
-    providedDefer.promise,
-    foundDefer.promise
-  ])
-  proc.kill()
-}
-
-module.exports = test
--- a/examples/peer-and-content-routing/test.js
+++ b/examples/peer-and-content-routing/test.js
@ -1,11 +0,0 @@
-'use strict'
-
-const test1 = require('./test-1')
-const test2 = require('./test-2')
-
-async function test() {
-  await test1()
-  await test2()
-}
-
-module.exports = test
--- a/examples/pnet/libp2p-node.js
+++ b/examples/pnet/libp2p-node.js
@ -3,7 +3,7 @@
 const Libp2p = require('libp2p')
 const TCP = require('libp2p-tcp')
 const MPLEX = require('libp2p-mplex')
-const { NOISE } = require('@chainsafe/libp2p-noise')
+const { NOISE } = require('libp2p-noise')
 const Protector = require('libp2p/src/pnet')

 /**
--- a/examples/pnet/test.js
+++ b/examples/pnet/test.js
@ -1,30 +0,0 @@
-'use strict'
-
-const path = require('path')
-const execa = require('execa')
-const pDefer = require('p-defer')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
-
-async function test () {
-  const messageReceived = pDefer()
-  process.stdout.write('index.js\n')
-
-  const proc = execa('node', [path.join(__dirname, 'index.js')], {
-    cwd: path.resolve(__dirname),
-    all: true
-  })
-
-  proc.all.on('data', async (data) => {
-    process.stdout.write(data)
-
-    const s = uint8ArrayToString(data)
-    if (s.includes('This message is sent on a private network')) {
-      messageReceived.resolve()
-    }
-  })
-
-  await messageReceived.promise
-  proc.kill()
-}
-
-module.exports = test
--- a/examples/protocol-and-stream-muxing/1.js
+++ b/examples/protocol-and-stream-muxing/1.js
@ -3,7 +3,7 @@
 const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const MPLEX = require('libp2p-mplex')
-const { NOISE } = require('@chainsafe/libp2p-noise')
+const { NOISE } = require('libp2p-noise')

 const pipe = require('it-pipe')

--- a/examples/protocol-and-stream-muxing/2.js
+++ b/examples/protocol-and-stream-muxing/2.js
@ -3,7 +3,7 @@
 const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const MPLEX = require('libp2p-mplex')
-const { NOISE } = require('@chainsafe/libp2p-noise')
+const { NOISE } = require('libp2p-noise')

 const pipe = require('it-pipe')

--- a/examples/protocol-and-stream-muxing/3.js
+++ b/examples/protocol-and-stream-muxing/3.js
@ -4,7 +4,7 @@
 const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const MPLEX = require('libp2p-mplex')
-const { NOISE } = require('@chainsafe/libp2p-noise')
+const { NOISE } = require('libp2p-noise')

 const pipe = require('it-pipe')

--- a/examples/protocol-and-stream-muxing/test-1.js
+++ b/examples/protocol-and-stream-muxing/test-1.js
@ -1,31 +0,0 @@
-'use strict'
-
-const path = require('path')
-const execa = require('execa')
-const pDefer = require('p-defer')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
-
-async function test() {
-  const messageDefer = pDefer()
-  process.stdout.write('1.js\n')
-
-  const proc = execa('node', [path.join(__dirname, '1.js')], {
-    cwd: path.resolve(__dirname),
-    all: true
-  })
-
-  proc.all.on('data', async (data) => {
-    process.stdout.write(data)
-
-    const line = uint8ArrayToString(data)
-
-    if (line.includes('my own protocol, wow!')) {
-      messageDefer.resolve()
-    }
-  })
-
-  await messageDefer.promise
-  proc.kill()
-}
-
-module.exports = test
--- a/examples/protocol-and-stream-muxing/test-2.js
+++ b/examples/protocol-and-stream-muxing/test-2.js
@ -1,38 +0,0 @@
-'use strict'
-
-const path = require('path')
-const execa = require('execa')
-const pWaitFor = require('p-wait-for')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
-
-const messages = [
-  'protocol (a)',
-  'protocol (b)',
-  'another stream on protocol (b)'
-]
-
-async function test() {
-  process.stdout.write('2.js\n')
-
-  let count = 0
-  const proc = execa('node', [path.join(__dirname, '2.js')], {
-    cwd: path.resolve(__dirname),
-    all: true
-  })
-
-  proc.all.on('data', async (data) => {
-    process.stdout.write(data)
-
-    const line = uint8ArrayToString(data)
-
-    if (messages.find((m) => line.includes(m))) {
-      count += 1
-    }
-  })
-
-  await pWaitFor(() => count === messages.length)
-
-  proc.kill()
-}
-
-module.exports = test
--- a/examples/protocol-and-stream-muxing/test-3.js
+++ b/examples/protocol-and-stream-muxing/test-3.js
@ -1,37 +0,0 @@
-'use strict'
-
-const path = require('path')
-const execa = require('execa')
-const pWaitFor = require('p-wait-for')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
-
-const messages = [
-  'from 1 to 2',
-  'from 2 to 1'
-]
-
-async function test() {
-  process.stdout.write('3.js\n')
-
-  let count = 0
-  const proc = execa('node', [path.join(__dirname, '3.js')], {
-    cwd: path.resolve(__dirname),
-    all: true
-  })
-
-  proc.all.on('data', async (data) => {
-    process.stdout.write(data)
-
-    const line = uint8ArrayToString(data)
-
-    if (messages.find((m) => line.includes(m))) {
-      count += 1
-    }
-  })
-
-  await pWaitFor(() => count === messages.length)
-
-  proc.kill()
-}
-
-module.exports = test
--- a/examples/protocol-and-stream-muxing/test.js
+++ b/examples/protocol-and-stream-muxing/test.js
@ -1,13 +0,0 @@
-'use strict'
-
-const test1 = require('./test-1')
-const test2 = require('./test-2')
-const test3 = require('./test-3')
-
-async function test() {
-  await test1()
-  await test2()
-  await test3()
-}
-
-module.exports = test
--- a/examples/pubsub/1.js
+++ b/examples/pubsub/1.js
@ -4,10 +4,10 @@
 const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
-const { NOISE } = require('@chainsafe/libp2p-noise')
+const { NOISE } = require('libp2p-noise')
 const Gossipsub = require('libp2p-gossipsub')
-const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
+const uint8ArrayFromString = require('uint8arrays/from-string')
+const uint8ArrayToString = require('uint8arrays/to-string')

 const createNode = async () => {
  const node = await Libp2p.create({
@ -43,7 +43,6 @@ const createNode = async () => {
  })
  await node1.pubsub.subscribe(topic)

-  // Will not receive own published messages by default
  node2.pubsub.on(topic, (msg) => {
    console.log(`node2 received: ${uint8ArrayToString(msg.data)}`)
  })
--- a/examples/pubsub/README.md
+++ b/examples/pubsub/README.md
@ -8,10 +8,6 @@ We've seen many interesting use cases appear with this, here are some highlights
 - [IPFS PubSub (using libp2p-floodsub) for IoT](https://www.youtube.com/watch?v=qLpM5pBDGiE).
 - [Real Time distributed Applications](https://www.youtube.com/watch?v=vQrbxyDPSXg)

-## 0. Set up the example
-
-Before moving into the examples, you should run `npm install` on the top level `js-libp2p` folder, in order to install all the dependencies needed for this example. In addition, you will need to install the example related dependencies by doing `cd examples && npm install`. Once the install finishes, you should move into the example folder with `cd pubsub`.
-
 ## 1. Setting up a simple PubSub network on top of libp2p

 For this example, we will use MulticastDNS for automatic Peer Discovery. This example is based the previous examples found in [Discovery Mechanisms](../discovery-mechanisms). You can find the complete version at [1.js](./1.js).
@ -48,6 +44,7 @@ const node2 = nodes[1]

 // Add node's 2 data to the PeerStore
 node1.peerStore.addressBook.set(node2.peerId, node2.multiaddrs)
+
 await node1.dial(node2.peerId)

 node1.pubsub.on(topic, (msg) => {
@ -55,7 +52,6 @@ node1.pubsub.on(topic, (msg) => {
 })
 await node1.pubsub.subscribe(topic)

-// Will not receive own published messages by default
 node2.pubsub.on(topic, (msg) => {
  console.log(`node2 received: ${uint8ArrayToString(msg.data)}`)
 })
@ -72,34 +68,25 @@ The output of the program should look like:
 ```
 > node 1.js
 connected to QmWpvkKm6qHLhoxpWrTswY6UMNWDyn8hN265Qp9ZYvgS82
+node2 received: Bird bird bird, bird is the word!
 node1 received: Bird bird bird, bird is the word!
+node2 received: Bird bird bird, bird is the word!
 node1 received: Bird bird bird, bird is the word!
 ```

-You can change the pubsub `emitSelf` option if you want the publishing node to receive its own messages.
+You can change the pubsub `emitSelf` option if you don't want the publishing node to receive its own messages.

 ```JavaScript
 const defaults = {
  config: {
    pubsub: {
      enabled: true,
-      emitSelf: true
+      emitSelf: false
    }
  }
 }
 ```

-The output of the program should look like:
-
-```
-> node 1.js
-connected to QmWpvkKm6qHLhoxpWrTswY6UMNWDyn8hN265Qp9ZYvgS82
-node1 received: Bird bird bird, bird is the word!
-node2 received: Bird bird bird, bird is the word!
-node1 received: Bird bird bird, bird is the word!
-node2 received: Bird bird bird, bird is the word!
-```
-
 ## 2. Future work

 libp2p/IPFS PubSub is enabling a whole set of Distributed Real Time applications using CRDT (Conflict-Free Replicated Data Types). It is still going through heavy research (and hacking) and we invite you to join the conversation at [research-CRDT](https://github.com/ipfs/research-CRDT). Here is a list of some of the exciting examples:
--- a/examples/pubsub/message-filtering/1.js
+++ b/examples/pubsub/message-filtering/1.js
@ -4,10 +4,10 @@
 const Libp2p = require('../../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
-const { NOISE } = require('@chainsafe/libp2p-noise')
+const { NOISE } = require('libp2p-noise')
 const Gossipsub = require('libp2p-gossipsub')
-const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
+const uint8ArrayFromString = require('uint8arrays/from-string')
+const uint8ArrayToString = require('uint8arrays/to-string')

 const createNode = async () => {
  const node = await Libp2p.create({
@ -44,7 +44,6 @@ const createNode = async () => {

  //subscribe
  node1.pubsub.on(topic, (msg) => {
-    // Will not receive own published messages by default
    console.log(`node1 received: ${uint8ArrayToString(msg.data)}`)
  })
  await node1.pubsub.subscribe(topic)
--- a/examples/pubsub/message-filtering/README.md
+++ b/examples/pubsub/message-filtering/README.md
@ -97,12 +97,15 @@ Result
 ```
 > node 1.js
 ############## fruit banana ##############
+node1 received: banana
 node2 received: banana
 node3 received: banana
 ############## fruit apple ##############
+node1 received: apple
 node2 received: apple
 node3 received: apple
 ############## fruit car ##############
+node1 received: car
 ############## fruit orange ##############
 node1 received: orange
 node2 received: orange
--- a/examples/pubsub/message-filtering/test.js
+++ b/examples/pubsub/message-filtering/test.js
@ -1,67 +0,0 @@
-'use strict'
-
-const path = require('path')
-const execa = require('execa')
-const pDefer = require('p-defer')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
-
-const stdout = [
-  {
-    topic: 'banana',
-    messageCount: 2
-  },
-  {
-    topic: 'apple',
-    messageCount: 2
-  },
-  {
-    topic: 'car',
-    messageCount: 0
-  },
-  {
-    topic: 'orange',
-    messageCount: 2
-  },
-]
-
-async function test () {
-  const defer = pDefer()
-  let topicCount = 0
-  let topicMessageCount = 0
-
-  process.stdout.write('message-filtering/1.js\n')
-
-  const proc = execa('node', [path.join(__dirname, '1.js')], {
-    cwd: path.resolve(__dirname),
-    all: true
-  })
-
-  proc.all.on('data', async (data) => {
-    // End
-    if (topicCount === stdout.length) {
-      defer.resolve()
-      proc.all.removeAllListeners('data')
-    }
-
-    process.stdout.write(data)
-    const line = uint8ArrayToString(data)
-
-    if (stdout[topicCount] && line.includes(stdout[topicCount].topic)) {
-      // Validate previous number of messages
-      if (topicCount > 0 && topicMessageCount > stdout[topicCount - 1].messageCount) {
-        defer.reject()
-        throw new Error(`topic ${stdout[topicCount - 1].topic} had ${topicMessageCount} messages instead of ${stdout[topicCount - 1].messageCount}`)
-      }
-
-      topicCount++
-      topicMessageCount = 0
-    } else {
-      topicMessageCount++
-    }
-  })
-
-  await defer.promise
-  proc.kill()
-}
-
-module.exports = test
--- a/examples/pubsub/test-1.js
+++ b/examples/pubsub/test-1.js
@ -1,30 +0,0 @@
-'use strict'
-
-const path = require('path')
-const execa = require('execa')
-const pDefer = require('p-defer')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
-
-async function test () {
-  const defer = pDefer()
-  process.stdout.write('1.js\n')
-
-  const proc = execa('node', [path.join(__dirname, '1.js')], {
-    cwd: path.resolve(__dirname),
-    all: true
-  })
-
-  proc.all.on('data', async (data) => {
-    process.stdout.write(data)
-    const line = uint8ArrayToString(data)
-
-    if (line.includes('node1 received: Bird bird bird, bird is the word!')) {
-      defer.resolve()
-    }
-  })
-
-  await defer.promise
-  proc.kill()
-}
-
-module.exports = test
--- a/examples/pubsub/test.js
+++ b/examples/pubsub/test.js
@ -1,11 +0,0 @@
-'use strict'
-
-const test1 = require('./test-1')
-const testMessageFiltering = require('./message-filtering/test')
-
-async function test() {
-  await test1()
-  await testMessageFiltering()
-}
-
-module.exports = test
--- a/examples/test-all.js
+++ b/examples/test-all.js
@ -1,33 +0,0 @@
-'use strict'
-
-process.on('unhandedRejection', (err) => {
-  console.error(err)
-
-  process.exit(1)
-})
-
-const path = require('path')
-const fs = require('fs')
-const {
-  waitForOutput
-} = require('./utils')
-
-async function testAll () {
-  for (const dir of fs.readdirSync(__dirname)) {
-    if (dir === 'node_modules' || dir === 'tests_output') {
-      continue
-    }
-
-    const stats = fs.statSync(path.join(__dirname, dir))
-
-    if (!stats.isDirectory()) {
-      continue
-    }
-
-    await waitForOutput('npm info ok', 'npm', ['test', '--', dir], {
-      cwd: __dirname
-    })
-  }
-}
-
-testAll()
--- a/examples/test.js
+++ b/examples/test.js
@ -1,94 +0,0 @@
-'use strict'
-
-process.env.NODE_ENV = 'test'
-process.env.CI = true // needed for some "clever" build tools
-
-const fs = require('fs-extra')
-const path = require('path')
-const execa = require('execa')
-const dir = path.join(__dirname, process.argv[2])
-
-testExample(dir)
-  .then(() => {}, (err) => {
-    if (err.exitCode) {
-      process.exit(err.exitCode)
-    }
-
-    console.error(err)
-    process.exit(1)
-  })
-
-async function testExample (dir) {
-  await installDeps(dir)
-  await build(dir)
-  await runTest(dir)
-}
-
-async function installDeps (dir) {
-  if (!fs.existsSync(path.join(dir, 'package.json'))) {
-    console.info('Nothing to install in', dir)
-    return
-  }
-
-  if (fs.existsSync(path.join(dir, 'node_modules'))) {
-    console.info('Dependencies already installed in', dir)
-    return
-  }
-
-  const proc = execa.command('npm install', {
-    cwd: dir
-  })
-  proc.all.on('data', (data) => {
-    process.stdout.write(data)
-  })
-
-  await proc
-}
-
-async function build (dir) {
-  const pkgJson = path.join(dir, 'package.json')
-
-  if (!fs.existsSync(pkgJson)) {
-    console.info('Nothing to build in', dir)
-    return
-  }
-
-  const pkg = require(pkgJson)
-  let build
-
-  if (pkg.scripts.bundle) {
-    build = 'bundle'
-  }
-
-  if (pkg.scripts.build) {
-    build = 'build'
-  }
-
-  if (!build) {
-    console.info('No "build" or "bundle" script in', pkgJson)
-    return
-  }
-
-  const proc = execa('npm', ['run', build], {
-    cwd: dir
-  })
-  proc.all.on('data', (data) => {
-    process.stdout.write(data)
-  })
-
-  await proc
-}
-
-async function runTest (dir) {
-  console.info('Running node tests in', dir)
-  const testFile = path.join(dir, 'test.js')
-
-  if (!fs.existsSync(testFile)) {
-    console.info('Nothing to test in', dir)
-    return
-  }
-
-  const test = require(testFile)
-
-  await test()
-}
--- a/examples/transports/1.js
+++ b/examples/transports/1.js
@ -3,7 +3,7 @@

 const Libp2p = require('../..')
 const TCP = require('libp2p-tcp')
-const { NOISE } = require('@chainsafe/libp2p-noise')
+const { NOISE } = require('libp2p-noise')

 const createNode = async () => {
  const node = await Libp2p.create({
--- a/examples/transports/2.js
+++ b/examples/transports/2.js
@ -3,7 +3,7 @@

 const Libp2p = require('../..')
 const TCP = require('libp2p-tcp')
-const { NOISE } = require('@chainsafe/libp2p-noise')
+const { NOISE } = require('libp2p-noise')
 const MPLEX = require('libp2p-mplex')

 const pipe = require('it-pipe')
--- a/examples/transports/3.js
+++ b/examples/transports/3.js
@ -4,7 +4,7 @@
 const Libp2p = require('../..')
 const TCP = require('libp2p-tcp')
 const WebSockets = require('libp2p-websockets')
-const { NOISE } = require('@chainsafe/libp2p-noise')
+const { NOISE } = require('libp2p-noise')
 const MPLEX = require('libp2p-mplex')

 const pipe = require('it-pipe')
@ -81,7 +81,7 @@ function print ({ stream }) {
  // node 3 (listening WebSockets) can dial node 1 (TCP)
  try {
    await node3.dialProtocol(node1.peerId, '/print')
-  } catch (/** @type {any} */ err) {
+  } catch (err) {
    console.log('node 3 failed to dial to node 1 with:', err.message)
  }
 })();
--- a/examples/transports/4.js
+++ b/examples/transports/4.js
@ -1,89 +0,0 @@
-/* eslint-disable no-console */
-'use strict'
-
-const Libp2p = require('../..')
-const TCP = require('libp2p-tcp')
-const WebSockets = require('libp2p-websockets')
-const { NOISE } = require('@chainsafe/libp2p-noise')
-const MPLEX = require('libp2p-mplex')
-
-const fs = require('fs');
-const https = require('https');
-const pipe = require('it-pipe')
-
-const transportKey = WebSockets.prototype[Symbol.toStringTag];
-
-const httpServer = https.createServer({
-  cert: fs.readFileSync('./test_certs/cert.pem'),
-  key: fs.readFileSync('./test_certs/key.pem'),
-});
-
-const createNode = async (addresses = []) => {
-  if (!Array.isArray(addresses)) {
-    addresses = [addresses]
-  }
-
-  const node = await Libp2p.create({
-    addresses: {
-      listen: addresses
-    },
-    modules: {
-      transport: [WebSockets],
-      connEncryption: [NOISE],
-      streamMuxer: [MPLEX]
-    },
-    config: {
-      peerDiscovery: {
-        // Disable autoDial as it would fail because we are using a self-signed cert.
-        // `dialProtocol` does not fail because we pass `rejectUnauthorized: false`.
-        autoDial: false
-      },
-      transport: {
-        [transportKey]: {
-          listenerOptions: { server: httpServer },
-        },
-      },
-    }
-  })
-
-  await node.start()
-  return node
-}
-
-function printAddrs(node, number) {
-  console.log('node %s is listening on:', number)
-  node.multiaddrs.forEach((ma) => console.log(`${ma.toString()}/p2p/${node.peerId.toB58String()}`))
-}
-
-function print ({ stream }) {
-  pipe(
-    stream,
-    async function (source) {
-      for await (const msg of source) {
-        console.log(msg.toString())
-      }
-    }
-  )
-}
-
-;(async () => {
-  const [node1, node2] = await Promise.all([
-    createNode('/ip4/127.0.0.1/tcp/10000/wss'),
-    createNode([])
-  ])
-
-  printAddrs(node1, '1')
-  printAddrs(node2, '2')
-
-  node1.handle('/print', print)
-  node2.handle('/print', print)
-
-  const targetAddr = `${node1.multiaddrs[0]}/p2p/${node1.peerId.toB58String()}`;
-
-  // node 2 (Secure WebSockets) dials to node 1 (Secure Websockets)
-  const { stream } = await node2.dialProtocol(targetAddr, '/print',  { websocket: { rejectUnauthorized: false } })
-  await pipe(
-    ['node 2 dialed to node 1 successfully'],
-    stream
-  )
-})();
--- a/examples/transports/README.md
+++ b/examples/transports/README.md
@ -13,7 +13,7 @@ When using libp2p, you need properly configure it, that is, pick your set of mod
 You will need 4 dependencies total, so go ahead and install all of them with:

 ```bash
-> npm install libp2p libp2p-tcp @chainsafe/libp2p-noise
+> npm install libp2p libp2p-tcp libp2p-noise
 ```

 Then, in your favorite text editor create a file with the `.js` extension. I've called mine `1.js`.
@ -25,7 +25,7 @@ First thing is to create our own libp2p node! Insert:

 const Libp2p = require('libp2p')
 const TCP = require('libp2p-tcp')
-const { NOISE } = require('@chainsafe/libp2p-noise')
+const { NOISE } = require('libp2p-noise')

 const createNode = async () => {
  const node = await Libp2p.create({
--- a/examples/transports/test-1.js
+++ b/examples/transports/test-1.js
@ -1,38 +0,0 @@
-'use strict'
-
-const path = require('path')
-const execa = require('execa')
-const pDefer = require('p-defer')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
-
-async function test () {
-  const deferStarted = pDefer()
-  const deferListen = pDefer()
-
-  process.stdout.write('1.js\n')
-
-  const proc = execa('node', [path.join(__dirname, '1.js')], {
-    cwd: path.resolve(__dirname),
-    all: true
-  })
-
-  proc.all.on('data', async (data) => {
-    process.stdout.write(data)
-    const line = uint8ArrayToString(data)
-
-
-    if (line.includes('node has started (true/false): true')) {
-      deferStarted.resolve()
-    } else if (line.includes('p2p')) {
-      deferListen.resolve()
-    }
-  })
-
-  await Promise.all([
-    deferStarted.promise,
-    deferListen.promise
-  ])
-  proc.kill()
-}
-
-module.exports = test
--- a/examples/transports/test-2.js
+++ b/examples/transports/test-2.js
@ -1,30 +0,0 @@
-'use strict'
-
-const path = require('path')
-const execa = require('execa')
-const pDefer = require('p-defer')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
-
-async function test () {
-  const defer = pDefer()
-  process.stdout.write('2.js\n')
-
-  const proc = execa('node', [path.join(__dirname, '2.js')], {
-    cwd: path.resolve(__dirname),
-    all: true
-  })
-
-  proc.all.on('data', async (data) => {
-    process.stdout.write(data)
-    const line = uint8ArrayToString(data)
-
-    if (line.includes('Hello p2p world!')) {
-      defer.resolve()
-    }
-  })
-
-  await defer.promise
-  proc.kill()
-}
-
-module.exports = test
--- a/examples/transports/test-3.js
+++ b/examples/transports/test-3.js
@ -1,41 +0,0 @@
-'use strict'
-
-const path = require('path')
-const execa = require('execa')
-const pDefer = require('p-defer')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
-
-async function test () {
-  const deferNode1 = pDefer()
-  const deferNode2 = pDefer()
-  const deferNode3 = pDefer()
-
-  process.stdout.write('3.js\n')
-
-  const proc = execa('node', [path.join(__dirname, '3.js')], {
-    cwd: path.resolve(__dirname),
-    all: true
-  })
-
-  proc.all.on('data', async (data) => {
-    process.stdout.write(data)
-    const line = uint8ArrayToString(data)
-
-    if (line.includes('node 1 dialed to node 2 successfully')) {
-      deferNode1.resolve()
-    } else if (line.includes('node 2 dialed to node 3 successfully')) {
-      deferNode2.resolve()
-    } else if (line.includes('node 3 failed to dial to node 1 with:')) {
-      deferNode3.resolve()
-    }
-  })
-
-  await Promise.all([
-    deferNode1.promise,
-    deferNode2.promise,
-    deferNode3.promise
-  ])
-  proc.kill()
-}
-
-module.exports = test
--- a/examples/transports/test-4.js
+++ b/examples/transports/test-4.js
@ -1,33 +0,0 @@
-'use strict'
-
-const path = require('path')
-const execa = require('execa')
-const pDefer = require('p-defer')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
-
-async function test () {
-  const deferNode1 = pDefer()
-
-  process.stdout.write('4.js\n')
-
-  const proc = execa('node', [path.join(__dirname, '4.js')], {
-    cwd: path.resolve(__dirname),
-    all: true
-  })
-
-  proc.all.on('data', async (data) => {
-    process.stdout.write(data)
-    const line = uint8ArrayToString(data)
-
-    if (line.includes('node 2 dialed to node 1 successfully')) {
-      deferNode1.resolve()
-    }
-  })
-
-  await Promise.all([
-    deferNode1.promise,
-  ])
-  proc.kill()
-}
-
-module.exports = test
--- a/examples/transports/test.js
+++ b/examples/transports/test.js
@ -1,15 +0,0 @@
-'use strict'
-
-const test1 = require('./test-1')
-const test2 = require('./test-2')
-const test3 = require('./test-3')
-const test4 = require('./test-4')
-
-async function test() {
-  await test1()
-  await test2()
-  await test3()
-  await test4()
-}
-
-module.exports = test
--- a/examples/transports/test_certs/cert.pem
+++ b/examples/transports/test_certs/cert.pem
@ -1,32 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIFlzCCA3+gAwIBAgIUMYedwb9L/BtvZ7Lhu71iSKrXsa4wDQYJKoZIhvcNAQEL
-BQAwajELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlZBMREwDwYDVQQHDAhTb21lQ2l0
-eTESMBAGA1UECgwJTXlDb21wYW55MRMwEQYDVQQLDApNeURpdmlzaW9uMRIwEAYD
-VQQDDAkxMjcuMC4wLjEwHhcNMjEwNDI4MDIzMjA5WhcNMjIwNDI4MDIzMjA5WjBq
-MQswCQYDVQQGEwJVUzELMAkGA1UECAwCVkExETAPBgNVBAcMCFNvbWVDaXR5MRIw
-EAYDVQQKDAlNeUNvbXBhbnkxEzARBgNVBAsMCk15RGl2aXNpb24xEjAQBgNVBAMM
-CTEyNy4wLjAuMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANNhXBu0
-GH1Kzl9iaQxCxEnyyAShS5FYScdKxqpYsgJT4poLWLQBZQEFLEqbdillIlTZqMss
-jWqkFL2xmjqdcnOKFEZUarntVE2hxFYYQex2Fi8MYwFj+Pvt74d02xPyfzFNFgyX
-a1EakoGBwClaf3I7jW7raPudjcf4HnwQ7r/NwiO8FqHFZgLcTnwI8bk+cxDoDAqu
-mhqMB5nnerqvKEyR9Fb2PoL+8PwOPJOOKTDVwLMeMJu2WLR8AU2FzOj5SVI2qsu9
-Ps5azysD8KQAMcw4y9s6do36SaMQS85fbvXBV7XBqMD34HPBUbFiCoFoaCzK9Zfb
-pCXyVJMUNmw5hyq9nbjUt4Kvr/58bU2gjUKSdPf6KhBxFnDZwl+2qqPdVIb/qtwz
-HExtJWq3upklXNOg3HoR6vcr1O9ReJHrzLRMEb51WP1aN/qJ2/lRskcZ4A806qwr
-W67BvnOg6s3ZtxHN9v3bsyfsvC66w8PEfCnCVxugC7cUW0gtW54AU75T3ukg7X+m
-vECr/+qIzNEBIxxCPgefCG/JAdJhQ5SCvoARAVPStUIWDmigDeOt7go5nKbdVIJ4
-7bbBFUhHT2mTHu30fHhRqSDcHzwE7Zz6YJIJmKq29UmzUazFnKlLU67MjLJwiDPm
-fC3GyOdAWkkZE5hjtkiy+3yWoEHhaJYRI1u3AgMBAAGjNTAzMAsGA1UdDwQEAwIE
-MDATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHREECDAGhwR/AAABMA0GCSqGSIb3
-DQEBCwUAA4ICAQCx/ynu4iCQAK8VId/QQe7GqgOpFgx+6Mce9GQC6ZVEjAPgapsS
-Pl+l6+11cFjHKv0+Z/iN2JgkFmNXfwJcfYI0tHbMK+0U9hgKb1eFgiIwCqb4cPOz
-wMwusZ95BjIbtcEbL/+pMUpNhmjPz1fOILJZtDVq++lqJCv7t8+SoAmMVYtlcLNg
-muuV/UYR3uqvnAJmjgJVWs4otDGrxCYJE48M+9L2Gm05Htpi9WL1bZaQ+fJ85m85
-daedLc6R1/ZRTIH6i73sD4rYs0bx1fCJvkbcgXtKMHEkiHuG/MzR7Pa4cJAVKCx9
-lRTgrO7Gkllt2+jp4qg0YhdNq89e0DNA5cyB9H4udRgHQOcrlVRiX9OD/Kz+F5m/
-fQwMdbnqdg3ar5DSa8Q5g3bdLbNSCcI9sjCLTkNxUC/XTWGdG03RCVIt1qvBvZHk
-JaG6xGpbRZ5CN0T9eindd38JBrkPAPfgl6qhwvcqh6uVFYua+7KmF9K+mKarlmMw
-6RWaw2j4sMgUyRIS6fR9vDc20SrtoNvKQM1U6+0VYs1nizfkmsqqqRODmERKbKwc
-ahKJFubXfr8gz+PipAKFZbxr2EPAyoiNkx+0eM6Eedo55oP2BoGHEfXEoAonyMFM
-F/xTbpFtdRYE2hwsZCk86fpbcPTmdCY8txeZ7+4Bme2d9XXsTAxF64usqQ==
-----END CERTIFICATE-----
--- a/examples/transports/test_certs/key.pem
+++ b/examples/transports/test_certs/key.pem
@ -1,52 +0,0 @@
-----BEGIN PRIVATE KEY-----
-MIIJRAIBADANBgkqhkiG9w0BAQEFAASCCS4wggkqAgEAAoICAQDTYVwbtBh9Ss5f
-YmkMQsRJ8sgEoUuRWEnHSsaqWLICU+KaC1i0AWUBBSxKm3YpZSJU2ajLLI1qpBS9
-sZo6nXJzihRGVGq57VRNocRWGEHsdhYvDGMBY/j77e+HdNsT8n8xTRYMl2tRGpKB
-gcApWn9yO41u62j7nY3H+B58EO6/zcIjvBahxWYC3E58CPG5PnMQ6AwKrpoajAeZ
-53q6ryhMkfRW9j6C/vD8DjyTjikw1cCzHjCbtli0fAFNhczo+UlSNqrLvT7OWs8r
-A/CkADHMOMvbOnaN+kmjEEvOX271wVe1wajA9+BzwVGxYgqBaGgsyvWX26Ql8lST
-FDZsOYcqvZ241LeCr6/+fG1NoI1CknT3+ioQcRZw2cJftqqj3VSG/6rcMxxMbSVq
-t7qZJVzToNx6Eer3K9TvUXiR68y0TBG+dVj9Wjf6idv5UbJHGeAPNOqsK1uuwb5z
-oOrN2bcRzfb927Mn7LwuusPDxHwpwlcboAu3FFtILVueAFO+U97pIO1/prxAq//q
-iMzRASMcQj4HnwhvyQHSYUOUgr6AEQFT0rVCFg5ooA3jre4KOZym3VSCeO22wRVI
-R09pkx7t9Hx4Uakg3B88BO2c+mCSCZiqtvVJs1GsxZypS1OuzIyycIgz5nwtxsjn
-QFpJGROYY7ZIsvt8lqBB4WiWESNbtwIDAQABAoICAQCpGV3iG7Trpohp7gQzdsYo
-kjxI1+/oGkULVVqQs9vT2N+SdDlF50eyBT1lgfCJNQq97lIGF2IaSaD+D7Jd6c7B
-d1i42pd2ndGvORYj+cvjKqSchsA9QIjSoYnZRzZrQrdV7WESOZ/0hdlmGTJs4qTJ
-8bI3ZcPaZjQiIO/iOHmGn0gL5lAEojH1X+C5gT4+/yJ2B+x6LyvAyPzbtj6MUctf
-VfOuDdf8W47VVV5IfJWfJ6C8qg4gw0M7P2ibZ8qBJcvuJSWFT6OK2UKaGtDLogw0
-X8tVWfO1qOB3vnWmZtoRZ9aO5JnnpWS9tY1w5gmZdLjB/Kt0DJXIdZALCURwV6U0
-q5XR0SETEgdRrNX92PA2lmxO9fAgXRSjP/OoeDjAVhnRfYyShDbEIb8GHk7nE+is
-6ak5ufxKE53S8wB9L7MTPqTvxusBHi8saLevdnPBMQPvtEVkg2Iw/iPBsegUuUjD
-uzXlq4WUMCUBJEMVPuYEsaQizxpp2oM6AZj/ecuTKFX5CirFFWKOQ4cp+O8lrfI5
-ruwHrMkfjowDYcQaOLHq13anvt8+8LBlngVw+jiAGB/bGwrAwEZWUc8i1HbH/G8e
-sm0kMuCqV1GbRyMCUO3pWjzrsz8LEy74Jr0z7KZn52vLWrTkiD4NRXahxTBhHpXb
-AVclJ+a4BKk2rRJVRFRRQQKCAQEA7+uTl2ZHp1v7A8/I2zPIxoVz0fiwxwAjuv34
-cV+uxG0n5Tko4PKMxavddRFKNeGvrz0aO/GNX8NIW7pDqZ2CwHyskgUX/bFAqGKF
-Z/z2DmiZ2rdSUH89O3ysq+OF3RjX/FBNJ0SVdwtrpz3kCSWpa4PnmN7+IevL6zxY
-8gLrs07Ge+ci94FZaDHBNrkGQ00krbOmwIvnc90hyRPCKfMS+u2/ejKZ5QDyRG+H
-jbQ008ZV2OqUdS6h1twfoJ1Q4QhHijB6PegRLGdZGuUXIQfFP8dIUsQluKSUFyOy
-bL9W2yBwtbn3EwYDHLJQnLICxfcTBWg/2vOIucsSjxG7KNY0yQKCAQEA4YwcVpi3
-D+8OcnbpRBRlHo84DRZorp0RO8vhxevvB1CcBnkLRIYXlS2JIfrnhZAI/5jBk1ei
-FmgRFyAjZ8gDdkDCiDMQMDUwUhLGSVurI9sk16B4TQKCM+iE0LDrXIy9ezJRJkj0
-rOt8sqo2/TOttm2KEXY8Cco59tU4bMZg5Tr9l7SMTTj4skTO6Jn6/6hX3XuFkJw7
-B0DsSzIqXyRHAzOidagIEoIr7k4cEGXsrSWoSiHg/eky1ihCyUw3vDDOmoViBR7s
-h5nLjQNNAzOtyoKLqST7B7uXkdUo5nV2IUHSGD5LNxlTaNp0XL9Ph3EBtcuwNuB6
-zyKXc+O5iNfMfwKCAQEA5/RJKCnRgsORxpif5xWEujIRzOHz/yFqagHarbnFHNEv
-rhT6Kak2YnIL1H/X0IoWsYSQlX2uofQKQ+ysOBM5c2HV8gKMtFAnY+SEeAn/1eRZ
-QzTTl1G84INj6Xc6V40KXD1CqoFLQ+G9vd4/Vnyb9H99bLXC2wa+ivo4QBqEyEGT
-8fyAOOxMhUj9NSvjGzQ9DtbOk/9u0PztChtZL/d61TEAW2MKmHW2xGVTl7OvE0QA
-gYwh5b0k6La+uSj/JeE8USUXOjzgRZ7RbggouV1q3YOMr8BFe+NZ7Zksiqjej1Io
-xfk6H6FDZv4ao7QSrFR4hlTIz6V9/aqQkdOhsBSQyQKCAQEAzHwz4Qr5xVduGLbY
-S6HV/7vHDI6Jf+3lBvqUidWa013w5yls3sZXsSckkgshRoVMszayIbystnXJMNcx
-YlEDWn3iIItzHNHMKkzdOvsCETMIlvnkt6UTmK4xY+dSq4jp7Ty0N+qi8fdaCb2q
-tyrYTnHHYId6bUHMBY5QZsYAaTNvYNAO96A0UaNyl42q84iTiLkJYg9SsQPad15W
-7gU84Jk6rEMYdndQDvEAHpnZ1y0yA2vtySZYsbK0wj34tgTl+0/8izn7JgF4ezNH
-6iQ7Z0OuDT763IrmIxBH0ZEi9YnwSYyIsr6iUYjlQIUuPFRnQYQXEdm5Xfw1pZsL
-xhYoTwKCAQB9edDe4LX+0z9i4qr0iHV8H/WoyI5UD/Pc217PKkYM3+ewR9SL9D9z
-TS78Sl7HgRgEmIu+MR/u5B2ePf7jkvB/oxyPwqAzJeJ72mV3Mevm27G/Ndd8lt5W
-FBCGOx7ZeP4/Cv4mvPD979ix2IalDoWMSWJnpQPN+B1jGeCrUYAXQc1k/vU99gLa
-8Tuu3WfBpVAsO7hAC9mu6tuLyfKVqiMOVs2aky9xLqiqW/6uIcGu+owrr+gkDDY/
-JfBSUfxYKcjtJiHOEbFGrrRe93XsngmaTz/Hv9A/QLVCuJgWEHlt4WHSc+BtAtaV
-9avp6VlyVNfe4KEKW7IekrI0cmfMdXkl
-----END PRIVATE KEY-----
--- a/examples/utils.js
+++ b/examples/utils.js
@ -1,61 +0,0 @@
-'use strict'
-
-const execa = require('execa')
-const fs = require('fs-extra')
-const which = require('which')
-
-async function isExecutable (command) {
-  try {
-    await fs.access(command, fs.constants.X_OK)
-
-    return true
-  } catch (/** @type {any} */ err) {
-    if (err.code === 'ENOENT') {
-      return isExecutable(await which(command))
-    }
-
-    if (err.code === 'EACCES') {
-      return false
-    }
-
-    throw err
-  }
-}
-
-async function waitForOutput (expectedOutput, command, args = [], opts = {}) {
-  if (!await isExecutable(command)) {
-    args.unshift(command)
-    command = 'node'
-  }
-
-  const proc = execa(command, args, opts)
-  let output = ''
-  let time = 120000
-
-  let timeout = setTimeout(() => {
-    throw new Error(`Did not see "${expectedOutput}" in output from "${[command].concat(args).join(' ')}" after ${time/1000}s`)
-  }, time)
-
-  proc.all.on('data', (data) => {
-    process.stdout.write(data)
-
-    output += data.toString('utf8')
-
-    if (output.includes(expectedOutput)) {
-      clearTimeout(timeout)
-      proc.kill()
-    }
-  })
-
-  try {
-    await proc
-  } catch (/** @type {any} */ err) {
-    if (!err.killed) {
-      throw err
-    }
-  }
-}
-
-module.exports = {
-  waitForOutput
-}
--- a/examples/webrtc-direct/README.md
+++ b/examples/webrtc-direct/README.md
@ -1,33 +0,0 @@
-### Webrtc-direct example
-
-An example that uses [js-libp2p-webrtc-direct](https://github.com/libp2p/js-libp2p-webrtc-direct) for connecting
-nodejs libp2p and browser libp2p clients. To run the example:
-
-## 0. Run a nodejs libp2p listener
-
-When in the root folder of this example, type `node listener.js` in terminal. You should see an address that listens for
-incoming connections. Below is just an example of such address. In your case the suffix hash (`peerId`) will be different.
-
-```bash
-$ node listener.js 
-Listening on:
-/ip4/127.0.0.1/tcp/9090/http/p2p-webrtc-direct/p2p/QmUKQCzEUhhhobcNSrXU5uzxTqbvF1BjMCGNGZzZU14Kgd
-```
-
-## 1. Prepare a browser libp2p dialer
-Confirm that the above address is the same as the field `list` in `public/dialer.js`:
-```js
-    peerDiscovery: {
-      [Bootstrap.tag]: {
-        enabled: true,
-        // paste the address into `list`
-        list: ['/ip4/127.0.0.1/tcp/9090/http/p2p-webrtc-direct/p2p/QmUKQCzEUhhhobcNSrXU5uzxTqbvF1BjMCGNGZzZU14Kgd']
-      }
-    }
-```
-
-## 2. Run a browser libp2p dialer
-When in the root folder of this example, type `npm run dev` in terminal. You should see an address where you can browse
-the running client. Open this address in your browser. In console
-logs you should see logs about successful connection with the node client. In the output of node client you should see
-a log message about successful connection as well.
--- a/examples/webrtc-direct/dialer.js
+++ b/examples/webrtc-direct/dialer.js
@ -1,57 +0,0 @@
-import 'babel-polyfill'
-const Libp2p = require('libp2p')
-const WebRTCDirect = require('libp2p-webrtc-direct')
-const Mplex = require('libp2p-mplex')
-const { NOISE } = require('@chainsafe/libp2p-noise')
-const Bootstrap = require('libp2p-bootstrap')
-
-document.addEventListener('DOMContentLoaded', async () => {
-  // use the same peer id as in `listener.js` to avoid copy-pasting of listener's peer id into `peerDiscovery`
-  const hardcodedPeerId = '12D3KooWCuo3MdXfMgaqpLC5Houi1TRoFqgK9aoxok4NK5udMu8m'
-  const libp2p = await Libp2p.create({
-    modules: {
-      transport: [WebRTCDirect],
-      streamMuxer: [Mplex],
-      connEncryption: [NOISE],
-      peerDiscovery: [Bootstrap]
-    },
-    config: {
-      peerDiscovery: {
-        [Bootstrap.tag]: {
-          enabled: true,
-          list: [`/ip4/127.0.0.1/tcp/9090/http/p2p-webrtc-direct/p2p/${hardcodedPeerId}`]
-        }
-      }
-    }
-  })
-
-  const status = document.getElementById('status')
-  const output = document.getElementById('output')
-
-  output.textContent = ''
-
-  function log (txt) {
-    console.info(txt)
-    output.textContent += `${txt.trim()}\n`
-  }
-
-  // Listen for new peers
-  libp2p.on('peer:discovery', (peerId) => {
-    log(`Found peer ${peerId.toB58String()}`)
-  })
-
-  // Listen for new connections to peers
-  libp2p.connectionManager.on('peer:connect', (connection) => {
-    log(`Connected to ${connection.remotePeer.toB58String()}`)
-  })
-
-  // Listen for peers disconnecting
-  libp2p.connectionManager.on('peer:disconnect', (connection) => {
-    log(`Disconnected from ${connection.remotePeer.toB58String()}`)
-  })
-
-  await libp2p.start()
-  status.innerText = 'libp2p started!'
-  log(`libp2p id is ${libp2p.peerId.toB58String()}`)
-
-})
--- a/examples/webrtc-direct/index.html
+++ b/examples/webrtc-direct/index.html
@ -1,17 +0,0 @@
-<!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="./dialer.js" type="module"></script>
-</body>
-</html>
--- a/examples/webrtc-direct/listener.js
+++ b/examples/webrtc-direct/listener.js
@ -1,44 +0,0 @@
-const Libp2p = require('libp2p')
-const Bootstrap = require('libp2p-bootstrap')
-const WebRTCDirect = require('libp2p-webrtc-direct')
-const Mplex = require('libp2p-mplex')
-const { NOISE } = require('@chainsafe/libp2p-noise')
-const PeerId = require('peer-id')
-
-;(async () => {
-  // hardcoded peer id to avoid copy-pasting of listener's peer id into the dialer's bootstrap list
-  // generated with cmd `peer-id --type=ed25519`
-  const hardcodedPeerId = await PeerId.createFromJSON({
-    "id": "12D3KooWCuo3MdXfMgaqpLC5Houi1TRoFqgK9aoxok4NK5udMu8m",
-    "privKey": "CAESQAG6Ld7ev6nnD0FKPs033/j0eQpjWilhxnzJ2CCTqT0+LfcWoI2Vr+zdc1vwk7XAVdyoCa2nwUR3RJebPWsF1/I=",
-    "pubKey": "CAESIC33FqCNla/s3XNb8JO1wFXcqAmtp8FEd0SXmz1rBdfy"
-  })
-  const node = await Libp2p.create({
-    peerId: hardcodedPeerId,
-    addresses: {
-      listen: ['/ip4/127.0.0.1/tcp/9090/http/p2p-webrtc-direct']
-    },
-    modules: {
-      transport: [WebRTCDirect],
-      streamMuxer: [Mplex],
-      connEncryption: [NOISE]
-    },
-    config: {
-      peerDiscovery: {
-        [Bootstrap.tag]: {
-          enabled: false,
-        }
-      }
-    }
-  })
-
-  node.connectionManager.on('peer:connect', (connection) => {
-    console.info(`Connected to ${connection.remotePeer.toB58String()}!`)
-  })
-
-  await node.start()
-
-  console.log('Listening on:')
-  node.multiaddrs.forEach((ma) => console.log(`${ma.toString()}/p2p/${node.peerId.toB58String()}`))
-
-})()
--- a/examples/webrtc-direct/package.json
+++ b/examples/webrtc-direct/package.json
@ -1,32 +0,0 @@
-{
-  "name": "webrtc-direct",
-  "version": "0.0.1",
-  "private": true,
-  "description": "",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "parcel build index.html",
-    "start": "parcel index.html"
-  },
-  "license": "ISC",
-  "devDependencies": {
-    "@babel/cli": "^7.13.10",
-    "@babel/core": "^7.13.10",
-    "babel-plugin-syntax-async-functions": "^6.13.0",
-    "babel-plugin-transform-regenerator": "^6.26.0",
-    "babel-polyfill": "^6.26.0",
-    "parcel": "^2.0.1",
-    "util": "^0.12.3"
-  },
-  "dependencies": {
-    "libp2p": "../../",
-    "libp2p-bootstrap": "^0.13.0",
-    "libp2p-mplex": "^0.10.4",
-    "@chainsafe/libp2p-noise": "^4.1.0",
-    "libp2p-webrtc-direct": "^0.7.0",
-    "peer-id": "^0.16.0"
-  },
-  "browser": {
-    "ipfs": "ipfs/dist/index.min.js"
-  }
-}
--- a/examples/webrtc-direct/test.js
+++ b/examples/webrtc-direct/test.js
@ -1,95 +0,0 @@
-'use strict'
-
-const path = require('path')
-const execa = require('execa')
-const pDefer = require('p-defer')
-const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
-const { chromium } = require('playwright');
-
-function startNode (name, args = []) {
-    return execa('node', [path.join(__dirname, name), ...args], {
-        cwd: path.resolve(__dirname),
-        all: true
-    })
-}
-
-function startBrowser (name, args = []) {
-    return execa('parcel', [path.join(__dirname, name), ...args], {
-        preferLocal: true,
-        localDir: __dirname,
-        cwd: __dirname,
-        all: true
-    })
-}
-
-async function test () {
-    // Step 1, listener process
-    const listenerProcReady = pDefer()
-    let listenerOutput = ''
-    process.stdout.write('listener.js\n')
-    const listenerProc = startNode('listener.js')
-
-    listenerProc.all.on('data', async (data) => {
-        process.stdout.write(data)
-        listenerOutput += uint8ArrayToString(data)
-        if (listenerOutput.includes('Listening on:') && listenerOutput.includes('12D3KooWCuo3MdXfMgaqpLC5Houi1TRoFqgK9aoxok4NK5udMu8m')) {
-            listenerProcReady.resolve()
-        }
-    })
-
-    await listenerProcReady.promise
-    process.stdout.write('==================================================================\n')
-
-    // Step 2, dialer process
-    process.stdout.write('dialer.js\n')
-    let dialerUrl = ''
-    const dialerProc = startBrowser('index.html')
-
-    dialerProc.all.on('data', async (chunk) => {
-        /**@type {string} */
-        const out = chunk.toString()
-
-        if (out.includes('Server running at')) {
-            dialerUrl = out.split('Server running at ')[1]
-        }
-
-
-        if (out.includes('Built in ')) {
-
-            try {
-                const browser = await chromium.launch();
-                const page = await browser.newPage();
-                await page.goto(dialerUrl);
-                await page.waitForFunction(selector => document.querySelector(selector).innerText === 'libp2p started!', '#status')
-                await page.waitForFunction(
-                  selector => {
-                      const text = document.querySelector(selector).innerText
-                      return text.includes('libp2p id is') &&
-                        text.includes('Found peer') &&
-                        text.includes('Connected to')
-                  },
-                  '#output',
-                  { timeout: 10000 }
-                )
-                await browser.close();
-            } catch (/** @type {any} */ err) {
-                console.error(err)
-                process.exit(1)
-            } finally {
-                dialerProc.cancel()
-                listenerProc.kill()
-            }
-        }
-    })
-
-    await Promise.all([
-        listenerProc,
-        dialerProc,
-    ]).catch((err) => {
-        if (err.signal !== 'SIGTERM') {
-            throw err
-        }
-    })
-}
-
-module.exports = test
--- a/package-list.json
+++ b/package-list.json
@ -23,6 +23,7 @@

    "secure channels",
    ["NodeFactoryIo/js-libp2p-noise", "libp2p-noise"],
+    ["libp2p/js-libp2p-secio", "libp2p-secio"],

    "stream multiplexers",
    ["libp2p/js-libp2p-mplex", "libp2p-mplex"],
@ -44,10 +45,10 @@

    "utilities",
    ["libp2p/js-libp2p-crypto", "libp2p-crypto"],
+    ["libp2p/js-libp2p-crypto-secp256k1", "libp2p-crypto-secp256k1"],

    "data types",
    ["libp2p/js-peer-id", "peer-id"],
-    ["libp2p/js-libp2p-record", "libp2p-record"],

    "pubsub",
    ["libp2p/js-libp2p-floodsub", "libp2p-floodsub"],
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Vasco Santos	98f6fd7157	chore: add links from getting started and readme	2020-11-09 15:17:02 +01:00
Vasco Santos	62acb72ae4	docs: discoverability and connectivity	2020-11-09 15:17:02 +01:00
Vasco Santos	8456d0e051	chore: store self protocols in protobook (#760 )	2020-11-09 14:11:48 +01:00
Vasco Santos	558bcf9541	chore: improve logging for auto relay active listen	2020-11-09 14:11:48 +01:00
Vasco Santos	3bd1768b04	chore: sort relay addresses to listen for public first	2020-11-09 14:11:48 +01:00
Vasco Santos	722cacd6d2	chore: lint issues fixed	2020-11-09 14:11:48 +01:00
Vasco Santos	2746b4b025	chore: apply suggestions from code review Co-authored-by: Jacob Heun <jacobheun@gmail.com>	2020-11-09 14:11:48 +01:00
Vasco Santos	29e30c2199	chore: add configuration docs for auto relay and hop service	2020-11-09 14:11:48 +01:00
Vasco Santos	3d2181f6fa	chore: address review	2020-11-09 14:11:48 +01:00
Vasco Santos	e6b0134299	feat: auto relay network query for new relays	2020-11-09 14:11:48 +01:00
Vasco Santos	2530b834a1	chore: lint issue fixed 0.30	2020-11-09 14:11:48 +01:00
Vasco Santos	05e6472cce	chore: address review	2020-11-09 14:11:48 +01:00
Vasco Santos	abba305bd6	chore: add identify test for multiaddr change	2020-11-09 14:11:48 +01:00
Vasco Santos	87d20ac46d	chore: create signed peer record on new listen addresses in transport manager	2020-11-09 14:11:48 +01:00
Vasco Santos	ee8ee5b49b	chore: use listening events to create self peer record on updates	2020-11-09 14:11:48 +01:00
Vasco Santos	971655ff27	chore: _isStarted is false when stop starts	2020-11-09 14:11:48 +01:00
Vasco Santos	8d75093dcb	chore: auto relay multiaddr update push	2020-11-09 14:11:48 +01:00
Vasco Santos	25488853ef	feat: auto relay (#723 ) * feat: auto relay * fix: leverage protoBook events to ask relay peers if they support hop * chore: refactor disconnect * chore: do not listen on a relayed conn * chore: tweaks * chore: improve _listenOnAvailableHopRelays logic * chore: default value of 1 to maxListeners on auto-relay	2020-11-09 14:11:48 +01:00