chore: upgrade libp2p & related deps (#1471)

* chore: update noise * update: package.lock * update: @chainsafe/libp2p-gossipsub * rm unwanted libp2p interface deps & bump up libp2p * refactor code for new deps * update: new package.lock * update package.lock * fix build * chore(deps)(deps-dev): bump eslint-plugin-functional from 5.0.8 to 6.0.0 (#1479) Bumps [eslint-plugin-functional](https://github.com/eslint-functional/eslint-plugin-functional) from 5.0.8 to 6.0.0. - [Release notes](https://github.com/eslint-functional/eslint-plugin-functional/releases) - [Changelog](https://github.com/eslint-functional/eslint-plugin-functional/blob/main/CHANGELOG.md) - [Commits](eslint-functional/eslint-plugin-functional@v5.0.8...v6.0.0) --- updated-dependencies: - dependency-name: eslint-plugin-functional dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(peer-exchange): refactor/fix compliance test (#1478) * use `peer:identify` instead of `peer:update` * dial the peer after initialising peer-exchange * re-enable @waku/tests (#1472) * chore(deps)(deps): bump @libp2p/websockets from 6.0.3 to 7.0.3 (#1481) Bumps [@libp2p/websockets](https://github.com/libp2p/js-libp2p) from 6.0.3 to 7.0.3. - [Release notes](https://github.com/libp2p/js-libp2p/releases) - [Changelog](https://github.com/libp2p/js-libp2p/blob/master/.release-please.json) - [Commits](libp2p/js-libp2p@peer-record-v6.0.3...websockets-v7.0.3) --- updated-dependencies: - dependency-name: "@libp2p/websockets" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * import type for interface * update: tsdoc (#1476) * fix imports for merge * update typedoc exports * add: CustomEvent import * use new libp2p interface --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
waku-org · Aug 16, 2023 · bb6608e · bb6608e
1 parent ff3ffdd
commit bb6608e
Show file tree

Hide file tree

Showing 45 changed files with 15,906 additions and 45,799 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "eslint": "^8.47.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-functional": "^5.0.4",
+    "eslint-plugin-functional": "^6.0.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^5.0.0",
     "gh-pages": "^5.0.0",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -85,11 +85,6 @@
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@libp2p/interface-connection": "^5.1.1",
-    "@libp2p/interface-libp2p": "^3.2.0",
-    "@libp2p/interface-peer-id": "^2.0.2",
-    "@libp2p/interface-peer-store": "^2.0.4",
-    "@libp2p/interface-registrar": "^2.0.12",
     "@multiformats/multiaddr": "^12.0.0",
     "@rollup/plugin-commonjs": "^24.0.1",
     "@rollup/plugin-json": "^6.0.0",
@@ -119,7 +114,7 @@
   },
   "peerDependencies": {
     "@multiformats/multiaddr": "^12.0.0",
-    "libp2p": "^0.45.9"
+    "libp2p": "^0.46.3"
   },
   "peerDependenciesMeta": {
     "@multiformats/multiaddr": {

diff --git a/packages/core/src/lib/base_protocol.ts b/packages/core/src/lib/base_protocol.ts
@@ -1,7 +1,7 @@
-import type { Stream } from "@libp2p/interface-connection";
-import type { Libp2p } from "@libp2p/interface-libp2p";
-import type { PeerId } from "@libp2p/interface-peer-id";
-import { Peer, PeerStore } from "@libp2p/interface-peer-store";
+import type { Libp2p } from "@libp2p/interface";
+import type { Stream } from "@libp2p/interface/connection";
+import type { PeerId } from "@libp2p/interface/peer-id";
+import { Peer, PeerStore } from "@libp2p/interface/peer-store";
 import type { IBaseProtocol, Libp2pComponents } from "@waku/interfaces";
 import {
   getPeersForProtocol,

diff --git a/packages/core/src/lib/connection_manager.ts b/packages/core/src/lib/connection_manager.ts
@@ -1,6 +1,6 @@
-import type { PeerId } from "@libp2p/interface-peer-id";
-import type { PeerInfo } from "@libp2p/interface-peer-info";
-import type { Peer } from "@libp2p/interface-peer-store";
+import type { PeerId } from "@libp2p/interface/peer-id";
+import type { PeerInfo } from "@libp2p/interface/peer-info";
+import type { Peer } from "@libp2p/interface/peer-store";
 import { CustomEvent, EventEmitter } from "@libp2p/interfaces/events";
 import {
   ConnectionManagerOptions,

diff --git a/packages/core/src/lib/filter/index.ts b/packages/core/src/lib/filter/index.ts
@@ -1,7 +1,7 @@
-import { Stream } from "@libp2p/interface-connection";
-import type { PeerId } from "@libp2p/interface-peer-id";
-import type { Peer } from "@libp2p/interface-peer-store";
-import type { IncomingStreamData } from "@libp2p/interface-registrar";
+import { Stream } from "@libp2p/interface/connection";
+import type { PeerId } from "@libp2p/interface/peer-id";
+import type { Peer } from "@libp2p/interface/peer-store";
+import type { IncomingStreamData } from "@libp2p/interface-internal/registrar";
 import type {
   Callback,
   ContentTopic,

diff --git a/packages/core/src/lib/keep_alive_manager.ts b/packages/core/src/lib/keep_alive_manager.ts
@@ -1,4 +1,4 @@
-import type { PeerId } from "@libp2p/interface-peer-id";
+import type { PeerId } from "@libp2p/interface/peer-id";
 import type { IRelay } from "@waku/interfaces";
 import type { KeepAliveOptions } from "@waku/interfaces";
 import debug from "debug";

diff --git a/packages/core/src/lib/light_push/index.ts b/packages/core/src/lib/light_push/index.ts
@@ -1,4 +1,4 @@
-import type { PeerId } from "@libp2p/interface-peer-id";
+import type { PeerId } from "@libp2p/interface/peer-id";
 import {
   IEncoder,
   ILightPush,

diff --git a/packages/core/src/lib/store/index.ts b/packages/core/src/lib/store/index.ts
@@ -1,5 +1,5 @@
-import type { Stream } from "@libp2p/interface-connection";
-import type { PeerId } from "@libp2p/interface-peer-id";
+import type { Stream } from "@libp2p/interface/connection";
+import type { PeerId } from "@libp2p/interface/peer-id";
 import { sha256 } from "@noble/hashes/sha256";
 import {
   Cursor,

diff --git a/packages/core/src/lib/wait_for_remote_peer.ts b/packages/core/src/lib/wait_for_remote_peer.ts
@@ -1,4 +1,4 @@
-import type { IdentifyResult } from "@libp2p/interface-libp2p";
+import type { IdentifyResult } from "@libp2p/interface";
 import type { IBaseProtocol, IRelay, Waku } from "@waku/interfaces";
 import { Protocols } from "@waku/interfaces";
 import debug from "debug";

diff --git a/packages/core/src/lib/waku.ts b/packages/core/src/lib/waku.ts
@@ -1,5 +1,5 @@
-import type { Stream } from "@libp2p/interface-connection";
-import { isPeerId, PeerId } from "@libp2p/interface-peer-id";
+import type { Stream } from "@libp2p/interface/connection";
+import { isPeerId, PeerId } from "@libp2p/interface/peer-id";
 import { multiaddr, Multiaddr, MultiaddrInput } from "@multiformats/multiaddr";
 import type {
   IFilter,

diff --git a/packages/dns-discovery/package.json b/packages/dns-discovery/package.json
@@ -51,8 +51,6 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@libp2p/interface-peer-discovery": "^2.0.0",
-    "@libp2p/interfaces": "^3.3.2",
     "@waku/enr": "0.0.16",
     "@waku/utils": "0.0.10",
     "debug": "^4.3.4",
@@ -61,8 +59,6 @@
     "uint8arrays": "^4.0.4"
   },
   "devDependencies": {
-    "@libp2p/interface-peer-info": "^1.0.10",
-    "@libp2p/interface-peer-store": "^2.0.4",
     "@libp2p/peer-id": "^2.0.4",
     "@libp2p/peer-id-factory": "^2.0.4",
     "@multiformats/multiaddr": "^12.0.0",

diff --git a/packages/dns-discovery/src/index.ts b/packages/dns-discovery/src/index.ts
@@ -1,11 +1,11 @@
+import { CustomEvent, EventEmitter } from "@libp2p/interface/events";
 import type {
   PeerDiscovery,
   PeerDiscoveryEvents
-} from "@libp2p/interface-peer-discovery";
-import { peerDiscovery as symbol } from "@libp2p/interface-peer-discovery";
-import type { PeerInfo } from "@libp2p/interface-peer-info";
-import type { PeerStore } from "@libp2p/interface-peer-store";
-import { CustomEvent, EventEmitter } from "@libp2p/interfaces/events";
+} from "@libp2p/interface/peer-discovery";
+import { peerDiscovery as symbol } from "@libp2p/interface/peer-discovery";
+import type { PeerInfo } from "@libp2p/interface/peer-info";
+import type { PeerStore } from "@libp2p/interface/peer-store";
 import type { IEnr } from "@waku/interfaces";
 import debug from "debug";
 

diff --git a/packages/enr/package.json b/packages/enr/package.json
@@ -61,8 +61,6 @@
     "js-sha3": "^0.8.0"
   },
   "devDependencies": {
-    "@libp2p/interface-peer-id": "^2.0.2",
-    "@libp2p/interface-peer-info": "^1.0.10",
     "@libp2p/peer-id-factory": "^2.0.4",
     "@rollup/plugin-commonjs": "^24.0.1",
     "@rollup/plugin-json": "^6.0.0",

diff --git a/packages/enr/src/creator.ts b/packages/enr/src/creator.ts
@@ -1,4 +1,4 @@
-import { PeerId } from "@libp2p/interface-peer-id";
+import type { PeerId } from "@libp2p/interface/peer-id";
 import type { ENRKey, ENRValue } from "@waku/interfaces";
 import { utf8ToBytes } from "@waku/utils/bytes";
 

diff --git a/packages/enr/src/enr.spec.ts b/packages/enr/src/enr.spec.ts
@@ -1,4 +1,4 @@
-import type { PeerId } from "@libp2p/interface-peer-id";
+import type { PeerId } from "@libp2p/interface/peer-id";
 import { createSecp256k1PeerId } from "@libp2p/peer-id-factory";
 import { multiaddr } from "@multiformats/multiaddr";
 import * as secp from "@noble/secp256k1";

diff --git a/packages/enr/src/enr.ts b/packages/enr/src/enr.ts
@@ -1,5 +1,5 @@
-import type { PeerId } from "@libp2p/interface-peer-id";
-import type { PeerInfo } from "@libp2p/interface-peer-info";
+import type { PeerId } from "@libp2p/interface/peer-id";
+import type { PeerInfo } from "@libp2p/interface/peer-info";
 import type { Multiaddr } from "@multiformats/multiaddr";
 import type {
   ENRKey,

diff --git a/packages/enr/src/peer_id.ts b/packages/enr/src/peer_id.ts
@@ -1,6 +1,6 @@
 import { unmarshalPrivateKey, unmarshalPublicKey } from "@libp2p/crypto/keys";
 import { supportedKeys } from "@libp2p/crypto/keys";
-import type { PeerId } from "@libp2p/interface-peer-id";
+import type { PeerId } from "@libp2p/interface/peer-id";
 import { peerIdFromKeys } from "@libp2p/peer-id";
 
 export function createPeerIdFromPublicKey(

diff --git a/packages/interfaces/package.json b/packages/interfaces/package.json
@@ -47,19 +47,12 @@
     "node": ">=16"
   },
   "devDependencies": {
-    "@chainsafe/libp2p-gossipsub": "^9.1.0",
-    "@libp2p/interface-connection": "^5.1.1",
-    "@libp2p/interface-connection-manager": "^3.0.1",
-    "@libp2p/interface-libp2p": "^3.2.0",
-    "@libp2p/interface-peer-id": "^2.0.2",
-    "@libp2p/interface-peer-info": "^1.0.10",
-    "@libp2p/interface-peer-store": "^2.0.4",
-    "@libp2p/interface-registrar": "^2.0.12",
+    "@chainsafe/libp2p-gossipsub": "^10.0.0",
     "@multiformats/multiaddr": "^12.0.0",
     "cspell": "^7.0.0",
     "npm-run-all": "^4.1.5",
     "typescript": "^5.0.4",
-    "libp2p": "^0.45.9"
+    "libp2p": "^0.46.3"
   },
   "typedoc": {
     "entryPoint": "./src/index.ts"

diff --git a/packages/interfaces/src/connection_manager.ts b/packages/interfaces/src/connection_manager.ts
@@ -1,5 +1,5 @@
-import type { PeerId } from "@libp2p/interface-peer-id";
-import type { Peer } from "@libp2p/interface-peer-store";
+import type { PeerId } from "@libp2p/interface/peer-id";
+import type { Peer } from "@libp2p/interface/peer-store";
 import type { EventEmitter } from "@libp2p/interfaces/events";
 
 export enum Tags {

diff --git a/packages/interfaces/src/enr.ts b/packages/interfaces/src/enr.ts
@@ -1,5 +1,5 @@
-import type { PeerId } from "@libp2p/interface-peer-id";
-import type { PeerInfo } from "@libp2p/interface-peer-info";
+import type { PeerId } from "@libp2p/interface/peer-id";
+import type { PeerInfo } from "@libp2p/interface/peer-info";
 import type { Multiaddr } from "@multiformats/multiaddr";
 
 export type ENRKey = string;

diff --git a/packages/interfaces/src/filter.ts b/packages/interfaces/src/filter.ts
@@ -1,4 +1,4 @@
-import type { PeerId } from "@libp2p/interface-peer-id";
+import type { PeerId } from "@libp2p/interface/peer-id";
 
 import type { IDecodedMessage, IDecoder } from "./message.js";
 import type { ContentTopic } from "./misc.js";

diff --git a/packages/interfaces/src/libp2p.ts b/packages/interfaces/src/libp2p.ts
@@ -1,5 +1,5 @@
 import type { GossipSub } from "@chainsafe/libp2p-gossipsub";
-import type { Libp2p as BaseLibp2p } from "@libp2p/interface-libp2p";
+import type { Libp2p as BaseLibp2p } from "@libp2p/interface";
 import type { Libp2pInit } from "libp2p";
 import type { identifyService } from "libp2p/identify";
 import type { PingService } from "libp2p/ping";

diff --git a/packages/interfaces/src/peer_exchange.ts b/packages/interfaces/src/peer_exchange.ts
@@ -1,6 +1,6 @@
-import type { ConnectionManager } from "@libp2p/interface-connection-manager";
-import type { PeerId } from "@libp2p/interface-peer-id";
-import type { PeerStore } from "@libp2p/interface-peer-store";
+import type { PeerId } from "@libp2p/interface/peer-id";
+import type { PeerStore } from "@libp2p/interface/peer-store";
+import type { ConnectionManager } from "@libp2p/interface-internal/connection-manager";
 
 import { IEnr } from "./enr.js";
 import { IBaseProtocol } from "./protocols.js";

diff --git a/packages/interfaces/src/protocols.ts b/packages/interfaces/src/protocols.ts
@@ -1,6 +1,6 @@
-import type { Libp2p } from "@libp2p/interface-libp2p";
-import type { PeerId } from "@libp2p/interface-peer-id";
-import type { Peer, PeerStore } from "@libp2p/interface-peer-store";
+import type { Libp2p } from "@libp2p/interface";
+import type { PeerId } from "@libp2p/interface/peer-id";
+import type { Peer, PeerStore } from "@libp2p/interface/peer-store";
 import type { Libp2pOptions } from "libp2p";
 
 import type { IDecodedMessage } from "./message.js";

diff --git a/packages/interfaces/src/relay.ts b/packages/interfaces/src/relay.ts
@@ -4,7 +4,14 @@ import type { PeerIdStr, TopicStr } from "@chainsafe/libp2p-gossipsub/types";
 import { IReceiver } from "./receiver.js";
 import type { ISender } from "./sender.js";
 
-interface IRelayAPI {
+/**
+ * Interface representing the Relay API, providing control and information about the GossipSub protocol.
+ *
+ * @property gossipSub - The GossipSub instance used for managing pub/sub behavior.
+ * @property start - Function to start the relay, returning a Promise that resolves when initialization is complete.
+ * @property getMeshPeers - Function to retrieve the mesh peers for a given topic or all topics if none is specified. Returns an array of peer IDs as strings.
+ */
+export interface IRelayAPI {
   readonly gossipSub: GossipSub;
   start: () => Promise<void>;
   getMeshPeers: (topic?: TopicStr) => PeerIdStr[];

diff --git a/packages/interfaces/src/waku.ts b/packages/interfaces/src/waku.ts
@@ -1,5 +1,5 @@
-import type { Stream } from "@libp2p/interface-connection";
-import type { PeerId } from "@libp2p/interface-peer-id";
+import type { Stream } from "@libp2p/interface/connection";
+import type { PeerId } from "@libp2p/interface/peer-id";
 import type { Multiaddr } from "@multiformats/multiaddr";
 
 import { IConnectionManager } from "./connection_manager.js";

diff --git a/packages/message-encryption/package.json b/packages/message-encryption/package.json
@@ -80,12 +80,6 @@
     "js-sha3": "^0.8.0"
   },
   "devDependencies": {
-    "@libp2p/interface-connection": "^5.1.1",
-    "@libp2p/interface-connection-manager": "^3.0.1",
-    "@libp2p/interface-libp2p": "^3.2.0",
-    "@libp2p/interface-peer-id": "^2.0.2",
-    "@libp2p/interface-peer-store": "^2.0.4",
-    "@libp2p/interface-registrar": "^2.0.12",
     "@rollup/plugin-commonjs": "^24.0.1",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.2",

diff --git a/packages/peer-exchange/package.json b/packages/peer-exchange/package.json
@@ -48,25 +48,18 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@libp2p/interface-peer-discovery": "^2.0.0",
     "@libp2p/interfaces": "^3.3.2",
     "@waku/core": "0.0.22",
     "@waku/enr": "0.0.16",
+    "@waku/interfaces": "0.0.17",
     "@waku/proto": "0.0.5",
     "@waku/utils": "0.0.10",
-    "@waku/interfaces": "0.0.17",
     "debug": "^4.3.4",
     "it-all": "^3.0.2",
     "it-length-prefixed": "^9.0.1",
     "it-pipe": "^3.0.1"
   },
   "devDependencies": {
-    "@libp2p/interface-connection-manager": "^3.0.1",
-    "@libp2p/interface-libp2p": "^3.2.0",
-    "@libp2p/interface-peer-id": "^2.0.2",
-    "@libp2p/interface-peer-info": "^1.0.10",
-    "@libp2p/interface-peer-store": "^2.0.4",
-    "@libp2p/interface-registrar": "^2.0.12",
     "@rollup/plugin-commonjs": "^24.0.1",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.2",

diff --git a/packages/peer-exchange/src/waku_peer_exchange_discovery.ts b/packages/peer-exchange/src/waku_peer_exchange_discovery.ts
@@ -1,12 +1,12 @@
-import type { PeerUpdate } from "@libp2p/interface-libp2p";
+import type { IdentifyResult } from "@libp2p/interface";
+import { CustomEvent, EventEmitter } from "@libp2p/interface/events";
 import type {
   PeerDiscovery,
   PeerDiscoveryEvents
-} from "@libp2p/interface-peer-discovery";
-import { peerDiscovery as symbol } from "@libp2p/interface-peer-discovery";
-import type { PeerId } from "@libp2p/interface-peer-id";
-import type { PeerInfo } from "@libp2p/interface-peer-info";
-import { CustomEvent, EventEmitter } from "@libp2p/interfaces/events";
+} from "@libp2p/interface/peer-discovery";
+import { peerDiscovery as symbol } from "@libp2p/interface/peer-discovery";
+import type { PeerId } from "@libp2p/interface/peer-id";
+import type { PeerInfo } from "@libp2p/interface/peer-info";
 import { Libp2pComponents, Tags } from "@waku/interfaces";
 import debug from "debug";
 
@@ -61,11 +61,10 @@ export class PeerExchangeDiscovery
   private queryAttempts: Map<string, number> = new Map();
 
   private readonly handleDiscoveredPeer = (
-    event: CustomEvent<PeerUpdate>
+    event: CustomEvent<IdentifyResult>
   ): void => {
-    const {
-      peer: { protocols, id: peerId }
-    } = event.detail;
+    const { protocols, peerId } = event.detail;
+
     if (
       !protocols.includes(PeerExchangeCodec) ||
       this.queryingPeers.has(peerId.toString())
@@ -98,7 +97,7 @@ export class PeerExchangeDiscovery
 
     // might be better to use "peer:identify" or "peer:update"
     this.components.events.addEventListener(
-      "peer:update",
+      "peer:identify",
       this.handleDiscoveredPeer
     );
   }
@@ -112,7 +111,7 @@ export class PeerExchangeDiscovery
     this.isStarted = false;
     this.queryingPeers.clear();
     this.components.events.removeEventListener(
-      "peer:update",
+      "peer:identify",
       this.handleDiscoveredPeer
     );
   }

diff --git a/packages/relay/package.json b/packages/relay/package.json
@@ -49,7 +49,7 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@chainsafe/libp2p-gossipsub": "^9.1.0",
+    "@chainsafe/libp2p-gossipsub": "^10.0.0",
     "@noble/hashes": "^1.3.0",
     "@waku/core": "0.0.22",
     "@waku/interfaces": "0.0.17",
@@ -60,7 +60,6 @@
     "fast-check": "^3.8.1"
   },
   "devDependencies": {
-    "@libp2p/interface-pubsub": "^4.0.1",
     "@rollup/plugin-commonjs": "^24.1.0",
     "@waku/build-utils": "*",
     "@rollup/plugin-json": "^6.0.0",

diff --git a/packages/relay/src/index.ts b/packages/relay/src/index.ts
@@ -6,7 +6,7 @@ import {
 } from "@chainsafe/libp2p-gossipsub";
 import type { PeerIdStr, TopicStr } from "@chainsafe/libp2p-gossipsub/types";
 import { SignaturePolicy } from "@chainsafe/libp2p-gossipsub/types";
-import type { PubSub } from "@libp2p/interface-pubsub";
+import type { PubSub } from "@libp2p/interface/pubsub";
 import { sha256 } from "@noble/hashes/sha256";
 import { DefaultPubSubTopic } from "@waku/core";
 import {

diff --git a/packages/relay/src/message_validator.spec.ts b/packages/relay/src/message_validator.spec.ts
@@ -1,5 +1,5 @@
-import { TopicValidatorResult } from "@libp2p/interface-pubsub";
-import type { UnsignedMessage } from "@libp2p/interface-pubsub";
+import { TopicValidatorResult } from "@libp2p/interface/pubsub";
+import type { UnsignedMessage } from "@libp2p/interface/pubsub";
 import { createSecp256k1PeerId } from "@libp2p/peer-id-factory";
 import { createEncoder } from "@waku/core";
 import { expect } from "chai";