Merge branch 'main' into mikesposito/update-keyring-controller

Author: mikesposito

.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/manifest/v3/_base.json

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

app/scripts/background.js

@@ -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/scripts/lib/dapp-swap/dapp-swap-middleware.test.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/naming-convention */
 import { JsonRpcResponseStruct } from '@metamask/utils';
 
 import { flushPromises } from '../../../../test/lib/timer-helpers';
@@ -20,15 +21,23 @@ const getNetworkConfigurationByNetworkClientId = jest.fn();
 const createMiddleware = (
   args: {
     // eslint-disable-next-line @typescript-eslint/naming-convention
-    dappSwapMetricsFlag?: { enabled: boolean; bridge_quote_fees: number };
+    dappSwapMetricsFlag?: {
+      enabled: boolean;
+      bridge_quote_fees: number;
+      origins: string[];
+    };
   } = {},
 ) => {
   const middlewareFunction = createDappSwapMiddleware({
     fetchQuotes,
     setDappSwapComparisonData,
     getNetworkConfigurationByNetworkClientId,
     // eslint-disable-next-line @typescript-eslint/naming-convention
-    dappSwapMetricsFlag: { enabled: true, bridge_quote_fees: 250 },
+    dappSwapMetricsFlag: {
+      enabled: true,
+      bridge_quote_fees: 250,
+      origins: ['https://metamask.github.io'],
+    },
     ...args,
   });
   return { middlewareFunction };
@@ -60,7 +69,11 @@ describe('DappSwapMiddleware', () => {
     fetchQuotes.mockReturnValueOnce(mockBridgeQuotes);
     const { middlewareFunction } = createMiddleware({
       // eslint-disable-next-line @typescript-eslint/naming-convention
-      dappSwapMetricsFlag: { enabled: false, bridge_quote_fees: 250 },
+      dappSwapMetricsFlag: {
+        enabled: false,
+        bridge_quote_fees: 250,
+        origins: ['https://metamask.github.io'],
+      },
     });
 
     const req = {
@@ -221,4 +234,44 @@ describe('DappSwapMiddleware', () => {
         'Error fetching bridge quotes: Error: Error getting data from swap: invalid batch transaction, invalid command',
     });
   });
+
+  it('does not fetch quotes if origin is not in the list of allowed origins', async () => {
+    fetchQuotes.mockReturnValueOnce(mockBridgeQuotes);
+    const { middlewareFunction } = createMiddleware({
+      // eslint-disable-next-line @typescript-eslint/naming-convention
+      dappSwapMetricsFlag: {
+        enabled: true,
+        bridge_quote_fees: 250,
+        origins: ['https://metamask.github.io'],
+      },
+    });
+
+    const req = {
+      ...REQUEST_MOCK,
+      method: 'eth_sendTransaction',
+      origin: 'https://test.com',
+      securityAlertResponse: {
+        securityAlertId: '123',
+      },
+      params: [
+        {
+          data: '0x3593564c000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000068f0dd1b0000000000000000000000000000000000000000000000000000000000000003100604000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000044000000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000003c0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000003070b0e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000005af3107a4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e583100000000000000000000000000000000000000000000000000000000000001f4000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000060000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e58310000000000000000000000007ffc3dbf3b2b50ff3a1d5523bc24bb5043837b1400000000000000000000000000000000000000000000000000000000000000190000000000000000000000000000000000000000000000000000000000000060000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831000000000000000000000000178239802520a9c99dcbd791f81326b70298d62900000000000000000000000000000000000000000000000000000000000601470c',
+          from: '0x12312312312312',
+          chainId: '1',
+          calls: [],
+        },
+      ],
+      networkClientId: 'networkClientId',
+    };
+
+    await middlewareFunction(
+      req as unknown as DappSwapMiddlewareRequest<(string | { to: string })[]>,
+      { ...JsonRpcResponseStruct.TYPE },
+      () => undefined,
+    );
+
+    await flushPromises();
+
+    expect(fetchQuotes).not.toHaveBeenCalled();
+  });
 });

app/scripts/lib/dapp-swap/dapp-swap-middleware.ts

@@ -31,8 +31,12 @@ export function createDappSwapMiddleware<
   getNetworkConfigurationByNetworkClientId: (
     networkClientId: NetworkClientId,
   ) => NetworkConfiguration | undefined;
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  dappSwapMetricsFlag: { enabled: boolean; bridge_quote_fees: number };
+  dappSwapMetricsFlag: {
+    enabled: boolean;
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    bridge_quote_fees: number;
+    origins: string[];
+  };
 }) {
   return async (
     req: DappSwapMiddlewareRequest<Params>,

app/scripts/lib/dapp-swap/dapp-swap-util.ts

@@ -34,8 +34,6 @@ export type DappSwapMiddlewareRequest<
 };
 
 const FOUR_BYTE_EXECUTE_SWAP_CONTRACT = '0x3593564c';
-const DAPP_SWAP_COMPARISON_ORIGIN = 'https://app.uniswap.org';
-const TEST_DAPP_ORIGIN = 'https://metamask.github.io';
 
 const getSwapDetails = (params: DappSwapMiddlewareRequest['params']) => {
   if (!params?.length) {
@@ -79,20 +77,27 @@ export function getQuotesForConfirmation({
   getNetworkConfigurationByNetworkClientId: (
     networkClientId: NetworkClientId,
   ) => NetworkConfiguration | undefined;
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  dappSwapMetricsFlag: { enabled: boolean; bridge_quote_fees: number };
+  dappSwapMetricsFlag: {
+    enabled: boolean;
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    bridge_quote_fees: number;
+    origins: string[];
+  };
   securityAlertId?: string;
 }) {
   let commands = '';
   try {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    const { enabled: dappSwapEnabled, bridge_quote_fees: bridgeQuoteFees } =
-      dappSwapMetricsFlag;
+    const {
+      enabled: dappSwapEnabled,
+      // eslint-disable-next-line @typescript-eslint/naming-convention
+      bridge_quote_fees: bridgeQuoteFees,
+      origins,
+    } = dappSwapMetricsFlag;
     if (!dappSwapEnabled || !securityAlertId) {
       return;
     }
     const { params, origin } = req;
-    if (origin === DAPP_SWAP_COMPARISON_ORIGIN || origin === TEST_DAPP_ORIGIN) {
+    if (origin && origins.includes(origin)) {
       const { chainId } =
         getNetworkConfigurationByNetworkClientId(req.networkClientId) ?? {};
       const { data, from } = getSwapDetails(params);