ci - enforce yarn lock deduplications (#12737)

* ci - test for yarn lock deduplications

* deps - update yarn.lock and patches

* lavamoat - update policy

* test - ui/helpers/utils/optimism/buildUnserializedTransaction - test against json obj

* lint fix

* patch-package - patch @babel/runtime for lavamoat support

* patch-package - fix additional @babel/runtime lockdown incompats

* patch-package - cleanup sass patch

.circleci/config.yml

@@ -31,6 +31,9 @@ workflows:
       - test-deps-depcheck:
           requires:
             - prep-deps
+      - test-yarn-dedupe:
+          requires:
+            - prep-deps
       - validate-lavamoat-config:
           filters:
             branches:
@@ -333,6 +336,16 @@ jobs:
           paths:
             - storybook-build
 
+  test-yarn-dedupe:
+    executor: node-browsers
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - run:
+          name: Detect yarn lock deduplications
+          command: yarn yarn-deduplicate && git diff --exit-code yarn.lock
+
   test-lint:
     executor: node-browsers
     steps:

lavamoat/browserify/beta/policy.json

@@ -1172,6 +1172,12 @@
         "buffer": true
       }
     },
+    "call-bind": {
+      "packages": {
+        "function-bind": true,
+        "get-intrinsic": true
+      }
+    },
     "cbor-sync": {
       "globals": {
         "define": true
@@ -1241,7 +1247,7 @@
     },
     "copy-to-clipboard": {
       "globals": {
-        "clipboardData.setData": true,
+        "clipboardData": true,
         "console.error": true,
         "console.warn": true,
         "document.body.appendChild": true,
@@ -1576,12 +1582,6 @@
         "prr": true
       }
     },
-    "es-abstract": {
-      "packages": {
-        "function-bind": true,
-        "has-symbols": true
-      }
-    },
     "eth-block-tracker": {
       "globals": {
         "clearTimeout": true,
@@ -2020,6 +2020,18 @@
         "webkitRTCSessionDescription": true
       }
     },
+    "get-intrinsic": {
+      "globals": {
+        "AggregateError": true,
+        "FinalizationRegistry": true,
+        "WeakRef": true
+      },
+      "packages": {
+        "function-bind": true,
+        "has": true,
+        "has-symbols": true
+      }
+    },
     "get-params": {
       "globals": {
         "GetParams": "write"
@@ -2062,6 +2074,11 @@
         "sparse-array": true
       }
     },
+    "has": {
+      "packages": {
+        "function-bind": true
+      }
+    },
     "has-binary2": {
       "globals": {
         "Blob": true,
@@ -2585,6 +2602,7 @@
     },
     "is-regex": {
       "packages": {
+        "call-bind": true,
         "has-symbols": true
       }
     },
@@ -4178,8 +4196,7 @@
         "console": true
       },
       "packages": {
-        "@babel/runtime": true,
+        "@babel/runtime": true
-        "symbol-observable": true
       }
     },
     "redux-devtools-core": {
@@ -4218,8 +4235,8 @@
     },
     "regexp.prototype.flags": {
       "packages": {
-        "define-properties": true,
+        "call-bind": true,
-        "es-abstract": true
+        "define-properties": true
       }
     },
     "relative-url": {

lavamoat/browserify/flask/policy.json

@@ -1172,6 +1172,12 @@
         "buffer": true
       }
     },
