@argent/x-shared 1.70.3 → 1.71.0

package/dist/src/transactions/estimate/utils.d.ts

@@ -1,61 +1,30 @@
-import { CairoVersion } from 'starknet';
-import { Address } from '../../chains/starknet/address';
-import { EstimatedFee, EstimatedFees, SimulateAndReview } from '../../features/simulation';
-import { ApiTransactionSimulationResponse } from '../transactionSimulationTypes';
-import { CastFeeEstimation, FRI, FeeEstimationV1, FeeEstimationV3, TransactionReviewTransactions, WEI } from './model';
-export declare function isWEI<T>(value: Pick<CastFeeEstimation<T>, "unit">): value is FeeEstimationV1<T>;
-export declare function isFRI<T>(value: Pick<CastFeeEstimation<T>, "unit">): value is FeeEstimationV3<T>;
-export declare function castFeeEstimation<S, T extends CastFeeEstimation<S>, C>(feeEstimation: T, cast: (value: S) => C): CastFeeEstimation<C>;
-export declare function toMax<S, T extends CastFeeEstimation<S>>(value: T): T["unit"] extends WEI ? {
-    maxFee: S;
-} : {
-    amount: S;
-    pricePerUnit: S;
-};
-export declare function unitToFeeTokenAddress(unit: WEI | FRI): Address;
-export declare function multiplyBigIntByFloat(bigintValue: bigint, floatValue: number, precision?: number): bigint;
-export declare const tokensRequireTxV3Support: string[];
-export type FeeAdjustmentFn = (ratio: number) => number;
-export declare const estimatedFeeToTotal: (estimatedFee: Pick<EstimatedFee, "amount" | "pricePerUnit" | "dataGasConsumed" | "dataGasPrice">) => bigint;
-export declare const getWatermarkedMaxFeeTotal: (estimatedFee: EstimatedFee) => bigint | undefined;
-export declare const estimatedFeeToMaxFeeTotal: (estimatedFee: EstimatedFee) => bigint;
-export declare const estimatedFeesToTotal: (estimatedFees: EstimatedFees) => bigint;
-export declare const estimatedFeesToMaxFeeTotal: (estimatedFees: EstimatedFees) => bigint;
-export declare const buildDummyTx: (tokenAddress: Address, feeTokenAddress: Address) => {
-    contractAddress: `0x${string}`;
-    entrypoint: string;
-    calldata: import('starknet').Calldata;
-}[];
-export declare const getEstimatedFeeFromBulkSimulation: (simulation: Pick<ApiTransactionSimulationResponse, "feeEstimation">[] | undefined, feeTokenAddress?: Address) => EstimatedFees;
-export declare const getPayloadFromTransaction: ({ transaction, nonce, chainId, version, isDeploymentTransaction, cairoVersion, address, appDomain, }: {
-    transaction: TransactionReviewTransactions;
-    nonce: string;
-    chainId: string;
-    version: string;
-    isDeploymentTransaction: boolean;
-    cairoVersion: CairoVersion;
-    address: string;
-    appDomain?: string;
-}) => {
-    type: "DECLARE" | "DEPLOY" | "DEPLOY_ACCOUNT" | "INVOKE";
-    chainId: string;
-    cairoVersion: CairoVersion;
-    nonce: string;
-    version: string;
-    account: string;
-    calls: import('starknet').Call[];
-    calldata: string[] | undefined;
-    salt: `0x${string}` | undefined;
-    signature: string[] | undefined;
-    classHash: `0x${string}` | undefined;
-    appDomain: string | undefined;
-};
-export declare const getEstimatedFeeFromSimulationAndRespectWatermarkFee: (simulateAndReviewResult: Pick<SimulateAndReview, "transactions">, feeTokenAddress?: Address) => EstimatedFees & {
-    transactions: Required<EstimatedFee>;
-    deployment?: Required<EstimatedFee>;
-};
-export declare const estimatedFeeToMaxResourceBounds: (estimatedFee: EstimatedFee) => {
-    maxFee: bigint;
+import { Address } from '../../chains';
+import { PaymasterFeeEstimation, FeeEstimation, SimulateAndReview } from '../../features/simulation';
+import { EstimatedFees, NativeEstimatedFees, NativeEstimatedFeeData, NativeEstimatedFeesData, PaymasterEstimatedFeesData } from '../../features/simulation/fees/schema';
+export declare const getEstimatedFeeFromSimulationAndRespectWatermarkFeeV2: (simulateAndReviewResult: Pick<SimulateAndReview, "transactions">) => EstimatedFees[];
+export declare const getPaymasterFeeFromSimulation: (invokeTransaction: {
+    paymasterFeeEstimations: PaymasterFeeEstimation[];
+}, deployTransactionOrUndefined?: {
+    paymasterFeeEstimations: PaymasterFeeEstimation[];
+} | undefined) => EstimatedFees[];
+export declare const getNativeFeeFromSimulation: (invokeTransaction: {
+    nativeFeeEstimations: FeeEstimation[];
+}, deployTransactionOrUndefined?: {
+    nativeFeeEstimations: FeeEstimation[];
+} | undefined) => EstimatedFees[];
+export declare const toMaxFeeEstimation: (fee: FeeEstimation) => bigint;
+export declare const estimatedFeesToMaxFeeTotalV2: (estimatedFees: EstimatedFees) => bigint;
+export declare const estimatedFeesToTotalV2: (estimatedFees: EstimatedFees) => bigint;
+export declare const getNativeEstimatedFees: (estimatedFees?: EstimatedFees[]) => NativeEstimatedFees[];
+export declare const filterPaymasterEstimatedFees: (estimatedFees: EstimatedFees[]) => PaymasterEstimatedFeesData[];
+export declare const getNativeFeeTokenAddress: () => Address;
+export declare const getNativeEstimatedFeeByFeeToken: (estimatedFees: EstimatedFees[] | undefined, feeTokenAddress: string) => NativeEstimatedFees;
+export declare const getNativeEstimatedFeeByTxVersion: (estimatedFees?: EstimatedFees[]) => NativeEstimatedFees;
+export declare const getNativeEstimatedFeeForAccount: (estimatedFees?: EstimatedFees[]) => NativeEstimatedFees;
+export declare const estimatedFeesToTotal: (estimatedFees: NativeEstimatedFeesData) => bigint;
+export declare const estimatedFeeToTotal: (estimatedFee: NativeEstimatedFeeData) => bigint;
+export declare const estimatedFeeToMaxFeeTotal: (estimatedFee: NativeEstimatedFeeData) => bigint;
+export declare const estimatedFeeToMaxResourceBounds: (estimatedFee: NativeEstimatedFeeData) => {
     resourceBounds: {
         l1_gas: {
             max_amount: string;
@@ -65,8 +34,9 @@ export declare const estimatedFeeToMaxResourceBounds: (estimatedFee: EstimatedFe
             max_amount: string;
             max_price_per_unit: string;
         };
+        l1_data_gas: {
+            max_amount: string;
+            max_price_per_unit: string;
+        };
     };
 };
-export declare const calculateSqrtAdjustment: (ratio: number) => number;
-export declare const calculateCubeRootAdjustment: (ratio: number) => number;
-export declare const calculateNonLinearAdjustment: (ratio: number) => number;

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

@@ -1,235 +1,168 @@
-import { upperCase as A } from "lodash-es";
-import { num as r, CallData as B, uint256 as C } from "starknet";
-import { isEqualAddress as T } from "../../chains/starknet/address.js";
-import { STRK_TOKEN_ADDRESS as I, ETH_TOKEN_ADDRESS as y } from "../../chains/starknet/constants.js";
-import { argentMaxFee as _ } from "./argentMaxFee.js";
-import { EstimateError as G } from "./error.js";
-import { transferCalldataSchema as h } from "../../utils/starknet/starknet.js";
-import { feeEstimationSchema as f } from "../../features/simulation/transactionReview/schema.js";
-import { ensureArray as M } from "../../utils/arrays.js";
-function E(t) {
-  return A(t.unit) === "WEI";
-}
-function k(t) {
-  return A(t.unit) === "FRI";
-}
-function u(t, e) {
-  return E(t) ? {
-    ...t,
-    maxFee: e(t.maxFee),
-    overallFee: e(t.overallFee),
-    gasPrice: e(t.gasPrice),
-    gasUsage: e(t.gasUsage)
-  } : {
-    ...t,
-    overallFee: e(t.overallFee),
-    gasPrice: e(t.gasPrice),
-    gasUsage: e(t.gasUsage),
-    maxAmount: e(t.maxAmount),
-    maxPricePerUnit: e(t.maxPricePerUnit)
-  };
-}
-function d(t) {
-  return E(t) ? {
-    maxFee: t.maxFee
-  } : {
-    amount: t.maxAmount,
-    pricePerUnit: t.maxPricePerUnit
-  };
-}
-function x(t) {
-  return k({ unit: t }) ? I : y;
-}
-function V(t, e, n = 2) {
-  const a = BigInt(10 ** n), o = BigInt(Math.round(e * 10 ** n));
-  return t * o / a;
-}
-const Y = [I], U = (t, e = w) => {
-  if (t.max && "amount" in t.max)
+import { isEmpty as P, partition as A } 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 { 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))
+    return [];
+  if (e.length > 2)
+    throw Error(`Unexpected simulation response length. Got ${e.length}`);
+  const a = e.map((m) => {
+    if (!m.simulation)
+      throw new F({ code: "SIMULATE_AND_REVIEW_FAILED" });
     return {
-      ...t,
-      ...t.max
+      ...m.simulation,
+      ..._(m.simulation.feeEstimations)
     };
-  const n = 10000n, { amount: a, pricePerUnit: o, dataGasConsumed: s = 0n, dataGasPrice: m = 0n } = t, c = a * o + s * m;
-  if (c < 0)
-    throw Error("Cannot calculate max fee for negative fee");
-  const i = r.toBigInt(_({ estimatedFee: c })), g = Number(i) / Number(c), F = e(g), l = BigInt(Math.trunc(F * Number(n)));
-  return {
-    ...t,
-    amount: a * l / n,
-    pricePerUnit: o * l / n,
-    dataGasConsumed: s * l / n,
-    dataGasPrice: m * l / n
-  };
-}, p = (t) => {
-  const { amount: e, pricePerUnit: n, dataGasConsumed: a = 0n, dataGasPrice: o = 0n } = t;
-  return e * n + a * o;
-}, N = (t) => {
-  if (t.max)
-    return "maxFee" in t.max ? t.max.maxFee : p(t.max);
-}, P = (t) => {
-  const e = N(t);
-  return e || p(U(t));
-}, $ = (t) => {
-  if (t.deployment && !T(t.deployment.feeTokenAddress, t.transactions.feeTokenAddress))
-    throw Error("Cannot calculate estimated fees for different tokens");
-  const e = p(t.transactions), n = t.deployment ? p(t.deployment) : 0n;
-  return e + n;
-}, z = (t) => {
-  if (t.deployment && !T(t.deployment.feeTokenAddress, t.transactions.feeTokenAddress))
-    throw Error("Cannot calculate estimated fees for different tokens");
-  const e = t.deployment ? P(t.deployment) : 0n, n = P(t.transactions);
-  return e + n;
-}, J = (t, e) => [
-  {
-    contractAddress: t,
-    entrypoint: "transfer",
-    calldata: B.compile(h.parse({
-      // We are using a dummy address (ETH here) as recipient to estimate the fee given we don't have a receipient yet
-      recipient: e,
-      // We are using the smallest possible amount to make sure this doesn't throw an error
-      amount: C.bnToUint256(BigInt(1))
-    }))
-  }
-], S = (t, e) => {
+  }), [n, s] = a.length === 1 ? [a[0], void 0] : [a[1], a[0]], r = h(n, s), i = v(n, s);
+  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 {
-      transactions: {
-        feeTokenAddress: e ?? y,
-        amount: 0n,
-        pricePerUnit: 0n,
-        dataGasConsumed: 0n,
-        dataGasPrice: 0n
-      }
-    };
-  if (!Array.isArray(t))
-    throw Error(`Unexpected simulation response. Expected array. Got ${typeof t}`);
-  if (t.length === 1) {
-    const n = f.parse(t[0].feeEstimation);
-    return {
-      transactions: {
-        feeTokenAddress: x(n.unit),
-        amount: r.toBigInt(n.gasUsage),
-        pricePerUnit: r.toBigInt(n.gasPrice),
-        max: d(u(n, r.toBigInt)),
-        dataGasConsumed: n.dataGasConsumed ? r.toBigInt(n.dataGasConsumed) : 0n,
-        dataGasPrice: n.dataGasPrice ? r.toBigInt(n.dataGasPrice) : 0n
-      }
-    };
-  }
-  if (t.length === 2) {
-    const n = f.parse(t[0].feeEstimation), a = f.parse(t[1].feeEstimation);
-    return {
-      deployment: {
-        feeTokenAddress: x(n.unit),
-        amount: r.toBigInt(n.gasUsage),
-        pricePerUnit: r.toBigInt(n.gasPrice),
-        max: d(u(n, r.toBigInt)),
-        dataGasConsumed: n.dataGasConsumed ? r.toBigInt(n.dataGasConsumed) : 0n,
-        dataGasPrice: n.dataGasPrice ? r.toBigInt(n.dataGasPrice) : 0n
-      },
-      transactions: {
-        feeTokenAddress: x(a.unit),
-        amount: r.toBigInt(a.gasUsage),
-        pricePerUnit: r.toBigInt(a.gasPrice),
-        max: d(u(a, r.toBigInt)),
-        dataGasConsumed: a.dataGasConsumed ? r.toBigInt(a.dataGasConsumed) : 0n,
-        dataGasPrice: a.dataGasPrice ? r.toBigInt(a.dataGasPrice) : 0n
-      }
-    };
+    return [];
+  if (!e)
+    return t.paymasterFeeEstimations.map((s) => ({
+      type: "paymaster",
+      transactions: u(s),
+      deployment: void 0
+    }));
+  const a = e.paymasterFeeEstimations, n = t.paymasterFeeEstimations;
+  if (a.length !== n.length)
+    throw Error("Deployment and transaction fee estimations length mismatch");
+  return n.map((s, r) => ({
+    type: "paymaster",
+    transactions: u(s),
+    deployment: u(a[r])
+  }));
+}, h = (t, e) => {
+  if (!t)
+    return [];
+  if (!e)
+    return t.nativeFeeEstimations.map((s) => ({
+      type: "native",
+      transactions: l(s),
+      deployment: void 0
+    }));
+  const a = e.nativeFeeEstimations, n = t.nativeFeeEstimations;
+  if (a.length !== n.length)
+    throw Error("Deployment and transaction fee estimations length mismatch");
+  return n.map((s, r) => ({
+    type: "native",
+    transactions: l(s),
+    deployment: l(a[r])
+  }));
+}, u = (t) => ({
+  feeTokenAddress: t.token.address,
+  maxFee: BigInt(t.maxFee),
+  overallFee: BigInt(t.overallFee)
+}), l = (t) => ({
+  feeTokenAddress: E,
+  l1Gas: {
+    gasConsumed: o.toBigInt(t.resourceBounds.l1Gas.maxAmount),
+    gasPrice: o.toBigInt(t.resourceBounds.l1Gas.maxPricePerUnit)
+  },
+  l1DataGas: {
+    gasConsumed: o.toBigInt(t.resourceBounds.l1DataGas.maxAmount),
+    gasPrice: o.toBigInt(t.resourceBounds.l1DataGas.maxPricePerUnit)
+  },
+  l2Gas: {
+    gasConsumed: o.toBigInt(t.resourceBounds.l2Gas.maxAmount),
+    gasPrice: o.toBigInt(t.resourceBounds.l2Gas.maxPricePerUnit)
   }
-  throw Error("Unexpected simulation response length");
-}, Q = ({ transaction: t, nonce: e, chainId: n, version: a, isDeploymentTransaction: o, cairoVersion: s, address: m, appDomain: c }) => {
-  let i = e;
-  o && t.type !== "DEPLOY_ACCOUNT" && (i = r.toHex(1));
-  const g = M(t.calls);
-  return {
-    type: t.type,
-    chainId: n,
-    cairoVersion: s,
-    nonce: i,
-    version: a,
-    account: m,
-    calls: g,
-    calldata: t.calldata,
-    salt: t.salt,
-    signature: t.signature,
-    classHash: t.classHash,
-    appDomain: c
-    // appDomain: "https://starknetkit-blacked-listed.vercel.app", // to simulate blacklisted domain
-  };
-}, X = (t, e) => {
-  const { transactions: n } = t;
-  if (!n)
-    throw new G({ code: "SIMULATE_AND_REVIEW_FAILED" });
-  const a = n.map((i) => {
-    if (!i.simulation)
-      throw new G({ code: "SIMULATE_AND_REVIEW_FAILED" });
-    return i;
-  }), o = a.map((i) => ({
-    ...i.simulation,
-    feeEstimation: u(i.simulation.feeEstimation, Number)
-  })), s = S(o, e), [m, c] = a.length === 1 ? [a[0], void 0] : [a[1], a[0]];
+}), 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))
+    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));
+  if (!a)
+    throw Error(`No native estimated fee found for ${e}`);
+  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))
+    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;
+  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)));
   return {
-    ...s,
-    transactions: {
-      ...s.transactions,
-      dataGasConsumed: s.transactions.dataGasConsumed ?? 0n,
-      dataGasPrice: s.transactions.dataGasPrice ?? 0n,
-      max: d(u(m.simulation.feeEstimation, r.toBigInt))
+    ...t,
+    l1Gas: {
+      gasConsumed: n.gasConsumed * c / a,
+      gasPrice: n.gasPrice
+    },
+    l2Gas: {
+      gasConsumed: s.gasConsumed * c / a,
+      gasPrice: s.gasPrice
     },
-    deployment: s.deployment && c ? {
-      ...s.deployment,
-      dataGasConsumed: s.deployment.dataGasConsumed ?? 0n,
-      dataGasPrice: s.deployment.dataGasPrice ?? 0n,
-      max: d(u(c.simulation.feeEstimation, r.toBigInt))
-    } : void 0
+    l1DataGas: {
+      gasConsumed: r.gasConsumed * c / a,
+      gasPrice: r.gasPrice
+    }
   };
-}, D = (t) => ({
-  max_amount: r.toHex(t.amount),
-  max_price_per_unit: r.toHex(t.pricePerUnit)
-}), R = (t, e, n) => ({
-  // (overall_fee / gas_price) × gas_safety_margin
-  max_amount: r.toHex(t / e),
-  // max_price_per_unit: gas_price × fee_safety_margin
-  max_price_per_unit: r.toHex(n)
-}), Z = (t) => {
-  const e = U(t), n = P(t);
-  return {
-    // for v1 transactions
-    maxFee: n,
-    // for v3 transactions
+}, q = (t) => {
+  const e = y(t);
+  return g(t), {
     resourceBounds: {
-      l1_gas: ((o) => o !== void 0 && "amount" in o && "pricePerUnit" in o)(t.max) ? D(t.max) : R(n, t.pricePerUnit, e.pricePerUnit),
-      l2_gas: { max_amount: "0x0", max_price_per_unit: "0x0" }
+      l1_gas: w(e.l1Gas),
+      l2_gas: {
+        max_amount: o.toHex(e.l2Gas.gasConsumed),
+        max_price_per_unit: o.toHex(e.l2Gas.gasPrice)
+      },
+      l1_data_gas: {
+        max_amount: o.toHex(e.l1DataGas.gasConsumed),
+        max_price_per_unit: o.toHex(e.l1DataGas.gasPrice)
+      }
     }
   };
-}, tt = (t) => {
-  const e = Math.sqrt(t);
-  return isNaN(e) ? Math.sqrt(2) : e;
-}, w = (t) => {
-  const e = Math.cbrt(t);
-  return isNaN(e) ? Math.cbrt(2) : e;
-}, nt = (t) => t < 1 || isNaN(t) ? 1.1 : Math.log(t + 1) + 1;
+}, w = (t) => ({
+  max_amount: o.toHex(t.gasConsumed),
+  max_price_per_unit: o.toHex(t.gasPrice)
+});
 export {
-  J as buildDummyTx,
-  w as calculateCubeRootAdjustment,
-  nt as calculateNonLinearAdjustment,
-  tt as calculateSqrtAdjustment,
-  u as castFeeEstimation,
-  P as estimatedFeeToMaxFeeTotal,
-  Z as estimatedFeeToMaxResourceBounds,
-  p as estimatedFeeToTotal,
-  z as estimatedFeesToMaxFeeTotal,
-  $ as estimatedFeesToTotal,
-  S as getEstimatedFeeFromBulkSimulation,
-  X as getEstimatedFeeFromSimulationAndRespectWatermarkFee,
-  Q as getPayloadFromTransaction,
-  N as getWatermarkedMaxFeeTotal,
-  k as isFRI,
-  E as isWEI,
-  V as multiplyBigIntByFloat,
-  d as toMax,
-  Y as tokensRequireTxV3Support,
-  x as unitToFeeTokenAddress
+  g as estimatedFeeToMaxFeeTotal,
+  q as estimatedFeeToMaxResourceBounds,
+  d as estimatedFeeToTotal,
+  j as estimatedFeesToMaxFeeTotalV2,
+  N as estimatedFeesToTotal,
+  W as estimatedFeesToTotalV2,
+  $ as filterPaymasterEstimatedFees,
+  L as getEstimatedFeeFromSimulationAndRespectWatermarkFeeV2,
+  I as getNativeEstimatedFeeByFeeToken,
+  D as getNativeEstimatedFeeByTxVersion,
+  K as getNativeEstimatedFeeForAccount,
+  B as getNativeEstimatedFees,
+  h as getNativeFeeFromSimulation,
+  C as getNativeFeeTokenAddress,
+  v as getPaymasterFeeFromSimulation,
+  b as toMaxFeeEstimation
 };

