@waku/core 0.0.38 → 0.0.39-3e66a33.0

package/bundle/index.js

@@ -1,5 +1,5 @@
-import { e as equals$2, c as coerce, b as base32, a as base58btc, d as base36, B as BASES, f as fromString, v as version_0, g as allocUnsafe, h as alloc, i as encodingLength$1, j as encode$3, k as decode$4, L as Logger, F as FilterSubscribeRequest, l as FilterSubscribeResponse$1, M as MessagePush, P as PushRpc$1, m as PushResponse, S as StoreQueryRequest$1, n as StoreQueryResponse$1, o as createEncoder, p as enumeration, q as message, r as encodeMessage, s as decodeMessage, t as bases, u as base64url, w as encodeUint8Array, W as WakuMetadataRequest, x as WakuMetadataResponse } from './version_0-CGLjyYN6.js';
-export { y as createDecoder } from './version_0-CGLjyYN6.js';
+import { e as equals$2, c as coerce, b as base32, a as base58btc, d as base36, s as sha256$1, f as concat$1, u as utf8ToBytes, v as version_0, g as allocUnsafe, h as alloc, i as encodingLength$1, j as encode$3, k as decode$4, L as Logger, F as FilterSubscribeRequest, l as FilterSubscribeResponse$1, M as MessagePush, P as PushRpc$1, m as LightPushRequestV3, n as LightPushResponseV3, S as StoreQueryRequest$1, o as StoreQueryResponse$1, p as createEncoder, t as toString, q as fromString, r as hexToBytes, w as isBytes, x as abytes, y as bytesToHex, z as concatBytes, A as anumber, B as randomBytes, C as sha512, D as enumeration, E as message, G as encodeMessage, H as decodeMessage, I as Hash, J as ahash, K as toBytes, N as clean, O as aexists, Q as sha256$2, R as bases, T as base64url, U as encodeUint8Array, V as bytesToUtf8, W as WakuMetadataRequest, X as WakuMetadataResponse } from './version_0-DQUncDnb.js';
+export { Y as createDecoder, Z as messageHash, _ as messageHashStr } from './version_0-DQUncDnb.js';
 
 /* eslint-disable */
 var encode_1 = encode$2;
