Version v12.4.0 RC

.circleci/scripts/git-diff-develop.ts

@@ -0,0 +1,99 @@
+import { hasProperty } from '@metamask/utils';
+import { exec as execCallback } from 'child_process';
+import fs from 'fs';
+import path from 'path';
+import { promisify } from 'util';
+
+const exec = promisify(execCallback);
+
+/**
+ * Fetches the git repository with a specified depth.
+ *
+ * @param depth - The depth to use for the fetch command.
+ * @returns True if the fetch is successful, otherwise false.
+ */
+async function fetchWithDepth(depth: number): Promise<boolean> {
+  try {
+    await exec(`git fetch --depth ${depth} origin develop`);
+    await exec(`git fetch --depth ${depth} origin ${process.env.CIRCLE_BRANCH}`);
+    return true;
+  } catch (error: unknown) {
+    console.error(`Failed to fetch with depth ${depth}:`, error);
+    return false;
+  }
+}
+
+/**
+ * Attempts to fetch the necessary commits until the merge base is found.
+ * It tries different fetch depths and performs a full fetch if needed.
+ *
+ * @throws If an unexpected error occurs during the execution of git commands.
+ */
+async function fetchUntilMergeBaseFound() {
+  const depths = [1, 10, 100];
+  for (const depth of depths) {
+    console.log(`Attempting git diff with depth ${depth}...`);
+    await fetchWithDepth(depth);
+
+    try {
+      await exec(`git merge-base origin/HEAD HEAD`);
+      return;
+    } catch (error: unknown) {
+      if (
+        error instanceof Error &&
+        hasProperty(error, 'code') &&
+        error.code === 1
+      ) {
+        console.error(`Error 'no merge base' encountered with depth ${depth}. Incrementing depth...`);
+      } else {
+        throw error;
+      }
+    }
+  }
+  await exec(`git fetch --unshallow origin develop`);
+}
+
+/**
+ * Performs a git diff command to get the list of files changed between the current branch and the origin.
+ * It first ensures that the necessary commits are fetched until the merge base is found.
+ *
+ * @returns The output of the git diff command, listing the changed files.
+ * @throws If unable to get the diff after fetching the merge base or if an unexpected error occurs.
+ */
+async function gitDiff(): Promise<string> {
+  await fetchUntilMergeBaseFound();
+  const { stdout: diffResult } = await exec(`git diff --name-only origin/HEAD...${process.env.CIRCLE_BRANCH}`);
+  if (!diffResult) {
+      throw new Error('Unable to get diff after full checkout.');
+  }
+  return diffResult;
+}
+
+/**
+ * Stores the output of git diff to a file.
+ *
+ * @returns Returns a promise that resolves when the git diff output is successfully stored.
+ */
+async function storeGitDiffOutput() {
+  try {
+    console.log("Attempting to get git diff...");
+    const diffOutput = await gitDiff();
+    console.log(diffOutput);
+
+    // Create the directory
+    const outputDir = 'changed-files';
+    fs.mkdirSync(outputDir, { recursive: true });
+
+    // Store the output of git diff
+    const outputPath = path.resolve(outputDir, 'changed-files.txt');
+    fs.writeFileSync(outputPath, diffOutput.trim());
+
+    console.log(`Git diff results saved to ${outputPath}`);
+    process.exit(0);
+  } catch (error: any) {
+    console.error('An error occurred:', error.message);
+    process.exit(1);
+  }
+}
+
+storeGitDiffOutput();

.circleci/scripts/test-run-e2e.sh

@@ -11,4 +11,16 @@ then
     exit 1
 fi
 
+# Run the actual test command from the parameters
+timeout 20m "$@" --retries 1
+
+# Error code 124 means the command timed out
+if [ $? -eq 124 ]; then
+  # Once deleted, if someone tries to "Rerun failed tests" the result will be
+  # "Error: can not rerun failed tests: no failed tests could be found"
+  echo 'Timeout error, deleting the test results'
+  rm -rf test/test-results/e2e
+  exit 124
+fi
+
 exit 0

