Merge remote-tracking branch 'origin/dev' into feat/chain-type

.github/actions/setup/action.yml

@@ -14,6 +14,3 @@ runs:
       with:
           node-version: 20
           cache: "pnpm"
-
-    - name: Install Foundry
-      uses: foundry-rs/foundry-toolchain@v1

.github/workflows/lint.yml

@@ -33,6 +33,3 @@ jobs:
 
             - name: Run Linter
               run: pnpm lint
-
-            - name: Run Contracts Linter
-              run: pnpm lint:contracts:check

libs/metrics/src/l1/abis/index.ts

@@ -1,4 +1,3 @@
 export * from "./bridgeHub.abi";
 export * from "./diamondProxy.abi";
 export * from "./sharedBridge.abi";
-export * from "./tokenBalances.abi";

libs/metrics/src/l1/l1MetricsService.ts

@@ -4,11 +4,9 @@ import { Inject, Injectable, LoggerService } from "@nestjs/common";
 import { WINSTON_MODULE_NEST_PROVIDER } from "nest-winston";
 import {
     Address,
-    ContractConstructorArgs,
     encodeFunctionData,
     erc20Abi,
     formatUnits,
-    parseAbiParameters,
     parseEther,
     parseUnits,
     zeroAddress,
@@ -19,13 +17,7 @@ import {
     InvalidChainType,
     L1MetricsServiceException,
 } from "@zkchainhub/metrics/exceptions";
-import {
-    bridgeHubAbi,
-    diamondProxyAbi,
-    sharedBridgeAbi,
-    tokenBalancesAbi,
-} from "@zkchainhub/metrics/l1/abis";
-import { tokenBalancesBytecode } from "@zkchainhub/metrics/l1/bytecode";
+import { bridgeHubAbi, diamondProxyAbi, sharedBridgeAbi } from "@zkchainhub/metrics/l1/abis";
 import { AssetTvl, GasInfo } from "@zkchainhub/metrics/types";
 import { IPricingService, PRICING_PROVIDER } from "@zkchainhub/pricing";
 import { EvmProviderService } from "@zkchainhub/providers";
@@ -136,29 +128,30 @@ export class L1MetricsService {
 
     /**
      * Fetches the token balances for the given addresses and ETH balance.
-     * Note: The last balance in the returned array is the ETH balance, so the fetch length should be addresses.length + 1.
      * @param addresses - An array of addresses for which to fetch the token balances.
      * @returns A promise that resolves to an object containing the ETH balance and an array of address balances.
      */
     private async fetchTokenBalances(
         addresses: Address[],
     ): Promise<{ ethBalance: bigint; addressesBalance: bigint[] }> {
-        const returnAbiParams = parseAbiParameters("uint256[]");
-        const args: ContractConstructorArgs<typeof tokenBalancesAbi> = [
-            L1_CONTRACTS.SHARED_BRIDGE,
-            addresses,
-        ];
-
-        const [balances] = await this.evmProviderService.batchRequest(
-            tokenBalancesAbi,
-            tokenBalancesBytecode,
-            args,
-            returnAbiParams,
-        );
+        const balances = await this.evmProviderService.multicall({
+            contracts: [
+                ...addresses.map((tokenAddress) => {
+                    return {
+                        address: tokenAddress,
+                        abi: erc20Abi,
+                        functionName: "balanceOf",
+                        args: [this.sharedBridge.address],
+                    } as const;
+                }),
+            ],
+            allowFailure: false,
+        });
+        const ethBalance = await this.evmProviderService.getBalance(this.sharedBridge.address);
 
-        assert(balances.length === addresses.length + 1, "Invalid balances length");
+        assert(balances.length === addresses.length, "Invalid balances length");
 
-        return { ethBalance: balances[addresses.length]!, addressesBalance: balances.slice(0, -1) };
+        return { ethBalance: ethBalance, addressesBalance: balances };
     }
 
     /**