Merge branch 'main' into feat/upgrade-ledger-library

Author: Akaryatrh

.circleci/config.yml

@@ -3,13 +3,13 @@ version: 2.1
 executors:
   node-browsers-small:
     docker:
-      - image: cimg/node:20.18-browsers
+      - image: cimg/node:22.13-browsers
     resource_class: small
     environment:
       NODE_OPTIONS: --max_old_space_size=2048
   node-browsers-medium:
     docker:
-      - image: cimg/node:20.18-browsers
+      - image: cimg/node:22.13-browsers
     resource_class: medium
     environment:
       NODE_OPTIONS: --max_old_space_size=3072
@@ -21,7 +21,7 @@ executors:
       NODE_OPTIONS: --max_old_space_size=6144
   node-browsers-medium-plus:
     docker:
-      - image: cimg/node:20.18-browsers
+      - image: cimg/node:22.13-browsers
     resource_class: medium+
     environment:
       NODE_OPTIONS: --max_old_space_size=4096

.circleci/scripts/check_mmi_trigger.sh

@@ -24,7 +24,7 @@ ignores:
   - '@metamask/phishing-warning' # statically hosted as part of some e2e tests
   - '@metamask/test-dapp'
   - '@metamask/design-tokens' # Only imported in index.css
-  - '@tsconfig/node20' # required dynamically by TS, used in tsconfig.json
+  - '@tsconfig/node22' # required dynamically by TS, used in tsconfig.json
   - '@sentry/cli' # invoked as `sentry-cli`
   - 'chromedriver'
   - 'depcheck' # ooo meta

.depcheckrc.yml

