@waku/discovery 0.0.4-1887f4f.0 → 0.0.4-409642d.0

package/bundle/index.js

@@ -26,7 +26,7 @@ const peerIdSymbol = Symbol.for('@libp2p/peer-id');
  * usually in response to the `abort` event being emitted by an
  * AbortSignal.
  */
-let CodeError$1 = class CodeError extends Error {
+class CodeError extends Error {
     code;
     props;
     constructor(message, code, props) {
@@ -35,7 +35,7 @@ let CodeError$1 = class CodeError extends Error {
         this.name = props?.name ?? 'CodeError';
         this.props = props ?? {}; // eslint-disable-line @typescript-eslint/consistent-type-assertions
     }
-};
+}
 class AggregateCodeError extends AggregateError {
     code;
     props;
@@ -537,6 +537,11 @@ var ProtocolError;
      * 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";
     /**
      * 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
@@ -567,12 +572,6 @@ var ProtocolError;
     ProtocolError["REQUEST_TIMEOUT"] = "Request timeout";
 })(ProtocolError || (ProtocolError = {}));
 
-var PageDirection;
-(function (PageDirection) {
-    PageDirection["BACKWARD"] = "backward";
-    PageDirection["FORWARD"] = "forward";
-})(PageDirection || (PageDirection = {}));
-
 var Tags;
 (function (Tags) {
     Tags["BOOTSTRAP"] = "bootstrap";
@@ -591,10 +590,12 @@ var EConnectionStateEvents;
     EConnectionStateEvents["CONNECTION_STATUS"] = "waku:connection";
 })(EConnectionStateEvents || (EConnectionStateEvents = {}));
 
-/**
- * The default cluster ID for The Waku Network
- */
-const DEFAULT_CLUSTER_ID = 1;
+var HealthStatus;
+(function (HealthStatus) {
+    HealthStatus["Unhealthy"] = "Unhealthy";
+    HealthStatus["MinimallyHealthy"] = "MinimallyHealthy";
+    HealthStatus["SufficientlyHealthy"] = "SufficientlyHealthy";
+})(HealthStatus || (HealthStatus = {}));
 
 function equals$2(aa, bb) {
     if (aa === bb)
@@ -1905,41 +1906,7 @@ const bytesToUtf8 = (b) => toString$6(b, "utf8");
  * Encode utf-8 string to byte array.
  */
 const utf8ToBytes$1 = (s) => fromString(s, "utf8");
-/**
- * Concatenate using Uint8Arrays as `Buffer` has a different behavior with `DataView`
- */
-function concat$2(byteArrays, totalLength) {
-    const len = totalLength ?? 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;
-}
 
-const shardInfoToPubsubTopics = (shardInfo) => {
-    if ("contentTopics" in shardInfo && shardInfo.contentTopics) {
-        // Autosharding: explicitly defined content topics
-        return Array.from(new Set(shardInfo.contentTopics.map((contentTopic) => contentTopicToPubsubTopic(contentTopic, shardInfo.clusterId))));
-    }
-    else if ("shards" in shardInfo) {
-        // Static sharding
-        if (shardInfo.shards === undefined)
-            throw new Error("Invalid shard");
-        return Array.from(new Set(shardInfo.shards.map((index) => `/waku/2/rs/${shardInfo.clusterId ?? DEFAULT_CLUSTER_ID}/${index}`)));
-    }
-    else if ("application" in shardInfo && "version" in shardInfo) {
-        // Autosharding: single shard from application and version
-        return [
-            contentTopicToPubsubTopic(`/${shardInfo.application}/${shardInfo.version}/default/default`, shardInfo.clusterId)
-        ];
-    }
-    else {
-        throw new Error("Missing required configuration in shard parameters");
-    }
-};
 const pubsubTopicToSingleShardInfo = (pubsubTopics) => {
     const parts = pubsubTopics.split("/");
     if (parts.length != 6 ||
@@ -1956,112 +1923,26 @@ const pubsubTopicToSingleShardInfo = (pubsubTopics) => {
         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");
-    }
-    // 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");
-        }
-        if (generation > 0) {
-            throw new Error("Generation greater than 0 is not supported");
-        }
-    }
-    // Validate remaining fields
-    const fields = parts.splice(-4);
-    // Validate application field
-    if (fields[0].length == 0) {
-        throw new Error("Application field cannot be empty");
-    }
-    // Validate version field
-    if (fields[1].length == 0) {
-        throw new Error("Version field cannot be empty");
-    }
-    // Validate topic name field
-    if (fields[2].length == 0) {
-        throw new Error("Topic name field cannot be empty");
-    }
-    // Validate encoding field
-    if (fields[3].length == 0) {
-        throw new Error("Encoding field cannot be empty");
-    }
+const pubsubTopicsToShardInfo = (pubsubTopics) => {
+    const shardInfoSet = new Set();
+    const clusterIds = new Set();
+    for (const topic of pubsubTopics) {
+        const { clusterId, shard } = pubsubTopicToSingleShardInfo(topic);
+        shardInfoSet.add(`${clusterId}:${shard}`);
+        clusterIds.add(clusterId);
+    }
+    if (shardInfoSet.size === 0) {
+        throw new Error("No valid pubsub topics provided");
+    }
+    if (clusterIds.size > 1) {
+        throw new Error("Pubsub topics from multiple cluster IDs are not supported");
+    }
+    const clusterId = clusterIds.values().next().value;
+    const shards = Array.from(shardInfoSet).map((info) => parseInt(info.split(":")[1]));
     return {
-        generation,
-        application: fields[0],
-        version: fields[1],
-        topicName: fields[2],
-        encoding: fields[3]
+        clusterId,
+        shards
     };
-}
-/**
- * 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, networkShards = 8) {
-    const { application, version } = ensureValidContentTopic(contentTopic);
-    const digest = sha256$1(concat$2([utf8ToBytes$1(application), utf8ToBytes$1(version)]));
-    const dataview = new DataView(digest.buffer.slice(-8));
-    return Number(dataview.getBigUint64(0, false) % BigInt(networkShards));
-}
-function contentTopicToPubsubTopic(contentTopic, clusterId = DEFAULT_CLUSTER_ID, networkShards = 8) {
-    if (!contentTopic) {
-        throw Error("Content topic must be specified");
-    }
-    const shardIndex = contentTopicToShardIndex(contentTopic, networkShards);
-    return `/waku/2/rs/${clusterId}/${shardIndex}`;
-}
-/**
- * Validates sharding configuration and sets defaults where possible.
- * @returns Validated sharding parameters, with any missing values set to defaults
- */
-const ensureShardingConfigured = (shardInfo) => {
-    const clusterId = shardInfo.clusterId ?? DEFAULT_CLUSTER_ID;
-    const shards = "shards" in shardInfo ? shardInfo.shards : [];
-    const contentTopics = "contentTopics" in shardInfo ? shardInfo.contentTopics : [];
-    const [application, version] = "application" in shardInfo && "version" in shardInfo
-        ? [shardInfo.application, shardInfo.version]
-        : [undefined, undefined];
-    const isShardsConfigured = shards && shards.length > 0;
-    const isContentTopicsConfigured = contentTopics && contentTopics.length > 0;
-    const isApplicationVersionConfigured = application && version;
-    if (isShardsConfigured) {
-        return {
-            shardingParams: { clusterId, shards },
-            shardInfo: { clusterId, shards },
-            pubsubTopics: shardInfoToPubsubTopics({ clusterId, shards })
-        };
-    }
-    if (isContentTopicsConfigured) {
-        const pubsubTopics = Array.from(new Set(contentTopics.map((topic) => contentTopicToPubsubTopic(topic, clusterId))));
-        const shards = Array.from(new Set(contentTopics.map((topic) => contentTopicToShardIndex(topic))));
-        return {
-            shardingParams: { clusterId, contentTopics },
-            shardInfo: { clusterId, shards },
-            pubsubTopics
-        };
-    }
-    if (isApplicationVersionConfigured) {
-        const pubsubTopic = contentTopicToPubsubTopic(`/${application}/${version}/default/default`, clusterId);
-        return {
-            shardingParams: { clusterId, application, version },
-            shardInfo: {
-                clusterId,
-                shards: [pubsubTopicToSingleShardInfo(pubsubTopic).shard]
-            },
-            pubsubTopics: [pubsubTopic]
-        };
-    }
-    throw new Error("Missing minimum required configuration options for static sharding or autosharding.");
 };
 
 const decodeRelayShard = (bytes) => {
@@ -2707,6 +2588,8 @@ var common = setup;
 			return false;
 		}
 
+		let m;
+
 		// Is webkit? http://stackoverflow.com/a/16459606/376773
 		// document is undefined in react-native: https://github.com/facebook/react-native/pull/1632
 		return (typeof document !== 'undefined' && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance) ||
@@ -2714,7 +2597,7 @@ var common = setup;
 			(typeof window !== 'undefined' && window.console && (window.console.firebug || (window.console.exception && window.console.table))) ||
 			// Is firefox >= v31?
 			// https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
-			(typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31) ||
+			(typeof navigator !== 'undefined' && navigator.userAgent && (m = navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/)) && parseInt(m[1], 10) >= 31) ||
 			// Double check webkit in userAgent just in case we are in a worker
 			(typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/));
 	}
@@ -2917,7 +2800,7 @@ const _0n$5 = BigInt(0);
 const _1n$7 = BigInt(1);
 const _2n$5 = BigInt(2);
 const _3n$2 = BigInt(3);
