Replace ethers with submodules

package.json

@@ -26,10 +26,12 @@
     "build:link": "yarn build && cd dist && yarn link && rm -rf node_modules && cd .."
   },
   "dependencies": {
+    "@ethersproject/bignumber": "^5.7.0",
+    "@ethersproject/bytes": "^5.7.0",
+    "@ethersproject/providers": "^5.7.0",
     "@metamask/controllers": "^30.0.0",
     "@types/lodash": "^4.14.176",
     "bignumber.js": "^9.0.1",
-    "ethers": "^5.5.1",
     "fast-json-patch": "^3.1.0",
     "isomorphic-fetch": "^3.0.0",
     "lodash": "^4.17.21"

src/SmartTransactionsController.test.ts

@@ -8,29 +8,29 @@ import { SmartTransaction, SmartTransactionStatuses } from './types';
 
 const confirmExternalMock = jest.fn();
 
-jest.mock('ethers', () => ({
-  ethers: {
-    providers: {
-      Web3Provider: class Web3Provider {
-        getBalance = () => ({ toHexString: () => '0x1000' });
+jest.mock('@ethersproject/bytes', () => ({
+  hexlify: (str: string) => `0x${str}`,
+}));
 
-        getTransactionReceipt = jest.fn(() => ({ blockNumber: '123' }));
+jest.mock('@ethersproject/providers', () => ({
+  Web3Provider: class Web3Provider {
+    getBalance = () => ({ toHexString: () => '0x1000' });
 
-        getTransaction = jest.fn(() => ({
-          maxFeePerGas: { toHexString: () => '0x123' },
-          maxPriorityFeePerGas: { toHexString: () => '0x123' },
-        }));
+    getTransactionReceipt = jest.fn(() => ({ blockNumber: '123' }));
 
-        getBlock = jest.fn();
-      },
-    },
-    utils: {
-      hexlify: (str: string) => `0x${str}`,
-    },
-    BigNumber: class BigNumber {},
+    getTransaction = jest.fn(() => ({
+      maxFeePerGas: { toHexString: () => '0x123' },
+      maxPriorityFeePerGas: { toHexString: () => '0x123' },
+    }));
+
+    getBlock = jest.fn();
   },
 }));
 
+jest.mock('@ethersproject/bignumber', () => ({
+  BigNumber: class BigNumber {},
+}));
+
 const addressFrom = '0x268392a24B6b093127E8581eAfbD1DA228bAdAe3';
 
 const createUnsignedTransaction = () => {

src/SmartTransactionsController.ts

@@ -6,7 +6,9 @@ import {
   util,
 } from '@metamask/controllers';
 import { BigNumber } from 'bignumber.js';
-import { ethers } from 'ethers';
+import { BigNumber as ethersBigNumber } from '@ethersproject/bignumber';
+import { Web3Provider } from '@ethersproject/providers';
+import { hexlify } from '@ethersproject/bytes';
 import mapValues from 'lodash/mapValues';
 import cloneDeep from 'lodash/cloneDeep';
 import {
@@ -132,7 +134,7 @@ export default class SmartTransactionsController extends BaseController<
 
     this.getNonceLock = getNonceLock;
     this.getNetwork = getNetwork;
-    this.ethersProvider = new ethers.providers.Web3Provider(provider);
+    this.ethersProvider = new Web3Provider(provider);
     this.confirmExternalTransaction = confirmExternalTransaction;
     this.trackMetaMetricsEvent = trackMetaMetricsEvent;
 
@@ -144,7 +146,7 @@ export default class SmartTransactionsController extends BaseController<
       this.configure({ chainId });
       this.initializeSmartTransactionsForChainId();
       this.checkPoll(this.state);
-      this.ethersProvider = new ethers.providers.Web3Provider(provider);
+      this.ethersProvider = new Web3Provider(provider);
     });
 
     this.subscribe((currentState: any) => this.checkPoll(currentState));
@@ -366,7 +368,7 @@ export default class SmartTransactionsController extends BaseController<
         );
         const baseFeePerGas = blockData?.baseFeePerGas.toHexString();
         const txReceipt = mapValues(transactionReceipt, (value) => {
-          if (value instanceof ethers.BigNumber) {
+          if (value instanceof ethersBigNumber) {
             return value.toHexString();
           }
           return value;
@@ -566,7 +568,7 @@ export default class SmartTransactionsController extends BaseController<
       console.error('ethers error', e);
     }
     const nonceLock = await this.getNonceLock(txParams?.from);
-    const nonce = ethers.utils.hexlify(nonceLock.nextNonce);
+    const nonce = hexlify(nonceLock.nextNonce);
     if (txParams && !txParams?.nonce) {
       txParams.nonce = nonce;
     }

src/utils.ts

@@ -1,7 +1,7 @@
 import jsonDiffer from 'fast-json-patch';
 import _ from 'lodash';
 import { BigNumber } from 'bignumber.js';
-import { ethers } from 'ethers';
+import { hexlify } from '@ethersproject/bytes';
 import {
   APIType,
   SmartTransaction,
@@ -208,5 +208,5 @@ export const isSmartTransactionCancellable = (
 
 export const incrementNonceInHex = (nonceInHex: string): string => {
   const nonceInDec = new BigNumber(nonceInHex, 16).toString(10);
-  return ethers.utils.hexlify(Number(nonceInDec) + 1);
+  return hexlify(Number(nonceInDec) + 1);
 };