@argent/x-shared 1.56.0 → 1.56.2

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const A=require("lodash-es"),r=require("starknet"),y=require("../../chains/starknet/address.cjs"),x=require("../../chains/starknet/constants.cjs"),M=require("./argentMaxFee.cjs"),E=require("./error.cjs"),S=require("../../utils/starknet/starknet.cjs"),F=require("../../features/simulation/transactionReview/schema.cjs"),_=require("../../utils/arrays.cjs");function P(e){return A.upperCase(e.unit)==="WEI"}function I(e){return A.upperCase(e.unit)==="FRI"}function u(e,n){return P(e)?{...e,maxFee:n(e.maxFee),overallFee:n(e.overallFee),gasPrice:n(e.gasPrice),gasUsage:n(e.gasUsage)}:{...e,overallFee:n(e.overallFee),gasPrice:n(e.gasPrice),gasUsage:n(e.gasUsage),maxAmount:n(e.maxAmount),maxPricePerUnit:n(e.maxPricePerUnit)}}function d(e){return P(e)?{maxFee:e.maxFee}:{amount:e.maxAmount,pricePerUnit:e.maxPricePerUnit}}function p(e){return I({unit:e})?x.STRK_TOKEN_ADDRESS:x.ETH_TOKEN_ADDRESS}function k(e,n,t=2){const a=BigInt(10**t),s=BigInt(Math.round(n*10**t));return e*s/a}const N=[x.STRK_TOKEN_ADDRESS],G=(e,n=U)=>{if(e.max&&"amount"in e.max)return{...e,...e.max};const t=10000n,{amount:a,pricePerUnit:s,dataGasConsumed:o=0n,dataGasPrice:m=0n}=e,c=a*s+o*m;if(c<0)throw Error("Cannot calculate max fee for negative fee");const i=r.num.toBigInt(M.argentMaxFee({estimatedFee:c})),f=Number(i)/Number(c),h=n(f),g=BigInt(Math.trunc(h*Number(t)));return{...e,amount:a*g/t,pricePerUnit:s*g/t,dataGasConsumed:o*g/t,dataGasPrice:m*g/t}},l=e=>{const{amount:n,pricePerUnit:t,dataGasConsumed:a=0n,dataGasPrice:s=0n}=e;return n*t+a*s},B=e=>{if(e.max)return"maxFee"in e.max?e.max.maxFee:l(e.max)},T=e=>{const n=B(e);return n||l(G(e))},R=e=>{if(e.deployment&&!y.isEqualAddress(e.deployment.feeTokenAddress,e.transactions.feeTokenAddress))throw Error("Cannot calculate estimated fees for different tokens");const n=l(e.transactions),t=e.deployment?l(e.deployment):0n;return n+t},q=e=>{if(e.deployment&&!y.isEqualAddress(e.deployment.feeTokenAddress,e.transactions.feeTokenAddress))throw Error("Cannot calculate estimated fees for different tokens");const n=e.deployment?T(e.deployment):0n,t=T(e.transactions);return n+t},D=(e,n)=>[{contractAddress:e,entrypoint:"transfer",calldata:r.CallData.compile(S.transferCalldataSchema.parse({recipient:n,amount:r.uint256.bnToUint256(BigInt(1))}))}],C=(e,n)=>{if(!e)return{transactions:{feeTokenAddress:n??x.ETH_TOKEN_ADDRESS,amount:0n,pricePerUnit:0n,dataGasConsumed:0n,dataGasPrice:0n}};if(!Array.isArray(e))throw Error(`Unexpected simulation response. Expected array. Got ${typeof e}`);if(e.length===1){const t=F.feeEstimationSchema.parse(e[0].feeEstimation);return{transactions:{feeTokenAddress:p(t.unit),amount:r.num.toBigInt(t.gasUsage),pricePerUnit:r.num.toBigInt(t.gasPrice),max:d(u(t,r.num.toBigInt)),dataGasConsumed:t.dataGasConsumed?r.num.toBigInt(t.dataGasConsumed):0n,dataGasPrice:t.dataGasPrice?r.num.toBigInt(t.dataGasPrice):0n}}}if(e.length===2){const t=F.feeEstimationSchema.parse(e[0].feeEstimation),a=F.feeEstimationSchema.parse(e[1].feeEstimation);return{deployment:{feeTokenAddress:p(t.unit),amount:r.num.toBigInt(t.gasUsage),pricePerUnit:r.num.toBigInt(t.gasPrice),max:d(u(t,r.num.toBigInt)),dataGasConsumed:t.dataGasConsumed?r.num.toBigInt(t.dataGasConsumed):0n,dataGasPrice:t.dataGasPrice?r.num.toBigInt(t.dataGasPrice):0n},transactions:{feeTokenAddress:p(a.unit),amount:r.num.toBigInt(a.gasUsage),pricePerUnit:r.num.toBigInt(a.gasPrice),max:d(u(a,r.num.toBigInt)),dataGasConsumed:a.dataGasConsumed?r.num.toBigInt(a.dataGasConsumed):0n,dataGasPrice:a.dataGasPrice?r.num.toBigInt(a.dataGasPrice):0n}}}throw Error("Unexpected simulation response length")},b=({transaction:e,nonce:n,chainId:t,version:a,isDeploymentTransaction:s,cairoVersion:o,address:m,appDomain:c})=>{let i=n;s&&e.type!=="DEPLOY_ACCOUNT"&&(i=r.num.toHex(1));const f=_.ensureArray(e.calls);return{type:e.type,chainId:t,cairoVersion:o,nonce:i,version:a,account:m,calls:f,calldata:e.calldata,salt:e.salt,signature:e.signature,classHash:e.classHash,appDomain:c}},j=(e,n)=>{const{transactions:t}=e;if(!t)throw new E.EstimateError({code:"SIMULATE_AND_REVIEW_FAILED"});const a=t.map(i=>{if(!i.simulation)throw new E.EstimateError({code:"SIMULATE_AND_REVIEW_FAILED"});return i}),s=a.map(i=>({...i.simulation,feeEstimation:u(i.simulation.feeEstimation,Number)})),o=C(s,n),[m,c]=a.length===1?[a[0],void 0]:[a[1],a[0]];return{...o,transactions:{...o.transactions,dataGasConsumed:o.transactions.dataGasConsumed??0n,dataGasPrice:o.transactions.dataGasPrice??0n,max:d(u(m.simulation.feeEstimation,r.num.toBigInt))},deployment:o.deployment&&c?{...o.deployment,dataGasConsumed:o.deployment.dataGasConsumed??0n,dataGasPrice:o.deployment.dataGasPrice??0n,max:d(u(c.simulation.feeEstimation,r.num.toBigInt))}:void 0}},w=e=>{const n=G(e),t=T(e);return{maxFee:t,resourceBounds:{l1_gas:{max_amount:r.num.toHex(t/e.pricePerUnit),max_price_per_unit:r.num.toHex(n.pricePerUnit)},l2_gas:{max_amount:"0x0",max_price_per_unit:"0x0"}}}},W=e=>{const n=Math.sqrt(e);return isNaN(n)?Math.sqrt(2):n},U=e=>{const n=Math.cbrt(e);return isNaN(n)?Math.cbrt(2):n},O=e=>e<1||isNaN(e)?1.1:Math.log(e+1)+1;exports.buildDummyTx=D;exports.calculateCubeRootAdjustment=U;exports.calculateNonLinearAdjustment=O;exports.calculateSqrtAdjustment=W;exports.castFeeEstimation=u;exports.estimatedFeeToMaxFeeTotal=T;exports.estimatedFeeToMaxResourceBounds=w;exports.estimatedFeeToTotal=l;exports.estimatedFeesToMaxFeeTotal=q;exports.estimatedFeesToTotal=R;exports.getEstimatedFeeFromBulkSimulation=C;exports.getEstimatedFeeFromSimulationAndRespectWatermarkFee=j;exports.getPayloadFromTransaction=b;exports.getWatermarkedMaxFeeTotal=B;exports.isFRI=I;exports.isWEI=P;exports.multiplyBigIntByFloat=k;exports.toMax=d;exports.tokensRequireTxV3Support=N;exports.unitToFeeTokenAddress=p;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const A=require("lodash-es"),a=require("starknet"),y=require("../../chains/starknet/address.cjs"),x=require("../../chains/starknet/constants.cjs"),U=require("./argentMaxFee.cjs"),E=require("./error.cjs"),h=require("../../utils/starknet/starknet.cjs"),P=require("../../features/simulation/transactionReview/schema.cjs"),S=require("../../utils/arrays.cjs");function F(t){return A.upperCase(t.unit)==="WEI"}function G(t){return A.upperCase(t.unit)==="FRI"}function u(t,n){return F(t)?{...t,maxFee:n(t.maxFee),overallFee:n(t.overallFee),gasPrice:n(t.gasPrice),gasUsage:n(t.gasUsage)}:{...t,overallFee:n(t.overallFee),gasPrice:n(t.gasPrice),gasUsage:n(t.gasUsage),maxAmount:n(t.maxAmount),maxPricePerUnit:n(t.maxPricePerUnit)}}function d(t){return F(t)?{maxFee:t.maxFee}:{amount:t.maxAmount,pricePerUnit:t.maxPricePerUnit}}function p(t){return G({unit:t})?x.STRK_TOKEN_ADDRESS:x.ETH_TOKEN_ADDRESS}function k(t,n,e=2){const r=BigInt(10**e),o=BigInt(Math.round(n*10**e));return t*o/r}const N=[x.STRK_TOKEN_ADDRESS],I=(t,n=C)=>{if(t.max&&"amount"in t.max)return{...t,...t.max};const e=10000n,{amount:r,pricePerUnit:o,dataGasConsumed:s=0n,dataGasPrice:m=0n}=t,c=r*o+s*m;if(c<0)throw Error("Cannot calculate max fee for negative fee");const i=a.num.toBigInt(U.argentMaxFee({estimatedFee:c})),f=Number(i)/Number(c),M=n(f),g=BigInt(Math.trunc(M*Number(e)));return{...t,amount:r*g/e,pricePerUnit:o*g/e,dataGasConsumed:s*g/e,dataGasPrice:m*g/e}},l=t=>{const{amount:n,pricePerUnit:e,dataGasConsumed:r=0n,dataGasPrice:o=0n}=t;return n*e+r*o},B=t=>{if(t.max)return"maxFee"in t.max?t.max.maxFee:l(t.max)},T=t=>{const n=B(t);return n||l(I(t))},R=t=>{if(t.deployment&&!y.isEqualAddress(t.deployment.feeTokenAddress,t.transactions.feeTokenAddress))throw Error("Cannot calculate estimated fees for different tokens");const n=l(t.transactions),e=t.deployment?l(t.deployment):0n;return n+e},q=t=>{if(t.deployment&&!y.isEqualAddress(t.deployment.feeTokenAddress,t.transactions.feeTokenAddress))throw Error("Cannot calculate estimated fees for different tokens");const n=t.deployment?T(t.deployment):0n,e=T(t.transactions);return n+e},D=(t,n)=>[{contractAddress:t,entrypoint:"transfer",calldata:a.CallData.compile(h.transferCalldataSchema.parse({recipient:n,amount:a.uint256.bnToUint256(BigInt(1))}))}],_=(t,n)=>{if(!t)return{transactions:{feeTokenAddress:n??x.ETH_TOKEN_ADDRESS,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 e=P.feeEstimationSchema.parse(t[0].feeEstimation);return{transactions:{feeTokenAddress:p(e.unit),amount:a.num.toBigInt(e.gasUsage),pricePerUnit:a.num.toBigInt(e.gasPrice),max:d(u(e,a.num.toBigInt)),dataGasConsumed:e.dataGasConsumed?a.num.toBigInt(e.dataGasConsumed):0n,dataGasPrice:e.dataGasPrice?a.num.toBigInt(e.dataGasPrice):0n}}}if(t.length===2){const e=P.feeEstimationSchema.parse(t[0].feeEstimation),r=P.feeEstimationSchema.parse(t[1].feeEstimation);return{deployment:{feeTokenAddress:p(e.unit),amount:a.num.toBigInt(e.gasUsage),pricePerUnit:a.num.toBigInt(e.gasPrice),max:d(u(e,a.num.toBigInt)),dataGasConsumed:e.dataGasConsumed?a.num.toBigInt(e.dataGasConsumed):0n,dataGasPrice:e.dataGasPrice?a.num.toBigInt(e.dataGasPrice):0n},transactions:{feeTokenAddress:p(r.unit),amount:a.num.toBigInt(r.gasUsage),pricePerUnit:a.num.toBigInt(r.gasPrice),max:d(u(r,a.num.toBigInt)),dataGasConsumed:r.dataGasConsumed?a.num.toBigInt(r.dataGasConsumed):0n,dataGasPrice:r.dataGasPrice?a.num.toBigInt(r.dataGasPrice):0n}}}throw Error("Unexpected simulation response length")},b=({transaction:t,nonce:n,chainId:e,version:r,isDeploymentTransaction:o,cairoVersion:s,address:m,appDomain:c})=>{let i=n;o&&t.type!=="DEPLOY_ACCOUNT"&&(i=a.num.toHex(1));const f=S.ensureArray(t.calls);return{type:t.type,chainId:e,cairoVersion:s,nonce:i,version:r,account:m,calls:f,calldata:t.calldata,salt:t.salt,signature:t.signature,classHash:t.classHash,appDomain:c}},W=(t,n)=>{const{transactions:e}=t;if(!e)throw new E.EstimateError({code:"SIMULATE_AND_REVIEW_FAILED"});const r=e.map(i=>{if(!i.simulation)throw new E.EstimateError({code:"SIMULATE_AND_REVIEW_FAILED"});return i}),o=r.map(i=>({...i.simulation,feeEstimation:u(i.simulation.feeEstimation,Number)})),s=_(o,n),[m,c]=r.length===1?[r[0],void 0]:[r[1],r[0]];return{...s,transactions:{...s.transactions,dataGasConsumed:s.transactions.dataGasConsumed??0n,dataGasPrice:s.transactions.dataGasPrice??0n,max:d(u(m.simulation.feeEstimation,a.num.toBigInt))},deployment:s.deployment&&c?{...s.deployment,dataGasConsumed:s.deployment.dataGasConsumed??0n,dataGasPrice:s.deployment.dataGasPrice??0n,max:d(u(c.simulation.feeEstimation,a.num.toBigInt))}:void 0}},j=t=>({max_amount:a.num.toHex(t.amount),max_price_per_unit:a.num.toHex(t.pricePerUnit)}),w=(t,n,e)=>({max_amount:a.num.toHex(t/n),max_price_per_unit:a.num.toHex(e)}),H=t=>{const n=I(t),e=T(t);return{maxFee:e,resourceBounds:{l1_gas:(o=>o!==void 0&&"amount"in o&&"pricePerUnit"in o)(t.max)?j(t.max):w(e,t.pricePerUnit,n.pricePerUnit),l2_gas:{max_amount:"0x0",max_price_per_unit:"0x0"}}}},L=t=>{const n=Math.sqrt(t);return isNaN(n)?Math.sqrt(2):n},C=t=>{const n=Math.cbrt(t);return isNaN(n)?Math.cbrt(2):n},v=t=>t<1||isNaN(t)?1.1:Math.log(t+1)+1;exports.buildDummyTx=D;exports.calculateCubeRootAdjustment=C;exports.calculateNonLinearAdjustment=v;exports.calculateSqrtAdjustment=L;exports.castFeeEstimation=u;exports.estimatedFeeToMaxFeeTotal=T;exports.estimatedFeeToMaxResourceBounds=H;exports.estimatedFeeToTotal=l;exports.estimatedFeesToMaxFeeTotal=q;exports.estimatedFeesToTotal=R;exports.getEstimatedFeeFromBulkSimulation=_;exports.getEstimatedFeeFromSimulationAndRespectWatermarkFee=W;exports.getPayloadFromTransaction=b;exports.getWatermarkedMaxFeeTotal=B;exports.isFRI=G;exports.isWEI=F;exports.multiplyBigIntByFloat=k;exports.toMax=d;exports.tokensRequireTxV3Support=N;exports.unitToFeeTokenAddress=p;

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

@@ -1,32 +1,32 @@
-import { upperCase as T } from "lodash-es";
-import { num as r, CallData as C, uint256 as U } from "starknet";
-import { isEqualAddress as I } from "../../chains/starknet/address.js";
-import { STRK_TOKEN_ADDRESS as y, ETH_TOKEN_ADDRESS as A } from "../../chains/starknet/constants.js";
-import { argentMaxFee as h } from "./argentMaxFee.js";
+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 _ } from "../../utils/starknet/starknet.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 T(t.unit) === "WEI";
+  return A(t.unit) === "WEI";
 }
 function k(t) {
-  return T(t.unit) === "FRI";
+  return A(t.unit) === "FRI";
 }
