nostr-double-ratchet 0.0.33 → 0.0.35

package/dist/nostr-double-ratchet.es.js

@@ -1,7 +1,7 @@
 var Ki = Object.defineProperty;
 var Ni = (e, t, n) => t in e ? Ki(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
 var J = (e, t, n) => Ni(e, typeof t != "symbol" ? t + "" : t, n);
-function kn(e) {
+function Bn(e) {
   if (!Number.isSafeInteger(e) || e < 0)
     throw new Error(`Wrong positive integer: ${e}`);
 }
@@ -14,7 +14,7 @@ function Fn(e, ...t) {
 function Si(e) {
   if (typeof e != "function" || typeof e.create != "function")
     throw new Error("Hash should be wrapped by utils.wrapConstructor");
-  kn(e.outputLen), kn(e.blockLen);
+  Bn(e.outputLen), Bn(e.blockLen);
 }
 function et(e, t = !0) {
   if (e.destroyed)
@@ -33,17 +33,17 @@ const xt = typeof globalThis == "object" && "crypto" in globalThis ? globalThis.
 const Gn = (e) => e instanceof Uint8Array, Kt = (e) => new DataView(e.buffer, e.byteOffset, e.byteLength), re = (e, t) => e << 32 - t | e >>> t, Ci = new Uint8Array(new Uint32Array([287454020]).buffer)[0] === 68;
 if (!Ci)
   throw new Error("Non little-endian hardware is not supported");
-function Bi(e) {
+function ki(e) {
   if (typeof e != "string")
     throw new Error(`utf8ToBytes expected string, got ${typeof e}`);
   return new Uint8Array(new TextEncoder().encode(e));
 }
 function Vt(e) {
-  if (typeof e == "string" && (e = Bi(e)), !Gn(e))
+  if (typeof e == "string" && (e = ki(e)), !Gn(e))
     throw new Error(`expected Uint8Array, got ${typeof e}`);
   return e;
 }
-function ki(...e) {
+function Bi(...e) {
   const t = new Uint8Array(e.reduce((r, i) => r + i.length, 0));
   let n = 0;
   return e.forEach((r) => {
@@ -67,13 +67,13 @@ function Yn(e = 32) {
     return xt.getRandomValues(new Uint8Array(e));
   throw new Error("crypto.getRandomValues must be defined");
 }
-function _i(e, t, n, r) {
+function Ui(e, t, n, r) {
   if (typeof e.setBigUint64 == "function")
     return e.setBigUint64(t, n, r);
   const i = BigInt(32), s = BigInt(4294967295), o = Number(n >> i & s), c = Number(n & s), a = r ? 4 : 0, l = r ? 0 : 4;
   e.setUint32(t + a, o, r), e.setUint32(t + l, c, r);
 }
-let Ui = class extends Jn {
+let _i = class extends Jn {
   constructor(t, n, r, i) {
     super(), this.blockLen = t, this.outputLen = n, this.padOffset = r, this.isLE = i, this.finished = !1, this.length = 0, this.pos = 0, this.destroyed = !1, this.buffer = new Uint8Array(t), this.view = Kt(this.buffer);
   }
@@ -101,7 +101,7 @@ let Ui = class extends Jn {
     n[o++] = 128, this.buffer.subarray(o).fill(0), this.padOffset > i - o && (this.process(r, 0), o = 0);
     for (let u = o; u < i; u++)
       n[u] = 0;
-    _i(r, i - 8, BigInt(this.length * 8), s), this.process(r, 0);
+    Ui(r, i - 8, BigInt(this.length * 8), s), this.process(r, 0);
     const c = Kt(t), a = this.outputLen;
     if (a % 4)
       throw new Error("_sha2: outputLen should be aligned to 32bit");
@@ -198,7 +198,7 @@ const Li = (e, t, n) => e & t ^ ~e & n, $i = (e, t, n) => e & t ^ e & n ^ t & n,
   528734635,
   1541459225
 ]), ve = /* @__PURE__ */ new Uint32Array(64);
-let Ti = class extends Ui {
+let Ti = class extends _i {
   constructor() {
     super(64, 32, 8, !1), this.A = be[0] | 0, this.B = be[1] | 0, this.C = be[2] | 0, this.D = be[3] | 0, this.E = be[4] | 0, this.F = be[5] | 0, this.G = be[6] | 0, this.H = be[7] | 0;
   }
@@ -413,7 +413,7 @@ const Vi = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   validateObject: Ye
 }, Symbol.toStringTag, { value: "Module" }));
 /*! noble-curves - MIT License (c) 2022 Paul Miller (paulmillr.com) */
-const W = BigInt(0), z = BigInt(1), Ce = BigInt(2), Zi = BigInt(3), Rt = BigInt(4), _n = BigInt(5), Un = BigInt(8);
+const W = BigInt(0), z = BigInt(1), Ce = BigInt(2), Zi = BigInt(3), Rt = BigInt(4), Un = BigInt(5), _n = BigInt(8);
 BigInt(9);
 BigInt(16);
 function V(e, t) {
@@ -491,8 +491,8 @@ function Ji(e) {
       return s;
     };
   }
-  if (e % Un === _n) {
-    const t = (e - _n) / Un;
+  if (e % _n === Un) {
+    const t = (e - Un) / _n;
     return function(r, i) {
       const s = r.mul(i, Ce), o = r.pow(s, t), c = r.mul(i, o), a = r.mul(r.mul(c, Ce), o), l = r.mul(c, r.sub(a, r.ONE));
       if (!r.eql(r.sqr(l), i))
@@ -671,8 +671,8 @@ function is(e, t) {
         const h = g * a;
         let d = Number(o & u);
         o >>= w, d > a && (d -= p, o += St);
-        const y = h, E = h + Math.abs(d) - 1, S = g % 2 !== 0, _ = d < 0;
-        d === 0 ? f = f.add(n(S, s[y])) : l = l.add(n(_, s[E]));
+        const y = h, m = h + Math.abs(d) - 1, S = g % 2 !== 0, U = d < 0;
+        d === 0 ? f = f.add(n(S, s[y])) : l = l.add(n(U, s[m]));
       }
       return { p: l, f };
     },
@@ -722,7 +722,7 @@ function ss(e) {
   }
   return Object.freeze({ ...t });
 }
-const { bytesToNumberBE: os, hexToBytes: as } = Vi, Be = {
+const { bytesToNumberBE: os, hexToBytes: as } = Vi, ke = {
   // asn.1 DER encoding utils
   Err: class extends Error {
     constructor(t = "") {
@@ -730,7 +730,7 @@ const { bytesToNumberBE: os, hexToBytes: as } = Vi, Be = {
     }
   },
   _parseInt(e) {
-    const { Err: t } = Be;
+    const { Err: t } = ke;
     if (e.length < 2 || e[0] !== 2)
       throw new t("Invalid signature integer tag");
     const n = e[1], r = e.subarray(2, n + 2);
@@ -743,7 +743,7 @@ const { bytesToNumberBE: os, hexToBytes: as } = Vi, Be = {
     return { d: os(r), l: e.subarray(n + 2) };
   },
   toSig(e) {
-    const { Err: t } = Be, n = typeof e == "string" ? as(e) : e;
+    const { Err: t } = ke, n = typeof e == "string" ? as(e) : e;
     if (!(n instanceof Uint8Array))
       throw new Error("ui8a expected");
     let r = n.length;
@@ -751,7 +751,7 @@ const { bytesToNumberBE: os, hexToBytes: as } = Vi, Be = {
       throw new t("Invalid signature tag");
     if (n[1] !== r - 2)
       throw new t("Invalid signature: incorrect length");
-    const { d: i, l: s } = Be._parseInt(n.subarray(2)), { d: o, l: c } = Be._parseInt(s);
+    const { d: i, l: s } = ke._parseInt(n.subarray(2)), { d: o, l: c } = ke._parseInt(s);
     if (c.length)
       throw new t("Invalid signature: left bytes after parsing");
     return { r: i, s: o };
@@ -776,8 +776,8 @@ function cs(e) {
     return { x: d, y };
   });
   function s(g) {
-    const { a: h, b: d } = t, y = n.sqr(g), E = n.mul(y, g);
-    return n.add(n.add(E, n.mul(g, h)), d);
+    const { a: h, b: d } = t, y = n.sqr(g), m = n.mul(y, g);
+    return n.add(n.add(m, n.mul(g, h)), d);
   }
   if (!n.eql(n.sqr(t.Gy), s(t.Gx)))
     throw new Error("bad generator point: equation left != right");
@@ -789,7 +789,7 @@ function cs(e) {
       throw new Error("Expected valid bigint: 0 < bigint < curve.n");
   }
   function a(g) {
-    const { allowedPrivateKeyLengths: h, nByteLength: d, wrapPrivateKey: y, n: E } = t;
+    const { allowedPrivateKeyLengths: h, nByteLength: d, wrapPrivateKey: y, n: m } = t;
     if (h && typeof g != "bigint") {
       if (g instanceof Uint8Array && (g = qe(g)), typeof g != "string" || !h.includes(g.length))
         throw new Error("Invalid key");
@@ -801,7 +801,7 @@ function cs(e) {
     } catch {
       throw new Error(`private key must be ${d} bytes, hex or bigint, not ${typeof g}`);
     }
-    return y && (S = V(S, E)), c(S), S;
+    return y && (S = V(S, m)), c(S), S;
   }
   const l = /* @__PURE__ */ new Map();
   function f(g) {
@@ -825,8 +825,8 @@ function cs(e) {
         throw new Error("invalid affine point");
       if (h instanceof u)
         throw new Error("projective point not allowed");
-      const E = (S) => n.eql(S, n.ZERO);
-      return E(d) && E(y) ? u.ZERO : new u(d, y, n.ONE);
+      const m = (S) => n.eql(S, n.ZERO);
+      return m(d) && m(y) ? u.ZERO : new u(d, y, n.ONE);
     }
     get x() {
       return this.toAffine().x;
@@ -842,7 +842,7 @@ function cs(e) {
      */
     static normalizeZ(h) {
       const d = n.invertBatch(h.map((y) => y.pz));
-      return h.map((y, E) => y.toAffine(d[E])).map(u.fromAffine);
+      return h.map((y, m) => y.toAffine(d[m])).map(u.fromAffine);
     }
     /**
      * Converts hash string or Uint8Array to Point.
@@ -870,8 +870,8 @@ function cs(e) {
       const { x: h, y: d } = this.toAffine();
       if (!n.isValid(h) || !n.isValid(d))
         throw new Error("bad point: x or y not FE");
-      const y = n.sqr(d), E = s(h);
-      if (!n.eql(y, E))
+      const y = n.sqr(d), m = s(h);
+      if (!n.eql(y, m))
         throw new Error("bad point: equation left != right");
       if (!this.isTorsionFree())
         throw new Error("bad point: not in prime-order subgroup");
@@ -887,8 +887,8 @@ function cs(e) {
      */
     equals(h) {
       f(h);
-      const { px: d, py: y, pz: E } = this, { px: S, py: _, pz: B } = h, m = n.eql(n.mul(d, B), n.mul(S, E)), x = n.eql(n.mul(y, B), n.mul(_, E));
-      return m && x;
+      const { px: d, py: y, pz: m } = this, { px: S, py: U, pz: k } = h, E = n.eql(n.mul(d, k), n.mul(S, m)), x = n.eql(n.mul(y, k), n.mul(U, m));
+      return E && x;
     }
     /**
      * Flips point to one corresponding to (x, -y) in Affine coordinates.
@@ -901,9 +901,9 @@ function cs(e) {
     // https://eprint.iacr.org/2015/1060, algorithm 3
     // Cost: 8M + 3S + 3*a + 2*b3 + 15add.
     double() {
-      const { a: h, b: d } = t, y = n.mul(d, Ln), { px: E, py: S, pz: _ } = this;
-      let B = n.ZERO, m = n.ZERO, x = n.ZERO, K = n.mul(E, E), M = n.mul(S, S), I = n.mul(_, _), A = n.mul(E, S);
-      return A = n.add(A, A), x = n.mul(E, _), x = n.add(x, x), B = n.mul(h, x), m = n.mul(y, I), m = n.add(B, m), B = n.sub(M, m), m = n.add(M, m), m = n.mul(B, m), B = n.mul(A, B), x = n.mul(y, x), I = n.mul(h, I), A = n.sub(K, I), A = n.mul(h, A), A = n.add(A, x), x = n.add(K, K), K = n.add(x, K), K = n.add(K, I), K = n.mul(K, A), m = n.add(m, K), I = n.mul(S, _), I = n.add(I, I), K = n.mul(I, A), B = n.sub(B, K), x = n.mul(I, M), x = n.add(x, x), x = n.add(x, x), new u(B, m, x);
+      const { a: h, b: d } = t, y = n.mul(d, Ln), { px: m, py: S, pz: U } = this;
+      let k = n.ZERO, E = n.ZERO, x = n.ZERO, K = n.mul(m, m), M = n.mul(S, S), I = n.mul(U, U), A = n.mul(m, S);
+      return A = n.add(A, A), x = n.mul(m, U), x = n.add(x, x), k = n.mul(h, x), E = n.mul(y, I), E = n.add(k, E), k = n.sub(M, E), E = n.add(M, E), E = n.mul(k, E), k = n.mul(A, k), x = n.mul(y, x), I = n.mul(h, I), A = n.sub(K, I), A = n.mul(h, A), A = n.add(A, x), x = n.add(K, K), K = n.add(x, K), K = n.add(K, I), K = n.mul(K, A), E = n.add(E, K), I = n.mul(S, U), I = n.add(I, I), K = n.mul(I, A), k = n.sub(k, K), x = n.mul(I, M), x = n.add(x, x), x = n.add(x, x), new u(k, E, x);
     }
     // Renes-Costello-Batina exception-free addition formula.
     // There is 30% faster Jacobian formula, but it is not complete.
@@ -911,13 +911,13 @@ function cs(e) {
     // Cost: 12M + 0S + 3*a + 3*b3 + 23add.
     add(h) {
       f(h);
-      const { px: d, py: y, pz: E } = this, { px: S, py: _, pz: B } = h;
-      let m = n.ZERO, x = n.ZERO, K = n.ZERO;
+      const { px: d, py: y, pz: m } = this, { px: S, py: U, pz: k } = h;
+      let E = n.ZERO, x = n.ZERO, K = n.ZERO;
       const M = t.a, I = n.mul(t.b, Ln);
-      let A = n.mul(d, S), R = n.mul(y, _), T = n.mul(E, B), D = n.add(d, y), b = n.add(S, _);
-      D = n.mul(D, b), b = n.add(A, R), D = n.sub(D, b), b = n.add(d, E);
-      let v = n.add(S, B);
-      return b = n.mul(b, v), v = n.add(A, T), b = n.sub(b, v), v = n.add(y, E), m = n.add(_, B), v = n.mul(v, m), m = n.add(R, T), v = n.sub(v, m), K = n.mul(M, b), m = n.mul(I, T), K = n.add(m, K), m = n.sub(R, K), K = n.add(R, K), x = n.mul(m, K), R = n.add(A, A), R = n.add(R, A), T = n.mul(M, T), b = n.mul(I, b), R = n.add(R, T), T = n.sub(A, T), T = n.mul(M, T), b = n.add(b, T), A = n.mul(R, b), x = n.add(x, A), A = n.mul(v, b), m = n.mul(D, m), m = n.sub(m, A), A = n.mul(D, R), K = n.mul(v, K), K = n.add(K, A), new u(m, x, K);
+      let A = n.mul(d, S), R = n.mul(y, U), T = n.mul(m, k), D = n.add(d, y), b = n.add(S, U);
+      D = n.mul(D, b), b = n.add(A, R), D = n.sub(D, b), b = n.add(d, m);
+      let v = n.add(S, k);
+      return b = n.mul(b, v), v = n.add(A, T), b = n.sub(b, v), v = n.add(y, m), E = n.add(U, k), v = n.mul(v, E), E = n.add(R, T), v = n.sub(v, E), K = n.mul(M, b), E = n.mul(I, T), K = n.add(E, K), E = n.sub(R, K), K = n.add(R, K), x = n.mul(E, K), R = n.add(A, A), R = n.add(R, A), T = n.mul(M, T), b = n.mul(I, b), R = n.add(R, T), T = n.sub(A, T), T = n.mul(M, T), b = n.add(b, T), A = n.mul(R, b), x = n.add(x, A), A = n.mul(v, b), E = n.mul(D, E), E = n.sub(E, A), A = n.mul(D, R), K = n.mul(v, K), K = n.add(K, A), new u(E, x, K);
     }
     subtract(h) {
       return this.add(h.negate());
@@ -927,8 +927,8 @@ function cs(e) {
     }
     wNAF(h) {
       return w.wNAFCached(this, l, h, (d) => {
-        const y = n.invertBatch(d.map((E) => E.pz));
-        return d.map((E, S) => E.toAffine(y[S])).map(u.fromAffine);
+        const y = n.invertBatch(d.map((m) => m.pz));
+        return d.map((m, S) => m.toAffine(y[S])).map(u.fromAffine);
       });
     }
     /**
@@ -945,10 +945,10 @@ function cs(e) {
       const { endo: y } = t;
       if (!y)
         return w.unsafeLadder(this, h);
-      let { k1neg: E, k1: S, k2neg: _, k2: B } = y.splitScalar(h), m = d, x = d, K = this;
-      for (; S > ce || B > ce; )
-        S & X && (m = m.add(K)), B & X && (x = x.add(K)), K = K.double(), S >>= X, B >>= X;
-      return E && (m = m.negate()), _ && (x = x.negate()), x = new u(n.mul(x.px, y.beta), x.py, x.pz), m.add(x);
+      let { k1neg: m, k1: S, k2neg: U, k2: k } = y.splitScalar(h), E = d, x = d, K = this;
+      for (; S > ce || k > ce; )
+        S & X && (E = E.add(K)), k & X && (x = x.add(K)), K = K.double(), S >>= X, k >>= X;
+      return m && (E = E.negate()), U && (x = x.negate()), x = new u(n.mul(x.px, y.beta), x.py, x.pz), E.add(x);
     }
     /**
      * Constant time multiplication.
@@ -961,17 +961,17 @@ function cs(e) {
      */
     multiply(h) {
       c(h);
-      let d = h, y, E;
+      let d = h, y, m;
       const { endo: S } = t;
       if (S) {
-        const { k1neg: _, k1: B, k2neg: m, k2: x } = S.splitScalar(d);
-        let { p: K, f: M } = this.wNAF(B), { p: I, f: A } = this.wNAF(x);
-        K = w.constTimeNegate(_, K), I = w.constTimeNegate(m, I), I = new u(n.mul(I.px, S.beta), I.py, I.pz), y = K.add(I), E = M.add(A);
+        const { k1neg: U, k1: k, k2neg: E, k2: x } = S.splitScalar(d);
+        let { p: K, f: M } = this.wNAF(k), { p: I, f: A } = this.wNAF(x);
+        K = w.constTimeNegate(U, K), I = w.constTimeNegate(E, I), I = new u(n.mul(I.px, S.beta), I.py, I.pz), y = K.add(I), m = M.add(A);
       } else {
-        const { p: _, f: B } = this.wNAF(d);
-        y = _, E = B;
+        const { p: U, f: k } = this.wNAF(d);
+        y = U, m = k;
       }
-      return u.normalizeZ([y, E])[0];
+      return u.normalizeZ([y, m])[0];
     }
     /**
      * Efficiently calculate `aP + bQ`. Unsafe, can expose private key, if used incorrectly.
@@ -980,21 +980,21 @@ function cs(e) {
      * @returns non-zero affine point
      */
     multiplyAndAddUnsafe(h, d, y) {
-      const E = u.BASE, S = (B, m) => m === ce || m === X || !B.equals(E) ? B.multiplyUnsafe(m) : B.multiply(m), _ = S(this, d).add(S(h, y));
-      return _.is0() ? void 0 : _;
+      const m = u.BASE, S = (k, E) => E === ce || E === X || !k.equals(m) ? k.multiplyUnsafe(E) : k.multiply(E), U = S(this, d).add(S(h, y));
+      return U.is0() ? void 0 : U;
     }
     // 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)
     toAffine(h) {
-      const { px: d, py: y, pz: E } = this, S = this.is0();
-      h == null && (h = S ? n.ONE : n.inv(E));
-      const _ = n.mul(d, h), B = n.mul(y, h), m = n.mul(E, h);
+      const { px: d, py: y, pz: m } = this, S = this.is0();
+      h == null && (h = S ? n.ONE : n.inv(m));
+      const U = n.mul(d, h), k = n.mul(y, h), E = n.mul(m, h);
       if (S)
         return { x: n.ZERO, y: n.ZERO };
-      if (!n.eql(m, n.ONE))
+      if (!n.eql(E, n.ONE))
         throw new Error("invZ was invalid");
-      return { x: _, y: B };
+      return { x: U, y: k };
     }
     isTorsionFree() {
       const { h, isTorsionFree: d } = t;
@@ -1051,22 +1051,22 @@ function ls(e) {
   const { ProjectivePoint: l, normPrivateKeyToScalar: f, weierstrassEquation: u, isWithinCurveOrder: p } = cs({
     ...t,
     toBytes(b, v, N) {
-      const k = v.toAffine(), C = n.toBytes(k.x), U = Ie;
-      return N ? U(Uint8Array.from([v.hasEvenY() ? 2 : 3]), C) : U(Uint8Array.from([4]), C, n.toBytes(k.y));
+      const B = v.toAffine(), C = n.toBytes(B.x), _ = Ie;
+      return N ? _(Uint8Array.from([v.hasEvenY() ? 2 : 3]), C) : _(Uint8Array.from([4]), C, n.toBytes(B.y));
     },
     fromBytes(b) {
-      const v = b.length, N = b[0], k = b.subarray(1);
+      const v = b.length, N = b[0], B = b.subarray(1);
       if (v === i && (N === 2 || N === 3)) {
-        const C = G(k);
+        const C = G(B);
         if (!o(C))
           throw new Error("Point is not on curve");
-        const U = u(C);
-        let O = n.sqrt(U);
+        const _ = u(C);
+        let O = n.sqrt(_);
         const $ = (O & X) === X;
         return (N & 1) === 1 !== $ && (O = n.neg(O)), { x: C, y: O };
       } else if (v === s && N === 4) {
-        const C = n.fromBytes(k.subarray(0, n.BYTES)), U = n.fromBytes(k.subarray(n.BYTES, 2 * n.BYTES));
-        return { x: C, y: U };
+        const C = n.fromBytes(B.subarray(0, n.BYTES)), _ = n.fromBytes(B.subarray(n.BYTES, 2 * n.BYTES));
+        return { x: C, y: _ };
       } else
         throw new Error(`Point of length ${v} was invalid. Expected ${i} compressed bytes or ${s} uncompressed bytes`);
     }
@@ -1080,8 +1080,8 @@ function ls(e) {
   }
   const d = (b, v, N) => G(b.slice(v, N));
   class y {
-    constructor(v, N, k) {
-      this.r = v, this.s = N, this.recovery = k, this.assertValidity();
+    constructor(v, N, B) {
+      this.r = v, this.s = N, this.recovery = B, this.assertValidity();
     }
     // pair (bytes of r, bytes of s)
     static fromCompact(v) {
@@ -1091,8 +1091,8 @@ function ls(e) {
     // DER encoded ECDSA signature
     // https://bitcoin.stackexchange.com/questions/57644/what-are-the-parts-of-a-bitcoin-transaction-input-script
     static fromDER(v) {
-      const { r: N, s: k } = Be.toSig(Z("DER", v));
-      return new y(N, k);
+      const { r: N, s: B } = ke.toSig(Z("DER", v));
+      return new y(N, B);
     }
     assertValidity() {
       if (!p(this.r))
@@ -1104,13 +1104,13 @@ function ls(e) {
       return new y(this.r, this.s, v);
     }
     recoverPublicKey(v) {
-      const { r: N, s: k, recovery: C } = this, U = x(Z("msgHash", v));
+      const { r: N, s: B, recovery: C } = this, _ = x(Z("msgHash", v));
       if (C == null || ![0, 1, 2, 3].includes(C))
         throw new Error("recovery id invalid");
       const O = C === 2 || C === 3 ? N + t.n : N;
       if (O >= n.ORDER)
         throw new Error("recovery id 2 or 3 invalid");
-      const $ = (C & 1) === 0 ? "02" : "03", ee = l.fromHex($ + w(O)), ge = a(O), Ue = c(-U * ge), Ve = c(k * ge), we = l.BASE.multiplyAndAddUnsafe(ee, Ue, Ve);
+      const $ = (C & 1) === 0 ? "02" : "03", ee = l.fromHex($ + w(O)), ge = a(O), _e = c(-_ * ge), Ve = c(B * ge), we = l.BASE.multiplyAndAddUnsafe(ee, _e, Ve);
       if (!we)
         throw new Error("point at infinify");
       return we.assertValidity(), we;
@@ -1127,7 +1127,7 @@ function ls(e) {
       return je(this.toDERHex());
     }
     toDERHex() {
-      return Be.hexFromSig({ r: this.r, s: this.s });
+      return ke.hexFromSig({ r: this.r, s: this.s });
     }
     // padded bytes of r, then padded bytes of s
     toCompactRawBytes() {
@@ -1137,7 +1137,7 @@ function ls(e) {
       return w(this.r) + w(this.s);
     }
   }
-  const E = {
+  const m = {
     isValidPrivateKey(b) {
       try {
         return f(b), !0;
@@ -1169,22 +1169,22 @@ function ls(e) {
   function S(b, v = !0) {
     return l.fromPrivateKey(b).toRawBytes(v);
   }
-  function _(b) {
-    const v = b instanceof Uint8Array, N = typeof b == "string", k = (v || N) && b.length;
-    return v ? k === i || k === s : N ? k === 2 * i || k === 2 * s : b instanceof l;
+  function U(b) {
+    const v = b instanceof Uint8Array, N = typeof b == "string", B = (v || N) && b.length;
+    return v ? B === i || B === s : N ? B === 2 * i || B === 2 * s : b instanceof l;
   }
-  function B(b, v, N = !0) {
-    if (_(b))
+  function k(b, v, N = !0) {
+    if (U(b))
       throw new Error("first arg must be private key");
-    if (!_(v))
+    if (!U(v))
       throw new Error("second arg must be public key");
     return l.fromHex(v).multiply(f(b)).toRawBytes(N);
   }
-  const m = t.bits2int || function(b) {
+  const E = t.bits2int || function(b) {
     const v = G(b), N = b.length * 8 - t.nBitLength;
     return N > 0 ? v >> BigInt(N) : v;
   }, x = t.bits2int_modN || function(b) {
-    return c(m(b));
+    return c(E(b));
   }, K = Jt(t.nBitLength);
   function M(b) {
     if (typeof b != "bigint")
@@ -1196,17 +1196,17 @@ function ls(e) {
   function I(b, v, N = A) {
     if (["recovered", "canonical"].some((Ae) => Ae in N))
       throw new Error("sign() legacy options not supported");
-    const { hash: k, randomBytes: C } = t;
-    let { lowS: U, prehash: O, extraEntropy: $ } = N;
-    U == null && (U = !0), b = Z("msgHash", b), O && (b = Z("prehashed msgHash", k(b)));
-    const ee = x(b), ge = f(v), Ue = [M(ge), M(ee)];
+    const { hash: B, randomBytes: C } = t;
+    let { lowS: _, prehash: O, extraEntropy: $ } = N;
+    _ == null && (_ = !0), b = Z("msgHash", b), O && (b = Z("prehashed msgHash", B(b)));
+    const ee = x(b), ge = f(v), _e = [M(ge), M(ee)];
     if ($ != null) {
       const Ae = $ === !0 ? C(n.BYTES) : $;
-      Ue.push(Z("extraEntropy", Ae));
+      _e.push(Z("extraEntropy", Ae));
     }
-    const Ve = Ie(...Ue), we = ee;
+    const Ve = Ie(..._e), we = ee;
     function Et(Ae) {
-      const Le = m(Ae);
+      const Le = E(Ae);
       if (!p(Le))
         return;
       const An = a(Le), $e = l.BASE.multiply(Le).toAffine(), te = c($e.x);
@@ -1215,30 +1215,30 @@ function ls(e) {
       const Re = c(An * c(we + te * ge));
       if (Re === ce)
         return;
-      let Cn = ($e.x === te ? 0 : 2) | Number($e.y & X), Bn = Re;
-      return U && g(Re) && (Bn = h(Re), Cn ^= 1), new y(te, Bn, Cn);
+      let Cn = ($e.x === te ? 0 : 2) | Number($e.y & X), kn = Re;
+      return _ && g(Re) && (kn = h(Re), Cn ^= 1), new y(te, kn, Cn);
     }
     return { seed: Ve, k2sig: Et };
   }
   const A = { lowS: t.lowS, prehash: !1 }, R = { lowS: t.lowS, prehash: !1 };
   function T(b, v, N = A) {
-    const { seed: k, k2sig: C } = I(b, v, N), U = t;
-    return er(U.hash.outputLen, U.nByteLength, U.hmac)(k, C);
+    const { seed: B, k2sig: C } = I(b, v, N), _ = t;
+    return er(_.hash.outputLen, _.nByteLength, _.hmac)(B, C);
   }
   l.BASE._setWindowSize(8);
-  function D(b, v, N, k = R) {
+  function D(b, v, N, B = R) {
     var $e;
     const C = b;
-    if (v = Z("msgHash", v), N = Z("publicKey", N), "strict" in k)
+    if (v = Z("msgHash", v), N = Z("publicKey", N), "strict" in B)
       throw new Error("options.strict was renamed to lowS");
-    const { lowS: U, prehash: O } = k;
+    const { lowS: _, prehash: O } = B;
     let $, ee;
     try {
       if (typeof C == "string" || C instanceof Uint8Array)
         try {
           $ = y.fromDER(C);
         } catch (te) {
-          if (!(te instanceof Be.Err))
+          if (!(te instanceof ke.Err))
             throw te;
           $ = y.fromCompact(C);
         }
@@ -1253,21 +1253,21 @@ function ls(e) {
         throw new Error("signature must be Signature instance, Uint8Array or hex string");
       return !1;
     }
-    if (U && $.hasHighS())
+    if (_ && $.hasHighS())
       return !1;
     O && (v = t.hash(v));
-    const { r: ge, s: Ue } = $, Ve = x(v), we = a(Ue), Et = c(Ve * we), Ae = c(ge * we), Le = ($e = l.BASE.multiplyAndAddUnsafe(ee, Et, Ae)) == null ? void 0 : $e.toAffine();
+    const { r: ge, s: _e } = $, Ve = x(v), we = a(_e), Et = c(Ve * we), Ae = c(ge * we), Le = ($e = l.BASE.multiplyAndAddUnsafe(ee, Et, Ae)) == null ? void 0 : $e.toAffine();
     return Le ? c(Le.x) === ge : !1;
   }
   return {
     CURVE: t,
     getPublicKey: S,
-    getSharedSecret: B,
+    getSharedSecret: k,
     sign: T,
     verify: D,
     ProjectivePoint: l,
     Signature: y,
-    utils: E
+    utils: m
   };
 }
 let sr = class extends Jn {
@@ -1311,7 +1311,7 @@ or.create = (e, t) => new sr(e, t);
 function fs(e) {
   return {
     hash: e,
-    hmac: (t, ...n) => or(e, t, ki(...n)),
+    hmac: (t, ...n) => or(e, t, Bi(...n)),
     randomBytes: Yn
   };
 }
@@ -1322,12 +1322,12 @@ function hs(e, t) {
 /*! noble-curves - MIT License (c) 2022 Paul Miller (paulmillr.com) */
 const ut = BigInt("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f"), tt = BigInt("0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141"), ar = BigInt(1), nt = BigInt(2), $n = (e, t) => (e + t / nt) / t;
 function cr(e) {
-  const t = ut, n = BigInt(3), r = BigInt(6), i = BigInt(11), s = BigInt(22), o = BigInt(23), c = BigInt(44), a = BigInt(88), l = e * e * e % t, f = l * l * e % t, u = Y(f, n, t) * f % t, p = Y(u, n, t) * f % t, w = Y(p, nt, t) * l % t, g = Y(w, i, t) * w % t, h = Y(g, s, t) * g % t, d = Y(h, c, t) * h % t, y = Y(d, a, t) * d % t, E = Y(y, c, t) * h % t, S = Y(E, n, t) * f % t, _ = Y(S, o, t) * g % t, B = Y(_, r, t) * l % t, m = Y(B, nt, t);
-  if (!Ot.eql(Ot.sqr(m), e))
+  const t = ut, n = BigInt(3), r = BigInt(6), i = BigInt(11), s = BigInt(22), o = BigInt(23), c = BigInt(44), a = BigInt(88), l = e * e * e % t, f = l * l * e % t, u = Y(f, n, t) * f % t, p = Y(u, n, t) * f % t, w = Y(p, nt, t) * l % t, g = Y(w, i, t) * w % t, h = Y(g, s, t) * g % t, d = Y(h, c, t) * h % t, y = Y(d, a, t) * d % t, m = Y(y, c, t) * h % t, S = Y(m, n, t) * f % t, U = Y(S, o, t) * g % t, k = Y(U, r, t) * l % t, E = Y(k, nt, t);
+  if (!Ot.eql(Ot.sqr(E), e))
     throw new Error("Cannot find square root");
-  return m;
+  return E;
 }
-const Ot = ts(ut, void 0, void 0, { sqrt: cr }), _e = hs({
+const Ot = ts(ut, void 0, void 0, { sqrt: cr }), Ue = hs({
   a: BigInt(0),
   b: BigInt(7),
   Fp: Ot,
@@ -1363,9 +1363,9 @@ function rt(e, ...t) {
   }
   return $t(Ie(n, ...t));
 }
-const Yt = (e) => e.toRawBytes(!0).slice(1), Mt = (e) => Ne(e, 32), At = (e) => V(e, ut), Ge = (e) => V(e, tt), Xt = _e.ProjectivePoint, ps = (e, t, n) => Xt.BASE.multiplyAndAddUnsafe(e, t, n);
+const Yt = (e) => e.toRawBytes(!0).slice(1), Mt = (e) => Ne(e, 32), At = (e) => V(e, ut), Ge = (e) => V(e, tt), Xt = Ue.ProjectivePoint, ys = (e, t, n) => Xt.BASE.multiplyAndAddUnsafe(e, t, n);
 function Pt(e) {
-  let t = _e.utils.normPrivateKeyToScalar(e), n = Xt.fromPrivateKey(t);
+  let t = Ue.utils.normPrivateKeyToScalar(e), n = Xt.fromPrivateKey(t);
   return { scalar: n.hasEvenY() ? t : Ge(-t), bytes: Yt(n) };
 }
 function lr(e) {
@@ -1380,7 +1380,7 @@ function lr(e) {
 function fr(...e) {
   return Ge(G(rt("BIP0340/challenge", ...e)));
 }
-function ys(e) {
+function ps(e) {
   return Pt(e).bytes;
 }
 function gs(e, t, n = Yn(32)) {
@@ -1401,18 +1401,18 @@ function hr(e, t, n) {
     const a = G(r.subarray(32, 64));
     if (!ds(a))
       return !1;
-    const l = fr(Mt(c), Yt(o), i), f = ps(o, a, Ge(-l));
+    const l = fr(Mt(c), Yt(o), i), f = ys(o, a, Ge(-l));
     return !(!f || !f.hasEvenY() || f.toAffine().x !== c);
   } catch {
     return !1;
   }
 }
 const Ze = {
-  getPublicKey: ys,
+  getPublicKey: ps,
   sign: gs,
   verify: hr,
   utils: {
-    randomPrivateKey: _e.utils.randomPrivateKey,
+    randomPrivateKey: Ue.utils.randomPrivateKey,
     lift_x: lr,
     pointToBytes: Yt,
     numberToBytesBE: Ne,
@@ -1422,7 +1422,7 @@ const Ze = {
   }
 }, Ct = typeof globalThis == "object" && "crypto" in globalThis ? globalThis.crypto : void 0;
 /*! noble-hashes - MIT License (c) 2022 Paul Miller (paulmillr.com) */
-const Qt = (e) => e instanceof Uint8Array, Bt = (e) => new DataView(e.buffer, e.byteOffset, e.byteLength), ie = (e, t) => e << 32 - t | e >>> t, ws = new Uint8Array(new Uint32Array([287454020]).buffer)[0] === 68;
+const Qt = (e) => e instanceof Uint8Array, kt = (e) => new DataView(e.buffer, e.byteOffset, e.byteLength), ie = (e, t) => e << 32 - t | e >>> t, ws = new Uint8Array(new Uint32Array([287454020]).buffer)[0] === 68;
 if (!ws)
   throw new Error("Non little-endian hardware is not supported");
 const bs = Array.from({ length: 256 }, (e, t) => t.toString(16).padStart(2, "0"));
@@ -1474,11 +1474,11 @@ class dr {
     return this._cloneInto();
   }
 }
-function pr(e) {
+function yr(e) {
   const t = (r) => e().update(Je(r)).digest(), n = e();
   return t.outputLen = n.outputLen, t.blockLen = n.blockLen, t.create = () => e(), t;
 }
-function yr(e = 32) {
+function pr(e = 32) {
   if (Ct && typeof Ct.getRandomValues == "function")
     return Ct.getRandomValues(new Uint8Array(e));
   throw new Error("crypto.getRandomValues must be defined");
@@ -1530,7 +1530,7 @@ function Ns(e, t, n, r) {
 }
 class Ss extends dr {
   constructor(t, n, r, i) {
-    super(), this.blockLen = t, this.outputLen = n, this.padOffset = r, this.isLE = i, this.finished = !1, this.length = 0, this.pos = 0, this.destroyed = !1, this.buffer = new Uint8Array(t), this.view = Bt(this.buffer);
+    super(), this.blockLen = t, this.outputLen = n, this.padOffset = r, this.isLE = i, this.finished = !1, this.length = 0, this.pos = 0, this.destroyed = !1, this.buffer = new Uint8Array(t), this.view = kt(this.buffer);
   }
   update(t) {
     se.exists(this);
@@ -1540,7 +1540,7 @@ class Ss extends dr {
     for (let o = 0; o < s; ) {
       const c = Math.min(i - this.pos, s - o);
       if (c === i) {
-        const a = Bt(t);
+        const a = kt(t);
         for (; i <= s - o; o += i)
           this.process(a, o);
         continue;
@@ -1557,7 +1557,7 @@ class Ss extends dr {
     for (let u = o; u < i; u++)
       n[u] = 0;
     Ns(r, i - 8, BigInt(this.length * 8), s), this.process(r, 0);
-    const c = Bt(t), a = this.outputLen;
+    const c = kt(t), a = this.outputLen;
     if (a % 4)
       throw new Error("_sha2: outputLen should be aligned to 32bit");
     const l = a / 4, f = this.get();
@@ -1578,7 +1578,7 @@ class Ss extends dr {
     return t.length = i, t.pos = c, t.finished = s, t.destroyed = o, i % n && t.buffer.set(r), t;
   }
 }
-const As = (e, t, n) => e & t ^ ~e & n, Cs = (e, t, n) => e & t ^ e & n ^ t & n, Bs = new Uint32Array([
+const As = (e, t, n) => e & t ^ ~e & n, Cs = (e, t, n) => e & t ^ e & n ^ t & n, ks = new Uint32Array([
   1116352408,
   1899447441,
   3049323471,
@@ -1674,7 +1674,7 @@ class wr extends Ss {
     }
     let { A: r, B: i, C: s, D: o, E: c, F: a, G: l, H: f } = this;
     for (let u = 0; u < 64; u++) {
-      const p = ie(c, 6) ^ ie(c, 11) ^ ie(c, 25), w = f + p + As(c, a, l) + Bs[u] + Ee[u] | 0, h = (ie(r, 2) ^ ie(r, 13) ^ ie(r, 22)) + Cs(r, i, s) | 0;
+      const p = ie(c, 6) ^ ie(c, 11) ^ ie(c, 25), w = f + p + As(c, a, l) + ks[u] + Ee[u] | 0, h = (ie(r, 2) ^ ie(r, 13) ^ ie(r, 22)) + Cs(r, i, s) | 0;
       f = l, l = a, a = c, c = o + w | 0, o = s, s = i, i = r, r = w + h | 0;
     }
     r = r + this.A | 0, i = i + this.B | 0, s = s + this.C | 0, o = o + this.D | 0, c = c + this.E | 0, a = a + this.F | 0, l = l + this.G | 0, f = f + this.H | 0, this.set(r, i, s, o, c, a, l, f);
@@ -1686,13 +1686,13 @@ class wr extends Ss {
     this.set(0, 0, 0, 0, 0, 0, 0, 0), this.buffer.fill(0);
   }
 }
-class ks extends wr {
+class Bs extends wr {
   constructor() {
     super(), this.A = -1056596264, this.B = 914150663, this.C = 812702999, this.D = -150054599, this.E = -4191439, this.F = 1750603025, this.G = 1694076839, this.H = -1090891868, this.outputLen = 28;
   }
 }
-const fe = pr(() => new wr());
-pr(() => new ks());
+const fe = yr(() => new wr());
+yr(() => new Bs());
 /*! scure-base - MIT License (c) 2022 Paul Miller (paulmillr.com) */
 function We(e) {
   if (!Number.isSafeInteger(e))
@@ -1702,7 +1702,7 @@ function de(...e) {
   const t = (i, s) => (o) => i(s(o)), n = Array.from(e).reverse().reduce((i, s) => i ? t(i, s.encode) : s.encode, void 0), r = e.reduce((i, s) => i ? t(i, s.decode) : s.decode, void 0);
   return { encode: n, decode: r };
 }
-function pe(e) {
+function ye(e) {
   return {
     encode: (t) => {
       if (!Array.isArray(t) || t.length && typeof t[0] != "number")
@@ -1727,7 +1727,7 @@ function pe(e) {
     }
   };
 }
-function ye(e = "") {
+function pe(e = "") {
   if (typeof e != "string")
     throw new Error("join separator should be string");
   return {
@@ -1883,10 +1883,10 @@ function On(e) {
     }
   };
 }
-const _s = de(Se(4), pe("0123456789ABCDEF"), ye("")), Us = de(Se(5), pe("ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"), ht(5), ye(""));
-de(Se(5), pe("0123456789ABCDEFGHIJKLMNOPQRSTUV"), ht(5), ye(""));
-de(Se(5), pe("0123456789ABCDEFGHJKMNPQRSTVWXYZ"), ye(""), br((e) => e.toUpperCase().replace(/O/g, "0").replace(/[IL]/g, "1")));
-const he = de(Se(6), pe("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"), ht(6), ye("")), Ls = de(Se(6), pe("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"), ht(6), ye("")), en = (e) => de(Is(58), pe(e), ye("")), qt = en("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz");
+const Us = de(Se(4), ye("0123456789ABCDEF"), pe("")), _s = de(Se(5), ye("ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"), ht(5), pe(""));
+de(Se(5), ye("0123456789ABCDEFGHIJKLMNOPQRSTUV"), ht(5), pe(""));
+de(Se(5), ye("0123456789ABCDEFGHJKMNPQRSTVWXYZ"), pe(""), br((e) => e.toUpperCase().replace(/O/g, "0").replace(/[IL]/g, "1")));
+const he = de(Se(6), ye("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"), ht(6), pe("")), Ls = de(Se(6), ye("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"), ht(6), pe("")), en = (e) => de(Is(58), ye(e), pe("")), qt = en("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz");
 en("123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ");
 en("rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz");
 const Mn = [0, 2, 3, 5, 6, 7, 9, 10, 11], $s = {
@@ -1909,7 +1909,7 @@ const Mn = [0, 2, 3, 5, 6, 7, 9, 10, 11], $s = {
     }
     return Uint8Array.from(t);
   }
-}, jt = de(pe("qpzry9x8gf2tvdw0s3jn54khce6mua7l"), ye("")), Pn = [996825010, 642813549, 513874426, 1027748829, 705979059];
+}, jt = de(ye("qpzry9x8gf2tvdw0s3jn54khce6mua7l"), pe("")), Pn = [996825010, 642813549, 513874426, 1027748829, 705979059];
 function Fe(e) {
   const t = e >> 25;
   let n = (e & 33554431) << 5;
@@ -1979,22 +1979,22 @@ mr("bech32m");
 const Rs = {
   encode: (e) => new TextDecoder().decode(e),
   decode: (e) => new TextEncoder().encode(e)
-}, Ts = de(Se(4), pe("0123456789abcdef"), ye(""), br((e) => {
+}, Ts = de(Se(4), ye("0123456789abcdef"), pe(""), br((e) => {
   if (typeof e != "string" || e.length % 2)
     throw new TypeError(`hex.decode: expected string, got ${typeof e} with length ${e.length}`);
   return e.toLowerCase();
 })), Os = {
   utf8: Rs,
   hex: Ts,
-  base16: _s,
-  base32: Us,
+  base16: Us,
+  base32: _s,
   base64: he,
   base64url: Ls,
   base58: qt,
   base58xmr: $s
 };
 `${Object.keys(Os).join(", ")}`;
-function kt(e) {
+function Bt(e) {
   if (!Number.isSafeInteger(e) || e < 0)
     throw new Error(`positive integer expected, not ${e}`);
 }
@@ -2104,8 +2104,8 @@ function qn(e, t, n, r, i) {
   t ^= e[a++], n ^= e[a++], r ^= e[a++], i ^= e[a++];
   const l = e.length / 4 - 2;
   for (let g = 0; g < l; g++) {
-    const h = e[a++] ^ xe(o, c, t, n, r, i), d = e[a++] ^ xe(o, c, n, r, i, t), y = e[a++] ^ xe(o, c, r, i, t, n), E = e[a++] ^ xe(o, c, i, t, n, r);
-    t = h, n = d, r = y, i = E;
+    const h = e[a++] ^ xe(o, c, t, n, r, i), d = e[a++] ^ xe(o, c, n, r, i, t), y = e[a++] ^ xe(o, c, r, i, t, n), m = e[a++] ^ xe(o, c, i, t, n, r);
+    t = h, n = d, r = y, i = m;
   }
   const f = e[a++] ^ oe(s, t, n, r, i), u = e[a++] ^ oe(s, n, r, i, t), p = e[a++] ^ oe(s, r, i, t, n), w = e[a++] ^ oe(s, i, t, n, r);
   return { s0: f, s1: u, s2: p, s3: w };
@@ -2116,8 +2116,8 @@ function Fs(e, t, n, r, i) {
   t ^= e[a++], n ^= e[a++], r ^= e[a++], i ^= e[a++];
   const l = e.length / 4 - 2;
   for (let g = 0; g < l; g++) {
-    const h = e[a++] ^ xe(o, c, t, i, r, n), d = e[a++] ^ xe(o, c, n, t, i, r), y = e[a++] ^ xe(o, c, r, n, t, i), E = e[a++] ^ xe(o, c, i, r, n, t);
-    t = h, n = d, r = y, i = E;
+    const h = e[a++] ^ xe(o, c, t, i, r, n), d = e[a++] ^ xe(o, c, n, t, i, r), y = e[a++] ^ xe(o, c, r, n, t, i), m = e[a++] ^ xe(o, c, i, r, n, t);
+    t = h, n = d, r = y, i = m;
   }
   const f = e[a++] ^ oe(s, t, i, r, n), u = e[a++] ^ oe(s, n, t, i, r), p = e[a++] ^ oe(s, r, n, t, i), w = e[a++] ^ oe(s, i, r, n, t);
   return { s0: f, s1: u, s2: p, s3: w };
@@ -2189,10 +2189,10 @@ const Sr = /* @__PURE__ */ qs({ blockSize: 16, nonceLength: 16 }, function(t, n,
       const c = Zs(t), a = F(n), l = Nr(s.length, o), f = F(s), u = F(l);
       let p = a[0], w = a[1], g = a[2], h = a[3];
       for (let d = 0; d + 4 <= f.length; ) {
-        const y = p, E = w, S = g, _ = h;
+        const y = p, m = w, S = g, U = h;
         p = f[d + 0], w = f[d + 1], g = f[d + 2], h = f[d + 3];
-        const { s0: B, s1: m, s2: x, s3: K } = Fs(c, p, w, g, h);
-        u[d++] = B ^ y, u[d++] = m ^ E, u[d++] = x ^ S, u[d++] = K ^ _;
+        const { s0: k, s1: E, s2: x, s3: K } = Fs(c, p, w, g, h);
+        u[d++] = k ^ y, u[d++] = E ^ m, u[d++] = x ^ S, u[d++] = K ^ U;
       }
       return c.fill(0), Ys(l, i);
     }
@@ -2205,19 +2205,19 @@ function L(e, t) {
 function Wt(e) {
   return e.byteOffset % 4 === 0;
 }
-const Xe = 64, no = 16, Br = 2 ** 32 - 1, jn = new Uint32Array();
+const Xe = 64, no = 16, kr = 2 ** 32 - 1, jn = new Uint32Array();
 function ro(e, t, n, r, i, s, o, c) {
   const a = i.length, l = new Uint8Array(Xe), f = F(l), u = Wt(i) && Wt(s), p = u ? F(i) : jn, w = u ? F(s) : jn;
   for (let g = 0; g < a; o++) {
-    if (e(t, n, r, f, o, c), o >= Br)
+    if (e(t, n, r, f, o, c), o >= kr)
       throw new Error("arx: counter overflow");
     const h = Math.min(Xe, a - g);
     if (u && h === Xe) {
       const d = g / 4;
       if (g % 4 !== 0)
         throw new Error("arx: invalid block position");
-      for (let y = 0, E; y < no; y++)
-        E = d + y, w[E] = p[E] ^ f[y];
+      for (let y = 0, m; y < no; y++)
+        m = d + y, w[m] = p[m] ^ f[y];
       g += Xe;
       continue;
     }
@@ -2230,10 +2230,10 @@ function io(e, t) {
   const { allowShortKeys: n, extendNonceFn: r, counterLength: i, counterRight: s, rounds: o } = Hs({ allowShortKeys: !1, counterLength: 8, counterRight: !1, rounds: 20 }, t);
   if (typeof e != "function")
     throw new Error("core must be a function");
-  return kt(i), kt(o), Dn(s), Dn(n), (c, a, l, f, u = 0) => {
+  return Bt(i), Bt(o), Dn(s), Dn(n), (c, a, l, f, u = 0) => {
     ue(c), ue(a), ue(l);
     const p = l.length;
-    if (f || (f = new Uint8Array(p)), ue(f), kt(u), u < 0 || u >= Br)
+    if (f || (f = new Uint8Array(p)), ue(f), Bt(u), u < 0 || u >= kr)
       throw new Error("arx: counter overflow");
     if (f.length < p)
       throw new Error(`arx: output (${f.length}) is shorter than data (${p})`);
@@ -2252,12 +2252,12 @@ function io(e, t) {
         throw new Error("arx: extended nonce must be 24 bytes");
       r(d, y, F(a.subarray(0, 16)), y), a = a.subarray(16);
     }
-    const E = 16 - i;
-    if (E !== a.length)
-      throw new Error(`arx: nonce must be ${E} or 16 bytes`);
-    if (E !== 12) {
-      const _ = new Uint8Array(12);
-      _.set(a, s ? 0 : 12 - a.length), a = _, w.push(a);
+    const m = 16 - i;
+    if (m !== a.length)
+      throw new Error(`arx: nonce must be ${m} or 16 bytes`);
+    if (m !== 12) {
+      const U = new Uint8Array(12);
+      U.set(a, s ? 0 : 12 - a.length), a = U, w.push(a);
     }
     const S = F(a);
     for (ro(e, d, y, S, l, f, u, o); w.length > 0; )
@@ -2266,13 +2266,13 @@ function io(e, t) {
   };
 }
 function so(e, t, n, r, i, s = 20) {
-  let o = e[0], c = e[1], a = e[2], l = e[3], f = t[0], u = t[1], p = t[2], w = t[3], g = t[4], h = t[5], d = t[6], y = t[7], E = i, S = n[0], _ = n[1], B = n[2], m = o, x = c, K = a, M = l, I = f, A = u, R = p, T = w, D = g, b = h, v = d, N = y, k = E, C = S, U = _, O = B;
+  let o = e[0], c = e[1], a = e[2], l = e[3], f = t[0], u = t[1], p = t[2], w = t[3], g = t[4], h = t[5], d = t[6], y = t[7], m = i, S = n[0], U = n[1], k = n[2], E = o, x = c, K = a, M = l, I = f, A = u, R = p, T = w, D = g, b = h, v = d, N = y, B = m, C = S, _ = U, O = k;
   for (let ee = 0; ee < s; ee += 2)
-    m = m + I | 0, k = L(k ^ m, 16), D = D + k | 0, I = L(I ^ D, 12), m = m + I | 0, k = L(k ^ m, 8), D = D + k | 0, I = L(I ^ D, 7), x = x + A | 0, C = L(C ^ x, 16), b = b + C | 0, A = L(A ^ b, 12), x = x + A | 0, C = L(C ^ x, 8), b = b + C | 0, A = L(A ^ b, 7), K = K + R | 0, U = L(U ^ K, 16), v = v + U | 0, R = L(R ^ v, 12), K = K + R | 0, U = L(U ^ K, 8), v = v + U | 0, R = L(R ^ v, 7), M = M + T | 0, O = L(O ^ M, 16), N = N + O | 0, T = L(T ^ N, 12), M = M + T | 0, O = L(O ^ M, 8), N = N + O | 0, T = L(T ^ N, 7), m = m + A | 0, O = L(O ^ m, 16), v = v + O | 0, A = L(A ^ v, 12), m = m + A | 0, O = L(O ^ m, 8), v = v + O | 0, A = L(A ^ v, 7), x = x + R | 0, k = L(k ^ x, 16), N = N + k | 0, R = L(R ^ N, 12), x = x + R | 0, k = L(k ^ x, 8), N = N + k | 0, R = L(R ^ N, 7), K = K + T | 0, C = L(C ^ K, 16), D = D + C | 0, T = L(T ^ D, 12), K = K + T | 0, C = L(C ^ K, 8), D = D + C | 0, T = L(T ^ D, 7), M = M + I | 0, U = L(U ^ M, 16), b = b + U | 0, I = L(I ^ b, 12), M = M + I | 0, U = L(U ^ M, 8), b = b + U | 0, I = L(I ^ b, 7);
+    E = E + I | 0, B = L(B ^ E, 16), D = D + B | 0, I = L(I ^ D, 12), E = E + I | 0, B = L(B ^ E, 8), D = D + B | 0, I = L(I ^ D, 7), x = x + A | 0, C = L(C ^ x, 16), b = b + C | 0, A = L(A ^ b, 12), x = x + A | 0, C = L(C ^ x, 8), b = b + C | 0, A = L(A ^ b, 7), K = K + R | 0, _ = L(_ ^ K, 16), v = v + _ | 0, R = L(R ^ v, 12), K = K + R | 0, _ = L(_ ^ K, 8), v = v + _ | 0, R = L(R ^ v, 7), M = M + T | 0, O = L(O ^ M, 16), N = N + O | 0, T = L(T ^ N, 12), M = M + T | 0, O = L(O ^ M, 8), N = N + O | 0, T = L(T ^ N, 7), E = E + A | 0, O = L(O ^ E, 16), v = v + O | 0, A = L(A ^ v, 12), E = E + A | 0, O = L(O ^ E, 8), v = v + O | 0, A = L(A ^ v, 7), x = x + R | 0, B = L(B ^ x, 16), N = N + B | 0, R = L(R ^ N, 12), x = x + R | 0, B = L(B ^ x, 8), N = N + B | 0, R = L(R ^ N, 7), K = K + T | 0, C = L(C ^ K, 16), D = D + C | 0, T = L(T ^ D, 12), K = K + T | 0, C = L(C ^ K, 8), D = D + C | 0, T = L(T ^ D, 7), M = M + I | 0, _ = L(_ ^ M, 16), b = b + _ | 0, I = L(I ^ b, 12), M = M + I | 0, _ = L(_ ^ M, 8), b = b + _ | 0, I = L(I ^ b, 7);
   let $ = 0;
-  r[$++] = o + m | 0, r[$++] = c + x | 0, r[$++] = a + K | 0, r[$++] = l + M | 0, r[$++] = f + I | 0, r[$++] = u + A | 0, r[$++] = p + R | 0, r[$++] = w + T | 0, r[$++] = g + D | 0, r[$++] = h + b | 0, r[$++] = d + v | 0, r[$++] = y + N | 0, r[$++] = E + k | 0, r[$++] = S + C | 0, r[$++] = _ + U | 0, r[$++] = B + O | 0;
+  r[$++] = o + E | 0, r[$++] = c + x | 0, r[$++] = a + K | 0, r[$++] = l + M | 0, r[$++] = f + I | 0, r[$++] = u + A | 0, r[$++] = p + R | 0, r[$++] = w + T | 0, r[$++] = g + D | 0, r[$++] = h + b | 0, r[$++] = d + v | 0, r[$++] = y + N | 0, r[$++] = m + B | 0, r[$++] = S + C | 0, r[$++] = U + _ | 0, r[$++] = k + O | 0;
 }
-const kr = /* @__PURE__ */ io(so, {
+const Br = /* @__PURE__ */ io(so, {
   counterRight: !1,
   counterLength: 4,
   allowShortKeys: !1
@@ -2317,22 +2317,22 @@ dt.create = (e, t) => new Ir(e, t);
 function rn(e, t, n) {
   return se.hash(e), n === void 0 && (n = new Uint8Array(e.outputLen)), dt(e, Je(n), Je(t));
 }
-const _t = new Uint8Array([0]), zn = new Uint8Array();
-function _r(e, t, n, r = 32) {
+const Ut = new Uint8Array([0]), zn = new Uint8Array();
+function Ur(e, t, n, r = 32) {
   if (se.hash(e), se.number(r), r > 255 * e.outputLen)
     throw new Error("Length should be <= 255*HashLen");
   const i = Math.ceil(r / e.outputLen);
   n === void 0 && (n = zn);
   const s = new Uint8Array(i * e.outputLen), o = dt.create(e, t), c = o._cloneInto(), a = new Uint8Array(o.outputLen);
   for (let l = 0; l < i; l++)
-    _t[0] = l + 1, c.update(l === 0 ? zn : a).update(n).update(_t).digestInto(a), s.set(a, e.outputLen * l), o._cloneInto(c);
-  return o.destroy(), c.destroy(), a.fill(0), _t.fill(0), s.slice(0, r);
+    Ut[0] = l + 1, c.update(l === 0 ? zn : a).update(n).update(Ut).digestInto(a), s.set(a, e.outputLen * l), o._cloneInto(c);
+  return o.destroy(), c.destroy(), a.fill(0), Ut.fill(0), s.slice(0, r);
 }
 var oo = Object.defineProperty, H = (e, t) => {
   for (var n in t)
     oo(e, n, { get: t[n], enumerable: !0 });
 }, Te = Symbol("verified"), ao = (e) => e instanceof Object;
-function pt(e) {
+function yt(e) {
   if (!ao(e) || typeof e.kind != "number" || typeof e.content != "string" || typeof e.created_at != "number" || typeof e.pubkey != "string" || !e.pubkey.match(/^[a-f0-9]{64}$/) || !Array.isArray(e.tags))
     return !1;
   for (let t = 0; t < e.tags.length; t++) {
@@ -2348,7 +2348,7 @@ function pt(e) {
 var co = {};
 H(co, {
   Queue: () => ho,
-  QueueNode: () => Ur,
+  QueueNode: () => _r,
   binarySearch: () => sn,
   bytesToHex: () => P,
   hexToBytes: () => j,
@@ -2386,7 +2386,7 @@ function sn(e, t) {
   }
   return [n, !1];
 }
-var Ur = class {
+var _r = class {
   constructor(e) {
     J(this, "value");
     J(this, "next", null);
@@ -2400,7 +2400,7 @@ var Ur = class {
     this.first = null, this.last = null;
   }
   enqueue(e) {
-    const t = new Ur(e);
+    const t = new _r(e);
     return this.last ? this.last === this.first ? (this.last = t, this.last.prev = this.first, this.first.next = t) : (t.prev = this.last, this.last.next = t, this.last = t) : (this.first = t, this.last = t), !0;
   }
   dequeue() {
@@ -2413,7 +2413,7 @@ var Ur = class {
     const e = this.first;
     return this.first = e.next, this.first && (this.first.prev = null), e.value;
   }
-}, po = class {
+}, yo = class {
   generateSecretKey() {
     return Ze.utils.randomPrivateKey();
   }
@@ -2438,18 +2438,18 @@ var Ur = class {
     }
   }
 };
-function yo(e) {
-  if (!pt(e))
+function po(e) {
+  if (!yt(e))
     throw new Error("can't serialize event with wrong or missing properties");
   return JSON.stringify([0, e.pubkey, e.created_at, e.kind, e.tags, e.content]);
 }
 function De(e) {
-  let t = fe(ne.encode(yo(e)));
+  let t = fe(ne.encode(po(e)));
   return P(t);
 }
-var yt = new po(), ke = yt.generateSecretKey, ae = yt.getPublicKey, Q = yt.finalizeEvent, gt = yt.verifyEvent, go = {};
+var pt = new yo(), Be = pt.generateSecretKey, ae = pt.getPublicKey, Q = pt.finalizeEvent, gt = pt.verifyEvent, go = {};
 H(go, {
-  Application: () => ya,
+  Application: () => pa,
   BadgeAward: () => No,
   BadgeDefinition: () => ca,
   BlockedRelaysList: () => Vo,
@@ -2466,7 +2466,7 @@ H(go, {
   ClientAuth: () => zr,
   CommunitiesList: () => zo,
   CommunityDefinition: () => Aa,
-  CommunityPostApproval: () => Uo,
+  CommunityPostApproval: () => _o,
   Contacts: () => Eo,
   CreateOrUpdateProduct: () => fa,
   CreateOrUpdateStall: () => la,
@@ -2475,7 +2475,7 @@ H(go, {
   DirectMessageRelaysList: () => Jo,
   DraftClassifiedListing: () => va,
   DraftLong: () => da,
-  Emojisets: () => pa,
+  Emojisets: () => ya,
   EncryptedDirectMessage: () => xo,
   EventDeletion: () => Ko,
   FileMetadata: () => Ao,
@@ -2493,7 +2493,7 @@ H(go, {
   JobFeedback: () => Ro,
   JobRequest: () => Lo,
   JobResult: () => $o,
-  Label: () => _o,
+  Label: () => Uo,
   LightningPubRPC: () => Qo,
   LiveChatMessage: () => Co,
   LiveEvent: () => ga,
@@ -2507,14 +2507,14 @@ H(go, {
   OpenTimestamps: () => So,
   Pinlist: () => Do,
   PrivateDirectMessage: () => Or,
-  ProblemTracker: () => Bo,
+  ProblemTracker: () => ko,
   ProfileBadges: () => aa,
   PublicChatsList: () => Wo,
   Reaction: () => un,
   RecommendRelay: () => mo,
   RelayList: () => qo,
   Relaysets: () => ia,
-  Report: () => ko,
+  Report: () => Bo,
   Reporting: () => Io,
   Repost: () => cn,
   Seal: () => Tr,
@@ -2550,15 +2550,15 @@ function wo(e) {
 }
 function bo(e, t) {
   const n = t instanceof Array ? t : [t];
-  return pt(e) && n.includes(e.kind) || !1;
+  return yt(e) && n.includes(e.kind) || !1;
 }
-var vo = 0, Rr = 1, mo = 2, Eo = 3, xo = 4, Ko = 5, cn = 6, un = 7, No = 8, Tr = 13, Or = 14, ln = 16, Mr = 40, Pr = 41, Hr = 42, Dr = 43, qr = 44, So = 1040, jr = 1059, Ao = 1063, Co = 1311, Bo = 1971, ko = 1984, Io = 1984, _o = 1985, Uo = 4550, Lo = 5999, $o = 6999, Ro = 7e3, To = 9041, Oo = 9734, Mo = 9735, Po = 9802, Ho = 1e4, Do = 10001, qo = 10002, jo = 10003, zo = 10004, Wo = 10005, Vo = 10006, Zo = 10007, Fo = 10015, Go = 10030, Jo = 10050, Yo = 10096, Xo = 13194, Qo = 21e3, zr = 22242, Wr = 23194, ea = 23195, ta = 24133, fn = 27235, na = 3e4, ra = 30001, ia = 30002, sa = 30003, oa = 30004, aa = 30008, ca = 30009, ua = 30015, la = 30017, fa = 30018, ha = 30023, da = 30024, pa = 30030, ya = 30078, ga = 30311, wa = 30315, ba = 30402, va = 30403, ma = 31922, Ea = 31923, xa = 31924, Ka = 31925, Na = 31989, Sa = 31990, Aa = 34550, Ca = {};
+var vo = 0, Rr = 1, mo = 2, Eo = 3, xo = 4, Ko = 5, cn = 6, un = 7, No = 8, Tr = 13, Or = 14, ln = 16, Mr = 40, Pr = 41, Hr = 42, Dr = 43, qr = 44, So = 1040, jr = 1059, Ao = 1063, Co = 1311, ko = 1971, Bo = 1984, Io = 1984, Uo = 1985, _o = 4550, Lo = 5999, $o = 6999, Ro = 7e3, To = 9041, Oo = 9734, Mo = 9735, Po = 9802, Ho = 1e4, Do = 10001, qo = 10002, jo = 10003, zo = 10004, Wo = 10005, Vo = 10006, Zo = 10007, Fo = 10015, Go = 10030, Jo = 10050, Yo = 10096, Xo = 13194, Qo = 21e3, zr = 22242, Wr = 23194, ea = 23195, ta = 24133, fn = 27235, na = 3e4, ra = 30001, ia = 30002, sa = 30003, oa = 30004, aa = 30008, ca = 30009, ua = 30015, la = 30017, fa = 30018, ha = 30023, da = 30024, ya = 30030, pa = 30078, ga = 30311, wa = 30315, ba = 30402, va = 30403, ma = 31922, Ea = 31923, xa = 31924, Ka = 31925, Na = 31989, Sa = 31990, Aa = 34550, Ca = {};
 H(Ca, {
   getHex64: () => hn,
   getInt: () => Vr,
-  getSubscriptionId: () => Ba,
-  matchEventId: () => ka,
-  matchEventKind: () => _a,
+  getSubscriptionId: () => ka,
+  matchEventId: () => Ba,
+  matchEventKind: () => Ua,
   matchEventPubkey: () => Ia
 });
 function hn(e, t) {
@@ -2569,7 +2569,7 @@ function Vr(e, t) {
   let n = t.length, r = e.indexOf(`"${t}":`) + n + 3, i = e.slice(r), s = Math.min(i.indexOf(","), i.indexOf("}"));
   return parseInt(i.slice(0, s), 10);
 }
-function Ba(e) {
+function ka(e) {
   let t = e.slice(0, 22).indexOf('"EVENT"');
   if (t === -1)
     return null;
@@ -2582,17 +2582,17 @@ function Ba(e) {
   let s = r + 1 + i;
   return e.slice(r + 1, s);
 }
-function ka(e, t) {
+function Ba(e, t) {
   return t === hn(e, "id");
 }
 function Ia(e, t) {
   return t === hn(e, "pubkey");
 }
-function _a(e, t) {
+function Ua(e, t) {
   return t === Vr(e, "kind");
 }
-var Ua = {};
-H(Ua, {
+var _a = {};
+H(_a, {
   makeAuthEvent: () => La
 });
 function La(e, t) {
@@ -2656,7 +2656,7 @@ function wt(e) {
   let { prefix: t, words: n } = ze.decode(e, dn), r = new Uint8Array(ze.fromWords(n));
   switch (t) {
     case "nprofile": {
-      let u = Ut(r);
+      let u = _t(r);
       if (!((i = u[0]) != null && i[0]))
         throw new Error("missing TLV 0 for nprofile");
       if (u[0][0].length !== 32)
@@ -2670,7 +2670,7 @@ function wt(e) {
       };
     }
     case "nevent": {
-      let u = Ut(r);
+      let u = _t(r);
       if (!((s = u[0]) != null && s[0]))
         throw new Error("missing TLV 0 for nevent");
       if (u[0][0].length !== 32)
@@ -2690,7 +2690,7 @@ function wt(e) {
       };
     }
     case "naddr": {
-      let u = Ut(r);
+      let u = _t(r);
       if (!((a = u[0]) != null && a[0]))
         throw new Error("missing TLV 0 for naddr");
       if (!((l = u[2]) != null && l[0]))
@@ -2720,7 +2720,7 @@ function wt(e) {
       throw new Error(`unknown prefix ${t}`);
   }
 }
-function Ut(e) {
+function _t(e) {
   let t = {}, n = e;
   for (; n.length > 0; ) {
     let r = n[0], i = n[1], s = n.slice(2, 2 + i);
@@ -2747,7 +2747,7 @@ function vt(e, t) {
   return bt(e, t);
 }
 function ja(e) {
-  let t = pn({
+  let t = yn({
     0: [j(e.pubkey)],
     1: (e.relays || []).map((n) => ne.encode(n))
   });
@@ -2756,7 +2756,7 @@ function ja(e) {
 function za(e) {
   let t;
   e.kind !== void 0 && (t = Ma(e.kind));
-  let n = pn({
+  let n = yn({
     0: [j(e.id)],
     1: (e.relays || []).map((r) => ne.encode(r)),
     2: e.author ? [j(e.author)] : [],
@@ -2767,7 +2767,7 @@ function za(e) {
 function Wa(e) {
   let t = new ArrayBuffer(4);
   new DataView(t).setUint32(0, e.kind, !1);
-  let n = pn({
+  let n = yn({
     0: [ne.encode(e.identifier)],
     1: (e.relays || []).map((r) => ne.encode(r)),
     2: [j(e.pubkey)],
@@ -2775,7 +2775,7 @@ function Wa(e) {
   });
   return bt("naddr", n);
 }
-function pn(e) {
+function yn(e) {
   let t = [];
   return Object.entries(e).reverse().forEach(([n, r]) => {
     r.forEach((i) => {
@@ -2790,13 +2790,13 @@ H(Va, {
   encrypt: () => Fr
 });
 function Fr(e, t, n) {
-  const r = e instanceof Uint8Array ? P(e) : e, i = _e.getSharedSecret(r, "02" + t), s = Gr(i);
-  let o = Uint8Array.from(yr(16)), c = ne.encode(n), a = Sr(s, o).encrypt(c), l = he.encode(new Uint8Array(a)), f = he.encode(new Uint8Array(o.buffer));
+  const r = e instanceof Uint8Array ? P(e) : e, i = Ue.getSharedSecret(r, "02" + t), s = Gr(i);
+  let o = Uint8Array.from(pr(16)), c = ne.encode(n), a = Sr(s, o).encrypt(c), l = he.encode(new Uint8Array(a)), f = he.encode(new Uint8Array(o.buffer));
   return `${l}?iv=${f}`;
 }
 function Za(e, t, n) {
   const r = e instanceof Uint8Array ? P(e) : e;
-  let [i, s] = n.split("?iv="), o = _e.getSharedSecret(r, "02" + t), c = Gr(o), a = he.decode(s), l = he.decode(i), f = Sr(c, a).decrypt(l);
+  let [i, s] = n.split("?iv="), o = Ue.getSharedSecret(r, "02" + t), c = Gr(o), a = he.decode(s), l = he.decode(i), f = Sr(c, a).decrypt(l);
   return le.decode(f);
 }
 function Gr(e) {
@@ -2804,14 +2804,14 @@ function Gr(e) {
 }
 var Fa = {};
 H(Fa, {
-  NIP05_REGEX: () => yn,
+  NIP05_REGEX: () => pn,
   isNip05: () => Ga,
   isValid: () => Xa,
   queryProfile: () => Jr,
   searchDomain: () => Ya,
   useFetchImplementation: () => Ja
 });
-var yn = /^(?:([\w.+-]+)@)?([\w_-]+(\.[\w_-]+)+)$/, Ga = (e) => yn.test(e || ""), mt;
+var pn = /^(?:([\w.+-]+)@)?([\w_-]+(\.[\w_-]+)+)$/, Ga = (e) => pn.test(e || ""), mt;
 try {
   mt = fetch;
 } catch {
@@ -2831,7 +2831,7 @@ async function Ya(e, t = "") {
 }
 async function Jr(e) {
   var i;
-  const t = e.match(yn);
+  const t = e.match(pn);
   if (!t)
     return null;
   const [, n = "_", r] = t;
@@ -2987,7 +2987,7 @@ H(ac, {
   unwrapEvent: () => mn,
   unwrapManyEvents: () => fi,
   wrapEvent: () => st,
-  wrapManyEvents: () => pc
+  wrapManyEvents: () => yc
 });
 var q = {};
 H(q, {
@@ -2998,11 +2998,11 @@ H(q, {
 });
 var ei = 1, ti = 65535;
 function gn(e, t) {
-  const n = _e.getSharedSecret(e, "02" + t).subarray(1, 33);
+  const n = Ue.getSharedSecret(e, "02" + t).subarray(1, 33);
   return rn(fe, n, "nip44-v2");
 }
 function ni(e, t) {
-  const n = _r(fe, e, t, 76);
+  const n = Ur(fe, e, t, 76);
   return {
     chacha_key: n.subarray(0, 32),
     chacha_nonce: n.subarray(32, 44),
@@ -3065,15 +3065,15 @@ function fc(e) {
     mac: n.subarray(-32)
   };
 }
-function bn(e, t, n = yr(32)) {
-  const { chacha_key: r, chacha_nonce: i, hmac_key: s } = ni(t, n), o = uc(e), c = kr(r, i, o), a = ri(s, c, n);
+function bn(e, t, n = pr(32)) {
+  const { chacha_key: r, chacha_nonce: i, hmac_key: s } = ni(t, n), o = uc(e), c = Br(r, i, o), a = ri(s, c, n);
   return he.encode(ft(new Uint8Array([2]), n, c, a));
 }
 function vn(e, t) {
   const { nonce: n, ciphertext: r, mac: i } = fc(e), { chacha_key: s, chacha_nonce: o, hmac_key: c } = ni(t, n), a = ri(c, r, n);
   if (!Ds(a, i))
     throw new Error("invalid MAC");
-  const l = kr(s, o, r);
+  const l = Br(s, o, r);
   return lc(l);
 }
 var hc = {
@@ -3106,7 +3106,7 @@ function ui(e, t, n) {
   );
 }
 function li(e, t) {
-  const n = ke();
+  const n = Be();
   return Q(
     {
       kind: jr,
@@ -3121,7 +3121,7 @@ function st(e, t, n) {
   const r = ci(e, t), i = ui(r, t, n);
   return li(i, n);
 }
-function pc(e, t, n) {
+function yc(e, t, n) {
   if (!n || n.length === 0)
     throw new Error("At least one recipient is required.");
   const r = ae(t), i = [st(e, t, r)];
@@ -3139,7 +3139,7 @@ function fi(e, t) {
     n.push(mn(r, t));
   }), n.sort((r, i) => r.created_at - i.created_at), n;
 }
-function yc(e, t, n, r) {
+function pc(e, t, n, r) {
   const i = {
     created_at: Math.ceil(Date.now() / 1e3),
     kind: Or,
@@ -3151,7 +3151,7 @@ function yc(e, t, n, r) {
   }), r && i.tags.push(["e", r.eventId, r.relayUrl || "", "reply"]), n && i.tags.push(["subject", n]), i;
 }
 function hi(e, t, n, r, i) {
-  const s = yc(t, n, r, i);
+  const s = pc(t, n, r, i);
   return st(s, e, t.publicKey);
 }
 function gc(e, t, n, r, i) {
@@ -3261,11 +3261,11 @@ function Cc(e) {
       author: n[1]
     };
 }
-var Bc = {};
-H(Bc, {
+var kc = {};
+H(kc, {
   parse: () => Ic
 });
-var kc = /\W/m, Vn = /\W |\W$|$|,| /m;
+var Bc = /\W/m, Vn = /\W |\W$|$|,| /m;
 function* Ic(e) {
   const t = e.length;
   let n = 0, r = 0;
@@ -3274,7 +3274,7 @@ function* Ic(e) {
     if (i === -1)
       break;
     if (e.substring(i - 5, i) === "nostr") {
-      const s = e.substring(i + 60).match(kc), o = s ? i + 60 + s.index : t;
+      const s = e.substring(i + 60).match(Bc), o = s ? i + 60 + s.index : t;
       try {
         let c, { data: a, type: l } = wt(e.substring(i + 1, o));
         switch (l) {
@@ -3337,15 +3337,15 @@ function* Ic(e) {
   }
   n !== t && (yield { type: "text", text: e.substring(n) });
 }
-var _c = {};
-H(_c, {
-  channelCreateEvent: () => Uc,
+var Uc = {};
+H(Uc, {
+  channelCreateEvent: () => _c,
   channelHideMessageEvent: () => Rc,
   channelMessageEvent: () => $c,
   channelMetadataEvent: () => Lc,
   channelMuteUserEvent: () => Tc
 });
-var Uc = (e, t) => {
+var _c = (e, t) => {
   let n;
   if (typeof e.content == "object")
     n = JSON.stringify(e.content);
@@ -3426,12 +3426,12 @@ var Uc = (e, t) => {
   );
 }, Oc = {};
 H(Oc, {
-  EMOJI_SHORTCODE_REGEX: () => pi,
+  EMOJI_SHORTCODE_REGEX: () => yi,
   matchAll: () => Mc,
   regex: () => xn,
   replaceAll: () => Pc
 });
-var pi = /:(\w+):/, xn = () => new RegExp(`\\B${pi.source}\\B`, "g");
+var yi = /:(\w+):/, xn = () => new RegExp(`\\B${yi.source}\\B`, "g");
 function* Mc(e) {
   const t = e.matchAll(xn());
   for (const n of t)
@@ -3539,40 +3539,31 @@ async function Jc(e) {
   }
   return null;
 }
-function Yc({
-  profile: e,
-  event: t,
-  amount: n,
-  relays: r,
-  comment: i = ""
-}) {
-  if (!n)
-    throw new Error("amount not given");
-  if (!e)
-    throw new Error("profile not given");
-  let s = {
+function Yc(e) {
+  let t = {
     kind: 9734,
     created_at: Math.round(Date.now() / 1e3),
-    content: i,
+    content: e.comment || "",
     tags: [
-      ["p", e],
-      ["amount", n.toString()],
-      ["relays", ...r]
+      ["p", "pubkey" in e ? e.pubkey : e.event.pubkey],
+      ["amount", e.amount.toString()],
+      ["relays", ...e.relays]
     ]
   };
-  if (t && typeof t == "string" && s.tags.push(["e", t]), t && typeof t == "object") {
-    if (on(t.kind)) {
-      const o = ["a", `${t.kind}:${t.pubkey}:`];
-      s.tags.push(o);
-    } else if (an(t.kind)) {
-      let o = t.tags.find(([a, l]) => a === "d" && l);
-      if (!o)
+  if ("event" in e) {
+    if (t.tags.push(["e", e.event.id]), on(e.event.kind)) {
+      const n = ["a", `${e.event.kind}:${e.event.pubkey}:`];
+      t.tags.push(n);
+    } else if (an(e.event.kind)) {
+      let n = e.event.tags.find(([i, s]) => i === "d" && s);
+      if (!n)
         throw new Error("d tag not found or is empty");
-      const c = ["a", `${t.kind}:${t.pubkey}:${o[1]}`];
-      s.tags.push(c);
+      const r = ["a", `${e.event.kind}:${e.event.pubkey}:${n[1]}`];
+      t.tags.push(r);
     }
+    t.tags.push(["k", e.event.kind.toString()]);
   }
-  return s;
+  return t;
 }
 function Xc(e) {
   let t;
@@ -3581,7 +3572,7 @@ function Xc(e) {
   } catch {
     return "Invalid zap request JSON.";
   }
-  if (!pt(t))
+  if (!yt(t))
     return "Zap request is not a valid Nostr event.";
   if (!gt(t))
     return "Invalid signature on zap request.";
@@ -3651,7 +3642,7 @@ H(tu, {
   validateEventUrlTag: () => vi,
   validateToken: () => ru
 });
-var yi = "Nostr ";
+var pi = "Nostr ";
 async function nu(e, t, n, r = !1, i) {
   const s = {
     kind: fn,
@@ -3664,7 +3655,7 @@ async function nu(e, t, n, r = !1, i) {
   };
   i && s.tags.push(["payload", Sn(i)]);
   const o = await n(s);
-  return (r ? yi : "") + he.encode(ne.encode(JSON.stringify(o)));
+  return (r ? pi : "") + he.encode(ne.encode(JSON.stringify(o)));
 }
 async function ru(e, t, n) {
   const r = await gi(e).catch((s) => {
@@ -3677,7 +3668,7 @@ async function ru(e, t, n) {
 async function gi(e) {
   if (!e)
     throw new Error("Missing token");
-  e = e.replace(yi, "");
+  e = e.replace(pi, "");
   const t = le.decode(he.decode(e));
   if (!t || t.length === 0 || !t.startsWith("{"))
     throw new Error("Invalid token");
@@ -3723,8 +3714,8 @@ async function xi(e, t, n, r) {
     throw new Error("Invalid nostr event, payload tag does not match request body hash");
   return !0;
 }
-const Oe = 1060, Lt = 30078, Zn = 1059, iu = 14, wu = 100, su = 1;
-function bu(e) {
+const Oe = 1060, Lt = 30078, Zn = 1059, iu = 14, bu = 100, su = 1;
+function vu(e) {
   return JSON.stringify({
     version: su,
     rootKey: P(e.rootKey),
@@ -3759,7 +3750,7 @@ function bu(e) {
     )
   });
 }
-function vu(e) {
+function mu(e) {
   const t = JSON.parse(e);
   if (!t.version) {
     const n = {};
@@ -3822,7 +3813,38 @@ function vu(e) {
     )
   };
 }
-async function* mu(e) {
+function ou(e) {
+  return {
+    rootKey: new Uint8Array(e.rootKey),
+    theirCurrentNostrPublicKey: e.theirCurrentNostrPublicKey,
+    theirNextNostrPublicKey: e.theirNextNostrPublicKey,
+    ourCurrentNostrKey: e.ourCurrentNostrKey ? {
+      publicKey: e.ourCurrentNostrKey.publicKey,
+      privateKey: new Uint8Array(e.ourCurrentNostrKey.privateKey)
+    } : void 0,
+    ourNextNostrKey: {
+      publicKey: e.ourNextNostrKey.publicKey,
+      privateKey: new Uint8Array(e.ourNextNostrKey.privateKey)
+    },
+    receivingChainKey: e.receivingChainKey ? new Uint8Array(e.receivingChainKey) : void 0,
+    sendingChainKey: e.sendingChainKey ? new Uint8Array(e.sendingChainKey) : void 0,
+    sendingChainMessageNumber: e.sendingChainMessageNumber,
+    receivingChainMessageNumber: e.receivingChainMessageNumber,
+    previousSendingChainMessageCount: e.previousSendingChainMessageCount,
+    skippedKeys: Object.fromEntries(
+      Object.entries(e.skippedKeys).map(([t, n]) => [
+        t,
+        {
+          headerKeys: n.headerKeys.map((r) => new Uint8Array(r)),
+          messageKeys: Object.fromEntries(
+            Object.entries(n.messageKeys).map(([r, i]) => [r, new Uint8Array(i)])
+          )
+        }
+      ])
+    )
+  };
+}
+async function* Eu(e) {
   const t = [];
   let n = null;
   const r = e.onEvent((i) => {
@@ -3840,18 +3862,18 @@ async function* mu(e) {
 function Me(e, t = new Uint8Array(32), n = 1) {
   const r = rn(fe, e, t), i = [];
   for (let s = 1; s <= n; s++)
-    i.push(_r(fe, r, new Uint8Array([s]), 32));
+    i.push(Ur(fe, r, new Uint8Array([s]), 32));
   return i;
 }
-function Eu(e, t) {
+function xu(e, t) {
   return `${e}:${t}`;
 }
-function xu(e) {
+function Ku(e) {
   var n;
   const t = (n = e.tags) == null ? void 0 : n.find((r) => r[0] === "ms");
   return t ? parseInt(t[1]) : e.created_at * 1e3;
 }
-const ou = 1e3, au = "0000000000000000000000000000000000000000000000000000000000000000";
+const au = 1e3, cu = "0000000000000000000000000000000000000000000000000000000000000000";
 class ot {
   // 1. CHANNEL PUBLIC INTERFACE
   constructor(t, n) {
@@ -3874,7 +3896,7 @@ class ot {
    * @returns A new Session instance
    */
   static init(t, n, r, i, s, o) {
-    const c = ke();
+    const c = Be();
     let a, l, f, u;
     i ? ([a, l] = Me(s, q.getConversationKey(c, n), 2), f = {
       publicKey: ae(r),
@@ -3931,7 +3953,7 @@ class ot {
       kind: t.kind || Oe,
       created_at: t.created_at || Math.floor(n / 1e3),
       tags: t.tags || [],
-      pubkey: t.pubkey || au
+      pubkey: t.pubkey || cu
     };
     r.tags.some(([l]) => l === "ms") || r.tags.push(["ms", String(n)]), r.id = De(r);
     const [i, s] = this.ratchetEncrypt(JSON.stringify(r)), o = q.getConversationKey(this.state.ourCurrentNostrKey.privateKey, this.state.theirNextNostrPublicKey), c = q.encrypt(JSON.stringify(i), o);
@@ -3978,7 +4000,7 @@ class ot {
     this.state.previousSendingChainMessageCount = this.state.sendingChainMessageNumber, this.state.sendingChainMessageNumber = 0, this.state.receivingChainMessageNumber = 0;
     const t = q.getConversationKey(this.state.ourNextNostrKey.privateKey, this.state.theirNextNostrPublicKey), [n, r] = Me(this.state.rootKey, t, 2);
     this.state.receivingChainKey = r, this.state.ourCurrentNostrKey = this.state.ourNextNostrKey;
-    const i = ke();
+    const i = Be();
     this.state.ourNextNostrKey = {
       publicKey: ae(i),
       privateKey: i
@@ -3989,7 +4011,7 @@ class ot {
   // 3. MESSAGE KEY FUNCTIONS
   skipMessageKeys(t, n) {
     if (!(t <= this.state.receivingChainMessageNumber)) {
-      if (t > this.state.receivingChainMessageNumber + ou)
+      if (t > this.state.receivingChainMessageNumber + au)
         throw new Error("Too many skipped messages");
       if (!this.state.skippedKeys[n]) {
         if (this.state.skippedKeys[n] = {
@@ -4039,24 +4061,32 @@ class ot {
     throw new Error("Failed to decrypt header with current and skipped header keys");
   }
   handleNostrEvent(t) {
-    var n, r;
+    var i, s;
+    const n = ou(this.state);
+    let r = !1;
     try {
-      const [i, s, o] = this.decryptHeader(t);
-      if (!o)
-        this.state.theirNextNostrPublicKey !== i.nextPublicKey && (this.state.theirCurrentNostrPublicKey = this.state.theirNextNostrPublicKey, this.state.theirNextNostrPublicKey = i.nextPublicKey, (n = this.nostrUnsubscribe) == null || n.call(this), this.nostrUnsubscribe = this.nostrNextUnsubscribe, this.nostrNextUnsubscribe = this.nostrSubscribe(
-          { authors: [this.state.theirNextNostrPublicKey], kinds: [Oe] },
-          (l) => this.handleNostrEvent(l)
-        )), s && (this.skipMessageKeys(i.previousChainLength, t.pubkey), this.ratchetStep());
-      else if (!((r = this.state.skippedKeys[t.pubkey]) != null && r.messageKeys[i.number]))
+      const [o, c, a] = this.decryptHeader(t);
+      if (!a && this.state.theirNextNostrPublicKey !== o.nextPublicKey && (this.state.theirCurrentNostrPublicKey = this.state.theirNextNostrPublicKey, this.state.theirNextNostrPublicKey = o.nextPublicKey, r = !0), !a)
+        c && (this.skipMessageKeys(o.previousChainLength, t.pubkey), this.ratchetStep());
+      else if (!((i = this.state.skippedKeys[t.pubkey]) != null && i.messageKeys[o.number]))
         return;
-      const c = this.ratchetDecrypt(i, t.content, t.pubkey), a = JSON.parse(c);
-      if (!pt(a) || a.id !== De(a))
+      const l = this.ratchetDecrypt(o, t.content, t.pubkey), f = JSON.parse(l);
+      if (!yt(f)) {
+        this.state = n;
         return;
-      this.internalSubscriptions.forEach((l) => l(a, t));
-    } catch (i) {
-      if (i instanceof Error && i.message.includes("Failed to decrypt header"))
+      }
+      if (f.id !== De(f)) {
+        this.state = n;
         return;
-      throw i;
+      }
+      r && ((s = this.nostrUnsubscribe) == null || s.call(this), this.nostrUnsubscribe = this.nostrNextUnsubscribe, this.nostrNextUnsubscribe = this.nostrSubscribe(
+        { authors: [this.state.theirNextNostrPublicKey], kinds: [Oe] },
+        (u) => this.handleNostrEvent(u)
+      )), this.internalSubscriptions.forEach((u) => u(f, t));
+    } catch (o) {
+      if (this.state = n, o instanceof Error && (o.message.includes("Failed to decrypt header") || o.message === "invalid MAC"))
+        return;
+      throw o;
     }
   }
   subscribeToNostrEvents() {
@@ -4078,10 +4108,10 @@ class ot {
 new TextDecoder("utf-8");
 new TextEncoder();
 function Qe(e, t) {
-  const n = _e.getSharedSecret(e, "02" + t).subarray(1, 33);
+  const n = Ue.getSharedSecret(e, "02" + t).subarray(1, 33);
   return rn(fe, n, "nip44-v2");
 }
-const cu = 2 * 24 * 60 * 60, uu = () => Math.round(Date.now() / 1e3), lu = () => Math.round(uu() - Math.random() * cu);
+const uu = 2 * 24 * 60 * 60, lu = () => Math.round(Date.now() / 1e3), fu = () => Math.round(lu() - Math.random() * uu);
 class Pe {
   constructor(t, n, r, i, s, o, c = []) {
     this.inviterEphemeralPublicKey = t, this.sharedSecret = n, this.inviter = r, this.inviterEphemeralPrivateKey = i, this.deviceId = s, this.maxUses = o, this.usedBy = c;
@@ -4089,7 +4119,7 @@ class Pe {
   static createNew(t, n, r) {
     if (!t)
       throw new Error("Inviter public key is required");
-    const i = ke(), s = ae(i), o = P(ke());
+    const i = Be(), s = ae(i), o = P(Be());
     return new Pe(
       s,
       o,
@@ -4241,29 +4271,33 @@ class Pe {
        * @param nostrSubscribe - A function to subscribe to Nostr events
        * @param inviteePublicKey - The invitee's public key
        * @param encryptor - The invitee's secret key or a signing/encrypt function
+       * @param deviceId - Optional device ID to identify the invitee's device
        * @returns An object containing the new session and an event to be published
        *
        * 1. Inner event: No signature, content encrypted with DH(inviter, invitee).
-       *    Purpose: Authenticate invitee. Contains invitee session key.
+       *    Purpose: Authenticate invitee. Contains invitee session key and deviceId.
        * 2. Envelope: No signature, content encrypted with DH(inviter, random key).
        *    Purpose: Contains inner event. Hides invitee from others who might have the shared Nostr key.
   
        * Note: You need to publish the returned event on Nostr using NDK or another Nostr system of your choice,
        * so the inviter can create the session on their side.
        */
-  async accept(t, n, r) {
-    const i = ke(), s = ae(i), o = this.inviter || this.inviterEphemeralPublicKey, c = j(this.sharedSecret), a = ot.init(t, this.inviterEphemeralPublicKey, i, !0, c, void 0), f = await (typeof r == "function" ? r : (d, y) => Promise.resolve(q.encrypt(d, Qe(r, y))))(s, o), u = {
+  async accept(t, n, r, i) {
+    const s = Be(), o = ae(s), c = this.inviter || this.inviterEphemeralPublicKey, a = j(this.sharedSecret), l = ot.init(t, this.inviterEphemeralPublicKey, s, !0, a, void 0), f = typeof r == "function" ? r : (m, S) => Promise.resolve(q.encrypt(m, Qe(r, S))), u = JSON.stringify({
+      sessionKey: o,
+      deviceId: i
+    }), p = await f(u, c), w = {
       pubkey: n,
-      content: await q.encrypt(f, c),
+      content: await q.encrypt(p, a),
       created_at: Math.floor(Date.now() / 1e3)
-    }, p = JSON.stringify(u), w = ke(), g = ae(w), h = {
+    }, g = JSON.stringify(w), h = Be(), d = ae(h), y = {
       kind: Zn,
-      pubkey: g,
-      content: q.encrypt(p, Qe(w, this.inviterEphemeralPublicKey)),
-      created_at: lu(),
+      pubkey: d,
+      content: q.encrypt(g, Qe(h, this.inviterEphemeralPublicKey)),
+      created_at: fu(),
       tags: [["p", this.inviterEphemeralPublicKey]]
     };
-    return { session: a, event: Q(h, w) };
+    return { session: l, event: Q(y, h) };
   }
   listen(t, n, r) {
     if (!this.inviterEphemeralPrivateKey)
@@ -4278,8 +4312,16 @@ class Pe {
           return;
         const o = await q.decrypt(s.content, Qe(this.inviterEphemeralPrivateKey, s.pubkey)), c = JSON.parse(o), a = j(this.sharedSecret), l = c.pubkey;
         this.usedBy.push(l);
-        const f = await q.decrypt(c.content, a), p = await (typeof t == "function" ? t : (h, d) => Promise.resolve(q.decrypt(h, Qe(t, d))))(f, l), w = s.id, g = ot.init(n, p, this.inviterEphemeralPrivateKey, !1, a, w);
-        r(g, l);
+        const f = await q.decrypt(c.content, a), p = await (typeof t == "function" ? t : (y, m) => Promise.resolve(q.decrypt(y, Qe(t, m))))(f, l);
+        let w, g;
+        try {
+          const y = JSON.parse(p);
+          w = y.sessionKey, g = y.deviceId;
+        } catch {
+          w = p;
+        }
+        const h = s.id, d = ot.init(n, w, this.inviterEphemeralPrivateKey, !1, a, h);
+        r(d, l, g);
       } catch {
       }
     });
@@ -4290,13 +4332,14 @@ export {
   Lt as INVITE_EVENT_KIND,
   Zn as INVITE_RESPONSE_KIND,
   Pe as Invite,
-  wu as MAX_SKIP,
+  bu as MAX_SKIP,
   Oe as MESSAGE_EVENT_KIND,
   ot as Session,
-  mu as createEventStream,
-  vu as deserializeSessionState,
-  xu as getMillisecondTimestamp,
+  Eu as createEventStream,
+  ou as deepCopyState,
+  mu as deserializeSessionState,
+  Ku as getMillisecondTimestamp,
   Me as kdf,
-  bu as serializeSessionState,
-  Eu as skippedMessageIndexKey
+  vu as serializeSessionState,
+  xu as skippedMessageIndexKey
 };