Merge branch 'main' into mikesposito/deps/smart-transaction-controller

Author: mikesposito

.github/workflows/add-team-label.yml

@@ -8,6 +8,6 @@ on:
 jobs:
   add-team-label:
     if: ${{ !github.event.pull_request.head.repo.fork }}
-    uses: metamask/github-tools/.github/workflows/add-team-label.yml@18af6e4b56a18230d1792480e249ebc50b324927
+    uses: metamask/github-tools/.github/workflows/add-team-label.yml@7fe185fdb0e60981c898e88d82e44ff33f604daa
     secrets:
       TEAM_LABEL_TOKEN: ${{ secrets.TEAM_LABEL_TOKEN }}

.github/workflows/update-lavamoat-policies.yml

@@ -4,10 +4,6 @@ on:
   issue_comment:
     types: created
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}
-  cancel-in-progress: ${{ !contains(github.ref_name, 'release/')}}
-
 jobs:
   is-fork-pull-request:
     name: Determine whether this issue comment was on a pull request from a fork

app/_locales/en/messages.json

@@ -6,6 +6,8 @@ import {
   AccountTreeControllerGetAccountsFromSelectedAccountGroupAction,
   AccountTreeControllerSelectedAccountGroupChangeEvent,
 } from '@metamask/account-tree-controller';
