Fix linting problems

Author: jeffsmale90

packages/gator-permissions-snap/images/networks/not-found.svg

@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snap-7715-permissions.git"
   },
   "source": {
-    "shasum": "k3y7TRsPdHuDrL9r1SbxdLYSK2tdbbWT0C4xdUa2EhU=",
+    "shasum": "m4LWlKnvQMfH2OgdfZzvNn7L97UX+7pyHXCd7C0TRlA=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

packages/gator-permissions-snap/images/tokens/not-found.svg

@@ -1,8 +1,8 @@
 import { logger } from '@metamask/7715-permissions-shared/utils';
 import { CHAIN_ID as ChainsWithDelegatorDeployed } from '@metamask/delegation-toolkit';
 import type { SnapsProvider } from '@metamask/snaps-sdk';
-import * as chains from 'viem/chains';
 import type { Address } from 'viem';
+import * as chains from 'viem/chains';
 
 import type { AccountApiClient } from '../clients/accountApiClient';
 import type {
@@ -183,18 +183,19 @@ export abstract class BaseAccountController {
    * Gets the appropriate token metadata client for the given chain ID.
    * Uses the account API client for mainnet (chain ID 1) and the blockchain client for other chains.
    *
-   * @param params - The parameters object
-   * @param params.chainId - The chain ID to get the client for
-   * @returns The appropriate token metadata client
+   * @param config - The configuration object.
+   * @param config.chainId - The chain ID to get the client for.
+   * @returns The appropriate token metadata client.
    */
-  #getTokenMetadataClientForChainId({
-    chainId,
-  }: {
+  #getTokenMetadataClientForChainId(config: {
     chainId: number;
   }): TokenMetadataClient {
-    if (this.#accountApiClient.isChainIdSupported({ chainId })) {
+    console.log('getTokenMetadataClientForChainId', config);
+    if (this.#accountApiClient.isChainIdSupported(config)) {
+      console.log('Returning account api client', config);
       return this.#accountApiClient;
     }
+    console.log('Returning tokenMetadataClient');
 
     return this.#tokenMetadataClient;
   }

packages/gator-permissions-snap/snap.manifest.json

@@ -5,9 +5,11 @@ import {
   type DeleGatorEnvironment,
 } from '@metamask/delegation-toolkit';
 import type { SnapsEthereumProvider, SnapsProvider } from '@metamask/snaps-sdk';
-import { Hex, type Address } from 'viem';
+import type { Hex } from 'viem';
+import { type Address } from 'viem';
 
-import { AccountApiClient } from '../clients/accountApiClient';
+import type { AccountApiClient } from '../clients/accountApiClient';
+import type { TokenMetadataClient } from '../core/types';
 import type { SupportedChains } from './baseAccountController';
 import { BaseAccountController } from './baseAccountController';
 import type {
@@ -16,7 +18,6 @@ import type {
   SignDelegationOptions,
   FactoryArgs,
 } from './types';
-import type { TokenMetadataClient } from '../core/types';
 
 /**
  * Controls EOA account operations including address retrieval, delegation signing, and balance queries.
@@ -36,6 +37,7 @@ export class EoaAccountController
    * @param config.ethereumProvider - The provider for interacting with Ethereum.
    * @param config.supportedChains - Optional list of supported blockchain chains.
    * @param config.accountApiClient - The client for interacting with the account API.
+   * @param config.tokenMetadataClient - The client for interacting with the token metadata.
    */
   constructor(config: {
     snapsProvider: SnapsProvider;

packages/gator-permissions-snap/src/accountController/baseAccountController.ts

@@ -7,6 +7,7 @@ import {
   type MetaMaskSmartAccount,
 } from '@metamask/delegation-toolkit';
 import type { SnapsProvider } from '@metamask/snaps-sdk';
+import type { TokenMetadataClient } from 'src/core/types';
 import {
   createClient,
   custom,
@@ -16,7 +17,7 @@ import {
 } from 'viem';
 import { privateKeyToAccount } from 'viem/accounts';
 
-import { AccountApiClient } from '../clients/accountApiClient';
+import type { AccountApiClient } from '../clients/accountApiClient';
 import type { SupportedChains } from './baseAccountController';
 import { BaseAccountController } from './baseAccountController';
 import type {
@@ -25,7 +26,6 @@ import type {
   SignDelegationOptions,
   FactoryArgs,
 } from './types';
-import { TokenMetadataClient } from 'src/core/types';
 
 const GET_ENTROPY_SALT = '7715_permissions_provider_snap';
 const MULTISIG_THRESHOLD = 1n;
@@ -56,6 +56,7 @@ export class SmartAccountController
    * @param config.supportedChains - The supported blockchain chains.
    * @param config.deploymentSalt - The hex salt for smart account deployment.
    * @param config.accountApiClient - The client for interacting with the account API.
+   * @param config.tokenMetadataClient - The client for interacting with the token metadata.
    */
   constructor(config: {
     snapsProvider: SnapsProvider;

packages/gator-permissions-snap/src/accountController/eoaAccountController.ts

@@ -3,6 +3,7 @@ import type {
   DeleGatorEnvironment,
 } from '@metamask/delegation-toolkit';
 import type { Address, Hex } from 'viem';
+
 import type { TokenBalanceAndMetadata } from '../core/types';
 
 /**

packages/gator-permissions-snap/src/accountController/smartAccountController.ts

@@ -1,5 +1,6 @@
 import { logger } from '@metamask/7715-permissions-shared/utils';
 import { isAddressEqual, zeroAddress, type Address } from 'viem';
+
 import type { TokenBalanceAndMetadata } from '../core/types';
 
 /**
@@ -53,9 +54,9 @@ export class AccountApiClient {
    * Checks if a chain ID is supported by the account API.
    * Currently only mainnet (chain ID 1) is supported.
    *
-   * @param params - The parameters object
-   * @param params.chainId - The chain ID to check
-   * @returns True if the chain ID is supported, false otherwise
+   * @param params - The parameters object.
+   * @param params.chainId - The chain ID to check.
+   * @returns True if the chain ID is supported, false otherwise.
    */
   public isChainIdSupported({ chainId }: { chainId: number }): boolean {
     return chainId === 1;
@@ -64,11 +65,11 @@ export class AccountApiClient {
   /**
    * Fetch the token balance and metadata for a given account and token.
    *
-   * @param params - The parameters for fetching the token balance
-   * @param params.chainId - The chain ID to fetch the balance from
-   * @param params.assetAddress - The token address to fetch the balance for. If not provided, fetches native token balance
-   * @param params.account - The account address to fetch the balance for
-   * @returns The token balance and metadata
+   * @param params - The parameters for fetching the token balance.
+   * @param params.chainId - The chain ID to fetch the balance from.
+   * @param params.assetAddress - The token address to fetch the balance for. If not provided, fetches native token balance.
+   * @param params.account - The account address to fetch the balance for.
+   * @returns The token balance and metadata.
    */
   public async getTokenBalanceAndMetadata({
     chainId,
@@ -79,18 +80,15 @@ export class AccountApiClient {
     account: Address;
     assetAddress?: Address | undefined;
   }): Promise<TokenBalanceAndMetadata> {
-    console.log('getTokenBalanceAndMetadata', chainId, assetAddress, account);
     if (!chainId) {
       const message = 'No chainId provided to fetch token balance';
-      console.log(message);
       logger.error(message);
 
       throw new Error(message);
     }
 
     if (!account) {
       const message = 'No account address provided to fetch token balance';
-      console.log(message);
       logger.error(message);
 
       throw new Error(message);
@@ -99,12 +97,8 @@ export class AccountApiClient {
     // zeroAddress is the native token on the specified chain
     const tokenAddress = assetAddress ?? zeroAddress;
 
-    console.log(
-      `${this.#baseUrl}/tokens/${tokenAddress}?accountAddresses=${account}&chainId=${1}`,
-    );
-    // todo: chainId is hardcoded to mainnet, because the account api does not support sepolia.
     const response = await this.#fetch(
-      `${this.#baseUrl}/tokens/${tokenAddress}?accountAddresses=${account}&chainId=${1}`,
+      `${this.#baseUrl}/tokens/${tokenAddress}?accountAddresses=${account}&chainId=${chainId}`,
     );
 
     if (!response.ok) {
@@ -127,9 +121,7 @@ export class AccountApiClient {
       throw new Error(message);
     }
 
-    if (
-      AccountApiClient.#supportedTokenTypes.indexOf(balanceData.type) === -1
-    ) {
+    if (!AccountApiClient.#supportedTokenTypes.includes(balanceData.type)) {
       const message = `Unsupported token type: ${balanceData.type}`;
       logger.error(message);
 

packages/gator-permissions-snap/src/accountController/types.ts

@@ -1,8 +1,5 @@
 import { logger } from '@metamask/7715-permissions-shared/utils';
-import type {
-  TokenMetadataClient,
-  TokenBalanceAndMetadata,
-} from '../core/types';
+import type { SnapsEthereumProvider } from '@metamask/snaps-sdk';
 import type { AbiFunction, AbiParameter, Address, Hex } from 'viem';
 import {
   decodeAbiParameters,
@@ -11,7 +8,11 @@ import {
   zeroAddress,
 } from 'viem';
 import { sepolia, mainnet } from 'viem/chains';
-import { SnapsEthereumProvider } from '@metamask/snaps-sdk';
+
+import type {
+  TokenMetadataClient,
+  TokenBalanceAndMetadata,
+} from '../core/types';
 
 const BALANCEOF_ABI: AbiFunction = {
   constant: true,
@@ -59,11 +60,11 @@ export class BlockchainTokenMetadataClient implements TokenMetadataClient {
   /**
    * Fetch the token balance and metadata for a given account and token.
    *
-   * @param params - The parameters for fetching the token balance
-   * @param params.chainId - The chain ID to fetch the balance from
-   * @param params.assetAddress - The token address to fetch the balance for. If not provided, fetches native token balance
-   * @param params.account - The account address to fetch the balance for
-   * @returns The token balance and metadata
+   * @param args - The parameters for fetching the token balance.
+   * @param args.chainId - The chain ID to fetch the balance from.
+   * @param args.assetAddress - The token address to fetch the balance for. If not provided, fetches native token balance.
+   * @param args.account - The account address to fetch the balance for.
+   * @returns The token balance and metadata.
    */
   public async getTokenBalanceAndMetadata({
     chainId,

packages/gator-permissions-snap/src/clients/accountApiClient.ts

@@ -318,7 +318,7 @@ export type TokenBalanceAndMetadata = {
 /**
  * Interface for token metadata clients that can fetch token balance and metadata
  */
-export interface TokenMetadataClient {
+export type TokenMetadataClient = {
   /**
    * Fetch the token balance and metadata for a given account and token.
    *
@@ -333,4 +333,4 @@ export interface TokenMetadataClient {
     account: Address;
     assetAddress?: Address | undefined;
   }): Promise<TokenBalanceAndMetadata>;
-}
+};