fixed all merge conflicts for the v3 release

Author: gulshanpr

.github/dictionary.txt

@@ -14,6 +14,13 @@ additionals
 SECG
 Certicom
 RSAES
+unuse
+dialback
+chacha
+peerStore
+xxhandshake
+zerolen
+connmanager
 reprovide
 reprovider
 reproviding

.github/workflows/stale.yml

@@ -1,4 +1,4 @@
-name: Close Stale Issues
+name: Close and mark stale issue
 
 on:
   schedule:

doc/GETTING_STARTED.md

@@ -250,16 +250,28 @@ If you want to know more about libp2p peer discovery, you should read the follow
 
 ## Debugging
 
-When running libp2p you may want to see what things are happening behind the scenes. You can see trace logs by setting the `DEBUG` environment variable when running in Node.js, and by setting `debug` as a localStorage item when running in the browser. Some examples:
+When running libp2p you may want to see what things are happening behind the scenes. You can see trace logs by setting the `DEBUG` environment variable when running in Node.js, and by setting `debug` as a localStorage item when running in the browser.
+
+You may wish to start with trace logging, then narrow down the scope to just the components you are interested in.
+
+Wildcards in components names are supported (`*`), and components can be excluded by prefxing their name with `-`.
+
+Some examples:
 
 ### Node
 
 ```JavaScript
 # all libp2p debug logs
 DEBUG="libp2p:*" node my-script.js
 
-# networking debug logs
-DEBUG="libp2p:tcp,libp2p:websockets,libp2p:webtransport,libp2p:kad-dht,libp2p:dialer" node my-script.js
+# all libp2p debug logs, maximum detail
+DEBUG="libp2p:*,*:trace" node my-script.js
+
+# all libp2p debug logs including trace logs, exclude yamux
+DEBUG="libp2p:*,*:trace,-libp2p:yamux:*" node my-script.js
+
+# networking debug logs (here TCP and WebSocket transports are configured)
+DEBUG="libp2p:tcp:*,libp2p:websockets:*,libp2p:kad-dht,libp2p:connection-manager:*" node my-script.js
 ```
 
 ### Browser
@@ -269,9 +281,46 @@ DEBUG="libp2p:tcp,libp2p:websockets,libp2p:webtransport,libp2p:kad-dht,libp2p:di
 localStorage.setItem('debug', 'libp2p:*') // then refresh the page to ensure the libraries can read this when spinning up.
 
 // networking debug logs
