Merge branch 'develop' into fix/erc1155-test

MetaMask · Nov 1, 2023 · c9cdc07 · c9cdc07
2 parents 8b61f49 + 74a7ab5
commit c9cdc07
Show file tree

Hide file tree

Showing 45 changed files with 1,864 additions and 1,712 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -252,6 +252,7 @@ workflows:
             - test-mozilla-lint-desktop
             - test-mozilla-lint-flask
             - test-e2e-chrome
+            - test-e2e-chrome-multichain
             - test-e2e-firefox
             - test-e2e-chrome-flask
             - test-e2e-firefox-flask

diff --git a/development/lib/retry.js b/development/lib/retry.js
@@ -40,7 +40,7 @@ async function retry(
         return result;
       }
     } catch (error) {
-      console.error(error);
+      console.error('error caught in retry():', error);
       if (retryUntilFailure) {
         return null;
       }

diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json
@@ -1192,6 +1192,33 @@
         "@metamask/jazzicon>color>color-convert>color-name": true
       }
     },
+    "@sentry/cli>which": {
+      "builtin": {
+        "path.join": true
+      },
+      "globals": {
+        "process.cwd": true,
+        "process.env.OSTYPE": true,
+        "process.env.PATH": true,
+        "process.env.PATHEXT": true,
+        "process.platform": true
+      },
+      "packages": {
+        "@sentry/cli>which>isexe": true
+      }
+    },
+    "@sentry/cli>which>isexe": {
+      "builtin": {
+        "fs": true
+      },
+      "globals": {
+        "TESTING_WINDOWS": true,
+        "process.env.PATHEXT": true,
+        "process.getgid": true,
+        "process.getuid": true,
+        "process.platform": true
+      }
+    },
     "@storybook/addon-knobs>qs": {
       "packages": {
         "string.prototype.matchall>side-channel": true
@@ -2082,9 +2109,9 @@
         "process.platform": true
       },
       "packages": {
+        "@sentry/cli>which": true,
         "cross-spawn>path-key": true,
-        "cross-spawn>shebang-command": true,
-        "mocha>which": true
+        "cross-spawn>shebang-command": true
       }
     },
     "cross-spawn>path-key": {
@@ -3160,7 +3187,7 @@
     },
     "eslint>minimatch>brace-expansion": {
       "packages": {
-        "mocha>minimatch>brace-expansion>concat-map": true,
+        "eslint>minimatch>brace-expansion>concat-map": true,
         "stylelint>balanced-match": true
       }
     },
@@ -6371,33 +6398,6 @@
         "chalk>supports-color>has-flag": true
       }
     },
-    "mocha>which": {
-      "builtin": {
-        "path.join": true
-      },
-      "globals": {
-        "process.cwd": true,
-        "process.env.OSTYPE": true,
-        "process.env.PATH": true,
-        "process.env.PATHEXT": true,
-        "process.platform": true
-      },
-      "packages": {
-        "mocha>which>isexe": true
-      }
-    },
-    "mocha>which>isexe": {
-      "builtin": {
-        "fs": true
-      },
-      "globals": {
-        "TESTING_WINDOWS": true,
-        "process.env.PATHEXT": true,
-        "process.getgid": true,
-        "process.getuid": true,
-        "process.platform": true
-      }
-    },
     "nock>debug": {
       "builtin": {
         "tty.isatty": true,
@@ -8066,7 +8066,7 @@
         "process.platform": true
       },
       "packages": {
-        "mocha>which>isexe": true
+        "@sentry/cli>which>isexe": true
       }
     },
     "stylelint>globjoin": {

diff --git a/package.json b/package.json
@@ -425,6 +425,7 @@
     "@types/gulp-sourcemaps": "^0.0.35",
     "@types/jest": "^29.1.2",
     "@types/madge": "^5.0.0",
+    "@types/mocha": "^10.0.3",
     "@types/node": "^17.0.21",
     "@types/pify": "^5.0.1",
     "@types/pump": "^1.1.1",
@@ -434,6 +435,7 @@
     "@types/react-router-dom": "^5.3.3",
     "@types/remote-redux-devtools": "^0.5.5",
     "@types/sass": "^1.43.1",
+    "@types/selenium-webdriver": "^4.1.19",
     "@types/sinon": "^10.0.13",
     "@types/w3c-web-hid": "^1.0.3",
     "@types/watchify": "^3.11.1",
@@ -512,7 +514,7 @@
     "lockfile-lint": "^4.10.6",
     "loose-envify": "^1.4.0",
     "madge": "^6.1.0",
-    "mocha": "^9.2.2",
+    "mocha": "^10.2.0",
     "mocha-junit-reporter": "^2.2.1",
     "mockttp": "^2.6.0",
     "nock": "^13.2.9",