Merge branch 'main' into jongsun/build/enable-react-compiler-webpack

Author: MajorLift

.github/workflows/run-e2e.yml

@@ -74,6 +74,7 @@ jobs:
       RUN_ID: ${{ github.run_id }}
       PR_NUMBER: ${{ github.event.pull_request.number || '' }}
       TEST_SUITE_NAME: ${{ inputs.test-suite-name }}
+      IS_SIDEPANEL: true
     steps:
       - name: Checkout and setup environment
         uses: MetaMask/action-checkout-and-setup@v1

app/_locales/en/messages.json

@@ -88,8 +88,7 @@
     "webRequest",
     "offscreen",
     "identity",
-    "sidePanel",
-    "contextMenus"
+    "sidePanel"
   ],
   "sandbox": {
     "pages": ["snaps/index.html"]

app/_locales/en_GB/messages.json

@@ -55,7 +55,6 @@ import {
   CorruptionHandler,
   hasVault,
 } from './lib/state-corruption/state-corruption-recovery';
-import { initSidePanelContextMenu } from './lib/sidepanel-context-menu';
 import {
   backedUpStateKeys,
   PersistenceManager,
@@ -183,7 +182,6 @@ const PHISHING_WARNING_PAGE_TIMEOUT = ONE_SECOND_IN_MILLISECONDS;
 
 lazyListener.once('runtime', 'onInstalled').then((details) => {
   handleOnInstalled(details);
-  handleSidePanelContextMenu();
 });
 
 /**
@@ -1663,15 +1661,6 @@ function onInstall() {
   }
 }
 
-/**
- * Handles the onInstalled event for sidepanel context menu creation.
- * This is registered via lazyListener to catch the event at module load time.
- */
-async function handleSidePanelContextMenu() {
-  await isInitialized;
-  await initSidePanelContextMenu(controller);
-}
-
 /**
  * Trigger actions that should happen only when an update is available
  */
@@ -1749,18 +1738,6 @@ const initSidePanelBehavior = async () => {
         openPanelOnActionClick: useSidePanelAsDefault,
       });
     }
-
-    // Setup remote feature flag listener to update sidepanel preferences
-    controller?.controllerMessenger?.subscribe(
-      'RemoteFeatureFlagController:stateChange',
-      (state) => {
-        const extensionUxSidepanel =
-          state?.remoteFeatureFlags?.extensionUxSidepanel;
-        if (extensionUxSidepanel === false) {
-          controller?.preferencesController?.setUseSidePanelAsDefault(false);
-        }
-      },
-    );
   } catch (error) {
     console.error('Error setting side panel behavior:', error);
   }

app/manifest/v3/_base.json

@@ -65,7 +65,6 @@ describe('KeyringControllerInit', () => {
     expect(controllerMock).toHaveBeenCalledWith({
       messenger: expect.any(Object),
       state: undefined,
-      cacheEncryptionKey: true,
       encryptor: expect.any(Object),
       keyringBuilders: expect.any(Array),
     });

app/scripts/background.js

@@ -109,11 +109,9 @@ export const KeyringControllerInit: ControllerInitFunction<
   additionalKeyrings.push(snapKeyringBuilder);
   ///: END:ONLY_INCLUDE_IF
 
-  // @ts-expect-error: The types for the encryptor are not correct.
   const controller = new KeyringController({
     state: persistedState.KeyringController,
     messenger: controllerMessenger,
-    cacheEncryptionKey: true,
     keyringBuilders: additionalKeyrings,
     encryptor: encryptor || encryptorFactory(600_000),
   });

app/scripts/controller-init/keyring-controller-init.test.ts

@@ -71,7 +71,12 @@ describe('SeedlessOnboardingControllerInit', () => {
         decryptWithKey: expect.any(Function),
         encrypt: expect.any(Function),
         encryptWithDetail: expect.any(Function),
+        encryptWithKey: expect.any(Function),
+        isVaultUpdated: expect.any(Function),
         importKey: expect.any(Function),
+        exportKey: expect.any(Function),
+        generateSalt: expect.any(Function),
+        keyFromPassword: expect.any(Function),
       },
       passwordOutdatedCacheTTL: expect.any(Number),
       refreshJWTToken: expect.any(Function),

app/scripts/controller-init/keyring-controller-init.ts

@@ -3,7 +3,7 @@ import {
   SeedlessOnboardingControllerMessenger,
   Web3AuthNetwork,
 } from '@metamask/seedless-onboarding-controller';
-import { EncryptionKey, EncryptionResult } from '@metamask/browser-passworder';
+import { EncryptionKey } from '@metamask/browser-passworder';
 import { ControllerInitFunction } from '../types';
 import { encryptorFactory } from '../../lib/encryptor-factory';
 import { isDevOrTestBuild } from '../../services/oauth/config';
@@ -24,7 +24,9 @@ export const SeedlessOnboardingControllerInit: ControllerInitFunction<
 
   const network = loadWeb3AuthNetwork();
 
-  const controller = new SeedlessOnboardingController({
+  const controller = new SeedlessOnboardingController<
+    CryptoKey | EncryptionKey
+  >({
     messenger: controllerMessenger,
     state: persistedState.SeedlessOnboardingController,
     network,
@@ -41,24 +43,7 @@ export const SeedlessOnboardingControllerInit: ControllerInitFunction<
     renewRefreshToken: (...args) =>
       initMessenger.call('OAuthService:renewRefreshToken', ...args),
 
-    encryptor: {
-      decrypt: (key, encryptedData) => encryptor.decrypt(key, encryptedData),
-      decryptWithDetail: (key, encryptedData) =>
-        encryptor.decryptWithDetail(key, encryptedData),
-      decryptWithKey(key, encryptedData) {
-        let payload: EncryptionResult;
-        if (typeof encryptedData === 'string') {
-          payload = JSON.parse(encryptedData);
-        } else {
-          payload = encryptedData;
-        }
-
-        return encryptor.decryptWithKey(key as EncryptionKey, payload);
-      },
-      encrypt: (key, data) => encryptor.encrypt(key, data),
-      encryptWithDetail: (key, data) => encryptor.encryptWithDetail(key, data),
-      importKey: (key) => encryptor.importKey(key),
-    },
+    encryptor,
   });
 
   return {

app/scripts/controller-init/seedless-onboarding/seedless-onboarding-controller-init.test.ts

@@ -7,7 +7,7 @@ import { Duplex } from 'readable-stream';
 import { SubjectType } from '@metamask/permission-controller';
 import { PreinstalledSnap } from '@metamask/snaps-controllers';
 import { Browser } from 'webextension-polyfill';
-import { ExportableKeyEncryptor } from '@metamask/keyring-controller';
+import { Encryptor } from '@metamask/keyring-controller';
 import { KeyringClass } from '@metamask/keyring-utils';
 import { QrKeyringScannerBridge } from '@metamask/eth-qr-keyring';
 import type { TransactionMetricsRequest } from '../../../shared/types';
@@ -83,7 +83,7 @@ export type ControllerInitRequest<
    * An instance of an encryptor to use for encrypting and decrypting
    * sensitive data.
    */
-  encryptor?: ExportableKeyEncryptor;
+  encryptor: Encryptor;
 
   /**
    * The extension browser API.