fixed merge conflicts

Author: Aryakoste

.cspell.json

@@ -0,0 +1,11 @@
+{
+  "import": [
+    "./node_modules/aegir/cspell.json"
+  ],
+  "dictionaries": ["project"],
+  "dictionaryDefinitions": [{
+    "name": "project",
+    "path": "./.github/dictionary.txt",
+    "addWords": true
+  }]
+}

.github/dictionary.txt

@@ -0,0 +1,13 @@
+setbit
+getbit
+stopstr
+rlflx
+incrby
+hopr
+dout
+supercop
+nothrow
+buildx
+blpop
+rpush
+additionals

.github/workflows/main.yml

@@ -18,29 +18,31 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: lts/*
-    - uses: ipfs/aegir/actions/cache-node-modules@main
-      with:
-        directories: ${{ env.CACHE_DIRS }}
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+      - uses: ipfs/aegir/actions/cache-node-modules@main
+        with:
+          directories: ${{ env.CACHE_DIRS }}
 
   check:
     needs: build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: lts/*
-    - uses: ipfs/aegir/actions/cache-node-modules@main
-      with:
-        directories: ${{ env.CACHE_DIRS }}
-    - run: npm run --if-present lint
-    - run: npm run --if-present dep-check
-    - run: npm run --if-present docs:no-publish
-    - run: npm run --if-present doc-check
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+      - uses: ipfs/aegir/actions/cache-node-modules@main
+        with:
+          directories: ${{ env.CACHE_DIRS }}
+      - run: npm run --if-present lint
+      - run: npm run --if-present dep-check
+      - run: npm run --if-present docs:no-publish
+      - run: npm run --if-present doc-check
+      - run: npm run --if-present spell-check
+
   test-node:
     needs: build
     runs-on: ${{ matrix.os }}
@@ -58,7 +60,7 @@ jobs:
         with:
           directories: ${{ env.CACHE_DIRS }}
       - run: npm run --if-present test:node
-      - uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
+      - uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
         with:
           flags: node
           files: .coverage/*,packages/*/.coverage/*
@@ -76,7 +78,7 @@ jobs:
         with:
           directories: ${{ env.CACHE_DIRS }}
       - run: npm run --if-present test:chrome
-      - uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
+      - uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
         with:
           flags: chrome
           files: .coverage/*,packages/*/.coverage/*
@@ -94,7 +96,7 @@ jobs:
         with:
           directories: ${{ env.CACHE_DIRS }}
       - run: npm run --if-present test:chrome-webworker
-      - uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
+      - uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
         with:
           flags: chrome-webworker
           files: .coverage/*,packages/*/.coverage/*
@@ -112,7 +114,7 @@ jobs:
         with:
           directories: ${{ env.CACHE_DIRS }}
       - run: npm run --if-present test:firefox
-      - uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
+      - uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
         with:
           flags: firefox
           files: .coverage/*,packages/*/.coverage/*
@@ -130,7 +132,7 @@ jobs:
         with:
           directories: ${{ env.CACHE_DIRS }}
       - run: npm run --if-present test:firefox-webworker
-      - uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
+      - uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
         with:
           flags: firefox-webworker
           files: .coverage/*,packages/*/.coverage/*
@@ -153,7 +155,7 @@ jobs:
           sudo apt-get update
       - run: npx playwright install-deps
       - run: npm run --if-present test:webkit
-      - uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
+      - uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
         with:
           flags: webkit
           files: .coverage/*,packages/*/.coverage/*
@@ -171,7 +173,7 @@ jobs:
         with:
           directories: ${{ env.CACHE_DIRS }}
       - run: npx xvfb-maybe npm run --if-present test:electron-main
-      - uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
+      - uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
         with:
           flags: electron-main
           files: .coverage/*,packages/*/.coverage/*
@@ -189,7 +191,7 @@ jobs:
         with:
           directories: ${{ env.CACHE_DIRS }}
       - run: npx xvfb-maybe npm run --if-present test:electron-renderer
-      - uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
+      - uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
         with:
           flags: electron-renderer
           files: .coverage/*,packages/*/.coverage/*

.release-please-manifest.json

@@ -1 +1 @@
-{"packages/config":"1.1.0","packages/connection-encrypter-plaintext":"2.0.16","packages/connection-encrypter-tls":"2.0.16","packages/crypto":"5.0.12","packages/interface":"2.6.0","packages/interface-compliance-tests":"6.3.4","packages/interface-internal":"2.3.4","packages/kad-dht":"14.2.9","packages/keychain":"5.1.0","packages/libp2p":"2.7.2","packages/logger":"5.1.9","packages/metrics-devtools":"1.2.7","packages/metrics-opentelemetry":"1.0.6","packages/metrics-prometheus":"4.3.9","packages/metrics-simple":"1.3.3","packages/multistream-select":"6.0.16","packages/peer-collections":"6.0.20","packages/peer-discovery-bootstrap":"11.0.26","packages/peer-discovery-mdns":"11.0.26","packages/peer-id":"5.0.13","packages/peer-record":"8.0.20","packages/peer-store":"11.0.20","packages/pnet":"2.0.26","packages/protocol-autonat":"2.0.23","packages/protocol-dcutr":"2.0.22","packages/protocol-echo":"2.1.13","packages/protocol-fetch":"3.0.7","packages/protocol-identify":"3.0.22","packages/protocol-perf":"4.0.26","packages/protocol-ping":"2.0.22","packages/pubsub":"10.1.3","packages/pubsub-floodsub":"10.1.25","packages/record":"4.0.4","packages/stream-multiplexer-mplex":"11.0.26","packages/transport-circuit-relay-v2":"3.2.2","packages/transport-memory":"1.1.0","packages/transport-tcp":"10.1.2","packages/transport-webrtc":"5.2.3","packages/transport-websockets":"9.2.2","packages/transport-webtransport":"5.0.31","packages/upnp-nat":"3.1.6","packages/utils":"6.5.4"}
+{"packages/config":"1.1.4","packages/connection-encrypter-plaintext":"2.0.20","packages/connection-encrypter-tls":"2.1.1","packages/crypto":"5.0.15","packages/interface":"2.7.0","packages/interface-compliance-tests":"6.4.1","packages/interface-internal":"2.3.8","packages/kad-dht":"14.2.14","packages/keychain":"5.1.4","packages/libp2p":"2.8.1","packages/logger":"5.1.13","packages/metrics-devtools":"1.2.11","packages/metrics-opentelemetry":"1.0.10","packages/metrics-prometheus":"4.3.14","packages/metrics-simple":"1.3.7","packages/multistream-select":"6.0.20","packages/peer-collections":"6.0.24","packages/peer-discovery-bootstrap":"11.0.31","packages/peer-discovery-mdns":"11.0.31","packages/peer-id":"5.1.0","packages/peer-record":"8.0.24","packages/peer-store":"11.1.1","packages/pnet":"2.0.31","packages/protocol-autonat":"2.0.27","packages/protocol-dcutr":"2.0.26","packages/protocol-echo":"2.1.17","packages/protocol-fetch":"3.0.11","packages/protocol-identify":"3.0.26","packages/protocol-perf":"4.0.31","packages/protocol-ping":"2.0.26","packages/pubsub":"10.1.7","packages/pubsub-floodsub":"10.1.30","packages/record":"4.0.5","packages/stream-multiplexer-mplex":"11.0.31","packages/transport-circuit-relay-v2":"3.2.7","packages/transport-memory":"1.1.4","packages/transport-tcp":"10.1.7","packages/transport-webrtc":"5.2.8","packages/transport-websockets":"9.2.7","packages/transport-webtransport":"5.0.36","packages/upnp-nat":"3.1.10","packages/utils":"6.5.8"}

CONTRIBUTING.md

@@ -4,7 +4,7 @@
 
 👉 Please see the [IPFS JavaScript Community contributing guidelines](https://github.com/ipfs/community/blob/master/CONTRIBUTING_JS.md) for how to collaborate and contribute to js-libp2p.
 
-💪 The [core maintainers](https://github.com/libp2p/js-libp2p/blob/main/CODEOWNERS) hang out in #libp2p-implementers in ipfs.io Matrix, FIL Slack, and IPFS Discord. They perform weekly triage of issues and PRs per https://lu.ma/libp2p
+💪 The [core maintainers](https://github.com/libp2p/js-libp2p/blob/main/CODEOWNERS) hang out in #libp2p-implementers in ipfs.io Matrix, FIL Slack, and IPFS Discord. They perform weekly triage of issues and PRs on the Open Maintainers Call - see the [Libp2p Events Calendar](https://lu.ma/libp2p) to find out when the next one is.
 
 🤲 Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed in [README.md](https://github.com/libp2p/js-libp2p/blob/main/README.md), without any additional terms or conditions.
 

README.md

@@ -13,7 +13,7 @@
 [![CI](https://img.shields.io/github/actions/workflow/status/libp2p/js-libp2p/main.yml?branch=main\&style=flat-square)](https://github.com/libp2p/js-libp2p/actions/workflows/main.yml?query=branch%3Amain)
 
 > [!NOTE]
-> Are you tring to upgrade libp2p to the latest version?  Check out the [migration guides](https://github.com/libp2p/js-libp2p/tree/main/doc/migrations) for any changes you need to make.
+> Are you trying to upgrade libp2p to the latest version?  Check out the [migration guides](https://github.com/libp2p/js-libp2p/tree/main/doc/migrations) for any changes you need to make.
 
 ### Project status
 
@@ -24,7 +24,7 @@ The documentation in the main 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.
 
 > [!TIP]
-> Just tring to figure out what this is all about? Check our [GETTING\_STARTED.md](https://github.com/libp2p/js-libp2p/blob/main/doc/GETTING_STARTED.md) guide and [examples](https://github.com/libp2p/js-libp2p-examples).
+> Just trying to figure out what this is all about? Check our [GETTING\_STARTED.md](https://github.com/libp2p/js-libp2p/blob/main/doc/GETTING_STARTED.md) guide and [examples](https://github.com/libp2p/js-libp2p-examples).
 
 ## Background
 
@@ -41,7 +41,7 @@ We are in the process of writing better documentation, blog posts, tutorials and
 - Articles
   - [The overview of libp2p](https://github.com/libp2p/libp2p#description)
 
-To sum up, libp2p is a "network stack" -- a protocol suite -- that cleanly separates concerns, and enables sophisticated applications to only use the protocols they absolutely need, without giving up interoperability and upgradeability. libp2p grew out of IPFS, but it is built so that lots of people can use it, for lots of different projects.
+To sum up, libp2p is a "network stack" -- a protocol suite -- that cleanly separates concerns, and enables sophisticated applications to only use the protocols they absolutely need, without giving up interoperability and upgradability. libp2p grew out of IPFS, but it is built so that lots of people can use it, for lots of different projects.
 
 ## Roadmap
 
@@ -76,7 +76,7 @@ You can find multiple examples on the [examples repo](https://github.com/libp2p/
 ## Structure
 
 - [`/doc`](https://github.com/libp2p/js-libp2p/blob/main/doc) Docs for libp2p
-- [`/interop`](https://github.com/libp2p/js-libp2p/tree/main/interop) Multidimension Interop Test
+- [`/interop`](https://github.com/libp2p/js-libp2p/tree/main/interop) Multidimensional Interop Test
 - [`/packages/crypto`](https://github.com/libp2p/js-libp2p/tree/main/packages/crypto) Crypto primitives for libp2p
 - [`/packages/interface`](https://github.com/libp2p/js-libp2p/tree/main/packages/interface) The interface implemented by a libp2p node
 - [`/packages/interface-compliance-tests`](https://github.com/libp2p/js-libp2p/tree/main/packages/interface-compliance-tests) Compliance tests for JS libp2p interfaces
@@ -121,7 +121,7 @@ You can find multiple examples on the [examples repo](https://github.com/libp2p/
 #### Run unit tests
 
 ```sh
-# run all the unit tsts
+# run all the unit tests
 > npm test
 
 # run just Node.js tests

ROADMAP.md

@@ -8,7 +8,7 @@ js-libp2p is deployed in many production environments so to take adoption to the
 
 ### js-libp2p amino DHT bootstrapper
 
-Deploying a public bootstrapper is a great test of the capacity of js-libp2p since it will need to maintain several thousand simultaneous connections and service many DHT RPC requests.  Comprehensive metrics and logging will also give us insight into real world usage patterns that can further direct performance optimisations.
+Deploying a public bootstrapper is a great test of the capacity of js-libp2p since it will need to maintain several thousand simultaneous connections and service many DHT RPC requests.  Comprehensive metrics and logging will also give us insight into real world usage patterns that can further direct performance optimizations.
 
   - Deploy a bootstrap server that acts as an entry point to the network for DHT clients
   - Ship it in the default config of majority libp2p/IPFS implementations
@@ -74,7 +74,7 @@ The specification is [in progress](https://github.com/libp2p/specs/pull/625) the
 
 ### QUIC in Node.js
 
-There's a decent chance the Node.js QUIC implementation is [not going to be exposed to userland](https://github.com/nodejs/node/pull/52628#issuecomment-2143475066), but we need this to have compatibility with other libp2p implementations.
+There's a decent chance the Node.js QUIC implementation is [not going to be exposed to user land](https://github.com/nodejs/node/pull/52628#issuecomment-2143475066), but we need this to have compatibility with other libp2p implementations.
 
 https://github.com/ChainSafe/js-libp2p-quic is in-progress to add QUIC support via a native module that uses the Rust implementation.
 

doc/ARCHITECTURE.md

@@ -1,6 +1,6 @@
 # Libp2p Architecture
 
-js-libp2p is comprised of a number of components that work together to provide functionality such as dailling peers, managing connections, registering protocols, storing information about peers and much more. This document aims to provide a high level overview of the components and how they interact with each other.
+js-libp2p is comprised of a number of components that work together to provide functionality such as dialing peers, managing connections, registering protocols, storing information about peers and much more. This document aims to provide a high level overview of the components and how they interact with each other.
 
 - [Libp2p Architecture](#libp2p-architecture)
   - [Component Diagram](#component-diagram)

doc/CONFIGURATION.md

@@ -20,7 +20,7 @@
     - [Setup with Delegated Content and Peer Routing](#setup-with-delegated-content-and-peer-routing)
     - [Setup with Relay](#setup-with-relay)
     - [Setup with Automatic Reservations](#setup-with-automatic-reservations)
-    - [Setup with Preconfigured Reservations](#setup-with-preconfigured-reservations)
+    - [Setup with Pre-configured Reservations](#setup-with-pre-configured-reservations)
     - [Setup with Keychain](#setup-with-keychain)
     - [Configuring Connection Manager](#configuring-connection-manager)
     - [Configuring Connection Gater](#configuring-connection-gater)
@@ -175,7 +175,7 @@ If none of the available peer routing protocols fulfills your needs, you can cre
 
 > A DHT can provide content and peer routing capabilities in a p2p system, as well as peer discovery capabilities.
 
-The DHT implementation currently available is [@libp2p/kad-dht](https://github.com/libp2p/js-libp2p/tree/main/packages/kad-dht). This implementation is largely based on the Kademlia whitepaper, augmented with notions from S/Kademlia, Coral and mainlineDHT.
+The DHT implementation currently available is [@libp2p/kad-dht](https://github.com/libp2p/js-libp2p/tree/main/packages/kad-dht). This implementation is largely based on the Kademlia white paper, augmented with notions from S/Kademlia, Coral and mainlineDHT.
 
 If this DHT implementation does not fulfill your needs and you want to create or use your own implementation, please get in touch with us through a github issue. We plan to work on improving the ability to bring your own DHT in a future release.
 
@@ -501,7 +501,7 @@ const node = await createLibp2p({
 })
 ```
 
-#### Setup with Preconfigured Reservations
+#### Setup with Pre-configured Reservations
 
 In this configuration the libp2p node is a circuit relay client which connects to a relay, `/ip4/123.123.123.123/p2p/QmRelay` which has been configured to have slots available.
 
@@ -563,7 +563,7 @@ const node = await createLibp2p({
     noise()
   ],
   keychain: {
-    pass: 'notsafepassword123456789',
+    pass: 'not-safe-password-123456789',
   },
   datastore
 })
@@ -640,7 +640,7 @@ const node = await createLibp2p({
      * multiaddr for the given peer.
      *
      * This is called by the dialer.connectToPeer implementation after it has
-     * resolved the peer's addrs, and prior to dialling each.
+     * resolved the peer's addresses, and prior to dialling each.
      *
      * Return true to prevent dialing the passed peer on the passed multiaddr.
      */