@@ -308,7 +308,6 @@ module.exports = {
       files: [
         '**/__snapshots__/*.snap',
         'app/scripts/controllers/app-state-controller.test.ts',
-        'app/scripts/controllers/mmi-controller.test.ts',
         'app/scripts/controllers/alert-controller.test.ts',
         'app/scripts/metamask-controller.actions.test.js',
         'app/scripts/detect-multiple-instances.test.js',

.eslintrc.js

@@ -56,18 +56,13 @@ privacy-snapshot.json                @MetaMask/extension-privacy-reviewers
 .devcontainer/                       @MetaMask/extension-security-team @HowardBraham
 
 # Confirmations team to own code for confirmations on UI.
-app/scripts/lib/ppom                    @MetaMask/confirmations
-app/scripts/lib/signature               @MetaMask/confirmations
-app/scripts/lib/transaction/decode      @MetaMask/confirmations
-app/scripts/lib/transaction/metrics.*   @MetaMask/confirmations
-app/scripts/lib/transaction/util.*      @MetaMask/confirmations
-ui/pages/confirmations                  @MetaMask/confirmations
-
-# MMI team is responsible for code related with Institutioanl version of MetaMask
-ui/pages/institutional               @MetaMask/mmi
-ui/components/institutional          @MetaMask/mmi
-ui/ducks/institutional               @MetaMask/mmi
-ui/selectors/institutional           @MetaMask/mmi
+app/scripts/controller-init/confirmations                         @MetaMask/confirmations
+app/scripts/lib/ppom                                              @MetaMask/confirmations
+app/scripts/lib/signature                                         @MetaMask/confirmations
+app/scripts/lib/transaction/decode                                @MetaMask/confirmations
+app/scripts/lib/transaction/metrics.*                             @MetaMask/confirmations
+app/scripts/lib/transaction/util.*                                @MetaMask/confirmations
+ui/pages/confirmations                                            @MetaMask/confirmations
 
 # Design System to own code for the component-library folder
 # Slack handle: @metamask-design-system-team | Slack channel: #metamask-design-system

.github/CODEOWNERS

@@ -22,9 +22,10 @@ jobs:
       - name: Get merge base commit hash
         id: get-merge-base
         env:
-          BASE_REF: ${{ github.event.pull_request.base.ref }}
+          BASE_SHA: ${{ github.event.pull_request.base.sha }}
+          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
         run: |
-          merge_base="$(git merge-base "origin/${BASE_REF}" HEAD)"
+          merge_base="$(git merge-base "${BASE_SHA}" "${HEAD_SHA}")"
           echo "MERGE_BASE=${merge_base}" >> "$GITHUB_OUTPUT"
           echo "Merge base is '${merge_base}'"
 

.github/workflows/add-mmi-reviewer-and-notify.yml

@@ -92,7 +92,7 @@ jobs:
       matrix:
         # Ensure this is synchronized with the list below in the "commit-updated-policies" job
         # and with the build type list in `builds.yml`
-        build-type: [main, beta, flask, mmi]
+        build-type: [main, beta, flask]
     name: Update LavaMoat ${{ matrix.build-type }} application policy
     runs-on: ubuntu-latest
     needs:
@@ -154,7 +154,7 @@ jobs:
           path: lavamoat/build-system
           key: cache-build-${{ needs.prepare.outputs.COMMIT_SHA }}
           fail-on-cache-miss: true
-      # One restore step per build type: [main, beta, flask, mmi]
+      # One restore step per build type: [main, beta, flask]
       # Ensure this is synchronized with the list above in the "update-lavamoat-webapp-policy" job
       # and with the build type list in `builds.yml`
       - name: Restore main application policy
@@ -175,12 +175,6 @@ jobs:
           path: lavamoat/browserify/flask
           key: cache-flask-${{ needs.prepare.outputs.COMMIT_SHA }}
           fail-on-cache-miss: true
-      - name: Restore mmi application policy
-        uses: actions/cache/restore@v4
-        with:
-          path: lavamoat/browserify/mmi
-          key: cache-mmi-${{ needs.prepare.outputs.COMMIT_SHA }}
-          fail-on-cache-miss: true
       - name: Check whether there are policy changes
         id: policy-changes
         run: |
@@ -197,11 +191,33 @@ jobs:
           git config --global user.email '[email protected]'
           git commit -am "Update LavaMoat policies"
           git push
+      ## Yes, it would be nice to use the local diff before the commit is made, but we need to include potential multiple updates in the history of the PR
+      - name: Compare policy changes
+        run: |
+          if [[ $HAS_CHANGES == 'true' ]]
+          then
+            git fetch origin ${{ github.base_ref }}
+            main_diff=$(git diff origin/${{ github.base_ref }} lavamoat/browserify/main/policy.json | md5sum | cut -d' ' -f1)
+            for folder in lavamoat/browserify/*/; do
+              if [ "$folder" != "lavamoat/browserify/main/" ]; then
+                file="${folder}policy.json"
+                if [ -f "$file" ]; then
+                  diff=$(git diff origin/${{ github.base_ref }} "$file" | md5sum | cut -d' ' -f1)
+                  if [ "$diff" = "$main_diff" ]; then
+                    echo "✅ ${folder}policy.json changes match main/policy.json policy changes"
+                  else
+                    echo "👀 ${folder}policy.json changes **differ from** main/policy.json policy changes"
+                  fi
+                fi
+              fi
+            done > does_diff_diff.txt
+          fi
+      ## Note the use of `cat -` to include the file contents and the echo in the comment
       - name: Post comment
         run: |
           if [[ $HAS_CHANGES == 'true' ]]
           then
-            echo -e 'Policies updated.  \n👀 Please review the diff for suspicious new powers.  \n\n🧠 Learn how: https://lavamoat.github.io/guides/policy-diff/#what-to-look-for-when-reviewing-a-policy-diff' |  gh pr comment "${PR_NUMBER}" --body-file -
+            echo -e 'Policies updated.  \n👀 Please review the diff for suspicious new powers.  \n\n🧠 Learn how: https://lavamoat.github.io/guides/policy-diff/#what-to-look-for-when-reviewing-a-policy-diff \n\n' | cat - does_diff_diff.txt |  gh pr comment "${PR_NUMBER}" --body-file -
           else
             gh pr comment "${PR_NUMBER}" --body 'No policy changes'
           fi

.github/workflows/publish-prerelease.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        build-type: [main, beta, flask, mmi]
+        build-type: [main, beta, flask]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

.github/workflows/trigger-metamask-institutional-e2e-ci.yml

@@ -67,12 +67,8 @@ test-results/
 !.yarn/versions
 development/generate-attributions/.yarn/*
 
-# MMI Playwright
+# Playwright
 public/playwright
-test/e2e/playwright/mmi/.env
-test/e2e/playwright/mmi/playwright.config.ts
-test/e2e/playwright/mmi/specs/**/*-darwin.png
-test/e2e/playwright/mmi/dist/
 lavamoat/**/policy-debug.json
 
 # Attributions

.github/workflows/update-lavamoat-policies.yml

@@ -31,9 +31,6 @@ BLOCKAID_PUBLIC_KEY=
 ; Set this to true to enable the snap path for the Firefox WebDriver (Linux)
 ; FIREFOX_SNAP=
 
-; Enable the redesigned confirmations still in development, without needing to toggle the developer setting.
-; ENABLE_CONFIRMATION_REDESIGN=
-
 ; URL of security alerts API used to validate dApp requests
 ; SECURITY_ALERTS_API_URL='http://localhost:3000'
 ; Temporary mechanism to enable security alerts API prior to release

.github/workflows/validate-lavamoat-policy-webapp.yml

@@ -1 +1 @@
-v20.18
+v22.13

.gitignore

@@ -31,7 +31,6 @@ module.exports = {
   staticDirs: ['../app', './images'],
   env: (config) => ({
     ...config,
-    ENABLE_CONFIRMATION_REDESIGN: true,
     INFURA_PROJECT_ID: process.env.INFURA_STORYBOOK_PROJECT_ID || '',
   }),
   // Uses babel.config.js settings and prevents "Missing class properties transform" error