Merge branch 'main' into swaps2702-parallel-fetchquotes

Author: micaelae

.github/CODEOWNERS

@@ -14,6 +14,7 @@
 
 ## Assets Team
 /packages/assets-controllers         @MetaMask/metamask-assets
+/packages/network-enablement-controller @MetaMask/metamask-assets
 
 ## Confirmations Team
 /packages/address-book-controller           @MetaMask/confirmations
@@ -157,3 +158,5 @@
 /packages/foundryup/CHANGELOG.md @MetaMask/mobile-platform @MetaMask/extension-platform @MetaMask/core-platform
 /packages/seedless-onboarding-controller/package.json @MetaMask/web3auth @MetaMask/core-platform
 /packages/seedless-onboarding-controller/CHANGELOG.md @MetaMask/web3auth @MetaMask/core-platform
+/packages/network-enablement-controller/package.json @MetaMask/metamask-assets @MetaMask/core-platform
+/packages/network-enablement-controller/CHANGELOG.md @MetaMask/metamask-assets @MetaMask/core-platform

README.md

@@ -54,6 +54,7 @@ Each package in this repository has its own README where you can find installati
 - [`@metamask/multichain-transactions-controller`](packages/multichain-transactions-controller)
 - [`@metamask/name-controller`](packages/name-controller)
 - [`@metamask/network-controller`](packages/network-controller)
+- [`@metamask/network-enablement-controller`](packages/network-enablement-controller)
 - [`@metamask/notification-services-controller`](packages/notification-services-controller)
 - [`@metamask/permission-controller`](packages/permission-controller)
 - [`@metamask/permission-log-controller`](packages/permission-log-controller)
@@ -113,6 +114,7 @@ linkStyle default opacity:0.5
   multichain_transactions_controller(["@metamask/multichain-transactions-controller"]);
   name_controller(["@metamask/name-controller"]);
   network_controller(["@metamask/network-controller"]);
+  network_enablement_controller(["@metamask/network-enablement-controller"]);
   notification_services_controller(["@metamask/notification-services-controller"]);
   permission_controller(["@metamask/permission-controller"]);
   permission_log_controller(["@metamask/permission-log-controller"]);
@@ -228,6 +230,10 @@ linkStyle default opacity:0.5
   network_controller --> eth_json_rpc_provider;
   network_controller --> json_rpc_engine;
   network_controller --> error_reporting_service;
+  network_enablement_controller --> base_controller;
+  network_enablement_controller --> controller_utils;
+  network_enablement_controller --> multichain_network_controller;
+  network_enablement_controller --> network_controller;
   notification_services_controller --> base_controller;
   notification_services_controller --> controller_utils;
   notification_services_controller --> keyring_controller;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/core-monorepo",