@@ -795,7 +795,7 @@ const node = await createLibp2p({
 
 PeerStore persistence is disabled in libp2p by default. You can enable and configure it as follows. Aside from enabled being `false` by default, it will need an implementation of a [datastore](https://github.com/ipfs/interface-datastore). Take into consideration that using the memory datastore will be ineffective for persistence.
 
-The threshold number represents the maximum number of "dirty peers" allowed in the PeerStore, i.e. peers that are not updated in the datastore. In this context, browser nodes should use a threshold of 1, since they might not "stop" properly in several scenarios and the PeerStore might end up with unflushed records when the window is closed.
+The threshold number represents the maximum number of "dirty peers" allowed in the PeerStore, i.e. peers that are not updated in the datastore. In this context, browser nodes should use a threshold of 1, since they might not "stop" properly in several scenarios and the PeerStore might end up with un-flushed records when the window is closed.
 
 | Name        | Type      | Description                    |
 | ----------- | --------- | ------------------------------ |

doc/GETTING_STARTED.md

@@ -50,7 +50,7 @@ Other systems have tried to fill this gap, notably CommonJS, AMD, RequireJS and
 }
 ```
 
-For more info on enablng ES modules in Node, see [this guide](https://nodejs.org/api/esm.html).
+For more info on enabling ES modules in Node, see [this guide](https://nodejs.org/api/esm.html).
 
 ### Basic setup
 
@@ -176,8 +176,8 @@ const node = await createLibp2p({
 await node.start()
 console.log('libp2p has started')
 
-const listenAddrs = node.getMultiaddrs()
-console.log('libp2p is listening on the following addresses: ', listenAddrs)
+const listenAddresses = node.getMultiaddrs()
+console.log('libp2p is listening on the following addresses: ', listenAddresses)
 
 // stop libp2p
 await node.stop()
@@ -254,17 +254,17 @@ When running libp2p you may want to see what things are happening behind the sce
 
 ### Node
 
-```javascript
+```JavaScript
 # all libp2p debug logs
-DEBUG="libp2p:*" node myscript.js
+DEBUG="libp2p:*" node my-script.js
 
 # networking debug logs
-DEBUG="libp2p:tcp,libp2p:websockets,libp2p:webtransport,libp2p:kad-dht,libp2p:dialer" node myscript.js
+DEBUG="libp2p:tcp,libp2p:websockets,libp2p:webtransport,libp2p:kad-dht,libp2p:dialer" node my-script.js
 ```
 
 ### Browser
 
-```javascript
+```JavaScript
 // all libp2p debug logs
 localStorage.setItem('debug', 'libp2p:*') // then refresh the page to ensure the libraries can read this when spinning up.