chore: faster address checksum

Nodonisko · Nodonisko · commit 997387cb51c6 · 2025-07-03T21:57:17.000+02:00
diff --git a/app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentageCrossChains.test.tsx b/app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentageCrossChains.test.tsx
@@ -23,10 +23,13 @@ jest.mock('../../../../selectors/currencyRateController', () => ({
 }));
 
 jest.mock('ethereumjs-util', () => ({
-  toChecksumAddress: jest.fn((address) => address),
   zeroAddress: jest.fn(() => '0x0000000000000000000000000000000000000000'),
 }));
 
+jest.mock('@metamask/utils', () => ({
+  getChecksumAddress: jest.fn((address) => address),
+}));
+
 describe('AggregatedPercentageCrossChains', () => {
   const mockStore = configureStore([]);
   let store: Store;
diff --git a/app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentageCrossChains.tsx b/app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentageCrossChains.tsx
@@ -10,15 +10,15 @@ import {
   FORMATTED_VALUE_PRICE_TEST_ID,
   FORMATTED_PERCENTAGE_TEST_ID,
 } from './AggregatedPercentage.constants';
-import { toChecksumAddress, zeroAddress } from 'ethereumjs-util';
+import { zeroAddress } from 'ethereumjs-util';
+import { getChecksumAddress, Hex } from '@metamask/utils';
 import { selectTokenMarketData } from '../../../../selectors/tokenRatesController';
 import {
   MarketDataMapping,
   TokensWithBalances,
 } from '../../../../components/hooks/useGetFormattedTokensPerChain';
 import { getFormattedAmountChange, getPercentageTextColor } from './utils';
 import { AggregatedPercentageCrossChainsProps } from './AggregatedPercentageCrossChains.types';
-
 export const getCalculatedTokenAmount1dAgo = (
   tokenFiatBalance: number,
   tokenPricePercentChange1dAgo: number,
@@ -48,7 +48,9 @@ const AggregatedPercentageCrossChains = ({
       const totalPerChain1dAgoERC20 = tokensWithBalances.reduce(
         (total1dAgo: number, item: { address: string }, idx: number) => {
           const found =
-            crossChainMarketData?.[chainId]?.[toChecksumAddress(item.address)];
+            crossChainMarketData?.[chainId]?.[
+              getChecksumAddress(item.address as Hex)
+            ];
 
           const tokenFiat1dAgo = getCalculatedTokenAmount1dAgo(
             tokenFiatBalances[idx],
diff --git a/app/components/UI/AccountFromToInfoCard/AddressFrom.tsx b/app/components/UI/AccountFromToInfoCard/AddressFrom.tsx
@@ -1,4 +1,4 @@
-import { toChecksumAddress } from 'ethereumjs-util';
+import { getChecksumAddress, Hex } from '@metamask/utils';
 import React, { useEffect, useState } from 'react';
 import { View } from 'react-native';
 import { useSelector } from 'react-redux';
@@ -62,7 +62,7 @@ const AddressFrom = ({
   const accountsByChainId = useSelector(selectAccountsByChainId);
 
   const internalAccounts = useSelector(selectInternalEvmAccounts);
-  const activeAddress = toChecksumAddress(from);
+  const activeAddress = getChecksumAddress(from as Hex);
 
   const networkName = useSelector(selectEvmNetworkName);
   const networkImage = useSelector(selectEvmNetworkImageSource);
diff --git a/app/components/UI/PaymentRequest/AssetList/index.tsx b/app/components/UI/PaymentRequest/AssetList/index.tsx
@@ -6,7 +6,7 @@ import { fontStyles } from '../../../../styles/common';
 import Identicon from '../../Identicon';
 import NetworkMainAssetLogo from '../../NetworkMainAssetLogo';
 import { useSelector } from 'react-redux';
-import { toChecksumAddress } from 'ethereumjs-util';
+import { getChecksumAddress } from '@metamask/utils';
 import { useTheme } from '../../../../util/theme';
 import { selectTokenList } from '../../../../selectors/tokenListController';
 import { ImportTokenViewSelectorsIDs } from '../../../../../e2e/selectors/wallet/ImportTokenView.selectors';
@@ -104,7 +104,7 @@ const AssetList = ({
         return <NetworkMainAssetLogo big style={styles.ethLogo} />;
       }
       const token =
-        tokenList?.[toChecksumAddress(address)] ||
+        tokenList?.[getChecksumAddress(address)] ||
         tokenList?.[address.toLowerCase()];
       const iconUrl = token?.iconUrl;
       if (!iconUrl) {
diff --git a/app/components/UI/TransactionElement/utils.js b/app/components/UI/TransactionElement/utils.js
@@ -24,7 +24,7 @@ import {
   getActionKey,
   TRANSACTION_TYPES,
 } from '../../../util/transactions';
-import { toChecksumAddress } from 'ethereumjs-util';
+import { getChecksumAddress } from '@metamask/utils';
 import { swapsUtils } from '@metamask/swaps-controller';
 import { isSwapsNativeAsset } from '../Swaps/utils';
 import Engine from '../../../core/Engine';
@@ -242,7 +242,7 @@ export function decodeIncomingTransfer(args) {
     : undefined;
   const exchangeRate =
     token && contractExchangeRates
-      ? contractExchangeRates[toChecksumAddress(token.address)]?.price
+      ? contractExchangeRates[getChecksumAddress(token.address)]?.price
       : undefined;
 
   let renderTokenFiatAmount, renderTokenFiatNumber;
@@ -402,7 +402,8 @@ function decodeTransferFromTx(args) {
 
   const renderFrom = renderFullAddress(addressFrom);
   const renderTo = renderFullAddress(addressTo);
-  const ticker = networkConfigurationsByChainId?.[txChainId]?.nativeCurrency || args.ticker;
+  const ticker =
+    networkConfigurationsByChainId?.[txChainId]?.nativeCurrency || args.ticker;
 
   const { SENT_COLLECTIBLE, RECEIVED_COLLECTIBLE } = TRANSACTION_TYPES;
   const transactionType =
@@ -473,7 +474,8 @@ function decodeDeploymentTx(args) {
     actionKey,
     primaryCurrency,
   } = args;
-  const ticker = networkConfigurationsByChainId?.[txChainId]?.nativeCurrency || args.ticker;
+  const ticker =
+    networkConfigurationsByChainId?.[txChainId]?.nativeCurrency || args.ticker;
 
   const totalGas = calculateTotalGas(txParams);
   const renderTotalEth = `${renderFromWei(totalGas)} ${ticker}`;
diff --git a/app/components/Views/Settings/Contacts/ContactForm/index.js b/app/components/Views/Settings/Contacts/ContactForm/index.js
@@ -13,7 +13,7 @@ import PropTypes from 'prop-types';
 import { getEditableOptions } from '../../../../UI/Navbar';
 import StyledButton from '../../../../UI/StyledButton';
 import Engine from '../../../../../core/Engine';
-import { toChecksumAddress } from 'ethereumjs-util';
+import { getChecksumAddress } from '@metamask/utils';
 import { connect } from 'react-redux';
 import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
 import { strings } from '../../../../../../locales/i18n';
@@ -272,7 +272,7 @@ class ContactForm extends PureComponent {
     const { AddressBookController } = Engine.context;
     if (!name || !address) return;
     AddressBookController.set(
-      toChecksumAddress(toEnsAddress || address),
+      getChecksumAddress(toEnsAddress || address),
       name,
       chainId,
       memo,
diff --git a/app/components/Views/confirmations/hooks/useAccountInfo.ts b/app/components/Views/confirmations/hooks/useAccountInfo.ts
@@ -1,7 +1,6 @@
-import { toChecksumAddress } from 'ethereumjs-util';
 import { useMemo } from 'react';
 import { useSelector } from 'react-redux';
-import { Hex } from '@metamask/utils';
+import { Hex, getChecksumAddress } from '@metamask/utils';
 
 import Engine from '../../../../core/Engine';
 import useAddressBalance from '../../../../components/hooks/useAddressBalance/useAddressBalance';
@@ -13,7 +12,7 @@ import I18n from '../../../../../locales/i18n';
 
 const useAccountInfo = (address: string, chainId: Hex) => {
   const internalAccounts = useSelector(selectInternalAccounts);
-  const activeAddress = toChecksumAddress(address);
+  const activeAddress = getChecksumAddress(address as Hex);
   const { addressBalance: accountBalance } = useAddressBalance(
     undefined,
     address,
diff --git a/app/components/Views/confirmations/legacy/Send/index.js b/app/components/Views/confirmations/legacy/Send/index.js
@@ -17,7 +17,7 @@ import {
   fromWei,
   fromTokenMinimalUnit,
 } from '../../../../../util/number';
-import { toChecksumAddress } from 'ethereumjs-util';
+import { getChecksumAddress } from '@metamask/utils';
 import { strings } from '../../../../../../locales/i18n';
 import { getTransactionOptionsTitle } from '../../../../UI/Navbar';
 import { connect } from 'react-redux';
@@ -443,7 +443,7 @@ class Send extends PureComponent {
    */
   handleTokenDeeplink = async (address) => {
     const { tokens, tokenList } = this.props;
-    address = toChecksumAddress(address);
+    address = getChecksumAddress(address);
     // First check if we have token information in token list
     if (address in tokenList) {
       return tokenList[address];
@@ -582,15 +582,15 @@ class Send extends PureComponent {
       let checksummedAddress = null;
 
       if (assetType === 'ETH') {
-        checksummedAddress = toChecksumAddress(transactionMeta.transaction.to);
+        checksummedAddress = getChecksumAddress(transactionMeta.transaction.to);
       } else if (assetType === 'ERC20') {
         try {
           const [addressTo] = decodeTransferData(
             'transfer',
             transactionMeta.transaction.data,
           );
           if (addressTo) {
-            checksummedAddress = toChecksumAddress(addressTo);
+            checksummedAddress = getChecksumAddress(addressTo);
           }
         } catch (e) {
           Logger.log('Error decoding transfer data', transactionMeta.data);
@@ -603,7 +603,7 @@ class Send extends PureComponent {
           );
           const addressTo = data[1];
           if (addressTo) {
-            checksummedAddress = toChecksumAddress(addressTo);
+            checksummedAddress = getChecksumAddress(addressTo);
           }
         } catch (e) {
           Logger.log('Error decoding transfer data', transactionMeta.data);
diff --git a/app/components/Views/confirmations/legacy/SendFlow/SendTo/index.js b/app/components/Views/confirmations/legacy/SendFlow/SendTo/index.js
@@ -2,7 +2,7 @@ import React, { Fragment, PureComponent } from 'react';
 import { View, ScrollView, Alert, Platform, BackHandler } from 'react-native';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { toChecksumAddress } from 'ethereumjs-util';
+import { getChecksumAddress } from '@metamask/utils';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import Icon from 'react-native-vector-icons/FontAwesome';
 import AddressList from '../AddressList';
@@ -278,7 +278,8 @@ class SendFlow extends PureComponent {
   };
 
   onTransactionDirectionSet = async () => {
-    const { setRecipient, navigation, providerType, selectedAddress } = this.props;
+    const { setRecipient, navigation, providerType, selectedAddress } =
+      this.props;
     const {
       toAccount,
       toEnsName,
@@ -291,12 +292,7 @@ class SendFlow extends PureComponent {
     }
 
     const toAddress = toEnsAddressResolved || toAccount;
-    setRecipient(
-      selectedAddress,
-      toAddress,
-      toEnsName,
-      toSelectedAddressName,
-    );
+    setRecipient(selectedAddress, toAddress, toEnsName, toSelectedAddressName);
     this.props.metrics.trackEvent(
       this.props.metrics
         .createEventBuilder(MetaMetricsEvents.SEND_FLOW_ADDS_RECIPIENT)
@@ -482,7 +478,7 @@ class SendFlow extends PureComponent {
 
   safeChecksumAddress = (address) => {
     try {
-      return toChecksumAddress(address);
+      return getChecksumAddress(address);
     } catch (error) {
       return address;
     }
diff --git a/app/components/Views/confirmations/legacy/components/ApproveTransactionHeader/ApproveTransactionHeader.tsx b/app/components/Views/confirmations/legacy/components/ApproveTransactionHeader/ApproveTransactionHeader.tsx
@@ -1,8 +1,7 @@
-import { toChecksumAddress } from 'ethereumjs-util';
 import React, { useEffect, useState } from 'react';
 import { View } from 'react-native';
 import { useSelector } from 'react-redux';
-import { Hex } from '@metamask/utils';
+import { Hex, getChecksumAddress } from '@metamask/utils';
 
 import { strings } from '../../../../../../../locales/i18n';
 import AccountBalance from '../../../../../../component-library/components-temp/Accounts/AccountBalance';
@@ -58,7 +57,7 @@ const ApproveTransactionHeader = ({
   const accountsByChainId = useSelector(selectAccountsByChainId);
 
   const internalAccounts = useSelector(selectInternalAccounts);
-  const activeAddress = toChecksumAddress(from);
+  const activeAddress = getChecksumAddress(from as Hex);
 
   const networkName = networkConfiguration?.name;
 
diff --git a/app/components/Views/confirmations/legacy/components/ApproveTransactionReview/AddNickname/index.tsx b/app/components/Views/confirmations/legacy/components/ApproveTransactionReview/AddNickname/index.tsx
@@ -5,7 +5,7 @@ import EthereumAddress from '../../../../../../UI/EthereumAddress';
 import Engine from '../../../../../../../core/Engine';
 import { MetaMetricsEvents } from '../../../../../../../core/Analytics';
 
-import { toChecksumAddress } from 'ethereumjs-util';
+import { getChecksumAddress, Hex } from '@metamask/utils';
 import { connect, useSelector } from 'react-redux';
 import StyledButton from '../../../../../../UI/StyledButton';
 import Text from '../../../../../../../component-library/components/Texts/Text';
@@ -120,7 +120,7 @@ const AddNickname = (props: AddNicknameProps) => {
     const { AddressBookController } = Engine.context as any;
     if (!newNickname || !address) return;
     AddressBookController.set(
-      toChecksumAddress(address),
+      getChecksumAddress(address as Hex),
       newNickname,
       providerChainId,
     );
diff --git a/app/components/hooks/useAccounts/useAccounts.test.ts b/app/components/hooks/useAccounts/useAccounts.test.ts
@@ -1,12 +1,11 @@
 import { renderHook, act } from '@testing-library/react-hooks';
 import { KeyringTypes } from '@metamask/keyring-controller';
 import { EthScope } from '@metamask/keyring-api';
-import { toChecksumAddress } from 'ethereumjs-util';
 import useAccounts from './useAccounts';
 import { backgroundState } from '../../../util/test/initial-root-state';
 import { MOCK_ACCOUNTS_CONTROLLER_STATE } from '../../../util/test/accountsControllerTestUtils';
 import { Account } from './useAccounts.types';
-import { Hex } from '@metamask/utils';
+import { Hex, getChecksumAddress } from '@metamask/utils';
 // eslint-disable-next-line import/no-namespace
 import * as networks from '../../../util/networks';
 
@@ -32,7 +31,7 @@ const MOCK_ACCOUNTS = Object.values(
 const MOCK_ACCOUNT_1: Account = {
   id: MOCK_ACCOUNTS[0].id,
   name: 'Account 1',
-  address: toChecksumAddress(MOCK_ACCOUNTS[0].address) as Hex,
+  address: getChecksumAddress(MOCK_ACCOUNTS[0].address as Hex),
   type: KeyringTypes.hd,
   yOffset: 0,
   isSelected: false,
@@ -47,7 +46,7 @@ const MOCK_ACCOUNT_1: Account = {
 const MOCK_ACCOUNT_2: Account = {
   id: MOCK_ACCOUNTS[1].id,
   name: 'Account 2',
-  address: toChecksumAddress(MOCK_ACCOUNTS[1].address) as Hex,
+  address: getChecksumAddress(MOCK_ACCOUNTS[1].address as Hex),
   type: KeyringTypes.hd,
   yOffset: 78,
   isSelected: true,
diff --git a/app/components/hooks/useExistingAddress.ts b/app/components/hooks/useExistingAddress.ts
@@ -1,5 +1,5 @@
-import { toChecksumAddress } from 'ethereumjs-util';
 import { useSelector } from 'react-redux';
+import { getChecksumAddress } from '@metamask/utils';
 
 import { selectInternalAccounts } from '../../selectors/accountsController';
 import { areAddressesEqual } from '../../util/address';
@@ -20,7 +20,7 @@ const useExistingAddress = (address?: string): AccountInfo | undefined => {
   if (!address || !isEvmSelected) return;
   // TODO: [SOLANA] Revisit this before shipping, Address Book controller should support non evm networks
   const networkAddressBook = addressBook[chainId] || {};
-  const checksummedAddress = toChecksumAddress(address);
+  const checksummedAddress = getChecksumAddress(address);
 
   const matchingAddressBookEntry: AddressBookEntry | undefined =
     networkAddressBook?.[checksummedAddress];
diff --git a/app/selectors/earnController/earn/index.ts b/app/selectors/earnController/earn/index.ts
@@ -3,7 +3,7 @@ import {
   selectLendingMarketsByChainIdAndOutputTokenAddress,
   selectLendingMarketsByChainIdAndTokenAddress,
 } from '@metamask/earn-controller';
-import { Hex } from '@metamask/utils';
+import { Hex, getChecksumAddress } from '@metamask/utils';
 import BigNumber from 'bignumber.js';
 import BN4 from 'bnjs4';
 import { createSelector } from 'reselect';
@@ -28,7 +28,6 @@ import { selectNetworkConfigurations } from '../../networkController';
 import { selectTokensBalances } from '../../tokenBalancesController';
 import { selectTokenMarketData } from '../../tokenRatesController';
 import { pooledStakingSelectors } from '../pooledStaking';
-import { toChecksumAddress } from 'ethereumjs-util';
 import {
   selectPooledStakingEnabledFlag,
   selectStablecoinLendingEnabledFlag,
@@ -194,12 +193,16 @@ const selectEarnTokens = createDeepEqualSelector(
       // TODO: balance logic, extract to utils then use when we are clear to add token
       const rawAccountBalance = selectedAddress
         ? accountsByChainId[token?.chainId as Hex]?.[
-            isEvmAddress ? toChecksumAddress(selectedAddress) : selectedAddress
+            isEvmAddress
+              ? getChecksumAddress(selectedAddress as Hex)
+              : selectedAddress
           ]?.balance
         : '0';
       const rawStakedAccountBalance = selectedAddress
         ? accountsByChainId[token?.chainId as Hex]?.[
-            isEvmAddress ? toChecksumAddress(selectedAddress) : selectedAddress
+            isEvmAddress
+              ? getChecksumAddress(selectedAddress as Hex)
+              : selectedAddress
           ]?.stakedBalance
         : '0';
       const balanceWei = hexToBN(rawAccountBalance);
diff --git a/app/util/address/index.ts b/app/util/address/index.ts
diff --git a/app/util/checkAddress.ts b/app/util/checkAddress.ts
diff --git a/app/util/transactions/index.js b/app/util/transactions/index.js
diff --git a/package.json b/package.json
diff --git a/yarn.lock b/yarn.lock
