Merge pull request #482 from 0xs34n/fix/estimate-fee-bulk-type

fix: estimate fee response bulk type
starknet-io · Jan 10, 2023 · 084d89e · 084d89e
2 parents 60d27fc + 7a66843
commit 084d89e
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 3 deletions.
diff --git a/__tests__/account.test.ts b/__tests__/account.test.ts
@@ -18,6 +18,7 @@ import {
   compiledOpenZeppelinAccount,
   compiledStarknetId,
   compiledTestDapp,
+  describeIfDevnetSequencer,
   describeIfSequencer,
   erc20ClassHash,
   getTestAccount,
@@ -71,6 +72,36 @@ describe('deploy and test Wallet', () => {
     innerInvokeEstFeeSpy.mockClear();
   });
 
+  describeIfDevnetSequencer('Estimate Fee Bulk on Sequencer', () => {
+    test('estimate fee bulk', async () => {
+      const innerInvokeEstFeeSpy = jest.spyOn(account.signer, 'signTransaction');
+      const estimatedFeeBulk = await account.estimateFeeBulk([
+        {
+          type: 'INVOKE_FUNCTION',
+          payload: {
+            contractAddress: erc20Address,
+            entrypoint: 'transfer',
+            calldata: [erc20.address, '10', '0'],
+          },
+        },
+        {
+          type: 'INVOKE_FUNCTION',
+          payload: {
+            contractAddress: erc20Address,
+            entrypoint: 'transfer',
+            calldata: [erc20.address, '10', '0'],
+          },
+        },
+      ]);
+
+      expect(estimatedFeeBulk[0]).toHaveProperty('suggestedMaxFee');
+      expect(estimatedFeeBulk.length).toEqual(2);
+      expect(isBN(estimatedFeeBulk[0].overall_fee)).toBe(true);
+      expect(innerInvokeEstFeeSpy.mock.calls[0][1].version).toBe(feeTransactionVersion);
+      innerInvokeEstFeeSpy.mockClear();
+    });
+  });
+
   test('read balance of wallet', async () => {
     const x = await erc20.balanceOf(account.address);
 

diff --git a/__tests__/fixtures.ts b/__tests__/fixtures.ts
@@ -35,6 +35,8 @@ const PROVIDER_URL = RPC_URL || BASE_URL;
 export const IS_LOCALHOST_DEVNET =
   PROVIDER_URL.includes('localhost') || PROVIDER_URL.includes('127.0.0.1');
 
+export const IS_DEVNET_RPC = IS_LOCALHOST_DEVNET && PROVIDER_URL.includes('rpc');
+
 /* Definitions */
 export const IS_RPC = !!RPC_URL;
 export const IS_SEQUENCER = !RPC_URL;
@@ -80,5 +82,7 @@ export const describeIfSequencer = describeIf(IS_SEQUENCER);
 export const describeIfRpc = describeIf(IS_RPC);
 export const describeIfNotDevnet = describeIf(!IS_LOCALHOST_DEVNET);
 export const describeIfDevnet = describeIf(IS_LOCALHOST_DEVNET);
+export const describeIfDevnetRpc = describeIf(IS_DEVNET_RPC);
+export const describeIfDevnetSequencer = describeIf(!IS_DEVNET_RPC);
 
 export const erc20ClassHash = '0x54328a1075b8820eb43caf0caa233923148c983742402dcfc38541dd843d01a';
diff --git a/src/account/default.ts b/src/account/default.ts
@@ -21,7 +21,6 @@ import {
   EstimateFee,
   EstimateFeeAction,
   EstimateFeeDetails,
-  EstimateFeeResponseBulk,
   Invocation,
   InvocationsDetails,
   InvocationsSignerDetails,
@@ -32,6 +31,7 @@ import {
   TransactionBulk,
   UniversalDeployerContractPayload,
 } from '../types';
+import { EstimateFeeBulk } from '../types/account';
 import { parseUDCEvent } from '../utils/events';
 import {
   calculateContractAddressFromHash,
@@ -220,7 +220,7 @@ export class Account extends Provider implements AccountInterface {
   public async estimateFeeBulk(
     transactions: TransactionBulk,
     { nonce: providedNonce, blockIdentifier }: EstimateFeeDetails = {}
-  ): Promise<EstimateFeeResponseBulk> {
+  ): Promise<EstimateFeeBulk> {
     const nonce = toBN(providedNonce ?? (await this.getNonce()));
     const version = toBN(feeTransactionVersion);
     const chainId = await this.getChainId();

diff --git a/src/types/account.ts b/src/types/account.ts
@@ -8,6 +8,8 @@ export interface EstimateFee extends EstimateFeeResponse {
   suggestedMaxFee: BN;
 }
 
+export type EstimateFeeBulk = Array<EstimateFee>;
+
 export interface EstimateFeeDetails {
   nonce?: BigNumberish;
   blockIdentifier?: BlockIdentifier;

diff --git a/tsconfig.json b/tsconfig.json
@@ -11,7 +11,7 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "es5" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
+    "target": "ES6" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
     "lib": [
       "es2017",
       "es7",