.circleci/scripts/validate-locales-only.ts

@@ -0,0 +1,31 @@
+const { readChangedFiles } = require('../../test/e2e/changedFilesUtil.js');
+
+/**
+ * Verifies that all changed files are in the /_locales/ directory.
+ * Fails the build if any changed files are outside of the /_locales/ directory.
+ * Fails if no changed files are detected.
+ */
+async function validateLocalesOnlyChangedFiles() {
+  const changedFiles = await readChangedFiles();
+  if (!changedFiles || changedFiles.length === 0) {
+    console.error('Failure: No changed files detected.');
+    process.exit(1);
+  }
+  const invalidFiles = changedFiles.filter(
+    (file) => !file.startsWith('app/_locales/'),
+  );
+  if (invalidFiles.length > 0) {
+    console.error(
+      'Failure: Changed files must be in the /_locales/ directory.\n Changed Files:',
+      changedFiles,
+      '\n Invalid Files:',
+      invalidFiles,
+    );
+    process.exit(1);
+  } else {
+    console.log('Passed validation');
+    process.exit(0);
+  }
+}
+
+validateLocalesOnlyChangedFiles();

.depcheckrc.yml

@@ -58,6 +58,23 @@ ignores:
   - 'resolve-url-loader'
   # jest environments
   - 'jest-environment-jsdom'
+  # webpack
+  - '@pmmmwh/react-refresh-webpack-plugin' # dev tool
+  - 'webpack-dev-server' # dev tool
+  - 'html-bundler-webpack-plugin' # build tool
+  - 'postcss-loader' # build tool
+  - '@swc/helpers' # build tool
+  - browserslist # build tool
+  - 'buffer' # polyfill
+  - 'crypto-browserify' # polyfill
+  - 'process' # polyfill
+  - 'stream-http' # polyfill
+  - 'rimraf' # misc: install helper
+  - 'json-schema-to-ts' # misc: typescript helper
+  - 'https-browserify' # polyfill
+  - 'path-browserify' # polyfill
+  - 'nyc' # coverage
+  - 'core-js-pure' # polyfills
   # babel
   - '@babel/plugin-transform-logical-assignment-operators'
   # trezor

.devcontainer/devcontainer.json

@@ -13,7 +13,6 @@
       ],
       "settings": {
         "editor.formatOnSave": true,
-        "git.autofetch": true,
         "git.ignoreRebaseWarning": true,
         "git.rebaseWhenSync": true,
         "gitlens.showWelcomeOnInstall": false
@@ -48,13 +47,13 @@
     }
   },
 
-  "postAttachCommand": "/usr/local/share/desktop-init.sh && git pull --rebase; yarn download-builds",
+  "postAttachCommand": "/usr/local/share/desktop-init.sh && git pull; yarn download-builds",
 
   // This is a working Infura key, but it's on the Free Plan and has very limited requests per second
   // If you want to use your own INFURA_PROJECT_ID, follow the instructions in README.md
   "postCreateCommand": "if [ -z \"$INFURA_PROJECT_ID\" ]; then echo 'INFURA_PROJECT_ID=3d110a0fce9e49b08d2ee584e19a05ba' > .metamaskrc; fi",
 
   "runArgs": ["--shm-size=1g"],
 
-  "updateContentCommand": "sudo .devcontainer/install.sh && yarn --immutable && yarn tsx .devcontainer/setup-browsers.ts && echo 'export DISPLAY=:1' >> ~/.bashrc"
+  "updateContentCommand": "sudo .devcontainer/install.sh && corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 yarn --immutable && yarn tsx .devcontainer/setup-browsers.ts && echo 'export DISPLAY=:1' >> ~/.bashrc"
 }

.devcontainer/download-builds.ts

