@argent/x-shared 1.74.2 → 1.75.1

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("lodash-es"),o=require("starknet"),C=require("./adjustment.cjs"),N=require("./argentMaxFee.cjs"),E=require("./error.cjs"),x=require("../../chains/starknet/constants.cjs"),g=require("../../chains/starknet/address.cjs"),D=e=>{const{transactions:t}=e;if(!t)throw new E.EstimateError({code:"SIMULATE_AND_REVIEW_FAILED"});if(!Array.isArray(t))throw Error(`Unexpected simulation response. Expected array. Got ${typeof t}`);if(p.isEmpty(t))return[];if(t.length>2)throw Error(`Unexpected simulation response length. Got ${t.length}`);const a=t.map(m=>{if(!m.simulation)throw new E.EstimateError({code:"SIMULATE_AND_REVIEW_FAILED"});return{...m.simulation,...I(m.simulation.feeEstimations)}}),[s,n]=a.length===1?[a[0],void 0]:[a[1],a[0]],r=T(s,n),i=y(s,n);return[...r,...i]},I=e=>{const[t,a]=p.partition(e,s=>"unit"in s&&s.unit==="FRI");return{nativeFeeEstimations:t,paymasterFeeEstimations:a}},y=(e,t)=>{if(!e)return[];if(!t)return e.paymasterFeeEstimations.map(n=>({type:"paymaster",transactions:d(n),deployment:void 0}));const a=t.paymasterFeeEstimations,s=e.paymasterFeeEstimations;if(a.length!==s.length)throw Error("Deployment and transaction fee estimations length mismatch");return s.map((n,r)=>({type:"paymaster",transactions:d(n),deployment:d(a[r])}))},T=(e,t)=>{if(!e)return[];if(!t)return e.nativeFeeEstimations.map(n=>({type:"native",transactions:F(n),deployment:void 0}));const a=t.nativeFeeEstimations,s=e.nativeFeeEstimations;if(a.length!==s.length)throw Error("Deployment and transaction fee estimations length mismatch");return s.map((n,r)=>({type:"native",transactions:F(n),deployment:F(a[r])}))},d=e=>({feeTokenAddress:e.token.address,maxFee:BigInt(e.maxFee),overallFee:BigInt(e.overallFee)}),F=e=>({feeTokenAddress:x.STRK_TOKEN_ADDRESS,overallFee:o.num.toBigInt(e.overallFee),l1Gas:{gasConsumed:o.num.toBigInt(e.resourceBounds.l1Gas.maxAmount),gasPrice:o.num.toBigInt(e.resourceBounds.l1Gas.maxPricePerUnit)},l1DataGas:{gasConsumed:o.num.toBigInt(e.resourceBounds.l1DataGas.maxAmount),gasPrice:o.num.toBigInt(e.resourceBounds.l1DataGas.maxPricePerUnit)},l2Gas:{gasConsumed:o.num.toBigInt(e.resourceBounds.l2Gas.maxAmount),gasPrice:o.num.toBigInt(e.resourceBounds.l2Gas.maxPricePerUnit)}}),M=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.num.toBigInt(n)},S=e=>{const{type:t,deployment:a,transactions:s}=e;if(t==="paymaster")return s.maxFee+((a==null?void 0:a.maxFee)??0n);if(a&&!g.isEqualAddress(a.feeTokenAddress,s.feeTokenAddress))throw Error("Cannot calculate estimated fees for different tokens");const n=!s.overallFee&&!(a!=null&&a.overallFee),r=l=>n?h(l):u(l),i=a?r(a):0n,m=r(s);return i+m},k=e=>{var t;return e.transactions.overallFee?e.transactions.overallFee+(((t=e.deployment)==null?void 0:t.overallFee)??0n):G(e)},v=(e=[])=>e.filter(a=>a.type==="native"),w=e=>e.filter(t=>t.type==="paymaster"),f=()=>x.STRK_TOKEN_ADDRESS,P=(e=[],t)=>{const a=v(e).find(s=>g.isEqualAddress(s.transactions.feeTokenAddress,t));if(!a)throw Error(`No native estimated fee found for ${t}`);return a},A=(e=[])=>{const t=f();return P(e,t)},R=(e=[])=>A(e),G=e=>{if(e.deployment&&!g.isEqualAddress(e.deployment.feeTokenAddress,e.transactions.feeTokenAddress))throw Error("Cannot calculate estimated fees for different tokens");const t=u(e.transactions),a=e.deployment?u(e.deployment):0n;return t+a},u=e=>{const{l1Gas:t,l2Gas:a,l1DataGas:s}=e;return t.gasConsumed*t.gasPrice+a.gasConsumed*a.gasPrice+s.gasConsumed*s.gasPrice},h=e=>u(_(e)),_=(e,t=C.calculateCubeRootAdjustment)=>{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.num.toBigInt(N.argentMaxFee({estimatedFee:i})),l=Number(m)/Number(i),B=t(l),c=BigInt(Math.trunc(B*Number(a)));return{...e,l1Gas:{gasConsumed:s.gasConsumed*c/a,gasPrice:s.gasPrice*c/a},l2Gas:{gasConsumed:n.gasConsumed*c/a,gasPrice:n.gasPrice*c/a},l1DataGas:{gasConsumed:r.gasConsumed*c/a,gasPrice:r.gasPrice*c/a}}},q=e=>{const t=e.overallFee?e:_(e);return{resourceBounds:{l1_gas:V(t.l1Gas),l2_gas:{max_amount:o.num.toHex(t.l2Gas.gasConsumed),max_price_per_unit:o.num.toHex(t.l2Gas.gasPrice)},l1_data_gas:{max_amount:o.num.toHex(t.l1DataGas.gasConsumed),max_price_per_unit:o.num.toHex(t.l1DataGas.gasPrice)}}}},V=e=>({max_amount:o.num.toHex(e.gasConsumed),max_price_per_unit:o.num.toHex(e.gasPrice)});exports.estimatedFeeToMaxFeeTotal=h;exports.estimatedFeeToMaxResourceBounds=q;exports.estimatedFeeToTotal=u;exports.estimatedFeesToMaxFeeTotalV2=S;exports.estimatedFeesToTotal=G;exports.estimatedFeesToTotalWithOverallFee=k;exports.filterPaymasterEstimatedFees=w;exports.getEstimatedFeeFromSimulationAndRespectWatermarkFeeV2=D;exports.getNativeEstimatedFeeByFeeToken=P;exports.getNativeEstimatedFeeByTxVersion=A;exports.getNativeEstimatedFeeForAccount=R;exports.getNativeEstimatedFees=v;exports.getNativeFeeFromSimulation=T;exports.getNativeFeeTokenAddress=f;exports.getPaymasterFeeFromSimulation=y;exports.toMaxFeeEstimation=M;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const E=require("lodash-es"),o=require("starknet"),C=require("./adjustment.cjs"),I=require("./argentMaxFee.cjs"),p=require("./error.cjs"),T=require("../../chains/starknet/constants.cjs"),g=require("../../chains/starknet/address.cjs"),D=e=>{const{transactions:t}=e;if(!t)throw new p.EstimateError({code:"SIMULATE_AND_REVIEW_FAILED"});if(!Array.isArray(t))throw Error(`Unexpected simulation response. Expected array. Got ${typeof t}`);if(E.isEmpty(t))return[];if(t.length>2)throw Error(`Unexpected simulation response length. Got ${t.length}`);const a=t.map(m=>{if(!m.simulation)throw new p.EstimateError({code:"SIMULATE_AND_REVIEW_FAILED"});return{...m.simulation,...M(m.simulation.feeEstimations)}}),[s,n]=a.length===1?[a[0],void 0]:[a[1],a[0]],r=y(s,n),i=x(s,n);return[...r,...i]},M=e=>{const[t,a]=E.partition(e,s=>"unit"in s&&s.unit==="FRI");return{nativeFeeEstimations:t,paymasterFeeEstimations:a}},x=(e,t)=>{if(!e)return[];if(!t)return e.paymasterFeeEstimations.map(n=>({type:"paymaster",transactions:l(n),deployment:void 0}));const a=t.paymasterFeeEstimations,s=e.paymasterFeeEstimations;if(a.length!==s.length)throw Error("Deployment and transaction fee estimations length mismatch");return s.map((n,r)=>({type:"paymaster",transactions:l(n),deployment:l(a[r])}))},y=(e,t)=>{if(!e)return[];if(!t)return e.nativeFeeEstimations.map(n=>({type:"native",transactions:F(n),deployment:void 0}));const a=t.nativeFeeEstimations,s=e.nativeFeeEstimations;if(a.length!==s.length)throw Error("Deployment and transaction fee estimations length mismatch");return s.map((n,r)=>({type:"native",transactions:F(n),deployment:F(a[r])}))},l=e=>({feeTokenAddress:e.token.address,maxFee:BigInt(e.maxFee),overallFee:BigInt(e.overallFee),tip:e.defaultTip?o.num.toBigInt(e.defaultTip):void 0}),F=e=>({feeTokenAddress:T.STRK_TOKEN_ADDRESS,overallFee:o.num.toBigInt(e.overallFee),l1Gas:{gasConsumed:o.num.toBigInt(e.resourceBounds.l1Gas.maxAmount),gasPrice:o.num.toBigInt(e.resourceBounds.l1Gas.maxPricePerUnit)},l1DataGas:{gasConsumed:o.num.toBigInt(e.resourceBounds.l1DataGas.maxAmount),gasPrice:o.num.toBigInt(e.resourceBounds.l1DataGas.maxPricePerUnit)},l2Gas:{gasConsumed:o.num.toBigInt(e.resourceBounds.l2Gas.maxAmount),gasPrice:o.num.toBigInt(e.resourceBounds.l2Gas.maxPricePerUnit)},tip:e.defaultTip?o.num.toBigInt(e.defaultTip):void 0}),S=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.num.toBigInt(n)},k=e=>{const{type:t,deployment:a,transactions:s}=e;if(t==="paymaster")return s.maxFee+(a?.maxFee??0n);if(a&&!g.isEqualAddress(a.feeTokenAddress,s.feeTokenAddress))throw Error("Cannot calculate estimated fees for different tokens");const n=!s.overallFee&&!a?.overallFee,r=d=>n?G(d):c(d),i=a?r(a):0n,m=r(s);return i+m},R=e=>e.transactions.overallFee?e.transactions.overallFee+(e.deployment?.overallFee??0n):A(e),v=(e=[])=>e.filter(a=>a.type==="native"),w=e=>e.filter(t=>t.type==="paymaster"),f=()=>T.STRK_TOKEN_ADDRESS,B=(e=[],t)=>{const a=v(e).find(s=>g.isEqualAddress(s.transactions.feeTokenAddress,t));if(!a)throw Error(`No native estimated fee found for ${t}`);return a},P=(e=[])=>{const t=f();return B(e,t)},q=(e=[])=>P(e),A=e=>{if(e.deployment&&!g.isEqualAddress(e.deployment.feeTokenAddress,e.transactions.feeTokenAddress))throw Error("Cannot calculate estimated fees for different tokens");const t=c(e.transactions),a=e.deployment?c(e.deployment):0n;return t+a},c=e=>{const{l1Gas:t,l2Gas:a,l1DataGas:s}=e;return t.gasConsumed*t.gasPrice+a.gasConsumed*a.gasPrice+s.gasConsumed*s.gasPrice},G=e=>c(h(e)),h=(e,t=C.calculateCubeRootAdjustment)=>{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.num.toBigInt(I.argentMaxFee({estimatedFee:i})),d=Number(m)/Number(i),N=t(d),u=BigInt(Math.trunc(N*Number(a)));return{...e,l1Gas:{gasConsumed:s.gasConsumed*u/a,gasPrice:s.gasPrice*u/a},l2Gas:{gasConsumed:n.gasConsumed*u/a,gasPrice:n.gasPrice*u/a},l1DataGas:{gasConsumed:r.gasConsumed*u/a,gasPrice:r.gasPrice*u/a}}},_=e=>{const t=e.overallFee?e:h(e);return{...e,resourceBounds:{l1_gas:U(t.l1Gas),l2_gas:{max_amount:o.num.toHex(t.l2Gas.gasConsumed),max_price_per_unit:o.num.toHex(t.l2Gas.gasPrice)},l1_data_gas:{max_amount:o.num.toHex(t.l1DataGas.gasConsumed),max_price_per_unit:o.num.toHex(t.l1DataGas.gasPrice)}}}},V=e=>({...e,resourceBounds:o.stark.resourceBoundsToBigInt(_(e).resourceBounds)}),U=e=>({max_amount:o.num.toHex(e.gasConsumed),max_price_per_unit:o.num.toHex(e.gasPrice)});exports.estimatedFeeToMaxFeeTotal=G;exports.estimatedFeeToMaxResourceBounds=_;exports.estimatedFeeToMaxResourceBoundsBN=V;exports.estimatedFeeToTotal=c;exports.estimatedFeesToMaxFeeTotalV2=k;exports.estimatedFeesToTotal=A;exports.estimatedFeesToTotalWithOverallFee=R;exports.filterPaymasterEstimatedFees=w;exports.getEstimatedFeeFromSimulationAndRespectWatermarkFeeV2=D;exports.getNativeEstimatedFeeByFeeToken=B;exports.getNativeEstimatedFeeByTxVersion=P;exports.getNativeEstimatedFeeForAccount=q;exports.getNativeEstimatedFees=v;exports.getNativeFeeFromSimulation=y;exports.getNativeFeeTokenAddress=f;exports.getPaymasterFeeFromSimulation=x;exports.toMaxFeeEstimation=S;

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

