Version v11.3.0

.circleci/config.yml

@@ -125,6 +125,9 @@ workflows:
       - prep-build-test-flask:
           requires:
             - prep-deps
+      - prep-build-test-mmi:
+          requires:
+            - prep-deps
       - prep-build-storybook:
           requires:
             - prep-deps
@@ -162,6 +165,12 @@ workflows:
       - test-e2e-firefox-snaps-flask:
           requires:
             - prep-build-test-flask
+      - test-e2e-chrome-mmi:
+          requires:
+            - prep-build-test-mmi
+      - test-e2e-chrome-rpc-mmi:
+          requires:
+            - prep-build-test-mmi
       - test-e2e-chrome-mv3:
           requires:
             - prep-build-test-mv3
@@ -248,6 +257,8 @@ workflows:
             - test-e2e-firefox-snaps
             - test-e2e-chrome-snaps-flask
             - test-e2e-firefox-snaps-flask
+            - test-e2e-chrome-mmi
+            - test-e2e-chrome-rpc-mmi
             - test-storybook
       - benchmark:
           requires:
@@ -350,23 +361,28 @@ jobs:
     executor: node-browsers
     steps:
       - run: *shallow-git-clone
+      - run:
+          name: Save Yarn version
+          command: |
+            yarn --version > /tmp/YARN_VERSION
       - restore_cache:
           keys:
             # First try to get the specific cache for the checksum of the yarn.lock file.
             # This cache key lookup will fail if the lock file is modified and a cache
             # has not yet been persisted for the new checksum.
-            - dependency-cache-v1-{{ checksum "yarn.lock" }}
+            - dependency-cache-{{ checksum "/tmp/YARN_VERSION" }}-{{ checksum "yarn.lock" }}
             # To prevent having to do a full install of every node_module when
             # dependencies change, restore from the last known cache of any
-            # branch/checksum, the install step will remove cached items that are no longer
-            # required and add the new dependencies, and the cache will be persisted.
-            - dependency-cache-v1-
+            # branch/checksum with the same Yarn version, the install step will remove
+            # cached items that are no longer required and add the new dependencies, and
+            # the cache will be persisted.
+            - dependency-cache-{{ checksum "/tmp/YARN_VERSION" }}-
       - gh/install
       - run:
           name: Install dependencies
           command: .circleci/scripts/install-dependencies.sh
       - save_cache:
-          key: dependency-cache-v1-{{ checksum "yarn.lock" }}
+          key: dependency-cache-{{ checksum "/tmp/YARN_VERSION" }}-{{ checksum "yarn.lock" }}
           paths:
             - .yarn/cache
       - persist_to_workspace:
@@ -568,17 +584,38 @@ jobs:
           name: Build extension for testing
           command: yarn build:test:flask
       - run:
-          name: Move test build to 'dist-test' to avoid conflict with production build
+          name: Move test build to 'dist-test-flask' to avoid conflict with production build
           command: mv ./dist ./dist-test-flask
       - run:
-          name: Move test zips to 'builds-test' to avoid conflict with production build
+          name: Move test zips to 'builds-test-flask' to avoid conflict with production build
           command: mv ./builds ./builds-test-flask
       - persist_to_workspace:
           root: .
           paths:
             - dist-test-flask
             - builds-test-flask
 
+  prep-build-test-mmi:
+    executor: node-browsers-medium-plus
+    steps:
+      - run: *shallow-git-clone
+      - attach_workspace:
+          at: .
+      - run:
+          name: Build extension for testing
+          command: yarn build:test:mmi
+      - run:
+          name: Move test build to 'dist-test' to avoid conflict with production build
+          command: mv ./dist ./dist-test-mmi
+      - run:
+          name: Move test zips to 'builds-test' to avoid conflict with production build
+          command: mv ./builds ./builds-test-mmi
+      - persist_to_workspace:
+          root: .
+          paths:
+            - dist-test-mmi
+            - builds-test-mmi
+
   prep-build-test-mv3:
     executor: node-browsers-medium-plus
     steps:
