Merge branch 'token-approval-promise-refactor' into token-approval-pr…

…omise-refactor-full
MetaMask · May 4, 2023 · 4de3dde · 4de3dde
2 parents 44c5d8a + 9e98b50
commit 4de3dde
Show file tree

Hide file tree

Showing 613 changed files with 13,667 additions and 5,877 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,10 +3,10 @@ version: 2.1
 executors:
   node-browsers:
     docker:
-      - image: circleci/node:16-browsers
+      - image: cimg/node:16.20-browsers
   node-browsers-medium-plus:
     docker:
-      - image: circleci/node:16-browsers
+      - image: cimg/node:16.20-browsers
     resource_class: medium+
     environment:
       NODE_OPTIONS: --max_old_space_size=2048
@@ -143,11 +143,6 @@ workflows:
           requires:
             - prep-deps
             - prep-build
-      - test-mozilla-lint-beta:
-          <<: *rc_branch_only
-          requires:
-            - prep-deps
-            - trigger-beta-build
       - test-mozilla-lint-desktop:
           filters:
             branches:
@@ -176,7 +171,6 @@ workflows:
             - validate-source-maps-desktop
             - validate-source-maps-flask
             - test-mozilla-lint
-            - test-mozilla-lint-beta
             - test-mozilla-lint-desktop
             - test-mozilla-lint-flask
             - test-e2e-chrome
@@ -1144,17 +1138,6 @@ jobs:
           name: test:mozilla-lint
           command: NODE_OPTIONS=--max_old_space_size=3072 yarn mozilla-lint
 
-  test-mozilla-lint-beta:
-    executor: node-browsers
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Lint beta for firefox
-          command: |
-            .circleci/scripts/mozilla-lint-beta.sh
-
   test-mozilla-lint-desktop:
     executor: node-browsers
     steps:

diff --git a/.circleci/scripts/chrome-install.sh b/.circleci/scripts/chrome-install.sh
@@ -4,6 +4,8 @@ set -e
 set -u
 set -o pipefail
 
+sudo apt-get update
+
 # To get the latest version, see <https://www.ubuntuupdates.org/ppa/google_chrome?dist=stable>
 CHROME_VERSION='111.0.5563.64-1'
 CHROME_BINARY="google-chrome-stable_${CHROME_VERSION}_amd64.deb"

diff --git a/.circleci/scripts/firefox-install.sh b/.circleci/scripts/firefox-install.sh
@@ -9,10 +9,6 @@ FIREFOX_BINARY="firefox-${FIREFOX_VERSION}.tar.bz2"
 FIREFOX_BINARY_URL="https://ftp.mozilla.org/pub/firefox/releases/${FIREFOX_VERSION}/linux-x86_64/en-US/${FIREFOX_BINARY}"
 FIREFOX_PATH='/opt/firefox'
 
-printf '%s\n' "Removing old Firefox installation"
-
-sudo rm -r "${FIREFOX_PATH}"
-
 printf '%s\n' "Downloading & installing Firefox ${FIREFOX_VERSION}"
 
 wget --quiet --show-progress -O- "${FIREFOX_BINARY_URL}" | sudo tar xj -C /opt

