@swapkit/core 1.0.0-rc.24 → 1.0.0-rc.26

package/dist/index.es.js

@@ -843,7 +843,7 @@ var pt = /* @__PURE__ */ ((e) => (e[e.NoError = 36864] = "NoError", e))(pt || {}
   if (t.has(e))
     throw TypeError("Cannot add the same private member more than once");
   t instanceof WeakSet ? t.add(e) : t.set(e, n);
-}, g = (e, t, n) => (yt(e, t, "access private method"), n);
+}, R = (e, t, n) => (yt(e, t, "access private method"), n);
 const ct = "0x313ce567", De = async ({ chain: e, to: t }) => {
   try {
     const { result: n } = await be.post(ot[e], {
@@ -985,14 +985,14 @@ const ct = "0x313ce567", De = async ({ chain: e, to: t }) => {
   poolUnits: t,
   runeDepth: n
 }) => {
-  const a = I(e), s = I(t), r = I(n), o = a.mul(r), p = s.mul(s).mul(2), d = s.mul(a).mul(2), y = a.mul(a), u = s.mul(s).mul(s);
+  const a = g(e), s = g(t), r = g(n), o = a.mul(r), p = s.mul(s).mul(2), d = s.mul(a).mul(2), y = a.mul(a), u = s.mul(s).mul(s);
   return o.mul(p.sub(d).add(y)).div(u);
 }, gt = ({
   liquidityUnits: e,
   poolUnits: t,
   assetDepth: n
 }) => {
-  const a = I(e), s = I(t), r = I(n), o = a.mul(r), p = s.mul(s).mul(2), d = s.mul(a).mul(2), y = a.mul(a), u = o.mul(p.sub(d).add(y)), c = s.mul(s).mul(s);
+  const a = g(e), s = g(t), r = g(n), o = a.mul(r), p = s.mul(s).mul(2), d = s.mul(a).mul(2), y = a.mul(a), u = o.mul(p.sub(d).add(y)), c = s.mul(s).mul(s);
   return u.div(c);
 }, In = ({
   percent: e,
@@ -1004,14 +1004,14 @@ const ct = "0x313ce567", De = async ({ chain: e, to: t }) => {
   assetDepth: t,
   liquidityUnits: n,
   poolUnits: a
-}) => gt({ assetDepth: t, liquidityUnits: n, poolUnits: a }).mul(e), I = (e) => N.fromBigInt(BigInt(e), A.THOR), Ot = ({
+}) => gt({ assetDepth: t, liquidityUnits: n, poolUnits: a }).mul(e), g = (e) => D.fromBigInt(BigInt(e), A.THOR), Ot = ({
   liquidityUnits: e,
   poolUnits: t,
   runeDepth: n,
   assetDepth: a
 }) => ({
-  assetAmount: I(a).mul(e).div(t),
-  runeAmount: I(n).mul(e).div(t)
+  assetAmount: g(a).mul(e).div(t),
+  runeAmount: g(n).mul(e).div(t)
 }), vn = ({
   liquidityUnits: e,
   poolUnits: t,
@@ -1030,8 +1030,8 @@ const ct = "0x313ce567", De = async ({ chain: e, to: t }) => {
   runeAmount: s,
   assetAmount: r
 }) => {
-  const o = new N({ value: e, decimal: 8 }), p = new N({ value: n, decimal: 8 }), d = new N({ value: t, decimal: 8 }), y = new N({ value: s, decimal: 8 }), u = new N({ value: r, decimal: 8 }), c = y.mul(p), _ = u.mul(o), b = y.mul(u), E = o.mul(p), R = d.mul(c.add(_.add(b.mul(2)))), w = c.add(_.add(E.mul(2))), O = R.div(w), S = I(a).add(O);
-  if (O.getBaseValue("number") === 0)
+  const o = new D({ value: e, decimal: 8 }), p = new D({ value: n, decimal: 8 }), d = new D({ value: t, decimal: 8 }), y = new D({ value: s, decimal: 8 }), u = new D({ value: r, decimal: 8 }), c = y.mul(p), _ = u.mul(o), b = y.mul(u), w = o.mul(p), E = d.mul(c.add(_.add(b.mul(2)))), O = c.add(_.add(w.mul(2))), I = E.div(O), S = g(a).add(I);
+  if (I.getBaseValue("number") === 0)
     return S.div(d).getBaseValue("number");
   const P = d.add(S);
   return S.div(P).getBaseValue("number");
@@ -1043,13 +1043,13 @@ const ct = "0x313ce567", De = async ({ chain: e, to: t }) => {
 }) => {
   if (e === "0" || t === "0" || n === "0" || a === "0")
     return 0;
-  const s = I(n), r = I(a), o = I(t), p = I(e), d = o.mul(s).sub(r.mul(p)), y = r.mul(p).add(s.mul(r));
+  const s = g(n), r = g(a), o = g(t), p = g(e), d = o.mul(s).sub(r.mul(p)), y = r.mul(p).add(s.mul(r));
   return Math.abs(d.div(y).getBaseValue("number"));
 }, It = ({
   symbol: e,
   ticker: t,
   chain: n
-}) => n === "ETH" && t !== "ETH" ? `${t}-${e.slice(-3)}` : e, D = (e, t) => {
+}) => n === "ETH" && t !== "ETH" ? `${t}-${e.slice(-3)}` : e, x = (e, t) => {
   switch (e) {
     case h.LEAVE:
     case h.BOND: {
@@ -1474,8 +1474,8 @@ const qt = class $e {
     L(this, U), L(this, pe), L(this, de), L(this, ee), L(this, $), L(this, te), C(this, "decimalMultiplier", 10n ** 8n), C(this, "bigIntValue", 0n), C(this, "decimal");
     const n = ce(t);
     this.decimal = typeof t == "object" ? t.decimal : void 0, this.decimalMultiplier = H(
-      Math.max(g(this, te, le).call(this, g(this, $, W).call(this, n)), this.decimal || 0)
-    ), g(this, pe, He).call(this, n);
+      Math.max(R(this, te, le).call(this, R(this, $, W).call(this, n)), this.decimal || 0)
+    ), R(this, pe, He).call(this, n);
   }
   static fromBigInt(t, n) {
     return new $e({
@@ -1515,16 +1515,16 @@ const qt = class $e {
     return new this.constructor({ decimal: this.decimal, value: t, identifier: this.toString() });
   }
   add(...t) {
-    return g(this, U, k).call(this, "add", ...t);
+    return R(this, U, k).call(this, "add", ...t);
   }
   sub(...t) {
-    return g(this, U, k).call(this, "sub", ...t);
+    return R(this, U, k).call(this, "sub", ...t);
   }
   mul(...t) {
-    return g(this, U, k).call(this, "mul", ...t);
+    return R(this, U, k).call(this, "mul", ...t);
   }
   div(...t) {
-    return g(this, U, k).call(this, "div", ...t);
+    return R(this, U, k).call(this, "div", ...t);
   }
   gt(t) {
     return this.bigIntValue > this.getBigIntValue(t);
@@ -1569,8 +1569,8 @@ const qt = class $e {
   getBigIntValue(t, n) {
     if (!n && typeof t == "object")
       return t.bigIntValue;
-    const a = ce(t), s = g(this, $, W).call(this, a);
-    return s === "0" || s === "undefined" ? 0n : g(this, ee, ue).call(this, s, n);
+    const a = ce(t), s = R(this, $, W).call(this, a);
+    return s === "0" || s === "undefined" ? 0n : R(this, ee, ue).call(this, s, n);
   }
   formatBigIntToSafeValue(t, n) {
     const a = n || this.decimal || j, s = Math.max(
@@ -1619,7 +1619,7 @@ const qt = class $e {
   }
 };
 U = /* @__PURE__ */ new WeakSet(), k = function(e, ...t) {
-  const n = g(this, de, ge).call(this, this, ...t), a = H(n), s = t.reduce(
+  const n = R(this, de, ge).call(this, this, ...t), a = H(n), s = t.reduce(
     (o, p) => {
       const d = this.getBigIntValue(p, n);
       switch (e) {
@@ -1647,11 +1647,11 @@ U = /* @__PURE__ */ new WeakSet(), k = function(e, ...t) {
   });
   return new this.constructor({ decimal: this.decimal, value: r, identifier: this.toString() });
 }, pe = /* @__PURE__ */ new WeakSet(), He = function(e) {
-  const t = g(this, $, W).call(this, e) || "0";
-  this.bigIntValue = g(this, ee, ue).call(this, t);
+  const t = R(this, $, W).call(this, e) || "0";
+  this.bigIntValue = R(this, ee, ue).call(this, t);
 }, de = /* @__PURE__ */ new WeakSet(), ge = function(...e) {
   const t = e.map(
-    (n) => typeof n == "object" ? n.decimal || G(n.decimalMultiplier) : g(this, te, le).call(this, g(this, $, W).call(this, n))
+    (n) => typeof n == "object" ? n.decimal || G(n.decimalMultiplier) : R(this, te, le).call(this, R(this, $, W).call(this, n))
   ).filter(Boolean);
   return Math.max(...t, j);
 }, ee = /* @__PURE__ */ new WeakSet(), ue = function(e, t) {
@@ -1681,9 +1681,9 @@ const Oe = (e) => {
 }, Ie = async (e, t = 0) => {
   Wt(e);
   const n = await _t(Te(e)), a = z(t, n);
-  return new x({ decimal: n, value: a, identifier: e });
+  return new N({ decimal: n, value: a, identifier: e });
 };
-class x extends ye {
+class N extends ye {
   constructor(t) {
     super(
       t.value instanceof ye ? t.value : { decimal: t.decimal, value: t.value }
@@ -1711,18 +1711,18 @@ class x extends ye {
     const { isSynthetic: a } = Te(t), { decimal: s, identifier: r } = Oe(
       t
     ), o = z(n, s);
-    return r ? new x({ decimal: s, identifier: r, value: o }) : a ? new x({ decimal: 8, identifier: t, value: o }) : void 0;
+    return r ? new N({ decimal: s, identifier: r, value: o }) : a ? new N({ decimal: 8, identifier: t, value: o }) : void 0;
   }
   static async fromIdentifier(t, n = 0) {
     return Ie(t, n);
   }
   static fromIdentifierSync(t, n = 0) {
     const { decimal: a, identifier: s } = Oe(t), r = z(n, a);
-    return new x({ decimal: a, identifier: s, value: r });
+    return new N({ decimal: a, identifier: s, value: r });
   }
   static fromChainOrSignature(t, n = 0) {
     const { decimal: a, identifier: s } = wt(t), r = z(n, a);
-    return new x({ value: r, decimal: a, identifier: s });
+    return new N({ value: r, decimal: a, identifier: s });
   }
   static async loadStaticAssets() {
     return new Promise(
@@ -1754,7 +1754,7 @@ class x extends ye {
   }
 }
 const Se = (e) => {
-  const t = x.fromChainOrSignature(e);
+  const t = N.fromChainOrSignature(e);
   switch (e) {
     case i.Bitcoin:
     case i.Litecoin:
@@ -1843,12 +1843,12 @@ class m extends Error {
     console.error(n), super(t, { cause: { code: jt[t], message: t } }), Object.setPrototypeOf(this, m.prototype);
   }
 }
-class N extends ye {
+class D extends ye {
   eq(t) {
     return this.eqValue(t);
   }
   static fromBigInt(t, n) {
-    return new N({
+    return new D({
       decimal: n,
       value: se({ value: t, bigIntDecimal: n, decimal: n })
     });
@@ -3576,30 +3576,30 @@ const Kt = [
     tcMemo: c,
     tcRouter: _,
     tcVault: b,
-    vault: E,
-    token: R
+    vault: w,
+    token: E
   }
 }) => {
-  const w = !!ke[t.toLowerCase()];
-  if (w && !y)
+  const O = !!ke[t.toLowerCase()];
+  if (O && !y)
     throw new Error("Router is required on calldata for swapIn with GenericContract");
-  const O = c || d, S = e && u || O;
-  if (!b && !E)
+  const I = c || d, S = e && u || I;
+  if (!b && !w)
     throw new Error("TC Vault is required on calldata");
   if (!_ && !y)
     throw new Error("TC Router is required on calldata");
   if (!S)
     throw new Error("TC Memo is required on calldata");
-  if (!R)
+  if (!E)
     throw new Error("Token is required on calldata");
   const P = [
     // v2 contracts don't have tcVault, tcRouter, tcMemo but vault, router, memo
     a(_ || y),
-    a(b || E),
+    a(b || w),
     S.replace("{recipientAddress}", n),
-    a(R),
+    a(E),
     s
-  ], Fe = w ? [a(y), o, p] : [r, p];
+  ], Fe = O ? [a(y), o, p] : [r, p];
   return [...P, ...Fe];
 }, un = ({ chain: e, txHash: t }) => {
   const n = xe[e];
@@ -3690,31 +3690,29 @@ class Pn {
             throw new m("core_wallet_connection_not_found");
           if (!(t ? (p = a == null ? void 0 : a.streamingSwap) == null ? void 0 : p.transaction : a == null ? void 0 : a.transaction))
             throw new m("core_swap_route_transaction_not_found");
-          const { isHexString: c, parseUnits: _ } = await import("./index-cf1865cd.js"), { data: b, from: E, to: R, value: w } = a.transaction, O = {
-            data: b,
-            from: E,
-            to: R.toLowerCase(),
+          const { data: c, from: _, to: b, value: w } = a.transaction, E = {
+            data: c,
+            from: _,
+            to: b.toLowerCase(),
             chainId: BigInt(rt[o]),
-            value: w ? new N({
-              value: c(w) ? w : _(w, "wei").toString(16)
-            }).getBaseValue("bigint") : 0n
+            value: w ? BigInt(w) : 0n
           };
-          return y.sendTransaction(O, s);
+          return y.sendTransaction(E, s);
         }
         if (et.includes(r)) {
           if (!a.calldata.fromAsset)
             throw new m("core_swap_asset_not_recognized");
-          const y = await x.fromString(a.calldata.fromAsset);
+          const y = await N.fromString(a.calldata.fromAsset);
           if (!y)
             throw new m("core_swap_asset_not_recognized");
           const { address: u } = await f(this, V).call(this, y.chain), {
             contract: c,
-            calldata: { expiration: _, amountIn: b, memo: E, memoStreamingSwap: R }
-          } = a, w = y.add(N.fromBigInt(BigInt(b), y.decimal)), O = t && R || E;
+            calldata: { expiration: _, amountIn: b, memo: w, memoStreamingSwap: E }
+          } = a, O = y.add(D.fromBigInt(BigInt(b), y.decimal)), I = t && E || w;
           return this.deposit({
             expiration: _,
-            assetValue: w,
-            memo: O,
+            assetValue: O,
+            memo: I,
             feeOptionKey: s,
             router: c,
             recipient: u
@@ -3727,13 +3725,13 @@ class Pn {
           const c = this.connectedWallets[o], _ = this.getAddress(o);
           if (!(c != null && c.sendTransaction) || !_)
             throw new m("core_wallet_connection_not_found");
-          const { getProvider: b, toChecksumAddress: E } = await import("@swapkit/toolbox-evm"), R = b(o), w = pn[u.toLowerCase()];
-          if (!w)
+          const { getProvider: b, toChecksumAddress: w } = await import("@swapkit/toolbox-evm"), E = b(o), O = pn[u.toLowerCase()];
+          if (!O)
             throw new m("core_swap_contract_not_supported", { contractAddress: u });
-          const S = await (await ((d = c.createContract) == null ? void 0 : d.call(c, u, w, R))).getFunction("swapIn").populateTransaction(
+          const S = await (await ((d = c.createContract) == null ? void 0 : d.call(c, u, O, E))).getFunction("swapIn").populateTransaction(
             ...dn({
               streamSwap: t,
-              toChecksumAddress: E,
+              toChecksumAddress: w,
               contractAddress: u,
               recipient: n,
               calldata: y
@@ -3752,7 +3750,7 @@ class Pn {
       const a = this.getAddress(t);
       if (!a)
         return null;
-      const s = [x.fromChainOrSignature(t)], r = (o = this.connectedChains[t]) == null ? void 0 : o.walletType;
+      const s = [N.fromChainOrSignature(t)], r = (o = this.connectedChains[t]) == null ? void 0 : o.walletType;
       try {
         const d = await ((p = this.getWallet(t)) == null ? void 0 : p.getBalance(a, n));
         return this.connectedChains[t] = {
@@ -3807,10 +3805,9 @@ class Pn {
               funcParams: [
                 n,
                 u({ chain: r, symbol: o, ticker: p }, r),
-                // TODO: (@Towan) Re-Check on that conversion 🙏
-                t.getBaseValue("bigint").toString(),
+                t.getBaseValue("string"),
                 y.memo,
-                s.expiration
+                s.expiration || parseInt(`${((/* @__PURE__ */ new Date()).getTime() + 15 * 60 * 1e3) / 1e3}`)
               ],
               txOverrides: {
                 from: y.from,
@@ -3822,8 +3819,8 @@ class Pn {
             return await d.transfer(y);
         }
       } catch (u) {
-        const c = ((u == null ? void 0 : u.message) || (u == null ? void 0 : u.toString())).toLowerCase(), _ = c == null ? void 0 : c.includes("insufficient funds"), b = c == null ? void 0 : c.includes("gas"), E = c == null ? void 0 : c.includes("server"), R = _ ? "core_transaction_deposit_insufficient_funds_error" : b ? "core_transaction_deposit_gas_error" : E ? "core_transaction_deposit_server_error" : "core_transaction_deposit_error";
-        throw new m(R, u);
+        const c = ((u == null ? void 0 : u.message) || (u == null ? void 0 : u.toString())).toLowerCase(), _ = c == null ? void 0 : c.includes("insufficient funds"), b = c == null ? void 0 : c.includes("gas"), w = c == null ? void 0 : c.includes("server"), E = _ ? "core_transaction_deposit_insufficient_funds_error" : b ? "core_transaction_deposit_gas_error" : w ? "core_transaction_deposit_server_error" : "core_transaction_deposit_error";
+        throw new m(E, u);
       }
     });
     /**
@@ -3839,7 +3836,7 @@ class Pn {
       try {
         a = await f(this, M).call(this, {
           assetValue: t,
-          memo: D(h.DEPOSIT, {
+          memo: x(h.DEPOSIT, {
             ...n,
             address: this.getAddress(n.chain)
           })
@@ -3850,7 +3847,7 @@ class Pn {
       try {
         s = await f(this, M).call(this, {
           assetValue: n,
-          memo: D(h.DEPOSIT, {
+          memo: x(h.DEPOSIT, {
             ...n,
             address: this.getAddress(i.THORChain)
           })
@@ -3869,32 +3866,32 @@ class Pn {
       isPendingSymmAsset: o,
       mode: p = "sym"
     }) => {
-      const [d, ...y] = t.split("."), u = p === "sym", c = (n == null ? void 0 : n.gt(0)) && (u || p === "rune"), _ = (a == null ? void 0 : a.gt(0)) && (u || p === "asset"), b = o || c, E = b ? s || this.getAddress(i.THORChain) : "", R = u || p === "asset" ? r || this.getAddress(d) : "";
+      const [d, ...y] = t.split("."), u = p === "sym", c = (n == null ? void 0 : n.gt(0)) && (u || p === "rune"), _ = (a == null ? void 0 : a.gt(0)) && (u || p === "asset"), b = o || c, w = b ? s || this.getAddress(i.THORChain) : "", E = u || p === "asset" ? r || this.getAddress(d) : "";
       if (!c && !_)
         throw new m("core_transaction_add_liquidity_invalid_params");
-      if (b && !E)
+      if (b && !w)
         throw new m("core_transaction_add_liquidity_no_rune_address");
-      let w, O;
+      let O, I;
       const S = { chain: d, symbol: y.join(".") };
       if (c && n)
         try {
-          w = await f(this, M).call(this, {
+          O = await f(this, M).call(this, {
             assetValue: n,
-            memo: D(h.DEPOSIT, { ...S, address: R })
+            memo: x(h.DEPOSIT, { ...S, address: E })
           });
         } catch (P) {
           throw new m("core_transaction_add_liquidity_rune_error", P);
         }
       if (_ && a)
         try {
-          O = await f(this, M).call(this, {
+          I = await f(this, M).call(this, {
             assetValue: a,
-            memo: D(h.DEPOSIT, { ...S, address: E })
+            memo: x(h.DEPOSIT, { ...S, address: w })
           });
         } catch (P) {
           throw new m("core_transaction_add_liquidity_asset_error", P);
         }
-      return { runeTx: w, assetTx: O };
+      return { runeTx: O, assetTx: I };
     });
     T(this, "withdraw", async ({
       memo: t,
@@ -3903,11 +3900,11 @@ class Pn {
       from: s,
       to: r
     }) => {
-      const o = r === "rune" ? x.fromChainOrSignature(i.THORChain) : s === "sym" && r === "sym" || s === "rune" || s === "asset" ? void 0 : n;
+      const o = r === "rune" ? N.fromChainOrSignature(i.THORChain) : s === "sym" && r === "sym" || s === "rune" || s === "asset" ? void 0 : n;
       try {
         return await f(this, M).call(this, {
           assetValue: Se(s === "asset" ? n.chain : i.THORChain),
-          memo: t || D(h.WITHDRAW, {
+          memo: t || x(h.WITHDRAW, {
             symbol: n.symbol,
             chain: n.chain,
             ticker: n.ticker,
@@ -3926,12 +3923,12 @@ class Pn {
       percent: a,
       type: s
     }) => {
-      const r = s === "add" ? h.DEPOSIT : h.WITHDRAW, o = n || D(r, {
+      const r = s === "add" ? h.DEPOSIT : h.WITHDRAW, o = n || x(r, {
         ticker: t.ticker,
         symbol: t.symbol,
         chain: t.chain,
         singleSide: !0,
-        basisPoints: a ? Math.max(1e4, Math.round(a * 100)) : void 0
+        basisPoints: a ? Math.min(1e4, Math.round(a * 100)) : void 0
       });
       return f(this, M).call(this, { assetValue: t, memo: o });
     });
@@ -3942,7 +3939,7 @@ class Pn {
       type: s
     }) => f(this, M).call(this, {
       assetValue: t,
-      memo: n || D(s === "open" ? h.OPEN_LOAN : h.CLOSE_LOAN, {
+      memo: n || x(s === "open" ? h.OPEN_LOAN : h.CLOSE_LOAN, {
         asset: t.toString(),
         minAmount: a.toString(),
         address: this.getAddress(t.chain)
@@ -3953,7 +3950,7 @@ class Pn {
       assetValue: n,
       address: a
     }) => {
-      const s = t === "bond" ? h.BOND : t === "unbond" ? h.UNBOND : h.LEAVE, r = D(s, {
+      const s = t === "bond" ? h.BOND : t === "unbond" ? h.UNBOND : h.LEAVE, r = x(s, {
         address: a,
         unbondAmount: t === "unbond" ? n.getBaseValue("number") : void 0
       });
@@ -3965,7 +3962,7 @@ class Pn {
     T(this, "registerThorname", ({
       assetValue: t,
       ...n
-    }) => f(this, Y).call(this, { assetValue: t, memo: D(h.THORNAME_REGISTER, n) }));
+    }) => f(this, Y).call(this, { assetValue: t, memo: x(h.THORNAME_REGISTER, n) }));
     T(this, "extend", ({ wallets: t, config: n, apis: a = {}, rpcUrls: s = {} }) => {
       try {
         t.forEach((r) => {
@@ -4066,23 +4063,23 @@ class Pn {
       this.connectedChains[t] = n, this.connectedWallets[t] = a;
     });
     B(this, K, async ({
-      assetValue: { getBaseValue: t, address: n, chain: a, isGasAsset: s, isSynthetic: r },
-      type: o = "checkOnly",
-      contractAddress: p
+      assetValue: t,
+      type: n = "checkOnly",
+      contractAddress: a
     }) => {
-      const d = [i.Ethereum, i.Avalanche, i.BinanceSmartChain].includes(a);
-      if (d && s || !d || r)
+      const { address: s, chain: r, isGasAsset: o, isSynthetic: p } = t, d = [i.Ethereum, i.Avalanche, i.BinanceSmartChain].includes(r);
+      if (d && o || !d || p)
         return !0;
-      const u = this.connectedWallets[a], c = o === "checkOnly" ? u == null ? void 0 : u.isApproved : u == null ? void 0 : u.approve;
+      const u = this.connectedWallets[r], c = n === "checkOnly" ? u == null ? void 0 : u.isApproved : u == null ? void 0 : u.approve;
       if (!c)
         throw new m("core_wallet_connection_not_found");
-      const _ = this.getAddress(a);
-      if (!n || !_)
+      const _ = this.getAddress(r);
+      if (!s || !_)
         throw new m("core_approve_asset_address_or_from_not_found");
-      const b = p || (await f(this, V).call(this, a)).router;
+      const b = a || (await f(this, V).call(this, r)).router;
       return c({
-        amount: t("bigint"),
-        assetAddress: n,
+        amount: t.getBaseValue("bigint"),
+        assetAddress: s,
         from: _,
         spenderAddress: b
       });
@@ -4125,7 +4122,7 @@ export {
   ze as AGG_SWAP,
   hn as ApiError,
   q as ApiUrl,
-  x as AssetValue,
+  N as AssetValue,
   A as BaseDecimal,
   ye as BigIntArithmetics,
   i as Chain,
@@ -4153,7 +4150,7 @@ export {
   et as SWAP_OUT,
   Pn as SwapKitCore,
   m as SwapKitError,
-  N as SwapKitNumber,
+  D as SwapKitNumber,
   Xe as TCAvalancheDepositABI,
   Je as TCBscDepositABI,
   Ye as TCEthereumVaultAbi,
@@ -4175,7 +4172,7 @@ export {
   _t as getDecimal,
   Cn as getEstimatedPoolShare,
   Mn as getLiquiditySlippage,
-  D as getMemoFor,
+  x as getMemoFor,
   Se as getMinAmountByChain,
   Ot as getSymmetricPoolShare,
   vn as getSymmetricWithdraw,

package/package.json

@@ -2,7 +2,7 @@
   "author": "swapkit-oss-team",
   "dependencies": {
     "@swapkit/types": "1.0.0-rc.7",
-    "@swapkit/helpers": "1.0.0-rc.18"
+    "@swapkit/helpers": "1.0.0-rc.19"
   },
   "description": "SwapKit Lib core",
   "devDependencies": {
@@ -15,16 +15,16 @@
     "@internal/config": "0.0.0-internal.0",
     "@swapkit/api": "1.0.0-rc.7",
     "@swapkit/tokens": "1.0.0-rc.7",
-    "@swapkit/toolbox-cosmos": "1.0.0-rc.20",
-    "@swapkit/toolbox-evm": "1.0.0-rc.20",
-    "@swapkit/toolbox-utxo": "1.0.0-rc.19"
+    "@swapkit/toolbox-cosmos": "1.0.0-rc.21",
+    "@swapkit/toolbox-evm": "1.0.0-rc.22",
+    "@swapkit/toolbox-utxo": "1.0.0-rc.20"
   },
   "peerDependencies": {
     "@swapkit/api": "1.0.0-rc.7",
     "@swapkit/tokens": "1.0.0-rc.7",
-    "@swapkit/toolbox-cosmos": "1.0.0-rc.20",
-    "@swapkit/toolbox-evm": "1.0.0-rc.20",
-    "@swapkit/toolbox-utxo": "1.0.0-rc.19"
+    "@swapkit/toolbox-cosmos": "1.0.0-rc.21",
+    "@swapkit/toolbox-evm": "1.0.0-rc.22",
+    "@swapkit/toolbox-utxo": "1.0.0-rc.20"
   },
   "eslintConfig": {
     "extends": "../../../internal/eslint-config"
@@ -52,7 +52,7 @@
   "repository": "https://github.com/thorswap/SwapKit.git",
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "1.0.0-rc.24",
+  "version": "1.0.0-rc.26",
   "scripts": {
     "build": "NODE_OPTIONS=--max_old_space_size=16384 vite build",
     "clean": "rm -rf dist vite.config.ts.* .turbo node_modules",

package/src/client/index.ts

@@ -94,7 +94,6 @@ export class SwapKitCore<T = ''> {
         const transaction = streamSwap ? route?.streamingSwap?.transaction : route?.transaction;
         if (!transaction) throw new SwapKitError('core_swap_route_transaction_not_found');
 
-        const { isHexString, parseUnits } = await import('ethers');
         const { data, from, to, value } = route.transaction;
 
         const params = {
@@ -102,11 +101,7 @@ export class SwapKitCore<T = ''> {
           from,
           to: to.toLowerCase(),
           chainId: BigInt(ChainToChainId[evmChain]),
-          value: value
-            ? new SwapKitNumber({
-                value: !isHexString(value) ? parseUnits(value, 'wei').toString(16) : value,
-              }).getBaseValue('bigint')
-            : 0n,
+          value: value ? BigInt(value) : 0n,
         };
 
         return walletMethods.sendTransaction(params, feeOptionKey) as Promise<string>;
@@ -258,10 +253,9 @@ export class SwapKitCore<T = ''> {
             funcParams: [
               recipient,
               getChecksumAddressFromAsset({ chain, symbol, ticker }, chain),
-              // TODO: (@Towan) Re-Check on that conversion 🙏
-              assetValue.getBaseValue('bigint').toString(),
+              assetValue.getBaseValue('string'),
               params.memo,
-              rest.expiration,
+              rest.expiration || parseInt(`${(new Date().getTime() + 15 * 60 * 1000) / 1000}`),
             ],
             txOverrides: {
               from: params.from,
@@ -455,7 +449,7 @@ export class SwapKitCore<T = ''> {
         symbol: assetValue.symbol,
         chain: assetValue.chain,
         singleSide: true,
-        basisPoints: percent ? Math.max(10000, Math.round(percent * 100)) : undefined,
+        basisPoints: percent ? Math.min(10000, Math.round(percent * 100)) : undefined,
       });
 
     return this.#depositToPool({ assetValue, memo: memoString });
@@ -627,7 +621,7 @@ export class SwapKitCore<T = ''> {
   };
 
   #approve = async <T = string>({
-    assetValue: { getBaseValue, address, chain, isGasAsset, isSynthetic },
+    assetValue,
     type = 'checkOnly',
     contractAddress,
   }: {
@@ -635,6 +629,7 @@ export class SwapKitCore<T = ''> {
     type?: 'checkOnly' | 'approve';
     contractAddress?: string;
   }) => {
+    const { address, chain, isGasAsset, isSynthetic } = assetValue;
     const isEVMChain = [Chain.Ethereum, Chain.Avalanche, Chain.BinanceSmartChain].includes(chain);
     const isNativeEVM = isEVMChain && isGasAsset;
 
@@ -653,7 +648,7 @@ export class SwapKitCore<T = ''> {
       contractAddress || ((await this.#getInboundDataByChain(chain)).router as string);
 
     return walletAction({
-      amount: getBaseValue('bigint'),
+      amount: assetValue.getBaseValue('bigint'),
       assetAddress: address,
       from,
       spenderAddress,

package/dist/index-9e36735e.cjs

@@ -1 +0,0 @@
-"use strict";var nt=Object.defineProperty;var st=(e,t,r)=>t in e?nt(e,t,{enumerable:!0,configurable:!0,writable:!0,value:r}):e[t]=r;var j=(e,t,r)=>(st(e,typeof t!="symbol"?t+"":t,r),r),D=(e,t,r)=>{if(!t.has(e))throw TypeError("Cannot "+r)};var s=(e,t,r)=>(D(e,t,"read from private field"),r?r.call(e):t.get(e)),b=(e,t,r)=>{if(t.has(e))throw TypeError("Cannot add the same private member more than once");t instanceof WeakSet?t.add(e):t.set(e,r)},M=(e,t,r,i)=>(D(e,t,"write to private field"),i?i.call(e,r):t.set(e,r),r);var u=(e,t,r)=>(D(e,t,"access private method"),r);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const Q="6.7.1";function ot(e,t,r){const i=t.split("|").map(o=>o.trim());for(let o=0;o<i.length;o++)switch(t){case"any":return;case"bigint":case"boolean":case"number":case"string":if(typeof e===t)return}const n=new Error(`invalid value for type ${t}`);throw n.code="INVALID_ARGUMENT",n.argument=`value.${r}`,n.value=e,n}function K(e,t,r){for(let i in t){let n=t[i];const o=r?r[i]:null;o&&ot(n,o,i),Object.defineProperty(e,i,{enumerable:!0,value:n,writable:!1})}}function x(e){if(e==null)return"null";if(Array.isArray(e))return"[ "+e.map(x).join(", ")+" ]";if(e instanceof Uint8Array){const t="0123456789abcdef";let r="0x";for(let i=0;i<e.length;i++)r+=t[e[i]>>4],r+=t[e[i]&15];return r}if(typeof e=="object"&&typeof e.toJSON=="function")return x(e.toJSON());switch(typeof e){case"boolean":case"symbol":return e.toString();case"bigint":return BigInt(e).toString();case"number":return e.toString();case"string":return JSON.stringify(e);case"object":{const t=Object.keys(e);return t.sort(),"{ "+t.map(r=>`${x(r)}: ${x(e[r])}`).join(", ")+" }"}}return"[ COULD NOT SERIALIZE ]"}function W(e,t,r){{const n=[];if(r){if("message"in r||"code"in r||"name"in r)throw new Error(`value will overwrite populated values: ${x(r)}`);for(const o in r){const l=r[o];n.push(o+"="+x(l))}}n.push(`code=${t}`),n.push(`version=${Q}`),n.length&&(e+=" ("+n.join(", ")+")")}let i;switch(t){case"INVALID_ARGUMENT":i=new TypeError(e);break;case"NUMERIC_FAULT":case"BUFFER_OVERRUN":i=new RangeError(e);break;default:i=new Error(e)}return K(i,{code:t}),r&&Object.assign(i,r),i}function g(e,t,r,i){if(!e)throw W(t,r,i)}function c(e,t,r,i){g(e,t,"INVALID_ARGUMENT",{argument:r,value:i})}["NFD","NFC","NFKD","NFKC"].reduce((e,t)=>{try{if("test".normalize(t)!=="test")throw new Error("bad");if(t==="NFD"){const r=String.fromCharCode(233).normalize("NFD"),i=String.fromCharCode(101,769);if(r!==i)throw new Error("broken")}e.push(t)}catch{}return e},[]);function Y(e,t,r){if(r==null&&(r=""),e!==t){let i=r,n="new";r&&(i+=".",n+=" "+r),g(!1,`private constructor; use ${i}from* methods`,"UNSUPPORTED_OPERATION",{operation:n})}}function ft(e,t,r){if(e instanceof Uint8Array)return r?new Uint8Array(e):e;if(typeof e=="string"&&e.match(/^0x([0-9a-f][0-9a-f])*$/i)){const i=new Uint8Array((e.length-2)/2);let n=2;for(let o=0;o<i.length;o++)i[o]=parseInt(e.substring(n,n+2),16),n+=2;return i}c(!1,"invalid BytesLike value",t||"value",e)}function tt(e,t){return ft(e,t,!1)}function ut(e,t){return!(typeof e!="string"||!e.match(/^0x[0-9A-Fa-f]*$/)||typeof t=="number"&&e.length!==2+2*t||t===!0&&e.length%2!==0)}const et=BigInt(0),E=BigInt(1),S=9007199254740991;function k(e,t){const r=q(e,"value"),i=BigInt(T(t,"width"));if(g(r>>i===et,"overflow","NUMERIC_FAULT",{operation:"fromTwos",fault:"overflow",value:e}),r>>i-E){const n=(E<<i)-E;return-((~r&n)+E)}return r}function z(e,t){const r=q(e,"value"),i=BigInt(T(t,"bits"));return r&(E<<i)-E}function V(e,t){switch(typeof e){case"bigint":return e;case"number":return c(Number.isInteger(e),"underflow",t||"value",e),c(e>=-S&&e<=S,"overflow",t||"value",e),BigInt(e);case"string":try{if(e==="")throw new Error("empty string");return e[0]==="-"&&e[1]!=="-"?-BigInt(e.substring(1)):BigInt(e)}catch(r){c(!1,`invalid BigNumberish string: ${r.message}`,t||"value",e)}}c(!1,"invalid BigNumberish value",t||"value",e)}function q(e,t){const r=V(e,t);return g(r>=et,"unsigned value cannot be negative","NUMERIC_FAULT",{fault:"overflow",operation:"getUint",value:e}),r}const X="0123456789abcdef";function rt(e){if(e instanceof Uint8Array){let t="0x0";for(const r of e)t+=X[r>>4],t+=X[r&15];return BigInt(t)}return V(e)}function T(e,t){switch(typeof e){case"bigint":return c(e>=-S&&e<=S,"overflow",t||"value",e),Number(e);case"number":return c(Number.isInteger(e),"underflow",t||"value",e),c(e>=-S&&e<=S,"overflow",t||"value",e),e;case"string":try{if(e==="")throw new Error("empty string");return T(BigInt(e),t)}catch(r){c(!1,`invalid numeric string: ${r.message}`,t||"value",e)}}c(!1,"invalid numeric value",t||"value",e)}const ct=BigInt(-1),d=BigInt(0),F=BigInt(1),lt=BigInt(5),B={};let A="0000";for(;A.length<80;)A+=A;function y(e){let t=A;for(;t.length<e;)t+=t;return BigInt("1"+t.substring(0,e))}function C(e,t,r){const i=BigInt(t.width);if(t.signed){const n=F<<i-F;g(r==null||e>=-n&&e<n,"overflow","NUMERIC_FAULT",{operation:r,fault:"overflow",value:e}),e>d?e=k(z(e,i),i):e=-k(z(-e,i),i)}else{const n=F<<i;g(r==null||e>=0&&e<n,"overflow","NUMERIC_FAULT",{operation:r,fault:"overflow",value:e}),e=(e%n+n)%n&n-F}return e}function P(e){typeof e=="number"&&(e=`fixed128x${e}`);let t=!0,r=128,i=18;if(typeof e=="string"){if(e!=="fixed")if(e==="ufixed")t=!1;else{const o=e.match(/^(u?)fixed([0-9]+)x([0-9]+)$/);c(o,"invalid fixed format","format",e),t=o[1]!=="u",r=parseInt(o[2]),i=parseInt(o[3])}}else if(e){const o=e,l=(h,R,it)=>o[h]==null?it:(c(typeof o[h]===R,"invalid fixed format ("+h+" not "+R+")","format."+h,o[h]),o[h]);t=l("signed","boolean",t),r=l("width","number",r),i=l("decimals","number",i)}c(r%8===0,"invalid FixedNumber width (not byte aligned)","format.width",r),c(i<=80,"invalid FixedNumber decimals (too large)","format.decimals",i);const n=(t?"":"u")+"fixed"+String(r)+"x"+String(i);return{signed:t,width:r,decimals:i,name:n}}function at(e,t){let r="";e<d&&(r="-",e*=ct);let i=e.toString();if(t===0)return r+i;for(;i.length<=t;)i=A+i;const n=i.length-t;for(i=i.substring(0,n)+"."+i.substring(n);i[0]==="0"&&i[1]!==".";)i=i.substring(1);for(;i[i.length-1]==="0"&&i[i.length-2]!==".";)i=i.substring(0,i.length-1);return r+i}var m,f,a,N,U,w,p,$,G,L,H,v,J,_,Z;const I=class I{constructor(t,r,i){b(this,N);b(this,w);b(this,$);b(this,L);b(this,v);b(this,_);j(this,"format");b(this,m,void 0);b(this,f,void 0);b(this,a,void 0);j(this,"_value");Y(t,B,"FixedNumber"),M(this,f,r),M(this,m,i);const n=at(r,i.decimals);K(this,{format:i.name,_value:n}),M(this,a,y(i.decimals))}get signed(){return s(this,m).signed}get width(){return s(this,m).width}get decimals(){return s(this,m).decimals}get value(){return s(this,f)}addUnsafe(t){return u(this,$,G).call(this,t)}add(t){return u(this,$,G).call(this,t,"add")}subUnsafe(t){return u(this,L,H).call(this,t)}sub(t){return u(this,L,H).call(this,t,"sub")}mulUnsafe(t){return u(this,v,J).call(this,t)}mul(t){return u(this,v,J).call(this,t,"mul")}mulSignal(t){u(this,N,U).call(this,t);const r=s(this,f)*s(t,f);return g(r%s(this,a)===d,"precision lost during signalling mul","NUMERIC_FAULT",{operation:"mulSignal",fault:"underflow",value:this}),u(this,w,p).call(this,r/s(this,a),"mulSignal")}divUnsafe(t){return u(this,_,Z).call(this,t)}div(t){return u(this,_,Z).call(this,t,"div")}divSignal(t){g(s(t,f)!==d,"division by zero","NUMERIC_FAULT",{operation:"div",fault:"divide-by-zero",value:this}),u(this,N,U).call(this,t);const r=s(this,f)*s(this,a);return g(r%s(t,f)===d,"precision lost during signalling div","NUMERIC_FAULT",{operation:"divSignal",fault:"underflow",value:this}),u(this,w,p).call(this,r/s(t,f),"divSignal")}cmp(t){let r=this.value,i=t.value;const n=this.decimals-t.decimals;return n>0?i*=y(n):n<0&&(r*=y(-n)),r<i?-1:r>i?1:0}eq(t){return this.cmp(t)===0}lt(t){return this.cmp(t)<0}lte(t){return this.cmp(t)<=0}gt(t){return this.cmp(t)>0}gte(t){return this.cmp(t)>=0}floor(){let t=s(this,f);return s(this,f)<d&&(t-=s(this,a)-F),t=s(this,f)/s(this,a)*s(this,a),u(this,w,p).call(this,t,"floor")}ceiling(){let t=s(this,f);return s(this,f)>d&&(t+=s(this,a)-F),t=s(this,f)/s(this,a)*s(this,a),u(this,w,p).call(this,t,"ceiling")}round(t){if(t==null&&(t=0),t>=this.decimals)return this;const r=this.decimals-t,i=lt*y(r-1);let n=this.value+i;const o=y(r);return n=n/o*o,C(n,s(this,m),"round"),new I(B,n,s(this,m))}isZero(){return s(this,f)===d}isNegative(){return s(this,f)<d}toString(){return this._value}toUnsafeFloat(){return parseFloat(this.toString())}toFormat(t){return I.fromString(this.toString(),t)}static fromValue(t,r,i){const n=r==null?0:T(r),o=P(i);let l=V(t,"value");const h=n-o.decimals;if(h>0){const R=y(h);g(l%R===d,"value loses precision for format","NUMERIC_FAULT",{operation:"fromValue",fault:"underflow",value:t}),l/=R}else h<0&&(l*=y(-h));return C(l,o,"fromValue"),new I(B,l,o)}static fromString(t,r){const i=t.match(/^(-?)([0-9]*)\.?([0-9]*)$/);c(i&&i[2].length+i[3].length>0,"invalid FixedNumber string value","value",t);const n=P(r);let o=i[2]||"0",l=i[3]||"";for(;l.length<n.decimals;)l+=A;g(l.substring(n.decimals).match(/^0*$/),"too many decimals for format","NUMERIC_FAULT",{operation:"fromString",fault:"underflow",value:t}),l=l.substring(0,n.decimals);const h=BigInt(i[1]+o+l);return C(h,n,"fromString"),new I(B,h,n)}static fromBytes(t,r){let i=rt(tt(t,"value"));const n=P(r);return n.signed&&(i=k(i,n.width)),C(i,n,"fromBytes"),new I(B,i,n)}};m=new WeakMap,f=new WeakMap,a=new WeakMap,N=new WeakSet,U=function(t){c(this.format===t.format,"incompatible format; use fixedNumber.toFormat","other",t)},w=new WeakSet,p=function(t,r){return t=C(t,s(this,m),r),new I(B,t,s(this,m))},$=new WeakSet,G=function(t,r){return u(this,N,U).call(this,t),u(this,w,p).call(this,s(this,f)+s(t,f),r)},L=new WeakSet,H=function(t,r){return u(this,N,U).call(this,t),u(this,w,p).call(this,s(this,f)-s(t,f),r)},v=new WeakSet,J=function(t,r){return u(this,N,U).call(this,t),u(this,w,p).call(this,s(this,f)*s(t,f)/s(this,a),r)},_=new WeakSet,Z=function(t,r){return g(s(t,f)!==d,"division by zero","NUMERIC_FAULT",{operation:"div",fault:"divide-by-zero",value:this}),u(this,N,U).call(this,t),u(this,w,p).call(this,s(this,f)*s(this,a)/s(t,f),r)};let O=I;const ht=["wei","kwei","mwei","gwei","szabo","finney","ether"];function gt(e,t){c(typeof e=="string","value must be a string","value",e);let r=18;if(typeof t=="string"){const i=ht.indexOf(t);c(i>=0,"invalid unit","unit",t),r=3*i}else t!=null&&(r=T(t,"unit"));return O.fromString(e,{decimals:r,width:512}).value}exports.FixedNumber=O;exports.assert=g;exports.assertArgument=c;exports.assertPrivate=Y;exports.defineProperties=K;exports.fromTwos=k;exports.getBigInt=V;exports.getBytes=tt;exports.getNumber=T;exports.getUint=q;exports.isHexString=ut;exports.makeError=W;exports.mask=z;exports.parseUnits=gt;exports.toBigInt=rt;exports.version=Q;