@argent/x-shared 1.72.0 → 1.72.1

package/dist/src/transactions/estimate/utils.js

@@ -1,168 +1,169 @@
-import { isEmpty as P, partition as A } from "lodash-es";
+import { isEmpty as y, partition as P } from "lodash-es";
 import { num as o } from "starknet";
-import { calculateCubeRootAdjustment as G } from "./adjustment.js";
-import { argentMaxFee as T } from "./argentMaxFee.js";
-import { EstimateError as F } from "./error.js";
+import { calculateCubeRootAdjustment as v } from "./adjustment.js";
+import { argentMaxFee as A } from "./argentMaxFee.js";
+import { EstimateError as p } from "./error.js";
 import { STRK_TOKEN_ADDRESS as E } from "../../chains/starknet/constants.js";
-import { isEqualAddress as p } from "../../chains/starknet/address.js";
-const L = (t) => {
-  const { transactions: e } = t;
-  if (!e)
-    throw new F({ code: "SIMULATE_AND_REVIEW_FAILED" });
-  if (!Array.isArray(e))
-    throw Error(`Unexpected simulation response. Expected array. Got ${typeof e}`);
-  if (P(e))
+import { isEqualAddress as F } from "../../chains/starknet/address.js";
+const L = (e) => {
+  const { transactions: t } = e;
+  if (!t)
+    throw new p({ code: "SIMULATE_AND_REVIEW_FAILED" });
+  if (!Array.isArray(t))
+    throw Error(`Unexpected simulation response. Expected array. Got ${typeof t}`);
+  if (y(t))
     return [];
-  if (e.length > 2)
-    throw Error(`Unexpected simulation response length. Got ${e.length}`);
-  const a = e.map((m) => {
+  if (t.length > 2)
+    throw Error(`Unexpected simulation response length. Got ${t.length}`);
+  const a = t.map((m) => {
     if (!m.simulation)
-      throw new F({ code: "SIMULATE_AND_REVIEW_FAILED" });
+      throw new p({ code: "SIMULATE_AND_REVIEW_FAILED" });
     return {
       ...m.simulation,
-      ..._(m.simulation.feeEstimations)
+      ...G(m.simulation.feeEstimations)
     };
-  }), [n, s] = a.length === 1 ? [a[0], void 0] : [a[1], a[0]], r = h(n, s), i = v(n, s);
+  }), [s, n] = a.length === 1 ? [a[0], void 0] : [a[1], a[0]], r = h(s, n), i = T(s, n);
   return [...r, ...i];
-}, _ = (t) => {
-  const [e, a] = A(t, (n) => "unit" in n && n.unit === "FRI");
-  return { nativeFeeEstimations: e, paymasterFeeEstimations: a };
-}, v = (t, e) => {
-  if (!t)
-    return [];
+}, G = (e) => {
+  const [t, a] = P(e, (s) => "unit" in s && s.unit === "FRI");
+  return { nativeFeeEstimations: t, paymasterFeeEstimations: a };
+}, T = (e, t) => {
   if (!e)
-    return t.paymasterFeeEstimations.map((s) => ({
+    return [];
+  if (!t)
+    return e.paymasterFeeEstimations.map((n) => ({
       type: "paymaster",
-      transactions: u(s),
+      transactions: d(n),
       deployment: void 0
     }));
-  const a = e.paymasterFeeEstimations, n = t.paymasterFeeEstimations;
-  if (a.length !== n.length)
+  const a = t.paymasterFeeEstimations, s = e.paymasterFeeEstimations;
+  if (a.length !== s.length)
     throw Error("Deployment and transaction fee estimations length mismatch");
-  return n.map((s, r) => ({
+  return s.map((n, r) => ({
     type: "paymaster",
-    transactions: u(s),
-    deployment: u(a[r])
+    transactions: d(n),
+    deployment: d(a[r])
   }));
-}, h = (t, e) => {
-  if (!t)
-    return [];
+}, h = (e, t) => {
   if (!e)
-    return t.nativeFeeEstimations.map((s) => ({
+    return [];
+  if (!t)
+    return e.nativeFeeEstimations.map((n) => ({
       type: "native",
-      transactions: l(s),
+      transactions: g(n),
       deployment: void 0
     }));
-  const a = e.nativeFeeEstimations, n = t.nativeFeeEstimations;
-  if (a.length !== n.length)
+  const a = t.nativeFeeEstimations, s = e.nativeFeeEstimations;
+  if (a.length !== s.length)
     throw Error("Deployment and transaction fee estimations length mismatch");
-  return n.map((s, r) => ({
+  return s.map((n, r) => ({
     type: "native",
-    transactions: l(s),
-    deployment: l(a[r])
+    transactions: g(n),
+    deployment: g(a[r])
   }));
-}, u = (t) => ({
-  feeTokenAddress: t.token.address,
-  maxFee: BigInt(t.maxFee),
-  overallFee: BigInt(t.overallFee)
-}), l = (t) => ({
+}, d = (e) => ({
+  feeTokenAddress: e.token.address,
+  maxFee: BigInt(e.maxFee),
+  overallFee: BigInt(e.overallFee)
+}), g = (e) => ({
   feeTokenAddress: E,
+  overallFee: o.toBigInt(e.overallFee),
   l1Gas: {
-    gasConsumed: o.toBigInt(t.resourceBounds.l1Gas.maxAmount),
-    gasPrice: o.toBigInt(t.resourceBounds.l1Gas.maxPricePerUnit)
+    gasConsumed: o.toBigInt(e.resourceBounds.l1Gas.maxAmount),
+    gasPrice: o.toBigInt(e.resourceBounds.l1Gas.maxPricePerUnit)
   },
   l1DataGas: {
-    gasConsumed: o.toBigInt(t.resourceBounds.l1DataGas.maxAmount),
-    gasPrice: o.toBigInt(t.resourceBounds.l1DataGas.maxPricePerUnit)
+    gasConsumed: o.toBigInt(e.resourceBounds.l1DataGas.maxAmount),
+    gasPrice: o.toBigInt(e.resourceBounds.l1DataGas.maxPricePerUnit)
   },
   l2Gas: {
-    gasConsumed: o.toBigInt(t.resourceBounds.l2Gas.maxAmount),
-    gasPrice: o.toBigInt(t.resourceBounds.l2Gas.maxPricePerUnit)
+    gasConsumed: o.toBigInt(e.resourceBounds.l2Gas.maxAmount),
+    gasPrice: o.toBigInt(e.resourceBounds.l2Gas.maxPricePerUnit)
   }
-}), b = (t) => {
-  const { l1Gas: e, l2Gas: a, l1DataGas: n } = t.resourceBounds, s = e.maxAmount * e.maxPricePerUnit + a.maxAmount * a.maxPricePerUnit + n.maxAmount * n.maxPricePerUnit;
-  return o.toBigInt(s);
-}, j = (t) => {
-  var n;
-  if (t.type === "paymaster")
-    return t.transactions.maxFee + (((n = t.deployment) == null ? void 0 : n.maxFee) ?? 0n);
-  if (t.deployment && !p(t.deployment.feeTokenAddress, t.transactions.feeTokenAddress))
+}), b = (e) => {
+  const { l1Gas: t, l2Gas: a, l1DataGas: s } = e.resourceBounds, n = t.maxAmount * t.maxPricePerUnit + a.maxAmount * a.maxPricePerUnit + s.maxAmount * s.maxPricePerUnit;
+  return o.toBigInt(n);
+}, j = (e) => {
+  const { type: t, deployment: a, transactions: s } = e;
+  if (t === "paymaster")
+    return s.maxFee + ((a == null ? void 0 : a.maxFee) ?? 0n);
+  if (a && !F(a.feeTokenAddress, s.feeTokenAddress))
     throw Error("Cannot calculate estimated fees for different tokens");
-  const e = t.deployment ? g(t.deployment) : 0n, a = g(t.transactions);
-  return e + a;
-}, W = (t) => {
-  var e;
-  return t.type === "paymaster" ? t.transactions.overallFee + (((e = t.deployment) == null ? void 0 : e.overallFee) ?? 0n) : N(t);
-}, B = (t = []) => t.filter((a) => a.type === "native"), $ = (t) => t.filter((e) => e.type === "paymaster"), C = () => E, I = (t = [], e) => {
-  const a = B(t).find((n) => p(n.transactions.feeTokenAddress, e));
+  const n = !s.overallFee && !(a != null && a.overallFee), r = (u) => n ? N(u) : l(u), i = a ? r(a) : 0n, m = r(s);
+  return i + m;
+}, W = (e) => {
+  var t;
+  return e.transactions.overallFee ? e.transactions.overallFee + (((t = e.deployment) == null ? void 0 : t.overallFee) ?? 0n) : D(e);
+}, _ = (e = []) => e.filter((a) => a.type === "native"), $ = (e) => e.filter((t) => t.type === "paymaster"), B = () => E, C = (e = [], t) => {
+  const a = _(e).find((s) => F(s.transactions.feeTokenAddress, t));
   if (!a)
-    throw Error(`No native estimated fee found for ${e}`);
+    throw Error(`No native estimated fee found for ${t}`);
   return a;
-}, D = (t = []) => {
-  const e = C();
-  return I(t, e);
-}, K = (t = []) => D(t), N = (t) => {
-  if (t.deployment && !p(t.deployment.feeTokenAddress, t.transactions.feeTokenAddress))
+}, I = (e = []) => {
+  const t = B();
+  return C(e, t);
+}, K = (e = []) => I(e), D = (e) => {
+  if (e.deployment && !F(e.deployment.feeTokenAddress, e.transactions.feeTokenAddress))
     throw Error("Cannot calculate estimated fees for different tokens");
-  const e = d(t.transactions), a = t.deployment ? d(t.deployment) : 0n;
-  return e + a;
-}, d = (t) => {
-  const { l1Gas: e, l2Gas: a, l1DataGas: n } = t;
-  return e.gasConsumed * e.gasPrice + a.gasConsumed * a.gasPrice + n.gasConsumed * n.gasPrice;
-}, g = (t) => d(y(t)), y = (t, e = G) => {
-  const a = 10000n, { l1Gas: n, l2Gas: s, l1DataGas: r } = t, i = n.gasConsumed * n.gasPrice + s.gasConsumed * s.gasPrice + r.gasConsumed * r.gasPrice;
+  const t = l(e.transactions), a = e.deployment ? l(e.deployment) : 0n;
+  return t + a;
+}, l = (e) => {
+  const { l1Gas: t, l2Gas: a, l1DataGas: s } = e;
+  return t.gasConsumed * t.gasPrice + a.gasConsumed * a.gasPrice + s.gasConsumed * s.gasPrice;
+}, N = (e) => l(f(e)), f = (e, t = v) => {
+  const a = 10000n, { l1Gas: s, l2Gas: n, l1DataGas: r } = e, i = s.gasConsumed * s.gasPrice + n.gasConsumed * n.gasPrice + r.gasConsumed * r.gasPrice;
   if (i < 0)
     throw Error("Cannot calculate max fee for negative fee");
-  const m = o.toBigInt(T({ estimatedFee: i })), f = Number(m) / Number(i), x = e(f), c = BigInt(Math.trunc(x * Number(a)));
+  const m = o.toBigInt(A({ estimatedFee: i })), u = Number(m) / Number(i), x = t(u), c = BigInt(Math.trunc(x * Number(a)));
   return {
-    ...t,
+    ...e,
     l1Gas: {
-      gasConsumed: n.gasConsumed * c / a,
-      gasPrice: n.gasPrice
+      gasConsumed: s.gasConsumed * c / a,
+      gasPrice: s.gasPrice * c / a
     },
     l2Gas: {
-      gasConsumed: s.gasConsumed * c / a,
-      gasPrice: s.gasPrice
+      gasConsumed: n.gasConsumed * c / a,
+      gasPrice: n.gasPrice * c / a
     },
     l1DataGas: {
       gasConsumed: r.gasConsumed * c / a,
-      gasPrice: r.gasPrice
+      gasPrice: r.gasPrice * c / a
     }
   };
-}, q = (t) => {
-  const e = y(t);
-  return g(t), {
+}, O = (e) => {
+  const t = e.overallFee ? e : f(e);
+  return {
     resourceBounds: {
-      l1_gas: w(e.l1Gas),
+      l1_gas: w(t.l1Gas),
       l2_gas: {
-        max_amount: o.toHex(e.l2Gas.gasConsumed),
-        max_price_per_unit: o.toHex(e.l2Gas.gasPrice)
+        max_amount: o.toHex(t.l2Gas.gasConsumed),
+        max_price_per_unit: o.toHex(t.l2Gas.gasPrice)
       },
       l1_data_gas: {
-        max_amount: o.toHex(e.l1DataGas.gasConsumed),
-        max_price_per_unit: o.toHex(e.l1DataGas.gasPrice)
+        max_amount: o.toHex(t.l1DataGas.gasConsumed),
+        max_price_per_unit: o.toHex(t.l1DataGas.gasPrice)
       }
     }
   };
-}, w = (t) => ({
-  max_amount: o.toHex(t.gasConsumed),
-  max_price_per_unit: o.toHex(t.gasPrice)
+}, w = (e) => ({
+  max_amount: o.toHex(e.gasConsumed),
+  max_price_per_unit: o.toHex(e.gasPrice)
 });
 export {
-  g as estimatedFeeToMaxFeeTotal,
-  q as estimatedFeeToMaxResourceBounds,
-  d as estimatedFeeToTotal,
+  N as estimatedFeeToMaxFeeTotal,
+  O as estimatedFeeToMaxResourceBounds,
+  l as estimatedFeeToTotal,
   j as estimatedFeesToMaxFeeTotalV2,
-  N as estimatedFeesToTotal,
-  W as estimatedFeesToTotalV2,
+  D as estimatedFeesToTotal,
+  W as estimatedFeesToTotalWithOverallFee,
   $ as filterPaymasterEstimatedFees,
   L as getEstimatedFeeFromSimulationAndRespectWatermarkFeeV2,
-  I as getNativeEstimatedFeeByFeeToken,
-  D as getNativeEstimatedFeeByTxVersion,
+  C as getNativeEstimatedFeeByFeeToken,
+  I as getNativeEstimatedFeeByTxVersion,
   K as getNativeEstimatedFeeForAccount,
-  B as getNativeEstimatedFees,
+  _ as getNativeEstimatedFees,
   h as getNativeFeeFromSimulation,
-  C as getNativeFeeTokenAddress,
-  v as getPaymasterFeeFromSimulation,
+  B as getNativeFeeTokenAddress,
+  T as getPaymasterFeeFromSimulation,
   b as toMaxFeeEstimation
 };

package/dist/src/transactions/service/implementation.d.ts

@@ -49,6 +49,7 @@ export declare class TransactionReviewServiceWeb implements ITransactionReviewSe
                     gasConsumed: bigint;
                     gasPrice: bigint;
                 };
+                overallFee?: bigint | undefined;
             };
             deployment?: {
                 feeTokenAddress: `0x${string}`;
@@ -64,18 +65,19 @@ export declare class TransactionReviewServiceWeb implements ITransactionReviewSe
                     gasConsumed: bigint;
                     gasPrice: bigint;
                 };
+                overallFee?: bigint | undefined;
             } | undefined;
         } | {
             type: "paymaster";
             transactions: {
                 feeTokenAddress: `0x${string}`;
-                maxFee: bigint;
                 overallFee: bigint;
+                maxFee: bigint;
             };
             deployment?: {
                 feeTokenAddress: `0x${string}`;
-                maxFee: bigint;
                 overallFee: bigint;
+                maxFee: bigint;
             } | undefined;
         })[];
         isBackendDown: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@argent/x-shared",
-  "version": "1.72.0",
+  "version": "1.72.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/argentlabs/x-shared.git"