diff --git a/.circleci/scripts/mozilla-lint-beta.sh b/.circleci/scripts/mozilla-lint-beta.sh
diff --git a/.circleci/scripts/trigger-beta-build.sh b/.circleci/scripts/trigger-beta-build.sh
@@ -12,8 +12,9 @@ if [[ $current_commit_msg =~ Version[[:space:]](v[[:digit:]]+.[[:digit:]]+.[[:di
 then
     # filter the commit message like Version v10.24.1-beta.1
     printf '%s\n' "Create a build for $version with beta version $current_commit_msg"
-    yarn build --build-type beta dist
-    yarn build --build-type beta prod
+    export ENABLE_MV3=true
+    yarn build --build-type beta --platform='chrome' dist
+    yarn build --build-type beta --platform='chrome' prod
 else
     printf '%s\n' 'Commit message does not match commit message for beta pattern; skipping beta automation build'
     mkdir dist

diff --git a/.depcheckrc.yml b/.depcheckrc.yml
@@ -10,6 +10,14 @@ 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
   #

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,20 +1,22 @@
 # Lines starting with '#' are comments.
 # Each line is a file pattern followed by one or more owners.
 # Owners bear a responsibility to the organization and the users of this
-# application. Repository administrators have the ability to merge pull 
-# requests that have not yet received the requisite reviews as outlined 
-# in this file. Do not force merge any PR without confidence that it 
-# follows all policies or without full understanding of the impact of 
+# application. Repository administrators have the ability to merge pull
+# requests that have not yet received the requisite reviews as outlined
+# in this file. Do not force merge any PR without confidence that it
+# follows all policies or without full understanding of the impact of
 # those changes on build, release and publishing outcomes.
 
 *                                    @MetaMask/extension-devs
+**/snaps/**                          @MetaMask/snaps-devs
+**/flask/**                          @MetaMask/snaps-devs
 development/                         @MetaMask/extension-devs @kumavis
 lavamoat/                            @MetaMask/supply-chain
 
 # The .circleci/ folder instructs Circle CI on the process by which it
 # should test, build and publish releases of our application. Due to the
 # impact that changes to the files contained within this folder may have
-# on our releases, only those with the knowledge and responsibility to 
+# on our releases, only those with the knowledge and responsibility to
 # publish libraries under the MetaMask name may approve those changes.
 # Note to reviewers: We employ the use of CircleCI "Orbs", which are
 # remotely hosted sections of CircleCI configuration and scripts, to

diff --git a/.github/workflows/fitness-functions.yml b/.github/workflows/fitness-functions.yml
@@ -11,18 +11,24 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
 
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
           node-version: '16'
 
+      - name: Install dependencies
+        run: yarn
+
       - name: Run fitness functions
         env:
-          HEAD_REF: ${{ github.event.pull_request.head.ref }}
           BASE_REF: ${{ github.event.pull_request.base.ref }}
         run: |
-          # git fetch origin $HEAD_REF
-          # git fetch origin $BASE_REF
-          # git diff origin/$BASE_REF origin/$HEAD_REF -- . > diff
-          # npm run fitness-functions -- "ci" "./diff"
+          # The following command generates a diff of changes between the common
+          # ancestor of $BASE_REF and HEAD, and the current commit (HEAD), for
+          # files in the current directory and its subdirectories. The output is
+          # then saved to a file called "diff".
+          git diff "$(git merge-base "origin/$BASE_REF" HEAD)" HEAD -- . > ./diff
+          npm run fitness-functions -- "ci" "./diff"
diff --git a/.iyarc b/.iyarc
@@ -6,16 +6,6 @@ GHSA-257v-vj4p-3w2h
 # 7.1.1 and is included only via remote-redux-devtools which is a devDependency
 GHSA-6fc8-4gx4-v693
 
-# yarn npm audit reports on a fast-json-patch version < 3.1.1 but due to patch
-# resolution, the only version of fast-json-patch that we use is 3.1.1. We also
-# have 2.2.1 installed but it is a dev only dependency. The "violation" reports
-# smart-transacton-controller as the culprit but if you run
-# `yarn info -A -R dependents fast-json-patch` you can see that only 2.2.1 and
-# 3.3.1 are installed and that smart-transaction-controller resolves to the
-# patched version of 3.3.1. We can remove this once the
-# smart-transaction-controller updates its dependency.
-GHSA-8gh8-hqwg-xf34
-
 # request library is subject to SSRF.
 # addressed by temporary patch in .yarn/patches/request-npm-2.88.2-f4a57c72c4.patch
 GHSA-p8p7-x288-28g6
diff --git a/.metamaskrc.dist b/.metamaskrc.dist
@@ -1,11 +1,15 @@
 ; Extra environment variables
-PASSWORD=METAMASK PASSWORD
+; Defaults are set in builds.yml
+
+; This variable is required
 INFURA_PROJECT_ID=00000000000
-SEGMENT_WRITE_KEY=
-SWAPS_USE_DEV_APIS=
-PORTFOLIO_URL=
-TRANSACTION_SECURITY_PROVIDER=
-MULTICHAIN=
+
+;PASSWORD=METAMASK PASSWORD
+,SEGMENT_WRITE_KEY=
+;SWAPS_USE_DEV_APIS=
+;PORTFOLIO_URL=
+;TRANSACTION_SECURITY_PROVIDER=
+;MULTICHAIN=
 
 ; Set this to test changes to the phishing warning page.
-PHISHING_WARNING_PAGE_URL=
+;PHISHING_WARNING_PAGE_URL=
diff --git a/.storybook/test-data.js b/.storybook/test-data.js
@@ -599,7 +599,7 @@ const state = {
     connectedStatusPopoverHasBeenShown: true,
     swapsWelcomeMessageHasBeenShown: true,
     defaultHomeActiveTabName: 'Assets',
-    provider: {
+    providerConfig: {
       type: 'goerli',
       ticker: 'ETH',
       nickname: '',

diff --git a/.yarn/patches/@eslint-eslintrc-npm-1.3.0-1f3c51be25.patch b/.yarn/patches/@eslint-eslintrc-npm-1.3.0-1f3c51be25.patch
diff --git a/.yarn/patches/@eslint-eslintrc-npm-2.0.2-d308674d86.patch b/.yarn/patches/@eslint-eslintrc-npm-2.0.2-d308674d86.patch
diff --git a/...atches/eslint-npm-8.20.0-6bbc377ff7.patch → ...atches/eslint-npm-8.36.0-f8482bce95.patch b/...atches/eslint-npm-8.20.0-6bbc377ff7.patch → ...atches/eslint-npm-8.36.0-f8482bce95.patch
@@ -1,8 +1,8 @@
 diff --git a/lib/linter/linter.js b/lib/linter/linter.js
-index 29d78da3969e2a3560d056af5683a08083562984..a6ae07b7142a353fcd8d58b55a7e68b8f81b2846 100644
+index 0f1bd4f77611aa5ccc43c94385efd4f9b5639327..59ff9f14727e22bbec2cc7539af30305f759b23a 100644
 --- a/lib/linter/linter.js
 +++ b/lib/linter/linter.js
-@@ -704,7 +704,7 @@ function createLanguageOptions({ globals: configuredGlobals, parser, parserOptio
+@@ -708,7 +708,7 @@ function createLanguageOptions({ globals: configuredGlobals, parser, parserOptio
   */
  function resolveGlobals(providedGlobals, enabledEnvironments) {
      return Object.assign(

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json