Merge branch 'main' into chore/upgrade-assets-controllers

Author: sahar-fehri

app/scripts/metamask-controller.js

@@ -14,15 +14,7 @@ import { createEngineStream } from '@metamask/json-rpc-middleware-stream';
 import { ObservableStore } from '@metamask/obs-store';
 import { storeAsStream } from '@metamask/obs-store/dist/asStream';
 import { providerAsMiddleware } from '@metamask/eth-json-rpc-middleware';
-import {
-  debounce,
-  throttle,
-  memoize,
-  wrap,
-  pick,
-  cloneDeep,
-  uniq,
-} from 'lodash';
+import { debounce, throttle, memoize, wrap, pick, uniq } from 'lodash';
 import {
   KeyringController,
   KeyringTypes,
@@ -92,6 +84,7 @@ import {
   ERC20,
   ERC721,
   BlockExplorerUrl,
+  ChainId,
 } from '@metamask/controller-utils';
 
 import { AccountsController } from '@metamask/accounts-controller';
@@ -189,8 +182,6 @@ import {
   CHAIN_SPEC_URL,
   NETWORK_TYPES,
   NetworkStatus,
-  MAINNET_DISPLAY_NAME,
-  DEFAULT_CUSTOM_TESTNET_MAP,
   UNSUPPORTED_RPC_METHODS,
 } from '../../shared/constants/network';
 import { getAllowedSmartTransactionsChainIds } from '../../shared/constants/smartTransactions';
@@ -582,22 +573,10 @@ export default class MetamaskController extends EventEmitter {
       const networks =
         initialNetworkControllerState.networkConfigurationsByChainId;
 
-      // Note: Consider changing `getDefaultNetworkControllerState`
-      // on the controller side to include some of these tweaks.
-      networks[CHAIN_IDS.MAINNET].name = MAINNET_DISPLAY_NAME;
-      delete networks[CHAIN_IDS.GOERLI];
-      delete networks[CHAIN_IDS.LINEA_GOERLI];
-
-      // Due to the MegaETH Testnet not being included in getDefaultNetworkControllerState().
-      // and it is not using Infura as a provider, we need to add it manually.
-      networks[CHAIN_IDS.MEGAETH_TESTNET] = cloneDeep(
-        DEFAULT_CUSTOM_TESTNET_MAP[CHAIN_IDS.MEGAETH_TESTNET],
-      );
-
+      // TODO: It should be done on NetworkController level
       Object.values(networks).forEach((network) => {
         const id = network.rpcEndpoints[0].networkClientId;
         // Process only if the default network has a corresponding networkClientId in BlockExplorerUrl.
-        // Note: The MegaETH Testnet is currently the only network that is not included.
         if (hasProperty(BlockExplorerUrl, id)) {
           network.blockExplorerUrls = [BlockExplorerUrl[id]];
         }
@@ -642,6 +621,7 @@ export default class MetamaskController extends EventEmitter {
         fetch: globalThis.fetch.bind(globalThis),
         btoa: globalThis.btoa.bind(globalThis),
       }),
+      additionalDefaultNetworks: [ChainId['megaeth-testnet']],
     });
     this.networkController.initializeProvider();
 

app/scripts/migrations/146.test.ts

@@ -1,11 +1,30 @@
-import { cloneDeep } from 'lodash';
-import {
-  CHAIN_IDS,
-  DEFAULT_CUSTOM_TESTNET_MAP,
-} from '../../../shared/constants/network';
+import { ChainId } from '@metamask/controller-utils';
+
 import { migrate, version } from './146';
 
 const oldVersion = 145;
+const megaEthChainId = ChainId['megaeth-testnet'];
+
+/**
+ * Get the MegaETH testnet network configuration object as snapshot.
+ *
+ * @returns The MegaETH testnet network configuration object.
+ */
+const getMegaEthTestnetConfiguration = () => ({
+  chainId: megaEthChainId,
+  name: 'Mega Testnet',
+  nativeCurrency: 'MegaETH',
+  blockExplorerUrls: ['https://megaexplorer.xyz'],
+  defaultRpcEndpointIndex: 0,
+  defaultBlockExplorerUrlIndex: 0,
+  rpcEndpoints: [
+    {
+      networkClientId: 'megaeth-testnet',
+      url: 'https://carrot.megaeth.com/rpc',
+      type: 'custom',
+    },
+  ],
+});
 
 describe(`migration #${version}`, () => {
   it('updates the version metadata', async () => {
@@ -129,9 +148,7 @@ describe(`migration #${version}`, () => {
           ...oldState.data.NetworkController,
           networkConfigurationsByChainId: {
             ...oldState.data.NetworkController.networkConfigurationsByChainId,
-            [CHAIN_IDS.MEGAETH_TESTNET]: cloneDeep(
-              DEFAULT_CUSTOM_TESTNET_MAP[CHAIN_IDS.MEGAETH_TESTNET],
-            ),
+            [megaEthChainId]: getMegaEthTestnetConfiguration(),
           },
         },
       };
@@ -148,10 +165,8 @@ describe(`migration #${version}`, () => {
             selectedNetworkClientId: 'mainnet',
             networksMetadata: {},
             networkConfigurationsByChainId: {
-              [CHAIN_IDS.MEGAETH_TESTNET]: {
-                ...cloneDeep(
-                  DEFAULT_CUSTOM_TESTNET_MAP[CHAIN_IDS.MEGAETH_TESTNET],
-                ),
+              [megaEthChainId]: {
+                ...getMegaEthTestnetConfiguration(),
                 name: 'Some other name',
               },
             },
@@ -164,9 +179,7 @@ describe(`migration #${version}`, () => {
           ...oldStorage.data.NetworkController,
           networkConfigurationsByChainId: {
             ...oldStorage.data.NetworkController.networkConfigurationsByChainId,
-            [CHAIN_IDS.MEGAETH_TESTNET]: cloneDeep(
-              DEFAULT_CUSTOM_TESTNET_MAP[CHAIN_IDS.MEGAETH_TESTNET],
-            ),
+            [megaEthChainId]: getMegaEthTestnetConfiguration(),
           },
         },
       };

app/scripts/migrations/146.ts

@@ -1,9 +1,16 @@
 import { hasProperty, isObject } from '@metamask/utils';
-import { cloneDeep } from 'lodash';
 import {
-  CHAIN_IDS,
-  DEFAULT_CUSTOM_TESTNET_MAP,
-} from '../../../shared/constants/network';
+  NetworkConfiguration,
+  RpcEndpointType,
+} from '@metamask/network-controller';
+import {
+  BlockExplorerUrl,
+  BUILT_IN_CUSTOM_NETWORKS_RPC,
+  ChainId,
+  NetworkNickname,
+  NetworksTicker,
+} from '@metamask/controller-utils';
+import { cloneDeep } from 'lodash';
 
 type VersionedData = {
   meta: { version: number };
@@ -33,9 +40,27 @@ function transformState(state: Record<string, unknown>) {
     isObject(state.NetworkController) &&
     isObject(state.NetworkController.networkConfigurationsByChainId)
   ) {
+    const megaethTestnet = 'megaeth-testnet';
+    const megaethTestnetChainId = ChainId[megaethTestnet];
+    const megaethTestnetConfiguration: NetworkConfiguration = {
+      chainId: megaethTestnetChainId,
+      name: NetworkNickname[megaethTestnet],
+      nativeCurrency: NetworksTicker[megaethTestnet],
+      blockExplorerUrls: [BlockExplorerUrl[megaethTestnet]],
+      defaultRpcEndpointIndex: 0,
+      defaultBlockExplorerUrlIndex: 0,
+      rpcEndpoints: [
+        {
+          networkClientId: megaethTestnet,
+          type: RpcEndpointType.Custom,
+          url: BUILT_IN_CUSTOM_NETWORKS_RPC.MEGAETH_TESTNET,
+        },
+      ],
+    };
+
     state.NetworkController.networkConfigurationsByChainId[
-      CHAIN_IDS.MEGAETH_TESTNET
-    ] = cloneDeep(DEFAULT_CUSTOM_TESTNET_MAP[CHAIN_IDS.MEGAETH_TESTNET]);
+      megaethTestnetChainId
+    ] = megaethTestnetConfiguration;
   }
   return state;
 }

shared/constants/network.ts

@@ -1,7 +1,4 @@
-import type {
-  AddNetworkFields,
-  NetworkConfiguration,
-} from '@metamask/network-controller';
+import type { AddNetworkFields } from '@metamask/network-controller';
 import { RpcEndpointType } from '@metamask/network-controller';
 import { capitalize, pick } from 'lodash';
 import { Hex, hexToNumber } from '@metamask/utils';
@@ -1249,27 +1246,6 @@ export const FEATURED_NETWORK_CHAIN_IDS = [
   ...FEATURED_RPCS.map((rpc) => rpc.chainId),
 ];
 
-/**
- * A mapping for the default custom testnets.
- */
-export const DEFAULT_CUSTOM_TESTNET_MAP: Record<Hex, NetworkConfiguration> = {
-  [CHAIN_IDS.MEGAETH_TESTNET]: {
-    chainId: CHAIN_IDS.MEGAETH_TESTNET,
-    name: MEGAETH_TESTNET_DISPLAY_NAME,
-    nativeCurrency: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.MEGAETH_TESTNET],
-    blockExplorerUrls: ['https://megaexplorer.xyz'],
-    defaultRpcEndpointIndex: 0,
-    defaultBlockExplorerUrlIndex: 0,
-    rpcEndpoints: [
-      {
-        networkClientId: 'megaeth-testnet',
-        url: 'https://carrot.megaeth.com/rpc',
-        type: RpcEndpointType.Custom,
-      },
-    ],
-  },
-};
-
 export const infuraChainIdsTestNets: string[] = [
   CHAIN_IDS.SEPOLIA,
   CHAIN_IDS.HOLESKY,

test/e2e/mock-e2e.js

@@ -676,20 +676,6 @@ async function setupMocking(
       };
     });
 
-  await server
-    .forGet('https://min-api.cryptocompare.com/data/pricemulti')
-    .withQuery({ fsyms: 'ETH,MegaETH', tsyms: 'usd' })
-    .thenCallback(() => {
-      return {
-        statusCode: 200,
-        json: {
-          ETH: {
-            USD: ethConversionInUsd,
-          },
-        },
-      };
-    });
-
   const PPOM_VERSION = fs.readFileSync(PPOM_VERSION_PATH);
   const PPOM_VERSION_HEADERS = fs.readFileSync(PPOM_VERSION_HEADERS_PATH);
   const CDN_CONFIG = fs.readFileSync(CDN_CONFIG_PATH);

ui/helpers/utils/remote-mode.test.ts

@@ -0,0 +1,63 @@
+import type { InternalAccount } from '@metamask/keyring-internal-api';
+import { isRemoteModeSupported } from './remote-mode';
+
+describe('Remote Mode Utils', () => {
+  describe('isRemoteModeSupported', () => {
+    it('returns true for supported hardware wallet types', () => {
+      const ledgerAccount: InternalAccount = {
+        address: '0x12C7e...q135f',
+        type: 'eip155:eoa',
+        id: '1',
+        options: {},
+        metadata: {
+          name: 'Ledger Hardware',
+          importTime: 1717334400,
+          keyring: {
+            type: 'Ledger Hardware',
+          },
+        },
+        scopes: [],
+        methods: [],
+      };
+
+      const latticeAccount: InternalAccount = {
+        address: '0x12C7e...q135f',
+        type: 'eip155:eoa',
+        id: '2',
+        options: {},
+        metadata: {
+          name: 'Lattice Hardware',
+          importTime: 1717334400,
+          keyring: {
+            type: 'Lattice Hardware',
+          },
+        },
+        scopes: [],
+        methods: [],
+      };
+
+      expect(isRemoteModeSupported(ledgerAccount)).toBe(true);
+      expect(isRemoteModeSupported(latticeAccount)).toBe(true);
+    });
+
+    it('returns false for unsupported hardware wallet types', () => {
+      const unsupportedAccount: InternalAccount = {
+        address: '0x12C7e...q135f',
+        type: 'eip155:eoa',
+        id: '3',
+        options: {},
+        metadata: {
+          name: 'Some Other Wallet',
+          importTime: 1717334400,
+          keyring: {
+            type: 'eip155',
+          },
+        },
+        scopes: [],
+        methods: [],
+      };
+
+      expect(isRemoteModeSupported(unsupportedAccount)).toBe(false);
+    });
+  });
+});

ui/helpers/utils/remote-mode.ts

@@ -0,0 +1,10 @@
+import type { InternalAccount } from '@metamask/keyring-internal-api';
+
+const SUPPORTED_HARDWARE_WALLET_TYPES = ['Ledger Hardware', 'Lattice Hardware'];
+
+export function isRemoteModeSupported(account: InternalAccount) {
+  // todo: add check that account also implements signEip7702Authorization()
+  return SUPPORTED_HARDWARE_WALLET_TYPES.includes(
+    account.metadata.keyring.type,
+  );
+}

ui/pages/pages.scss

@@ -21,6 +21,7 @@
 @import 'snaps/snaps-list/index';
 @import 'snaps/snap-view/index';
 @import 'create-snap-account/index';
+@import 'remote-mode/setup/setup-swaps/index';
 @import 'remove-snap-account/index';
 @import 'swaps/index';
 @import 'bridge/index';