deps: update @multiformats/multiaddr-matcher dep to 2.x.x (#3208)

achingbrain · web-flow · commit 57e7fa4413a0 · 2025-07-07T17:13:33.000+02:00
Updates usage and fixes compilation errors.
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
@@ -60,7 +60,7 @@
     "@multiformats/dns": "^1.0.6",
     "@multiformats/mafmt": "^12.1.6",
     "@multiformats/multiaddr": "^12.4.4",
-    "@multiformats/multiaddr-matcher": "^1.7.2",
+    "@multiformats/multiaddr-matcher": "^2.0.0",
     "aegir": "^47.0.14",
     "delay": "^6.0.0",
     "detect-browser": "^5.3.0",
diff --git a/packages/integration-tests/test/compliance/transport/circuit-relay.spec.ts b/packages/integration-tests/test/compliance/transport/circuit-relay.spec.ts
@@ -6,11 +6,12 @@ import { circuitRelayTransport } from '@libp2p/circuit-relay-v2'
 import { identify } from '@libp2p/identify'
 import tests from '@libp2p/interface-compliance-tests/transport'
 import { webSockets } from '@libp2p/websockets'
+import { CODE_P2P_CIRCUIT } from '@multiformats/multiaddr'
 import { Circuit, P2P } from '@multiformats/multiaddr-matcher'
-import { and, fmt, literal } from '@multiformats/multiaddr-matcher/utils'
+import { and, fmt, code } from '@multiformats/multiaddr-matcher/utils'
 
 export const CircuitListen = fmt(
-  and(P2P.matchers[0], literal('p2p-circuit'))
+  and(P2P.matchers[0], code(CODE_P2P_CIRCUIT))
 )
 
 describe('Circuit relay transport interface compliance', () => {
diff --git a/packages/interface-compliance-tests/package.json b/packages/interface-compliance-tests/package.json
@@ -109,7 +109,7 @@
     "@libp2p/plaintext": "^2.0.28",
     "@libp2p/utils": "^6.7.1",
     "@multiformats/multiaddr": "^12.4.4",
-    "@multiformats/multiaddr-matcher": "^1.7.2",
+    "@multiformats/multiaddr-matcher": "^2.0.0",
     "abortable-iterator": "^5.1.0",
     "aegir": "^47.0.14",
     "any-signal": "^4.1.1",
diff --git a/packages/libp2p/package.json b/packages/libp2p/package.json
@@ -91,7 +91,7 @@
     "@libp2p/utils": "^6.7.1",
     "@multiformats/dns": "^1.0.6",
     "@multiformats/multiaddr": "^12.4.4",
-    "@multiformats/multiaddr-matcher": "^1.7.2",
+    "@multiformats/multiaddr-matcher": "^2.0.0",
     "any-signal": "^4.1.1",
     "datastore-core": "^10.0.2",
     "interface-datastore": "^8.3.1",
diff --git a/packages/libp2p/src/address-manager/index.ts b/packages/libp2p/src/address-manager/index.ts
@@ -5,7 +5,7 @@ import { debounce } from '@libp2p/utils/debounce'
 import { createScalableCuckooFilter } from '@libp2p/utils/filters'
 import { isPrivateIp } from '@libp2p/utils/private-ip'
 import { multiaddr } from '@multiformats/multiaddr'
-import { QUICV1, TCP, WebSockets, WebSocketsSecure } from '@multiformats/multiaddr-matcher'
+import { QUIC_V1, TCP, WebSockets, WebSocketsSecure } from '@multiformats/multiaddr-matcher'
 import { DNSMappings } from './dns-mappings.js'
 import { IPMappings } from './ip-mappings.js'
 import { ObservedAddresses } from './observed-addresses.js'
@@ -489,7 +489,7 @@ export class AddressManager implements AddressManagerInterface {
     const transportMatchers: Array<(ma: Multiaddr) => boolean> = [
       (ma: Multiaddr) => WebSockets.exactMatch(ma) || WebSocketsSecure.exactMatch(ma),
       (ma: Multiaddr) => TCP.exactMatch(ma),
-      (ma: Multiaddr) => QUICV1.exactMatch(ma)
+      (ma: Multiaddr) => QUIC_V1.exactMatch(ma)
     ]
 
     for (const matcher of transportMatchers) {
diff --git a/packages/protocol-dcutr/package.json b/packages/protocol-dcutr/package.json
@@ -49,7 +49,7 @@
     "@libp2p/interface-internal": "^2.3.18",
     "@libp2p/utils": "^6.7.1",
     "@multiformats/multiaddr": "^12.4.4",
-    "@multiformats/multiaddr-matcher": "^1.7.2",
+    "@multiformats/multiaddr-matcher": "^2.0.0",
     "delay": "^6.0.0",
     "it-protobuf-stream": "^2.0.2",
     "protons-runtime": "^5.5.0",
diff --git a/packages/protocol-identify/package.json b/packages/protocol-identify/package.json
@@ -52,7 +52,7 @@
     "@libp2p/peer-record": "^8.0.34",
     "@libp2p/utils": "^6.7.1",
     "@multiformats/multiaddr": "^12.4.4",
-    "@multiformats/multiaddr-matcher": "^1.7.2",
+    "@multiformats/multiaddr-matcher": "^2.0.0",
     "it-drain": "^3.0.9",
     "it-parallel": "^3.0.11",
     "it-protobuf-stream": "^2.0.2",
diff --git a/packages/transport-circuit-relay-v2/package.json b/packages/transport-circuit-relay-v2/package.json
@@ -53,7 +53,7 @@
     "@libp2p/peer-record": "^8.0.34",
     "@libp2p/utils": "^6.7.1",
     "@multiformats/multiaddr": "^12.4.4",
-    "@multiformats/multiaddr-matcher": "^1.7.2",
+    "@multiformats/multiaddr-matcher": "^2.0.0",
     "any-signal": "^4.1.1",
     "it-protobuf-stream": "^2.0.2",
     "it-stream-types": "^2.0.2",
diff --git a/packages/transport-circuit-relay-v2/src/utils.ts b/packages/transport-circuit-relay-v2/src/utils.ts
@@ -1,5 +1,6 @@
+import { CODE_P2P_CIRCUIT } from '@multiformats/multiaddr'
 import { P2P } from '@multiformats/multiaddr-matcher'
-import { fmt, literal, and } from '@multiformats/multiaddr-matcher/utils'
+import { fmt, code, and } from '@multiformats/multiaddr-matcher/utils'
 import { anySignal } from 'any-signal'
 import { CID } from 'multiformats/cid'
 import { sha256 } from 'multiformats/hashes/sha2'
@@ -197,12 +198,12 @@ export class LimitTracker {
  * A custom matcher that tells us to listen on a particular relay
  */
 export const CircuitListen = fmt(
-  and(P2P.matchers[0], literal('p2p-circuit'))
+  and(P2P.matchers[0], code(CODE_P2P_CIRCUIT))
 )
 
 /**
  * A custom matcher that tells us to discover available relays
  */
 export const CircuitSearch = fmt(
-  literal('p2p-circuit')
+  code(CODE_P2P_CIRCUIT)
 )
diff --git a/packages/transport-memory/package.json b/packages/transport-memory/package.json
@@ -46,7 +46,7 @@
   "dependencies": {
     "@libp2p/interface": "^2.10.5",
     "@multiformats/multiaddr": "^12.4.4",
-    "@multiformats/multiaddr-matcher": "^1.7.2",
+    "@multiformats/multiaddr-matcher": "^2.0.0",
     "@types/sinon": "^17.0.4",
     "delay": "^6.0.0",
     "it-map": "^3.1.3",
diff --git a/packages/transport-tcp/package.json b/packages/transport-tcp/package.json
@@ -56,7 +56,7 @@
     "@libp2p/interface": "^2.10.5",
     "@libp2p/utils": "^6.7.1",
     "@multiformats/multiaddr": "^12.4.4",
-    "@multiformats/multiaddr-matcher": "^1.7.2",
+    "@multiformats/multiaddr-matcher": "^2.0.0",
     "@types/sinon": "^17.0.4",
     "main-event": "^1.0.1",
     "p-defer": "^4.0.1",
diff --git a/packages/transport-webrtc/package.json b/packages/transport-webrtc/package.json
@@ -54,7 +54,7 @@
     "@libp2p/peer-id": "^5.1.8",
     "@libp2p/utils": "^6.7.1",
     "@multiformats/multiaddr": "^12.4.4",
-    "@multiformats/multiaddr-matcher": "^1.7.2",
+    "@multiformats/multiaddr-matcher": "^2.0.0",
     "@peculiar/webcrypto": "^1.5.0",
     "@peculiar/x509": "^1.12.3",
     "any-signal": "^4.1.1",
diff --git a/packages/transport-webrtc/src/private-to-private/listener.ts b/packages/transport-webrtc/src/private-to-private/listener.ts
@@ -1,12 +1,13 @@
+import { CODE_P2P_CIRCUIT } from '@multiformats/multiaddr'
 import { P2P } from '@multiformats/multiaddr-matcher'
-import { fmt, literal } from '@multiformats/multiaddr-matcher/utils'
+import { fmt, code } from '@multiformats/multiaddr-matcher/utils'
 import { TypedEventEmitter } from 'main-event'
 import type { PeerId, ListenerEvents, Listener, Libp2pEvents } from '@libp2p/interface'
 import type { TransportManager } from '@libp2p/interface-internal'
 import type { Multiaddr } from '@multiformats/multiaddr'
 import type { TypedEventTarget } from 'main-event'
 
-const Circuit = fmt(P2P.matchers[0], literal('p2p-circuit'))
+const Circuit = fmt(P2P.matchers[0], code(CODE_P2P_CIRCUIT))
 
 export interface WebRTCPeerListenerComponents {
   peerId: PeerId
diff --git a/packages/transport-websockets/package.json b/packages/transport-websockets/package.json
@@ -70,7 +70,7 @@
     "@libp2p/interface": "^2.10.5",
     "@libp2p/utils": "^6.7.1",
     "@multiformats/multiaddr": "^12.4.4",
-    "@multiformats/multiaddr-matcher": "^1.7.2",
+    "@multiformats/multiaddr-matcher": "^2.0.0",
     "@multiformats/multiaddr-to-uri": "^11.0.0",
     "@types/ws": "^8.18.1",
     "it-ws": "^6.1.5",
diff --git a/packages/transport-webtransport/package.json b/packages/transport-webtransport/package.json
@@ -48,7 +48,7 @@
     "@libp2p/peer-id": "^5.1.8",
     "@libp2p/utils": "^6.7.1",
     "@multiformats/multiaddr": "^12.4.4",
-    "@multiformats/multiaddr-matcher": "^1.7.2",
+    "@multiformats/multiaddr-matcher": "^2.0.0",
     "it-stream-types": "^2.0.2",
     "multiformats": "^13.3.6",
     "progress-events": "^1.0.1",
diff --git a/packages/upnp-nat/package.json b/packages/upnp-nat/package.json
@@ -53,7 +53,7 @@
     "@libp2p/interface-internal": "^2.3.18",
     "@libp2p/utils": "^6.7.1",
     "@multiformats/multiaddr": "^12.4.4",
-    "@multiformats/multiaddr-matcher": "^1.7.2",
+    "@multiformats/multiaddr-matcher": "^2.0.0",
     "main-event": "^1.0.1",
     "p-defer": "^4.0.1",
     "race-signal": "^1.1.3"
diff --git a/packages/upnp-nat/src/upnp-port-mapper.ts b/packages/upnp-nat/src/upnp-port-mapper.ts
@@ -5,7 +5,7 @@ import { isLoopback } from '@libp2p/utils/multiaddr/is-loopback'
 import { isPrivate } from '@libp2p/utils/multiaddr/is-private'
 import { isPrivateIp } from '@libp2p/utils/private-ip'
 import { multiaddr } from '@multiformats/multiaddr'
-import { QUICV1, TCP, WebSockets, WebSocketsSecure, WebTransport } from '@multiformats/multiaddr-matcher'
+import { QUIC_V1, TCP, WebSockets, WebSocketsSecure, WebTransport } from '@multiformats/multiaddr-matcher'
 import { dynamicExternalAddress, staticExternalAddress } from './check-external-address.js'
 import { DoubleNATError } from './errors.js'
 import type { ExternalAddress } from './check-external-address.js'
@@ -242,7 +242,7 @@ export class UPnPPortMapper {
     return TCP.exactMatch(ma) ||
       WebSockets.exactMatch(ma) ||
       WebSocketsSecure.exactMatch(ma) ||
-      QUICV1.exactMatch(ma) ||
+      QUIC_V1.exactMatch(ma) ||
       WebTransport.exactMatch(ma)
   }
 }
