chore: Update v12.6.0 with v12.5.0

.yarnrc.yml

@@ -43,6 +43,12 @@ npmAuditIgnoreAdvisories:
   # not appear to be used.
   - 1092461
 
+  # Issue: Sentry SDK Prototype Pollution gadget in JavaScript SDKs
+  # URL: https://github.com/advisories/GHSA-593m-55hh-j8gv
+  # Not easily fixed in this version, will be fixed in v12.5.0
+  # Minimally effects the extension due to usage of LavaMoat + SES lockdown.
+  - 1099839
+
   # Temp fix for https://github.com/MetaMask/metamask-extension/pull/16920 for the sake of 11.7.1 hotfix
   # This will be removed in this ticket https://github.com/MetaMask/metamask-extension/issues/22299
   - 'ts-custom-error (deprecation)'
@@ -114,15 +120,9 @@ npmAuditIgnoreAdvisories:
   # upon old versions of ethereumjs-utils.
   - 'ethereum-cryptography (deprecation)'
 
-  # Currently only dependent on deprecated @metamask/types as it is brought in
-  # by @metamask/keyring-api. Updating the dependency in keyring-api will
-  # remove this.
-  - '@metamask/types (deprecation)'
-
-  # @metamask/keyring-api also depends on @metamask/snaps-ui which is
-  # deprecated. Replacing that dependency with @metamask/snaps-sdk will remove
-  # this.
-  - '@metamask/snaps-ui (deprecation)'
+  # Currently in use for the network list drag and drop functionality.
+  # Maintenance has stopped and the project will be archived in 2025.
+  - 'react-beautiful-dnd (deprecation)'
 
 npmRegistries:
   'https://npm.pkg.github.com':

app/scripts/controllers/swaps/swaps.test.ts

@@ -1097,7 +1097,6 @@ describe('SwapsController', function () {
             oldState.swapsState.swapsStxGetTransactionsRefreshTime,
           swapsStxBatchStatusRefreshTime:
             oldState.swapsState.swapsStxBatchStatusRefreshTime,
-          swapsStxStatusDeadline: oldState.swapsState.swapsStxStatusDeadline,
         });
       });
 