-  "version": "486.0.0",
+  "version": "487.0.0",
   "private": true,
   "description": "Monorepo for packages shared between MetaMask clients",
   "repository": {

packages/assets-controllers/CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Use a narrow selector when listening to `CurrencyRateController:stateChange` ([#6217](https://github.com/MetaMask/core/pull/6217))
+- Fixed an issue where attempting to fetch asset conversions for accounts without assets would crash the snap ([#6207](https://github.com/MetaMask/core/pull/6207))
 
 ## [73.0.1]
 

packages/assets-controllers/src/MultichainAssetsRatesController/MultichainAssetsRatesController.test.ts

@@ -503,6 +503,31 @@ describe('MultichainAssetsRatesController', () => {
     expect(controller.state.conversionRates).toStrictEqual({});
   });
 
+  it('does not make snap requests when updateAssetsRatesForNewAssets is called with no new assets', async () => {
+    const { controller, messenger } = setupController();
+
+    const snapSpy = jest.fn().mockResolvedValue(fakeAccountRates);
+    messenger.registerActionHandler('SnapController:handleRequest', snapSpy);
+
+    // Publish accountAssetListUpdated event with accounts that have no new assets (empty added arrays)
+    messenger.publish('MultichainAssetsController:accountAssetListUpdated', {
+      assets: {
+        account1: {
+          added: [], // No new assets added
+          removed: [],
+        },
+      },
+    });
+
+    // Wait for the asynchronous subscriber to process the event
+    await Promise.resolve();
+
+    // Verify no snap requests were made since there are no new assets to process
+    expect(snapSpy).not.toHaveBeenCalled();
+    // Verify state remains empty
+    expect(controller.state.conversionRates).toStrictEqual({});
+  });
+
   it('updates state when currency is updated', async () => {
     const { controller, messenger } = setupController();
 

packages/assets-controllers/src/MultichainAssetsRatesController/MultichainAssetsRatesController.ts

@@ -346,6 +346,11 @@ export class MultichainAssetsRatesController extends StaticIntervalPollingContro
   ): Promise<
     Record<string, UnifiedAssetConversion & { currency: CaipAssetType }>
   > {
+    // Do not attempt to retrieve rates from Snap if there are no assets
+    if (!assets.length) {
+      return {};
+    }
+
     // Build the conversions array
     const conversions = this.#buildConversions(assets);
 

packages/network-enablement-controller/CHANGELOG.md

@@ -0,0 +1,17 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.1.0]
+
+### Added
+
+- Initial release ([#6028](https://github.com/MetaMask/core/pull/6028))
+
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/network-enablement-controller@0.1.0...HEAD
+[0.1.0]: https://github.com/MetaMask/core/releases/tag/@metamask/network-enablement-controller@0.1.0

packages/network-enablement-controller/LICENSE

@@ -0,0 +1,20 @@
+MIT License
+
+Copyright (c) 2025 MetaMask
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

packages/network-enablement-controller/README.md

@@ -0,0 +1,182 @@
+# Network Enablement Controller
+
+A MetaMask controller for managing network enablement state across different blockchain networks.
+
+## Overview
+
+The NetworkEnablementController tracks which networks are enabled/disabled for the user and provides methods to toggle network states. It supports both EVM (EIP-155) and non-EVM networks like Solana.
+
+## Installation
+
+```bash
+npm install @metamask/network-enablement-controller
+```
+
+```bash
+yarn add @metamask/network-enablement-controller
+```
+
+## Usage
+
+### Basic Controller Usage
+
+```typescript
+import { NetworkEnablementController } from '@metamask/network-enablement-controller';
+
+// Create controller instance
+const controller = new NetworkEnablementController({
+  messenger,
+  state: {
+    enabledNetworkMap: {
+      eip155: {
+        '0x1': true, // Ethereum mainnet enabled
+        '0xa': false, // Optimism disabled
+      },
+      solana: {
+        'solana:mainnet': true,
+      },
+    },
+  },
+});
+
+// Enable a network
+controller.setEnabledNetwork('0x1'); // Hex format for EVM
+controller.setEnabledNetwork('eip155:1'); // CAIP-2 format for EVM
+controller.setEnabledNetwork('solana:mainnet'); // CAIP-2 format for Solana
+
+// Disable a network
+controller.setDisabledNetwork('0xa');
+
+// Check if network is enabled
+const isEnabled = controller.isNetworkEnabled('0x1');
+
+// Get all enabled networks for a namespace
+const evmNetworks = controller.getEnabledNetworksForNamespace('eip155');
+
+// Get all enabled networks across all namespaces
+const allNetworks = controller.getAllEnabledNetworks();
+```
+
+### Using Selectors (Redux-style)
+
+The controller also provides selectors that can be used in Redux contexts or any state management system:
+
+```typescript
+import {
+  selectIsNetworkEnabled,
+  selectAllEnabledNetworks,
+  selectEnabledNetworksForNamespace,
+  selectEnabledEvmNetworks,
+  selectEnabledSolanaNetworks,
+} from '@metamask/network-enablement-controller';
+
+// Get controller state
+const state = controller.state;
+
+// Check if a specific network is enabled
+const isEthereumEnabled = selectIsNetworkEnabled('0x1')(state);
+const isSolanaEnabled = selectIsNetworkEnabled('solana:mainnet')(state);
+
+// Get all enabled networks across all namespaces
+const allEnabledNetworks = selectAllEnabledNetworks(state);
+// Returns: { eip155: ['0x1'], solana: ['solana:mainnet'] }
+
+// Get enabled networks for a specific namespace
+const evmNetworks = selectEnabledNetworksForNamespace('eip155')(state);
+const solanaNetworks = selectEnabledNetworksForNamespace('solana')(state);
+
+// Convenience selectors for specific network types
+const enabledEvmNetworks = selectEnabledEvmNetworks(state);
+const enabledSolanaNetworks = selectEnabledSolanaNetworks(state);
+
+// Get total count of enabled networks
+const totalEnabled = selectEnabledNetworksCount(state);
+
+// Check if any networks are enabled for a namespace
+const hasEvmNetworks = selectHasEnabledNetworksForNamespace('eip155')(state);
+```
+
+## API Reference
+
+### Controller Methods
+
+#### `setEnabledNetwork(chainId: Hex | CaipChainId): void`
+
+Enables a network for the user. Accepts either Hex chain IDs (for EVM networks) or CAIP-2 chain IDs (for any blockchain network).
+
+#### `setDisabledNetwork(chainId: Hex | CaipChainId): void`
+
+Disables a network for the user. Prevents disabling the last remaining enabled network.
+
+#### `isNetworkEnabled(chainId: Hex | CaipChainId): boolean`
+
+Checks if a network is currently enabled. Returns false for unknown networks.
+
+#### `getEnabledNetworksForNamespace(namespace: CaipNamespace): string[]`
+
+Gets all enabled networks for a specific namespace.
+
+#### `getAllEnabledNetworks(): Record<CaipNamespace, string[]>`
+
+Gets all enabled networks across all namespaces.
+
+### Selectors
+
+#### `selectIsNetworkEnabled(chainId: Hex | CaipChainId)`
+
+Returns a selector function that checks if a specific network is enabled.
+
+#### `selectAllEnabledNetworks`
+
+Returns a selector function that gets all enabled networks across all namespaces.
+
+#### `selectEnabledNetworksForNamespace(namespace: CaipNamespace)`
+
+Returns a selector function that gets enabled networks for a specific namespace.
+
+#### `selectEnabledNetworksCount`
+
+Returns a selector function that gets the total count of enabled networks.
+
+#### `selectHasEnabledNetworksForNamespace(namespace: CaipNamespace)`
+
+Returns a selector function that checks if any networks are enabled for a namespace.
+
+#### `selectEnabledEvmNetworks`
+
+Returns a selector function that gets all enabled EVM networks.
+
+#### `selectEnabledSolanaNetworks`
+
+Returns a selector function that gets all enabled Solana networks.
+
+## Chain ID Formats
+
+The controller supports two chain ID formats:
+
+1. **Hex format**: Traditional EVM chain IDs (e.g., `'0x1'` for Ethereum mainnet)
+2. **CAIP-2 format**: Chain Agnostic Improvement Proposal format (e.g., `'eip155:1'` for Ethereum mainnet, `'solana:mainnet'` for Solana)
+
+## Network Types
+
+### EVM Networks (eip155 namespace)
+
+- Ethereum Mainnet: `'0x1'` or `'eip155:1'`
+- Optimism: `'0xa'` or `'eip155:10'`
+- Arbitrum One: `'0xa4b1'` or `'eip155:42161'`
+
+### Solana Networks (solana namespace)
+
+- Solana Mainnet: `'solana:mainnet'`
+- Solana Testnet: `'solana:testnet'`
+
+## State Persistence
+
+The controller state is automatically persisted and restored between sessions. The `enabledNetworkMap` is stored anonymously to protect user privacy.
+
+## Safety Features
+
+- **At least one network enabled**: The controller ensures at least one network is always enabled
+- **Unknown network protection**: Prevents enabling networks not configured in the system
+- **Exclusive mode**: When enabling non-popular networks, all other networks are disabled
+- **Last network protection**: Prevents disabling the last remaining enabled network

packages/network-enablement-controller/jest.config.js

@@ -0,0 +1,26 @@
+/*
+ * For a detailed explanation regarding each configuration property and type check, visit:
+ * https://jestjs.io/docs/configuration
+ */
+
+const merge = require('deepmerge');
+const path = require('path');
+
+const baseConfig = require('../../jest.config.packages');
+
+const displayName = path.basename(__dirname);
+
+module.exports = merge(baseConfig, {
+  // The display name when running multiple projects
+  displayName,
+
+  // An object that configures minimum threshold enforcement for coverage results
+  coverageThreshold: {
+    global: {
+      branches: 100,
+      functions: 100,
+      lines: 100,
+      statements: 100,
+    },
+  },
+});