Merge branch 'main' into add-justification-field-to-revocation-details

Author: mj-kiwi

.eslintrc.js

@@ -114,7 +114,6 @@ module.exports = {
         'shared/**/*.js',
         'shared/**/*.ts',
         'ui/**/*.js',
-        'offscreen/**/*.ts',
         '**/*.test.js',
         'test/lib/**/*.js',
         'test/mocks/**/*.js',

.github/CODEOWNERS

@@ -19,7 +19,7 @@ lavamoat/                            @MetaMask/extension-devs @MetaMask/policy-r
 # 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.
-offscreen/scripts/offscreen.ts       @MetaMask/core-platform
+app/offscreen/offscreen.ts       @MetaMask/core-platform
 
 
 # The privacy-snapshot.json file includes a list of all hosts that the

.github/scripts/bundle.sh

@@ -32,6 +32,7 @@ export QUICKNODE_LINEA_MAINNET_URL=""
 export QUICKNODE_MAINNET_URL=""
 export QUICKNODE_OPTIMISM_URL=""
 export QUICKNODE_POLYGON_URL=""
+export QUICKNODE_SEI_URL=""
 export SEGMENT_BETA_WRITE_KEY=""
 export SEGMENT_EXPERIMENTAL_WRITE_KEY=""
 export SEGMENT_FLASK_WRITE_KEY=""

.github/workflows/e2e-chrome.yml

@@ -87,14 +87,14 @@ jobs:
       matrix-index: ${{ matrix.index }}
       matrix-total: ${{ strategy.job-total }}
 
-  test-e2e-chrome-vault-decryption:
+  test-e2e-chrome-dist:
     # This if statement is equivalent to IS_FORK
     if: ${{ !(github.event.pull_request.head.repo.fork || github.event.repository.fork) }}
     uses: ./.github/workflows/run-e2e.yml
     with:
-      test-suite-name: test-e2e-chrome-vault-decryption
+      test-suite-name: test-e2e-chrome-dist
       build-artifact: build-dist-browserify
-      test-command: yarn test:e2e:single test/e2e/vault-decryption-chrome.spec.ts --browser chrome
+      test-command: yarn test:e2e:chrome:dist
       builds-from-run: ${{ inputs.builds-from-run }}
 
   test-e2e-chrome-api-specs:
@@ -188,7 +188,7 @@ jobs:
       - test-e2e-chrome-multiple-providers
       - test-e2e-chrome-rpc
       - test-e2e-chrome-flask
-      - test-e2e-chrome-vault-decryption
+      - test-e2e-chrome-dist
       - test-e2e-chrome-api-specs
       - test-e2e-chrome-api-specs-multichain
     runs-on: ubuntu-latest

.github/workflows/e2e-firefox.yml

@@ -45,8 +45,8 @@ jobs:
           [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
     with:
       test-suite-name: test-e2e-firefox-webpack
-      build-artifact: build-test-webpack
-      build-command: yarn build:test:webpack
+      build-artifact: build-test-mv2-webpack
+      build-command: yarn build:test:webpack:mv2
       test-command: yarn test:e2e:firefox
       builds-from-run: ${{ inputs.builds-from-run }}
       matrix-index: ${{ matrix.index }}

.github/workflows/main.yml

@@ -242,6 +242,17 @@ jobs:
       builds-from-run: ${{ needs.identify-builds.outputs.builds-from-run }}
     secrets: inherit
 
+  build-test-mv2-webpack:
+    needs:
+      - identify-builds
+    uses: ./.github/workflows/run-build.yml
+    with:
+      build-name: build-test-mv2-webpack
+      build-command: yarn build:test:webpack:mv2
+      validate-source-maps: false # Disabled as webpack outputs are not supported by validate-source-maps
+      builds-from-run: ${{ needs.identify-builds.outputs.builds-from-run }}
+    secrets: inherit
+
   run-benchmarks:
     # If not a fork, run benchmarks
     if: ${{ !(github.event.pull_request.head.repo.fork || github.event.repository.fork) }}
@@ -250,7 +261,9 @@ jobs:
       - identify-builds
       - prep-deps
       - build-test-browserify
+      - build-test-mv2-browserify
       - build-test-webpack
+      - build-test-mv2-webpack
     with:
       builds-from-run: ${{ needs.identify-builds.outputs.builds-from-run }}
     secrets:
@@ -339,8 +352,9 @@ jobs:
     needs:
       - identify-builds
       - needs-e2e
+      - build-dist-mv2-browserify
       - build-test-mv2-browserify
-      - build-test-webpack
+      - build-test-mv2-webpack
       - build-test-flask-mv2-browserify
     if: ${{ needs.needs-e2e.outputs.needs-e2e == 'true' }}
     uses: ./.github/workflows/e2e-firefox.yml
@@ -538,6 +552,7 @@ jobs:
       - build-test-flask-browserify
       - build-test-flask-mv2-browserify
       - build-test-webpack
+      - build-test-mv2-webpack
       - run-tests
       - build-storybook
       - build-ts-migration-dashboard

.github/workflows/publish-release.yml

@@ -46,6 +46,7 @@ jobs:
       QUICKNODE_MAINNET_URL: ${{ secrets.QUICKNODE_MAINNET_URL }}
       QUICKNODE_OPTIMISM_URL: ${{ secrets.QUICKNODE_OPTIMISM_URL }}
       QUICKNODE_POLYGON_URL: ${{ secrets.QUICKNODE_POLYGON_URL }}
+      QUICKNODE_SEI_URL: ${{ secrets.QUICKNODE_SEI_URL }}
       SEGMENT_BETA_WRITE_KEY: ${{ secrets.SEGMENT_BETA_WRITE_KEY }}
       SEGMENT_EXPERIMENTAL_WRITE_KEY: ${{ secrets.SEGMENT_EXPERIMENTAL_WRITE_KEY }}
       SEGMENT_FLASK_WRITE_KEY: ${{ secrets.SEGMENT_FLASK_WRITE_KEY }}

.github/workflows/run-benchmarks.yml

@@ -20,7 +20,7 @@ env:
 jobs:
   benchmarks:
     if: ${{ github.event_name != 'merge_group' }} # Skip this job for the Merge Queue
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     timeout-minutes: 30
     container:
       image: ghcr.io/metamask/metamask-extension-e2e-image:v24.11.0
@@ -37,7 +37,7 @@ jobs:
     env:
       SELENIUM_BROWSER: ${{ matrix.browser }}
       HEADLESS: false
-      ARTIFACT_NAME: build-test-${{ matrix.buildType }}
+      ARTIFACT_NAME: build-test${{ matrix.browser == 'firefox' && '-mv2' || '' }}-${{ matrix.buildType }}
       OUTPUT_NAME: benchmark-${{ matrix.browser }}-${{ matrix.buildType }}-${{ matrix.pageType }}.json
       INFURA_PROJECT_ID: ${{ secrets.INFURA_PROJECT_ID }}
     continue-on-error: true
@@ -73,7 +73,7 @@ jobs:
 
       # TODO: Pre-install this in the container image
       - name: Install AWS CLI (needed in the container)
-        run: sudo apt-get install python3-pip && sudo pip install awscli --break-system-packages
+        run: sudo apt-get update && sudo apt-get install python3-pip && sudo pip install awscli --break-system-packages
 
       - name: Run the benchmark
         # Choose a benchmark command from env.COMMANDS

.github/workflows/run-build.yml

@@ -77,6 +77,7 @@ jobs:
       QUICKNODE_MAINNET_URL: ${{ secrets.QUICKNODE_MAINNET_URL }}
       QUICKNODE_OPTIMISM_URL: ${{ secrets.QUICKNODE_OPTIMISM_URL }}
       QUICKNODE_POLYGON_URL: ${{ secrets.QUICKNODE_POLYGON_URL }}
+      QUICKNODE_SEI_URL: ${{ secrets.QUICKNODE_SEI_URL }}
       SEGMENT_BETA_WRITE_KEY: ${{ secrets.SEGMENT_BETA_WRITE_KEY }}
       SEGMENT_EXPERIMENTAL_WRITE_KEY: ${{ secrets.SEGMENT_EXPERIMENTAL_WRITE_KEY }}
       SEGMENT_FLASK_WRITE_KEY: ${{ secrets.SEGMENT_FLASK_WRITE_KEY }}

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

@@ -162,6 +162,43 @@ jobs:
           path: lavamoat/browserify/${{ matrix.build-type }}
           key: cache-${{ matrix.build-type }}-${{ needs.prepare.outputs.COMMIT_SHA }}
 
+  update-lavamoat-webpack-policy-mv2:
+    name: Update LavaMoat webpack MV2 policy
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    needs:
+      - prepare
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Checkout pull request
+        run: gh pr checkout "${PR_NUMBER}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.LAVAMOAT_UPDATE_TOKEN }}
+          PR_NUMBER: ${{ github.event.issue.number }}
+
+      - name: Checkout and setup environment
+        uses: MetaMask/action-checkout-and-setup@v1
+        with:
+          is-high-risk-environment: false
+          skip-allow-scripts: true
+          use-yarn-hydrate: true
+
+      - name: Update LavaMoat webpack MV2 policy
+        run: yarn webpack --env production --no-cache --generatePolicy -v 2
+        env:
+          INFURA_PROD_PROJECT_ID: 00000000000
+          SEGMENT_PROD_WRITE_KEY: 00000000000
+          GOOGLE_PROD_CLIENT_ID: 00000000000
+          APPLE_PROD_CLIENT_ID: 00000000000
+
+      - name: Cache webpack MV2 policy
+        uses: actions/cache/save@v4
+        with:
+          path: lavamoat/webpack/mv2
+          key: cache-webpack-mv2-${{ needs.prepare.outputs.COMMIT_SHA }}
+
   update-lavamoat-webpack-policy:
     name: Update LavaMoat webpack policy
     runs-on: ubuntu-latest
@@ -196,7 +233,7 @@ jobs:
       - name: Cache webpack policy
         uses: actions/cache/save@v4
         with:
-          path: lavamoat/webpack
+          path: lavamoat/webpack/mv3
           key: cache-webpack-${{ needs.prepare.outputs.COMMIT_SHA }}
 
   commit-updated-policies:
@@ -208,6 +245,7 @@ jobs:
       - is-fork-pull-request
       - update-lavamoat-build-policy
       - update-lavamoat-webapp-policy
+      - update-lavamoat-webpack-policy-mv2
       - update-lavamoat-webpack-policy
     # Ensure forks don't get access to the LavaMoat update token
     if: ${{ needs.is-fork-pull-request.outputs.IS_FORK == 'false' }}
@@ -266,10 +304,17 @@ jobs:
           key: cache-experimental-${{ needs.prepare.outputs.COMMIT_SHA }}
           fail-on-cache-miss: true
 
+      - name: Restore webpack MV2 policy
+        uses: actions/cache/restore@v4
+        with:
+          path: lavamoat/webpack/mv2
+          key: cache-webpack-mv2-${{ needs.prepare.outputs.COMMIT_SHA }}
+          fail-on-cache-miss: true
+
       - name: Restore webpack policy
         uses: actions/cache/restore@v4
         with:
-          path: lavamoat/webpack
+          path: lavamoat/webpack/mv3
           key: cache-webpack-${{ needs.prepare.outputs.COMMIT_SHA }}
           fail-on-cache-miss: true