feat: assets-controllers polish getAssetId and unit tests

Author: maxime-oe

packages/assets-controllers/CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Snap account-asset enrichment via `getAccountAssetInfo`; balance rows and `Asset.extra` carry chain-specific fields; export `isStellarClassicTrustlineInactiveForDisplay` for Stellar trustline UX ([#8828](https://github.com/MetaMask/core/pull/8828))
+- Add exported `getAssetId` in `codefi-v2.ts` for CAIP-19 asset ID derivation - extracted from existing `fetchTokenPrices` ([#9386](https://github.com/MetaMask/core/pull/9386))
 
 ### Changed
 

packages/assets-controllers/src/token-prices-service/codefi-v2.test.ts

@@ -15,6 +15,7 @@ import {
   fetchSupportedNetworks,
   getSupportedNetworks,
   resetSupportedNetworksCache,
+  getAssetId,
 } from './codefi-v2';
 
 // We're not customizing the default max delay
@@ -2183,6 +2184,74 @@ describe('CodefiTokenPricesServiceV2', () => {
       expect(service.validateChainIdSupported('0xdeadbeef')).toBe(false);
     });
   });
+
+  describe('getAssetId', () => {
+    it('returns a CAIP-19 erc20 id with a lowercased address for ERC20 tokens', () => {
+      expect(getAssetId({ chainId: '0x1', tokenAddress: '0xABCDEF' })).toBe(
+        'eip155:1/erc20:0xabcdef',
+      );
+    });
+
+    it('returns the hardcoded id for native tokens on supported chains', () => {
+      expect(getAssetId({ chainId: '0x1', tokenAddress: ZERO_ADDRESS })).toBe(
+        'eip155:1/slip44:60',
+      );
+    });
+
+    it('detects native tokens on chains with a custom native address', () => {
+      expect(
+        getAssetId({
+          chainId: '0x89',
+          tokenAddress: '0x0000000000000000000000000000000000001010',
+        }),
+      ).toBe('eip155:137/slip44:966');
+    });
+
+    it('matches native token addresses case-insensitively', () => {
+      expect(
+        getAssetId({
+          chainId: '0x89',
+          tokenAddress: '0x0000000000000000000000000000000000001010'
+            .toUpperCase()
+            .replace('0X', '0x'),
+        }),
+      ).toBe('eip155:137/slip44:966');
+    });
+
+    it('falls back to nativeAssetIdentifiers when the chain has no hardcoded entry', () => {
+      // 0x42 (OKXChain) is not in SPOT_PRICES_SUPPORT_INFO
+      expect(
+        getAssetId({
+          chainId: '0x42',
+          tokenAddress: ZERO_ADDRESS,
+          nativeAssetIdentifiers: { 'eip155:66': 'eip155:66/slip44:996' },
+        }),
+      ).toBe('eip155:66/slip44:996');
+    });
+
+    it('prefers the hardcoded entry over nativeAssetIdentifiers', () => {
+      expect(
+        getAssetId({
+          chainId: '0x1',
+          tokenAddress: ZERO_ADDRESS,
+          nativeAssetIdentifiers: { 'eip155:1': 'eip155:1/erc20:0xwrong' },
+        }),
+      ).toBe('eip155:1/slip44:60');
+    });
+
+    it('returns undefined for a native token with no hardcoded entry and no identifier', () => {
+      expect(
+        getAssetId({ chainId: '0x42', tokenAddress: ZERO_ADDRESS }),
+      ).toBeUndefined();
+    });
+
+    it('returns undefined instead of throwing when given a malformed chain ID', () => {
+      expect(
+        // @ts-expect-error Testing runtime behavior with invalid input
+        getAssetId({ chainId: 'not-a-hex-string', tokenAddress: '0xAAA' }),
+      ).toBeUndefined();
+    });
+  });
 });
 
 /**

packages/assets-controllers/src/token-prices-service/codefi-v2.ts

@@ -589,31 +589,36 @@ export function resetSupportedCurrenciesCache(): void {
 export function getAssetId({
   chainId,
   tokenAddress,
-  nativeAssetIdentifiers,
+  nativeAssetIdentifiers = {},
 }: {
   chainId: Hex;
   tokenAddress: string;
-  nativeAssetIdentifiers: NativeAssetIdentifiersMap;
+  nativeAssetIdentifiers?: NativeAssetIdentifiersMap;
 }): CaipAssetType | undefined {
-  const caipChainId = toCaipChainId(
-    KnownCaipNamespace.Eip155,
-    hexToNumber(chainId).toString(),
-  );
+  try {
+    const caipChainId = toCaipChainId(
+      KnownCaipNamespace.Eip155,
+      hexToNumber(chainId).toString(),
+    );
 
-  const nativeAddress = getNativeTokenAddress(chainId);
-  const isNativeToken =
-    nativeAddress.toLowerCase() === tokenAddress.toLowerCase();
-
-  if (isNativeToken) {
-    const hardcodedId = (
-      SPOT_PRICES_SUPPORT_INFO as Partial<Record<Hex, string>>
-    )[chainId];
-    return (hardcodedId ?? nativeAssetIdentifiers[caipChainId]) as
-      | CaipAssetType
-      | undefined;
-  }
+    const nativeAddress = getNativeTokenAddress(chainId);
+    const isNativeToken =
+      nativeAddress.toLowerCase() === tokenAddress.toLowerCase();
+
+    if (isNativeToken) {
+      const hardcodedId = (
+        SPOT_PRICES_SUPPORT_INFO as Partial<Record<Hex, string>>
+      )[chainId];
+      return (hardcodedId ?? nativeAssetIdentifiers[caipChainId]) as
+        | CaipAssetType
+        | undefined;
+    }
 
-  return `${caipChainId}/erc20:${tokenAddress.toLowerCase()}` as CaipAssetType;
+    return `${caipChainId}/erc20:${tokenAddress.toLowerCase()}` as CaipAssetType;
+  } catch {
+    // This block should never be reached as long as using Typescript, but added for safety.
+    return undefined;
+  }
 }
 
 /**