-const _8n$2 = BigInt(8);
+const _8n$3 = BigInt(8);
 const CURVE = Object.freeze({
     a: _0n$5,
     b: BigInt(7),
@@ -3021,7 +2904,7 @@ class JacobianPoint {
         const E = mod$1(_3n$2 * A);
         const F = mod$1(E * E);
         const X3 = mod$1(F - _2n$5 * D);
-        const Y3 = mod$1(E * (D - X3) - _8n$2 * C);
+        const Y3 = mod$1(E * (D - X3) - _8n$3 * C);
         const Z3 = mod$1(_2n$5 * Y1 * Z1);
         return new JacobianPoint(X3, Y3, Z3);
     }
@@ -3121,12 +3004,12 @@ class JacobianPoint {
         if (256 % W) {
             throw new Error('Point#wNAF: Invalid precomputation window, must be power of 2');
         }
-        let precomputes = affinePoint && pointPrecomputes.get(affinePoint);
+        let precomputes = affinePoint && pointPrecomputes$1.get(affinePoint);
         if (!precomputes) {
             precomputes = this.precomputeWindow(W);
             if (affinePoint && W !== 1) {
                 precomputes = JacobianPoint.normalizeZ(precomputes);
-                pointPrecomputes.set(affinePoint, precomputes);
+                pointPrecomputes$1.set(affinePoint, precomputes);
             }
         }
         let p = JacobianPoint.ZERO;
@@ -3182,7 +3065,7 @@ class JacobianPoint {
         const { x, y, z } = this;
         const is0 = this.equals(JacobianPoint.ZERO);
         if (invZ == null)
-            invZ = is0 ? _8n$2 : invert$1(z);
+            invZ = is0 ? _8n$3 : invert$1(z);
         const iz1 = invZ;
         const iz2 = mod$1(iz1 * iz1);
         const iz3 = mod$1(iz2 * iz1);
@@ -3202,7 +3085,7 @@ function constTimeNegate(condition, item) {
     const neg = item.negate();
     return condition ? neg : item;
 }
-const pointPrecomputes = new WeakMap();
+const pointPrecomputes$1 = new WeakMap();
 class Point {
     constructor(x, y) {
         this.x = x;
@@ -3210,7 +3093,7 @@ class Point {
     }
     _setWindowSize(windowSize) {
         this._WINDOW_SIZE = windowSize;
-        pointPrecomputes.delete(this);
+        pointPrecomputes$1.delete(this);
     }
     hasEvenY() {
         return this.y % _2n$5 === _0n$5;
@@ -5268,6 +5151,7 @@ const table = [
     [478, 0, 'wss'],
     [479, 0, 'p2p-websocket-star'],
     [480, 0, 'http'],
+    [481, V, 'http-path'],
     [777, V, 'memory']
 ];
 // populate tables
@@ -5353,6 +5237,8 @@ function convertToString(proto, buf) {
             return bytes2onion(buf);
         case 466: // certhash
             return bytes2mb(buf);
+        case 481: // http-path
+            return globalThis.encodeURIComponent(bytes2str(buf));
         default:
             return toString$6(buf, 'base16'); // no clue. convert to hex
     }
@@ -5387,6 +5273,8 @@ function convertToBytes(proto, str) {
             return onion32bytes(str);
         case 466: // certhash
             return mb2bytes(str);
+        case 481: // http-path
+            return str2bytes(globalThis.decodeURIComponent(str));
         default:
             return fromString(str, 'base16'); // no clue. convert from hex
     }
@@ -5848,7 +5736,7 @@ class Multiaddr {
         }
         const resolver = resolvers$1.get(resolvableProto.name);
         if (resolver == null) {
-            throw new CodeError$1(`no available resolver for ${resolvableProto.name}`, 'ERR_NO_AVAILABLE_RESOLVER');
+            throw new CodeError(`no available resolver for ${resolvableProto.name}`, 'ERR_NO_AVAILABLE_RESOLVER');
         }
         const result = await resolver(this, options);
         return result.map(str => multiaddr(str));
@@ -6291,9 +6179,9 @@ const sha512 = /* @__PURE__ */ wrapConstructor(() => new SHA512());
 // This is OK: `abstract` directory does not use noble-hashes.
 // User may opt-in into using different hashing library. This way, noble-hashes
 // won't be included into their bundle.
-const _0n$4 = BigInt(0);
-const _1n$6 = BigInt(1);
-const _2n$4 = BigInt(2);
+const _0n$4 = /* @__PURE__ */ BigInt(0);
+const _1n$6 = /* @__PURE__ */ BigInt(1);
+const _2n$4 = /* @__PURE__ */ BigInt(2);
 function isBytes$1(a) {
     return (a instanceof Uint8Array ||
         (a != null && typeof a === 'object' && a.constructor.name === 'Uint8Array'));
@@ -6302,6 +6190,10 @@ function abytes(item) {
     if (!isBytes$1(item))
         throw new Error('Uint8Array expected');
 }
+function abool(title, value) {
+    if (typeof value !== 'boolean')
+        throw new Error(`${title} must be valid boolean, got "${value}".`);
+}
 // Array where index 0xf0 (240) is mapped to string 'f0'
 const hexes = /* @__PURE__ */ Array.from({ length: 256 }, (_, i) => i.toString(16).padStart(2, '0'));
 /**
@@ -6444,6 +6336,25 @@ function utf8ToBytes(str) {
         throw new Error(`utf8ToBytes expected string, got ${typeof str}`);
     return new Uint8Array(new TextEncoder().encode(str)); // https://bugzil.la/1681809
 }
+// Is positive bigint
+const isPosBig = (n) => typeof n === 'bigint' && _0n$4 <= n;
+function inRange(n, min, max) {
+    return isPosBig(n) && isPosBig(min) && isPosBig(max) && min <= n && n < max;
+}
+/**
+ * Asserts min <= n < max. NOTE: It's < max and not <= max.
+ * @example
+ * aInRange('x', x, 1n, 256n); // would assume x is in (1n..255n)
+ */
+function aInRange(title, n, min, max) {
+    // Why min <= n < max and not a (min < n < max) OR b (min <= n <= max)?
+    // consider P=256n, min=0n, max=P
+    // - a for min=0 would require -1:          `inRange('x', x, -1n, P)`
+    // - b would commonly require subtraction:  `inRange('x', x, 0n, P - 1n)`
+    // - our way is the cleanest:               `inRange('x', x, 0n, P)
+    if (!inRange(n, min, max))
+        throw new Error(`expected valid ${title}: ${min} <= n < ${max}, got ${typeof n} ${n}`);
+}
 // Bit operations
 /**
  * Calculates amount of bits in a bigint.
@@ -6574,9 +6485,32 @@ function validateObject(object, validators, optValidators = {}) {
 // const z2 = validateObject(o, { a: 'isSafeInteger' }, { c: 'zz' });
 // const z3 = validateObject(o, { test: 'boolean', z: 'bug' });
 // const z4 = validateObject(o, { a: 'boolean', z: 'bug' });
+/**
+ * throws not implemented error
+ */
+const notImplemented = () => {
+    throw new Error('not implemented');
+};
+/**
+ * Memoizes (caches) computation result.
+ * Uses WeakMap: the value is going auto-cleaned by GC after last reference is removed.
+ */
+function memoized(fn) {
+    const map = new WeakMap();
+    return (arg, ...args) => {
+        const val = map.get(arg);
+        if (val !== undefined)
+            return val;
+        const computed = fn(arg, ...args);
+        map.set(arg, computed);
+        return computed;
+    };
+}
 
 var ut = /*#__PURE__*/Object.freeze({
     __proto__: null,
+    aInRange: aInRange,
+    abool: abool,
     abytes: abytes,
     bitGet: bitGet,
     bitLen: bitLen,
@@ -6591,7 +6525,10 @@ var ut = /*#__PURE__*/Object.freeze({
     equalBytes: equalBytes,
     hexToBytes: hexToBytes,
     hexToNumber: hexToNumber,
+    inRange: inRange,
     isBytes: isBytes$1,
+    memoized: memoized,
+    notImplemented: notImplemented,
     numberToBytesBE: numberToBytesBE,
     numberToBytesLE: numberToBytesLE,
     numberToHexUnpadded: numberToHexUnpadded,
@@ -6605,7 +6542,7 @@ var ut = /*#__PURE__*/Object.freeze({
 // prettier-ignore
 const _0n$3 = BigInt(0), _1n$5 = BigInt(1), _2n$3 = BigInt(2), _3n$1 = BigInt(3);
 // prettier-ignore
-const _4n = BigInt(4), _5n$1 = BigInt(5), _8n$1 = BigInt(8);
+const _4n = BigInt(4), _5n$1 = BigInt(5), _8n$2 = BigInt(8);
 // prettier-ignore
 BigInt(9); BigInt(16);
 // Calculates a modulo b
@@ -6751,8 +6688,8 @@ function FpSqrt(P) {
         };
     }
     // Atkin algorithm for q ≡ 5 (mod 8), https://eprint.iacr.org/2012/685.pdf (page 10)
-    if (P % _8n$1 === _5n$1) {
-        const c1 = (P - _5n$1) / _8n$1;
+    if (P % _8n$2 === _5n$1) {
+        const c1 = (P - _5n$1) / _8n$2;
         return function sqrt5mod8(Fp, n) {
             const n2 = Fp.mul(n, _2n$3);
             const v = Fp.pow(n2, c1);
@@ -6850,6 +6787,9 @@ function nLength(n, nBitLength) {
  * * a) denormalized operations like mulN instead of mul
  * * b) same object shape: never add or remove keys
  * * c) Object.freeze
+ * NOTE: operations don't check 'isValid' for all elements for performance reasons,
+ * it is caller responsibility to check this.
+ * This is low-level code, please make sure you know what you doing.
  * @param ORDER prime positive bigint
  * @param bitLen how many bits the field consumes
  * @param isLE (def: false) if encoding / decoding should be in little-endian
@@ -6905,12 +6845,6 @@ function Field(ORDER, bitLen, isLE = false, redef = {}) {
     });
     return Object.freeze(f);
 }
-function FpSqrtEven(Fp, elm) {
-    if (!Fp.isOdd)
-        throw new Error(`Field doesn't have isOdd`);
-    const root = Fp.sqrt(elm);
-    return Fp.isOdd(root) ? Fp.neg(root) : root;
-}
 /**
  * Returns total number of bytes consumed by the field element.
  * For example, 32 bytes for usual 256-bit weierstrass curve.
@@ -6964,6 +6898,10 @@ function mapHashToField(key, fieldOrder, isLE = false) {
 // Abelian group utilities
 const _0n$2 = BigInt(0);
 const _1n$4 = BigInt(1);
+// Since points in different groups cannot be equal (different object constructor),
+// we can have single place to store precomputes
+const pointPrecomputes = new WeakMap();
+const pointWindowSizes = new WeakMap(); // This allows use make points immutable (nothing changes inside)
 // Elliptic curve multiplication of Point by scalar. Fragile.
 // Scalars should always be less than curve order: this should be checked inside of a curve itself.
 // Creates precomputation tables for fast multiplication:
@@ -6980,7 +6918,12 @@ function wNAF(c, bits) {
         const neg = item.negate();
         return condition ? neg : item;
     };
+    const validateW = (W) => {
+        if (!Number.isSafeInteger(W) || W <= 0 || W > bits)
+            throw new Error(`Wrong window size=${W}, should be [1..${bits}]`);
+    };
     const opts = (W) => {
+        validateW(W);
         const windows = Math.ceil(bits / W) + 1; // +1, because
         const windowSize = 2 ** (W - 1); // -1 because we skip zero
         return { windows, windowSize };
@@ -7080,19 +7023,25 @@ function wNAF(c, bits) {
             // which makes it less const-time: around 1 bigint multiply.
             return { p, f };
         },
-        wNAFCached(P, precomputesMap, n, transform) {
-            // @ts-ignore
-            const W = P._WINDOW_SIZE || 1;
+        wNAFCached(P, n, transform) {
+            const W = pointWindowSizes.get(P) || 1;
             // Calculate precomputes on a first run, reuse them after
-            let comp = precomputesMap.get(P);
+            let comp = pointPrecomputes.get(P);
             if (!comp) {
                 comp = this.precomputeWindow(P, W);
-                if (W !== 1) {
-                    precomputesMap.set(P, transform(comp));
-                }
+                if (W !== 1)
+                    pointPrecomputes.set(P, transform(comp));
             }
             return this.wNAF(W, comp, n);
         },
+        // We calculate precomputes for elliptic curve point multiplication
+        // using windowed method. This specifies window size and
+        // stores precomputed values. Usually only base point would be precomputed.
+        setWindowSize(P, W) {
+            validateW(W);
+            pointWindowSizes.set(P, W);
+            pointPrecomputes.delete(P);
+        },
     };
 }
 function validateBasic(curve) {
@@ -7118,7 +7067,7 @@ function validateBasic(curve) {
 // Twisted Edwards curve. The formula is: ax² + y² = 1 + dx²y²
 // Be friendly to bad ECMAScript parsers by not using bigint literals
 // prettier-ignore
-const _0n$1 = BigInt(0), _1n$3 = BigInt(1), _2n$2 = BigInt(2), _8n = BigInt(8);
+const _0n$1 = BigInt(0), _1n$3 = BigInt(1), _2n$2 = BigInt(2), _8n$1 = BigInt(8);
 // verification rule is either zip215 or rfc8032 / nist186-5. Consult fromHex:
 const VERIFY_DEFAULT = { zip215: true };
 function validateOpts$1(curve) {
@@ -7137,7 +7086,13 @@ function validateOpts$1(curve) {
     // Set defaults
     return Object.freeze({ ...opts });
 }
-// It is not generic twisted curve for now, but ed25519/ed448 generic implementation
+/**
+ * Creates Twisted Edwards curve with EdDSA signatures.
+ * @example
+ * import { Field } from '@noble/curves/abstract/modular';
+ * // Before that, define BigInt-s: a, d, p, n, Gx, Gy, h
+ * const curve = twistedEdwards({ a, d, Fp: Field(p), n, Gx, Gy, h })
+ */
 function twistedEdwards(curveDef) {
     const CURVE = validateOpts$1(curveDef);
     const { Fp, n: CURVE_ORDER, prehash: prehash, hash: cHash, randomBytes, nByteLength, h: cofactor, } = CURVE;
@@ -7156,28 +7111,59 @@ function twistedEdwards(curveDef) {
     const adjustScalarBytes = CURVE.adjustScalarBytes || ((bytes) => bytes); // NOOP
     const domain = CURVE.domain ||
         ((data, ctx, phflag) => {
+            abool('phflag', phflag);
             if (ctx.length || phflag)
                 throw new Error('Contexts/pre-hash are not supported');
             return data;
         }); // NOOP
-    const inBig = (n) => typeof n === 'bigint' && _0n$1 < n; // n in [1..]
-    const inRange = (n, max) => inBig(n) && inBig(max) && n < max; // n in [1..max-1]
-    const in0MaskRange = (n) => n === _0n$1 || inRange(n, MASK); // n in [0..MASK-1]
-    function assertInRange(n, max) {
-        // n in [1..max-1]
-        if (inRange(n, max))
-            return n;
-        throw new Error(`Expected valid scalar < ${max}, got ${typeof n} ${n}`);
-    }
-    function assertGE0(n) {
-        // n in [0..CURVE_ORDER-1]
-        return n === _0n$1 ? n : assertInRange(n, CURVE_ORDER); // GE = prime subgroup, not full group
-    }
-    const pointPrecomputes = new Map();
-    function isPoint(other) {
+    // 0 <= n < MASK
+    // Coordinates larger than Fp.ORDER are allowed for zip215
+    function aCoordinate(title, n) {
+        aInRange('coordinate ' + title, n, _0n$1, MASK);
+    }
+    function assertPoint(other) {
         if (!(other instanceof Point))
             throw new Error('ExtendedPoint expected');
     }
+    // Converts Extended point to default (x, y) coordinates.
+    // Can accept precomputed Z^-1 - for example, from invertBatch.
+    const toAffineMemo = memoized((p, iz) => {
+        const { ex: x, ey: y, ez: z } = p;
+        const is0 = p.is0();
+        if (iz == null)
+            iz = is0 ? _8n$1 : Fp.inv(z); // 8 was chosen arbitrarily
+        const ax = modP(x * iz);
+        const ay = modP(y * iz);
+        const zz = modP(z * iz);
+        if (is0)
+            return { x: _0n$1, y: _1n$3 };
+        if (zz !== _1n$3)
+            throw new Error('invZ was invalid');
+        return { x: ax, y: ay };
+    });
+    const assertValidMemo = memoized((p) => {
+        const { a, d } = CURVE;
+        if (p.is0())
+            throw new Error('bad point: ZERO'); // TODO: optimize, with vars below?
+        // Equation in affine coordinates: ax² + y² = 1 + dx²y²
+        // Equation in projective coordinates (X/Z, Y/Z, Z):  (aX² + Y²)Z² = Z⁴ + dX²Y²
+        const { ex: X, ey: Y, ez: Z, et: T } = p;
+        const X2 = modP(X * X); // X²
+        const Y2 = modP(Y * Y); // Y²
+        const Z2 = modP(Z * Z); // Z²
+        const Z4 = modP(Z2 * Z2); // Z⁴
+        const aX2 = modP(X2 * a); // aX²
+        const left = modP(Z2 * modP(aX2 + Y2)); // (aX² + Y²)Z²
+        const right = modP(Z4 + modP(d * modP(X2 * Y2))); // Z⁴ + dX²Y²
+        if (left !== right)
+            throw new Error('bad point: equation left != right (1)');
+        // In Extended coordinates we also have T, which is x*y=T/Z: check X*Y == Z*T
+        const XY = modP(X * Y);
+        const ZT = modP(Z * T);
+        if (XY !== ZT)
+            throw new Error('bad point: equation left != right (2)');
+        return true;
+    });
     // Extended Point works in extended coordinates: (x, y, z, t) ∋ (x=x/z, y=y/z, t=xy).
     // https://en.wikipedia.org/wiki/Twisted_Edwards_curve#Extended_coordinates
     class Point {
@@ -7186,14 +7172,11 @@ function twistedEdwards(curveDef) {
             this.ey = ey;
             this.ez = ez;
             this.et = et;
-            if (!in0MaskRange(ex))
-                throw new Error('x required');
-            if (!in0MaskRange(ey))
-                throw new Error('y required');
-            if (!in0MaskRange(ez))
-                throw new Error('z required');
-            if (!in0MaskRange(et))
-                throw new Error('t required');
+            aCoordinate('x', ex);
+            aCoordinate('y', ey);
+            aCoordinate('z', ez);
+            aCoordinate('t', et);
+            Object.freeze(this);
         }
         get x() {
             return this.toAffine().x;
@@ -7205,8 +7188,8 @@ function twistedEdwards(curveDef) {
             if (p instanceof Point)
                 throw new Error('extended point not allowed');
             const { x, y } = p || {};
-            if (!in0MaskRange(x) || !in0MaskRange(y))
-                throw new Error('invalid affine point');
+            aCoordinate('x', x);
+            aCoordinate('y', y);
             return new Point(x, y, _1n$3, modP(x * y));
         }
         static normalizeZ(points) {
@@ -7215,36 +7198,16 @@ function twistedEdwards(curveDef) {
         }
         // "Private method", don't use it directly
         _setWindowSize(windowSize) {
-            this._WINDOW_SIZE = windowSize;
-            pointPrecomputes.delete(this);
+            wnaf.setWindowSize(this, windowSize);
         }
         // Not required for fromHex(), which always creates valid points.
         // Could be useful for fromAffine().
         assertValidity() {
-            const { a, d } = CURVE;
-            if (this.is0())
-                throw new Error('bad point: ZERO'); // TODO: optimize, with vars below?
-            // Equation in affine coordinates: ax² + y² = 1 + dx²y²
-            // Equation in projective coordinates (X/Z, Y/Z, Z):  (aX² + Y²)Z² = Z⁴ + dX²Y²
-            const { ex: X, ey: Y, ez: Z, et: T } = this;
-            const X2 = modP(X * X); // X²
-            const Y2 = modP(Y * Y); // Y²
-            const Z2 = modP(Z * Z); // Z²
-            const Z4 = modP(Z2 * Z2); // Z⁴
-            const aX2 = modP(X2 * a); // aX²
-            const left = modP(Z2 * modP(aX2 + Y2)); // (aX² + Y²)Z²
-            const right = modP(Z4 + modP(d * modP(X2 * Y2))); // Z⁴ + dX²Y²
-            if (left !== right)
-                throw new Error('bad point: equation left != right (1)');
-            // In Extended coordinates we also have T, which is x*y=T/Z: check X*Y == Z*T
-            const XY = modP(X * Y);
-            const ZT = modP(Z * T);
-            if (XY !== ZT)
-                throw new Error('bad point: equation left != right (2)');
+            assertValidMemo(this);
         }
         // Compare one point to another.
         equals(other) {
-            isPoint(other);
+            assertPoint(other);
             const { ex: X1, ey: Y1, ez: Z1 } = this;
             const { ex: X2, ey: Y2, ez: Z2 } = other;
             const X1Z2 = modP(X1 * Z2);
@@ -7285,7 +7248,7 @@ function twistedEdwards(curveDef) {
         // https://hyperelliptic.org/EFD/g1p/auto-twisted-extended.html#addition-add-2008-hwcd
         // Cost: 9M + 1*a + 1*d + 7add.
         add(other) {
-            isPoint(other);
+            assertPoint(other);
             const { a, d } = CURVE;
             const { ex: X1, ey: Y1, ez: Z1, et: T1 } = this;
             const { ex: X2, ey: Y2, ez: Z2, et: T2 } = other;
@@ -7328,11 +7291,13 @@ function twistedEdwards(curveDef) {
             return this.add(other.negate());
         }
         wNAF(n) {
-            return wnaf.wNAFCached(this, pointPrecomputes, n, Point.normalizeZ);
+            return wnaf.wNAFCached(this, n, Point.normalizeZ);
         }
         // Constant-time multiplication.
         multiply(scalar) {
-            const { p, f } = this.wNAF(assertInRange(scalar, CURVE_ORDER));
+            const n = scalar;
+            aInRange('scalar', n, _1n$3, CURVE_ORDER); // 1 <= scalar < L
+            const { p, f } = this.wNAF(n);
             return Point.normalizeZ([p, f])[0];
         }
         // Non-constant-time multiplication. Uses double-and-add algorithm.
@@ -7340,7 +7305,8 @@ function twistedEdwards(curveDef) {
         // an exposed private key e.g. sig verification.
         // Does NOT allow scalars higher than CURVE.n.
         multiplyUnsafe(scalar) {
-            let n = assertGE0(scalar); // 0 <= scalar < CURVE.n
+            const n = scalar;
+            aInRange('scalar', n, _0n$1, CURVE_ORDER); // 0 <= scalar < L
             if (n === _0n$1)
                 return I;
             if (this.equals(I) || n === _1n$3)
@@ -7364,18 +7330,7 @@ function twistedEdwards(curveDef) {
         // Converts Extended point to default (x, y) coordinates.
         // Can accept precomputed Z^-1 - for example, from invertBatch.
         toAffine(iz) {
-            const { ex: x, ey: y, ez: z } = this;
-            const is0 = this.is0();
-            if (iz == null)
-                iz = is0 ? _8n : Fp.inv(z); // 8 was chosen arbitrarily
-            const ax = modP(x * iz);
-            const ay = modP(y * iz);
-            const zz = modP(z * iz);
-            if (is0)
-                return { x: _0n$1, y: _1n$3 };
-            if (zz !== _1n$3)
-                throw new Error('invZ was invalid');
-            return { x: ax, y: ay };
+            return toAffineMemo(this, iz);
         }
         clearCofactor() {
             const { h: cofactor } = CURVE;
@@ -7389,18 +7344,16 @@ function twistedEdwards(curveDef) {
             const { d, a } = CURVE;
             const len = Fp.BYTES;
             hex = ensureBytes('pointHex', hex, len); // copy hex to a new array
+            abool('zip215', zip215);
             const normed = hex.slice(); // copy again, we'll manipulate it
             const lastByte = hex[len - 1]; // select last byte
             normed[len - 1] = lastByte & ~0x80; // clear last bit
             const y = bytesToNumberLE(normed);
-            if (y === _0n$1) ;
-            else {
-                // RFC8032 prohibits >= p, but ZIP215 doesn't
-                if (zip215)
-                    assertInRange(y, MASK); // zip215=true [1..P-1] (2^255-19-1 for ed25519)
-                else
-                    assertInRange(y, Fp.ORDER); // zip215=false [1..MASK-1] (2^256-1 for ed25519)
-            }
+            // RFC8032 prohibits >= p, but ZIP215 doesn't
+            // zip215=true:  0 <= y < MASK (2^256 for ed25519)
+            // zip215=false: 0 <= y < P (2^255-19 for ed25519)
+            const max = zip215 ? MASK : Fp.ORDER;
+            aInRange('pointHex.y', y, _0n$1, max);
             // Ed25519: x² = (y²-1)/(dy²+1) mod p. Ed448: x² = (y²-1)/(dy²-1) mod p. Generic case:
             // ax²+y²=1+dx²y² => y²-1=dx²y²-ax² => y²-1=x²(dy²-a) => x²=(y²-1)/(dy²-a)
             const y2 = modP(y * y); // denominator is always non-0 mod p.
@@ -7475,7 +7428,7 @@ function twistedEdwards(curveDef) {
         const R = G.multiply(r).toRawBytes(); // R = rG
         const k = hashDomainToScalar(options.context, R, pointBytes, msg); // R || A || PH(M)
         const s = modN(r + k * scalar); // S = (r + k * s) mod L
-        assertGE0(s); // 0 <= s < l
+        aInRange('signature.s', s, _0n$1, CURVE_ORDER); // 0 <= s < l
         const res = concatBytes(R, numberToBytesLE(s, Fp.BYTES));
         return ensureBytes('result', res, nByteLength * 2); // 64-byte signature
     }
@@ -7485,6 +7438,8 @@ function twistedEdwards(curveDef) {
         const len = Fp.BYTES; // Verifies EdDSA signature against message and public key. RFC8032 5.1.7.
         sig = ensureBytes('signature', sig, 2 * len); // An extended group equation is checked.
         msg = ensureBytes('message', msg);
+        if (zip215 !== undefined)
+            abool('zip215', zip215);
         if (prehash)
             msg = prehash(msg); // for ed25519ph, etc
         const s = bytesToNumberLE(sig.slice(len, 2 * len));
@@ -7542,12 +7497,14 @@ function twistedEdwards(curveDef) {
  */
 const ED25519_P = BigInt('57896044618658097711785492504343953926634992332820282019728792003956564819949');
 // √(-1) aka √(a) aka 2^((p-1)/4)
-const ED25519_SQRT_M1 = BigInt('19681161376707505956807079304988542015446066515923890162744021073123829784752');
+const ED25519_SQRT_M1 = /* @__PURE__ */ BigInt('19681161376707505956807079304988542015446066515923890162744021073123829784752');
 // prettier-ignore
-BigInt(0); const _1n$2 = BigInt(1), _2n$1 = BigInt(2), _5n = BigInt(5);
+BigInt(0); const _1n$2 = BigInt(1), _2n$1 = BigInt(2); BigInt(3);
 // prettier-ignore
-const _10n = BigInt(10), _20n = BigInt(20), _40n = BigInt(40), _80n = BigInt(80);
+const _5n = BigInt(5), _8n = BigInt(8);
 function ed25519_pow_2_252_3(x) {
+    // prettier-ignore
+    const _10n = BigInt(10), _20n = BigInt(20), _40n = BigInt(40), _80n = BigInt(80);
     const P = ED25519_P;
     const x2 = (x * x) % P;
     const b2 = (x2 * x) % P; // x^3, 11
@@ -7596,8 +7553,8 @@ function uvRatio(u, v) {
         x = mod(-x, P);
     return { isValid: useRoot1 || useRoot2, value: x };
 }
-const Fp$1 = Field(ED25519_P, undefined, true);
-const ed25519Defaults = {
+const Fp$1 = /* @__PURE__ */ (() => Field(ED25519_P, undefined, true))();
+const ed25519Defaults = /* @__PURE__ */ (() => ({
     // Param: a
     a: BigInt(-1), // Fp.create(-1) is proper; our way still works and is faster
     // d is equal to -121665/121666 over finite field.
@@ -7609,7 +7566,7 @@ const ed25519Defaults = {
     // 2n**252n + 27742317777372353535851937790883648493n;
     n: BigInt('7237005577332262213973186563042994240857116359379907606001950938285454250989'),
     // Cofactor
-    h: BigInt(8),
+    h: _8n,
     // Base point (x, y) aka generator point
     Gx: BigInt('15112221349535400772501151409588531511454012693041857206046113283949847762202'),
     Gy: BigInt('46316835694926478169428394003475163141307993866256225615783033603165251855960'),
@@ -7620,40 +7577,11 @@ const ed25519Defaults = {
     // Ratio of u to v. Allows us to combine inversion and square root. Uses algo from RFC8032 5.1.3.
     // Constant-time, u/√v
     uvRatio,
-};
-const ed25519 = /* @__PURE__ */ twistedEdwards(ed25519Defaults);
-function ed25519_domain(data, ctx, phflag) {
-    if (ctx.length > 255)
-        throw new Error('Context is too big');
-    return concatBytes$2(utf8ToBytes$2('SigEd25519 no Ed25519 collisions'), new Uint8Array([phflag ? 1 : 0, ctx.length]), ctx, data);
-}
-/* @__PURE__ */ twistedEdwards({
-    ...ed25519Defaults,
-    domain: ed25519_domain,
-});
-/* @__PURE__ */ twistedEdwards({
-    ...ed25519Defaults,
-    domain: ed25519_domain,
-    prehash: sha512,
-});
-// Hash To Curve Elligator2 Map (NOTE: different from ristretto255 elligator)
-// NOTE: very important part is usage of FpSqrtEven for ELL2_C1_EDWARDS, since
-// SageMath returns different root first and everything falls apart
-const ELL2_C1 = (Fp$1.ORDER + BigInt(3)) / BigInt(8); // 1. c1 = (q + 3) / 8       # Integer arithmetic
-Fp$1.pow(_2n$1, ELL2_C1); // 2. c2 = 2^c1
-Fp$1.sqrt(Fp$1.neg(Fp$1.ONE)); // 3. c3 = sqrt(-1)
-(Fp$1.ORDER - BigInt(5)) / BigInt(8); // 4. c4 = (q - 5) / 8       # Integer arithmetic
-BigInt(486662);
-FpSqrtEven(Fp$1, Fp$1.neg(BigInt(486664))); // sgn0(c1) MUST equal 0
-// √(ad - 1)
-BigInt('25063068953384623474111414158702152701244531502492656460079210482610430750235');
-// 1 / √(a-d)
-BigInt('54469307008909316920995813868745141605393597292927456921205312896311721017578');
-// 1-d²
-BigInt('1159843021668779879193775521855586647937357759715417654439879720876111806838');
-// (d-1)²
-BigInt('40440834346308536858101042469323190826248399146238708352240133220865137265952');
-BigInt('0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff');
+}))();
+/**
+ * ed25519 curve with EdDSA signatures.
+ */
+const ed25519 = /* @__PURE__ */ (() => twistedEdwards(ed25519Defaults))();
 
 const PUBLIC_KEY_BYTE_LENGTH = 32;
 const PRIVATE_KEY_BYTE_LENGTH = 64; // private key is actually 32 bytes but for historical reasons we concat private and public keys
@@ -7710,7 +7638,7 @@ function concatKeys(privateKeyRaw, publicKey) {
 var webcrypto = {
     get(win = globalThis) {
         const nativeCrypto = win.crypto;
-        if (nativeCrypto == null || nativeCrypto.subtle == null) {
+        if (nativeCrypto?.subtle == null) {
             throw Object.assign(new Error('Missing Web Crypto API. ' +
                 'The most likely cause of this error is that this page is being accessed ' +
                 'from an insecure context (i.e. not HTTPS). For more information and ' +
@@ -7734,12 +7662,12 @@ var webcrypto = {
 const derivedEmptyPasswordKey = { alg: 'A128GCM', ext: true, k: 'scm9jmO_4BJAgdwWGVulLg', key_ops: ['encrypt', 'decrypt'], kty: 'oct' };
 // Based off of code from https://github.com/luke-park/SecureCompatibleEncryptionExamples
 function create(opts) {
-    const algorithm = opts?.algorithm ?? 'AES-GCM';
-    let keyLength = opts?.keyLength ?? 16;
-    const nonceLength = opts?.nonceLength ?? 12;
-    const digest = opts?.digest ?? 'SHA-256';
-    const saltLength = opts?.saltLength ?? 16;
-    const iterations = opts?.iterations ?? 32767;
+    const algorithm = 'AES-GCM';
+    let keyLength = 16;
+    const nonceLength = 12;
+    const digest = 'SHA-256';
+    const saltLength = 16;
+    const iterations = 32767;
     const crypto = webcrypto.get();
     keyLength *= 8; // Browser crypto uses bits instead of bytes
     /**
@@ -8523,7 +8451,7 @@ function decodeMessage(buf, codec, opts) {
  * A general purpose buffer pool
  */
 function pool(size) {
-    const SIZE = size ?? 8192;
+    const SIZE = 8192;
     const MAX = SIZE >>> 1;
     let slab;
     let offset = SIZE;
@@ -9036,12 +8964,17 @@ function message(encode, decode) {
  * npm i protons-runtime
  * ```
  */
-class CodeError extends Error {
-    code;
-    constructor(message, code, options) {
-        super(message, options);
-        this.code = code;
-    }
+/**
+ * Thrown when a repeated field has too many elements
+ */
+class MaxLengthError extends Error {
+    /**
+     * This will be removed in a future release
+     *
+     * @deprecated use the `.name` property instead
+     */
+    code = 'ERR_MAX_LENGTH';
+    name = 'MaxLengthError';
 }
 
 /* eslint-disable import/export */
@@ -9252,7 +9185,7 @@ class Ed25519PrivateKey {
             return exporter(this.bytes, password);
         }
         else {
-            throw new CodeError$1(`export format '${format}' is not supported`, 'ERR_INVALID_EXPORT_FORMAT');
+            throw new CodeError(`export format '${format}' is not supported`, 'ERR_INVALID_EXPORT_FORMAT');
         }
     }
 }
@@ -9284,7 +9217,7 @@ async function generateKeyPairFromSeed(seed) {
 function ensureKey(key, length) {
     key = Uint8Array.from(key ?? []);
     if (key.length !== length) {
-        throw new CodeError$1(`Key must be a Uint8Array of length ${length}, got ${key.length}`, 'ERR_INVALID_KEY_TYPE');
+        throw new CodeError(`Key must be a Uint8Array of length ${length}, got ${key.length}`, 'ERR_INVALID_KEY_TYPE');
     }
     return key;
 }
@@ -9304,7 +9237,7 @@ var Ed25519 = /*#__PURE__*/Object.freeze({
  */
 function randomBytes(length) {
     if (isNaN(length) || length <= 0) {
-        throw new CodeError$1('random bytes length must be a Number bigger than 0', 'ERR_INVALID_LENGTH');
+        throw new CodeError('random bytes length must be a Number bigger than 0', 'ERR_INVALID_LENGTH');
     }
     return randomBytes$1(length);
 }
@@ -12713,7 +12646,7 @@ function pkcs1ToJwk(bytes) {
  */
 function jwkToPkcs1(jwk) {
     if (jwk.n == null || jwk.e == null || jwk.d == null || jwk.p == null || jwk.q == null || jwk.dp == null || jwk.dq == null || jwk.qi == null) {
-        throw new CodeError$1('JWK was missing components', 'ERR_INVALID_PARAMETERS');
+        throw new CodeError('JWK was missing components', 'ERR_INVALID_PARAMETERS');
     }
     const root = new Sequence({
         value: [
@@ -12750,7 +12683,7 @@ function pkixToJwk(bytes) {
  */
 function jwkToPkix(jwk) {
     if (jwk.n == null || jwk.e == null) {
-        throw new CodeError$1('JWK was missing components', 'ERR_INVALID_PARAMETERS');
+        throw new CodeError('JWK was missing components', 'ERR_INVALID_PARAMETERS');
     }
     const root = new Sequence({
         value: [
@@ -12962,7 +12895,7 @@ async function hashAndVerify$1(key, sig, msg) {
 }
 async function exportKey(pair) {
     if (pair.privateKey == null || pair.publicKey == null) {
-        throw new CodeError$1('Private and public key are required', 'ERR_INVALID_PARAMETERS');
+        throw new CodeError('Private and public key are required', 'ERR_INVALID_PARAMETERS');
     }
     return Promise.all([
         webcrypto.get().subtle.exportKey('jwk', pair.privateKey),
@@ -12981,10 +12914,10 @@ async function derivePublicFromPrivate(jwKey) {
 }
 function keySize(jwk) {
     if (jwk.kty !== 'RSA') {
-        throw new CodeError$1('invalid key type', 'ERR_INVALID_KEY_TYPE');
+        throw new CodeError('invalid key type', 'ERR_INVALID_KEY_TYPE');
     }
     else if (jwk.n == null) {
-        throw new CodeError$1('invalid key modulus', 'ERR_INVALID_KEY_MODULUS');
+        throw new CodeError('invalid key modulus', 'ERR_INVALID_KEY_MODULUS');
     }
     const bytes = fromString(jwk.n, 'base64url');
     return bytes.length * 8;
@@ -13034,7 +12967,7 @@ class RsaPrivateKey {
     }
     get public() {
         if (this._publicKey == null) {
-            throw new CodeError$1('public key not provided', 'ERR_PUBKEY_NOT_PROVIDED');
+            throw new CodeError('public key not provided', 'ERR_PUBKEY_NOT_PROVIDED');
         }
         return new RsaPublicKey(this._publicKey);
     }
@@ -13083,14 +13016,14 @@ class RsaPrivateKey {
             return exporter(this.bytes, password);
         }
         else {
-            throw new CodeError$1(`export format '${format}' is not supported`, 'ERR_INVALID_EXPORT_FORMAT');
+            throw new CodeError(`export format '${format}' is not supported`, 'ERR_INVALID_EXPORT_FORMAT');
         }
     }
 }
 async function unmarshalRsaPrivateKey(bytes) {
     const jwk = pkcs1ToJwk(bytes);
     if (keySize(jwk) > MAX_RSA_KEY_SIZE) {
-        throw new CodeError$1('key size is too large', 'ERR_KEY_SIZE_TOO_LARGE');
+        throw new CodeError('key size is too large', 'ERR_KEY_SIZE_TOO_LARGE');
     }
     const keys = await unmarshalPrivateKey$1(jwk);
     return new RsaPrivateKey(keys.privateKey, keys.publicKey);
@@ -13098,20 +13031,20 @@ async function unmarshalRsaPrivateKey(bytes) {
 function unmarshalRsaPublicKey(bytes) {
     const jwk = pkixToJwk(bytes);
     if (keySize(jwk) > MAX_RSA_KEY_SIZE) {
-        throw new CodeError$1('key size is too large', 'ERR_KEY_SIZE_TOO_LARGE');
+        throw new CodeError('key size is too large', 'ERR_KEY_SIZE_TOO_LARGE');
     }
     return new RsaPublicKey(jwk);
 }
 async function fromJwk(jwk) {
     if (keySize(jwk) > MAX_RSA_KEY_SIZE) {
-        throw new CodeError$1('key size is too large', 'ERR_KEY_SIZE_TOO_LARGE');
+        throw new CodeError('key size is too large', 'ERR_KEY_SIZE_TOO_LARGE');
     }
     const keys = await unmarshalPrivateKey$1(jwk);
     return new RsaPrivateKey(keys.privateKey, keys.publicKey);
 }
 async function generateKeyPair$1(bits) {
     if (bits > MAX_RSA_KEY_SIZE) {
-        throw new CodeError$1('key size is too large', 'ERR_KEY_SIZE_TOO_LARGE');
+        throw new CodeError('key size is too large', 'ERR_KEY_SIZE_TOO_LARGE');
     }
     const keys = await generateKey$1(bits);
     return new RsaPrivateKey(keys.privateKey, keys.publicKey);
@@ -13130,6 +13063,12 @@ var RSA = /*#__PURE__*/Object.freeze({
 
 /*! noble-curves - MIT License (c) 2022 Paul Miller (paulmillr.com) */
 // Short Weierstrass curve. The formula is: y² = x³ + ax + b
+function validateSigVerOpts(opts) {
+    if (opts.lowS !== undefined)
+        abool('lowS', opts.lowS);
+    if (opts.prehash !== undefined)
+        abool('prehash', opts.prehash);
+}
 function validatePointOpts(curve) {
     const opts = validateBasic(curve);
     validateObject(opts, {
@@ -13254,16 +13193,12 @@ function weierstrassPoints(opts) {
         throw new Error('bad generator point: equation left != right');
     // Valid group elements reside in range 1..n-1
     function isWithinCurveOrder(num) {
-        return typeof num === 'bigint' && _0n < num && num < CURVE.n;
-    }
-    function assertGE(num) {
-        if (!isWithinCurveOrder(num))
-            throw new Error('Expected valid bigint: 0 < bigint < curve.n');
+        return inRange(num, _1n$1, CURVE.n);
     }
     // Validates if priv key is valid and converts it to bigint.
     // Supports options allowedPrivateKeyLengths and wrapPrivateKey.
     function normPrivateKeyToScalar(key) {
-        const { allowedPrivateKeyLengths: lengths, nByteLength, wrapPrivateKey, n } = CURVE;
+        const { allowedPrivateKeyLengths: lengths, nByteLength, wrapPrivateKey, n: N } = CURVE;
         if (lengths && typeof key !== 'bigint') {
             if (isBytes$1(key))
                 key = bytesToHex(key);
@@ -13283,15 +13218,61 @@ function weierstrassPoints(opts) {
             throw new Error(`private key must be ${nByteLength} bytes, hex or bigint, not ${typeof key}`);
         }
         if (wrapPrivateKey)
-            num = mod(num, n); // disabled by default, enabled for BLS
-        assertGE(num); // num in range [1..N-1]
+            num = mod(num, N); // disabled by default, enabled for BLS
+        aInRange('private key', num, _1n$1, N); // num in range [1..N-1]
         return num;
     }
-    const pointPrecomputes = new Map();
     function assertPrjPoint(other) {
         if (!(other instanceof Point))
             throw new Error('ProjectivePoint expected');
     }
+    // Memoized toAffine / validity check. They are heavy. Points are immutable.
+    // Converts Projective point to affine (x, y) coordinates.
+    // Can accept precomputed Z^-1 - for example, from invertBatch.
+    // (x, y, z) ∋ (x=x/z, y=y/z)
+    const toAffineMemo = memoized((p, iz) => {
+        const { px: x, py: y, pz: z } = p;
+        // Fast-path for normalized points
+        if (Fp.eql(z, Fp.ONE))
+            return { x, y };
+        const is0 = p.is0();
+        // If invZ was 0, we return zero point. However we still want to execute
+        // all operations, so we replace invZ with a random number, 1.
+        if (iz == null)
+            iz = is0 ? Fp.ONE : Fp.inv(z);
+        const ax = Fp.mul(x, iz);
+        const ay = Fp.mul(y, iz);
+        const zz = Fp.mul(z, iz);
+        if (is0)
+            return { x: Fp.ZERO, y: Fp.ZERO };
+        if (!Fp.eql(zz, Fp.ONE))
+            throw new Error('invZ was invalid');
+        return { x: ax, y: ay };
+    });
+    // NOTE: on exception this will crash 'cached' and no value will be set.
+    // Otherwise true will be return
+    const assertValidMemo = memoized((p) => {
+        if (p.is0()) {
+            // (0, 1, 0) aka ZERO is invalid in most contexts.
+            // In BLS, ZERO can be serialized, so we allow it.
+            // (0, 0, 0) is wrong representation of ZERO and is always invalid.
+            if (CURVE.allowInfinityPoint && !Fp.is0(p.py))
+                return;
+            throw new Error('bad point: ZERO');
+        }
+        // Some 3rd-party test vectors require different wording between here & `fromCompressedHex`
+        const { x, y } = p.toAffine();
+        // Check if x, y are valid field elements
+        if (!Fp.isValid(x) || !Fp.isValid(y))
+            throw new Error('bad point: x or y not FE');
+        const left = Fp.sqr(y); // y²
+        const right = weierstrassEquation(x); // x³ + ax + b
+        if (!Fp.eql(left, right))
+            throw new Error('bad point: equation left != right');
+        if (!p.isTorsionFree())
+            throw new Error('bad point: not in prime-order subgroup');
+        return true;
+    });
     /**
      * Projective Point works in 3d / projective (homogeneous) coordinates: (x, y, z) ∋ (x=x/z, y=y/z)
      * Default Point works in 2d / affine coordinates: (x, y)
@@ -13308,6 +13289,7 @@ function weierstrassPoints(opts) {
                 throw new Error('y required');
             if (pz == null || !Fp.isValid(pz))
                 throw new Error('z required');
+            Object.freeze(this);
         }
         // Does not validate if the point is on-curve.
         // Use fromHex instead, or call assertValidity() later.
@@ -13354,30 +13336,11 @@ function weierstrassPoints(opts) {
         }
         // "Private method", don't use it directly
         _setWindowSize(windowSize) {
-            this._WINDOW_SIZE = windowSize;
-            pointPrecomputes.delete(this);
+            wnaf.setWindowSize(this, windowSize);
         }
         // A point on curve is valid if it conforms to equation.
         assertValidity() {
-            if (this.is0()) {
-                // (0, 1, 0) aka ZERO is invalid in most contexts.
-                // In BLS, ZERO can be serialized, so we allow it.
-                // (0, 0, 0) is wrong representation of ZERO and is always invalid.
-                if (CURVE.allowInfinityPoint && !Fp.is0(this.py))
-                    return;
-                throw new Error('bad point: ZERO');
-            }
-            // Some 3rd-party test vectors require different wording between here & `fromCompressedHex`
-            const { x, y } = this.toAffine();
-            // Check if x, y are valid field elements
-            if (!Fp.isValid(x) || !Fp.isValid(y))
-                throw new Error('bad point: x or y not FE');
-            const left = Fp.sqr(y); // y²
-            const right = weierstrassEquation(x); // x³ + ax + b
-            if (!Fp.eql(left, right))
-                throw new Error('bad point: equation left != right');
-            if (!this.isTorsionFree())
-                throw new Error('bad point: not in prime-order subgroup');
+            assertValidMemo(this);
         }
         hasEvenY() {
             const { y } = this.toAffine();
@@ -13504,28 +13467,25 @@ function weierstrassPoints(opts) {
             return this.equals(Point.ZERO);
         }
         wNAF(n) {
-            return wnaf.wNAFCached(this, pointPrecomputes, n, (comp) => {
-                const toInv = Fp.invertBatch(comp.map((p) => p.pz));
-                return comp.map((p, i) => p.toAffine(toInv[i])).map(Point.fromAffine);
-            });
+            return wnaf.wNAFCached(this, n, Point.normalizeZ);
         }
         /**
          * Non-constant-time multiplication. Uses double-and-add algorithm.
          * It's faster, but should only be used when you don't care about
          * an exposed private key e.g. sig verification, which works over *public* keys.
          */
-        multiplyUnsafe(n) {
+        multiplyUnsafe(sc) {
+            aInRange('scalar', sc, _0n, CURVE.n);
             const I = Point.ZERO;
-            if (n === _0n)
+            if (sc === _0n)
                 return I;
-            assertGE(n); // Will throw on 0
-            if (n === _1n$1)
+            if (sc === _1n$1)
                 return this;
             const { endo } = CURVE;
             if (!endo)
-                return wnaf.unsafeLadder(this, n);
+                return wnaf.unsafeLadder(this, sc);
             // Apply endomorphism
-            let { k1neg, k1, k2neg, k2 } = endo.splitScalar(n);
+            let { k1neg, k1, k2neg, k2 } = endo.splitScalar(sc);
             let k1p = I;
             let k2p = I;
             let d = this;
@@ -13555,12 +13515,11 @@ function weierstrassPoints(opts) {
          * @returns New point
          */
         multiply(scalar) {
-            assertGE(scalar);
-            let n = scalar;
+            const { endo, n: N } = CURVE;
+            aInRange('scalar', scalar, _1n$1, N);
             let point, fake; // Fake point is used to const-time mult
-            const { endo } = CURVE;
             if (endo) {
-                const { k1neg, k1, k2neg, k2 } = endo.splitScalar(n);
+                const { k1neg, k1, k2neg, k2 } = endo.splitScalar(scalar);
                 let { p: k1p, f: f1p } = this.wNAF(k1);
                 let { p: k2p, f: f2p } = this.wNAF(k2);
                 k1p = wnaf.constTimeNegate(k1neg, k1p);
@@ -13570,7 +13529,7 @@ function weierstrassPoints(opts) {
                 fake = f1p.add(f2p);
             }
             else {
-                const { p, f } = this.wNAF(n);
+                const { p, f } = this.wNAF(scalar);
                 point = p;
                 fake = f;
             }
@@ -13594,20 +13553,7 @@ function weierstrassPoints(opts) {
         // Can accept precomputed Z^-1 - for example, from invertBatch.
         // (x, y, z) ∋ (x=x/z, y=y/z)
         toAffine(iz) {
-            const { px: x, py: y, pz: z } = this;
-            const is0 = this.is0();
-            // If invZ was 0, we return zero point. However we still want to execute
-            // all operations, so we replace invZ with a random number, 1.
-            if (iz == null)
-                iz = is0 ? Fp.ONE : Fp.inv(z);
-            const ax = Fp.mul(x, iz);
-            const ay = Fp.mul(y, iz);
-            const zz = Fp.mul(z, iz);
-            if (is0)
-                return { x: Fp.ZERO, y: Fp.ZERO };
-            if (!Fp.eql(zz, Fp.ONE))
-                throw new Error('invZ was invalid');
-            return { x: ax, y: ay };
+            return toAffineMemo(this, iz);
         }
         isTorsionFree() {
             const { h: cofactor, isTorsionFree } = CURVE;
@@ -13626,10 +13572,12 @@ function weierstrassPoints(opts) {
             return this.multiplyUnsafe(CURVE.h);
         }
         toRawBytes(isCompressed = true) {
+            abool('isCompressed', isCompressed);
             this.assertValidity();
             return toBytes(Point, this, isCompressed);
         }
         toHex(isCompressed = true) {
+            abool('isCompressed', isCompressed);
             return bytesToHex(this.toRawBytes(isCompressed));
         }
     }
@@ -13659,14 +13607,18 @@ function validateOpts(curve) {
     });
     return Object.freeze({ lowS: true, ...opts });
 }
+/**
+ * Creates short weierstrass curve and ECDSA signature methods for it.
+ * @example
+ * import { Field } from '@noble/curves/abstract/modular';
+ * // Before that, define BigInt-s: a, b, p, n, Gx, Gy
+ * const curve = weierstrass({ a, b, Fp: Field(p), n, Gx, Gy, h: 1n })
+ */
 function weierstrass(curveDef) {
     const CURVE = validateOpts(curveDef);
     const { Fp, n: CURVE_ORDER } = CURVE;
     const compressedLen = Fp.BYTES + 1; // e.g. 33 for 32
     const uncompressedLen = 2 * Fp.BYTES + 1; // e.g. 65 for 32
-    function isValidFieldElement(num) {
-        return _0n < num && num < Fp.ORDER; // 0 is banned since it's not invertible FE
-    }
     function modN(a) {
         return mod(a, CURVE_ORDER);
     }
@@ -13679,6 +13631,7 @@ function weierstrass(curveDef) {
             const a = point.toAffine();
             const x = Fp.toBytes(a.x);
             const cat = concatBytes;
+            abool('isCompressed', isCompressed);
             if (isCompressed) {
                 return cat(Uint8Array.from([point.hasEvenY() ? 0x02 : 0x03]), x);
             }
@@ -13693,7 +13646,7 @@ function weierstrass(curveDef) {
             // this.assertValidity() is done inside of fromHex
             if (len === compressedLen && (head === 0x02 || head === 0x03)) {
                 const x = bytesToNumberBE(tail);
-                if (!isValidFieldElement(x))
+                if (!inRange(x, _1n$1, Fp.ORDER))
                     throw new Error('Point is not on curve');
                 const y2 = weierstrassEquation(x); // y² = x³ + ax + b
                 let y;
@@ -13754,11 +13707,8 @@ function weierstrass(curveDef) {
             return new Signature(r, s);
         }
         assertValidity() {
-            // can use assertGE here
-            if (!isWithinCurveOrder(this.r))
-                throw new Error('r must be 0 < r < CURVE.n');
-            if (!isWithinCurveOrder(this.s))
-                throw new Error('s must be 0 < s < CURVE.n');
+            aInRange('r', this.r, _1n$1, CURVE_ORDER); // r in [1..N]
+            aInRange('s', this.s, _1n$1, CURVE_ORDER); // s in [1..N]
         }
         addRecoveryBit(recovery) {
             return new Signature(this.r, this.s, recovery);
@@ -13901,10 +13851,7 @@ function weierstrass(curveDef) {
      * Converts to bytes. Checks if num in `[0..ORDER_MASK-1]` e.g.: `[0..2^256-1]`.
      */
     function int2octets(num) {
-        if (typeof num !== 'bigint')
-            throw new Error('bigint expected');
-        if (!(_0n <= num && num < ORDER_MASK))
-            throw new Error(`bigint expected < 2^${CURVE.nBitLength}`);
+        aInRange(`num < 2^${CURVE.nBitLength}`, num, _0n, ORDER_MASK);
         // works with order, can have different size than numToField!
         return numberToBytesBE(num, CURVE.nByteLength);
     }
@@ -13921,6 +13868,7 @@ function weierstrass(curveDef) {
         if (lowS == null)
             lowS = true; // RFC6979 3.2: we skip step A, because we already provide hash
         msgHash = ensureBytes('msgHash', msgHash);
+        validateSigVerOpts(opts);
         if (prehash)
             msgHash = ensureBytes('prehashed msgHash', hash(msgHash));
         // We can't later call bits2octets, since nested bits2int is broken for curves
@@ -14007,6 +13955,7 @@ function weierstrass(curveDef) {
         publicKey = ensureBytes('publicKey', publicKey);
         if ('strict' in opts)
             throw new Error('options.strict was renamed to lowS');
+        validateSigVerOpts(opts);
         const { lowS, prehash } = opts;
         let _sig = undefined;
         let P;
@@ -14113,6 +14062,9 @@ function sqrtMod(y) {
     return root;
 }
 const Fp = Field(secp256k1P, undefined, undefined, { sqrt: sqrtMod });
+/**
+ * secp256k1 short weierstrass curve and ECDSA signatures over it.
+ */
 const secp256k1 = createCurve({
     a: BigInt(0), // equation params: a, b
     b: BigInt(7), // Seem to be rigid: bitcointalk.org/index.php?topic=289795.msg3183975#msg3183975
@@ -14171,14 +14123,14 @@ function hashAndSign(key, msg) {
     if (isPromise$1(p)) {
         return p.then(({ digest }) => secp256k1.sign(digest, key).toDERRawBytes())
             .catch(err => {
-            throw new CodeError$1(String(err), 'ERR_INVALID_INPUT');
+            throw new CodeError(String(err), 'ERR_INVALID_INPUT');
         });
     }
     try {
         return secp256k1.sign(p.digest, key).toDERRawBytes();
     }
     catch (err) {
-        throw new CodeError$1(String(err), 'ERR_INVALID_INPUT');
+        throw new CodeError(String(err), 'ERR_INVALID_INPUT');
     }
 }
 /**
@@ -14189,14 +14141,14 @@ function hashAndVerify(key, sig, msg) {
     if (isPromise$1(p)) {
         return p.then(({ digest }) => secp256k1.verify(sig, digest, key))
             .catch(err => {
-            throw new CodeError$1(String(err), 'ERR_INVALID_INPUT');
+            throw new CodeError(String(err), 'ERR_INVALID_INPUT');
         });
     }
     try {
         return secp256k1.verify(sig, p.digest, key);
     }
     catch (err) {
-        throw new CodeError$1(String(err), 'ERR_INVALID_INPUT');
+        throw new CodeError(String(err), 'ERR_INVALID_INPUT');
     }
 }
 function compressPublicKey(key) {
@@ -14208,7 +14160,7 @@ function validatePrivateKey(key) {
         secp256k1.getPublicKey(key, true);
     }
     catch (err) {
-        throw new CodeError$1(String(err), 'ERR_INVALID_PRIVATE_KEY');
+        throw new CodeError(String(err), 'ERR_INVALID_PRIVATE_KEY');
     }
 }
 function validatePublicKey(key) {
@@ -14216,7 +14168,7 @@ function validatePublicKey(key) {
         secp256k1.ProjectivePoint.fromHex(key);
     }
     catch (err) {
-        throw new CodeError$1(String(err), 'ERR_INVALID_PUBLIC_KEY');
+        throw new CodeError(String(err), 'ERR_INVALID_PUBLIC_KEY');
     }
 }
 function computePublicKey(privateKey) {
@@ -14224,7 +14176,7 @@ function computePublicKey(privateKey) {
         return secp256k1.getPublicKey(privateKey, true);
     }
     catch (err) {
-        throw new CodeError$1(String(err), 'ERR_INVALID_PRIVATE_KEY');
+        throw new CodeError(String(err), 'ERR_INVALID_PRIVATE_KEY');
     }
 }
 
@@ -14314,7 +14266,7 @@ class Secp256k1PrivateKey {
             return exporter(this.bytes, password);
         }
         else {
-            throw new CodeError$1(`export format '${format}' is not supported`, 'ERR_INVALID_EXPORT_FORMAT');
+            throw new CodeError(`export format '${format}' is not supported`, 'ERR_INVALID_EXPORT_FORMAT');
         }
     }
 }
@@ -14356,7 +14308,7 @@ const supportedKeys = {
 };
 function unsupportedKey(type) {
     const supported = Object.keys(supportedKeys).join(' / ');
-    return new CodeError$1(`invalid or unsupported key type ${type}. Must be ${supported}`, 'ERR_UNSUPPORTED_KEY_TYPE');
+    return new CodeError(`invalid or unsupported key type ${type}. Must be ${supported}`, 'ERR_UNSUPPORTED_KEY_TYPE');
 }
 function typeToKey(type) {
     type = type.toLowerCase();
@@ -14541,6 +14493,41 @@ class Secp256k1PeerIdImpl extends PeerIdImpl {
         this.publicKey = init.multihash.digest;
     }
 }
+// these values are from https://github.com/multiformats/multicodec/blob/master/table.csv
+const TRANSPORT_IPFS_GATEWAY_HTTP_CODE = 0x0920;
+class URLPeerIdImpl {
+    type = 'url';
+    multihash;
+    privateKey;
+    publicKey;
+    url;
+    constructor(url) {
+        this.url = url.toString();
+        this.multihash = identity.digest(fromString(this.url));
+    }
+    [inspect]() {
+        return `PeerId(${this.url})`;
+    }
+    [peerIdSymbol] = true;
+    toString() {
+        return this.toCID().toString();
+    }
+    toCID() {
+        return CID.createV1(TRANSPORT_IPFS_GATEWAY_HTTP_CODE, this.multihash);
+    }
+    toBytes() {
+        return this.toCID().bytes;
+    }
+    equals(other) {
+        if (other == null) {
+            return false;
+        }
+        if (other instanceof Uint8Array) {
+            other = toString$6(other);
+        }
+        return other.toString() === this.toString();
+    }
+}
 function peerIdFromString(str, decoder) {
     if (str.charAt(0) === '1' || str.charAt(0) === 'Q') {
         // identity hash ed25519/secp256k1 key or sha2-256 hash of
@@ -14579,9 +14566,13 @@ function peerIdFromBytes(buf) {
     throw new Error('Supplied PeerID CID is invalid');
 }
 function peerIdFromCID(cid) {
-    if (cid == null || cid.multihash == null || cid.version == null || (cid.version === 1 && cid.code !== LIBP2P_KEY_CODE)) {
+    if (cid?.multihash == null || cid.version == null || (cid.version === 1 && (cid.code !== LIBP2P_KEY_CODE) && cid.code !== TRANSPORT_IPFS_GATEWAY_HTTP_CODE)) {
         throw new Error('Supplied PeerID CID is invalid');
     }
+    if (cid.code === TRANSPORT_IPFS_GATEWAY_HTTP_CODE) {
+        const url = toString$6(cid.multihash.digest);
+        return new URLPeerIdImpl(new URL(url));
+    }
     const multihash = cid.multihash;
     if (multihash.code === sha256.code) {
         return new RSAPeerIdImpl({ multihash: cid.multihash });
@@ -15427,9 +15418,6 @@ function isHexString(value, length) {
     if (typeof (value) !== "string" || !value.match(/^0x[0-9A-Fa-f]*$/)) {
         return false;
     }
-    if (length && value.length !== 2 + 2 * length) {
-        return false;
-    }
     return true;
 }
 const HexCharacters = "0123456789abcdef";
@@ -17853,7 +17841,7 @@ if (!AbortError$1) {
 AbortError$1.prototype.name = 'AbortError';
 AbortError$1.prototype.code = 'ABORT_ERR';
 
-const URL = (typeof globalThis !== 'undefined' && globalThis.URL) || require('url').URL;
+const URL$1 = (typeof globalThis !== 'undefined' && globalThis.URL) || require('url').URL;
 
 class HTTPStatusError extends Error {
   constructor (uri, code, method) {
@@ -18102,7 +18090,7 @@ class HTTPEndpoint extends BaseEndpoint {
     }
     const url = `${this.protocol}//${safeHost(this.host)}:${this.port}${this.path}`;
     try {
-      this.url = new URL(url);
+      this.url = new URL$1(url);
     } catch (err) {
       throw new Error(err.message + ` [${url}]`)
     }
@@ -18184,7 +18172,7 @@ async function loadJSON (url, cache, timeout, abortSignal) {
 
 function requestRaw (url, method, data, timeout, abortSignal) {
   return new Promise((resolve, reject) => {
-    const target = new URL(url);
+    const target = new URL$1(url);
     if (method === 'GET' && data) {
       target.search = '?dns=' + base64URL.decode(data);
     }
@@ -19563,7 +19551,7 @@ function queryDoh (endpoint, query, timeout, abortSignal) {
   )
 }
 
-const UPDATE_URL = new URL('https://martinheidegger.github.io/dns-query/resolvers.json');
+const UPDATE_URL = new URL$1('https://martinheidegger.github.io/dns-query/resolvers.json');
 
 function isNameString (entry) {
   return /^@/.test(entry)
@@ -20918,16 +20906,14 @@ class BaseProtocol {
     components;
     log;
     pubsubTopics;
-    options;
     addLibp2pEventListener;
     removeLibp2pEventListener;
     streamManager;
-    constructor(multicodec, components, log, pubsubTopics, options) {
+    constructor(multicodec, components, log, pubsubTopics) {
         this.multicodec = multicodec;
         this.components = components;
         this.log = log;
         this.pubsubTopics = pubsubTopics;
-        this.options = options;
         this.addLibp2pEventListener = components.events.addEventListener.bind(components.events);
         this.removeLibp2pEventListener = components.events.removeEventListener.bind(components.events);
         this.streamManager = new StreamManager(multicodec, components.connectionManager.getConnections.bind(components.connectionManager), this.addLibp2pEventListener);
@@ -20965,9 +20951,7 @@ class BaseProtocol {
         numPeers: 0
     }) {
         // Retrieve all connected peers that support the protocol & shard (if configured)
-        const connectedPeersForProtocolAndShard = await getConnectedPeersForProtocolAndShard(this.components.connectionManager.getConnections(), this.peerStore, [this.multicodec], this.options?.shardInfo
-            ? ensureShardingConfigured(this.options.shardInfo).shardInfo
-            : undefined);
+        const connectedPeersForProtocolAndShard = await getConnectedPeersForProtocolAndShard(this.components.connectionManager.getConnections(), this.peerStore, [this.multicodec], pubsubTopicsToShardInfo(this.pubsubTopics));
         // Filter the peers based on discovery & number of peers requested
         const filteredPeers = filterPeersByDiscovery(connectedPeersForProtocolAndShard, numPeers, maxBootstrapPeers);
         // Sort the peers by latency
@@ -21657,74 +21641,35 @@ encode.single = (chunk, options) => {
 };
 
 /**
- * @typedef {{ [key: string]: any }} Extensions
- * @typedef {Error} Err
- * @property {string} message
+ * The reported length of the next data message was not a positive integer
  */
-
+class InvalidMessageLengthError extends Error {
+    name = 'InvalidMessageLengthError';
+    code = 'ERR_INVALID_MSG_LENGTH';
+}
 /**
- *
- * @param {Error} obj
- * @param {Extensions} props
- * @returns {Error & Extensions}
+ * The reported length of the next data message was larger than the configured
+ * max allowable value
  */
-function assign(obj, props) {
-    for (const key in props) {
-        Object.defineProperty(obj, key, {
-            value: props[key],
-            enumerable: true,
-            configurable: true,
-        });
-    }
-
-    return obj;
+class InvalidDataLengthError extends Error {
+    name = 'InvalidDataLengthError';
+    code = 'ERR_MSG_DATA_TOO_LONG';
 }
-
 /**
- *
- * @param {any} err - An Error
- * @param {string|Extensions} code - A string code or props to set on the error
- * @param {Extensions} [props] - Props to set on the error
- * @returns {Error & Extensions}
+ * The varint used to specify the length of the next data message contained more
+ * bytes than the configured max allowable value
  */
-function createError(err, code, props) {
-    if (!err || typeof err === 'string') {
-        throw new TypeError('Please pass an Error to err-code');
-    }
-
-    if (!props) {
-        props = {};
-    }
-
-    if (typeof code === 'object') {
-        props = code;
-        code = '';
-    }
-
-    if (code) {
-        props.code = code;
-    }
-
-    try {
-        return assign(err, props);
-    } catch (_) {
-        props.message = err.message;
-        props.stack = err.stack;
-
-        const ErrClass = function () {};
-
-        ErrClass.prototype = Object.create(Object.getPrototypeOf(err));
-
-        // @ts-ignore
-        const output = assign(new ErrClass(), props);
-
-        return output;
-    }
+class InvalidDataLengthLengthError extends Error {
+    name = 'InvalidDataLengthLengthError';
+    code = 'ERR_MSG_LENGTH_TOO_LONG';
+}
+/**
+ * The incoming stream ended before the expected number of bytes were read
+ */
+class UnexpectedEOFError extends Error {
+    name = 'UnexpectedEOFError';
+    code = 'ERR_UNEXPECTED_EOF';
 }
-
-var errCode = createError;
-
-var errCode$1 = /*@__PURE__*/getDefaultExportFromCjs(errCode);
 
 /* eslint max-depth: ["error", 6] */
 // Maximum length of the length section of the message
@@ -21756,10 +21701,10 @@ function decode(source, options) {
                 try {
                     dataLength = lengthDecoder(buffer);
                     if (dataLength < 0) {
-                        throw errCode$1(new Error('invalid message length'), 'ERR_INVALID_MSG_LENGTH');
+                        throw new InvalidMessageLengthError('Invalid message length');
                     }
                     if (dataLength > maxDataLength) {
-                        throw errCode$1(new Error('message length too long'), 'ERR_MSG_DATA_TOO_LONG');
+                        throw new InvalidDataLengthError('Message length too long');
                     }
                     const dataLengthLength = lengthDecoder.bytes;
                     buffer.consume(dataLengthLength);
@@ -21771,7 +21716,7 @@ function decode(source, options) {
                 catch (err) {
                     if (err instanceof RangeError) {
                         if (buffer.byteLength > maxLengthLength) {
-                            throw errCode$1(new Error('message length length too long'), 'ERR_MSG_LENGTH_TOO_LONG');
+                            throw new InvalidDataLengthLengthError('Message length length too long');
                         }
                         break;
                     }
@@ -21800,7 +21745,7 @@ function decode(source, options) {
                 yield* maybeYield();
             }
             if (buffer.byteLength > 0) {
-                throw errCode$1(new Error('unexpected end of input'), 'ERR_UNEXPECTED_EOF');
+                throw new UnexpectedEOFError('Unexpected end of input');
             }
         })();
     }
@@ -21810,7 +21755,7 @@ function decode(source, options) {
             yield* maybeYield();
         }
         if (buffer.byteLength > 0) {
-            throw errCode$1(new Error('unexpected end of input'), 'ERR_UNEXPECTED_EOF');
+            throw new UnexpectedEOFError('Unexpected end of input');
         }
     })();
 }
@@ -22645,7 +22590,7 @@ var FilterRequest;
                         }
                         case 3: {
                             if (opts.limits?.contentFilters != null && obj.contentFilters.length === opts.limits.contentFilters) {
-                                throw new CodeError('decode error - map field "contentFilters" had too many elements', 'ERR_MAX_LENGTH');
+                                throw new MaxLengthError('Decode error - map field "contentFilters" had too many elements');
                             }
                             obj.contentFilters.push(FilterRequest.ContentFilter.codec().decode(reader, reader.uint32(), {
                                 limits: opts.limits?.contentFilters$
@@ -22698,7 +22643,7 @@ var MessagePush$1;
                     switch (tag >>> 3) {
                         case 1: {
                             if (opts.limits?.messages != null && obj.messages.length === opts.limits.messages) {
-                                throw new CodeError('decode error - map field "messages" had too many elements', 'ERR_MAX_LENGTH');
+                                throw new MaxLengthError('Decode error - map field "messages" had too many elements');
                             }
                             obj.messages.push(WakuMessage$3.codec().decode(reader, reader.uint32(), {
                                 limits: opts.limits?.messages$
@@ -23117,7 +23062,7 @@ var FilterSubscribeRequest;
                         }
                         case 11: {
                             if (opts.limits?.contentTopics != null && obj.contentTopics.length === opts.limits.contentTopics) {
-                                throw new CodeError('decode error - map field "contentTopics" had too many elements', 'ERR_MAX_LENGTH');
+                                throw new MaxLengthError('Decode error - map field "contentTopics" had too many elements');
                             }
                             obj.contentTopics.push(reader.string());
                             break;
@@ -23839,113 +23784,26 @@ var WakuMessage$1;
 /* eslint-disable @typescript-eslint/no-namespace */
 /* eslint-disable @typescript-eslint/no-unnecessary-boolean-literal-compare */
 /* eslint-disable @typescript-eslint/no-empty-interface */
-var Index;
-(function (Index) {
+var WakuMessageKeyValue;
+(function (WakuMessageKeyValue) {
     let _codec;
-    Index.codec = () => {
+    WakuMessageKeyValue.codec = () => {
         if (_codec == null) {
             _codec = message((obj, w, opts = {}) => {
                 if (opts.lengthDelimited !== false) {
                     w.fork();
                 }
-                if ((obj.digest != null && obj.digest.byteLength > 0)) {
+                if (obj.messageHash != null) {
                     w.uint32(10);
-                    w.bytes(obj.digest);
+                    w.bytes(obj.messageHash);
                 }
-                if ((obj.receiverTime != null && obj.receiverTime !== 0n)) {
-                    w.uint32(16);
-                    w.sint64(obj.receiverTime);
-                }
-                if ((obj.senderTime != null && obj.senderTime !== 0n)) {
-                    w.uint32(24);
-                    w.sint64(obj.senderTime);
-                }
-                if ((obj.pubsubTopic != null && obj.pubsubTopic !== '')) {
-                    w.uint32(34);
-                    w.string(obj.pubsubTopic);
-                }
-                if (opts.lengthDelimited !== false) {
-                    w.ldelim();
-                }
-            }, (reader, length, opts = {}) => {
-                const obj = {
-                    digest: alloc$2(0),
-                    receiverTime: 0n,
-                    senderTime: 0n,
-                    pubsubTopic: ''
-                };
-                const end = length == null ? reader.len : reader.pos + length;
-                while (reader.pos < end) {
-                    const tag = reader.uint32();
-                    switch (tag >>> 3) {
-                        case 1: {
-                            obj.digest = reader.bytes();
-                            break;
-                        }
-                        case 2: {
-                            obj.receiverTime = reader.sint64();
-                            break;
-                        }
-                        case 3: {
-                            obj.senderTime = reader.sint64();
-                            break;
-                        }
-                        case 4: {
-                            obj.pubsubTopic = reader.string();
-                            break;
-                        }
-                        default: {
-                            reader.skipType(tag & 7);
-                            break;
-                        }
-                    }
-                }
-                return obj;
-            });
-        }
-        return _codec;
-    };
-    Index.encode = (obj) => {
-        return encodeMessage(obj, Index.codec());
-    };
-    Index.decode = (buf, opts) => {
-        return decodeMessage(buf, Index.codec(), opts);
-    };
-})(Index || (Index = {}));
-var PagingInfo;
-(function (PagingInfo) {
-    (function (Direction) {
-        Direction["BACKWARD"] = "BACKWARD";
-        Direction["FORWARD"] = "FORWARD";
-    })(PagingInfo.Direction || (PagingInfo.Direction = {}));
-    let __DirectionValues;
-    (function (__DirectionValues) {
-        __DirectionValues[__DirectionValues["BACKWARD"] = 0] = "BACKWARD";
-        __DirectionValues[__DirectionValues["FORWARD"] = 1] = "FORWARD";
-    })(__DirectionValues || (__DirectionValues = {}));
-    (function (Direction) {
-        Direction.codec = () => {
-            return enumeration(__DirectionValues);
-        };
-    })(PagingInfo.Direction || (PagingInfo.Direction = {}));
-    let _codec;
-    PagingInfo.codec = () => {
-        if (_codec == null) {
-            _codec = message((obj, w, opts = {}) => {
-                if (opts.lengthDelimited !== false) {
-                    w.fork();
-                }
-                if (obj.pageSize != null) {
-                    w.uint32(8);
-                    w.uint64(obj.pageSize);
-                }
-                if (obj.cursor != null) {
+                if (obj.message != null) {
                     w.uint32(18);
-                    Index.codec().encode(obj.cursor, w);
+                    WakuMessage.codec().encode(obj.message, w);
                 }
-                if (obj.direction != null) {
-                    w.uint32(24);
-                    PagingInfo.Direction.codec().encode(obj.direction, w);
+                if (obj.pubsubTopic != null) {
+                    w.uint32(26);
+                    w.string(obj.pubsubTopic);
                 }
                 if (opts.lengthDelimited !== false) {
                     w.ldelim();
@@ -23957,17 +23815,17 @@ var PagingInfo;
                     const tag = reader.uint32();
                     switch (tag >>> 3) {
                         case 1: {
-                            obj.pageSize = reader.uint64();
+                            obj.messageHash = reader.bytes();
                             break;
                         }
                         case 2: {
-                            obj.cursor = Index.codec().decode(reader, reader.uint32(), {
-                                limits: opts.limits?.cursor
+                            obj.message = WakuMessage.codec().decode(reader, reader.uint32(), {
+                                limits: opts.limits?.message
                             });
                             break;
                         }
                         case 3: {
-                            obj.direction = PagingInfo.Direction.codec().decode(reader);
+                            obj.pubsubTopic = reader.string();
                             break;
                         }
                         default: {
@@ -23981,217 +23839,125 @@ var PagingInfo;
         }
         return _codec;
     };
-    PagingInfo.encode = (obj) => {
-        return encodeMessage(obj, PagingInfo.codec());
+    WakuMessageKeyValue.encode = (obj) => {
+        return encodeMessage(obj, WakuMessageKeyValue.codec());
     };
-    PagingInfo.decode = (buf, opts) => {
-        return decodeMessage(buf, PagingInfo.codec(), opts);
+    WakuMessageKeyValue.decode = (buf, opts) => {
+        return decodeMessage(buf, WakuMessageKeyValue.codec(), opts);
     };
-})(PagingInfo || (PagingInfo = {}));
-var ContentFilter;
-(function (ContentFilter) {
+})(WakuMessageKeyValue || (WakuMessageKeyValue = {}));
+var StoreQueryRequest;
+(function (StoreQueryRequest) {
     let _codec;
-    ContentFilter.codec = () => {
+    StoreQueryRequest.codec = () => {
         if (_codec == null) {
             _codec = message((obj, w, opts = {}) => {
                 if (opts.lengthDelimited !== false) {
                     w.fork();
                 }
-                if ((obj.contentTopic != null && obj.contentTopic !== '')) {
+                if ((obj.requestId != null && obj.requestId !== '')) {
                     w.uint32(10);
-                    w.string(obj.contentTopic);
+                    w.string(obj.requestId);
                 }
-                if (opts.lengthDelimited !== false) {
-                    w.ldelim();
+                if ((obj.includeData != null && obj.includeData !== false)) {
+                    w.uint32(16);
+                    w.bool(obj.includeData);
                 }
-            }, (reader, length, opts = {}) => {
-                const obj = {
-                    contentTopic: ''
-                };
-                const end = length == null ? reader.len : reader.pos + length;
-                while (reader.pos < end) {
-                    const tag = reader.uint32();
-                    switch (tag >>> 3) {
-                        case 1: {
-                            obj.contentTopic = reader.string();
-                            break;
-                        }
-                        default: {
-                            reader.skipType(tag & 7);
-                            break;
-                        }
+                if (obj.pubsubTopic != null) {
+                    w.uint32(82);
+                    w.string(obj.pubsubTopic);
+                }
+                if (obj.contentTopics != null) {
+                    for (const value of obj.contentTopics) {
+                        w.uint32(90);
+                        w.string(value);
                     }
                 }
-                return obj;
-            });
-        }
-        return _codec;
-    };
-    ContentFilter.encode = (obj) => {
-        return encodeMessage(obj, ContentFilter.codec());
-    };
-    ContentFilter.decode = (buf, opts) => {
-        return decodeMessage(buf, ContentFilter.codec(), opts);
-    };
-})(ContentFilter || (ContentFilter = {}));
-var HistoryQuery;
-(function (HistoryQuery) {
-    let _codec;
-    HistoryQuery.codec = () => {
-        if (_codec == null) {
-            _codec = message((obj, w, opts = {}) => {
-                if (opts.lengthDelimited !== false) {
-                    w.fork();
+                if (obj.timeStart != null) {
+                    w.uint32(96);
+                    w.sint64(obj.timeStart);
                 }
-                if (obj.pubsubTopic != null) {
-                    w.uint32(18);
-                    w.string(obj.pubsubTopic);
+                if (obj.timeEnd != null) {
+                    w.uint32(104);
+                    w.sint64(obj.timeEnd);
                 }
-                if (obj.contentFilters != null) {
-                    for (const value of obj.contentFilters) {
-                        w.uint32(26);
-                        ContentFilter.codec().encode(value, w);
+                if (obj.messageHashes != null) {
+                    for (const value of obj.messageHashes) {
+                        w.uint32(162);
+                        w.bytes(value);
                     }
                 }
-                if (obj.pagingInfo != null) {
-                    w.uint32(34);
-                    PagingInfo.codec().encode(obj.pagingInfo, w);
+                if (obj.paginationCursor != null) {
+                    w.uint32(410);
+                    w.bytes(obj.paginationCursor);
                 }
-                if (obj.startTime != null) {
-                    w.uint32(40);
-                    w.sint64(obj.startTime);
+                if ((obj.paginationForward != null && obj.paginationForward !== false)) {
+                    w.uint32(416);
+                    w.bool(obj.paginationForward);
                 }
-                if (obj.endTime != null) {
-                    w.uint32(48);
-                    w.sint64(obj.endTime);
+                if (obj.paginationLimit != null) {
+                    w.uint32(424);
+                    w.uint64(obj.paginationLimit);
                 }
                 if (opts.lengthDelimited !== false) {
                     w.ldelim();
                 }
             }, (reader, length, opts = {}) => {
                 const obj = {
-                    contentFilters: []
+                    requestId: '',
+                    includeData: false,
+                    contentTopics: [],
+                    messageHashes: [],
+                    paginationForward: false
                 };
                 const end = length == null ? reader.len : reader.pos + length;
                 while (reader.pos < end) {
                     const tag = reader.uint32();
                     switch (tag >>> 3) {
-                        case 2: {
-                            obj.pubsubTopic = reader.string();
+                        case 1: {
+                            obj.requestId = reader.string();
                             break;
                         }
-                        case 3: {
-                            if (opts.limits?.contentFilters != null && obj.contentFilters.length === opts.limits.contentFilters) {
-                                throw new CodeError('decode error - map field "contentFilters" had too many elements', 'ERR_MAX_LENGTH');
-                            }
-                            obj.contentFilters.push(ContentFilter.codec().decode(reader, reader.uint32(), {
-                                limits: opts.limits?.contentFilters$
-                            }));
+                        case 2: {
+                            obj.includeData = reader.bool();
                             break;
                         }
-                        case 4: {
-                            obj.pagingInfo = PagingInfo.codec().decode(reader, reader.uint32(), {
-                                limits: opts.limits?.pagingInfo
-                            });
+                        case 10: {
+                            obj.pubsubTopic = reader.string();
                             break;
                         }
-                        case 5: {
-                            obj.startTime = reader.sint64();
+                        case 11: {
+                            if (opts.limits?.contentTopics != null && obj.contentTopics.length === opts.limits.contentTopics) {
+                                throw new MaxLengthError('Decode error - map field "contentTopics" had too many elements');
+                            }
+                            obj.contentTopics.push(reader.string());
                             break;
                         }
-                        case 6: {
-                            obj.endTime = reader.sint64();
+                        case 12: {
+                            obj.timeStart = reader.sint64();
                             break;
                         }
-                        default: {
-                            reader.skipType(tag & 7);
+                        case 13: {
+                            obj.timeEnd = reader.sint64();
                             break;
                         }
-                    }
-                }
-                return obj;
-            });
-        }
-        return _codec;
-    };
-    HistoryQuery.encode = (obj) => {
-        return encodeMessage(obj, HistoryQuery.codec());
-    };
-    HistoryQuery.decode = (buf, opts) => {
-        return decodeMessage(buf, HistoryQuery.codec(), opts);
-    };
-})(HistoryQuery || (HistoryQuery = {}));
-var HistoryResponse;
-(function (HistoryResponse) {
-    let HistoryError;
-    (function (HistoryError) {
-        HistoryError["NONE"] = "NONE";
-        HistoryError["INVALID_CURSOR"] = "INVALID_CURSOR";
-        HistoryError["TOO_MANY_REQUESTS"] = "TOO_MANY_REQUESTS";
-        HistoryError["SERVICE_UNAVAILABLE"] = "SERVICE_UNAVAILABLE";
-    })(HistoryError = HistoryResponse.HistoryError || (HistoryResponse.HistoryError = {}));
-    let __HistoryErrorValues;
-    (function (__HistoryErrorValues) {
-        __HistoryErrorValues[__HistoryErrorValues["NONE"] = 0] = "NONE";
-        __HistoryErrorValues[__HistoryErrorValues["INVALID_CURSOR"] = 1] = "INVALID_CURSOR";
-        __HistoryErrorValues[__HistoryErrorValues["TOO_MANY_REQUESTS"] = 429] = "TOO_MANY_REQUESTS";
-        __HistoryErrorValues[__HistoryErrorValues["SERVICE_UNAVAILABLE"] = 503] = "SERVICE_UNAVAILABLE";
-    })(__HistoryErrorValues || (__HistoryErrorValues = {}));
-    (function (HistoryError) {
-        HistoryError.codec = () => {
-            return enumeration(__HistoryErrorValues);
-        };
-    })(HistoryError = HistoryResponse.HistoryError || (HistoryResponse.HistoryError = {}));
-    let _codec;
-    HistoryResponse.codec = () => {
-        if (_codec == null) {
-            _codec = message((obj, w, opts = {}) => {
-                if (opts.lengthDelimited !== false) {
-                    w.fork();
-                }
-                if (obj.messages != null) {
-                    for (const value of obj.messages) {
-                        w.uint32(18);
-                        WakuMessage.codec().encode(value, w);
-                    }
-                }
-                if (obj.pagingInfo != null) {
-                    w.uint32(26);
-                    PagingInfo.codec().encode(obj.pagingInfo, w);
-                }
-                if (obj.error != null && __HistoryErrorValues[obj.error] !== 0) {
-                    w.uint32(32);
-                    HistoryResponse.HistoryError.codec().encode(obj.error, w);
-                }
-                if (opts.lengthDelimited !== false) {
-                    w.ldelim();
-                }
-            }, (reader, length, opts = {}) => {
-                const obj = {
-                    messages: [],
-                    error: HistoryError.NONE
-                };
-                const end = length == null ? reader.len : reader.pos + length;
-                while (reader.pos < end) {
-                    const tag = reader.uint32();
-                    switch (tag >>> 3) {
-                        case 2: {
-                            if (opts.limits?.messages != null && obj.messages.length === opts.limits.messages) {
-                                throw new CodeError('decode error - map field "messages" had too many elements', 'ERR_MAX_LENGTH');
+                        case 20: {
+                            if (opts.limits?.messageHashes != null && obj.messageHashes.length === opts.limits.messageHashes) {
+                                throw new MaxLengthError('Decode error - map field "messageHashes" had too many elements');
                             }
-                            obj.messages.push(WakuMessage.codec().decode(reader, reader.uint32(), {
-                                limits: opts.limits?.messages$
-                            }));
+                            obj.messageHashes.push(reader.bytes());
                             break;
                         }
-                        case 3: {
-                            obj.pagingInfo = PagingInfo.codec().decode(reader, reader.uint32(), {
-                                limits: opts.limits?.pagingInfo
-                            });
+                        case 51: {
+                            obj.paginationCursor = reader.bytes();
                             break;
                         }
-                        case 4: {
-                            obj.error = HistoryResponse.HistoryError.codec().decode(reader);
+                        case 52: {
+                            obj.paginationForward = reader.bool();
+                            break;
+                        }
+                        case 53: {
+                            obj.paginationLimit = reader.uint64();
                             break;
                         }
                         default: {
@@ -24205,17 +23971,17 @@ var HistoryResponse;
         }
         return _codec;
     };
-    HistoryResponse.encode = (obj) => {
-        return encodeMessage(obj, HistoryResponse.codec());
+    StoreQueryRequest.encode = (obj) => {
+        return encodeMessage(obj, StoreQueryRequest.codec());
     };
-    HistoryResponse.decode = (buf, opts) => {
-        return decodeMessage(buf, HistoryResponse.codec(), opts);
+    StoreQueryRequest.decode = (buf, opts) => {
+        return decodeMessage(buf, StoreQueryRequest.codec(), opts);
     };
-})(HistoryResponse || (HistoryResponse = {}));
-var HistoryRpc;
-(function (HistoryRpc) {
+})(StoreQueryRequest || (StoreQueryRequest = {}));
+var StoreQueryResponse;
+(function (StoreQueryResponse) {
     let _codec;
-    HistoryRpc.codec = () => {
+    StoreQueryResponse.codec = () => {
         if (_codec == null) {
             _codec = message((obj, w, opts = {}) => {
                 if (opts.lengthDelimited !== false) {
@@ -24225,20 +23991,31 @@ var HistoryRpc;
                     w.uint32(10);
                     w.string(obj.requestId);
                 }
-                if (obj.query != null) {
-                    w.uint32(18);
-                    HistoryQuery.codec().encode(obj.query, w);
+                if (obj.statusCode != null) {
+                    w.uint32(80);
+                    w.uint32(obj.statusCode);
                 }
-                if (obj.response != null) {
-                    w.uint32(26);
-                    HistoryResponse.codec().encode(obj.response, w);
+                if (obj.statusDesc != null) {
+                    w.uint32(90);
+                    w.string(obj.statusDesc);
+                }
+                if (obj.messages != null) {
+                    for (const value of obj.messages) {
+                        w.uint32(162);
+                        WakuMessageKeyValue.codec().encode(value, w);
+                    }
+                }
+                if (obj.paginationCursor != null) {
+                    w.uint32(410);
+                    w.bytes(obj.paginationCursor);
                 }
                 if (opts.lengthDelimited !== false) {
                     w.ldelim();
                 }
             }, (reader, length, opts = {}) => {
                 const obj = {
-                    requestId: ''
+                    requestId: '',
+                    messages: []
                 };
                 const end = length == null ? reader.len : reader.pos + length;
                 while (reader.pos < end) {
@@ -24248,16 +24025,25 @@ var HistoryRpc;
                             obj.requestId = reader.string();
                             break;
                         }
-                        case 2: {
-                            obj.query = HistoryQuery.codec().decode(reader, reader.uint32(), {
-                                limits: opts.limits?.query
-                            });
+                        case 10: {
+                            obj.statusCode = reader.uint32();
                             break;
                         }
-                        case 3: {
-                            obj.response = HistoryResponse.codec().decode(reader, reader.uint32(), {
-                                limits: opts.limits?.response
-                            });
+                        case 11: {
+                            obj.statusDesc = reader.string();
+                            break;
+                        }
+                        case 20: {
+                            if (opts.limits?.messages != null && obj.messages.length === opts.limits.messages) {
+                                throw new MaxLengthError('Decode error - map field "messages" had too many elements');
+                            }
+                            obj.messages.push(WakuMessageKeyValue.codec().decode(reader, reader.uint32(), {
+                                limits: opts.limits?.messages$
+                            }));
+                            break;
+                        }
+                        case 51: {
+                            obj.paginationCursor = reader.bytes();
                             break;
                         }
                         default: {
@@ -24271,13 +24057,13 @@ var HistoryRpc;
         }
         return _codec;
     };
-    HistoryRpc.encode = (obj) => {
-        return encodeMessage(obj, HistoryRpc.codec());
+    StoreQueryResponse.encode = (obj) => {
+        return encodeMessage(obj, StoreQueryResponse.codec());
     };
-    HistoryRpc.decode = (buf, opts) => {
-        return decodeMessage(buf, HistoryRpc.codec(), opts);
+    StoreQueryResponse.decode = (buf, opts) => {
+        return decodeMessage(buf, StoreQueryResponse.codec(), opts);
     };
-})(HistoryRpc || (HistoryRpc = {}));
+})(StoreQueryResponse || (StoreQueryResponse = {}));
 var RateLimitProof;
 (function (RateLimitProof) {
     let _codec;
@@ -24597,7 +24383,7 @@ var PeerExchangeResponse;
                     switch (tag >>> 3) {
                         case 1: {
                             if (opts.limits?.peerInfos != null && obj.peerInfos.length === opts.limits.peerInfos) {
-                                throw new CodeError('decode error - map field "peerInfos" had too many elements', 'ERR_MAX_LENGTH');
+                                throw new MaxLengthError('Decode error - map field "peerInfos" had too many elements');
                             }
                             obj.peerInfos.push(PeerInfo.codec().decode(reader, reader.uint32(), {
                                 limits: opts.limits?.peerInfos$
@@ -24720,7 +24506,7 @@ var WakuMetadataRequest;
                         }
                         case 2: {
                             if (opts.limits?.shards != null && obj.shards.length === opts.limits.shards) {
-                                throw new CodeError('decode error - map field "shards" had too many elements', 'ERR_MAX_LENGTH');
+                                throw new MaxLengthError('Decode error - map field "shards" had too many elements');
                             }
                             obj.shards.push(reader.uint32());
                             break;
@@ -24779,7 +24565,7 @@ var WakuMetadataResponse;
                         }
                         case 2: {
                             if (opts.limits?.shards != null && obj.shards.length === opts.limits.shards) {
-                                throw new CodeError('decode error - map field "shards" had too many elements', 'ERR_MAX_LENGTH');
+                                throw new MaxLengthError('Decode error - map field "shards" had too many elements');
                             }
                             obj.shards.push(reader.uint32());
                             break;
@@ -24859,11 +24645,11 @@ class WakuPeerExchange extends BaseProtocol {
      * Make a peer exchange query to a peer
      */
     async query(params) {
-        const { numPeers } = params;
+        const { numPeers, peerId } = params;
         const rpcQuery = PeerExchangeRPC.createRequest({
             numPeers: BigInt(numPeers)
         });
-        const peer = await this.peerStore.get(params.peerId);
+        const peer = await this.peerStore.get(peerId);
         if (!peer) {
             return {
                 peerInfos: null,
@@ -25019,7 +24805,31 @@ class PeerExchangeDiscovery extends TypedEventEmitter {
             }
             const hasPeer = await this.components.peerStore.has(peerId);
             if (hasPeer) {
-                continue;
+                const { hasMultiaddrDiff, hasShardDiff } = await this.checkPeerInfoDiff(peerInfo, shardInfo);
+                if (hasMultiaddrDiff || hasShardDiff) {
+                    log$1.info(`Peer ${peerId.toString()} has updated multiaddrs or shardInfo, updating`);
+                    if (hasMultiaddrDiff) {
+                        log$1.info(`Peer ${peerId.toString()} has updated multiaddrs, updating`);
+                        await this.components.peerStore.patch(peerId, {
+                            multiaddrs: peerInfo.multiaddrs
+                        });
+                    }
+                    if (hasShardDiff && shardInfo) {
+                        log$1.info(`Peer ${peerId.toString()} has updated shardInfo, updating`);
+                        await this.components.peerStore.merge(peerId, {
+                            metadata: {
+                                shardInfo: encodeRelayShard(shardInfo)
+                            }
+                        });
+                        this.dispatchEvent(new CustomEvent("peer", {
+                            detail: {
+                                id: peerId,
+                                multiaddrs: peerInfo.multiaddrs
+                            }
+                        }));
+                    }
+                    continue;
+                }
             }
             // update the tags for the peer
             await this.components.peerStore.save(peerId, {
@@ -25033,6 +24843,9 @@ class PeerExchangeDiscovery extends TypedEventEmitter {
                     metadata: {
                         shardInfo: encodeRelayShard(shardInfo)
                     }
+                }),
+                ...(peerInfo.multiaddrs && {
+                    multiaddrs: peerInfo.multiaddrs
                 })
             });
             log$1.info(`Discovered peer: ${peerId.toString()}`);
@@ -25050,6 +24863,24 @@ class PeerExchangeDiscovery extends TypedEventEmitter {
         this.queryingPeers.delete(peerIdStr);
         this.queryAttempts.delete(peerIdStr);
     }
+    async checkPeerInfoDiff(peerInfo, shardInfo) {
+        const { id: peerId } = peerInfo;
+        const peer = await this.components.peerStore.get(peerId);
+        const existingMultiaddrs = peer.addresses.map((a) => a.multiaddr.toString());
+        const newMultiaddrs = peerInfo.multiaddrs.map((ma) => ma.toString());
+        const hasMultiaddrDiff = existingMultiaddrs.some((ma) => !newMultiaddrs.includes(ma));
+        let hasShardDiff = false;
+        const existingShardInfoBytes = peer.metadata.get("shardInfo");
+        if (existingShardInfoBytes) {
+            const existingShardInfo = decodeRelayShard(existingShardInfoBytes);
+            if (existingShardInfo || shardInfo) {
+                hasShardDiff =
+                    existingShardInfo.clusterId !== shardInfo?.clusterId ||
+                        existingShardInfo.shards.some((shard) => !shardInfo?.shards.includes(shard));
+            }
+        }
+        return { hasMultiaddrDiff, hasShardDiff };
+    }
 }
 function wakuPeerExchangeDiscovery(pubsubTopics) {
     return (components) => new PeerExchangeDiscovery(components, pubsubTopics);
@@ -25095,7 +24926,13 @@ async function createFromParts(multihash, privKey, pubKey) {
         const key = unmarshalPublicKey(pubKey);
         return createFromPubKey(key);
     }
-    return peerIdFromBytes(multihash);
+    const peerId = peerIdFromBytes(multihash);
+    if (peerId.type !== 'Ed25519' && peerId.type !== 'secp256k1' && peerId.type !== 'RSA') {
+        // should not be possible since `multihash` is derived from keys and these
+        // are the cryptographic peer id types
+        throw new Error('Supplied PeerID is invalid');
+    }
+    return peerId;
 }
 
 const log = new Logger$1("peer-exchange-discovery");