Merge branch 'main' into djb/circular-deps-monitoring

.circleci/config.yml

@@ -321,12 +321,15 @@ jobs:
       - run:
           name: Save Yarn version
           command: yarn --version > /tmp/YARN_VERSION
+      - run:
+          name: Save Foundry version
+          command: node -e "process.stdout.write(require('./package.json').foundryup.version)" > /tmp/FOUNDRY_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-{{ checksum "/tmp/YARN_VERSION" }}-{{ checksum "yarn.lock" }}
+            - dependency-cache-{{ checksum "/tmp/YARN_VERSION" }}-{{ checksum "yarn.lock" }}-{{ checksum "/tmp/FOUNDRY_VERSION" }}
             # 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 with the same Yarn version, the install step will remove
@@ -338,12 +341,14 @@ jobs:
           name: Install dependencies
           command: yarn --immutable
       - save_cache:
-          key: dependency-cache-{{ checksum "/tmp/YARN_VERSION" }}-{{ checksum "yarn.lock" }}
+          key: dependency-cache-{{ checksum "/tmp/YARN_VERSION" }}-{{ checksum "yarn.lock" }}-{{ checksum "/tmp/FOUNDRY_VERSION" }}
           paths:
             - .yarn/cache
+            - .metamask/cache # should match yarn's relative location
       - persist_to_workspace:
           root: .
           paths:
+            - .metamask/cache # ensures anvil is installed
             - node_modules
             - build-artifacts
 

.depcheckrc.yml

@@ -40,6 +40,8 @@ ignores:
   - 'wait-on'
   - 'tsx' # used in .devcontainer
   - 'prettier-eslint' # used by the Prettier ESLint VSCode extension
+  - 'tar' # used by foundryup.ts
+  - 'minipass' # used by foundryup.ts
   # storybook
   - '@storybook/cli'
   - '@storybook/core'
@@ -65,7 +67,7 @@ ignores:
   - 'html-bundler-webpack-plugin' # build tool
   - 'postcss-loader' # build tool
   - '@swc/helpers' # build tool
-  - browserslist # build tool
+  - 'browserslist' # build tool
   - 'buffer' # polyfill
   - 'crypto-browserify' # polyfill
   - 'process' # polyfill

.gitignore

@@ -67,6 +67,9 @@ test-results/
 !.yarn/versions
 development/generate-attributions/.yarn/*
 
+# MetaMask
+.metamask/*
+
 # Playwright
 public/playwright
 lavamoat/**/policy-debug.json

.storybook/test-data.js

@@ -1317,7 +1317,6 @@ const state = {
       '0xaD6D458402F60fD3Bd25163575031ACDce07538D': './sai.svg',
     },
     hiddenTokens: [],
-    useNonceField: false,
     usePhishDetect: true,
     useTokenDetection: true,
     useCurrencyRateCheck: true,

.vscode/cspell.json

@@ -60,6 +60,7 @@
     "metamaskbot",
     "metamaskrc",
     "metametrics",
+    "Minipass",
     "mocharc",
     "MULTICHAIN",
     "MULTIPROVIDER",

.vscode/package.json-schema.json

@@ -18,6 +18,10 @@
               "type": "string",
               "description": "Deletes webpack's build cache. Useful to force a rebuild (webpack not detecting changes, node_modules have changed, etc)."
             },
+            "foundryup": {
+              "type": "string",
+              "description": "Installs foundry's Anvil. Run `yarn foundryup --help` for advanced usage."
+            },
             "postinstall": {
               "type": "string",
               "description": "Runs automatically after running `yarn` (`yarn install`) in order to prime the webpack dev build."