fix(deps): ethereumjs-util@6.1.0->^7.1.5

app/components/Nav/Main/RootRPCMethodsUI.js

@@ -25,7 +25,7 @@ import {
   getIsSwapApproveOrSwapTransaction,
   isApprovalTransaction,
 } from '../../../util/transactions';
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 import Logger from '../../../util/Logger';
 import TransactionTypes from '../../../core/TransactionTypes';
 import { swapsUtils } from '@metamask/swaps-controller';

app/components/UI/ConfirmAddAsset/ConfirmAddAsset.test.tsx

@@ -7,7 +7,7 @@
 import useBalance from '../Ramp/hooks/useBalance';
 import { toTokenMinimalUnit } from '../../../util/number';
 import { fireEvent } from '@testing-library/react-native';
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 import { RootState } from '../../../reducers';
 import { mockNetworkState } from '../../../util/test/network';
 import { CHAIN_IDS } from '@metamask/transaction-controller';
@@ -48,7 +48,7 @@
 
 const mockUseBalanceInitialValue: Partial<ReturnType<typeof useBalance>> = {
   balanceFiat: '$27.02',
   balanceBN: toTokenMinimalUnit('5.36385', 18) as BN,
 };
 
 const mockUseBalanceValues: Partial<ReturnType<typeof useBalance>> = {

app/components/UI/Ramp/Views/BuildQuote/BuildQuote.test.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Limits, Payment } from '@consensys/on-ramp-sdk';
 import { act, fireEvent, screen } from '@testing-library/react-native';
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 import { renderScreen } from '../../../../../util/test/renderWithProvider';
 import BuildQuote from './BuildQuote';
 import useRegions from '../../hooks/useRegions';
@@ -191,7 +191,7 @@
 
 const mockUseBalanceInitialValue: Partial<ReturnType<typeof useBalance>> = {
   balanceFiat: '$27.02',
   balanceBN: toTokenMinimalUnit('5.36385', 18) as BN,
 };
 
 let mockUseBalanceValues: Partial<ReturnType<typeof useBalance>> = {
@@ -242,7 +242,7 @@
   estimatedGasFee: toTokenMinimalUnit(
     '0.01',
     mockUseRampSDKInitialValues.selectedAsset?.decimals || 18,
   ) as BN,
 };
 
 let mockUseGasPriceEstimationValue: ReturnType<typeof useGasPriceEstimation> =
@@ -669,7 +669,7 @@
       mockUseBalanceValues.balanceBN = toTokenMinimalUnit(
         '5',
         mockUseRampSDKValues.selectedAsset?.decimals || 18,
       ) as BN;
       render(BuildQuote);
       const initialAmount = '0';
       const overBalanceAmout = '6';
@@ -688,7 +688,7 @@
       mockUseBalanceValues.balanceBN = toTokenMinimalUnit(
         '1',
         mockUseRampSDKValues.selectedAsset?.decimals || 18,
       ) as BN;
       const symbol = mockUseRampSDKValues.selectedAsset?.symbol;
       fireEvent.press(getByRoleButton(`${initialAmount} ${symbol}`));
       fireEvent.press(getByRoleButton('25%'));
@@ -719,13 +719,13 @@
         balanceBN: toTokenMinimalUnit(
           '1',
           mockUseRampSDKValues.selectedAsset?.decimals || 18,
         ) as BN,
       };
       mockUseGasPriceEstimationValue = {
         estimatedGasFee: toTokenMinimalUnit(
           '0.27',
           mockUseRampSDKValues.selectedAsset?.decimals || 18,
         ) as BN,
       };
       const symbol = mockUseRampSDKValues.selectedAsset?.symbol;
       fireEvent.press(getByRoleButton(`${initialAmount} ${symbol}`));
@@ -752,13 +752,13 @@
         balanceBN: toTokenMinimalUnit(
           '1',
           mockUseRampSDKValues.selectedAsset?.decimals || 18,
         ) as BN,
       };
       mockUseGasPriceEstimationValue = {
         estimatedGasFee: toTokenMinimalUnit(
           '0.27',
           mockUseRampSDKValues.selectedAsset?.decimals || 18,
         ) as BN,
       };
       const symbol = mockUseRampSDKValues.selectedAsset?.symbol;
       fireEvent.press(getByRoleButton(`${initialAmount} ${symbol}`));

app/components/UI/Ramp/Views/BuildQuote/BuildQuote.tsx

@@ -12,7 +12,7 @@ import Animated, {
   withTiming,
 } from 'react-native-reanimated';
 import { useNavigation } from '@react-navigation/native';
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 
 import { useRampSDK } from '../../sdk';
 import usePaymentMethods from '../../hooks/usePaymentMethods';

app/components/UI/Ramp/Views/SendTransaction/SendTransaction.tsx

