nostr-double-ratchet 0.0.25 → 0.0.26

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

@@ -214,8 +214,8 @@ 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 g = ve[u - 15], w = ve[u - 2], y = re(g, 7) ^ re(g, 18) ^ g >>> 3, h = re(w, 17) ^ re(w, 19) ^ w >>> 10;
-      ve[u] = h + ve[u - 7] + y + ve[u - 16] | 0;
+      const g = ve[u - 15], w = ve[u - 2], p = re(g, 7) ^ re(g, 18) ^ g >>> 3, h = re(w, 17) ^ re(w, 19) ^ w >>> 10;
+      ve[u] = h + ve[u - 7] + p + 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++) {
@@ -475,8 +475,8 @@ function zi(e) {
       let w = 1;
       for (let h = c.sqr(g); w < l && !c.eql(h, c.ONE); w++)
         h = c.sqr(h);
-      const y = c.pow(f, j << BigInt(l - w - 1));
-      f = c.sqr(y), u = c.mul(u, y), g = c.mul(g, f), l = w;
+      const p = c.pow(f, j << BigInt(l - w - 1));
+      f = c.sqr(p), u = c.mul(u, p), g = c.mul(g, f), l = w;
     }
     return u;
   };
@@ -667,12 +667,12 @@ function Qi(e, t) {
       const { windows: c, windowSize: a } = r(i);
       let l = e.ZERO, f = e.BASE;
       const u = BigInt(2 ** i - 1), g = 2 ** i, w = BigInt(i);
-      for (let y = 0; y < c; y++) {
-        const h = y * a;
+      for (let p = 0; p < c; p++) {
+        const h = p * a;
         let d = Number(o & u);
         o >>= w, d > a && (d -= g, o += St);
-        const p = h, E = h + Math.abs(d) - 1, S = y % 2 !== 0, I = d < 0;
-        d === 0 ? f = f.add(n(S, s[p])) : l = l.add(n(I, s[E]));
+        const y = h, E = h + Math.abs(d) - 1, S = p % 2 !== 0, I = d < 0;
+        d === 0 ? f = f.add(n(S, s[y])) : l = l.add(n(I, s[E]));
       }
       return { p: l, f };
     },
@@ -768,65 +768,65 @@ BigInt(2);
 const kn = BigInt(3);
 BigInt(4);
 function rs(e) {
-  const t = es(e), { Fp: n } = t, r = t.toBytes || ((y, h, d) => {
-    const p = h.toAffine();
-    return _e(Uint8Array.from([4]), n.toBytes(p.x), n.toBytes(p.y));
-  }), i = t.fromBytes || ((y) => {
-    const h = y.subarray(1), d = n.fromBytes(h.subarray(0, n.BYTES)), p = n.fromBytes(h.subarray(n.BYTES, 2 * n.BYTES));
-    return { x: d, y: p };
+  const t = es(e), { Fp: n } = t, r = t.toBytes || ((p, h, d) => {
+    const y = h.toAffine();
+    return _e(Uint8Array.from([4]), n.toBytes(y.x), n.toBytes(y.y));
+  }), i = t.fromBytes || ((p) => {
+    const h = p.subarray(1), d = n.fromBytes(h.subarray(0, n.BYTES)), y = n.fromBytes(h.subarray(n.BYTES, 2 * n.BYTES));
+    return { x: d, y };
   });
-  function s(y) {
-    const { a: h, b: d } = t, p = n.sqr(y), E = n.mul(p, y);
-    return n.add(n.add(E, n.mul(y, h)), d);
+  function s(p) {
+    const { a: h, b: d } = t, y = n.sqr(p), E = n.mul(y, p);
+    return n.add(n.add(E, n.mul(p, h)), d);
   }
   if (!n.eql(n.sqr(t.Gy), s(t.Gx)))
     throw new Error("bad generator point: equation left != right");
-  function o(y) {
-    return typeof y == "bigint" && ae < y && y < t.n;
+  function o(p) {
+    return typeof p == "bigint" && ae < p && p < t.n;
   }
-  function c(y) {
-    if (!o(y))
+  function c(p) {
+    if (!o(p))
       throw new Error("Expected valid bigint: 0 < bigint < curve.n");
   }
-  function a(y) {
-    const { allowedPrivateKeyLengths: h, nByteLength: d, wrapPrivateKey: p, n: E } = t;
-    if (h && typeof y != "bigint") {
-      if (y instanceof Uint8Array && (y = De(y)), typeof y != "string" || !h.includes(y.length))
+  function a(p) {
+    const { allowedPrivateKeyLengths: h, nByteLength: d, wrapPrivateKey: y, n: E } = t;
+    if (h && typeof p != "bigint") {
+      if (p instanceof Uint8Array && (p = De(p)), typeof p != "string" || !h.includes(p.length))
         throw new Error("Invalid key");
-      y = y.padStart(d * 2, "0");
+      p = p.padStart(d * 2, "0");
     }
     let S;
     try {
-      S = typeof y == "bigint" ? y : F(Z("private key", y, d));
+      S = typeof p == "bigint" ? p : F(Z("private key", p, d));
     } catch {
-      throw new Error(`private key must be ${d} bytes, hex or bigint, not ${typeof y}`);
+      throw new Error(`private key must be ${d} bytes, hex or bigint, not ${typeof p}`);
     }
-    return p && (S = W(S, E)), c(S), S;
+    return y && (S = W(S, E)), c(S), S;
   }
   const l = /* @__PURE__ */ new Map();
-  function f(y) {
-    if (!(y instanceof u))
+  function f(p) {
+    if (!(p instanceof u))
       throw new Error("ProjectivePoint expected");
   }
   class u {
-    constructor(h, d, p) {
-      if (this.px = h, this.py = d, this.pz = p, h == null || !n.isValid(h))
+    constructor(h, d, y) {
+      if (this.px = h, this.py = d, this.pz = y, h == null || !n.isValid(h))
         throw new Error("x required");
       if (d == null || !n.isValid(d))
         throw new Error("y required");
-      if (p == null || !n.isValid(p))
+      if (y == null || !n.isValid(y))
         throw new Error("z required");
     }
     // Does not validate if the point is on-curve.
     // Use fromHex instead, or call assertValidity() later.
     static fromAffine(h) {
-      const { x: d, y: p } = h || {};
-      if (!h || !n.isValid(d) || !n.isValid(p))
+      const { x: d, y } = h || {};
+      if (!h || !n.isValid(d) || !n.isValid(y))
         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(p) ? u.ZERO : new u(d, p, n.ONE);
+      return E(d) && E(y) ? u.ZERO : new u(d, y, n.ONE);
     }
     get x() {
       return this.toAffine().x;
@@ -841,8 +841,8 @@ function rs(e) {
      * Optimization: converts a list of projective points to a list of identical points with Z=1.
      */
     static normalizeZ(h) {
-      const d = n.invertBatch(h.map((p) => p.pz));
-      return h.map((p, E) => p.toAffine(d[E])).map(u.fromAffine);
+      const d = n.invertBatch(h.map((y) => y.pz));
+      return h.map((y, E) => y.toAffine(d[E])).map(u.fromAffine);
     }
     /**
      * Converts hash string or Uint8Array to Point.
@@ -870,8 +870,8 @@ function rs(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 p = n.sqr(d), E = s(h);
-      if (!n.eql(p, E))
+      const y = n.sqr(d), E = s(h);
+      if (!n.eql(y, E))
         throw new Error("bad point: equation left != right");
       if (!this.isTorsionFree())
         throw new Error("bad point: not in prime-order subgroup");
@@ -887,7 +887,7 @@ function rs(e) {
      */
     equals(h) {
       f(h);
-      const { px: d, py: p, pz: E } = this, { px: S, py: I, pz: B } = h, m = n.eql(n.mul(d, B), n.mul(S, E)), x = n.eql(n.mul(p, B), n.mul(I, E));
+      const { px: d, py: y, pz: E } = this, { px: S, py: I, pz: B } = h, m = n.eql(n.mul(d, B), n.mul(S, E)), x = n.eql(n.mul(y, B), n.mul(I, E));
       return m && x;
     }
     /**
@@ -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, p = n.mul(d, kn), { px: E, py: S, pz: I } = this;
+      const { a: h, b: d } = t, y = 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(p, _), 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(p, 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);
+      return A = n.add(A, A), x = n.mul(E, I), x = n.add(x, x), B = n.mul(h, x), m = n.mul(y, _), 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), _ = 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.
@@ -911,13 +911,13 @@ function rs(e) {
     // Cost: 12M + 0S + 3*a + 3*b3 + 23add.
     add(h) {
       f(h);
-      const { px: d, py: p, pz: E } = this, { px: S, py: I, pz: B } = h;
+      const { px: d, py: y, pz: E } = this, { px: S, py: I, pz: B } = h;
       let m = n.ZERO, x = n.ZERO, K = n.ZERO;
       const M = t.a, _ = n.mul(t.b, kn);
-      let A = n.mul(d, S), T = n.mul(p, I), R = n.mul(E, B), H = n.add(d, p), b = n.add(S, I);
+      let A = n.mul(d, S), T = n.mul(y, I), R = n.mul(E, B), H = n.add(d, y), b = n.add(S, I);
       H = n.mul(H, b), b = n.add(A, T), H = n.sub(H, b), b = n.add(d, E);
       let v = n.add(S, B);
-      return b = n.mul(b, v), v = n.add(A, R), b = n.sub(b, v), v = n.add(p, 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, b), 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), b = n.mul(_, b), T = n.add(T, R), R = n.sub(A, R), R = n.mul(M, R), b = n.add(b, R), A = n.mul(T, b), x = n.add(x, A), A = n.mul(v, b), 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 b = n.mul(b, v), v = n.add(A, R), b = n.sub(b, v), v = n.add(y, 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, b), 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), b = n.mul(_, b), T = n.add(T, R), R = n.sub(A, R), R = n.mul(M, R), b = n.add(b, R), A = n.mul(T, b), x = n.add(x, A), A = n.mul(v, b), 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());
@@ -927,8 +927,8 @@ function rs(e) {
     }
     wNAF(h) {
       return w.wNAFCached(this, l, h, (d) => {
-        const p = n.invertBatch(d.map((E) => E.pz));
-        return d.map((E, S) => E.toAffine(p[S])).map(u.fromAffine);
+        const y = n.invertBatch(d.map((E) => E.pz));
+        return d.map((E, S) => E.toAffine(y[S])).map(u.fromAffine);
       });
     }
     /**
@@ -942,13 +942,13 @@ function rs(e) {
         return d;
       if (c(h), h === X)
         return this;
-      const { endo: p } = t;
-      if (!p)
+      const { endo: y } = t;
+      if (!y)
         return w.unsafeLadder(this, h);
-      let { k1neg: E, k1: S, k2neg: I, k2: B } = p.splitScalar(h), m = d, x = d, K = this;
+      let { k1neg: E, k1: S, k2neg: I, k2: B } = y.splitScalar(h), m = d, x = d, K = this;
       for (; S > ae || B > ae; )
         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, p.beta), x.py, x.pz), m.add(x);
+      return E && (m = m.negate()), I && (x = x.negate()), x = new u(n.mul(x.px, y.beta), x.py, x.pz), m.add(x);
     }
     /**
      * Constant time multiplication.
@@ -961,17 +961,17 @@ function rs(e) {
      */
     multiply(h) {
       c(h);
-      let d = h, p, E;
+      let d = h, y, 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: _, f: A } = this.wNAF(x);
-        K = w.constTimeNegate(I, K), _ = w.constTimeNegate(m, _), _ = new u(n.mul(_.px, S.beta), _.py, _.pz), p = K.add(_), E = M.add(A);
+        K = w.constTimeNegate(I, K), _ = w.constTimeNegate(m, _), _ = new u(n.mul(_.px, S.beta), _.py, _.pz), y = K.add(_), E = M.add(A);
       } else {
         const { p: I, f: B } = this.wNAF(d);
-        p = I, E = B;
+        y = I, E = B;
       }
-      return u.normalizeZ([p, E])[0];
+      return u.normalizeZ([y, E])[0];
     }
     /**
      * Efficiently calculate `aP + bQ`. Unsafe, can expose private key, if used incorrectly.
@@ -979,17 +979,17 @@ function rs(e) {
      * The trick could be useful if both P and Q are not G (not in our case).
      * @returns non-zero affine point
      */
-    multiplyAndAddUnsafe(h, d, p) {
-      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, p));
+    multiplyAndAddUnsafe(h, d, y) {
+      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, y));
       return I.is0() ? void 0 : I;
     }
     // 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: p, pz: E } = this, S = this.is0();
+      const { px: d, py: y, pz: E } = this, S = this.is0();
       h == null && (h = S ? n.ONE : n.inv(E));
-      const I = n.mul(d, h), B = n.mul(p, h), m = n.mul(E, h);
+      const I = n.mul(d, h), B = n.mul(y, h), m = n.mul(E, h);
       if (S)
         return { x: n.ZERO, y: n.ZERO };
       if (!n.eql(m, n.ONE))
@@ -1071,28 +1071,28 @@ function ss(e) {
         throw new Error(`Point of length ${v} was invalid. Expected ${i} compressed bytes or ${s} uncompressed bytes`);
     }
   }), w = (b) => De(Ne(b, t.nByteLength));
-  function y(b) {
+  function p(b) {
     const v = r >> X;
     return b > v;
   }
   function h(b) {
-    return y(b) ? c(-b) : b;
+    return p(b) ? c(-b) : b;
   }
   const d = (b, v, N) => F(b.slice(v, N));
-  class p {
+  class y {
     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) {
       const N = t.nByteLength;
-      return v = Z("compactSignature", v, N * 2), new p(d(v, 0, N), d(v, N, 2 * N));
+      return v = Z("compactSignature", v, N * 2), new y(d(v, 0, N), d(v, N, 2 * N));
     }
     // 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 p(N, k);
+      return new y(N, k);
     }
     assertValidity() {
       if (!g(this.r))
@@ -1101,7 +1101,7 @@ function ss(e) {
         throw new Error("s must be 0 < s < CURVE.n");
     }
     addRecoveryBit(v) {
-      return new p(this.r, this.s, v);
+      return new y(this.r, this.s, v);
     }
     recoverPublicKey(v) {
       const { r: N, s: k, recovery: C } = this, U = x(Z("msgHash", v));
@@ -1117,10 +1117,10 @@ function ss(e) {
     }
     // Signatures should be low-s, to prevent malleability.
     hasHighS() {
-      return y(this.s);
+      return p(this.s);
     }
     normalizeS() {
-      return this.hasHighS() ? new p(this.r, c(-this.s), this.recovery) : this;
+      return this.hasHighS() ? new y(this.r, c(-this.s), this.recovery) : this;
     }
     // DER-encoded
     toDERRawBytes() {
@@ -1216,7 +1216,7 @@ function ss(e) {
       if (Te === ae)
         return;
       let Kn = ($e.x === te ? 0 : 2) | Number($e.y & X), Nn = Te;
-      return U && y(Te) && (Nn = h(Te), Kn ^= 1), new p(te, Nn, Kn);
+      return U && p(Te) && (Nn = h(Te), Kn ^= 1), new y(te, Nn, Kn);
     }
     return { seed: We, k2sig: Et };
   }
@@ -1236,15 +1236,15 @@ function ss(e) {
     try {
       if (typeof C == "string" || C instanceof Uint8Array)
         try {
-          $ = p.fromDER(C);
+          $ = y.fromDER(C);
         } catch (te) {
           if (!(te instanceof Be.Err))
             throw te;
-          $ = p.fromCompact(C);
+          $ = y.fromCompact(C);
         }
       else if (typeof C == "object" && typeof C.r == "bigint" && typeof C.s == "bigint") {
         const { r: te, s: Te } = C;
-        $ = new p(te, Te);
+        $ = new y(te, Te);
       } else
         throw new Error("PARSE");
       ee = l.fromHex(N);
@@ -1266,7 +1266,7 @@ function ss(e) {
     sign: R,
     verify: H,
     ProjectivePoint: l,
-    Signature: p,
+    Signature: y,
     utils: E
   };
 }
@@ -1322,7 +1322,7 @@ function as(e, t) {
 /*! noble-curves - MIT License (c) 2022 Paul Miller (paulmillr.com) */
 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 = Y(f, n, t) * f % t, g = Y(u, n, t) * f % t, w = Y(g, nt, t) * l % t, y = Y(w, i, t) * w % t, h = Y(y, s, t) * y % t, d = Y(h, c, t) * h % t, p = Y(d, a, t) * d % t, E = Y(p, 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);
+  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, g = Y(u, n, t) * f % t, w = Y(g, nt, t) * l % t, p = Y(w, i, t) * w % t, h = Y(p, s, t) * p % 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, I = Y(S, o, t) * p % 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;
@@ -1449,13 +1449,13 @@ function z(e) {
   }
   return n;
 }
-function ps(e) {
+function ys(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 = ps(e)), !Qt(e))
+  if (typeof e == "string" && (e = ys(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 ys(e) {
+function ps(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: ys,
+  bool: ps,
   bytes: hr,
   hash: gs,
   exists: ws,
@@ -1669,8 +1669,8 @@ 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 g = Ee[u - 15], w = Ee[u - 2], y = ie(g, 7) ^ ie(g, 18) ^ g >>> 3, h = ie(w, 17) ^ ie(w, 19) ^ w >>> 10;
-      Ee[u] = h + Ee[u - 7] + y + Ee[u - 16] | 0;
+      const g = Ee[u - 15], w = Ee[u - 2], p = ie(g, 7) ^ ie(g, 18) ^ g >>> 3, h = ie(w, 17) ^ ie(w, 19) ^ w >>> 10;
+      Ee[u] = h + Ee[u - 7] + p + 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++) {
@@ -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 {
@@ -1776,7 +1776,7 @@ function ft(e, t = "=") {
     }
   };
 }
-function pr(e) {
+function yr(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 yr = (e, t) => t ? yr(t, e % t) : e, it = (e, t) => e + (t - yr(e, t));
+const pr = (e, t) => t ? pr(t, e % t) : e, it = (e, t) => e + (t - pr(e, t));
 function Ht(e, t, n, r) {
   if (!Array.isArray(e))
     throw new Error("convertRadix2: data should be array");
@@ -1883,10 +1883,10 @@ function Ln(e) {
     }
   };
 }
-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");
+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");
 en("123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ");
 en("rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz");
 const $n = [0, 2, 3, 5, 6, 7, 9, 10, 11], ks = {
@@ -1909,7 +1909,7 @@ const $n = [0, 2, 3, 5, 6, 7, 9, 10, 11], ks = {
     }
     return Uint8Array.from(t);
   }
-}, Dt = de(pe("qpzry9x8gf2tvdw0s3jn54khce6mua7l"), ye("")), Tn = [996825010, 642813549, 513874426, 1027748829, 705979059];
+}, Dt = de(ye("qpzry9x8gf2tvdw0s3jn54khce6mua7l"), pe("")), Tn = [996825010, 642813549, 513874426, 1027748829, 705979059];
 function Ge(e) {
   const t = e >> 25;
   let n = (e & 33554431) << 5;
@@ -1959,13 +1959,13 @@ function gr(e) {
     const w = f.lastIndexOf("1");
     if (w === 0 || w === -1)
       throw new Error('Letter "1" must be present between prefix and data only');
-    const y = f.slice(0, w), h = f.slice(w + 1);
+    const p = f.slice(0, w), h = f.slice(w + 1);
     if (h.length < 6)
       throw new Error("Data must be at least 6 characters long");
-    const d = Dt.decode(h).slice(0, -6), p = Rn(y, d, t);
-    if (!h.endsWith(p))
-      throw new Error(`Invalid checksum in ${f}: expected "${p}"`);
-    return { prefix: y, words: d };
+    const d = Dt.decode(h).slice(0, -6), y = Rn(p, d, t);
+    if (!h.endsWith(y))
+      throw new Error(`Invalid checksum in ${f}: expected "${y}"`);
+    return { prefix: p, words: d };
   }
   const a = Ln(c);
   function l(f) {
@@ -1979,7 +1979,7 @@ gr("bech32m");
 const _s = {
   encode: (e) => new TextDecoder().decode(e),
   decode: (e) => new TextEncoder().encode(e)
-}, Is = de(Se(4), pe("0123456789abcdef"), ye(""), pr((e) => {
+}, Is = de(Se(4), ye("0123456789abcdef"), pe(""), yr((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();
@@ -2103,9 +2103,9 @@ 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 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), p = e[a++] ^ xe(o, c, r, i, t, n), E = e[a++] ^ xe(o, c, i, t, n, r);
-    t = h, n = d, r = p, i = E;
+  for (let p = 0; p < l; p++) {
+    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 f = e[a++] ^ oe(s, t, n, r, i), u = e[a++] ^ oe(s, n, r, i, t), g = e[a++] ^ oe(s, r, i, t, n), w = e[a++] ^ oe(s, i, t, n, r);
   return { s0: f, s1: u, s2: g, s3: w };
@@ -2115,9 +2115,9 @@ function js(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 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), p = e[a++] ^ xe(o, c, r, n, t, i), E = e[a++] ^ xe(o, c, i, r, n, t);
-    t = h, n = d, r = p, i = E;
+  for (let p = 0; p < l; p++) {
+    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 f = e[a++] ^ oe(s, t, i, r, n), u = e[a++] ^ oe(s, n, t, i, r), g = e[a++] ^ oe(s, r, n, t, i), w = e[a++] ^ oe(s, i, r, n, t);
   return { s0: f, s1: u, s2: g, s3: w };
@@ -2175,24 +2175,24 @@ 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 g = u[0], w = u[1], y = u[2], h = u[3], d = 0;
+      let g = u[0], w = u[1], p = u[2], h = u[3], d = 0;
       for (; d + 4 <= a.length; )
-        g ^= a[d + 0], w ^= a[d + 1], y ^= a[d + 2], h ^= a[d + 3], { s0: g, s1: w, s2: y, s3: h } = Pn(c, g, w, y, h), l[d++] = g, l[d++] = w, l[d++] = y, l[d++] = h;
+        g ^= a[d + 0], w ^= a[d + 1], p ^= a[d + 2], h ^= a[d + 3], { s0: g, s1: w, s2: p, s3: h } = Pn(c, g, w, p, h), l[d++] = g, l[d++] = w, l[d++] = p, l[d++] = h;
       if (i) {
-        const p = Zs(s.subarray(d * 4));
-        g ^= p[0], w ^= p[1], y ^= p[2], h ^= p[3], { s0: g, s1: w, s2: y, s3: h } = Pn(c, g, w, y, h), l[d++] = g, l[d++] = w, l[d++] = y, l[d++] = h;
+        const y = Zs(s.subarray(d * 4));
+        g ^= y[0], w ^= y[1], p ^= y[2], h ^= y[3], { s0: g, s1: w, s2: p, s3: h } = Pn(c, g, w, p, h), l[d++] = g, l[d++] = w, l[d++] = p, 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 g = a[0], w = a[1], y = a[2], h = a[3];
+      let g = a[0], w = a[1], p = a[2], h = a[3];
       for (let d = 0; d + 4 <= f.length; ) {
-        const p = g, E = w, S = y, I = h;
-        g = f[d + 0], w = f[d + 1], y = f[d + 2], h = f[d + 3];
-        const { s0: B, s1: m, s2: x, s3: K } = js(c, g, w, y, h);
-        u[d++] = B ^ p, u[d++] = m ^ E, u[d++] = x ^ S, u[d++] = K ^ I;
+        const y = g, E = w, S = p, I = h;
+        g = f[d + 0], w = f[d + 1], p = f[d + 2], h = f[d + 3];
+        const { s0: B, s1: m, s2: x, s3: K } = js(c, g, w, p, h);
+        u[d++] = B ^ y, u[d++] = m ^ E, u[d++] = x ^ S, u[d++] = K ^ I;
       }
       return c.fill(0), Ws(l, i);
     }
@@ -2208,22 +2208,22 @@ 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), g = u ? G(i) : Mn, w = u ? G(s) : Mn;
-  for (let y = 0; y < a; o++) {
+  for (let p = 0; p < a; o++) {
     if (e(t, n, r, f, o, c), o >= Nr)
       throw new Error("arx: counter overflow");
-    const h = Math.min(Xe, a - y);
+    const h = Math.min(Xe, a - p);
     if (u && h === Xe) {
-      const d = y / 4;
-      if (y % 4 !== 0)
+      const d = p / 4;
+      if (p % 4 !== 0)
         throw new Error("arx: invalid block position");
-      for (let p = 0, E; p < Ys; p++)
-        E = d + p, w[E] = g[E] ^ f[p];
-      y += Xe;
+      for (let y = 0, E; y < Ys; y++)
+        E = d + y, w[E] = g[E] ^ f[y];
+      p += Xe;
       continue;
     }
-    for (let d = 0, p; d < h; d++)
-      p = y + d, s[p] = i[p] ^ l[d];
-    y += h;
+    for (let d = 0, y; d < h; d++)
+      y = p + d, s[y] = i[y] ^ l[d];
+    p += h;
   }
 }
 function Qs(e, t) {
@@ -2238,19 +2238,19 @@ function Qs(e, t) {
     if (f.length < g)
       throw new Error(`arx: output (${f.length}) is shorter than data (${g})`);
     const w = [];
-    let y = c.length, h, d;
-    if (y === 32)
+    let p = c.length, h, d;
+    if (p === 32)
       h = c.slice(), w.push(h), d = Kr;
-    else if (y === 16 && n)
+    else if (p === 16 && n)
       h = new Uint8Array(32), h.set(c), h.set(c, 16), d = Js, w.push(h);
     else
-      throw new Error(`arx: invalid 32-byte key, got length=${y}`);
+      throw new Error(`arx: invalid 32-byte key, got length=${p}`);
     zt(a) || (a = a.slice(), w.push(a));
-    const p = G(h);
+    const y = G(h);
     if (r) {
       if (a.length !== 24)
         throw new Error("arx: extended nonce must be 24 bytes");
-      r(d, p, G(a.subarray(0, 16)), p), a = a.subarray(16);
+      r(d, y, G(a.subarray(0, 16)), y), a = a.subarray(16);
     }
     const E = 16 - i;
     if (E !== a.length)
@@ -2260,17 +2260,17 @@ function Qs(e, t) {
       I.set(a, s ? 0 : 12 - a.length), a = I, w.push(a);
     }
     const S = G(a);
-    for (Xs(e, d, p, S, l, f, u, o); w.length > 0; )
+    for (Xs(e, d, y, S, l, f, u, o); w.length > 0; )
       w.pop().fill(0);
     return f;
   };
 }
 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], g = t[2], w = t[3], y = t[4], h = t[5], d = t[6], p = 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 = g, R = w, H = y, b = h, v = d, N = p, k = E, C = S, U = I, O = B;
+  let o = e[0], c = e[1], a = e[2], l = e[3], f = t[0], u = t[1], g = t[2], w = t[3], p = t[4], h = t[5], d = t[6], y = 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 = g, R = w, H = p, b = h, v = d, N = y, 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), 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 + 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), b = b + U | 0, _ = L(_ ^ b, 12), M = M + _ | 0, U = L(U ^ M, 8), b = b + U | 0, _ = L(_ ^ b, 7);
   let $ = 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[$++] = g + T | 0, r[$++] = w + R | 0, r[$++] = y + H | 0, r[$++] = h + b | 0, r[$++] = d + v | 0, r[$++] = p + N | 0, r[$++] = E + k | 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[$++] = g + T | 0, r[$++] = w + R | 0, r[$++] = p + H | 0, r[$++] = h + b | 0, r[$++] = d + v | 0, r[$++] = y + 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,
@@ -2441,7 +2441,7 @@ function qe(e) {
   let t = fe(ne.encode(uo(e)));
   return P(t);
 }
-var pt = new co(), ke = pt.generateSecretKey, le = pt.getPublicKey, Q = pt.finalizeEvent, yt = pt.verifyEvent, lo = {};
+var yt = new co(), ke = yt.generateSecretKey, le = yt.getPublicKey, Q = yt.finalizeEvent, pt = yt.verifyEvent, lo = {};
 D(lo, {
   Application: () => da,
   BadgeAward: () => mo,
@@ -2490,9 +2490,9 @@ D(lo, {
   Label: () => ko,
   LightningPubRPC: () => Yo,
   LiveChatMessage: () => So,
-  LiveEvent: () => pa,
+  LiveEvent: () => ya,
   LongFormArticle: () => la,
-  Metadata: () => po,
+  Metadata: () => yo,
   Mutelist: () => Po,
   NWCWalletInfo: () => Jo,
   NWCWalletRequest: () => qr,
@@ -2513,10 +2513,10 @@ D(lo, {
   Repost: () => on,
   Seal: () => Lr,
   SearchRelaysList: () => Vo,
-  ShortTextNote: () => yo,
+  ShortTextNote: () => po,
   Time: () => va,
   UserEmojiList: () => Zo,
-  UserStatuses: () => ya,
+  UserStatuses: () => pa,
   Zap: () => Ro,
   ZapGoal: () => $o,
   ZapRequest: () => To,
@@ -2546,7 +2546,7 @@ function ho(e, t) {
   const n = t instanceof Array ? t : [t];
   return dt(e) && n.includes(e.kind) || !1;
 }
-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 = {};
+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, 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, ya = 30311, pa = 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,
@@ -3000,7 +3000,7 @@ function sc(e, { skipVerification: t } = {}) {
   } catch {
     return;
   }
-  if (r.id === n.id && !(!t && !yt(r)))
+  if (r.id === n.id && !(!t && !pt(r)))
     return r;
 }
 var oc = {};
@@ -3059,7 +3059,7 @@ var hc = {};
 D(hc, {
   matchAll: () => dc,
   regex: () => dn,
-  replaceAll: () => pc
+  replaceAll: () => yc
 });
 var dn = () => new RegExp(`\\b${mt.source}\\b`, "g");
 function* dc(e) {
@@ -3077,15 +3077,15 @@ function* dc(e) {
     } catch {
     }
 }
-function pc(e, t) {
+function yc(e, t) {
   return e.replaceAll(dn(), (n, r) => t({
     uri: n,
     value: r,
     decoded: gt(r)
   }));
 }
-var yc = {};
-D(yc, {
+var pc = {};
+D(pc, {
   channelCreateEvent: () => gc,
   channelHideMessageEvent: () => vc,
   channelMessageEvent: () => bc,
@@ -3175,12 +3175,12 @@ var gc = (e, t) => {
 D(Ec, {
   EMOJI_SHORTCODE_REGEX: () => Yr,
   matchAll: () => xc,
-  regex: () => pn,
+  regex: () => yn,
   replaceAll: () => Kc
 });
-var Yr = /:(\w+):/, pn = () => new RegExp(`\\B${Yr.source}\\B`, "g");
+var Yr = /:(\w+):/, yn = () => new RegExp(`\\B${Yr.source}\\B`, "g");
 function* xc(e) {
-  const t = e.matchAll(pn());
+  const t = e.matchAll(yn());
   for (const n of t)
     try {
       const [r, i] = n;
@@ -3194,7 +3194,7 @@ function* xc(e) {
     }
 }
 function Kc(e, t) {
-  return e.replaceAll(pn(), (n, r) => t({
+  return e.replaceAll(yn(), (n, r) => t({
     shortcode: n,
     name: r
   }));
@@ -3204,17 +3204,17 @@ D(Nc, {
   useFetchImplementation: () => Sc,
   validateGithub: () => Ac
 });
-var yn;
+var pn;
 try {
-  yn = fetch;
+  pn = fetch;
 } catch {
 }
 function Sc(e) {
-  yn = e;
+  pn = e;
 }
 async function Ac(e, t, n) {
   try {
-    return await (await yn(`https://gist.github.com/${t}/${n}/raw`)).text() === `Verifying that I control the following Nostr public key: ${e}`;
+    return await (await pn(`https://gist.github.com/${t}/${n}/raw`)).text() === `Verifying that I control the following Nostr public key: ${e}`;
   } catch {
     return !1;
   }
@@ -3404,7 +3404,7 @@ function Mc(e) {
   }
   if (!dt(t))
     return "Zap request is not a valid Nostr event.";
-  if (!yt(t))
+  if (!pt(t))
     return "Invalid signature on zap request.";
   let n = t.tags.find(([s, o]) => s === "p" && o);
   if (!n)
@@ -3501,10 +3501,10 @@ D(Vc, {
   unpackEventFromToken: () => fi,
   validateEvent: () => wi,
   validateEventKind: () => di,
-  validateEventMethodTag: () => yi,
+  validateEventMethodTag: () => pi,
   validateEventPayloadTag: () => gi,
   validateEventTimestamp: () => hi,
-  validateEventUrlTag: () => pi,
+  validateEventUrlTag: () => yi,
   validateToken: () => Zc
 });
 var li = "Nostr ";
@@ -3545,11 +3545,11 @@ function hi(e) {
 function di(e) {
   return e.kind === cn;
 }
-function pi(e, t) {
+function yi(e, t) {
   const n = e.tags.find((r) => r[0] === "u");
   return n ? n.length > 0 && n[1] === t : !1;
 }
-function yi(e, t) {
+function pi(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 (!yt(e))
+  if (!pt(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 (!pi(e, t))
+  if (!yi(e, t))
     throw new Error("Invalid nostr event, url tag invalid");
-  if (!yi(e, n))
+  if (!pi(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");
@@ -3730,16 +3730,25 @@ class st {
    * @returns A new Session instance
    */
   static init(t, n, r, i, s, o) {
-    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 c = ke();
+    let a, l, f, u;
+    i ? ([a, l] = Pe(s, q.getConversationKey(c, n), 2), f = {
+      publicKey: le(r),
+      privateKey: r
+    }, u = {
+      publicKey: le(c),
+      privateKey: c
+    }) : (a = s, l = void 0, f = void 0, u = {
+      publicKey: le(r),
+      privateKey: r
+    });
     const g = {
-      rootKey: i ? a : s,
+      rootKey: a,
       theirNextNostrPublicKey: n,
       ourCurrentNostrKey: f,
       ourNextNostrKey: u,
       receivingChainKey: void 0,
-      sendingChainKey: i ? l : void 0,
+      sendingChainKey: l,
       sendingChainMessageNumber: 0,
       receivingChainMessageNumber: 0,
       previousSendingChainMessageCount: 0,
@@ -3845,22 +3854,24 @@ class st {
   }
   // 3. MESSAGE KEY FUNCTIONS
   skipMessageKeys(t, n) {
-    if (this.state.receivingChainMessageNumber + Jc < t)
-      throw new Error("Too many skipped messages");
-    if (!this.state.skippedKeys[n]) {
-      if (this.state.skippedKeys[n] = {
-        headerKeys: [],
-        messageKeys: {}
-      }, this.state.ourCurrentNostrKey) {
-        const i = q.getConversationKey(this.state.ourCurrentNostrKey.privateKey, n);
-        this.state.skippedKeys[n].headerKeys.push(i);
+    if (!(t <= this.state.receivingChainMessageNumber)) {
+      if (t > this.state.receivingChainMessageNumber + Jc)
+        throw new Error("Too many skipped messages");
+      if (!this.state.skippedKeys[n]) {
+        if (this.state.skippedKeys[n] = {
+          headerKeys: [],
+          messageKeys: {}
+        }, this.state.ourCurrentNostrKey) {
+          const i = q.getConversationKey(this.state.ourCurrentNostrKey.privateKey, n);
+          this.state.skippedKeys[n].headerKeys.push(i);
+        }
+        const r = q.getConversationKey(this.state.ourNextNostrKey.privateKey, n);
+        this.state.skippedKeys[n].headerKeys.push(r);
+      }
+      for (; this.state.receivingChainMessageNumber < t; ) {
+        const [r, i] = Pe(this.state.receivingChainKey, new Uint8Array([1]), 2);
+        this.state.receivingChainKey = r, this.state.skippedKeys[n].messageKeys[this.state.receivingChainMessageNumber] = i, this.state.receivingChainMessageNumber++;
       }
-      const r = q.getConversationKey(this.state.ourNextNostrKey.privateKey, n);
-      this.state.skippedKeys[n].headerKeys.push(r);
-    }
-    for (; this.state.receivingChainMessageNumber < t; ) {
-      const [r, i] = Pe(this.state.receivingChainKey, new Uint8Array([1]), 2);
-      this.state.receivingChainKey = r, this.state.skippedKeys[n].messageKeys[this.state.receivingChainMessageNumber] = i, this.state.receivingChainMessageNumber++;
     }
   }
   trySkippedMessageKeys(t, n, r) {
@@ -3990,7 +4001,7 @@ class Me {
     var o, c;
     if (!t.sig)
       throw new Error("Event is not signed");
-    if (!yt(t))
+    if (!pt(t))
       throw new Error("Event signature is invalid");
     const { tags: n } = t;
     if (!n)
@@ -4079,13 +4090,13 @@ class Me {
        * so the inviter can create the session on their side.
        */
   async accept(t, n, r) {
-    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 : (d, p) => Promise.resolve(q.encrypt(d, Qe(r, p))))(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 : (d, y) => Promise.resolve(q.encrypt(d, Qe(r, y))))(s, o), u = {
       pubkey: n,
       content: await q.encrypt(f, c),
       created_at: Math.floor(Date.now() / 1e3)
-    }, g = JSON.stringify(u), w = ke(), y = le(w), h = {
+    }, g = JSON.stringify(u), w = ke(), p = le(w), h = {
       kind: jn,
-      pubkey: y,
+      pubkey: p,
       content: q.encrypt(g, Qe(w, this.inviterEphemeralPublicKey)),
       created_at: eu(),
       tags: [["p", this.inviterEphemeralPublicKey]]
@@ -4107,8 +4118,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), g = await (typeof t == "function" ? t : (h, d) => Promise.resolve(q.decrypt(h, Qe(t, d))))(f, l), w = s.id, y = st.init(n, g, this.inviterEphemeralPrivateKey, !1, a, w);
-        r(y, l);
+        const f = await q.decrypt(c.content, a), g = await (typeof t == "function" ? t : (h, d) => Promise.resolve(q.decrypt(h, Qe(t, d))))(f, l), w = s.id, p = st.init(n, g, this.inviterEphemeralPrivateKey, !1, a, w);
+        r(p, l);
       } catch (o) {
         console.error("Error processing invite message:", o, "event", s);
       }