fix: checksum EVM token addresses used throughout the bridge experience (#38971)

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Changes
- Updates the `toAssetId` util to **checksum EVM assetIds** and
**transform Tron assets correctly**
- Explicitly checksums addresses (if needed) before passing them to the
bridge-controller
- Removes unused bridge-status utils



<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/38971?quickstart=1)

## **Changelog**

<!--
If this PR is not End-User-Facing and should not show up in the
CHANGELOG, you can choose to either:
1. Write `CHANGELOG entry: null`
2. Label with `no-changelog`

If this PR is End-User-Facing, please write a short User-Facing
description in the past tense like:
`CHANGELOG entry: Added a new tab for users to see their NFTs`
`CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker`

(This helps the Release Engineer do their job more quickly and
accurately)
-->

CHANGELOG entry: fix: toAssetId util should checksum EVM assetIds and
support Tron tokens

## **Related issues**

Fixes:

## **Manual testing steps**

1. Source and dest fiat values should be correct for evm and non-evm
tokens
2. Block explorer link in dest input should link to correct URL

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> - **Asset ID + image handling**: Updates `toAssetId` to accept
hex/CAIP chain IDs, checksum EVM addresses, and generate Solana `token:`
and Tron `trc20:` asset IDs; `getAssetImageUrl` now lowercases EVM paths
while preserving non‑EVM case and builds URLs from CAIP asset IDs.
> - **Metadata fetch**: Refactors
`fetchAssetMetadata`/`fetchAssetMetadataForAssetIds` to use new
`toAssetId` and `getAssetImageUrl`, normalize chain IDs, and return
non‑EVM addresses via CAIP references; adds `isEvmChainId` and
`isTronResource` helpers.
> - **Bridge integration**: Reworks selectors/utils to build assetIds
with `toAssetId(fromToken.address, fromChain.chainId)`, generate images
via CDN, and format quote params with CAIP references; updates tests/e2e
to expect checksummed ERC20 assetIds/addresses and new image URLs.
> - **Constants + cleanup**: Fixes Tron common token address format in
`BRIDGE_CHAINID_COMMON_TOKEN_PAIR`; removes unused bridge-status metrics
utils and related types.
> 
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
9e831bf. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->

Author: micaelae

app/scripts/lib/bridge-status/metrics-utils.ts