@@ -592,7 +629,7 @@ jobs:
           name: Move test build to 'dist-test' to avoid conflict with production build
           command: mv ./dist ./dist-test-mv3
       - run:
-          name: Move test zips to 'builds-test' to avoid conflict with production build
+          name: Move test zips to 'builds-test-mv3' to avoid conflict with production build
           command: mv ./builds ./builds-test-mv3
       - persist_to_workspace:
           root: .
@@ -855,6 +892,42 @@ jobs:
       - store_test_results:
           path: test/test-results/e2e.xml
 
+  test-e2e-chrome-rpc-mmi:
+    executor: node-browsers
+    steps:
+      - checkout
+      - run:
+          name: Re-Install Chrome
+          command: ./.circleci/scripts/chrome-install.sh
+      - attach_workspace:
+          at: .
+      - run:
+          name: Move test build to dist
+          command: mv ./dist-test-mmi ./dist
+      - run:
+          name: Move test zips to builds
+          command: mv ./builds-test-mmi ./builds
+      - run:
+          name: test:e2e:chrome:rpc
+          command: |
+            if .circleci/scripts/test-run-e2e.sh
+            then
+              yarn test:e2e:chrome:rpc --retries 2 --debug --build-type=mmi
+            fi
+          no_output_timeout: 20m
+      - run:
+          name: Merge JUnit report
+          command: |
+            if [ "$(ls -A test/test-results/e2e)" ]; then
+              yarn test:e2e:report
+            fi
+          when: always
+      - store_artifacts:
+          path: test-artifacts
+          destination: test-artifacts
+      - store_test_results:
+          path: test/test-results/e2e.xml
+
   test-e2e-firefox-snaps:
     executor: node-browsers
     parallelism: 4
@@ -950,7 +1023,7 @@ jobs:
           command: |
             if .circleci/scripts/test-run-e2e.sh
             then
-              yarn test:e2e:firefox:snaps --retries 2 --debug
+              yarn test:e2e:firefox:snaps --retries 2 --debug --build-type=flask
             fi
           no_output_timeout: 20m
       - run:
@@ -987,7 +1060,44 @@ jobs:
           command: |
             if .circleci/scripts/test-run-e2e.sh
             then
-              yarn test:e2e:chrome:snaps --retries 2 --debug
+              yarn test:e2e:chrome:snaps --retries 2 --debug --build-type=flask
+            fi
+          no_output_timeout: 20m
+      - run:
+          name: Merge JUnit report
+          command: |
+            if [ "$(ls -A test/test-results/e2e)" ]; then
+              yarn test:e2e:report
+            fi
+          when: always
+      - store_artifacts:
+          path: test-artifacts
+          destination: test-artifacts
+      - store_test_results:
+          path: test/test-results/e2e.xml
+
+  test-e2e-chrome-mmi:
+    executor: node-browsers
+    parallelism: 4
+    steps:
+      - run: *shallow-git-clone
+      - run:
+          name: Re-Install Chrome
+          command: ./.circleci/scripts/chrome-install.sh
+      - attach_workspace:
+          at: .
+      - run:
+          name: Move test build to dist
+          command: mv ./dist-test-mmi ./dist
+      - run:
+          name: Move test zips to builds
+          command: mv ./builds-test-mmi ./builds
+      - run:
+          name: test:e2e:chrome:mmi
+          command: |
+            if .circleci/scripts/test-run-e2e.sh
+            then
+              yarn test:e2e:chrome:mmi --retries 2 --debug --build-type=mmi
             fi
           no_output_timeout: 20m
       - run:
@@ -1162,6 +1272,10 @@ jobs:
       - store_artifacts:
           path: builds-mmi
           destination: builds-mmi
+      - store_artifacts:
+          path: builds-test
+      - store_artifacts:
+          path: builds-test-flask
       - store_artifacts:
           path: coverage
           destination: coverage

.depcheckrc.yml

@@ -10,14 +10,6 @@ ignores:
   - '@fortawesome/fontawesome-free'
   - 'punycode'
 