+    "call-bind": {
+      "packages": {
+        "function-bind": true,
+        "get-intrinsic": true
+      }
+    },
     "cbor-sync": {
       "globals": {
         "define": true
@@ -1241,7 +1247,7 @@
     },
     "copy-to-clipboard": {
       "globals": {
-        "clipboardData.setData": true,
+        "clipboardData": true,
         "console.error": true,
         "console.warn": true,
         "document.body.appendChild": true,
@@ -1576,12 +1582,6 @@
         "prr": true
       }
     },
-    "es-abstract": {
-      "packages": {
-        "function-bind": true,
-        "has-symbols": true
-      }
-    },
     "eth-block-tracker": {
       "globals": {
         "clearTimeout": true,
@@ -2020,6 +2020,18 @@
         "webkitRTCSessionDescription": true
       }
     },
+    "get-intrinsic": {
+      "globals": {
+        "AggregateError": true,
+        "FinalizationRegistry": true,
+        "WeakRef": true
+      },
+      "packages": {
+        "function-bind": true,
+        "has": true,
+        "has-symbols": true
+      }
+    },
     "get-params": {
       "globals": {
         "GetParams": "write"
@@ -2062,6 +2074,11 @@
         "sparse-array": true
       }
     },
+    "has": {
+      "packages": {
+        "function-bind": true
+      }
+    },
     "has-binary2": {
       "globals": {
         "Blob": true,
@@ -2585,6 +2602,7 @@
     },
     "is-regex": {
       "packages": {
+        "call-bind": true,
         "has-symbols": true
       }
     },
@@ -4178,8 +4196,7 @@
         "console": true
       },
       "packages": {
-        "@babel/runtime": true,
+        "@babel/runtime": true
-        "symbol-observable": true
       }
     },
     "redux-devtools-core": {
@@ -4218,8 +4235,8 @@
     },
     "regexp.prototype.flags": {
       "packages": {
-        "define-properties": true,
+        "call-bind": true,
-        "es-abstract": true
+        "define-properties": true
       }
     },
     "relative-url": {

lavamoat/browserify/main/policy.json

@@ -1172,6 +1172,12 @@
         "buffer": true
       }
     },
+    "call-bind": {
+      "packages": {
+        "function-bind": true,
+        "get-intrinsic": true
+      }
+    },
     "cbor-sync": {
       "globals": {
         "define": true
@@ -1241,7 +1247,7 @@
     },
     "copy-to-clipboard": {
       "globals": {
-        "clipboardData.setData": true,
+        "clipboardData": true,
         "console.error": true,
         "console.warn": true,
         "document.body.appendChild": true,
@@ -1576,12 +1582,6 @@
         "prr": true
       }
     },
-    "es-abstract": {
-      "packages": {
-        "function-bind": true,
-        "has-symbols": true
-      }
-    },
     "eth-block-tracker": {
       "globals": {
         "clearTimeout": true,
@@ -2020,6 +2020,18 @@
         "webkitRTCSessionDescription": true
       }
     },
+    "get-intrinsic": {
+      "globals": {
+        "AggregateError": true,
+        "FinalizationRegistry": true,
+        "WeakRef": true
+      },
+      "packages": {
+        "function-bind": true,
+        "has": true,
+        "has-symbols": true
+      }
+    },
     "get-params": {
       "globals": {
         "GetParams": "write"
@@ -2062,6 +2074,11 @@
         "sparse-array": true
       }
     },
+    "has": {
+      "packages": {
+        "function-bind": true
+      }
+    },
     "has-binary2": {
       "globals": {
         "Blob": true,
@@ -2585,6 +2602,7 @@
     },
     "is-regex": {
       "packages": {
+        "call-bind": true,
         "has-symbols": true
       }
     },
@@ -4178,8 +4196,7 @@
         "console": true
       },
       "packages": {
-        "@babel/runtime": true,
+        "@babel/runtime": true
-        "symbol-observable": true
       }
     },
     "redux-devtools-core": {
@@ -4218,8 +4235,8 @@
     },
     "regexp.prototype.flags": {
       "packages": {
-        "define-properties": true,
+        "call-bind": true,
-        "es-abstract": true
+        "define-properties": true
       }
     },
     "relative-url": {

lavamoat/build-system/policy.json

@@ -12,19 +12,23 @@
     "@babel/core": {
       "builtin": {
         "fs": true,
+        "module": true,
         "path": true,
-        "url": true
+        "url": true,
+        "v8": true
       },
       "globals": {
         "console.log": true,
         "process.cwd": true,
         "process.env.BABEL_ENV": true,
         "process.env.BABEL_SHOW_CONFIG_FOR": true,
-        "process.env.NODE_ENV": true
+        "process.env.NODE_ENV": true,
+        "process.versions.node": true
       },
       "packages": {
         "@babel/code-frame": true,
         "@babel/generator": true,
+        "@babel/helper-compilation-targets": true,
         "@babel/helper-module-transforms": true,
         "@babel/helpers": true,
         "@babel/parser": true,
@@ -35,8 +39,6 @@
         "debug": true,
         "gensync": true,
         "json5": true,
-        "lodash": true,
-        "resolve": true,
         "semver": true,
         "source-map": true
       }
@@ -76,22 +78,9 @@
         "@babel/types": true
       }
     },
