Merge pull request #1789 from waku-org/chore/bump-libp2p-packages

chore: bump all libp2p packages to latest version
waku-org · Jan 17, 2024 · a859243 · a859243
2 parents d3bd7f8 + ae7bc3e
commit a859243
Show file tree

Hide file tree

Showing 50 changed files with 9,770 additions and 6,323 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -72,6 +72,7 @@
     "node": ">=18"
   },
   "dependencies": {
+    "@libp2p/ping": "^1.0.9",
     "@noble/hashes": "^1.3.2",
     "@waku/enr": "^0.0.20",
     "@waku/interfaces": "0.0.21",
@@ -107,7 +108,7 @@
   },
   "peerDependencies": {
     "@multiformats/multiaddr": "^12.0.0",
-    "libp2p": "^0.46.3"
+    "libp2p": "^1.1.2"
   },
   "peerDependenciesMeta": {
     "@multiformats/multiaddr": {

diff --git a/packages/core/src/lib/base_protocol.ts b/packages/core/src/lib/base_protocol.ts
@@ -1,6 +1,5 @@
 import type { Libp2p } from "@libp2p/interface";
-import type { Stream } from "@libp2p/interface/connection";
-import { Peer, PeerStore } from "@libp2p/interface/peer-store";
+import type { Peer, PeerStore, Stream } from "@libp2p/interface";
 import type {
   IBaseProtocol,
   Libp2pComponents,
@@ -69,7 +68,7 @@ export class BaseProtocol implements IBaseProtocol {
    *
    * @param numPeers - The total number of peers to retrieve. If 0, all peers are returned.
    * @param maxBootstrapPeers - The maximum number of bootstrap peers to retrieve.
-   
+
   * @returns A list of peers that support the protocol sorted by latency.
   */
   protected async getPeers(

diff --git a/packages/core/src/lib/connection_manager.ts b/packages/core/src/lib/connection_manager.ts
@@ -1,8 +1,5 @@
-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 { PeerStore } from "@libp2p/interface/peer-store";
-import { CustomEvent, EventEmitter } from "@libp2p/interfaces/events";
+import type { Peer, PeerId, PeerInfo, PeerStore } from "@libp2p/interface";
+import { CustomEvent, TypedEventEmitter } from "@libp2p/interface";
 import { decodeRelayShard } from "@waku/enr";
 import {
   ConnectionManagerOptions,
@@ -30,7 +27,7 @@ export const DEFAULT_MAX_DIAL_ATTEMPTS_FOR_PEER = 3;
 export const DEFAULT_MAX_PARALLEL_DIALS = 3;
 
 export class ConnectionManager
-  extends EventEmitter<IPeersByDiscoveryEvents & IConnectionStateEvents>
+  extends TypedEventEmitter<IPeersByDiscoveryEvents & IConnectionStateEvents>
   implements IConnectionManager
 {
   private static instances = new Map<string, ConnectionManager>();

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

diff --git a/packages/core/src/lib/filterPeers.spec.ts b/packages/core/src/lib/filterPeers.spec.ts
@@ -1,5 +1,5 @@
-import { Peer } from "@libp2p/interface/peer-store";
-import type { Tag } from "@libp2p/interface/peer-store";
+import { Peer } from "@libp2p/interface";
+import type { Tag } from "@libp2p/interface";
 import { createSecp256k1PeerId } from "@libp2p/peer-id-factory";
 import { Tags } from "@waku/interfaces";
 import { expect } from "chai";

diff --git a/packages/core/src/lib/filterPeers.ts b/packages/core/src/lib/filterPeers.ts
@@ -1,4 +1,4 @@
-import { Peer } from "@libp2p/interface/peer-store";
+import { Peer } from "@libp2p/interface";
 import { Tags } from "@waku/interfaces";
 
 /**

diff --git a/packages/core/src/lib/keep_alive_manager.ts b/packages/core/src/lib/keep_alive_manager.ts
@@ -1,10 +1,9 @@
-import type { PeerId } from "@libp2p/interface/peer-id";
-import type { PeerStore } from "@libp2p/interface/peer-store";
+import type { PeerId, PeerStore } from "@libp2p/interface";
+import type { PingService } from "@libp2p/ping";
 import type { IRelay, PeerIdStr } from "@waku/interfaces";
 import type { KeepAliveOptions } from "@waku/interfaces";
 import { Logger, pubsubTopicToSingleShardInfo } from "@waku/utils";
 import { utf8ToBytes } from "@waku/utils/bytes";
-import type { PingService } from "libp2p/ping";
 
 import { createEncoder } from "./message/version_0.js";
 

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

diff --git a/packages/core/src/lib/metadata/index.ts b/packages/core/src/lib/metadata/index.ts
@@ -1,5 +1,5 @@
-import type { PeerId } from "@libp2p/interface/peer-id";
-import { IncomingStreamData } from "@libp2p/interface/stream-handler";
+import type { PeerId } from "@libp2p/interface";
+import { IncomingStreamData } from "@libp2p/interface";
 import { encodeRelayShard } from "@waku/enr";
 import type {
   IMetadata,

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

diff --git a/packages/core/src/lib/stream_manager.ts b/packages/core/src/lib/stream_manager.ts
@@ -1,6 +1,5 @@
-import type { PeerUpdate } from "@libp2p/interface";
-import type { Stream } from "@libp2p/interface/connection";
-import { Peer } from "@libp2p/interface/peer-store";
+import type { PeerUpdate, Stream } from "@libp2p/interface";
+import { Peer } from "@libp2p/interface";
 import { Libp2p } from "@waku/interfaces";
 import { Logger } from "@waku/utils";
 import { selectConnection } from "@waku/utils/libp2p";

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";
+import { isPeerId, PeerId } from "@libp2p/interface";
 import { multiaddr, Multiaddr, MultiaddrInput } from "@multiformats/multiaddr";
 import type {
   IFilter,
@@ -185,7 +185,7 @@ export class WakuNode implements Waku {
   }
 
   isStarted(): boolean {
-    return this.libp2p.isStarted();
+    return this.libp2p.status == "started";
   }
 
   isConnected(): boolean {

diff --git a/packages/dns-discovery/package.json b/packages/dns-discovery/package.json
@@ -59,8 +59,8 @@
     "uint8arrays": "^4.0.4"
   },
   "devDependencies": {
-    "@libp2p/peer-id": "^3.0.3",
-    "@libp2p/peer-id-factory": "^3.0.3",
+    "@libp2p/peer-id": "^4.0.4",
+    "@libp2p/peer-id-factory": "^4.0.4",
     "@multiformats/multiaddr": "^12.0.0",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-json": "^6.0.0",

diff --git a/packages/dns-discovery/src/dns_discovery.ts b/packages/dns-discovery/src/dns_discovery.ts
@@ -1,10 +1,11 @@
-import { CustomEvent, EventEmitter } from "@libp2p/interface/events";
-import type {
+import {
+  CustomEvent,
   PeerDiscovery,
-  PeerDiscoveryEvents
-} from "@libp2p/interface/peer-discovery";
-import { peerDiscovery as symbol } from "@libp2p/interface/peer-discovery";
-import type { PeerInfo } from "@libp2p/interface/peer-info";
+  PeerDiscoveryEvents,
+  TypedEventEmitter
+} from "@libp2p/interface";
+import { peerDiscoverySymbol as symbol } from "@libp2p/interface";
+import type { PeerInfo } from "@libp2p/interface";
 import { encodeRelayShard } from "@waku/enr";
 import type {
   DnsDiscOptions,
@@ -28,7 +29,7 @@ const log = new Logger("peer-discovery-dns");
  * Parse options and expose function to return bootstrap peer addresses.
  */
 export class PeerDiscoveryDns
-  extends EventEmitter<PeerDiscoveryEvents>
+  extends TypedEventEmitter<PeerDiscoveryEvents>
   implements PeerDiscovery
 {
   private nextPeer: (() => AsyncGenerator<IEnr>) | undefined;

diff --git a/packages/enr/package.json b/packages/enr/package.json
@@ -52,16 +52,16 @@
   },
   "dependencies": {
     "@ethersproject/rlp": "^5.7.0",
-    "@libp2p/crypto": "^3.0.2",
-    "@libp2p/peer-id": "^3.0.3",
+    "@libp2p/crypto": "^4.0.0",
+    "@libp2p/peer-id": "^4.0.4",
     "@multiformats/multiaddr": "^12.0.0",
     "@noble/secp256k1": "^1.7.1",
     "@waku/utils": "0.0.14",
     "debug": "^4.3.4",
     "js-sha3": "^0.9.2"
   },
   "devDependencies": {
-    "@libp2p/peer-id-factory": "^3.0.3",
+    "@libp2p/peer-id-factory": "^4.0.4",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.2.3",

diff --git a/packages/enr/src/creator.ts b/packages/enr/src/creator.ts
@@ -1,4 +1,4 @@
-import type { PeerId } from "@libp2p/interface/peer-id";
+import type { PeerId } from "@libp2p/interface";
 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";
 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,4 @@
-import type { PeerId } from "@libp2p/interface/peer-id";
-import type { PeerInfo } from "@libp2p/interface/peer-info";
+import type { PeerId, PeerInfo } from "@libp2p/interface";
 import type { Multiaddr } from "@multiformats/multiaddr";
 import type {
   ENRKey,
@@ -116,8 +115,7 @@ export class ENR extends RawEnr implements IEnr {
     if (!id) return;
     return {
       id,
-      multiaddrs: this.getAllLocationMultiaddrs(),
-      protocols: []
+      multiaddrs: this.getAllLocationMultiaddrs()
     };
   }
 

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";
 import { peerIdFromKeys } from "@libp2p/peer-id";
 
 export function createPeerIdFromPublicKey(

diff --git a/packages/interfaces/package.json b/packages/interfaces/package.json
@@ -47,11 +47,11 @@
     "node": ">=18"
   },
   "devDependencies": {
-    "@chainsafe/libp2p-gossipsub": "^10.1.1",
+    "@chainsafe/libp2p-gossipsub": "^11.0.1",
     "@multiformats/multiaddr": "^12.0.0",
     "cspell": "^7.3.2",
     "npm-run-all": "^4.1.5",
-    "libp2p": "^0.46.14"
+    "libp2p": "^1.1.2"
   },
   "files": [
     "dist",

diff --git a/packages/interfaces/src/connection_manager.ts b/packages/interfaces/src/connection_manager.ts
@@ -1,6 +1,4 @@
-import type { PeerId } from "@libp2p/interface/peer-id";
-import type { Peer } from "@libp2p/interface/peer-store";
-import type { EventEmitter } from "@libp2p/interfaces/events";
+import type { Peer, PeerId, TypedEventEmitter } from "@libp2p/interface";
 
 export enum Tags {
   BOOTSTRAP = "bootstrap",
@@ -59,7 +57,7 @@ export interface IConnectionStateEvents {
 }
 
 export interface IConnectionManager
-  extends EventEmitter<IPeersByDiscoveryEvents & IConnectionStateEvents> {
+  extends TypedEventEmitter<IPeersByDiscoveryEvents & IConnectionStateEvents> {
   getPeersByDiscovery(): Promise<PeersByDiscoveryResult>;
   stop(): void;
 }
diff --git a/packages/interfaces/src/dns_discovery.ts b/packages/interfaces/src/dns_discovery.ts
@@ -1,4 +1,4 @@
-import { PeerStore } from "@libp2p/interface/peer-store";
+import { PeerStore } from "@libp2p/interface";
 
 export type SearchContext = {
   domain: string;

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";
+import type { PeerInfo } from "@libp2p/interface";
 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";
 
 import type { IDecodedMessage, IDecoder, SingleShardInfo } from "./message.js";
 import type { ContentTopic, PubsubTopic } from "./misc.js";

diff --git a/packages/interfaces/src/libp2p.ts b/packages/interfaces/src/libp2p.ts
@@ -1,16 +1,16 @@
 import type { GossipSub } from "@chainsafe/libp2p-gossipsub";
+import type { identify } from "@libp2p/identify";
 import type { Libp2p as BaseLibp2p } from "@libp2p/interface";
+import type { PingService } from "@libp2p/ping";
 import type { Libp2pInit, Libp2pOptions } from "libp2p";
-import type { identifyService } from "libp2p/identify";
-import type { PingService } from "libp2p/ping";
 
 import { IMetadata } from "./metadata";
 
 export type Libp2pServices = {
   ping: PingService;
   metadata?: IMetadata;
   pubsub?: GossipSub;
-  identify: ReturnType<ReturnType<typeof identifyService>>;
+  identify: ReturnType<ReturnType<typeof identify>>;
 };
 
 // TODO: Get libp2p to export this.

diff --git a/packages/interfaces/src/metadata.ts b/packages/interfaces/src/metadata.ts
@@ -1,4 +1,4 @@
-import type { PeerId } from "@libp2p/interface/peer-id";
+import type { PeerId } from "@libp2p/interface";
 
 import type { ShardInfo } from "./enr.js";
 import type { IBaseProtocol } from "./protocols.js";

diff --git a/packages/interfaces/src/peer_exchange.ts b/packages/interfaces/src/peer_exchange.ts
@@ -1,6 +1,6 @@
-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 type { PeerId } from "@libp2p/interface";
+import type { PeerStore } from "@libp2p/interface";
+import type { ConnectionManager } from "@libp2p/interface-internal";
 
 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";
-import type { PeerId } from "@libp2p/interface/peer-id";
-import type { Peer, PeerStore } from "@libp2p/interface/peer-store";
+import type { PeerId } from "@libp2p/interface";
+import type { Peer, PeerStore } from "@libp2p/interface";
 
 import type { ShardInfo } from "./enr.js";
 import type { CreateLibp2pOptions } from "./libp2p.js";

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

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 { IdentifyResult } from "@libp2p/interface";
-import { CustomEvent, EventEmitter } from "@libp2p/interface/events";
+import { CustomEvent, TypedEventEmitter } from "@libp2p/interface";
+import { peerDiscoverySymbol as symbol } from "@libp2p/interface";
 import type {
+  IdentifyResult,
   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";
+  PeerDiscoveryEvents,
+  PeerId,
+  PeerInfo
+} from "@libp2p/interface";
 import { encodeRelayShard } from "@waku/enr";
 import { Libp2pComponents, Tags } from "@waku/interfaces";
 import { Logger } from "@waku/utils";
@@ -51,7 +51,7 @@ const DEFAULT_PEER_EXCHANGE_TAG_VALUE = 50;
 const DEFAULT_PEER_EXCHANGE_TAG_TTL = 100_000_000;
 
 export class PeerExchangeDiscovery
-  extends EventEmitter<PeerDiscoveryEvents>
+  extends TypedEventEmitter<PeerDiscoveryEvents>
   implements PeerDiscovery
 {
   private readonly components: Libp2pComponents;
@@ -206,7 +206,6 @@ export class PeerExchangeDiscovery
         new CustomEvent<PeerInfo>("peer", {
           detail: {
             id: peerId,
-            protocols: [],
             multiaddrs: peerInfo.multiaddrs
           }
         })

diff --git a/packages/relay/package.json b/packages/relay/package.json
@@ -49,7 +49,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@chainsafe/libp2p-gossipsub": "^10.1.1",
+    "@chainsafe/libp2p-gossipsub": "^11.0.1",
     "@noble/hashes": "^1.3.2",
     "@waku/core": "0.0.26",
     "@waku/interfaces": "0.0.21",

diff --git a/packages/relay/src/index.ts b/packages/relay/src/index.ts
@@ -6,8 +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 { PeerId } from "@libp2p/interface/peer-id";
-import type { PubSub as Libp2pPubsub } from "@libp2p/interface/pubsub";
+import type { PubSub as Libp2pPubsub, PeerId } from "@libp2p/interface";
 import { sha256 } from "@noble/hashes/sha256";
 import {
   ActiveSubscriptions,

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";
+import type { UnsignedMessage } from "@libp2p/interface";
 import { createSecp256k1PeerId } from "@libp2p/peer-id-factory";
 import { createEncoder } from "@waku/core";
 import { expect } from "chai";