package/dist/src/transactions/index.d.ts

@@ -6,7 +6,6 @@ export * from './errors';
 export * from './estimate';
 export * from './findTransfersAndApprovals';
 export * from './getPrettyRcpError';
-export * from './getTransactionVersion';
 export * from './service';
 export type * from './transactionAction';
 export * from './transactionReviewTypes';

package/dist/src/transactions/service/implementation.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const _=require("starknet"),h=require("url-join"),m=require("../../errors/review.cjs"),w=require("../getTransactionVersion.cjs"),E=require("../estimate/utils.cjs"),S=require("../../utils/url/urlWithQuery.cjs"),y=require("../../features/simulation/transactionReview/schema.cjs"),I=require("../../utils/arrays.cjs");class C{constructor(e,a){this.apiBase=e,this.httpService=a}async getLabels(){const e=h(this.apiBase,"reviewer","labels");return await this.httpService.get(e)}async getWarnings(){const e=h(this.apiBase,"reviewer","warnings/reasons");return await this.httpService.get(e)}async simulateAndReview(e,a,o,n,c,t){var l;const r=a.some(s=>s.type==="DEPLOY_ACCOUNT");try{if(!("getChainId"in e))throw new Error("MISSING_METHOD");const s=w.getTxVersionFromFeeToken(o),i=r?"0x0":await e.getNonce(),d=await e.getChainId(),F={transactions:a.map(g=>({...E.getPayloadFromTransaction({transaction:g,nonce:i,version:s,chainId:d,isDeploymentTransaction:r,appDomain:n,cairoVersion:e.cairoVersion,address:e.address}),type:g.type}))},p=h(this.apiBase,"reviewer","transactions","v2","review","starknet"),v=t?S.urlWithQuery(p,{delayedTransactions:"true"}):p,u=await this.httpService.post(v,{headers:{Accept:"application/json","Content-Type":"application/json"},body:JSON.stringify(F)},y.simulateAndReviewSchema);if((l=u.transactions)==null?void 0:l.some(g=>y.isTransactionSimulationError(g)))return u;const T=E.getEstimatedFeeFromSimulationAndRespectWatermarkFee(u,o);return{...u,enrichedFeeEstimation:T}}catch(s){return console.error(s),this.fallbackToOnchainFeeEstimation({transactions:a,account:e,isDeploymentTransaction:r,feeTokenAddress:o,accountDeployTransaction:c})}}getCallsFromTx(e){let a;return e.calls&&(a=I.ensureArray(e.calls)),a}async fallbackToOnchainFeeEstimation({transactions:e,account:a,isDeploymentTransaction:o,feeTokenAddress:n,accountDeployTransaction:c}){try{const t=o?this.getCallsFromTx(e[1]):this.getCallsFromTx(e[0]);if(!t)throw new m.ReviewError({code:"NO_CALLS_FOUND"});const r=await this.fetchFeesOnchain({starknetAccount:a,calls:t,isDeployed:!o,feeTokenAddress:n,accountDeployTransaction:c});return{transactions:[],enrichedFeeEstimation:r,isBackendDown:!0}}catch(t){throw console.error(t),new m.ReviewError({message:`${t}`,code:"SIMULATE_AND_REVIEW_FAILED"})}}async fetchFeesOnchain({starknetAccount:e,calls:a,isDeployed:o,feeTokenAddress:n,accountDeployTransaction:c}){try{const t=w.getTxVersionFromFeeToken(n),r={transactions:{feeTokenAddress:n,amount:0n,pricePerUnit:0n,dataGasConsumed:0n,dataGasPrice:0n}};if(!o&&c){if("estimateFeeBulk"in e){const l=[{type:_.TransactionType.DEPLOY_ACCOUNT,payload:{classHash:c.classHash,addressSalt:c.salt,constructorCalldata:c.calldata,contractAddress:e.address}},{type:_.TransactionType.INVOKE,payload:a}],[s,i]=await e.estimateFeeBulk(l,{version:t}).catch(d=>{throw console.error(d),d});if(!s.gas_consumed||!s.gas_price||!i.gas_consumed||!i.gas_price)throw new m.ReviewError({code:"ONCHAIN_FEE_ESTIMATION_FAILED",message:"Missing gas_consumed or gas_price"});r.deployment={feeTokenAddress:n,amount:s.gas_consumed,pricePerUnit:s.gas_price,dataGasConsumed:s.data_gas_consumed,dataGasPrice:s.data_gas_price},r.transactions={feeTokenAddress:n,amount:i.gas_consumed,pricePerUnit:i.gas_price,dataGasConsumed:i.data_gas_consumed,dataGasPrice:i.data_gas_price}}}else{const{gas_consumed:l,gas_price:s,data_gas_consumed:i,data_gas_price:d}=await e.estimateFee(a,{skipValidate:!0,version:t});if(!l||!s)throw new m.ReviewError({code:"ONCHAIN_FEE_ESTIMATION_FAILED",message:"Missing gas_consumed or gas_price"});r.transactions={feeTokenAddress:n,amount:l,pricePerUnit:s,dataGasConsumed:i,dataGasPrice:d}}return r}catch(t){throw new m.ReviewError({code:"ONCHAIN_FEE_ESTIMATION_FAILED",message:`${t}`})}}}exports.TransactionReviewServiceWeb=C;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("starknet"),E=require("url-join"),d=require("../../errors/review.cjs"),v=require("./utils.cjs"),S=require("../../utils/url/urlWithQuery.cjs"),w=require("../../features/simulation/transactionReview/schema.cjs"),I=require("../estimate/utils.cjs"),T=require("../../utils/arrays.cjs");class F{constructor(e,a){this.apiBase=e,this.httpService=a}async getLabels(){const e=E(this.apiBase,"reviewer","labels");return await this.httpService.get(e)}async getWarnings(){const e=E(this.apiBase,"reviewer","warnings/reasons");return await this.httpService.get(e)}async simulateAndReview(e,a,l,n,o,r){var g;const i=a.some(s=>s.type==="DEPLOY_ACCOUNT");try{if(!("getChainId"in e))throw new Error("MISSING_METHOD");const s=p.constants.TRANSACTION_VERSION.V3,t=i?"0x0":await e.getNonce(),c=await e.getChainId(),m={transactions:a.map(h=>({...v.getPayloadFromTransaction({transaction:h,nonce:t,version:s,chainId:c,isDeploymentTransaction:i,appDomain:n,cairoVersion:e.cairoVersion,address:e.address}),type:h.type}))},_=E(this.apiBase,"reviewer","transactions","v2","review","starknet"),y=r?S.urlWithQuery(_,{delayedTransactions:"true"}):_,u=await this.httpService.post(y,{headers:{Accept:"application/json","Content-Type":"application/json"},body:JSON.stringify(m)},w.simulateAndReviewSchema);if((g=u.transactions)==null?void 0:g.some(h=>w.isTransactionSimulationError(h)))return u;const C=I.getEstimatedFeeFromSimulationAndRespectWatermarkFeeV2(u);return{...u,enrichedFeeEstimation:C}}catch(s){return console.error(s),this.fallbackToOnchainFeeEstimation({transactions:a,account:e,isDeploymentTransaction:i,feeTokenAddress:l,accountDeployTransaction:o})}}getCallsFromTx(e){let a;return e.calls&&(a=T.ensureArray(e.calls)),a}async fallbackToOnchainFeeEstimation({transactions:e,account:a,isDeploymentTransaction:l,feeTokenAddress:n,accountDeployTransaction:o}){try{const r=l?this.getCallsFromTx(e[1]):this.getCallsFromTx(e[0]);if(!r)throw new d.ReviewError({code:"NO_CALLS_FOUND"});const i=await this.fetchFeesOnchain({starknetAccount:a,calls:r,isDeployed:!l,feeTokenAddress:n,accountDeployTransaction:o});return{transactions:[],enrichedFeeEstimation:i,isBackendDown:!0}}catch(r){throw console.error(r),new d.ReviewError({message:`${r}`,code:"SIMULATE_AND_REVIEW_FAILED"})}}async fetchFeesOnchain({starknetAccount:e,calls:a,isDeployed:l,feeTokenAddress:n,accountDeployTransaction:o}){try{const r=p.constants.TRANSACTION_VERSION.V3,i={type:"native",transactions:{feeTokenAddress:n,l1Gas:{gasConsumed:0n,gasPrice:0n},l2Gas:{gasConsumed:0n,gasPrice:0n},l1DataGas:{gasConsumed:0n,gasPrice:0n}}};if(!l&&o){if("estimateFeeBulk"in e){const g=[{type:p.TransactionType.DEPLOY_ACCOUNT,payload:{classHash:o.classHash,addressSalt:o.salt,constructorCalldata:o.calldata,contractAddress:e.address}},{type:p.TransactionType.INVOKE,payload:a}],[s,t]=await e.estimateFeeBulk(g,{version:r}).catch(c=>{throw console.error(c),c});if(!s.l1_gas_consumed||!s.l1_gas_price||!s.l2_gas_consumed||!s.l2_gas_price||!t.l2_gas_consumed||!t.l2_gas_price)throw new d.ReviewError({code:"ONCHAIN_FEE_ESTIMATION_FAILED",message:"Missing gas_consumed or gas_price"});i.deployment={feeTokenAddress:n,l1Gas:{gasConsumed:s.l1_gas_consumed,gasPrice:s.l1_gas_price},l2Gas:{gasConsumed:s.l2_gas_consumed,gasPrice:s.l2_gas_price},l1DataGas:{gasConsumed:s.l1_data_gas_consumed,gasPrice:s.l1_data_gas_price}},i.transactions={feeTokenAddress:n,l1Gas:{gasConsumed:t.l1_gas_consumed,gasPrice:t.l1_gas_price},l2Gas:{gasConsumed:t.l2_gas_consumed,gasPrice:t.l2_gas_price},l1DataGas:{gasConsumed:t.l1_data_gas_consumed,gasPrice:t.l1_data_gas_price}}}}else{const{l1_data_gas_price:g,l1_data_gas_consumed:s,l1_gas_consumed:t,l2_gas_price:c,l2_gas_consumed:m,l1_gas_price:_}=await e.estimateFee(a,{skipValidate:!0,version:r});if(!t||!_||!m||!c)throw new d.ReviewError({code:"ONCHAIN_FEE_ESTIMATION_FAILED",message:"Missing gas_consumed or gas_price"});i.transactions={feeTokenAddress:n,l1Gas:{gasConsumed:t,gasPrice:_},l2Gas:{gasConsumed:m,gasPrice:c},l1DataGas:{gasConsumed:s,gasPrice:g}}}return[i]}catch(r){throw new d.ReviewError({code:"ONCHAIN_FEE_ESTIMATION_FAILED",message:`${r}`})}}}exports.TransactionReviewServiceWeb=F;

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

