nostr-double-ratchet 0.0.12 → 0.0.14

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

@@ -33,17 +33,17 @@ const Et = typeof globalThis == "object" && "crypto" in globalThis ? globalThis.
 const Vn = (e) => e instanceof Uint8Array, xt = (e) => new DataView(e.buffer, e.byteOffset, e.byteLength), re = (e, t) => e << 32 - t | e >>> t, xi = new Uint8Array(new Uint32Array([287454020]).buffer)[0] === 68;
 if (!xi)
   throw new Error("Non little-endian hardware is not supported");
-function Si(e) {
+function Ai(e) {
   if (typeof e != "string")
     throw new Error(`utf8ToBytes expected string, got ${typeof e}`);
   return new Uint8Array(new TextEncoder().encode(e));
 }
 function Wt(e) {
-  if (typeof e == "string" && (e = Si(e)), !Vn(e))
+  if (typeof e == "string" && (e = Ai(e)), !Vn(e))
     throw new Error(`expected Uint8Array, got ${typeof e}`);
   return e;
 }
-function Ai(...e) {
+function Ni(...e) {
   const t = new Uint8Array(e.reduce((r, i) => r + i.length, 0));
   let n = 0;
   return e.forEach((r) => {
@@ -58,7 +58,7 @@ let Wn = class {
     return this._cloneInto();
   }
 };
-function Ni(e) {
+function Si(e) {
   const t = (r) => e().update(Wt(r)).digest(), n = e();
   return t.outputLen = n.outputLen, t.blockLen = n.blockLen, t.create = () => e(), t;
 }
@@ -73,7 +73,7 @@ function Ki(e, t, n, r) {
   const i = BigInt(32), s = BigInt(4294967295), o = Number(n >> i & s), a = Number(n & s), c = r ? 4 : 0, l = r ? 0 : 4;
   e.setUint32(t + c, o, r), e.setUint32(t + l, a, r);
 }
-let ki = class extends Wn {
+let Ci = class extends Wn {
   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 = xt(this.buffer);
   }
@@ -123,7 +123,7 @@ let ki = class extends Wn {
     return t.length = i, t.pos = a, t.finished = s, t.destroyed = o, i % n && t.buffer.set(r), t;
   }
 };
-const Bi = (e, t, n) => e & t ^ ~e & n, Ci = (e, t, n) => e & t ^ e & n ^ t & n, Ui = /* @__PURE__ */ new Uint32Array([
+const Bi = (e, t, n) => e & t ^ ~e & n, ki = (e, t, n) => e & t ^ e & n ^ t & n, Ui = /* @__PURE__ */ new Uint32Array([
   1116352408,
   1899447441,
   3049323471,
@@ -198,7 +198,7 @@ const Bi = (e, t, n) => e & t ^ ~e & n, Ci = (e, t, n) => e & t ^ e & n ^ t & n,
   528734635,
   1541459225
 ]), ve = /* @__PURE__ */ new Uint32Array(64);
-let _i = class extends ki {
+let _i = 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 _i = class extends ki {
     }
     let { A: r, B: i, C: s, D: o, E: a, F: c, G: l, H: f } = this;
     for (let u = 0; u < 64; u++) {
-      const g = re(a, 6) ^ re(a, 11) ^ re(a, 25), b = f + g + Bi(a, c, l) + Ui[u] + ve[u] | 0, h = (re(r, 2) ^ re(r, 13) ^ re(r, 22)) + Ci(r, i, s) | 0;
+      const g = re(a, 6) ^ re(a, 11) ^ re(a, 25), b = f + g + Bi(a, c, l) + Ui[u] + ve[u] | 0, h = (re(r, 2) ^ re(r, 13) ^ re(r, 22)) + ki(r, i, s) | 0;
       f = l, l = c, c = a, a = 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, a = a + this.E | 0, c = c + this.F | 0, l = l + this.G | 0, f = f + this.H | 0, this.set(r, i, s, o, a, c, l, f);
@@ -231,7 +231,7 @@ let _i = class extends ki {
     this.set(0, 0, 0, 0, 0, 0, 0, 0), this.buffer.fill(0);
   }
 };
-const Lt = /* @__PURE__ */ Ni(() => new _i());
+const Lt = /* @__PURE__ */ Si(() => new _i());
 /*! noble-curves - MIT License (c) 2022 Paul Miller (paulmillr.com) */
 const Gn = BigInt(0), ot = BigInt(1), Ii = BigInt(2), at = (e) => e instanceof Uint8Array, Li = /* @__PURE__ */ Array.from({ length: 256 }, (e, t) => t.toString(16).padStart(2, "0"));
 function qe(e) {
@@ -274,11 +274,11 @@ function Gt(e) {
     throw new Error("Uint8Array expected");
   return Zt(qe(Uint8Array.from(e).reverse()));
 }
-function Ae(e, t) {
+function Ne(e, t) {
   return De(e.toString(16).padStart(t * 2, "0"));
 }
 function Ft(e, t) {
-  return Ae(e, t).reverse();
+  return Ne(e, t).reverse();
 }
 function $i(e) {
   return De(Fn(e));
@@ -331,7 +331,7 @@ function Oi(e) {
 function Mi(e, t) {
   return e >> BigInt(t) & ot;
 }
-const Hi = (e, t, n) => e | (n ? ot : Gn) << BigInt(t), Jt = (e) => (Ii << BigInt(e - 1)) - ot, St = (e) => new Uint8Array(e), kn = (e) => Uint8Array.from(e);
+const Pi = (e, t, n) => e | (n ? ot : Gn) << BigInt(t), Jt = (e) => (Ii << BigInt(e - 1)) - ot, At = (e) => new Uint8Array(e), Cn = (e) => Uint8Array.from(e);
 function Jn(e, t, n) {
   if (typeof e != "number" || e < 2)
     throw new Error("hashLen must be a number");
@@ -339,11 +339,11 @@ function Jn(e, t, n) {
     throw new Error("qByteLen must be a number");
   if (typeof n != "function")
     throw new Error("hmacFn must be a function");
-  let r = St(e), i = St(e), s = 0;
+  let r = At(e), i = At(e), s = 0;
   const o = () => {
     r.fill(1), i.fill(0), s = 0;
-  }, a = (...u) => n(i, r, ...u), c = (u = St()) => {
-    i = a(kn([0]), u), r = a(), u.length !== 0 && (i = a(kn([1]), u), r = a());
+  }, a = (...u) => n(i, r, ...u), c = (u = At()) => {
+    i = a(Cn([0]), u), r = a(), u.length !== 0 && (i = a(Cn([1]), u), r = a());
   }, l = () => {
     if (s++ >= 1e3)
       throw new Error("drbg: tried 1000 values");
@@ -364,7 +364,7 @@ function Jn(e, t, n) {
     return o(), b;
   };
 }
-const Pi = {
+const Hi = {
   bigint: (e) => typeof e == "bigint",
   function: (e) => typeof e == "function",
   boolean: (e) => typeof e == "boolean",
@@ -377,7 +377,7 @@ const Pi = {
 };
 function Je(e, t, n = {}) {
   const r = (i, s, o) => {
-    const a = Pi[s];
+    const a = Hi[s];
     if (typeof a != "function")
       throw new Error(`Invalid validator "${s}", expected function`);
     const c = e[i];
@@ -395,7 +395,7 @@ const qi = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   bitGet: Mi,
   bitLen: Oi,
   bitMask: Jt,
-  bitSet: Hi,
+  bitSet: Pi,
   bytesToHex: qe,
   bytesToNumberBE: F,
   bytesToNumberLE: Gt,
@@ -405,7 +405,7 @@ const qi = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   equalBytes: Ti,
   hexToBytes: De,
   hexToNumber: Zt,
-  numberToBytesBE: Ae,
+  numberToBytesBE: Ne,
   numberToBytesLE: Ft,
   numberToHexUnpadded: Fn,
   numberToVarBytesBE: $i,
@@ -413,7 +413,7 @@ const qi = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   validateObject: Je
 }, Symbol.toStringTag, { value: "Module" }));
 /*! noble-curves - MIT License (c) 2022 Paul Miller (paulmillr.com) */
-const z = BigInt(0), D = BigInt(1), ke = BigInt(2), Di = BigInt(3), $t = BigInt(4), Bn = BigInt(5), Cn = BigInt(8);
+const z = BigInt(0), j = BigInt(1), Ce = BigInt(2), Di = BigInt(3), $t = BigInt(4), Bn = BigInt(5), kn = BigInt(8);
 BigInt(9);
 BigInt(16);
 function V(e, t) {
@@ -423,11 +423,11 @@ function V(e, t) {
 function ji(e, t, n) {
   if (n <= z || t < z)
     throw new Error("Expected power/modulo > 0");
-  if (n === D)
+  if (n === j)
     return z;
-  let r = D;
+  let r = j;
   for (; t > z; )
-    t & D && (r = r * e % n), e = e * e % n, t >>= D;
+    t & j && (r = r * e % n), e = e * e % n, t >>= j;
   return r;
 }
 function J(e, t, n) {
@@ -439,24 +439,24 @@ function J(e, t, n) {
 function Tt(e, t) {
   if (e === z || t <= z)
     throw new Error(`invert: expected positive integers, got n=${e} mod=${t}`);
-  let n = V(e, t), r = t, i = z, s = D;
+  let n = V(e, t), r = t, i = z, s = j;
   for (; n !== z; ) {
     const a = r / n, c = r % n, l = i - s * a;
     r = n, n = c, i = s, s = l;
   }
-  if (r !== D)
+  if (r !== j)
     throw new Error("invert: does not exist");
   return V(i, t);
 }
 function zi(e) {
-  const t = (e - D) / ke;
+  const t = (e - j) / Ce;
   let n, r, i;
-  for (n = e - D, r = 0; n % ke === z; n /= ke, r++)
+  for (n = e - j, r = 0; n % Ce === z; n /= Ce, r++)
     ;
-  for (i = ke; i < e && ji(i, t, e) !== e - D; i++)
+  for (i = Ce; i < e && ji(i, t, e) !== e - j; i++)
     ;
   if (r === 1) {
-    const o = (e + D) / $t;
+    const o = (e + j) / $t;
     return function(c, l) {
       const f = c.pow(l, o);
       if (!c.eql(c.sqr(f), l))
@@ -464,7 +464,7 @@ function zi(e) {
       return f;
     };
   }
-  const s = (n + D) / ke;
+  const s = (n + j) / Ce;
   return function(a, c) {
     if (a.pow(c, t) === a.neg(a.ONE))
       throw new Error("Cannot find square root");
@@ -475,7 +475,7 @@ function zi(e) {
       let b = 1;
       for (let h = a.sqr(g); b < l && !a.eql(h, a.ONE); b++)
         h = a.sqr(h);
-      const p = a.pow(f, D << BigInt(l - b - 1));
+      const p = a.pow(f, j << BigInt(l - b - 1));
       f = a.sqr(p), u = a.mul(u, p), g = a.mul(g, f), l = b;
     }
     return u;
@@ -483,7 +483,7 @@ function zi(e) {
 }
 function Vi(e) {
   if (e % $t === Di) {
-    const t = (e + D) / $t;
+    const t = (e + j) / $t;
     return function(r, i) {
       const s = r.pow(i, t);
       if (!r.eql(r.sqr(s), i))
@@ -491,10 +491,10 @@ function Vi(e) {
       return s;
     };
   }
-  if (e % Cn === Bn) {
-    const t = (e - Bn) / Cn;
+  if (e % kn === Bn) {
+    const t = (e - Bn) / kn;
     return function(r, i) {
-      const s = r.mul(i, ke), o = r.pow(s, t), a = r.mul(i, o), c = r.mul(r.mul(a, ke), o), l = r.mul(a, r.sub(c, r.ONE));
+      const s = r.mul(i, Ce), o = r.pow(s, t), a = r.mul(i, o), c = r.mul(r.mul(a, Ce), o), l = r.mul(a, r.sub(c, r.ONE));
       if (!r.eql(r.sqr(l), i))
         throw new Error("Cannot find square root");
       return l;
@@ -535,11 +535,11 @@ function Gi(e, t, n) {
     throw new Error("Expected power > 0");
   if (n === z)
     return e.ONE;
-  if (n === D)
+  if (n === j)
     return t;
   let r = e.ONE, i = t;
   for (; n > z; )
-    n & D && (r = e.mul(r, i)), i = e.sqr(i), n >>= D;
+    n & j && (r = e.mul(r, i)), i = e.sqr(i), n >>= j;
   return r;
 }
 function Fi(e, t) {
@@ -562,7 +562,7 @@ function Ji(e, t, n = !1, r = {}) {
     BYTES: s,
     MASK: Jt(i),
     ZERO: z,
-    ONE: D,
+    ONE: j,
     create: (c) => V(c, e),
     isValid: (c) => {
       if (typeof c != "bigint")
@@ -570,7 +570,7 @@ function Ji(e, t, n = !1, r = {}) {
       return z <= c && c < e;
     },
     is0: (c) => c === z,
-    isOdd: (c) => (c & D) === D,
+    isOdd: (c) => (c & j) === j,
     neg: (c) => V(-c, e),
     eql: (c, l) => c === l,
     sqr: (c) => V(c * c, e),
@@ -590,7 +590,7 @@ function Ji(e, t, n = !1, r = {}) {
     // TODO: do we really need constant cmov?
     // We don't have const-time bigints anyway, so probably will be not very useful
     cmov: (c, l, f) => f ? l : c,
-    toBytes: (c) => n ? Ft(c, s) : Ae(c, s),
+    toBytes: (c) => n ? Ft(c, s) : Ne(c, s),
     fromBytes: (c) => {
       if (c.length !== s)
         throw new Error(`Fp.fromBytes: expected ${s}, got ${c.length}`);
@@ -613,11 +613,11 @@ function Yi(e, t, n = !1) {
   const r = e.length, i = Xn(t), s = Qn(t);
   if (r < 16 || r < s || r > 1024)
     throw new Error(`expected ${s}-1024 bytes of input, got ${r}`);
-  const o = n ? F(e) : Gt(e), a = V(o, t - D) + D;
-  return n ? Ft(a, i) : Ae(a, i);
+  const o = n ? F(e) : Gt(e), a = V(o, t - j) + j;
+  return n ? Ft(a, i) : Ne(a, i);
 }
 /*! noble-curves - MIT License (c) 2022 Paul Miller (paulmillr.com) */
-const Xi = BigInt(0), At = BigInt(1);
+const Xi = BigInt(0), Nt = BigInt(1);
 function Qi(e, t) {
   const n = (i, s) => {
     const o = s.negate();
@@ -632,7 +632,7 @@ function Qi(e, t) {
     unsafeLadder(i, s) {
       let o = e.ZERO, a = i;
       for (; s > Xi; )
-        s & At && (o = o.add(a)), a = a.double(), s >>= At;
+        s & Nt && (o = o.add(a)), a = a.double(), s >>= Nt;
       return o;
     },
     /**
@@ -670,9 +670,9 @@ function Qi(e, t) {
       for (let p = 0; p < a; p++) {
         const h = p * c;
         let d = Number(o & u);
-        o >>= b, d > c && (d -= g, o += At);
-        const y = h, E = h + Math.abs(d) - 1, N = p % 2 !== 0, _ = d < 0;
-        d === 0 ? f = f.add(n(N, s[y])) : l = l.add(n(_, s[E]));
+        o >>= b, d > c && (d -= g, o += Nt);
+        const y = h, E = h + Math.abs(d) - 1, S = p % 2 !== 0, _ = d < 0;
+        d === 0 ? f = f.add(n(S, s[y])) : l = l.add(n(_, s[E]));
       }
       return { p: l, f };
     },
@@ -795,13 +795,13 @@ function rs(e) {
         throw new Error("Invalid key");
       p = p.padStart(d * 2, "0");
     }
-    let N;
+    let S;
     try {
-      N = typeof p == "bigint" ? p : F(W("private key", p, d));
+      S = typeof p == "bigint" ? p : F(W("private key", p, d));
     } catch {
       throw new Error(`private key must be ${d} bytes, hex or bigint, not ${typeof p}`);
     }
-    return y && (N = V(N, E)), a(N), N;
+    return y && (S = V(S, E)), a(S), S;
   }
   const l = /* @__PURE__ */ new Map();
   function f(p) {
@@ -825,7 +825,7 @@ function rs(e) {
         throw new Error("invalid affine point");
       if (h instanceof u)
         throw new Error("projective point not allowed");
-      const E = (N) => n.eql(N, n.ZERO);
+      const E = (S) => n.eql(S, n.ZERO);
       return E(d) && E(y) ? u.ZERO : new u(d, y, n.ONE);
     }
     get x() {
@@ -887,7 +887,7 @@ function rs(e) {
      */
     equals(h) {
       f(h);
-      const { px: d, py: y, pz: E } = this, { px: N, py: _, pz: B } = h, m = n.eql(n.mul(d, B), n.mul(N, E)), x = n.eql(n.mul(y, B), n.mul(_, E));
+      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;
     }
     /**
@@ -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, y = n.mul(d, Un), { px: E, py: N, pz: _ } = this;
-      let B = n.ZERO, m = n.ZERO, x = n.ZERO, S = n.mul(E, E), H = n.mul(N, N), U = n.mul(_, _), K = n.mul(E, N);
-      return K = n.add(K, K), x = n.mul(E, _), x = n.add(x, x), B = n.mul(h, x), m = n.mul(y, U), m = n.add(B, m), B = n.sub(H, m), m = n.add(H, m), m = n.mul(B, m), B = n.mul(K, B), x = n.mul(y, x), U = n.mul(h, U), K = n.sub(S, U), K = n.mul(h, K), K = n.add(K, x), x = n.add(S, S), S = n.add(x, S), S = n.add(S, U), S = n.mul(S, K), m = n.add(m, S), U = n.mul(N, _), U = n.add(U, U), S = n.mul(U, K), B = n.sub(B, S), x = n.mul(U, H), x = n.add(x, x), x = n.add(x, x), new u(B, m, x);
+      const { a: h, b: d } = t, y = n.mul(d, Un), { px: E, py: S, pz: _ } = this;
+      let B = n.ZERO, m = n.ZERO, x = n.ZERO, A = n.mul(E, E), P = n.mul(S, S), U = n.mul(_, _), K = n.mul(E, S);
+      return K = n.add(K, K), x = n.mul(E, _), x = n.add(x, x), B = n.mul(h, x), m = n.mul(y, U), m = n.add(B, m), B = n.sub(P, m), m = n.add(P, m), m = n.mul(B, m), B = n.mul(K, B), x = n.mul(y, x), U = n.mul(h, U), K = n.sub(A, U), K = n.mul(h, K), K = n.add(K, x), x = n.add(A, A), A = n.add(x, A), A = n.add(A, U), A = n.mul(A, K), m = n.add(m, A), U = n.mul(S, _), U = n.add(U, U), A = n.mul(U, K), B = n.sub(B, A), x = n.mul(U, P), 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: y, pz: E } = this, { px: N, py: _, pz: B } = h;
-      let m = n.ZERO, x = n.ZERO, S = n.ZERO;
-      const H = t.a, U = n.mul(t.b, Un);
-      let K = n.mul(d, N), T = n.mul(y, _), R = n.mul(E, B), P = n.add(d, y), w = n.add(N, _);
-      P = n.mul(P, w), w = n.add(K, T), P = n.sub(P, w), w = n.add(d, E);
-      let v = n.add(N, B);
-      return w = n.mul(w, v), v = n.add(K, R), w = n.sub(w, v), v = n.add(y, E), m = n.add(_, B), v = n.mul(v, m), m = n.add(T, R), v = n.sub(v, m), S = n.mul(H, w), m = n.mul(U, R), S = n.add(m, S), m = n.sub(T, S), S = n.add(T, S), x = n.mul(m, S), T = n.add(K, K), T = n.add(T, K), R = n.mul(H, R), w = n.mul(U, w), T = n.add(T, R), R = n.sub(K, R), R = n.mul(H, R), w = n.add(w, R), K = n.mul(T, w), x = n.add(x, K), K = n.mul(v, w), m = n.mul(P, m), m = n.sub(m, K), K = n.mul(P, T), S = n.mul(v, S), S = n.add(S, K), new u(m, x, S);
+      const { px: d, py: y, pz: E } = this, { px: S, py: _, pz: B } = h;
+      let m = n.ZERO, x = n.ZERO, A = n.ZERO;
+      const P = t.a, U = n.mul(t.b, Un);
+      let K = n.mul(d, S), T = n.mul(y, _), R = n.mul(E, B), H = n.add(d, y), w = n.add(S, _);
+      H = n.mul(H, w), w = n.add(K, 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(K, R), w = n.sub(w, v), v = n.add(y, E), m = n.add(_, B), v = n.mul(v, m), m = n.add(T, R), v = n.sub(v, m), A = n.mul(P, w), m = n.mul(U, R), A = n.add(m, A), m = n.sub(T, A), A = n.add(T, A), x = n.mul(m, A), T = n.add(K, K), T = n.add(T, K), R = n.mul(P, R), w = n.mul(U, w), T = n.add(T, R), R = n.sub(K, R), R = n.mul(P, R), w = n.add(w, R), K = n.mul(T, w), x = n.add(x, K), K = n.mul(v, w), m = n.mul(H, m), m = n.sub(m, K), K = n.mul(H, T), A = n.mul(v, A), A = n.add(A, K), new u(m, x, A);
     }
     subtract(h) {
       return this.add(h.negate());
@@ -928,7 +928,7 @@ function rs(e) {
     wNAF(h) {
       return b.wNAFCached(this, l, h, (d) => {
         const y = n.invertBatch(d.map((E) => E.pz));
-        return d.map((E, N) => E.toAffine(y[N])).map(u.fromAffine);
+        return d.map((E, S) => E.toAffine(y[S])).map(u.fromAffine);
       });
     }
     /**
@@ -945,9 +945,9 @@ function rs(e) {
       const { endo: y } = t;
       if (!y)
         return b.unsafeLadder(this, h);
-      let { k1neg: E, k1: N, k2neg: _, k2: B } = y.splitScalar(h), m = d, x = d, S = this;
-      for (; N > ae || B > ae; )
-        N & Y && (m = m.add(S)), B & Y && (x = x.add(S)), S = S.double(), N >>= Y, B >>= Y;
+      let { k1neg: E, k1: S, k2neg: _, k2: B } = y.splitScalar(h), m = d, x = d, A = this;
+      for (; S > ae || B > ae; )
+        S & Y && (m = m.add(A)), B & Y && (x = x.add(A)), A = A.double(), S >>= Y, B >>= Y;
       return E && (m = m.negate()), _ && (x = x.negate()), x = new u(n.mul(x.px, y.beta), x.py, x.pz), m.add(x);
     }
     /**
@@ -962,11 +962,11 @@ function rs(e) {
     multiply(h) {
       a(h);
       let d = h, y, E;
-      const { endo: N } = t;
-      if (N) {
-        const { k1neg: _, k1: B, k2neg: m, k2: x } = N.splitScalar(d);
-        let { p: S, f: H } = this.wNAF(B), { p: U, f: K } = this.wNAF(x);
-        S = b.constTimeNegate(_, S), U = b.constTimeNegate(m, U), U = new u(n.mul(U.px, N.beta), U.py, U.pz), y = S.add(U), E = H.add(K);
+      const { endo: S } = t;
+      if (S) {
+        const { k1neg: _, k1: B, k2neg: m, k2: x } = S.splitScalar(d);
+        let { p: A, f: P } = this.wNAF(B), { p: U, f: K } = this.wNAF(x);
+        A = b.constTimeNegate(_, A), U = b.constTimeNegate(m, U), U = new u(n.mul(U.px, S.beta), U.py, U.pz), y = A.add(U), E = P.add(K);
       } else {
         const { p: _, f: B } = this.wNAF(d);
         y = _, E = B;
@@ -980,17 +980,17 @@ function rs(e) {
      * @returns non-zero affine point
      */
     multiplyAndAddUnsafe(h, d, y) {
-      const E = u.BASE, N = (B, m) => m === ae || m === Y || !B.equals(E) ? B.multiplyUnsafe(m) : B.multiply(m), _ = N(this, d).add(N(h, y));
+      const E = u.BASE, S = (B, m) => m === ae || m === Y || !B.equals(E) ? B.multiplyUnsafe(m) : B.multiply(m), _ = S(this, d).add(S(h, y));
       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, N = this.is0();
-      h == null && (h = N ? n.ONE : n.inv(E));
+      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);
-      if (N)
+      if (S)
         return { x: n.ZERO, y: n.ZERO };
       if (!n.eql(m, n.ONE))
         throw new Error("invZ was invalid");
@@ -1050,27 +1050,27 @@ function ss(e) {
   }
   const { ProjectivePoint: l, normPrivateKeyToScalar: f, weierstrassEquation: u, isWithinCurveOrder: g } = rs({
     ...t,
-    toBytes(w, v, A) {
-      const C = v.toAffine(), k = n.toBytes(C.x), I = Ue;
-      return A ? I(Uint8Array.from([v.hasEvenY() ? 2 : 3]), k) : I(Uint8Array.from([4]), k, n.toBytes(C.y));
+    toBytes(w, v, N) {
+      const k = v.toAffine(), C = n.toBytes(k.x), I = Ue;
+      return N ? I(Uint8Array.from([v.hasEvenY() ? 2 : 3]), C) : I(Uint8Array.from([4]), C, n.toBytes(k.y));
     },
     fromBytes(w) {
-      const v = w.length, A = w[0], C = w.subarray(1);
-      if (v === i && (A === 2 || A === 3)) {
-        const k = F(C);
-        if (!o(k))
+      const v = w.length, N = w[0], k = w.subarray(1);
+      if (v === i && (N === 2 || N === 3)) {
+        const C = F(k);
+        if (!o(C))
           throw new Error("Point is not on curve");
-        const I = u(k);
+        const I = u(C);
         let O = n.sqrt(I);
         const $ = (O & Y) === Y;
-        return (A & 1) === 1 !== $ && (O = n.neg(O)), { x: k, y: O };
-      } else if (v === s && A === 4) {
-        const k = n.fromBytes(C.subarray(0, n.BYTES)), I = n.fromBytes(C.subarray(n.BYTES, 2 * n.BYTES));
-        return { x: k, y: I };
+        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)), I = n.fromBytes(k.subarray(n.BYTES, 2 * n.BYTES));
+        return { x: C, y: I };
       } else
         throw new Error(`Point of length ${v} was invalid. Expected ${i} compressed bytes or ${s} uncompressed bytes`);
     }
-  }), b = (w) => qe(Ae(w, t.nByteLength));
+  }), b = (w) => qe(Ne(w, t.nByteLength));
   function p(w) {
     const v = r >> Y;
     return w > v;
@@ -1078,21 +1078,21 @@ function ss(e) {
   function h(w) {
     return p(w) ? a(-w) : w;
   }
-  const d = (w, v, A) => F(w.slice(v, A));
+  const d = (w, v, N) => F(w.slice(v, N));
   class y {
-    constructor(v, A, C) {
-      this.r = v, this.s = A, this.recovery = C, this.assertValidity();
+    constructor(v, N, k) {
+      this.r = v, this.s = N, this.recovery = k, this.assertValidity();
     }
     // pair (bytes of r, bytes of s)
     static fromCompact(v) {
-      const A = t.nByteLength;
-      return v = W("compactSignature", v, A * 2), new y(d(v, 0, A), d(v, A, 2 * A));
+      const N = t.nByteLength;
+      return v = W("compactSignature", v, N * 2), new y(d(v, 0, N), d(v, N, 2 * N));
     }
     // DER encoded ECDSA signature
     // https://bitcoin.stackexchange.com/questions/57644/what-are-the-parts-of-a-bitcoin-transaction-input-script
     static fromDER(v) {
-      const { r: A, s: C } = Be.toSig(W("DER", v));
-      return new y(A, C);
+      const { r: N, s: k } = Be.toSig(W("DER", v));
+      return new y(N, k);
     }
     assertValidity() {
       if (!g(this.r))
@@ -1104,13 +1104,13 @@ function ss(e) {
       return new y(this.r, this.s, v);
     }
     recoverPublicKey(v) {
-      const { r: A, s: C, recovery: k } = this, I = x(W("msgHash", v));
-      if (k == null || ![0, 1, 2, 3].includes(k))
+      const { r: N, s: k, recovery: C } = this, I = x(W("msgHash", v));
+      if (C == null || ![0, 1, 2, 3].includes(C))
         throw new Error("recovery id invalid");
-      const O = k === 2 || k === 3 ? A + t.n : A;
+      const O = C === 2 || C === 3 ? N + t.n : N;
       if (O >= n.ORDER)
         throw new Error("recovery id 2 or 3 invalid");
-      const $ = k & 1 ? "03" : "02", Q = l.fromHex($ + b(O)), ge = c(O), Ie = a(-I * ge), Ve = a(C * ge), we = l.BASE.multiplyAndAddUnsafe(Q, Ie, Ve);
+      const $ = C & 1 ? "03" : "02", Q = l.fromHex($ + b(O)), ge = c(O), Ie = a(-I * ge), Ve = a(k * ge), we = l.BASE.multiplyAndAddUnsafe(Q, Ie, Ve);
       if (!we)
         throw new Error("point at infinify");
       return we.assertValidity(), we;
@@ -1166,42 +1166,42 @@ function ss(e) {
       return v._setWindowSize(w), v.multiply(BigInt(3)), v;
     }
   };
-  function N(w, v = !0) {
+  function S(w, v = !0) {
     return l.fromPrivateKey(w).toRawBytes(v);
   }
   function _(w) {
-    const v = w instanceof Uint8Array, A = typeof w == "string", C = (v || A) && w.length;
-    return v ? C === i || C === s : A ? C === 2 * i || C === 2 * s : w instanceof l;
+    const v = w instanceof Uint8Array, N = typeof w == "string", k = (v || N) && w.length;
+    return v ? k === i || k === s : N ? k === 2 * i || k === 2 * s : w instanceof l;
   }
-  function B(w, v, A = !0) {
+  function B(w, v, N = !0) {
     if (_(w))
       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(w)).toRawBytes(A);
+    return l.fromHex(v).multiply(f(w)).toRawBytes(N);
   }
   const m = t.bits2int || function(w) {
-    const v = F(w), A = w.length * 8 - t.nBitLength;
-    return A > 0 ? v >> BigInt(A) : v;
+    const v = F(w), N = w.length * 8 - t.nBitLength;
+    return N > 0 ? v >> BigInt(N) : v;
   }, x = t.bits2int_modN || function(w) {
     return a(m(w));
-  }, S = Jt(t.nBitLength);
-  function H(w) {
+  }, A = Jt(t.nBitLength);
+  function P(w) {
     if (typeof w != "bigint")
       throw new Error("bigint expected");
-    if (!(ae <= w && w < S))
+    if (!(ae <= w && w < A))
       throw new Error(`bigint expected < 2^${t.nBitLength}`);
-    return Ae(w, t.nByteLength);
+    return Ne(w, t.nByteLength);
   }
-  function U(w, v, A = K) {
-    if (["recovered", "canonical"].some((Ke) => Ke in A))
+  function U(w, v, N = K) {
+    if (["recovered", "canonical"].some((Ke) => Ke in N))
       throw new Error("sign() legacy options not supported");
-    const { hash: C, randomBytes: k } = t;
-    let { lowS: I, prehash: O, extraEntropy: $ } = A;
-    I == null && (I = !0), w = W("msgHash", w), O && (w = W("prehashed msgHash", C(w)));
-    const Q = x(w), ge = f(v), Ie = [H(ge), H(Q)];
+    const { hash: k, randomBytes: C } = t;
+    let { lowS: I, prehash: O, extraEntropy: $ } = N;
+    I == null && (I = !0), w = W("msgHash", w), O && (w = W("prehashed msgHash", k(w)));
+    const Q = x(w), ge = f(v), Ie = [P(ge), P(Q)];
     if ($ != null) {
-      const Ke = $ === !0 ? k(n.BYTES) : $;
+      const Ke = $ === !0 ? C(n.BYTES) : $;
       Ie.push(W("extraEntropy", Ke));
     }
     const Ve = Ue(...Ie), we = Q;
@@ -1209,45 +1209,45 @@ function ss(e) {
       const Le = m(Ke);
       if (!g(Le))
         return;
-      const Sn = c(Le), $e = l.BASE.multiply(Le).toAffine(), ee = a($e.x);
+      const An = c(Le), $e = l.BASE.multiply(Le).toAffine(), ee = a($e.x);
       if (ee === ae)
         return;
-      const Te = a(Sn * a(we + ee * ge));
+      const Te = a(An * a(we + ee * ge));
       if (Te === ae)
         return;
-      let An = ($e.x === ee ? 0 : 2) | Number($e.y & Y), Nn = Te;
-      return I && p(Te) && (Nn = h(Te), An ^= 1), new y(ee, Nn, An);
+      let Nn = ($e.x === ee ? 0 : 2) | Number($e.y & Y), Sn = Te;
+      return I && p(Te) && (Sn = h(Te), Nn ^= 1), new y(ee, Sn, Nn);
     }
     return { seed: Ve, k2sig: mt };
   }
   const K = { lowS: t.lowS, prehash: !1 }, T = { lowS: t.lowS, prehash: !1 };
-  function R(w, v, A = K) {
-    const { seed: C, k2sig: k } = U(w, v, A), I = t;
-    return Jn(I.hash.outputLen, I.nByteLength, I.hmac)(C, k);
+  function R(w, v, N = K) {
+    const { seed: k, k2sig: C } = U(w, v, N), I = t;
+    return Jn(I.hash.outputLen, I.nByteLength, I.hmac)(k, C);
   }
   l.BASE._setWindowSize(8);
-  function P(w, v, A, C = T) {
+  function H(w, v, N, k = T) {
     var $e;
-    const k = w;
-    if (v = W("msgHash", v), A = W("publicKey", A), "strict" in C)
+    const C = w;
+    if (v = W("msgHash", v), N = W("publicKey", N), "strict" in k)
       throw new Error("options.strict was renamed to lowS");
-    const { lowS: I, prehash: O } = C;
+    const { lowS: I, prehash: O } = k;
     let $, Q;
     try {
-      if (typeof k == "string" || k instanceof Uint8Array)
+      if (typeof C == "string" || C instanceof Uint8Array)
         try {
-          $ = y.fromDER(k);
+          $ = y.fromDER(C);
         } catch (ee) {
           if (!(ee instanceof Be.Err))
             throw ee;
-          $ = y.fromCompact(k);
+          $ = y.fromCompact(C);
         }
-      else if (typeof k == "object" && typeof k.r == "bigint" && typeof k.s == "bigint") {
-        const { r: ee, s: Te } = k;
+      else if (typeof C == "object" && typeof C.r == "bigint" && typeof C.s == "bigint") {
+        const { r: ee, s: Te } = C;
         $ = new y(ee, Te);
       } else
         throw new Error("PARSE");
-      Q = l.fromHex(A);
+      Q = l.fromHex(N);
     } catch (ee) {
       if (ee.message === "PARSE")
         throw new Error("signature must be Signature instance, Uint8Array or hex string");
@@ -1261,10 +1261,10 @@ function ss(e) {
   }
   return {
     CURVE: t,
-    getPublicKey: N,
+    getPublicKey: S,
     getSharedSecret: B,
     sign: R,
-    verify: P,
+    verify: H,
     ProjectivePoint: l,
     Signature: y,
     utils: E
@@ -1311,7 +1311,7 @@ nr.create = (e, t) => new tr(e, t);
 function os(e) {
   return {
     hash: e,
-    hmac: (t, ...n) => nr(e, t, Ai(...n)),
+    hmac: (t, ...n) => nr(e, t, Ni(...n)),
     randomBytes: Zn
   };
 }
@@ -1322,7 +1322,7 @@ function as(e, t) {
 /*! noble-curves - MIT License (c) 2022 Paul Miller (paulmillr.com) */
 const ct = BigInt("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f"), tt = BigInt("0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141"), rr = BigInt(1), nt = BigInt(2), _n = (e, t) => (e + t / nt) / t;
 function ir(e) {
-  const t = ct, n = BigInt(3), r = BigInt(6), i = BigInt(11), s = BigInt(22), o = BigInt(23), a = BigInt(44), c = BigInt(88), l = e * e * e % t, f = l * l * e % t, u = J(f, n, t) * f % t, g = J(u, n, t) * f % t, b = J(g, nt, t) * l % t, p = J(b, i, t) * b % t, h = J(p, s, t) * p % t, d = J(h, a, t) * h % t, y = J(d, c, t) * d % t, E = J(y, a, t) * h % t, N = J(E, n, t) * f % t, _ = J(N, o, t) * p % t, B = J(_, 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), a = BigInt(44), c = BigInt(88), l = e * e * e % t, f = l * l * e % t, u = J(f, n, t) * f % t, g = J(u, n, t) * f % t, b = J(g, nt, t) * l % t, p = J(b, i, t) * b % t, h = J(p, s, t) * p % t, d = J(h, a, t) * h % t, y = J(d, c, t) * d % t, E = J(y, a, t) * h % t, S = J(E, n, t) * f % t, _ = J(S, o, t) * p % t, B = J(_, 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;
@@ -1363,7 +1363,7 @@ function rt(e, ...t) {
   }
   return Lt(Ue(n, ...t));
 }
-const Yt = (e) => e.toRawBytes(!0).slice(1), Ot = (e) => Ae(e, 32), Nt = (e) => V(e, ct), Ge = (e) => V(e, tt), Xt = _e.ProjectivePoint, us = (e, t, n) => Xt.BASE.multiplyAndAddUnsafe(e, t, n);
+const Yt = (e) => e.toRawBytes(!0).slice(1), Ot = (e) => Ne(e, 32), St = (e) => V(e, ct), Ge = (e) => V(e, tt), Xt = _e.ProjectivePoint, us = (e, t, n) => Xt.BASE.multiplyAndAddUnsafe(e, t, n);
 function Mt(e) {
   let t = _e.utils.normPrivateKeyToScalar(e), n = Xt.fromPrivateKey(t);
   return { scalar: n.hasEvenY() ? t : Ge(-t), bytes: Yt(n) };
@@ -1371,9 +1371,9 @@ function Mt(e) {
 function or(e) {
   if (!sr(e))
     throw new Error("bad x: need 0 < x < p");
-  const t = Nt(e * e), n = Nt(t * e + BigInt(7));
+  const t = St(e * e), n = St(t * e + BigInt(7));
   let r = ir(n);
-  r % nt !== ut && (r = Nt(-r));
+  r % nt !== ut && (r = St(-r));
   const i = new Xt(e, r, rr);
   return i.assertValidity(), i;
 }
@@ -1415,14 +1415,14 @@ const We = {
     randomPrivateKey: _e.utils.randomPrivateKey,
     lift_x: or,
     pointToBytes: Yt,
-    numberToBytesBE: Ae,
+    numberToBytesBE: Ne,
     bytesToNumberBE: F,
     taggedHash: rt,
     mod: V
   }
 }, Kt = 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, kt = (e) => new DataView(e.buffer, e.byteOffset, e.byteLength), ie = (e, t) => e << 32 - t | e >>> t, hs = new Uint8Array(new Uint32Array([287454020]).buffer)[0] === 68;
+const Qt = (e) => e instanceof Uint8Array, Ct = (e) => new DataView(e.buffer, e.byteOffset, e.byteLength), ie = (e, t) => e << 32 - t | e >>> t, hs = new Uint8Array(new Uint32Array([287454020]).buffer)[0] === 68;
 if (!hs)
   throw new Error("Non little-endian hardware is not supported");
 const ds = Array.from({ length: 256 }, (e, t) => t.toString(16).padStart(2, "0"));
@@ -1483,7 +1483,7 @@ function fr(e = 32) {
     return Kt.getRandomValues(new Uint8Array(e));
   throw new Error("crypto.getRandomValues must be defined");
 }
-function Ht(e) {
+function Pt(e) {
   if (!Number.isSafeInteger(e) || e < 0)
     throw new Error(`Wrong positive integer: ${e}`);
 }
@@ -1500,7 +1500,7 @@ function hr(e, ...t) {
 function gs(e) {
   if (typeof e != "function" || typeof e.create != "function")
     throw new Error("Hash should be wrapped by utils.wrapConstructor");
-  Ht(e.outputLen), Ht(e.blockLen);
+  Pt(e.outputLen), Pt(e.blockLen);
 }
 function ws(e, t = !0) {
   if (e.destroyed)
@@ -1515,7 +1515,7 @@ function bs(e, t) {
     throw new Error(`digestInto() expects output buffer of length at least ${n}`);
 }
 const se = {
-  number: Ht,
+  number: Pt,
   bool: ys,
   bytes: hr,
   hash: gs,
@@ -1530,7 +1530,7 @@ function vs(e, t, n, r) {
 }
 class ms extends ur {
   constructor(t, n, r, i) {
-    super(), this.blockLen = t, this.outputLen = n, this.padOffset = r, this.isLE = i, this.finished = !1, this.length = 0, this.pos = 0, this.destroyed = !1, this.buffer = new Uint8Array(t), this.view = kt(this.buffer);
+    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 = Ct(this.buffer);
   }
   update(t) {
     se.exists(this);
@@ -1540,7 +1540,7 @@ class ms extends ur {
     for (let o = 0; o < s; ) {
       const a = Math.min(i - this.pos, s - o);
       if (a === i) {
-        const c = kt(t);
+        const c = Ct(t);
         for (; i <= s - o; o += i)
           this.process(c, o);
         continue;
@@ -1557,7 +1557,7 @@ class ms extends ur {
     for (let u = o; u < i; u++)
       n[u] = 0;
     vs(r, i - 8, BigInt(this.length * 8), s), this.process(r, 0);
-    const a = kt(t), c = this.outputLen;
+    const a = Ct(t), c = this.outputLen;
     if (c % 4)
       throw new Error("_sha2: outputLen should be aligned to 32bit");
     const l = c / 4, f = this.get();
@@ -1578,7 +1578,7 @@ class ms extends ur {
     return t.length = i, t.pos = a, t.finished = s, t.destroyed = o, i % n && t.buffer.set(r), t;
   }
 }
-const Es = (e, t, n) => e & t ^ ~e & n, xs = (e, t, n) => e & t ^ e & n ^ t & n, Ss = new Uint32Array([
+const Es = (e, t, n) => e & t ^ ~e & n, xs = (e, t, n) => e & t ^ e & n ^ t & n, As = new Uint32Array([
   1116352408,
   1899447441,
   3049323471,
@@ -1674,7 +1674,7 @@ class dr extends ms {
     }
     let { A: r, B: i, C: s, D: o, E: a, F: c, G: l, H: f } = this;
     for (let u = 0; u < 64; u++) {
-      const g = ie(a, 6) ^ ie(a, 11) ^ ie(a, 25), b = f + g + Es(a, c, l) + Ss[u] + Ee[u] | 0, h = (ie(r, 2) ^ ie(r, 13) ^ ie(r, 22)) + xs(r, i, s) | 0;
+      const g = ie(a, 6) ^ ie(a, 11) ^ ie(a, 25), b = f + g + Es(a, c, l) + As[u] + Ee[u] | 0, h = (ie(r, 2) ^ ie(r, 13) ^ ie(r, 22)) + xs(r, i, s) | 0;
       f = l, l = c, c = a, a = 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, a = a + this.E | 0, c = c + this.F | 0, l = l + this.G | 0, f = f + this.H | 0, this.set(r, i, s, o, a, c, l, f);
@@ -1686,13 +1686,13 @@ class dr extends ms {
     this.set(0, 0, 0, 0, 0, 0, 0, 0), this.buffer.fill(0);
   }
 }
-class As extends dr {
+class Ns extends dr {
   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 = lr(() => new dr());
-lr(() => new As());
+lr(() => new Ns());
 /*! scure-base - MIT License (c) 2022 Paul Miller (paulmillr.com) */
 function ze(e) {
   if (!Number.isSafeInteger(e))
@@ -1815,7 +1815,7 @@ function Ln(e, t, n) {
   return i.reverse();
 }
 const yr = (e, t) => t ? yr(t, e % t) : e, it = (e, t) => e + (t - yr(e, t));
-function Pt(e, t, n, r) {
+function Ht(e, t, n, r) {
   if (!Array.isArray(e))
     throw new Error("convertRadix2: data should be array");
   if (t <= 0 || t > 32)
@@ -1841,7 +1841,7 @@ function Pt(e, t, n, r) {
     throw new Error(`Non-zero padding: ${i}`);
   return r && s > 0 && a.push(i >>> 0), a;
 }
-function Ns(e) {
+function Ss(e) {
   return ze(e), {
     encode: (t) => {
       if (!(t instanceof Uint8Array))
@@ -1855,7 +1855,7 @@ function Ns(e) {
     }
   };
 }
-function Ne(e, t = !1) {
+function Se(e, t = !1) {
   if (ze(e), e <= 0 || e > 32)
     throw new Error("radix2: bits should be in (0..32]");
   if (it(8, e) > 32 || it(e, 8) > 32)
@@ -1864,12 +1864,12 @@ function Ne(e, t = !1) {
     encode: (n) => {
       if (!(n instanceof Uint8Array))
         throw new Error("radix2.encode input should be Uint8Array");
-      return Pt(Array.from(n), 8, e, !t);
+      return Ht(Array.from(n), 8, e, !t);
     },
     decode: (n) => {
       if (!Array.isArray(n) || n.length && typeof n[0] != "number")
         throw new Error("radix2.decode input should be array of strings");
-      return Uint8Array.from(Pt(n, e, 8, t));
+      return Uint8Array.from(Ht(n, e, 8, t));
     }
   };
 }
@@ -1883,13 +1883,13 @@ function $n(e) {
     }
   };
 }
-const Ks = de(Ne(4), pe("0123456789ABCDEF"), ye("")), ks = de(Ne(5), pe("ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"), ft(5), ye(""));
-de(Ne(5), pe("0123456789ABCDEFGHIJKLMNOPQRSTUV"), ft(5), ye(""));
-de(Ne(5), pe("0123456789ABCDEFGHJKMNPQRSTVWXYZ"), ye(""), pr((e) => e.toUpperCase().replace(/O/g, "0").replace(/[IL]/g, "1")));
-const he = de(Ne(6), pe("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"), ft(6), ye("")), Bs = de(Ne(6), pe("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"), ft(6), ye("")), en = (e) => de(Ns(58), pe(e), ye("")), qt = en("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz");
+const Ks = de(Se(4), pe("0123456789ABCDEF"), ye("")), Cs = de(Se(5), pe("ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"), ft(5), ye(""));
+de(Se(5), pe("0123456789ABCDEFGHIJKLMNOPQRSTUV"), ft(5), ye(""));
+de(Se(5), pe("0123456789ABCDEFGHJKMNPQRSTVWXYZ"), ye(""), pr((e) => e.toUpperCase().replace(/O/g, "0").replace(/[IL]/g, "1")));
+const he = de(Se(6), pe("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"), ft(6), ye("")), Bs = de(Se(6), pe("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"), ft(6), ye("")), en = (e) => de(Ss(58), pe(e), ye("")), qt = en("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz");
 en("123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ");
 en("rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz");
-const Tn = [0, 2, 3, 5, 6, 7, 9, 10, 11], Cs = {
+const Tn = [0, 2, 3, 5, 6, 7, 9, 10, 11], ks = {
   encode(e) {
     let t = "";
     for (let n = 0; n < e.length; n += 8) {
@@ -1933,10 +1933,10 @@ function On(e, t, n = 1) {
     i = Ze(i) ^ s;
   for (let s = 0; s < 6; s++)
     i = Ze(i);
-  return i ^= n, Dt.encode(Pt([i % 2 ** 30], 30, 5, !1));
+  return i ^= n, Dt.encode(Ht([i % 2 ** 30], 30, 5, !1));
 }
 function gr(e) {
-  const t = e === "bech32" ? 1 : 734539939, n = Ne(5), r = n.decode, i = n.encode, s = $n(r);
+  const t = e === "bech32" ? 1 : 734539939, n = Se(5), r = n.decode, i = n.encode, s = $n(r);
   function o(f, u, g = 90) {
     if (typeof f != "string")
       throw new Error(`bech32.encode prefix should be string, not ${typeof f}`);
@@ -1979,7 +1979,7 @@ gr("bech32m");
 const Us = {
   encode: (e) => new TextDecoder().decode(e),
   decode: (e) => new TextEncoder().encode(e)
-}, _s = de(Ne(4), pe("0123456789abcdef"), ye(""), pr((e) => {
+}, _s = de(Se(4), pe("0123456789abcdef"), ye(""), pr((e) => {
   if (typeof e != "string" || e.length % 2)
     throw new TypeError(`hex.decode: expected string, got ${typeof e} with length ${e.length}`);
   return e.toLowerCase();
@@ -1987,11 +1987,11 @@ const Us = {
   utf8: Us,
   hex: _s,
   base16: Ks,
-  base32: ks,
+  base32: Cs,
   base64: he,
   base64url: Bs,
   base58: qt,
-  base58xmr: Cs
+  base58xmr: ks
 };
 `${Object.keys(Is).join(", ")}`;
 function Bt(e) {
@@ -2028,11 +2028,11 @@ function Rs(e, t) {
     n |= e[r] ^ t[r];
   return n === 0;
 }
-const Os = /* @__NO_SIDE_EFFECTS__ */ (e, t) => (Object.assign(t, e), t), Se = 16, Ms = 283;
+const Os = /* @__NO_SIDE_EFFECTS__ */ (e, t) => (Object.assign(t, e), t), Ae = 16, Ms = 283;
 function tn(e) {
   return e << 1 ^ Ms & -(e >> 7);
 }
-function He(e, t) {
+function Pe(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;
-})(), Hs = /* @__PURE__ */ jt.map((e, t) => jt.indexOf(t)), Ps = (e) => e << 24 | e >>> 8, Ct = (e) => e << 8 | e >>> 24;
+})(), Ps = /* @__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(Ct), i = r.map(Ct), s = i.map(Ct), o = new Uint32Array(256 * 256), a = new Uint32Array(256 * 256), c = 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), a = new Uint32Array(256 * 256), c = 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: c, T0: n, T1: r, T2: i, T3: s, T01: o, T23: a };
 }
-const nn = /* @__PURE__ */ wr(jt, (e) => He(e, 3) << 24 | e << 16 | e << 8 | He(e, 2)), br = /* @__PURE__ */ wr(Hs, (e) => He(e, 11) << 24 | He(e, 13) << 16 | He(e, 9) << 8 | He(e, 14)), qs = /* @__PURE__ */ (() => {
+const nn = /* @__PURE__ */ wr(jt, (e) => Pe(e, 3) << 24 | e << 16 | e << 8 | Pe(e, 2)), br = /* @__PURE__ */ wr(Ps, (e) => Pe(e, 11) << 24 | Pe(e, 13) << 16 | Pe(e, 9) << 8 | Pe(e, 14)), qs = /* @__PURE__ */ (() => {
   const e = new Uint8Array(16);
   for (let t = 0, n = 1; t < 16; t++, n = tn(n))
     e[t] = n;
@@ -2076,7 +2076,7 @@ function vr(e) {
   o.set(r);
   for (let a = i; a < o.length; a++) {
     let c = o[a - 1];
-    a % i === 0 ? c = s(Ps(c)) ^ qs[a / i - 1] : i > 6 && a % i === 4 && (c = s(c)), o[a] = o[a - i] ^ c;
+    a % i === 0 ? c = s(Hs(c)) ^ qs[a / i - 1] : i > 6 && a % i === 4 && (c = s(c)), o[a] = o[a - i] ^ c;
   }
   return o;
 }
@@ -2098,7 +2098,7 @@ function xe(e, t, n, r, i, s) {
 function oe(e, t, n, r, i) {
   return e[t & 255 | n & 65280] | e[r >>> 16 & 255 | i >>> 16 & 65280] << 16;
 }
-function Hn(e, t, n, r, i) {
+function Pn(e, t, n, r, i) {
   const { sbox2: s, T01: o, T23: a } = nn;
   let c = 0;
   t ^= e[c++], n ^= e[c++], r ^= e[c++], i ^= e[c++];
@@ -2130,18 +2130,18 @@ function mr(e, t) {
   return t;
 }
 function zs(e) {
-  if (ce(e), e.length % Se !== 0)
-    throw new Error(`aes/(cbc-ecb).decrypt ciphertext should consist of blocks with size ${Se}`);
+  if (ce(e), e.length % Ae !== 0)
+    throw new Error(`aes/(cbc-ecb).decrypt ciphertext should consist of blocks with size ${Ae}`);
 }
 function Vs(e, t, n) {
   let r = e.length;
-  const i = r % Se;
+  const i = r % Ae;
   if (!t && i !== 0)
     throw new Error("aec/(cbc-ecb): unpadded plaintext with disabled padding");
   const s = Z(e);
   if (t) {
-    let c = Se - i;
-    c || (c = Se), r = r + c;
+    let c = Ae - i;
+    c || (c = Ae), r = r + c;
   }
   const o = mr(r, n), a = Z(o);
   return { b: s, o: a, out: o };
@@ -2164,8 +2164,8 @@ function Ws(e, t) {
 function Zs(e) {
   const t = new Uint8Array(16), n = Z(t);
   t.set(e);
-  const r = Se - e.length;
-  for (let i = Se - r; i < Se; i++)
+  const r = Ae - e.length;
+  for (let i = Ae - r; i < Ae; i++)
     t[i] = r;
   return n;
 }
@@ -2177,10 +2177,10 @@ const Er = /* @__PURE__ */ Os({ blockSize: 16, nonceLength: 16 }, function(t, n,
       const a = vr(t), { b: c, o: l, out: f } = Vs(s, i, o), u = Z(n);
       let g = u[0], b = u[1], p = u[2], h = u[3], d = 0;
       for (; d + 4 <= c.length; )
-        g ^= c[d + 0], b ^= c[d + 1], p ^= c[d + 2], h ^= c[d + 3], { s0: g, s1: b, s2: p, s3: h } = Hn(a, g, b, p, h), l[d++] = g, l[d++] = b, l[d++] = p, l[d++] = h;
+        g ^= c[d + 0], b ^= c[d + 1], p ^= c[d + 2], h ^= c[d + 3], { s0: g, s1: b, s2: p, s3: h } = Pn(a, g, b, p, h), l[d++] = g, l[d++] = b, l[d++] = p, l[d++] = h;
       if (i) {
         const y = Zs(s.subarray(d * 4));
-        g ^= y[0], b ^= y[1], p ^= y[2], h ^= y[3], { s0: g, s1: b, s2: p, s3: h } = Hn(a, g, b, p, h), l[d++] = g, l[d++] = b, l[d++] = p, l[d++] = h;
+        g ^= y[0], b ^= y[1], p ^= y[2], h ^= y[3], { s0: g, s1: b, s2: p, s3: h } = Pn(a, g, b, p, h), l[d++] = g, l[d++] = b, l[d++] = p, l[d++] = h;
       }
       return a.fill(0), f;
     },
@@ -2189,27 +2189,27 @@ const Er = /* @__PURE__ */ Os({ blockSize: 16, nonceLength: 16 }, function(t, n,
       const a = Ds(t), c = Z(n), l = mr(s.length, o), f = Z(s), u = Z(l);
       let g = c[0], b = c[1], p = c[2], h = c[3];
       for (let d = 0; d + 4 <= f.length; ) {
-        const y = g, E = b, N = p, _ = h;
+        const y = g, E = b, S = p, _ = h;
         g = f[d + 0], b = f[d + 1], p = f[d + 2], h = f[d + 3];
-        const { s0: B, s1: m, s2: x, s3: S } = js(a, g, b, p, h);
-        u[d++] = B ^ y, u[d++] = m ^ E, u[d++] = x ^ N, u[d++] = S ^ _;
+        const { s0: B, s1: m, s2: x, s3: A } = js(a, g, b, p, h);
+        u[d++] = B ^ y, u[d++] = m ^ E, u[d++] = x ^ S, u[d++] = A ^ _;
       }
       return a.fill(0), Ws(l, i);
     }
   };
-}), xr = (e) => Uint8Array.from(e.split("").map((t) => t.charCodeAt(0))), Gs = xr("expand 16-byte k"), Fs = xr("expand 32-byte k"), Js = Z(Gs), Sr = Z(Fs);
-Sr.slice();
+}), xr = (e) => Uint8Array.from(e.split("").map((t) => t.charCodeAt(0))), Gs = xr("expand 16-byte k"), Fs = xr("expand 32-byte k"), Js = Z(Gs), Ar = Z(Fs);
+Ar.slice();
 function L(e, t) {
   return e << t | e >>> 32 - t;
 }
 function zt(e) {
   return e.byteOffset % 4 === 0;
 }
-const Ye = 64, Ys = 16, Ar = 2 ** 32 - 1, Pn = new Uint32Array();
+const Ye = 64, Ys = 16, Nr = 2 ** 32 - 1, Hn = new Uint32Array();
 function Xs(e, t, n, r, i, s, o, a) {
-  const c = i.length, l = new Uint8Array(Ye), f = Z(l), u = zt(i) && zt(s), g = u ? Z(i) : Pn, b = u ? Z(s) : Pn;
+  const c = i.length, l = new Uint8Array(Ye), f = Z(l), u = zt(i) && zt(s), g = u ? Z(i) : Hn, b = u ? Z(s) : Hn;
   for (let p = 0; p < c; o++) {
-    if (e(t, n, r, f, o, a), o >= Ar)
+    if (e(t, n, r, f, o, a), o >= Nr)
       throw new Error("arx: counter overflow");
     const h = Math.min(Ye, c - p);
     if (u && h === Ye) {
@@ -2233,14 +2233,14 @@ function Qs(e, t) {
   return Bt(i), Bt(o), Mn(s), Mn(n), (a, c, l, f, u = 0) => {
     ce(a), ce(c), ce(l);
     const g = l.length;
-    if (f || (f = new Uint8Array(g)), ce(f), Bt(u), u < 0 || u >= Ar)
+    if (f || (f = new Uint8Array(g)), ce(f), Bt(u), u < 0 || u >= Nr)
       throw new Error("arx: counter overflow");
     if (f.length < g)
       throw new Error(`arx: output (${f.length}) is shorter than data (${g})`);
     const b = [];
     let p = a.length, h, d;
     if (p === 32)
-      h = a.slice(), b.push(h), d = Sr;
+      h = a.slice(), b.push(h), d = Ar;
     else if (p === 16 && n)
       h = new Uint8Array(32), h.set(a), h.set(a, 16), d = Js, b.push(h);
     else
@@ -2259,20 +2259,20 @@ function Qs(e, t) {
       const _ = new Uint8Array(12);
       _.set(c, s ? 0 : 12 - c.length), c = _, b.push(c);
     }
-    const N = Z(c);
-    for (Xs(e, d, y, N, l, f, u, o); b.length > 0; )
+    const S = Z(c);
+    for (Xs(e, d, y, S, l, f, u, o); b.length > 0; )
       b.pop().fill(0);
     return f;
   };
 }
 function eo(e, t, n, r, i, s = 20) {
-  let o = e[0], a = e[1], c = e[2], l = e[3], f = t[0], u = t[1], g = t[2], b = t[3], p = t[4], h = t[5], d = t[6], y = t[7], E = i, N = n[0], _ = n[1], B = n[2], m = o, x = a, S = c, H = l, U = f, K = u, T = g, R = b, P = p, w = h, v = d, A = y, C = E, k = N, I = _, O = B;
+  let o = e[0], a = e[1], c = e[2], l = e[3], f = t[0], u = t[1], g = t[2], b = t[3], p = t[4], h = t[5], d = t[6], y = t[7], E = i, S = n[0], _ = n[1], B = n[2], m = o, x = a, A = c, P = l, U = f, K = u, T = g, R = b, H = p, w = h, v = d, N = y, k = E, C = S, I = _, O = B;
   for (let Q = 0; Q < s; Q += 2)
-    m = m + U | 0, C = L(C ^ m, 16), P = P + C | 0, U = L(U ^ P, 12), m = m + U | 0, C = L(C ^ m, 8), P = P + C | 0, U = L(U ^ P, 7), x = x + K | 0, k = L(k ^ x, 16), w = w + k | 0, K = L(K ^ w, 12), x = x + K | 0, k = L(k ^ x, 8), w = w + k | 0, K = L(K ^ w, 7), S = S + T | 0, I = L(I ^ S, 16), v = v + I | 0, T = L(T ^ v, 12), S = S + T | 0, I = L(I ^ S, 8), v = v + I | 0, T = L(T ^ v, 7), H = H + R | 0, O = L(O ^ H, 16), A = A + O | 0, R = L(R ^ A, 12), H = H + R | 0, O = L(O ^ H, 8), A = A + O | 0, R = L(R ^ A, 7), m = m + K | 0, O = L(O ^ m, 16), v = v + O | 0, K = L(K ^ v, 12), m = m + K | 0, O = L(O ^ m, 8), v = v + O | 0, K = L(K ^ v, 7), x = x + T | 0, C = L(C ^ x, 16), A = A + C | 0, T = L(T ^ A, 12), x = x + T | 0, C = L(C ^ x, 8), A = A + C | 0, T = L(T ^ A, 7), S = S + R | 0, k = L(k ^ S, 16), P = P + k | 0, R = L(R ^ P, 12), S = S + R | 0, k = L(k ^ S, 8), P = P + k | 0, R = L(R ^ P, 7), H = H + U | 0, I = L(I ^ H, 16), w = w + I | 0, U = L(U ^ w, 12), H = H + U | 0, I = L(I ^ H, 8), w = w + I | 0, U = L(U ^ w, 7);
+    m = m + U | 0, k = L(k ^ m, 16), H = H + k | 0, U = L(U ^ H, 12), m = m + U | 0, k = L(k ^ m, 8), H = H + k | 0, U = L(U ^ H, 7), x = x + K | 0, C = L(C ^ x, 16), w = w + C | 0, K = L(K ^ w, 12), x = x + K | 0, C = L(C ^ x, 8), w = w + C | 0, K = L(K ^ w, 7), A = A + T | 0, I = L(I ^ A, 16), v = v + I | 0, T = L(T ^ v, 12), A = A + T | 0, I = L(I ^ A, 8), v = v + I | 0, T = L(T ^ v, 7), P = P + R | 0, O = L(O ^ P, 16), N = N + O | 0, R = L(R ^ N, 12), P = P + R | 0, O = L(O ^ P, 8), N = N + O | 0, R = L(R ^ N, 7), m = m + K | 0, O = L(O ^ m, 16), v = v + O | 0, K = L(K ^ v, 12), m = m + K | 0, O = L(O ^ m, 8), v = v + O | 0, K = L(K ^ v, 7), x = x + T | 0, k = L(k ^ x, 16), N = N + k | 0, T = L(T ^ N, 12), x = x + T | 0, k = L(k ^ x, 8), N = N + k | 0, T = L(T ^ N, 7), A = A + R | 0, C = L(C ^ A, 16), H = H + C | 0, R = L(R ^ H, 12), A = A + R | 0, C = L(C ^ A, 8), H = H + C | 0, R = L(R ^ H, 7), P = P + U | 0, I = L(I ^ P, 16), w = w + I | 0, U = L(U ^ w, 12), P = P + U | 0, I = L(I ^ P, 8), w = w + I | 0, U = L(U ^ w, 7);
   let $ = 0;
-  r[$++] = o + m | 0, r[$++] = a + x | 0, r[$++] = c + S | 0, r[$++] = l + H | 0, r[$++] = f + U | 0, r[$++] = u + K | 0, r[$++] = g + T | 0, r[$++] = b + R | 0, r[$++] = p + P | 0, r[$++] = h + w | 0, r[$++] = d + v | 0, r[$++] = y + A | 0, r[$++] = E + C | 0, r[$++] = N + k | 0, r[$++] = _ + I | 0, r[$++] = B + O | 0;
+  r[$++] = o + m | 0, r[$++] = a + x | 0, r[$++] = c + A | 0, r[$++] = l + P | 0, r[$++] = f + U | 0, r[$++] = u + K | 0, r[$++] = g + T | 0, r[$++] = b + R | 0, r[$++] = p + H | 0, r[$++] = h + w | 0, r[$++] = d + v | 0, r[$++] = y + N | 0, r[$++] = E + k | 0, r[$++] = S + C | 0, r[$++] = _ + I | 0, r[$++] = B + O | 0;
 }
-const Nr = /* @__PURE__ */ Qs(eo, {
+const Sr = /* @__PURE__ */ Qs(eo, {
   counterRight: !1,
   counterLength: 4,
   allowShortKeys: !1
@@ -2318,7 +2318,7 @@ function rn(e, t, n) {
   return se.hash(e), n === void 0 && (n = new Uint8Array(e.outputLen)), ht(e, Fe(n), Fe(t));
 }
 const Ut = new Uint8Array([0]), qn = new Uint8Array();
-function kr(e, t, n, r = 32) {
+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");
   const i = Math.ceil(r / e.outputLen);
@@ -2328,7 +2328,7 @@ function kr(e, t, n, r = 32) {
     Ut[0] = l + 1, a.update(l === 0 ? qn : c).update(n).update(Ut).digestInto(c), s.set(c, e.outputLen * l), o._cloneInto(a);
   return o.destroy(), a.destroy(), c.fill(0), Ut.fill(0), s.slice(0, r);
 }
-var to = Object.defineProperty, q = (e, t) => {
+var to = Object.defineProperty, D = (e, t) => {
   for (var n in t)
     to(e, n, { get: t[n], enumerable: !0 });
 }, Re = Symbol("verified"), no = (e) => e instanceof Object;
@@ -2346,7 +2346,7 @@ function sn(e) {
   return !0;
 }
 var ro = {};
-q(ro, {
+D(ro, {
   Queue: () => ao,
   QueueNode: () => Br,
   binarySearch: () => on,
@@ -2441,8 +2441,8 @@ function Qe(e) {
   let t = fe(ne.encode(uo(e)));
   return M(t);
 }
-var dt = new co(), Ce = dt.generateSecretKey, le = dt.getPublicKey, X = dt.finalizeEvent, pt = dt.verifyEvent, lo = {};
-q(lo, {
+var dt = new co(), ke = dt.generateSecretKey, le = dt.getPublicKey, X = dt.finalizeEvent, pt = dt.verifyEvent, lo = {};
+D(lo, {
   Application: () => da,
   BadgeAward: () => mo,
   BadgeDefinition: () => oa,
@@ -2457,9 +2457,9 @@ q(lo, {
   ChannelMetadata: () => Tr,
   ChannelMuteUser: () => Mr,
   ClassifiedListing: () => ga,
-  ClientAuth: () => Pr,
+  ClientAuth: () => Hr,
   CommunitiesList: () => Do,
-  CommunityDefinition: () => Aa,
+  CommunityDefinition: () => Na,
   CommunityPostApproval: () => Uo,
   Contacts: () => wo,
   CreateOrUpdateProduct: () => ua,
@@ -2472,14 +2472,14 @@ q(lo, {
   Emojisets: () => ha,
   EncryptedDirectMessage: () => bo,
   EventDeletion: () => vo,
-  FileMetadata: () => Ao,
+  FileMetadata: () => No,
   FileServerPreference: () => Fo,
   Followsets: () => ea,
   GenericRepost: () => xo,
   Genericlists: () => ta,
-  GiftWrap: () => Hr,
+  GiftWrap: () => Pr,
   HTTPAuth: () => un,
-  Handlerinformation: () => Sa,
+  Handlerinformation: () => Aa,
   Handlerrecommendation: () => xa,
   Highlights: () => Oo,
   InterestsList: () => Wo,
@@ -2487,9 +2487,9 @@ q(lo, {
   JobFeedback: () => Lo,
   JobRequest: () => _o,
   JobResult: () => Io,
-  Label: () => Co,
+  Label: () => ko,
   LightningPubRPC: () => Yo,
-  LiveChatMessage: () => No,
+  LiveChatMessage: () => So,
   LiveEvent: () => pa,
   LongFormArticle: () => la,
   Metadata: () => po,
@@ -2498,17 +2498,17 @@ q(lo, {
   NWCWalletRequest: () => qr,
   NWCWalletResponse: () => Xo,
   NostrConnect: () => Qo,
-  OpenTimestamps: () => So,
-  Pinlist: () => Ho,
+  OpenTimestamps: () => Ao,
+  Pinlist: () => Po,
   PrivateDirectMessage: () => Eo,
   ProblemTracker: () => Ko,
   ProfileBadges: () => sa,
   PublicChatsList: () => jo,
   Reaction: () => cn,
   RecommendRelay: () => go,
-  RelayList: () => Po,
+  RelayList: () => Ho,
   Relaysets: () => na,
-  Report: () => ko,
+  Report: () => Co,
   Reporting: () => Bo,
   Repost: () => an,
   Seal: () => Lr,
@@ -2524,10 +2524,10 @@ q(lo, {
   isEphemeralKind: () => _r,
   isKind: () => ho,
   isParameterizedReplaceableKind: () => Ir,
-  isRegularKind: () => Cr,
+  isRegularKind: () => kr,
   isReplaceableKind: () => Ur
 });
-function Cr(e) {
+function kr(e) {
   return 1e3 <= e && e < 1e4 || [1, 2, 4, 5, 6, 7, 8, 16, 40, 41, 42, 43, 44].includes(e);
 }
 function Ur(e) {
@@ -2540,19 +2540,19 @@ function Ir(e) {
   return 3e4 <= e && e < 4e4;
 }
 function fo(e) {
-  return Cr(e) ? "regular" : Ur(e) ? "replaceable" : _r(e) ? "ephemeral" : Ir(e) ? "parameterized" : "unknown";
+  return kr(e) ? "regular" : Ur(e) ? "replaceable" : _r(e) ? "ephemeral" : Ir(e) ? "parameterized" : "unknown";
 }
 function ho(e, t) {
   const n = t instanceof Array ? t : [t];
   return sn(e) && n.includes(e.kind) || !1;
 }
-var po = 0, yo = 1, go = 2, wo = 3, bo = 4, vo = 5, an = 6, cn = 7, mo = 8, Lr = 13, Eo = 14, xo = 16, $r = 40, Tr = 41, Rr = 42, Or = 43, Mr = 44, So = 1040, Hr = 1059, Ao = 1063, No = 1311, Ko = 1971, ko = 1984, Bo = 1984, Co = 1985, Uo = 4550, _o = 5999, Io = 6999, Lo = 7e3, $o = 9041, To = 9734, Ro = 9735, Oo = 9802, Mo = 1e4, Ho = 10001, Po = 10002, qo = 10003, Do = 10004, jo = 10005, zo = 10006, Vo = 10007, Wo = 10015, Zo = 10030, Go = 10050, Fo = 10096, Jo = 13194, Yo = 21e3, Pr = 22242, qr = 23194, Xo = 23195, Qo = 24133, un = 27235, ea = 3e4, ta = 30001, na = 30002, ra = 30003, ia = 30004, sa = 30008, oa = 30009, aa = 30015, ca = 30017, ua = 30018, la = 30023, fa = 30024, ha = 30030, da = 30078, pa = 30311, ya = 30315, ga = 30402, wa = 30403, ba = 31922, va = 31923, ma = 31924, Ea = 31925, xa = 31989, Sa = 31990, Aa = 34550, Na = {};
-q(Na, {
+var po = 0, yo = 1, go = 2, wo = 3, bo = 4, vo = 5, an = 6, cn = 7, mo = 8, Lr = 13, Eo = 14, xo = 16, $r = 40, Tr = 41, Rr = 42, Or = 43, Mr = 44, Ao = 1040, Pr = 1059, No = 1063, So = 1311, Ko = 1971, Co = 1984, Bo = 1984, ko = 1985, Uo = 4550, _o = 5999, Io = 6999, Lo = 7e3, $o = 9041, To = 9734, Ro = 9735, Oo = 9802, Mo = 1e4, Po = 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, un = 27235, ea = 3e4, ta = 30001, na = 30002, ra = 30003, ia = 30004, sa = 30008, oa = 30009, aa = 30015, ca = 30017, ua = 30018, la = 30023, fa = 30024, ha = 30030, da = 30078, pa = 30311, ya = 30315, ga = 30402, wa = 30403, ba = 31922, va = 31923, ma = 31924, Ea = 31925, xa = 31989, Aa = 31990, Na = 34550, Sa = {};
+D(Sa, {
   getHex64: () => ln,
   getInt: () => Dr,
   getSubscriptionId: () => Ka,
-  matchEventId: () => ka,
-  matchEventKind: () => Ca,
+  matchEventId: () => Ca,
+  matchEventKind: () => ka,
   matchEventPubkey: () => Ba
 });
 function ln(e, t) {
@@ -2576,22 +2576,22 @@ function Ka(e) {
   let s = r + 1 + i;
   return e.slice(r + 1, s);
 }
-function ka(e, t) {
+function Ca(e, t) {
   return t === ln(e, "id");
 }
 function Ba(e, t) {
   return t === ln(e, "pubkey");
 }
-function Ca(e, t) {
+function ka(e, t) {
   return t === Dr(e, "kind");
 }
 var Ua = {};
-q(Ua, {
+D(Ua, {
   makeAuthEvent: () => _a
 });
 function _a(e, t) {
   return {
-    kind: Pr,
+    kind: Hr,
     created_at: Math.floor(Date.now() / 1e3),
     tags: [
       ["relay", e],
@@ -2611,7 +2611,7 @@ try {
 } catch {
 }
 var $a = {};
-q($a, {
+D($a, {
   BECH32_REGEX: () => jr,
   Bech32MaxSize: () => fn,
   NostrTypeGuard: () => Ta,
@@ -2619,8 +2619,8 @@ q($a, {
   encodeBytes: () => wt,
   naddrEncode: () => Da,
   neventEncode: () => qa,
-  noteEncode: () => Ha,
-  nprofileEncode: () => Pa,
+  noteEncode: () => Pa,
+  nprofileEncode: () => Ha,
   npubEncode: () => Ma,
   nsecEncode: () => Oa
 });
@@ -2722,7 +2722,7 @@ function Oa(e) {
 function Ma(e) {
   return wt("npub", G(e));
 }
-function Ha(e) {
+function Pa(e) {
   return wt("note", G(e));
 }
 function gt(e, t) {
@@ -2732,7 +2732,7 @@ function gt(e, t) {
 function wt(e, t) {
   return gt(e, t);
 }
-function Pa(e) {
+function Ha(e) {
   let t = hn({
     0: [G(e.pubkey)],
     1: (e.relays || []).map((n) => ne.encode(n))
@@ -2771,7 +2771,7 @@ function hn(e) {
   }), lt(...t);
 }
 var ja = {};
-q(ja, {
+D(ja, {
   decrypt: () => za,
   encrypt: () => zr
 });
@@ -2789,7 +2789,7 @@ function Vr(e) {
   return e.slice(1, 33);
 }
 var Va = {};
-q(Va, {
+D(Va, {
   NIP05_REGEX: () => dn,
   isNip05: () => Wa,
   isValid: () => Fa,
@@ -2836,7 +2836,7 @@ async function Fa(e, t) {
   return n ? n.pubkey === e : !1;
 }
 var Ja = {};
-q(Ja, {
+D(Ja, {
   parse: () => Ya
 });
 function Ya(e) {
@@ -2907,7 +2907,7 @@ function Ya(e) {
   }), t;
 }
 var Xa = {};
-q(Xa, {
+D(Xa, {
   fetchRelayInformation: () => ec,
   useFetchImplementation: () => Qa
 });
@@ -2925,7 +2925,7 @@ async function ec(e) {
   })).json();
 }
 var tc = {};
-q(tc, {
+D(tc, {
   fastEventHash: () => Fr,
   getPow: () => Gr,
   minePow: () => nc
@@ -2959,7 +2959,7 @@ function Fr(e) {
   );
 }
 var rc = {};
-q(rc, {
+D(rc, {
   finishRepostEvent: () => ic,
   getRepostedEvent: () => sc,
   getRepostedEventPointer: () => Jr
@@ -3004,7 +3004,7 @@ function sc(e, { skipVerification: t } = {}) {
     return r;
 }
 var oc = {};
-q(oc, {
+D(oc, {
   NOSTR_URI_REGEX: () => vt,
   parse: () => cc,
   test: () => ac
@@ -3024,7 +3024,7 @@ function cc(e) {
   };
 }
 var uc = {};
-q(uc, {
+D(uc, {
   finishReactionEvent: () => lc,
   getReactedEventPointer: () => fc
 });
@@ -3056,7 +3056,7 @@ function fc(e) {
     };
 }
 var hc = {};
-q(hc, {
+D(hc, {
   matchAll: () => dc,
   regex: () => pn,
   replaceAll: () => pc
@@ -3085,7 +3085,7 @@ function pc(e, t) {
   }));
 }
 var yc = {};
-q(yc, {
+D(yc, {
   channelCreateEvent: () => gc,
   channelHideMessageEvent: () => vc,
   channelMessageEvent: () => bc,
@@ -3172,11 +3172,11 @@ var gc = (e, t) => {
     t
   );
 }, Ec = {};
-q(Ec, {
+D(Ec, {
   EMOJI_SHORTCODE_REGEX: () => Yr,
   matchAll: () => xc,
   regex: () => yn,
-  replaceAll: () => Sc
+  replaceAll: () => Ac
 });
 var Yr = /:(\w+):/, yn = () => new RegExp(`\\B${Yr.source}\\B`, "g");
 function* xc(e) {
@@ -3193,15 +3193,15 @@ function* xc(e) {
     } catch {
     }
 }
-function Sc(e, t) {
+function Ac(e, t) {
   return e.replaceAll(yn(), (n, r) => t({
     shortcode: n,
     name: r
   }));
 }
-var Ac = {};
-q(Ac, {
-  useFetchImplementation: () => Nc,
+var Nc = {};
+D(Nc, {
+  useFetchImplementation: () => Sc,
   validateGithub: () => Kc
 });
 var gn;
@@ -3209,7 +3209,7 @@ try {
   gn = fetch;
 } catch {
 }
-function Nc(e) {
+function Sc(e) {
   gn = e;
 }
 async function Kc(e, t, n) {
@@ -3219,8 +3219,8 @@ async function Kc(e, t, n) {
     return !1;
   }
 }
-var j = {};
-q(j, {
+var q = {};
+D(q, {
   decrypt: () => mn,
   encrypt: () => vn,
   getConversationKey: () => wn,
@@ -3232,7 +3232,7 @@ function wn(e, t) {
   return rn(fe, n, "nip44-v2");
 }
 function ei(e, t) {
-  const n = kr(fe, e, t, 76);
+  const n = Cr(fe, e, t, 76);
   return {
     chacha_key: n.subarray(0, 32),
     chacha_nonce: n.subarray(32, 44),
@@ -3247,17 +3247,17 @@ function bn(e) {
   const t = 1 << Math.floor(Math.log2(e - 1)) + 1, n = t <= 256 ? 32 : t / 8;
   return n * (Math.floor((e - 1) / n) + 1);
 }
-function kc(e) {
+function Cc(e) {
   if (!Number.isSafeInteger(e) || e < Xr || e > Qr)
     throw new Error("invalid plaintext size: must be between 1 and 65535 bytes");
   const t = new Uint8Array(2);
   return new DataView(t.buffer).setUint16(0, e, !1), t;
 }
 function Bc(e) {
-  const t = ne.encode(e), n = t.length, r = kc(n), i = new Uint8Array(bn(n) - n);
+  const t = ne.encode(e), n = t.length, r = Cc(n), i = new Uint8Array(bn(n) - n);
   return lt(r, t, i);
 }
-function Cc(e) {
+function kc(e) {
   const t = new DataView(e.buffer).getUint16(0), n = e.subarray(2, 2 + t);
   if (t < Xr || t > Qr || n.length !== t || e.length !== 2 + bn(t))
     throw new Error("invalid padding");
@@ -3296,15 +3296,15 @@ function Uc(e) {
   };
 }
 function vn(e, t, n = fr(32)) {
-  const { chacha_key: r, chacha_nonce: i, hmac_key: s } = ei(t, n), o = Bc(e), a = Nr(r, i, o), c = ti(s, a, n);
+  const { chacha_key: r, chacha_nonce: i, hmac_key: s } = ei(t, n), o = Bc(e), a = Sr(r, i, o), c = ti(s, a, n);
   return he.encode(lt(new Uint8Array([2]), n, a, c));
 }
 function mn(e, t) {
   const { nonce: n, ciphertext: r, mac: i } = Uc(e), { chacha_key: s, chacha_nonce: o, hmac_key: a } = ei(t, n), c = ti(a, r, n);
   if (!Rs(c, i))
     throw new Error("invalid MAC");
-  const l = Nr(s, o, r);
-  return Cc(l);
+  const l = Sr(s, o, r);
+  return kc(l);
 }
 var _c = {
   utils: {
@@ -3314,7 +3314,7 @@ var _c = {
   encrypt: vn,
   decrypt: mn
 }, Ic = {};
-q(Ic, {
+D(Ic, {
   makeNwcRequestEvent: () => $c,
   parseConnectionString: () => Lc
 });
@@ -3339,12 +3339,12 @@ async function $c(e, t, n) {
   return X(s, t);
 }
 var Tc = {};
-q(Tc, {
+D(Tc, {
   getZapEndpoint: () => Oc,
-  makeZapReceipt: () => Pc,
+  makeZapReceipt: () => Hc,
   makeZapRequest: () => Mc,
   useFetchImplementation: () => Rc,
-  validateZapRequest: () => Hc
+  validateZapRequest: () => Pc
 });
 var En;
 try {
@@ -3395,7 +3395,7 @@ function Mc({
   };
   return t && s.tags.push(["e", t]), s;
 }
-function Hc(e) {
+function Pc(e) {
   let t;
   try {
     t = JSON.parse(e);
@@ -3414,7 +3414,7 @@ function Hc(e) {
   let r = t.tags.find(([s, o]) => s === "e" && o);
   return r && !r[1].match(/^[a-f0-9]{64}$/) ? "Zap request 'e' tag is not valid hex." : t.tags.find(([s, o]) => s === "relays" && o) ? null : "Zap request doesn't have a 'relays' tag.";
 }
-function Pc({
+function Hc({
   zapRequest: e,
   preimage: t,
   bolt11: n,
@@ -3429,7 +3429,7 @@ function Pc({
   return t && o.tags.push(["preimage", t]), o;
 }
 var qc = {};
-q(qc, {
+D(qc, {
   createRumor: () => oi,
   createSeal: () => ai,
   createWrap: () => ci,
@@ -3461,10 +3461,10 @@ function ai(e, t, n) {
   );
 }
 function ci(e, t) {
-  const n = Ce();
+  const n = ke();
   return X(
     {
-      kind: Hr,
+      kind: Pr,
       content: si(e, n, t),
       created_at: ri(),
       tags: [["p", t]]
@@ -3495,7 +3495,7 @@ function zc(e, t) {
   }), n.sort((r, i) => r.created_at - i.created_at), n;
 }
 var Vc = {};
-q(Vc, {
+D(Vc, {
   getToken: () => Wc,
   hashPayload: () => xn,
   unpackEventFromToken: () => fi,
@@ -3579,12 +3579,13 @@ async function wi(e, t, n, r) {
     throw new Error("Invalid nostr event, payload tag does not match request body hash");
   return !0;
 }
-const Pe = 4, jn = 30078, nu = 100;
+const He = 4, jn = 30078, nu = 100;
 var Gc = /* @__PURE__ */ ((e) => (e[e.Us = 0] = "Us", e[e.Them = 1] = "Them", e))(Gc || {});
 function ru(e) {
   return JSON.stringify({
     rootKey: M(e.rootKey),
-    theirNostrPublicKey: e.theirNostrPublicKey,
+    theirCurrentNostrPublicKey: e.theirCurrentNostrPublicKey,
+    theirNextNostrPublicKey: e.theirNextNostrPublicKey,
     ourCurrentNostrKey: e.ourCurrentNostrKey ? {
       publicKey: e.ourCurrentNostrKey.publicKey,
       privateKey: M(e.ourCurrentNostrKey.privateKey)
@@ -3616,7 +3617,8 @@ function iu(e) {
   const t = JSON.parse(e);
   return {
     rootKey: G(t.rootKey),
-    theirNostrPublicKey: t.theirNostrPublicKey,
+    theirCurrentNostrPublicKey: t.theirCurrentNostrPublicKey,
+    theirNextNostrPublicKey: t.theirNextNostrPublicKey,
     ourCurrentNostrKey: t.ourCurrentNostrKey ? {
       publicKey: t.ourCurrentNostrKey.publicKey,
       privateKey: G(t.ourCurrentNostrKey.privateKey)
@@ -3662,7 +3664,7 @@ async function* su(e) {
 function Oe(e, t = new Uint8Array(32), n = 1) {
   const r = rn(fe, e, t), i = [];
   for (let s = 1; s <= n; s++)
-    i.push(kr(fe, r, new Uint8Array([s]), 32));
+    i.push(Cr(fe, r, new Uint8Array([s]), 32));
   return i;
 }
 function It(e, t) {
@@ -3682,7 +3684,7 @@ class st {
   /**
    * Initializes a new secure communication session
    * @param nostrSubscribe Function to subscribe to Nostr events
-   * @param theirNostrPublicKey The public key of the other party
+   * @param theirNextNostrPublicKey The public key of the other party
    * @param ourCurrentPrivateKey Our current private key for Nostr
    * @param isInitiator Whether we are initiating the conversation (true) or responding (false)
    * @param sharedSecret Initial shared secret for securing the first message chain
@@ -3690,12 +3692,12 @@ class st {
    * @returns A new Session instance
    */
   static init(t, n, r, i, s, o) {
-    const a = Ce(), [c, l] = Oe(s, j.getConversationKey(a, n), 2);
+    const a = ke(), [c, l] = Oe(s, q.getConversationKey(a, n), 2);
     let f, u;
     i ? (f = { publicKey: le(r), privateKey: r }, u = { publicKey: le(a), privateKey: a }) : u = { publicKey: le(r), privateKey: r };
     const g = {
       rootKey: i ? c : s,
-      theirNostrPublicKey: n,
+      theirNextNostrPublicKey: n,
       ourCurrentNostrKey: f,
       ourNextNostrKey: u,
       receivingChainKey: void 0,
@@ -3715,12 +3717,12 @@ class st {
    * @throws Error if we are not the initiator and trying to send the first message
    */
   send(t) {
-    if (!this.state.theirNostrPublicKey || !this.state.ourCurrentNostrKey)
+    if (!this.state.theirNextNostrPublicKey || !this.state.ourCurrentNostrKey)
       throw new Error("we are not the initiator, so we can't send the first message");
-    const [n, r] = this.ratchetEncrypt(t), i = j.getConversationKey(this.state.ourCurrentNostrKey.privateKey, this.state.theirNostrPublicKey), s = j.encrypt(JSON.stringify(n), i);
+    const [n, r] = this.ratchetEncrypt(t), i = q.getConversationKey(this.state.ourCurrentNostrKey.privateKey, this.state.theirNextNostrPublicKey), s = q.encrypt(JSON.stringify(n), i);
     return X({
       content: r,
-      kind: Pe,
+      kind: He,
       tags: [["header", s]],
       created_at: Math.floor(Date.now() / 1e3)
     }, this.state.ourCurrentNostrKey.privateKey);
@@ -3749,7 +3751,7 @@ class st {
       nextPublicKey: this.state.ourNextNostrKey.publicKey,
       time: Date.now(),
       previousChainLength: this.state.previousSendingChainMessageCount
-    }, j.encrypt(t, r)];
+    }, q.encrypt(t, r)];
   }
   ratchetDecrypt(t, n, r) {
     const i = this.trySkippedMessageKeys(t, n, r);
@@ -3758,7 +3760,7 @@ class st {
     const [s, o] = Oe(this.state.receivingChainKey, new Uint8Array([1]), 2);
     this.state.receivingChainKey = s, this.state.receivingChainMessageNumber++;
     try {
-      return j.decrypt(n, o);
+      return q.decrypt(n, o);
     } catch (a) {
       throw console.error(this.name, "Decryption failed:", a, {
         messageKey: M(o).slice(0, 4),
@@ -3769,15 +3771,15 @@ class st {
     }
   }
   ratchetStep(t) {
-    this.state.previousSendingChainMessageCount = this.state.sendingChainMessageNumber, this.state.sendingChainMessageNumber = 0, this.state.receivingChainMessageNumber = 0, this.state.theirNostrPublicKey = t;
-    const n = j.getConversationKey(this.state.ourNextNostrKey.privateKey, this.state.theirNostrPublicKey), [r, i] = Oe(this.state.rootKey, n, 2);
+    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);
     this.state.receivingChainKey = i, this.state.ourCurrentNostrKey = this.state.ourNextNostrKey;
-    const s = Ce();
+    const s = ke();
     this.state.ourNextNostrKey = {
       publicKey: le(s),
       privateKey: s
     };
-    const o = j.getConversationKey(this.state.ourNextNostrKey.privateKey, this.state.theirNostrPublicKey), [a, c] = Oe(r, o, 2);
+    const o = q.getConversationKey(this.state.ourNextNostrKey.privateKey, this.state.theirNextNostrPublicKey), [a, c] = Oe(r, o, 2);
     this.state.rootKey = a, this.state.sendingChainKey = c;
   }
   // 3. MESSAGE KEY FUNCTIONS
@@ -3791,10 +3793,10 @@ class st {
       if (this.state.skippedMessageKeys[s] = i, !this.state.skippedHeaderKeys[n]) {
         const o = [];
         if (this.state.ourCurrentNostrKey) {
-          const c = j.getConversationKey(this.state.ourCurrentNostrKey.privateKey, n);
+          const c = q.getConversationKey(this.state.ourCurrentNostrKey.privateKey, n);
           o.push(c);
         }
-        const a = j.getConversationKey(this.state.ourNextNostrKey.privateKey, n);
+        const a = q.getConversationKey(this.state.ourNextNostrKey.privateKey, n);
         o.push(a), this.state.skippedHeaderKeys[n] = o;
       }
       this.state.receivingChainMessageNumber++;
@@ -3805,7 +3807,7 @@ class st {
     const i = It(r, t.number);
     if (i in this.state.skippedMessageKeys) {
       const o = this.state.skippedMessageKeys[i];
-      return delete this.state.skippedMessageKeys[i], Object.keys(this.state.skippedMessageKeys).some((c) => c.startsWith(`${r}:`)) || (delete this.state.skippedHeaderKeys[r], (s = this.nostrUnsubscribe) == null || s.call(this), this.nostrUnsubscribe = void 0), j.decrypt(n, o);
+      return delete this.state.skippedMessageKeys[i], Object.keys(this.state.skippedMessageKeys).some((c) => c.startsWith(`${r}:`)) || (delete this.state.skippedHeaderKeys[r], (s = this.nostrUnsubscribe) == null || s.call(this), this.nostrUnsubscribe = void 0), q.decrypt(n, o);
     }
     return null;
   }
@@ -3813,22 +3815,22 @@ class st {
   decryptHeader(t) {
     const n = t.tags[0][1];
     if (this.state.ourCurrentNostrKey) {
-      const s = j.getConversationKey(this.state.ourCurrentNostrKey.privateKey, t.pubkey);
+      const s = q.getConversationKey(this.state.ourCurrentNostrKey.privateKey, t.pubkey);
       try {
-        return [JSON.parse(j.decrypt(n, s)), !1, !1];
+        return [JSON.parse(q.decrypt(n, s)), !1, !1];
       } catch {
       }
     }
-    const r = j.getConversationKey(this.state.ourNextNostrKey.privateKey, t.pubkey);
+    const r = q.getConversationKey(this.state.ourNextNostrKey.privateKey, t.pubkey);
     try {
-      return [JSON.parse(j.decrypt(n, r)), !0, !1];
+      return [JSON.parse(q.decrypt(n, r)), !0, !1];
     } catch {
     }
     const i = this.state.skippedHeaderKeys[t.pubkey];
     if (i)
       for (const s of i)
         try {
-          return [JSON.parse(j.decrypt(n, s)), !1, !0];
+          return [JSON.parse(q.decrypt(n, s)), !1, !0];
         } catch {
         }
     throw new Error("Failed to decrypt header with current and skipped header keys");
@@ -3837,8 +3839,8 @@ class st {
     var o;
     const [n, r, i] = this.decryptHeader(t);
     if (!i)
-      this.state.theirNostrPublicKey !== n.nextPublicKey && (this.state.theirNostrPublicKey = n.nextPublicKey, (o = this.nostrUnsubscribe) == null || o.call(this), this.nostrUnsubscribe = this.nostrNextUnsubscribe, this.nostrNextUnsubscribe = this.nostrSubscribe(
-        { authors: [this.state.theirNostrPublicKey], kinds: [Pe] },
+      this.state.theirNextNostrPublicKey !== n.nextPublicKey && (this.state.theirCurrentNostrPublicKey = this.state.theirNextNostrPublicKey, this.state.theirNextNostrPublicKey = n.nextPublicKey, (o = this.nostrUnsubscribe) == null || o.call(this), this.nostrUnsubscribe = this.nostrNextUnsubscribe, this.nostrNextUnsubscribe = this.nostrSubscribe(
+        { authors: [this.state.theirNextNostrPublicKey], kinds: [He] },
         (a) => this.handleNostrEvent(a)
       )), r && (this.skipMessageKeys(n.previousChainLength, t.pubkey), this.ratchetStep(n.nextPublicKey));
     else if (!(It(t.pubkey, n.number) in this.state.skippedMessageKeys))
@@ -3849,14 +3851,14 @@ class st {
   subscribeToNostrEvents() {
     if (this.nostrNextUnsubscribe) return;
     this.nostrNextUnsubscribe = this.nostrSubscribe(
-      { authors: [this.state.theirNostrPublicKey], kinds: [Pe] },
+      { authors: [this.state.theirNextNostrPublicKey], kinds: [He] },
       (n) => this.handleNostrEvent(n)
     );
     const t = Object.keys(this.state.skippedHeaderKeys);
-    t.length > 0 && (this.nostrUnsubscribe = this.nostrSubscribe(
-      { authors: t, kinds: [Pe] },
+    this.state.theirCurrentNostrPublicKey && !t.includes(this.state.theirCurrentNostrPublicKey) && t.push(this.state.theirCurrentNostrPublicKey), this.nostrUnsubscribe = this.nostrSubscribe(
+      { authors: t, kinds: [He] },
       (n) => this.handleNostrEvent(n)
-    ));
+    );
   }
 }
 new TextDecoder("utf-8");
@@ -3867,12 +3869,12 @@ function Xe(e, t) {
 }
 class Me {
   constructor(t, n, r, i, s, o, a = []) {
-    this.inviterSessionPublicKey = t, this.linkSecret = n, this.inviter = r, this.inviterSessionPrivateKey = i, this.label = s, this.maxUses = o, this.usedBy = a;
+    this.inviterEphemeralPublicKey = t, this.sharedSecret = n, this.inviter = r, this.inviterEphemeralPrivateKey = i, this.label = s, this.maxUses = o, this.usedBy = a;
   }
   static createNew(t, n, r) {
     if (!t)
       throw new Error("Inviter public key is required");
-    const i = Ce(), s = le(i), o = M(Ce());
+    const i = ke(), s = le(i), o = M(ke());
     return new Me(
       s,
       o,
@@ -3893,9 +3895,9 @@ class Me {
     } catch (l) {
       throw new Error("Invite data in URL hash is not valid JSON: " + l);
     }
-    const { inviter: o, sessionKey: a, linkSecret: c } = s;
+    const { inviter: o, ephemeralKey: a, sharedSecret: c } = s;
     if (!o || !a || !c)
-      throw new Error("Missing required fields (inviter, sessionKey, linkSecret) in invite data.");
+      throw new Error("Missing required fields (inviter, ephemeralKey, sharedSecret) in invite data.");
     return new Me(
       a,
       c,
@@ -3905,10 +3907,10 @@ class Me {
   static deserialize(t) {
     const n = JSON.parse(t);
     return new Me(
-      n.inviterSessionPublicKey,
-      n.linkSecret,
+      n.inviterEphemeralPublicKey,
+      n.sharedSecret,
       n.inviter,
-      n.inviterSessionPrivateKey ? new Uint8Array(n.inviterSessionPrivateKey) : void 0,
+      n.inviterEphemeralPrivateKey ? new Uint8Array(n.inviterEphemeralPrivateKey) : void 0,
       n.label,
       n.maxUses,
       n.usedBy
@@ -3920,9 +3922,9 @@ class Me {
       throw new Error("Event is not signed");
     if (!pt(t))
       throw new Error("Event signature is invalid");
-    const { tags: n } = t, r = (o = n.find(([c]) => c === "sessionKey")) == null ? void 0 : o[1], i = (a = n.find(([c]) => c === "linkSecret")) == null ? void 0 : a[1], s = t.pubkey;
+    const { tags: n } = t, r = (o = n.find(([c]) => c === "ephemeralKey")) == null ? void 0 : o[1], i = (a = n.find(([c]) => c === "sharedSecret")) == null ? void 0 : a[1], s = t.pubkey;
     if (!r || !i)
-      throw new Error("Invalid invite event: missing session key or link secret");
+      throw new Error("Invalid invite event: missing session key or sharedSecret");
     return new Me(
       r,
       i,
@@ -3954,10 +3956,10 @@ class Me {
    */
   serialize() {
     return JSON.stringify({
-      inviterSessionPublicKey: this.inviterSessionPublicKey,
-      linkSecret: this.linkSecret,
+      inviterEphemeralPublicKey: this.inviterEphemeralPublicKey,
+      sharedSecret: this.sharedSecret,
       inviter: this.inviter,
-      inviterSessionPrivateKey: this.inviterSessionPrivateKey ? Array.from(this.inviterSessionPrivateKey) : void 0,
+      inviterEphemeralPrivateKey: this.inviterEphemeralPrivateKey ? Array.from(this.inviterEphemeralPrivateKey) : void 0,
       label: this.label,
       maxUses: this.maxUses,
       usedBy: this.usedBy
@@ -3969,10 +3971,10 @@ class Me {
   getUrl(t = "https://iris.to") {
     const n = {
       inviter: this.inviter,
-      sessionKey: this.inviterSessionPublicKey,
-      linkSecret: this.linkSecret
+      ephemeralKey: this.inviterEphemeralPublicKey,
+      sharedSecret: this.sharedSecret
     }, r = new URL(t);
-    return r.hash = encodeURIComponent(JSON.stringify(n)), console.log("url", r.toString()), r.toString();
+    return r.hash = encodeURIComponent(JSON.stringify(n)), r.toString();
   }
   getEvent() {
     return {
@@ -3980,7 +3982,7 @@ class Me {
       pubkey: this.inviter,
       content: "",
       created_at: Math.floor(Date.now() / 1e3),
-      tags: [["sessionKey", this.inviterSessionPublicKey], ["linkSecret", this.linkSecret], ["d", "nostr-double-ratchet/invite"]]
+      tags: [["ephemeralKey", this.inviterEphemeralPublicKey], ["sharedSecret", this.sharedSecret], ["d", "nostr-double-ratchet/invite"]]
     };
   }
   /**
@@ -3999,26 +4001,26 @@ class Me {
        * so the inviter can create the session on their side.
        */
   async accept(t, n, r) {
-    const i = Ce(), s = le(i), o = this.inviter || this.inviterSessionPublicKey, a = G(this.linkSecret), c = st.init(t, this.inviterSessionPublicKey, i, !0, a, void 0), l = Ce(), f = le(l), u = typeof r == "function" ? r : (p, h) => Promise.resolve(j.encrypt(p, Xe(r, h))), g = {
+    const i = ke(), s = le(i), o = this.inviter || this.inviterEphemeralPublicKey, a = G(this.sharedSecret), c = st.init(t, this.inviterEphemeralPublicKey, i, !0, a, void 0), l = ke(), f = le(l), g = await (typeof r == "function" ? r : (h, d) => Promise.resolve(q.encrypt(h, Xe(r, d))))(s, o), b = {
       pubkey: n,
-      tags: [["secret", this.linkSecret]],
-      content: await u(s, o),
+      tags: [["sharedSecret", this.sharedSecret]],
+      content: await q.encrypt(g, a),
       created_at: Math.floor(Date.now() / 1e3)
-    }, b = {
-      kind: Pe,
+    }, p = {
+      kind: He,
       pubkey: f,
-      content: j.encrypt(JSON.stringify(g), Xe(l, this.inviterSessionPublicKey)),
+      content: q.encrypt(JSON.stringify(b), Xe(l, this.inviterEphemeralPublicKey)),
       created_at: Math.floor(Date.now() / 1e3),
-      tags: [["p", this.inviterSessionPublicKey]]
+      tags: [["p", this.inviterEphemeralPublicKey]]
     };
-    return { session: c, event: X(b, l) };
+    return { session: c, event: X(p, l) };
   }
   listen(t, n, r) {
-    if (!this.inviterSessionPrivateKey)
+    if (!this.inviterEphemeralPrivateKey)
       throw new Error("Inviter session key is not available");
     const i = {
-      kinds: [Pe],
-      "#p": [this.inviterSessionPublicKey]
+      kinds: [He],
+      "#p": [this.inviterEphemeralPublicKey]
     };
     return n(i, async (s) => {
       try {
@@ -4026,15 +4028,15 @@ class Me {
           console.error("Invite has reached maximum number of uses");
           return;
         }
-        const o = await j.decrypt(s.content, Xe(this.inviterSessionPrivateKey, s.pubkey)), a = JSON.parse(o);
-        if (!a.tags || !a.tags.some(([p, h]) => p === "secret" && h === this.linkSecret)) {
+        const o = await q.decrypt(s.content, Xe(this.inviterEphemeralPrivateKey, s.pubkey)), a = JSON.parse(o);
+        if (!a.tags || !a.tags.some(([h, d]) => h === "sharedSecret" && d === this.sharedSecret)) {
           console.error("Invalid secret from event", s);
           return;
         }
-        const c = typeof t == "function" ? t : (p, h) => Promise.resolve(j.decrypt(p, Xe(t, h))), l = a.pubkey;
+        const c = G(this.sharedSecret), l = a.pubkey;
         this.usedBy.push(l);
-        const f = await c(a.content, l), u = G(this.linkSecret), g = s.id, b = st.init(n, f, this.inviterSessionPrivateKey, !1, u, g);
-        r(b, l);
+        const f = await q.decrypt(a.content, c), g = await (typeof t == "function" ? t : (h, d) => Promise.resolve(q.decrypt(h, Xe(t, d))))(f, l), b = s.id, p = st.init(n, g, this.inviterEphemeralPrivateKey, !1, c, b);
+        r(p, l);
       } catch (o) {
         console.error("Error processing invite message:", o, "event", s);
       }
@@ -4045,7 +4047,7 @@ export {
   jn as INVITE_EVENT_KIND,
   Me as Invite,
   nu as MAX_SKIP,
-  Pe as MESSAGE_EVENT_KIND,
+  He as MESSAGE_EVENT_KIND,
   Gc as Sender,
   st as Session,
   su as createMessageStream,