@waku/enr 0.0.10 → 0.0.12

package/CHANGELOG.md

@@ -27,6 +27,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   * devDependencies
     * @waku/interfaces bumped from 0.0.10 to 0.0.11
 
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @waku/utils bumped from 0.0.4 to 0.0.5
+  * devDependencies
+    * @waku/interfaces bumped from 0.0.11 to 0.0.12
+
+## [0.0.12](https://github.com/waku-org/js-waku/compare/enr-v0.0.11...enr-v0.0.12) (2023-05-18)
+
+
+### ⚠ BREAKING CHANGES
+
+* @waku/relay ([#1316](https://github.com/waku-org/js-waku/issues/1316))
+
+### Features
+
+* @waku/relay ([#1316](https://github.com/waku-org/js-waku/issues/1316)) ([50c2c25](https://github.com/waku-org/js-waku/commit/50c2c2540f3c5ff78d93f3fea646da0eee246e17))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @waku/utils bumped from * to 0.0.6
+  * devDependencies
+    * @waku/interfaces bumped from 0.0.12 to 0.0.13
+
 ## [0.0.9](https://github.com/waku-org/js-waku/compare/enr-v0.0.8...enr-v0.0.9) (2023-03-28)
 
 

package/bundle/index.js

@@ -868,13 +868,13 @@ var length$1 = function (value) {
   )
 };
 
-var varint$1 = {
+var varint$2 = {
     encode: encode_1$1
   , decode: decode$4
   , encodingLength: length$1
 };
 
-var _brrp_varint = varint$1;
+var _brrp_varint = varint$2;
 
 /**
  * @param {Uint8Array} data
@@ -2890,11 +2890,7 @@ function getAugmentedNamespace(n) {
 	return a;
 }
 
-var sha3Exports = {};
-var sha3$1 = {
-  get exports(){ return sha3Exports; },
-  set exports(v){ sha3Exports = v; },
-};
+var sha3$1 = {exports: {}};
 
 /**
  * [js-sha3]{@link https://github.com/emn178/js-sha3}
@@ -3546,10 +3542,11 @@ var sha3$1 = {
 	      root[methodNames[i]] = methods[methodNames[i]];
 	    }
 	  }
-	})();
+	})(); 
 } (sha3$1));
 
-var sha3 = sha3Exports;
+var sha3Exports = sha3$1.exports;
+var sha3 = /*@__PURE__*/getDefaultExportFromCjs(sha3Exports);
 
 /**
  * ECDSA Sign a message with the given private key.
@@ -3589,11 +3586,7 @@ function verifySignature(signature, message, publicKey) {
     }
 }
 
-var browserExports = {};
-var browser = {
-  get exports(){ return browserExports; },
-  set exports(v){ browserExports = v; },
-};
+var browser = {exports: {}};
 
 /**
  * Helpers.
@@ -4309,10 +4302,11 @@ var common = setup;
 		} catch (error) {
 			return '[UnexpectedJSONParseError]: ' + error.message;
 		}
-	};
-} (browser, browserExports));
+	}; 
+} (browser, browser.exports));
 
-var debug = browserExports;
+var browserExports = browser.exports;
+var debug = /*@__PURE__*/getDefaultExportFromCjs(browserExports);
 
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 class Parser {
@@ -4817,6 +4811,8 @@ var varint = {
   , encodingLength: length
 };
 
+var varint$1 = /*@__PURE__*/getDefaultExportFromCjs(varint);
+
 /**
  * Returns a new Uint8Array created by concatenating the passed ArrayLikes
  */
@@ -4838,6 +4834,9 @@ function concat(arrays, length) {
  *
  * Provides methods for converting
  */
+getProtocol('ip4');
+getProtocol('ip6');
+getProtocol('ipcidr');
 /**
  * Convert [code,Uint8Array] to string
  */
@@ -4942,12 +4941,12 @@ function bytes2port(buf) {
 }
 function str2bytes(str) {
     const buf = fromString$1(str);
-    const size = Uint8Array.from(varint.encode(buf.length));
+    const size = Uint8Array.from(varint$1.encode(buf.length));
     return concat([size, buf], size.length + buf.length);
 }
 function bytes2str(buf) {
-    const size = varint.decode(buf);
-    buf = buf.slice(varint.decode.bytes);
+    const size = varint$1.decode(buf);
+    buf = buf.slice(varint$1.decode.bytes);
     if (buf.length !== size) {
         throw new Error('inconsistent lengths');
     }
@@ -4962,17 +4961,17 @@ function mh2bytes(hash) {
         mh = CID.parse(hash).multihash.bytes;
     }
     // the address is a varint prefixed multihash string representation
-    const size = Uint8Array.from(varint.encode(mh.length));
+    const size = Uint8Array.from(varint$1.encode(mh.length));
     return concat([size, mh], size.length + mh.length);
 }
 function mb2bytes(mbstr) {
     const mb = anybaseDecoder.decode(mbstr);
-    const size = Uint8Array.from(varint.encode(mb.length));
+    const size = Uint8Array.from(varint$1.encode(mb.length));
     return concat([size, mb], size.length + mb.length);
 }
 function bytes2mb(buf) {
-    const size = varint.decode(buf);
-    const hash = buf.slice(varint.decode.bytes);
+    const size = varint$1.decode(buf);
+    const hash = buf.slice(varint$1.decode.bytes);
     if (hash.length !== size) {
         throw new Error('inconsistent lengths');
     }
@@ -4982,8 +4981,8 @@ function bytes2mb(buf) {
  * Converts bytes to bas58btc string
  */
 function bytes2mh(buf) {
-    const size = varint.decode(buf);
-    const address = buf.slice(varint.decode.bytes);
+    const size = varint$1.decode(buf);
+    const address = buf.slice(varint$1.decode.bytes);
     if (address.length !== size) {
         throw new Error('inconsistent lengths');
     }
@@ -5119,7 +5118,7 @@ function tuplesToStringTuples(tuples) {
 function tuplesToBytes(tuples) {
     return fromBytes(concat(tuples.map((tup) => {
         const proto = protoFromTuple(tup);
-        let buf = Uint8Array.from(varint.encode(proto.code));
+        let buf = Uint8Array.from(varint$1.encode(proto.code));
         if (tup.length > 1 && tup[1] != null) {
             buf = concat([buf, tup[1]]); // add address buffer
         }
@@ -5137,16 +5136,16 @@ function sizeForAddr(p, addr) {
         return 0;
     }
     else {
-        const size = varint.decode(addr);
-        return size + (varint.decode.bytes ?? 0);
+        const size = varint$1.decode(addr);
+        return size + (varint$1.decode.bytes ?? 0);
     }
 }
 function bytesToTuples(buf) {
     const tuples = [];
     let i = 0;
     while (i < buf.length) {
-        const code = varint.decode(buf, i);
-        const n = varint.decode.bytes ?? 0;
+        const code = varint$1.decode(buf, i);
+        const n = varint$1.decode.bytes ?? 0;
         const p = getProtocol(code);
         const size = sizeForAddr(p, buf.slice(i + n));
         if (size === 0) {
@@ -5218,73 +5217,19 @@ function protoFromTuple(tup) {
 }
 
 /**
- * @typedef {{ [key: string]: any }} Extensions
- * @typedef {Error} Err
- * @property {string} message
- */
-
-/**
- *
- * @param {Error} obj
- * @param {Extensions} props
- * @returns {Error & Extensions}
- */
-function assign(obj, props) {
-    for (const key in props) {
-        Object.defineProperty(obj, key, {
-            value: props[key],
-            enumerable: true,
-            configurable: true,
-        });
-    }
-
-    return obj;
-}
-
-/**
- *
- * @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}
+ * When this error is thrown it means an operation was aborted,
+ * usually in response to the `abort` event being emitted by an
+ * AbortSignal.
  */
-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 CodeError extends Error {
+    constructor(message, code, props) {
+        super(message);
+        this.code = code;
+        this.name = props?.name ?? 'CodeError';
+        this.props = props ?? {}; // eslint-disable-line @typescript-eslint/consistent-type-assertions
     }
 }
 
-var errCode = createError;
-
 /**
  * Returns true if the two passed Uint8Arrays have the same content
  */
@@ -5327,7 +5272,7 @@ var __classPrivateFieldSet = (undefined && undefined.__classPrivateFieldSet) ||
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _DefaultMultiaddr_string, _DefaultMultiaddr_tuples, _DefaultMultiaddr_stringTuples, _a;
+var _DefaultMultiaddr_string, _DefaultMultiaddr_tuples, _DefaultMultiaddr_stringTuples, _DefaultMultiaddr_path, _a;
 const inspect$1 = Symbol.for('nodejs.util.inspect.custom');
 const DNS_CODES = [
     getProtocol('dns').code,
@@ -5365,6 +5310,7 @@ class DefaultMultiaddr {
         _DefaultMultiaddr_string.set(this, void 0);
         _DefaultMultiaddr_tuples.set(this, void 0);
         _DefaultMultiaddr_stringTuples.set(this, void 0);
+        _DefaultMultiaddr_path.set(this, void 0);
         this[_a] = true;
         // default
         if (addr == null) {
@@ -5447,8 +5393,8 @@ class DefaultMultiaddr {
         const buf = this.bytes;
         let i = 0;
         while (i < buf.length) {
-            const code = varint.decode(buf, i);
-            const n = varint.decode.bytes ?? 0;
+            const code = varint$1.decode(buf, i);
+            const n = varint$1.decode.bytes ?? 0;
             const p = getProtocol(code);
             const size = sizeForAddr(p, buf.slice(i + n));
             i += (size + n);
@@ -5520,23 +5466,26 @@ class DefaultMultiaddr {
         }
     }
     getPath() {
-        let path = null;
-        try {
-            path = this.stringTuples().filter((tuple) => {
-                const proto = getProtocol(tuple[0]);
-                if (proto.path === true) {
-                    return true;
+        // on initialization, this.#path is undefined
+        // after the first call, it is either a string or null
+        if (__classPrivateFieldGet(this, _DefaultMultiaddr_path, "f") === undefined) {
+            try {
+                __classPrivateFieldSet(this, _DefaultMultiaddr_path, this.stringTuples().filter((tuple) => {
+                    const proto = getProtocol(tuple[0]);
+                    if (proto.path === true) {
+                        return true;
+                    }
+                    return false;
+                })[0][1], "f");
+                if (__classPrivateFieldGet(this, _DefaultMultiaddr_path, "f") == null) {
+                    __classPrivateFieldSet(this, _DefaultMultiaddr_path, null, "f");
                 }
-                return false;
-            })[0][1];
-            if (path == null) {
-                path = null;
+            }
+            catch {
+                __classPrivateFieldSet(this, _DefaultMultiaddr_path, null, "f");
             }
         }
-        catch {
-            path = null;
-        }
-        return path;
+        return __classPrivateFieldGet(this, _DefaultMultiaddr_path, "f");
     }
     equals(addr) {
         return equals(this.bytes, addr.bytes);
@@ -5549,7 +5498,7 @@ class DefaultMultiaddr {
         }
         const resolver = resolvers.get(resolvableProto.name);
         if (resolver == null) {
-            throw errCode(new Error(`no available resolver for ${resolvableProto.name}`), 'ERR_NO_AVAILABLE_RESOLVER');
+            throw new CodeError(`no available resolver for ${resolvableProto.name}`, 'ERR_NO_AVAILABLE_RESOLVER');
         }
         const addresses = await resolver(this, options);
         return addresses.map((a) => new DefaultMultiaddr(a));
@@ -5590,7 +5539,7 @@ class DefaultMultiaddr {
      * // 'Multiaddr(/ip4/127.0.0.1/tcp/4001)'
      * ```
      */
-    [(_DefaultMultiaddr_string = new WeakMap(), _DefaultMultiaddr_tuples = new WeakMap(), _DefaultMultiaddr_stringTuples = new WeakMap(), _a = symbol$1, inspect$1)]() {
+    [(_DefaultMultiaddr_string = new WeakMap(), _DefaultMultiaddr_tuples = new WeakMap(), _DefaultMultiaddr_stringTuples = new WeakMap(), _DefaultMultiaddr_path = new WeakMap(), _a = symbol$1, inspect$1)]() {
         return `Multiaddr(${bytesToString(this.bytes)})`;
     }
 }
@@ -5841,7 +5790,7 @@ var base64$1 = {};
 	 */
 	base64.test = function test(string) {
 	    return /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(string);
-	};
+	}; 
 } (base64$1));
 
 var eventemitter = EventEmitter;
@@ -6377,7 +6326,7 @@ var utf8$2 = {};
 	        }
 	    }
 	    return offset - start;
-	};
+	}; 
 } (utf8$2));
 
 var pool_1 = pool;
@@ -7078,8 +7027,8 @@ function requireMinimal () {
 		        function Buffer_allocUnsafe(size) {
 		            return new Buffer(size);
 		        };
-		};
-} (minimal));
+		}; 
+	} (minimal));
 	return minimal;
 }
 
@@ -7494,6 +7443,8 @@ Reader$1._configure = function(BufferReader_) {
     });
 };
 
+var ReaderClass = /*@__PURE__*/getDefaultExportFromCjs(reader$1);
+
 var reader_buffer = BufferReader;
 
 // extends Reader
@@ -7545,6 +7496,8 @@ BufferReader.prototype.string = function read_string_buffer() {
 
 BufferReader._configure();
 
+var ReaderBufferClass = /*@__PURE__*/getDefaultExportFromCjs(reader_buffer);
+
 var minimalExports = requireMinimal();
 var util$4 = /*@__PURE__*/getDefaultExportFromCjs(minimalExports);
 
@@ -8013,6 +7966,8 @@ Writer$1._configure = function(BufferWriter_) {
     BufferWriter$1._configure();
 };
 
+var WriterClass = /*@__PURE__*/getDefaultExportFromCjs(writer$1);
+
 var writer_buffer = BufferWriter;
 
 // extends Writer
@@ -8098,11 +8053,13 @@ BufferWriter.prototype.string = function write_string_buffer(value) {
 
 BufferWriter._configure();
 
+var WriterBufferClass = /*@__PURE__*/getDefaultExportFromCjs(writer_buffer);
+
 // @ts-expect-error no types
 function configure() {
     util$4._configure();
-    reader$1._configure(reader_buffer);
-    writer$1._configure(writer_buffer);
+    ReaderClass._configure(ReaderBufferClass);
+    WriterClass._configure(WriterBufferClass);
 }
 // Set up buffer utility according to the environment
 configure();
@@ -8123,7 +8080,7 @@ function patchReader(obj) {
     return obj;
 }
 function reader(buf) {
-    return patchReader(new reader$1(buf));
+    return patchReader(new ReaderClass(buf));
 }
 function patchWriter(obj) {
     for (const method of methods) {
@@ -8138,7 +8095,7 @@ function patchWriter(obj) {
     return obj;
 }
 function writer() {
-    return patchWriter(writer$1.create());
+    return patchWriter(WriterClass.create());
 }
 
 function decodeMessage(buf, codec) {
@@ -8330,6 +8287,8 @@ var forge$m = {
   }
 };
 
+var forge$n = /*@__PURE__*/getDefaultExportFromCjs(forge$m);
+
 /**
  * Base-N/Base-X encoding/decoding functions.
  *
@@ -17002,6 +16961,7 @@ var forge$8 = forge$m;
 
 // forge.random already defined
 if(forge$8.random && forge$8.random.getBytes) {
+  forge$8.random;
   return;
 }
 
@@ -17101,7 +17061,8 @@ if(_crypto && _crypto.getRandomValues) {
   };
 }
 
-if((!forge$8.util.isNodejs && !getRandomValues)) {
+if(forge$8.options.usePureJavaScript ||
+  (!forge$8.util.isNodejs && !getRandomValues)) {
 
   // get load time entropy
   _ctx.collectInt(+new Date(), 32);
@@ -17156,6 +17117,8 @@ if(!forge$8.random) {
 // expose spawn PRNG
 forge$8.random.createInstance = spawnPrng;
 
+forge$8.random;
+
 })(typeof(jQuery) !== 'undefined' ? jQuery : null);
 
 })();
@@ -19440,6 +19403,7 @@ var forge$3 = forge$m;
 
 // forge.prime already defined
 if(forge$3.prime) {
+  forge$3.prime;
   return;
 }
 
@@ -20647,7 +20611,7 @@ pki$1.rsa.generateKeyPair = function(bits, e, options, callback) {
   }
 
   // use native code if permitted, available, and parameters are acceptable
-  if(!options.prng &&
+  if(!forge$2.options.usePureJavaScript && !options.prng &&
     bits >= 256 && bits <= 16384 && (e === 0x10001 || e === 3)) {
     if(callback) {
       // try native async
@@ -22665,20 +22629,6 @@ function createPbkdf2Params(salt, countBytes, dkLen, prfAlgorithm) {
   return params;
 }
 
-/**
- * When this error is thrown it means an operation was aborted,
- * usually in response to the `abort` event being emitted by an
- * AbortSignal.
- */
-class CodeError extends Error {
-    constructor(message, code, props) {
-        super(message);
-        this.code = code;
-        this.name = props?.name ?? 'CodeError';
-        this.props = props ?? {}; // eslint-disable-line @typescript-eslint/consistent-type-assertions
-    }
-}
-
 /* eslint-env browser */
 // Check native crypto exists and is enabled (In insecure context `self.crypto`
 // exists but `self.crypto.subtle` does not).
@@ -22714,7 +22664,7 @@ function bigIntegerToUintBase64url(num, len) {
 // Convert a base64url encoded string to a BigInteger
 function base64urlToBigInteger(str) {
     const buf = base64urlToBuffer(str);
-    return new forge$m.jsbn.BigInteger(toString$1(buf, 'base16'), 16);
+    return new forge$n.jsbn.BigInteger(toString$1(buf, 'base16'), 16);
 }
 function base64urlToBuffer(str, len) {
     let buf = fromString$1(str, 'base64urlpad');
@@ -22734,6 +22684,20 @@ const bits = {
 const curveTypes = Object.keys(bits);
 curveTypes.join(' / ');
 
+function isWebkitLinux() {
+    return typeof navigator !== 'undefined' && navigator.userAgent.includes('Safari') && navigator.userAgent.includes('Linux') && !navigator.userAgent.includes('Chrome');
+}
+// WebKit on Linux does not support deriving a key from an empty PBKDF2 key.
+// So, as a workaround, we provide the generated key as a constant. We test that
+// this generated key is accurate in test/workaround.spec.ts
+// Generated via:
+// await crypto.subtle.exportKey('jwk',
+//   await crypto.subtle.deriveKey(
+//     { name: 'PBKDF2', salt: new Uint8Array(16), iterations: 32767, hash: { name: 'SHA-256' } },
+//     await crypto.subtle.importKey('raw', new Uint8Array(0), { name: 'PBKDF2' }, false, ['deriveKey']),
+//     { name: 'AES-GCM', length: 128 }, true, ['encrypt', 'decrypt'])
+// )
+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';
@@ -22755,10 +22719,16 @@ function create(opts) {
         if (typeof password === 'string') {
             password = fromString$1(password);
         }
-        // Derive a key using PBKDF2.
-        const deriveParams = { name: 'PBKDF2', salt, iterations, hash: { name: digest } };
-        const rawKey = await crypto.subtle.importKey('raw', password, { name: 'PBKDF2' }, false, ['deriveKey', 'deriveBits']);
-        const cryptoKey = await crypto.subtle.deriveKey(deriveParams, rawKey, { name: algorithm, length: keyLength }, true, ['encrypt']);
+        let cryptoKey;
+        if (password.length === 0 && isWebkitLinux()) {
+            cryptoKey = await crypto.subtle.importKey('jwk', derivedEmptyPasswordKey, { name: 'AES-GCM' }, true, ['encrypt']);
+        }
+        else {
+            // Derive a key using PBKDF2.
+            const deriveParams = { name: 'PBKDF2', salt, iterations, hash: { name: digest } };
+            const rawKey = await crypto.subtle.importKey('raw', password, { name: 'PBKDF2' }, false, ['deriveKey']);
+            cryptoKey = await crypto.subtle.deriveKey(deriveParams, rawKey, { name: algorithm, length: keyLength }, true, ['encrypt']);
+        }
         // Encrypt the string.
         const ciphertext = await crypto.subtle.encrypt(aesGcm, cryptoKey, data);
         return concat([salt, aesGcm.iv, new Uint8Array(ciphertext)]);
@@ -22777,10 +22747,16 @@ function create(opts) {
         if (typeof password === 'string') {
             password = fromString$1(password);
         }
-        // Derive the key using PBKDF2.
-        const deriveParams = { name: 'PBKDF2', salt, iterations, hash: { name: digest } };
-        const rawKey = await crypto.subtle.importKey('raw', password, { name: 'PBKDF2' }, false, ['deriveKey', 'deriveBits']);
-        const cryptoKey = await crypto.subtle.deriveKey(deriveParams, rawKey, { name: algorithm, length: keyLength }, true, ['decrypt']);
+        let cryptoKey;
+        if (password.length === 0 && isWebkitLinux()) {
+            cryptoKey = await crypto.subtle.importKey('jwk', derivedEmptyPasswordKey, { name: 'AES-GCM' }, true, ['decrypt']);
+        }
+        else {
+            // Derive the key using PBKDF2.
+            const deriveParams = { name: 'PBKDF2', salt, iterations, hash: { name: digest } };
+            const rawKey = await crypto.subtle.importKey('raw', password, { name: 'PBKDF2' }, false, ['deriveKey']);
+            cryptoKey = await crypto.subtle.deriveKey(deriveParams, rawKey, { name: algorithm, length: keyLength }, true, ['decrypt']);
+        }
         // Decrypt the string.
         const plaintext = await crypto.subtle.decrypt(aesGcm, cryptoKey, ciphertext);
         return new Uint8Array(plaintext);
@@ -23364,8 +23340,8 @@ function randomBytes(length) {
 
 // Convert a PKCS#1 in ASN1 DER format to a JWK key
 function pkcs1ToJwk(bytes) {
-    const asn1 = forge$m.asn1.fromDer(toString$1(bytes, 'ascii'));
-    const privateKey = forge$m.pki.privateKeyFromAsn1(asn1);
+    const asn1 = forge$n.asn1.fromDer(toString$1(bytes, 'ascii'));
+    const privateKey = forge$n.pki.privateKeyFromAsn1(asn1);
     // https://tools.ietf.org/html/rfc7518#section-6.3.1
     return {
         kty: 'RSA',
@@ -23385,7 +23361,7 @@ 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('JWK was missing components', 'ERR_INVALID_PARAMETERS');
     }
-    const asn1 = forge$m.pki.privateKeyToAsn1({
+    const asn1 = forge$n.pki.privateKeyToAsn1({
         n: base64urlToBigInteger(jwk.n),
         e: base64urlToBigInteger(jwk.e),
         d: base64urlToBigInteger(jwk.d),
@@ -23395,12 +23371,12 @@ function jwkToPkcs1(jwk) {
         dQ: base64urlToBigInteger(jwk.dq),
         qInv: base64urlToBigInteger(jwk.qi)
     });
-    return fromString$1(forge$m.asn1.toDer(asn1).getBytes(), 'ascii');
+    return fromString$1(forge$n.asn1.toDer(asn1).getBytes(), 'ascii');
 }
 // Convert a PKCIX in ASN1 DER format to a JWK key
 function pkixToJwk(bytes) {
-    const asn1 = forge$m.asn1.fromDer(toString$1(bytes, 'ascii'));
-    const publicKey = forge$m.pki.publicKeyFromAsn1(asn1);
+    const asn1 = forge$n.asn1.fromDer(toString$1(bytes, 'ascii'));
+    const publicKey = forge$n.pki.publicKeyFromAsn1(asn1);
     return {
         kty: 'RSA',
         n: bigIntegerToUintBase64url(publicKey.n),
@@ -23412,21 +23388,21 @@ function jwkToPkix(jwk) {
     if (jwk.n == null || jwk.e == null) {
         throw new CodeError('JWK was missing components', 'ERR_INVALID_PARAMETERS');
     }
-    const asn1 = forge$m.pki.publicKeyToAsn1({
+    const asn1 = forge$n.pki.publicKeyToAsn1({
         n: base64urlToBigInteger(jwk.n),
         e: base64urlToBigInteger(jwk.e)
     });
-    return fromString$1(forge$m.asn1.toDer(asn1).getBytes(), 'ascii');
+    return fromString$1(forge$n.asn1.toDer(asn1).getBytes(), 'ascii');
 }
 
 function convert(key, types) {
     return types.map(t => base64urlToBigInteger(key[t]));
 }
 function jwk2priv(key) {
-    return forge$m.pki.setRsaPrivateKey(...convert(key, ['n', 'e', 'd', 'p', 'q', 'dp', 'dq', 'qi']));
+    return forge$n.pki.setRsaPrivateKey(...convert(key, ['n', 'e', 'd', 'p', 'q', 'dp', 'dq', 'qi']));
 }
 function jwk2pub(key) {
-    return forge$m.pki.setRsaPublicKey(...convert(key, ['n', 'e']));
+    return forge$n.pki.setRsaPublicKey(...convert(key, ['n', 'e']));
 }
 
 async function generateKey$2(bits) {
@@ -23609,16 +23585,16 @@ class RsaPrivateKey {
      */
     async export(password, format = 'pkcs-8') {
         if (format === 'pkcs-8') {
-            const buffer = new forge$m.util.ByteBuffer(this.marshal());
-            const asn1 = forge$m.asn1.fromDer(buffer);
-            const privateKey = forge$m.pki.privateKeyFromAsn1(asn1);
+            const buffer = new forge$n.util.ByteBuffer(this.marshal());
+            const asn1 = forge$n.asn1.fromDer(buffer);
+            const privateKey = forge$n.pki.privateKeyFromAsn1(asn1);
             const options = {
                 algorithm: 'aes256',
                 count: 10000,
                 saltSize: 128 / 8,
                 prfAlgorithm: 'sha512'
             };
-            return forge$m.pki.encryptRsaPrivateKey(privateKey, password, options);
+            return forge$n.pki.encryptRsaPrivateKey(privateKey, password, options);
         }
         else if (format === 'libp2p-key') {
             return await exporter(this.bytes, password);
@@ -25053,6 +25029,8 @@ function decodeWaku2(byte) {
 }
 
 class RawEnr extends Map {
+    seq;
+    signature;
     constructor(kvs = {}, seq = BigInt(1), signature) {
         super(Object.entries(kvs));
         this.seq = seq;
@@ -25214,10 +25192,8 @@ var TransportProtocolPerIpVersion;
     TransportProtocolPerIpVersion["UDP6"] = "udp6";
 })(TransportProtocolPerIpVersion || (TransportProtocolPerIpVersion = {}));
 class ENR extends RawEnr {
-    constructor() {
-        super(...arguments);
-        this.getLocationMultiaddr = locationMultiaddrFromEnrFields.bind({}, this);
-    }
+    static RECORD_PREFIX = "enr:";
+    peerId;
     static async create(kvs = {}, seq = BigInt(1), signature) {
         const enr = new ENR(kvs, seq, signature);
         try {
@@ -25239,6 +25215,7 @@ class ENR extends RawEnr {
                 throw new Error(ERR_INVALID_ID);
         }
     }
+    getLocationMultiaddr = locationMultiaddrFromEnrFields.bind({}, this);
     setLocationMultiaddr(multiaddr) {
         const protoNames = multiaddr.protoNames();
         if (protoNames.length !== 2 &&
@@ -25329,7 +25306,6 @@ class ENR extends RawEnr {
         return this.signature;
     }
 }
-ENR.RECORD_PREFIX = "enr:";
 
 class EnrCreator {
     static fromPublicKey(publicKey, kvs = {}) {

package/dist/enr.js

@@ -18,11 +18,9 @@ export var TransportProtocolPerIpVersion;
     TransportProtocolPerIpVersion["TCP6"] = "tcp6";
     TransportProtocolPerIpVersion["UDP6"] = "udp6";
 })(TransportProtocolPerIpVersion || (TransportProtocolPerIpVersion = {}));
-export class ENR extends RawEnr {
-    constructor() {
-        super(...arguments);
-        this.getLocationMultiaddr = locationMultiaddrFromEnrFields.bind({}, this);
-    }
+class ENR extends RawEnr {
+    static RECORD_PREFIX = "enr:";
+    peerId;
     static async create(kvs = {}, seq = BigInt(1), signature) {
         const enr = new ENR(kvs, seq, signature);
         try {
@@ -44,6 +42,7 @@ export class ENR extends RawEnr {
                 throw new Error(ERR_INVALID_ID);
         }
     }
+    getLocationMultiaddr = locationMultiaddrFromEnrFields.bind({}, this);
     setLocationMultiaddr(multiaddr) {
         const protoNames = multiaddr.protoNames();
         if (protoNames.length !== 2 &&
@@ -134,5 +133,5 @@ export class ENR extends RawEnr {
         return this.signature;
     }
 }
-ENR.RECORD_PREFIX = "enr:";
+export { ENR };
 //# sourceMappingURL=enr.js.map

package/dist/enr.js.map

@@ -1 +1 @@
-{"version":3,"file":"enr.js","sourceRoot":"","sources":["../src/enr.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"enr.js","sourceRoot":"","sources":["../src/enr.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,8BAA8B,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAE9B,MAAM,GAAG,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;AAE9B,MAAM,CAAN,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IAC3B,gCAAW,CAAA;IACX,gCAAW,CAAA;AACb,CAAC,EAHW,iBAAiB,KAAjB,iBAAiB,QAG5B;AACD,MAAM,CAAN,IAAY,6BAKX;AALD,WAAY,6BAA6B;IACvC,8CAAa,CAAA;IACb,8CAAa,CAAA;IACb,8CAAa,CAAA;IACb,8CAAa,CAAA;AACf,CAAC,EALW,6BAA6B,KAA7B,6BAA6B,QAKxC;AAED,MAAa,GAAI,SAAQ,MAAM;IACtB,MAAM,CAAU,aAAa,GAAG,MAAM,CAAC;IACvC,MAAM,CAAU;IAEvB,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,MAAgC,EAAE,EAClC,MAAsB,MAAM,CAAC,CAAC,CAAC,EAC/B,SAAsB;QAEtB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;QACzC,IAAI;YACF,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;YAChC,IAAI,SAAS,EAAE;gBACb,GAAG,CAAC,MAAM,GAAG,MAAM,yBAAyB,CAAC,SAAS,CAAC,CAAC;aACzD;SACF;QAAC,OAAO,CAAC,EAAE;YACV,GAAG,CAAC,qCAAqC,EAAE,CAAC,CAAC,CAAC;SAC/C;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAI,MAAM;QACR,QAAQ,IAAI,CAAC,EAAE,EAAE;YACf,KAAK,IAAI;gBACP,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAChE;gBACE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;SACnC;IACH,CAAC;IACD,oBAAoB,GAES,8BAA8B,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAE3E,oBAAoB,CAAC,SAAoB;QACvC,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,EAAE,CAAC;QAC1C,IACE,UAAU,CAAC,MAAM,KAAK,CAAC;YACvB,UAAU,CAAC,CAAC,CAAC,KAAK,KAAK;YACvB,UAAU,CAAC,CAAC,CAAC,KAAK,KAAK,EACvB;YACA,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;SACtC;QACD,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;SACtC;QAED,OAAO;QACP,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;YACtB,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7B,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACvC;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9B,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC7C;IACH,CAAC;IAED,wBAAwB;QACtB,MAAM,UAAU,GAAG,EAAE,CAAC;QAEtB,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,6BAA6B,CAAC,EAAE;YACnE,MAAM,EAAE,GAAG,IAAI,CAAC,oBAAoB,CAClC,QAAyC,CAC1C,CAAC;YACF,IAAI,EAAE;gBAAE,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC7B;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;QAE1C,OAAO,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,QAAQ;QACV,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QACvB,IAAI,CAAC,EAAE;YAAE,OAAO;QAChB,OAAO;YACL,EAAE;YACF,UAAU,EAAE,IAAI,CAAC,wBAAwB,EAAE;YAC3C,SAAS,EAAE,EAAE;SACd,CAAC;IACJ,CAAC;IAED;;;;;;;OAOG;IACH,gBAAgB,CACd,QAA2D;QAE3D,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;YAC9D,IAAI,iBAAiB,EAAE;gBACrB,OAAO,iBAAiB,CAAC,WAAW,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;aACxE;SACF;QACD,OAAO;IACT,CAAC;IAED;;OAEG;IACH,iBAAiB;QACf,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,UAAU,EAAE;YAClC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YAC3B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;gBAChC,OAAO,EAAE,CAAC,WAAW,CAAC,QAAQ,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;SACJ;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,CAAC,IAAgB,EAAE,SAAqB;QAC5C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,EAAE,KAAK,IAAI,EAAE;YACvC,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;SACjC;QACD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;SACxD;QACD,OAAO,eAAe,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAAgB,EAAE,UAAsB;QACjD,QAAQ,IAAI,CAAC,EAAE,EAAE;YACf,KAAK,IAAI;gBACP,IAAI,CAAC,SAAS,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;gBACjD,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;SACnC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;;SAvIU,GAAG"}

package/dist/raw_enr.js

@@ -4,6 +4,8 @@ import { ERR_INVALID_ID } from "./constants.js";
 import { decodeMultiaddrs, encodeMultiaddrs } from "./multiaddrs_codec.js";
 import { decodeWaku2, encodeWaku2 } from "./waku2_codec.js";
 export class RawEnr extends Map {
+    seq;
+    signature;
     constructor(kvs = {}, seq = BigInt(1), signature) {
         super(Object.entries(kvs));
         this.seq = seq;

package/dist/raw_enr.js.map

@@ -1 +1 @@
-{"version":3,"file":"raw_enr.js","sourceRoot":"","sources":["../src/raw_enr.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,eAAe,GAChB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE5D,MAAM,OAAO,MAAO,SAAQ,GAAqB;IAI/C,YACE,MAAgC,EAAE,EAClC,MAAsB,MAAM,CAAC,CAAC,CAAC,EAC/B,SAAsB;QAEtB,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,GAAG,CAAC,CAAS,EAAE,CAAW;QACxB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACzB,CAAC;IAED,IAAI,EAAE;QACJ,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAI,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;QAC1C,OAAO,WAAW,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC;IAED,IAAI,SAAS;QACX,QAAQ,IAAI,CAAC,EAAE,EAAE;YACf,KAAK,IAAI;gBACP,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC/B;gBACE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;SACnC;IACH,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,EAAE,CAAC,EAAsB;QAC3B,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,GAAG;QACL,OAAO,sBAAsB,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,GAAG,CAAC,IAAwB;QAC9B,sBAAsB,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,GAAG;QACL,OAAO,sBAAsB,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,GAAG,CAAC,IAAwB;QAC9B,sBAAsB,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,GAAG;QACL,OAAO,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,GAAG,CAAC,EAAsB;QAC5B,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IACrD,CAAC;IAED,IAAI,IAAI,CAAC,IAAwB;QAC/B,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,IAAI;QACN,OAAO,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IACrD,CAAC;IAED,IAAI,IAAI,CAAC,IAAwB;QAC/B,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IACpD,CAAC;IAED;;;;;;;;;;;OAWG;IACH,IAAI,UAAU;QACZ,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAEnC,IAAI,GAAG;YAAE,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAEtC,OAAO;IACT,CAAC;IAED;;;;;;;;;;;OAWG;IACH,IAAI,UAAU,CAAC,UAAmC;QAChD,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;IACpE,CAAC;IAED;;OAEG;IACH,IAAI,KAAK;QACP,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC9B,IAAI,GAAG;YAAE,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAEpC,OAAO;IACT,CAAC;IAED;;OAEG;IACH,IAAI,KAAK,CAAC,KAAwB;QAChC,eAAe,CACb,IAAI,EACJ,OAAO,EACP,KAAK,EACL,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,UAAU,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CACxC,CAAC;IACJ,CAAC;CACF;AAED,SAAS,cAAc,CACrB,GAA0B,EAC1B,GAAW,EACX,KAAa;IAEb,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzB,IAAI,CAAC,GAAG;QAAE,OAAO;IACjB,OAAO,eAAe,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,sBAAsB,CAC7B,GAA0B,EAC1B,GAAW,EACX,KAAa;IAEb,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzB,IAAI,CAAC,GAAG;QAAE,OAAO;IACjB,OAAO,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,cAAc,CACrB,GAA0B,EAC1B,GAAW,EACX,KAAa,EACb,KAAyB;IAEzB,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;AACnE,CAAC;AAED,SAAS,sBAAsB,CAC7B,GAA0B,EAC1B,GAAW,EACX,KAAa,EACb,KAAyB;IAEzB,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;AACvD,CAAC;AAED,SAAS,eAAe,CACtB,GAAc,EACd,GAAM,EACN,KAAoB,EACpB,SAAsB;IAEtB,IAAI,KAAK,KAAK,SAAS,EAAE;QACvB,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;KAChC;SAAM;QACL,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;KACjB;AACH,CAAC"}
+{"version":3,"file":"raw_enr.js","sourceRoot":"","sources":["../src/raw_enr.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waku/enr",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "description": "ENR (EIP-778) for Waku",
   "types": "./dist/index.d.ts",
   "module": "./dist/index.js",
@@ -36,11 +36,9 @@
     "build:esm": "tsc",
     "build:bundle": "rollup --config rollup.config.js",
     "fix": "run-s fix:*",
-    "fix:prettier": "prettier . --write",
     "fix:lint": "eslint src *.js --fix",
     "check": "run-s check:*",
     "check:lint": "eslint src --ext .ts",
-    "check:prettier": "prettier . --list-different",
     "check:spelling": "cspell \"{README.md,src/**/*.ts}\"",
     "check:tsc": "tsc -p tsconfig.dev.json",
     "test": "run-s test:*",
@@ -54,27 +52,27 @@
   },
   "dependencies": {
     "@ethersproject/rlp": "^5.7.0",
-    "@libp2p/crypto": "^1.0.14",
-    "@libp2p/peer-id": "^2.0.2",
+    "@libp2p/crypto": "^1.0.15",
+    "@libp2p/peer-id": "^2.0.3",
     "@multiformats/multiaddr": "^12.0.0",
     "@noble/secp256k1": "^1.7.1",
-    "@waku/utils": "0.0.4",
+    "@waku/utils": "0.0.6",
     "debug": "^4.3.4",
     "js-sha3": "^0.8.0"
   },
   "devDependencies": {
     "@libp2p/interface-peer-id": "^2.0.1",
     "@libp2p/interface-peer-info": "^1.0.8",
-    "@libp2p/peer-id-factory": "^2.0.1",
+    "@libp2p/peer-id-factory": "^2.0.3",
     "@rollup/plugin-commonjs": "^24.0.1",
     "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@rollup/plugin-node-resolve": "^15.0.2",
     "@types/chai": "^4.3.4",
     "@types/mocha": "^10.0.1",
     "@typescript-eslint/eslint-plugin": "^5.57.0",
     "@typescript-eslint/parser": "^5.51.0",
     "@waku/build-utils": "*",
-    "@waku/interfaces": "0.0.11",
+    "@waku/interfaces": "0.0.13",
     "chai": "^4.3.7",
     "cspell": "^6.31.1",
     "eslint": "^8.35.0",
@@ -89,12 +87,12 @@
     "karma-webpack": "^5.0.0",
     "mocha": "^10.2.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.8.4",
+    "prettier": "^2.8.8",
     "process": "^0.11.10",
     "puppeteer": "^19.8.2",
-    "rollup": "^3.15.0",
+    "rollup": "^3.21.3",
     "ts-loader": "^9.4.2",
-    "typescript": "^4.9.5",
+    "typescript": "^5.0.4",
     "uint8arrays": "^4.0.3"
   },
   "typedoc": {