-    "@babel/helper-builder-react-jsx": {
-      "packages": {
-        "@babel/helper-annotate-as-pure": true,
-        "@babel/types": true
-      }
-    },
-    "@babel/helper-builder-react-jsx-experimental": {
-      "packages": {
-        "@babel/helper-annotate-as-pure": true,
-        "@babel/helper-module-imports": true,
-        "@babel/types": true
-      }
-    },
     "@babel/helper-compilation-targets": {
       "globals": {
-        "console.log": true,
+        "console.warn": true,
         "process.versions.node": true
       },
       "packages": {
@@ -107,6 +96,7 @@
       },
       "packages": {
         "@babel/core": true,
+        "@babel/helper-annotate-as-pure": true,
         "@babel/helper-function-name": true,
         "@babel/helper-member-expression-to-functions": true,
         "@babel/helper-optimise-call-expression": true,
@@ -121,11 +111,22 @@
         "regexpu-core": true
       }
     },
-    "@babel/helper-define-map": {
+    "@babel/helper-define-polyfill-provider": {
+      "builtin": {
+        "path": true
+      },
+      "globals": {
+        "console.log": true,
+        "console.warn": true,
+        "process.exitCode": "write",
+        "process.versions.node": true
+      },
       "packages": {
-        "@babel/helper-function-name": true,
+        "@babel/core": true,
-        "@babel/types": true,
+        "@babel/helper-compilation-targets": true,
-        "lodash": true
+        "@babel/helper-plugin-utils": true,
+        "lodash.debounce": true,
+        "resolve": true
       }
     },
     "@babel/helper-explode-assignable-expression": {
@@ -177,8 +178,7 @@
         "@babel/helper-validator-identifier": true,
         "@babel/template": true,
         "@babel/traverse": true,
-        "@babel/types": true,
+        "@babel/types": true
-        "lodash": true
       }
     },
     "@babel/helper-optimise-call-expression": {
@@ -237,6 +237,14 @@
         "js-tokens": true
       }
     },
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "packages": {
+        "@babel/core": true,
+        "@babel/helper-plugin-utils": true,
+        "@babel/helper-skip-transparent-expression-wrappers": true,
+        "@babel/plugin-proposal-optional-chaining": true
+      }
+    },
     "@babel/plugin-proposal-async-generator-functions": {
       "packages": {
         "@babel/core": true,
@@ -251,6 +259,13 @@
         "@babel/helper-plugin-utils": true
       }
     },