@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { ImageSourcePropType, View } from 'react-native';
 import { useDispatch, useSelector } from 'react-redux';
 import { useNavigation } from '@react-navigation/native';
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 import { SellOrder } from '@consensys/on-ramp-sdk/dist/API';
 import {
   TransactionParams,

app/components/UI/Ramp/hooks/useGasPriceEstimation.ts

@@ -5,7 +5,7 @@ import {
   type GasFeeController as GasFeeControllerType,
 } from '@metamask/gas-fee-controller';
 
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 import Engine from '../../../../core/Engine';
 import { decGWEIToHexWEI } from '../../../../util/conversions';
 import { selectGasFeeControllerState } from '../../../../selectors/gasFeeController';

app/components/UI/Ramp/hooks/useIntentAmount.ts

@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-import { type BN } from 'ethereumjs-util';
+import { type BN } from 'bn.js';
 import { useRampSDK } from '../sdk';
 import parseAmount from '../utils/parseAmount';
 import { toTokenMinimalUnit } from '../../../../util/number';

app/components/UI/Stake/Views/StakeInputView/StakeInputView.test.tsx

@@ -4,7 +4,7 @@ import StakeInputView from './StakeInputView';
 import { renderScreen } from '../../../../../util/test/renderWithProvider';
 import Routes from '../../../../../constants/navigation/Routes';
 import { backgroundState } from '../../../../../util/test/initial-root-state';
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 import { Stake } from '../../sdk/stakeSdkProvider';
 
 function render(Component: React.ComponentType) {

app/components/UI/Stake/Views/UnstakeInputView/UnstakeInputView.tsx

@@ -1,6 +1,6 @@
 import { useNavigation } from '@react-navigation/native';
 import React, { useCallback, useEffect } from 'react';
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 import UnstakeInputViewBanner from './UnstakeBanner';
 import { strings } from '../../../../../../locales/i18n';
 import Button, {

app/components/UI/Stake/components/StakingBalance/StakingBalance.tsx

@@ -25,7 +25,7 @@ import { strings } from '../../../../../../locales/i18n';
 import { renderFromWei } from '../../../../../util/number';
 import { getTimeDifferenceFromNow } from '../../../../../util/date';
 import { filterExitRequests } from './utils';
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 import bn from 'bignumber.js';
 import {
   CommonPercentageInputUnits,

app/components/UI/Stake/hooks/useStakingInput.ts

@@ -1,4 +1,4 @@
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 import { useState, useMemo, useCallback } from 'react';
 import { useSelector } from 'react-redux';
 import {

app/components/UI/Tokens/TokenList/PortfolioBalance/index.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { fireEvent } from '@testing-library/react-native';
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 import renderWithProvider from '../../../../../util/test/renderWithProvider';
 import { backgroundState } from '../../../../../util/test/initial-root-state';
 import AppConstants from '../../../../../../app/core/AppConstants';

app/components/UI/Tokens/index.test.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 // eslint-disable-next-line @typescript-eslint/no-shadow
 import { fireEvent, waitFor } from '@testing-library/react-native';
 import Tokens from './';
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 import renderWithProvider from '../../../util/test/renderWithProvider';
 import { createStackNavigator } from '@react-navigation/stack';
 import { getAssetTestId } from '../../../../wdio/screen-objects/testIDs/Screens/WalletView.testIds';

app/components/Views/confirmations/Approval/components/TransactionEditor/index.js

@@ -3,14 +3,15 @@ import { StyleSheet, View } from 'react-native';
 import PropTypes from 'prop-types';
 import AnimatedTransactionModal from '../../../../../UI/AnimatedTransactionModal';
 import TransactionReview from '../../../components/TransactionReview';
+import { BN } from 'bn.js';
 import {
   hexToBN,
   fromWei,
   renderFromWei,
   toHexadecimal,
 } from '../../../../../../util/number';
-import { isValidAddress, BN, addHexPrefix } from 'ethereumjs-util';
 import { strings } from '../../../../../../../locales/i18n';
+import { isValidAddress, addHexPrefix } from 'ethereumjs-util';
 import { connect } from 'react-redux';
 import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
 import {

app/components/Views/confirmations/SendFlow/Amount/index.js

@@ -60,7 +60,7 @@ import CollectibleMedia from '../../../../UI/CollectibleMedia';
 import collectiblesTransferInformation from '../../../../../util/collectibles-transfer';
 import { strings } from '../../../../../../locales/i18n';
 import Device from '../../../../../util/device';
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 import { MetaMetricsEvents } from '../../../../../core/Analytics';
 import dismissKeyboard from 'react-native/Libraries/Utilities/dismissKeyboard';
 import NetworkMainAssetLogo from '../../../../UI/NetworkMainAssetLogo';

app/components/Views/confirmations/SendFlow/Confirm/validation.test.ts

@@ -1,4 +1,4 @@
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 import { validateSufficientBalance, validateSufficientTokenBalance } from './validation';
 import { renderFromWei, hexToBN } from '../../../../../util/number';
 import {

app/components/Views/confirmations/SendFlow/Confirm/validation.ts

@@ -4,7 +4,7 @@ import {
   decodeTransferData,
 } from '../../../../../util/transactions';
 import { strings } from '../../../../../../locales/i18n';
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 
 interface SelectedAsset {
   address: string;

app/components/hooks/useAddressBalance/useAddressBalance.test.tsx

@@ -8,7 +8,7 @@ import { Asset } from './useAddressBalance.types';
 import useAddressBalance from './useAddressBalance';
 import backgroundState from '../../../util/test/initial-root-state';
 import { createMockAccountsControllerState } from '../../../util/test/accountsControllerTestUtils';
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 const MOCK_ADDRESS_1 = '0x0';
 const MOCK_ADDRESS_2 = '0x1';
 

app/components/hooks/useTokenBalance.tsx

@@ -1,6 +1,6 @@
 import { useState, useEffect, Dispatch, SetStateAction } from 'react';
 import Engine from '../../core/Engine';
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 
 /**
  * Hook to handle the balance of ERC20 tokens

app/components/hooks/useTokenBalancesController/useTokenBalancesController.test.tsx

@@ -4,7 +4,7 @@ import { Provider } from 'react-redux';
 import { createStore, Store } from 'redux';
 import { act, render, waitFor } from '@testing-library/react-native';
 import useTokenBalancesController from './useTokenBalancesController';
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 import { cloneDeep } from 'lodash';
 import { backgroundState } from '../../../util/test/initial-root-state';
 

app/constants/transaction.ts

@@ -1,4 +1,4 @@
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 
 // Transaction Status
 export const TX_UNAPPROVED = 'unapproved';

app/store/migrations/029.ts

@@ -2,7 +2,6 @@ import { toHex } from '@metamask/controller-utils';
 import { Hex, hasProperty, isObject } from '@metamask/utils';
 import { regex } from '../../../app/util/regex';
 
-//@ts-expect-error - This error is expected, but ethereumjs-util exports this function
 import { isHexString } from 'ethereumjs-util';
 import { TransactionParams } from '@metamask/transaction-controller';
 import { captureException } from '@sentry/react-native';
@@ -466,7 +465,7 @@ export default async function migrate(stateAsync: unknown) {
   if (Array.isArray(transactionControllerState.transactions)) {
     transactionControllerState.transactions.forEach(
       (transaction: TransactionParams, index: number) => {
-        if (transaction && !isHexString(transaction.chainId)) {
+        if (transaction && (!transaction.chainId || (transaction.chainId && !isHexString(transaction.chainId)))) {
           if (
             Array.isArray(transactionControllerState.transactions) &&
             isObject(transactionControllerState.transactions[index])

app/store/migrations/031.ts

@@ -6,7 +6,6 @@ import {
   TokensControllerState,
 } from '@metamask/assets-controllers';
 import { toHex } from '@metamask/controller-utils';
-//@ts-expect-error - This error is expected, but ethereumjs-util exports this function
 import { isHexString } from 'ethereumjs-util';
 
 /**

app/util/address/index.ts

@@ -3,7 +3,6 @@ import {
   isValidAddress,
   addHexPrefix,
   isValidChecksumAddress,
-  //@ts-expect-error - This error is expected, but ethereumjs-util exports this function
   isHexPrefixed,
 } from 'ethereumjs-util';
 import punycode from 'punycode/punycode';

app/util/confirmation/transactions.test.ts

@@ -1,4 +1,4 @@
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 import { buildTransactionParams } from './transactions';
 import { GAS_ESTIMATE_TYPES } from '@metamask/gas-fee-controller';
 import { TransactionEnvelopeType } from '@metamask/transaction-controller';

app/util/conversion/index.js

@@ -23,7 +23,8 @@
 
 import BigNumber from 'bignumber.js';
 
-import { stripHexPrefix, BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
+import { stripHexPrefix } from 'etehreumjs-util';
 
 // Big Number Constants
 const BIG_NUMBER_WEI_MULTIPLIER = new BigNumber('1000000000000000000');

app/util/custom-gas/index.js

@@ -1,4 +1,4 @@
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 import { renderFromWei, weiToFiat, toWei, conversionUtil } from '../number';
 import { strings } from '../../../locales/i18n';
 import TransactionTypes from '../../core/TransactionTypes';

app/util/dappTransactions/index.test.ts

@@ -1,4 +1,4 @@
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 
 import { strings } from '../../../locales/i18n';
 import Engine from '../../core/Engine';

app/util/dappTransactions/index.ts

@@ -4,7 +4,7 @@ import Engine from '../../core/Engine';
 import TransactionTypes from '../../core/TransactionTypes';
 import { toLowerCaseEquals } from '../general';
 import { strings } from '../../../locales/i18n';
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 import { lt } from '../lodash';
 import { estimateGas as controllerEstimateGas } from '../transaction-controller';
 

app/util/number/index.js

@@ -1,7 +1,8 @@
 /**
  * Collection of utility functions for consistent formatting and conversion
  */
-import { BN, stripHexPrefix } from 'ethereumjs-util';
+import { BN } from 'bn.js';
+import { stripHexPrefix } from 'ethereumjs-util';
 import { utils as ethersUtils } from 'ethers';
 import convert from 'ethjs-unit';
 import {
@@ -367,7 +368,7 @@ export function isDecimal(value) {
  * @returns {Object} - BN instance
  */
 export function toBN(value) {
-  return new BN(value);
+  return new BN(value || 0);
 }
 
 /**

app/util/number/index.test.ts

@@ -1,4 +1,4 @@
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 
 import {
   addCurrencySymbol,

app/util/transaction-reducer-helpers.ts

@@ -1,5 +1,5 @@
 import { SecurityAlertResponse } from '@metamask/transaction-controller';
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 
 interface TxMeta {
   data?: string;

app/util/transactions/index.js

@@ -1,5 +1,6 @@
-import { addHexPrefix, toChecksumAddress, BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 import { rawEncode, rawDecode } from 'ethereumjs-abi';
+import { addHexPrefix, toChecksumAddress } from 'ethereumjs-util';
 import BigNumber from 'bignumber.js';
 import humanizeDuration from 'humanize-duration';
 import {

app/util/transactions/index.test.ts

@@ -1,5 +1,5 @@
 import { swapsUtils } from '@metamask/swaps-controller';
-import { BN } from 'ethereumjs-util';
+import { BN } from 'bn.js';
 
 /* eslint-disable-next-line import/no-namespace */
 import * as controllerUtilsModule from '@metamask/controller-utils';

package.json

@@ -110,6 +110,7 @@
     "@metamask/accounts-controller": "^18.1.0",
     "@metamask/contract-metadata": "^2.1.0",
     "@metamask/react-native-payments/validator": "^13.7.0",
+    "**/ethereumjs-abi": "npm:ethereumjs-abi@0.6.8",
     "**/minimist": "1.2.6",
     "d3-color": "3.1.0",
     "tough-cookie": "4.1.3",
@@ -130,7 +131,6 @@
     "socket.io-client/engine.io-client/ws": "^8.17.1",
     "micromatch": "4.0.8",
     "send": "0.19.0",
-    "ethereumjs-util/**/secp256k1": "3.8.1",
     "**/secp256k1": "4.0.4"
   },
   "dependencies": {
@@ -225,6 +225,7 @@
     "axios": "^1.6.8",
     "base-64": "1.0.0",
     "bignumber.js": "^9.0.1",
+    "bn.js": "5.2.1",
     "buffer": "6.0.3",
     "cockatiel": "^3.1.2",
     "compare-versions": "^3.6.0",
@@ -239,8 +240,8 @@
     "eth-json-rpc-filters": "4.2.2",
     "eth-json-rpc-middleware": "4.3.0",
     "eth-url-parser": "1.0.4",
-    "ethereumjs-abi": "0.6.6",
-    "ethereumjs-util": "6.1.0",
+    "ethereumjs-abi": "^0.6.8",
+    "ethereumjs-util": "^7.1.5",
     "ethers": "^5.0.14",
     "ethjs-contract": "0.2.3",
     "ethjs-ens": "2.0.1",
@@ -536,7 +537,7 @@
   },
   "lavamoat": {
     "allowScripts": {
-      "ethereumjs-abi>ethereumjs-util>ethereum-cryptography>keccak": true,
+      "ethereumjs-util>ethereum-cryptography>keccak": true,
       "@sentry/react-native>@sentry/cli": true,
       "@storybook/manager-webpack5>@storybook/core-common>webpack>watchpack>watchpack-chokidar2>chokidar>fsevents": false,
       "@storybook/addon-controls>@storybook/core-common>esbuild": false,
@@ -555,8 +556,6 @@
       "detox": true,
       "detox>bunyan>dtrace-provider": false,
       "eciesjs>secp256k1": true,
-      "ethereumjs-util>keccak": true,
-      "ethereumjs-util>secp256k1": true,
       "ethjs-query>babel-runtime>core-js": false,
       "ganache>@trufflesuite/bigint-buffer": false,
       "ganache>bufferutil": false,