@@ -1175,6 +1174,7 @@ describe('SwapsController', function () {
         const swapsStxBatchStatusRefreshTime = 0;
         const swapsStxGetTransactionsRefreshTime = 0;
         const swapsStxStatusDeadline = 0;
+
         swapsController.__test__updateState({
           swapsState: {
             ...swapsController.state.swapsState,

app/scripts/lib/ppom/ppom-middleware.test.ts

@@ -1,13 +1,13 @@
 import { type Hex, JsonRpcResponseStruct } from '@metamask/utils';
 import { detectSIWE, SIWEMessage } from '@metamask/controller-utils';
-
 import { CHAIN_IDS } from '../../../../shared/constants/network';
 
 import {
   BlockaidReason,
   BlockaidResultType,
 } from '../../../../shared/constants/security-provider';
 import { flushPromises } from '../../../../test/lib/timer-helpers';
+import { mockNetworkState } from '../../../../test/stub/networks';
 import { createPPOMMiddleware, PPOMMiddlewareRequest } from './ppom-middleware';
 import {
   generateSecurityAlertId,
@@ -36,18 +36,22 @@ const REQUEST_MOCK = {
   params: [],
   id: '',
   jsonrpc: '2.0' as const,
-  origin: 'test.com',
-  networkClientId: 'networkClientId',
 };
 
 const createMiddleware = (
   options: {
-    chainId?: Hex;
+    chainId?: Hex | null;
     error?: Error;
     securityAlertsEnabled?: boolean;
-  } = {},
+    // TODO: Replace `any` with type
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    updateSecurityAlertResponse?: any;
+  } = {
+    updateSecurityAlertResponse: () => undefined,
+  },
 ) => {
-  const { chainId, error, securityAlertsEnabled } = options;
+  const { chainId, error, securityAlertsEnabled, updateSecurityAlertResponse } =
+    options;
 
   const ppomController = {};
 
@@ -66,9 +70,10 @@ const createMiddleware = (
   }
 
   const networkController = {
-    getNetworkConfigurationByNetworkClientId: jest
-      .fn()
-      .mockReturnValue({ chainId: chainId || CHAIN_IDS.MAINNET }),
+    state: {
+      ...mockNetworkState({ chainId: chainId || CHAIN_IDS.MAINNET }),
+      ...(chainId === null ? { providerConfig: {} } : undefined),
+    },
   };
 
   const appStateController = {
@@ -79,9 +84,7 @@ const createMiddleware = (
     listAccounts: () => [{ address: INTERNAL_ACCOUNT_ADDRESS }],
   };
 
-  const updateSecurityAlertResponse = jest.fn();
-
-  const middleware = createPPOMMiddleware(
+  return createPPOMMiddleware(
     // TODO: Replace `any` with type
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     ppomController as any,
@@ -98,16 +101,6 @@ const createMiddleware = (
     accountsController as any,
     updateSecurityAlertResponse,
   );
-
-  return {
-    middleware,
-    ppomController,
-    preferenceController,
-    networkController,
-    appStateController,
-    accountsController,
-    updateSecurityAlertResponse,
-  };
 };
 
 describe('PPOMMiddleware', () => {
@@ -135,37 +128,24 @@ describe('PPOMMiddleware', () => {
     };
   });
 
-  it('gets the network configuration for the request networkClientId', async () => {
-    const { middleware, networkController } = createMiddleware();
-
-    const req = {
-      ...REQUEST_MOCK,
-      method: 'eth_sendTransaction',
-      securityAlertResponse: undefined,
-    };
-
-    await middleware(req, { ...JsonRpcResponseStruct.TYPE }, () => undefined);
-
-    await flushPromises();
-
-    expect(
-      networkController.getNetworkConfigurationByNetworkClientId,
-    ).toHaveBeenCalledTimes(1);
-    expect(
-      networkController.getNetworkConfigurationByNetworkClientId,
-    ).toHaveBeenCalledWith('networkClientId');
-  });
-
   it('updates alert response after validating request', async () => {
-    const { middleware, updateSecurityAlertResponse } = createMiddleware();
+    const updateSecurityAlertResponse = jest.fn();
+
+    const middlewareFunction = createMiddleware({
+      updateSecurityAlertResponse,
+    });
 
     const req = {
       ...REQUEST_MOCK,
       method: 'eth_sendTransaction',
       securityAlertResponse: undefined,
     };
 
-    await middleware(req, { ...JsonRpcResponseStruct.TYPE }, () => undefined);
+    await middlewareFunction(
+      req,
+      { ...JsonRpcResponseStruct.TYPE },
+      () => undefined,
+    );
 
     await flushPromises();
 
@@ -178,15 +158,19 @@ describe('PPOMMiddleware', () => {
   });
 
   it('adds loading response to confirmation requests while validation is in progress', async () => {
-    const { middleware } = createMiddleware();
+    const middlewareFunction = createMiddleware();
 
     const req: PPOMMiddlewareRequest<(string | { to: string })[]> = {
       ...REQUEST_MOCK,
       method: 'eth_sendTransaction',
       securityAlertResponse: undefined,
     };
 
-    await middleware(req, { ...JsonRpcResponseStruct.TYPE }, () => undefined);
+    await middlewareFunction(
+      req,
+      { ...JsonRpcResponseStruct.TYPE },
+      () => undefined,
+    );
 
     expect(req.securityAlertResponse?.reason).toBe(BlockaidReason.inProgress);
     expect(req.securityAlertResponse?.result_type).toBe(
@@ -195,7 +179,7 @@ describe('PPOMMiddleware', () => {
   });
 
   it('does not do validation if the user has not enabled the preference', async () => {
-    const { middleware } = createMiddleware({
+    const middlewareFunction = createMiddleware({
       securityAlertsEnabled: false,
     });
 
@@ -206,15 +190,37 @@ describe('PPOMMiddleware', () => {
     };
 
     // @ts-expect-error Passing in invalid input for testing purposes
-    await middleware(req, undefined, () => undefined);
+    await middlewareFunction(req, undefined, () => undefined);
+
+    expect(req.securityAlertResponse).toBeUndefined();
+    expect(validateRequestWithPPOM).not.toHaveBeenCalled();
+  });
+
+  it('does not do validation if unable to get the chainId from the network provider config', async () => {
+    isChainSupportedMock.mockResolvedValue(false);
+    const middlewareFunction = createMiddleware({
+      chainId: null,
+    });
+
+    const req = {
+      ...REQUEST_MOCK,
+      method: 'eth_sendTransaction',
+      securityAlertResponse: undefined,
+    };
+
+    await middlewareFunction(
+      req,
+      { ...JsonRpcResponseStruct.TYPE },
+      () => undefined,
+    );
 
     expect(req.securityAlertResponse).toBeUndefined();
     expect(validateRequestWithPPOM).not.toHaveBeenCalled();
   });
 
   it('does not do validation if user is not on a supported network', async () => {
     isChainSupportedMock.mockResolvedValue(false);
-    const { middleware } = createMiddleware({
+    const middlewareFunction = createMiddleware({
       chainId: '0x2',
     });
 
@@ -224,29 +230,37 @@ describe('PPOMMiddleware', () => {
       securityAlertResponse: undefined,
     };
 
-    await middleware(req, { ...JsonRpcResponseStruct.TYPE }, () => undefined);
+    await middlewareFunction(
+      req,
+      { ...JsonRpcResponseStruct.TYPE },
+      () => undefined,
+    );
 
     expect(req.securityAlertResponse).toBeUndefined();
     expect(validateRequestWithPPOM).not.toHaveBeenCalled();
   });
 
   it('does not do validation when request is not for confirmation method', async () => {
-    const { middleware } = createMiddleware();
+    const middlewareFunction = createMiddleware();
 
     const req = {
       ...REQUEST_MOCK,
       method: 'eth_someRequest',
       securityAlertResponse: undefined,
     };
 
-    await middleware(req, { ...JsonRpcResponseStruct.TYPE }, () => undefined);
+    await middlewareFunction(
+      req,
+      { ...JsonRpcResponseStruct.TYPE },
+      () => undefined,
+    );
 
     expect(req.securityAlertResponse).toBeUndefined();
     expect(validateRequestWithPPOM).not.toHaveBeenCalled();
   });
 
   it('does not do validation when request is send to users own account', async () => {
-    const { middleware } = createMiddleware();
+    const middlewareFunction = createMiddleware();
 
     const req = {
       ...REQUEST_MOCK,
@@ -255,14 +269,18 @@ describe('PPOMMiddleware', () => {
       securityAlertResponse: undefined,
     };
 
-    await middleware(req, { ...JsonRpcResponseStruct.TYPE }, () => undefined);
+    await middlewareFunction(
+      req,
+      { ...JsonRpcResponseStruct.TYPE },
+      () => undefined,
+    );
 
     expect(req.securityAlertResponse).toBeUndefined();
     expect(validateRequestWithPPOM).not.toHaveBeenCalled();
   });
 
   it('does not do validation for SIWE signature', async () => {
-    const { middleware } = createMiddleware({
+    const middlewareFunction = createMiddleware({
       securityAlertsEnabled: true,
     });
 
@@ -283,17 +301,17 @@ describe('PPOMMiddleware', () => {
     detectSIWEMock.mockReturnValue({ isSIWEMessage: true } as SIWEMessage);
 
     // @ts-expect-error Passing invalid input for testing purposes
-    await middleware(req, undefined, () => undefined);
+    await middlewareFunction(req, undefined, () => undefined);
 
     expect(req.securityAlertResponse).toBeUndefined();
     expect(validateRequestWithPPOM).not.toHaveBeenCalled();
   });
 
   it('calls next method', async () => {
-    const { middleware } = createMiddleware();
+    const middlewareFunction = createMiddleware();
     const nextMock = jest.fn();
 
-    await middleware(
+    await middlewareFunction(
       { ...REQUEST_MOCK, method: 'eth_sendTransaction' },
       { ...JsonRpcResponseStruct.TYPE },
       nextMock,
@@ -308,15 +326,15 @@ describe('PPOMMiddleware', () => {
 
     const nextMock = jest.fn();
 
-    const { middleware } = createMiddleware({ error });
+    const middlewareFunction = createMiddleware({ error });
 
     const req = {
       ...REQUEST_MOCK,
       method: 'eth_sendTransaction',
       securityAlertResponse: undefined,
     };
 
-    await middleware(req, { ...JsonRpcResponseStruct.TYPE }, nextMock);
+    await middlewareFunction(req, { ...JsonRpcResponseStruct.TYPE }, nextMock);
 
     expect(req.securityAlertResponse).toStrictEqual(
       SECURITY_ALERT_RESPONSE_MOCK,