-  #
-  # snaps flask deps
-  #
-  - '@metamask/rpc-methods-flask'
-  - '@metamask/snaps-controllers-flask'
-  - '@metamask/snaps-ui-flask'
-  - '@metamask/snaps-utils-flask'
-
   #
   # dev deps
   #

.github/CODEOWNERS

@@ -9,7 +9,6 @@
 
 *                                    @MetaMask/extension-devs
 **/snaps/**                          @MetaMask/snaps-devs
-**/flask/**                          @MetaMask/snaps-devs
 development/                         @MetaMask/extension-devs @kumavis
 lavamoat/                            @MetaMask/extension-devs @MetaMask/supply-chain @MetaMask/snaps-devs
 

.github/CONTRIBUTING.md

@@ -6,13 +6,14 @@ If you're submitting code to MetaMask, there are some simple things we'd appreci
 
 Before taking the time to code and implement something, feel free to open an issue and discuss it! There may even be an issue already open, and together we may come up with a specific strategy before you take your precious time to write code.
 
-There are also plenty of open issues we'd love help with. Search the [`good first issue`](https://github.com/MetaMask/metamask-extension/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) label, or head to Gitcoin and earn ETH for completing projects we've posted bounties on.
+There are also plenty of open issues we'd love help with. Search the [`good first issue`](https://github.com/MetaMask/metamask-extension/contribute) label, or head to Gitcoin and earn ETH for completing projects we've posted bounties on.
 
 If you're picking up a bounty or an existing issue, feel free to ask clarifying questions on the issue as you go about your work.
 
 ### Submitting a pull request
 When you're done with your project / bugfix / feature and ready to submit a PR, there are a couple guidelines we ask you to follow:
 
+- [ ] **Make sure you followed our [`coding guidelines`](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md)**: These guidelines aim to maintain consistency and readability across the codebase. They help ensure that the code is easy to understand, maintain, and modify, which is particularly important when working with multiple contributors.
 - [ ] **Test it**: For any new programmatic functionality, we like unit tests when possible, so if you can keep your code cleanly isolated, please do add a test file to the `tests` folder.
 - [ ] **Add to the CHANGELOG**: Help us keep track of all the moving pieces by adding an entry to the [`CHANGELOG.md`](https://github.com/MetaMask/metamask-extension/blob/develop/CHANGELOG.md) with a link to your PR.
 - [ ] **Meet the spec**: Make sure the PR adds functionality that matches the issue you're closing. This is especially important for bounties: sometimes design or implementation details are included in the conversation, so read carefully!

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -16,17 +16,30 @@ body:
    id: what-happened
    attributes:
      label: Describe the bug
-     description: What happened? What did you expect to happen? Please include screenshots if applicable!
-     placeholder: Tell us what you see!
+     description: What happened?
+     placeholder: A clear and concise description of what the bug is
    validations:
      required: true
+ - type: textarea
+   id: expected-behavior
+   attributes:
+     label: Expected behavior
+     description: What did you expect to happen?
+ - type: textarea
+   id: screenshot
+   attributes:
+     label: Screenshots
+     description: Please include screenshots if applicable!
  - type: textarea
    id: reproduce
    attributes:
      label: Steps to reproduce
-     description: List all steps needed to reproduce the problem
-     value: |
-       1.
+     description: "List all steps needed to reproduce the problem:"
+     placeholder: |
+       1. Go to '...'
+       2. Click on '...'
+       3. Scroll down to '...'
+       4. See error
    validations:
      required: true
  - type: textarea
@@ -96,3 +109,14 @@ body:
    attributes:
      label: Additional context
      description: Add any other context about the problem here, e.g. related issues, additional error messages or logs, or any potentially relevant details about the environment or situation the bug occurred in.
+ - type: textarea
+   id: severity
+   attributes:
+     label: Severity
+     description: |
+       To be added after bug submission by internal support / PM:
+     placeholder: |
+       - How critical is the impact of this bug on a user?
+       - Add stats if available on % of customers impacted
+       - Is this visible to all users?
+       - Is this tech debt?