nostr-double-ratchet 0.0.33 → 0.0.34

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

@@ -1,7 +1,7 @@
 var Ki = Object.defineProperty;
 var Ni = (e, t, n) => t in e ? Ki(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
 var J = (e, t, n) => Ni(e, typeof t != "symbol" ? t + "" : t, n);
-function kn(e) {
+function Bn(e) {
   if (!Number.isSafeInteger(e) || e < 0)
     throw new Error(`Wrong positive integer: ${e}`);
 }
@@ -14,7 +14,7 @@ function Fn(e, ...t) {
 function Si(e) {
   if (typeof e != "function" || typeof e.create != "function")
     throw new Error("Hash should be wrapped by utils.wrapConstructor");
-  kn(e.outputLen), kn(e.blockLen);
+  Bn(e.outputLen), Bn(e.blockLen);
 }
 function et(e, t = !0) {
   if (e.destroyed)
@@ -33,17 +33,17 @@ const xt = typeof globalThis == "object" && "crypto" in globalThis ? globalThis.
 const Gn = (e) => e instanceof Uint8Array, Kt = (e) => new DataView(e.buffer, e.byteOffset, e.byteLength), re = (e, t) => e << 32 - t | e >>> t, Ci = new Uint8Array(new Uint32Array([287454020]).buffer)[0] === 68;
 if (!Ci)
   throw new Error("Non little-endian hardware is not supported");
-function Bi(e) {
+function ki(e) {
   if (typeof e != "string")
     throw new Error(`utf8ToBytes expected string, got ${typeof e}`);
   return new Uint8Array(new TextEncoder().encode(e));
 }
 function Vt(e) {
-  if (typeof e == "string" && (e = Bi(e)), !Gn(e))
+  if (typeof e == "string" && (e = ki(e)), !Gn(e))
     throw new Error(`expected Uint8Array, got ${typeof e}`);
   return e;
 }
-function ki(...e) {
+function Bi(...e) {
   const t = new Uint8Array(e.reduce((r, i) => r + i.length, 0));
   let n = 0;
   return e.forEach((r) => {
@@ -214,12 +214,12 @@ let Ti = class extends Ui {
     for (let u = 0; u < 16; u++, n += 4)
       ve[u] = t.getUint32(n, !1);
     for (let u = 16; u < 64; u++) {
-      const p = ve[u - 15], w = ve[u - 2], g = re(p, 7) ^ re(p, 18) ^ p >>> 3, h = re(w, 17) ^ re(w, 19) ^ w >>> 10;
+      const y = ve[u - 15], w = ve[u - 2], g = re(y, 7) ^ re(y, 18) ^ y >>> 3, h = re(w, 17) ^ re(w, 19) ^ w >>> 10;
       ve[u] = h + ve[u - 7] + g + ve[u - 16] | 0;
     }
     let { A: r, B: i, C: s, D: o, E: c, F: a, G: l, H: f } = this;
     for (let u = 0; u < 64; u++) {
-      const p = re(c, 6) ^ re(c, 11) ^ re(c, 25), w = f + p + Li(c, a, l) + Ri[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), w = f + y + Li(c, a, l) + Ri[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 + w | 0, o = s, s = i, i = r, r = w + h | 0;
     }
     r = r + this.A | 0, i = i + this.B | 0, s = s + this.C | 0, o = o + this.D | 0, c = c + this.E | 0, a = a + this.F | 0, l = l + this.G | 0, f = f + this.H | 0, this.set(r, i, s, o, c, a, l, f);
@@ -348,18 +348,18 @@ function er(e, t, n) {
     if (s++ >= 1e3)
       throw new Error("drbg: tried 1000 values");
     let u = 0;
-    const p = [];
+    const y = [];
     for (; u < t; ) {
       r = c();
       const w = r.slice();
-      p.push(w), u += r.length;
+      y.push(w), u += r.length;
     }
-    return Ie(...p);
+    return Ie(...y);
   };
-  return (u, p) => {
+  return (u, y) => {
     o(), a(u);
     let w;
-    for (; !(w = p(l())); )
+    for (; !(w = y(l())); )
       a();
     return o(), w;
   };
@@ -468,15 +468,15 @@ function Gi(e) {
   return function(c, a) {
     if (c.pow(a, t) === c.neg(c.ONE))
       throw new Error("Cannot find square root");
-    let l = r, f = c.pow(c.mul(c.ONE, i), n), u = c.pow(a, s), p = c.pow(a, n);
-    for (; !c.eql(p, c.ONE); ) {
-      if (c.eql(p, c.ZERO))
+    let l = r, f = c.pow(c.mul(c.ONE, i), n), u = c.pow(a, s), y = c.pow(a, n);
+    for (; !c.eql(y, c.ONE); ) {
+      if (c.eql(y, c.ZERO))
         return c.ZERO;
       let w = 1;
-      for (let h = c.sqr(p); w < l && !c.eql(h, c.ONE); w++)
+      for (let h = c.sqr(y); w < l && !c.eql(h, c.ONE); w++)
         h = c.sqr(h);
       const g = c.pow(f, z << BigInt(l - w - 1));
-      f = c.sqr(g), u = c.mul(u, g), p = c.mul(p, f), l = w;
+      f = c.sqr(g), u = c.mul(u, g), y = c.mul(y, f), l = w;
     }
     return u;
   };
@@ -650,7 +650,7 @@ function is(e, t) {
       let l = i, f = l;
       for (let u = 0; u < o; u++) {
         f = l, a.push(f);
-        for (let p = 1; p < c; p++)
+        for (let y = 1; y < c; y++)
           f = f.add(l), a.push(f);
         l = f.double();
       }
@@ -666,13 +666,13 @@ function is(e, t) {
     wNAF(i, s, o) {
       const { windows: c, windowSize: a } = r(i);
       let l = e.ZERO, f = e.BASE;
-      const u = BigInt(2 ** i - 1), p = 2 ** i, w = BigInt(i);
+      const u = BigInt(2 ** i - 1), y = 2 ** i, w = BigInt(i);
       for (let g = 0; g < c; g++) {
         const h = g * a;
         let d = Number(o & u);
-        o >>= w, d > a && (d -= p, o += St);
-        const y = h, E = h + Math.abs(d) - 1, S = g % 2 !== 0, _ = d < 0;
-        d === 0 ? f = f.add(n(S, s[y])) : l = l.add(n(_, s[E]));
+        o >>= w, d > a && (d -= y, o += St);
+        const p = h, m = h + Math.abs(d) - 1, S = g % 2 !== 0, _ = d < 0;
+        d === 0 ? f = f.add(n(S, s[p])) : l = l.add(n(_, s[m]));
       }
       return { p: l, f };
     },
@@ -722,7 +722,7 @@ function ss(e) {
   }
   return Object.freeze({ ...t });
 }
-const { bytesToNumberBE: os, hexToBytes: as } = Vi, Be = {
+const { bytesToNumberBE: os, hexToBytes: as } = Vi, ke = {
   // asn.1 DER encoding utils
   Err: class extends Error {
     constructor(t = "") {
@@ -730,7 +730,7 @@ const { bytesToNumberBE: os, hexToBytes: as } = Vi, Be = {
     }
   },
   _parseInt(e) {
-    const { Err: t } = Be;
+    const { Err: t } = ke;
     if (e.length < 2 || e[0] !== 2)
       throw new t("Invalid signature integer tag");
     const n = e[1], r = e.subarray(2, n + 2);
@@ -743,7 +743,7 @@ const { bytesToNumberBE: os, hexToBytes: as } = Vi, Be = {
     return { d: os(r), l: e.subarray(n + 2) };
   },
   toSig(e) {
-    const { Err: t } = Be, n = typeof e == "string" ? as(e) : e;
+    const { Err: t } = ke, n = typeof e == "string" ? as(e) : e;
     if (!(n instanceof Uint8Array))
       throw new Error("ui8a expected");
     let r = n.length;
@@ -751,7 +751,7 @@ const { bytesToNumberBE: os, hexToBytes: as } = Vi, Be = {
       throw new t("Invalid signature tag");
     if (n[1] !== r - 2)
       throw new t("Invalid signature: incorrect length");
-    const { d: i, l: s } = Be._parseInt(n.subarray(2)), { d: o, l: c } = Be._parseInt(s);
+    const { d: i, l: s } = ke._parseInt(n.subarray(2)), { d: o, l: c } = ke._parseInt(s);
     if (c.length)
       throw new t("Invalid signature: left bytes after parsing");
     return { r: i, s: o };
@@ -769,15 +769,15 @@ const Ln = BigInt(3);
 BigInt(4);
 function cs(e) {
   const t = ss(e), { Fp: n } = t, r = t.toBytes || ((g, h, d) => {
-    const y = h.toAffine();
-    return Ie(Uint8Array.from([4]), n.toBytes(y.x), n.toBytes(y.y));
+    const p = h.toAffine();
+    return Ie(Uint8Array.from([4]), n.toBytes(p.x), n.toBytes(p.y));
   }), i = t.fromBytes || ((g) => {
-    const h = g.subarray(1), d = n.fromBytes(h.subarray(0, n.BYTES)), y = n.fromBytes(h.subarray(n.BYTES, 2 * n.BYTES));
-    return { x: d, y };
+    const h = g.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 };
   });
   function s(g) {
-    const { a: h, b: d } = t, y = n.sqr(g), E = n.mul(y, g);
-    return n.add(n.add(E, n.mul(g, h)), d);
+    const { a: h, b: d } = t, p = n.sqr(g), m = n.mul(p, g);
+    return n.add(n.add(m, n.mul(g, h)), d);
   }
   if (!n.eql(n.sqr(t.Gy), s(t.Gx)))
     throw new Error("bad generator point: equation left != right");
@@ -789,7 +789,7 @@ function cs(e) {
       throw new Error("Expected valid bigint: 0 < bigint < curve.n");
   }
   function a(g) {
-    const { allowedPrivateKeyLengths: h, nByteLength: d, wrapPrivateKey: y, n: E } = t;
+    const { allowedPrivateKeyLengths: h, nByteLength: d, wrapPrivateKey: p, n: m } = t;
     if (h && typeof g != "bigint") {
       if (g instanceof Uint8Array && (g = qe(g)), typeof g != "string" || !h.includes(g.length))
         throw new Error("Invalid key");
@@ -801,7 +801,7 @@ function cs(e) {
     } catch {
       throw new Error(`private key must be ${d} bytes, hex or bigint, not ${typeof g}`);
     }
-    return y && (S = V(S, E)), c(S), S;
+    return p && (S = V(S, m)), c(S), S;
   }
   const l = /* @__PURE__ */ new Map();
   function f(g) {
@@ -809,24 +809,24 @@ function cs(e) {
       throw new Error("ProjectivePoint expected");
   }
   class u {
-    constructor(h, d, y) {
-      if (this.px = h, this.py = d, this.pz = y, h == null || !n.isValid(h))
+    constructor(h, d, p) {
+      if (this.px = h, this.py = d, this.pz = p, h == null || !n.isValid(h))
         throw new Error("x required");
       if (d == null || !n.isValid(d))
         throw new Error("y required");
-      if (y == null || !n.isValid(y))
+      if (p == null || !n.isValid(p))
         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 } = h || {};
-      if (!h || !n.isValid(d) || !n.isValid(y))
+      const { x: d, y: p } = h || {};
+      if (!h || !n.isValid(d) || !n.isValid(p))
         throw new Error("invalid affine point");
       if (h instanceof u)
         throw new Error("projective point not allowed");
-      const E = (S) => n.eql(S, n.ZERO);
-      return E(d) && E(y) ? u.ZERO : new u(d, y, n.ONE);
+      const m = (S) => n.eql(S, n.ZERO);
+      return m(d) && m(p) ? u.ZERO : new u(d, p, n.ONE);
     }
     get x() {
       return this.toAffine().x;
@@ -841,8 +841,8 @@ function cs(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((y) => y.pz));
-      return h.map((y, E) => y.toAffine(d[E])).map(u.fromAffine);
+      const d = n.invertBatch(h.map((p) => p.pz));
+      return h.map((p, m) => p.toAffine(d[m])).map(u.fromAffine);
     }
     /**
      * Converts hash string or Uint8Array to Point.
@@ -870,8 +870,8 @@ function cs(e) {
       const { x: h, y: d } = this.toAffine();
       if (!n.isValid(h) || !n.isValid(d))
         throw new Error("bad point: x or y not FE");
-      const y = n.sqr(d), E = s(h);
-      if (!n.eql(y, E))
+      const p = n.sqr(d), m = s(h);
+      if (!n.eql(p, m))
         throw new Error("bad point: equation left != right");
       if (!this.isTorsionFree())
         throw new Error("bad point: not in prime-order subgroup");
@@ -887,8 +887,8 @@ function cs(e) {
      */
     equals(h) {
       f(h);
-      const { px: d, py: y, pz: E } = this, { px: S, py: _, pz: B } = h, m = n.eql(n.mul(d, B), n.mul(S, E)), x = n.eql(n.mul(y, B), n.mul(_, E));
-      return m && x;
+      const { px: d, py: p, pz: m } = this, { px: S, py: _, pz: k } = h, E = n.eql(n.mul(d, k), n.mul(S, m)), x = n.eql(n.mul(p, k), n.mul(_, m));
+      return E && x;
     }
     /**
      * Flips point to one corresponding to (x, -y) in Affine coordinates.
@@ -901,9 +901,9 @@ function cs(e) {
     // https://eprint.iacr.org/2015/1060, algorithm 3
     // Cost: 8M + 3S + 3*a + 2*b3 + 15add.
     double() {
-      const { a: h, b: d } = t, y = n.mul(d, Ln), { px: E, py: S, pz: _ } = this;
-      let B = n.ZERO, m = n.ZERO, x = n.ZERO, K = n.mul(E, E), M = n.mul(S, S), I = n.mul(_, _), A = n.mul(E, S);
-      return A = n.add(A, A), x = n.mul(E, _), x = n.add(x, x), B = n.mul(h, x), m = n.mul(y, I), m = n.add(B, m), B = n.sub(M, m), m = n.add(M, m), m = n.mul(B, m), B = n.mul(A, B), x = n.mul(y, x), I = n.mul(h, I), A = n.sub(K, I), A = n.mul(h, A), A = n.add(A, x), x = n.add(K, K), K = n.add(x, K), K = n.add(K, I), K = n.mul(K, A), m = n.add(m, K), I = n.mul(S, _), I = n.add(I, I), K = n.mul(I, A), B = n.sub(B, K), x = n.mul(I, M), x = n.add(x, x), x = n.add(x, x), new u(B, m, x);
+      const { a: h, b: d } = t, p = n.mul(d, Ln), { px: m, py: S, pz: _ } = this;
+      let k = n.ZERO, E = n.ZERO, x = n.ZERO, K = n.mul(m, m), M = n.mul(S, S), I = n.mul(_, _), A = n.mul(m, S);
+      return A = n.add(A, A), x = n.mul(m, _), x = n.add(x, x), k = n.mul(h, x), E = n.mul(p, I), E = n.add(k, E), k = n.sub(M, E), E = n.add(M, E), E = n.mul(k, E), k = n.mul(A, k), x = n.mul(p, x), I = n.mul(h, I), A = n.sub(K, I), A = n.mul(h, A), A = n.add(A, x), x = n.add(K, K), K = n.add(x, K), K = n.add(K, I), K = n.mul(K, A), E = n.add(E, K), I = n.mul(S, _), I = n.add(I, I), K = n.mul(I, A), k = n.sub(k, K), x = n.mul(I, M), x = n.add(x, x), x = n.add(x, x), new u(k, E, x);
     }
     // Renes-Costello-Batina exception-free addition formula.
     // There is 30% faster Jacobian formula, but it is not complete.
@@ -911,13 +911,13 @@ function cs(e) {
     // Cost: 12M + 0S + 3*a + 3*b3 + 23add.
     add(h) {
       f(h);
-      const { px: d, py: y, pz: E } = this, { px: S, py: _, pz: B } = h;
-      let m = n.ZERO, x = n.ZERO, K = n.ZERO;
+      const { px: d, py: p, pz: m } = this, { px: S, py: _, pz: k } = h;
+      let E = n.ZERO, x = n.ZERO, K = n.ZERO;
       const M = t.a, I = n.mul(t.b, Ln);
-      let A = n.mul(d, S), R = n.mul(y, _), T = n.mul(E, B), D = n.add(d, y), b = n.add(S, _);
-      D = n.mul(D, b), b = n.add(A, R), D = n.sub(D, b), b = n.add(d, E);
-      let v = n.add(S, B);
-      return b = n.mul(b, v), v = n.add(A, T), b = n.sub(b, v), v = n.add(y, E), m = n.add(_, B), v = n.mul(v, m), m = n.add(R, T), v = n.sub(v, m), K = n.mul(M, b), m = n.mul(I, T), K = n.add(m, K), m = n.sub(R, K), K = n.add(R, K), x = n.mul(m, K), R = n.add(A, A), R = n.add(R, A), T = n.mul(M, T), b = n.mul(I, b), R = n.add(R, T), T = n.sub(A, T), T = n.mul(M, T), b = n.add(b, T), A = n.mul(R, b), x = n.add(x, A), A = n.mul(v, b), m = n.mul(D, m), m = n.sub(m, A), A = n.mul(D, R), K = n.mul(v, K), K = n.add(K, A), new u(m, x, K);
+      let A = n.mul(d, S), R = n.mul(p, _), T = n.mul(m, k), D = n.add(d, p), b = n.add(S, _);
+      D = n.mul(D, b), b = n.add(A, R), D = n.sub(D, b), b = n.add(d, m);
+      let v = n.add(S, k);
+      return b = n.mul(b, v), v = n.add(A, T), b = n.sub(b, v), v = n.add(p, m), E = n.add(_, k), v = n.mul(v, E), E = n.add(R, T), v = n.sub(v, E), K = n.mul(M, b), E = n.mul(I, T), K = n.add(E, K), E = n.sub(R, K), K = n.add(R, K), x = n.mul(E, K), R = n.add(A, A), R = n.add(R, A), T = n.mul(M, T), b = n.mul(I, b), R = n.add(R, T), T = n.sub(A, T), T = n.mul(M, T), b = n.add(b, T), A = n.mul(R, b), x = n.add(x, A), A = n.mul(v, b), E = n.mul(D, E), E = n.sub(E, A), A = n.mul(D, R), K = n.mul(v, K), K = n.add(K, A), new u(E, x, K);
     }
     subtract(h) {
       return this.add(h.negate());
@@ -927,8 +927,8 @@ function cs(e) {
     }
     wNAF(h) {
       return w.wNAFCached(this, l, h, (d) => {
-        const y = n.invertBatch(d.map((E) => E.pz));
-        return d.map((E, S) => E.toAffine(y[S])).map(u.fromAffine);
+        const p = n.invertBatch(d.map((m) => m.pz));
+        return d.map((m, S) => m.toAffine(p[S])).map(u.fromAffine);
       });
     }
     /**
@@ -942,13 +942,13 @@ function cs(e) {
         return d;
       if (c(h), h === X)
         return this;
-      const { endo: y } = t;
-      if (!y)
+      const { endo: p } = t;
+      if (!p)
         return w.unsafeLadder(this, h);
-      let { k1neg: E, k1: S, k2neg: _, k2: B } = y.splitScalar(h), m = d, x = d, K = this;
-      for (; S > ce || B > ce; )
-        S & X && (m = m.add(K)), B & X && (x = x.add(K)), K = K.double(), S >>= X, B >>= X;
-      return E && (m = m.negate()), _ && (x = x.negate()), x = new u(n.mul(x.px, y.beta), x.py, x.pz), m.add(x);
+      let { k1neg: m, k1: S, k2neg: _, k2: k } = p.splitScalar(h), E = d, x = d, K = this;
+      for (; S > ce || k > ce; )
+        S & X && (E = E.add(K)), k & X && (x = x.add(K)), K = K.double(), S >>= X, k >>= X;
+      return m && (E = E.negate()), _ && (x = x.negate()), x = new u(n.mul(x.px, p.beta), x.py, x.pz), E.add(x);
     }
     /**
      * Constant time multiplication.
@@ -961,17 +961,17 @@ function cs(e) {
      */
     multiply(h) {
       c(h);
-      let d = h, y, E;
+      let d = h, p, m;
       const { endo: S } = t;
       if (S) {
-        const { k1neg: _, k1: B, k2neg: m, k2: x } = S.splitScalar(d);
-        let { p: K, f: M } = this.wNAF(B), { p: I, f: A } = this.wNAF(x);
-        K = w.constTimeNegate(_, K), I = w.constTimeNegate(m, I), I = new u(n.mul(I.px, S.beta), I.py, I.pz), y = K.add(I), E = M.add(A);
+        const { k1neg: _, k1: k, k2neg: E, k2: x } = S.splitScalar(d);
+        let { p: K, f: M } = this.wNAF(k), { p: I, f: A } = this.wNAF(x);
+        K = w.constTimeNegate(_, K), I = w.constTimeNegate(E, I), I = new u(n.mul(I.px, S.beta), I.py, I.pz), p = K.add(I), m = M.add(A);
       } else {
-        const { p: _, f: B } = this.wNAF(d);
-        y = _, E = B;
+        const { p: _, f: k } = this.wNAF(d);
+        p = _, m = k;
       }
-      return u.normalizeZ([y, E])[0];
+      return u.normalizeZ([p, m])[0];
     }
     /**
      * Efficiently calculate `aP + bQ`. Unsafe, can expose private key, if used incorrectly.
@@ -979,22 +979,22 @@ function cs(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, y) {
-      const E = u.BASE, S = (B, m) => m === ce || m === X || !B.equals(E) ? B.multiplyUnsafe(m) : B.multiply(m), _ = S(this, d).add(S(h, y));
+    multiplyAndAddUnsafe(h, d, p) {
+      const m = u.BASE, S = (k, E) => E === ce || E === X || !k.equals(m) ? k.multiplyUnsafe(E) : k.multiply(E), _ = S(this, d).add(S(h, p));
       return _.is0() ? void 0 : _;
     }
     // Converts Projective point to affine (x, y) coordinates.
     // Can accept precomputed Z^-1 - for example, from invertBatch.
     // (x, y, z) ∋ (x=x/z, y=y/z)
     toAffine(h) {
-      const { px: d, py: y, pz: E } = this, S = this.is0();
-      h == null && (h = S ? n.ONE : n.inv(E));
-      const _ = n.mul(d, h), B = n.mul(y, h), m = n.mul(E, h);
+      const { px: d, py: p, pz: m } = this, S = this.is0();
+      h == null && (h = S ? n.ONE : n.inv(m));
+      const _ = n.mul(d, h), k = n.mul(p, h), E = n.mul(m, h);
       if (S)
         return { x: n.ZERO, y: n.ZERO };
-      if (!n.eql(m, n.ONE))
+      if (!n.eql(E, n.ONE))
         throw new Error("invZ was invalid");
-      return { x: _, y: B };
+      return { x: _, y: k };
     }
     isTorsionFree() {
       const { h, isTorsionFree: d } = t;
@@ -1016,7 +1016,7 @@ function cs(e) {
     }
   }
   u.BASE = new u(t.Gx, t.Gy, n.ONE), u.ZERO = new u(n.ZERO, n.ONE, n.ZERO);
-  const p = t.nBitLength, w = is(u, t.endo ? Math.ceil(p / 2) : p);
+  const y = t.nBitLength, w = is(u, t.endo ? Math.ceil(y / 2) : y);
   return {
     CURVE: t,
     ProjectivePoint: u,
@@ -1048,16 +1048,16 @@ function ls(e) {
   function a(b) {
     return Tt(b, r);
   }
-  const { ProjectivePoint: l, normPrivateKeyToScalar: f, weierstrassEquation: u, isWithinCurveOrder: p } = cs({
+  const { ProjectivePoint: l, normPrivateKeyToScalar: f, weierstrassEquation: u, isWithinCurveOrder: y } = cs({
     ...t,
     toBytes(b, v, N) {
-      const k = v.toAffine(), C = n.toBytes(k.x), U = Ie;
-      return N ? U(Uint8Array.from([v.hasEvenY() ? 2 : 3]), C) : U(Uint8Array.from([4]), C, n.toBytes(k.y));
+      const B = v.toAffine(), C = n.toBytes(B.x), U = Ie;
+      return N ? U(Uint8Array.from([v.hasEvenY() ? 2 : 3]), C) : U(Uint8Array.from([4]), C, n.toBytes(B.y));
     },
     fromBytes(b) {
-      const v = b.length, N = b[0], k = b.subarray(1);
+      const v = b.length, N = b[0], B = b.subarray(1);
       if (v === i && (N === 2 || N === 3)) {
-        const C = G(k);
+        const C = G(B);
         if (!o(C))
           throw new Error("Point is not on curve");
         const U = u(C);
@@ -1065,7 +1065,7 @@ function ls(e) {
         const $ = (O & X) === X;
         return (N & 1) === 1 !== $ && (O = n.neg(O)), { x: C, y: O };
       } else if (v === s && N === 4) {
-        const C = n.fromBytes(k.subarray(0, n.BYTES)), U = n.fromBytes(k.subarray(n.BYTES, 2 * n.BYTES));
+        const C = n.fromBytes(B.subarray(0, n.BYTES)), U = n.fromBytes(B.subarray(n.BYTES, 2 * n.BYTES));
         return { x: C, y: U };
       } else
         throw new Error(`Point of length ${v} was invalid. Expected ${i} compressed bytes or ${s} uncompressed bytes`);
@@ -1079,38 +1079,38 @@ function ls(e) {
     return g(b) ? c(-b) : b;
   }
   const d = (b, v, N) => G(b.slice(v, N));
-  class y {
-    constructor(v, N, k) {
-      this.r = v, this.s = N, this.recovery = k, this.assertValidity();
+  class p {
+    constructor(v, N, B) {
+      this.r = v, this.s = N, this.recovery = B, this.assertValidity();
     }
     // pair (bytes of r, bytes of s)
     static fromCompact(v) {
       const N = t.nByteLength;
-      return v = Z("compactSignature", v, N * 2), new y(d(v, 0, N), d(v, N, 2 * N));
+      return v = Z("compactSignature", v, N * 2), new p(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 y(N, k);
+      const { r: N, s: B } = ke.toSig(Z("DER", v));
+      return new p(N, B);
     }
     assertValidity() {
-      if (!p(this.r))
+      if (!y(this.r))
         throw new Error("r must be 0 < r < CURVE.n");
-      if (!p(this.s))
+      if (!y(this.s))
         throw new Error("s must be 0 < s < CURVE.n");
     }
     addRecoveryBit(v) {
-      return new y(this.r, this.s, v);
+      return new p(this.r, this.s, v);
     }
     recoverPublicKey(v) {
-      const { r: N, s: k, recovery: C } = this, U = x(Z("msgHash", v));
+      const { r: N, s: B, recovery: C } = this, U = x(Z("msgHash", v));
       if (C == null || ![0, 1, 2, 3].includes(C))
         throw new Error("recovery id invalid");
       const O = C === 2 || C === 3 ? N + t.n : N;
       if (O >= n.ORDER)
         throw new Error("recovery id 2 or 3 invalid");
-      const $ = (C & 1) === 0 ? "02" : "03", ee = l.fromHex($ + w(O)), ge = a(O), Ue = c(-U * ge), Ve = c(k * ge), we = l.BASE.multiplyAndAddUnsafe(ee, Ue, Ve);
+      const $ = (C & 1) === 0 ? "02" : "03", ee = l.fromHex($ + w(O)), ge = a(O), Ue = c(-U * ge), Ve = c(B * ge), we = l.BASE.multiplyAndAddUnsafe(ee, Ue, Ve);
       if (!we)
         throw new Error("point at infinify");
       return we.assertValidity(), we;
@@ -1120,14 +1120,14 @@ function ls(e) {
       return g(this.s);
     }
     normalizeS() {
-      return this.hasHighS() ? new y(this.r, c(-this.s), this.recovery) : this;
+      return this.hasHighS() ? new p(this.r, c(-this.s), this.recovery) : this;
     }
     // DER-encoded
     toDERRawBytes() {
       return je(this.toDERHex());
     }
     toDERHex() {
-      return Be.hexFromSig({ r: this.r, s: this.s });
+      return ke.hexFromSig({ r: this.r, s: this.s });
     }
     // padded bytes of r, then padded bytes of s
     toCompactRawBytes() {
@@ -1137,7 +1137,7 @@ function ls(e) {
       return w(this.r) + w(this.s);
     }
   }
-  const E = {
+  const m = {
     isValidPrivateKey(b) {
       try {
         return f(b), !0;
@@ -1170,21 +1170,21 @@ function ls(e) {
     return l.fromPrivateKey(b).toRawBytes(v);
   }
   function _(b) {
-    const v = b instanceof Uint8Array, N = typeof b == "string", k = (v || N) && b.length;
-    return v ? k === i || k === s : N ? k === 2 * i || k === 2 * s : b instanceof l;
+    const v = b instanceof Uint8Array, N = typeof b == "string", B = (v || N) && b.length;
+    return v ? B === i || B === s : N ? B === 2 * i || B === 2 * s : b instanceof l;
   }
-  function B(b, v, N = !0) {
+  function k(b, v, N = !0) {
     if (_(b))
       throw new Error("first arg must be private key");
     if (!_(v))
       throw new Error("second arg must be public key");
     return l.fromHex(v).multiply(f(b)).toRawBytes(N);
   }
-  const m = t.bits2int || function(b) {
+  const E = t.bits2int || function(b) {
     const v = G(b), N = b.length * 8 - t.nBitLength;
     return N > 0 ? v >> BigInt(N) : v;
   }, x = t.bits2int_modN || function(b) {
-    return c(m(b));
+    return c(E(b));
   }, K = Jt(t.nBitLength);
   function M(b) {
     if (typeof b != "bigint")
@@ -1196,9 +1196,9 @@ function ls(e) {
   function I(b, v, N = A) {
     if (["recovered", "canonical"].some((Ae) => Ae in N))
       throw new Error("sign() legacy options not supported");
-    const { hash: k, randomBytes: C } = t;
+    const { hash: B, randomBytes: C } = t;
     let { lowS: U, prehash: O, extraEntropy: $ } = N;
-    U == null && (U = !0), b = Z("msgHash", b), O && (b = Z("prehashed msgHash", k(b)));
+    U == null && (U = !0), b = Z("msgHash", b), O && (b = Z("prehashed msgHash", B(b)));
     const ee = x(b), ge = f(v), Ue = [M(ge), M(ee)];
     if ($ != null) {
       const Ae = $ === !0 ? C(n.BYTES) : $;
@@ -1206,8 +1206,8 @@ function ls(e) {
     }
     const Ve = Ie(...Ue), we = ee;
     function Et(Ae) {
-      const Le = m(Ae);
-      if (!p(Le))
+      const Le = E(Ae);
+      if (!y(Le))
         return;
       const An = a(Le), $e = l.BASE.multiply(Le).toAffine(), te = c($e.x);
       if (te === ce)
@@ -1215,36 +1215,36 @@ function ls(e) {
       const Re = c(An * c(we + te * ge));
       if (Re === ce)
         return;
-      let Cn = ($e.x === te ? 0 : 2) | Number($e.y & X), Bn = Re;
-      return U && g(Re) && (Bn = h(Re), Cn ^= 1), new y(te, Bn, Cn);
+      let Cn = ($e.x === te ? 0 : 2) | Number($e.y & X), kn = Re;
+      return U && g(Re) && (kn = h(Re), Cn ^= 1), new p(te, kn, Cn);
     }
     return { seed: Ve, k2sig: Et };
   }
   const A = { lowS: t.lowS, prehash: !1 }, R = { lowS: t.lowS, prehash: !1 };
   function T(b, v, N = A) {
-    const { seed: k, k2sig: C } = I(b, v, N), U = t;
-    return er(U.hash.outputLen, U.nByteLength, U.hmac)(k, C);
+    const { seed: B, k2sig: C } = I(b, v, N), U = t;
+    return er(U.hash.outputLen, U.nByteLength, U.hmac)(B, C);
   }
   l.BASE._setWindowSize(8);
-  function D(b, v, N, k = R) {
+  function D(b, v, N, B = R) {
     var $e;
     const C = b;
-    if (v = Z("msgHash", v), N = Z("publicKey", N), "strict" in k)
+    if (v = Z("msgHash", v), N = Z("publicKey", N), "strict" in B)
       throw new Error("options.strict was renamed to lowS");
-    const { lowS: U, prehash: O } = k;
+    const { lowS: U, prehash: O } = B;
     let $, ee;
     try {
       if (typeof C == "string" || C instanceof Uint8Array)
         try {
-          $ = y.fromDER(C);
+          $ = p.fromDER(C);
         } catch (te) {
-          if (!(te instanceof Be.Err))
+          if (!(te instanceof ke.Err))
             throw te;
-          $ = y.fromCompact(C);
+          $ = p.fromCompact(C);
         }
       else if (typeof C == "object" && typeof C.r == "bigint" && typeof C.s == "bigint") {
         const { r: te, s: Re } = C;
-        $ = new y(te, Re);
+        $ = new p(te, Re);
       } else
         throw new Error("PARSE");
       ee = l.fromHex(N);
@@ -1262,12 +1262,12 @@ function ls(e) {
   return {
     CURVE: t,
     getPublicKey: S,
-    getSharedSecret: B,
+    getSharedSecret: k,
     sign: T,
     verify: D,
     ProjectivePoint: l,
-    Signature: y,
-    utils: E
+    Signature: p,
+    utils: m
   };
 }
 let sr = class extends Jn {
@@ -1311,7 +1311,7 @@ or.create = (e, t) => new sr(e, t);
 function fs(e) {
   return {
     hash: e,
-    hmac: (t, ...n) => or(e, t, ki(...n)),
+    hmac: (t, ...n) => or(e, t, Bi(...n)),
     randomBytes: Yn
   };
 }
@@ -1322,10 +1322,10 @@ function hs(e, t) {
 /*! noble-curves - MIT License (c) 2022 Paul Miller (paulmillr.com) */
 const ut = BigInt("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f"), tt = BigInt("0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141"), ar = BigInt(1), nt = BigInt(2), $n = (e, t) => (e + t / nt) / t;
 function cr(e) {
-  const t = ut, n = BigInt(3), r = BigInt(6), i = BigInt(11), s = BigInt(22), o = BigInt(23), c = BigInt(44), a = BigInt(88), l = e * e * e % t, f = l * l * e % t, u = Y(f, n, t) * f % t, p = Y(u, n, t) * f % t, w = Y(p, nt, t) * l % t, g = Y(w, i, t) * w % t, h = Y(g, s, t) * g % t, d = Y(h, c, t) * h % t, y = Y(d, a, t) * d % t, E = Y(y, c, t) * h % t, S = Y(E, n, t) * f % t, _ = Y(S, o, t) * g % t, B = Y(_, r, t) * l % t, m = Y(B, nt, t);
-  if (!Ot.eql(Ot.sqr(m), e))
+  const t = ut, n = BigInt(3), r = BigInt(6), i = BigInt(11), s = BigInt(22), o = BigInt(23), c = BigInt(44), a = BigInt(88), l = e * e * e % t, f = l * l * e % t, u = Y(f, n, t) * f % t, y = Y(u, n, t) * f % t, w = Y(y, nt, t) * l % t, g = Y(w, i, t) * w % t, h = Y(g, s, t) * g % t, d = Y(h, c, t) * h % t, p = Y(d, a, t) * d % t, m = Y(p, c, t) * h % t, S = Y(m, n, t) * f % t, _ = Y(S, o, t) * g % t, k = Y(_, r, t) * l % t, E = Y(k, nt, t);
+  if (!Ot.eql(Ot.sqr(E), e))
     throw new Error("Cannot find square root");
-  return m;
+  return E;
 }
 const Ot = ts(ut, void 0, void 0, { sqrt: cr }), _e = hs({
   a: BigInt(0),
@@ -1348,10 +1348,10 @@ const Ot = ts(ut, void 0, void 0, { sqrt: cr }), _e = hs({
     splitScalar: (e) => {
       const t = tt, n = BigInt("0x3086d221a7d46bcde86c90e49284eb15"), r = -ar * BigInt("0xe4437ed6010e88286f547fa90abfe4c3"), i = BigInt("0x114ca50f7a8e2f3f657c1108d9d44cfd8"), s = n, o = BigInt("0x100000000000000000000000000000000"), c = $n(s * e, t), a = $n(-r * e, t);
       let l = V(e - c * n - a * i, t), f = V(-c * r - a * s, t);
-      const u = l > o, p = f > o;
-      if (u && (l = t - l), p && (f = t - f), l > o || f > o)
+      const u = l > o, y = f > o;
+      if (u && (l = t - l), y && (f = t - f), l > o || f > o)
         throw new Error("splitScalar: Endomorphism failed, k=" + e);
-      return { k1neg: u, k1: l, k2neg: p, k2: f };
+      return { k1neg: u, k1: l, k2neg: y, k2: f };
     }
   }
 }, $t), lt = BigInt(0), ur = (e) => typeof e == "bigint" && lt < e && e < ut, ds = (e) => typeof e == "bigint" && lt < e && e < tt, Rn = {};
@@ -1387,8 +1387,8 @@ function gs(e, t, n = Yn(32)) {
   const r = Z("message", e), { bytes: i, scalar: s } = Pt(t), o = Z("auxRand", n, 32), c = Mt(s ^ G(rt("BIP0340/aux", o))), a = rt("BIP0340/nonce", c, i, r), l = Ge(G(a));
   if (l === lt)
     throw new Error("sign failed: k is zero");
-  const { bytes: f, scalar: u } = Pt(l), p = fr(f, i, r), w = new Uint8Array(64);
-  if (w.set(f, 0), w.set(Mt(Ge(u + p * s)), 32), !hr(w, r, i))
+  const { bytes: f, scalar: u } = Pt(l), y = fr(f, i, r), w = new Uint8Array(64);
+  if (w.set(f, 0), w.set(Mt(Ge(u + y * s)), 32), !hr(w, r, i))
     throw new Error("sign: Invalid signature produced");
   return w;
 }
@@ -1422,7 +1422,7 @@ const Ze = {
   }
 }, Ct = typeof globalThis == "object" && "crypto" in globalThis ? globalThis.crypto : void 0;
 /*! noble-hashes - MIT License (c) 2022 Paul Miller (paulmillr.com) */
-const Qt = (e) => e instanceof Uint8Array, Bt = (e) => new DataView(e.buffer, e.byteOffset, e.byteLength), ie = (e, t) => e << 32 - t | e >>> t, ws = new Uint8Array(new Uint32Array([287454020]).buffer)[0] === 68;
+const Qt = (e) => e instanceof Uint8Array, kt = (e) => new DataView(e.buffer, e.byteOffset, e.byteLength), ie = (e, t) => e << 32 - t | e >>> t, ws = new Uint8Array(new Uint32Array([287454020]).buffer)[0] === 68;
 if (!ws)
   throw new Error("Non little-endian hardware is not supported");
 const bs = Array.from({ length: 256 }, (e, t) => t.toString(16).padStart(2, "0"));
@@ -1530,7 +1530,7 @@ function Ns(e, t, n, r) {
 }
 class Ss extends dr {
   constructor(t, n, r, i) {
-    super(), this.blockLen = t, this.outputLen = n, this.padOffset = r, this.isLE = i, this.finished = !1, this.length = 0, this.pos = 0, this.destroyed = !1, this.buffer = new Uint8Array(t), this.view = Bt(this.buffer);
+    super(), this.blockLen = t, this.outputLen = n, this.padOffset = r, this.isLE = i, this.finished = !1, this.length = 0, this.pos = 0, this.destroyed = !1, this.buffer = new Uint8Array(t), this.view = kt(this.buffer);
   }
   update(t) {
     se.exists(this);
@@ -1540,7 +1540,7 @@ class Ss extends dr {
     for (let o = 0; o < s; ) {
       const c = Math.min(i - this.pos, s - o);
       if (c === i) {
-        const a = Bt(t);
+        const a = kt(t);
         for (; i <= s - o; o += i)
           this.process(a, o);
         continue;
@@ -1557,7 +1557,7 @@ class Ss extends dr {
     for (let u = o; u < i; u++)
       n[u] = 0;
     Ns(r, i - 8, BigInt(this.length * 8), s), this.process(r, 0);
-    const c = Bt(t), a = this.outputLen;
+    const c = kt(t), a = this.outputLen;
     if (a % 4)
       throw new Error("_sha2: outputLen should be aligned to 32bit");
     const l = a / 4, f = this.get();
@@ -1578,7 +1578,7 @@ class Ss extends dr {
     return t.length = i, t.pos = c, t.finished = s, t.destroyed = o, i % n && t.buffer.set(r), t;
   }
 }
-const As = (e, t, n) => e & t ^ ~e & n, Cs = (e, t, n) => e & t ^ e & n ^ t & n, Bs = new Uint32Array([
+const As = (e, t, n) => e & t ^ ~e & n, Cs = (e, t, n) => e & t ^ e & n ^ t & n, ks = new Uint32Array([
   1116352408,
   1899447441,
   3049323471,
@@ -1669,12 +1669,12 @@ class wr extends Ss {
     for (let u = 0; u < 16; u++, n += 4)
       Ee[u] = t.getUint32(n, !1);
     for (let u = 16; u < 64; u++) {
-      const p = Ee[u - 15], w = Ee[u - 2], g = ie(p, 7) ^ ie(p, 18) ^ p >>> 3, h = ie(w, 17) ^ ie(w, 19) ^ w >>> 10;
+      const y = Ee[u - 15], w = Ee[u - 2], g = ie(y, 7) ^ ie(y, 18) ^ y >>> 3, h = ie(w, 17) ^ ie(w, 19) ^ w >>> 10;
       Ee[u] = h + Ee[u - 7] + g + Ee[u - 16] | 0;
     }
     let { A: r, B: i, C: s, D: o, E: c, F: a, G: l, H: f } = this;
     for (let u = 0; u < 64; u++) {
-      const p = ie(c, 6) ^ ie(c, 11) ^ ie(c, 25), w = f + p + As(c, a, l) + Bs[u] + Ee[u] | 0, h = (ie(r, 2) ^ ie(r, 13) ^ ie(r, 22)) + Cs(r, i, s) | 0;
+      const y = ie(c, 6) ^ ie(c, 11) ^ ie(c, 25), w = f + y + As(c, a, l) + ks[u] + Ee[u] | 0, h = (ie(r, 2) ^ ie(r, 13) ^ ie(r, 22)) + Cs(r, i, s) | 0;
       f = l, l = a, a = c, c = o + w | 0, o = s, s = i, i = r, r = w + h | 0;
     }
     r = r + this.A | 0, i = i + this.B | 0, s = s + this.C | 0, o = o + this.D | 0, c = c + this.E | 0, a = a + this.F | 0, l = l + this.G | 0, f = f + this.H | 0, this.set(r, i, s, o, c, a, l, f);
@@ -1686,13 +1686,13 @@ class wr extends Ss {
     this.set(0, 0, 0, 0, 0, 0, 0, 0), this.buffer.fill(0);
   }
 }
-class ks extends wr {
+class Bs extends wr {
   constructor() {
     super(), this.A = -1056596264, this.B = 914150663, this.C = 812702999, this.D = -150054599, this.E = -4191439, this.F = 1750603025, this.G = 1694076839, this.H = -1090891868, this.outputLen = 28;
   }
 }
 const fe = pr(() => new wr());
-pr(() => new ks());
+pr(() => new Bs());
 /*! scure-base - MIT License (c) 2022 Paul Miller (paulmillr.com) */
 function We(e) {
   if (!Number.isSafeInteger(e))
@@ -1937,14 +1937,14 @@ function Hn(e, t, n = 1) {
 }
 function mr(e) {
   const t = e === "bech32" ? 1 : 734539939, n = Se(5), r = n.decode, i = n.encode, s = On(r);
-  function o(f, u, p = 90) {
+  function o(f, u, y = 90) {
     if (typeof f != "string")
       throw new Error(`bech32.encode prefix should be string, not ${typeof f}`);
     if (!Array.isArray(u) || u.length && typeof u[0] != "number")
       throw new Error(`bech32.encode words should be array of numbers, not ${typeof u}`);
     const w = f.length + 7 + u.length;
-    if (p !== !1 && w > p)
-      throw new TypeError(`Length ${w} exceeds limit ${p}`);
+    if (y !== !1 && w > y)
+      throw new TypeError(`Length ${w} exceeds limit ${y}`);
     return f = f.toLowerCase(), `${f}1${jt.encode(u)}${Hn(f, u, t)}`;
   }
   function c(f, u = 90) {
@@ -1952,25 +1952,25 @@ function mr(e) {
       throw new Error(`bech32.decode input should be string, not ${typeof f}`);
     if (f.length < 8 || u !== !1 && f.length > u)
       throw new TypeError(`Wrong string length: ${f.length} (${f}). Expected (8..${u})`);
-    const p = f.toLowerCase();
-    if (f !== p && f !== f.toUpperCase())
+    const y = f.toLowerCase();
+    if (f !== y && f !== f.toUpperCase())
       throw new Error("String must be lowercase or uppercase");
-    f = p;
+    f = y;
     const w = f.lastIndexOf("1");
     if (w === 0 || w === -1)
       throw new Error('Letter "1" must be present between prefix and data only');
     const g = 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 = jt.decode(h).slice(0, -6), y = Hn(g, d, t);
-    if (!h.endsWith(y))
-      throw new Error(`Invalid checksum in ${f}: expected "${y}"`);
+    const d = jt.decode(h).slice(0, -6), p = Hn(g, d, t);
+    if (!h.endsWith(p))
+      throw new Error(`Invalid checksum in ${f}: expected "${p}"`);
     return { prefix: g, words: d };
   }
   const a = On(c);
   function l(f) {
-    const { prefix: u, words: p } = c(f, !1);
-    return { prefix: u, words: p, bytes: r(p) };
+    const { prefix: u, words: y } = c(f, !1);
+    return { prefix: u, words: y, bytes: r(y) };
   }
   return { encode: o, decode: c, decodeToBytes: l, decodeUnsafe: a, fromWords: r, fromWordsUnsafe: s, toWords: i };
 }
@@ -1994,7 +1994,7 @@ const Rs = {
   base58xmr: $s
 };
 `${Object.keys(Os).join(", ")}`;
-function kt(e) {
+function Bt(e) {
   if (!Number.isSafeInteger(e) || e < 0)
     throw new Error(`positive integer expected, not ${e}`);
 }
@@ -2104,11 +2104,11 @@ function qn(e, t, n, r, i) {
   t ^= e[a++], n ^= e[a++], r ^= e[a++], i ^= e[a++];
   const l = e.length / 4 - 2;
   for (let g = 0; g < l; g++) {
-    const h = e[a++] ^ xe(o, c, t, n, r, i), d = e[a++] ^ xe(o, c, n, r, i, t), y = e[a++] ^ xe(o, c, r, i, t, n), E = e[a++] ^ xe(o, c, i, t, n, r);
-    t = h, n = d, r = y, i = E;
+    const h = e[a++] ^ xe(o, c, t, n, r, i), d = e[a++] ^ xe(o, c, n, r, i, t), p = e[a++] ^ xe(o, c, r, i, t, n), m = e[a++] ^ xe(o, c, i, t, n, r);
+    t = h, n = d, r = p, i = m;
   }
-  const f = e[a++] ^ oe(s, t, n, r, i), u = e[a++] ^ oe(s, n, r, i, t), p = e[a++] ^ oe(s, r, i, t, n), w = e[a++] ^ oe(s, i, t, n, r);
-  return { s0: f, s1: u, s2: p, s3: w };
+  const f = e[a++] ^ oe(s, t, n, r, i), u = e[a++] ^ oe(s, n, r, i, t), y = e[a++] ^ oe(s, r, i, t, n), w = e[a++] ^ oe(s, i, t, n, r);
+  return { s0: f, s1: u, s2: y, s3: w };
 }
 function Fs(e, t, n, r, i) {
   const { sbox2: s, T01: o, T23: c } = xr;
@@ -2116,11 +2116,11 @@ function Fs(e, t, n, r, i) {
   t ^= e[a++], n ^= e[a++], r ^= e[a++], i ^= e[a++];
   const l = e.length / 4 - 2;
   for (let g = 0; g < l; g++) {
-    const h = e[a++] ^ xe(o, c, t, i, r, n), d = e[a++] ^ xe(o, c, n, t, i, r), y = e[a++] ^ xe(o, c, r, n, t, i), E = e[a++] ^ xe(o, c, i, r, n, t);
-    t = h, n = d, r = y, i = E;
+    const h = e[a++] ^ xe(o, c, t, i, r, n), d = e[a++] ^ xe(o, c, n, t, i, r), p = e[a++] ^ xe(o, c, r, n, t, i), m = e[a++] ^ xe(o, c, i, r, n, t);
+    t = h, n = d, r = p, i = m;
   }
-  const f = e[a++] ^ oe(s, t, i, r, n), u = e[a++] ^ oe(s, n, t, i, r), p = e[a++] ^ oe(s, r, n, t, i), w = e[a++] ^ oe(s, i, r, n, t);
-  return { s0: f, s1: u, s2: p, s3: w };
+  const f = e[a++] ^ oe(s, t, i, r, n), u = e[a++] ^ oe(s, n, t, i, r), y = e[a++] ^ oe(s, r, n, t, i), w = e[a++] ^ oe(s, i, r, n, t);
+  return { s0: f, s1: u, s2: y, s3: w };
 }
 function Nr(e, t) {
   if (!t)
@@ -2175,24 +2175,24 @@ const Sr = /* @__PURE__ */ qs({ blockSize: 16, nonceLength: 16 }, function(t, n,
   return {
     encrypt: (s, o) => {
       const c = Kr(t), { b: a, o: l, out: f } = Js(s, i, o), u = F(n);
-      let p = u[0], w = u[1], g = u[2], h = u[3], d = 0;
+      let y = u[0], w = u[1], g = u[2], h = u[3], d = 0;
       for (; d + 4 <= a.length; )
-        p ^= a[d + 0], w ^= a[d + 1], g ^= a[d + 2], h ^= a[d + 3], { s0: p, s1: w, s2: g, s3: h } = qn(c, p, w, g, h), l[d++] = p, l[d++] = w, l[d++] = g, l[d++] = h;
+        y ^= a[d + 0], w ^= a[d + 1], g ^= a[d + 2], h ^= a[d + 3], { s0: y, s1: w, s2: g, s3: h } = qn(c, y, w, g, h), l[d++] = y, l[d++] = w, l[d++] = g, l[d++] = h;
       if (i) {
-        const y = Xs(s.subarray(d * 4));
-        p ^= y[0], w ^= y[1], g ^= y[2], h ^= y[3], { s0: p, s1: w, s2: g, s3: h } = qn(c, p, w, g, h), l[d++] = p, l[d++] = w, l[d++] = g, l[d++] = h;
+        const p = Xs(s.subarray(d * 4));
+        y ^= p[0], w ^= p[1], g ^= p[2], h ^= p[3], { s0: y, s1: w, s2: g, s3: h } = qn(c, y, w, g, h), l[d++] = y, l[d++] = w, l[d++] = g, l[d++] = h;
       }
       return c.fill(0), f;
     },
     decrypt: (s, o) => {
       Gs(s);
       const c = Zs(t), a = F(n), l = Nr(s.length, o), f = F(s), u = F(l);
-      let p = a[0], w = a[1], g = a[2], h = a[3];
+      let y = a[0], w = a[1], g = a[2], h = a[3];
       for (let d = 0; d + 4 <= f.length; ) {
-        const y = p, E = w, S = g, _ = h;
-        p = f[d + 0], w = f[d + 1], g = f[d + 2], h = f[d + 3];
-        const { s0: B, s1: m, s2: x, s3: K } = Fs(c, p, w, g, h);
-        u[d++] = B ^ y, u[d++] = m ^ E, u[d++] = x ^ S, u[d++] = K ^ _;
+        const p = y, m = w, S = g, _ = h;
+        y = f[d + 0], w = f[d + 1], g = f[d + 2], h = f[d + 3];
+        const { s0: k, s1: E, s2: x, s3: K } = Fs(c, y, w, g, h);
+        u[d++] = k ^ p, u[d++] = E ^ m, u[d++] = x ^ S, u[d++] = K ^ _;
       }
       return c.fill(0), Ys(l, i);
     }
@@ -2205,24 +2205,24 @@ function L(e, t) {
 function Wt(e) {
   return e.byteOffset % 4 === 0;
 }
-const Xe = 64, no = 16, Br = 2 ** 32 - 1, jn = new Uint32Array();
+const Xe = 64, no = 16, kr = 2 ** 32 - 1, jn = new Uint32Array();
 function ro(e, t, n, r, i, s, o, c) {
-  const a = i.length, l = new Uint8Array(Xe), f = F(l), u = Wt(i) && Wt(s), p = u ? F(i) : jn, w = u ? F(s) : jn;
+  const a = i.length, l = new Uint8Array(Xe), f = F(l), u = Wt(i) && Wt(s), y = u ? F(i) : jn, w = u ? F(s) : jn;
   for (let g = 0; g < a; o++) {
-    if (e(t, n, r, f, o, c), o >= Br)
+    if (e(t, n, r, f, o, c), o >= kr)
       throw new Error("arx: counter overflow");
     const h = Math.min(Xe, a - g);
     if (u && h === Xe) {
       const d = g / 4;
       if (g % 4 !== 0)
         throw new Error("arx: invalid block position");
-      for (let y = 0, E; y < no; y++)
-        E = d + y, w[E] = p[E] ^ f[y];
+      for (let p = 0, m; p < no; p++)
+        m = d + p, w[m] = y[m] ^ f[p];
       g += Xe;
       continue;
     }
-    for (let d = 0, y; d < h; d++)
-      y = g + d, s[y] = i[y] ^ l[d];
+    for (let d = 0, p; d < h; d++)
+      p = g + d, s[p] = i[p] ^ l[d];
     g += h;
   }
 }
@@ -2230,13 +2230,13 @@ function io(e, t) {
   const { allowShortKeys: n, extendNonceFn: r, counterLength: i, counterRight: s, rounds: o } = Hs({ allowShortKeys: !1, counterLength: 8, counterRight: !1, rounds: 20 }, t);
   if (typeof e != "function")
     throw new Error("core must be a function");
-  return kt(i), kt(o), Dn(s), Dn(n), (c, a, l, f, u = 0) => {
+  return Bt(i), Bt(o), Dn(s), Dn(n), (c, a, l, f, u = 0) => {
     ue(c), ue(a), ue(l);
-    const p = l.length;
-    if (f || (f = new Uint8Array(p)), ue(f), kt(u), u < 0 || u >= Br)
+    const y = l.length;
+    if (f || (f = new Uint8Array(y)), ue(f), Bt(u), u < 0 || u >= kr)
       throw new Error("arx: counter overflow");
-    if (f.length < p)
-      throw new Error(`arx: output (${f.length}) is shorter than data (${p})`);
+    if (f.length < y)
+      throw new Error(`arx: output (${f.length}) is shorter than data (${y})`);
     const w = [];
     let g = c.length, h, d;
     if (g === 32)
@@ -2246,33 +2246,33 @@ function io(e, t) {
     else
       throw new Error(`arx: invalid 32-byte key, got length=${g}`);
     Wt(a) || (a = a.slice(), w.push(a));
-    const y = F(h);
+    const p = F(h);
     if (r) {
       if (a.length !== 24)
         throw new Error("arx: extended nonce must be 24 bytes");
-      r(d, y, F(a.subarray(0, 16)), y), a = a.subarray(16);
+      r(d, p, F(a.subarray(0, 16)), p), a = a.subarray(16);
     }
-    const E = 16 - i;
-    if (E !== a.length)
-      throw new Error(`arx: nonce must be ${E} or 16 bytes`);
-    if (E !== 12) {
+    const m = 16 - i;
+    if (m !== a.length)
+      throw new Error(`arx: nonce must be ${m} or 16 bytes`);
+    if (m !== 12) {
       const _ = new Uint8Array(12);
       _.set(a, s ? 0 : 12 - a.length), a = _, w.push(a);
     }
     const S = F(a);
-    for (ro(e, d, y, S, l, f, u, o); w.length > 0; )
+    for (ro(e, d, p, S, l, f, u, o); w.length > 0; )
       w.pop().fill(0);
     return f;
   };
 }
 function so(e, t, n, r, i, s = 20) {
-  let o = e[0], c = e[1], a = e[2], l = e[3], f = t[0], u = t[1], p = t[2], w = t[3], g = t[4], h = t[5], d = t[6], y = t[7], E = i, S = n[0], _ = n[1], B = n[2], m = o, x = c, K = a, M = l, I = f, A = u, R = p, T = w, D = g, b = h, v = d, N = y, k = E, C = S, U = _, O = B;
+  let o = e[0], c = e[1], a = e[2], l = e[3], f = t[0], u = t[1], y = t[2], w = t[3], g = t[4], h = t[5], d = t[6], p = t[7], m = i, S = n[0], _ = n[1], k = n[2], E = o, x = c, K = a, M = l, I = f, A = u, R = y, T = w, D = g, b = h, v = d, N = p, B = m, C = S, U = _, O = k;
   for (let ee = 0; ee < s; ee += 2)
-    m = m + I | 0, k = L(k ^ m, 16), D = D + k | 0, I = L(I ^ D, 12), m = m + I | 0, k = L(k ^ m, 8), D = D + k | 0, I = L(I ^ D, 7), x = x + A | 0, C = L(C ^ x, 16), b = b + C | 0, A = L(A ^ b, 12), x = x + A | 0, C = L(C ^ x, 8), b = b + C | 0, A = L(A ^ b, 7), K = K + R | 0, U = L(U ^ K, 16), v = v + U | 0, R = L(R ^ v, 12), K = K + R | 0, U = L(U ^ K, 8), v = v + U | 0, R = L(R ^ v, 7), M = M + T | 0, O = L(O ^ M, 16), N = N + O | 0, T = L(T ^ N, 12), M = M + T | 0, O = L(O ^ M, 8), N = N + O | 0, T = L(T ^ N, 7), m = m + A | 0, O = L(O ^ m, 16), v = v + O | 0, A = L(A ^ v, 12), m = m + A | 0, O = L(O ^ m, 8), v = v + O | 0, A = L(A ^ v, 7), x = x + R | 0, k = L(k ^ x, 16), N = N + k | 0, R = L(R ^ N, 12), x = x + R | 0, k = L(k ^ x, 8), N = N + k | 0, R = L(R ^ N, 7), K = K + T | 0, C = L(C ^ K, 16), D = D + C | 0, T = L(T ^ D, 12), K = K + T | 0, C = L(C ^ K, 8), D = D + C | 0, T = L(T ^ D, 7), M = M + I | 0, U = L(U ^ M, 16), b = b + U | 0, I = L(I ^ b, 12), M = M + I | 0, U = L(U ^ M, 8), b = b + U | 0, I = L(I ^ b, 7);
+    E = E + I | 0, B = L(B ^ E, 16), D = D + B | 0, I = L(I ^ D, 12), E = E + I | 0, B = L(B ^ E, 8), D = D + B | 0, I = L(I ^ D, 7), x = x + A | 0, C = L(C ^ x, 16), b = b + C | 0, A = L(A ^ b, 12), x = x + A | 0, C = L(C ^ x, 8), b = b + C | 0, A = L(A ^ b, 7), K = K + R | 0, U = L(U ^ K, 16), v = v + U | 0, R = L(R ^ v, 12), K = K + R | 0, U = L(U ^ K, 8), v = v + U | 0, R = L(R ^ v, 7), M = M + T | 0, O = L(O ^ M, 16), N = N + O | 0, T = L(T ^ N, 12), M = M + T | 0, O = L(O ^ M, 8), N = N + O | 0, T = L(T ^ N, 7), E = E + A | 0, O = L(O ^ E, 16), v = v + O | 0, A = L(A ^ v, 12), E = E + A | 0, O = L(O ^ E, 8), v = v + O | 0, A = L(A ^ v, 7), x = x + R | 0, B = L(B ^ x, 16), N = N + B | 0, R = L(R ^ N, 12), x = x + R | 0, B = L(B ^ x, 8), N = N + B | 0, R = L(R ^ N, 7), K = K + T | 0, C = L(C ^ K, 16), D = D + C | 0, T = L(T ^ D, 12), K = K + T | 0, C = L(C ^ K, 8), D = D + C | 0, T = L(T ^ D, 7), M = M + I | 0, U = L(U ^ M, 16), b = b + U | 0, I = L(I ^ b, 12), M = M + I | 0, U = L(U ^ M, 8), b = b + U | 0, I = L(I ^ b, 7);
   let $ = 0;
-  r[$++] = o + m | 0, r[$++] = c + x | 0, r[$++] = a + K | 0, r[$++] = l + M | 0, r[$++] = f + I | 0, r[$++] = u + A | 0, r[$++] = p + R | 0, r[$++] = w + T | 0, r[$++] = g + D | 0, r[$++] = h + b | 0, r[$++] = d + v | 0, r[$++] = y + N | 0, r[$++] = E + k | 0, r[$++] = S + C | 0, r[$++] = _ + U | 0, r[$++] = B + O | 0;
+  r[$++] = o + E | 0, r[$++] = c + x | 0, r[$++] = a + K | 0, r[$++] = l + M | 0, r[$++] = f + I | 0, r[$++] = u + A | 0, r[$++] = y + R | 0, r[$++] = w + T | 0, r[$++] = g + D | 0, r[$++] = h + b | 0, r[$++] = d + v | 0, r[$++] = p + N | 0, r[$++] = m + B | 0, r[$++] = S + C | 0, r[$++] = _ + U | 0, r[$++] = k + O | 0;
 }
-const kr = /* @__PURE__ */ io(so, {
+const Br = /* @__PURE__ */ io(so, {
   counterRight: !1,
   counterLength: 4,
   allowShortKeys: !1
@@ -2447,7 +2447,7 @@ function De(e) {
   let t = fe(ne.encode(yo(e)));
   return P(t);
 }
-var yt = new po(), ke = yt.generateSecretKey, ae = yt.getPublicKey, Q = yt.finalizeEvent, gt = yt.verifyEvent, go = {};
+var yt = new po(), Be = yt.generateSecretKey, ae = yt.getPublicKey, Q = yt.finalizeEvent, gt = yt.verifyEvent, go = {};
 H(go, {
   Application: () => ya,
   BadgeAward: () => No,
@@ -2507,14 +2507,14 @@ H(go, {
   OpenTimestamps: () => So,
   Pinlist: () => Do,
   PrivateDirectMessage: () => Or,
-  ProblemTracker: () => Bo,
+  ProblemTracker: () => ko,
   ProfileBadges: () => aa,
   PublicChatsList: () => Wo,
   Reaction: () => un,
   RecommendRelay: () => mo,
   RelayList: () => qo,
   Relaysets: () => ia,
-  Report: () => ko,
+  Report: () => Bo,
   Reporting: () => Io,
   Repost: () => cn,
   Seal: () => Tr,
@@ -2552,12 +2552,12 @@ function bo(e, t) {
   const n = t instanceof Array ? t : [t];
   return pt(e) && n.includes(e.kind) || !1;
 }
-var vo = 0, Rr = 1, mo = 2, Eo = 3, xo = 4, Ko = 5, cn = 6, un = 7, No = 8, Tr = 13, Or = 14, ln = 16, Mr = 40, Pr = 41, Hr = 42, Dr = 43, qr = 44, So = 1040, jr = 1059, Ao = 1063, Co = 1311, Bo = 1971, ko = 1984, Io = 1984, _o = 1985, Uo = 4550, Lo = 5999, $o = 6999, Ro = 7e3, To = 9041, Oo = 9734, Mo = 9735, Po = 9802, Ho = 1e4, Do = 10001, qo = 10002, jo = 10003, zo = 10004, Wo = 10005, Vo = 10006, Zo = 10007, Fo = 10015, Go = 10030, Jo = 10050, Yo = 10096, Xo = 13194, Qo = 21e3, zr = 22242, Wr = 23194, ea = 23195, ta = 24133, fn = 27235, na = 3e4, ra = 30001, ia = 30002, sa = 30003, oa = 30004, aa = 30008, ca = 30009, ua = 30015, la = 30017, fa = 30018, ha = 30023, da = 30024, pa = 30030, ya = 30078, ga = 30311, wa = 30315, ba = 30402, va = 30403, ma = 31922, Ea = 31923, xa = 31924, Ka = 31925, Na = 31989, Sa = 31990, Aa = 34550, Ca = {};
+var vo = 0, Rr = 1, mo = 2, Eo = 3, xo = 4, Ko = 5, cn = 6, un = 7, No = 8, Tr = 13, Or = 14, ln = 16, Mr = 40, Pr = 41, Hr = 42, Dr = 43, qr = 44, So = 1040, jr = 1059, Ao = 1063, Co = 1311, ko = 1971, Bo = 1984, Io = 1984, _o = 1985, Uo = 4550, Lo = 5999, $o = 6999, Ro = 7e3, To = 9041, Oo = 9734, Mo = 9735, Po = 9802, Ho = 1e4, Do = 10001, qo = 10002, jo = 10003, zo = 10004, Wo = 10005, Vo = 10006, Zo = 10007, Fo = 10015, Go = 10030, Jo = 10050, Yo = 10096, Xo = 13194, Qo = 21e3, zr = 22242, Wr = 23194, ea = 23195, ta = 24133, fn = 27235, na = 3e4, ra = 30001, ia = 30002, sa = 30003, oa = 30004, aa = 30008, ca = 30009, ua = 30015, la = 30017, fa = 30018, ha = 30023, da = 30024, pa = 30030, ya = 30078, ga = 30311, wa = 30315, ba = 30402, va = 30403, ma = 31922, Ea = 31923, xa = 31924, Ka = 31925, Na = 31989, Sa = 31990, Aa = 34550, Ca = {};
 H(Ca, {
   getHex64: () => hn,
   getInt: () => Vr,
-  getSubscriptionId: () => Ba,
-  matchEventId: () => ka,
+  getSubscriptionId: () => ka,
+  matchEventId: () => Ba,
   matchEventKind: () => _a,
   matchEventPubkey: () => Ia
 });
@@ -2569,7 +2569,7 @@ function Vr(e, t) {
   let n = t.length, r = e.indexOf(`"${t}":`) + n + 3, i = e.slice(r), s = Math.min(i.indexOf(","), i.indexOf("}"));
   return parseInt(i.slice(0, s), 10);
 }
-function Ba(e) {
+function ka(e) {
   let t = e.slice(0, 22).indexOf('"EVENT"');
   if (t === -1)
     return null;
@@ -2582,7 +2582,7 @@ function Ba(e) {
   let s = r + 1 + i;
   return e.slice(r + 1, s);
 }
-function ka(e, t) {
+function Ba(e, t) {
   return t === hn(e, "id");
 }
 function Ia(e, t) {
@@ -2665,7 +2665,7 @@ function wt(e) {
         type: "nprofile",
         data: {
           pubkey: P(u[0][0]),
-          relays: u[1] ? u[1].map((p) => le.decode(p)) : []
+          relays: u[1] ? u[1].map((y) => le.decode(y)) : []
         }
       };
     }
@@ -2683,7 +2683,7 @@ function wt(e) {
         type: "nevent",
         data: {
           id: P(u[0][0]),
-          relays: u[1] ? u[1].map((p) => le.decode(p)) : [],
+          relays: u[1] ? u[1].map((y) => le.decode(y)) : [],
           author: (o = u[2]) != null && o[0] ? P(u[2][0]) : void 0,
           kind: (c = u[3]) != null && c[0] ? parseInt(P(u[3][0]), 16) : void 0
         }
@@ -2707,7 +2707,7 @@ function wt(e) {
           identifier: le.decode(u[0][0]),
           pubkey: P(u[2][0]),
           kind: parseInt(P(u[3][0]), 16),
-          relays: u[1] ? u[1].map((p) => le.decode(p)) : []
+          relays: u[1] ? u[1].map((y) => le.decode(y)) : []
         }
       };
     }
@@ -3066,14 +3066,14 @@ function fc(e) {
   };
 }
 function bn(e, t, n = yr(32)) {
-  const { chacha_key: r, chacha_nonce: i, hmac_key: s } = ni(t, n), o = uc(e), c = kr(r, i, o), a = ri(s, c, n);
+  const { chacha_key: r, chacha_nonce: i, hmac_key: s } = ni(t, n), o = uc(e), c = Br(r, i, o), a = ri(s, c, n);
   return he.encode(ft(new Uint8Array([2]), n, c, a));
 }
 function vn(e, t) {
   const { nonce: n, ciphertext: r, mac: i } = fc(e), { chacha_key: s, chacha_nonce: o, hmac_key: c } = ni(t, n), a = ri(c, r, n);
   if (!Ds(a, i))
     throw new Error("invalid MAC");
-  const l = kr(s, o, r);
+  const l = Br(s, o, r);
   return lc(l);
 }
 var hc = {
@@ -3106,7 +3106,7 @@ function ui(e, t, n) {
   );
 }
 function li(e, t) {
-  const n = ke();
+  const n = Be();
   return Q(
     {
       kind: jr,
@@ -3261,11 +3261,11 @@ function Cc(e) {
       author: n[1]
     };
 }
-var Bc = {};
-H(Bc, {
+var kc = {};
+H(kc, {
   parse: () => Ic
 });
-var kc = /\W/m, Vn = /\W |\W$|$|,| /m;
+var Bc = /\W/m, Vn = /\W |\W$|$|,| /m;
 function* Ic(e) {
   const t = e.length;
   let n = 0, r = 0;
@@ -3274,7 +3274,7 @@ function* Ic(e) {
     if (i === -1)
       break;
     if (e.substring(i - 5, i) === "nostr") {
-      const s = e.substring(i + 60).match(kc), o = s ? i + 60 + s.index : t;
+      const s = e.substring(i + 60).match(Bc), o = s ? i + 60 + s.index : t;
       try {
         let c, { data: a, type: l } = wt(e.substring(i + 1, o));
         switch (l) {
@@ -3539,40 +3539,31 @@ async function Jc(e) {
   }
   return null;
 }
-function Yc({
-  profile: e,
-  event: t,
-  amount: n,
-  relays: r,
-  comment: i = ""
-}) {
-  if (!n)
-    throw new Error("amount not given");
-  if (!e)
-    throw new Error("profile not given");
-  let s = {
+function Yc(e) {
+  let t = {
     kind: 9734,
     created_at: Math.round(Date.now() / 1e3),
-    content: i,
+    content: e.comment || "",
     tags: [
-      ["p", e],
-      ["amount", n.toString()],
-      ["relays", ...r]
+      ["p", "pubkey" in e ? e.pubkey : e.event.pubkey],
+      ["amount", e.amount.toString()],
+      ["relays", ...e.relays]
     ]
   };
-  if (t && typeof t == "string" && s.tags.push(["e", t]), t && typeof t == "object") {
-    if (on(t.kind)) {
-      const o = ["a", `${t.kind}:${t.pubkey}:`];
-      s.tags.push(o);
-    } else if (an(t.kind)) {
-      let o = t.tags.find(([a, l]) => a === "d" && l);
-      if (!o)
+  if ("event" in e) {
+    if (t.tags.push(["e", e.event.id]), on(e.event.kind)) {
+      const n = ["a", `${e.event.kind}:${e.event.pubkey}:`];
+      t.tags.push(n);
+    } else if (an(e.event.kind)) {
+      let n = e.event.tags.find(([i, s]) => i === "d" && s);
+      if (!n)
         throw new Error("d tag not found or is empty");
-      const c = ["a", `${t.kind}:${t.pubkey}:${o[1]}`];
-      s.tags.push(c);
+      const r = ["a", `${e.event.kind}:${e.event.pubkey}:${n[1]}`];
+      t.tags.push(r);
     }
+    t.tags.push(["k", e.event.kind.toString()]);
   }
-  return s;
+  return t;
 }
 function Xc(e) {
   let t;
@@ -3874,7 +3865,7 @@ class ot {
    * @returns A new Session instance
    */
   static init(t, n, r, i, s, o) {
-    const c = ke();
+    const c = Be();
     let a, l, f, u;
     i ? ([a, l] = Me(s, q.getConversationKey(c, n), 2), f = {
       publicKey: ae(r),
@@ -3886,7 +3877,7 @@ class ot {
       publicKey: ae(r),
       privateKey: r
     });
-    const p = {
+    const y = {
       rootKey: a,
       theirNextNostrPublicKey: n,
       ourCurrentNostrKey: f,
@@ -3897,7 +3888,7 @@ class ot {
       receivingChainMessageNumber: 0,
       previousSendingChainMessageCount: 0,
       skippedKeys: {}
-    }, w = new ot(t, p);
+    }, w = new ot(t, y);
     return o && (w.name = o), w;
   }
   /**
@@ -3978,7 +3969,7 @@ class ot {
     this.state.previousSendingChainMessageCount = this.state.sendingChainMessageNumber, this.state.sendingChainMessageNumber = 0, this.state.receivingChainMessageNumber = 0;
     const t = q.getConversationKey(this.state.ourNextNostrKey.privateKey, this.state.theirNextNostrPublicKey), [n, r] = Me(this.state.rootKey, t, 2);
     this.state.receivingChainKey = r, this.state.ourCurrentNostrKey = this.state.ourNextNostrKey;
-    const i = ke();
+    const i = Be();
     this.state.ourNextNostrKey = {
       publicKey: ae(i),
       privateKey: i
@@ -4089,7 +4080,7 @@ class Pe {
   static createNew(t, n, r) {
     if (!t)
       throw new Error("Inviter public key is required");
-    const i = ke(), s = ae(i), o = P(ke());
+    const i = Be(), s = ae(i), o = P(Be());
     return new Pe(
       s,
       o,
@@ -4140,7 +4131,7 @@ class Pe {
     const { tags: n } = t;
     if (!n)
       throw new Error("Invalid invite event: missing tags");
-    const r = (a = n.find(([p]) => p === "ephemeralKey")) == null ? void 0 : a[1], i = (l = n.find(([p]) => p === "sharedSecret")) == null ? void 0 : l[1], s = t.pubkey, o = (f = n.find(([p]) => p === "d")) == null ? void 0 : f[1], c = (u = o == null ? void 0 : o.split("/")) == null ? void 0 : u[2];
+    const r = (a = n.find(([y]) => y === "ephemeralKey")) == null ? void 0 : a[1], i = (l = n.find(([y]) => y === "sharedSecret")) == null ? void 0 : l[1], s = t.pubkey, o = (f = n.find(([y]) => y === "d")) == null ? void 0 : f[1], c = (u = o == null ? void 0 : o.split("/")) == null ? void 0 : u[2];
     if (!r || !i)
       throw new Error("Invalid invite event: missing session key or sharedSecret");
     return new Pe(
@@ -4241,29 +4232,33 @@ class Pe {
        * @param nostrSubscribe - A function to subscribe to Nostr events
        * @param inviteePublicKey - The invitee's public key
        * @param encryptor - The invitee's secret key or a signing/encrypt function
+       * @param deviceId - Optional device ID to identify the invitee's device
        * @returns An object containing the new session and an event to be published
        *
        * 1. Inner event: No signature, content encrypted with DH(inviter, invitee).
-       *    Purpose: Authenticate invitee. Contains invitee session key.
+       *    Purpose: Authenticate invitee. Contains invitee session key and deviceId.
        * 2. Envelope: No signature, content encrypted with DH(inviter, random key).
        *    Purpose: Contains inner event. Hides invitee from others who might have the shared Nostr key.
   
        * Note: You need to publish the returned event on Nostr using NDK or another Nostr system of your choice,
        * so the inviter can create the session on their side.
        */
-  async accept(t, n, r) {
-    const i = ke(), s = ae(i), o = this.inviter || this.inviterEphemeralPublicKey, c = j(this.sharedSecret), a = ot.init(t, this.inviterEphemeralPublicKey, i, !0, c, void 0), f = await (typeof r == "function" ? r : (d, y) => Promise.resolve(q.encrypt(d, Qe(r, y))))(s, o), u = {
+  async accept(t, n, r, i) {
+    const s = Be(), o = ae(s), c = this.inviter || this.inviterEphemeralPublicKey, a = j(this.sharedSecret), l = ot.init(t, this.inviterEphemeralPublicKey, s, !0, a, void 0), f = typeof r == "function" ? r : (m, S) => Promise.resolve(q.encrypt(m, Qe(r, S))), u = JSON.stringify({
+      sessionKey: o,
+      deviceId: i
+    }), y = await f(u, c), w = {
       pubkey: n,
-      content: await q.encrypt(f, c),
+      content: await q.encrypt(y, a),
       created_at: Math.floor(Date.now() / 1e3)
-    }, p = JSON.stringify(u), w = ke(), g = ae(w), h = {
+    }, g = JSON.stringify(w), h = Be(), d = ae(h), p = {
       kind: Zn,
-      pubkey: g,
-      content: q.encrypt(p, Qe(w, this.inviterEphemeralPublicKey)),
+      pubkey: d,
+      content: q.encrypt(g, Qe(h, this.inviterEphemeralPublicKey)),
       created_at: lu(),
       tags: [["p", this.inviterEphemeralPublicKey]]
     };
-    return { session: a, event: Q(h, w) };
+    return { session: l, event: Q(p, h) };
   }
   listen(t, n, r) {
     if (!this.inviterEphemeralPrivateKey)
@@ -4278,8 +4273,16 @@ class Pe {
           return;
         const o = await q.decrypt(s.content, Qe(this.inviterEphemeralPrivateKey, s.pubkey)), c = JSON.parse(o), a = j(this.sharedSecret), l = c.pubkey;
         this.usedBy.push(l);
-        const f = await q.decrypt(c.content, a), p = await (typeof t == "function" ? t : (h, d) => Promise.resolve(q.decrypt(h, Qe(t, d))))(f, l), w = s.id, g = ot.init(n, p, this.inviterEphemeralPrivateKey, !1, a, w);
-        r(g, l);
+        const f = await q.decrypt(c.content, a), y = await (typeof t == "function" ? t : (p, m) => Promise.resolve(q.decrypt(p, Qe(t, m))))(f, l);
+        let w, g;
+        try {
+          const p = JSON.parse(y);
+          w = p.sessionKey, g = p.deviceId;
+        } catch {
+          w = y;
+        }
+        const h = s.id, d = ot.init(n, w, this.inviterEphemeralPrivateKey, !1, a, h);
+        r(d, l, g);
       } catch {
       }
     });