Fix/android startup times remove web3

package.json

@@ -69,6 +69,8 @@
     "typescript": "^5.1.0"
   },
   "dependencies": {
+    "@ethersproject/contracts": "^5.7.0",
+    "@ethersproject/providers": "^5.7.0",
     "@metamask/base-controller": "^5.0.0",
     "@metamask/controller-utils": "^10.0.0",
     "@metamask/eth-query": "^4.0.0",
@@ -77,8 +79,7 @@
     "async-mutex": "^0.5.0",
     "bignumber.js": "^9.0.1",
     "bn.js": "^5.2.1",
-    "human-standard-token-abi": "^2.0.0",
-    "web3": "^4.2.2"
+    "human-standard-token-abi": "^2.0.0"
   },
   "lavamoat": {
     "allowScripts": {

src/SwapsController.test.ts

@@ -146,19 +146,12 @@ jest.mock('@metamask/eth-query', () =>
   }),
 );
 
-// Mock implementation of web3
-jest.mock('web3', () => {
+jest.mock('@ethersproject/contracts', () => {
   return {
-    Web3: jest.fn(() => ({
-      eth: {
-        Contract: jest.fn(() => ({
-          methods: {
-            allowance: jest.fn(() => ({
-              call: jest.fn().mockResolvedValue('1000000000000000000'), // Mocked allowance value
-            })),
-          },
-        })),
-      },
+    Contract: jest.fn(() => ({
+      allowance: jest.fn(() => ({
+        call: jest.fn().mockResolvedValue('1000000000000000000'), // Mocked allowance value
+      })),
     })),
   };
 });
@@ -383,12 +376,10 @@ describe('SwapsController', () => {
         rpcUrl: 'test',
       } as unknown as Provider;
 
-      expect(swapsController.__test__getInternal('#web3')).toBeUndefined();
       expect(swapsController.__test__getInternal('#ethQuery')).toBeUndefined();
 
       swapsController.setProvider(provider);
 
-      expect(swapsController.__test__getInternal('#web3')).toBeDefined();
       expect(swapsController.__test__getInternal('#ethQuery')).toBeDefined();
     });
   });
@@ -402,15 +393,13 @@ describe('SwapsController', () => {
         rpcUrl: 'test',
       } as unknown as Provider;
 
-      expect(swapsController.__test__getInternal('#web3')).toBeUndefined();
       expect(swapsController.__test__getInternal('#ethQuery')).toBeUndefined();
 
       swapsController.setProvider(provider, {
         chainId: '0x23',
         pollCountLimit: 10,
       });
 
-      expect(swapsController.__test__getInternal('#web3')).toBeDefined();
       expect(swapsController.__test__getInternal('#ethQuery')).toBeDefined();
       expect(swapsController.__test__getInternal('#chainId')).toBe('0x23');
       expect(swapsController.__test__getInternal('#pollCountLimit')).toBe(10);

src/SwapsController.ts

@@ -1,3 +1,5 @@
+import { Contract } from '@ethersproject/contracts';
+import { Web3Provider } from '@ethersproject/providers';
 import type { StateMetadata } from '@metamask/base-controller';
 import { BaseController } from '@metamask/base-controller';
 import {
@@ -22,8 +24,6 @@ import {
 import { Mutex } from 'async-mutex';
 import { BigNumber } from 'bignumber.js';
 import abiERC20 from 'human-standard-token-abi';
-import type { Web3 as Web3Type } from 'web3';
-import * as web3 from 'web3';
 
 import {
   AVALANCHE_CHAIN_ID,
@@ -70,9 +70,6 @@ import type {
   TxParams,
 } from './types';
 
-// Hack to fix the issue with the web3 import that works different in app vs tests
-const Web3 = web3.Web3 === undefined ? web3.default : web3.Web3;
-
 const metadata: StateMetadata<SwapsControllerState> = {
   quotes: { persist: false, anonymous: false },
   quoteValues: { persist: false, anonymous: false },
@@ -124,8 +121,6 @@ export default class SwapsController extends BaseController<
 
   #supportedChainIds: Hex[];
 
-  #web3: Web3Type;
-
   #chainId: Hex;
 
   // TODO: Remove once GasFeeController exports this action type
@@ -228,17 +223,30 @@ export default class SwapsController extends BaseController<
     contractAddress: string,
     walletAddress: string,
   ): Promise<BigNumber> {
-    const contract = new this.#web3.eth.Contract(abiERC20, contractAddress);
+    const networkClientId = this.messagingSystem.call(
+      'NetworkController:findNetworkClientIdByChainId',
+      this.#chainId,
+    );
+    const { provider } = this.messagingSystem.call(
+      'NetworkController:getNetworkClientById',
+      networkClientId,
+    );
+    const web3provider = new Web3Provider(provider as any);
+
+    const contract = new Contract(contractAddress, abiERC20, web3provider);
+
     const allowanceTimeout = new Promise<BigNumber>((_, reject) => {
       setTimeout(() => {
         reject(new Error(SwapsError.SWAPS_ALLOWANCE_TIMEOUT));
       }, 10000);
     });
 
     const allowancePromise = async () => {
-      const result: bigint = await contract.methods
-        .allowance(walletAddress, getSwapsContractAddress(this.#chainId))
-        .call();
+      const result = await contract.allowance(
+        walletAddress,
+        getSwapsContractAddress(this.#chainId),
+      );
+
       return new BigNumber(result.toString());
     };
 
@@ -1125,8 +1133,6 @@ export default class SwapsController extends BaseController<
     provider: Provider,
     opts?: { chainId: Hex; pollCountLimit: number },
   ): void {
-    // @ts-expect-error TODO: align `Web3` with EIP-1193 provider
-    this.#web3 = new Web3(provider);
     this.#ethQuery = new EthQuery(provider);
 
     if (opts?.chainId) {
@@ -1202,8 +1208,6 @@ export default class SwapsController extends BaseController<
         return this.#supportedChainIds;
       case '#clientId':
         return this.#clientId;
-      case '#web3':
-        return this.#web3;
       case '#ethQuery':
         return this.#ethQuery;
       case '#handle':

src/types.ts

@@ -9,6 +9,10 @@ import type {
   GasFeeEstimates,
   GasFeeState,
 } from '@metamask/gas-fee-controller';
+import type {
+  NetworkControllerFindNetworkClientIdByChainIdAction,
+  NetworkControllerGetNetworkClientByIdAction,
+} from '@metamask/network-controller';
 import type { Hex, JsonRpcError } from '@metamask/utils';
 
 import type SwapsController from './SwapsController';
@@ -325,7 +329,9 @@ export type SwapsControllerStateChangeEvent = ControllerStateChangeEvent<
  * The external actions available to the {@link SwapsController}.
  * TODO: Add GasFeeControllerFetchGasFeeEstimates once GasFeeController exports this action type
  */
-export type AllowedActions = never;
+export type AllowedActions =
+  | NetworkControllerFindNetworkClientIdByChainIdAction
+  | NetworkControllerGetNetworkClientByIdAction;
 
 /**
  * The internal actions available to the SwapsController.