@@ -52,7 +52,11 @@ async function getBuilds(branch: string, jobNames: string[]) {
 
     const artifacts = await response.json();
 
-    if (!artifacts || artifacts.length === 0) {
+    if (
+      !artifacts ||
+      artifacts.length === 0 ||
+      artifacts.message === 'Not Found'
+    ) {
       return [];
     }
 

.eslintrc.js

@@ -257,7 +257,7 @@ module.exports = {
      * Mocha library.
      */
     {
-      files: ['test/e2e/**/*.spec.js', 'test/unit-global/*.test.js'],
+      files: ['test/e2e/**/*.spec.js'],
       extends: ['@metamask/eslint-config-mocha'],
       rules: {
         // In Mocha tests, it is common to use `this` to store values or do
@@ -281,7 +281,9 @@ module.exports = {
         'app/scripts/controllers/mmi-controller.test.ts',
         'app/scripts/metamask-controller.actions.test.js',
         'app/scripts/detect-multiple-instances.test.js',
-        'app/scripts/controllers/swaps.test.js',
+        'app/scripts/controllers/bridge.test.ts',
+        'app/scripts/controllers/swaps/**/*.test.js',
+        'app/scripts/controllers/swaps/**/*.test.ts',
         'app/scripts/controllers/metametrics.test.js',
         'app/scripts/controllers/permissions/**/*.test.js',
         'app/scripts/controllers/preferences.test.js',
@@ -297,6 +299,7 @@ module.exports = {
         'test/jest/*.js',
         'test/lib/timer-helpers.js',
         'test/e2e/helpers.test.js',
+        'test/unit-global/*.test.js',
         'ui/**/*.test.js',
         'ui/__mocks__/*.js',
         'shared/lib/error-utils.test.js',
@@ -365,7 +368,6 @@ module.exports = {
         'development/**/*.js',
         'test/e2e/benchmark.js',
         'test/helpers/setup-helper.js',
-        'test/run-unit-tests.js',
       ],
       rules: {
         'node/no-process-exit': 'off',

.github/CODEOWNERS

@@ -8,11 +8,10 @@
 # those changes on build, release and publishing outcomes.
 
 *                                    @MetaMask/extension-devs
-**/snaps/**                          @MetaMask/snaps-devs
 development/                         @MetaMask/extension-devs @kumavis
 lavamoat/                            @MetaMask/extension-devs @MetaMask/supply-chain @MetaMask/snaps-devs
 
-# The offscreen.ts script file that is included in the offscreedocument html
+# The offscreen.ts script file that is included in the offscreen document html
 # file is responsible, at present, for loading the snaps execution environment
 # for MV3. Any changes to this file should require at least one member of the
 # snaps development team to review and approve the changes.
@@ -84,3 +83,13 @@ ui/components/component-library      @MetaMask/design-system-engineers
 # Slack handle: @accounts-team-devs | Slack channel: #metamask-accounts-team
 
 app/scripts/lib/snap-keyring         @MetaMask/accounts-engineers
+
+# Swaps team to own code for the swaps folder
+ui/pages/swaps                                        @MetaMask/swaps-engineers
+app/scripts/controllers/swaps                         @MetaMask/swaps-engineers
+
+# Snaps
+**/snaps/**                          @MetaMask/snaps-devs
+shared/constants/permissions.ts      @MetaMask/snaps-devs
+ui/helpers/utils/permission.js       @MetaMask/snaps-devs
+ui/hooks/useTransactionInsights.js   @MetaMask/snaps-devs

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -48,6 +48,18 @@ body:
      label: Error messages or log output
      description: Please copy and paste any relevant error messages or log output. This will be automatically formatted, so there is no need for backticks.
      render: shell
+ - type: dropdown
+   id: stage
+   attributes:
+     label: Detection stage
+     description: At what stage was the bug detected?
+     options:
+       - In production (default)
+       - In beta
+       - During release testing
+       - On the development branch
+   validations:
+     required: true
  - type: input
    id: version
    attributes: