upgrade yarn to version 3 (#16232)

Co-authored-by: Mark Stacey <markjstacey@gmail.com> Co-authored-by: ricky <ricky.miller@gmail.com> Co-authored-by: Elliot Winkler <elliot.winkler@gmail.com> Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com> Co-authored-by: legobt <6wbvkn0j@anonaddy.me> Co-authored-by: Pedro Figueiredo <pedro.figueiredo@consensys.net>
2024-12-22 01:13:22 +01:00 · 2022-12-08 11:38:04 -05:00 · 2022-12-08 11:38:04 -05:00 · 6d1170f06c
commit 6d1170f06c
parent 3a456a45fc
63 changed files with 38231 additions and 27792 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -238,11 +238,6 @@ jobs:
          key: dependency-cache-v1-{{ checksum "yarn.lock" }}
          paths:
            - node_modules/
-            - build-artifacts/yarn-install-har/
-      - run:
-          name: Postinstall
-          command: |
-            yarn setup:postinstall
      - persist_to_workspace:
          root: .
          paths:
@ -316,9 +311,9 @@ jobs:
                command: yarn build --build-type beta dist
      - when:
          condition:
-              matches:
-                pattern: /^master$/
-                value: << pipeline.git.branch >>
+            matches:
+              pattern: /^master$/
+              value: << pipeline.git.branch >>
          steps:
            - run:
                name: build:prod
@ -356,9 +351,9 @@ jobs:
                command: yarn build --build-type flask dist
      - when:
          condition:
-              matches:
-                pattern: /^master$/
-                value: << pipeline.git.branch >>
+            matches:
+              pattern: /^master$/
+              value: << pipeline.git.branch >>
          steps:
            - run:
                name: build:prod
@ -477,7 +472,7 @@ jobs:
          at: .
      - run:
          name: Detect yarn lock deduplications
-          command: yarn yarn-deduplicate && git diff --exit-code yarn.lock
+          command: yarn dedupe --check

  test-lint:
    executor: node-browsers
@ -886,7 +881,7 @@ jobs:
    steps:
      - add_ssh_keys:
          fingerprints:
-            - "8b:21:e3:20:7c:c9:db:82:74:2d:86:d6:11:a7:2f:49"
+            - '8b:21:e3:20:7c:c9:db:82:74:2d:86:d6:11:a7:2f:49'
      - checkout
      - attach_workspace:
          at: .
--- a/.circleci/scripts/deps-install.sh
+++ b/.circleci/scripts/deps-install.sh
@ -5,12 +5,5 @@ set -x
 # Exit immediately if a command exits with a non-zero status.
 set -e

-yarn install --frozen-lockfile --har
+yarn install --frozen-lockfile

-# Move HAR file into directory with consistent name so that we can cache it
-mkdir -p build-artifacts/yarn-install-har
-har_files=(./*.har)
-if [[ -f "${har_files[0]}" ]]
-then
-  mv ./*.har build-artifacts/yarn-install-har/
-fi
--- a/.circleci/scripts/yarn-audit.sh
+++ b/.circleci/scripts/yarn-audit.sh
@ -16,7 +16,7 @@ audit_status="$?"

 if [[ "$audit_status" != 0 ]]
 then
-    count="$(yarn audit --level moderate --groups dependencies --json | tail -1 | jq '.data.vulnerabilities.moderate + .data.vulnerabilities.high + .data.vulnerabilities.critical')"
+    count="$(yarn npm audit --severity moderate --environment production --json | tail -1 | jq '.data.vulnerabilities.moderate + .data.vulnerabilities.high + .data.vulnerabilities.critical')"
    printf "Audit shows %s moderate or high severity advisories _in the production dependencies_\n" "$count"
    exit 1
 else
--- a/.depcheckrc.yml
+++ b/.depcheckrc.yml
@ -5,6 +5,7 @@ ignores:
  #

  - '@lavamoat/snow'
+  - '@lavamoat/allow-scripts'
  - '@babel/runtime'
  - '@fortawesome/fontawesome-free'
  - 'punycode'
@ -34,7 +35,6 @@ ignores:
  - 'prettier-plugin-sort-json' # automatically imported by prettier
  - 'source-map-explorer'
  # development tool
-  - 'yarn-deduplicate'
  - 'improved-yarn-audit'
  # storybook
  - '@storybook/core'
--- a/.gitattributes
+++ b/.gitattributes
@ -16,3 +16,7 @@ test/e2e/send-eth-with-private-key-test/web3js.js linguist-vendored linguist-gen
 # translations will be a little harder to review but those do not get submitted
 # as often as other PRs.
 app/_locales/** linguist-generated
+
+# yarn berry suggested .gitattributes
+/.yarn/releases/** binary
+/.yarn/plugins/** binary
--- a/.gitignore
+++ b/.gitignore
@ -60,3 +60,10 @@ test-results/
 # This file is used to authenticate with the GitHub Package registry, to
 # enable the use of @metamask preview builds.
 .npmrc
+#yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
--- a/.iyarc
+++ b/.iyarc
@ -1,2 +1,7 @@
 # improved-yarn-audit advisory exclusions
 GHSA-257v-vj4p-3w2h
+
+# yarn berry's `yarn npm audit` script reports the following vulnerability but
+# it is a false positive. The offending version of 'ws' that is installed is
+# 7.1.1 and is included only via remote-redux-devtools which is a devDependency
+GHSA-6fc8-4gx4-v693
--- a/.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch
+++ b/.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch
@ -0,0 +1,48 @@
+diff --git a/helpers/construct.js b/helpers/construct.js
+index ecc013db4703c1c6ca8a5bba3db3955e75c1a972..08826bea9453f1351c08d44be9fffca92923fd76 100644
+--- a/helpers/construct.js
+++ b/helpers/construct.js
+@@ -1,22 +1,21 @@
+-var setPrototypeOf = require("./setPrototypeOf.js");
+// All of MetaMask's supported browsers include `Reflect.construct` support, so
+// we don't need this polyfill.
+ 
+-var isNativeReflectConstruct = require("./isNativeReflectConstruct.js");
+// This Proxy preseves the two properties that were added by `@babel/runtime`.
+// I am not entire sure what these properties are for (maybe ES5/ES6
+// interoperability?) but they have been preserved just in case.
+const reflectProxy =  new Proxy(
+  Reflect.construct,
+  {
+    get: function (target, property) {
+      if (property === 'default') {
+        return target;
+      } else if (property === '__esModule') {
+        return true;
+      }
+      return Reflect.get(...arguments);
+    }
+    }
+);
+ 
+-function _construct(Parent, args, Class) {
+-  if (isNativeReflectConstruct()) {
+-    module.exports = _construct = Reflect.construct.bind(), module.exports.__esModule = true, module.exports["default"] = module.exports;
+-  } else {
+-    module.exports = _construct = function _construct(Parent, args, Class) {
+-      var a = [null];
+-      a.push.apply(a, args);
+-      var Constructor = Function.bind.apply(Parent, a);
+-      var instance = new Constructor();
+-      if (Class) setPrototypeOf(instance, Class.prototype);
+-      return instance;
+-    }, module.exports.__esModule = true, module.exports["default"] = module.exports;
+-  }
+-
+-  return _construct.apply(null, arguments);
+-}
+-
+-module.exports = _construct, module.exports.__esModule = true, module.exports["default"] = module.exports;
+\ No newline at end of file
+module.exports = reflectProxy;
+\ No newline at end of file
--- a/.yarn/patches/@eslint-eslintrc-npm-1.3.0-1f3c51be25.patch
+++ b/.yarn/patches/@eslint-eslintrc-npm-1.3.0-1f3c51be25.patch
--- a/.yarn/patches/@formatjs-intl-utils-npm-3.3.1-08510c16ad.patch
+++ b/.yarn/patches/@formatjs-intl-utils-npm-3.3.1-08510c16ad.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/@formatjs/intl-utils/dist/index.js b/node_modules/@formatjs/intl-utils/dist/index.js
-index cb44944..4ec2d32 100644
--- a/node_modules/@formatjs/intl-utils/dist/index.js
-+++ b/node_modules/@formatjs/intl-utils/dist/index.js
+diff --git a/dist/index.js b/dist/index.js
+index cb44944a2a0e8214e9c507936d9a38fafd355655..4ec2d32be9fdd670c59b5727805eb01c231b86b7 100644
+--- a/dist/index.js
+++ b/dist/index.js
@@ -25,7 +25,7 @@ exports.toRawFixed = polyfill_utils_1.toRawFixed;
 exports.toRawPrecision = polyfill_utils_1.toRawPrecision;
 exports.getMagnitude = polyfill_utils_1.getMagnitude;
@ -11,10 +11,10 @@ index cb44944..4ec2d32 100644
 exports.isWellFormedUnitIdentifier = polyfill_utils_1.isWellFormedUnitIdentifier;
 exports.defineProperty = polyfill_utils_1.defineProperty;
 var resolve_locale_1 = require("./resolve-locale");
-diff --git a/node_modules/@formatjs/intl-utils/dist/polyfill-utils.js b/node_modules/@formatjs/intl-utils/dist/polyfill-utils.js
-index 9306ef0..24859ac 100644
--- a/node_modules/@formatjs/intl-utils/dist/polyfill-utils.js
-+++ b/node_modules/@formatjs/intl-utils/dist/polyfill-utils.js
+diff --git a/dist/polyfill-utils.js b/dist/polyfill-utils.js
+index 9306ef0dd39575620352ed50cc3d80ef449910e9..24859acce8a860f2515054e7ae4d17b6bd200327 100644
+--- a/dist/polyfill-utils.js
+++ b/dist/polyfill-utils.js
@@ -5,7 +5,7 @@ var units_1 = require("./units");
 function hasOwnProperty(o, key) {
     return Object.prototype.hasOwnProperty.call(o, key);
@ -23,4 +23,4 @@ index 9306ef0..24859ac 100644
 +Object.defineProperty(exports, 'hasOwnProperty', { value: hasOwnProperty });
 /**
  * https://tc39.es/ecma262/#sec-toobject
-  * @param arg
+  * @param arg
--- a/.yarn/patches/@fortawesome-fontawesome-free-npm-5.13.0-f20fc0388d.patch
+++ b/.yarn/patches/@fortawesome-fontawesome-free-npm-5.13.0-f20fc0388d.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/@fortawesome/fontawesome-free/scss/_larger.scss b/node_modules/@fortawesome/fontawesome-free/scss/_larger.scss
-index 27c2ad5..5b82984 100644
--- a/node_modules/@fortawesome/fontawesome-free/scss/_larger.scss
-+++ b/node_modules/@fortawesome/fontawesome-free/scss/_larger.scss
+diff --git a/scss/_larger.scss b/scss/_larger.scss
+index 27c2ad5fc45272972e7e894e2b1dc4ae7e10367b..5b8298418eeeeb86eab39706093455a0809e9423 100644
+--- a/scss/_larger.scss
+++ b/scss/_larger.scss
@@ -1,10 +1,12 @@
 +@use "sass:math";
 +
@ -17,10 +17,10 @@ index 27c2ad5..5b82984 100644
   vertical-align: -.0667em;
 }
 
-diff --git a/node_modules/@fortawesome/fontawesome-free/scss/_list.scss b/node_modules/@fortawesome/fontawesome-free/scss/_list.scss
-index 8ebf333..233923a 100644
--- a/node_modules/@fortawesome/fontawesome-free/scss/_list.scss
-+++ b/node_modules/@fortawesome/fontawesome-free/scss/_list.scss
+diff --git a/scss/_list.scss b/scss/_list.scss
+index 8ebf33333cfd9cc589c44b39e9881d781986fccb..233923aba7f6a9821c3fb5b471e4d10dc619037f 100644
+--- a/scss/_list.scss
+++ b/scss/_list.scss
@@ -1,9 +1,11 @@
 +@use "sass:math";
 +
@ -34,10 +34,10 @@ index 8ebf333..233923a 100644
   padding-left: 0;
 
   > li { position: relative; }
-diff --git a/node_modules/@fortawesome/fontawesome-free/scss/_variables.scss b/node_modules/@fortawesome/fontawesome-free/scss/_variables.scss
-index fad7705..d0da3ae 100644
--- a/node_modules/@fortawesome/fontawesome-free/scss/_variables.scss
-+++ b/node_modules/@fortawesome/fontawesome-free/scss/_variables.scss
+diff --git a/scss/_variables.scss b/scss/_variables.scss
+index fad7705d887c25e5c47b1ecaead68f27f4d709af..d0da3aebe52c2b6e0d783b8b7658d7c72c803343 100644
+--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -1,3 +1,5 @@
 +@use "sass:math";
 +
--- a/.yarn/patches/@keystonehq-bc-ur-registry-npm-0.5.0-alpha.5-b95c7992a6.patch
+++ b/.yarn/patches/@keystonehq-bc-ur-registry-npm-0.5.0-alpha.5-b95c7992a6.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/Bytes.ts b/node_modules/@keystonehq/bc-ur-registry/src/Bytes.ts
+diff --git a/src/Bytes.ts b/src/Bytes.ts
 deleted file mode 100644
-index a5f9f7d..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/Bytes.ts
+index a5f9f7d4facaf06bd2dc9deedb85cd331c9e75a0..0000000000000000000000000000000000000000
+--- a/src/Bytes.ts
 +++ /dev/null
@@ -1,34 +0,0 @@
 -import { decodeToDataItem, DataItem } from './lib';
@ -38,10 +38,10 @@ index a5f9f7d..0000000
 -    return Bytes.fromDataItem(dataItem);
 -  };
 -}
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/CryptoAccount.ts b/node_modules/@keystonehq/bc-ur-registry/src/CryptoAccount.ts
+diff --git a/src/CryptoAccount.ts b/src/CryptoAccount.ts
 deleted file mode 100644
-index e6efeeb..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/CryptoAccount.ts
+index e6efeeb44a0b23428d172bd5aee99621d7469d19..0000000000000000000000000000000000000000
+--- a/src/CryptoAccount.ts
 +++ /dev/null
@@ -1,58 +0,0 @@
 -import { CryptoOutput } from '.';
@ -102,10 +102,10 @@ index e6efeeb..0000000
 -    return CryptoAccount.fromDataItem(dataItem);
 -  };
 -}
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/CryptoCoinInfo.ts b/node_modules/@keystonehq/bc-ur-registry/src/CryptoCoinInfo.ts
+diff --git a/src/CryptoCoinInfo.ts b/src/CryptoCoinInfo.ts
 deleted file mode 100644
-index 843b50c..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/CryptoCoinInfo.ts
+index 843b50cb0551def4be3ba8293f34ab94063c85a7..0000000000000000000000000000000000000000
+--- a/src/CryptoCoinInfo.ts
 +++ /dev/null
@@ -1,59 +0,0 @@
 -import { decodeToDataItem, DataItem } from './lib';
@ -167,10 +167,10 @@ index 843b50c..0000000
 -    return CryptoCoinInfo.fromDataItem(dataItem);
 -  };
 -}
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/CryptoECKey.ts b/node_modules/@keystonehq/bc-ur-registry/src/CryptoECKey.ts
+diff --git a/src/CryptoECKey.ts b/src/CryptoECKey.ts
 deleted file mode 100644
-index 54c3c4b..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/CryptoECKey.ts
+index 54c3c4b0aabe13bdaff7821dd8524a6a789ed008..0000000000000000000000000000000000000000
+--- a/src/CryptoECKey.ts
 +++ /dev/null
@@ -1,68 +0,0 @@
 -import { decodeToDataItem, DataItem } from './lib';
@ -241,10 +241,10 @@ index 54c3c4b..0000000
 -    return CryptoECKey.fromDataItem(dataItem);
 -  };
 -}
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/CryptoHDKey.ts b/node_modules/@keystonehq/bc-ur-registry/src/CryptoHDKey.ts
+diff --git a/src/CryptoHDKey.ts b/src/CryptoHDKey.ts
 deleted file mode 100644
-index 8fc2a82..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/CryptoHDKey.ts
+index 8fc2a82970fd2f639cb3912940c328308ec4ea2c..0000000000000000000000000000000000000000
+--- a/src/CryptoHDKey.ts
 +++ /dev/null
@@ -1,237 +0,0 @@
 -// eslint-disable-next-line @typescript-eslint/ban-ts-comment
@ -484,112 +484,10 @@ index 8fc2a82..0000000
 -    return CryptoHDKey.fromDataItem(dataItem);
 -  };
 -}
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/CryptoKeypath.ts b/node_modules/@keystonehq/bc-ur-registry/src/CryptoKeypath.ts
+diff --git a/src/CryptoOutput.ts b/src/CryptoOutput.ts
 deleted file mode 100644
-index 00146ce..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/CryptoKeypath.ts
-+++ /dev/null
-@@ -1,96 +0,0 @@
-import { decodeToDataItem, DataItem } from './lib';
-import { PathComponent } from './PathComponent';
-import { RegistryItem } from './RegistryItem';
-import { RegistryTypes } from './RegistryType';
-import { DataItemMap } from './types';
-
-enum Keys {
-  components = 1,
-  source_fingerprint,
-  depth,
-}
-
-export class CryptoKeypath extends RegistryItem {
-  getRegistryType = () => {
-    return RegistryTypes.CRYPTO_KEYPATH;
-  };
-
-  constructor(
-    private components: PathComponent[] = [],
-    private sourceFingerprint?: Buffer,
-    private depth?: number,
-  ) {
-    super();
-  }
-
-  public getPath = () => {
-    if (this.components.length === 0) {
-      return undefined;
-    }
-
-    const components = this.components.map((component) => {
-      return `${component.isWildcard() ? '*' : component.getIndex()}${
-        component.isHardened() ? "'" : ''
-      }`;
-    });
-    return components.join('/');
-  };
-
-  public getComponents = () => this.components;
-  public getSourceFingerprint = () => this.sourceFingerprint;
-  public getDepth = () => this.depth;
-
-  toDataItem = () => {
-    const map: DataItemMap = {};
-    const components: (number | boolean | any[])[] = [];
-    this.components &&
-      this.components.forEach((component) => {
-        if (component.isWildcard()) {
-          components.push([]);
-        } else {
-          components.push(component.getIndex() as number);
-        }
-        components.push(component.isHardened());
-      });
-    map[Keys.components] = components;
-    if (this.sourceFingerprint) {
-      map[Keys.source_fingerprint] = this.sourceFingerprint.readUInt32BE(0);
-    }
-    if (this.depth !== undefined) {
-      map[Keys.depth] = this.depth;
-    }
-    return new DataItem(map);
-  };
-
-  static fromDataItem = (dataItem: DataItem) => {
-    const map: Record<string, any> = dataItem.getData();
-    const pathComponents: PathComponent[] = [];
-    const components = map[Keys.components] as any[];
-    if (components) {
-      for (let i = 0; i < components.length; i += 2) {
-        const isHardened = components[i + 1];
-        const path = components[i];
-        if (typeof path === 'number') {
-          pathComponents.push(
-            new PathComponent({ index: path, hardened: isHardened }),
-          );
-        } else {
-          pathComponents.push(new PathComponent({ hardened: isHardened }));
-        }
-      }
-    }
-    const _sourceFingerprint = map[Keys.source_fingerprint];
-    let sourceFingerprint: Buffer | undefined;
-    if (_sourceFingerprint) {
-      sourceFingerprint = Buffer.alloc(4);
-      sourceFingerprint.writeUInt32BE(_sourceFingerprint, 0);
-    }
-    const depth = map[Keys.depth];
-    return new CryptoKeypath(pathComponents, sourceFingerprint, depth);
-  };
-
-  public static fromCBOR = (_cborPayload: Buffer) => {
-    const dataItem = decodeToDataItem(_cborPayload);
-    return CryptoKeypath.fromDataItem(dataItem);
-  };
-}
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/CryptoOutput.ts b/node_modules/@keystonehq/bc-ur-registry/src/CryptoOutput.ts
-deleted file mode 100644
-index 90abf6f..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/CryptoOutput.ts
+index 90abf6f108c05315ee2b255465dd39c90ee0f459..0000000000000000000000000000000000000000
+--- a/src/CryptoOutput.ts
 +++ /dev/null
@@ -1,127 +0,0 @@
 -import { CryptoECKey } from './CryptoECKey';
@ -719,10 +617,10 @@ index 90abf6f..0000000
 -    return CryptoOutput.fromDataItem(dataItem);
 -  };
 -}
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/CryptoPSBT.ts b/node_modules/@keystonehq/bc-ur-registry/src/CryptoPSBT.ts
+diff --git a/src/CryptoPSBT.ts b/src/CryptoPSBT.ts
 deleted file mode 100644
-index 626b647..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/CryptoPSBT.ts
+index 626b647098f04039755a1396511076ce2a0112a4..0000000000000000000000000000000000000000
+--- a/src/CryptoPSBT.ts
 +++ /dev/null
@@ -1,32 +0,0 @@
 -import { decodeToDataItem, DataItem } from './lib';
@ -757,10 +655,10 @@ index 626b647..0000000
 -    return CryptoPSBT.fromDataItem(dataItem);
 -  };
 -}
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/Decoder/index.ts b/node_modules/@keystonehq/bc-ur-registry/src/Decoder/index.ts
+diff --git a/src/Decoder/index.ts b/src/Decoder/index.ts
 deleted file mode 100644
-index 5d7e3fe..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/Decoder/index.ts
+index 5d7e3fe5aaef44fae3c39ac002bd2add9278a201..0000000000000000000000000000000000000000
+--- a/src/Decoder/index.ts
 +++ /dev/null
@@ -1,41 +0,0 @@
 -import { URDecoder } from '@ngraveio/bc-ur';
@ -804,10 +702,10 @@ index 5d7e3fe..0000000
 -    }
 -  };
 -}
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/MultiKey.ts b/node_modules/@keystonehq/bc-ur-registry/src/MultiKey.ts
+diff --git a/src/MultiKey.ts b/src/MultiKey.ts
 deleted file mode 100644
-index ced19dc..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/MultiKey.ts
+index ced19dc364fae1ad5b9147710cdb2195e17b4582..0000000000000000000000000000000000000000
+--- a/src/MultiKey.ts
 +++ /dev/null
@@ -1,60 +0,0 @@
 -import { CryptoECKey } from './CryptoECKey';
@ -870,10 +768,10 @@ index ced19dc..0000000
 -    return new MultiKey(threshold, keys);
 -  };
 -}
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/PathComponent.ts b/node_modules/@keystonehq/bc-ur-registry/src/PathComponent.ts
+diff --git a/src/PathComponent.ts b/src/PathComponent.ts
 deleted file mode 100644
-index d41cb06..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/PathComponent.ts
+index d41cb067e383f29986a7d84bc88b0e4b7b71fb0b..0000000000000000000000000000000000000000
+--- a/src/PathComponent.ts
 +++ /dev/null
@@ -1,28 +0,0 @@
 -export class PathComponent {
@ -904,10 +802,10 @@ index d41cb06..0000000
 -  public isWildcard = () => this.wildcard;
 -  public isHardened = () => this.hardened;
 -}
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/RegistryItem.ts b/node_modules/@keystonehq/bc-ur-registry/src/RegistryItem.ts
+diff --git a/src/RegistryItem.ts b/src/RegistryItem.ts
 deleted file mode 100644
-index 99139f7..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/RegistryItem.ts
+index 99139f7001b596add08be3332526264c39693279..0000000000000000000000000000000000000000
+--- a/src/RegistryItem.ts
 +++ /dev/null
@@ -1,35 +0,0 @@
 -import { UR, UREncoder } from '@ngraveio/bc-ur';
@ -945,10 +843,10 @@ index 99139f7..0000000
 -    return urEncoder;
 -  };
 -}
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/RegistryType.ts b/node_modules/@keystonehq/bc-ur-registry/src/RegistryType.ts
+diff --git a/src/RegistryType.ts b/src/RegistryType.ts
 deleted file mode 100644
-index 64637bc..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/RegistryType.ts
+index 64637bca3626b0db586563d5dcffd44f61e39520..0000000000000000000000000000000000000000
+--- a/src/RegistryType.ts
 +++ /dev/null
@@ -1,20 +0,0 @@
 -// cbor registry types: https://github.com/BlockchainCommons/Research/blob/master/papers/bcr-2020-006-urtypes.md
@ -971,10 +869,10 @@ index 64637bc..0000000
 -  CRYPTO_PSBT: new RegistryType('crypto-psbt', 310),
 -  CRYPTO_ACCOUNT: new RegistryType('crypto-account', 311),
 -};
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/ScriptExpression.ts b/node_modules/@keystonehq/bc-ur-registry/src/ScriptExpression.ts
+diff --git a/src/ScriptExpression.ts b/src/ScriptExpression.ts
 deleted file mode 100644
-index 8fbf0db..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/ScriptExpression.ts
+index 8fbf0db679040337a5d9e6af8c8ecf734faa00d5..0000000000000000000000000000000000000000
+--- a/src/ScriptExpression.ts
 +++ /dev/null
@@ -1,26 +0,0 @@
 -export class ScriptExpression {
@ -1003,21 +901,10 @@ index 8fbf0db..0000000
 -  ADDRESS: new ScriptExpression(307, 'addr'),
 -  RAW_SCRIPT: new ScriptExpression(408, 'raw'),
 -};
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/errors/index.ts b/node_modules/@keystonehq/bc-ur-registry/src/errors/index.ts
+diff --git a/src/index.ts b/src/index.ts
 deleted file mode 100644
-index dd2b0bd..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/errors/index.ts
-+++ /dev/null
-@@ -1,5 +0,0 @@
-export class UnknownURTypeError extends Error {
-  constructor(message: string) {
-    super(message);
-  }
-}
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/index.ts b/node_modules/@keystonehq/bc-ur-registry/src/index.ts
-deleted file mode 100644
-index bb07bc8..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/index.ts
+index bb07bc8c2a62c2c0afc28bce0f8c4d968b7c93ee..0000000000000000000000000000000000000000
+--- a/src/index.ts
 +++ /dev/null
@@ -1,110 +0,0 @@
 -import './patchCBOR';
@ -1130,10 +1017,10 @@ index bb07bc8..0000000
 -export * from './utils'
 -
 -export default URlib;
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/lib/DataItem.ts b/node_modules/@keystonehq/bc-ur-registry/src/lib/DataItem.ts
+diff --git a/src/lib/DataItem.ts b/src/lib/DataItem.ts
 deleted file mode 100644
-index 9727f7e..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/lib/DataItem.ts
+index 9727f7eb100756076732b137402e22efad73727c..0000000000000000000000000000000000000000
+--- a/src/lib/DataItem.ts
 +++ /dev/null
@@ -1,25 +0,0 @@
 -export class DataItem {
@ -1161,10 +1048,10 @@ index 9727f7e..0000000
 -    return this.data;
 -  };
 -}
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/lib/cbor-sync.d.ts b/node_modules/@keystonehq/bc-ur-registry/src/lib/cbor-sync.d.ts
+diff --git a/src/lib/cbor-sync.d.ts b/src/lib/cbor-sync.d.ts
 deleted file mode 100644
-index 6374ba7..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/lib/cbor-sync.d.ts
+index 6374ba78fb23af2b8773820250e1183ed36c978e..0000000000000000000000000000000000000000
+--- a/src/lib/cbor-sync.d.ts
 +++ /dev/null
@@ -1,36 +0,0 @@
 -export namespace config {
@ -1203,10 +1090,10 @@ index 6374ba7..0000000
 -    addSemanticDecode: (tag: any, fn: any) => any;
 -};
 -//# sourceMappingURL=cbor-sync.d.ts.map
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/lib/cbor-sync.js b/node_modules/@keystonehq/bc-ur-registry/src/lib/cbor-sync.js
+diff --git a/src/lib/cbor-sync.js b/src/lib/cbor-sync.js
 deleted file mode 100644
-index df8db90..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/lib/cbor-sync.js
+index df8db9040ddb2fffed53bc980181097b97cab8d6..0000000000000000000000000000000000000000
+--- a/src/lib/cbor-sync.js
 +++ /dev/null
@@ -1,693 +0,0 @@
 -(function (global, factory) {
@ -1902,10 +1789,10 @@ index df8db90..0000000
 -
 -  return CBOR;
 -});
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/lib/index.ts b/node_modules/@keystonehq/bc-ur-registry/src/lib/index.ts
+diff --git a/src/lib/index.ts b/src/lib/index.ts
 deleted file mode 100644
-index deb0156..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/lib/index.ts
+index deb01562dbf2ce9ea2da105c3271ad6ae573b6f6..0000000000000000000000000000000000000000
+--- a/src/lib/index.ts
 +++ /dev/null
@@ -1,9 +0,0 @@
 -export {
@ -1917,10 +1804,10 @@ index deb0156..0000000
 -  addWriter,
 -} from './cbor-sync';
 -export { DataItem } from './DataItem';
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/patchCBOR.ts b/node_modules/@keystonehq/bc-ur-registry/src/patchCBOR.ts
+diff --git a/src/patchCBOR.ts b/src/patchCBOR.ts
 deleted file mode 100644
-index 218e912..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/patchCBOR.ts
+index 218e912870e98872677bb1b167c9ab67a18fbb00..0000000000000000000000000000000000000000
+--- a/src/patchCBOR.ts
 +++ /dev/null
@@ -1,11 +0,0 @@
 -import { patchTags } from './utils';
@ -1934,10 +1821,10 @@ index 218e912..0000000
 -  se.getTag(),
 -);
 -patchTags(registryTags.concat(scriptExpressionTags) as number[]);
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/types.ts b/node_modules/@keystonehq/bc-ur-registry/src/types.ts
+diff --git a/src/types.ts b/src/types.ts
 deleted file mode 100644
-index 29aa370..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/types.ts
+index 29aa370267a20a0b50f01604c014d52145194b00..0000000000000000000000000000000000000000
+--- a/src/types.ts
 +++ /dev/null
@@ -1,6 +0,0 @@
 -export interface ICryptoKey {
@ -1946,10 +1833,10 @@ index 29aa370..0000000
 -}
 -
 -export type DataItemMap = Record<string, any>;
-diff --git a/node_modules/@keystonehq/bc-ur-registry/src/utils.ts b/node_modules/@keystonehq/bc-ur-registry/src/utils.ts
+diff --git a/src/utils.ts b/src/utils.ts
 deleted file mode 100644
-index e38112b..0000000
--- a/node_modules/@keystonehq/bc-ur-registry/src/utils.ts
+index e38112bfad6326399f71526ac1de00384c47fd49..0000000000000000000000000000000000000000
+--- a/src/utils.ts
 +++ /dev/null
@@ -1,19 +0,0 @@
 -import { addSemanticDecode, addSemanticEncode, DataItem } from './lib';
--- a/.yarn/patches/@lavamoat-lavapack-npm-3.1.0-34c65d233b.patch
+++ b/.yarn/patches/@lavamoat-lavapack-npm-3.1.0-34c65d233b.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/@lavamoat/lavapack/src/pack.js b/node_modules/@lavamoat/lavapack/src/pack.js
-index eb41a0a..3f891ea 100644
--- a/node_modules/@lavamoat/lavapack/src/pack.js
-+++ b/node_modules/@lavamoat/lavapack/src/pack.js
+diff --git a/src/pack.js b/src/pack.js
+index eb41a0af7e2cb84f009486e97c132a0608f17912..3f891eaa2690ef4d4e314d6ca8851becd12afeb3 100644
+--- a/src/pack.js
+++ b/src/pack.js
@@ -203,7 +203,9 @@ function createPacker({
     const jsonSerializeableData = {
       // id,
--- a/.yarn/patches/@reduxjs-toolkit-npm-1.6.2-67af09515f.patch
+++ b/.yarn/patches/@reduxjs-toolkit-npm-1.6.2-67af09515f.patch
--- a/.yarn/patches/@types-madge-npm-5.0.0-654566c2d2.patch
+++ b/.yarn/patches/@types-madge-npm-5.0.0-654566c2d2.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/@types/madge/index.d.ts b/node_modules/@types/madge/index.d.ts
-index f2a8652..3a26bfe 100755
--- a/node_modules/@types/madge/index.d.ts
-+++ b/node_modules/@types/madge/index.d.ts
+diff --git a/index.d.ts b/index.d.ts
+index f2a8652b233b13610c67633b7eca38d507276c95..3a26bfe8664e1a509fa3ad061828f457f8f5e7b9 100755
+--- a/index.d.ts
+++ b/index.d.ts
@@ -265,6 +265,10 @@ declare namespace madge {
          *
          * @default undefined
--- a/.yarn/patches/abort-controller-npm-3.0.0-2f3a9a2bcb.patch
+++ b/.yarn/patches/abort-controller-npm-3.0.0-2f3a9a2bcb.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/abort-controller/browser.js b/node_modules/abort-controller/browser.js
-index b0c5ec3..b61071b 100644
--- a/node_modules/abort-controller/browser.js
-+++ b/node_modules/abort-controller/browser.js
+diff --git a/browser.js b/browser.js
+index b0c5ec37d9b76ca561a0a5391a07226ebc6a2b48..b61071bb3de94c61e98ffc49d9257c58c5f0c792 100644
+--- a/browser.js
+++ b/browser.js
@@ -2,12 +2,7 @@
 "use strict"
 
--- a/.yarn/patches/acorn-npm-7.4.1-f450b4646c.patch
+++ b/.yarn/patches/acorn-npm-7.4.1-f450b4646c.patch
@ -0,0 +1,13 @@
+diff --git a/dist/acorn.js b/dist/acorn.js
+index 0523f0e3485d0100b6c83d9a290b6ea05bc1f921..1617d4aa489ae3fb014f3540e9b0df7a89a1944e 100644
+--- a/dist/acorn.js
+++ b/dist/acorn.js
+@@ -1835,7 +1835,7 @@
+       if (checkClashes) {
+         if (has(checkClashes, expr.name))
+           { this.raiseRecoverable(expr.start, "Argument name clash"); }
+-        checkClashes[expr.name] = true;
+          Object.defineProperty(checkClashes, expr.name, { value: true, writable: true, enumerable: true, configurable: true });
+       }
+       if (bindingType !== BIND_NONE && bindingType !== BIND_OUTSIDE) { this.declareName(expr.name, bindingType, expr.start); }
+       break
--- a/.yarn/patches/await-semaphore-npm-0.1.3-b7a0001fab.patch
+++ b/.yarn/patches/await-semaphore-npm-0.1.3-b7a0001fab.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/await-semaphore/index.ts b/node_modules/await-semaphore/index.ts
+diff --git a/index.ts b/index.ts
 deleted file mode 100644
-index 69ce92a..0000000
--- a/node_modules/await-semaphore/index.ts
+index 69ce92ac081f182b5123409021e1b1028255c7f3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
+--- a/index.ts
 +++ /dev/null
@@ -1,62 +0,0 @@
 -export class Semaphore {
--- a/.yarn/patches/borc-npm-2.1.2-8ffcc2dd81.patch
+++ b/.yarn/patches/borc-npm-2.1.2-8ffcc2dd81.patch
@ -0,0 +1,13 @@
+diff --git a/src/decoder.asm.js b/src/decoder.asm.js
+index d77a3c20aef26fcb778d07146399cb8d74ef24bf..dc70f6be20c92b12528047e27febf35363f97166 100644
+--- a/src/decoder.asm.js
+++ b/src/decoder.asm.js
+@@ -1,7 +1,7 @@
+ /* eslint-disable */
+ 
+ module.exports = function decodeAsm (stdlib, foreign, buffer) {
+-  'use asm'
+  // 'use asm' //causes v8 to not cache bytecode
+ 
+   // -- Imports
+ 
--- a/.yarn/patches/colors-npm-1.4.0-7e2cf12234.patch
+++ b/.yarn/patches/colors-npm-1.4.0-7e2cf12234.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/colors/lib/extendStringPrototype.js b/node_modules/colors/lib/extendStringPrototype.js
-index 46fd386..c7d0fc5 100644
--- a/node_modules/colors/lib/extendStringPrototype.js
-+++ b/node_modules/colors/lib/extendStringPrototype.js
+diff --git a/lib/extendStringPrototype.js b/lib/extendStringPrototype.js
+index 46fd386a915a67d53fa8c3beefdf74d6c0ed03bc..c7d0fc50f42603463eb8237e2428802ab8831eb9 100644
+--- a/lib/extendStringPrototype.js
+++ b/lib/extendStringPrototype.js
@@ -5,7 +5,8 @@ module['exports'] = function() {
   // Extends prototype of native string object to allow for "foo".red syntax
   //
--- a/.yarn/patches/convert-source-map-npm-1.1.3-7f1bfeabd4.patch
+++ b/.yarn/patches/convert-source-map-npm-1.1.3-7f1bfeabd4.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/combine-source-map/node_modules/convert-source-map/index.js b/node_modules/combine-source-map/node_modules/convert-source-map/index.js
-index bfe92d1..bee1ffe 100644
--- a/node_modules/combine-source-map/node_modules/convert-source-map/index.js
-+++ b/node_modules/combine-source-map/node_modules/convert-source-map/index.js
+diff --git a/index.js b/index.js
+index bfe92d1e2cae77974e1962b1e339471382d7bd1e..bee1ffe59ab15bd604254a366b0a800b35f0baca 100644
+--- a/index.js
+++ b/index.js
@@ -9,7 +9,7 @@ var mapFileCommentRx =
   /(?:\/\/[@#][ \t]+sourceMappingURL=([^\s'"]+?)[ \t]*$)|(?:\/\*[@#][ \t]+sourceMappingURL=([^\*]+?)[ \t]*(?:\*\/){1}[ \t]*$)/mg
 
--- a/.yarn/patches/error-npm-7.0.2-6dfbeab4da.patch
+++ b/.yarn/patches/error-npm-7.0.2-6dfbeab4da.patch
@ -1,16 +1,18 @@
-diff --git a/node_modules/error/typed.js b/node_modules/error/typed.js
-index fe9effd..e554568 100644
--- a/node_modules/error/typed.js
-+++ b/node_modules/error/typed.js
-@@ -22,8 +22,10 @@ function TypedError(args) {
+diff --git a/typed.js b/typed.js
+index fe9effd2bfb56b509a124e71936a9f1a0b0d8091..d030b5afcb9d35a595f2cb888d892876949f7da2 100644
+--- a/typed.js
+++ b/typed.js
+@@ -22,9 +22,11 @@ function TypedError(args) {
         args.name = errorName[0].toUpperCase() + errorName.substr(1);
     }
 
 -    extend(createError, args);
     createError._name = args.name;
+-
 +    //remove args.name, name is not extensible under strict mode (lavamoat)
 +    delete args.name
 +    extend(createError, args);
- 
+  
     return createError;
 
+     function createError(opts) {
--- a/.yarn/patches/eslint-import-resolver-typescript-npm-2.5.0-3b8adf0d03.patch
+++ b/.yarn/patches/eslint-import-resolver-typescript-npm-2.5.0-3b8adf0d03.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/eslint-import-resolver-typescript/lib/cjs.js b/node_modules/eslint-import-resolver-typescript/lib/cjs.js
-index 5aeddb5..1fe0cbf 100644
--- a/node_modules/eslint-import-resolver-typescript/lib/cjs.js
-+++ b/node_modules/eslint-import-resolver-typescript/lib/cjs.js
+diff --git a/lib/cjs.js b/lib/cjs.js
+index 15e6c37f3ae9f94c710ad04a7d88ec35cbfe4f70..6b80ab657f7e319058c99dfe827c66dfb9f76778 100644
+--- a/lib/cjs.js
+++ b/lib/cjs.js
@@ -49,13 +49,19 @@ function __spreadArray(to, from) {
 
 var IMPORTER_NAME = 'eslint-import-resolver-typescript';
--- a/.yarn/patches/eslint-npm-8.20.0-6bbc377ff7.patch
+++ b/.yarn/patches/eslint-npm-8.20.0-6bbc377ff7.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/eslint/lib/linter/linter.js b/node_modules/eslint/lib/linter/linter.js
-index 29d78da..a6ae07b 100644
--- a/node_modules/eslint/lib/linter/linter.js
-+++ b/node_modules/eslint/lib/linter/linter.js
+diff --git a/lib/linter/linter.js b/lib/linter/linter.js
+index 29d78da3969e2a3560d056af5683a08083562984..a6ae07b7142a353fcd8d58b55a7e68b8f81b2846 100644
+--- a/lib/linter/linter.js
+++ b/lib/linter/linter.js
@@ -704,7 +704,7 @@ function createLanguageOptions({ globals: configuredGlobals, parser, parserOptio
  */
 function resolveGlobals(providedGlobals, enabledEnvironments) {
--- a/.yarn/patches/eth-query-npm-2.1.2-7c6adc825f.patch
+++ b/.yarn/patches/eth-query-npm-2.1.2-7c6adc825f.patch
@ -1,15 +1,19 @@
-diff --git a/node_modules/eth-query/index.js b/node_modules/eth-query/index.js
-index 13e9f3c..d714bb7 100644
--- a/node_modules/eth-query/index.js
-+++ b/node_modules/eth-query/index.js
-@@ -1,5 +1,6 @@
+diff --git a/index.js b/index.js
+index 13e9f3c25e7d3bee6a4ec3c2c5e1eea31e86a377..18b050ded27baf3603708fd6d595a554ea3c19c8 100644
+--- a/index.js
+++ b/index.js
+@@ -1,9 +1,9 @@
 const extend = require('xtend')
 const createRandomId = require('json-rpc-random-id')()
-+const debug = require('debug')('eth-query');
+const debug = require('debug')('eth-query')
 
 module.exports = EthQuery
 
-@@ -63,7 +64,10 @@ EthQuery.prototype.submitHashrate =                      generateFnFor('eth_subm
+-
+ function EthQuery(provider){
+   const self = this
+   self.currentProvider = provider
+@@ -63,7 +63,10 @@ EthQuery.prototype.submitHashrate =                      generateFnFor('eth_subm
 
 EthQuery.prototype.sendAsync = function(opts, cb){
   const self = this
--- a/.yarn/patches/ethereumjs-util-npm-5.2.1-72b39f4e7e.patch
+++ b/.yarn/patches/ethereumjs-util-npm-5.2.1-72b39f4e7e.patch
@ -0,0 +1,46 @@
+diff --git a/dist/secp256k1-adapter.js b/dist/secp256k1-adapter.js
+index e4d053a3a828f07046b360f5990a8fcbfcc5a92d..fdc14f61d8718e9514d8a81bbb7b4e9d58132432 100644
+--- a/dist/secp256k1-adapter.js
+++ b/dist/secp256k1-adapter.js
+@@ -2,7 +2,7 @@
+ 
+ var secp256k1 = require('ethereum-cryptography/secp256k1');
+ 
+-var secp256k1v3 = require('./secp256k1-lib/index');
+function getSecp256k1 () { return require('./secp256k1-lib/index'); }
+ var der = require('./secp256k1-lib/der');
+ 
+ /**
+@@ -28,6 +28,7 @@ var privateKeyVerify = function privateKeyVerify(privateKey) {
+  * @return {boolean}
+  */
+ var privateKeyExport = function privateKeyExport(privateKey, compressed) {
+  var secp256k1v3 = getSecp256k1();
+   // privateKeyExport method is not part of secp256k1 v4 package
+   // this implementation is based on v3
+   if (privateKey.length !== 32) {
+@@ -77,7 +78,7 @@ var privateKeyModInverse = function privateKeyModInverse(privateKey) {
+   if (privateKey.length !== 32) {
+     throw new Error('private key length is invalid');
+   }
+-
+  var secp256k1v3 = getSecp256k1();
+   return Buffer.from(secp256k1v3.privateKeyModInverse(Uint8Array.from(privateKey)));
+ };
+ 
+@@ -223,6 +224,7 @@ var signatureImportLax = function signatureImportLax(signature) {
+   if (signature.length === 0) {
+     throw new RangeError('signature length is invalid');
+   }
+  var secp256k1v3 = getSecp256k1();
+ 
+   var sigObj = der.signatureImportLax(signature);
+   if (sigObj === null) {
+@@ -351,6 +353,7 @@ var ecdhUnsafe = function ecdhUnsafe(publicKey, privateKey, compressed) {
+   if (privateKey.length !== 32) {
+     throw new RangeError('private key length is invalid');
+   }
+  var secp256k1v3 = getSecp256k1();
+ 
+   return Buffer.from(secp256k1v3.ecdhUnsafe(Uint8Array.from(publicKey), Uint8Array.from(privateKey), compressed));
+ };
--- a/.yarn/patches/ethereumjs-util-npm-7.1.5-5bb4d00000.patch
+++ b/.yarn/patches/ethereumjs-util-npm-7.1.5-5bb4d00000.patch
@ -1,39 +1,39 @@
-diff --git a/node_modules/ethereumjs-util/dist.browser/internal.js b/node_modules/ethereumjs-util/dist.browser/internal.js
-index 9f3888b..3803958 100644
--- a/node_modules/ethereumjs-util/dist.browser/internal.js
-+++ b/node_modules/ethereumjs-util/dist.browser/internal.js
-@@ -43,8 +43,9 @@ exports.isHexPrefixed = isHexPrefixed;
-  * @returns the string without 0x prefix
-  */
- var stripHexPrefix = function (str) {
-    if (typeof str !== 'string')
-        throw new Error("[stripHexPrefix] input must be type 'string', received ".concat(typeof str));
-+    if (typeof str !== 'string'){
-+        return str;
-+    }
-     return isHexPrefixed(str) ? str.slice(2) : str;
- };
- exports.stripHexPrefix = stripHexPrefix;
-diff --git a/node_modules/ethereumjs-util/dist/internal.js b/node_modules/ethereumjs-util/dist/internal.js
-index 01a90a0..9f1d8cd 100644
--- a/node_modules/ethereumjs-util/dist/internal.js
-+++ b/node_modules/ethereumjs-util/dist/internal.js
+diff --git a/dist/internal.js b/dist/internal.js
+index 01a90a00e666ff2af0e66fcab0016d58ffd13fd7..1bfdbeb9fc56ed7a13e7f4a52fa439455dc0e910 100644
+--- a/dist/internal.js
+++ b/dist/internal.js
@@ -43,8 +43,9 @@ exports.isHexPrefixed = isHexPrefixed;
  * @returns the string without 0x prefix
  */
 const stripHexPrefix = (str) => {
 -    if (typeof str !== 'string')
 -        throw new Error(`[stripHexPrefix] input must be type 'string', received ${typeof str}`);
-+    if (typeof str !== 'string'){
-+        return str;
+    if (typeof str !== 'string') {
+      return str;
 +    }
     return isHexPrefixed(str) ? str.slice(2) : str;
 };
 exports.stripHexPrefix = stripHexPrefix;
-diff --git a/node_modules/ethereumjs-util/src/internal.ts b/node_modules/ethereumjs-util/src/internal.ts
-index 52032f5..8f6f5f8 100644
--- a/node_modules/ethereumjs-util/src/internal.ts
-+++ b/node_modules/ethereumjs-util/src/internal.ts
+diff --git a/dist.browser/internal.js b/dist.browser/internal.js
+index 9f3888b30098dd284a4cb80edbe6cfe4305241a2..68db592230ffb4e4c3938870931567cc51e78173 100644
+--- a/dist.browser/internal.js
+++ b/dist.browser/internal.js
+@@ -43,8 +43,9 @@ exports.isHexPrefixed = isHexPrefixed;
+  * @returns the string without 0x prefix
+  */
+ var stripHexPrefix = function (str) {
+-    if (typeof str !== 'string')
+-        throw new Error("[stripHexPrefix] input must be type 'string', received ".concat(typeof str));
+    if (typeof str !== 'string') {
+      return str;
+    }
+     return isHexPrefixed(str) ? str.slice(2) : str;
+ };
+ exports.stripHexPrefix = stripHexPrefix;
+diff --git a/src/internal.ts b/src/internal.ts
+index 52032f54caa0b6673c2bcebfc8d0f652d71976e7..8f6f5f80f3fe3a2656aacf21215120559b80d84a 100644
+--- a/src/internal.ts
+++ b/src/internal.ts
@@ -42,8 +42,9 @@ export function isHexPrefixed(str: string): boolean {
  * @returns the string without 0x prefix
  */
--- a/.yarn/patches/fast-json-patch-npm-2.2.1-63b021bb37.patch
+++ b/.yarn/patches/fast-json-patch-npm-2.2.1-63b021bb37.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/fast-json-patch/lib/helpers.js b/node_modules/fast-json-patch/lib/helpers.js
-index 0ac28b4..d048c0a 100644
--- a/node_modules/fast-json-patch/lib/helpers.js
-+++ b/node_modules/fast-json-patch/lib/helpers.js
+diff --git a/lib/helpers.js b/lib/helpers.js
+index 0ac28b4d6a715e913da246f1b4b2576c7e5537f4..d048c0a9b498d08fb70337558fa541c1ecc2ed32 100644
+--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -21,7 +21,7 @@ var _hasOwnProperty = Object.prototype.hasOwnProperty;
 function hasOwnProperty(obj, key) {
     return _hasOwnProperty.call(obj, key);
@ -10,4 +10,4 @@ index 0ac28b4..d048c0a 100644
 +Object.defineProperty(exports, "hasOwnProperty", { value: hasOwnProperty });
 function _objectKeys(obj) {
     if (Array.isArray(obj)) {
-         var keys = new Array(obj.length);
+         var keys = new Array(obj.length);
--- a/.yarn/patches/fast-json-patch-npm-3.1.0-f4bd467b5f.patch
+++ b/.yarn/patches/fast-json-patch-npm-3.1.0-f4bd467b5f.patch
@ -0,0 +1,13 @@
+diff --git a/commonjs/helpers.js b/commonjs/helpers.js
+index 0ac28b4d6a715e913da246f1b4b2576c7e5537f4..d048c0a9b498d08fb70337558fa541c1ecc2ed32 100644
+--- a/commonjs/helpers.js
+++ b/commonjs/helpers.js
+@@ -21,7 +21,7 @@ var _hasOwnProperty = Object.prototype.hasOwnProperty;
+ function hasOwnProperty(obj, key) {
+     return _hasOwnProperty.call(obj, key);
+ }
+-exports.hasOwnProperty = hasOwnProperty;
+Object.defineProperty(exports, "hasOwnProperty", { value: hasOwnProperty });
+ function _objectKeys(obj) {
+     if (Array.isArray(obj)) {
+         var keys = new Array(obj.length);
--- a/.yarn/patches/gulp-sourcemaps-npm-3.0.0-1ae0fbef6d.patch
+++ b/.yarn/patches/gulp-sourcemaps-npm-3.0.0-1ae0fbef6d.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/gulp-sourcemaps/src/init/index.internals.js b/node_modules/gulp-sourcemaps/src/init/index.internals.js
-index 7104555..7dfe218 100644
--- a/node_modules/gulp-sourcemaps/src/init/index.internals.js
-+++ b/node_modules/gulp-sourcemaps/src/init/index.internals.js
+diff --git a/src/init/index.internals.js b/src/init/index.internals.js
+index 7104555c6a436e8727401f688138d2c95e5ab327..7dfe2189e1b5146a40c819b2adcf8e76d5e347b0 100644
+--- a/src/init/index.internals.js
+++ b/src/init/index.internals.js
@@ -72,7 +72,7 @@ module.exports = function(options, file, fileContent) {
 
       });
@ -11,10 +11,10 @@ index 7104555..7dfe218 100644
     }
 
   }
-diff --git a/node_modules/gulp-sourcemaps/src/write/index.internals.js b/node_modules/gulp-sourcemaps/src/write/index.internals.js
-index 89cee60..adfe8d1 100644
--- a/node_modules/gulp-sourcemaps/src/write/index.internals.js
-+++ b/node_modules/gulp-sourcemaps/src/write/index.internals.js
+diff --git a/src/write/index.internals.js b/src/write/index.internals.js
+index 89cee60374e1ff095429a73bb7934767bce35346..adfe8d15d5faddd299c55b01415e554af648530c 100644
+--- a/src/write/index.internals.js
+++ b/src/write/index.internals.js
@@ -99,7 +99,7 @@ module.exports = function(destPath, options) {
 
     if (destPath === undefined || destPath === null) {
--- a/.yarn/patches/improved-yarn-audit-npm-3.0.0-3e37ee431a.patch
+++ b/.yarn/patches/improved-yarn-audit-npm-3.0.0-3e37ee431a.patch
@ -0,0 +1,69 @@
+# Improved yarn audit is patched to work with yarn version 2+. The primary need
+# is to retool the script to first use yarn's new audit command and parameters
+# as well as to change the process for how it reads the result due to an update
+# in returned shape of audit command's data.
+diff --git a/bin/improved-yarn-audit b/bin/improved-yarn-audit
+index 52df548151aa28289565e3335b2cd7a92fa38325..7e058df6a4a159596df72c9475a36b747580cd98 100755
+--- a/bin/improved-yarn-audit
+++ b/bin/improved-yarn-audit
+@@ -15,6 +15,7 @@ const { tmpdir } = require("os")
+ const path = require("path")
+ const { env, exit, platform } = require("process")
+ const { createInterface } = require("readline")
+const { Stream } = require("stream")
+ 
+ const GITHUB_ADVISORY_CODE = "GHSA"
+ 
+@@ -250,7 +251,15 @@ async function iterateOverAuditResults(action) {
+   const auditResultsFileStream = getAuditResultsFileStream("r")
+   const iterator = createInterface(auditResultsFileStream)
+ 
+-  iterator.on("line", action)
+  iterator.on("line", async (result) => {
+    const parsed = parseAuditJson(result);
+    const advisories = Stream.Readable.from(
+      Object.values(parsed.advisories).map(advisory => JSON.stringify(advisory))
+    );
+    for await (const data of advisories) {
+      action(data);
+    }
+  });
+ 
+   await new Promise((resolve) => iterator.on("close", resolve))
+ 
+@@ -305,10 +314,10 @@ async function streamYarnAuditOutput(auditParams, auditResultsFileStream) {
+ }
+ 
+ async function invokeYarnAudit() {
+-  const auditParams = ["audit", "--json", `--level=${minSeverityName}`]
+  const auditParams = ["npm", "audit", "--recursive", "--json", `--severity=${minSeverityName}`]
+ 
+   if (ignoreDevDependencies) {
+-    auditParams.push("--groups=dependencies")
+    auditParams.push("--environment=production")
+   }
+ 
+   cleanupAuditResultsFile()
+@@ -420,17 +429,17 @@ async function runAuditReport() {
+   let devDependencyAdvisories = []
+   let devDependencyAdvisoryIds = []
+ 
+-  await iterateOverAuditResults((resultJson) => {
+-    const potentialResult = parseAuditJson(resultJson)
+  await iterateOverAuditResults((resultJsonString) => {
+    const potentialResult = parseAuditJson(resultJsonString);
+ 
+     if (
+-      typeof potentialResult.type !== "string" ||
+-      potentialResult.type !== "auditAdvisory"
+      typeof potentialResult.github_advisory_id !== "string"
+     ) {
+       return
+     }
+ 
+-    const result = potentialResult.data.advisory
+
+    const result = potentialResult;
+ 
+     allAdvisories.push(result)
+ 
--- a/.yarn/patches/inline-source-map-npm-0.6.2-96902459a0.patch
+++ b/.yarn/patches/inline-source-map-npm-0.6.2-96902459a0.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/inline-source-map/index.js b/node_modules/inline-source-map/index.js
-index df74d61..7641aad 100644
--- a/node_modules/inline-source-map/index.js
-+++ b/node_modules/inline-source-map/index.js
+diff --git a/index.js b/index.js
+index df74d6126073947a34234f271a033c4d13ed02e5..833a4846989673c597500be60301a52132ebaa09 100644
+--- a/index.js
+++ b/index.js
@@ -91,7 +91,7 @@ Generator.prototype.addSourceContent = function (sourceFile, sourcesContent) {
  */
 Generator.prototype.base64Encode = function () {
--- a/.yarn/patches/lockfile-lint-api-npm-5.4.6-dc86b73900.patch
+++ b/.yarn/patches/lockfile-lint-api-npm-5.4.6-dc86b73900.patch
@ -0,0 +1,48 @@
+# Lockfile lint's current version does not work with the updated structure of the yarn v2 lockfile
+# This patch updates it so that it can parse and read the lockfile entries.
+diff --git a/src/ParseLockfile.js b/src/ParseLockfile.js
+index 0f0c951027ec83c61769bb6a48943420dff133b8..bad2d251cf376bf3ef4b444a0d49f03a602d7a6e 100644
+--- a/src/ParseLockfile.js
+++ b/src/ParseLockfile.js
+@@ -21,13 +21,13 @@ const {
+  * @return boolean
+  */
+ function checkSampleContent (lockfile) {
+-  const [sampleKey, sampleValue] = Object.entries(lockfile)[0]
+  const [sampleKey, sampleValue] = Object.entries(lockfile)[1]
+   return (
+     sampleKey.match(/.*@.*/) &&
+     (sampleValue &&
+       typeof sampleValue === 'object' &&
+       sampleValue.hasOwnProperty('version') &&
+-      sampleValue.hasOwnProperty('resolved'))
+      sampleValue.hasOwnProperty('resolution'))
+   )
+ }
+ /**
+@@ -41,7 +41,24 @@ function yarnParseAndVerify (lockfileBuffer) {
+   if (!hasSensibleContent) {
+     throw Error('Lockfile does not seem to contain a valid dependency list')
+   }
+-  return {type: 'success', object: lockfile}
+  const normalized = Object.fromEntries(Object.entries(lockfile).map(([packageName, packageDetails]) => {
+    const resolution = packageDetails.resolution;
+    if (!resolution) {
+      return [packageName, packageDetails];
+    }
+    const splitByAt = resolution.split('@');
+    let resolvedPackageName;
+    let host;
+    if (splitByAt.length > 2 && resolution[0] === '@') {
+      resolvedPackageName = `@${splitByAt[1]}`;
+      host = splitByAt[2];
+    } else {
+      [resolvedPackageName, host] = splitByAt;
+    }
+
+    return [packageName, { ...packageDetails, resolved: host}]
+  }))
+  return {type: 'success', object: normalized}
+ }
+ class ParseLockfile {
+   /**
--- a/.yarn/patches/luxon-npm-3.1.0-16e2508500.patch
+++ b/.yarn/patches/luxon-npm-3.1.0-16e2508500.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/luxon/build/cjs-browser/luxon.js b/node_modules/luxon/build/cjs-browser/luxon.js
-index 9ab2b9f..14c2891 100644
--- a/node_modules/luxon/build/cjs-browser/luxon.js
-+++ b/node_modules/luxon/build/cjs-browser/luxon.js
+diff --git a/build/cjs-browser/luxon.js b/build/cjs-browser/luxon.js
+index 9ab2b9fd75714368c9c71975ea280bf5d49cb237..14c2891068731bb8bd4ac834d22fb5525a5ed162 100644
+--- a/build/cjs-browser/luxon.js
+++ b/build/cjs-browser/luxon.js
@@ -7373,7 +7373,7 @@ var DateTime = /*#__PURE__*/function () {
    */
   ;
--- a/.yarn/patches/object.values-npm-1.1.5-f1de7f3742.patch
+++ b/.yarn/patches/object.values-npm-1.1.5-f1de7f3742.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/object.values/index.js b/node_modules/object.values/index.js
-index abf0449..2dc8083 100644
--- a/node_modules/object.values/index.js
-+++ b/node_modules/object.values/index.js
+diff --git a/index.js b/index.js
+index abf0449c9546665ebc4fbe2601e75ad937d98c17..0b5722d3f2e7bebb4bf25b56a690e22aacc7beb3 100644
+--- a/index.js
+++ b/index.js
@@ -1,18 +1,3 @@
 'use strict';
 
@ -22,3 +22,4 @@ index abf0449..2dc8083 100644
 -
 -module.exports = polyfill;
 +module.exports = Object.values;
+\ No newline at end of file
--- a/.yarn/patches/parse5-npm-7.0.0-3158a72394.patch
+++ b/.yarn/patches/parse5-npm-7.0.0-3158a72394.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/@types/jsdom/node_modules/parse5/dist/index.d.ts b/node_modules/@types/jsdom/node_modules/parse5/dist/index.d.ts
-index 81253d3..d2333bf 100644
--- a/node_modules/@types/jsdom/node_modules/parse5/dist/index.d.ts
-+++ b/node_modules/@types/jsdom/node_modules/parse5/dist/index.d.ts
+diff --git a/dist/index.d.ts b/dist/index.d.ts
+index 81253d38280bb25de1e36443d919f0e95b3e023c..d2333bf6796ff3ec94f5857d23ef34cc39c9729a 100644
+--- a/dist/index.d.ts
+++ b/dist/index.d.ts
@@ -1,10 +1,10 @@
 -import { type ParserOptions } from './parser/index.js';
 +import { ParserOptions } from './parser/index.js';
@ -26,10 +26,10 @@ index 81253d3..d2333bf 100644
 /**
  * Parses an HTML string.
  *
-diff --git a/node_modules/@types/jsdom/node_modules/parse5/dist/parser/index.d.ts b/node_modules/@types/jsdom/node_modules/parse5/dist/parser/index.d.ts
-index 50a9bd0..df1863e 100644
--- a/node_modules/@types/jsdom/node_modules/parse5/dist/parser/index.d.ts
-+++ b/node_modules/@types/jsdom/node_modules/parse5/dist/parser/index.d.ts
+diff --git a/dist/parser/index.d.ts b/dist/parser/index.d.ts
+index 50a9bd0c73649e4a78edd0d18b4ee44ae9cdf3b7..df1863e335e64269298dea42a7481b26b9e77581 100644
+--- a/dist/parser/index.d.ts
+++ b/dist/parser/index.d.ts
@@ -1,10 +1,10 @@
 -import { Tokenizer, TokenizerMode, type TokenHandler } from '../tokenizer/index.js';
 -import { OpenElementStack, type StackHandler } from './open-element-stack.js';
@ -45,10 +45,10 @@ index 50a9bd0..df1863e 100644
 declare enum InsertionMode {
     INITIAL = 0,
     BEFORE_HTML = 1,
-diff --git a/node_modules/@types/jsdom/node_modules/parse5/dist/serializer/index.d.ts b/node_modules/@types/jsdom/node_modules/parse5/dist/serializer/index.d.ts
-index d944fae..432464c 100644
--- a/node_modules/@types/jsdom/node_modules/parse5/dist/serializer/index.d.ts
-+++ b/node_modules/@types/jsdom/node_modules/parse5/dist/serializer/index.d.ts
+diff --git a/dist/serializer/index.d.ts b/dist/serializer/index.d.ts
+index d944fae103a245cb84623fd733c91cc7e79f72f1..432464c9e05ecfd93c66526bcf4f0c81f09bf00d 100644
+--- a/dist/serializer/index.d.ts
+++ b/dist/serializer/index.d.ts
@@ -1,5 +1,5 @@
 import type { TreeAdapter, TreeAdapterTypeMap } from '../tree-adapters/interface';
 -import { type DefaultTreeAdapterMap } from '../tree-adapters/default.js';
@ -56,10 +56,10 @@ index d944fae..432464c 100644
 export interface SerializerOptions<T extends TreeAdapterTypeMap> {
     /**
      * Specifies input tree format.
-diff --git a/node_modules/@types/jsdom/node_modules/parse5/dist/tokenizer/index.d.ts b/node_modules/@types/jsdom/node_modules/parse5/dist/tokenizer/index.d.ts
-index de6e234..89e2484 100644
--- a/node_modules/@types/jsdom/node_modules/parse5/dist/tokenizer/index.d.ts
-+++ b/node_modules/@types/jsdom/node_modules/parse5/dist/tokenizer/index.d.ts
+diff --git a/dist/tokenizer/index.d.ts b/dist/tokenizer/index.d.ts
+index de6e234cfb36bb3a4b928c47ab0d0fdf0b4311e1..89e2484b43f3487f3f157435a283ba932a879210 100644
+--- a/dist/tokenizer/index.d.ts
+++ b/dist/tokenizer/index.d.ts
@@ -1,6 +1,6 @@
 import { Preprocessor } from './preprocessor.js';
 -import { type CharacterToken, type DoctypeToken, type TagToken, type EOFToken, type CommentToken } from '../common/token.js';
@ -69,20 +69,20 @@ index de6e234..89e2484 100644
 declare const enum State {
     DATA = 0,
     RCDATA = 1,
-diff --git a/node_modules/@types/jsdom/node_modules/parse5/dist/tokenizer/preprocessor.d.ts b/node_modules/@types/jsdom/node_modules/parse5/dist/tokenizer/preprocessor.d.ts
-index e74a590..d145dcc 100644
--- a/node_modules/@types/jsdom/node_modules/parse5/dist/tokenizer/preprocessor.d.ts
-+++ b/node_modules/@types/jsdom/node_modules/parse5/dist/tokenizer/preprocessor.d.ts
+diff --git a/dist/tokenizer/preprocessor.d.ts b/dist/tokenizer/preprocessor.d.ts
+index e74a590783b4688fb6498b019c1a75cfd9ac23e7..d145dcce97b104830e5b3d7f57f3a63377bbf89c 100644
+--- a/dist/tokenizer/preprocessor.d.ts
+++ b/dist/tokenizer/preprocessor.d.ts
@@ -1,4 +1,4 @@
 -import { ERR, type ParserError, type ParserErrorHandler } from '../common/error-codes.js';
 +import { ERR, ParserError, ParserErrorHandler } from '../common/error-codes.js';
 export declare class Preprocessor {
     private handler;
     html: string;
-diff --git a/node_modules/@types/jsdom/node_modules/parse5/dist/tree-adapters/default.d.ts b/node_modules/@types/jsdom/node_modules/parse5/dist/tree-adapters/default.d.ts
-index cccdf8f..d70b8fa 100644
--- a/node_modules/@types/jsdom/node_modules/parse5/dist/tree-adapters/default.d.ts
-+++ b/node_modules/@types/jsdom/node_modules/parse5/dist/tree-adapters/default.d.ts
+diff --git a/dist/tree-adapters/default.d.ts b/dist/tree-adapters/default.d.ts
+index cccdf8f86d2295b3059c42943d896e81691c8419..d70b8fa2562f4dc6415d7ebaaba6cb322f66e9cb 100644
+--- a/dist/tree-adapters/default.d.ts
+++ b/dist/tree-adapters/default.d.ts
@@ -1,4 +1,4 @@
 -import { DOCUMENT_MODE, type NS } from '../common/html.js';
 +import { DOCUMENT_MODE, NS } from '../common/html.js';
--- a/.yarn/patches/plugin-error-npm-1.0.1-7d15e880d6.patch
+++ b/.yarn/patches/plugin-error-npm-1.0.1-7d15e880d6.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/plugin-error/index.js b/node_modules/plugin-error/index.js
-index a4d360d..d2be4a2 100644
--- a/node_modules/plugin-error/index.js
-+++ b/node_modules/plugin-error/index.js
+diff --git a/index.js b/index.js
+index a4d360dc6c6343d321bf2bae46e743718a5cb480..d2be4a20f717d33c1268c860ca74287ac86597c4 100644
+--- a/index.js
+++ b/index.js
@@ -54,7 +54,6 @@ function PluginError(plugin, message, options) {
       return this._messageWithDetails() + '\nStack:';
     }.bind(this);
--- a/.yarn/patches/regenerator-runtime-npm-0.13.7-41bcbe64ea.patch
+++ b/.yarn/patches/regenerator-runtime-npm-0.13.7-41bcbe64ea.patch
@ -1,16 +1,7 @@
-diff --git a/node_modules/regenerator-runtime/runtime.js b/node_modules/regenerator-runtime/runtime.js
-index 547b8c6..885626e 100644
--- a/node_modules/regenerator-runtime/runtime.js
-+++ b/node_modules/regenerator-runtime/runtime.js
-@@ -5,7 +5,7 @@
-  * LICENSE file in the root directory of this source tree.
-  */
- 
-var runtime = (function (exports) {
-+ var runtime = (function (exports) {
-   "use strict";
- 
-   var Op = Object.prototype;
+diff --git a/runtime.js b/runtime.js
+index 547b8c6af462faae1a859160a54fd1d107dd52c3..57030742671c525d1717a1fb11eea0c7ffd59689 100644
+--- a/runtime.js
+++ b/runtime.js
@@ -86,9 +86,9 @@ var runtime = (function (exports) {
   // This is a polyfill for %IteratorPrototype% for environments that
   // don't natively support it.
@ -58,7 +49,7 @@ index 547b8c6..885626e 100644
 +  });
 
 -  Gp.toString = function() {
-+  define(Gp, "toString", function() {
+  define(Gp, 'toString', function() {
     return "[object Generator]";
 -  };
 +  });
--- a/.yarn/patches/sass-npm-1.35.2-6df4e15d13.patch
+++ b/.yarn/patches/sass-npm-1.35.2-6df4e15d13.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/sass/sass.dart.js b/node_modules/sass/sass.dart.js
-index 512d612..1374f5e 100644
--- a/node_modules/sass/sass.dart.js
-+++ b/node_modules/sass/sass.dart.js
+diff --git a/sass.dart.js b/sass.dart.js
+index 512d612fa415209d754f226802ce944aba1bf787..1374f5e19dd303fb57b5fd208d933c421c046628 100644
+--- a/sass.dart.js
+++ b/sass.dart.js
@@ -16,6 +16,10 @@ self.scheduleImmediate = typeof setImmediate !== "undefined"
 // CommonJS globals.
 self.exports = exports;
--- a/.yarn/patches/squirrelly-npm-8.0.8-1d17420d8d.patch
+++ b/.yarn/patches/squirrelly-npm-8.0.8-1d17420d8d.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/squirrelly/dist/squirrelly.cjs.js b/node_modules/squirrelly/dist/squirrelly.cjs.js
-index 7908a34..044e348 100644
--- a/node_modules/squirrelly/dist/squirrelly.cjs.js
-+++ b/node_modules/squirrelly/dist/squirrelly.cjs.js
+diff --git a/dist/squirrelly.cjs.js b/dist/squirrelly.cjs.js
+index 4680ee747900853b9af01b480c749880dedb9824..95dce7623bc115508063a78c7de9ed7b6e4d3d82 100644
+--- a/dist/squirrelly.cjs.js
+++ b/dist/squirrelly.cjs.js
@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 // TODO: allow '-' to trim up until newline. Use [^\S\n\r] instead of \s
 // TODO: only include trimLeft polyfill if not in ES6
--- a/.yarn/patches/stylelint-npm-13.6.1-47aaddf62b.patch
+++ b/.yarn/patches/stylelint-npm-13.6.1-47aaddf62b.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/stylelint/lib/syntaxes/index.js b/node_modules/stylelint/lib/syntaxes/index.js
-index 7afa0c3..73eaa00 100644
--- a/node_modules/stylelint/lib/syntaxes/index.js
-+++ b/node_modules/stylelint/lib/syntaxes/index.js
+diff --git a/lib/syntaxes/index.js b/lib/syntaxes/index.js
+index 7afa0c3ccd852ed903a43cb8dcb4242e580fc5f0..73eaa00d8d430610df58303a1428f83b07e9e967 100644
+--- a/lib/syntaxes/index.js
+++ b/lib/syntaxes/index.js
@@ -1,16 +1,13 @@
 'use strict';
 
--- a/.yarn/patches/typescript-npm-4.4.4-3fedcc07a3.patch
+++ b/.yarn/patches/typescript-npm-4.4.4-3fedcc07a3.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/typescript/lib/typescript.js b/node_modules/typescript/lib/typescript.js
-index 323de6f..367063a 100644
--- a/node_modules/typescript/lib/typescript.js
-+++ b/node_modules/typescript/lib/typescript.js
+diff --git a/lib/typescript.js b/lib/typescript.js
+index 323de6f4da00612e90e685142120736bfaeed37b..350e352e36f8bb6a870d7c24eaeae6bf7d648840 100644
+--- a/lib/typescript.js
+++ b/lib/typescript.js
@@ -24,11 +24,58 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
@ -240,11 +240,3 @@ index 323de6f..367063a 100644
     var textToKeyword = new ts.Map(ts.getEntries(ts.textToKeywordObj));
     var textToToken = new ts.Map(ts.getEntries(__assign(__assign({}, ts.textToKeywordObj), { "{": 18 /* OpenBraceToken */, "}": 19 /* CloseBraceToken */, "(": 20 /* OpenParenToken */, ")": 21 /* CloseParenToken */, "[": 22 /* OpenBracketToken */, "]": 23 /* CloseBracketToken */, ".": 24 /* DotToken */, "...": 25 /* DotDotDotToken */, ";": 26 /* SemicolonToken */, ",": 27 /* CommaToken */, "<": 29 /* LessThanToken */, ">": 31 /* GreaterThanToken */, "<=": 32 /* LessThanEqualsToken */, ">=": 33 /* GreaterThanEqualsToken */, "==": 34 /* EqualsEqualsToken */, "!=": 35 /* ExclamationEqualsToken */, "===": 36 /* EqualsEqualsEqualsToken */, "!==": 37 /* ExclamationEqualsEqualsToken */, "=>": 38 /* EqualsGreaterThanToken */, "+": 39 /* PlusToken */, "-": 40 /* MinusToken */, "**": 42 /* AsteriskAsteriskToken */, "*": 41 /* AsteriskToken */, "/": 43 /* SlashToken */, "%": 44 /* PercentToken */, "++": 45 /* PlusPlusToken */, "--": 46 /* MinusMinusToken */, "<<": 47 /* LessThanLessThanToken */, "</": 30 /* LessThanSlashToken */, ">>": 48 /* GreaterThanGreaterThanToken */, ">>>": 49 /* GreaterThanGreaterThanGreaterThanToken */, "&": 50 /* AmpersandToken */, "|": 51 /* BarToken */, "^": 52 /* CaretToken */, "!": 53 /* ExclamationToken */, "~": 54 /* TildeToken */, "&&": 55 /* AmpersandAmpersandToken */, "||": 56 /* BarBarToken */, "?": 57 /* QuestionToken */, "??": 60 /* QuestionQuestionToken */, "?.": 28 /* QuestionDotToken */, ":": 58 /* ColonToken */, "=": 63 /* EqualsToken */, "+=": 64 /* PlusEqualsToken */, "-=": 65 /* MinusEqualsToken */, "*=": 66 /* AsteriskEqualsToken */, "**=": 67 /* AsteriskAsteriskEqualsToken */, "/=": 68 /* SlashEqualsToken */, "%=": 69 /* PercentEqualsToken */, "<<=": 70 /* LessThanLessThanEqualsToken */, ">>=": 71 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 72 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 73 /* AmpersandEqualsToken */, "|=": 74 /* BarEqualsToken */, "^=": 78 /* CaretEqualsToken */, "||=": 75 /* BarBarEqualsToken */, "&&=": 76 /* AmpersandAmpersandEqualsToken */, "??=": 77 /* QuestionQuestionEqualsToken */, "@": 59 /* AtToken */, "#": 62 /* HashToken */, "`": 61 /* BacktickToken */ })));
     /*
-@@ -159858,6 +159912,7 @@ var ts;
-         delete Object.prototype.__magic__;
-     }
-     catch (error) {
-+        throw error;
-         // In IE8, Object.defineProperty only works on DOM objects.
-         // If we hit this code path, assume `window` exists.
-         //@ts-ignore
--- a/.yarn/patches/undeclared-identifiers-npm-1.1.2-13d6792e9e.patch
+++ b/.yarn/patches/undeclared-identifiers-npm-1.1.2-13d6792e9e.patch
@ -0,0 +1,13 @@
+diff --git a/index.js b/index.js
+index c331176c5488e12b3e812658cc3f51347d4ff973..127765d9c85217398ef9a0f24ac9d43c7cdb54b9 100644
+--- a/index.js
+++ b/index.js
+@@ -50,7 +50,7 @@ var bindingVisitor = {
+         }
+       }
+ 
+-      state.undeclared[node.name] = true
+      Reflect.defineProperty(state.undeclared, node.name, { value: true, writable: true, enumerable: true, configurable: true })
+     }
+ 
+     if (state.wildcard &&
--- a/.yarn/patches/watchify-npm-4.0.0-4fd965dd49.patch
+++ b/.yarn/patches/watchify-npm-4.0.0-4fd965dd49.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/watchify/index.js b/node_modules/watchify/index.js
-index 0753b9f..05efb1b 100644
--- a/node_modules/watchify/index.js
-+++ b/node_modules/watchify/index.js
+diff --git a/index.js b/index.js
+index 0753b9f13d9972c5e79be38dd3e686fbbb23627c..05efb1b1ea52a5e9621a46ad7e2097ee486431d8 100644
+--- a/index.js
+++ b/index.js
@@ -58,33 +58,6 @@ function watchify (b, opts) {
         if (pkgcache) pkgcache[file] = pkg;
     });
--- a/.yarn/patches/web3-npm-0.20.7-ee7ef00c57.patch
+++ b/.yarn/patches/web3-npm-0.20.7-ee7ef00c57.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/web3/dist/web3.js b/node_modules/web3/dist/web3.js
-index 6eb151c..6aa4516 100644
--- a/node_modules/web3/dist/web3.js
-+++ b/node_modules/web3/dist/web3.js
+diff --git a/dist/web3.js b/dist/web3.js
+index 6eb151ce903cd7b289af4e6d4097ca88f93d7a92..6aa4516838708b7e3444a8e0afe5b20a2ed83b2a 100644
+--- a/dist/web3.js
+++ b/dist/web3.js
@@ -5072,7 +5072,7 @@ Method.prototype.toPayload = function (args) {
 
 Method.prototype.attachToObject = function (obj) {
@ -11,10 +11,10 @@ index 6eb151c..6aa4516 100644
     var name = this.name.split('.');
     if (name.length > 1) {
         obj[name[0]] = obj[name[0]] || {};
-diff --git a/node_modules/web3/lib/web3/function.js b/node_modules/web3/lib/web3/function.js
-index 863a10a..ffcd23c 100644
--- a/node_modules/web3/lib/web3/function.js
-+++ b/node_modules/web3/lib/web3/function.js
+diff --git a/lib/web3/function.js b/lib/web3/function.js
+index 863a10a08e9cb7ab1527ca5dc42d94a4187c2304..ffcd23c6779071d88b99a7709b1bf7c14c6e7948 100644
+--- a/lib/web3/function.js
+++ b/lib/web3/function.js
@@ -269,7 +269,7 @@ SolidityFunction.prototype.execute = function () {
 SolidityFunction.prototype.attachToContract = function (contract) {
     var execute = this.execute.bind(this);
@ -24,10 +24,10 @@ index 863a10a..ffcd23c 100644
     execute.sendTransaction = this.sendTransaction.bind(this);
     execute.estimateGas = this.estimateGas.bind(this);
     execute.getData = this.getData.bind(this);
-diff --git a/node_modules/web3/lib/web3/method.js b/node_modules/web3/lib/web3/method.js
-index 2e3c796..be0b663 100644
--- a/node_modules/web3/lib/web3/method.js
-+++ b/node_modules/web3/lib/web3/method.js
+diff --git a/lib/web3/method.js b/lib/web3/method.js
+index 2e3c79639525c1986d80308be41c08b1ae608e77..be0b6630ce32a10c32bf11b995de6353c368c1a6 100644
+--- a/lib/web3/method.js
+++ b/lib/web3/method.js
@@ -123,7 +123,7 @@ Method.prototype.toPayload = function (args) {
 
 Method.prototype.attachToObject = function (obj) {
@ -36,4 +36,4 @@ index 2e3c796..be0b663 100644
 +    Reflect.defineProperty(func, 'call', { value: this.call })
     var name = this.name.split('.');
     if (name.length > 1) {
-         obj[name[0]] = obj[name[0]] || {};
+         obj[name[0]] = obj[name[0]] || {};
--- a/.yarn/patches/zxcvbn-npm-4.4.2-6527983856.patch
+++ b/.yarn/patches/zxcvbn-npm-4.4.2-6527983856.patch
@ -1,7 +1,7 @@
-diff --git a/node_modules/zxcvbn/lib/matching.js b/node_modules/zxcvbn/lib/matching.js
-index 3940bad..748da8b 100644
--- a/node_modules/zxcvbn/lib/matching.js
-+++ b/node_modules/zxcvbn/lib/matching.js
+diff --git a/lib/matching.js b/lib/matching.js
+index 3940bad18c864515899ae3cb69f173e42d494067..748da8b09f921f4eb6f0eed235f2734151b1dd78 100644
+--- a/lib/matching.js
+++ b/lib/matching.js
@@ -13,7 +13,7 @@ build_ranked_dict = function(ordered_list) {
   i = 1;
   for (o = 0, len1 = ordered_list.length; o < len1; o++) {
--- a/.yarn/plugins/@yarnpkg/plugin-allow-scripts.cjs
+++ b/.yarn/plugins/@yarnpkg/plugin-allow-scripts.cjs
@ -0,0 +1,9 @@
+/* eslint-disable */
+//prettier-ignore
+module.exports = {
+name: "@yarnpkg/plugin-allow-scripts",
+factory: function (require) {
+var plugin=(()=>{var a=Object.create,l=Object.defineProperty;var i=Object.getOwnPropertyDescriptor;var s=Object.getOwnPropertyNames;var p=Object.getPrototypeOf,c=Object.prototype.hasOwnProperty;var u=e=>l(e,"__esModule",{value:!0});var f=e=>{if(typeof require!="undefined")return require(e);throw new Error('Dynamic require of "'+e+'" is not supported')};var g=(e,o)=>{for(var r in o)l(e,r,{get:o[r],enumerable:!0})},m=(e,o,r)=>{if(o&&typeof o=="object"||typeof o=="function")for(let t of s(o))!c.call(e,t)&&t!=="default"&&l(e,t,{get:()=>o[t],enumerable:!(r=i(o,t))||r.enumerable});return e},x=e=>m(u(l(e!=null?a(p(e)):{},"default",e&&e.__esModule&&"default"in e?{get:()=>e.default,enumerable:!0}:{value:e,enumerable:!0})),e);var k={};g(k,{default:()=>d});var n=x(f("@yarnpkg/shell")),y={hooks:{afterAllInstalled:async()=>{let e=await(0,n.execute)("yarn run allow-scripts");e!==0&&process.exit(e)}}},d=y;return k;})();
+return plugin;
+}
+};
--- a/.yarn/releases/yarn-3.2.4.cjs
+++ b/.yarn/releases/yarn-3.2.4.cjs
--- a/.yarnrc
+++ b/.yarnrc
@ -1 +0,0 @@
-ignore-scripts true
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@ -0,0 +1,15 @@
+enableScripts: false
+
+enableTelemetry: false
+
+nodeLinker: node-modules
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-allow-scripts.cjs
+    spec: 'https://raw.githubusercontent.com/LavaMoat/LavaMoat/main/packages/yarn-plugin-allow-scripts/bundles/@yarnpkg/plugin-allow-scripts.js'
+
+yarnPath: .yarn/releases/yarn-3.2.4.cjs
+
+logFilters:
+  - code: YN0004
+    level: discard
--- a/README.md
+++ b/README.md
@ -16,8 +16,8 @@ To learn how to contribute to the MetaMask project itself, visit our [Internal D

 - Install [Node.js](https://nodejs.org) version 16
    - If you are using [nvm](https://github.com/nvm-sh/nvm#installing-and-updating) (recommended) running `nvm use` will automatically choose the right node version for you.
- Install [Yarn](https://yarnpkg.com/en/docs/install)
- Install dependencies: `yarn setup` (not the usual install command)
+- Install [Yarn v3](https://yarnpkg.com/getting-started/install)
+- Install dependencies: `yarn`
 - Copy the `.metamaskrc.dist` file to `.metamaskrc`
    - Replace the `INFURA_PROJECT_ID` value with your own personal [Infura Project ID](https://infura.io/docs).
    - If debugging MetaMetrics, you'll need to add a value for `SEGMENT_WRITE_KEY` [Segment write key](https://segment.com/docs/connections/find-writekey/), see [Developing on MetaMask - Segment](./development/README.md#segment).
@ -89,8 +89,8 @@ An example for running `account-details` testcase with chrome and leaving the br
 Whenever you change dependencies (adding, removing, or updating, either in `package.json` or `yarn.lock`), there are various files that must be kept up-to-date.

 * `yarn.lock`:
-  * Run `yarn setup` again after your changes to ensure `yarn.lock` has been properly updated.
-  * Run `yarn yarn-deduplicate` to remove duplicate dependencies from the lockfile.
+  * Run `yarn` again after your changes to ensure `yarn.lock` has been properly updated.
+  * Run `yarn lint:lockfile:dedupe:fix` to remove duplicate dependencies from the lockfile.
 * The `allow-scripts` configuration in `package.json`
  * Run `yarn allow-scripts auto` to update the `allow-scripts` configuration automatically. This config determines whether the package's install/postinstall scripts are allowed to run. Review each new package to determine whether the install script needs to run or not, testing if necessary.
  * Unfortunately, `yarn allow-scripts auto` will behave inconsistently on different platforms. macOS and Windows users may see extraneous changes relating to optional dependencies.
@ -104,7 +104,7 @@ Whenever you change dependencies (adding, removing, or updating, either in `pack
  * Unfortunately, `yarn lavamoat:auto` will behave inconsistently on different platforms.
  macOS and Windows users may see extraneous changes relating to optional dependencies.
  * If you keep getting policy failures even after regenerating the policy files, try regenerating the policies after a clean install by doing:
-    * `rm -rf node_modules/ && yarn setup && yarn lavamoat:auto`
+    * `rm -rf node_modules/ && yarn && yarn lavamoat:auto`
  * Keep in mind that any kind of dynamic import or dynamic use of globals may elude LavaMoat's static analysis.
  Refer to the LavaMoat documentation or ask for help if you run into any issues.

--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@ -41,15 +41,15 @@
    },
    "@ensdomains/content-hash>cids>multicodec": {
      "packages": {
-        "@ensdomains/content-hash>cids>multicodec>varint": true,
-        "@ensdomains/content-hash>cids>uint8arrays": true
+        "@ensdomains/content-hash>cids>uint8arrays": true,
+        "@ensdomains/content-hash>multicodec>varint": true
      }
    },
    "@ensdomains/content-hash>cids>multihashes": {
      "packages": {
        "@ensdomains/content-hash>cids>multibase": true,
-        "@ensdomains/content-hash>cids>uint8arrays": true,
-        "@ensdomains/content-hash>multihashes>varint": true
+        "@ensdomains/content-hash>cids>multihashes>varint": true,
+        "@ensdomains/content-hash>cids>uint8arrays": true
      }
    },
    "@ensdomains/content-hash>cids>uint8arrays": {
@ -252,18 +252,13 @@
    },
    "@keystonehq/bc-ur-registry-eth>hdkey": {
      "packages": {
-        "@keystonehq/bc-ur-registry-eth>hdkey>secp256k1": true,
        "browserify>assert": true,
        "browserify>crypto-browserify": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
        "ethereumjs-wallet>bs58check": true,
        "ethereumjs-wallet>safe-buffer": true
      }
    },
-    "@keystonehq/bc-ur-registry-eth>hdkey>secp256k1": {
-      "packages": {
-        "ethers>@ethersproject/signing-key>elliptic": true
-      }
-    },
    "@keystonehq/metamask-airgapped-keyring": {
      "packages": {
        "@ethereumjs/tx": true,
@ -280,27 +275,13 @@
      "packages": {
        "@ethereumjs/tx": true,
        "@keystonehq/bc-ur-registry-eth": true,
-        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey": true,
+        "@keystonehq/bc-ur-registry-eth>hdkey": true,
        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true,
        "browserify>buffer": true,
        "eth-lattice-keyring>@ethereumjs/util": true,
        "uuid": true
      }
    },
-    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey": {
-      "packages": {
-        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey>secp256k1": true,
-        "browserify>assert": true,
-        "browserify>crypto-browserify": true,
-        "ethereumjs-wallet>bs58check": true,
-        "ethereumjs-wallet>safe-buffer": true
-      }
-    },
-    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey>secp256k1": {
-      "packages": {
-        "ethers>@ethersproject/signing-key>elliptic": true
-      }
-    },
    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": {
      "globals": {
        "TextEncoder": true
@ -760,9 +741,9 @@
      "packages": {
        "@ethereumjs/tx": true,
        "@metamask/eth-ledger-bridge-keyring>eth-sig-util": true,
+        "@metamask/eth-ledger-bridge-keyring>hdkey": true,
        "browserify>buffer": true,
        "browserify>events": true,
-        "eth-trezor-keyring>hdkey": true,
        "ethereumjs-util": true
      }
    },
@ -795,6 +776,25 @@
        "ethjs>ethjs-util>strip-hex-prefix": true
      }
    },
+    "@metamask/eth-ledger-bridge-keyring>hdkey": {
+      "packages": {
+        "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": true,
+        "browserify>assert": true,
+        "browserify>crypto-browserify": true,
+        "eth-trezor-keyring>hdkey>coinstring": true,
+        "ethereumjs-wallet>safe-buffer": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": {
+      "packages": {
+        "bn.js": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "eth-trezor-keyring>hdkey>secp256k1>bip66": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-wallet>safe-buffer": true,
+        "ethers>@ethersproject/signing-key>elliptic": true
+      }
+    },
    "@metamask/eth-token-tracker": {
      "globals": {
        "console.warn": true
@ -1720,10 +1720,16 @@
    },
    "@truffle/codec>@truffle/abi-utils>change-case>pascal-case": {
      "packages": {
-        "@truffle/codec>@truffle/abi-utils>change-case>camel-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>pascal-case>camel-case": true,
        "@truffle/codec>@truffle/abi-utils>change-case>upper-case-first": true
      }
    },
+    "@truffle/codec>@truffle/abi-utils>change-case>pascal-case>camel-case": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>no-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true
+      }
+    },
    "@truffle/codec>@truffle/abi-utils>change-case>path-case": {
      "packages": {
        "@truffle/codec>@truffle/abi-utils>change-case>no-case": true
@ -2704,11 +2710,11 @@
        "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
        "eth-lattice-keyring>gridplus-sdk>js-sha3": true,
        "eth-lattice-keyring>gridplus-sdk>rlp": true,
+        "eth-lattice-keyring>gridplus-sdk>secp256k1": true,
        "ethereumjs-wallet>aes-js": true,
        "ethereumjs-wallet>bs58check": true,
        "ethers>@ethersproject/sha2>hash.js": true,
        "ethers>@ethersproject/signing-key>elliptic": true,
-        "ganache>secp256k1": true,
        "lodash": true
      }
    },
@ -2819,6 +2825,11 @@
        "TextEncoder": true
      }
    },
+    "eth-lattice-keyring>gridplus-sdk>secp256k1": {
+      "packages": {
+        "ethers>@ethersproject/signing-key>elliptic": true
+      }
+    },
    "eth-lattice-keyring>rlp": {
      "globals": {
        "TextEncoder": true
@ -4608,11 +4619,6 @@
        "define": true
      }
    },
-    "ganache>secp256k1": {
-      "packages": {
-        "ethers>@ethersproject/signing-key>elliptic": true
-      }
-    },
    "gh-pages>async": {
      "globals": {
        "setTimeout": true
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@ -186,15 +186,15 @@
    },
    "@ensdomains/content-hash>cids>multicodec": {
      "packages": {
-        "@ensdomains/content-hash>cids>multicodec>varint": true,
-        "@ensdomains/content-hash>cids>uint8arrays": true
+        "@ensdomains/content-hash>cids>uint8arrays": true,
+        "@ensdomains/content-hash>multicodec>varint": true
      }
    },
    "@ensdomains/content-hash>cids>multihashes": {
      "packages": {
        "@ensdomains/content-hash>cids>multibase": true,
-        "@ensdomains/content-hash>cids>uint8arrays": true,
-        "@ensdomains/content-hash>multihashes>varint": true
+        "@ensdomains/content-hash>cids>multihashes>varint": true,
+        "@ensdomains/content-hash>cids>uint8arrays": true
      }
    },
    "@ensdomains/content-hash>cids>uint8arrays": {
@ -397,18 +397,13 @@
    },
    "@keystonehq/bc-ur-registry-eth>hdkey": {
      "packages": {
-        "@keystonehq/bc-ur-registry-eth>hdkey>secp256k1": true,
        "browserify>assert": true,
        "browserify>crypto-browserify": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
        "ethereumjs-wallet>bs58check": true,
        "ethereumjs-wallet>safe-buffer": true
      }
    },
-    "@keystonehq/bc-ur-registry-eth>hdkey>secp256k1": {
-      "packages": {
-        "ethers>@ethersproject/signing-key>elliptic": true
-      }
-    },
    "@keystonehq/metamask-airgapped-keyring": {
      "packages": {
        "@ethereumjs/tx": true,
@ -425,27 +420,13 @@
      "packages": {
        "@ethereumjs/tx": true,
        "@keystonehq/bc-ur-registry-eth": true,
-        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey": true,
+        "@keystonehq/bc-ur-registry-eth>hdkey": true,
        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true,
        "browserify>buffer": true,
        "eth-lattice-keyring>@ethereumjs/util": true,
        "uuid": true
      }
    },
-    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey": {
-      "packages": {
-        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey>secp256k1": true,
-        "browserify>assert": true,
-        "browserify>crypto-browserify": true,
-        "ethereumjs-wallet>bs58check": true,
-        "ethereumjs-wallet>safe-buffer": true
-      }
-    },
-    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey>secp256k1": {
-      "packages": {
-        "ethers>@ethersproject/signing-key>elliptic": true
-      }
-    },
    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": {
      "globals": {
        "TextEncoder": true
@ -905,9 +886,9 @@
      "packages": {
        "@ethereumjs/tx": true,
        "@metamask/eth-ledger-bridge-keyring>eth-sig-util": true,
+        "@metamask/eth-ledger-bridge-keyring>hdkey": true,
        "browserify>buffer": true,
        "browserify>events": true,
-        "eth-trezor-keyring>hdkey": true,
        "ethereumjs-util": true
      }
    },
@ -940,6 +921,25 @@
        "ethjs>ethjs-util>strip-hex-prefix": true
      }
    },
+    "@metamask/eth-ledger-bridge-keyring>hdkey": {
+      "packages": {
+        "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": true,
+        "browserify>assert": true,
+        "browserify>crypto-browserify": true,
+        "eth-trezor-keyring>hdkey>coinstring": true,
+        "ethereumjs-wallet>safe-buffer": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": {
+      "packages": {
+        "bn.js": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "eth-trezor-keyring>hdkey>secp256k1>bip66": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-wallet>safe-buffer": true,
+        "ethers>@ethersproject/signing-key>elliptic": true
+      }
+    },
    "@metamask/eth-token-tracker": {
      "globals": {
        "console.warn": true
@ -1330,6 +1330,7 @@
    },
    "@metamask/post-message-stream>readable-stream": {
      "packages": {
+        "@metamask/post-message-stream>readable-stream>process-nextick-args": true,
        "@metamask/post-message-stream>readable-stream>safe-buffer": true,
        "@metamask/post-message-stream>readable-stream>string_decoder": true,
        "@storybook/api>util-deprecate": true,
@ -1339,8 +1340,12 @@
        "browserify>timers-browserify": true,
        "pumpify>inherits": true,
        "readable-stream>core-util-is": true,
-        "readable-stream>isarray": true,
-        "vinyl>cloneable-readable>process-nextick-args": true
+        "readable-stream>isarray": true
+      }
+    },
+    "@metamask/post-message-stream>readable-stream>process-nextick-args": {
+      "packages": {
+        "browserify>process": true
      }
    },
    "@metamask/post-message-stream>readable-stream>safe-buffer": {
@ -2214,10 +2219,16 @@
    },
    "@truffle/codec>@truffle/abi-utils>change-case>pascal-case": {
      "packages": {
-        "@truffle/codec>@truffle/abi-utils>change-case>camel-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>pascal-case>camel-case": true,
        "@truffle/codec>@truffle/abi-utils>change-case>upper-case-first": true
      }
    },
+    "@truffle/codec>@truffle/abi-utils>change-case>pascal-case>camel-case": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>no-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true
+      }
+    },
    "@truffle/codec>@truffle/abi-utils>change-case>path-case": {
      "packages": {
        "@truffle/codec>@truffle/abi-utils>change-case>no-case": true
@ -3232,11 +3243,11 @@
        "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
        "eth-lattice-keyring>gridplus-sdk>js-sha3": true,
        "eth-lattice-keyring>gridplus-sdk>rlp": true,
+        "eth-lattice-keyring>gridplus-sdk>secp256k1": true,
        "ethereumjs-wallet>aes-js": true,
        "ethereumjs-wallet>bs58check": true,
        "ethers>@ethersproject/sha2>hash.js": true,
        "ethers>@ethersproject/signing-key>elliptic": true,
-        "ganache>secp256k1": true,
        "lodash": true
      }
    },
@ -3347,6 +3358,11 @@
        "TextEncoder": true
      }
    },
+    "eth-lattice-keyring>gridplus-sdk>secp256k1": {
+      "packages": {
+        "ethers>@ethersproject/signing-key>elliptic": true
+      }
+    },
    "eth-lattice-keyring>rlp": {
      "globals": {
        "TextEncoder": true
@ -5136,11 +5152,6 @@
        "define": true
      }
    },
-    "ganache>secp256k1": {
-      "packages": {
-        "ethers>@ethersproject/signing-key>elliptic": true
-      }
-    },
    "gh-pages>async": {
      "globals": {
        "setTimeout": true
@ -5320,14 +5331,9 @@
    },
    "nyc>convert-source-map": {
      "packages": {
-        "browserify>browser-resolve": true,
-        "browserify>path-browserify": true,
-        "nyc>convert-source-map>safe-buffer": true
-      }
-    },
-    "nyc>convert-source-map>safe-buffer": {
-      "packages": {
-        "browserify>buffer": true
+        "browserify": true,
+        "browserify>buffer": true,
+        "browserify>path-browserify": true
      }
    },
    "obj-multiplex": {
@ -5975,11 +5981,6 @@
        "browserify>buffer": true
      }
    },
-    "vinyl>cloneable-readable>process-nextick-args": {
-      "packages": {
-        "browserify>process": true
-      }
-    },
    "web3": {
      "globals": {
        "XMLHttpRequest": true
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@ -41,15 +41,15 @@
    },
    "@ensdomains/content-hash>cids>multicodec": {
      "packages": {
-        "@ensdomains/content-hash>cids>multicodec>varint": true,
-        "@ensdomains/content-hash>cids>uint8arrays": true
+        "@ensdomains/content-hash>cids>uint8arrays": true,
+        "@ensdomains/content-hash>multicodec>varint": true
      }
    },
    "@ensdomains/content-hash>cids>multihashes": {
      "packages": {
        "@ensdomains/content-hash>cids>multibase": true,
-        "@ensdomains/content-hash>cids>uint8arrays": true,
-        "@ensdomains/content-hash>multihashes>varint": true
+        "@ensdomains/content-hash>cids>multihashes>varint": true,
+        "@ensdomains/content-hash>cids>uint8arrays": true
      }
    },
    "@ensdomains/content-hash>cids>uint8arrays": {
@ -252,18 +252,13 @@
    },
    "@keystonehq/bc-ur-registry-eth>hdkey": {
      "packages": {
-        "@keystonehq/bc-ur-registry-eth>hdkey>secp256k1": true,
        "browserify>assert": true,
        "browserify>crypto-browserify": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
        "ethereumjs-wallet>bs58check": true,
        "ethereumjs-wallet>safe-buffer": true
      }
    },
-    "@keystonehq/bc-ur-registry-eth>hdkey>secp256k1": {
-      "packages": {
-        "ethers>@ethersproject/signing-key>elliptic": true
-      }
-    },
    "@keystonehq/metamask-airgapped-keyring": {
      "packages": {
        "@ethereumjs/tx": true,
@ -280,27 +275,13 @@
      "packages": {
        "@ethereumjs/tx": true,
        "@keystonehq/bc-ur-registry-eth": true,
-        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey": true,
+        "@keystonehq/bc-ur-registry-eth>hdkey": true,
        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true,
        "browserify>buffer": true,
        "eth-lattice-keyring>@ethereumjs/util": true,
        "uuid": true
      }
    },
-    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey": {
-      "packages": {
-        "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey>secp256k1": true,
-        "browserify>assert": true,
-        "browserify>crypto-browserify": true,
-        "ethereumjs-wallet>bs58check": true,
-        "ethereumjs-wallet>safe-buffer": true
-      }
-    },
-    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>hdkey>secp256k1": {
-      "packages": {
-        "ethers>@ethersproject/signing-key>elliptic": true
-      }
-    },
    "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": {
      "globals": {
        "TextEncoder": true
@ -760,9 +741,9 @@
      "packages": {
        "@ethereumjs/tx": true,
        "@metamask/eth-ledger-bridge-keyring>eth-sig-util": true,
+        "@metamask/eth-ledger-bridge-keyring>hdkey": true,
        "browserify>buffer": true,
        "browserify>events": true,
-        "eth-trezor-keyring>hdkey": true,
        "ethereumjs-util": true
      }
    },
@ -795,6 +776,25 @@
        "ethjs>ethjs-util>strip-hex-prefix": true
      }
    },
+    "@metamask/eth-ledger-bridge-keyring>hdkey": {
+      "packages": {
+        "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": true,
+        "browserify>assert": true,
+        "browserify>crypto-browserify": true,
+        "eth-trezor-keyring>hdkey>coinstring": true,
+        "ethereumjs-wallet>safe-buffer": true
+      }
+    },
+    "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": {
+      "packages": {
+        "bn.js": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "eth-trezor-keyring>hdkey>secp256k1>bip66": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-wallet>safe-buffer": true,
+        "ethers>@ethersproject/signing-key>elliptic": true
+      }
+    },
    "@metamask/eth-token-tracker": {
      "globals": {
        "console.warn": true
@ -1720,10 +1720,16 @@
    },
    "@truffle/codec>@truffle/abi-utils>change-case>pascal-case": {
      "packages": {
-        "@truffle/codec>@truffle/abi-utils>change-case>camel-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>pascal-case>camel-case": true,
        "@truffle/codec>@truffle/abi-utils>change-case>upper-case-first": true
      }
    },
+    "@truffle/codec>@truffle/abi-utils>change-case>pascal-case>camel-case": {
+      "packages": {
+        "@truffle/codec>@truffle/abi-utils>change-case>no-case": true,
+        "@truffle/codec>@truffle/abi-utils>change-case>upper-case": true
+      }
+    },
    "@truffle/codec>@truffle/abi-utils>change-case>path-case": {
      "packages": {
        "@truffle/codec>@truffle/abi-utils>change-case>no-case": true
@ -2704,11 +2710,11 @@
        "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
        "eth-lattice-keyring>gridplus-sdk>js-sha3": true,
        "eth-lattice-keyring>gridplus-sdk>rlp": true,
+        "eth-lattice-keyring>gridplus-sdk>secp256k1": true,
        "ethereumjs-wallet>aes-js": true,
        "ethereumjs-wallet>bs58check": true,
        "ethers>@ethersproject/sha2>hash.js": true,
        "ethers>@ethersproject/signing-key>elliptic": true,
-        "ganache>secp256k1": true,
        "lodash": true
      }
    },
@ -2819,6 +2825,11 @@
        "TextEncoder": true
      }
    },
+    "eth-lattice-keyring>gridplus-sdk>secp256k1": {
+      "packages": {
+        "ethers>@ethersproject/signing-key>elliptic": true
+      }
+    },
    "eth-lattice-keyring>rlp": {
      "globals": {
        "TextEncoder": true
@ -4608,11 +4619,6 @@
        "define": true
      }
    },
-    "ganache>secp256k1": {
-      "packages": {
-        "ethers>@ethersproject/signing-key>elliptic": true
-      }
-    },
    "gh-pages>async": {
      "globals": {
        "setTimeout": true
--- a/lavamoat/build-system/policy.json
+++ b/lavamoat/build-system/policy.json
--- a/package.json
+++ b/package.json
@ -7,8 +7,6 @@
    "url": "https://github.com/MetaMask/metamask-extension.git"
  },
  "scripts": {
-    "setup": "yarn install && yarn setup:postinstall",
-    "setup:postinstall": "yarn patch-package && yarn allow-scripts",
    "start": "yarn build:dev dev --apply-lavamoat=false --snow=false",
    "start:lavamoat": "yarn build:dev dev --apply-lavamoat=true",
    "start:mv3": "ENABLE_MV3=true yarn build:dev dev --apply-lavamoat=false",
@ -51,7 +49,9 @@
    "lint:changelog:rc": "auto-changelog validate --rc",
    "lint:eslint": "eslint . --ext js,ts,tsx,snap --cache",
    "lint:eslint:fix": "yarn lint:eslint --fix",
-    "lint:lockfile": "lockfile-lint --path yarn.lock --allowed-hosts npm yarn github.com codeload.github.com npm.pkg.github.com --empty-hostname false --allowed-schemes \"https:\" \"git+https:\"",
+    "lint:lockfile:dedupe": "yarn dedupe --check",
+    "lint:lockfile:dedupe:fix": "yarn dedupe",
+    "lint:lockfile": "lockfile-lint --path yarn.lock --allowed-hosts npm yarn github.com codeload.github.com --empty-hostname true --allowed-schemes \"https:\" \"git+https:\" \"npm:\" \"patch:\" \"workspace:\"",
    "lint:shellcheck": "./development/shellcheck.sh",
    "lint:styles": "stylelint '*/**/*.scss'",
    "lint:styles:fix": "yarn lint:styles --fix",
@ -82,19 +82,109 @@
    "ts-migration:dashboard:deploy": "gh-pages --dist development/ts-migration-dashboard/build --remote ts-migration-dashboard"
  },
  "resolutions": {
-    "**/regenerator-runtime": "^0.13.7",
-    "**/cross-fetch": "^3.1.5",
-    "**/configstore/dot-prop": "^5.1.1",
-    "**/ethers/elliptic": "^6.5.4",
-    "**/redux/symbol-observable": "^2.0.3",
-    "**/redux-devtools-instrument/symbol-observable": "^2.0.3",
-    "**/rxjs/symbol-observable": "^2.0.3",
    "analytics-node/axios": "^0.21.2",
    "ganache-core/lodash": "^4.17.21",
    "netmask": "^2.0.1",
    "pubnub/superagent-proxy": "^3.0.0",
    "json-schema": "^0.4.0",
-    "simple-get": "^4.0.1"
+    "simple-get": "^4.0.1",
+    "typescript@~4.4.0": "patch:typescript@npm:4.4.4#.yarn/patches/typescript-npm-4.4.4-3fedcc07a3.patch",
+    "acorn@^7.0.0": "patch:acorn@npm:7.4.1#.yarn/patches/acorn-npm-7.4.1-f450b4646c.patch",
+    "acorn@^7.4.1": "patch:acorn@npm:7.4.1#.yarn/patches/acorn-npm-7.4.1-f450b4646c.patch",
+    "acorn@^7.1.1": "patch:acorn@npm:7.4.1#.yarn/patches/acorn-npm-7.4.1-f450b4646c.patch",
+    "acorn@7.4.1": "patch:acorn@npm:7.4.1#.yarn/patches/acorn-npm-7.4.1-f450b4646c.patch",
+    "object.values@^1.1.0": "patch:object.values@npm%3A1.1.5#./.yarn/patches/object.values-npm-1.1.5-f1de7f3742.patch",
+    "object.values@^1.1.5": "patch:object.values@npm%3A1.1.5#./.yarn/patches/object.values-npm-1.1.5-f1de7f3742.patch",
+    "object.values@^1.0.4": "patch:object.values@npm%3A1.1.5#./.yarn/patches/object.values-npm-1.1.5-f1de7f3742.patch",
+    "error@^7.0.0": "patch:error@npm%3A7.0.2#./.yarn/patches/error-npm-7.0.2-6dfbeab4da.patch",
+    "eslint-import-resolver-typescript@^2.5.0": "patch:eslint-import-resolver-typescript@npm%3A2.5.0#./.yarn/patches/eslint-import-resolver-typescript-npm-2.5.0-3b8adf0d03.patch",
+    "colors@^1.4.0": "patch:colors@npm%3A1.4.0#./.yarn/patches/colors-npm-1.4.0-7e2cf12234.patch",
+    "colors@0.5.x": "patch:colors@npm%3A1.4.0#./.yarn/patches/colors-npm-1.4.0-7e2cf12234.patch",
+    "borc@^2.1.2": "patch:borc@npm%3A2.1.2#./.yarn/patches/borc-npm-2.1.2-8ffcc2dd81.patch",
+    "borc@^2.1.0": "patch:borc@npm%3A2.1.2#./.yarn/patches/borc-npm-2.1.2-8ffcc2dd81.patch",
+    "convert-source-map@^1.7.0": "patch:convert-source-map@npm%3A1.1.3#./.yarn/patches/convert-source-map-npm-1.1.3-7f1bfeabd4.patch",
+    "convert-source-map@1.7.0": "patch:convert-source-map@npm%3A1.1.3#./.yarn/patches/convert-source-map-npm-1.1.3-7f1bfeabd4.patch",
+    "convert-source-map@^1.0.0": "patch:convert-source-map@npm%3A1.1.3#./.yarn/patches/convert-source-map-npm-1.1.3-7f1bfeabd4.patch",
+    "convert-source-map@^1.8.0": "patch:convert-source-map@npm%3A1.1.3#./.yarn/patches/convert-source-map-npm-1.1.3-7f1bfeabd4.patch",
+    "convert-source-map@~1.1.0": "patch:convert-source-map@npm%3A1.1.3#./.yarn/patches/convert-source-map-npm-1.1.3-7f1bfeabd4.patch",
+    "convert-source-map@^0.3.3": "patch:convert-source-map@npm%3A1.1.3#./.yarn/patches/convert-source-map-npm-1.1.3-7f1bfeabd4.patch",
+    "convert-source-map@^1.5.1": "patch:convert-source-map@npm%3A1.1.3#./.yarn/patches/convert-source-map-npm-1.1.3-7f1bfeabd4.patch",
+    "convert-source-map@^1.5.0": "patch:convert-source-map@npm%3A1.1.3#./.yarn/patches/convert-source-map-npm-1.1.3-7f1bfeabd4.patch",
+    "convert-source-map@^1.4.0": "patch:convert-source-map@npm%3A1.1.3#./.yarn/patches/convert-source-map-npm-1.1.3-7f1bfeabd4.patch",
+    "convert-source-map@^1.6.0": "patch:convert-source-map@npm%3A1.1.3#./.yarn/patches/convert-source-map-npm-1.1.3-7f1bfeabd4.patch",
+    "abort-controller@^3.0.0": "patch:abort-controller@npm%3A3.0.0#./.yarn/patches/abort-controller-npm-3.0.0-2f3a9a2bcb.patch",
+    "await-semaphore@^0.1.1": "patch:await-semaphore@npm%3A0.1.3#./.yarn/patches/await-semaphore-npm-0.1.3-b7a0001fab.patch",
+    "await-semaphore@^0.1.3": "patch:await-semaphore@npm%3A0.1.3#./.yarn/patches/await-semaphore-npm-0.1.3-b7a0001fab.patch",
+    "eslint@^8.20.0": "patch:eslint@npm%3A8.20.0#./.yarn/patches/eslint-npm-8.20.0-6bbc377ff7.patch",
+    "eslint@8.14.0": "patch:eslint@npm%3A8.20.0#./.yarn/patches/eslint-npm-8.20.0-6bbc377ff7.patch",
+    "eth-query@^2.1.2": "patch:eth-query@npm%3A2.1.2#./.yarn/patches/eth-query-npm-2.1.2-7c6adc825f.patch",
+    "eth-query@^2.1.0": "patch:eth-query@npm%3A2.1.2#./.yarn/patches/eth-query-npm-2.1.2-7c6adc825f.patch",
+    "ethereumjs-util@^5.1.1": "patch:ethereumjs-util@npm%3A5.2.1#./.yarn/patches/ethereumjs-util-npm-5.2.1-72b39f4e7e.patch",
+    "ethereumjs-util@^5.1.2": "patch:ethereumjs-util@npm%3A5.2.1#./.yarn/patches/ethereumjs-util-npm-5.2.1-72b39f4e7e.patch",
+    "ethereumjs-util@^5.1.5": "patch:ethereumjs-util@npm%3A5.2.1#./.yarn/patches/ethereumjs-util-npm-5.2.1-72b39f4e7e.patch",
+    "ethereumjs-util@^5.0.0": "patch:ethereumjs-util@npm%3A5.2.1#./.yarn/patches/ethereumjs-util-npm-5.2.1-72b39f4e7e.patch",
+    "ethereumjs-util@^5.2.0": "patch:ethereumjs-util@npm%3A5.2.1#./.yarn/patches/ethereumjs-util-npm-5.2.1-72b39f4e7e.patch",
+    "ethereumjs-util@^7.0.10": "patch:ethereumjs-util@npm%3A7.1.5#./.yarn/patches/ethereumjs-util-npm-7.1.5-5bb4d00000.patch",
+    "ethereumjs-util@^7.1.5": "patch:ethereumjs-util@npm%3A7.1.5#./.yarn/patches/ethereumjs-util-npm-7.1.5-5bb4d00000.patch",
+    "ethereumjs-util@^7.1.4": "patch:ethereumjs-util@npm%3A7.1.5#./.yarn/patches/ethereumjs-util-npm-7.1.5-5bb4d00000.patch",
+    "ethereumjs-util@^7.0.9": "patch:ethereumjs-util@npm%3A7.1.5#./.yarn/patches/ethereumjs-util-npm-7.1.5-5bb4d00000.patch",
+    "ethereumjs-util@^7.1.0": "patch:ethereumjs-util@npm%3A7.1.5#./.yarn/patches/ethereumjs-util-npm-7.1.5-5bb4d00000.patch",
+    "ethereumjs-util@^7.0.2": "patch:ethereumjs-util@npm%3A7.1.5#./.yarn/patches/ethereumjs-util-npm-7.1.5-5bb4d00000.patch",
+    "ethereumjs-util@^7.0.8": "patch:ethereumjs-util@npm%3A7.1.5#./.yarn/patches/ethereumjs-util-npm-7.1.5-5bb4d00000.patch",
+    "ethereumjs-util@^7.0.7": "patch:ethereumjs-util@npm%3A7.1.5#./.yarn/patches/ethereumjs-util-npm-7.1.5-5bb4d00000.patch",
+    "fast-json-patch@^2.2.1": "patch:fast-json-patch@npm%3A2.2.1#./.yarn/patches/fast-json-patch-npm-2.2.1-63b021bb37.patch",
+    "fast-json-patch@^2.0.6": "patch:fast-json-patch@npm%3A2.2.1#./.yarn/patches/fast-json-patch-npm-2.2.1-63b021bb37.patch",
+    "gulp-sourcemaps@^3.0.0": "patch:gulp-sourcemaps@npm%3A3.0.0#./.yarn/patches/gulp-sourcemaps-npm-3.0.0-1ae0fbef6d.patch",
+    "inline-source-map@~0.6.0": "patch:inline-source-map@npm%3A0.6.2#./.yarn/patches/inline-source-map-npm-0.6.2-96902459a0.patch",
+    "plugin-error@^1.0.1": "patch:plugin-error@npm%3A1.0.1#./.yarn/patches/plugin-error-npm-1.0.1-7d15e880d6.patch",
+    "plugin-error@1.0.1": "patch:plugin-error@npm%3A1.0.1#./.yarn/patches/plugin-error-npm-1.0.1-7d15e880d6.patch",
+    "regenerator-runtime@^0.13.4": "patch:regenerator-runtime@npm%3A0.13.7#./.yarn/patches/regenerator-runtime-npm-0.13.7-41bcbe64ea.patch",
+    "regenerator-runtime@^0.13.7": "patch:regenerator-runtime@npm%3A0.13.7#./.yarn/patches/regenerator-runtime-npm-0.13.7-41bcbe64ea.patch",
+    "regenerator-runtime@^0.11.0": "patch:regenerator-runtime@npm%3A0.13.7#./.yarn/patches/regenerator-runtime-npm-0.13.7-41bcbe64ea.patch",
+    "@babel/runtime@^7.5.5": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",
+    "@babel/runtime@^7.7.6": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",
+    "@babel/runtime@^7.9.2": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",
+    "@babel/runtime@^7.5.4": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",
+    "@babel/runtime@^7.10.3": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",
+    "@babel/runtime@^7.1.2": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",
+    "@babel/runtime@^7.4.4": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",
+    "@babel/runtime@^7.10.2": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",
+    "@babel/runtime@^7.4.5": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",
+    "@babel/runtime@^7.15.4": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",
+    "@babel/runtime@^7.17.8": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",
+    "@babel/runtime@^7.8.7": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",
+    "@babel/runtime@^7.0.0": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",
+    "@babel/runtime@^7.4.0": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",
+    "@babel/runtime@^7.3.1": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",
+    "@babel/runtime@^7.8.3": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",
+    "@babel/runtime@^7.7.2": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",
+    "@babel/runtime@^7.12.5": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",
+    "@babel/runtime@^7.5.0": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",
+    "@babel/runtime@^7.8.4": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",
+    "@eslint/eslintrc@^1.3.0": "patch:@eslint/eslintrc@npm%3A1.3.0#./.yarn/patches/@eslint-eslintrc-npm-1.3.0-1f3c51be25.patch",
+    "@formatjs/intl-utils@^3.3.1": "patch:@formatjs/intl-utils@npm%3A3.3.1#./.yarn/patches/@formatjs-intl-utils-npm-3.3.1-08510c16ad.patch",
+    "@fortawesome/fontawesome-free@^5.13.0": "patch:@fortawesome/fontawesome-free@npm%3A5.13.0#./.yarn/patches/@fortawesome-fontawesome-free-npm-5.13.0-f20fc0388d.patch",
+    "@keystonehq/bc-ur-registry@^0.5.0-alpha.5": "patch:@keystonehq/bc-ur-registry@npm%3A0.5.0-alpha.5#./.yarn/patches/@keystonehq-bc-ur-registry-npm-0.5.0-alpha.5-b95c7992a6.patch",
+    "@lavamoat/lavapack@^3.1.0": "patch:@lavamoat/lavapack@npm%3A3.1.0#./.yarn/patches/@lavamoat-lavapack-npm-3.1.0-34c65d233b.patch",
+    "fast-json-patch@^3.1.0": "patch:fast-json-patch@npm%3A3.1.0#./.yarn/patches/fast-json-patch-npm-3.1.0-f4bd467b5f.patch",
+    "@reduxjs/toolkit@^1.6.2": "patch:@reduxjs/toolkit@npm%3A1.6.2#./.yarn/patches/@reduxjs-toolkit-npm-1.6.2-67af09515f.patch",
+    "parse5@^7.0.0": "patch:parse5@npm%3A7.0.0#./.yarn/patches/parse5-npm-7.0.0-3158a72394.patch",
+    "@types/madge@^5.0.0": "patch:@types/madge@npm%3A5.0.0#./.yarn/patches/@types-madge-npm-5.0.0-654566c2d2.patch",
+    "zxcvbn@^4.4.2": "patch:zxcvbn@npm%3A4.4.2#./.yarn/patches/zxcvbn-npm-4.4.2-6527983856.patch",
+    "web3@^0.20.7": "patch:web3@npm%3A0.20.7#./.yarn/patches/web3-npm-0.20.7-ee7ef00c57.patch",
+    "watchify@^4.0.0": "patch:watchify@npm%3A4.0.0#./.yarn/patches/watchify-npm-4.0.0-4fd965dd49.patch",
+    "undeclared-identifiers@^1.1.2": "patch:undeclared-identifiers@npm%3A1.1.2#./.yarn/patches/undeclared-identifiers-npm-1.1.2-13d6792e9e.patch",
+    "luxon@^1.26.0": "patch:luxon@npm%3A1.26.0#./.yarn/patches/luxon-npm-1.26.0-09624ad59c.patch",
+    "sass@^1.32.4": "patch:sass@npm%3A1.35.2#./.yarn/patches/sass-npm-1.35.2-6df4e15d13.patch",
+    "sass@^1.26.3": "patch:sass@npm%3A1.35.2#./.yarn/patches/sass-npm-1.35.2-6df4e15d13.patch",
+    "sass@^1.29.0": "patch:sass@npm%3A1.35.2#./.yarn/patches/sass-npm-1.35.2-6df4e15d13.patch",
+    "squirrelly@^8.0.8": "patch:squirrelly@npm%3A8.0.8#./.yarn/patches/squirrelly-npm-8.0.8-1d17420d8d.patch",
+    "stylelint@^13.6.1": "patch:stylelint@npm%3A13.6.1#./.yarn/patches/stylelint-npm-13.6.1-47aaddf62b.patch",
+    "luxon@^3.1.0": "patch:luxon@npm%3A3.1.0#./.yarn/patches/luxon-npm-3.1.0-16e2508500.patch",
+    "luxon@^3.0.1": "patch:luxon@npm%3A3.1.0#./.yarn/patches/luxon-npm-3.1.0-16e2508500.patch",
+    "improved-yarn-audit@^3.0.0": "patch:improved-yarn-audit@npm%3A3.0.0#./.yarn/patches/improved-yarn-audit-npm-3.0.0-3e37ee431a.patch",
+    "lockfile-lint-api@^5.4.6": "patch:lockfile-lint-api@npm%3A5.4.6#./.yarn/patches/lockfile-lint-api-npm-5.4.6-dc86b73900.patch",
+    "symbol-observable": "^2.0.3"
  },
  "dependencies": {
    "@babel/runtime": "^7.5.5",
@ -362,7 +452,7 @@
    "lavamoat": "^6.2.0",
    "lavamoat-browserify": "^15.2.0",
    "lavamoat-viz": "^6.0.9",
-    "lockfile-lint": "^4.0.0",
+    "lockfile-lint": "^4.9.6",
    "loose-envify": "^1.4.0",
    "madge": "^5.0.1",
    "mocha": "^7.2.0",
@ -370,7 +460,6 @@
    "nock": "^13.2.9",
    "node-fetch": "^2.6.1",
    "nyc": "^15.0.0",
-    "patch-package": "^6.4.7",
    "polyfill-crypto.getrandomvalues": "^1.0.0",
    "prettier": "^2.7.1",
    "prettier-plugin-sort-json": "^0.0.1",
@ -409,12 +498,11 @@
    "watchify": "^4.0.0",
    "webextension-polyfill": "^0.8.0",
    "webpack": "^5.75.0",
-    "yargs": "^17.0.1",
-    "yarn-deduplicate": "^3.1.0"
+    "yargs": "^17.0.1"
  },
  "engines": {
    "node": "^16.0.0",
-    "yarn": "^1.16.0"
+    "yarn": "^3.2.4"
  },
  "lavamoat": {
    "allowScripts": {
@ -472,5 +560,6 @@
      "@metamask/base-controller>simple-git-hooks": false,
      "@storybook/core>@storybook/core-server>webpack>watchpack>watchpack-chokidar2>chokidar>fsevents": false
    }
-  }
+  },
+  "packageManager": "yarn@3.2.4"
 }
--- a/patches/@babel+runtime+7.18.9.patch
+++ b/patches/@babel+runtime+7.18.9.patch
@ -1,104 +0,0 @@
-diff --git a/node_modules/@babel/runtime/helpers/construct.js b/node_modules/@babel/runtime/helpers/construct.js
-index ecc013d..092b29b 100644
--- a/node_modules/@babel/runtime/helpers/construct.js
-+++ b/node_modules/@babel/runtime/helpers/construct.js
-@@ -1,22 +1,21 @@
-var setPrototypeOf = require("./setPrototypeOf.js");
-+// All of MetaMask's supported browsers include `Reflect.construct` support, so
-+// we don't need this polyfill.
- 
-var isNativeReflectConstruct = require("./isNativeReflectConstruct.js");
-
-function _construct(Parent, args, Class) {
-  if (isNativeReflectConstruct()) {
-    module.exports = _construct = Reflect.construct.bind(), module.exports.__esModule = true, module.exports["default"] = module.exports;
-  } else {
-    module.exports = _construct = function _construct(Parent, args, Class) {
-      var a = [null];
-      a.push.apply(a, args);
-      var Constructor = Function.bind.apply(Parent, a);
-      var instance = new Constructor();
-      if (Class) setPrototypeOf(instance, Class.prototype);
-      return instance;
-    }, module.exports.__esModule = true, module.exports["default"] = module.exports;
-+// This Proxy preseves the two properties that were added by `@babel/runtime`.
-+// I am not entire sure what these properties are for (maybe ES5/ES6
-+// interoperability?) but they have been preserved just in case.
-+const reflectProxy =  new Proxy(
-+  Reflect.construct,
-+  {
-+    get: function (target, property) {
-+      if (property === 'default') {
-+        return target;
-+      } else if (property === '__esModule') {
-+        return true;
-+      }
-+      return Reflect.get(...arguments);
-+    }
-   }
-+);
- 
-  return _construct.apply(null, arguments);
-}
-
-module.exports = _construct, module.exports.__esModule = true, module.exports["default"] = module.exports;
-\ No newline at end of file
-+module.exports = reflectProxy;
-\ No newline at end of file
-diff --git a/node_modules/@babel/runtime/helpers/extends.js b/node_modules/@babel/runtime/helpers/extends.js
-index b76a654..561a078 100644
--- a/node_modules/@babel/runtime/helpers/extends.js
-+++ b/node_modules/@babel/runtime/helpers/extends.js
-@@ -1,18 +1,5 @@
- function _extends() {
-  module.exports = _extends = Object.assign ? Object.assign.bind() : function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
-    }
-
-    return target;
-  }, module.exports.__esModule = true, module.exports["default"] = module.exports;
-  return _extends.apply(this, arguments);
-+  return Object.assign(...arguments);
- }
- 
- module.exports = _extends, module.exports.__esModule = true, module.exports["default"] = module.exports;
-\ No newline at end of file
-diff --git a/node_modules/@babel/runtime/helpers/getPrototypeOf.js b/node_modules/@babel/runtime/helpers/getPrototypeOf.js
-index 259ed27..07bb963 100644
--- a/node_modules/@babel/runtime/helpers/getPrototypeOf.js
-+++ b/node_modules/@babel/runtime/helpers/getPrototypeOf.js
-@@ -1,8 +1,5 @@
- function _getPrototypeOf(o) {
-  module.exports = _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) {
-    return o.__proto__ || Object.getPrototypeOf(o);
-  }, module.exports.__esModule = true, module.exports["default"] = module.exports;
-  return _getPrototypeOf(o);
-+  return Object.getPrototypeOf(o);
- }
- 
- module.exports = _getPrototypeOf, module.exports.__esModule = true, module.exports["default"] = module.exports;
-\ No newline at end of file
-diff --git a/node_modules/@babel/runtime/helpers/setPrototypeOf.js b/node_modules/@babel/runtime/helpers/setPrototypeOf.js
-index ed2c1eb..da8ef36 100644
--- a/node_modules/@babel/runtime/helpers/setPrototypeOf.js
-+++ b/node_modules/@babel/runtime/helpers/setPrototypeOf.js
-@@ -1,9 +1,6 @@
- function _setPrototypeOf(o, p) {
-  module.exports = _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
-    o.__proto__ = p;
-    return o;
-  }, module.exports.__esModule = true, module.exports["default"] = module.exports;
-  return _setPrototypeOf(o, p);
-+  o.__proto__ = p;
-+  return o;
- }
- 
- module.exports = _setPrototypeOf, module.exports.__esModule = true, module.exports["default"] = module.exports;
-\ No newline at end of file
--- a/patches/@metamask+smart-transactions-controller++fast-json-patch+3.1.0.patch
+++ b/patches/@metamask+smart-transactions-controller++fast-json-patch+3.1.0.patch
@ -1,13 +0,0 @@
-diff --git a/node_modules/@metamask/smart-transactions-controller/node_modules/fast-json-patch/commonjs/helpers.js b/node_modules/@metamask/smart-transactions-controller/node_modules/fast-json-patch/commonjs/helpers.js
-index 0ac28b4..d048c0a 100644
--- a/node_modules/@metamask/smart-transactions-controller/node_modules/fast-json-patch/commonjs/helpers.js
-+++ b/node_modules/@metamask/smart-transactions-controller/node_modules/fast-json-patch/commonjs/helpers.js
-@@ -21,7 +21,7 @@ var _hasOwnProperty = Object.prototype.hasOwnProperty;
- function hasOwnProperty(obj, key) {
-     return _hasOwnProperty.call(obj, key);
- }
-exports.hasOwnProperty = hasOwnProperty;
-+Object.defineProperty(exports, "hasOwnProperty", { value: hasOwnProperty });
- function _objectKeys(obj) {
-     if (Array.isArray(obj)) {
-         var keys = new Array(obj.length);
--- a/patches/acorn-node++acorn+7.4.1.patch
+++ b/patches/acorn-node++acorn+7.4.1.patch
@ -1,13 +0,0 @@
-diff --git a/node_modules/acorn-node/node_modules/acorn/dist/acorn.js b/node_modules/acorn-node/node_modules/acorn/dist/acorn.js
-index 0523f0e..2bb9b56 100644
--- a/node_modules/acorn-node/node_modules/acorn/dist/acorn.js
-+++ b/node_modules/acorn-node/node_modules/acorn/dist/acorn.js
-@@ -1835,7 +1835,7 @@
-       if (checkClashes) {
-         if (has(checkClashes, expr.name))
-           { this.raiseRecoverable(expr.start, "Argument name clash"); }
-        checkClashes[expr.name] = true;
-+        Object.defineProperty(checkClashes, expr.name, { value: true, writable: true, enumerable: true, configurable: true });
-       }
-       if (bindingType !== BIND_NONE && bindingType !== BIND_OUTSIDE) { this.declareName(expr.name, bindingType, expr.start); }
-       break
--- a/patches/borc+2.1.2.patch
+++ b/patches/borc+2.1.2.patch
@ -1,13 +0,0 @@
-diff --git a/node_modules/borc/src/decoder.asm.js b/node_modules/borc/src/decoder.asm.js
-index d77a3c2..dc70f6b 100644
--- a/node_modules/borc/src/decoder.asm.js
-+++ b/node_modules/borc/src/decoder.asm.js
-@@ -1,7 +1,7 @@
- /* eslint-disable */
- 
- module.exports = function decodeAsm (stdlib, foreign, buffer) {
-  'use asm'
-+  // 'use asm' //causes v8 to not cache bytecode
- 
-   // -- Imports
- 
--- a/patches/eth-sig-util++ethereumjs-util+5.2.1.patch
+++ b/patches/eth-sig-util++ethereumjs-util+5.2.1.patch
@ -1,46 +0,0 @@
-lazy precompute for faster module initialization
-diff --git a/node_modules/eth-sig-util/node_modules/ethereumjs-util/dist/secp256k1-adapter.js b/node_modules/eth-sig-util/node_modules/ethereumjs-util/dist/secp256k1-adapter.js
-index e4d053a..3098939 100644
--- a/node_modules/eth-sig-util/node_modules/ethereumjs-util/dist/secp256k1-adapter.js
-+++ b/node_modules/eth-sig-util/node_modules/ethereumjs-util/dist/secp256k1-adapter.js
-@@ -2,7 +2,7 @@
- 
- var secp256k1 = require('ethereum-cryptography/secp256k1');
- 
-var secp256k1v3 = require('./secp256k1-lib/index');
-+function getSecp256k1 () { return require('./secp256k1-lib/index'); }
- var der = require('./secp256k1-lib/der');
- 
- /**
-@@ -28,6 +28,7 @@ var privateKeyVerify = function privateKeyVerify(privateKey) {
-  * @return {boolean}
-  */
- var privateKeyExport = function privateKeyExport(privateKey, compressed) {
-+  var secp256k1v3 = getSecp256k1();
-   // privateKeyExport method is not part of secp256k1 v4 package
-   // this implementation is based on v3
-   if (privateKey.length !== 32) {
-@@ -74,6 +75,7 @@ var privateKeyNegate = function privateKeyNegate(privateKey) {
-  * @return {Buffer}
-  */
- var privateKeyModInverse = function privateKeyModInverse(privateKey) {
-+  var secp256k1v3 = getSecp256k1();
-   if (privateKey.length !== 32) {
-     throw new Error('private key length is invalid');
-   }
-@@ -217,6 +219,7 @@ var signatureImport = function signatureImport(signature) {
-  * @return {Buffer}
-  */
- var signatureImportLax = function signatureImportLax(signature) {
-+  var secp256k1v3 = getSecp256k1();
-   // signatureImportLax method is not part of secp256k1 v4 package
-   // this implementation is based on v3
-   // ensure that signature is greater than 0
-@@ -340,6 +343,7 @@ var ecdh = function ecdh(publicKey, privateKey) {
-  * @return {Buffer}
-  */
- var ecdhUnsafe = function ecdhUnsafe(publicKey, privateKey, compressed) {
-+  var secp256k1v3 = getSecp256k1();
-   // ecdhUnsafe method is not part of secp256k1 v4 package
-   // this implementation is based on v3
-   // ensure valid publicKey length
--- a/patches/undeclared-identifiers+1.1.2.patch
+++ b/patches/undeclared-identifiers+1.1.2.patch
@ -1,13 +0,0 @@
-diff --git a/node_modules/undeclared-identifiers/index.js b/node_modules/undeclared-identifiers/index.js
-index c331176..127765d 100644
--- a/node_modules/undeclared-identifiers/index.js
-+++ b/node_modules/undeclared-identifiers/index.js
-@@ -50,7 +50,7 @@ var bindingVisitor = {
-         }
-       }
- 
-      state.undeclared[node.name] = true
-+      Reflect.defineProperty(state.undeclared, node.name, { value: true, writable: true, enumerable: true, configurable: true })
-     }
- 
-     if (state.wildcard &&
--- a/yarn.lock
+++ b/yarn.lock