@@ -39,4 +39,37 @@ export declare const estimatedFeeToMaxResourceBounds: (estimatedFee: NativeEstim
             max_price_per_unit: string;
         };
     };
+    feeTokenAddress: `0x${string}`;
+    l1Gas: {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    };
+    l2Gas: {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    };
+    l1DataGas: {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    };
+    overallFee?: bigint | undefined;
+    tip?: bigint | undefined;
+};
+export declare const estimatedFeeToMaxResourceBoundsBN: (estimatedFee: NativeEstimatedFeeData) => {
+    resourceBounds: import('starknet').ResourceBoundsBN;
+    feeTokenAddress: `0x${string}`;
+    l1Gas: {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    };
+    l2Gas: {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    };
+    l1DataGas: {
+        gasConsumed: bigint;
+        gasPrice: bigint;
+    };
+    overallFee?: bigint | undefined;
+    tip?: bigint | undefined;
 };

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

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

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

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

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

@@ -50,6 +50,7 @@ export declare class TransactionReviewServiceWeb implements ITransactionReviewSe
                     gasPrice: bigint;
                 };
                 overallFee?: bigint | undefined;
+                tip?: bigint | undefined;
             };
             deployment?: {
                 feeTokenAddress: `0x${string}`;
@@ -66,6 +67,7 @@ export declare class TransactionReviewServiceWeb implements ITransactionReviewSe
                     gasPrice: bigint;
                 };
                 overallFee?: bigint | undefined;
+                tip?: bigint | undefined;
             } | undefined;
         } | {
             type: "paymaster";
@@ -73,11 +75,13 @@ export declare class TransactionReviewServiceWeb implements ITransactionReviewSe
                 feeTokenAddress: `0x${string}`;
                 overallFee: bigint;
                 maxFee: bigint;
+                tip?: bigint | undefined;
             };
             deployment?: {
                 feeTokenAddress: `0x${string}`;
                 overallFee: bigint;
                 maxFee: bigint;
+                tip?: bigint | undefined;
             } | undefined;
         })[];
         isBackendDown: boolean;