-localStorage.setItem('debug', 'libp2p:websockets,libp2p:webtransport,libp2p:kad-dht,libp2p:dialer')
+localStorage.setItem('debug', 'libp2p:websockets*,libp2p:webtransport*,libp2p:kad-dht*,libp2p:connection-manager*')
 ```
 
+### Prefix logger
+
+If you are running multiple nodes in the same process (for example during a test run), separating their log output can be difficult.
+
+In this situation you can use the `prefixLogger` from the `@libp2p/logger` module:
+
+```ts
+import { prefixLogger } from '@libp2p/logger'
+import { createLibp2p } from 'libp2p'
+
+const dialer = await createLibp2p({
+  logger: prefixLogger('dialer')
+  // ... other options
+})
+
+const listener = await createLibp2p({
+  logger: prefixLogger('listener')
+  // ... other options
+})
+```
+
+All logs will be prefixed by the string passed to the prefix logger, so later you can do:
+
+```console
+DEBUG=dialer:*,listener:* node ./index.js
+listener:libp2p:transports adding transport @libp2p/tcp +0ms
+dialer:libp2p libp2p is starting +0ms
+listener:libp2p libp2p is starting +0ms
+dialer:libp2p:connection-manager started +0ms
+listener:libp2p:connection-manager started +0ms
+listener:libp2p:transports creating listener for @libp2p/tcp on /ip4/127.0.0.1/tcp/0 +6ms
+dialer:libp2p libp2p has started +7ms
+listener:libp2p libp2p has started +7ms
+```
+
+...and apply component log filters via the `DEBUG` env var as normal, e.g. `DEBUG=listener:libp2p:tcp:*` to just see TCP transport logs for the listener node, etc.
+
 ## React Native
 
 Libp2p can be used in React Native applications. However, there are some limitations and considerations to take into account as not all transports are supported and some of the underlying dependencies may not work as expected. There is on-going work to address these issues, particularly around the support of TCP. For a demo on how to use libp2p in a React Native application, see https://github.com/ipfs-shipyard/js-libp2p-react-native

doc/migrations/v0.43-v0.44.md

@@ -92,7 +92,7 @@ import { createLibp2p } from 'libp2p'
 const node = await createLibp2p({
   connectionGater: {
     denyDialMultiaddr: (multiaddr) => {
-      if (multiaddr.getPeerId() != null) {
+      if (multiaddr.findLast(c => c.code === CODE_P2P)?.value != null) {
         // there is a peer id present in the multiaddr
       }
 

doc/package.json

@@ -17,7 +17,7 @@
     "doc-check": "aegir doc-check"
   },
   "devDependencies": {
-    "aegir": "^47.0.14"
+    "aegir": "^47.0.21"
   },
   "private": true
 }

interop/node-version.json

@@ -9,8 +9,7 @@
       "onlyDial": true
     },
     "webrtc",
-    "webrtc-direct",
-    "quic-v1"
+    "webrtc-direct"
   ],
   "secureChannels": ["noise", "tls"],
   "muxers": ["yamux", "mplex"]

interop/package.json

@@ -11,22 +11,21 @@
     "dep-check": "aegir dep-check"
   },
   "devDependencies": {
-    "@chainsafe/libp2p-noise": "^16.1.3",
-    "@chainsafe/libp2p-quic": "^1.1.1",
-    "@chainsafe/libp2p-yamux": "^7.0.1",
-    "@libp2p/circuit-relay-v2": "^3.2.14",
-    "@libp2p/identify": "^3.0.32",
-    "@libp2p/interface": "^2.10.2",
-    "@libp2p/mplex": "^11.0.38",
-    "@libp2p/ping": "^2.0.32",
-    "@libp2p/tcp": "^10.1.13",
-    "@libp2p/tls": "^2.2.3",
-    "@libp2p/webrtc": "^5.2.15",
-    "@libp2p/websockets": "^9.2.13",
-    "@libp2p/webtransport": "^5.0.43",
-    "@multiformats/multiaddr": "^12.4.4",
-    "aegir": "^47.0.14",
-    "libp2p": "^2.8.8",
+    "@libp2p/noise": "^16.1.3",
+    "@libp2p/yamux": "^7.0.1",
+    "@libp2p/circuit-relay-v2": "^3.2.24",
+    "@libp2p/identify": "^3.0.39",
+    "@libp2p/interface": "^2.11.0",
+    "@libp2p/mplex": "^11.0.47",
+    "@libp2p/ping": "^2.0.37",
+    "@libp2p/tcp": "^10.1.19",
+    "@libp2p/tls": "^2.2.7",
+    "@libp2p/webrtc": "^5.2.24",
+    "@libp2p/websockets": "^9.2.19",
+    "@libp2p/webtransport": "^5.0.51",
+    "@multiformats/multiaddr": "^13.0.1",
+    "aegir": "^47.0.21",
+    "libp2p": "^2.10.0",
     "p-event": "^6.0.1",
     "redis": "^4.7.1"
   }

interop/test/dialer.spec.ts

@@ -5,7 +5,7 @@ import { multiaddr } from '@multiformats/multiaddr'
 import { getLibp2p } from './fixtures/get-libp2p.js'
 import { redisProxy } from './fixtures/redis-proxy.js'
 import type { Libp2p } from '@libp2p/interface'
-import type { PingService } from '@libp2p/ping'
+import type { Ping } from '@libp2p/ping'
 
 const isDialer: boolean = process.env.is_dialer === 'true'
 const timeoutMs: number = parseInt(process.env.test_timeout_secs ?? '180') * 1000
@@ -17,7 +17,7 @@ describe('ping test (dialer)', function () {
 
   // make the default timeout longer than the listener timeout
   this.timeout(timeoutMs + 30_000)
-  let node: Libp2p<{ ping: PingService }>
+  let node: Libp2p<{ ping: Ping }>
 
   beforeEach(async () => {
     node = await getLibp2p()

interop/test/fixtures/get-libp2p.ts

@@ -1,17 +1,17 @@
 /* eslint-disable complexity */
 
-import { noise } from '@chainsafe/libp2p-noise'
-import { quic } from '@chainsafe/libp2p-quic'
-import { yamux } from '@chainsafe/libp2p-yamux'
+// import { quic } from '@chainsafe/libp2p-quic'
 import { circuitRelayTransport } from '@libp2p/circuit-relay-v2'
 import { identify } from '@libp2p/identify'
 import { mplex } from '@libp2p/mplex'
+import { noise } from '@libp2p/noise'
 import { ping } from '@libp2p/ping'
 import { tcp } from '@libp2p/tcp'
 import { tls } from '@libp2p/tls'
 import { webRTC, webRTCDirect } from '@libp2p/webrtc'
 import { webSockets } from '@libp2p/websockets'
 import { webTransport } from '@libp2p/webtransport'
+import { yamux } from '@libp2p/yamux'
 import { createLibp2p } from 'libp2p'
 import type { Identify } from '@libp2p/identify'
 import type { Libp2p } from '@libp2p/interface'
@@ -83,12 +83,13 @@ export async function getLibp2p (): Promise<Libp2p<{ ping: PingService }>> {
         listen: isDialer ? [] : [`/ip4/${IP}/tcp/0/wss`]
       }
       break
-    case 'quic-v1':
-      options.transports = [quic()]
-      options.addresses = {
-        listen: isDialer ? [] : [`/ip4/${IP}/udp/0/quic-v1`]
-      }
-      break
+    // TODO: re-enable quic after v3 release
+    // case 'quic-v1':
+    //   options.transports = [quic()]
+    //   options.addresses = {
+    //     listen: isDialer ? [] : [`/ip4/${IP}/udp/0/quic-v1`]
+    //   }
+    //   break
     default:
       throw new Error(`Unknown transport: ${TRANSPORT ?? '???'}`)
   }
@@ -98,7 +99,8 @@ export async function getLibp2p (): Promise<Libp2p<{ ping: PingService }>> {
   switch (TRANSPORT) {
     case 'webtransport':
     case 'webrtc-direct':
-    case 'quic-v1':
+    // TODO: re-enable quic after v3 release
+    // case 'quic-v1':
       skipSecureChannel = true
       skipMuxer = true
       break
@@ -122,7 +124,7 @@ export async function getLibp2p (): Promise<Libp2p<{ ping: PingService }>> {
         options.connectionEncrypters = [tls()]
         break
       default:
-        throw new Error(`Unknown secure channel: ${SECURE_CHANNEL ?? ''}`)
+        throw new Error(`Unknown secure channel: ${SECURE_CHANNEL ?? ''} for transport ${TRANSPORT ?? ''}`)
     }
   }
 

interop/test/fixtures/relay.ts

@@ -1,8 +1,8 @@
-import { noise } from '@chainsafe/libp2p-noise'
-import { yamux } from '@chainsafe/libp2p-yamux'
 import { circuitRelayServer } from '@libp2p/circuit-relay-v2'
 import { identify } from '@libp2p/identify'
+import { noise } from '@libp2p/noise'
 import { webSockets } from '@libp2p/websockets'
+import { yamux } from '@libp2p/yamux'
 import { createLibp2p } from 'libp2p'
 import type { Libp2p } from '@libp2p/interface'