fix: utilize provided resourceBounds value

starknet-io · Jan 4, 2024 · 65bea53 · 65bea53
1 parent bfedce9
commit 65bea53
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/__tests__/utils/stark.test.ts b/__tests__/utils/stark.test.ts
@@ -1,5 +1,5 @@
-import { CallData, RawArgs, json, stark } from '../../src';
-import { FeeEstimate } from '../../src/types/api';
+import { CallData, RawArgs, UniversalDetails, json, stark } from '../../src';
+import { EDataAvailabilityMode, FeeEstimate } from '../../src/types/api';
 import { toBigInt, toHex } from '../../src/utils/num';
 import { compiledOpenZeppelinAccount } from '../config/fixtures';
 
@@ -83,4 +83,25 @@ describe('stark', () => {
  l1_gas: { max_amount: '0x6e', max_price_per_unit: '0xf' },
  });
  });
+
+ test('v3Details', () => {
+ const setValues = (o: {}, v: any) => Object.fromEntries(Object.keys(o).map((k) => [k, v]));
+
+ const details: UniversalDetails = {
+ tip: 99n,
+ paymasterData: [99n, 99n],
+ accountDeploymentData: [99n, 99n],
+ nonceDataAvailabilityMode: EDataAvailabilityMode.L2,
+ feeDataAvailabilityMode: EDataAvailabilityMode.L2,
+ resourceBounds: {
+ l1_gas: { max_amount: '0x99', max_price_per_unit: '0x99' },
+ l2_gas: { max_amount: '0x99', max_price_per_unit: '0x99' },
+ },
+ };
+ const detailsUndefined = setValues(details, undefined);
+ const detailsAnything = setValues(details, expect.anything());
+
+ expect(stark.v3Details(details)).toMatchObject(details);
+ expect(stark.v3Details(detailsUndefined)).toEqual(expect.objectContaining(detailsAnything));
+ });
 });
diff --git a/src/utils/stark.ts b/src/utils/stark.ts
@@ -171,8 +171,7 @@ export function toFeeVersion(providedVersion?: BigNumberish) {
 }
 
 /**
- * Rerturn provided or default v3 tx details
- * @param details EstimateFeeDetails
+ * Return provided or default v3 tx details
  */
 export function v3Details(details: UniversalDetails) {
  return {
@@ -181,7 +180,7 @@ export function v3Details(details: UniversalDetails) {
  accountDeploymentData: details.accountDeploymentData || [],
  nonceDataAvailabilityMode: details.nonceDataAvailabilityMode || EDataAvailabilityMode.L1,
  feeDataAvailabilityMode: details.feeDataAvailabilityMode || EDataAvailabilityMode.L1,
- resourceBounds: estimateFeeToBounds(ZERO),
+ resourceBounds: details.resourceBounds ?? estimateFeeToBounds(ZERO),
  };
 }