@waku/core 0.0.36-b0a2e39.0 → 0.0.36-b133417.0

package/dist/lib/light_push/{push_rpc_v2.d.ts → push_rpc.d.ts}

@@ -1,10 +1,10 @@
 import { proto_lightpush as proto } from "@waku/proto";
 import type { Uint8ArrayList } from "uint8arraylist";
-export declare class PushRpcV2 {
+export declare class PushRpc {
     proto: proto.PushRpc;
     constructor(proto: proto.PushRpc);
-    static createRequest(message: proto.WakuMessage, pubsubTopic: string): PushRpcV2;
-    static decode(bytes: Uint8ArrayList): PushRpcV2;
+    static createRequest(message: proto.WakuMessage, pubsubTopic: string): PushRpc;
+    static decode(bytes: Uint8ArrayList): PushRpc;
     encode(): Uint8Array;
     get query(): proto.PushRequest | undefined;
     get response(): proto.PushResponse | undefined;

package/dist/lib/light_push/{push_rpc_v2.js → push_rpc.js}

@@ -1,12 +1,12 @@
 import { proto_lightpush as proto } from "@waku/proto";
 import { v4 as uuid } from "uuid";
-export class PushRpcV2 {
+export class PushRpc {
     proto;
     constructor(proto) {
         this.proto = proto;
     }
     static createRequest(message, pubsubTopic) {
-        return new PushRpcV2({
+        return new PushRpc({
             requestId: uuid(),
             request: {
                 message: message,
@@ -17,7 +17,7 @@ export class PushRpcV2 {
     }
     static decode(bytes) {
         const res = proto.PushRpc.decode(bytes);
-        return new PushRpcV2(res);
+        return new PushRpc(res);
     }
     encode() {
         return proto.PushRpc.encode(this.proto);
@@ -29,4 +29,4 @@ export class PushRpcV2 {
         return this.proto.response;
     }
 }
-//# sourceMappingURL=push_rpc_v2.js.map
+//# sourceMappingURL=push_rpc.js.map

package/dist/lib/light_push/push_rpc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"push_rpc.js","sourceRoot":"","sources":["../../../src/lib/light_push/push_rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,IAAI,KAAK,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAC;AAElC,MAAM,OAAO,OAAO;IACQ;IAA1B,YAA0B,KAAoB;QAApB,UAAK,GAAL,KAAK,CAAe;IAAG,CAAC;IAE3C,MAAM,CAAC,aAAa,CACzB,OAA0B,EAC1B,WAAmB;QAEnB,OAAO,IAAI,OAAO,CAAC;YACjB,SAAS,EAAE,IAAI,EAAE;YACjB,OAAO,EAAE;gBACP,OAAO,EAAE,OAAO;gBAChB,WAAW,EAAE,WAAW;aACzB;YACD,QAAQ,EAAE,SAAS;SACpB,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,MAAM,CAAC,KAAqB;QACxC,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACxC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAEM,MAAM;QACX,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IAED,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;IAC5B,CAAC;IAED,IAAW,QAAQ;QACjB,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IAC7B,CAAC;CACF"}

package/dist/lib/light_push/utils.d.ts

@@ -1,25 +1 @@
-import type { IEncoder, IMessage } from "@waku/interfaces";
-import { ProtocolError } from "@waku/interfaces";
-/**
- * Validates a Light Push v3 request ID format.
- * Request IDs should be valid UUIDs, with special handling for "N/A" when rate limited.
- *
- * @param requestId - The request ID to validate
- * @returns true if the request ID is valid, false otherwise
- */
-export declare function isValidRequestId(requestId: string | undefined): boolean;
 export declare const isRLNResponseError: (info?: string) => boolean;
-export declare function mapInfoToProtocolError(info?: string): ProtocolError;
-/**
- * Validates that a message conforms to Light Push protocol requirements.
- *
- * @param message - The message to validate
- * @param encoder - The encoder to use for message size validation
- * @returns A ProtocolError if validation fails, null if the message is valid
- *
- * @remarks
- * This function performs the following validations:
- * - Checks if the message payload exists and is not empty
- * - Verifies the encoded message size is under the network cap (1MB)
- */
-export declare function validateMessage(message: IMessage, encoder: IEncoder): Promise<ProtocolError | null>;

package/dist/lib/light_push/utils.js

@@ -1,21 +1,3 @@
-import { ProtocolError } from "@waku/interfaces";
-import { isMessageSizeUnderCap, Logger } from "@waku/utils";
-const log = new Logger("waku:light-push:utils");
-const UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-/**
- * Validates a Light Push v3 request ID format.
- * Request IDs should be valid UUIDs, with special handling for "N/A" when rate limited.
- *
- * @param requestId - The request ID to validate
- * @returns true if the request ID is valid, false otherwise
- */
-export function isValidRequestId(requestId) {
-    if (!requestId)
-        return false;
-    if (requestId === "N/A")
-        return true; // Special case for rate-limited responses
-    return UUID_REGEX.test(requestId);
-}
 // should match nwaku
 // https://github.com/waku-org/nwaku/blob/c3cb06ac6c03f0f382d3941ea53b330f6a8dd127/waku/waku_rln_relay/rln_relay.nim#L309
 // https://github.com/waku-org/nwaku/blob/c3cb06ac6c03f0f382d3941ea53b330f6a8dd127/tests/waku_rln_relay/rln/waku_rln_relay_utils.nim#L20
@@ -33,56 +15,4 @@ export const isRLNResponseError = (info) => {
         info.includes(RLN_MESSAGE_ID_PREFIX_ERROR) ||
         info.includes(RLN_REMOTE_VALIDATION));
 };
-export function mapInfoToProtocolError(info) {
-    if (!info) {
-        return ProtocolError.REMOTE_PEER_REJECTED;
-    }
-    const lowerInfo = info.toLowerCase();
-    if (isRLNResponseError(info)) {
-        return ProtocolError.RLN_PROOF_GENERATION;
-    }
-    if (lowerInfo.includes("rate limit") ||
-        lowerInfo.includes("too many requests")) {
-        return ProtocolError.REMOTE_PEER_REJECTED;
-    }
-    if (lowerInfo.includes("topic") &&
-        (lowerInfo.includes("not found") || lowerInfo.includes("not configured"))) {
-        return ProtocolError.TOPIC_NOT_CONFIGURED;
-    }
-    if (lowerInfo.includes("too large") || lowerInfo.includes("size")) {
-        return ProtocolError.SIZE_TOO_BIG;
-    }
-    if (lowerInfo.includes("decode") ||
-        lowerInfo.includes("invalid") ||
-        lowerInfo.includes("malformed")) {
-        return ProtocolError.DECODE_FAILED;
-    }
-    if (lowerInfo.includes("empty") && lowerInfo.includes("payload")) {
-        return ProtocolError.EMPTY_PAYLOAD;
-    }
-    return ProtocolError.REMOTE_PEER_REJECTED;
-}
-/**
- * Validates that a message conforms to Light Push protocol requirements.
- *
- * @param message - The message to validate
- * @param encoder - The encoder to use for message size validation
- * @returns A ProtocolError if validation fails, null if the message is valid
- *
- * @remarks
- * This function performs the following validations:
- * - Checks if the message payload exists and is not empty
- * - Verifies the encoded message size is under the network cap (1MB)
- */
-export async function validateMessage(message, encoder) {
-    if (!message.payload?.length) {
-        log.error("Failed to send waku light push: payload is empty");
-        return ProtocolError.EMPTY_PAYLOAD;
-    }
-    if (!(await isMessageSizeUnderCap(encoder, message))) {
-        log.error("Failed to send waku light push: message is bigger than 1MB");
-        return ProtocolError.SIZE_TOO_BIG;
-    }
-    return null;
-}
 //# sourceMappingURL=utils.js.map

package/dist/lib/light_push/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/lib/light_push/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/lib/light_push/utils.ts"],"names":[],"mappings":"AAAA,qBAAqB;AACrB,yHAAyH;AACzH,wIAAwI;AACxI,MAAM,2BAA2B,GAAG,8BAA8B,CAAC;AACnE,MAAM,2BAA2B,GAC/B,uDAAuD,CAAC;AAE1D,0BAA0B;AAC1B,wHAAwH;AACxH,gHAAgH;AAChH,MAAM,qBAAqB,GAAG,uBAAuB,CAAC;AAEtD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAa,EAAW,EAAE;IAC3D,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,CACL,IAAI,CAAC,QAAQ,CAAC,2BAA2B,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,2BAA2B,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CACrC,CAAC;AACJ,CAAC,CAAC"}

package/package.json

@@ -1 +1 @@
-{"name":"@waku/core","version":"0.0.36-b0a2e39.0","description":"TypeScript implementation of the Waku v2 protocol","types":"./dist/index.d.ts","module":"./dist/index.js","exports":{".":{"types":"./dist/index.d.ts","import":"./dist/index.js"},"./lib/message/version_0":{"types":"./dist/lib/message/version_0.d.ts","import":"./dist/lib/message/version_0.js"},"./lib/base_protocol":{"types":"./dist/lib/base_protocol.d.ts","import":"./dist/lib/base_protocol.js"}},"typesVersions":{"*":{"lib/*":["dist/lib/*"],"constants/*":["dist/constants/*"]}},"type":"module","homepage":"https://github.com/waku-org/js-waku/tree/master/packages/core#readme","repository":{"type":"git","url":"https://github.com/waku-org/js-waku.git"},"bugs":{"url":"https://github.com/waku-org/js-waku/issues"},"license":"MIT OR Apache-2.0","keywords":["waku","decentralised","communication","web3","ethereum","dapps"],"scripts":{"build":"run-s build:**","build:esm":"tsc","build:bundle":"rollup --config rollup.config.js","fix":"run-s fix:*","fix:lint":"eslint src *.js --fix","check":"run-s check:*","check:tsc":"tsc -p tsconfig.dev.json","check:lint":"eslint src *.js","check:spelling":"cspell \"{README.md,src/**/*.ts}\"","test":"NODE_ENV=test run-s test:*","test:node":"NODE_ENV=test TS_NODE_PROJECT=./tsconfig.dev.json mocha","test:browser":"NODE_ENV=test karma start karma.conf.cjs","watch:build":"tsc -p tsconfig.json -w","watch:test":"mocha --watch","prepublish":"npm run build","reset-hard":"git clean -dfx -e .idea && git reset --hard && npm i && npm run build"},"engines":{"node":">=20"},"dependencies":{"@waku/enr":"0.0.30-b0a2e39.0","@waku/interfaces":"0.0.31-b0a2e39.0","@libp2p/ping":"2.0.1","@waku/proto":"0.0.11-b0a2e39.0","@waku/utils":"0.0.24-b0a2e39.0","debug":"^4.3.4","@noble/hashes":"^1.3.2","it-all":"^3.0.4","it-length-prefixed":"^9.0.4","it-pipe":"^3.0.1","uint8arraylist":"^2.4.3","uuid":"^9.0.0"},"devDependencies":{"@libp2p/peer-id":"^5.0.1","@libp2p/interface":"^2.1.3","@multiformats/multiaddr":"^12.0.0","@rollup/plugin-commonjs":"^25.0.7","@rollup/plugin-json":"^6.0.0","@rollup/plugin-node-resolve":"^15.2.3","@types/chai":"^4.3.11","@types/debug":"^4.1.12","@types/mocha":"^10.0.6","@types/uuid":"^9.0.8","@waku/build-utils":"*","chai":"^4.3.10","sinon":"^18.0.0","cspell":"^8.6.1","fast-check":"^3.19.0","ignore-loader":"^0.1.2","isomorphic-fetch":"^3.0.0","mocha":"^10.3.0","npm-run-all":"^4.1.5","process":"^0.11.10","rollup":"^4.12.0"},"peerDependencies":{"@multiformats/multiaddr":"^12.0.0","libp2p":"2.1.8"},"peerDependenciesMeta":{"@multiformats/multiaddr":{"optional":true},"libp2p":{"optional":true}},"files":["dist","bundle","src/**/*.ts","!**/*.spec.*","!**/*.json","CHANGELOG.md","LICENSE","README.md"]}
+{"name":"@waku/core","version":"0.0.36-b133417.0","description":"TypeScript implementation of the Waku v2 protocol","types":"./dist/index.d.ts","module":"./dist/index.js","exports":{".":{"types":"./dist/index.d.ts","import":"./dist/index.js"},"./lib/message/version_0":{"types":"./dist/lib/message/version_0.d.ts","import":"./dist/lib/message/version_0.js"},"./lib/base_protocol":{"types":"./dist/lib/base_protocol.d.ts","import":"./dist/lib/base_protocol.js"}},"typesVersions":{"*":{"lib/*":["dist/lib/*"],"constants/*":["dist/constants/*"]}},"type":"module","homepage":"https://github.com/waku-org/js-waku/tree/master/packages/core#readme","repository":{"type":"git","url":"https://github.com/waku-org/js-waku.git"},"bugs":{"url":"https://github.com/waku-org/js-waku/issues"},"license":"MIT OR Apache-2.0","keywords":["waku","decentralised","communication","web3","ethereum","dapps"],"scripts":{"build":"run-s build:**","build:esm":"tsc","build:bundle":"rollup --config rollup.config.js","fix":"run-s fix:*","fix:lint":"eslint src *.js --fix","check":"run-s check:*","check:tsc":"tsc -p tsconfig.dev.json","check:lint":"eslint src *.js","check:spelling":"cspell \"{README.md,src/**/*.ts}\"","test":"NODE_ENV=test run-s test:*","test:node":"NODE_ENV=test TS_NODE_PROJECT=./tsconfig.dev.json mocha","test:browser":"NODE_ENV=test karma start karma.conf.cjs","watch:build":"tsc -p tsconfig.json -w","watch:test":"mocha --watch","prepublish":"npm run build","reset-hard":"git clean -dfx -e .idea && git reset --hard && npm i && npm run build"},"engines":{"node":">=20"},"dependencies":{"@waku/enr":"0.0.30-b133417.0","@waku/interfaces":"0.0.31-b133417.0","@libp2p/ping":"2.0.1","@waku/proto":"0.0.11-b133417.0","@waku/utils":"0.0.24-b133417.0","debug":"^4.3.4","@noble/hashes":"^1.3.2","it-all":"^3.0.4","it-length-prefixed":"^9.0.4","it-pipe":"^3.0.1","uint8arraylist":"^2.4.3","uuid":"^9.0.0"},"devDependencies":{"@libp2p/peer-id":"^5.0.1","@libp2p/interface":"^2.1.3","@multiformats/multiaddr":"^12.0.0","@rollup/plugin-commonjs":"^25.0.7","@rollup/plugin-json":"^6.0.0","@rollup/plugin-node-resolve":"^15.2.3","@types/chai":"^4.3.11","@types/debug":"^4.1.12","@types/mocha":"^10.0.6","@types/uuid":"^9.0.8","@waku/build-utils":"*","chai":"^4.3.10","sinon":"^18.0.0","cspell":"^8.6.1","fast-check":"^3.19.0","ignore-loader":"^0.1.2","isomorphic-fetch":"^3.0.0","mocha":"^10.3.0","npm-run-all":"^4.1.5","process":"^0.11.10","rollup":"^4.12.0"},"peerDependencies":{"@multiformats/multiaddr":"^12.0.0","libp2p":"2.1.8"},"peerDependenciesMeta":{"@multiformats/multiaddr":{"optional":true},"libp2p":{"optional":true}},"files":["dist","bundle","src/**/*.ts","!**/*.spec.*","!**/*.json","CHANGELOG.md","LICENSE","README.md"]}

package/src/index.ts

@@ -10,11 +10,7 @@ export * as waku_filter from "./lib/filter/index.js";
 export { FilterCore, FilterCodecs } from "./lib/filter/index.js";
 
 export * as waku_light_push from "./lib/light_push/index.js";
-export {
-  LightPushCodec,
-  LightPushCore,
-  LightPushCoreV3
-} from "./lib/light_push/index.js";
+export { LightPushCodec, LightPushCore } from "./lib/light_push/index.js";
 
 export * as waku_store from "./lib/store/index.js";
 export { StoreCore, StoreCodec } from "./lib/store/index.js";

package/src/lib/connection_manager/connection_manager.ts

@@ -267,7 +267,7 @@ export class ConnectionManager
    * // Dial using multiaddr with specific protocols
    * await connectionManager.dialPeer(multiaddr, [
    *   "/vac/waku/relay/2.0.0",
-   *   "/vac/waku/lightpush/3.0.0"
+   *   "/vac/waku/lightpush/2.0.0-beta1"
    * ]);
    * ```
    *

package/src/lib/light_push/index.ts

@@ -1,2 +1 @@
-export { LightPushCore, LightPushCodec } from "./light_push.js";
-export { LightPushCoreV3 } from "./light_push_v3.js";
+export { LightPushCore, LightPushCodec, PushResponse } from "./light_push.js";

package/src/lib/light_push/light_push.ts

@@ -1,15 +1,16 @@
 import type { PeerId, Stream } from "@libp2p/interface";
 import {
+  type CoreProtocolResult,
   type IBaseProtocolCore,
   type IEncoder,
   type IMessage,
   type Libp2p,
-  type LightPushResult,
   ProtocolError,
   PubsubTopic,
   type ThisOrThat
 } from "@waku/interfaces";
-import { proto_lightpush as proto_lightpush_v2 } from "@waku/proto";
+import { PushResponse } from "@waku/proto";
+import { isMessageSizeUnderCap } from "@waku/utils";
 import { Logger } from "@waku/utils";
 import all from "it-all";
 import * as lp from "it-length-prefixed";
@@ -18,13 +19,19 @@ import { Uint8ArrayList } from "uint8arraylist";
 
 import { BaseProtocol } from "../base_protocol.js";
 
-import { PushRpcV2 } from "./push_rpc_v2.js";
-import { mapInfoToProtocolError, validateMessage } from "./utils.js";
+import { PushRpc } from "./push_rpc.js";
+import { isRLNResponseError } from "./utils.js";
 
 const log = new Logger("light-push");
 
 export const LightPushCodec = "/vac/waku/lightpush/2.0.0-beta1";
+export { PushResponse };
 
+type PreparePushMessageResult = ThisOrThat<"query", PushRpc>;
+
+/**
+ * Implements the [Waku v2 Light Push protocol](https://rfc.vac.dev/spec/19/).
+ */
 export class LightPushCore extends BaseProtocol implements IBaseProtocolCore {
   public constructor(
     public readonly pubsubTopics: PubsubTopic[],
@@ -36,11 +43,16 @@ export class LightPushCore extends BaseProtocol implements IBaseProtocolCore {
   private async preparePushMessage(
     encoder: IEncoder,
     message: IMessage
-  ): Promise<ThisOrThat<"query", PushRpcV2>> {
+  ): Promise<PreparePushMessageResult> {
     try {
-      const validationError = await validateMessage(message, encoder);
-      if (validationError) {
-        return { query: null, error: validationError };
+      if (!message.payload || message.payload.length === 0) {
+        log.error("Failed to send waku light push: payload is empty");
+        return { query: null, error: ProtocolError.EMPTY_PAYLOAD };
+      }
+
+      if (!(await isMessageSizeUnderCap(encoder, message))) {
+        log.error("Failed to send waku light push: message is bigger than 1MB");
+        return { query: null, error: ProtocolError.SIZE_TOO_BIG };
       }
 
       const protoMessage = await encoder.toProtoObj(message);
@@ -52,7 +64,7 @@ export class LightPushCore extends BaseProtocol implements IBaseProtocolCore {
         };
       }
 
-      const query = PushRpcV2.createRequest(protoMessage, encoder.pubsubTopic);
+      const query = PushRpc.createRequest(protoMessage, encoder.pubsubTopic);
       return { query, error: null };
     } catch (error) {
       log.error("Failed to prepare push message", error);
@@ -68,7 +80,7 @@ export class LightPushCore extends BaseProtocol implements IBaseProtocolCore {
     encoder: IEncoder,
     message: IMessage,
     peerId: PeerId
-  ): Promise<LightPushResult> {
+  ): Promise<CoreProtocolResult> {
     const { query, error: preparationError } = await this.preparePushMessage(
       encoder,
       message
@@ -108,6 +120,7 @@ export class LightPushCore extends BaseProtocol implements IBaseProtocolCore {
         async (source) => await all(source)
       );
     } catch (err) {
+      // can fail only because of `stream` abortion
       log.error("Failed to send waku light push request", err);
       return {
         success: null,
@@ -118,14 +131,14 @@ export class LightPushCore extends BaseProtocol implements IBaseProtocolCore {
       };
     }
 
-    const bytes = res.reduce((acc, chunk) => {
-      acc.append(chunk);
-      return acc;
-    }, new Uint8ArrayList());
+    const bytes = new Uint8ArrayList();
+    res.forEach((chunk) => {
+      bytes.append(chunk);
+    });
 
-    let response: proto_lightpush_v2.PushResponse | undefined;
+    let response: PushResponse | undefined;
     try {
-      response = PushRpcV2.decode(bytes).response;
+      response = PushRpc.decode(bytes).response;
     } catch (err) {
       log.error("Failed to decode push reply", err);
       return {
@@ -148,24 +161,28 @@ export class LightPushCore extends BaseProtocol implements IBaseProtocolCore {
       };
     }
 
-    if (!response.isSuccess) {
-      const errorMessage = response.info || "Message rejected";
-      log.error("Remote peer rejected the message: ", errorMessage);
-
-      const error = mapInfoToProtocolError(response.info);
+    if (isRLNResponseError(response.info)) {
+      log.error("Remote peer fault: RLN generation");
+      return {
+        success: null,
+        failure: {
+          error: ProtocolError.RLN_PROOF_GENERATION,
+          peerId: peerId
+        }
+      };
+    }
 
+    if (!response.isSuccess) {
+      log.error("Remote peer rejected the message: ", response.info);
       return {
         success: null,
         failure: {
-          error: error,
+          error: ProtocolError.REMOTE_PEER_REJECTED,
           peerId: peerId
         }
       };
     }
 
-    return {
-      success: peerId,
-      failure: null
-    };
+    return { success: peerId, failure: null };
   }
 }

package/src/lib/light_push/{push_rpc_v2.ts → push_rpc.ts}

@@ -2,14 +2,14 @@ import { proto_lightpush as proto } from "@waku/proto";
 import type { Uint8ArrayList } from "uint8arraylist";
 import { v4 as uuid } from "uuid";
 
-export class PushRpcV2 {
+export class PushRpc {
   public constructor(public proto: proto.PushRpc) {}
 
   public static createRequest(
     message: proto.WakuMessage,
     pubsubTopic: string
-  ): PushRpcV2 {
-    return new PushRpcV2({
+  ): PushRpc {
+    return new PushRpc({
       requestId: uuid(),
       request: {
         message: message,
@@ -19,9 +19,9 @@ export class PushRpcV2 {
     });
   }
 
-  public static decode(bytes: Uint8ArrayList): PushRpcV2 {
+  public static decode(bytes: Uint8ArrayList): PushRpc {
     const res = proto.PushRpc.decode(bytes);
-    return new PushRpcV2(res);
+    return new PushRpc(res);
   }
 
   public encode(): Uint8Array {

package/src/lib/light_push/utils.ts

@@ -1,25 +1,3 @@
-import type { IEncoder, IMessage } from "@waku/interfaces";
-import { ProtocolError } from "@waku/interfaces";
-import { isMessageSizeUnderCap, Logger } from "@waku/utils";
-
-const log = new Logger("waku:light-push:utils");
-
-const UUID_REGEX =
-  /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-
-/**
- * Validates a Light Push v3 request ID format.
- * Request IDs should be valid UUIDs, with special handling for "N/A" when rate limited.
- *
- * @param requestId - The request ID to validate
- * @returns true if the request ID is valid, false otherwise
- */
-export function isValidRequestId(requestId: string | undefined): boolean {
-  if (!requestId) return false;
-  if (requestId === "N/A") return true; // Special case for rate-limited responses
-  return UUID_REGEX.test(requestId);
-}
-
 // should match nwaku
 // https://github.com/waku-org/nwaku/blob/c3cb06ac6c03f0f382d3941ea53b330f6a8dd127/waku/waku_rln_relay/rln_relay.nim#L309
 // https://github.com/waku-org/nwaku/blob/c3cb06ac6c03f0f382d3941ea53b330f6a8dd127/tests/waku_rln_relay/rln/waku_rln_relay_utils.nim#L20
@@ -43,76 +21,3 @@ export const isRLNResponseError = (info?: string): boolean => {
     info.includes(RLN_REMOTE_VALIDATION)
   );
 };
-
-export function mapInfoToProtocolError(info?: string): ProtocolError {
-  if (!info) {
-    return ProtocolError.REMOTE_PEER_REJECTED;
-  }
-
-  const lowerInfo = info.toLowerCase();
-
-  if (isRLNResponseError(info)) {
-    return ProtocolError.RLN_PROOF_GENERATION;
-  }
-
-  if (
-    lowerInfo.includes("rate limit") ||
-    lowerInfo.includes("too many requests")
-  ) {
-    return ProtocolError.REMOTE_PEER_REJECTED;
-  }
-
-  if (
-    lowerInfo.includes("topic") &&
-    (lowerInfo.includes("not found") || lowerInfo.includes("not configured"))
-  ) {
-    return ProtocolError.TOPIC_NOT_CONFIGURED;
-  }
-
-  if (lowerInfo.includes("too large") || lowerInfo.includes("size")) {
-    return ProtocolError.SIZE_TOO_BIG;
-  }
-
-  if (
-    lowerInfo.includes("decode") ||
-    lowerInfo.includes("invalid") ||
-    lowerInfo.includes("malformed")
-  ) {
-    return ProtocolError.DECODE_FAILED;
-  }
-
-  if (lowerInfo.includes("empty") && lowerInfo.includes("payload")) {
-    return ProtocolError.EMPTY_PAYLOAD;
-  }
-
-  return ProtocolError.REMOTE_PEER_REJECTED;
-}
-
-/**
- * Validates that a message conforms to Light Push protocol requirements.
- *
- * @param message - The message to validate
- * @param encoder - The encoder to use for message size validation
- * @returns A ProtocolError if validation fails, null if the message is valid
- *
- * @remarks
- * This function performs the following validations:
- * - Checks if the message payload exists and is not empty
- * - Verifies the encoded message size is under the network cap (1MB)
- */
-export async function validateMessage(
-  message: IMessage,
-  encoder: IEncoder
-): Promise<ProtocolError | null> {
-  if (!message.payload?.length) {
-    log.error("Failed to send waku light push: payload is empty");
-    return ProtocolError.EMPTY_PAYLOAD;
-  }
-
-  if (!(await isMessageSizeUnderCap(encoder, message))) {
-    log.error("Failed to send waku light push: message is bigger than 1MB");
-    return ProtocolError.SIZE_TOO_BIG;
-  }
-
-  return null;
-}

package/dist/lib/light_push/light_push_v3.d.ts

@@ -1,14 +0,0 @@
-import type { PeerId } from "@libp2p/interface";
-import { type IBaseProtocolCore, type IEncoder, type IMessage, type Libp2p, type LightPushResult, PubsubTopic } from "@waku/interfaces";
-import { BaseProtocol } from "../base_protocol.js";
-export declare class LightPushCoreV3 extends BaseProtocol implements IBaseProtocolCore {
-    readonly pubsubTopics: PubsubTopic[];
-    constructor(pubsubTopics: PubsubTopic[], libp2p: Libp2p);
-    send(encoder: IEncoder, message: IMessage, peerId: PeerId): Promise<LightPushResult>;
-    private validateAndPrepareMessage;
-    private executeRequest;
-    private processResponse;
-    private acquireStream;
-    private sendAndReceive;
-    private decodeResponse;
-}