@waku/interfaces 0.0.15 → 0.0.16

package/CHANGELOG.md

@@ -5,6 +5,24 @@ All notable changes to this project will be documented in this file.
 The file is maintained by [Release Please](https://github.com/googleapis/release-please) based on [Conventional Commits](https://www.conventionalcommits.org) specification,
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.0.16](https://github.com/waku-org/js-waku/compare/interfaces-v0.0.15...interfaces-v0.0.16) (2023-07-26)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove filter v1 ([#1433](https://github.com/waku-org/js-waku/issues/1433))
+* upgrade to libp2p@0.45 ([#1400](https://github.com/waku-org/js-waku/issues/1400))
+
+### Features
+
+* Enable event emission for peer discovery/connection in ConnectionManager ([#1438](https://github.com/waku-org/js-waku/issues/1438)) ([6ce898d](https://github.com/waku-org/js-waku/commit/6ce898d77132f30b5d8f33b48c7f6276992a486e))
+* Upgrade to libp2p@0.45 ([#1400](https://github.com/waku-org/js-waku/issues/1400)) ([420e6c6](https://github.com/waku-org/js-waku/commit/420e6c698dd8f44d40d34e47d876da5d2e1ce85e))
+
+
+### Miscellaneous Chores
+
+* Remove filter v1 ([#1433](https://github.com/waku-org/js-waku/issues/1433)) ([d483644](https://github.com/waku-org/js-waku/commit/d483644a4bb4350df380719b9bcfbdd0b1439482))
+
 ## [0.0.15](https://github.com/waku-org/js-waku/compare/interfaces-v0.0.14...interfaces-v0.0.15) (2023-06-08)
 
 

package/dist/connection_manager.d.ts

@@ -1,3 +1,5 @@
+import type { PeerId } from "@libp2p/interface-peer-id";
+import type { Peer } from "@libp2p/interface-peer-store";
 export declare enum Tags {
     BOOTSTRAP = "bootstrap",
     PEER_EXCHANGE = "peer-exchange"
@@ -18,3 +20,25 @@ export interface ConnectionManagerOptions {
      */
     maxParallelDials: number;
 }
+export declare enum EPeersByDiscoveryEvents {
+    PEER_DISCOVERY_BOOTSTRAP = "peer:discovery:bootstrap",
+    PEER_DISCOVERY_PEER_EXCHANGE = "peer:discovery:peer-exchange",
+    PEER_CONNECT_BOOTSTRAP = "peer:connected:bootstrap",
+    PEER_CONNECT_PEER_EXCHANGE = "peer:connected:peer-exchange"
+}
+export interface IPeersByDiscoveryEvents {
+    [EPeersByDiscoveryEvents.PEER_DISCOVERY_BOOTSTRAP]: CustomEvent<PeerId>;
+    [EPeersByDiscoveryEvents.PEER_DISCOVERY_PEER_EXCHANGE]: CustomEvent<PeerId>;
+    [EPeersByDiscoveryEvents.PEER_CONNECT_BOOTSTRAP]: CustomEvent<PeerId>;
+    [EPeersByDiscoveryEvents.PEER_CONNECT_PEER_EXCHANGE]: CustomEvent<PeerId>;
+}
+export interface PeersByDiscoveryResult {
+    DISCOVERED: {
+        [Tags.BOOTSTRAP]: Peer[];
+        [Tags.PEER_EXCHANGE]: Peer[];
+    };
+    CONNECTED: {
+        [Tags.BOOTSTRAP]: Peer[];
+        [Tags.PEER_EXCHANGE]: Peer[];
+    };
+}

package/dist/connection_manager.js

@@ -3,4 +3,11 @@ export var Tags;
     Tags["BOOTSTRAP"] = "bootstrap";
     Tags["PEER_EXCHANGE"] = "peer-exchange";
 })(Tags || (Tags = {}));
+export var EPeersByDiscoveryEvents;
+(function (EPeersByDiscoveryEvents) {
+    EPeersByDiscoveryEvents["PEER_DISCOVERY_BOOTSTRAP"] = "peer:discovery:bootstrap";
+    EPeersByDiscoveryEvents["PEER_DISCOVERY_PEER_EXCHANGE"] = "peer:discovery:peer-exchange";
+    EPeersByDiscoveryEvents["PEER_CONNECT_BOOTSTRAP"] = "peer:connected:bootstrap";
+    EPeersByDiscoveryEvents["PEER_CONNECT_PEER_EXCHANGE"] = "peer:connected:peer-exchange";
+})(EPeersByDiscoveryEvents || (EPeersByDiscoveryEvents = {}));
 //# sourceMappingURL=connection_manager.js.map

package/dist/connection_manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection_manager.js","sourceRoot":"","sources":["../src/connection_manager.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,IAGX;AAHD,WAAY,IAAI;IACd,+BAAuB,CAAA;IACvB,uCAA+B,CAAA;AACjC,CAAC,EAHW,IAAI,KAAJ,IAAI,QAGf"}
+{"version":3,"file":"connection_manager.js","sourceRoot":"","sources":["../src/connection_manager.ts"],"names":[],"mappings":"AAGA,MAAM,CAAN,IAAY,IAGX;AAHD,WAAY,IAAI;IACd,+BAAuB,CAAA;IACvB,uCAA+B,CAAA;AACjC,CAAC,EAHW,IAAI,KAAJ,IAAI,QAGf;AAmBD,MAAM,CAAN,IAAY,uBAKX;AALD,WAAY,uBAAuB;IACjC,gFAAqD,CAAA;IACrD,wFAA6D,CAAA;IAC7D,8EAAmD,CAAA;IACnD,sFAA2D,CAAA;AAC7D,CAAC,EALW,uBAAuB,KAAvB,uBAAuB,QAKlC"}

package/dist/filter.d.ts

@@ -1,18 +1,17 @@
 import type { PeerId } from "@libp2p/interface-peer-id";
 import type { IDecodedMessage, IDecoder } from "./message.js";
 import type { ContentTopic } from "./misc.js";
-import type { Callback, PointToPointProtocol } from "./protocols.js";
+import type { Callback, IBaseProtocol } from "./protocols.js";
 import type { IReceiver } from "./receiver.js";
 export type ContentFilter = {
     contentTopic: string;
 };
-export type IFilter = IReceiver & PointToPointProtocol;
-export interface IFilterV2Subscription {
+export interface IFilterSubscription {
     subscribe<T extends IDecodedMessage>(decoders: IDecoder<T> | IDecoder<T>[], callback: Callback<T>): Promise<void>;
     unsubscribe(contentTopics: ContentTopic[]): Promise<void>;
     ping(): Promise<void>;
     unsubscribeAll(): Promise<void>;
 }
-export type IFilterV2 = IReceiver & PointToPointProtocol & {
-    createSubscription(pubSubTopic?: string, peerId?: PeerId): Promise<IFilterV2Subscription>;
+export type IFilter = IReceiver & IBaseProtocol & {
+    createSubscription(pubSubTopic?: string, peerId?: PeerId): Promise<IFilterSubscription>;
 };

package/dist/index.d.ts

@@ -11,3 +11,4 @@ export * from "./connection_manager.js";
 export * from "./sender.js";
 export * from "./receiver.js";
 export * from "./misc.js";
+export * from "./libp2p.js";

package/dist/index.js

@@ -11,4 +11,5 @@ export * from "./connection_manager.js";
 export * from "./sender.js";
 export * from "./receiver.js";
 export * from "./misc.js";
+export * from "./libp2p.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,yBAAyB,CAAC;AACxC,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,yBAAyB,CAAC;AACxC,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC"}

package/dist/libp2p.d.ts

@@ -0,0 +1,14 @@
+import type { GossipSub } from "@chainsafe/libp2p-gossipsub";
+import type { Libp2p as BaseLibp2p } from "@libp2p/interface-libp2p";
+import type { Libp2pInit } from "libp2p";
+import type { identifyService } from "libp2p/identify";
+import type { PingService } from "libp2p/ping";
+export type Libp2pServices = {
+    ping: PingService;
+    pubsub?: GossipSub;
+    identify: ReturnType<ReturnType<typeof identifyService>>;
+};
+export type Libp2pComponents = Parameters<Exclude<Libp2pInit["metrics"], undefined>>[0];
+export type Libp2p = BaseLibp2p<Libp2pServices> & {
+    components: Libp2pComponents;
+};

package/dist/libp2p.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=libp2p.js.map

package/dist/libp2p.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"libp2p.js","sourceRoot":"","sources":["../src/libp2p.ts"],"names":[],"mappings":""}

package/dist/light_push.d.ts

@@ -1,3 +1,3 @@
-import type { PointToPointProtocol } from "./protocols.js";
+import type { IBaseProtocol } from "./protocols.js";
 import type { ISender } from "./sender.js";
-export type ILightPush = ISender & PointToPointProtocol;
+export type ILightPush = ISender & IBaseProtocol;

package/dist/peer_exchange.d.ts

@@ -2,8 +2,8 @@ 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 { IEnr } from "./enr.js";
-import { PointToPointProtocol } from "./protocols.js";
-export interface IPeerExchange extends PointToPointProtocol {
+import { IBaseProtocol } from "./protocols.js";
+export interface IPeerExchange extends IBaseProtocol {
     query(params: PeerExchangeQueryParams): Promise<PeerInfo[] | undefined>;
 }
 export interface PeerExchangeQueryParams {

package/dist/protocols.d.ts

@@ -1,3 +1,4 @@
+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 { Libp2pOptions } from "libp2p";
@@ -8,10 +9,12 @@ export declare enum Protocols {
     LightPush = "lightpush",
     Filter = "filter"
 }
-export interface PointToPointProtocol {
+export interface IBaseProtocol {
     multicodec: string;
     peerStore: PeerStore;
     peers: () => Promise<Peer[]>;
+    addLibp2pEventListener: Libp2p["addEventListener"];
+    removeLibp2pEventListener: Libp2p["removeEventListener"];
 }
 export type ProtocolCreateOptions = {
     /**
@@ -45,12 +48,6 @@ export type ProtocolCreateOptions = {
      * Use recommended bootstrap method to discovery and connect to new nodes.
      */
     defaultBootstrap?: boolean;
-    /**
-     * FilterV2 has been set to default
-     * Use this flag to enable the previous version of the filter protocol
-     * See [Improved Filter protocol specifications](https://github.com/vacp2p/rfc/pull/562)
-     */
-    useFilterV1?: boolean;
 };
 export type ProtocolOptions = {
     /**

package/dist/protocols.js.map

@@ -1 +1 @@
-{"version":3,"file":"protocols.js","sourceRoot":"","sources":["../src/protocols.ts"],"names":[],"mappings":"AAMA,MAAM,CAAN,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,4BAAe,CAAA;IACf,4BAAe,CAAA;IACf,oCAAuB,CAAA;IACvB,8BAAiB,CAAA;AACnB,CAAC,EALW,SAAS,KAAT,SAAS,QAKpB;AA2DD,MAAM,CAAN,IAAY,SAMX;AAND,WAAY,SAAS;IACnB,2CAA8B,CAAA;IAC9B,+CAAkC,CAAA;IAClC,+CAAkC,CAAA;IAClC,6CAAgC,CAAA;IAChC,gDAAmC,CAAA;AACrC,CAAC,EANW,SAAS,KAAT,SAAS,QAMpB"}
+{"version":3,"file":"protocols.js","sourceRoot":"","sources":["../src/protocols.ts"],"names":[],"mappings":"AAOA,MAAM,CAAN,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,4BAAe,CAAA;IACf,4BAAe,CAAA;IACf,oCAAuB,CAAA;IACvB,8BAAiB,CAAA;AACnB,CAAC,EALW,SAAS,KAAT,SAAS,QAKpB;AAuDD,MAAM,CAAN,IAAY,SAMX;AAND,WAAY,SAAS;IACnB,2CAA8B,CAAA;IAC9B,+CAAkC,CAAA;IAClC,+CAAkC,CAAA;IAClC,6CAAgC,CAAA;IAChC,gDAAmC,CAAA;AACrC,CAAC,EANW,SAAS,KAAT,SAAS,QAMpB"}

package/dist/store.d.ts

@@ -1,5 +1,5 @@
 import type { IDecodedMessage, IDecoder } from "./message.js";
-import type { PointToPointProtocol, ProtocolOptions } from "./protocols.js";
+import type { IBaseProtocol, ProtocolOptions } from "./protocols.js";
 export declare enum PageDirection {
     BACKWARD = "backward",
     FORWARD = "forward"
@@ -40,7 +40,7 @@ export type StoreQueryOptions = {
      */
     cursor?: Cursor;
 } & ProtocolOptions;
-export interface IStore extends PointToPointProtocol {
+export interface IStore extends IBaseProtocol {
     queryOrderedCallback: <T extends IDecodedMessage>(decoders: IDecoder<T>[], callback: (message: T) => Promise<void | boolean> | boolean | void, options?: StoreQueryOptions) => Promise<void>;
     queryCallbackOnPromise: <T extends IDecodedMessage>(decoders: IDecoder<T>[], callback: (message: Promise<T | undefined>) => Promise<void | boolean> | boolean | void, options?: StoreQueryOptions) => Promise<void>;
     queryGenerator: <T extends IDecodedMessage>(decoders: IDecoder<T>[], options?: StoreQueryOptions) => AsyncGenerator<Promise<T | undefined>[]>;

package/dist/waku.d.ts

@@ -1,8 +1,8 @@
 import type { Stream } from "@libp2p/interface-connection";
-import type { Libp2p } from "@libp2p/interface-libp2p";
 import type { PeerId } from "@libp2p/interface-peer-id";
 import type { Multiaddr } from "@multiformats/multiaddr";
-import type { IFilter, IFilterV2 } from "./filter.js";
+import type { IFilter } from "./filter.js";
+import type { Libp2p } from "./libp2p.js";
 import type { ILightPush } from "./light_push.js";
 import { Protocols } from "./protocols.js";
 import type { IRelay } from "./relay.js";
@@ -11,7 +11,7 @@ export interface Waku {
     libp2p: Libp2p;
     relay?: IRelay;
     store?: IStore;
-    filter?: IFilter | IFilterV2;
+    filter?: IFilter;
     lightPush?: ILightPush;
     dial(peer: PeerId | Multiaddr, protocols?: Protocols[]): Promise<Stream>;
     start(): Promise<void>;
@@ -21,7 +21,7 @@ export interface Waku {
 export interface LightNode extends Waku {
     relay: undefined;
     store: IStore;
-    filter: IFilter | IFilterV2;
+    filter: IFilter;
     lightPush: ILightPush;
 }
 export interface RelayNode extends Waku {
@@ -33,6 +33,6 @@ export interface RelayNode extends Waku {
 export interface FullNode extends Waku {
     relay: IRelay;
     store: IStore;
-    filter: IFilter | IFilterV2;
+    filter: IFilter;
     lightPush: ILightPush;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waku/interfaces",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "description": "Definition of Waku interfaces",
   "types": "./dist/index.d.ts",
   "module": "./dist/index.js",
@@ -47,27 +47,20 @@
     "node": ">=16"
   },
   "devDependencies": {
-    "@chainsafe/libp2p-gossipsub": "^6.1.0",
-    "@libp2p/interface-connection": "^3.0.8",
-    "@libp2p/interface-connection-manager": "^1.3.7",
-    "@libp2p/interface-libp2p": "^1.1.2",
-    "@libp2p/interface-peer-id": "^2.0.1",
-    "@libp2p/interface-peer-info": "^1.0.8",
-    "@libp2p/interface-peer-store": "^1.2.8",
-    "@libp2p/interface-registrar": "^2.0.8",
+    "@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",
     "@multiformats/multiaddr": "^12.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.57.0",
-    "@typescript-eslint/parser": "^5.59.8",
     "cspell": "^6.31.1",
-    "eslint": "^8.41.0",
-    "eslint-config-prettier": "^8.6.0",
-    "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-functional": "^5.0.4",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-prettier": "^4.2.1",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.8",
-    "typescript": "^5.0.4"
+    "typescript": "^5.0.4",
+    "libp2p": "^0.45.9"
   },
   "typedoc": {
     "entryPoint": "./src/index.ts"

package/src/connection_manager.ts

@@ -1,3 +1,6 @@
+import type { PeerId } from "@libp2p/interface-peer-id";
+import type { Peer } from "@libp2p/interface-peer-store";
+
 export enum Tags {
   BOOTSTRAP = "bootstrap",
   PEER_EXCHANGE = "peer-exchange",
@@ -19,3 +22,28 @@ export interface ConnectionManagerOptions {
    */
   maxParallelDials: number;
 }
+
+export enum EPeersByDiscoveryEvents {
+  PEER_DISCOVERY_BOOTSTRAP = "peer:discovery:bootstrap",
+  PEER_DISCOVERY_PEER_EXCHANGE = "peer:discovery:peer-exchange",
+  PEER_CONNECT_BOOTSTRAP = "peer:connected:bootstrap",
+  PEER_CONNECT_PEER_EXCHANGE = "peer:connected:peer-exchange",
+}
+
+export interface IPeersByDiscoveryEvents {
+  [EPeersByDiscoveryEvents.PEER_DISCOVERY_BOOTSTRAP]: CustomEvent<PeerId>;
+  [EPeersByDiscoveryEvents.PEER_DISCOVERY_PEER_EXCHANGE]: CustomEvent<PeerId>;
+  [EPeersByDiscoveryEvents.PEER_CONNECT_BOOTSTRAP]: CustomEvent<PeerId>;
+  [EPeersByDiscoveryEvents.PEER_CONNECT_PEER_EXCHANGE]: CustomEvent<PeerId>;
+}
+
+export interface PeersByDiscoveryResult {
+  DISCOVERED: {
+    [Tags.BOOTSTRAP]: Peer[];
+    [Tags.PEER_EXCHANGE]: Peer[];
+  };
+  CONNECTED: {
+    [Tags.BOOTSTRAP]: Peer[];
+    [Tags.PEER_EXCHANGE]: Peer[];
+  };
+}

package/src/filter.ts

@@ -2,16 +2,14 @@ import type { PeerId } from "@libp2p/interface-peer-id";
 
 import type { IDecodedMessage, IDecoder } from "./message.js";
 import type { ContentTopic } from "./misc.js";
-import type { Callback, PointToPointProtocol } from "./protocols.js";
+import type { Callback, IBaseProtocol } from "./protocols.js";
 import type { IReceiver } from "./receiver.js";
 
 export type ContentFilter = {
   contentTopic: string;
 };
 
-export type IFilter = IReceiver & PointToPointProtocol;
-
-export interface IFilterV2Subscription {
+export interface IFilterSubscription {
   subscribe<T extends IDecodedMessage>(
     decoders: IDecoder<T> | IDecoder<T>[],
     callback: Callback<T>
@@ -24,10 +22,10 @@ export interface IFilterV2Subscription {
   unsubscribeAll(): Promise<void>;
 }
 
-export type IFilterV2 = IReceiver &
-  PointToPointProtocol & {
+export type IFilter = IReceiver &
+  IBaseProtocol & {
     createSubscription(
       pubSubTopic?: string,
       peerId?: PeerId
-    ): Promise<IFilterV2Subscription>;
+    ): Promise<IFilterSubscription>;
   };

package/src/index.ts

@@ -11,3 +11,4 @@ export * from "./connection_manager.js";
 export * from "./sender.js";
 export * from "./receiver.js";
 export * from "./misc.js";
+export * from "./libp2p.js";

package/src/libp2p.ts

@@ -0,0 +1,21 @@
+import type { GossipSub } from "@chainsafe/libp2p-gossipsub";
+import type { Libp2p as BaseLibp2p } from "@libp2p/interface-libp2p";
+import type { Libp2pInit } from "libp2p";
+import type { identifyService } from "libp2p/identify";
+import type { PingService } from "libp2p/ping";
+
+export type Libp2pServices = {
+  ping: PingService;
+  pubsub?: GossipSub;
+  identify: ReturnType<ReturnType<typeof identifyService>>;
+};
+
+// TODO: Get libp2p to export this.
+export type Libp2pComponents = Parameters<
+  Exclude<Libp2pInit["metrics"], undefined>
+>[0];
+
+// thought components are not defined on the Libp2p interface they are present on Libp2pNode class
+export type Libp2p = BaseLibp2p<Libp2pServices> & {
+  components: Libp2pComponents;
+};

package/src/light_push.ts

@@ -1,4 +1,4 @@
-import type { PointToPointProtocol } from "./protocols.js";
+import type { IBaseProtocol } from "./protocols.js";
 import type { ISender } from "./sender.js";
 
-export type ILightPush = ISender & PointToPointProtocol;
+export type ILightPush = ISender & IBaseProtocol;

package/src/peer_exchange.ts

@@ -3,9 +3,9 @@ import type { PeerId } from "@libp2p/interface-peer-id";
 import type { PeerStore } from "@libp2p/interface-peer-store";
 
 import { IEnr } from "./enr.js";
-import { PointToPointProtocol } from "./protocols.js";
+import { IBaseProtocol } from "./protocols.js";
 
-export interface IPeerExchange extends PointToPointProtocol {
+export interface IPeerExchange extends IBaseProtocol {
   query(params: PeerExchangeQueryParams): Promise<PeerInfo[] | undefined>;
 }
 

package/src/protocols.ts

@@ -1,3 +1,4 @@
+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 { Libp2pOptions } from "libp2p";
@@ -11,10 +12,12 @@ export enum Protocols {
   Filter = "filter",
 }
 
-export interface PointToPointProtocol {
+export interface IBaseProtocol {
   multicodec: string;
   peerStore: PeerStore;
   peers: () => Promise<Peer[]>;
+  addLibp2pEventListener: Libp2p["addEventListener"];
+  removeLibp2pEventListener: Libp2p["removeEventListener"];
 }
 
 export type ProtocolCreateOptions = {
@@ -49,12 +52,6 @@ export type ProtocolCreateOptions = {
    * Use recommended bootstrap method to discovery and connect to new nodes.
    */
   defaultBootstrap?: boolean;
-  /**
-   * FilterV2 has been set to default
-   * Use this flag to enable the previous version of the filter protocol
-   * See [Improved Filter protocol specifications](https://github.com/vacp2p/rfc/pull/562)
-   */
-  useFilterV1?: boolean;
 };
 
 export type ProtocolOptions = {

package/src/store.ts

@@ -1,5 +1,5 @@
 import type { IDecodedMessage, IDecoder } from "./message.js";
-import type { PointToPointProtocol, ProtocolOptions } from "./protocols.js";
+import type { IBaseProtocol, ProtocolOptions } from "./protocols.js";
 
 export enum PageDirection {
   BACKWARD = "backward",
@@ -45,7 +45,7 @@ export type StoreQueryOptions = {
   cursor?: Cursor;
 } & ProtocolOptions;
 
-export interface IStore extends PointToPointProtocol {
+export interface IStore extends IBaseProtocol {
   queryOrderedCallback: <T extends IDecodedMessage>(
     decoders: IDecoder<T>[],
     callback: (message: T) => Promise<void | boolean> | boolean | void,

package/src/waku.ts

@@ -1,9 +1,9 @@
 import type { Stream } from "@libp2p/interface-connection";
-import type { Libp2p } from "@libp2p/interface-libp2p";
 import type { PeerId } from "@libp2p/interface-peer-id";
 import type { Multiaddr } from "@multiformats/multiaddr";
 
-import type { IFilter, IFilterV2 } from "./filter.js";
+import type { IFilter } from "./filter.js";
+import type { Libp2p } from "./libp2p.js";
 import type { ILightPush } from "./light_push.js";
 import { Protocols } from "./protocols.js";
 import type { IRelay } from "./relay.js";
@@ -13,7 +13,7 @@ export interface Waku {
   libp2p: Libp2p;
   relay?: IRelay;
   store?: IStore;
-  filter?: IFilter | IFilterV2;
+  filter?: IFilter;
   lightPush?: ILightPush;
 
   dial(peer: PeerId | Multiaddr, protocols?: Protocols[]): Promise<Stream>;
@@ -28,7 +28,7 @@ export interface Waku {
 export interface LightNode extends Waku {
   relay: undefined;
   store: IStore;
-  filter: IFilter | IFilterV2;
+  filter: IFilter;
   lightPush: ILightPush;
 }
 
@@ -42,6 +42,6 @@ export interface RelayNode extends Waku {
 export interface FullNode extends Waku {
   relay: IRelay;
   store: IStore;
-  filter: IFilter | IFilterV2;
+  filter: IFilter;
   lightPush: ILightPush;
 }