@gardenfi/core 0.2.0-beta.89 → 0.2.0-beta.90

package/dist/index.js

@@ -700,17 +700,17 @@ class Ho extends Hi {
     const { buffer: r, view: n, blockLen: i, isLE: a } = this;
     let { pos: f } = this;
     r[f++] = 128, this.buffer.subarray(f).fill(0), this.padOffset > i - f && (this.process(n, 0), f = 0);
-    for (let m = f; m < i; m++)
-      r[m] = 0;
+    for (let g = f; g < i; g++)
+      r[g] = 0;
     Mo(n, i - 8, BigInt(this.length * 8), a), this.process(n, 0);
     const u = Dr(t), l = this.outputLen;
     if (l % 4)
       throw new Error("_sha2: outputLen should be aligned to 32bit");
-    const b = l / 4, g = this.get();
-    if (b > g.length)
+    const b = l / 4, m = this.get();
+    if (b > m.length)
       throw new Error("_sha2: outputLen bigger than state");
-    for (let m = 0; m < b; m++)
-      u.setUint32(4 * m, g[m], a);
+    for (let g = 0; g < b; g++)
+      u.setUint32(4 * g, m[g], a);
   }
   digest() {
     const { buffer: t, outputLen: r } = this;
@@ -812,18 +812,18 @@ class Go extends Ho {
     this.A = t | 0, this.B = r | 0, this.C = n | 0, this.D = i | 0, this.E = a | 0, this.F = f | 0, this.G = u | 0, this.H = l | 0;
   }
   process(t, r) {
-    for (let m = 0; m < 16; m++, r += 4)
-      Ye[m] = t.getUint32(r, !1);
-    for (let m = 16; m < 64; m++) {
-      const v = Ye[m - 15], I = Ye[m - 2], B = Le(v, 7) ^ Le(v, 18) ^ v >>> 3, P = Le(I, 17) ^ Le(I, 19) ^ I >>> 10;
-      Ye[m] = P + Ye[m - 7] + B + Ye[m - 16] | 0;
+    for (let g = 0; g < 16; g++, r += 4)
+      Ye[g] = t.getUint32(r, !1);
+    for (let g = 16; g < 64; g++) {
+      const v = Ye[g - 15], I = Ye[g - 2], B = Le(v, 7) ^ Le(v, 18) ^ v >>> 3, P = Le(I, 17) ^ Le(I, 19) ^ I >>> 10;
+      Ye[g] = P + Ye[g - 7] + B + Ye[g - 16] | 0;
     }
-    let { A: n, B: i, C: a, D: f, E: u, F: l, G: b, H: g } = this;
-    for (let m = 0; m < 64; m++) {
-      const v = Le(u, 6) ^ Le(u, 11) ^ Le(u, 25), I = g + v + Do(u, l, b) + zo[m] + Ye[m] | 0, P = (Le(n, 2) ^ Le(n, 13) ^ Le(n, 22)) + $o(n, i, a) | 0;
-      g = b, b = l, l = u, u = f + I | 0, f = a, a = i, i = n, n = I + P | 0;
+    let { A: n, B: i, C: a, D: f, E: u, F: l, G: b, H: m } = this;
+    for (let g = 0; g < 64; g++) {
+      const v = Le(u, 6) ^ Le(u, 11) ^ Le(u, 25), I = m + v + Do(u, l, b) + zo[g] + Ye[g] | 0, P = (Le(n, 2) ^ Le(n, 13) ^ Le(n, 22)) + $o(n, i, a) | 0;
+      m = b, b = l, l = u, u = f + I | 0, f = a, a = i, i = n, n = I + P | 0;
     }
-    n = n + this.A | 0, i = i + this.B | 0, a = a + this.C | 0, f = f + this.D | 0, u = u + this.E | 0, l = l + this.F | 0, b = b + this.G | 0, g = g + this.H | 0, this.set(n, i, a, f, u, l, b, g);
+    n = n + this.A | 0, i = i + this.B | 0, a = a + this.C | 0, f = f + this.D | 0, u = u + this.E | 0, l = l + this.F | 0, b = b + this.G | 0, m = m + this.H | 0, this.set(n, i, a, f, u, l, b, m);
   }
   roundClean() {
     Ye.fill(0);
@@ -1031,14 +1031,14 @@ function da(e, t = 24) {
     for (let f = 0; f < 10; f++)
       r[f] = e[f] ^ e[f + 10] ^ e[f + 20] ^ e[f + 30] ^ e[f + 40];
     for (let f = 0; f < 10; f += 2) {
-      const u = (f + 8) % 10, l = (f + 2) % 10, b = r[l], g = r[l + 1], m = Kn(b, g, 1) ^ r[u], v = Yn(b, g, 1) ^ r[u + 1];
+      const u = (f + 8) % 10, l = (f + 2) % 10, b = r[l], m = r[l + 1], g = Kn(b, m, 1) ^ r[u], v = Yn(b, m, 1) ^ r[u + 1];
       for (let I = 0; I < 50; I += 10)
-        e[f + I] ^= m, e[f + I + 1] ^= v;
+        e[f + I] ^= g, e[f + I + 1] ^= v;
     }
     let i = e[2], a = e[3];
     for (let f = 0; f < 24; f++) {
-      const u = Ji[f], l = Kn(i, a, u), b = Yn(i, a, u), g = Yi[f];
-      i = e[g], a = e[g + 1], e[g] = l, e[g + 1] = b;
+      const u = Ji[f], l = Kn(i, a, u), b = Yn(i, a, u), m = Yi[f];
+      i = e[m], a = e[m + 1], e[m] = l, e[m + 1] = b;
     }
     for (let f = 0; f < 50; f += 10) {
       for (let u = 0; u < 10; u++)
@@ -1255,9 +1255,9 @@ function Aa(e, t) {
   return r === "eip1559" ? Pa(e, t) : r === "eip2930" ? Ca(e, t) : r === "eip4844" ? Ta(e, t) : r === "eip7702" ? Ra(e, t) : ka(e, t);
 }
 function Ra(e, t) {
-  const { authorizationList: r, chainId: n, gas: i, nonce: a, to: f, value: u, maxFeePerGas: l, maxPriorityFeePerGas: b, accessList: g, data: m } = e;
+  const { authorizationList: r, chainId: n, gas: i, nonce: a, to: f, value: u, maxFeePerGas: l, maxPriorityFeePerGas: b, accessList: m, data: g } = e;
   va(e);
-  const v = Ir(g), I = Zo(r);
+  const v = Ir(m), I = Zo(r);
   return Yt([
     "0x04",
     ft([
@@ -1268,7 +1268,7 @@ function Ra(e, t) {
       i ? W(i) : "0x",
       f ?? "0x",
       u ? W(u) : "0x",
-      m ?? "0x",
+      g ?? "0x",
       v,
       I,
       ...Jt(e, t)
@@ -1276,7 +1276,7 @@ function Ra(e, t) {
   ]);
 }
 function Ta(e, t) {
-  const { chainId: r, gas: n, nonce: i, to: a, value: f, maxFeePerBlobGas: u, maxFeePerGas: l, maxPriorityFeePerGas: b, accessList: g, data: m } = e;
+  const { chainId: r, gas: n, nonce: i, to: a, value: f, maxFeePerBlobGas: u, maxFeePerGas: l, maxPriorityFeePerGas: b, accessList: m, data: g } = e;
   Ea(e);
   let v = e.blobVersionedHashes, I = e.sidecars;
   if (e.blobs && (typeof v > "u" || typeof I > "u")) {
@@ -1291,7 +1291,7 @@ function Ta(e, t) {
       I = Qo({ blobs: L, commitments: O, proofs: S });
     }
   }
-  const B = Ir(g), P = [
+  const B = Ir(m), P = [
     W(r),
     i ? W(i) : "0x",
     b ? W(b) : "0x",
@@ -1299,7 +1299,7 @@ function Ta(e, t) {
     n ? W(n) : "0x",
     a ?? "0x",
     f ? W(f) : "0x",
-    m ?? "0x",
+    g ?? "0x",
     B,
     u ? W(u) : "0x",
     v ?? [],
@@ -1317,9 +1317,9 @@ function Ta(e, t) {
   ]);
 }
 function Pa(e, t) {
-  const { chainId: r, gas: n, nonce: i, to: a, value: f, maxFeePerGas: u, maxPriorityFeePerGas: l, accessList: b, data: g } = e;
+  const { chainId: r, gas: n, nonce: i, to: a, value: f, maxFeePerGas: u, maxPriorityFeePerGas: l, accessList: b, data: m } = e;
   Bn(e);
-  const m = Ir(b), v = [
+  const g = Ir(b), v = [
     W(r),
     i ? W(i) : "0x",
     l ? W(l) : "0x",
@@ -1327,8 +1327,8 @@ function Pa(e, t) {
     n ? W(n) : "0x",
     a ?? "0x",
     f ? W(f) : "0x",
-    g ?? "0x",
-    m,
+    m ?? "0x",
+    g,
     ...Jt(e, t)
   ];
   return Yt([
@@ -1339,7 +1339,7 @@ function Pa(e, t) {
 function Ca(e, t) {
   const { chainId: r, gas: n, data: i, nonce: a, to: f, value: u, accessList: l, gasPrice: b } = e;
   Ba(e);
-  const g = Ir(l), m = [
+  const m = Ir(l), g = [
     W(r),
     a ? W(a) : "0x",
     b ? W(b) : "0x",
@@ -1347,12 +1347,12 @@ function Ca(e, t) {
     f ?? "0x",
     u ? W(u) : "0x",
     i ?? "0x",
-    g,
+    m,
     ...Jt(e, t)
   ];
   return Yt([
     "0x01",
-    ft(m)
+    ft(g)
   ]);
 }
 function ka(e, t) {
@@ -1367,7 +1367,7 @@ function ka(e, t) {
     i ?? "0x"
   ];
   if (t) {
-    const g = (() => {
+    const m = (() => {
       if (t.v >= 35n)
         return (t.v - 35n) / 2n > 0 ? t.v : 27n + (t.v === 35n ? 0n : 1n);
       if (r > 0)
@@ -1376,11 +1376,11 @@ function ka(e, t) {
       if (t.v !== I)
         throw new Co({ v: t.v });
       return I;
-    })(), m = dr(t.r), v = dr(t.s);
+    })(), g = dr(t.r), v = dr(t.s);
     b = [
       ...b,
-      W(g),
-      m === "0x00" ? "0x" : m,
+      W(m),
+      g === "0x00" ? "0x" : g,
       v === "0x00" ? "0x" : v
     ];
   } else r > 0 && (b = [
@@ -2255,13 +2255,13 @@ class rf {
         address: cr(this.order.source_swap.asset),
         abi: tf,
         client: t
-      }), g = await b.read.token(), m = await Xs(
+      }), m = await b.read.token(), g = await Xs(
         Number(u),
-        g,
+        m,
         this.order.source_swap.asset,
         t
       );
-      if (m.error) return N(m.error);
+      if (g.error) return N(g.error);
       const v = await b.read.eip712Domain(), I = await t.signTypedData({
         account: t.account,
         domain: {
@@ -2433,12 +2433,12 @@ class mr {
     if (this.utxoHashes && this.utxoHashes.length > 0)
       for (const l of this.utxoHashes) {
         const b = await a.getTransaction(l);
-        for (let g = 0; g < b.vout.length; g++) {
-          const m = b.vout[g];
-          m.scriptpubkey_address === i && f.push({
+        for (let m = 0; m < b.vout.length; m++) {
+          const g = b.vout[m];
+          g.scriptpubkey_address === i && f.push({
             txid: b.txid,
-            vout: g,
-            value: m.value,
+            vout: m,
+            value: g.value,
             status: { confirmed: !1 }
           });
         }
@@ -2482,16 +2482,16 @@ class mr {
   async instantRefund(t, r) {
     gt(t.length > 0, me.noCounterpartySigs);
     const { tx: n, usedUtxos: i } = await this.buildRawTx(r);
-    for (const m of i)
-      if (!t.find((v) => v.utxo === m.txid))
-        throw new Error(me.counterPartySigNotFound(m.txid));
+    for (const g of i)
+      if (!t.find((v) => v.utxo === g.txid))
+        throw new Error(me.counterPartySigNotFound(g.txid));
     const a = this.getOutputScript(), f = fe.Transaction.SIGHASH_DEFAULT, u = this.leafHash(
       2
       /* INSTANT_REFUND */
-    ), l = i.map((m) => m.value), b = zr(a, i.length);
-    for (let m = 0; m < n.ins.length; m++) {
+    ), l = i.map((g) => g.value), b = zr(a, i.length);
+    for (let g = 0; g < n.ins.length; g++) {
       const v = n.hashForWitnessV1(
-        m,
+        g,
         b,
         l,
         f,
@@ -2500,15 +2500,15 @@ class mr {
       if (!ot.verifySchnorr(
         v,
         Buffer.from(this.redeemerPubkey, "hex"),
-        Buffer.from(t[m].sig, "hex")
+        Buffer.from(t[g].sig, "hex")
       ))
         throw new Error(
-          me.invalidCounterpartySigForUTXO(t[m].utxo)
+          me.invalidCounterpartySigForUTXO(t[g].utxo)
         );
-      const I = await this.signer.signSchnorr(v), B = Buffer.from(n.ins[m].hash).reverse().toString("hex"), P = t.find((T) => T.utxo === B);
+      const I = await this.signer.signSchnorr(v), B = Buffer.from(n.ins[g].hash).reverse().toString("hex"), P = t.find((T) => T.utxo === B);
       if (!P)
         throw new Error(me.counterPartySigNotFound(B));
-      n.setWitness(m, [
+      n.setWitness(g, [
         Buffer.from(P.sig, "hex"),
         I,
         this.instantRefundLeaf(),
@@ -2534,16 +2534,16 @@ class mr {
     ), f = this.leafHash(
       1
       /* REDEEM */
-    ), u = a.map((m) => m.value), l = zr(this.getOutputScript(), a.length), b = fe.Transaction.SIGHASH_DEFAULT;
-    for (let m = 0; m < i.ins.length; m++) {
+    ), u = a.map((g) => g.value), l = zr(this.getOutputScript(), a.length), b = fe.Transaction.SIGHASH_DEFAULT;
+    for (let g = 0; g < i.ins.length; g++) {
       const v = i.hashForWitnessV1(
-        m,
+        g,
         l,
         u,
         b,
         f
       ), I = await this.signer.signSchnorr(v);
-      i.setWitness(m, [
+      i.setWitness(g, [
         I,
         Buffer.from(t, "hex"),
         this.redeemLeaf(),
@@ -2568,14 +2568,14 @@ class mr {
     const u = this.leafHash(
       0
       /* REFUND */
-    ), l = i.map((v) => v.value), b = zr(this.getOutputScript(), i.length), g = fe.Transaction.SIGHASH_DEFAULT;
+    ), l = i.map((v) => v.value), b = zr(this.getOutputScript(), i.length), m = fe.Transaction.SIGHASH_DEFAULT;
     for (let v = 0; v < n.ins.length; v++) {
       n.ins[v].sequence = this.expiry;
       const I = n.hashForWitnessV1(
         v,
         b,
         l,
-        g,
+        m,
         u
       ), B = await this.signer.signSchnorr(I);
       n.setWitness(v, [
@@ -2771,16 +2771,21 @@ class Bl {
   async swap(t) {
     const r = await this.validateAndFillParams(t);
     if (r.error) return N(r.error);
-    const { sendAddress: n, receiveAddress: i, timelock: a } = r.val, f = await this.orderBook.getOrdersCount(this.evmAddress);
-    if (f.error) return N(f.error);
-    const u = f.val + 1, l = this.secretManager.generateSecret(u);
-    if (l.error) return N(l.error);
-    const { strategyId: b, btcAddress: g } = t.additionalData, m = {
-      strategy_id: b,
-      ...g && {
-        bitcoin_optional_recipient: g
+    const { sendAddress: n, receiveAddress: i, timelock: a } = r.val;
+    let f = t.nonce;
+    if (!f) {
+      const P = await this.orderBook.getOrdersCount(this.evmAddress);
+      if (P.error) return N(P.error);
+      f = P.val + 1;
+    }
+    const u = this.secretManager.generateSecret(f);
+    if (u.error) return N(u.error);
+    const { strategyId: l, btcAddress: b } = t.additionalData, m = {
+      strategy_id: l,
+      ...b && {
+        bitcoin_optional_recipient: b
       }
-    }, v = {
+    }, g = {
       source_chain: t.fromAsset.chain,
       destination_chain: t.toAsset.chain,
       source_asset: t.fromAsset.atomicSwapAddress,
@@ -2790,17 +2795,17 @@ class Bl {
       source_amount: t.sendAmount,
       destination_amount: t.receiveAmount,
       fee: "1",
-      nonce: u.toString(),
+      nonce: f.toString(),
       timelock: a,
-      secret_hash: it(l.val.secretHash),
+      secret_hash: it(u.val.secretHash),
       min_destination_confirmations: t.minDestinationConfirmations ?? 0,
       additional_data: m
-    }, I = await this.quote.getAttestedQuote(v);
+    }, v = await this.quote.getAttestedQuote(g);
+    if (v.error) return N(v.error);
+    const I = await this.orderBook.createOrder(v.val);
     if (I.error) return N(I.error);
-    const B = await this.orderBook.createOrder(I.val);
-    if (B.error) return N(B.error);
-    const P = await this.pollOrder(B.val);
-    return P.error ? N(P.error) : ue(P.val);
+    const B = await this.pollOrder(I.val);
+    return B.error ? N(B.error) : ue(B.val);
   }
   async validateAndFillParams(t) {
     if (t.fromAsset.chain === t.toAsset.chain && t.fromAsset.atomicSwapAddress === t.toAsset.atomicSwapAddress)
@@ -2992,13 +2997,13 @@ class Bl {
     else if (r.destination_swap.redeem_tx_hash && !Number(r.destination_swap.redeem_block_number))
       try {
         const b = await (await t.getProvider()).getTransaction(r.destination_swap.redeem_tx_hash);
-        let g = !1;
-        for (const m of b.vin)
-          if (m.txid === a) {
-            g = !0;
+        let m = !1;
+        for (const g of b.vin)
+          if (g.txid === a) {
+            m = !0;
             break;
           }
-        if (g) {
+        if (m) {
           this.orderExecutorCache.set(
             r,
             le.Redeem,
@@ -3022,7 +3027,7 @@ class Bl {
       }
     this.emit("log", r.create_order.create_id, "executing btc redeem");
     try {
-      const g = await (await mr.from(
+      const m = await (await mr.from(
         t,
         Number(r.destination_swap.amount),
         r.create_order.secret_hash,
@@ -3038,7 +3043,7 @@ class Bl {
         "log",
         r.create_order.create_id,
         "rbf: btc redeem success"
-      ) : this.emit("success", r, le.Redeem, g), this.orderExecutorCache.set(r, le.Redeem, g, a);
+      ) : this.emit("success", r, le.Redeem, m), this.orderExecutorCache.set(r, le.Redeem, m, a);
     } catch (b) {
       this.emit("error", r, "Failed btc redeem: " + b);
     }
@@ -3106,8 +3111,8 @@ class Bl {
     var i;
     const r = await ((i = this.blockNumberFetcher) == null ? void 0 : i.fetchBlockNumbers()), n = [];
     for (let a = 0; a < t.length; a++) {
-      const f = t[a], u = f.source_swap.chain, l = f.destination_swap.chain, b = this.getWallet(u), g = this.getWallet(l);
-      if (b.error || g.error || !b.val || !g.val) {
+      const f = t[a], u = f.source_swap.chain, l = f.destination_swap.chain, b = this.getWallet(u), m = this.getWallet(l);
+      if (b.error || m.error || !b.val || !m.val) {
         this.emit(
           "error",
           f,
@@ -3115,11 +3120,11 @@ class Bl {
         );
         continue;
       }
-      let m = r == null ? void 0 : r.val[u], v = r == null ? void 0 : r.val[l];
-      if (!m || !v) {
+      let g = r == null ? void 0 : r.val[u], v = r == null ? void 0 : r.val[l];
+      if (!g || !v) {
         const B = await this.fetchCurrentBlockNumbers(f, {
           source: b.val,
-          destination: g.val
+          destination: m.val
         });
         if (B.error) {
           this.emit(
@@ -3129,11 +3134,11 @@ class Bl {
           );
           continue;
         }
-        m = B.val.source, v = B.val.destination;
+        g = B.val.source, v = B.val.destination;
       }
       const I = Zi(
         f,
-        m,
+        g,
         v
       );
       n.push({
@@ -3329,8 +3334,8 @@ function yf() {
       return `${M.toJSON()} between [${S}, ${z}]`;
     }, $;
   }
-  var g = Math.pow(2, 53) - 1;
-  function m(S) {
+  var m = Math.pow(2, 53) - 1;
+  function g(S) {
     return typeof S == "number" && isFinite(S);
   }
   function v(S) {
@@ -3343,7 +3348,7 @@ function yf() {
     return (S | 0) === S;
   }
   function P(S) {
-    return typeof S == "number" && S >= -g && S <= g && Math.floor(S) === S;
+    return typeof S == "number" && S >= -m && S <= m && Math.floor(S) === S;
   }
   function T(S) {
     return (S & 255) === S;
@@ -3355,13 +3360,13 @@ function yf() {
     return S >>> 0 === S;
   }
   function L(S) {
-    return typeof S == "number" && S >= 0 && S <= g && Math.floor(S) === S;
+    return typeof S == "number" && S >= 0 && S <= m && Math.floor(S) === S;
   }
   var k = {
     ArrayN: a,
     Buffer: r,
     BufferN: f,
-    Finite: m,
+    Finite: g,
     Hex: n,
     HexN: u,
     Int8: v,
@@ -3444,8 +3449,8 @@ var Xt = ss, he = Sn, Me = Xt.tfJSON, os = Xt.TfTypeError, as = Xt.TfPropertyTyp
           var l = r[u], b = a[u];
           we(l, b, f);
         }
-      } catch (g) {
-        throw Dt(g, u);
+      } catch (m) {
+        throw Dt(m, u);
       }
       if (f) {
         for (u in a)
@@ -3618,10 +3623,10 @@ function If(e) {
 var Rn = {};
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
 Rn.read = function(e, t, r, n, i) {
-  var a, f, u = i * 8 - n - 1, l = (1 << u) - 1, b = l >> 1, g = -7, m = r ? i - 1 : 0, v = r ? -1 : 1, I = e[t + m];
-  for (m += v, a = I & (1 << -g) - 1, I >>= -g, g += u; g > 0; a = a * 256 + e[t + m], m += v, g -= 8)
+  var a, f, u = i * 8 - n - 1, l = (1 << u) - 1, b = l >> 1, m = -7, g = r ? i - 1 : 0, v = r ? -1 : 1, I = e[t + g];
+  for (g += v, a = I & (1 << -m) - 1, I >>= -m, m += u; m > 0; a = a * 256 + e[t + g], g += v, m -= 8)
     ;
-  for (f = a & (1 << -g) - 1, a >>= -g, g += n; g > 0; f = f * 256 + e[t + m], m += v, g -= 8)
+  for (f = a & (1 << -m) - 1, a >>= -m, m += n; m > 0; f = f * 256 + e[t + g], g += v, m -= 8)
     ;
   if (a === 0)
     a = 1 - b;
@@ -3633,8 +3638,8 @@ Rn.read = function(e, t, r, n, i) {
   return (I ? -1 : 1) * f * Math.pow(2, a - n);
 };
 Rn.write = function(e, t, r, n, i, a) {
-  var f, u, l, b = a * 8 - i - 1, g = (1 << b) - 1, m = g >> 1, v = i === 23 ? Math.pow(2, -24) - Math.pow(2, -77) : 0, I = n ? 0 : a - 1, B = n ? 1 : -1, P = t < 0 || t === 0 && 1 / t < 0 ? 1 : 0;
-  for (t = Math.abs(t), isNaN(t) || t === 1 / 0 ? (u = isNaN(t) ? 1 : 0, f = g) : (f = Math.floor(Math.log(t) / Math.LN2), t * (l = Math.pow(2, -f)) < 1 && (f--, l *= 2), f + m >= 1 ? t += v / l : t += v * Math.pow(2, 1 - m), t * l >= 2 && (f++, l /= 2), f + m >= g ? (u = 0, f = g) : f + m >= 1 ? (u = (t * l - 1) * Math.pow(2, i), f = f + m) : (u = t * Math.pow(2, m - 1) * Math.pow(2, i), f = 0)); i >= 8; e[r + I] = u & 255, I += B, u /= 256, i -= 8)
+  var f, u, l, b = a * 8 - i - 1, m = (1 << b) - 1, g = m >> 1, v = i === 23 ? Math.pow(2, -24) - Math.pow(2, -77) : 0, I = n ? 0 : a - 1, B = n ? 1 : -1, P = t < 0 || t === 0 && 1 / t < 0 ? 1 : 0;
+  for (t = Math.abs(t), isNaN(t) || t === 1 / 0 ? (u = isNaN(t) ? 1 : 0, f = m) : (f = Math.floor(Math.log(t) / Math.LN2), t * (l = Math.pow(2, -f)) < 1 && (f--, l *= 2), f + g >= 1 ? t += v / l : t += v * Math.pow(2, 1 - g), t * l >= 2 && (f++, l /= 2), f + g >= m ? (u = 0, f = m) : f + g >= 1 ? (u = (t * l - 1) * Math.pow(2, i), f = f + g) : (u = t * Math.pow(2, g - 1) * Math.pow(2, i), f = 0)); i >= 8; e[r + I] = u & 255, I += B, u /= 256, i -= 8)
     ;
   for (f = f << i | u, b += i; b > 0; e[r + I] = f & 255, I += B, f /= 256, b -= 8)
     ;
@@ -3688,7 +3693,7 @@ Rn.write = function(e, t, r, n, i, a) {
         throw new TypeError(
           'The "string" argument must be of type string. Received type number'
         );
-      return m(c);
+      return g(c);
     }
     return l(c, s, o);
   }
@@ -3728,19 +3733,19 @@ Rn.write = function(e, t, r, n, i, a) {
     if (c < 0)
       throw new RangeError('The value "' + c + '" is invalid for option "size"');
   }
-  function g(c, s, o) {
+  function m(c, s, o) {
     return b(c), c <= 0 ? f(c) : s !== void 0 ? typeof o == "string" ? f(c).fill(s, o) : f(c).fill(s) : f(c);
   }
   u.alloc = function(c, s, o) {
-    return g(c, s, o);
+    return m(c, s, o);
   };
-  function m(c) {
+  function g(c) {
     return b(c), f(c < 0 ? 0 : C(c) | 0);
   }
   u.allocUnsafe = function(c) {
-    return m(c);
+    return g(c);
   }, u.allocUnsafeSlow = function(c) {
-    return m(c);
+    return g(c);
   };
   function v(c, s) {
     if ((typeof s != "string" || s === "") && (s = "utf8"), !u.isEncoding(s))
@@ -4725,8 +4730,8 @@ K.prototype.emit = function(t) {
   if (typeof l == "function")
     ti(l, this, r);
   else
-    for (var b = l.length, g = bs(l, b), n = 0; n < b; ++n)
-      ti(g[n], this, r);
+    for (var b = l.length, m = bs(l, b), n = 0; n < b; ++n)
+      ti(m[n], this, r);
   return !0;
 };
 function ls(e, t, r, n) {
@@ -4935,7 +4940,7 @@ function $f() {
     }
     return (P === "string" ? String : Number)(B);
   }
-  var l = Pt, b = l.Buffer, g = Pn, m = g.inspect, v = m && m.custom || "inspect";
+  var l = Pt, b = l.Buffer, m = Pn, g = m.inspect, v = g && g.custom || "inspect";
   function I(B, P, T) {
     b.prototype.copy.call(B, P, T);
   }
@@ -5035,7 +5040,7 @@ function $f() {
     }, {
       key: v,
       value: function(T, C) {
-        return m(this, t(t({}, C), {}, {
+        return g(this, t(t({}, C), {}, {
           // Only inspect one level.
           depth: 0,
           // It should not recurse.
@@ -5203,12 +5208,12 @@ function vs() {
   function u(w) {
     return i.isBuffer(w) || w instanceof a;
   }
-  var l = _s, b = xs, g = b.getHighWaterMark, m = ht.codes, v = m.ERR_INVALID_ARG_TYPE, I = m.ERR_METHOD_NOT_IMPLEMENTED, B = m.ERR_MULTIPLE_CALLBACK, P = m.ERR_STREAM_CANNOT_PIPE, T = m.ERR_STREAM_DESTROYED, C = m.ERR_STREAM_NULL_VALUES, F = m.ERR_STREAM_WRITE_AFTER_END, L = m.ERR_UNKNOWN_ENCODING, k = l.errorOrDestroy;
+  var l = _s, b = xs, m = b.getHighWaterMark, g = ht.codes, v = g.ERR_INVALID_ARG_TYPE, I = g.ERR_METHOD_NOT_IMPLEMENTED, B = g.ERR_MULTIPLE_CALLBACK, P = g.ERR_STREAM_CANNOT_PIPE, T = g.ERR_STREAM_DESTROYED, C = g.ERR_STREAM_NULL_VALUES, F = g.ERR_STREAM_WRITE_AFTER_END, L = g.ERR_UNKNOWN_ENCODING, k = l.errorOrDestroy;
   de(M, n);
   function O() {
   }
   function S(w, _, R) {
-    t = t || It(), w = w || {}, typeof R != "boolean" && (R = _ instanceof t), this.objectMode = !!w.objectMode, R && (this.objectMode = this.objectMode || !!w.writableObjectMode), this.highWaterMark = g(this, w, "writableHighWaterMark", R), this.finalCalled = !1, this.needDrain = !1, this.ending = !1, this.ended = !1, this.finished = !1, this.destroyed = !1;
+    t = t || It(), w = w || {}, typeof R != "boolean" && (R = _ instanceof t), this.objectMode = !!w.objectMode, R && (this.objectMode = this.objectMode || !!w.writableObjectMode), this.highWaterMark = m(this, w, "writableHighWaterMark", R), this.finalCalled = !1, this.needDrain = !1, this.ending = !1, this.ended = !1, this.finished = !1, this.destroyed = !1;
     var D = w.decodeStrings === !1;
     this.decodeStrings = !D, this.defaultEncoding = w.defaultEncoding || "utf8", this.length = 0, this.writing = !1, this.corked = 0, this.sync = !0, this.bufferProcessing = !1, this.onwrite = function(G) {
       tt(_, G);
@@ -5413,9 +5418,9 @@ function It() {
   if (ai) return Yr;
   ai = 1;
   var e = Object.keys || function(b) {
-    var g = [];
-    for (var m in b) g.push(m);
-    return g;
+    var m = [];
+    for (var g in b) m.push(g);
+    return m;
   };
   Yr = f;
   var t = Bs(), r = vs();
@@ -5467,8 +5472,8 @@ function It() {
     get: function() {
       return this._readableState === void 0 || this._writableState === void 0 ? !1 : this._readableState.destroyed && this._writableState.destroyed;
     },
-    set: function(g) {
-      this._readableState === void 0 || this._writableState === void 0 || (this._readableState.destroyed = g, this._writableState.destroyed = g);
+    set: function(m) {
+      this._readableState === void 0 || this._writableState === void 0 || (this._readableState.destroyed = m, this._writableState.destroyed = m);
     }
   }), Yr;
 }
@@ -5653,9 +5658,9 @@ function Es(e, t, r) {
     i = !1, f = !0, n || r.call(e);
   }, l = e._readableState && e._readableState.endEmitted, b = function() {
     n = !1, l = !0, i || r.call(e);
-  }, g = function(B) {
+  }, m = function(B) {
     r.call(e, B);
-  }, m = function() {
+  }, g = function() {
     var B;
     if (n && !l)
       return (!e._readableState || !e._readableState.ended) && (B = new ui()), r.call(e, B);
@@ -5664,8 +5669,8 @@ function Es(e, t, r) {
   }, v = function() {
     e.req.on("finish", u);
   };
-  return pu(e) ? (e.on("complete", u), e.on("abort", m), e.req ? v() : e.on("request", v)) : i && !e._writableState && (e.on("end", a), e.on("close", a)), e.on("end", b), e.on("finish", u), t.error !== !1 && e.on("error", g), e.on("close", m), function() {
-    e.removeListener("complete", u), e.removeListener("abort", m), e.removeListener("request", v), e.req && e.req.removeListener("finish", u), e.removeListener("end", a), e.removeListener("close", a), e.removeListener("finish", u), e.removeListener("end", b), e.removeListener("error", g), e.removeListener("close", m);
+  return pu(e) ? (e.on("complete", u), e.on("abort", g), e.req ? v() : e.on("request", v)) : i && !e._writableState && (e.on("end", a), e.on("close", a)), e.on("end", b), e.on("finish", u), t.error !== !1 && e.on("error", m), e.on("close", g), function() {
+    e.removeListener("complete", u), e.removeListener("abort", g), e.removeListener("request", v), e.req && e.req.removeListener("finish", u), e.removeListener("end", a), e.removeListener("close", a), e.removeListener("finish", u), e.removeListener("end", b), e.removeListener("error", m), e.removeListener("close", g);
   };
 }
 var kn = Es, Xr, ci;
@@ -5690,7 +5695,7 @@ function bu() {
     }
     return (k === "string" ? String : Number)(L);
   }
-  var i = kn, a = Symbol("lastResolve"), f = Symbol("lastReject"), u = Symbol("error"), l = Symbol("ended"), b = Symbol("lastPromise"), g = Symbol("handlePromise"), m = Symbol("stream");
+  var i = kn, a = Symbol("lastResolve"), f = Symbol("lastReject"), u = Symbol("error"), l = Symbol("ended"), b = Symbol("lastPromise"), m = Symbol("handlePromise"), g = Symbol("stream");
   function v(L, k) {
     return {
       value: L,
@@ -5700,7 +5705,7 @@ function bu() {
   function I(L) {
     var k = L[a];
     if (k !== null) {
-      var O = L[m].read();
+      var O = L[g].read();
       O !== null && (L[b] = null, L[a] = null, L[f] = null, k(v(O, !1)));
     }
   }
@@ -5714,14 +5719,14 @@ function bu() {
           O(v(void 0, !0));
           return;
         }
-        k[g](O, S);
+        k[m](O, S);
       }, S);
     };
   }
   var T = Object.getPrototypeOf(function() {
   }), C = Object.setPrototypeOf((e = {
     get stream() {
-      return this[m];
+      return this[g];
     },
     next: function() {
       var k = this, O = this[u];
@@ -5729,7 +5734,7 @@ function bu() {
         return Promise.reject(O);
       if (this[l])
         return Promise.resolve(v(void 0, !0));
-      if (this[m].destroyed)
+      if (this[g].destroyed)
         return new Promise(function($, se) {
           process.nextTick(function() {
             k[u] ? se(k[u]) : $(v(void 0, !0));
@@ -5739,10 +5744,10 @@ function bu() {
       if (S)
         z = new Promise(P(S, this));
       else {
-        var M = this[m].read();
+        var M = this[g].read();
         if (M !== null)
           return Promise.resolve(v(M, !1));
-        z = new Promise(this[g]);
+        z = new Promise(this[m]);
       }
       return this[b] = z, z;
     }
@@ -5751,7 +5756,7 @@ function bu() {
   }), t(e, "return", function() {
     var k = this;
     return new Promise(function(O, S) {
-      k[m].destroy(null, function(z) {
+      k[g].destroy(null, function(z) {
         if (z) {
           S(z);
           return;
@@ -5760,7 +5765,7 @@ function bu() {
       });
     });
   }), e), T), F = function(k) {
-    var O, S = Object.create(C, (O = {}, t(O, m, {
+    var O, S = Object.create(C, (O = {}, t(O, g, {
       value: k,
       writable: !0
     }), t(O, a, {
@@ -5775,9 +5780,9 @@ function bu() {
     }), t(O, l, {
       value: k._readableState.endEmitted,
       writable: !0
-    }), t(O, g, {
+    }), t(O, m, {
       value: function(M, $) {
-        var se = S[m].read();
+        var se = S[g].read();
         se ? (S[b] = null, S[a] = null, S[f] = null, M(v(se, !1))) : (S[a] = M, S[f] = $);
       },
       writable: !0
@@ -5819,9 +5824,9 @@ function Bs() {
   var u = Pn, l;
   u && u.debuglog ? l = u.debuglog("stream") : l = function() {
   };
-  var b = $f(), g = _s, m = xs, v = m.getHighWaterMark, I = ht.codes, B = I.ERR_INVALID_ARG_TYPE, P = I.ERR_STREAM_PUSH_AFTER_EOF, T = I.ERR_METHOD_NOT_IMPLEMENTED, C = I.ERR_STREAM_UNSHIFT_AFTER_END_EVENT, F, L, k;
+  var b = $f(), m = _s, g = xs, v = g.getHighWaterMark, I = ht.codes, B = I.ERR_INVALID_ARG_TYPE, P = I.ERR_STREAM_PUSH_AFTER_EOF, T = I.ERR_METHOD_NOT_IMPLEMENTED, C = I.ERR_STREAM_UNSHIFT_AFTER_END_EVENT, F, L, k;
   de($, r);
-  var O = g.errorOrDestroy, S = ["error", "close", "destroy", "pause", "resume"];
+  var O = m.errorOrDestroy, S = ["error", "close", "destroy", "pause", "resume"];
   function z(d, p, A) {
     if (typeof d.prependListener == "function") return d.prependListener(p, A);
     !d._events || !d._events[p] ? d.on(p, A) : Array.isArray(d._events[p]) ? d._events[p].unshift(A) : d._events[p] = [A, d._events[p]];
@@ -5845,7 +5850,7 @@ function Bs() {
     set: function(p) {
       this._readableState && (this._readableState.destroyed = p);
     }
-  }), $.prototype.destroy = g.destroy, $.prototype._undestroy = g.undestroy, $.prototype._destroy = function(d, p) {
+  }), $.prototype.destroy = m.destroy, $.prototype._undestroy = m.undestroy, $.prototype._destroy = function(d, p) {
     p(d);
   }, $.prototype.push = function(d, p) {
     var A = this._readableState, U;
@@ -6256,8 +6261,8 @@ function Cu() {
     throw new Su("streams");
   var i, a = t.map(function(f, u) {
     var l = u < t.length - 1, b = u > 0;
-    return Ru(f, l, b, function(g) {
-      i || (i = g), g && a.forEach(bi), !l && (a.forEach(bi), n(i));
+    return Ru(f, l, b, function(m) {
+      i || (i = m), m && a.forEach(bi), !l && (a.forEach(bi), n(i));
     });
   });
   return t.reduce(Tu);
@@ -6733,12 +6738,12 @@ function Lr() {
 Gu(Lr, ks);
 Lr.prototype._update = function() {
   for (var e = ju, t = 0; t < 16; ++t) e[t] = this._block.readInt32LE(t * 4);
-  for (var r = this._a | 0, n = this._b | 0, i = this._c | 0, a = this._d | 0, f = this._e | 0, u = this._a | 0, l = this._b | 0, b = this._c | 0, g = this._d | 0, m = this._e | 0, v = 0; v < 80; v += 1) {
+  for (var r = this._a | 0, n = this._b | 0, i = this._c | 0, a = this._d | 0, f = this._e | 0, u = this._a | 0, l = this._b | 0, b = this._c | 0, m = this._d | 0, g = this._e | 0, v = 0; v < 80; v += 1) {
     var I, B;
-    v < 16 ? (I = yi(r, n, i, a, f, e[$t[v]], jt[0], zt[v]), B = wi(u, l, b, g, m, e[Ht[v]], Wt[0], Gt[v])) : v < 32 ? (I = gi(r, n, i, a, f, e[$t[v]], jt[1], zt[v]), B = _i(u, l, b, g, m, e[Ht[v]], Wt[1], Gt[v])) : v < 48 ? (I = mi(r, n, i, a, f, e[$t[v]], jt[2], zt[v]), B = mi(u, l, b, g, m, e[Ht[v]], Wt[2], Gt[v])) : v < 64 ? (I = _i(r, n, i, a, f, e[$t[v]], jt[3], zt[v]), B = gi(u, l, b, g, m, e[Ht[v]], Wt[3], Gt[v])) : (I = wi(r, n, i, a, f, e[$t[v]], jt[4], zt[v]), B = yi(u, l, b, g, m, e[Ht[v]], Wt[4], Gt[v])), r = f, f = a, a = lt(i, 10), i = n, n = I, u = m, m = g, g = lt(b, 10), b = l, l = B;
+    v < 16 ? (I = yi(r, n, i, a, f, e[$t[v]], jt[0], zt[v]), B = wi(u, l, b, m, g, e[Ht[v]], Wt[0], Gt[v])) : v < 32 ? (I = gi(r, n, i, a, f, e[$t[v]], jt[1], zt[v]), B = _i(u, l, b, m, g, e[Ht[v]], Wt[1], Gt[v])) : v < 48 ? (I = mi(r, n, i, a, f, e[$t[v]], jt[2], zt[v]), B = mi(u, l, b, m, g, e[Ht[v]], Wt[2], Gt[v])) : v < 64 ? (I = _i(r, n, i, a, f, e[$t[v]], jt[3], zt[v]), B = gi(u, l, b, m, g, e[Ht[v]], Wt[3], Gt[v])) : (I = wi(r, n, i, a, f, e[$t[v]], jt[4], zt[v]), B = yi(u, l, b, m, g, e[Ht[v]], Wt[4], Gt[v])), r = f, f = a, a = lt(i, 10), i = n, n = I, u = g, g = m, m = lt(b, 10), b = l, l = B;
   }
-  var P = this._b + i + g | 0;
-  this._b = this._c + a + m | 0, this._c = this._d + f + u | 0, this._d = this._e + r + l | 0, this._e = this._a + n + b | 0, this._a = P;
+  var P = this._b + i + m | 0;
+  this._b = this._c + a + g | 0, this._c = this._d + f + u | 0, this._d = this._e + r + l | 0, this._e = this._a + n + b | 0, this._a = P;
 };
 Lr.prototype._digest = function() {
   this._block[this._blockOffset++] = 128, this._blockOffset > 56 && (this._block.fill(0, this._blockOffset, 64), this._update(), this._blockOffset = 0), this._block.fill(0, this._blockOffset, 56), this._block.writeUInt32LE(this._length[0], 56), this._block.writeUInt32LE(this._length[1], 60), this._update();
@@ -6819,8 +6824,8 @@ Zt.prototype._update = function(e) {
   for (var t = this._w, r = this._a | 0, n = this._b | 0, i = this._c | 0, a = this._d | 0, f = this._e | 0, u = 0; u < 16; ++u) t[u] = e.readInt32BE(u * 4);
   for (; u < 80; ++u) t[u] = t[u - 3] ^ t[u - 8] ^ t[u - 14] ^ t[u - 16];
   for (var l = 0; l < 80; ++l) {
-    var b = ~~(l / 20), g = Ju(r) + Qu(b, n, i, a) + f + t[l] + Ku[b] | 0;
-    f = a, a = i, i = Xu(n), n = r, r = g;
+    var b = ~~(l / 20), m = Ju(r) + Qu(b, n, i, a) + f + t[l] + Ku[b] | 0;
+    f = a, a = i, i = Xu(n), n = r, r = m;
   }
   this._a = r + this._a | 0, this._b = n + this._b | 0, this._c = i + this._c | 0, this._d = a + this._d | 0, this._e = f + this._e | 0;
 };
@@ -6857,8 +6862,8 @@ er.prototype._update = function(e) {
   for (var t = this._w, r = this._a | 0, n = this._b | 0, i = this._c | 0, a = this._d | 0, f = this._e | 0, u = 0; u < 16; ++u) t[u] = e.readInt32BE(u * 4);
   for (; u < 80; ++u) t[u] = ic(t[u - 3] ^ t[u - 8] ^ t[u - 14] ^ t[u - 16]);
   for (var l = 0; l < 80; ++l) {
-    var b = ~~(l / 20), g = sc(r) + ac(b, n, i, a) + f + t[l] + rc[b] | 0;
-    f = a, a = i, i = oc(n), n = r, r = g;
+    var b = ~~(l / 20), m = sc(r) + ac(b, n, i, a) + f + t[l] + rc[b] | 0;
+    f = a, a = i, i = oc(n), n = r, r = m;
   }
   this._a = r + this._a | 0, this._b = n + this._b | 0, this._c = i + this._c | 0, this._d = a + this._d | 0, this._e = f + this._e | 0;
 };
@@ -6958,10 +6963,10 @@ function mc(e) {
   return (e >>> 17 | e << 15) ^ (e >>> 19 | e << 13) ^ e >>> 10;
 }
 tr.prototype._update = function(e) {
-  for (var t = this._w, r = this._a | 0, n = this._b | 0, i = this._c | 0, a = this._d | 0, f = this._e | 0, u = this._f | 0, l = this._g | 0, b = this._h | 0, g = 0; g < 16; ++g) t[g] = e.readInt32BE(g * 4);
-  for (; g < 64; ++g) t[g] = mc(t[g - 2]) + t[g - 7] + gc(t[g - 15]) + t[g - 16] | 0;
-  for (var m = 0; m < 64; ++m) {
-    var v = b + yc(f) + dc(f, u, l) + lc[m] + t[m] | 0, I = bc(r) + pc(r, n, i) | 0;
+  for (var t = this._w, r = this._a | 0, n = this._b | 0, i = this._c | 0, a = this._d | 0, f = this._e | 0, u = this._f | 0, l = this._g | 0, b = this._h | 0, m = 0; m < 16; ++m) t[m] = e.readInt32BE(m * 4);
+  for (; m < 64; ++m) t[m] = mc(t[m - 2]) + t[m - 7] + gc(t[m - 15]) + t[m - 16] | 0;
+  for (var g = 0; g < 64; ++g) {
+    var v = b + yc(f) + dc(f, u, l) + lc[g] + t[g] | 0, I = bc(r) + pc(r, n, i) | 0;
     b = l, l = u, u = f, f = a + v | 0, a = i, i = n, n = r, r = v + I | 0;
   }
   this._a = r + this._a | 0, this._b = n + this._b | 0, this._c = i + this._c | 0, this._d = a + this._d | 0, this._e = f + this._e | 0, this._f = u + this._f | 0, this._g = l + this._g | 0, this._h = b + this._h | 0;
@@ -7179,7 +7184,7 @@ function ce(e, t) {
   return e >>> 0 < t >>> 0 ? 1 : 0;
 }
 rr.prototype._update = function(e) {
-  for (var t = this._w, r = this._ah | 0, n = this._bh | 0, i = this._ch | 0, a = this._dh | 0, f = this._eh | 0, u = this._fh | 0, l = this._gh | 0, b = this._hh | 0, g = this._al | 0, m = this._bl | 0, v = this._cl | 0, I = this._dl | 0, B = this._el | 0, P = this._fl | 0, T = this._gl | 0, C = this._hl | 0, F = 0; F < 32; F += 2)
+  for (var t = this._w, r = this._ah | 0, n = this._bh | 0, i = this._ch | 0, a = this._dh | 0, f = this._eh | 0, u = this._fh | 0, l = this._gh | 0, b = this._hh | 0, m = this._al | 0, g = this._bl | 0, v = this._cl | 0, I = this._dl | 0, B = this._el | 0, P = this._fl | 0, T = this._gl | 0, C = this._hl | 0, F = 0; F < 32; F += 2)
     t[F] = e.readInt32BE(F * 4), t[F + 1] = e.readInt32BE(F * 4 + 4);
   for (; F < 160; F += 2) {
     var L = t[F - 30], k = t[F - 15 * 2 + 1], O = Rc(L, k), S = Tc(k, L);
@@ -7189,12 +7194,12 @@ rr.prototype._update = function(e) {
   }
   for (var Ee = 0; Ee < 160; Ee += 2) {
     ve = t[Ee], ae = t[Ee + 1];
-    var tt = Ei(r, n, i), Pe = Ei(g, m, v), Ge = Bi(r, g), Ce = Bi(g, r), je = Si(f, B), Q = Si(B, f), oe = xi[Ee], Be = xi[Ee + 1], We = vi(f, u, l), Ue = vi(B, P, T), w = C + Q | 0, _ = b + je + ce(w, C) | 0;
+    var tt = Ei(r, n, i), Pe = Ei(m, g, v), Ge = Bi(r, m), Ce = Bi(m, r), je = Si(f, B), Q = Si(B, f), oe = xi[Ee], Be = xi[Ee + 1], We = vi(f, u, l), Ue = vi(B, P, T), w = C + Q | 0, _ = b + je + ce(w, C) | 0;
     w = w + Ue | 0, _ = _ + We + ce(w, Ue) | 0, w = w + Be | 0, _ = _ + oe + ce(w, Be) | 0, w = w + ae | 0, _ = _ + ve + ce(w, ae) | 0;
     var R = Ce + Pe | 0, D = Ge + tt + ce(R, Ce) | 0;
-    b = l, C = T, l = u, T = P, u = f, P = B, B = I + w | 0, f = a + _ + ce(B, I) | 0, a = i, I = v, i = n, v = m, n = r, m = g, g = w + R | 0, r = _ + D + ce(g, w) | 0;
+    b = l, C = T, l = u, T = P, u = f, P = B, B = I + w | 0, f = a + _ + ce(B, I) | 0, a = i, I = v, i = n, v = g, n = r, g = m, m = w + R | 0, r = _ + D + ce(m, w) | 0;
   }
-  this._al = this._al + g | 0, this._bl = this._bl + m | 0, this._cl = this._cl + v | 0, this._dl = this._dl + I | 0, this._el = this._el + B | 0, this._fl = this._fl + P | 0, this._gl = this._gl + T | 0, this._hl = this._hl + C | 0, this._ah = this._ah + r + ce(this._al, g) | 0, this._bh = this._bh + n + ce(this._bl, m) | 0, this._ch = this._ch + i + ce(this._cl, v) | 0, this._dh = this._dh + a + ce(this._dl, I) | 0, this._eh = this._eh + f + ce(this._el, B) | 0, this._fh = this._fh + u + ce(this._fl, P) | 0, this._gh = this._gh + l + ce(this._gl, T) | 0, this._hh = this._hh + b + ce(this._hl, C) | 0;
+  this._al = this._al + m | 0, this._bl = this._bl + g | 0, this._cl = this._cl + v | 0, this._dl = this._dl + I | 0, this._el = this._el + B | 0, this._fl = this._fl + P | 0, this._gl = this._gl + T | 0, this._hl = this._hl + C | 0, this._ah = this._ah + r + ce(this._al, m) | 0, this._bh = this._bh + n + ce(this._bl, g) | 0, this._ch = this._ch + i + ce(this._cl, v) | 0, this._dh = this._dh + a + ce(this._dl, I) | 0, this._eh = this._eh + f + ce(this._el, B) | 0, this._fh = this._fh + u + ce(this._fl, P) | 0, this._gh = this._gh + l + ce(this._gl, T) | 0, this._hh = this._hh + b + ce(this._hl, C) | 0;
 };
 rr.prototype._hash = function() {
   var e = Ic.allocUnsafe(64);
@@ -7305,7 +7310,7 @@ function Vc(e) {
     t[a] = n;
   }
   var f = e.length, u = e.charAt(0), l = Math.log(f) / Math.log(256), b = Math.log(256) / Math.log(f);
-  function g(I) {
+  function m(I) {
     if ((Array.isArray(I) || I instanceof Uint8Array) && (I = ur.from(I)), !ur.isBuffer(I))
       throw new TypeError("Expected Buffer");
     if (I.length === 0)
@@ -7325,7 +7330,7 @@ function Vc(e) {
       M += e.charAt(L[z]);
     return M;
   }
-  function m(I) {
+  function g(I) {
     if (typeof I != "string")
       throw new TypeError("Expected String");
     if (I.length === 0)
@@ -7351,14 +7356,14 @@ function Vc(e) {
     return z;
   }
   function v(I) {
-    var B = m(I);
+    var B = g(I);
     if (B)
       return B;
     throw new Error("Non-base" + f + " character");
   }
   return {
-    encode: g,
-    decodeUnsafe: m,
+    encode: m,
+    decodeUnsafe: g,
     decode: v
   };
 }
@@ -7655,10 +7660,10 @@ function cl(e) {
     return _e.typeforce(e.isPoint, u), _e.typeforce(nn, l), new f(void 0, u, l);
   }
   function i(u, l) {
-    const b = Ai.decode(u), g = b.version;
+    const b = Ai.decode(u), m = b.version;
     if (_e.Array(l)) {
-      if (l = l.filter((m) => g === m.wif).pop(), !l) throw new Error("Unknown network version");
-    } else if (l = l || pn.bitcoin, g !== l.wif) throw new Error("Invalid network version");
+      if (l = l.filter((g) => m === g.wif).pop(), !l) throw new Error("Unknown network version");
+    } else if (l = l || pn.bitcoin, m !== l.wif) throw new Error("Invalid network version");
     return r(b.privateKey, {
       compressed: b.compressed,
       network: l
@@ -7674,13 +7679,13 @@ function cl(e) {
     return r(b, u);
   }
   class f {
-    constructor(l, b, g) {
+    constructor(l, b, m) {
       yt(this, "__D");
       yt(this, "__Q");
       yt(this, "compressed");
       yt(this, "network");
       yt(this, "lowR");
-      this.__D = l, this.__Q = b, this.lowR = !1, g === void 0 && (g = {}), this.compressed = g.compressed === void 0 ? !0 : g.compressed, this.network = g.network || pn.bitcoin, b !== void 0 && (this.__Q = Buffer.from(e.pointCompress(b, this.compressed)));
+      this.__D = l, this.__Q = b, this.lowR = !1, m === void 0 && (m = {}), this.compressed = m.compressed === void 0 ? !0 : m.compressed, this.network = m.network || pn.bitcoin, b !== void 0 && (this.__Q = Buffer.from(e.pointCompress(b, this.compressed)));
     }
     get privateKey() {
       return this.__D;
@@ -7704,12 +7709,12 @@ function cl(e) {
       if (b === void 0 && (b = this.lowR), b === !1)
         return Buffer.from(e.sign(l, this.__D));
       {
-        let g = e.sign(l, this.__D);
-        const m = Buffer.alloc(32, 0);
+        let m = e.sign(l, this.__D);
+        const g = Buffer.alloc(32, 0);
         let v = 0;
-        for (; g[0] > 127; )
-          v++, m.writeUIntLE(v, 0, 6), g = e.sign(l, this.__D, m);
-        return Buffer.from(g);
+        for (; m[0] > 127; )
+          v++, g.writeUIntLE(v, 0, 6), m = e.sign(l, this.__D, g);
+        return Buffer.from(m);
       }
     }
     signSchnorr(l) {
@@ -7727,21 +7732,21 @@ function cl(e) {
       return e.verifySchnorr(l, this.publicKey.subarray(1, 33), b);
     }
     tweakFromPublicKey(l) {
-      const b = ul(this.publicKey), g = e.xOnlyPointAddTweak(b, l);
-      if (!g || g.xOnlyPubkey === null)
+      const b = ul(this.publicKey), m = e.xOnlyPointAddTweak(b, l);
+      if (!m || m.xOnlyPubkey === null)
         throw new Error("Cannot tweak public key!");
-      const m = Buffer.from([
-        g.parity === 0 ? 2 : 3
+      const g = Buffer.from([
+        m.parity === 0 ? 2 : 3
       ]);
       return n(
-        Buffer.concat([m, g.xOnlyPubkey]),
+        Buffer.concat([g, m.xOnlyPubkey]),
         { network: this.network, compressed: this.compressed }
       );
     }
     tweakFromPrivateKey(l) {
-      const g = this.publicKey[0] === 3 || this.publicKey[0] === 4 && (this.publicKey[64] & 1) === 1 ? e.privateNegate(this.privateKey) : this.privateKey, m = e.privateAdd(g, l);
-      if (!m) throw new Error("Invalid tweaked private key!");
-      return r(Buffer.from(m), {
+      const m = this.publicKey[0] === 3 || this.publicKey[0] === 4 && (this.publicKey[64] & 1) === 1 ? e.privateNegate(this.privateKey) : this.privateKey, g = e.privateAdd(m, l);
+      if (!g) throw new Error("Invalid tweaked private key!");
+      return r(Buffer.from(g), {
         network: this.network,
         compressed: this.compressed
       });