@@ -204,7 +204,7 @@ export const BRIDGE_CHAINID_COMMON_TOKEN_PAIR: Partial<
   ///: BEGIN:ONLY_INCLUDE_IF(tron)
   [MultichainNetworks.TRON]: {
     // TRX -> USDT on Tron
-    address: 'tron:728126428/trc20:TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t',
+    address: 'TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t',
     symbol: 'USDT',
     decimals: 6,
     name: 'Tether USD',

shared/constants/bridge.ts

@@ -128,7 +128,7 @@ describe('asset-utils', () => {
       const chainId = 'eip155:1' as CaipChainId;
 
       const result = toAssetId(address, chainId);
-      expect(result).toBe(`eip155:1/erc20:${address.toLowerCase()}`);
+      expect(result).toBe(`eip155:1/erc20:${address}`);
       expect(CaipAssetTypeStruct.validate(result)).toStrictEqual([
         undefined,
         result,
@@ -147,7 +147,8 @@ describe('asset-utils', () => {
     it('should return correct image URL for non-hex CAIP asset ID', () => {
       const assetId =
         `${MultichainNetworks.SOLANA}/token:aBCD` as CaipAssetType;
-      const expectedUrl = `${STATIC_METAMASK_BASE_URL}/api/v2/tokenIcons/assets/solana/5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token/aBCD.png`;
+      const expectedUrl =
+        'https://static.cx.metamask.io/api/v2/tokenIcons/assets/solana/5eykt4usfv8p8njdtrepy1vzqkqzkvdp/token/abcd.png';
 
       expect(getAssetImageUrl(assetId, 'eip155:1')).toBe(expectedUrl);
     });
@@ -188,7 +189,7 @@ describe('asset-utils', () => {
       );
 
       expect(mockFetchWithTimeout).toHaveBeenCalledWith(
-        `${TOKEN_API_V3_BASE_URL}/assets?assetIds=${mockAssetId + 'ABcDe'.toLowerCase()}`,
+        `${TOKEN_API_V3_BASE_URL}/assets?assetIds=${mockAssetId + 'ABcDe'}`,
         {
           method: 'GET',
           headers: { 'X-Client-Id': 'extension' },
@@ -200,7 +201,7 @@ describe('asset-utils', () => {
         decimals: 18,
         image:
           'https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/erc20/0x123abcde.png',
-        assetId: 'eip155:1/erc20:0x123abcde',
+        assetId: 'eip155:1/erc20:0x123ABcDe',
         address: '0x123abcde',
         chainId: mockHexChainId,
       });

shared/lib/asset-utils.test.ts

@@ -10,16 +10,17 @@ import {
   parseCaipAssetType,
   KnownCaipNamespace,
 } from '@metamask/utils';
-
+import { toChecksumHexAddress } from '@metamask/controller-utils';
 import { toEvmCaipChainId } from '@metamask/multichain-network-controller';
-import { MultichainNetwork } from '@metamask/multichain-transactions-controller';
 import {
   getNativeAssetForChainId,
   isNativeAddress,
+  isNonEvmChainId,
 } from '@metamask/bridge-controller';
 import { Asset } from '@metamask/assets-controllers';
 import getFetchWithTimeout from '../modules/fetch-with-timeout';
 import { decimalToPrefixedHex } from '../modules/conversion.utils';
+import { MultichainNetworks } from '../constants/multichain/networks';
 import {
   TRON_RESOURCE_SYMBOLS_SET,
   TronResourceSymbol,
@@ -31,21 +32,38 @@ const STATIC_METAMASK_BASE_URL = 'https://static.cx.metamask.io';
 
 export const toAssetId = (
   address: Hex | CaipAssetType | string,
-  chainId: CaipChainId,
+  chainId?: CaipChainId | Hex,
 ): CaipAssetType | undefined => {
+  let addressToUse = address;
+  let chainIdToUse = isStrictHexString(chainId)
+    ? toEvmCaipChainId(chainId)
+    : chainId;
+
+  // Use chainId and address from caip assetId if provided
   if (isCaipAssetType(address)) {
-    return address;
+    const { assetReference, chainId: chainIdFromCaipAssetId } =
+      parseCaipAssetType(address);
+    addressToUse = assetReference;
+    chainIdToUse = chainIdFromCaipAssetId;
   }
-  if (isNativeAddress(address)) {
-    return getNativeAssetForChainId(chainId)?.assetId;
+  if (!chainIdToUse) {
+    return undefined;
   }
-  if (chainId === MultichainNetwork.Solana) {
-    return CaipAssetTypeStruct.create(`${chainId}/token:${address}`);
+
+  if (isNativeAddress(addressToUse)) {
+    return getNativeAssetForChainId(chainIdToUse)?.assetId;
+  }
+  if (chainIdToUse === MultichainNetworks.SOLANA) {
+    return CaipAssetTypeStruct.create(`${chainIdToUse}/token:${addressToUse}`);
+  }
+  if (chainIdToUse === MultichainNetworks.TRON) {
+    return CaipAssetTypeStruct.create(`${chainIdToUse}/trc20:${addressToUse}`);
   }
   // EVM assets
-  if (isStrictHexString(address)) {
+  const checksummedAddress = toChecksumHexAddress(addressToUse) ?? addressToUse;
+  if (isStrictHexString(checksummedAddress)) {
     return CaipAssetTypeStruct.create(
-      `${chainId}/erc20:${address.toLowerCase()}`,
+      `${chainIdToUse}/erc20:${checksummedAddress}`,
     );
   }
   return undefined;
@@ -62,19 +80,17 @@ export const getAssetImageUrl = (
   assetId: CaipAssetType | string,
   chainId: CaipChainId | Hex,
 ) => {
-  const chainIdInCaip = isCaipChainId(chainId)
-    ? chainId
-    : toEvmCaipChainId(chainId);
-
-  const assetIdInCaip = toAssetId(assetId, chainIdInCaip);
+  const assetIdInCaip = toAssetId(assetId, chainId);
   if (!assetIdInCaip) {
     return undefined;
   }
+  const normalizedAssetId = (
+    isNonEvmChainId(chainId) ? assetIdInCaip : assetIdInCaip.toLowerCase()
+  ).replaceAll(':', '/');
 
-  return `${STATIC_METAMASK_BASE_URL}/api/v2/tokenIcons/assets/${assetIdInCaip.replaceAll(
-    ':',
-    '/',
-  )}.png`;
+  return `${STATIC_METAMASK_BASE_URL}/api/v2/tokenIcons/assets/${
+    normalizedAssetId
+  }.png`;
 };
 
 export type AssetMetadata = {
@@ -98,11 +114,7 @@ export const fetchAssetMetadata = async (
   abortSignal?: AbortSignal,
 ) => {
   try {
-    const chainIdInCaip = isCaipChainId(chainId)
-      ? chainId
-      : toEvmCaipChainId(chainId);
-
-    const assetId = toAssetId(address, chainIdInCaip);
+    const assetId = toAssetId(address, chainId);
 
     if (!assetId) {
       return undefined;
@@ -123,11 +135,11 @@ export const fetchAssetMetadata = async (
     const commonFields = {
       symbol: assetMetadata.symbol,
       decimals: assetMetadata.decimals,
-      image: getAssetImageUrl(assetId, chainIdInCaip),
+      image: getAssetImageUrl(assetId, chainId),
       assetId,
     };
 
-    if (chainId === MultichainNetwork.Solana && assetId) {
+    if (isNonEvmChainId(chainId) && assetId) {
       const { assetReference } = parseCaipAssetType(assetId);
       return {
         ...commonFields,
@@ -137,11 +149,13 @@ export const fetchAssetMetadata = async (
       };
     }
 
-    const { reference } = parseCaipChainId(chainIdInCaip);
+    const hexChainId = isStrictHexString(chainId)
+      ? chainId
+      : decimalToPrefixedHex(parseCaipChainId(chainId).reference);
     return {
       ...commonFields,
       address: address.toLowerCase(),
-      chainId: decimalToPrefixedHex(reference),
+      chainId: hexChainId,
     };
   } catch (error) {
     return undefined;

shared/lib/asset-utils.ts

@@ -1,5 +1,4 @@
 export type { FlattenedBackgroundStateProxy } from './background';
-export * from './bridge-status';
 export * from './confirm';
 export * from './metametrics';
 export * from './origin-throttling';

shared/types/bridge-status.ts

@@ -1,5 +1,6 @@
 import { strict as assert } from 'assert';
 import { Suite } from 'mocha';
+import { toChecksumHexAddress } from '@metamask/controller-utils';
 import {
   assertInAnyOrder,
   getEventPayloads,
@@ -154,7 +155,7 @@ describe('Bridge tests', function (this: Suite) {
             event.properties.chain_id_source === 'eip155:1' &&
             event.properties.chain_id_destination === 'eip155:59144' &&
             event.properties.token_address_source ===
-              'eip155:1/erc20:0x6b175474e89094c44da98b954eedeac495271d0f' &&
+              `eip155:1/erc20:${toChecksumHexAddress('0x6b175474e89094c44da98b954eedeac495271d0f')}` &&
             event.properties.token_address_destination ===
               'eip155:59144/slip44:60' &&
             event.properties.swap_type === 'crosschain' &&
@@ -175,7 +176,7 @@ describe('Bridge tests', function (this: Suite) {
             crossChainQuotesReceived[0].properties.chain_id_destination ===
               'eip155:59144' &&
             crossChainQuotesReceived[0].properties.token_address_source ===
-              'eip155:1/erc20:0x6b175474e89094c44da98b954eedeac495271d0f' &&
+              `eip155:1/erc20:${toChecksumHexAddress('0x6b175474e89094c44da98b954eedeac495271d0f')}` &&
             crossChainQuotesReceived[0].properties.token_address_destination ===
               'eip155:59144/slip44:60' &&
             crossChainQuotesReceived[0].properties.swap_type === 'crosschain',

shared/types/index.ts

@@ -1,14 +1,20 @@
 import { createSelector } from 'reselect';
-import { type BridgeHistoryItem } from '@metamask/bridge-status-controller';
+import type {
+  BridgeHistoryItem,
+  BridgeStatusControllerState,
+} from '@metamask/bridge-status-controller';
 import { Numeric } from '../../../shared/modules/Numeric';
 import { getCurrentChainId } from '../../../shared/modules/selectors/networks';
-import { type BridgeStatusAppState } from '../../../shared/types/bridge-status';
 import { getSwapsTokensReceivedFromTxMeta } from '../../../shared/lib/transactions-controller-utils';
 import {
   getInternalAccountsFromGroupById,
   getSelectedAccountGroup,
 } from '../../selectors/multichain-accounts/account-tree';
 
+type BridgeStatusAppState = {
+  metamask: BridgeStatusControllerState;
+};
+
 const selectBridgeHistory = (state: BridgeStatusAppState) =>
   state.metamask.txHistory;
 

test/e2e/tests/metrics/bridge.spec.ts

@@ -282,7 +282,8 @@ describe('Bridge selectors', () => {
         assetId: 'eip155:1/slip44:60',
         chainId: 'eip155:1',
         decimals: 18,
-        image: './images/eth_logo.svg',
+        image:
+          'https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/slip44/60.png',
         name: 'Ether',
         symbol: 'ETH',
         balance: '0',
@@ -300,7 +301,8 @@ describe('Bridge selectors', () => {
         assetId: 'eip155:1/slip44:60',
         chainId: 'eip155:1',
         decimals: 18,
-        image: './images/eth_logo.svg',
+        image:
+          'https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/slip44/60.png',
         name: 'Ether',
         symbol: 'ETH',
         balance: '0',
@@ -349,7 +351,7 @@ describe('Bridge selectors', () => {
 
       expect(result).toStrictEqual({
         address: '0xaca92e438df0b2401ff60da7e4337b687a2435da',
-        assetId: 'eip155:1/erc20:0xaca92e438df0b2401ff60da7e4337b687a2435da',
+        assetId: 'eip155:1/erc20:0xacA92E438df0B2401fF60dA7E4337B687a2435DA',
         balance: '0',
         chainId: 'eip155:1',
         decimals: 6,
@@ -443,7 +445,8 @@ describe('Bridge selectors', () => {
         chainId: 'eip155:1',
         decimals: 18,
         iconUrl: '',
-        image: './images/eth_logo.svg',
+        image:
+          'https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/slip44/60.png',
         name: 'Ether',
         symbol: 'ETH',
       });

ui/ducks/bridge-status/selectors.ts

@@ -603,10 +603,7 @@ export const getFromTokenConversionRate = createSelector(
       const nativeAssetId = getNativeAssetForChainId(
         fromChain.chainId,
       )?.assetId;
-      const tokenAssetId = toAssetId(
-        fromToken.address,
-        formatChainIdToCaip(fromChain.chainId),
-      );
+      const tokenAssetId = toAssetId(fromToken.address, fromChain.chainId);
       const nativeToCurrencyRate = isNonEvmChain(fromChain.chainId)
         ? Number(
             rates?.[fromChain.nativeCurrency?.toLowerCase()]?.conversionRate ??