nostr-double-ratchet 0.0.23 → 0.0.24

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

@@ -1,6 +1,6 @@
 var bi = Object.defineProperty;
 var vi = (e, t, n) => t in e ? bi(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
-var te = (e, t, n) => vi(e, typeof t != "symbol" ? t + "" : t, n);
+var J = (e, t, n) => vi(e, typeof t != "symbol" ? t + "" : t, n);
 function Sn(e) {
   if (!Number.isSafeInteger(e) || e < 0)
     throw new Error(`Wrong positive integer: ${e}`);
@@ -123,7 +123,7 @@ let Ci = class extends Wn {
     return t.length = i, t.pos = c, t.finished = s, t.destroyed = o, i % n && t.buffer.set(r), t;
   }
 };
-const Bi = (e, t, n) => e & t ^ ~e & n, _i = (e, t, n) => e & t ^ e & n ^ t & n, ki = /* @__PURE__ */ new Uint32Array([
+const Bi = (e, t, n) => e & t ^ ~e & n, ki = (e, t, n) => e & t ^ e & n ^ t & n, _i = /* @__PURE__ */ new Uint32Array([
   1116352408,
   1899447441,
   3049323471,
@@ -214,12 +214,12 @@ let Ii = class extends Ci {
     for (let u = 0; u < 16; u++, n += 4)
       ve[u] = t.getUint32(n, !1);
     for (let u = 16; u < 64; u++) {
-      const y = ve[u - 15], b = ve[u - 2], p = re(y, 7) ^ re(y, 18) ^ y >>> 3, h = re(b, 17) ^ re(b, 19) ^ b >>> 10;
-      ve[u] = h + ve[u - 7] + p + ve[u - 16] | 0;
+      const p = ve[u - 15], b = ve[u - 2], y = re(p, 7) ^ re(p, 18) ^ p >>> 3, h = re(b, 17) ^ re(b, 19) ^ b >>> 10;
+      ve[u] = h + ve[u - 7] + y + ve[u - 16] | 0;
     }
     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 y = re(c, 6) ^ re(c, 11) ^ re(c, 25), b = f + y + Bi(c, a, l) + ki[u] + ve[u] | 0, h = (re(r, 2) ^ re(r, 13) ^ re(r, 22)) + _i(r, i, s) | 0;
+      const p = re(c, 6) ^ re(c, 11) ^ re(c, 25), b = f + p + Bi(c, a, l) + _i[u] + ve[u] | 0, h = (re(r, 2) ^ re(r, 13) ^ re(r, 22)) + ki(r, i, s) | 0;
       f = l, l = a, a = c, c = o + b | 0, o = s, s = i, i = r, r = b + 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);
@@ -300,7 +300,7 @@ function Z(e, t, n) {
     throw new Error(`${e} expected ${n} bytes, got ${i}`);
   return r;
 }
-function ke(...e) {
+function _e(...e) {
   const t = new Uint8Array(e.reduce((r, i) => r + i.length, 0));
   let n = 0;
   return e.forEach((r) => {
@@ -348,18 +348,18 @@ function Jn(e, t, n) {
     if (s++ >= 1e3)
       throw new Error("drbg: tried 1000 values");
     let u = 0;
-    const y = [];
+    const p = [];
     for (; u < t; ) {
       r = c();
       const b = r.slice();
-      y.push(b), u += r.length;
+      p.push(b), u += r.length;
     }
-    return ke(...y);
+    return _e(...p);
   };
-  return (u, y) => {
+  return (u, p) => {
     o(), a(u);
     let b;
-    for (; !(b = y(l())); )
+    for (; !(b = p(l())); )
       a();
     return o(), b;
   };
@@ -399,7 +399,7 @@ const qi = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   bytesToHex: De,
   bytesToNumberBE: F,
   bytesToNumberLE: Gt,
-  concatBytes: ke,
+  concatBytes: _e,
   createHmacDrbg: Jn,
   ensureBytes: Z,
   equalBytes: Ti,
@@ -430,7 +430,7 @@ function ji(e, t, n) {
     t & j && (r = r * e % n), e = e * e % n, t >>= j;
   return r;
 }
-function J(e, t, n) {
+function Y(e, t, n) {
   let r = e;
   for (; t-- > V; )
     r *= r, r %= n;
@@ -468,15 +468,15 @@ function zi(e) {
   return function(c, a) {
     if (c.pow(a, t) === c.neg(c.ONE))
       throw new Error("Cannot find square root");
-    let l = r, f = c.pow(c.mul(c.ONE, i), n), u = c.pow(a, s), y = c.pow(a, n);
-    for (; !c.eql(y, c.ONE); ) {
-      if (c.eql(y, c.ZERO))
+    let l = r, f = c.pow(c.mul(c.ONE, i), n), u = c.pow(a, s), p = c.pow(a, n);
+    for (; !c.eql(p, c.ONE); ) {
+      if (c.eql(p, c.ZERO))
         return c.ZERO;
       let b = 1;
-      for (let h = c.sqr(y); b < l && !c.eql(h, c.ONE); b++)
+      for (let h = c.sqr(p); b < l && !c.eql(h, c.ONE); b++)
         h = c.sqr(h);
-      const p = c.pow(f, j << BigInt(l - b - 1));
-      f = c.sqr(p), u = c.mul(u, p), y = c.mul(y, f), l = b;
+      const y = c.pow(f, j << BigInt(l - b - 1));
+      f = c.sqr(y), u = c.mul(u, y), p = c.mul(p, f), l = b;
     }
     return u;
   };
@@ -650,7 +650,7 @@ function Qi(e, t) {
       let l = i, f = l;
       for (let u = 0; u < o; u++) {
         f = l, a.push(f);
-        for (let y = 1; y < c; y++)
+        for (let p = 1; p < c; p++)
           f = f.add(l), a.push(f);
         l = f.double();
       }
@@ -666,12 +666,12 @@ function Qi(e, t) {
     wNAF(i, s, o) {
       const { windows: c, windowSize: a } = r(i);
       let l = e.ZERO, f = e.BASE;
-      const u = BigInt(2 ** i - 1), y = 2 ** i, b = BigInt(i);
-      for (let p = 0; p < c; p++) {
-        const h = p * a;
+      const u = BigInt(2 ** i - 1), p = 2 ** i, b = BigInt(i);
+      for (let y = 0; y < c; y++) {
+        const h = y * a;
         let d = Number(o & u);
-        o >>= b, d > a && (d -= y, o += St);
-        const g = h, E = h + Math.abs(d) - 1, S = p % 2 !== 0, I = d < 0;
+        o >>= b, d > a && (d -= p, o += St);
+        const g = h, E = h + Math.abs(d) - 1, S = y % 2 !== 0, I = d < 0;
         d === 0 ? f = f.add(n(S, s[g])) : l = l.add(n(I, s[E]));
       }
       return { p: l, f };
@@ -763,49 +763,49 @@ const { bytesToNumberBE: ts, hexToBytes: ns } = qi, Be = {
     }, r = t(n(e.s)), i = t(n(e.r)), s = r.length / 2, o = i.length / 2, c = n(s), a = n(o);
     return `30${n(o + s + 4)}02${a}${i}02${c}${r}`;
   }
-}, ae = BigInt(0), Y = BigInt(1);
+}, ae = BigInt(0), X = BigInt(1);
 BigInt(2);
-const _n = BigInt(3);
+const kn = BigInt(3);
 BigInt(4);
 function rs(e) {
-  const t = es(e), { Fp: n } = t, r = t.toBytes || ((p, h, d) => {
+  const t = es(e), { Fp: n } = t, r = t.toBytes || ((y, h, d) => {
     const g = h.toAffine();
-    return ke(Uint8Array.from([4]), n.toBytes(g.x), n.toBytes(g.y));
-  }), i = t.fromBytes || ((p) => {
-    const h = p.subarray(1), d = n.fromBytes(h.subarray(0, n.BYTES)), g = n.fromBytes(h.subarray(n.BYTES, 2 * n.BYTES));
+    return _e(Uint8Array.from([4]), n.toBytes(g.x), n.toBytes(g.y));
+  }), i = t.fromBytes || ((y) => {
+    const h = y.subarray(1), d = n.fromBytes(h.subarray(0, n.BYTES)), g = n.fromBytes(h.subarray(n.BYTES, 2 * n.BYTES));
     return { x: d, y: g };
   });
-  function s(p) {
-    const { a: h, b: d } = t, g = n.sqr(p), E = n.mul(g, p);
-    return n.add(n.add(E, n.mul(p, h)), d);
+  function s(y) {
+    const { a: h, b: d } = t, g = n.sqr(y), E = n.mul(g, y);
+    return n.add(n.add(E, n.mul(y, h)), d);
   }
   if (!n.eql(n.sqr(t.Gy), s(t.Gx)))
     throw new Error("bad generator point: equation left != right");
-  function o(p) {
-    return typeof p == "bigint" && ae < p && p < t.n;
+  function o(y) {
+    return typeof y == "bigint" && ae < y && y < t.n;
   }
-  function c(p) {
-    if (!o(p))
+  function c(y) {
+    if (!o(y))
       throw new Error("Expected valid bigint: 0 < bigint < curve.n");
   }
-  function a(p) {
+  function a(y) {
     const { allowedPrivateKeyLengths: h, nByteLength: d, wrapPrivateKey: g, n: E } = t;
-    if (h && typeof p != "bigint") {
-      if (p instanceof Uint8Array && (p = De(p)), typeof p != "string" || !h.includes(p.length))
+    if (h && typeof y != "bigint") {
+      if (y instanceof Uint8Array && (y = De(y)), typeof y != "string" || !h.includes(y.length))
         throw new Error("Invalid key");
-      p = p.padStart(d * 2, "0");
+      y = y.padStart(d * 2, "0");
     }
     let S;
     try {
-      S = typeof p == "bigint" ? p : F(Z("private key", p, d));
+      S = typeof y == "bigint" ? y : F(Z("private key", y, d));
     } catch {
-      throw new Error(`private key must be ${d} bytes, hex or bigint, not ${typeof p}`);
+      throw new Error(`private key must be ${d} bytes, hex or bigint, not ${typeof y}`);
     }
     return g && (S = W(S, E)), c(S), S;
   }
   const l = /* @__PURE__ */ new Map();
-  function f(p) {
-    if (!(p instanceof u))
+  function f(y) {
+    if (!(y instanceof u))
       throw new Error("ProjectivePoint expected");
   }
   class u {
@@ -901,9 +901,9 @@ function rs(e) {
     // https://eprint.iacr.org/2015/1060, algorithm 3
     // Cost: 8M + 3S + 3*a + 2*b3 + 15add.
     double() {
-      const { a: h, b: d } = t, g = n.mul(d, _n), { px: E, py: S, pz: I } = this;
-      let B = n.ZERO, m = n.ZERO, x = n.ZERO, K = n.mul(E, E), M = n.mul(S, S), k = n.mul(I, I), A = n.mul(E, S);
-      return A = n.add(A, A), x = n.mul(E, I), x = n.add(x, x), B = n.mul(h, x), m = n.mul(g, k), 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(g, x), k = n.mul(h, k), A = n.sub(K, k), A = n.mul(h, A), A = n.add(A, x), x = n.add(K, K), K = n.add(x, K), K = n.add(K, k), K = n.mul(K, A), m = n.add(m, K), k = n.mul(S, I), k = n.add(k, k), K = n.mul(k, A), B = n.sub(B, K), x = n.mul(k, M), x = n.add(x, x), x = n.add(x, x), new u(B, m, x);
+      const { a: h, b: d } = t, g = n.mul(d, kn), { px: E, py: S, pz: I } = this;
+      let B = n.ZERO, m = n.ZERO, x = n.ZERO, K = n.mul(E, E), M = n.mul(S, S), _ = n.mul(I, I), A = n.mul(E, S);
+      return A = n.add(A, A), x = n.mul(E, I), x = n.add(x, x), B = n.mul(h, x), m = n.mul(g, _), 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(g, x), _ = n.mul(h, _), A = n.sub(K, _), A = n.mul(h, A), A = n.add(A, x), x = n.add(K, K), K = n.add(x, K), K = n.add(K, _), K = n.mul(K, A), m = n.add(m, K), _ = n.mul(S, I), _ = n.add(_, _), K = n.mul(_, A), B = n.sub(B, K), x = n.mul(_, M), x = n.add(x, x), x = n.add(x, x), new u(B, m, x);
     }
     // Renes-Costello-Batina exception-free addition formula.
     // There is 30% faster Jacobian formula, but it is not complete.
@@ -913,11 +913,11 @@ function rs(e) {
       f(h);
       const { px: d, py: g, pz: E } = this, { px: S, py: I, pz: B } = h;
       let m = n.ZERO, x = n.ZERO, K = n.ZERO;
-      const M = t.a, k = n.mul(t.b, _n);
+      const M = t.a, _ = n.mul(t.b, kn);
       let A = n.mul(d, S), T = n.mul(g, I), R = n.mul(E, B), H = n.add(d, g), w = n.add(S, I);
       H = n.mul(H, w), w = n.add(A, T), H = n.sub(H, w), w = n.add(d, E);
       let v = n.add(S, B);
-      return w = n.mul(w, v), v = n.add(A, R), w = n.sub(w, v), v = n.add(g, E), m = n.add(I, B), v = n.mul(v, m), m = n.add(T, R), v = n.sub(v, m), K = n.mul(M, w), m = n.mul(k, R), K = n.add(m, K), m = n.sub(T, K), K = n.add(T, K), x = n.mul(m, K), T = n.add(A, A), T = n.add(T, A), R = n.mul(M, R), w = n.mul(k, w), T = n.add(T, R), R = n.sub(A, R), R = n.mul(M, R), w = n.add(w, R), A = n.mul(T, w), x = n.add(x, A), A = n.mul(v, w), m = n.mul(H, m), m = n.sub(m, A), A = n.mul(H, T), K = n.mul(v, K), K = n.add(K, A), new u(m, x, K);
+      return w = n.mul(w, v), v = n.add(A, R), w = n.sub(w, v), v = n.add(g, E), m = n.add(I, B), v = n.mul(v, m), m = n.add(T, R), v = n.sub(v, m), K = n.mul(M, w), m = n.mul(_, R), K = n.add(m, K), m = n.sub(T, K), K = n.add(T, K), x = n.mul(m, K), T = n.add(A, A), T = n.add(T, A), R = n.mul(M, R), w = n.mul(_, w), T = n.add(T, R), R = n.sub(A, R), R = n.mul(M, R), w = n.add(w, R), A = n.mul(T, w), x = n.add(x, A), A = n.mul(v, w), m = n.mul(H, m), m = n.sub(m, A), A = n.mul(H, T), K = n.mul(v, K), K = n.add(K, A), new u(m, x, K);
     }
     subtract(h) {
       return this.add(h.negate());
@@ -940,14 +940,14 @@ function rs(e) {
       const d = u.ZERO;
       if (h === ae)
         return d;
-      if (c(h), h === Y)
+      if (c(h), h === X)
         return this;
       const { endo: g } = t;
       if (!g)
         return b.unsafeLadder(this, h);
       let { k1neg: E, k1: S, k2neg: I, k2: B } = g.splitScalar(h), m = d, x = d, K = this;
       for (; S > ae || B > ae; )
-        S & Y && (m = m.add(K)), B & Y && (x = x.add(K)), K = K.double(), S >>= Y, B >>= Y;
+        S & X && (m = m.add(K)), B & X && (x = x.add(K)), K = K.double(), S >>= X, B >>= X;
       return E && (m = m.negate()), I && (x = x.negate()), x = new u(n.mul(x.px, g.beta), x.py, x.pz), m.add(x);
     }
     /**
@@ -965,8 +965,8 @@ function rs(e) {
       const { endo: S } = t;
       if (S) {
         const { k1neg: I, k1: B, k2neg: m, k2: x } = S.splitScalar(d);
-        let { p: K, f: M } = this.wNAF(B), { p: k, f: A } = this.wNAF(x);
-        K = b.constTimeNegate(I, K), k = b.constTimeNegate(m, k), k = new u(n.mul(k.px, S.beta), k.py, k.pz), g = K.add(k), E = M.add(A);
+        let { p: K, f: M } = this.wNAF(B), { p: _, f: A } = this.wNAF(x);
+        K = b.constTimeNegate(I, K), _ = b.constTimeNegate(m, _), _ = new u(n.mul(_.px, S.beta), _.py, _.pz), g = K.add(_), E = M.add(A);
       } else {
         const { p: I, f: B } = this.wNAF(d);
         g = I, E = B;
@@ -980,7 +980,7 @@ function rs(e) {
      * @returns non-zero affine point
      */
     multiplyAndAddUnsafe(h, d, g) {
-      const E = u.BASE, S = (B, m) => m === ae || m === Y || !B.equals(E) ? B.multiplyUnsafe(m) : B.multiply(m), I = S(this, d).add(S(h, g));
+      const E = u.BASE, S = (B, m) => m === ae || m === X || !B.equals(E) ? B.multiplyUnsafe(m) : B.multiply(m), I = S(this, d).add(S(h, g));
       return I.is0() ? void 0 : I;
     }
     // Converts Projective point to affine (x, y) coordinates.
@@ -998,7 +998,7 @@ function rs(e) {
     }
     isTorsionFree() {
       const { h, isTorsionFree: d } = t;
-      if (h === Y)
+      if (h === X)
         return !0;
       if (d)
         return d(u, this);
@@ -1006,7 +1006,7 @@ function rs(e) {
     }
     clearCofactor() {
       const { h, clearCofactor: d } = t;
-      return h === Y ? this : d ? d(u, this) : this.multiplyUnsafe(t.h);
+      return h === X ? this : d ? d(u, this) : this.multiplyUnsafe(t.h);
     }
     toRawBytes(h = !0) {
       return this.assertValidity(), r(u, this, h);
@@ -1016,7 +1016,7 @@ function rs(e) {
     }
   }
   u.BASE = new u(t.Gx, t.Gy, n.ONE), u.ZERO = new u(n.ZERO, n.ONE, n.ZERO);
-  const y = t.nBitLength, b = Qi(u, t.endo ? Math.ceil(y / 2) : y);
+  const p = t.nBitLength, b = Qi(u, t.endo ? Math.ceil(p / 2) : p);
   return {
     CURVE: t,
     ProjectivePoint: u,
@@ -1048,40 +1048,40 @@ function ss(e) {
   function a(w) {
     return Tt(w, r);
   }
-  const { ProjectivePoint: l, normPrivateKeyToScalar: f, weierstrassEquation: u, isWithinCurveOrder: y } = rs({
+  const { ProjectivePoint: l, normPrivateKeyToScalar: f, weierstrassEquation: u, isWithinCurveOrder: p } = rs({
     ...t,
     toBytes(w, v, N) {
-      const _ = v.toAffine(), C = n.toBytes(_.x), U = ke;
-      return N ? U(Uint8Array.from([v.hasEvenY() ? 2 : 3]), C) : U(Uint8Array.from([4]), C, n.toBytes(_.y));
+      const k = v.toAffine(), C = n.toBytes(k.x), U = _e;
+      return N ? U(Uint8Array.from([v.hasEvenY() ? 2 : 3]), C) : U(Uint8Array.from([4]), C, n.toBytes(k.y));
     },
     fromBytes(w) {
-      const v = w.length, N = w[0], _ = w.subarray(1);
+      const v = w.length, N = w[0], k = w.subarray(1);
       if (v === i && (N === 2 || N === 3)) {
-        const C = F(_);
+        const C = F(k);
         if (!o(C))
           throw new Error("Point is not on curve");
         const U = u(C);
         let O = n.sqrt(U);
-        const $ = (O & Y) === Y;
+        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(_.subarray(0, n.BYTES)), U = n.fromBytes(_.subarray(n.BYTES, 2 * n.BYTES));
+        const C = n.fromBytes(k.subarray(0, n.BYTES)), U = n.fromBytes(k.subarray(n.BYTES, 2 * n.BYTES));
         return { x: C, y: U };
       } else
         throw new Error(`Point of length ${v} was invalid. Expected ${i} compressed bytes or ${s} uncompressed bytes`);
     }
   }), b = (w) => De(Ne(w, t.nByteLength));
-  function p(w) {
-    const v = r >> Y;
+  function y(w) {
+    const v = r >> X;
     return w > v;
   }
   function h(w) {
-    return p(w) ? c(-w) : w;
+    return y(w) ? c(-w) : w;
   }
   const d = (w, v, N) => F(w.slice(v, N));
   class g {
-    constructor(v, N, _) {
-      this.r = v, this.s = N, this.recovery = _, this.assertValidity();
+    constructor(v, N, k) {
+      this.r = v, this.s = N, this.recovery = k, this.assertValidity();
     }
     // pair (bytes of r, bytes of s)
     static fromCompact(v) {
@@ -1091,33 +1091,33 @@ function ss(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: _ } = Be.toSig(Z("DER", v));
-      return new g(N, _);
+      const { r: N, s: k } = Be.toSig(Z("DER", v));
+      return new g(N, k);
     }
     assertValidity() {
-      if (!y(this.r))
+      if (!p(this.r))
         throw new Error("r must be 0 < r < CURVE.n");
-      if (!y(this.s))
+      if (!p(this.s))
         throw new Error("s must be 0 < s < CURVE.n");
     }
     addRecoveryBit(v) {
       return new g(this.r, this.s, v);
     }
     recoverPublicKey(v) {
-      const { r: N, s: _, recovery: C } = this, U = x(Z("msgHash", v));
+      const { r: N, s: k, recovery: C } = this, U = 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 ? "03" : "02", Q = l.fromHex($ + b(O)), ge = a(O), Ue = c(-U * ge), We = c(_ * ge), we = l.BASE.multiplyAndAddUnsafe(Q, Ue, We);
+      const $ = C & 1 ? "03" : "02", ee = l.fromHex($ + b(O)), ge = a(O), Ue = c(-U * ge), We = c(k * ge), we = l.BASE.multiplyAndAddUnsafe(ee, Ue, We);
       if (!we)
         throw new Error("point at infinify");
       return we.assertValidity(), we;
     }
     // Signatures should be low-s, to prevent malleability.
     hasHighS() {
-      return p(this.s);
+      return y(this.s);
     }
     normalizeS() {
       return this.hasHighS() ? new g(this.r, c(-this.s), this.recovery) : this;
@@ -1170,8 +1170,8 @@ function ss(e) {
     return l.fromPrivateKey(w).toRawBytes(v);
   }
   function I(w) {
-    const v = w instanceof Uint8Array, N = typeof w == "string", _ = (v || N) && w.length;
-    return v ? _ === i || _ === s : N ? _ === 2 * i || _ === 2 * s : w instanceof l;
+    const v = w instanceof Uint8Array, N = typeof w == "string", k = (v || N) && w.length;
+    return v ? k === i || k === s : N ? k === 2 * i || k === 2 * s : w instanceof l;
   }
   function B(w, v, N = !0) {
     if (I(w))
@@ -1193,70 +1193,70 @@ function ss(e) {
       throw new Error(`bigint expected < 2^${t.nBitLength}`);
     return Ne(w, t.nByteLength);
   }
-  function k(w, v, N = A) {
+  function _(w, v, N = A) {
     if (["recovered", "canonical"].some((Ae) => Ae in N))
       throw new Error("sign() legacy options not supported");
-    const { hash: _, randomBytes: C } = t;
+    const { hash: k, randomBytes: C } = t;
     let { lowS: U, prehash: O, extraEntropy: $ } = N;
-    U == null && (U = !0), w = Z("msgHash", w), O && (w = Z("prehashed msgHash", _(w)));
-    const Q = x(w), ge = f(v), Ue = [M(ge), M(Q)];
+    U == null && (U = !0), w = Z("msgHash", w), O && (w = Z("prehashed msgHash", k(w)));
+    const ee = x(w), ge = f(v), Ue = [M(ge), M(ee)];
     if ($ != null) {
       const Ae = $ === !0 ? C(n.BYTES) : $;
       Ue.push(Z("extraEntropy", Ae));
     }
-    const We = ke(...Ue), we = Q;
+    const We = _e(...Ue), we = ee;
     function Et(Ae) {
       const Le = m(Ae);
-      if (!y(Le))
+      if (!p(Le))
         return;
-      const xn = a(Le), $e = l.BASE.multiply(Le).toAffine(), ee = c($e.x);
-      if (ee === ae)
+      const xn = a(Le), $e = l.BASE.multiply(Le).toAffine(), te = c($e.x);
+      if (te === ae)
         return;
-      const Te = c(xn * c(we + ee * ge));
+      const Te = c(xn * c(we + te * ge));
       if (Te === ae)
         return;
-      let Kn = ($e.x === ee ? 0 : 2) | Number($e.y & Y), Nn = Te;
-      return U && p(Te) && (Nn = h(Te), Kn ^= 1), new g(ee, Nn, Kn);
+      let Kn = ($e.x === te ? 0 : 2) | Number($e.y & X), Nn = Te;
+      return U && y(Te) && (Nn = h(Te), Kn ^= 1), new g(te, Nn, Kn);
     }
     return { seed: We, k2sig: Et };
   }
   const A = { lowS: t.lowS, prehash: !1 }, T = { lowS: t.lowS, prehash: !1 };
   function R(w, v, N = A) {
-    const { seed: _, k2sig: C } = k(w, v, N), U = t;
-    return Jn(U.hash.outputLen, U.nByteLength, U.hmac)(_, C);
+    const { seed: k, k2sig: C } = _(w, v, N), U = t;
+    return Jn(U.hash.outputLen, U.nByteLength, U.hmac)(k, C);
   }
   l.BASE._setWindowSize(8);
-  function H(w, v, N, _ = T) {
+  function H(w, v, N, k = T) {
     var $e;
     const C = w;
-    if (v = Z("msgHash", v), N = Z("publicKey", N), "strict" in _)
+    if (v = Z("msgHash", v), N = Z("publicKey", N), "strict" in k)
       throw new Error("options.strict was renamed to lowS");
-    const { lowS: U, prehash: O } = _;
-    let $, Q;
+    const { lowS: U, prehash: O } = k;
+    let $, ee;
     try {
       if (typeof C == "string" || C instanceof Uint8Array)
         try {
           $ = g.fromDER(C);
-        } catch (ee) {
-          if (!(ee instanceof Be.Err))
-            throw ee;
+        } catch (te) {
+          if (!(te instanceof Be.Err))
+            throw te;
           $ = g.fromCompact(C);
         }
       else if (typeof C == "object" && typeof C.r == "bigint" && typeof C.s == "bigint") {
-        const { r: ee, s: Te } = C;
-        $ = new g(ee, Te);
+        const { r: te, s: Te } = C;
+        $ = new g(te, Te);
       } else
         throw new Error("PARSE");
-      Q = l.fromHex(N);
-    } catch (ee) {
-      if (ee.message === "PARSE")
+      ee = l.fromHex(N);
+    } catch (te) {
+      if (te.message === "PARSE")
         throw new Error("signature must be Signature instance, Uint8Array or hex string");
       return !1;
     }
     if (U && $.hasHighS())
       return !1;
     O && (v = t.hash(v));
-    const { r: ge, s: Ue } = $, We = x(v), we = a(Ue), Et = c(We * we), Ae = c(ge * we), Le = ($e = l.BASE.multiplyAndAddUnsafe(Q, Et, Ae)) == null ? void 0 : $e.toAffine();
+    const { r: ge, s: Ue } = $, We = x(v), we = a(Ue), Et = c(We * 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 {
@@ -1320,9 +1320,9 @@ function as(e, t) {
   return Object.freeze({ ...n(t), create: n });
 }
 /*! noble-curves - MIT License (c) 2022 Paul Miller (paulmillr.com) */
-const ct = BigInt("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f"), tt = BigInt("0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141"), rr = BigInt(1), nt = BigInt(2), kn = (e, t) => (e + t / nt) / t;
+const ct = BigInt("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f"), tt = BigInt("0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141"), rr = BigInt(1), nt = BigInt(2), _n = (e, t) => (e + t / nt) / t;
 function ir(e) {
-  const t = ct, 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 = J(f, n, t) * f % t, y = J(u, n, t) * f % t, b = J(y, nt, t) * l % t, p = J(b, i, t) * b % t, h = J(p, s, t) * p % t, d = J(h, c, t) * h % t, g = J(d, a, t) * d % t, E = J(g, c, t) * h % t, S = J(E, n, t) * f % t, I = J(S, o, t) * p % t, B = J(I, r, t) * l % t, m = J(B, nt, t);
+  const t = ct, 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, b = Y(p, nt, t) * l % t, y = Y(b, i, t) * b % t, h = Y(y, s, t) * y % t, d = Y(h, c, t) * h % t, g = Y(d, a, t) * d % t, E = Y(g, c, t) * h % t, S = Y(E, n, t) * f % t, I = Y(S, o, t) * y % t, B = Y(I, r, t) * l % t, m = Y(B, nt, t);
   if (!Rt.eql(Rt.sqr(m), e))
     throw new Error("Cannot find square root");
   return m;
@@ -1346,12 +1346,12 @@ const Rt = Ji(ct, void 0, void 0, { sqrt: ir }), Ie = as({
   endo: {
     beta: BigInt("0x7ae96a2b657c07106e64479eac3434e99cf0497512f58995c1396c28719501ee"),
     splitScalar: (e) => {
-      const t = tt, n = BigInt("0x3086d221a7d46bcde86c90e49284eb15"), r = -rr * BigInt("0xe4437ed6010e88286f547fa90abfe4c3"), i = BigInt("0x114ca50f7a8e2f3f657c1108d9d44cfd8"), s = n, o = BigInt("0x100000000000000000000000000000000"), c = kn(s * e, t), a = kn(-r * e, t);
+      const t = tt, n = BigInt("0x3086d221a7d46bcde86c90e49284eb15"), r = -rr * BigInt("0xe4437ed6010e88286f547fa90abfe4c3"), i = BigInt("0x114ca50f7a8e2f3f657c1108d9d44cfd8"), s = n, o = BigInt("0x100000000000000000000000000000000"), c = _n(s * e, t), a = _n(-r * e, t);
       let l = W(e - c * n - a * i, t), f = W(-c * r - a * s, t);
-      const u = l > o, y = f > o;
-      if (u && (l = t - l), y && (f = t - f), l > o || f > o)
+      const u = l > o, p = f > o;
+      if (u && (l = t - l), p && (f = t - f), l > o || f > o)
         throw new Error("splitScalar: Endomorphism failed, k=" + e);
-      return { k1neg: u, k1: l, k2neg: y, k2: f };
+      return { k1neg: u, k1: l, k2neg: p, k2: f };
     }
   }
 }, Lt), ut = BigInt(0), sr = (e) => typeof e == "bigint" && ut < e && e < ct, cs = (e) => typeof e == "bigint" && ut < e && e < tt, In = {};
@@ -1359,9 +1359,9 @@ function rt(e, ...t) {
   let n = In[e];
   if (n === void 0) {
     const r = Lt(Uint8Array.from(e, (i) => i.charCodeAt(0)));
-    n = ke(r, r), In[e] = n;
+    n = _e(r, r), In[e] = n;
   }
-  return Lt(ke(n, ...t));
+  return Lt(_e(n, ...t));
 }
 const Yt = (e) => e.toRawBytes(!0).slice(1), Ot = (e) => Ne(e, 32), At = (e) => W(e, ct), Fe = (e) => W(e, tt), Xt = Ie.ProjectivePoint, us = (e, t, n) => Xt.BASE.multiplyAndAddUnsafe(e, t, n);
 function Pt(e) {
@@ -1387,8 +1387,8 @@ function fs(e, t, n = Zn(32)) {
   const r = Z("message", e), { bytes: i, scalar: s } = Pt(t), o = Z("auxRand", n, 32), c = Ot(s ^ F(rt("BIP0340/aux", o))), a = rt("BIP0340/nonce", c, i, r), l = Fe(F(a));
   if (l === ut)
     throw new Error("sign failed: k is zero");
-  const { bytes: f, scalar: u } = Pt(l), y = ar(f, i, r), b = new Uint8Array(64);
-  if (b.set(f, 0), b.set(Ot(Fe(u + y * s)), 32), !cr(b, r, i))
+  const { bytes: f, scalar: u } = Pt(l), p = ar(f, i, r), b = new Uint8Array(64);
+  if (b.set(f, 0), b.set(Ot(Fe(u + p * s)), 32), !cr(b, r, i))
     throw new Error("sign: Invalid signature produced");
   return b;
 }
@@ -1449,13 +1449,13 @@ function z(e) {
   }
   return n;
 }
-function ys(e) {
+function ps(e) {
   if (typeof e != "string")
     throw new Error(`utf8ToBytes expected string, got ${typeof e}`);
   return new Uint8Array(new TextEncoder().encode(e));
 }
 function Je(e) {
-  if (typeof e == "string" && (e = ys(e)), !Qt(e))
+  if (typeof e == "string" && (e = ps(e)), !Qt(e))
     throw new Error(`expected Uint8Array, got ${typeof e}`);
   return e;
 }
@@ -1487,7 +1487,7 @@ function Mt(e) {
   if (!Number.isSafeInteger(e) || e < 0)
     throw new Error(`Wrong positive integer: ${e}`);
 }
-function ps(e) {
+function ys(e) {
   if (typeof e != "boolean")
     throw new Error(`Expected boolean, not ${e}`);
 }
@@ -1516,7 +1516,7 @@ function bs(e, t) {
 }
 const se = {
   number: Mt,
-  bool: ps,
+  bool: ys,
   bytes: hr,
   hash: gs,
   exists: ws,
@@ -1669,12 +1669,12 @@ class dr extends ms {
     for (let u = 0; u < 16; u++, n += 4)
       Ee[u] = t.getUint32(n, !1);
     for (let u = 16; u < 64; u++) {
-      const y = Ee[u - 15], b = Ee[u - 2], p = ie(y, 7) ^ ie(y, 18) ^ y >>> 3, h = ie(b, 17) ^ ie(b, 19) ^ b >>> 10;
-      Ee[u] = h + Ee[u - 7] + p + Ee[u - 16] | 0;
+      const p = Ee[u - 15], b = Ee[u - 2], y = ie(p, 7) ^ ie(p, 18) ^ p >>> 3, h = ie(b, 17) ^ ie(b, 19) ^ b >>> 10;
+      Ee[u] = h + Ee[u - 7] + y + Ee[u - 16] | 0;
     }
     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 y = ie(c, 6) ^ ie(c, 11) ^ ie(c, 25), b = f + y + Es(c, a, l) + Ks[u] + Ee[u] | 0, h = (ie(r, 2) ^ ie(r, 13) ^ ie(r, 22)) + xs(r, i, s) | 0;
+      const p = ie(c, 6) ^ ie(c, 11) ^ ie(c, 25), b = f + p + Es(c, a, l) + Ks[u] + Ee[u] | 0, h = (ie(r, 2) ^ ie(r, 13) ^ ie(r, 22)) + xs(r, i, s) | 0;
       f = l, l = a, a = c, c = o + b | 0, o = s, s = i, i = r, r = b + 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);
@@ -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 ye(e) {
+function pe(e) {
   return {
     encode: (t) => {
       if (!Array.isArray(t) || t.length && typeof t[0] != "number")
@@ -1727,7 +1727,7 @@ function ye(e) {
     }
   };
 }
-function pe(e = "") {
+function ye(e = "") {
   if (typeof e != "string")
     throw new Error("join separator should be string");
   return {
@@ -1776,7 +1776,7 @@ function ft(e, t = "=") {
     }
   };
 }
-function yr(e) {
+function pr(e) {
   if (typeof e != "function")
     throw new Error("normalize fn should be function");
   return { encode: (t) => t, decode: (t) => e(t) };
@@ -1814,7 +1814,7 @@ function Un(e, t, n) {
     i.push(0);
   return i.reverse();
 }
-const pr = (e, t) => t ? pr(t, e % t) : e, it = (e, t) => e + (t - pr(e, t));
+const yr = (e, t) => t ? yr(t, e % t) : e, it = (e, t) => e + (t - yr(e, t));
 function Ht(e, t, n, r) {
   if (!Array.isArray(e))
     throw new Error("convertRadix2: data should be array");
@@ -1883,13 +1883,13 @@ function Ln(e) {
     }
   };
 }
-const As = de(Se(4), ye("0123456789ABCDEF"), pe("")), Cs = de(Se(5), ye("ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"), ft(5), pe(""));
-de(Se(5), ye("0123456789ABCDEFGHIJKLMNOPQRSTUV"), ft(5), pe(""));
-de(Se(5), ye("0123456789ABCDEFGHJKMNPQRSTVWXYZ"), pe(""), yr((e) => e.toUpperCase().replace(/O/g, "0").replace(/[IL]/g, "1")));
-const he = de(Se(6), ye("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"), ft(6), pe("")), Bs = de(Se(6), ye("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"), ft(6), pe("")), en = (e) => de(Ss(58), ye(e), pe("")), qt = en("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz");
+const As = de(Se(4), pe("0123456789ABCDEF"), ye("")), Cs = de(Se(5), pe("ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"), ft(5), ye(""));
+de(Se(5), pe("0123456789ABCDEFGHIJKLMNOPQRSTUV"), ft(5), ye(""));
+de(Se(5), pe("0123456789ABCDEFGHJKMNPQRSTVWXYZ"), ye(""), pr((e) => e.toUpperCase().replace(/O/g, "0").replace(/[IL]/g, "1")));
+const he = de(Se(6), pe("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"), ft(6), ye("")), Bs = de(Se(6), pe("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"), ft(6), ye("")), en = (e) => de(Ss(58), pe(e), ye("")), qt = en("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz");
 en("123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ");
 en("rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz");
-const $n = [0, 2, 3, 5, 6, 7, 9, 10, 11], _s = {
+const $n = [0, 2, 3, 5, 6, 7, 9, 10, 11], ks = {
   encode(e) {
     let t = "";
     for (let n = 0; n < e.length; n += 8) {
@@ -1909,7 +1909,7 @@ const $n = [0, 2, 3, 5, 6, 7, 9, 10, 11], _s = {
     }
     return Uint8Array.from(t);
   }
-}, Dt = de(ye("qpzry9x8gf2tvdw0s3jn54khce6mua7l"), pe("")), Tn = [996825010, 642813549, 513874426, 1027748829, 705979059];
+}, Dt = de(pe("qpzry9x8gf2tvdw0s3jn54khce6mua7l"), ye("")), Tn = [996825010, 642813549, 513874426, 1027748829, 705979059];
 function Ge(e) {
   const t = e >> 25;
   let n = (e & 33554431) << 5;
@@ -1937,14 +1937,14 @@ function Rn(e, t, n = 1) {
 }
 function gr(e) {
   const t = e === "bech32" ? 1 : 734539939, n = Se(5), r = n.decode, i = n.encode, s = Ln(r);
-  function o(f, u, y = 90) {
+  function o(f, u, p = 90) {
     if (typeof f != "string")
       throw new Error(`bech32.encode prefix should be string, not ${typeof f}`);
     if (!Array.isArray(u) || u.length && typeof u[0] != "number")
       throw new Error(`bech32.encode words should be array of numbers, not ${typeof u}`);
     const b = f.length + 7 + u.length;
-    if (y !== !1 && b > y)
-      throw new TypeError(`Length ${b} exceeds limit ${y}`);
+    if (p !== !1 && b > p)
+      throw new TypeError(`Length ${b} exceeds limit ${p}`);
     return f = f.toLowerCase(), `${f}1${Dt.encode(u)}${Rn(f, u, t)}`;
   }
   function c(f, u = 90) {
@@ -1952,49 +1952,49 @@ function gr(e) {
       throw new Error(`bech32.decode input should be string, not ${typeof f}`);
     if (f.length < 8 || u !== !1 && f.length > u)
       throw new TypeError(`Wrong string length: ${f.length} (${f}). Expected (8..${u})`);
-    const y = f.toLowerCase();
-    if (f !== y && f !== f.toUpperCase())
+    const p = f.toLowerCase();
+    if (f !== p && f !== f.toUpperCase())
       throw new Error("String must be lowercase or uppercase");
-    f = y;
+    f = p;
     const b = f.lastIndexOf("1");
     if (b === 0 || b === -1)
       throw new Error('Letter "1" must be present between prefix and data only');
-    const p = f.slice(0, b), h = f.slice(b + 1);
+    const y = f.slice(0, b), h = f.slice(b + 1);
     if (h.length < 6)
       throw new Error("Data must be at least 6 characters long");
-    const d = Dt.decode(h).slice(0, -6), g = Rn(p, d, t);
+    const d = Dt.decode(h).slice(0, -6), g = Rn(y, d, t);
     if (!h.endsWith(g))
       throw new Error(`Invalid checksum in ${f}: expected "${g}"`);
-    return { prefix: p, words: d };
+    return { prefix: y, words: d };
   }
   const a = Ln(c);
   function l(f) {
-    const { prefix: u, words: y } = c(f, !1);
-    return { prefix: u, words: y, bytes: r(y) };
+    const { prefix: u, words: p } = c(f, !1);
+    return { prefix: u, words: p, bytes: r(p) };
   }
   return { encode: o, decode: c, decodeToBytes: l, decodeUnsafe: a, fromWords: r, fromWordsUnsafe: s, toWords: i };
 }
 const ze = gr("bech32");
 gr("bech32m");
-const ks = {
+const _s = {
   encode: (e) => new TextDecoder().decode(e),
   decode: (e) => new TextEncoder().encode(e)
-}, Is = de(Se(4), ye("0123456789abcdef"), pe(""), yr((e) => {
+}, Is = de(Se(4), pe("0123456789abcdef"), ye(""), pr((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();
 })), Us = {
-  utf8: ks,
+  utf8: _s,
   hex: Is,
   base16: As,
   base32: Cs,
   base64: he,
   base64url: Bs,
   base58: qt,
-  base58xmr: _s
+  base58xmr: ks
 };
 `${Object.keys(Us).join(", ")}`;
-function _t(e) {
+function kt(e) {
   if (!Number.isSafeInteger(e) || e < 0)
     throw new Error(`positive integer expected, not ${e}`);
 }
@@ -2049,11 +2049,11 @@ const jt = /* @__PURE__ */ (() => {
     r |= r << 8, t[e[n]] = (r ^ r >> 4 ^ r >> 5 ^ r >> 6 ^ r >> 7 ^ 99) & 255;
   }
   return t;
-})(), Ms = /* @__PURE__ */ jt.map((e, t) => jt.indexOf(t)), Hs = (e) => e << 24 | e >>> 8, kt = (e) => e << 8 | e >>> 24;
+})(), Ms = /* @__PURE__ */ jt.map((e, t) => jt.indexOf(t)), Hs = (e) => e << 24 | e >>> 8, _t = (e) => e << 8 | e >>> 24;
 function wr(e, t) {
   if (e.length !== 256)
     throw new Error("Wrong sbox length");
-  const n = new Uint32Array(256).map((l, f) => t(e[f])), r = n.map(kt), i = r.map(kt), s = i.map(kt), o = new Uint32Array(256 * 256), c = new Uint32Array(256 * 256), a = new Uint16Array(256 * 256);
+  const n = new Uint32Array(256).map((l, f) => t(e[f])), r = n.map(_t), i = r.map(_t), s = i.map(_t), o = new Uint32Array(256 * 256), c = new Uint32Array(256 * 256), a = new Uint16Array(256 * 256);
   for (let l = 0; l < 256; l++)
     for (let f = 0; f < 256; f++) {
       const u = l * 256 + f;
@@ -2103,24 +2103,24 @@ function Pn(e, t, n, r, i) {
   let a = 0;
   t ^= e[a++], n ^= e[a++], r ^= e[a++], i ^= e[a++];
   const l = e.length / 4 - 2;
-  for (let p = 0; p < l; p++) {
+  for (let y = 0; y < l; y++) {
     const h = e[a++] ^ xe(o, c, t, n, r, i), d = e[a++] ^ xe(o, c, n, r, i, t), g = e[a++] ^ xe(o, c, r, i, t, n), E = e[a++] ^ xe(o, c, i, t, n, r);
     t = h, n = d, r = g, i = E;
   }
-  const f = e[a++] ^ oe(s, t, n, r, i), u = e[a++] ^ oe(s, n, r, i, t), y = e[a++] ^ oe(s, r, i, t, n), b = e[a++] ^ oe(s, i, t, n, r);
-  return { s0: f, s1: u, s2: y, s3: b };
+  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), b = e[a++] ^ oe(s, i, t, n, r);
+  return { s0: f, s1: u, s2: p, s3: b };
 }
 function js(e, t, n, r, i) {
   const { sbox2: s, T01: o, T23: c } = br;
   let a = 0;
   t ^= e[a++], n ^= e[a++], r ^= e[a++], i ^= e[a++];
   const l = e.length / 4 - 2;
-  for (let p = 0; p < l; p++) {
+  for (let y = 0; y < l; y++) {
     const h = e[a++] ^ xe(o, c, t, i, r, n), d = e[a++] ^ xe(o, c, n, t, i, r), g = e[a++] ^ xe(o, c, r, n, t, i), E = e[a++] ^ xe(o, c, i, r, n, t);
     t = h, n = d, r = g, i = E;
   }
-  const f = e[a++] ^ oe(s, t, i, r, n), u = e[a++] ^ oe(s, n, t, i, r), y = e[a++] ^ oe(s, r, n, t, i), b = e[a++] ^ oe(s, i, r, n, t);
-  return { s0: f, s1: u, s2: y, s3: b };
+  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), b = e[a++] ^ oe(s, i, r, n, t);
+  return { s0: f, s1: u, s2: p, s3: b };
 }
 function mr(e, t) {
   if (!t)
@@ -2175,23 +2175,23 @@ const Er = /* @__PURE__ */ Os({ blockSize: 16, nonceLength: 16 }, function(t, n,
   return {
     encrypt: (s, o) => {
       const c = vr(t), { b: a, o: l, out: f } = Vs(s, i, o), u = G(n);
-      let y = u[0], b = u[1], p = u[2], h = u[3], d = 0;
+      let p = u[0], b = u[1], y = u[2], h = u[3], d = 0;
       for (; d + 4 <= a.length; )
-        y ^= a[d + 0], b ^= a[d + 1], p ^= a[d + 2], h ^= a[d + 3], { s0: y, s1: b, s2: p, s3: h } = Pn(c, y, b, p, h), l[d++] = y, l[d++] = b, l[d++] = p, l[d++] = h;
+        p ^= a[d + 0], b ^= a[d + 1], y ^= a[d + 2], h ^= a[d + 3], { s0: p, s1: b, s2: y, s3: h } = Pn(c, p, b, y, h), l[d++] = p, l[d++] = b, l[d++] = y, l[d++] = h;
       if (i) {
         const g = Zs(s.subarray(d * 4));
-        y ^= g[0], b ^= g[1], p ^= g[2], h ^= g[3], { s0: y, s1: b, s2: p, s3: h } = Pn(c, y, b, p, h), l[d++] = y, l[d++] = b, l[d++] = p, l[d++] = h;
+        p ^= g[0], b ^= g[1], y ^= g[2], h ^= g[3], { s0: p, s1: b, s2: y, s3: h } = Pn(c, p, b, y, h), l[d++] = p, l[d++] = b, l[d++] = y, l[d++] = h;
       }
       return c.fill(0), f;
     },
     decrypt: (s, o) => {
       zs(s);
       const c = Ds(t), a = G(n), l = mr(s.length, o), f = G(s), u = G(l);
-      let y = a[0], b = a[1], p = a[2], h = a[3];
+      let p = a[0], b = a[1], y = a[2], h = a[3];
       for (let d = 0; d + 4 <= f.length; ) {
-        const g = y, E = b, S = p, I = h;
-        y = f[d + 0], b = f[d + 1], p = f[d + 2], h = f[d + 3];
-        const { s0: B, s1: m, s2: x, s3: K } = js(c, y, b, p, h);
+        const g = p, E = b, S = y, I = h;
+        p = f[d + 0], b = f[d + 1], y = f[d + 2], h = f[d + 3];
+        const { s0: B, s1: m, s2: x, s3: K } = js(c, p, b, y, h);
         u[d++] = B ^ g, u[d++] = m ^ E, u[d++] = x ^ S, u[d++] = K ^ I;
       }
       return c.fill(0), Ws(l, i);
@@ -2207,44 +2207,44 @@ function zt(e) {
 }
 const Xe = 64, Ys = 16, Nr = 2 ** 32 - 1, Mn = new Uint32Array();
 function Xs(e, t, n, r, i, s, o, c) {
-  const a = i.length, l = new Uint8Array(Xe), f = G(l), u = zt(i) && zt(s), y = u ? G(i) : Mn, b = u ? G(s) : Mn;
-  for (let p = 0; p < a; o++) {
+  const a = i.length, l = new Uint8Array(Xe), f = G(l), u = zt(i) && zt(s), p = u ? G(i) : Mn, b = u ? G(s) : Mn;
+  for (let y = 0; y < a; o++) {
     if (e(t, n, r, f, o, c), o >= Nr)
       throw new Error("arx: counter overflow");
-    const h = Math.min(Xe, a - p);
+    const h = Math.min(Xe, a - y);
     if (u && h === Xe) {
-      const d = p / 4;
-      if (p % 4 !== 0)
+      const d = y / 4;
+      if (y % 4 !== 0)
         throw new Error("arx: invalid block position");
       for (let g = 0, E; g < Ys; g++)
-        E = d + g, b[E] = y[E] ^ f[g];
-      p += Xe;
+        E = d + g, b[E] = p[E] ^ f[g];
+      y += Xe;
       continue;
     }
     for (let d = 0, g; d < h; d++)
-      g = p + d, s[g] = i[g] ^ l[d];
-    p += h;
+      g = y + d, s[g] = i[g] ^ l[d];
+    y += h;
   }
 }
 function Qs(e, t) {
   const { allowShortKeys: n, extendNonceFn: r, counterLength: i, counterRight: s, rounds: o } = Ts({ allowShortKeys: !1, counterLength: 8, counterRight: !1, rounds: 20 }, t);
   if (typeof e != "function")
     throw new Error("core must be a function");
-  return _t(i), _t(o), On(s), On(n), (c, a, l, f, u = 0) => {
+  return kt(i), kt(o), On(s), On(n), (c, a, l, f, u = 0) => {
     ce(c), ce(a), ce(l);
-    const y = l.length;
-    if (f || (f = new Uint8Array(y)), ce(f), _t(u), u < 0 || u >= Nr)
+    const p = l.length;
+    if (f || (f = new Uint8Array(p)), ce(f), kt(u), u < 0 || u >= Nr)
       throw new Error("arx: counter overflow");
-    if (f.length < y)
-      throw new Error(`arx: output (${f.length}) is shorter than data (${y})`);
+    if (f.length < p)
+      throw new Error(`arx: output (${f.length}) is shorter than data (${p})`);
     const b = [];
-    let p = c.length, h, d;
-    if (p === 32)
+    let y = c.length, h, d;
+    if (y === 32)
       h = c.slice(), b.push(h), d = Kr;
-    else if (p === 16 && n)
+    else if (y === 16 && n)
       h = new Uint8Array(32), h.set(c), h.set(c, 16), d = Js, b.push(h);
     else
-      throw new Error(`arx: invalid 32-byte key, got length=${p}`);
+      throw new Error(`arx: invalid 32-byte key, got length=${y}`);
     zt(a) || (a = a.slice(), b.push(a));
     const g = G(h);
     if (r) {
@@ -2266,11 +2266,11 @@ function Qs(e, t) {
   };
 }
 function eo(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], y = t[2], b = t[3], p = t[4], h = t[5], d = t[6], g = t[7], E = i, S = n[0], I = n[1], B = n[2], m = o, x = c, K = a, M = l, k = f, A = u, T = y, R = b, H = p, w = h, v = d, N = g, _ = E, C = S, U = I, O = B;
-  for (let Q = 0; Q < s; Q += 2)
-    m = m + k | 0, _ = L(_ ^ m, 16), H = H + _ | 0, k = L(k ^ H, 12), m = m + k | 0, _ = L(_ ^ m, 8), H = H + _ | 0, k = L(k ^ H, 7), x = x + A | 0, C = L(C ^ x, 16), w = w + C | 0, A = L(A ^ w, 12), x = x + A | 0, C = L(C ^ x, 8), w = w + C | 0, A = L(A ^ w, 7), K = K + T | 0, U = L(U ^ K, 16), v = v + U | 0, T = L(T ^ v, 12), K = K + T | 0, U = L(U ^ K, 8), v = v + U | 0, T = L(T ^ v, 7), M = M + R | 0, O = L(O ^ M, 16), N = N + O | 0, R = L(R ^ N, 12), M = M + R | 0, O = L(O ^ M, 8), N = N + O | 0, R = L(R ^ 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 + T | 0, _ = L(_ ^ x, 16), N = N + _ | 0, T = L(T ^ N, 12), x = x + T | 0, _ = L(_ ^ x, 8), N = N + _ | 0, T = L(T ^ N, 7), K = K + R | 0, C = L(C ^ K, 16), H = H + C | 0, R = L(R ^ H, 12), K = K + R | 0, C = L(C ^ K, 8), H = H + C | 0, R = L(R ^ H, 7), M = M + k | 0, U = L(U ^ M, 16), w = w + U | 0, k = L(k ^ w, 12), M = M + k | 0, U = L(U ^ M, 8), w = w + U | 0, k = L(k ^ w, 7);
+  let o = e[0], c = e[1], a = e[2], l = e[3], f = t[0], u = t[1], p = t[2], b = t[3], y = t[4], h = t[5], d = t[6], g = t[7], E = i, S = n[0], I = n[1], B = n[2], m = o, x = c, K = a, M = l, _ = f, A = u, T = p, R = b, H = y, w = h, v = d, N = g, k = E, C = S, U = I, O = B;
+  for (let ee = 0; ee < s; ee += 2)
+    m = m + _ | 0, k = L(k ^ m, 16), H = H + k | 0, _ = L(_ ^ H, 12), m = m + _ | 0, k = L(k ^ m, 8), H = H + k | 0, _ = L(_ ^ H, 7), x = x + A | 0, C = L(C ^ x, 16), w = w + C | 0, A = L(A ^ w, 12), x = x + A | 0, C = L(C ^ x, 8), w = w + C | 0, A = L(A ^ w, 7), K = K + T | 0, U = L(U ^ K, 16), v = v + U | 0, T = L(T ^ v, 12), K = K + T | 0, U = L(U ^ K, 8), v = v + U | 0, T = L(T ^ v, 7), M = M + R | 0, O = L(O ^ M, 16), N = N + O | 0, R = L(R ^ N, 12), M = M + R | 0, O = L(O ^ M, 8), N = N + O | 0, R = L(R ^ 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 + T | 0, k = L(k ^ x, 16), N = N + k | 0, T = L(T ^ N, 12), x = x + T | 0, k = L(k ^ x, 8), N = N + k | 0, T = L(T ^ N, 7), K = K + R | 0, C = L(C ^ K, 16), H = H + C | 0, R = L(R ^ H, 12), K = K + R | 0, C = L(C ^ K, 8), H = H + C | 0, R = L(R ^ H, 7), M = M + _ | 0, U = L(U ^ M, 16), w = w + U | 0, _ = L(_ ^ w, 12), M = M + _ | 0, U = L(U ^ M, 8), w = w + U | 0, _ = L(_ ^ w, 7);
   let $ = 0;
-  r[$++] = o + m | 0, r[$++] = c + x | 0, r[$++] = a + K | 0, r[$++] = l + M | 0, r[$++] = f + k | 0, r[$++] = u + A | 0, r[$++] = y + T | 0, r[$++] = b + R | 0, r[$++] = p + H | 0, r[$++] = h + w | 0, r[$++] = d + v | 0, r[$++] = g + N | 0, r[$++] = E + _ | 0, r[$++] = S + C | 0, r[$++] = I + U | 0, r[$++] = B + O | 0;
+  r[$++] = o + m | 0, r[$++] = c + x | 0, r[$++] = a + K | 0, r[$++] = l + M | 0, r[$++] = f + _ | 0, r[$++] = u + A | 0, r[$++] = p + T | 0, r[$++] = b + R | 0, r[$++] = y + H | 0, r[$++] = h + w | 0, r[$++] = d + v | 0, r[$++] = g + N | 0, r[$++] = E + k | 0, r[$++] = S + C | 0, r[$++] = I + U | 0, r[$++] = B + O | 0;
 }
 const Sr = /* @__PURE__ */ Qs(eo, {
   counterRight: !1,
@@ -2382,15 +2382,15 @@ function sn(e, t) {
 }
 var Br = class {
   constructor(e) {
-    te(this, "value");
-    te(this, "next", null);
-    te(this, "prev", null);
+    J(this, "value");
+    J(this, "next", null);
+    J(this, "prev", null);
     this.value = e;
   }
 }, ao = class {
   constructor() {
-    te(this, "first");
-    te(this, "last");
+    J(this, "first");
+    J(this, "last");
     this.first = null, this.last = null;
   }
   enqueue(e) {
@@ -2441,7 +2441,7 @@ function qe(e) {
   let t = fe(ne.encode(uo(e)));
   return P(t);
 }
-var yt = new co(), _e = yt.generateSecretKey, le = yt.getPublicKey, X = yt.finalizeEvent, pt = yt.verifyEvent, lo = {};
+var pt = new co(), ke = pt.generateSecretKey, le = pt.getPublicKey, Q = pt.finalizeEvent, yt = pt.verifyEvent, lo = {};
 D(lo, {
   Application: () => da,
   BadgeAward: () => mo,
@@ -2460,7 +2460,7 @@ D(lo, {
   ClientAuth: () => Hr,
   CommunitiesList: () => Do,
   CommunityDefinition: () => Na,
-  CommunityPostApproval: () => ko,
+  CommunityPostApproval: () => _o,
   Contacts: () => wo,
   CreateOrUpdateProduct: () => ua,
   CreateOrUpdateStall: () => ca,
@@ -2487,12 +2487,12 @@ D(lo, {
   JobFeedback: () => Lo,
   JobRequest: () => Io,
   JobResult: () => Uo,
-  Label: () => _o,
+  Label: () => ko,
   LightningPubRPC: () => Yo,
   LiveChatMessage: () => So,
-  LiveEvent: () => ya,
+  LiveEvent: () => pa,
   LongFormArticle: () => la,
-  Metadata: () => yo,
+  Metadata: () => po,
   Mutelist: () => Po,
   NWCWalletInfo: () => Jo,
   NWCWalletRequest: () => qr,
@@ -2513,10 +2513,10 @@ D(lo, {
   Repost: () => on,
   Seal: () => Lr,
   SearchRelaysList: () => Vo,
-  ShortTextNote: () => po,
+  ShortTextNote: () => yo,
   Time: () => va,
   UserEmojiList: () => Zo,
-  UserStatuses: () => pa,
+  UserStatuses: () => ya,
   Zap: () => Ro,
   ZapGoal: () => $o,
   ZapRequest: () => To,
@@ -2524,13 +2524,13 @@ D(lo, {
   isEphemeralKind: () => Ir,
   isKind: () => ho,
   isParameterizedReplaceableKind: () => Ur,
-  isRegularKind: () => _r,
-  isReplaceableKind: () => kr
+  isRegularKind: () => kr,
+  isReplaceableKind: () => _r
 });
-function _r(e) {
+function kr(e) {
   return 1e3 <= e && e < 1e4 || [1, 2, 4, 5, 6, 7, 8, 16, 40, 41, 42, 43, 44].includes(e);
 }
-function kr(e) {
+function _r(e) {
   return [0, 3].includes(e) || 1e4 <= e && e < 2e4;
 }
 function Ir(e) {
@@ -2540,19 +2540,19 @@ function Ur(e) {
   return 3e4 <= e && e < 4e4;
 }
 function fo(e) {
-  return _r(e) ? "regular" : kr(e) ? "replaceable" : Ir(e) ? "ephemeral" : Ur(e) ? "parameterized" : "unknown";
+  return kr(e) ? "regular" : _r(e) ? "replaceable" : Ir(e) ? "ephemeral" : Ur(e) ? "parameterized" : "unknown";
 }
 function ho(e, t) {
   const n = t instanceof Array ? t : [t];
   return dt(e) && n.includes(e.kind) || !1;
 }
-var yo = 0, po = 1, go = 2, wo = 3, bo = 4, vo = 5, on = 6, an = 7, mo = 8, Lr = 13, Eo = 14, xo = 16, $r = 40, Tr = 41, Rr = 42, Or = 43, Pr = 44, Ko = 1040, Mr = 1059, No = 1063, So = 1311, Ao = 1971, Co = 1984, Bo = 1984, _o = 1985, ko = 4550, Io = 5999, Uo = 6999, Lo = 7e3, $o = 9041, To = 9734, Ro = 9735, Oo = 9802, Po = 1e4, Mo = 10001, Ho = 10002, qo = 10003, Do = 10004, jo = 10005, zo = 10006, Vo = 10007, Wo = 10015, Zo = 10030, Go = 10050, Fo = 10096, Jo = 13194, Yo = 21e3, Hr = 22242, qr = 23194, Xo = 23195, Qo = 24133, cn = 27235, ea = 3e4, ta = 30001, na = 30002, ra = 30003, ia = 30004, sa = 30008, oa = 30009, aa = 30015, ca = 30017, ua = 30018, la = 30023, fa = 30024, ha = 30030, da = 30078, ya = 30311, pa = 30315, ga = 30402, wa = 30403, ba = 31922, va = 31923, ma = 31924, Ea = 31925, xa = 31989, Ka = 31990, Na = 34550, Sa = {};
+var po = 0, yo = 1, go = 2, wo = 3, bo = 4, vo = 5, on = 6, an = 7, mo = 8, Lr = 13, Eo = 14, xo = 16, $r = 40, Tr = 41, Rr = 42, Or = 43, Pr = 44, Ko = 1040, Mr = 1059, No = 1063, So = 1311, Ao = 1971, Co = 1984, Bo = 1984, ko = 1985, _o = 4550, Io = 5999, Uo = 6999, Lo = 7e3, $o = 9041, To = 9734, Ro = 9735, Oo = 9802, Po = 1e4, Mo = 10001, Ho = 10002, qo = 10003, Do = 10004, jo = 10005, zo = 10006, Vo = 10007, Wo = 10015, Zo = 10030, Go = 10050, Fo = 10096, Jo = 13194, Yo = 21e3, Hr = 22242, qr = 23194, Xo = 23195, Qo = 24133, cn = 27235, ea = 3e4, ta = 30001, na = 30002, ra = 30003, ia = 30004, sa = 30008, oa = 30009, aa = 30015, ca = 30017, ua = 30018, la = 30023, fa = 30024, ha = 30030, da = 30078, pa = 30311, ya = 30315, ga = 30402, wa = 30403, ba = 31922, va = 31923, ma = 31924, Ea = 31925, xa = 31989, Ka = 31990, Na = 34550, Sa = {};
 D(Sa, {
   getHex64: () => un,
   getInt: () => Dr,
   getSubscriptionId: () => Aa,
   matchEventId: () => Ca,
-  matchEventKind: () => _a,
+  matchEventKind: () => ka,
   matchEventPubkey: () => Ba
 });
 function un(e, t) {
@@ -2582,11 +2582,11 @@ function Ca(e, t) {
 function Ba(e, t) {
   return t === un(e, "pubkey");
 }
-function _a(e, t) {
+function ka(e, t) {
   return t === Dr(e, "kind");
 }
-var ka = {};
-D(ka, {
+var _a = {};
+D(_a, {
   makeAuthEvent: () => Ia
 });
 function Ia(e, t) {
@@ -2651,7 +2651,7 @@ function gt(e) {
         type: "nprofile",
         data: {
           pubkey: P(u[0][0]),
-          relays: u[1] ? u[1].map((y) => ue.decode(y)) : []
+          relays: u[1] ? u[1].map((p) => ue.decode(p)) : []
         }
       };
     }
@@ -2669,7 +2669,7 @@ function gt(e) {
         type: "nevent",
         data: {
           id: P(u[0][0]),
-          relays: u[1] ? u[1].map((y) => ue.decode(y)) : [],
+          relays: u[1] ? u[1].map((p) => ue.decode(p)) : [],
           author: (o = u[2]) != null && o[0] ? P(u[2][0]) : void 0,
           kind: (c = u[3]) != null && c[0] ? parseInt(P(u[3][0]), 16) : void 0
         }
@@ -2693,7 +2693,7 @@ function gt(e) {
           identifier: ue.decode(u[0][0]),
           pubkey: P(u[2][0]),
           kind: parseInt(P(u[3][0]), 16),
-          relays: u[1] ? u[1].map((y) => ue.decode(y)) : []
+          relays: u[1] ? u[1].map((p) => ue.decode(p)) : []
         }
       };
     }
@@ -2965,7 +2965,7 @@ D(rc, {
   getRepostedEventPointer: () => Jr
 });
 function ic(e, t, n, r) {
-  return X(
+  return Q(
     {
       kind: on,
       tags: [...e.tags ?? [], ["e", t.id, n], ["p", t.pubkey]],
@@ -3000,7 +3000,7 @@ function sc(e, { skipVerification: t } = {}) {
   } catch {
     return;
   }
-  if (r.id === n.id && !(!t && !pt(r)))
+  if (r.id === n.id && !(!t && !yt(r)))
     return r;
 }
 var oc = {};
@@ -3030,7 +3030,7 @@ D(uc, {
 });
 function lc(e, t, n) {
   const r = t.tags.filter((i) => i.length >= 2 && (i[0] === "e" || i[0] === "p"));
-  return X(
+  return Q(
     {
       ...e,
       kind: an,
@@ -3059,7 +3059,7 @@ var hc = {};
 D(hc, {
   matchAll: () => dc,
   regex: () => dn,
-  replaceAll: () => yc
+  replaceAll: () => pc
 });
 var dn = () => new RegExp(`\\b${mt.source}\\b`, "g");
 function* dc(e) {
@@ -3077,15 +3077,15 @@ function* dc(e) {
     } catch {
     }
 }
-function yc(e, t) {
+function pc(e, t) {
   return e.replaceAll(dn(), (n, r) => t({
     uri: n,
     value: r,
     decoded: gt(r)
   }));
 }
-var pc = {};
-D(pc, {
+var yc = {};
+D(yc, {
   channelCreateEvent: () => gc,
   channelHideMessageEvent: () => vc,
   channelMessageEvent: () => bc,
@@ -3100,7 +3100,7 @@ var gc = (e, t) => {
     n = e.content;
   else
     return;
-  return X(
+  return Q(
     {
       kind: $r,
       tags: [...e.tags ?? []],
@@ -3117,7 +3117,7 @@ var gc = (e, t) => {
     n = e.content;
   else
     return;
-  return X(
+  return Q(
     {
       kind: Tr,
       tags: [["e", e.channel_create_event_id], ...e.tags ?? []],
@@ -3128,7 +3128,7 @@ var gc = (e, t) => {
   );
 }, bc = (e, t) => {
   const n = [["e", e.channel_create_event_id, e.relay_url, "root"]];
-  return e.reply_to_channel_message_event_id && n.push(["e", e.reply_to_channel_message_event_id, e.relay_url, "reply"]), X(
+  return e.reply_to_channel_message_event_id && n.push(["e", e.reply_to_channel_message_event_id, e.relay_url, "reply"]), Q(
     {
       kind: Rr,
       tags: [...n, ...e.tags ?? []],
@@ -3145,7 +3145,7 @@ var gc = (e, t) => {
     n = e.content;
   else
     return;
-  return X(
+  return Q(
     {
       kind: Or,
       tags: [["e", e.channel_message_event_id], ...e.tags ?? []],
@@ -3162,7 +3162,7 @@ var gc = (e, t) => {
     n = e.content;
   else
     return;
-  return X(
+  return Q(
     {
       kind: Pr,
       tags: [["p", e.pubkey_to_mute], ...e.tags ?? []],
@@ -3175,12 +3175,12 @@ var gc = (e, t) => {
 D(Ec, {
   EMOJI_SHORTCODE_REGEX: () => Yr,
   matchAll: () => xc,
-  regex: () => yn,
+  regex: () => pn,
   replaceAll: () => Kc
 });
-var Yr = /:(\w+):/, yn = () => new RegExp(`\\B${Yr.source}\\B`, "g");
+var Yr = /:(\w+):/, pn = () => new RegExp(`\\B${Yr.source}\\B`, "g");
 function* xc(e) {
-  const t = e.matchAll(yn());
+  const t = e.matchAll(pn());
   for (const n of t)
     try {
       const [r, i] = n;
@@ -3194,7 +3194,7 @@ function* xc(e) {
     }
 }
 function Kc(e, t) {
-  return e.replaceAll(yn(), (n, r) => t({
+  return e.replaceAll(pn(), (n, r) => t({
     shortcode: n,
     name: r
   }));
@@ -3204,17 +3204,17 @@ D(Nc, {
   useFetchImplementation: () => Sc,
   validateGithub: () => Ac
 });
-var pn;
+var yn;
 try {
-  pn = fetch;
+  yn = fetch;
 } catch {
 }
 function Sc(e) {
-  pn = e;
+  yn = e;
 }
 async function Ac(e, t, n) {
   try {
-    return await (await pn(`https://gist.github.com/${t}/${n}/raw`)).text() === `Verifying that I control the following Nostr public key: ${e}`;
+    return await (await yn(`https://gist.github.com/${t}/${n}/raw`)).text() === `Verifying that I control the following Nostr public key: ${e}`;
   } catch {
     return !1;
   }
@@ -3257,7 +3257,7 @@ function Bc(e) {
   const t = ne.encode(e), n = t.length, r = Cc(n), i = new Uint8Array(wn(n) - n);
   return lt(r, t, i);
 }
-function _c(e) {
+function kc(e) {
   const t = new DataView(e.buffer).getUint16(0), n = e.subarray(2, 2 + t);
   if (t < Xr || t > Qr || n.length !== t || e.length !== 2 + wn(t))
     throw new Error("invalid padding");
@@ -3269,7 +3269,7 @@ function ti(e, t, n) {
   const r = lt(n, t);
   return ht(fe, e, r);
 }
-function kc(e) {
+function _c(e) {
   if (typeof e != "string")
     throw new Error("payload must be a valid string");
   const t = e.length;
@@ -3300,11 +3300,11 @@ function bn(e, t, n = fr(32)) {
   return he.encode(lt(new Uint8Array([2]), n, c, a));
 }
 function vn(e, t) {
-  const { nonce: n, ciphertext: r, mac: i } = kc(e), { chacha_key: s, chacha_nonce: o, hmac_key: c } = ei(t, n), a = ti(c, r, n);
+  const { nonce: n, ciphertext: r, mac: i } = _c(e), { chacha_key: s, chacha_nonce: o, hmac_key: c } = ei(t, n), a = ti(c, r, n);
   if (!Rs(a, i))
     throw new Error("invalid MAC");
   const l = Sr(s, o, r);
-  return _c(l);
+  return kc(l);
 }
 var Ic = {
   utils: {
@@ -3336,7 +3336,7 @@ async function $c(e, t, n) {
     content: i,
     tags: [["p", e]]
   };
-  return X(s, t);
+  return Q(s, t);
 }
 var Tc = {};
 D(Tc, {
@@ -3404,7 +3404,7 @@ function Mc(e) {
   }
   if (!dt(t))
     return "Zap request is not a valid Nostr event.";
-  if (!pt(t))
+  if (!yt(t))
     return "Invalid signature on zap request.";
   let n = t.tags.find(([s, o]) => s === "p" && o);
   if (!n)
@@ -3450,7 +3450,7 @@ function oi(e, t) {
   return n.id = qe(n), n;
 }
 function ai(e, t, n) {
-  return X(
+  return Q(
     {
       kind: Lr,
       content: si(e, t, n),
@@ -3461,8 +3461,8 @@ function ai(e, t, n) {
   );
 }
 function ci(e, t) {
-  const n = _e();
-  return X(
+  const n = ke();
+  return Q(
     {
       kind: Mr,
       content: si(e, n, t),
@@ -3501,10 +3501,10 @@ D(Vc, {
   unpackEventFromToken: () => fi,
   validateEvent: () => wi,
   validateEventKind: () => di,
-  validateEventMethodTag: () => pi,
+  validateEventMethodTag: () => yi,
   validateEventPayloadTag: () => gi,
   validateEventTimestamp: () => hi,
-  validateEventUrlTag: () => yi,
+  validateEventUrlTag: () => pi,
   validateToken: () => Zc
 });
 var li = "Nostr ";
@@ -3545,11 +3545,11 @@ function hi(e) {
 function di(e) {
   return e.kind === cn;
 }
-function yi(e, t) {
+function pi(e, t) {
   const n = e.tags.find((r) => r[0] === "u");
   return n ? n.length > 0 && n[1] === t : !1;
 }
-function pi(e, t) {
+function yi(e, t) {
   const n = e.tags.find((r) => r[0] === "method");
   return n ? n.length > 0 && n[1].toLowerCase() === t.toLowerCase() : !1;
 }
@@ -3565,15 +3565,15 @@ function gi(e, t) {
   return n.length > 0 && n[1] === r;
 }
 async function wi(e, t, n, r) {
-  if (!pt(e))
+  if (!yt(e))
     throw new Error("Invalid nostr event, signature invalid");
   if (!di(e))
     throw new Error("Invalid nostr event, kind invalid");
   if (!hi(e))
     throw new Error("Invalid nostr event, created_at timestamp invalid");
-  if (!yi(e, t))
+  if (!pi(e, t))
     throw new Error("Invalid nostr event, url tag invalid");
-  if (!pi(e, n))
+  if (!yi(e, n))
     throw new Error("Invalid nostr event, method tag invalid");
   if (r && typeof r == "object" && Object.keys(r).length > 0 && !gi(e, r))
     throw new Error("Invalid nostr event, payload tag does not match request body hash");
@@ -3711,11 +3711,12 @@ const Jc = 1e3, Yc = "0000000000000000000000000000000000000000000000000000000000
 class st {
   // 1. CHANNEL PUBLIC INTERFACE
   constructor(t, n) {
-    te(this, "nostrUnsubscribe");
-    te(this, "nostrNextUnsubscribe");
-    te(this, "internalSubscriptions", /* @__PURE__ */ new Map());
-    te(this, "currentInternalSubscriptionId", 0);
-    te(this, "name");
+    J(this, "skippedSubscription");
+    J(this, "nostrUnsubscribe");
+    J(this, "nostrNextUnsubscribe");
+    J(this, "internalSubscriptions", /* @__PURE__ */ new Map());
+    J(this, "currentInternalSubscriptionId", 0);
+    J(this, "name");
     this.nostrSubscribe = t, this.state = n, this.name = Math.random().toString(36).substring(2, 6);
   }
   /**
@@ -3729,10 +3730,10 @@ class st {
    * @returns A new Session instance
    */
   static init(t, n, r, i, s, o) {
-    const c = _e(), [a, l] = Pe(s, q.getConversationKey(c, n), 2);
+    const c = ke(), [a, l] = Pe(s, q.getConversationKey(c, n), 2);
     let f, u;
     i ? (f = { publicKey: le(r), privateKey: r }, u = { publicKey: le(c), privateKey: c }) : u = { publicKey: le(r), privateKey: r };
-    const y = {
+    const p = {
       rootKey: i ? a : s,
       theirNextNostrPublicKey: n,
       ourCurrentNostrKey: f,
@@ -3743,7 +3744,7 @@ class st {
       receivingChainMessageNumber: 0,
       previousSendingChainMessageCount: 0,
       skippedKeys: {}
-    }, b = new st(t, y);
+    }, b = new st(t, p);
     return o && (b.name = o), b;
   }
   /**
@@ -3781,7 +3782,7 @@ class st {
     };
     r.tags.some(([l]) => l === "ms") || r.tags.push(["ms", String(n)]), r.id = qe(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);
-    return { event: X({
+    return { event: Q({
       content: s,
       kind: Oe,
       tags: [["header", c]],
@@ -3801,8 +3802,8 @@ class st {
    * Stop listening to incoming messages
    */
   close() {
-    var t, n;
-    (t = this.nostrUnsubscribe) == null || t.call(this), (n = this.nostrNextUnsubscribe) == null || n.call(this);
+    var t, n, r;
+    (t = this.nostrUnsubscribe) == null || t.call(this), (n = this.nostrNextUnsubscribe) == null || n.call(this), (r = this.skippedSubscription) == null || r.call(this), this.internalSubscriptions.clear();
   }
   // 2. RATCHET FUNCTIONS
   ratchetEncrypt(t) {
@@ -3834,7 +3835,7 @@ class st {
     this.state.previousSendingChainMessageCount = this.state.sendingChainMessageNumber, this.state.sendingChainMessageNumber = 0, this.state.receivingChainMessageNumber = 0, this.state.theirNextNostrPublicKey = t;
     const n = q.getConversationKey(this.state.ourNextNostrKey.privateKey, this.state.theirNextNostrPublicKey), [r, i] = Pe(this.state.rootKey, n, 2);
     this.state.receivingChainKey = i, this.state.ourCurrentNostrKey = this.state.ourNextNostrKey;
-    const s = _e();
+    const s = ke();
     this.state.ourNextNostrKey = {
       publicKey: le(s),
       privateKey: s
@@ -3893,12 +3894,15 @@ class st {
     throw new Error("Failed to decrypt header with current and skipped header keys");
   }
   handleNostrEvent(t) {
-    var c;
+    var c, a;
     const [n, r, i] = this.decryptHeader(t);
-    i || (this.state.theirNextNostrPublicKey !== n.nextPublicKey && (this.state.theirCurrentNostrPublicKey = this.state.theirNextNostrPublicKey, this.state.theirNextNostrPublicKey = n.nextPublicKey, (c = this.nostrUnsubscribe) == null || c.call(this), this.nostrUnsubscribe = this.nostrNextUnsubscribe, this.nostrNextUnsubscribe = this.nostrSubscribe(
-      { authors: [this.state.theirNextNostrPublicKey], kinds: [Oe] },
-      (a) => this.handleNostrEvent(a)
-    )), r && (this.skipMessageKeys(n.previousChainLength, t.pubkey), this.ratchetStep(n.nextPublicKey)));
+    if (!i)
+      this.state.theirNextNostrPublicKey !== n.nextPublicKey && (this.state.theirCurrentNostrPublicKey = this.state.theirNextNostrPublicKey, this.state.theirNextNostrPublicKey = n.nextPublicKey, (c = this.nostrUnsubscribe) == null || c.call(this), this.nostrUnsubscribe = this.nostrNextUnsubscribe, this.nostrNextUnsubscribe = this.nostrSubscribe(
+        { authors: [this.state.theirNextNostrPublicKey], kinds: [Oe] },
+        (l) => this.handleNostrEvent(l)
+      )), r && (this.skipMessageKeys(n.previousChainLength, t.pubkey), this.ratchetStep(n.nextPublicKey));
+    else if (!((a = this.state.skippedKeys[t.pubkey]) != null && a.messageKeys[n.number]))
+      return;
     const s = this.ratchetDecrypt(n, t.content, t.pubkey), o = JSON.parse(s);
     if (!dt(o)) {
       console.error("Invalid event received", o);
@@ -3908,7 +3912,7 @@ class st {
       console.error("Event hash does not match", o);
       return;
     }
-    this.internalSubscriptions.forEach((a) => a(o, t));
+    this.internalSubscriptions.forEach((l) => l(o, t));
   }
   subscribeToNostrEvents() {
     if (this.nostrNextUnsubscribe) return;
@@ -3920,10 +3924,10 @@ class st {
       (n) => this.handleNostrEvent(n)
     ));
     const t = Object.keys(this.state.skippedKeys);
-    t.length && this.nostrSubscribe(
+    t.length && (this.skippedSubscription = this.nostrSubscribe(
       { authors: t, kinds: [Oe] },
       (n) => this.handleNostrEvent(n)
-    );
+    ));
   }
 }
 new TextDecoder("utf-8");
@@ -3940,7 +3944,7 @@ class Me {
   static createNew(t, n, r) {
     if (!t)
       throw new Error("Inviter public key is required");
-    const i = _e(), s = le(i), o = P(_e());
+    const i = ke(), s = le(i), o = P(ke());
     return new Me(
       s,
       o,
@@ -3986,7 +3990,7 @@ class Me {
     var o, c;
     if (!t.sig)
       throw new Error("Event is not signed");
-    if (!pt(t))
+    if (!yt(t))
       throw new Error("Event signature is invalid");
     const { tags: n } = t;
     if (!n)
@@ -4075,18 +4079,18 @@ class Me {
        * so the inviter can create the session on their side.
        */
   async accept(t, n, r) {
-    const i = _e(), s = le(i), o = this.inviter || this.inviterEphemeralPublicKey, c = z(this.sharedSecret), a = st.init(t, this.inviterEphemeralPublicKey, i, !0, c, void 0), f = await (typeof r == "function" ? r : (h, d) => Promise.resolve(q.encrypt(h, Qe(r, d))))(s, o), u = {
+    const i = ke(), s = le(i), o = this.inviter || this.inviterEphemeralPublicKey, c = z(this.sharedSecret), a = st.init(t, this.inviterEphemeralPublicKey, i, !0, c, void 0), f = await (typeof r == "function" ? r : (h, d) => Promise.resolve(q.encrypt(h, Qe(r, d))))(s, o), u = {
       pubkey: n,
       content: await q.encrypt(f, c),
       created_at: Math.floor(Date.now() / 1e3)
-    }, y = _e(), b = le(y), p = {
+    }, p = ke(), b = le(p), y = {
       kind: jn,
       pubkey: b,
-      content: q.encrypt(JSON.stringify(u), Qe(y, this.inviterEphemeralPublicKey)),
+      content: q.encrypt(JSON.stringify(u), Qe(p, this.inviterEphemeralPublicKey)),
       created_at: eu(),
       tags: [["p", this.inviterEphemeralPublicKey]]
     };
-    return { session: a, event: X(p, y) };
+    return { session: a, event: Q(y, p) };
   }
   listen(t, n, r) {
     if (!this.inviterEphemeralPrivateKey)
@@ -4103,8 +4107,8 @@ class Me {
         }
         const o = await q.decrypt(s.content, Qe(this.inviterEphemeralPrivateKey, s.pubkey)), c = JSON.parse(o), a = z(this.sharedSecret), l = c.pubkey;
         this.usedBy.push(l);
-        const f = await q.decrypt(c.content, a), y = await (typeof t == "function" ? t : (h, d) => Promise.resolve(q.decrypt(h, Qe(t, d))))(f, l), b = s.id, p = st.init(n, y, this.inviterEphemeralPrivateKey, !1, a, b);
-        r(p, 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), b = s.id, y = st.init(n, p, this.inviterEphemeralPrivateKey, !1, a, b);
+        r(y, l);
       } catch (o) {
         console.error("Error processing invite message:", o, "event", s);
       }