Merge branch 'main' into update-network-nicknames

Author: bergarces

.github/workflows/main.yml

@@ -24,16 +24,38 @@ jobs:
         shell: bash
 
   analyse-code:
-    name: Code scanner
+    name: Analyse code
     needs: check-workflows
-    uses: ./.github/workflows/security-code-scanner.yml
+    uses: MetaMask/action-security-code-scanner/.github/workflows/security-scan.yml@v2
+    with:
+      scanner-ref: v2
+      paths-ignored: |
+        .storybook/
+        **/__snapshots__/
+        **/*.snap
+        **/*.stories.js
+        **/*.stories.tsx
+        **/*.test.browser.ts*
+        **/*.test.js*
+        **/*.test.ts*
+        **/fixtures/
+        **/jest.config.js
+        **/jest.environment.js
+        **/mocks/
+        **/test*/
+        docs/
+        e2e/
+        merged-packages/
+        node_modules/
+        storybook/
+        test*/
+    secrets:
+      project-metrics-token: ${{ secrets.SECURITY_SCAN_METRICS_TOKEN }}
+      slack-webhook: ${{ secrets.APPSEC_BOT_SLACK_WEBHOOK }}
     permissions:
       actions: read
       contents: read
       security-events: write
-    secrets:
-      SECURITY_SCAN_METRICS_TOKEN: ${{ secrets.SECURITY_SCAN_METRICS_TOKEN }}
-      APPSEC_BOT_SLACK_WEBHOOK: ${{ secrets.APPSEC_BOT_SLACK_WEBHOOK }}
 
   lint-build-test:
     name: Lint, build, and test
@@ -49,7 +71,7 @@ jobs:
       IS_RELEASE: ${{ steps.is-release.outputs.IS_RELEASE }}
     steps:
       - id: is-release
-        uses: MetaMask/action-is-release@dc4672b05e3b1d464cdaf783579b04a4e43f8b02
+        uses: MetaMask/action-is-release@v2
         with:
           commit-starts-with: 'Release [version],Release v[version],Release/[version],Release/v[version],Release `[version]`'
 

.github/workflows/security-code-scanner.yml