-function u(t, n) {
+function u(t, e) {
   return E(t) ? {
     ...t,
-    maxFee: n(t.maxFee),
-    overallFee: n(t.overallFee),
-    gasPrice: n(t.gasPrice),
-    gasUsage: n(t.gasUsage)
+    maxFee: e(t.maxFee),
+    overallFee: e(t.overallFee),
+    gasPrice: e(t.gasPrice),
+    gasUsage: e(t.gasUsage)
   } : {
     ...t,
-    overallFee: n(t.overallFee),
-    gasPrice: n(t.gasPrice),
-    gasUsage: n(t.gasUsage),
-    maxAmount: n(t.maxAmount),
-    maxPricePerUnit: n(t.maxPricePerUnit)
+    overallFee: e(t.overallFee),
+    gasPrice: e(t.gasPrice),
+    gasUsage: e(t.gasUsage),
+    maxAmount: e(t.maxAmount),
+    maxPricePerUnit: e(t.maxPricePerUnit)
   };
 }
 function d(t) {
@@ -38,64 +38,64 @@ function d(t) {
   };
 }
 function x(t) {
-  return k({ unit: t }) ? y : A;
+  return k({ unit: t }) ? I : y;
 }
-function O(t, n, e = 2) {
-  const a = BigInt(10 ** e), s = BigInt(Math.round(n * 10 ** e));
-  return t * s / a;
+function V(t, e, n = 2) {
+  const a = BigInt(10 ** n), o = BigInt(Math.round(e * 10 ** n));
+  return t * o / a;
 }
-const K = [y], F = (t, n = D) => {
+const Y = [I], U = (t, e = w) => {
   if (t.max && "amount" in t.max)
     return {
       ...t,
       ...t.max
     };
-  const e = 10000n, { amount: a, pricePerUnit: s, dataGasConsumed: o = 0n, dataGasPrice: m = 0n } = t, c = a * s + o * m;
+  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(h({ estimatedFee: c })), g = Number(i) / Number(c), B = n(g), l = BigInt(Math.trunc(B * Number(e)));
+  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 / e,
-    pricePerUnit: s * l / e,
-    dataGasConsumed: o * l / e,
-    dataGasPrice: m * l / e
+    amount: a * l / n,
+    pricePerUnit: o * l / n,
+    dataGasConsumed: s * l / n,
+    dataGasPrice: m * l / n
   };
 }, p = (t) => {
-  const { amount: n, pricePerUnit: e, dataGasConsumed: a = 0n, dataGasPrice: s = 0n } = t;
-  return n * e + a * s;
+  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 n = N(t);
-  return n || p(F(t));
-}, V = (t) => {
-  if (t.deployment && !I(t.deployment.feeTokenAddress, t.transactions.feeTokenAddress))
+  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 n = p(t.transactions), e = t.deployment ? p(t.deployment) : 0n;
-  return n + e;
-}, Y = (t) => {
-  if (t.deployment && !I(t.deployment.feeTokenAddress, t.transactions.feeTokenAddress))
+  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 n = t.deployment ? P(t.deployment) : 0n, e = P(t.transactions);
-  return n + e;
-}, $ = (t, n) => [
+  const e = t.deployment ? P(t.deployment) : 0n, n = P(t.transactions);
+  return e + n;
+}, J = (t, e) => [
   {
     contractAddress: t,
     entrypoint: "transfer",
-    calldata: C.compile(_.parse({
+    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: n,
+      recipient: e,
       // We are using the smallest possible amount to make sure this doesn't throw an error
-      amount: U.bnToUint256(BigInt(1))
+      amount: C.bnToUint256(BigInt(1))
     }))
   }
-], S = (t, n) => {
+], S = (t, e) => {
   if (!t)
     return {
       transactions: {
-        feeTokenAddress: n ?? A,
+        feeTokenAddress: e ?? y,
         amount: 0n,
         pricePerUnit: 0n,
         dataGasConsumed: 0n,
@@ -105,28 +105,28 @@ const K = [y], F = (t, n = D) => {
   if (!Array.isArray(t))
     throw Error(`Unexpected simulation response. Expected array. Got ${typeof t}`);
   if (t.length === 1) {
-    const e = f.parse(t[0].feeEstimation);
+    const n = f.parse(t[0].feeEstimation);
     return {
       transactions: {
-        feeTokenAddress: x(e.unit),
-        amount: r.toBigInt(e.gasUsage),
-        pricePerUnit: r.toBigInt(e.gasPrice),
-        max: d(u(e, r.toBigInt)),
-        dataGasConsumed: e.dataGasConsumed ? r.toBigInt(e.dataGasConsumed) : 0n,
-        dataGasPrice: e.dataGasPrice ? r.toBigInt(e.dataGasPrice) : 0n
+        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 e = f.parse(t[0].feeEstimation), a = f.parse(t[1].feeEstimation);
+    const n = f.parse(t[0].feeEstimation), a = f.parse(t[1].feeEstimation);
     return {
       deployment: {
-        feeTokenAddress: x(e.unit),
-        amount: r.toBigInt(e.gasUsage),
-        pricePerUnit: r.toBigInt(e.gasPrice),
-        max: d(u(e, r.toBigInt)),
-        dataGasConsumed: e.dataGasConsumed ? r.toBigInt(e.dataGasConsumed) : 0n,
-        dataGasPrice: e.dataGasPrice ? r.toBigInt(e.dataGasPrice) : 0n
+        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),
@@ -139,14 +139,14 @@ const K = [y], F = (t, n = D) => {
     };
   }
   throw Error("Unexpected simulation response length");
-}, z = ({ transaction: t, nonce: n, chainId: e, version: a, isDeploymentTransaction: s, cairoVersion: o, address: m, appDomain: c }) => {
-  let i = n;
-  s && t.type !== "DEPLOY_ACCOUNT" && (i = r.toHex(1));
+}, 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: e,
-    cairoVersion: o,
+    chainId: n,
+    cairoVersion: s,
     nonce: i,
     version: a,
     account: m,
@@ -158,78 +158,78 @@ const K = [y], F = (t, n = D) => {
     appDomain: c
     // appDomain: "https://starknetkit-blacked-listed.vercel.app", // to simulate blacklisted domain
   };
-}, J = (t, n) => {
-  const { transactions: e } = t;
-  if (!e)
+}, X = (t, e) => {
+  const { transactions: n } = t;
+  if (!n)
     throw new G({ code: "SIMULATE_AND_REVIEW_FAILED" });
-  const a = e.map((i) => {
+  const a = n.map((i) => {
     if (!i.simulation)
       throw new G({ code: "SIMULATE_AND_REVIEW_FAILED" });
     return i;
-  }), s = a.map((i) => ({
+  }), o = a.map((i) => ({
     ...i.simulation,
     feeEstimation: u(i.simulation.feeEstimation, Number)
-  })), o = S(s, n), [m, c] = a.length === 1 ? [a[0], void 0] : [a[1], a[0]];
+  })), s = S(o, e), [m, c] = a.length === 1 ? [a[0], void 0] : [a[1], a[0]];
   return {
-    ...o,
+    ...s,
     transactions: {
-      ...o.transactions,
-      dataGasConsumed: o.transactions.dataGasConsumed ?? 0n,
-      dataGasPrice: o.transactions.dataGasPrice ?? 0n,
+      ...s.transactions,
+      dataGasConsumed: s.transactions.dataGasConsumed ?? 0n,
+      dataGasPrice: s.transactions.dataGasPrice ?? 0n,
       max: d(u(m.simulation.feeEstimation, r.toBigInt))
     },
-    deployment: o.deployment && c ? {
-      ...o.deployment,
-      dataGasConsumed: o.deployment.dataGasConsumed ?? 0n,
-      dataGasPrice: o.deployment.dataGasPrice ?? 0n,
+    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
   };
-}, Q = (t) => {
-  const n = F(t), e = P(t);
+}, 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: e,
+    maxFee: n,
     // for v3 transactions
     resourceBounds: {
-      l1_gas: {
-        // (overall_fee / gas_price) × gas_safety_margin
-        max_amount: r.toHex(e / t.pricePerUnit),
-        // max_price_per_unit: gas_price × fee_safety_margin
-        max_price_per_unit: r.toHex(n.pricePerUnit)
-      },
-      l2_gas: {
-        max_amount: "0x0",
-        max_price_per_unit: "0x0"
-      }
+      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" }
     }
   };
-}, X = (t) => {
-  const n = Math.sqrt(t);
-  return isNaN(n) ? Math.sqrt(2) : n;
-}, D = (t) => {
-  const n = Math.cbrt(t);
-  return isNaN(n) ? Math.cbrt(2) : n;
-}, Z = (t) => t < 1 || isNaN(t) ? 1.1 : Math.log(t + 1) + 1;
+}, 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;
 export {
-  $ as buildDummyTx,
-  D as calculateCubeRootAdjustment,
-  Z as calculateNonLinearAdjustment,
-  X as calculateSqrtAdjustment,
+  J as buildDummyTx,
+  w as calculateCubeRootAdjustment,
+  nt as calculateNonLinearAdjustment,
+  tt as calculateSqrtAdjustment,
   u as castFeeEstimation,
   P as estimatedFeeToMaxFeeTotal,
-  Q as estimatedFeeToMaxResourceBounds,
+  Z as estimatedFeeToMaxResourceBounds,
   p as estimatedFeeToTotal,
-  Y as estimatedFeesToMaxFeeTotal,
-  V as estimatedFeesToTotal,
+  z as estimatedFeesToMaxFeeTotal,
+  $ as estimatedFeesToTotal,
   S as getEstimatedFeeFromBulkSimulation,
-  J as getEstimatedFeeFromSimulationAndRespectWatermarkFee,
-  z as getPayloadFromTransaction,
+  X as getEstimatedFeeFromSimulationAndRespectWatermarkFee,
+  Q as getPayloadFromTransaction,
   N as getWatermarkedMaxFeeTotal,
   k as isFRI,
   E as isWEI,
-  O as multiplyBigIntByFloat,
+  V as multiplyBigIntByFloat,
   d as toMax,
-  K as tokensRequireTxV3Support,
+  Y as tokensRequireTxV3Support,
   x as unitToFeeTokenAddress
 };

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

@@ -5,15 +5,15 @@ import { AllowArray, Call, DeclareContractPayload, DeployAccountContractPayload,
  * Same as EstimateFeeAction from starknet.js
  */
 export type TransactionAction = {
-    type: TransactionType.INVOKE;
+    type: typeof TransactionType.INVOKE;
     payload: AllowArray<Call>;
 } | {
-    type: TransactionType.DECLARE;
+    type: typeof TransactionType.DECLARE;
     payload: DeclareContractPayload;
 } | {
-    type: TransactionType.DEPLOY_ACCOUNT;
+    type: typeof TransactionType.DEPLOY_ACCOUNT;
     payload: DeployAccountContractPayload;
 } | {
-    type: TransactionType.DEPLOY;
+    type: typeof TransactionType.DEPLOY;
     payload: UniversalDeployerContractPayload;
 };

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

@@ -14,7 +14,7 @@ export interface SimulationError extends Error {
     url: string;
 }
 export interface SimulateDeployAccountRequest {
-    type: TransactionType.DEPLOY_ACCOUNT;
+    type: typeof TransactionType.DEPLOY_ACCOUNT;
     classHash: string;
     calldata: Calldata;
     salt: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@argent/x-shared",
-  "version": "1.56.0",
+  "version": "1.56.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/argentlabs/x-shared.git"
@@ -73,7 +73,7 @@
     "@starknet-io/types-js": "^0.7.7",
     "big-decimal-number": "npm:bignumber.js@^9.1.2",
     "micro-starknet": "^0.2.3",
-    "starknet": "6.11.0",
+    "starknet": "6.21.1",
     "starknet4-deprecated": "npm:starknet@4.4.0",
     "starknet5": "npm:starknet@5.25.0"
   },