+import { KnownCaipNamespace } from '@metamask/utils';
+import { CHAIN_IDS } from '../../../../shared/constants/network';
 import { ControllerInitRequest } from '../types';
 import { buildControllerInitRequestMock } from '../test/utils';
 import {
@@ -37,15 +39,23 @@ function getInitRequestMock(
     if (controllerName === 'MultichainNetworkController') {
       return {
         state: {
-          multichainNetworkConfigurationsByChainId: {},
+          multichainNetworkConfigurationsByChainId: {
+            [SolScope.Mainnet]: {},
+            [BtcScope.Mainnet]: {},
+          },
         },
       };
     }
 
     if (controllerName === 'NetworkController') {
       return {
         state: {
-          networkConfigurationsByChainId: {},
+          networkConfigurationsByChainId: {
+            [CHAIN_IDS.MAINNET]: {},
+            [CHAIN_IDS.POLYGON]: {},
+            [CHAIN_IDS.SEPOLIA]: {},
+            [CHAIN_IDS.LOCALHOST]: {},
+          },
         },
       };
     }
@@ -63,22 +73,6 @@ describe('NetworkEnablementControllerInit', () => {
     expect(controller).toBeInstanceOf(NetworkEnablementController);
   });
 
-  it('passes the proper arguments to the controller', () => {
-    NetworkEnablementControllerInit(getInitRequestMock());
-
-    const controllerMock = jest.mocked(NetworkEnablementController);
-    expect(controllerMock).toHaveBeenCalledWith({
-      messenger: expect.any(Object),
-      state: {
-        enabledNetworkMap: {
-          bitcoin: {},
-          eip155: {},
-          solana: {},
-        },
-      },
-    });
-  });
-
   it('enables the Solana network when `AccountsController:selectedAccountChange` is emitted', () => {
     const messenger = new Messenger<
       never,
@@ -225,4 +219,118 @@ describe('NetworkEnablementControllerInit', () => {
 
     expect(controller.enableNetwork).not.toHaveBeenCalled();
   });
+
+  it('initialises the controller with the correct networks for prod environment', () => {
+    process.env.METAMASK_DEBUG = '';
+    process.env.METAMASK_ENVIRONMENT = 'production';
+    process.env.IN_TEST = '';
+
+    NetworkEnablementControllerInit(getInitRequestMock());
+
+    const controllerMock = jest.mocked(NetworkEnablementController);
+    expect(controllerMock).toHaveBeenCalledWith({
+      messenger: expect.any(Object),
+      state: {
+        enabledNetworkMap: {
+          [KnownCaipNamespace.Eip155]: {
+            [CHAIN_IDS.MAINNET]: true,
+            [CHAIN_IDS.POLYGON]: true,
+            [CHAIN_IDS.SEPOLIA]: false,
+            [CHAIN_IDS.LOCALHOST]: false,
+          },
+          [KnownCaipNamespace.Solana]: {
+            [SolScope.Mainnet]: true,
+          },
+          [KnownCaipNamespace.Bip122]: {
+            [BtcScope.Mainnet]: true,
+          },
+        },
+      },
+    });
+  });
+
+  it('initialises the controller with the correct networks for IN_TEST environment', () => {
+    process.env.IN_TEST = 'true';
+
+    NetworkEnablementControllerInit(getInitRequestMock());
+
+    const controllerMock = jest.mocked(NetworkEnablementController);
+    expect(controllerMock).toHaveBeenCalledWith({
+      messenger: expect.any(Object),
+      state: {
+        enabledNetworkMap: {
+          [KnownCaipNamespace.Eip155]: {
+            [CHAIN_IDS.MAINNET]: false,
+            [CHAIN_IDS.POLYGON]: false,
+            [CHAIN_IDS.SEPOLIA]: false,
+            [CHAIN_IDS.LOCALHOST]: true,
+          },
+          [KnownCaipNamespace.Solana]: {
+            [SolScope.Mainnet]: false,
+          },
+          [KnownCaipNamespace.Bip122]: {
+            [BtcScope.Mainnet]: false,
+          },
+        },
+      },
+    });
+  });
+
+  it('initialises the controller with the correct networks for DEBUG environment', () => {
+    process.env.METAMASK_DEBUG = 'true';
+    process.env.METAMASK_ENVIRONMENT = 'production';
+    process.env.IN_TEST = '';
+
+    NetworkEnablementControllerInit(getInitRequestMock());
+
+    const controllerMock = jest.mocked(NetworkEnablementController);
+    expect(controllerMock).toHaveBeenCalledWith({
+      messenger: expect.any(Object),
+      state: {
+        enabledNetworkMap: {
+          [KnownCaipNamespace.Eip155]: {
+            [CHAIN_IDS.MAINNET]: false,
+            [CHAIN_IDS.POLYGON]: false,
+            [CHAIN_IDS.SEPOLIA]: true,
+            [CHAIN_IDS.LOCALHOST]: false,
+          },
+          [KnownCaipNamespace.Solana]: {
+            [SolScope.Mainnet]: false,
+          },
+          [KnownCaipNamespace.Bip122]: {
+            [BtcScope.Mainnet]: false,
+          },
+        },
+      },
+    });
+  });
+
+  it('initialises the controller with the correct networks for test environment', () => {
+    process.env.METAMASK_DEBUG = '';
+    process.env.METAMASK_ENVIRONMENT = 'test';
+    process.env.IN_TEST = '';
+
+    NetworkEnablementControllerInit(getInitRequestMock());
+
+    const controllerMock = jest.mocked(NetworkEnablementController);
+    expect(controllerMock).toHaveBeenCalledWith({
+      messenger: expect.any(Object),
+      state: {
+        enabledNetworkMap: {
+          [KnownCaipNamespace.Eip155]: {
+            [CHAIN_IDS.MAINNET]: false,
+            [CHAIN_IDS.POLYGON]: false,
+            [CHAIN_IDS.SEPOLIA]: true,
+            [CHAIN_IDS.LOCALHOST]: false,
+          },
+          [KnownCaipNamespace.Solana]: {
+            [SolScope.Mainnet]: false,
+          },
+          [KnownCaipNamespace.Bip122]: {
+            [BtcScope.Mainnet]: false,
+          },
+        },
+      },
+    });
+  });
 });

app/_locales/en_GB/messages.json

@@ -11,7 +11,13 @@ import {
   SolAccountType,
   SolScope,
 } from '@metamask/keyring-api';
-import { KnownCaipNamespace } from '@metamask/utils';
+import {
+  CaipChainId,
+  CaipNamespace,
+  Hex,
+  KnownCaipNamespace,
+  parseCaipChainId,
+} from '@metamask/utils';
 import {
   NetworkEnablementControllerMessenger,
   NetworkEnablementControllerInitMessenger,
@@ -32,12 +38,14 @@ import {
 const generateEVMNetworkMap = (
   networkConfigurationsByChainId: NetworkState['networkConfigurationsByChainId'],
   enabledChainIds: string[],
-): Record<string, boolean> => {
-  const networkMap: Record<string, boolean> = {};
+): Record<KnownCaipNamespace.Eip155, Record<Hex, boolean>> => {
+  const networkMap: Record<KnownCaipNamespace.Eip155, Record<Hex, boolean>> = {
+    [KnownCaipNamespace.Eip155]: {},
+  };
 
-  // Add all available EVM networks from NetworkController with default disabled status
-  Object.keys(networkConfigurationsByChainId).forEach((chainId) => {
-    networkMap[chainId] = enabledChainIds.includes(chainId);
+  (Object.keys(networkConfigurationsByChainId) as Hex[]).forEach((chainId) => {
+    networkMap[KnownCaipNamespace.Eip155][chainId] =
+      enabledChainIds.includes(chainId);
   });
 
   return networkMap;
@@ -53,22 +61,16 @@ const generateEVMNetworkMap = (
 const generateMultichainNetworkMaps = (
   multichainNetworkConfigurationsByChainId: MultichainNetworkControllerState['multichainNetworkConfigurationsByChainId'],
   enabledNetworks: string[] = [],
-): Record<string, Record<string, boolean>> => {
-  const networkMaps: Record<string, Record<string, boolean>> = {
-    solana: {},
-    bitcoin: {},
-  };
+): Record<CaipNamespace, Record<CaipChainId, boolean>> => {
+  const networkMaps: Record<CaipNamespace, Record<CaipChainId, boolean>> = {};
 
-  // Organize multichain networks by their prefix/type
-  Object.keys(multichainNetworkConfigurationsByChainId).forEach((chainId) => {
+  (
+    Object.keys(multichainNetworkConfigurationsByChainId) as CaipChainId[]
+  ).forEach((chainId) => {
     const isEnabled = enabledNetworks.includes(chainId);
+    const { namespace } = parseCaipChainId(chainId);
 
-    if (chainId.startsWith('solana:')) {
-      networkMaps.solana[chainId] = isEnabled;
-    } else if (chainId.startsWith('bip122:')) {
-      networkMaps.bitcoin[chainId] = isEnabled;
-    }
-    // Add other network types as needed
+    (networkMaps[namespace] ??= {})[chainId] = isEnabled;
   });
 
   return networkMaps;
@@ -82,19 +84,16 @@ const generateDefaultNetworkEnablementControllerState = (
   const { multichainNetworkConfigurationsByChainId } =
     multichainNetworkControllerState;
 
-  // Generate multichain network maps (always empty for all environments currently)
-  const multichainMaps = generateMultichainNetworkMaps(
-    multichainNetworkConfigurationsByChainId,
-    [],
-  );
-
   if (process.env.IN_TEST) {
     return {
       enabledNetworkMap: {
-        eip155: generateEVMNetworkMap(networkConfigurationsByChainId, [
+        ...generateEVMNetworkMap(networkConfigurationsByChainId, [
           CHAIN_IDS.LOCALHOST,
         ]),
-        ...multichainMaps,
+        ...generateMultichainNetworkMaps(
+          multichainNetworkConfigurationsByChainId,
+          [],
+        ),
       },
     };
   } else if (
@@ -103,21 +102,33 @@ const generateDefaultNetworkEnablementControllerState = (
   ) {
     return {
       enabledNetworkMap: {
-        eip155: generateEVMNetworkMap(networkConfigurationsByChainId, [
+        ...generateEVMNetworkMap(networkConfigurationsByChainId, [
           CHAIN_IDS.SEPOLIA,
         ]),
-        ...multichainMaps,
+        ...generateMultichainNetworkMaps(
+          multichainNetworkConfigurationsByChainId,
+          [],
+        ),
       },
     };
   }
 
+  const enabledMultichainNetworks: string[] = [SolScope.Mainnet];
+
+  ///: BEGIN:ONLY_INCLUDE_IF(bitcoin)
+  enabledMultichainNetworks.push(BtcScope.Mainnet);
+  ///: END:ONLY_INCLUDE_IF
+
   return {
     enabledNetworkMap: {
-      eip155: generateEVMNetworkMap(
+      ...generateEVMNetworkMap(
         networkConfigurationsByChainId,
         FEATURED_NETWORK_CHAIN_IDS,
       ),
-      ...multichainMaps,
+      ...generateMultichainNetworkMaps(
+        multichainNetworkConfigurationsByChainId,
+        enabledMultichainNetworks,
+      ),
     },
   };
 };

app/images/lukso-native.svg

@@ -36,7 +36,10 @@ export function getShieldControllerMessenger(
   return messenger.getRestricted({
     name: 'ShieldController',
     allowedActions: [],
-    allowedEvents: ['TransactionController:stateChange'],
+    allowedEvents: [
+      'SignatureController:stateChange',
+      'TransactionController:stateChange',
+    ],
   });
 }