+    "@babel/plugin-proposal-class-static-block": {
+      "packages": {
+        "@babel/helper-create-class-features-plugin": true,
+        "@babel/helper-plugin-utils": true,
+        "@babel/plugin-syntax-class-static-block": true
+      }
+    },
     "@babel/plugin-proposal-dynamic-import": {
       "packages": {
         "@babel/helper-plugin-utils": true,
@@ -292,7 +307,9 @@
     },
     "@babel/plugin-proposal-object-rest-spread": {
       "packages": {
+        "@babel/compat-data": true,
         "@babel/core": true,
+        "@babel/helper-compilation-targets": true,
         "@babel/helper-plugin-utils": true,
         "@babel/plugin-syntax-object-rest-spread": true,
         "@babel/plugin-transform-parameters": true
@@ -318,6 +335,14 @@
         "@babel/helper-plugin-utils": true
       }
     },
+    "@babel/plugin-proposal-private-property-in-object": {
+      "packages": {
+        "@babel/helper-annotate-as-pure": true,
+        "@babel/helper-create-class-features-plugin": true,
+        "@babel/helper-plugin-utils": true,
+        "@babel/plugin-syntax-private-property-in-object": true
+      }
+    },
     "@babel/plugin-proposal-unicode-property-regex": {
       "packages": {
         "@babel/helper-create-regexp-features-plugin": true,
@@ -334,6 +359,11 @@
         "@babel/helper-plugin-utils": true
       }
     },
+    "@babel/plugin-syntax-class-static-block": {
+      "packages": {
+        "@babel/helper-plugin-utils": true
+      }
+    },
     "@babel/plugin-syntax-dynamic-import": {
       "packages": {
         "@babel/helper-plugin-utils": true
@@ -384,6 +414,11 @@
         "@babel/helper-plugin-utils": true
       }
     },
+    "@babel/plugin-syntax-private-property-in-object": {
+      "packages": {
+        "@babel/helper-plugin-utils": true
+      }
+    },
     "@babel/plugin-syntax-top-level-await": {
       "packages": {
         "@babel/helper-plugin-utils": true
@@ -418,7 +453,6 @@
       "packages": {
         "@babel/core": true,
         "@babel/helper-annotate-as-pure": true,
-        "@babel/helper-define-map": true,
         "@babel/helper-function-name": true,
         "@babel/helper-optimise-call-expression": true,
         "@babel/helper-plugin-utils": true,
@@ -554,7 +588,9 @@
     },
     "@babel/plugin-transform-react-display-name": {
       "builtin": {
-        "path": true
+        "path.basename": true,
+        "path.dirname": true,
+        "path.extname": true
       },
       "packages": {
         "@babel/core": true,
@@ -564,30 +600,15 @@
     "@babel/plugin-transform-react-jsx": {
       "packages": {
         "@babel/core": true,
-        "@babel/helper-builder-react-jsx": true,
+        "@babel/helper-annotate-as-pure": true,
-        "@babel/helper-builder-react-jsx-experimental": true,
+        "@babel/helper-module-imports": true,
         "@babel/helper-plugin-utils": true,
         "@babel/plugin-syntax-jsx": true
       }
     },
     "@babel/plugin-transform-react-jsx-development": {
       "packages": {
-        "@babel/core": true,
+        "@babel/plugin-transform-react-jsx": true
-        "@babel/helper-builder-react-jsx-experimental": true,
-        "@babel/helper-plugin-utils": true,
-        "@babel/plugin-syntax-jsx": true
-      }
-    },
-    "@babel/plugin-transform-react-jsx-self": {
-      "packages": {
-        "@babel/core": true,
-        "@babel/helper-plugin-utils": true
-      }
-    },
-    "@babel/plugin-transform-react-jsx-source": {
-      "packages": {
-        "@babel/core": true,
-        "@babel/helper-plugin-utils": true
       }
     },
     "@babel/plugin-transform-react-pure-annotations": {
@@ -673,11 +694,12 @@
       "packages": {
         "@babel/compat-data": true,
         "@babel/helper-compilation-targets": true,
-        "@babel/helper-module-imports": true,
         "@babel/helper-plugin-utils": true,
         "@babel/helper-validator-option": true,
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": true,
         "@babel/plugin-proposal-async-generator-functions": true,
         "@babel/plugin-proposal-class-properties": true,
+        "@babel/plugin-proposal-class-static-block": true,
         "@babel/plugin-proposal-dynamic-import": true,
         "@babel/plugin-proposal-export-namespace-from": true,
         "@babel/plugin-proposal-json-strings": true,
@@ -688,9 +710,11 @@
         "@babel/plugin-proposal-optional-catch-binding": true,
         "@babel/plugin-proposal-optional-chaining": true,
         "@babel/plugin-proposal-private-methods": true,
+        "@babel/plugin-proposal-private-property-in-object": true,
         "@babel/plugin-proposal-unicode-property-regex": true,
         "@babel/plugin-syntax-async-generators": true,
         "@babel/plugin-syntax-class-properties": true,
+        "@babel/plugin-syntax-class-static-block": true,
         "@babel/plugin-syntax-dynamic-import": true,
         "@babel/plugin-syntax-export-namespace-from": true,
         "@babel/plugin-syntax-json-strings": true,
@@ -700,6 +724,7 @@
         "@babel/plugin-syntax-object-rest-spread": true,
         "@babel/plugin-syntax-optional-catch-binding": true,
         "@babel/plugin-syntax-optional-chaining": true,
+        "@babel/plugin-syntax-private-property-in-object": true,
         "@babel/plugin-syntax-top-level-await": true,
         "@babel/plugin-transform-arrow-functions": true,
         "@babel/plugin-transform-async-to-generator": true,
@@ -735,6 +760,9 @@
         "@babel/plugin-transform-unicode-regex": true,
         "@babel/preset-modules": true,
         "@babel/types": true,
+        "babel-plugin-polyfill-corejs2": true,
+        "babel-plugin-polyfill-corejs3": true,
+        "babel-plugin-polyfill-regenerator": true,
         "core-js-compat": true,
         "semver": true
       }
@@ -742,11 +770,10 @@
     "@babel/preset-react": {
       "packages": {
         "@babel/helper-plugin-utils": true,
+        "@babel/helper-validator-option": true,
         "@babel/plugin-transform-react-display-name": true,
         "@babel/plugin-transform-react-jsx": true,
         "@babel/plugin-transform-react-jsx-development": true,
-        "@babel/plugin-transform-react-jsx-self": true,
-        "@babel/plugin-transform-react-jsx-source": true,
         "@babel/plugin-transform-react-pure-annotations": true
       }
     },
@@ -760,13 +787,13 @@
     "@babel/traverse": {
       "globals": {
         "console.log": true,
-        "console.trace": true,
+        "console.trace": true
-        "process.env.NODE_ENV": true
       },
       "packages": {
         "@babel/code-frame": true,
         "@babel/generator": true,
         "@babel/helper-function-name": true,
+        "@babel/helper-hoist-variables": true,
         "@babel/helper-split-export-declaration": true,
         "@babel/parser": true,
         "@babel/types": true,
@@ -781,7 +808,6 @@
       },
       "packages": {
         "@babel/helper-validator-identifier": true,
-        "lodash": true,
         "to-fast-properties": true
       }
     },
@@ -945,11 +971,6 @@
         "define": true
       }
     },
-    "acorn-dynamic-import": {
-      "packages": {
-        "acorn": true
-      }
-    },
     "acorn-jsx": {
       "packages": {
         "acorn": true
@@ -958,7 +979,6 @@
     "acorn-node": {
       "packages": {
         "acorn": true,
-        "acorn-dynamic-import": true,
         "acorn-walk": true,
         "xtend": true
       }
@@ -1117,13 +1137,33 @@
       "packages": {
         "browserslist": true,
         "caniuse-lite": true,
-        "colorette": true,
         "normalize-range": true,
         "num2fraction": true,
+        "picocolors": true,
         "postcss": true,
         "postcss-value-parser": true
       }
     },
+    "babel-plugin-polyfill-corejs2": {
+      "packages": {
+        "@babel/compat-data": true,
+        "@babel/core": true,
+        "@babel/helper-define-polyfill-provider": true,
+        "semver": true
+      }
+    },
+    "babel-plugin-polyfill-corejs3": {
+      "packages": {
+        "@babel/core": true,
+        "@babel/helper-define-polyfill-provider": true,
+        "core-js-compat": true
+      }
+    },
+    "babel-plugin-polyfill-regenerator": {
+      "packages": {
+        "@babel/helper-define-polyfill-provider": true
+      }
+    },
     "babelify": {
       "builtin": {
         "path.extname": true,
@@ -1675,7 +1715,7 @@
     },
     "deps-sort": {
       "packages": {
-        "shasum": true,
+        "shasum-object": true,
         "through2": true
       }
     },
@@ -1773,15 +1813,9 @@
       }
     },
     "es-abstract": {
-      "globals": {
-        "AggregateError": true,
-        "FinalizationRegistry": true,
-        "WeakRef": true
-      },
       "packages": {
         "call-bind": true,
         "es-to-primitive": true,
-        "function-bind": true,
         "get-intrinsic": true,
         "has": true,
         "has-symbols": true,
@@ -3069,7 +3103,6 @@
     "labeled-stream-splicer": {
       "packages": {
         "inherits": true,
-        "isarray": true,
         "stream-splicer": true
       }
     },
@@ -3196,6 +3229,12 @@
         "define": true
       }
     },
+    "lodash.debounce": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      }
+    },
     "log-symbols": {
       "globals": {
         "process.env.CI": true,
@@ -3489,7 +3528,6 @@
       "packages": {
         "call-bind": true,
         "define-properties": true,
-        "es-abstract": true,
         "has-symbols": true,
         "object-keys": true
       }
@@ -3534,14 +3572,6 @@
         "make-iterator": true
       }
     },
-    "object.values": {
-      "packages": {
-        "call-bind": true,
-        "define-properties": true,
-        "es-abstract": true,
-        "has": true
-      }
-    },
     "once": {
       "packages": {
         "wrappy": true
@@ -3670,6 +3700,16 @@
         "through": true
       }
     },
+    "picocolors": {
+      "builtin": {
+        "tty.isatty": true
+      },
+      "globals": {
+        "process.argv.includes": true,
+        "process.env": true,
+        "process.platform": true
+      }
+    },
     "picomatch": {
       "builtin": {
         "path.basename": true,
@@ -3727,6 +3767,7 @@
       },
       "packages": {
         "chalk": true,
+        "picocolors": true,
         "source-map": true,
         "supports-color": true
       }
@@ -3767,13 +3808,9 @@
       }
     },
     "postcss-selector-parser": {
-      "builtin": {
-        "util.deprecate": true
-      },
       "packages": {
         "cssesc": true,
-        "indexes-of": true,
+        "util-deprecate": true
-        "uniq": true
       }
     },
     "postcss-syntax": {
@@ -3861,6 +3898,11 @@
         "pump": true
       }
     },
+    "qs": {
+      "packages": {
+        "side-channel": true
+      }
+    },
     "quote-stream": {
       "globals": {
         "Buffer": true
@@ -4272,6 +4314,17 @@
         "json-stable-stringify": true
       }
     },
+    "shasum-object": {
+      "builtin": {
+        "crypto.createHash": true
+      },
+      "globals": {
+        "Buffer.isBuffer": true
+      },
+      "packages": {
+        "fast-safe-stringify": true
+      }
+    },
     "shebang-command": {
       "packages": {
         "shebang-regex": true
@@ -5200,8 +5253,8 @@
     "yaml": {
       "globals": {
         "Buffer": true,
-        "_YAML_SILENCE_DEPRECATION_WARNINGS": true,
+        "YAML_SILENCE_DEPRECATION_WARNINGS": true,
-        "_YAML_SILENCE_WARNINGS": true,
+        "YAML_SILENCE_WARNINGS": true,
         "atob": true,
         "btoa": true,
         "console.warn": true,

patches/@babel+runtime+7.15.4.patch

@@ -0,0 +1,62 @@
+diff --git a/node_modules/@babel/runtime/helpers/extends.js b/node_modules/@babel/runtime/helpers/extends.js
+index eaf9547..d0474f5 100644
+--- a/node_modules/@babel/runtime/helpers/extends.js
++++ b/node_modules/@babel/runtime/helpers/extends.js
+@@ -1,20 +1,5 @@
+ function _extends() {
+-  module.exports = _extends = Object.assign || 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["default"] = module.exports, module.exports.__esModule = true;
+-  return _extends.apply(this, arguments);
++  return Object.assign(...arguments)
+ }
+ 
+ module.exports = _extends;
+diff --git a/node_modules/@babel/runtime/helpers/getPrototypeOf.js b/node_modules/@babel/runtime/helpers/getPrototypeOf.js
+index a6916eb..e01b2d6 100644
+--- a/node_modules/@babel/runtime/helpers/getPrototypeOf.js
++++ b/node_modules/@babel/runtime/helpers/getPrototypeOf.js
+@@ -1,9 +1,5 @@
+ function _getPrototypeOf(o) {
+-  module.exports = _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
+-    return o.__proto__ || Object.getPrototypeOf(o);
+-  };
+-  module.exports["default"] = module.exports, module.exports.__esModule = true;
+-  return _getPrototypeOf(o);
++  return Object.getPrototypeOf(o);
+ }
+ 
+ module.exports = _getPrototypeOf;
+diff --git a/node_modules/@babel/runtime/helpers/setPrototypeOf.js b/node_modules/@babel/runtime/helpers/setPrototypeOf.js
+index 415797b..63312f2 100644
+--- a/node_modules/@babel/runtime/helpers/setPrototypeOf.js
++++ b/node_modules/@babel/runtime/helpers/setPrototypeOf.js
+@@ -1,12 +1,7 @@
+ function _setPrototypeOf(o, p) {
+-  module.exports = _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
+-    o.__proto__ = p;
+-    return o;
+-  };
+-
+-  module.exports["default"] = module.exports, module.exports.__esModule = true;
+-  return _setPrototypeOf(o, p);
+-}
++  o.__proto__ = p;
++  return o;
++};
+ 
+ module.exports = _setPrototypeOf;
+ module.exports["default"] = module.exports, module.exports.__esModule = true;
+\ No newline at end of file

patches/object.values+1.1.3.patch

@@ -1,17 +1,18 @@
 diff --git a/node_modules/object.values/index.js b/node_modules/object.values/index.js
-index b8ba091..2dc8083 100644
+index abf0449..2dc8083 100644
 --- a/node_modules/object.values/index.js
 +++ b/node_modules/object.values/index.js
-@@ -1,17 +1,3 @@
+@@ -1,18 +1,3 @@
  'use strict';
  
 -var define = require('define-properties');
+-var callBind = require('call-bind');
 -
 -var implementation = require('./implementation');
 -var getPolyfill = require('./polyfill');
 -var shim = require('./shim');
 -
--var polyfill = getPolyfill();
+-var polyfill = callBind(getPolyfill(), Object);
 -
 -define(polyfill, {
 -	getPolyfill: getPolyfill,

patches/sass+1.35.2.patch

@@ -1,25 +1,29 @@
 diff --git a/node_modules/sass/sass.dart.js b/node_modules/sass/sass.dart.js
-index fedd867..fef6a8f 100644
+index 512d612..1374f5e 100644
 --- a/node_modules/sass/sass.dart.js
 +++ b/node_modules/sass/sass.dart.js
-@@ -16,6 +16,9 @@ self.scheduleImmediate = self.setImmediate
+@@ -16,6 +16,10 @@ self.scheduleImmediate = typeof setImmediate !== "undefined"
  // CommonJS globals.
  self.exports = exports;
  
++// realm bridge utility functions
 +exports.bridgeJson = (target) => JSON.parse(JSON.stringify(target))
 +exports.bridgeFn = (target) => ((...args) => target(...args))
 +
  // Node.js specific exports, check to see if they exist & or polyfilled
  
  if (typeof process !== "undefined") {
-@@ -3616,10 +3619,6 @@ self.fs = require("fs");
+@@ -3700,13 +3704,6 @@ self.fs = require("fs");
          return C.PlainJavaScriptObject_methods;
        if (proto === Object.prototype)
          return C.PlainJavaScriptObject_methods;
 -      if (typeof $constructor == "function") {
--        Object.defineProperty($constructor, J.JS_INTEROP_INTERCEPTOR_TAG(), {value: C.UnknownJavaScriptObject_methods, enumerable: false, writable: true, configurable: true});
+-        t1 = $._JS_INTEROP_INTERCEPTOR_TAG;
+-        if (t1 == null)
+-          t1 = $._JS_INTEROP_INTERCEPTOR_TAG = init.getIsolateTag("_$dart_js");
+-        Object.defineProperty($constructor, t1, {value: C.UnknownJavaScriptObject_methods, enumerable: false, writable: true, configurable: true});
 -        return C.UnknownJavaScriptObject_methods;
 -      }
        return C.UnknownJavaScriptObject_methods;
      },
-     JS_INTEROP_INTERCEPTOR_TAG: function() {
+     JSArray_JSArray$fixed: function($length, $E) {

ui/helpers/utils/optimism/buildUnserializedTransaction.test.js

@@ -1,5 +1,4 @@
 import { BN } from 'ethereumjs-util';
-import { times } from 'lodash';
 import buildUnserializedTransaction from './buildUnserializedTransaction';
 
 describe('buildUnserializedTransaction', () => {
@@ -14,15 +13,13 @@ describe('buildUnserializedTransaction', () => {
         data: '0x0',
       },
     });
-    expect(unserializedTransaction).toMatchObject({
+    expect(unserializedTransaction.toJSON()).toMatchObject({
-      nonce: new BN('00', 16),
+      nonce: '0x0',
-      gasPrice: new BN('64', 16),
+      gasPrice: '0x64',
-      gasLimit: new BN('5208', 16),
+      gasLimit: '0x5208',
-      to: expect.objectContaining({
+      to: '0x0000000000000000000000000000000000000000',
-        buf: Buffer.from(times(20, 0)),
+      value: '0x9184e72a000',
-      }),
+      data: '0x00',
-      value: new BN('09184e72a000', 16),
-      data: Buffer.from([0]),
     });
   });
 });