@@ -63,7 +63,16 @@ type AllEvents = AllGasFeeControllerEvents | AllNetworkControllerEvents;
 type RootMessenger = Messenger<MockAnyNamespace, AllActions, AllEvents>;
 
 const getRootMessenger = (): RootMessenger => {
-  return new Messenger({ namespace: MOCK_ANY_NAMESPACE });
+  const rootMessenger = new Messenger<
+    MockAnyNamespace,
+    MessengerActions<NetworkControllerMessenger>,
+    MessengerEvents<NetworkControllerMessenger>
+  >({ namespace: MOCK_ANY_NAMESPACE });
+  rootMessenger.registerActionHandler(
+    'ErrorReportingService:captureException',
+    jest.fn(),
+  );
+  return rootMessenger;
 };
 
 const setupNetworkController = async ({
@@ -86,6 +95,10 @@ const setupNetworkController = async ({
     namespace: 'NetworkController',
     parent: rootMessenger,
   });
+  rootMessenger.delegate({
+    messenger: networkControllerMessenger,
+    actions: ['ErrorReportingService:captureException'],
+  });
 
   const infuraProjectId = '123';
 

packages/gas-fee-controller/src/GasFeeController.test.ts

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Limit Bitcoin and Tron providers to 3 concurrent account creations by default when creating multichain account groups ([#7052](https://github.com/MetaMask/core/pull/7052))
+
 ## [2.1.0]
 
 ### Added

packages/multichain-account-service/CHANGELOG.md

@@ -28,6 +28,7 @@ export class BtcAccountProvider extends SnapAccountProvider {
   constructor(
     messenger: MultichainAccountServiceMessenger,
     config: BtcAccountProviderConfig = {
+      maxConcurrency: 3,
       createAccounts: {
         timeoutMs: 3000,
       },

packages/multichain-account-service/src/providers/BtcAccountProvider.ts

@@ -18,7 +18,7 @@ const TEST_SNAP_ID = 'npm:@metamask/test-snap' as SnapId;
 const TEST_ENTROPY_SOURCE = 'test-entropy-source' as EntropySourceId;
 
 // Helper to create a tracked provider that monitors concurrent execution
-const createTrackedProvider = (maxConcurrency: number) => {
+const createTrackedProvider = (maxConcurrency?: number) => {
   const tracker: {
     startLog: number[];
     endLog: number[];
@@ -67,7 +67,7 @@ const createTrackedProvider = (maxConcurrency: number) => {
 
   const messenger = getMultichainAccountServiceMessenger(getRootMessenger());
   const config = {
-    maxConcurrency,
+    ...(maxConcurrency !== undefined && { maxConcurrency }),
     createAccounts: {
       timeoutMs: 5000,
     },
@@ -197,5 +197,26 @@ describe('SnapAccountProvider', () => {
       // With maxConcurrency=1, never more than 1 should run at a time
       expect(tracker.maxActiveCount).toBe(1);
     });
+
+    it('defaults to Infinity when maxConcurrency is not provided', async () => {
+      const { provider, tracker } = createTrackedProvider();
+
+      // Start 4 concurrent calls
+      const promises = [0, 1, 2, 3].map((index) =>
+        provider.createAccounts({
+          entropySource: TEST_ENTROPY_SOURCE,
+          groupIndex: index,
+        }),
+      );
+
+      await Promise.all(promises);
+
+      // All 4 operations should complete
+      expect(tracker.startLog).toHaveLength(4);
+
+      // Without maxConcurrency specified, should default to Infinity (no throttling)
+      // So all 4 should have been able to run concurrently
+      expect(tracker.maxActiveCount).toBe(4);
+    });
   });
 });

packages/multichain-account-service/src/providers/SnapAccountProvider.test.ts

@@ -29,6 +29,7 @@ export class TrxAccountProvider extends SnapAccountProvider {
   constructor(
     messenger: MultichainAccountServiceMessenger,
     config: TrxAccountProviderConfig = {
+      maxConcurrency: 3,
       discovery: {
         timeoutMs: 2000,
         maxAttempts: 3,

packages/multichain-account-service/src/providers/TrxAccountProvider.ts

@@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Providers accessible either via network clients or global proxies no longer emit events (or inherit from EventEmitter, for that matter).
 - Bump `@metamask/controller-utils` from `^11.14.1` to `^11.15.0` ([#7003](https://github.com/MetaMask/core/pull/7003))
 
+### Fixed
+
+- Ensure `networksMetadata` never references old network client IDs ([#7047](https://github.com/MetaMask/core/pull/7047))
+  - When removing a network configuration, ensure that metadata for all RPC endpoints in the network configuration are also removed from `networksMetadata`
+  - When initializing the controller, remove metadata for RPC endpoints in `networksMetadata` that are not present in a network configuration
+
 ## [25.0.0]
 
 ### Changed

packages/network-controller/CHANGELOG.md

@@ -1082,12 +1082,17 @@ function correctInitialState(
   const networkConfigurationsSortedByChainId = getNetworkConfigurations(
     state,
   ).sort((a, b) => a.chainId.localeCompare(b.chainId));
-  const networkClientIds = getAvailableNetworkClientIds(
+  const availableNetworkClientIds = getAvailableNetworkClientIds(
     networkConfigurationsSortedByChainId,
   );
+  const invalidNetworkClientIdsWithMetadata = Object.keys(
+    state.networksMetadata,
+  ).filter(
+    (networkClientId) => !availableNetworkClientIds.includes(networkClientId),
+  );
 
   return produce(state, (newState) => {
-    if (!networkClientIds.includes(state.selectedNetworkClientId)) {
+    if (!availableNetworkClientIds.includes(state.selectedNetworkClientId)) {
       const firstNetworkConfiguration = networkConfigurationsSortedByChainId[0];
       const newSelectedNetworkClientId =
         firstNetworkConfiguration.rpcEndpoints[
@@ -1101,6 +1106,18 @@ function correctInitialState(
       );
       newState.selectedNetworkClientId = newSelectedNetworkClientId;
     }
+
+    if (invalidNetworkClientIdsWithMetadata.length > 0) {
+      for (const invalidNetworkClientId of invalidNetworkClientIdsWithMetadata) {
+        delete newState.networksMetadata[invalidNetworkClientId];
+      }
+      messenger.call(
+        'ErrorReportingService:captureException',
+        new Error(
+          '`networksMetadata` had invalid network client IDs, which have been removed',
+        ),
+      );
+    }
   });
 }
 
@@ -2401,6 +2418,10 @@ export class NetworkController extends BaseController<
         mode: 'remove',
         existingNetworkConfiguration,
       });
+
+      for (const rpcEndpoint of existingNetworkConfiguration.rpcEndpoints) {
+        delete state.networksMetadata[rpcEndpoint.networkClientId];
+      }
     });
 
     this.messenger.publish(