@@ -191,7 +191,7 @@ class Hasher {
 function sha(name) {
     return async (data) => new Uint8Array(await crypto.subtle.digest(name, data));
 }
-const sha256$2 = from({
+const sha256 = from({
     name: 'sha2-256',
     code: 0x12,
     encode: sha('SHA-256')
@@ -560,10 +560,6 @@ function encodeCID(version, code, multihash) {
 }
 const cidSymbol = Symbol.for('@ipld/js-cid/CID');
 
-function isDefined(value) {
-    return Boolean(value);
-}
-
 const MB = 1024 ** 2;
 const SIZE_CAP_IN_MB = 1;
 /**
@@ -581,714 +577,88 @@ async function isMessageSizeUnderCap(encoder, message) {
 }
 const isWireSizeUnderCap = (buf) => buf.length / MB <= SIZE_CAP_IN_MB;
 
-const crypto$1 = typeof globalThis === 'object' && 'crypto' in globalThis ? globalThis.crypto : undefined;
-
-/**
- * Utilities for hex, bytes, CSPRNG.
- * @module
- */
-/*! noble-hashes - MIT License (c) 2022 Paul Miller (paulmillr.com) */
-// We use WebCrypto aka globalThis.crypto, which exists in browsers and node.js 16+.
-// node.js versions earlier than v19 don't declare it in global scope.
-// For node.js, package.json#exports field mapping rewrites import
-// from `crypto` to `cryptoNode`, which imports native module.
-// Makes the utils un-importable in browsers without a bundler.
-// Once node.js 18 is deprecated (2025-04-30), we can just drop the import.
-/** Checks if something is Uint8Array. Be careful: nodejs Buffer will return true. */
-function isBytes(a) {
-    return a instanceof Uint8Array || (ArrayBuffer.isView(a) && a.constructor.name === 'Uint8Array');
-}
-/** Asserts something is positive integer. */
-function anumber(n) {
-    if (!Number.isSafeInteger(n) || n < 0)
-        throw new Error('positive integer expected, got ' + n);
-}
-/** Asserts something is Uint8Array. */
-function abytes(b, ...lengths) {
-    if (!isBytes(b))
-        throw new Error('Uint8Array expected');
-    if (lengths.length > 0 && !lengths.includes(b.length))
-        throw new Error('Uint8Array expected of length ' + lengths + ', got length=' + b.length);
-}
-/** Asserts something is hash */
-function ahash(h) {
-    if (typeof h !== 'function' || typeof h.create !== 'function')
-        throw new Error('Hash should be wrapped by utils.createHasher');
-    anumber(h.outputLen);
-    anumber(h.blockLen);
-}
-/** Asserts a hash instance has not been destroyed / finished */
-function aexists(instance, checkFinished = true) {
-    if (instance.destroyed)
-        throw new Error('Hash instance has been destroyed');
-    if (checkFinished && instance.finished)
-        throw new Error('Hash#digest() has already been called');
-}
-/** Asserts output is properly-sized byte array */
-function aoutput(out, instance) {
-    abytes(out);
-    const min = instance.outputLen;
-    if (out.length < min) {
-        throw new Error('digestInto() expects output buffer of length at least ' + min);
-    }
-}
-/** Zeroize a byte array. Warning: JS provides no guarantees. */
-function clean(...arrays) {
-    for (let i = 0; i < arrays.length; i++) {
-        arrays[i].fill(0);
-    }
-}
-/** Create DataView of an array for easy byte-level manipulation. */
-function createView(arr) {
-    return new DataView(arr.buffer, arr.byteOffset, arr.byteLength);
-}
-/** The rotate right (circular right shift) operation for uint32 */
-function rotr(word, shift) {
-    return (word << (32 - shift)) | (word >>> shift);
-}
-// Built-in hex conversion https://caniuse.com/mdn-javascript_builtins_uint8array_fromhex
-const hasHexBuiltin = /* @__PURE__ */ (() => 
-// @ts-ignore
-typeof Uint8Array.from([]).toHex === 'function' && typeof Uint8Array.fromHex === 'function')();
-// Array where index 0xf0 (240) is mapped to string 'f0'
-const hexes = /* @__PURE__ */ Array.from({ length: 256 }, (_, i) => i.toString(16).padStart(2, '0'));
-/**
- * Convert byte array to hex string. Uses built-in function, when available.
- * @example bytesToHex(Uint8Array.from([0xca, 0xfe, 0x01, 0x23])) // 'cafe0123'
- */
-function bytesToHex$1(bytes) {
-    abytes(bytes);
-    // @ts-ignore
-    if (hasHexBuiltin)
-        return bytes.toHex();
-    // pre-caching improves the speed 6x
-    let hex = '';
-    for (let i = 0; i < bytes.length; i++) {
-        hex += hexes[bytes[i]];
-    }
-    return hex;
-}
-// We use optimized technique to convert hex string to byte array
-const asciis = { _0: 48, _9: 57, A: 65, F: 70, a: 97, f: 102 };
-function asciiToBase16(ch) {
-    if (ch >= asciis._0 && ch <= asciis._9)
-        return ch - asciis._0; // '2' => 50-48
-    if (ch >= asciis.A && ch <= asciis.F)
-        return ch - (asciis.A - 10); // 'B' => 66-(65-10)
-    if (ch >= asciis.a && ch <= asciis.f)
-        return ch - (asciis.a - 10); // 'b' => 98-(97-10)
-    return;
-}
-/**
- * Convert hex string to byte array. Uses built-in function, when available.
- * @example hexToBytes('cafe0123') // Uint8Array.from([0xca, 0xfe, 0x01, 0x23])
- */
-function hexToBytes(hex) {
-    if (typeof hex !== 'string')
-        throw new Error('hex string expected, got ' + typeof hex);
-    // @ts-ignore
-    if (hasHexBuiltin)
-        return Uint8Array.fromHex(hex);
-    const hl = hex.length;
-    const al = hl / 2;
-    if (hl % 2)
-        throw new Error('hex string expected, got unpadded hex of length ' + hl);
-    const array = new Uint8Array(al);
-    for (let ai = 0, hi = 0; ai < al; ai++, hi += 2) {
-        const n1 = asciiToBase16(hex.charCodeAt(hi));
-        const n2 = asciiToBase16(hex.charCodeAt(hi + 1));
-        if (n1 === undefined || n2 === undefined) {
-            const char = hex[hi] + hex[hi + 1];
-            throw new Error('hex string expected, got non-hex character "' + char + '" at index ' + hi);
-        }
-        array[ai] = n1 * 16 + n2; // multiply first octet, e.g. 'a3' => 10*16+3 => 160 + 3 => 163
-    }
-    return array;
-}
-/**
- * Converts string to bytes using UTF8 encoding.
- * @example utf8ToBytes('abc') // Uint8Array.from([97, 98, 99])
- */
-function utf8ToBytes$1(str) {
-    if (typeof str !== 'string')
-        throw new Error('string expected');
-    return new Uint8Array(new TextEncoder().encode(str)); // https://bugzil.la/1681809
-}
-/**
- * Normalizes (non-hex) string or Uint8Array to Uint8Array.
- * Warning: when Uint8Array is passed, it would NOT get copied.
- * Keep in mind for future mutable operations.
- */
-function toBytes(data) {
-    if (typeof data === 'string')
-        data = utf8ToBytes$1(data);
-    abytes(data);
-    return data;
-}
-/** Copies several Uint8Arrays into one. */
-function concatBytes(...arrays) {
-    let sum = 0;
-    for (let i = 0; i < arrays.length; i++) {
-        const a = arrays[i];
-        abytes(a);
-        sum += a.length;
-    }
-    const res = new Uint8Array(sum);
-    for (let i = 0, pad = 0; i < arrays.length; i++) {
-        const a = arrays[i];
-        res.set(a, pad);
-        pad += a.length;
-    }
-    return res;
-}
-/** For runtime check if class implements interface */
-class Hash {
-}
-/** Wraps hash function, creating an interface on top of it */
-function createHasher(hashCons) {
-    const hashC = (msg) => hashCons().update(toBytes(msg)).digest();
-    const tmp = hashCons();
-    hashC.outputLen = tmp.outputLen;
-    hashC.blockLen = tmp.blockLen;
-    hashC.create = () => hashCons();
-    return hashC;
-}
-/** Cryptographically secure PRNG. Uses internal OS-level `crypto.getRandomValues`. */
-function randomBytes(bytesLength = 32) {
-    if (crypto$1 && typeof crypto$1.getRandomValues === 'function') {
-        return crypto$1.getRandomValues(new Uint8Array(bytesLength));
-    }
-    // Legacy Node.js compatibility
-    if (crypto$1 && typeof crypto$1.randomBytes === 'function') {
-        return Uint8Array.from(crypto$1.randomBytes(bytesLength));
-    }
-    throw new Error('crypto.getRandomValues must be defined');
-}
-
-/**
- * Internal Merkle-Damgard hash utils.
- * @module
- */
-/** Polyfill for Safari 14. https://caniuse.com/mdn-javascript_builtins_dataview_setbiguint64 */
-function setBigUint64(view, byteOffset, value, isLE) {
-    if (typeof view.setBigUint64 === 'function')
-        return view.setBigUint64(byteOffset, value, isLE);
-    const _32n = BigInt(32);
-    const _u32_max = BigInt(0xffffffff);
-    const wh = Number((value >> _32n) & _u32_max);
-    const wl = Number(value & _u32_max);
-    const h = isLE ? 4 : 0;
-    const l = isLE ? 0 : 4;
-    view.setUint32(byteOffset + h, wh, isLE);
-    view.setUint32(byteOffset + l, wl, isLE);
-}
-/** Choice: a ? b : c */
-function Chi(a, b, c) {
-    return (a & b) ^ (~a & c);
-}
-/** Majority function, true if any two inputs is true. */
-function Maj(a, b, c) {
-    return (a & b) ^ (a & c) ^ (b & c);
-}
-/**
- * Merkle-Damgard hash construction base class.
- * Could be used to create MD5, RIPEMD, SHA1, SHA2.
- */
-class HashMD extends Hash {
-    constructor(blockLen, outputLen, padOffset, isLE) {
-        super();
-        this.finished = false;
-        this.length = 0;
-        this.pos = 0;
-        this.destroyed = false;
-        this.blockLen = blockLen;
-        this.outputLen = outputLen;
-        this.padOffset = padOffset;
-        this.isLE = isLE;
-        this.buffer = new Uint8Array(blockLen);
-        this.view = createView(this.buffer);
-    }
-    update(data) {
-        aexists(this);
-        data = toBytes(data);
-        abytes(data);
-        const { view, buffer, blockLen } = this;
-        const len = data.length;
-        for (let pos = 0; pos < len;) {
-            const take = Math.min(blockLen - this.pos, len - pos);
-            // Fast path: we have at least one block in input, cast it to view and process
-            if (take === blockLen) {
-                const dataView = createView(data);
-                for (; blockLen <= len - pos; pos += blockLen)
-                    this.process(dataView, pos);
-                continue;
-            }
-            buffer.set(data.subarray(pos, pos + take), this.pos);
-            this.pos += take;
-            pos += take;
-            if (this.pos === blockLen) {
-                this.process(view, 0);
-                this.pos = 0;
-            }
-        }
-        this.length += data.length;
-        this.roundClean();
-        return this;
-    }
-    digestInto(out) {
-        aexists(this);
-        aoutput(out, this);
-        this.finished = true;
-        // Padding
-        // We can avoid allocation of buffer for padding completely if it
-        // was previously not allocated here. But it won't change performance.
-        const { buffer, view, blockLen, isLE } = this;
-        let { pos } = this;
-        // append the bit '1' to the message
-        buffer[pos++] = 0b10000000;
-        clean(this.buffer.subarray(pos));
-        // we have less than padOffset left in buffer, so we cannot put length in
-        // current block, need process it and pad again
-        if (this.padOffset > blockLen - pos) {
-            this.process(view, 0);
-            pos = 0;
-        }
-        // Pad until full block byte with zeros
-        for (let i = pos; i < blockLen; i++)
-            buffer[i] = 0;
-        // Note: sha512 requires length to be 128bit integer, but length in JS will overflow before that
-        // You need to write around 2 exabytes (u64_max / 8 / (1024**6)) for this to happen.
-        // So we just write lowest 64 bits of that value.
-        setBigUint64(view, blockLen - 8, BigInt(this.length * 8), isLE);
-        this.process(view, 0);
-        const oview = createView(out);
-        const len = this.outputLen;
-        // NOTE: we do division by 4 later, which should be fused in single op with modulo by JIT
-        if (len % 4)
-            throw new Error('_sha2: outputLen should be aligned to 32bit');
-        const outLen = len / 4;
-        const state = this.get();
-        if (outLen > state.length)
-            throw new Error('_sha2: outputLen bigger than state');
-        for (let i = 0; i < outLen; i++)
-            oview.setUint32(4 * i, state[i], isLE);
-    }
-    digest() {
-        const { buffer, outputLen } = this;
-        this.digestInto(buffer);
-        const res = buffer.slice(0, outputLen);
-        this.destroy();
-        return res;
-    }
-    _cloneInto(to) {
-        to || (to = new this.constructor());
-        to.set(...this.get());
-        const { blockLen, buffer, length, finished, destroyed, pos } = this;
-        to.destroyed = destroyed;
-        to.finished = finished;
-        to.length = length;
-        to.pos = pos;
-        if (length % blockLen)
-            to.buffer.set(buffer);
-        return to;
-    }
-    clone() {
-        return this._cloneInto();
-    }
+function isAutoSharding(config) {
+    return "clusterId" in config && "numShardsInCluster" in config;
 }
-/**
- * Initial SHA-2 state: fractional parts of square roots of first 16 primes 2..53.
- * Check out `test/misc/sha2-gen-iv.js` for recomputation guide.
- */
-/** Initial SHA256 state. Bits 0..32 of frac part of sqrt of primes 2..19 */
-const SHA256_IV = /* @__PURE__ */ Uint32Array.from([
-    0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19,
-]);
-/** Initial SHA512 state. Bits 0..64 of frac part of sqrt of primes 2..19 */
-const SHA512_IV = /* @__PURE__ */ Uint32Array.from([
-    0x6a09e667, 0xf3bcc908, 0xbb67ae85, 0x84caa73b, 0x3c6ef372, 0xfe94f82b, 0xa54ff53a, 0x5f1d36f1,
-    0x510e527f, 0xade682d1, 0x9b05688c, 0x2b3e6c1f, 0x1f83d9ab, 0xfb41bd6b, 0x5be0cd19, 0x137e2179,
-]);
-
-/**
- * Internal helpers for u64. BigUint64Array is too slow as per 2025, so we implement it using Uint32Array.
- * @todo re-check https://issues.chromium.org/issues/42212588
- * @module
- */
-const U32_MASK64 = /* @__PURE__ */ BigInt(2 ** 32 - 1);
-const _32n = /* @__PURE__ */ BigInt(32);
-function fromBig(n, le = false) {
-    if (le)
-        return { h: Number(n & U32_MASK64), l: Number((n >> _32n) & U32_MASK64) };
-    return { h: Number((n >> _32n) & U32_MASK64) | 0, l: Number(n & U32_MASK64) | 0 };
-}
-function split(lst, le = false) {
-    const len = lst.length;
-    let Ah = new Uint32Array(len);
-    let Al = new Uint32Array(len);
-    for (let i = 0; i < len; i++) {
-        const { h, l } = fromBig(lst[i], le);
-        [Ah[i], Al[i]] = [h, l];
-    }
-    return [Ah, Al];
-}
-// for Shift in [0, 32)
-const shrSH = (h, _l, s) => h >>> s;
-const shrSL = (h, l, s) => (h << (32 - s)) | (l >>> s);
-// Right rotate for Shift in [1, 32)
-const rotrSH = (h, l, s) => (h >>> s) | (l << (32 - s));
-const rotrSL = (h, l, s) => (h << (32 - s)) | (l >>> s);
-// Right rotate for Shift in (32, 64), NOTE: 32 is special case.
-const rotrBH = (h, l, s) => (h << (64 - s)) | (l >>> (s - 32));
-const rotrBL = (h, l, s) => (h >>> (s - 32)) | (l << (64 - s));
-// JS uses 32-bit signed integers for bitwise operations which means we cannot
-// simple take carry out of low bit sum by shift, we need to use division.
-function add(Ah, Al, Bh, Bl) {
-    const l = (Al >>> 0) + (Bl >>> 0);
-    return { h: (Ah + Bh + ((l / 2 ** 32) | 0)) | 0, l: l | 0 };
-}
-// Addition with more than 2 elements
-const add3L = (Al, Bl, Cl) => (Al >>> 0) + (Bl >>> 0) + (Cl >>> 0);
-const add3H = (low, Ah, Bh, Ch) => (Ah + Bh + Ch + ((low / 2 ** 32) | 0)) | 0;
-const add4L = (Al, Bl, Cl, Dl) => (Al >>> 0) + (Bl >>> 0) + (Cl >>> 0) + (Dl >>> 0);
-const add4H = (low, Ah, Bh, Ch, Dh) => (Ah + Bh + Ch + Dh + ((low / 2 ** 32) | 0)) | 0;
-const add5L = (Al, Bl, Cl, Dl, El) => (Al >>> 0) + (Bl >>> 0) + (Cl >>> 0) + (Dl >>> 0) + (El >>> 0);
-const add5H = (low, Ah, Bh, Ch, Dh, Eh) => (Ah + Bh + Ch + Dh + Eh + ((low / 2 ** 32) | 0)) | 0;
 
+const formatPubsubTopic = (clusterId, shard) => {
+    return `/waku/2/rs/${clusterId}/${shard}`;
+};
 /**
- * SHA2 hash function. A.k.a. sha256, sha384, sha512, sha512_224, sha512_256.
- * SHA256 is the fastest hash implementable in JS, even faster than Blake3.
- * Check out [RFC 4634](https://datatracker.ietf.org/doc/html/rfc4634) and
- * [FIPS 180-4](https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.180-4.pdf).
- * @module
+ * @deprecated will be removed
  */
+const pubsubTopicToSingleShardInfo = (pubsubTopics) => {
+    const parts = pubsubTopics.split("/");
+    if (parts.length != 6 ||
+        parts[1] !== "waku" ||
+        parts[2] !== "2" ||
+        parts[3] !== "rs")
+        throw new Error("Invalid pubsub topic");
+    const clusterId = parseInt(parts[4]);
+    const shard = parseInt(parts[5]);
+    if (isNaN(clusterId) || isNaN(shard))
+        throw new Error("Invalid clusterId or shard");
+    return {
+        clusterId,
+        shard
+    };
+};
 /**
- * Round constants:
- * First 32 bits of fractional parts of the cube roots of the first 64 primes 2..311)
+ * Given a string, will throw an error if it is not formatted as a valid content topic for autosharding based on https://rfc.vac.dev/spec/51/
+ * @param contentTopic String to validate
+ * @returns Object with each content topic field as an attribute
  */
-// prettier-ignore
-const SHA256_K = /* @__PURE__ */ Uint32Array.from([
-    0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
-    0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
-    0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
-    0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
-    0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
-    0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
-    0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
-    0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
-]);
-/** Reusable temporary buffer. "W" comes straight from spec. */
-const SHA256_W = /* @__PURE__ */ new Uint32Array(64);
-class SHA256 extends HashMD {
-    constructor(outputLen = 32) {
-        super(64, outputLen, 8, false);
-        // We cannot use array here since array allows indexing by variable
-        // which means optimizer/compiler cannot use registers.
-        this.A = SHA256_IV[0] | 0;
-        this.B = SHA256_IV[1] | 0;
-        this.C = SHA256_IV[2] | 0;
-        this.D = SHA256_IV[3] | 0;
-        this.E = SHA256_IV[4] | 0;
-        this.F = SHA256_IV[5] | 0;
-        this.G = SHA256_IV[6] | 0;
-        this.H = SHA256_IV[7] | 0;
-    }
-    get() {
-        const { A, B, C, D, E, F, G, H } = this;
-        return [A, B, C, D, E, F, G, H];
-    }
-    // prettier-ignore
-    set(A, B, C, D, E, F, G, H) {
-        this.A = A | 0;
-        this.B = B | 0;
-        this.C = C | 0;
-        this.D = D | 0;
-        this.E = E | 0;
-        this.F = F | 0;
-        this.G = G | 0;
-        this.H = H | 0;
-    }
-    process(view, offset) {
-        // Extend the first 16 words into the remaining 48 words w[16..63] of the message schedule array
-        for (let i = 0; i < 16; i++, offset += 4)
-            SHA256_W[i] = view.getUint32(offset, false);
-        for (let i = 16; i < 64; i++) {
-            const W15 = SHA256_W[i - 15];
-            const W2 = SHA256_W[i - 2];
-            const s0 = rotr(W15, 7) ^ rotr(W15, 18) ^ (W15 >>> 3);
-            const s1 = rotr(W2, 17) ^ rotr(W2, 19) ^ (W2 >>> 10);
-            SHA256_W[i] = (s1 + SHA256_W[i - 7] + s0 + SHA256_W[i - 16]) | 0;
-        }
-        // Compression function main loop, 64 rounds
-        let { A, B, C, D, E, F, G, H } = this;
-        for (let i = 0; i < 64; i++) {
-            const sigma1 = rotr(E, 6) ^ rotr(E, 11) ^ rotr(E, 25);
-            const T1 = (H + sigma1 + Chi(E, F, G) + SHA256_K[i] + SHA256_W[i]) | 0;
-            const sigma0 = rotr(A, 2) ^ rotr(A, 13) ^ rotr(A, 22);
-            const T2 = (sigma0 + Maj(A, B, C)) | 0;
-            H = G;
-            G = F;
-            F = E;
-            E = (D + T1) | 0;
-            D = C;
-            C = B;
-            B = A;
-            A = (T1 + T2) | 0;
-        }
-        // Add the compressed chunk to the current hash value
-        A = (A + this.A) | 0;
-        B = (B + this.B) | 0;
-        C = (C + this.C) | 0;
-        D = (D + this.D) | 0;
-        E = (E + this.E) | 0;
-        F = (F + this.F) | 0;
-        G = (G + this.G) | 0;
-        H = (H + this.H) | 0;
-        this.set(A, B, C, D, E, F, G, H);
-    }
-    roundClean() {
-        clean(SHA256_W);
-    }
-    destroy() {
-        this.set(0, 0, 0, 0, 0, 0, 0, 0);
-        clean(this.buffer);
-    }
-}
-// SHA2-512 is slower than sha256 in js because u64 operations are slow.
-// Round contants
-// First 32 bits of the fractional parts of the cube roots of the first 80 primes 2..409
-// prettier-ignore
-const K512 = /* @__PURE__ */ (() => split([
-    '0x428a2f98d728ae22', '0x7137449123ef65cd', '0xb5c0fbcfec4d3b2f', '0xe9b5dba58189dbbc',
-    '0x3956c25bf348b538', '0x59f111f1b605d019', '0x923f82a4af194f9b', '0xab1c5ed5da6d8118',
-    '0xd807aa98a3030242', '0x12835b0145706fbe', '0x243185be4ee4b28c', '0x550c7dc3d5ffb4e2',
-    '0x72be5d74f27b896f', '0x80deb1fe3b1696b1', '0x9bdc06a725c71235', '0xc19bf174cf692694',
-    '0xe49b69c19ef14ad2', '0xefbe4786384f25e3', '0x0fc19dc68b8cd5b5', '0x240ca1cc77ac9c65',
-    '0x2de92c6f592b0275', '0x4a7484aa6ea6e483', '0x5cb0a9dcbd41fbd4', '0x76f988da831153b5',
-    '0x983e5152ee66dfab', '0xa831c66d2db43210', '0xb00327c898fb213f', '0xbf597fc7beef0ee4',
-    '0xc6e00bf33da88fc2', '0xd5a79147930aa725', '0x06ca6351e003826f', '0x142929670a0e6e70',
-    '0x27b70a8546d22ffc', '0x2e1b21385c26c926', '0x4d2c6dfc5ac42aed', '0x53380d139d95b3df',
-    '0x650a73548baf63de', '0x766a0abb3c77b2a8', '0x81c2c92e47edaee6', '0x92722c851482353b',
-    '0xa2bfe8a14cf10364', '0xa81a664bbc423001', '0xc24b8b70d0f89791', '0xc76c51a30654be30',
-    '0xd192e819d6ef5218', '0xd69906245565a910', '0xf40e35855771202a', '0x106aa07032bbd1b8',
-    '0x19a4c116b8d2d0c8', '0x1e376c085141ab53', '0x2748774cdf8eeb99', '0x34b0bcb5e19b48a8',
-    '0x391c0cb3c5c95a63', '0x4ed8aa4ae3418acb', '0x5b9cca4f7763e373', '0x682e6ff3d6b2b8a3',
-    '0x748f82ee5defb2fc', '0x78a5636f43172f60', '0x84c87814a1f0ab72', '0x8cc702081a6439ec',
-    '0x90befffa23631e28', '0xa4506cebde82bde9', '0xbef9a3f7b2c67915', '0xc67178f2e372532b',
-    '0xca273eceea26619c', '0xd186b8c721c0c207', '0xeada7dd6cde0eb1e', '0xf57d4f7fee6ed178',
-    '0x06f067aa72176fba', '0x0a637dc5a2c898a6', '0x113f9804bef90dae', '0x1b710b35131c471b',
-    '0x28db77f523047d84', '0x32caab7b40c72493', '0x3c9ebe0a15c9bebc', '0x431d67c49c100d4c',
-    '0x4cc5d4becb3e42b6', '0x597f299cfc657e2a', '0x5fcb6fab3ad6faec', '0x6c44198c4a475817'
-].map(n => BigInt(n))))();
-const SHA512_Kh = /* @__PURE__ */ (() => K512[0])();
-const SHA512_Kl = /* @__PURE__ */ (() => K512[1])();
-// Reusable temporary buffers
-const SHA512_W_H = /* @__PURE__ */ new Uint32Array(80);
-const SHA512_W_L = /* @__PURE__ */ new Uint32Array(80);
-class SHA512 extends HashMD {
-    constructor(outputLen = 64) {
-        super(128, outputLen, 16, false);
-        // We cannot use array here since array allows indexing by variable
-        // which means optimizer/compiler cannot use registers.
-        // h -- high 32 bits, l -- low 32 bits
-        this.Ah = SHA512_IV[0] | 0;
-        this.Al = SHA512_IV[1] | 0;
-        this.Bh = SHA512_IV[2] | 0;
-        this.Bl = SHA512_IV[3] | 0;
-        this.Ch = SHA512_IV[4] | 0;
-        this.Cl = SHA512_IV[5] | 0;
-        this.Dh = SHA512_IV[6] | 0;
-        this.Dl = SHA512_IV[7] | 0;
-        this.Eh = SHA512_IV[8] | 0;
-        this.El = SHA512_IV[9] | 0;
-        this.Fh = SHA512_IV[10] | 0;
-        this.Fl = SHA512_IV[11] | 0;
-        this.Gh = SHA512_IV[12] | 0;
-        this.Gl = SHA512_IV[13] | 0;
-        this.Hh = SHA512_IV[14] | 0;
-        this.Hl = SHA512_IV[15] | 0;
-    }
-    // prettier-ignore
-    get() {
-        const { Ah, Al, Bh, Bl, Ch, Cl, Dh, Dl, Eh, El, Fh, Fl, Gh, Gl, Hh, Hl } = this;
-        return [Ah, Al, Bh, Bl, Ch, Cl, Dh, Dl, Eh, El, Fh, Fl, Gh, Gl, Hh, Hl];
+function ensureValidContentTopic(contentTopic) {
+    const parts = contentTopic.split("/");
+    if (parts.length < 5 || parts.length > 6) {
+        throw Error(`Content topic format is invalid: ${contentTopic}`);
     }
-    // prettier-ignore
-    set(Ah, Al, Bh, Bl, Ch, Cl, Dh, Dl, Eh, El, Fh, Fl, Gh, Gl, Hh, Hl) {
-        this.Ah = Ah | 0;
-        this.Al = Al | 0;
-        this.Bh = Bh | 0;
-        this.Bl = Bl | 0;
-        this.Ch = Ch | 0;
-        this.Cl = Cl | 0;
-        this.Dh = Dh | 0;
-        this.Dl = Dl | 0;
-        this.Eh = Eh | 0;
-        this.El = El | 0;
-        this.Fh = Fh | 0;
-        this.Fl = Fl | 0;
-        this.Gh = Gh | 0;
-        this.Gl = Gl | 0;
-        this.Hh = Hh | 0;
-        this.Hl = Hl | 0;
-    }
-    process(view, offset) {
-        // Extend the first 16 words into the remaining 64 words w[16..79] of the message schedule array
-        for (let i = 0; i < 16; i++, offset += 4) {
-            SHA512_W_H[i] = view.getUint32(offset);
-            SHA512_W_L[i] = view.getUint32((offset += 4));
-        }
-        for (let i = 16; i < 80; i++) {
-            // s0 := (w[i-15] rightrotate 1) xor (w[i-15] rightrotate 8) xor (w[i-15] rightshift 7)
-            const W15h = SHA512_W_H[i - 15] | 0;
-            const W15l = SHA512_W_L[i - 15] | 0;
-            const s0h = rotrSH(W15h, W15l, 1) ^ rotrSH(W15h, W15l, 8) ^ shrSH(W15h, W15l, 7);
-            const s0l = rotrSL(W15h, W15l, 1) ^ rotrSL(W15h, W15l, 8) ^ shrSL(W15h, W15l, 7);
-            // s1 := (w[i-2] rightrotate 19) xor (w[i-2] rightrotate 61) xor (w[i-2] rightshift 6)
-            const W2h = SHA512_W_H[i - 2] | 0;
-            const W2l = SHA512_W_L[i - 2] | 0;
-            const s1h = rotrSH(W2h, W2l, 19) ^ rotrBH(W2h, W2l, 61) ^ shrSH(W2h, W2l, 6);
-            const s1l = rotrSL(W2h, W2l, 19) ^ rotrBL(W2h, W2l, 61) ^ shrSL(W2h, W2l, 6);
-            // SHA256_W[i] = s0 + s1 + SHA256_W[i - 7] + SHA256_W[i - 16];
-            const SUMl = add4L(s0l, s1l, SHA512_W_L[i - 7], SHA512_W_L[i - 16]);
-            const SUMh = add4H(SUMl, s0h, s1h, SHA512_W_H[i - 7], SHA512_W_H[i - 16]);
-            SHA512_W_H[i] = SUMh | 0;
-            SHA512_W_L[i] = SUMl | 0;
-        }
-        let { Ah, Al, Bh, Bl, Ch, Cl, Dh, Dl, Eh, El, Fh, Fl, Gh, Gl, Hh, Hl } = this;
-        // Compression function main loop, 80 rounds
-        for (let i = 0; i < 80; i++) {
-            // S1 := (e rightrotate 14) xor (e rightrotate 18) xor (e rightrotate 41)
-            const sigma1h = rotrSH(Eh, El, 14) ^ rotrSH(Eh, El, 18) ^ rotrBH(Eh, El, 41);
-            const sigma1l = rotrSL(Eh, El, 14) ^ rotrSL(Eh, El, 18) ^ rotrBL(Eh, El, 41);
-            //const T1 = (H + sigma1 + Chi(E, F, G) + SHA256_K[i] + SHA256_W[i]) | 0;
-            const CHIh = (Eh & Fh) ^ (~Eh & Gh);
-            const CHIl = (El & Fl) ^ (~El & Gl);
-            // T1 = H + sigma1 + Chi(E, F, G) + SHA512_K[i] + SHA512_W[i]
-            // prettier-ignore
-            const T1ll = add5L(Hl, sigma1l, CHIl, SHA512_Kl[i], SHA512_W_L[i]);
-            const T1h = add5H(T1ll, Hh, sigma1h, CHIh, SHA512_Kh[i], SHA512_W_H[i]);
-            const T1l = T1ll | 0;
-            // S0 := (a rightrotate 28) xor (a rightrotate 34) xor (a rightrotate 39)
-            const sigma0h = rotrSH(Ah, Al, 28) ^ rotrBH(Ah, Al, 34) ^ rotrBH(Ah, Al, 39);
-            const sigma0l = rotrSL(Ah, Al, 28) ^ rotrBL(Ah, Al, 34) ^ rotrBL(Ah, Al, 39);
-            const MAJh = (Ah & Bh) ^ (Ah & Ch) ^ (Bh & Ch);
-            const MAJl = (Al & Bl) ^ (Al & Cl) ^ (Bl & Cl);
-            Hh = Gh | 0;
-            Hl = Gl | 0;
-            Gh = Fh | 0;
-            Gl = Fl | 0;
-            Fh = Eh | 0;
-            Fl = El | 0;
-            ({ h: Eh, l: El } = add(Dh | 0, Dl | 0, T1h | 0, T1l | 0));
-            Dh = Ch | 0;
-            Dl = Cl | 0;
-            Ch = Bh | 0;
-            Cl = Bl | 0;
-            Bh = Ah | 0;
-            Bl = Al | 0;
-            const All = add3L(T1l, sigma0l, MAJl);
-            Ah = add3H(All, T1h, sigma0h, MAJh);
-            Al = All | 0;
-        }
-        // Add the compressed chunk to the current hash value
-        ({ h: Ah, l: Al } = add(this.Ah | 0, this.Al | 0, Ah | 0, Al | 0));
-        ({ h: Bh, l: Bl } = add(this.Bh | 0, this.Bl | 0, Bh | 0, Bl | 0));
-        ({ h: Ch, l: Cl } = add(this.Ch | 0, this.Cl | 0, Ch | 0, Cl | 0));
-        ({ h: Dh, l: Dl } = add(this.Dh | 0, this.Dl | 0, Dh | 0, Dl | 0));
-        ({ h: Eh, l: El } = add(this.Eh | 0, this.El | 0, Eh | 0, El | 0));
-        ({ h: Fh, l: Fl } = add(this.Fh | 0, this.Fl | 0, Fh | 0, Fl | 0));
-        ({ h: Gh, l: Gl } = add(this.Gh | 0, this.Gl | 0, Gh | 0, Gl | 0));
-        ({ h: Hh, l: Hl } = add(this.Hh | 0, this.Hl | 0, Hh | 0, Hl | 0));
-        this.set(Ah, Al, Bh, Bl, Ch, Cl, Dh, Dl, Eh, El, Fh, Fl, Gh, Gl, Hh, Hl);
-    }
-    roundClean() {
-        clean(SHA512_W_H, SHA512_W_L);
+    // Validate generation field if present
+    let generation = 0;
+    if (parts.length == 6) {
+        generation = parseInt(parts[1]);
+        if (isNaN(generation)) {
+            throw new Error(`Invalid generation field in content topic: ${contentTopic}`);
+        }
+        if (generation > 0) {
+            throw new Error(`Generation greater than 0 is not supported: ${contentTopic}`);
+        }
     }
-    destroy() {
-        clean(this.buffer);
-        this.set(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    // Validate remaining fields
+    const fields = parts.splice(-4);
+    // Validate application field
+    if (fields[0].length == 0) {
+        throw new Error(`Application field cannot be empty: ${contentTopic}`);
     }
-}
-/**
- * SHA2-256 hash function from RFC 4634.
- *
- * It is the fastest JS hash, even faster than Blake3.
- * To break sha256 using birthday attack, attackers need to try 2^128 hashes.
- * BTC network is doing 2^70 hashes/sec (2^95 hashes/year) as per 2025.
- */
-const sha256$1 = /* @__PURE__ */ createHasher(() => new SHA256());
-/** SHA2-512 hash function from RFC 4634. */
-const sha512 = /* @__PURE__ */ createHasher(() => new SHA512());
-
-/**
- * SHA2-256 a.k.a. sha256. In JS, it is the fastest hash, even faster than Blake3.
- *
- * To break sha256 using birthday attack, attackers need to try 2^128 hashes.
- * BTC network is doing 2^70 hashes/sec (2^95 hashes/year) as per 2025.
- *
- * Check out [FIPS 180-4](https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.180-4.pdf).
- * @module
- * @deprecated
- */
-/** @deprecated Use import from `noble/hashes/sha2` module */
-const sha256 = sha256$1;
-
-/**
- * Turns a `Uint8Array` into a string.
- *
- * Supports `utf8`, `utf-8` and any encoding supported by the multibase module.
- *
- * Also `ascii` which is similar to node's 'binary' encoding.
- */
-function toString(array, encoding = 'utf8') {
-    const base = BASES[encoding];
-    if (base == null) {
-        throw new Error(`Unsupported encoding "${encoding}"`);
+    // Validate version field
+    if (fields[1].length == 0) {
+        throw new Error(`Version field cannot be empty: ${contentTopic}`);
     }
-    // strip multibase prefix
-    return base.encoder.encode(array).substring(1);
-}
-
-function numberToBytes(value) {
-    const buffer = new ArrayBuffer(8);
-    const view = new DataView(buffer);
-    if (typeof value === "number") {
-        view.setFloat64(0, value, false);
+    // Validate topic name field
+    if (fields[2].length == 0) {
+        throw new Error(`Topic name field cannot be empty: ${contentTopic}`);
     }
-    else {
-        view.setBigInt64(0, value, false);
+    // Validate encoding field
+    if (fields[3].length == 0) {
+        throw new Error(`Encoding field cannot be empty: ${contentTopic}`);
     }
-    return new Uint8Array(buffer);
+    return {
+        generation,
+        application: fields[0],
+        version: fields[1],
+        topicName: fields[2],
+        encoding: fields[3]
+    };
 }
 /**
- * Convert byte array to hex string (no `0x` prefix).
- */
-const bytesToHex = (bytes) => toString(bytes, "base16");
-/**
- * Decode byte array to utf-8 string.
- */
-const bytesToUtf8 = (b) => toString(b, "utf8");
-/**
- * Encode utf-8 string to byte array.
- */
-const utf8ToBytes = (s) => fromString(s, "utf8");
-/**
- * Concatenate using Uint8Arrays as `Buffer` has a different behavior with `DataView`
+ * Given a string, determines which autoshard index to use for its pubsub topic.
+ * Based on the algorithm described in the RFC: https://rfc.vac.dev/spec/51//#algorithm
  */
-function concat$1(byteArrays, totalLength) {
-    const len = byteArrays.reduce((acc, curr) => acc + curr.length, 0);
-    const res = new Uint8Array(len);
-    let offset = 0;
-    for (const bytes of byteArrays) {
-        res.set(bytes, offset);
-        offset += bytes.length;
-    }
-    return res;
-}
-
-function isAutoSharding(config) {
-    return "clusterId" in config && "numShardsInCluster" in config;
+function contentTopicToShardIndex(contentTopic, numShardsInCluster) {
+    const { application, version } = ensureValidContentTopic(contentTopic);
+    const digest = sha256$1(concat$1([utf8ToBytes(application), utf8ToBytes(version)]));
+    const dataview = new DataView(digest.buffer.slice(-8));
+    return Number(dataview.getBigUint64(0, false) % BigInt(numShardsInCluster));
 }
 
 class BaseRoutingInfo {
@@ -1401,86 +771,6 @@ function createRoutingInfo(networkConfig, options) {
     }
 }
 
-const formatPubsubTopic = (clusterId, shard) => {
-    return `/waku/2/rs/${clusterId}/${shard}`;
-};
-/**
- * @deprecated will be removed
- */
-const pubsubTopicToSingleShardInfo = (pubsubTopics) => {
-    const parts = pubsubTopics.split("/");
-    if (parts.length != 6 ||
-        parts[1] !== "waku" ||
-        parts[2] !== "2" ||
-        parts[3] !== "rs")
-        throw new Error("Invalid pubsub topic");
-    const clusterId = parseInt(parts[4]);
-    const shard = parseInt(parts[5]);
-    if (isNaN(clusterId) || isNaN(shard))
-        throw new Error("Invalid clusterId or shard");
-    return {
-        clusterId,
-        shard
-    };
-};
-/**
- * Given a string, will throw an error if it is not formatted as a valid content topic for autosharding based on https://rfc.vac.dev/spec/51/
- * @param contentTopic String to validate
- * @returns Object with each content topic field as an attribute
- */
-function ensureValidContentTopic(contentTopic) {
-    const parts = contentTopic.split("/");
-    if (parts.length < 5 || parts.length > 6) {
-        throw Error(`Content topic format is invalid: ${contentTopic}`);
-    }
-    // Validate generation field if present
-    let generation = 0;
-    if (parts.length == 6) {
-        generation = parseInt(parts[1]);
-        if (isNaN(generation)) {
-            throw new Error(`Invalid generation field in content topic: ${contentTopic}`);
-        }
-        if (generation > 0) {
-            throw new Error(`Generation greater than 0 is not supported: ${contentTopic}`);
-        }
-    }
-    // Validate remaining fields
-    const fields = parts.splice(-4);
-    // Validate application field
-    if (fields[0].length == 0) {
-        throw new Error(`Application field cannot be empty: ${contentTopic}`);
-    }
-    // Validate version field
-    if (fields[1].length == 0) {
-        throw new Error(`Version field cannot be empty: ${contentTopic}`);
-    }
-    // Validate topic name field
-    if (fields[2].length == 0) {
-        throw new Error(`Topic name field cannot be empty: ${contentTopic}`);
-    }
-    // Validate encoding field
-    if (fields[3].length == 0) {
-        throw new Error(`Encoding field cannot be empty: ${contentTopic}`);
-    }
-    return {
-        generation,
-        application: fields[0],
-        version: fields[1],
-        topicName: fields[2],
-        encoding: fields[3]
-    };
-}
-/**
- * Given a string, determines which autoshard index to use for its pubsub topic.
- * Based on the algorithm described in the RFC: https://rfc.vac.dev/spec/51//#algorithm
- */
-function contentTopicToShardIndex(contentTopic, numShardsInCluster) {
-    const { application, version } = ensureValidContentTopic(contentTopic);
-    const digest = sha256(concat$1([utf8ToBytes(application), utf8ToBytes(version)]));
-    const dataview = new DataView(digest.buffer.slice(-8));
-    return Number(dataview.getBigUint64(0, false) % BigInt(numShardsInCluster));
-}
-
 const decodeRelayShard = (bytes) => {
     // explicitly converting to Uint8Array to avoid Buffer
     // https://github.com/libp2p/js-libp2p/issues/2146
@@ -1535,11 +825,105 @@ const encodeRelayShard = (shardInfo) => {
     return new Uint8Array(buffer);
 };
 
+/**
+ * All PeerId implementations must use this symbol as the name of a property
+ * with a boolean `true` value
+ */
+const peerIdSymbol = Symbol.for('@libp2p/peer-id');
+/**
+ * Returns true if the passed argument is a PeerId implementation
+ */
+function isPeerId(other) {
+    return Boolean(other?.[peerIdSymbol]);
+}
+
+/**
+ * When this error is thrown it means an operation was aborted,
+ * usually in response to the `abort` event being emitted by an
+ * AbortSignal.
+ */
+/**
+ * Thrown when invalid parameters are passed to a function or method call
+ */
+let InvalidParametersError$1 = class InvalidParametersError extends Error {
+    static name = 'InvalidParametersError';
+    constructor(message = 'Invalid parameters') {
+        super(message);
+        this.name = 'InvalidParametersError';
+    }
+};
+/**
+ * Thrown when a public key is invalid
+ */
+class InvalidPublicKeyError extends Error {
+    static name = 'InvalidPublicKeyError';
+    constructor(message = 'Invalid public key') {
+        super(message);
+        this.name = 'InvalidPublicKeyError';
+    }
+}
+/**
+ * Thrown when an invalid CID is encountered
+ */
+class InvalidCIDError extends Error {
+    static name = 'InvalidCIDError';
+    constructor(message = 'Invalid CID') {
+        super(message);
+        this.name = 'InvalidCIDError';
+    }
+}
+/**
+ * Thrown when an invalid multihash is encountered
+ */
+class InvalidMultihashError extends Error {
+    static name = 'InvalidMultihashError';
+    constructor(message = 'Invalid Multihash') {
+        super(message);
+        this.name = 'InvalidMultihashError';
+    }
+}
+/**
+ * Thrown when an attempt to operate on an unsupported key was made
+ */
+class UnsupportedKeyTypeError extends Error {
+    static name = 'UnsupportedKeyTypeError';
+    constructor(message = 'Unsupported key type') {
+        super(message);
+        this.name = 'UnsupportedKeyTypeError';
+    }
+}
+
 var index$3 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     version_0: version_0
 });
 
+var LightPushStatusCode;
+(function (LightPushStatusCode) {
+    LightPushStatusCode[LightPushStatusCode["SUCCESS"] = 200] = "SUCCESS";
+    LightPushStatusCode[LightPushStatusCode["BAD_REQUEST"] = 400] = "BAD_REQUEST";
+    LightPushStatusCode[LightPushStatusCode["PAYLOAD_TOO_LARGE"] = 413] = "PAYLOAD_TOO_LARGE";
+    LightPushStatusCode[LightPushStatusCode["INVALID_MESSAGE"] = 420] = "INVALID_MESSAGE";
+    LightPushStatusCode[LightPushStatusCode["UNSUPPORTED_TOPIC"] = 421] = "UNSUPPORTED_TOPIC";
+    LightPushStatusCode[LightPushStatusCode["TOO_MANY_REQUESTS"] = 429] = "TOO_MANY_REQUESTS";
+    LightPushStatusCode[LightPushStatusCode["INTERNAL_ERROR"] = 500] = "INTERNAL_ERROR";
+    LightPushStatusCode[LightPushStatusCode["UNAVAILABLE"] = 503] = "UNAVAILABLE";
+    LightPushStatusCode[LightPushStatusCode["NO_RLN_PROOF"] = 504] = "NO_RLN_PROOF";
+    LightPushStatusCode[LightPushStatusCode["NO_PEERS"] = 505] = "NO_PEERS";
+})(LightPushStatusCode || (LightPushStatusCode = {}));
+({
+    [LightPushStatusCode.SUCCESS]: "Message sent successfully",
+    [LightPushStatusCode.BAD_REQUEST]: "Bad request format",
+    [LightPushStatusCode.PAYLOAD_TOO_LARGE]: "Message payload exceeds maximum size",
+    [LightPushStatusCode.INVALID_MESSAGE]: "Message validation failed",
+    [LightPushStatusCode.UNSUPPORTED_TOPIC]: "Unsupported pubsub topic",
+    [LightPushStatusCode.TOO_MANY_REQUESTS]: "Rate limit exceeded",
+    [LightPushStatusCode.INTERNAL_ERROR]: "Internal server error",
+    [LightPushStatusCode.UNAVAILABLE]: "Service temporarily unavailable",
+    [LightPushStatusCode.NO_RLN_PROOF]: "RLN proof generation failed",
+    [LightPushStatusCode.NO_PEERS]: "No relay peers available"
+});
+
 var Protocols;
 (function (Protocols) {
     Protocols["Relay"] = "relay";
@@ -1547,90 +931,80 @@ var Protocols;
     Protocols["LightPush"] = "lightpush";
     Protocols["Filter"] = "filter";
 })(Protocols || (Protocols = {}));
+var LightPushError;
+(function (LightPushError) {
+    LightPushError["GENERIC_FAIL"] = "Generic error";
+    LightPushError["DECODE_FAILED"] = "Failed to decode";
+    LightPushError["NO_PEER_AVAILABLE"] = "No peer available";
+    LightPushError["NO_STREAM_AVAILABLE"] = "No stream available";
+    LightPushError["NO_RESPONSE"] = "No response received";
+    LightPushError["STREAM_ABORTED"] = "Stream aborted";
+    LightPushError["ENCODE_FAILED"] = "Failed to encode";
+    LightPushError["EMPTY_PAYLOAD"] = "Payload is empty";
+    LightPushError["SIZE_TOO_BIG"] = "Size is too big";
+    LightPushError["TOPIC_NOT_CONFIGURED"] = "Topic not configured";
+    LightPushError["RLN_PROOF_GENERATION"] = "Proof generation failed";
+    LightPushError["REMOTE_PEER_REJECTED"] = "Remote peer rejected";
+    LightPushError["BAD_REQUEST"] = "Bad request format";
+    LightPushError["PAYLOAD_TOO_LARGE"] = "Message payload exceeds maximum size";
+    LightPushError["INVALID_MESSAGE"] = "Message validation failed";
+    LightPushError["UNSUPPORTED_TOPIC"] = "Unsupported pubsub topic";
+    LightPushError["TOO_MANY_REQUESTS"] = "Rate limit exceeded";
+    LightPushError["INTERNAL_ERROR"] = "Internal server error";
+    LightPushError["UNAVAILABLE"] = "Service temporarily unavailable";
+    LightPushError["NO_RLN_PROOF"] = "RLN proof generation failed";
+    LightPushError["NO_PEERS"] = "No relay peers available";
+})(LightPushError || (LightPushError = {}));
+var FilterError;
+(function (FilterError) {
+    // General errors
+    FilterError["GENERIC_FAIL"] = "Generic error";
+    FilterError["DECODE_FAILED"] = "Failed to decode";
+    FilterError["NO_PEER_AVAILABLE"] = "No peer available";
+    FilterError["NO_STREAM_AVAILABLE"] = "No stream available";
+    FilterError["NO_RESPONSE"] = "No response received";
+    FilterError["STREAM_ABORTED"] = "Stream aborted";
+    // Filter specific errors
+    FilterError["REMOTE_PEER_REJECTED"] = "Remote peer rejected";
+    FilterError["TOPIC_NOT_CONFIGURED"] = "Topic not configured";
+    FilterError["SUBSCRIPTION_FAILED"] = "Subscription failed";
+    FilterError["UNSUBSCRIBE_FAILED"] = "Unsubscribe failed";
+    FilterError["PING_FAILED"] = "Ping failed";
+    FilterError["TOPIC_DECODER_MISMATCH"] = "Topic decoder mismatch";
+    FilterError["INVALID_DECODER_TOPICS"] = "Invalid decoder topics";
+    FilterError["SUBSCRIPTION_LIMIT_EXCEEDED"] = "Subscription limit exceeded";
+    FilterError["INVALID_CONTENT_TOPIC"] = "Invalid content topic";
+    FilterError["PUSH_MESSAGE_FAILED"] = "Push message failed";
+    FilterError["EMPTY_MESSAGE"] = "Empty message received";
+    FilterError["MISSING_PUBSUB_TOPIC"] = "Pubsub topic missing from push message";
+})(FilterError || (FilterError = {}));
+/**
+ * @deprecated replace usage by specific result types
+ */
 var ProtocolError;
 (function (ProtocolError) {
-    //
-    // GENERAL ERRORS SECTION
-    //
-    /**
-     * Could not determine the origin of the fault. Best to check connectivity and try again
-     * */
     ProtocolError["GENERIC_FAIL"] = "Generic error";
-    /**
-     * The remote peer rejected the message. Information provided by the remote peer
-     * is logged. Review message validity, or mitigation for `NO_PEER_AVAILABLE`
-     * or `DECODE_FAILED` can be used.
-     */
     ProtocolError["REMOTE_PEER_REJECTED"] = "Remote peer rejected";
-    /**
-     * Failure to protobuf decode the message. May be due to a remote peer issue,
-     * ensuring that messages are sent via several peer enable mitigation of this error.
-     */
     ProtocolError["DECODE_FAILED"] = "Failed to decode";
-    /**
-     * Failure to find a peer with suitable protocols. This may due to a connection issue.
-     * Mitigation can be: retrying after a given time period, display connectivity issue
-     * to user or listening for `peer:connected:bootstrap` or `peer:connected:peer-exchange`
-     * on the connection manager before retrying.
-     */
     ProtocolError["NO_PEER_AVAILABLE"] = "No peer available";
-    /**
-     * Failure to find a stream to the peer. This may be because the connection with the peer is not still alive.
-     * Mitigation can be: retrying after a given time period, or mitigation for `NO_PEER_AVAILABLE` can be used.
-     */
     ProtocolError["NO_STREAM_AVAILABLE"] = "No stream available";
-    /**
-     * The remote peer did not behave as expected. Mitigation for `NO_PEER_AVAILABLE`
-     * or `DECODE_FAILED` can be used.
-     */
     ProtocolError["NO_RESPONSE"] = "No response received";
-    //
-    // SEND ERRORS SECTION
-    //
-    /**
-     * Failure to protobuf encode the message. This is not recoverable and needs
-     * further investigation.
-     */
     ProtocolError["ENCODE_FAILED"] = "Failed to encode";
-    /**
-     * The message payload is empty, making the message invalid. Ensure that a non-empty
-     * payload is set on the outgoing message.
-     */
     ProtocolError["EMPTY_PAYLOAD"] = "Payload is empty";
-    /**
-     * The message size is above the maximum message size allowed on the Waku Network.
-     * Compressing the message or using an alternative strategy for large messages is recommended.
-     */
     ProtocolError["SIZE_TOO_BIG"] = "Size is too big";
-    /**
-     * The PubsubTopic passed to the send function is not configured on the Waku node.
-     * Please ensure that the PubsubTopic is used when initializing the Waku node.
-     */
     ProtocolError["TOPIC_NOT_CONFIGURED"] = "Topic not configured";
-    /**
-     * Fails when
-     */
     ProtocolError["STREAM_ABORTED"] = "Stream aborted";
-    /**
-     * General proof generation error message.
-     * nwaku: https://github.com/waku-org/nwaku/blob/c3cb06ac6c03f0f382d3941ea53b330f6a8dd127/waku/waku_rln_relay/group_manager/group_manager_base.nim#L201C19-L201C42
-     */
     ProtocolError["RLN_PROOF_GENERATION"] = "Proof generation failed";
-    //
-    // RECEIVE ERRORS SECTION
-    //
-    /**
-     * The pubsub topic configured on the decoder does not match the pubsub topic setup on the protocol.
-     * Ensure that the pubsub topic used for decoder creation is the same as the one used for protocol.
-     */
     ProtocolError["TOPIC_DECODER_MISMATCH"] = "Topic decoder mismatch";
-    /**
-     * The topics passed in the decoders do not match each other, or don't exist at all.
-     * Ensure that all the pubsub topics used in the decoders are valid and match each other.
-     */
     ProtocolError["INVALID_DECODER_TOPICS"] = "Invalid decoder topics";
 })(ProtocolError || (ProtocolError = {}));
 
+var WakuEvent;
+(function (WakuEvent) {
+    WakuEvent["Connection"] = "waku:connection";
+    WakuEvent["Health"] = "waku:health";
+})(WakuEvent || (WakuEvent = {}));
+
 // Peer tags
 var Tags;
 (function (Tags) {
@@ -3505,25 +2879,38 @@ class FilterSubscribeResponse {
     }
 }
 
-const log$9 = new Logger("filter-core");
+const log$a = new Logger("filter-core");
 const FilterCodecs = {
     SUBSCRIBE: "/vac/waku/filter-subscribe/2.0.0-beta1",
     PUSH: "/vac/waku/filter-push/2.0.0-beta1"
 };
 class FilterCore {
     handleIncomingMessage;
+    libp2p;
     streamManager;
     multicodec = FilterCodecs.SUBSCRIBE;
     constructor(handleIncomingMessage, libp2p) {
         this.handleIncomingMessage = handleIncomingMessage;
+        this.libp2p = libp2p;
         this.streamManager = new StreamManager(FilterCodecs.SUBSCRIBE, libp2p.components);
-        libp2p
-            .handle(FilterCodecs.PUSH, this.onRequest.bind(this), {
-            maxInboundStreams: 100
-        })
-            .catch((e) => {
-            log$9.error("Failed to register ", FilterCodecs.PUSH, e);
-        });
+    }
+    async start() {
+        try {
+            await this.libp2p.handle(FilterCodecs.PUSH, this.onRequest.bind(this), {
+                maxInboundStreams: 100
+            });
+        }
+        catch (e) {
+            log$a.error("Failed to register ", FilterCodecs.PUSH, e);
+        }
+    }
+    async stop() {
+        try {
+            await this.libp2p.unhandle(FilterCodecs.PUSH);
+        }
+        catch (e) {
+            log$a.error("Failed to unregister ", FilterCodecs.PUSH, e);
+        }
     }
     async subscribe(pubsubTopic, peerId, contentTopics) {
         const stream = await this.streamManager.getStream(peerId);
@@ -3531,7 +2918,7 @@ class FilterCore {
             return {
                 success: null,
                 failure: {
-                    error: ProtocolError.NO_STREAM_AVAILABLE,
+                    error: FilterError.NO_STREAM_AVAILABLE,
                     peerId: peerId
                 }
             };
@@ -3545,21 +2932,21 @@ class FilterCore {
             }
         }
         catch (error) {
-            log$9.error("Failed to send subscribe request", error);
+            log$a.error("Failed to send subscribe request", error);
             return {
                 success: null,
                 failure: {
-                    error: ProtocolError.GENERIC_FAIL,
+                    error: FilterError.GENERIC_FAIL,
                     peerId: peerId
                 }
             };
         }
         const { statusCode, requestId, statusDesc } = FilterSubscribeResponse.decode(res[0].slice());
         if (statusCode < 200 || statusCode >= 300) {
-            log$9.error(`Filter subscribe request ${requestId} failed with status code ${statusCode}: ${statusDesc}`);
+            log$a.error(`Filter subscribe request ${requestId} failed with status code ${statusCode}: ${statusDesc}`);
             return {
                 failure: {
-                    error: ProtocolError.REMOTE_PEER_REJECTED,
+                    error: FilterError.REMOTE_PEER_REJECTED,
                     peerId: peerId
                 },
                 success: null
@@ -3573,11 +2960,11 @@ class FilterCore {
     async unsubscribe(pubsubTopic, peerId, contentTopics) {
         const stream = await this.streamManager.getStream(peerId);
         if (!stream) {
-            log$9.error(`Failed to get a stream for remote peer:${peerId.toString()}`);
+            log$a.error(`Failed to get a stream for remote peer:${peerId.toString()}`);
             return {
                 success: null,
                 failure: {
-                    error: ProtocolError.NO_STREAM_AVAILABLE,
+                    error: FilterError.NO_STREAM_AVAILABLE,
                     peerId: peerId
                 }
             };
@@ -3587,11 +2974,11 @@ class FilterCore {
             await pipe([unsubscribeRequest.encode()], encode, stream.sink);
         }
         catch (error) {
-            log$9.error("Failed to send unsubscribe request", error);
+            log$a.error("Failed to send unsubscribe request", error);
             return {
                 success: null,
                 failure: {
-                    error: ProtocolError.GENERIC_FAIL,
+                    error: FilterError.GENERIC_FAIL,
                     peerId: peerId
                 }
             };
@@ -3604,11 +2991,11 @@ class FilterCore {
     async unsubscribeAll(pubsubTopic, peerId) {
         const stream = await this.streamManager.getStream(peerId);
         if (!stream) {
-            log$9.error(`Failed to get a stream for remote peer:${peerId.toString()}`);
+            log$a.error(`Failed to get a stream for remote peer:${peerId.toString()}`);
             return {
                 success: null,
                 failure: {
-                    error: ProtocolError.NO_STREAM_AVAILABLE,
+                    error: FilterError.NO_STREAM_AVAILABLE,
                     peerId: peerId
                 }
             };
@@ -3618,7 +3005,7 @@ class FilterCore {
         if (!res || !res.length) {
             return {
                 failure: {
-                    error: ProtocolError.NO_RESPONSE,
+                    error: FilterError.NO_RESPONSE,
                     peerId: peerId
                 },
                 success: null
@@ -3626,10 +3013,10 @@ class FilterCore {
         }
         const { statusCode, requestId, statusDesc } = FilterSubscribeResponse.decode(res[0].slice());
         if (statusCode < 200 || statusCode >= 300) {
-            log$9.error(`Filter unsubscribe all request ${requestId} failed with status code ${statusCode}: ${statusDesc}`);
+            log$a.error(`Filter unsubscribe all request ${requestId} failed with status code ${statusCode}: ${statusDesc}`);
             return {
                 failure: {
-                    error: ProtocolError.REMOTE_PEER_REJECTED,
+                    error: FilterError.REMOTE_PEER_REJECTED,
                     peerId: peerId
                 },
                 success: null
@@ -3643,11 +3030,11 @@ class FilterCore {
     async ping(peerId) {
         const stream = await this.streamManager.getStream(peerId);
         if (!stream) {
-            log$9.error(`Failed to get a stream for remote peer:${peerId.toString()}`);
+            log$a.error(`Failed to get a stream for remote peer:${peerId.toString()}`);
             return {
                 success: null,
                 failure: {
-                    error: ProtocolError.NO_STREAM_AVAILABLE,
+                    error: FilterError.NO_STREAM_AVAILABLE,
                     peerId: peerId
                 }
             };
@@ -3658,11 +3045,11 @@ class FilterCore {
             res = await pipe([request.encode()], encode, stream, decode, async (source) => await all(source));
         }
         catch (error) {
-            log$9.error("Failed to send ping request", error);
+            log$a.error("Failed to send ping request", error);
             return {
                 success: null,
                 failure: {
-                    error: ProtocolError.GENERIC_FAIL,
+                    error: FilterError.GENERIC_FAIL,
                     peerId: peerId
                 }
             };
@@ -3671,18 +3058,18 @@ class FilterCore {
             return {
                 success: null,
                 failure: {
-                    error: ProtocolError.NO_RESPONSE,
+                    error: FilterError.NO_RESPONSE,
                     peerId: peerId
                 }
             };
         }
         const { statusCode, requestId, statusDesc } = FilterSubscribeResponse.decode(res[0].slice());
         if (statusCode < 200 || statusCode >= 300) {
-            log$9.error(`Filter ping request ${requestId} failed with status code ${statusCode}: ${statusDesc}`);
+            log$a.error(`Filter ping request ${requestId} failed with status code ${statusCode}: ${statusDesc}`);
             return {
                 success: null,
                 failure: {
-                    error: ProtocolError.REMOTE_PEER_REJECTED,
+                    error: FilterError.REMOTE_PEER_REJECTED,
                     peerId: peerId
                 }
             };
@@ -3695,30 +3082,30 @@ class FilterCore {
     onRequest(streamData) {
         const { connection, stream } = streamData;
         const { remotePeer } = connection;
-        log$9.info(`Received message from ${remotePeer.toString()}`);
+        log$a.info(`Received message from ${remotePeer.toString()}`);
         try {
             pipe(stream, decode, async (source) => {
                 for await (const bytes of source) {
                     const response = FilterPushRpc.decode(bytes.slice());
                     const { pubsubTopic, wakuMessage } = response;
                     if (!wakuMessage) {
-                        log$9.error("Received empty message");
+                        log$a.error("Received empty message");
                         return;
                     }
                     if (!pubsubTopic) {
-                        log$9.error("Pubsub topic missing from push message");
+                        log$a.error("Pubsub topic missing from push message");
                         return;
                     }
                     await this.handleIncomingMessage(pubsubTopic, wakuMessage, connection.remotePeer.toString());
                 }
             }).then(() => {
-                log$9.info("Receiving pipe closed.");
+                log$a.info("Receiving pipe closed.");
             }, async (e) => {
-                log$9.error(`Error with receiving pipe on peer:${connection.remotePeer.toString()} -- stream:${stream.id} -- protocol:${stream.protocol}: `, e);
+                log$a.error(`Error with receiving pipe on peer:${connection.remotePeer.toString()} -- stream:${stream.id} -- protocol:${stream.protocol}: `, e);
             });
         }
         catch (e) {
-            log$9.error("Error decoding message", e);
+            log$a.error("Error decoding message", e);
         }
     }
 }
@@ -3729,13 +3116,20 @@ var index$2 = /*#__PURE__*/Object.freeze({
     FilterCore: FilterCore
 });
 
-class PushRpc {
+const CODECS = {
+    v2: "/vac/waku/lightpush/2.0.0-beta1",
+    v3: "/vac/waku/lightpush/3.0.0"
+};
+const LightPushCodecV2 = CODECS.v2;
+const LightPushCodec = CODECS.v3;
+
+class PushRpcV2 {
     proto;
     constructor(proto) {
         this.proto = proto;
     }
     static createRequest(message, pubsubTopic) {
-        return new PushRpc({
+        return new PushRpcV2({
             requestId: v4(),
             request: {
                 message: message,
@@ -3744,18 +3138,152 @@ class PushRpc {
             response: undefined
         });
     }
-    static decode(bytes) {
-        const res = PushRpc$1.decode(bytes);
+    static decode(bytes) {
+        const res = PushRpc$1.decode(bytes);
+        return new PushRpcV2(res);
+    }
+    encode() {
+        return PushRpc$1.encode(this.proto);
+    }
+    get query() {
+        return this.proto.request;
+    }
+    get response() {
+        return this.proto.response;
+    }
+}
+
+/**
+ * LightPush v3 protocol RPC handler.
+ * Implements the v3 message format with correct field numbers:
+ * - requestId: 1
+ * - pubsubTopic: 20
+ * - message: 21
+ */
+class PushRpc {
+    proto;
+    constructor(proto) {
+        this.proto = proto;
+    }
+    /**
+     * Create a v3 request message with proper field numbering
+     */
+    static createRequest(message, pubsubTopic) {
+        return new PushRpc({
+            requestId: v4(),
+            pubsubTopic: pubsubTopic,
+            message: message
+        });
+    }
+    /**
+     * Create a v3 response message with status code handling
+     */
+    static createResponse(requestId, statusCode, statusDesc, relayPeerCount) {
+        return new PushRpc({
+            requestId,
+            statusCode,
+            statusDesc,
+            relayPeerCount
+        });
+    }
+    /**
+     * Decode v3 request message
+     */
+    static decodeRequest(bytes) {
+        const res = LightPushRequestV3.decode(bytes);
+        return new PushRpc(res);
+    }
+    /**
+     * Decode v3 response message
+     */
+    static decodeResponse(bytes) {
+        const res = LightPushResponseV3.decode(bytes);
         return new PushRpc(res);
     }
+    /**
+     * Encode message to bytes
+     */
     encode() {
-        return PushRpc$1.encode(this.proto);
+        if (this.isRequest()) {
+            return LightPushRequestV3.encode(this.proto);
+        }
+        else {
+            return LightPushResponseV3.encode(this.proto);
+        }
     }
-    get query() {
-        return this.proto.request;
+    /**
+     * Get request data (if this is a request message)
+     */
+    get request() {
+        return this.isRequest()
+            ? this.proto
+            : undefined;
     }
+    /**
+     * Get response data (if this is a response message)
+     */
     get response() {
-        return this.proto.response;
+        return this.isResponse()
+            ? this.proto
+            : undefined;
+    }
+    /**
+     * Get the request ID
+     */
+    get requestId() {
+        return this.proto.requestId;
+    }
+    /**
+     * Get the pubsub topic (only available in requests)
+     */
+    get pubsubTopic() {
+        return this.isRequest()
+            ? this.proto.pubsubTopic
+            : undefined;
+    }
+    /**
+     * Get the message (only available in requests)
+     */
+    get message() {
+        return this.isRequest()
+            ? this.proto.message
+            : undefined;
+    }
+    /**
+     * Get the status code (only available in responses)
+     */
+    get statusCode() {
+        return this.isResponse()
+            ? this.proto.statusCode
+            : undefined;
+    }
+    /**
+     * Get the status description (only available in responses)
+     */
+    get statusDesc() {
+        return this.isResponse()
+            ? this.proto.statusDesc
+            : undefined;
+    }
+    /**
+     * Get the relay peer count (only available in responses)
+     */
+    get relayPeerCount() {
+        return this.isResponse()
+            ? this.proto.relayPeerCount
+            : undefined;
+    }
+    /**
+     * Check if this is a request message
+     */
+    isRequest() {
+        return "pubsubTopic" in this.proto && "message" in this.proto;
+    }
+    /**
+     * Check if this is a response message
+     */
+    isResponse() {
+        return "statusCode" in this.proto;
     }
 }
 
@@ -3777,140 +3305,251 @@ const isRLNResponseError = (info) => {
         info.includes(RLN_REMOTE_VALIDATION));
 };
 
-const log$8 = new Logger("light-push");
-const LightPushCodec = "/vac/waku/lightpush/2.0.0-beta1";
-/**
- * Implements the [Waku v2 Light Push protocol](https://rfc.vac.dev/spec/19/).
- */
-class LightPushCore {
-    streamManager;
-    multicodec = LightPushCodec;
-    constructor(libp2p) {
-        this.streamManager = new StreamManager(LightPushCodec, libp2p.components);
-    }
-    async preparePushMessage(encoder, message) {
+const log$9 = new Logger("light-push:protocol-handler");
+class ProtocolHandler {
+    static async preparePushMessage(encoder, message, protocol) {
         try {
             if (!message.payload || message.payload.length === 0) {
-                log$8.error("Failed to send waku light push: payload is empty");
-                return { query: null, error: ProtocolError.EMPTY_PAYLOAD };
+                log$9.error("Failed to send waku light push: payload is empty");
+                return { rpc: null, error: LightPushError.EMPTY_PAYLOAD };
             }
             if (!(await isMessageSizeUnderCap(encoder, message))) {
-                log$8.error("Failed to send waku light push: message is bigger than 1MB");
-                return { query: null, error: ProtocolError.SIZE_TOO_BIG };
+                log$9.error("Failed to send waku light push: message is bigger than 1MB");
+                return { rpc: null, error: LightPushError.SIZE_TOO_BIG };
             }
             const protoMessage = await encoder.toProtoObj(message);
             if (!protoMessage) {
-                log$8.error("Failed to encode to protoMessage, aborting push");
+                log$9.error("Failed to encode to protoMessage, aborting push");
+                return { rpc: null, error: LightPushError.ENCODE_FAILED };
+            }
+            if (protocol === CODECS.v3) {
+                log$9.info("Creating v3 RPC message");
+                return {
+                    rpc: ProtocolHandler.createV3Rpc(protoMessage, encoder.pubsubTopic),
+                    error: null
+                };
+            }
+            log$9.info("Creating v2 RPC message");
+            return {
+                rpc: ProtocolHandler.createV2Rpc(protoMessage, encoder.pubsubTopic),
+                error: null
+            };
+        }
+        catch (err) {
+            log$9.error("Failed to prepare push message", err);
+            return { rpc: null, error: LightPushError.GENERIC_FAIL };
+        }
+    }
+    /**
+     * Decode and evaluate a LightPush response according to the protocol version
+     */
+    static handleResponse(bytes, protocol, peerId) {
+        if (protocol === CODECS.v3) {
+            return ProtocolHandler.handleV3Response(bytes, peerId);
+        }
+        return ProtocolHandler.handleV2Response(bytes, peerId);
+    }
+    static handleV3Response(bytes, peerId) {
+        try {
+            const decodedRpcV3 = PushRpc.decodeResponse(bytes);
+            const statusCode = decodedRpcV3.statusCode;
+            const statusDesc = decodedRpcV3.statusDesc;
+            if (statusCode !== LightPushStatusCode.SUCCESS) {
+                const error = LightPushError.REMOTE_PEER_REJECTED;
+                log$9.error(`Remote peer rejected with v3 status code ${statusCode}: ${statusDesc}`);
                 return {
-                    query: null,
-                    error: ProtocolError.ENCODE_FAILED
+                    success: null,
+                    failure: {
+                        error,
+                        peerId: peerId
+                    }
                 };
             }
-            const query = PushRpc.createRequest(protoMessage, encoder.pubsubTopic);
-            return { query, error: null };
+            if (decodedRpcV3.relayPeerCount !== undefined) {
+                log$9.info(`Message relayed to ${decodedRpcV3.relayPeerCount} peers`);
+            }
+            return { success: peerId, failure: null };
         }
-        catch (error) {
-            log$8.error("Failed to prepare push message", error);
+        catch (err) {
             return {
-                query: null,
-                error: ProtocolError.GENERIC_FAIL
+                success: null,
+                failure: {
+                    error: LightPushError.DECODE_FAILED,
+                    peerId: peerId
+                }
             };
         }
     }
-    async send(encoder, message, peerId) {
-        const { query, error: preparationError } = await this.preparePushMessage(encoder, message);
-        if (preparationError || !query) {
+    static handleV2Response(bytes, peerId) {
+        let response;
+        try {
+            const decodedRpc = PushRpcV2.decode(bytes);
+            response = decodedRpc.response;
+        }
+        catch (err) {
             return {
                 success: null,
                 failure: {
-                    error: preparationError,
-                    peerId
+                    error: LightPushError.DECODE_FAILED,
+                    peerId: peerId
                 }
             };
         }
-        const stream = await this.streamManager.getStream(peerId);
-        if (!stream) {
-            log$8.error(`Failed to get a stream for remote peer:${peerId.toString()}`);
+        if (!response) {
             return {
                 success: null,
                 failure: {
-                    error: ProtocolError.NO_STREAM_AVAILABLE,
+                    error: LightPushError.NO_RESPONSE,
                     peerId: peerId
                 }
             };
         }
-        let res;
-        try {
-            res = await pipe([query.encode()], encode, stream, decode, async (source) => await all(source));
+        if (isRLNResponseError(response.info)) {
+            log$9.error("Remote peer fault: RLN generation");
+            return {
+                success: null,
+                failure: {
+                    error: LightPushError.RLN_PROOF_GENERATION,
+                    peerId: peerId
+                }
+            };
         }
-        catch (err) {
-            // can fail only because of `stream` abortion
-            log$8.error("Failed to send waku light push request", err);
+        if (!response.isSuccess) {
+            log$9.error("Remote peer rejected the message: ", response.info);
             return {
                 success: null,
                 failure: {
-                    error: ProtocolError.STREAM_ABORTED,
+                    error: LightPushError.REMOTE_PEER_REJECTED,
                     peerId: peerId
                 }
             };
         }
-        const bytes = new Uint8ArrayList();
-        res.forEach((chunk) => {
-            bytes.append(chunk);
-        });
-        let response;
-        try {
-            response = PushRpc.decode(bytes).response;
+        return { success: peerId, failure: null };
+    }
+    static createV2Rpc(message, pubsubTopic) {
+        const v2Rpc = PushRpcV2.createRequest(message, pubsubTopic);
+        return Object.assign(v2Rpc, { version: "v2" });
+    }
+    static createV3Rpc(message, pubsubTopic) {
+        if (!message.timestamp) {
+            message.timestamp = BigInt(Date.now()) * BigInt(1_000_000);
         }
-        catch (err) {
-            log$8.error("Failed to decode push reply", err);
+        const v3Rpc = PushRpc.createRequest(message, pubsubTopic);
+        return Object.assign(v3Rpc, { version: "v3" });
+    }
+}
+
+const log$8 = new Logger("light-push");
+/**
+ * Implements the [Waku v2 Light Push protocol](https://rfc.vac.dev/spec/19/).
+ */
+class LightPushCore {
+    libp2p;
+    streamManager;
+    streamManagerV2;
+    multicodec = [CODECS.v3, CODECS.v2];
+    constructor(libp2p) {
+        this.libp2p = libp2p;
+        this.streamManagerV2 = new StreamManager(CODECS.v2, libp2p.components);
+        this.streamManager = new StreamManager(CODECS.v3, libp2p.components);
+    }
+    async send(encoder, message, peerId, useLegacy = false) {
+        const protocol = await this.getProtocol(peerId, useLegacy);
+        log$8.info(`Sending light push request to peer:${peerId.toString()}, protocol:${protocol}`);
+        if (!protocol) {
             return {
                 success: null,
                 failure: {
-                    error: ProtocolError.DECODE_FAILED,
-                    peerId: peerId
+                    error: LightPushError.GENERIC_FAIL,
+                    peerId
                 }
             };
         }
-        if (!response) {
-            log$8.error("Remote peer fault: No response in PushRPC");
+        const { rpc, error: prepError } = await ProtocolHandler.preparePushMessage(encoder, message, protocol);
+        if (prepError) {
+            return {
+                success: null,
+                failure: {
+                    error: prepError,
+                    peerId
+                }
+            };
+        }
+        const stream = await this.getStream(peerId, protocol);
+        if (!stream) {
+            log$8.error(`Failed to get a stream for remote peer:${peerId.toString()}`);
             return {
                 success: null,
                 failure: {
-                    error: ProtocolError.NO_RESPONSE,
+                    error: LightPushError.NO_STREAM_AVAILABLE,
                     peerId: peerId
                 }
             };
         }
-        if (isRLNResponseError(response.info)) {
-            log$8.error("Remote peer fault: RLN generation");
+        let res;
+        try {
+            res = await pipe([rpc.encode()], encode, stream, decode, async (source) => await all(source));
+        }
+        catch (err) {
+            log$8.error("Failed to send waku light push request", err);
             return {
                 success: null,
                 failure: {
-                    error: ProtocolError.RLN_PROOF_GENERATION,
+                    error: LightPushError.STREAM_ABORTED,
                     peerId: peerId
                 }
             };
         }
-        if (!response.isSuccess) {
-            log$8.error("Remote peer rejected the message: ", response.info);
+        const bytes = new Uint8ArrayList();
+        res.forEach((chunk) => bytes.append(chunk));
+        if (bytes.length === 0) {
             return {
                 success: null,
                 failure: {
-                    error: ProtocolError.REMOTE_PEER_REJECTED,
+                    error: LightPushError.NO_RESPONSE,
                     peerId: peerId
                 }
             };
         }
-        return { success: peerId, failure: null };
+        return ProtocolHandler.handleResponse(bytes, protocol, peerId);
+    }
+    async getProtocol(peerId, useLegacy) {
+        try {
+            const peer = await this.libp2p.peerStore.get(peerId);
+            if (useLegacy ||
+                (!peer.protocols.includes(CODECS.v3) &&
+                    peer.protocols.includes(CODECS.v2))) {
+                return CODECS.v2;
+            }
+            else if (peer.protocols.includes(CODECS.v3)) {
+                return CODECS.v3;
+            }
+            else {
+                throw new Error("No supported protocol found");
+            }
+        }
+        catch (error) {
+            log$8.error("Failed to get protocol", error);
+            return undefined;
+        }
+    }
+    async getStream(peerId, protocol) {
+        switch (protocol) {
+            case CODECS.v2:
+                return this.streamManagerV2.getStream(peerId);
+            case CODECS.v3:
+                return this.streamManager.getStream(peerId);
+            default:
+                return undefined;
+        }
     }
 }
 
 var index$1 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     LightPushCodec: LightPushCodec,
-    LightPushCore: LightPushCore,
-    get PushResponse () { return PushResponse; }
+    LightPushCodecV2: LightPushCodecV2,
+    LightPushCore: LightPushCore
 });
 
 const EmptyMessage = {
@@ -4132,7 +3771,7 @@ class ConnectionLimiter {
             this.connectionMonitorInterval === null) {
             this.connectionMonitorInterval = setInterval(() => void this.maintainConnections(), DEFAULT_CONNECTION_MONITOR_INTERVAL);
         }
-        this.events.addEventListener("waku:connection", this.onWakuConnectionEvent);
+        this.events.addEventListener(WakuEvent.Connection, this.onWakuConnectionEvent);
         /**
          * NOTE: Event is not being emitted on closing nor losing a connection.
          * @see https://github.com/libp2p/js-libp2p/issues/939
@@ -4147,7 +3786,7 @@ class ConnectionLimiter {
         this.libp2p.addEventListener("peer:disconnect", this.onDisconnectedEvent);
     }
     stop() {
-        this.events.removeEventListener("waku:connection", this.onWakuConnectionEvent);
+        this.events.removeEventListener(WakuEvent.Connection, this.onWakuConnectionEvent);
         this.libp2p.removeEventListener("peer:disconnect", this.onDisconnectedEvent);
         if (this.connectionMonitorInterval) {
             clearInterval(this.connectionMonitorInterval);
@@ -4263,8 +3902,7 @@ class ConnectionLimiter {
             .getConnections()
             .map((conn) => conn.remotePeer)
             .map((id) => this.getPeer(id)));
-        const bootstrapPeers = peers.filter((peer) => peer && peer.tags.has(Tags.BOOTSTRAP));
-        return bootstrapPeers;
+        return peers.filter((peer) => peer && peer.tags.has(Tags.BOOTSTRAP));
     }
     async getPeer(peerId) {
         try {
@@ -4704,7 +4342,7 @@ class NetworkMonitor {
         }
     }
     dispatchNetworkEvent() {
-        this.events.dispatchEvent(new CustomEvent("waku:connection", {
+        this.events.dispatchEvent(new CustomEvent(WakuEvent.Connection, {
             detail: this.isConnected()
         }));
     }
@@ -4770,74 +4408,6 @@ class ShardReader {
     }
 }
 
-/**
- * All PeerId implementations must use this symbol as the name of a property
- * with a boolean `true` value
- */
-const peerIdSymbol = Symbol.for('@libp2p/peer-id');
-/**
- * Returns true if the passed argument is a PeerId implementation
- */
-function isPeerId(other) {
-    return Boolean(other?.[peerIdSymbol]);
-}
-
-/**
- * When this error is thrown it means an operation was aborted,
- * usually in response to the `abort` event being emitted by an
- * AbortSignal.
- */
-/**
- * Thrown when invalid parameters are passed to a function or method call
- */
-let InvalidParametersError$1 = class InvalidParametersError extends Error {
-    static name = 'InvalidParametersError';
-    constructor(message = 'Invalid parameters') {
-        super(message);
-        this.name = 'InvalidParametersError';
-    }
-};
-/**
- * Thrown when a public key is invalid
- */
-class InvalidPublicKeyError extends Error {
-    static name = 'InvalidPublicKeyError';
-    constructor(message = 'Invalid public key') {
-        super(message);
-        this.name = 'InvalidPublicKeyError';
-    }
-}
-/**
- * Thrown when an invalid CID is encountered
- */
-class InvalidCIDError extends Error {
-    static name = 'InvalidCIDError';
-    constructor(message = 'Invalid CID') {
-        super(message);
-        this.name = 'InvalidCIDError';
-    }
-}
-/**
- * Thrown when an invalid multihash is encountered
- */
-class InvalidMultihashError extends Error {
-    static name = 'InvalidMultihashError';
-    constructor(message = 'Invalid Multihash') {
-        super(message);
-        this.name = 'InvalidMultihashError';
-    }
-}
-/**
- * Thrown when an attempt to operate on an unsupported key was made
- */
-class UnsupportedKeyTypeError extends Error {
-    static name = 'UnsupportedKeyTypeError';
-    constructor(message = 'Unsupported key type') {
-        super(message);
-        this.name = 'UnsupportedKeyTypeError';
-    }
-}
-
 const TAG_MASK = parseInt('11111', 2);
 const LONG_LENGTH_MASK = parseInt('10000000', 2);
 const LONG_LENGTH_BYTES_MASK = parseInt('01111111', 2);
@@ -5175,11 +4745,11 @@ function hexToNumber(hex) {
 }
 // BE: Big Endian, LE: Little Endian
 function bytesToNumberBE(bytes) {
-    return hexToNumber(bytesToHex$1(bytes));
+    return hexToNumber(bytesToHex(bytes));
 }
 function bytesToNumberLE(bytes) {
     abytes(bytes);
-    return hexToNumber(bytesToHex$1(Uint8Array.from(bytes).reverse()));
+    return hexToNumber(bytesToHex(Uint8Array.from(bytes).reverse()));
 }
 function numberToBytesBE(n, len) {
     return hexToBytes(n.toString(16).padStart(len * 2, '0'));
@@ -6453,7 +6023,7 @@ function edwards(CURVE, curveOpts = {}) {
             return this.toBytes();
         }
         toHex() {
-            return bytesToHex$1(this.toBytes());
+            return bytesToHex(this.toBytes());
         }
         toString() {
             return `<Point ${this.is0() ? 'ZERO' : this.toHex()}>`;
@@ -7723,7 +7293,7 @@ function weierstrassN(CURVE, curveOpts = {}) {
             return this.toBytes(isCompressed);
         }
         toHex(isCompressed = true) {
-            return bytesToHex$1(this.toBytes(isCompressed));
+            return bytesToHex(this.toBytes(isCompressed));
         }
         toString() {
             return `<Point ${this.is0() ? 'ZERO' : this.toHex()}>`;
@@ -7853,14 +7423,14 @@ function ecdsa(Point, ecdsaOpts, curveOpts = {}) {
             return this.toBytes('der');
         }
         toDERHex() {
-            return bytesToHex$1(this.toBytes('der'));
+            return bytesToHex(this.toBytes('der'));
         }
         // padded bytes of r, then padded bytes of s
         toCompactRawBytes() {
             return this.toBytes('compact');
         }
         toCompactHex() {
-            return bytesToHex$1(this.toBytes('compact'));
+            return bytesToHex(this.toBytes('compact'));
         }
     }
     const normPrivateKeyToScalar = _legacyHelperNormPriv(Fn, curveOpts.allowedPrivateKeyLengths, curveOpts.wrapPrivateKey);
@@ -8308,13 +7878,13 @@ const secp256k1 = createCurve({
             return { k1neg, k1, k2neg, k2 };
         },
     },
-}, sha256$1);
+}, sha256$2);
 
 /**
  * Hash message and verify signature with public key
  */
 function hashAndVerify(key, sig, msg, options) {
-    const p = sha256$2.digest(msg instanceof Uint8Array ? msg : msg.subarray());
+    const p = sha256.digest(msg instanceof Uint8Array ? msg : msg.subarray());
     if (isPromise(p)) {
         return p
             .then(({ digest }) => {
@@ -8645,7 +8215,7 @@ function isIdentityMultihash(multihash) {
     return multihash.code === identity.code;
 }
 function isSha256Multihash(multihash) {
-    return multihash.code === sha256$2.code;
+    return multihash.code === sha256.code;
 }
 
 /**
@@ -10297,85 +9867,4 @@ function wakuMetadata(clusterId) {
     return (components) => new Metadata(clusterId, components);
 }
 
-/**
- * Deterministic Message Hashing as defined in
- * [14/WAKU2-MESSAGE](https://rfc.vac.dev/spec/14/#deterministic-message-hashing)
- *
- * Computes a SHA-256 hash of the concatenation of pubsub topic, payload, content topic, meta, and timestamp.
- *
- * @param pubsubTopic - The pubsub topic string
- * @param message - The message to be hashed
- * @returns A Uint8Array containing the SHA-256 hash
- *
- * @example
- * ```typescript
- * import { messageHash } from "@waku/core";
- *
- * const pubsubTopic = "/waku/2/default-waku/proto";
- * const message = {
- *   payload: new Uint8Array([1, 2, 3, 4]),
- *   contentTopic: "/waku/2/default-content/proto",
- *   meta: new Uint8Array([5, 6, 7, 8]),
- *   timestamp: new Date()
- * };
- *
- * const hash = messageHash(pubsubTopic, message);
- * ```
- */
-function messageHash(pubsubTopic, message) {
-    const pubsubTopicBytes = utf8ToBytes(pubsubTopic);
-    const contentTopicBytes = utf8ToBytes(message.contentTopic);
-    const timestampBytes = tryConvertTimestampToBytes(message.timestamp);
-    const bytes = concat$1([
-        pubsubTopicBytes,
-        message.payload,
-        contentTopicBytes,
-        message.meta,
-        timestampBytes
-    ].filter(isDefined));
-    return sha256(bytes);
-}
-function tryConvertTimestampToBytes(timestamp) {
-    if (!timestamp) {
-        return;
-    }
-    let bigIntTimestamp;
-    if (typeof timestamp === "bigint") {
-        bigIntTimestamp = timestamp;
-    }
-    else {
-        bigIntTimestamp = BigInt(timestamp.valueOf()) * 1000000n;
-    }
-    return numberToBytes(bigIntTimestamp);
-}
-/**
- * Computes a deterministic message hash and returns it as a hexadecimal string.
- * This is a convenience wrapper around messageHash that converts the result to a hex string.
- *
- * @param pubsubTopic - The pubsub topic string
- * @param message - The message to be hashed
- * @returns A string containing the hex representation of the SHA-256 hash
- *
- * @example
- * ```typescript
- * import { messageHashStr } from "@waku/core";
- *
- * const pubsubTopic = "/waku/2/default-waku/proto";
- * const message = {
- *   payload: new Uint8Array([1, 2, 3, 4]),
- *   contentTopic: "/waku/2/default-content/proto",
- *   meta: new Uint8Array([5, 6, 7, 8]),
- *   timestamp: new Date()
- * };
- *
- * const hashString = messageHashStr(pubsubTopic, message);
- * console.log(hashString); // e.g. "a1b2c3d4..."
- * ```
- */
-function messageHashStr(pubsubTopic, message) {
-    const hash = messageHash(pubsubTopic, message);
-    const hashStr = bytesToHex(hash);
-    return hashStr;
-}
-
-export { ConnectionManager, FilterCodecs, FilterCore, LightPushCodec, LightPushCore, MetadataCodec, StoreCodec, StoreCore, StreamManager, createEncoder, index$3 as message, messageHash, messageHashStr, wakuMetadata, index$2 as waku_filter, index$1 as waku_light_push, index as waku_store };
+export { ConnectionManager, FilterCodecs, FilterCore, LightPushCodec, LightPushCodecV2, LightPushCore, MetadataCodec, StoreCodec, StoreCore, StreamManager, createEncoder, index$3 as message, wakuMetadata, index$2 as waku_filter, index$1 as waku_light_push, index as waku_store };