@metamask-previews/network-enablement-controller 4.0.0-preview-821afcb8 → 4.0.0-preview-0c691324

package/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add `nativeAssetIdentifiers` state property that maps CAIP-2 chain IDs to CAIP-19-like native asset identifiers (e.g., `eip155:1/slip44:60`) ([#7609](https://github.com/MetaMask/core/pull/7609))
+- Add `Slip44Service` to look up SLIP-44 coin types by native currency symbol ([#7609](https://github.com/MetaMask/core/pull/7609))
+- Add `@metamask/slip44` dependency for SLIP-44 coin type lookups ([#7609](https://github.com/MetaMask/core/pull/7609))
+- Subscribe to `NetworkController:stateChange` to update `nativeAssetIdentifiers` when a network's native currency changes ([#7609](https://github.com/MetaMask/core/pull/7609))
+
 ### Changed
 
 - Upgrade `@metamask/utils` from `^11.8.1` to `^11.9.0` ([#7511](https://github.com/MetaMask/core/pull/7511))

package/dist/NetworkEnablementController.cjs

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _NetworkEnablementController_instances, _NetworkEnablementController_ensureNamespaceBucket, _NetworkEnablementController_isInPopularNetworksMode, _NetworkEnablementController_removeNetworkEntry, _NetworkEnablementController_onAddNetwork;
+var _NetworkEnablementController_instances, _NetworkEnablementController_onNativeCurrencyChange, _NetworkEnablementController_ensureNamespaceBucket, _NetworkEnablementController_updateNativeAssetIdentifier, _NetworkEnablementController_isInPopularNetworksMode, _NetworkEnablementController_removeNetworkEntry, _NetworkEnablementController_onAddNetwork;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NetworkEnablementController = void 0;
 const base_controller_1 = require("@metamask/base-controller");
@@ -12,8 +12,19 @@ const controller_utils_1 = require("@metamask/controller-utils");
 const keyring_api_1 = require("@metamask/keyring-api");
 const utils_1 = require("@metamask/utils");
 const constants_1 = require("./constants.cjs");
+const services_1 = require("./services/index.cjs");
 const utils_2 = require("./utils.cjs");
 const controllerName = 'NetworkEnablementController';
+/**
+ * Builds a native asset identifier in CAIP-19-like format.
+ *
+ * @param caipChainId - The CAIP-2 chain ID (e.g., 'eip155:1', 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp')
+ * @param slip44CoinType - The SLIP-44 coin type number
+ * @returns The native asset identifier string (e.g., 'eip155:1/slip44:60')
+ */
+function buildNativeAssetIdentifier(caipChainId, slip44CoinType) {
+    return `${caipChainId}/slip44:${slip44CoinType}`;
+}
 /**
  * Gets the default state for the NetworkEnablementController.
  *
@@ -47,6 +58,9 @@ const getDefaultNetworkEnablementControllerState = () => ({
             [keyring_api_1.TrxScope.Shasta]: false,
         },
     },
+    // nativeAssetIdentifiers is initialized as empty and should be populated
+    // by the client using initNativeAssetIdentifiers() during controller init
+    nativeAssetIdentifiers: {},
 });
 // Metadata for the controller state
 const metadata = {
@@ -56,6 +70,12 @@ const metadata = {
         includeInDebugSnapshot: true,
         usedInUi: true,
     },
+    nativeAssetIdentifiers: {
+        includeInStateLogs: true,
+        persist: true,
+        includeInDebugSnapshot: true,
+        usedInUi: true,
+    },
 };
 /**
  * Controller responsible for managing network enablement state across different blockchain networks.
@@ -85,12 +105,20 @@ class NetworkEnablementController extends base_controller_1.BaseController {
             },
         });
         _NetworkEnablementController_instances.add(this);
-        messenger.subscribe('NetworkController:networkAdded', ({ chainId }) => {
-            __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_onAddNetwork).call(this, chainId);
+        messenger.subscribe('NetworkController:networkAdded', ({ chainId, nativeCurrency }) => {
+            // eslint-disable-next-line no-void
+            void __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_onAddNetwork).call(this, chainId, nativeCurrency);
         });
         messenger.subscribe('NetworkController:networkRemoved', ({ chainId }) => {
             __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_removeNetworkEntry).call(this, chainId);
         });
+        // Subscribe to nativeCurrency changes using selector approach
+        messenger.subscribe('NetworkController:stateChange', (currentNativeCurrencies, previousNativeCurrencies) => {
+            // eslint-disable-next-line no-void
+            void __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_onNativeCurrencyChange).call(this, currentNativeCurrencies, previousNativeCurrencies);
+        }, 
+        // Selector: extract chainId -> nativeCurrency map
+        (networkState) => Object.fromEntries(Object.entries(networkState.networkConfigurationsByChainId).map(([chainId, config]) => [chainId, config.nativeCurrency])));
     }
     /**
      * Enables or disables a network for the user.
@@ -110,20 +138,20 @@ class NetworkEnablementController extends base_controller_1.BaseController {
      */
     enableNetwork(chainId) {
         const { namespace, storageKey } = (0, utils_2.deriveKeys)(chainId);
-        this.update((s) => {
+        this.update((state) => {
             // disable all networks in all namespaces first
-            Object.keys(s.enabledNetworkMap).forEach((ns) => {
-                Object.keys(s.enabledNetworkMap[ns]).forEach((key) => {
-                    s.enabledNetworkMap[ns][key] = false;
+            Object.keys(state.enabledNetworkMap).forEach((ns) => {
+                Object.keys(state.enabledNetworkMap[ns]).forEach((key) => {
+                    state.enabledNetworkMap[ns][key] = false;
                 });
             });
             // if the namespace bucket does not exist, return
             // new nemespace are added only when a new network is added
-            if (!s.enabledNetworkMap[namespace]) {
+            if (!state.enabledNetworkMap[namespace]) {
                 return;
             }
             // enable the network
-            s.enabledNetworkMap[namespace][storageKey] = true;
+            state.enabledNetworkMap[namespace][storageKey] = true;
         });
     }
     /**
@@ -148,17 +176,17 @@ class NetworkEnablementController extends base_controller_1.BaseController {
         if (derivedNamespace !== namespace) {
             throw new Error(`Chain ID ${chainId} belongs to namespace ${derivedNamespace}, but namespace ${namespace} was specified`);
         }
-        this.update((s) => {
+        this.update((state) => {
             // Ensure the namespace bucket exists
-            __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_ensureNamespaceBucket).call(this, s, namespace);
+            __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_ensureNamespaceBucket).call(this, state, namespace);
             // Disable all networks in the specified namespace first
-            if (s.enabledNetworkMap[namespace]) {
-                Object.keys(s.enabledNetworkMap[namespace]).forEach((key) => {
-                    s.enabledNetworkMap[namespace][key] = false;
+            if (state.enabledNetworkMap[namespace]) {
+                Object.keys(state.enabledNetworkMap[namespace]).forEach((key) => {
+                    state.enabledNetworkMap[namespace][key] = false;
                 });
             }
             // Enable the target network in the specified namespace
-            s.enabledNetworkMap[namespace][storageKey] = true;
+            state.enabledNetworkMap[namespace][storageKey] = true;
         });
     }
     /**
@@ -172,11 +200,11 @@ class NetworkEnablementController extends base_controller_1.BaseController {
      * Popular networks that don't exist in NetworkController or MultichainNetworkController configurations will be skipped silently.
      */
     enableAllPopularNetworks() {
-        this.update((s) => {
+        this.update((state) => {
             // First disable all networks across all namespaces
-            Object.keys(s.enabledNetworkMap).forEach((ns) => {
-                Object.keys(s.enabledNetworkMap[ns]).forEach((key) => {
-                    s.enabledNetworkMap[ns][key] = false;
+            Object.keys(state.enabledNetworkMap).forEach((ns) => {
+                Object.keys(state.enabledNetworkMap[ns]).forEach((key) => {
+                    state.enabledNetworkMap[ns][key] = false;
                 });
             });
             // Get current network configurations to check if networks exist
@@ -188,35 +216,36 @@ class NetworkEnablementController extends base_controller_1.BaseController {
                 // Check if network exists in NetworkController configurations
                 if (networkControllerState.networkConfigurationsByChainId[chainId]) {
                     // Ensure namespace bucket exists
-                    __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_ensureNamespaceBucket).call(this, s, namespace);
+                    __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_ensureNamespaceBucket).call(this, state, namespace);
                     // Enable the network
-                    s.enabledNetworkMap[namespace][storageKey] = true;
+                    state.enabledNetworkMap[namespace][storageKey] = true;
                 }
             });
             // Enable Solana mainnet if it exists in MultichainNetworkController configurations
             const solanaKeys = (0, utils_2.deriveKeys)(keyring_api_1.SolScope.Mainnet);
             if (multichainState.multichainNetworkConfigurationsByChainId[keyring_api_1.SolScope.Mainnet]) {
                 // Ensure namespace bucket exists
-                __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_ensureNamespaceBucket).call(this, s, solanaKeys.namespace);
+                __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_ensureNamespaceBucket).call(this, state, solanaKeys.namespace);
                 // Enable Solana mainnet
-                s.enabledNetworkMap[solanaKeys.namespace][solanaKeys.storageKey] = true;
+                state.enabledNetworkMap[solanaKeys.namespace][solanaKeys.storageKey] =
+                    true;
             }
             // Enable Bitcoin mainnet if it exists in MultichainNetworkController configurations
             const bitcoinKeys = (0, utils_2.deriveKeys)(keyring_api_1.BtcScope.Mainnet);
             if (multichainState.multichainNetworkConfigurationsByChainId[keyring_api_1.BtcScope.Mainnet]) {
                 // Ensure namespace bucket exists
-                __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_ensureNamespaceBucket).call(this, s, bitcoinKeys.namespace);
+                __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_ensureNamespaceBucket).call(this, state, bitcoinKeys.namespace);
                 // Enable Bitcoin mainnet
-                s.enabledNetworkMap[bitcoinKeys.namespace][bitcoinKeys.storageKey] =
+                state.enabledNetworkMap[bitcoinKeys.namespace][bitcoinKeys.storageKey] =
                     true;
             }
             // Enable Tron mainnet if it exists in MultichainNetworkController configurations
             const tronKeys = (0, utils_2.deriveKeys)(keyring_api_1.TrxScope.Mainnet);
             if (multichainState.multichainNetworkConfigurationsByChainId[keyring_api_1.TrxScope.Mainnet]) {
                 // Ensure namespace bucket exists
-                __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_ensureNamespaceBucket).call(this, s, tronKeys.namespace);
+                __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_ensureNamespaceBucket).call(this, state, tronKeys.namespace);
                 // Enable Tron mainnet
-                s.enabledNetworkMap[tronKeys.namespace][tronKeys.storageKey] = true;
+                state.enabledNetworkMap[tronKeys.namespace][tronKeys.storageKey] = true;
             }
         });
     }
@@ -224,39 +253,124 @@ class NetworkEnablementController extends base_controller_1.BaseController {
      * Initializes the network enablement state from network controller configurations.
      *
      * This method reads the current network configurations from both NetworkController
-     * and MultichainNetworkController and syncs the enabled network map accordingly.
+     * and MultichainNetworkController and syncs the enabled network map and nativeAssetIdentifiers accordingly.
      * It ensures proper namespace buckets exist for all configured networks and only
      * adds missing networks with a default value of false, preserving existing user settings.
      *
      * This method should be called after the NetworkController and MultichainNetworkController
      * have been initialized and their configurations are available.
      */
-    init() {
-        this.update((s) => {
-            // Get network configurations from NetworkController (EVM networks)
-            const networkControllerState = this.messenger.call('NetworkController:getState');
-            // Get network configurations from MultichainNetworkController (all networks)
-            const multichainState = this.messenger.call('MultichainNetworkController:getState');
+    async init() {
+        // Get network configurations from NetworkController (EVM networks)
+        const networkControllerState = this.messenger.call('NetworkController:getState');
+        // Get network configurations from MultichainNetworkController (all networks)
+        const multichainState = this.messenger.call('MultichainNetworkController:getState');
+        // Build nativeAssetIdentifiers for EVM networks using chainid.network
+        const evmNativeAssetUpdates = [];
+        for (const [chainId, config] of Object.entries(networkControllerState.networkConfigurationsByChainId)) {
+            const { caipChainId } = (0, utils_2.deriveKeys)(chainId);
+            // Skip if already in state
+            if (this.state.nativeAssetIdentifiers[caipChainId] !== undefined) {
+                continue;
+            }
+            // Parse hex chainId to number for chainid.network lookup
+            const numericChainId = parseInt(chainId, 16);
+            // EVM networks: use getSlip44ByChainId (chainid.network data)
+            // Default to 60 (Ethereum) if no specific mapping is found
+            const slip44CoinType = (await services_1.Slip44Service.getSlip44ByChainId(numericChainId, config.nativeCurrency)) ?? 60;
+            evmNativeAssetUpdates.push({
+                caipChainId,
+                identifier: buildNativeAssetIdentifier(caipChainId, slip44CoinType),
+            });
+        }
+        // Update state synchronously
+        this.update((state) => {
             // Initialize namespace buckets for EVM networks from NetworkController
-            Object.keys(networkControllerState.networkConfigurationsByChainId).forEach((chainId) => {
+            Object.entries(networkControllerState.networkConfigurationsByChainId).forEach(([chainId]) => {
+                var _a;
                 const { namespace, storageKey } = (0, utils_2.deriveKeys)(chainId);
-                __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_ensureNamespaceBucket).call(this, s, namespace);
+                __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_ensureNamespaceBucket).call(this, state, namespace);
                 // Only add network if it doesn't already exist in state (preserves user settings)
-                if (s.enabledNetworkMap[namespace][storageKey] === undefined) {
-                    s.enabledNetworkMap[namespace][storageKey] = false;
-                }
+                (_a = state.enabledNetworkMap[namespace])[storageKey] ?? (_a[storageKey] = false);
             });
+            // Apply nativeAssetIdentifier updates
+            for (const { caipChainId, identifier } of evmNativeAssetUpdates) {
+                state.nativeAssetIdentifiers[caipChainId] = identifier;
+            }
             // Initialize namespace buckets for all networks from MultichainNetworkController
             Object.keys(multichainState.multichainNetworkConfigurationsByChainId).forEach((chainId) => {
+                var _a;
                 const { namespace, storageKey } = (0, utils_2.deriveKeys)(chainId);
-                __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_ensureNamespaceBucket).call(this, s, namespace);
+                __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_ensureNamespaceBucket).call(this, state, namespace);
                 // Only add network if it doesn't already exist in state (preserves user settings)
-                if (s.enabledNetworkMap[namespace][storageKey] === undefined) {
-                    s.enabledNetworkMap[namespace][storageKey] = false;
-                }
+                (_a = state.enabledNetworkMap[namespace])[storageKey] ?? (_a[storageKey] = false);
             });
         });
     }
+    /**
+     * Initializes the native asset identifiers from network configurations.
+     * This method should be called from the client during controller initialization
+     * to populate the nativeAssetIdentifiers state based on actual network configurations.
+     *
+     * @param networks - Array of network configurations with chainId and nativeCurrency
+     * @example
+     * ```typescript
+     * const evmNetworks = Object.values(networkControllerState.networkConfigurationsByChainId)
+     *   .map(config => ({
+     *     chainId: toEvmCaipChainId(config.chainId),
+     *     nativeCurrency: config.nativeCurrency,
+     *   }));
+     *
+     * const multichainNetworks = Object.values(multichainState.multichainNetworkConfigurationsByChainId)
+     *   .map(config => ({
+     *     chainId: config.chainId,
+     *     nativeCurrency: config.nativeCurrency,
+     *   }));
+     *
+     * await controller.initNativeAssetIdentifiers([...evmNetworks, ...multichainNetworks]);
+     * ```
+     */
+    async initNativeAssetIdentifiers(networks) {
+        // Process networks and collect updates
+        const updates = [];
+        for (const { chainId, nativeCurrency } of networks) {
+            // Check if nativeCurrency is already in CAIP-19 format (e.g., "bip122:.../slip44:0")
+            // Non-EVM networks from MultichainNetworkController use this format
+            if (nativeCurrency.includes('/slip44:')) {
+                updates.push({
+                    chainId,
+                    identifier: nativeCurrency,
+                });
+                continue;
+            }
+            // Extract namespace from CAIP-2 chainId
+            const [namespace, reference] = chainId.split(':');
+            let slip44CoinType;
+            if (namespace === 'eip155') {
+                // EVM networks: use getSlip44ByChainId (chainid.network data)
+                // Default to 60 (Ethereum) if no specific mapping is found
+                const numericChainId = parseInt(reference, 10);
+                slip44CoinType =
+                    (await services_1.Slip44Service.getSlip44ByChainId(numericChainId, nativeCurrency)) ?? 60;
+            }
+            else {
+                // Non-EVM networks: use getSlip44BySymbol (@metamask/slip44 package)
+                slip44CoinType = services_1.Slip44Service.getSlip44BySymbol(nativeCurrency);
+            }
+            if (slip44CoinType !== undefined) {
+                updates.push({
+                    chainId,
+                    identifier: buildNativeAssetIdentifier(chainId, slip44CoinType),
+                });
+            }
+        }
+        // Apply all updates synchronously
+        this.update((state) => {
+            for (const { chainId, identifier } of updates) {
+                state.nativeAssetIdentifiers[chainId] = identifier;
+            }
+        });
+    }
     /**
      * Disables a network for the user.
      *
@@ -274,8 +388,8 @@ class NetworkEnablementController extends base_controller_1.BaseController {
     disableNetwork(chainId) {
         const derivedKeys = (0, utils_2.deriveKeys)(chainId);
         const { namespace, storageKey } = derivedKeys;
-        this.update((s) => {
-            s.enabledNetworkMap[namespace][storageKey] = false;
+        this.update((state) => {
+            state.enabledNetworkMap[namespace][storageKey] = false;
         });
     }
     /**
@@ -293,10 +407,53 @@ class NetworkEnablementController extends base_controller_1.BaseController {
     }
 }
 exports.NetworkEnablementController = NetworkEnablementController;
-_NetworkEnablementController_instances = new WeakSet(), _NetworkEnablementController_ensureNamespaceBucket = function _NetworkEnablementController_ensureNamespaceBucket(state, ns) {
+_NetworkEnablementController_instances = new WeakSet(), _NetworkEnablementController_onNativeCurrencyChange = 
+/**
+ * Handles changes to network nativeCurrency values.
+ * Compares current and previous nativeCurrency maps to detect updates.
+ *
+ * @param currentNativeCurrencies - Current map of chainId to nativeCurrency
+ * @param previousNativeCurrencies - Previous map of chainId to nativeCurrency
+ */
+async function _NetworkEnablementController_onNativeCurrencyChange(currentNativeCurrencies, previousNativeCurrencies) {
+    // Skip if no previous state (initial subscription)
+    if (!previousNativeCurrencies) {
+        return;
+    }
+    // Find chains where nativeCurrency has changed
+    for (const [chainId, currentCurrency] of Object.entries(currentNativeCurrencies)) {
+        const previousCurrency = previousNativeCurrencies[chainId];
+        // Only update if the nativeCurrency changed (not for new chains - those are handled by networkAdded)
+        if (previousCurrency !== undefined &&
+            previousCurrency !== currentCurrency) {
+            await __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_updateNativeAssetIdentifier).call(this, chainId, currentCurrency);
+        }
+    }
+}, _NetworkEnablementController_ensureNamespaceBucket = function _NetworkEnablementController_ensureNamespaceBucket(state, ns) {
     if (!state.enabledNetworkMap[ns]) {
         state.enabledNetworkMap[ns] = {};
     }
+}, _NetworkEnablementController_updateNativeAssetIdentifier = 
+/**
+ * Updates the native asset identifier for an EVM network based on its symbol.
+ *
+ * This method looks up the SLIP-44 coin type using chainid.network data
+ * (via getSlip44ByChainId) and updates the nativeAssetIdentifiers state.
+ * This is only called for EVM networks from NetworkController state changes.
+ *
+ * @param chainId - The chain ID of the network (Hex format)
+ * @param symbol - The native currency symbol of the network (e.g., 'ETH')
+ */
+async function _NetworkEnablementController_updateNativeAssetIdentifier(chainId, symbol) {
+    const { caipChainId, reference } = (0, utils_2.deriveKeys)(chainId);
+    // Parse hex chainId to number for chainid.network lookup
+    const numericChainId = parseInt(reference, 16);
+    // EVM networks: use getSlip44ByChainId (chainid.network data)
+    // Default to 60 (Ethereum) if no specific mapping is found
+    const slip44CoinType = (await services_1.Slip44Service.getSlip44ByChainId(numericChainId, symbol)) ?? 60;
+    this.update((state) => {
+        state.nativeAssetIdentifiers[caipChainId] = buildNativeAssetIdentifier(caipChainId, slip44CoinType);
+    });
 }, _NetworkEnablementController_isInPopularNetworksMode = function _NetworkEnablementController_isInPopularNetworksMode() {
     // Get current network configurations to check which popular networks exist
     const networkControllerState = this.messenger.call('NetworkController:getState');
@@ -314,22 +471,42 @@ _NetworkEnablementController_instances = new WeakSet(), _NetworkEnablementContro
     return enabledPopularNetworksCount > 1;
 }, _NetworkEnablementController_removeNetworkEntry = function _NetworkEnablementController_removeNetworkEntry(chainId) {
     const derivedKeys = (0, utils_2.deriveKeys)(chainId);
-    const { namespace, storageKey } = derivedKeys;
-    this.update((s) => {
+    const { namespace, storageKey, caipChainId } = derivedKeys;
+    this.update((state) => {
         // fallback and enable ethereum mainnet
         if ((0, utils_2.isOnlyNetworkEnabledInNamespace)(this.state, derivedKeys)) {
-            s.enabledNetworkMap[namespace][controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.Mainnet]] =
-                true;
+            state.enabledNetworkMap[namespace][controller_utils_1.ChainId[controller_utils_1.BuiltInNetworkName.Mainnet]] = true;
         }
-        if (namespace in s.enabledNetworkMap) {
-            delete s.enabledNetworkMap[namespace][storageKey];
+        if (namespace in state.enabledNetworkMap) {
+            delete state.enabledNetworkMap[namespace][storageKey];
         }
+        // Remove from nativeAssetIdentifiers as well
+        delete state.nativeAssetIdentifiers[caipChainId];
     });
-}, _NetworkEnablementController_onAddNetwork = function _NetworkEnablementController_onAddNetwork(chainId) {
-    const { namespace, storageKey, reference } = (0, utils_2.deriveKeys)(chainId);
-    this.update((s) => {
+}, _NetworkEnablementController_onAddNetwork = 
+/**
+ * Handles the addition of a new EVM network to the controller.
+ *
+ * @param chainId - The chain ID to add (Hex format)
+ * @param nativeCurrency - The native currency symbol of the network (e.g., 'ETH')
+ *
+ * @description
+ * - If in popular networks mode (>2 popular networks enabled) AND adding a popular network:
+ * - Keep current selection (add but don't enable the new network)
+ * - Otherwise:
+ * - Switch to the newly added network (disable all others, enable this one)
+ * - Also updates the nativeAssetIdentifiers with the CAIP-19-like identifier
+ */
+async function _NetworkEnablementController_onAddNetwork(chainId, nativeCurrency) {
+    const { namespace, storageKey, reference, caipChainId } = (0, utils_2.deriveKeys)(chainId);
+    // Parse hex chainId to number for chainid.network lookup
+    const numericChainId = parseInt(reference, 16);
+    // EVM networks: use getSlip44ByChainId (chainid.network data)
+    // Default to 60 (Ethereum) if no specific mapping is found
+    const slip44CoinType = (await services_1.Slip44Service.getSlip44ByChainId(numericChainId, nativeCurrency)) ?? 60;
+    this.update((state) => {
         // Ensure the namespace bucket exists
-        __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_ensureNamespaceBucket).call(this, s, namespace);
+        __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_ensureNamespaceBucket).call(this, state, namespace);
         // Check if popular networks mode is active (>2 popular networks enabled)
         const inPopularNetworksMode = __classPrivateFieldGet(this, _NetworkEnablementController_instances, "m", _NetworkEnablementController_isInPopularNetworksMode).call(this);
         // Check if the network being added is a popular network
@@ -338,18 +515,20 @@ _NetworkEnablementController_instances = new WeakSet(), _NetworkEnablementContro
         const shouldKeepCurrentSelection = inPopularNetworksMode && isAddedNetworkPopular;
         if (shouldKeepCurrentSelection) {
             // Add the popular network but don't enable it (keep current selection)
-            s.enabledNetworkMap[namespace][storageKey] = true;
+            state.enabledNetworkMap[namespace][storageKey] = true;
         }
         else {
             // Switch to the newly added network (disable all others, enable this one)
-            Object.keys(s.enabledNetworkMap).forEach((ns) => {
-                Object.keys(s.enabledNetworkMap[ns]).forEach((key) => {
-                    s.enabledNetworkMap[ns][key] = false;
+            Object.keys(state.enabledNetworkMap).forEach((ns) => {
+                Object.keys(state.enabledNetworkMap[ns]).forEach((key) => {
+                    state.enabledNetworkMap[ns][key] = false;
                 });
             });
             // Enable the newly added network
-            s.enabledNetworkMap[namespace][storageKey] = true;
+            state.enabledNetworkMap[namespace][storageKey] = true;
         }
+        // Update nativeAssetIdentifiers with the CAIP-19-like identifier
+        state.nativeAssetIdentifiers[caipChainId] = buildNativeAssetIdentifier(caipChainId, slip44CoinType);
     });
 };
 //# sourceMappingURL=NetworkEnablementController.cjs.map