@@ -33,34 +33,51 @@ export declare class TransactionReviewServiceWeb implements ITransactionReviewSe
         accountDeployTransaction?: AccountDeployTransaction;
     }): Promise<{
         transactions: never[];
-        enrichedFeeEstimation: {
+        enrichedFeeEstimation: ({
+            type: "native";
             transactions: {
-                amount: bigint;
-                pricePerUnit: bigint;
                 feeTokenAddress: `0x${string}`;
-                max?: {
-                    amount: bigint;
-                    pricePerUnit: bigint;
-                } | {
-                    maxFee: bigint;
-                } | undefined;
-                dataGasConsumed?: bigint | undefined;
-                dataGasPrice?: bigint | undefined;
+                l1Gas: {
+                    gasConsumed: bigint;
+                    gasPrice: bigint;
+                };
+                l2Gas: {
+                    gasConsumed: bigint;
+                    gasPrice: bigint;
+                };
+                l1DataGas: {
+                    gasConsumed: bigint;
+                    gasPrice: bigint;
+                };
             };
             deployment?: {
-                amount: bigint;
-                pricePerUnit: bigint;
                 feeTokenAddress: `0x${string}`;
-                max?: {
-                    amount: bigint;
-                    pricePerUnit: bigint;
-                } | {
-                    maxFee: bigint;
-                } | undefined;
-                dataGasConsumed?: bigint | undefined;
-                dataGasPrice?: bigint | undefined;
+                l1Gas: {
+                    gasConsumed: bigint;
+                    gasPrice: bigint;
+                };
+                l2Gas: {
+                    gasConsumed: bigint;
+                    gasPrice: bigint;
+                };
+                l1DataGas: {
+                    gasConsumed: bigint;
+                    gasPrice: bigint;
+                };
             } | undefined;
-        };
+        } | {
+            type: "paymaster";
+            transactions: {
+                feeTokenAddress: `0x${string}`;
+                maxFee: bigint;
+                overallFee: bigint;
+            };
+            deployment?: {
+                feeTokenAddress: `0x${string}`;
+                maxFee: bigint;
+                overallFee: bigint;
+            } | undefined;
+        })[];
         isBackendDown: boolean;
     }>;
     private fetchFeesOnchain;