nostr-double-ratchet 0.0.22 → 0.0.23

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

@@ -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, Ii = /* @__PURE__ */ new Uint32Array([
+const Bi = (e, t, n) => e & t ^ ~e & n, _i = (e, t, n) => e & t ^ e & n ^ t & n, ki = /* @__PURE__ */ new Uint32Array([
   1116352408,
   1899447441,
   3049323471,
@@ -198,7 +198,7 @@ const Bi = (e, t, n) => e & t ^ ~e & n, _i = (e, t, n) => e & t ^ e & n ^ t & n,
   528734635,
   1541459225
 ]), ve = /* @__PURE__ */ new Uint32Array(64);
-let ki = class extends Ci {
+let Ii = class extends Ci {
   constructor() {
     super(64, 32, 8, !1), this.A = be[0] | 0, this.B = be[1] | 0, this.C = be[2] | 0, this.D = be[3] | 0, this.E = be[4] | 0, this.F = be[5] | 0, this.G = be[6] | 0, this.H = be[7] | 0;
   }
@@ -219,7 +219,7 @@ let ki = class extends Ci {
     }
     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) + Ii[u] + ve[u] | 0, h = (re(r, 2) ^ re(r, 13) ^ re(r, 22)) + _i(r, i, s) | 0;
+      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;
       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);
@@ -231,10 +231,10 @@ let ki = class extends Ci {
     this.set(0, 0, 0, 0, 0, 0, 0, 0), this.buffer.fill(0);
   }
 };
-const Lt = /* @__PURE__ */ Si(() => new ki());
+const Lt = /* @__PURE__ */ Si(() => new Ii());
 /*! noble-curves - MIT License (c) 2022 Paul Miller (paulmillr.com) */
 const Gn = BigInt(0), ot = BigInt(1), Ui = BigInt(2), at = (e) => e instanceof Uint8Array, Li = /* @__PURE__ */ Array.from({ length: 256 }, (e, t) => t.toString(16).padStart(2, "0"));
-function qe(e) {
+function De(e) {
   if (!at(e))
     throw new Error("Uint8Array expected");
   let t = "";
@@ -251,7 +251,7 @@ function Zt(e) {
     throw new Error("hex string expected, got " + typeof e);
   return BigInt(e === "" ? "0" : `0x${e}`);
 }
-function De(e) {
+function je(e) {
   if (typeof e != "string")
     throw new Error("hex string expected, got " + typeof e);
   const t = e.length;
@@ -267,27 +267,27 @@ function De(e) {
   return n;
 }
 function F(e) {
-  return Zt(qe(e));
+  return Zt(De(e));
 }
 function Gt(e) {
   if (!at(e))
     throw new Error("Uint8Array expected");
-  return Zt(qe(Uint8Array.from(e).reverse()));
+  return Zt(De(Uint8Array.from(e).reverse()));
 }
 function Ne(e, t) {
-  return De(e.toString(16).padStart(t * 2, "0"));
+  return je(e.toString(16).padStart(t * 2, "0"));
 }
 function Ft(e, t) {
   return Ne(e, t).reverse();
 }
 function $i(e) {
-  return De(Fn(e));
+  return je(Fn(e));
 }
 function Z(e, t, n) {
   let r;
   if (typeof t == "string")
     try {
-      r = De(t);
+      r = je(t);
     } catch (s) {
       throw new Error(`${e} must be valid hex string, got "${t}". Cause: ${s}`);
     }
@@ -300,7 +300,7 @@ function Z(e, t, n) {
     throw new Error(`${e} expected ${n} bytes, got ${i}`);
   return r;
 }
-function Ie(...e) {
+function ke(...e) {
   const t = new Uint8Array(e.reduce((r, i) => r + i.length, 0));
   let n = 0;
   return e.forEach((r) => {
@@ -354,7 +354,7 @@ function Jn(e, t, n) {
       const b = r.slice();
       y.push(b), u += r.length;
     }
-    return Ie(...y);
+    return ke(...y);
   };
   return (u, y) => {
     o(), a(u);
@@ -396,14 +396,14 @@ const qi = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   bitLen: Oi,
   bitMask: Jt,
   bitSet: Mi,
-  bytesToHex: qe,
+  bytesToHex: De,
   bytesToNumberBE: F,
   bytesToNumberLE: Gt,
-  concatBytes: Ie,
+  concatBytes: ke,
   createHmacDrbg: Jn,
   ensureBytes: Z,
   equalBytes: Ti,
-  hexToBytes: De,
+  hexToBytes: je,
   hexToNumber: Zt,
   numberToBytesBE: Ne,
   numberToBytesLE: Ft,
@@ -671,8 +671,8 @@ function Qi(e, t) {
         const h = p * 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, k = d < 0;
-        d === 0 ? f = f.add(n(S, s[g])) : l = l.add(n(k, s[E]));
+        const g = h, E = h + Math.abs(d) - 1, S = p % 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 };
     },
@@ -770,7 +770,7 @@ BigInt(4);
 function rs(e) {
   const t = es(e), { Fp: n } = t, r = t.toBytes || ((p, h, d) => {
     const g = h.toAffine();
-    return Ie(Uint8Array.from([4]), n.toBytes(g.x), n.toBytes(g.y));
+    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 { x: d, y: g };
@@ -791,7 +791,7 @@ function rs(e) {
   function a(p) {
     const { allowedPrivateKeyLengths: h, nByteLength: d, wrapPrivateKey: g, n: E } = t;
     if (h && typeof p != "bigint") {
-      if (p instanceof Uint8Array && (p = qe(p)), typeof p != "string" || !h.includes(p.length))
+      if (p instanceof Uint8Array && (p = De(p)), typeof p != "string" || !h.includes(p.length))
         throw new Error("Invalid key");
       p = p.padStart(d * 2, "0");
     }
@@ -887,7 +887,7 @@ function rs(e) {
      */
     equals(h) {
       f(h);
-      const { px: d, py: g, pz: E } = this, { px: S, py: k, pz: B } = h, m = n.eql(n.mul(d, B), n.mul(S, E)), x = n.eql(n.mul(g, B), n.mul(k, E));
+      const { px: d, py: g, 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(g, 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, g = n.mul(d, _n), { px: E, py: S, pz: k } = this;
-      let B = n.ZERO, m = n.ZERO, x = n.ZERO, K = n.mul(E, E), M = n.mul(S, S), I = n.mul(k, k), A = n.mul(E, S);
-      return A = n.add(A, A), x = n.mul(E, k), x = n.add(x, x), B = n.mul(h, x), m = n.mul(g, I), m = n.add(B, m), B = n.sub(M, m), m = n.add(M, m), m = n.mul(B, m), B = n.mul(A, B), x = n.mul(g, x), I = n.mul(h, I), A = n.sub(K, I), A = n.mul(h, A), A = n.add(A, x), x = n.add(K, K), K = n.add(x, K), K = n.add(K, I), K = n.mul(K, A), m = n.add(m, K), I = n.mul(S, k), I = n.add(I, I), K = n.mul(I, A), B = n.sub(B, K), x = n.mul(I, M), x = n.add(x, x), x = n.add(x, x), new u(B, m, x);
+      const { a: h, b: d } = t, 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);
     }
     // 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: g, pz: E } = this, { px: S, py: k, pz: B } = 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, I = n.mul(t.b, _n);
-      let A = n.mul(d, S), T = n.mul(g, k), R = n.mul(E, B), H = n.add(d, g), w = n.add(S, k);
+      const M = t.a, k = n.mul(t.b, _n);
+      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(k, B), v = n.mul(v, m), m = n.add(T, R), v = n.sub(v, m), K = n.mul(M, w), m = n.mul(I, 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(I, 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(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);
     }
     subtract(h) {
       return this.add(h.negate());
@@ -945,10 +945,10 @@ function rs(e) {
       const { endo: g } = t;
       if (!g)
         return b.unsafeLadder(this, h);
-      let { k1neg: E, k1: S, k2neg: k, k2: B } = g.splitScalar(h), m = d, x = d, K = this;
+      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;
-      return E && (m = m.negate()), k && (x = x.negate()), x = new u(n.mul(x.px, g.beta), x.py, x.pz), m.add(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);
     }
     /**
      * Constant time multiplication.
@@ -964,12 +964,12 @@ function rs(e) {
       let d = h, g, E;
       const { endo: S } = t;
       if (S) {
-        const { k1neg: k, k1: B, k2neg: m, k2: x } = S.splitScalar(d);
-        let { p: K, f: M } = this.wNAF(B), { p: I, f: A } = this.wNAF(x);
-        K = b.constTimeNegate(k, K), I = b.constTimeNegate(m, I), I = new u(n.mul(I.px, S.beta), I.py, I.pz), g = K.add(I), E = M.add(A);
+        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);
       } else {
-        const { p: k, f: B } = this.wNAF(d);
-        g = k, E = B;
+        const { p: I, f: B } = this.wNAF(d);
+        g = I, E = B;
       }
       return u.normalizeZ([g, E])[0];
     }
@@ -980,8 +980,8 @@ 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), k = S(this, d).add(S(h, g));
-      return k.is0() ? void 0 : k;
+      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));
+      return I.is0() ? void 0 : I;
     }
     // Converts Projective point to affine (x, y) coordinates.
     // Can accept precomputed Z^-1 - for example, from invertBatch.
@@ -989,12 +989,12 @@ function rs(e) {
     toAffine(h) {
       const { px: d, py: g, pz: E } = this, S = this.is0();
       h == null && (h = S ? n.ONE : n.inv(E));
-      const k = n.mul(d, h), B = n.mul(g, h), m = n.mul(E, h);
+      const I = n.mul(d, h), B = n.mul(g, h), m = n.mul(E, h);
       if (S)
         return { x: n.ZERO, y: n.ZERO };
       if (!n.eql(m, n.ONE))
         throw new Error("invZ was invalid");
-      return { x: k, y: B };
+      return { x: I, y: B };
     }
     isTorsionFree() {
       const { h, isTorsionFree: d } = t;
@@ -1012,7 +1012,7 @@ function rs(e) {
       return this.assertValidity(), r(u, this, h);
     }
     toHex(h = !0) {
-      return qe(this.toRawBytes(h));
+      return De(this.toRawBytes(h));
     }
   }
   u.BASE = new u(t.Gx, t.Gy, n.ONE), u.ZERO = new u(n.ZERO, n.ONE, n.ZERO);
@@ -1051,7 +1051,7 @@ function ss(e) {
   const { ProjectivePoint: l, normPrivateKeyToScalar: f, weierstrassEquation: u, isWithinCurveOrder: y } = rs({
     ...t,
     toBytes(w, v, N) {
-      const _ = v.toAffine(), C = n.toBytes(_.x), U = Ie;
+      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));
     },
     fromBytes(w) {
@@ -1070,7 +1070,7 @@ function ss(e) {
       } else
         throw new Error(`Point of length ${v} was invalid. Expected ${i} compressed bytes or ${s} uncompressed bytes`);
     }
-  }), b = (w) => qe(Ne(w, t.nByteLength));
+  }), b = (w) => De(Ne(w, t.nByteLength));
   function p(w) {
     const v = r >> Y;
     return w > v;
@@ -1110,7 +1110,7 @@ function ss(e) {
       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), Ve = c(_ * ge), we = l.BASE.multiplyAndAddUnsafe(Q, Ue, Ve);
+      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);
       if (!we)
         throw new Error("point at infinify");
       return we.assertValidity(), we;
@@ -1124,14 +1124,14 @@ function ss(e) {
     }
     // DER-encoded
     toDERRawBytes() {
-      return De(this.toDERHex());
+      return je(this.toDERHex());
     }
     toDERHex() {
       return Be.hexFromSig({ r: this.r, s: this.s });
     }
     // padded bytes of r, then padded bytes of s
     toCompactRawBytes() {
-      return De(this.toCompactHex());
+      return je(this.toCompactHex());
     }
     toCompactHex() {
       return b(this.r) + b(this.s);
@@ -1169,14 +1169,14 @@ function ss(e) {
   function S(w, v = !0) {
     return l.fromPrivateKey(w).toRawBytes(v);
   }
-  function k(w) {
+  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;
   }
   function B(w, v, N = !0) {
-    if (k(w))
+    if (I(w))
       throw new Error("first arg must be private key");
-    if (!k(v))
+    if (!I(v))
       throw new Error("second arg must be public key");
     return l.fromHex(v).multiply(f(w)).toRawBytes(N);
   }
@@ -1193,7 +1193,7 @@ function ss(e) {
       throw new Error(`bigint expected < 2^${t.nBitLength}`);
     return Ne(w, t.nByteLength);
   }
-  function I(w, v, N = A) {
+  function k(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;
@@ -1204,7 +1204,7 @@ function ss(e) {
       const Ae = $ === !0 ? C(n.BYTES) : $;
       Ue.push(Z("extraEntropy", Ae));
     }
-    const Ve = Ie(...Ue), we = Q;
+    const We = ke(...Ue), we = Q;
     function Et(Ae) {
       const Le = m(Ae);
       if (!y(Le))
@@ -1218,11 +1218,11 @@ function ss(e) {
       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);
     }
-    return { seed: Ve, k2sig: Et };
+    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 } = I(w, v, N), U = t;
+    const { seed: _, k2sig: C } = k(w, v, N), U = t;
     return Jn(U.hash.outputLen, U.nByteLength, U.hmac)(_, C);
   }
   l.BASE._setWindowSize(8);
@@ -1256,7 +1256,7 @@ function ss(e) {
     if (U && $.hasHighS())
       return !1;
     O && (v = t.hash(v));
-    const { r: ge, s: Ue } = $, Ve = x(v), we = a(Ue), Et = c(Ve * we), Ae = c(ge * we), Le = ($e = l.BASE.multiplyAndAddUnsafe(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(Q, Et, Ae)) == null ? void 0 : $e.toAffine();
     return Le ? c(Le.x) === ge : !1;
   }
   return {
@@ -1320,14 +1320,14 @@ 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), In = (e, t) => (e + t / nt) / t;
+const ct = BigInt("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f"), tt = BigInt("0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141"), rr = BigInt(1), nt = BigInt(2), kn = (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, k = J(S, o, t) * p % t, B = J(k, 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 = 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);
   if (!Rt.eql(Rt.sqr(m), e))
     throw new Error("Cannot find square root");
   return m;
 }
-const Rt = Ji(ct, void 0, void 0, { sqrt: ir }), ke = as({
+const Rt = Ji(ct, void 0, void 0, { sqrt: ir }), Ie = as({
   a: BigInt(0),
   b: BigInt(7),
   Fp: Rt,
@@ -1346,7 +1346,7 @@ const Rt = Ji(ct, void 0, void 0, { sqrt: ir }), ke = 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 = In(s * e, t), a = In(-r * e, t);
+      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);
       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)
@@ -1354,18 +1354,18 @@ const Rt = Ji(ct, void 0, void 0, { sqrt: ir }), ke = as({
       return { k1neg: u, k1: l, k2neg: y, k2: f };
     }
   }
-}, Lt), ut = BigInt(0), sr = (e) => typeof e == "bigint" && ut < e && e < ct, cs = (e) => typeof e == "bigint" && ut < e && e < tt, kn = {};
+}, Lt), ut = BigInt(0), sr = (e) => typeof e == "bigint" && ut < e && e < ct, cs = (e) => typeof e == "bigint" && ut < e && e < tt, In = {};
 function rt(e, ...t) {
-  let n = kn[e];
+  let n = In[e];
   if (n === void 0) {
     const r = Lt(Uint8Array.from(e, (i) => i.charCodeAt(0)));
-    n = Ie(r, r), kn[e] = n;
+    n = ke(r, r), In[e] = n;
   }
-  return Lt(Ie(n, ...t));
+  return Lt(ke(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 = ke.ProjectivePoint, us = (e, t, n) => Xt.BASE.multiplyAndAddUnsafe(e, t, n);
+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) {
-  let t = ke.utils.normPrivateKeyToScalar(e), n = Xt.fromPrivateKey(t);
+  let t = Ie.utils.normPrivateKeyToScalar(e), n = Xt.fromPrivateKey(t);
   return { scalar: n.hasEvenY() ? t : Fe(-t), bytes: Yt(n) };
 }
 function or(e) {
@@ -1407,12 +1407,12 @@ function cr(e, t, n) {
     return !1;
   }
 }
-const We = {
+const Ze = {
   getPublicKey: ls,
   sign: fs,
   verify: cr,
   utils: {
-    randomPrivateKey: ke.utils.randomPrivateKey,
+    randomPrivateKey: Ie.utils.randomPrivateKey,
     lift_x: or,
     pointToBytes: Yt,
     numberToBytesBE: Ne,
@@ -1694,7 +1694,7 @@ class Ns extends dr {
 const fe = lr(() => new dr());
 lr(() => new Ns());
 /*! scure-base - MIT License (c) 2022 Paul Miller (paulmillr.com) */
-function ze(e) {
+function Ve(e) {
   if (!Number.isSafeInteger(e))
     throw new Error(`Wrong integer: ${e}`);
 }
@@ -1708,7 +1708,7 @@ function ye(e) {
       if (!Array.isArray(t) || t.length && typeof t[0] != "number")
         throw new Error("alphabet.encode input should be an array of numbers");
       return t.map((n) => {
-        if (ze(n), n < 0 || n >= e.length)
+        if (Ve(n), n < 0 || n >= e.length)
           throw new Error(`Digit index outside alphabet: ${n} (alphabet: ${e.length})`);
         return e[n];
       });
@@ -1747,7 +1747,7 @@ function pe(e = "") {
   };
 }
 function ft(e, t = "=") {
-  if (ze(e), typeof t != "string")
+  if (Ve(e), typeof t != "string")
     throw new Error("padding chr should be string");
   return {
     encode(n) {
@@ -1793,7 +1793,7 @@ function Un(e, t, n) {
   let r = 0;
   const i = [], s = Array.from(e);
   for (s.forEach((o) => {
-    if (ze(o), o < 0 || o >= t)
+    if (Ve(o), o < 0 || o >= t)
       throw new Error(`Wrong integer: ${o}`);
   }); ; ) {
     let o = 0, c = !0;
@@ -1827,7 +1827,7 @@ function Ht(e, t, n, r) {
   let i = 0, s = 0;
   const o = 2 ** n - 1, c = [];
   for (const a of e) {
-    if (ze(a), a >= 2 ** t)
+    if (Ve(a), a >= 2 ** t)
       throw new Error(`convertRadix2: invalid data word=${a} from=${t}`);
     if (i = i << t | a, s + t > 32)
       throw new Error(`convertRadix2: carry overflow pos=${s} from=${t}`);
@@ -1842,7 +1842,7 @@ function Ht(e, t, n, r) {
   return r && s > 0 && c.push(i >>> 0), c;
 }
 function Ss(e) {
-  return ze(e), {
+  return Ve(e), {
     encode: (t) => {
       if (!(t instanceof Uint8Array))
         throw new Error("radix.encode input should be Uint8Array");
@@ -1856,7 +1856,7 @@ function Ss(e) {
   };
 }
 function Se(e, t = !1) {
-  if (ze(e), e <= 0 || e > 32)
+  if (Ve(e), e <= 0 || e > 32)
     throw new Error("radix2: bits should be in (0..32]");
   if (it(8, e) > 32 || it(e, 8) > 32)
     throw new Error("radix2: carry overflow");
@@ -1910,7 +1910,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];
-function Ze(e) {
+function Ge(e) {
   const t = e >> 25;
   let n = (e & 33554431) << 5;
   for (let r = 0; r < Tn.length; r++)
@@ -1924,15 +1924,15 @@ function Rn(e, t, n = 1) {
     const o = e.charCodeAt(s);
     if (o < 33 || o > 126)
       throw new Error(`Invalid prefix (${e})`);
-    i = Ze(i) ^ o >> 5;
+    i = Ge(i) ^ o >> 5;
   }
-  i = Ze(i);
+  i = Ge(i);
   for (let s = 0; s < r; s++)
-    i = Ze(i) ^ e.charCodeAt(s) & 31;
+    i = Ge(i) ^ e.charCodeAt(s) & 31;
   for (let s of t)
-    i = Ze(i) ^ s;
+    i = Ge(i) ^ s;
   for (let s = 0; s < 6; s++)
-    i = Ze(i);
+    i = Ge(i);
   return i ^= n, Dt.encode(Ht([i % 2 ** 30], 30, 5, !1));
 }
 function gr(e) {
@@ -1974,18 +1974,18 @@ function gr(e) {
   }
   return { encode: o, decode: c, decodeToBytes: l, decodeUnsafe: a, fromWords: r, fromWordsUnsafe: s, toWords: i };
 }
-const je = gr("bech32");
+const ze = gr("bech32");
 gr("bech32m");
-const Is = {
+const ks = {
   encode: (e) => new TextDecoder().decode(e),
   decode: (e) => new TextEncoder().encode(e)
-}, ks = de(Se(4), ye("0123456789abcdef"), pe(""), yr((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();
 })), Us = {
-  utf8: Is,
-  hex: ks,
+  utf8: ks,
+  hex: Is,
   base16: As,
   base32: Cs,
   base64: he,
@@ -2032,7 +2032,7 @@ const Os = /* @__NO_SIDE_EFFECTS__ */ (e, t) => (Object.assign(t, e), t), Ke = 1
 function tn(e) {
   return e << 1 ^ Ps & -(e >> 7);
 }
-function Me(e, t) {
+function He(e, t) {
   let n = 0;
   for (; t > 0; t >>= 1)
     n ^= e & -(t & 1), e = tn(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, It = (e) => e << 8 | e >>> 24;
+})(), Ms = /* @__PURE__ */ jt.map((e, t) => jt.indexOf(t)), Hs = (e) => e << 24 | e >>> 8, kt = (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(It), i = r.map(It), s = i.map(It), 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(kt), i = r.map(kt), s = i.map(kt), 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;
@@ -2061,7 +2061,7 @@ function wr(e, t) {
     }
   return { sbox: e, sbox2: a, T0: n, T1: r, T2: i, T3: s, T01: o, T23: c };
 }
-const nn = /* @__PURE__ */ wr(jt, (e) => Me(e, 3) << 24 | e << 16 | e << 8 | Me(e, 2)), br = /* @__PURE__ */ wr(Ms, (e) => Me(e, 11) << 24 | Me(e, 13) << 16 | Me(e, 9) << 8 | Me(e, 14)), qs = /* @__PURE__ */ (() => {
+const nn = /* @__PURE__ */ wr(jt, (e) => He(e, 3) << 24 | e << 16 | e << 8 | He(e, 2)), br = /* @__PURE__ */ wr(Ms, (e) => He(e, 11) << 24 | He(e, 13) << 16 | He(e, 9) << 8 | He(e, 14)), qs = /* @__PURE__ */ (() => {
   const e = new Uint8Array(16);
   for (let t = 0, n = 1; t < 16; t++, n = tn(n))
     e[t] = n;
@@ -2189,10 +2189,10 @@ const Er = /* @__PURE__ */ Os({ blockSize: 16, nonceLength: 16 }, function(t, n,
       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];
       for (let d = 0; d + 4 <= f.length; ) {
-        const g = y, E = b, S = p, k = h;
+        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);
-        u[d++] = B ^ g, u[d++] = m ^ E, u[d++] = x ^ S, u[d++] = K ^ k;
+        u[d++] = B ^ g, u[d++] = m ^ E, u[d++] = x ^ S, u[d++] = K ^ I;
       }
       return c.fill(0), Ws(l, i);
     }
@@ -2256,8 +2256,8 @@ function Qs(e, t) {
     if (E !== a.length)
       throw new Error(`arx: nonce must be ${E} or 16 bytes`);
     if (E !== 12) {
-      const k = new Uint8Array(12);
-      k.set(a, s ? 0 : 12 - a.length), a = k, b.push(a);
+      const I = new Uint8Array(12);
+      I.set(a, s ? 0 : 12 - a.length), a = I, b.push(a);
     }
     const S = G(a);
     for (Xs(e, d, g, S, l, f, u, o); b.length > 0; )
@@ -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], k = n[1], B = n[2], m = o, x = c, K = a, M = l, I = f, A = u, T = y, R = b, H = p, w = h, v = d, N = g, _ = E, C = S, U = k, O = B;
+  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 + I | 0, _ = L(_ ^ m, 16), H = H + _ | 0, I = L(I ^ H, 12), m = m + I | 0, _ = L(_ ^ m, 8), H = H + _ | 0, I = L(I ^ 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 + I | 0, U = L(U ^ M, 16), w = w + U | 0, I = L(I ^ w, 12), M = M + I | 0, U = L(U ^ M, 8), w = w + U | 0, I = L(I ^ w, 7);
+    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 $ = 0;
-  r[$++] = o + m | 0, r[$++] = c + x | 0, r[$++] = a + K | 0, r[$++] = l + M | 0, r[$++] = f + I | 0, r[$++] = u + A | 0, r[$++] = 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[$++] = k + U | 0, r[$++] = B + O | 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;
 }
 const Sr = /* @__PURE__ */ Qs(eo, {
   counterRight: !1,
@@ -2317,7 +2317,7 @@ ht.create = (e, t) => new Ar(e, t);
 function rn(e, t, n) {
   return se.hash(e), n === void 0 && (n = new Uint8Array(e.outputLen)), ht(e, Je(n), Je(t));
 }
-const kt = new Uint8Array([0]), Hn = new Uint8Array();
+const It = new Uint8Array([0]), Hn = new Uint8Array();
 function Cr(e, t, n, r = 32) {
   if (se.hash(e), se.number(r), r > 255 * e.outputLen)
     throw new Error("Length should be <= 255*HashLen");
@@ -2325,8 +2325,8 @@ function Cr(e, t, n, r = 32) {
   n === void 0 && (n = Hn);
   const s = new Uint8Array(i * e.outputLen), o = ht.create(e, t), c = o._cloneInto(), a = new Uint8Array(o.outputLen);
   for (let l = 0; l < i; l++)
-    kt[0] = l + 1, c.update(l === 0 ? Hn : a).update(n).update(kt).digestInto(a), s.set(a, e.outputLen * l), o._cloneInto(c);
-  return o.destroy(), c.destroy(), a.fill(0), kt.fill(0), s.slice(0, r);
+    It[0] = l + 1, c.update(l === 0 ? Hn : a).update(n).update(It).digestInto(a), s.set(a, e.outputLen * l), o._cloneInto(c);
+  return o.destroy(), c.destroy(), a.fill(0), It.fill(0), s.slice(0, r);
 }
 var to = Object.defineProperty, D = (e, t) => {
   for (var n in t)
@@ -2409,23 +2409,23 @@ var Br = class {
   }
 }, co = class {
   generateSecretKey() {
-    return We.utils.randomPrivateKey();
+    return Ze.utils.randomPrivateKey();
   }
   getPublicKey(e) {
-    return P(We.getPublicKey(e));
+    return P(Ze.getPublicKey(e));
   }
   finalizeEvent(e, t) {
     const n = e;
-    return n.pubkey = P(We.getPublicKey(t)), n.id = He(n), n.sig = P(We.sign(He(n), t)), n[Re] = !0, n;
+    return n.pubkey = P(Ze.getPublicKey(t)), n.id = qe(n), n.sig = P(Ze.sign(qe(n), t)), n[Re] = !0, n;
   }
   verifyEvent(e) {
     if (typeof e[Re] == "boolean")
       return e[Re];
-    const t = He(e);
+    const t = qe(e);
     if (t !== e.id)
       return e[Re] = !1, !1;
     try {
-      const n = We.verify(e.sig, t, e.pubkey);
+      const n = Ze.verify(e.sig, t, e.pubkey);
       return e[Re] = n, n;
     } catch {
       return e[Re] = !1, !1;
@@ -2437,7 +2437,7 @@ function uo(e) {
     throw new Error("can't serialize event with wrong or missing properties");
   return JSON.stringify([0, e.pubkey, e.created_at, e.kind, e.tags, e.content]);
 }
-function He(e) {
+function qe(e) {
   let t = fe(ne.encode(uo(e)));
   return P(t);
 }
@@ -2460,7 +2460,7 @@ D(lo, {
   ClientAuth: () => Hr,
   CommunitiesList: () => Do,
   CommunityDefinition: () => Na,
-  CommunityPostApproval: () => Io,
+  CommunityPostApproval: () => ko,
   Contacts: () => wo,
   CreateOrUpdateProduct: () => ua,
   CreateOrUpdateStall: () => ca,
@@ -2485,7 +2485,7 @@ D(lo, {
   InterestsList: () => Wo,
   Interestsets: () => aa,
   JobFeedback: () => Lo,
-  JobRequest: () => ko,
+  JobRequest: () => Io,
   JobResult: () => Uo,
   Label: () => _o,
   LightningPubRPC: () => Yo,
@@ -2521,32 +2521,32 @@ D(lo, {
   ZapGoal: () => $o,
   ZapRequest: () => To,
   classifyKind: () => fo,
-  isEphemeralKind: () => kr,
+  isEphemeralKind: () => Ir,
   isKind: () => ho,
   isParameterizedReplaceableKind: () => Ur,
   isRegularKind: () => _r,
-  isReplaceableKind: () => Ir
+  isReplaceableKind: () => kr
 });
 function _r(e) {
   return 1e3 <= e && e < 1e4 || [1, 2, 4, 5, 6, 7, 8, 16, 40, 41, 42, 43, 44].includes(e);
 }
-function Ir(e) {
+function kr(e) {
   return [0, 3].includes(e) || 1e4 <= e && e < 2e4;
 }
-function kr(e) {
+function Ir(e) {
   return 2e4 <= e && e < 3e4;
 }
 function Ur(e) {
   return 3e4 <= e && e < 4e4;
 }
 function fo(e) {
-  return _r(e) ? "regular" : Ir(e) ? "replaceable" : kr(e) ? "ephemeral" : Ur(e) ? "parameterized" : "unknown";
+  return _r(e) ? "regular" : kr(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, Io = 4550, ko = 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 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 = {};
 D(Sa, {
   getHex64: () => un,
   getInt: () => Dr,
@@ -2585,11 +2585,11 @@ function Ba(e, t) {
 function _a(e, t) {
   return t === Dr(e, "kind");
 }
-var Ia = {};
-D(Ia, {
-  makeAuthEvent: () => ka
+var ka = {};
+D(ka, {
+  makeAuthEvent: () => Ia
 });
-function ka(e, t) {
+function Ia(e, t) {
   return {
     kind: Hr,
     created_at: Math.floor(Date.now() / 1e3),
@@ -2639,7 +2639,7 @@ function Ra(e) {
 }
 function gt(e) {
   var i, s, o, c, a, l, f;
-  let { prefix: t, words: n } = je.decode(e, ln), r = new Uint8Array(je.fromWords(n));
+  let { prefix: t, words: n } = ze.decode(e, ln), r = new Uint8Array(ze.fromWords(n));
   switch (t) {
     case "nprofile": {
       let u = Ut(r);
@@ -2726,8 +2726,8 @@ function Ma(e) {
   return bt("note", z(e));
 }
 function wt(e, t) {
-  let n = je.toWords(t);
-  return je.encode(e, n, ln);
+  let n = ze.toWords(t);
+  return ze.encode(e, n, ln);
 }
 function bt(e, t) {
   return wt(e, t);
@@ -2776,13 +2776,13 @@ D(ja, {
   encrypt: () => zr
 });
 async function zr(e, t, n) {
-  const r = e instanceof Uint8Array ? P(e) : e, i = ke.getSharedSecret(r, "02" + t), s = Vr(i);
+  const r = e instanceof Uint8Array ? P(e) : e, i = Ie.getSharedSecret(r, "02" + t), s = Vr(i);
   let o = Uint8Array.from(fr(16)), c = ne.encode(n), a = Er(s, o).encrypt(c), l = he.encode(new Uint8Array(a)), f = he.encode(new Uint8Array(o.buffer));
   return `${l}?iv=${f}`;
 }
 async function za(e, t, n) {
   const r = e instanceof Uint8Array ? P(e) : e;
-  let [i, s] = n.split("?iv="), o = ke.getSharedSecret(r, "02" + t), c = Vr(o), a = he.decode(s), l = he.decode(i), f = Er(c, a).decrypt(l);
+  let [i, s] = n.split("?iv="), o = Ie.getSharedSecret(r, "02" + t), c = Vr(o), a = he.decode(s), l = he.decode(i), f = Er(c, a).decrypt(l);
   return ue.decode(f);
 }
 function Vr(e) {
@@ -3224,11 +3224,11 @@ D(q, {
   decrypt: () => vn,
   encrypt: () => bn,
   getConversationKey: () => gn,
-  v2: () => kc
+  v2: () => Ic
 });
 var Xr = 1, Qr = 65535;
 function gn(e, t) {
-  const n = ke.getSharedSecret(e, "02" + t).subarray(1, 33);
+  const n = Ie.getSharedSecret(e, "02" + t).subarray(1, 33);
   return rn(fe, n, "nip44-v2");
 }
 function ei(e, t) {
@@ -3269,7 +3269,7 @@ function ti(e, t, n) {
   const r = lt(n, t);
   return ht(fe, e, r);
 }
-function Ic(e) {
+function kc(e) {
   if (typeof e != "string")
     throw new Error("payload must be a valid string");
   const t = e.length;
@@ -3300,13 +3300,13 @@ 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 } = Ic(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 } = kc(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);
 }
-var kc = {
+var Ic = {
   utils: {
     getConversationKey: gn,
     calcPaddedLen: wn
@@ -3358,7 +3358,7 @@ async function Oc(e) {
   try {
     let t = "", { lud06: n, lud16: r } = JSON.parse(e.content);
     if (n) {
-      let { words: o } = je.decode(n, 1e3), c = je.fromWords(o);
+      let { words: o } = ze.decode(n, 1e3), c = ze.fromWords(o);
       t = ue.decode(c);
     } else if (r) {
       let [o, c] = r.split("@");
@@ -3447,7 +3447,7 @@ function oi(e, t) {
     ...e,
     pubkey: le(t)
   };
-  return n.id = He(n), n;
+  return n.id = qe(n), n;
 }
 function ai(e, t, n) {
   return X(
@@ -3579,7 +3579,7 @@ async function wi(e, t, n, r) {
     throw new Error("Invalid nostr event, payload tag does not match request body hash");
   return !0;
 }
-const Ge = 30078, Dn = 30078, jn = 1059, Gc = 14, au = 100, Fc = 1;
+const Oe = 30078, Dn = 30078, jn = 1059, Gc = 14, au = 100, Fc = 1;
 function cu(e) {
   return JSON.stringify({
     version: Fc,
@@ -3693,7 +3693,7 @@ async function* lu(e) {
     r();
   }
 }
-function Oe(e, t = new Uint8Array(32), n = 1) {
+function Pe(e, t = new Uint8Array(32), n = 1) {
   const r = rn(fe, e, t), i = [];
   for (let s = 1; s <= n; s++)
     i.push(Cr(fe, r, new Uint8Array([s]), 32));
@@ -3729,7 +3729,7 @@ class st {
    * @returns A new Session instance
    */
   static init(t, n, r, i, s, o) {
-    const c = _e(), [a, l] = Oe(s, q.getConversationKey(c, n), 2);
+    const c = _e(), [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 = {
@@ -3774,16 +3774,16 @@ class st {
     const n = Date.now(), r = {
       ...t,
       content: t.content || "",
-      kind: t.kind || Ge,
+      kind: t.kind || Oe,
       created_at: t.created_at || Math.floor(n / 1e3),
       tags: t.tags || [],
       pubkey: t.pubkey || Yc
     };
-    r.tags.some(([l]) => l === "ms") || r.tags.push(["ms", String(n)]), r.id = He(r);
+    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({
       content: s,
-      kind: Ge,
+      kind: Oe,
       tags: [["header", c]],
       created_at: Math.floor(n / 1e3)
     }, this.state.ourCurrentNostrKey.privateKey), innerEvent: r };
@@ -3806,7 +3806,7 @@ class st {
   }
   // 2. RATCHET FUNCTIONS
   ratchetEncrypt(t) {
-    const [n, r] = Oe(this.state.sendingChainKey, new Uint8Array([1]), 2);
+    const [n, r] = Pe(this.state.sendingChainKey, new Uint8Array([1]), 2);
     return this.state.sendingChainKey = n, [{
       number: this.state.sendingChainMessageNumber++,
       nextPublicKey: this.state.ourNextNostrKey.publicKey,
@@ -3817,7 +3817,7 @@ class st {
     const i = this.trySkippedMessageKeys(t, n, r);
     if (i) return i;
     this.skipMessageKeys(t.number, r);
-    const [s, o] = Oe(this.state.receivingChainKey, new Uint8Array([1]), 2);
+    const [s, o] = Pe(this.state.receivingChainKey, new Uint8Array([1]), 2);
     this.state.receivingChainKey = s, this.state.receivingChainMessageNumber++;
     try {
       return q.decrypt(n, o);
@@ -3832,14 +3832,14 @@ class st {
   }
   ratchetStep(t) {
     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] = Oe(this.state.rootKey, n, 2);
+    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();
     this.state.ourNextNostrKey = {
       publicKey: le(s),
       privateKey: s
     };
-    const o = q.getConversationKey(this.state.ourNextNostrKey.privateKey, this.state.theirNextNostrPublicKey), [c, a] = Oe(r, o, 2);
+    const o = q.getConversationKey(this.state.ourNextNostrKey.privateKey, this.state.theirNextNostrPublicKey), [c, a] = Pe(r, o, 2);
     this.state.rootKey = c, this.state.sendingChainKey = a;
   }
   // 3. MESSAGE KEY FUNCTIONS
@@ -3858,16 +3858,15 @@ class st {
       this.state.skippedKeys[n].headerKeys.push(r);
     }
     for (; this.state.receivingChainMessageNumber < t; ) {
-      const [r, i] = Oe(this.state.receivingChainKey, new Uint8Array([1]), 2);
+      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) {
-    var o;
     const i = this.state.skippedKeys[r];
     if (!i) return null;
     const s = i.messageKeys[t.number];
-    return s ? (delete i.messageKeys[t.number], Object.keys(i.messageKeys).length === 0 && (delete this.state.skippedKeys[r], (o = this.nostrUnsubscribe) == null || o.call(this), this.nostrUnsubscribe = void 0), q.decrypt(n, s)) : null;
+    return s ? (delete i.messageKeys[t.number], Object.keys(i.messageKeys).length === 0 && delete this.state.skippedKeys[r], q.decrypt(n, s)) : null;
   }
   // 4. NOSTR EVENT HANDLING
   decryptHeader(t) {
@@ -3897,7 +3896,7 @@ class st {
     var c;
     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: [Ge] },
+      { authors: [this.state.theirNextNostrPublicKey], kinds: [Oe] },
       (a) => this.handleNostrEvent(a)
     )), r && (this.skipMessageKeys(n.previousChainLength, t.pubkey), this.ratchetStep(n.nextPublicKey)));
     const s = this.ratchetDecrypt(n, t.content, t.pubkey), o = JSON.parse(s);
@@ -3905,7 +3904,7 @@ class st {
       console.error("Invalid event received", o);
       return;
     }
-    if (o.id !== He(o)) {
+    if (o.id !== qe(o)) {
       console.error("Event hash does not match", o);
       return;
     }
@@ -3914,12 +3913,15 @@ class st {
   subscribeToNostrEvents() {
     if (this.nostrNextUnsubscribe) return;
     this.nostrNextUnsubscribe = this.nostrSubscribe(
-      { authors: [this.state.theirNextNostrPublicKey], kinds: [Ge] },
+      { authors: [this.state.theirNextNostrPublicKey], kinds: [Oe] },
       (n) => this.handleNostrEvent(n)
-    );
+    ), this.state.theirCurrentNostrPublicKey && (this.nostrUnsubscribe = this.nostrSubscribe(
+      { authors: [this.state.theirCurrentNostrPublicKey], kinds: [Oe] },
+      (n) => this.handleNostrEvent(n)
+    ));
     const t = Object.keys(this.state.skippedKeys);
-    this.state.theirCurrentNostrPublicKey && !t.includes(this.state.theirCurrentNostrPublicKey) && t.push(this.state.theirCurrentNostrPublicKey), this.nostrUnsubscribe = this.nostrSubscribe(
-      { authors: t, kinds: [Ge] },
+    t.length && this.nostrSubscribe(
+      { authors: t, kinds: [Oe] },
       (n) => this.handleNostrEvent(n)
     );
   }
@@ -3927,11 +3929,11 @@ class st {
 new TextDecoder("utf-8");
 new TextEncoder();
 function Qe(e, t) {
-  const n = ke.getSharedSecret(e, "02" + t).subarray(1, 33);
+  const n = Ie.getSharedSecret(e, "02" + t).subarray(1, 33);
   return rn(fe, n, "nip44-v2");
 }
 const Xc = 2 * 24 * 60 * 60, Qc = () => Math.round(Date.now() / 1e3), eu = () => Math.round(Qc() - Math.random() * Xc);
-class Pe {
+class Me {
   constructor(t, n, r, i, s, o, c = []) {
     this.inviterEphemeralPublicKey = t, this.sharedSecret = n, this.inviter = r, this.inviterEphemeralPrivateKey = i, this.label = s, this.maxUses = o, this.usedBy = c;
   }
@@ -3939,7 +3941,7 @@ class Pe {
     if (!t)
       throw new Error("Inviter public key is required");
     const i = _e(), s = le(i), o = P(_e());
-    return new Pe(
+    return new Me(
       s,
       o,
       t,
@@ -3962,7 +3964,7 @@ class Pe {
     const { inviter: o, ephemeralKey: c, sharedSecret: a } = s;
     if (!o || !c || !a)
       throw new Error("Missing required fields (inviter, ephemeralKey, sharedSecret) in invite data.");
-    return new Pe(
+    return new Me(
       c,
       a,
       o
@@ -3970,7 +3972,7 @@ class Pe {
   }
   static deserialize(t) {
     const n = JSON.parse(t);
-    return new Pe(
+    return new Me(
       n.inviterEphemeralPublicKey,
       n.sharedSecret,
       n.inviter,
@@ -3992,7 +3994,7 @@ class Pe {
     const r = (o = n.find(([a]) => a === "ephemeralKey")) == null ? void 0 : o[1], i = (c = n.find(([a]) => a === "sharedSecret")) == null ? void 0 : c[1], s = t.pubkey;
     if (!r || !i)
       throw new Error("Invalid invite event: missing session key or sharedSecret");
-    return new Pe(
+    return new Me(
       r,
       i,
       s
@@ -4010,7 +4012,7 @@ class Pe {
       if (!(!c.created_at || c.created_at <= s)) {
         s = c.created_at;
         try {
-          const a = Pe.fromEvent(c);
+          const a = Me.fromEvent(c);
           r(a);
         } catch (a) {
           console.error("Error processing invite:", a, "event:", c);
@@ -4113,14 +4115,14 @@ export {
   Gc as CHAT_MESSAGE_KIND,
   Dn as INVITE_EVENT_KIND,
   jn as INVITE_RESPONSE_KIND,
-  Pe as Invite,
+  Me as Invite,
   au as MAX_SKIP,
-  Ge as MESSAGE_EVENT_KIND,
+  Oe as MESSAGE_EVENT_KIND,
   st as Session,
   lu as createEventStream,
   uu as deserializeSessionState,
   hu as getMillisecondTimestamp,
-  Oe as kdf,
+  Pe as kdf,
   cu as serializeSessionState,
   fu as skippedMessageIndexKey
 };