lavamoat@6 - update to secure package naming (#14488)

3 years ago · 223124a561
parent 0c49bc14d4
commit 223124a561
5 changed files with 5700 additions and 3514 deletions
--- a/development/build/index.js
+++ b/development/build/index.js
@ -51,6 +51,7 @@ require('eslint-plugin-node');
 require('eslint-plugin-prettier');
 require('eslint-plugin-react');
 require('eslint-plugin-react-hooks');
+require('eslint-plugin-jest');

 defineAndRunBuildTasks();

--- a/lavamoat/build-system/policy-override.json
+++ b/lavamoat/build-system/policy-override.json
@ -2,20 +2,20 @@
  "resources": {
    "@babel/core": {
      "packages": {
-        "<root>": true,
+        "$root$": true,
+        "@babel/preset-env": true,
+        "@babel/preset-react": true,
+        "@babel/plugin-transform-runtime": true,
        "@babel/plugin-proposal-class-properties": true,
        "@babel/plugin-proposal-nullish-coalescing-operator": true,
        "@babel/plugin-proposal-object-rest-spread": true,
        "@babel/plugin-proposal-optional-chaining": true,
-        "@babel/plugin-transform-runtime": true,
-        "@babel/preset-env": true,
-        "@babel/preset-react": true,
        "@babel/preset-typescript": true
      }
    },
-    "@eslint/eslintrc": {
+    "eslint>@eslint/eslintrc": {
      "packages": {
-        "<root>": true,
+        "$root$": true,
        "@babel/eslint-parser": true,
        "@babel/eslint-plugin": true,
        "@metamask/eslint-config": true,
@ -32,58 +32,56 @@
        "eslint-plugin-react-hooks": true
      }
    },
-    "@typescript-eslint/eslint-plugin": {
+    "eslint-plugin-jest": {
      "packages": {
-        "@typescript-eslint/experimental-utils": true,
-        "@typescript-eslint/scope-manager": true,
-        "debug": true,
-        "eslint": true,
-        "ignore": true,
-        "regexpp": true,
-        "semver": true,
-        "tsutils": true,
-        "typescript": true
+        "eslint-plugin-jest>@typescript-eslint/experimental-utils": true,
+        "@typescript-eslint/eslint-plugin": true
      }
    },
-    "@typescript-eslint/experimental-utils": {
+    "eslint-plugin-jest>@typescript-eslint/experimental-utils": {
      "builtin": {
        "path": true
      },
      "packages": {
-        "@typescript-eslint/scope-manager": true,
-        "@typescript-eslint/types": true,
+        "eslint-plugin-jest>@typescript-eslint/experimental-utils>eslint-utils": true,
+        "@typescript-eslint/parser>@typescript-eslint/types": true,
        "eslint": true,
-        "eslint-scope": true,
-        "eslint-utils": true
+        "@typescript-eslint/parser>@typescript-eslint/scope-manager": true,
+        "eslint>eslint-scope": true
      }
    },
-    "@typescript-eslint/scope-manager": {
+    "eslint-plugin-jest>@typescript-eslint/experimental-utils>eslint-utils": {
      "packages": {
-        "@typescript-eslint/types": true,
-        "@typescript-eslint/visitor-keys": true
+        "eslint-plugin-jest>@typescript-eslint/experimental-utils>eslint-utils>eslint-visitor-keys": true
      }
    },
-    "@typescript-eslint/visitor-keys": {
+    "@typescript-eslint/eslint-plugin": {
      "packages": {
-        "eslint-visitor-keys": true
+        "typescript": true,
+        "eslint-plugin-jest>@typescript-eslint/experimental-utils": true,
+        "@typescript-eslint/parser>@typescript-eslint/scope-manager": true,
+        "@typescript-eslint/eslint-plugin>tsutils": true,
+        "eslint>debug": true,
+        "eslint": true,
+        "semver": true,
+        "globby>ignore": true,
+        "eslint>regexpp": true
      }
    },
-    "eslint-module-utils": {
+    "eslint-plugin-import>eslint-module-utils": {
      "packages": {
-        "@babel/eslint-parser": true,
-        "@typescript-eslint/parser": true,
        "eslint-import-resolver-node": true,
-        "eslint-import-resolver-typescript": true
+        "@babel/eslint-parser": true
      }
    },
-    "module-deps": {
+    "node-sass": {
+      "native": true
+    },
+    "browserify>module-deps": {
      "packages": {
        "loose-envify": true
      }
    },
-    "node-sass": {
-      "native": true
-    },
    "sass": {
      "env": "unfrozen",
      "builtin": {
--- a/lavamoat/build-system/policy.json
+++ b/lavamoat/build-system/policy.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "metamask-crx",
-  "version": "10.13.0",
+  "version": "10.12.4",
  "private": true,
  "repository": {
    "type": "git",
@ -241,7 +241,7 @@
    "@babel/preset-react": "^7.0.0",
    "@babel/preset-typescript": "^7.16.7",
    "@babel/register": "^7.5.5",
-    "@lavamoat/allow-scripts": "^2.0.0",
+    "@lavamoat/allow-scripts": "^2.0.3",
    "@lavamoat/lavapack": "^2.0.4",
    "@metamask/auto-changelog": "^2.1.0",
    "@metamask/eslint-config": "^9.0.0",
@ -326,7 +326,7 @@
    "jest-canvas-mock": "^2.3.1",
    "jsdom": "^11.2.0",
    "koa": "^2.7.0",
-    "lavamoat": "^5.3.5",
+    "lavamoat": "^6.1.2",
    "lavamoat-browserify": "^14.1.0",
    "lavamoat-viz": "^6.0.9",
    "lockfile-lint": "^4.0.0",
@ -383,59 +383,59 @@
  },
  "lavamoat": {
    "allowScripts": {
-      "3box>3box-orbitdb-plugins>ipfs-log>orbit-db-identity-provider>orbit-db-keystore>leveldown": false,
-      "3box>3box-orbitdb-plugins>ipfs-log>orbit-db-identity-provider>orbit-db-keystore>libp2p-crypto-secp256k1>secp256k1": false,
-      "3box>3box-orbitdb-plugins>ipfs-log>orbit-db-identity-provider>orbit-db-keystore>libp2p-crypto>libp2p-crypto-secp256k1>secp256k1": false,
-      "3box>3box-orbitdb-plugins>ipfs-log>orbit-db-identity-provider>orbit-db-keystore>libp2p-crypto>ursa-optional": false,
+      "@sentry/cli": true,
+      "chromedriver": true,
+      "geckodriver": true,
+      "react-devtools>electron": true,
      "3box>ipfs-postmsg-proxy>peer-id>libp2p-crypto>libp2p-crypto-secp256k1>secp256k1": false,
-      "3box>ipfs>ipfs-mfs>ipfs-unixfs-exporter>ipfs-unixfs-importer>rabin-wasm>assemblyscript": false,
      "3box>ipfs>ipfs-repo>datastore-level>leveldown": false,
-      "3box>ipfs>ipld-bitcoin>bitcoinjs-lib>bip32>tiny-secp256k1": false,
+      "3box>ipfs>ipfs-unixfs-importer>rabin-wasm>assemblyscript": false,
      "3box>ipfs>ipld-ethereum>ethereumjs-account>ethereumjs-util>keccak": false,
      "3box>ipfs>ipld-ethereum>ethereumjs-account>ethereumjs-util>secp256k1": false,
-      "3box>ipfs>ipld-ethereum>ethereumjs-block>ethereumjs-tx>ethereumjs-util>ethereum-cryptography>keccak": false,
-      "3box>ipfs>ipld-ethereum>ethereumjs-block>ethereumjs-tx>ethereumjs-util>ethereum-cryptography>secp256k1": false,
      "3box>ipfs>ipld-ethereum>ethereumjs-block>ethereumjs-util>keccak": false,
      "3box>ipfs>ipld-ethereum>ethereumjs-block>ethereumjs-util>secp256k1": false,
-      "3box>ipfs>ipld-ethereum>ethereumjs-block>merkle-patricia-tree>ethereumjs-util>keccak": false,
-      "3box>ipfs>ipld-ethereum>ethereumjs-block>merkle-patricia-tree>ethereumjs-util>secp256k1": false,
      "3box>ipfs>ipld-ethereum>ethereumjs-tx>ethereumjs-util>keccak": false,
      "3box>ipfs>ipld-ethereum>ethereumjs-tx>ethereumjs-util>secp256k1": false,
      "3box>ipfs>ipld-ethereum>merkle-patricia-tree>ethereumjs-util>keccak": false,
      "3box>ipfs>ipld-ethereum>merkle-patricia-tree>ethereumjs-util>secp256k1": false,
+      "3box>ipfs>libp2p-crypto>libp2p-crypto-secp256k1>secp256k1": false,
+      "3box>ipfs>libp2p-crypto>ursa-optional": false,
+      "3box>ipfs>prometheus-gc-stats>gc-stats": false,
      "3box>orbit-db>orbit-db-cache>leveldown": false,
-      "@lavamoat/allow-scripts>@lavamoat/preinstall-always-fail": false,
-      "@metamask/controllers>babel-runtime>core-js": false,
-      "@metamask/controllers>eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>keccak": false,
-      "@metamask/controllers>eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>secp256k1": false,
-      "@metamask/controllers>eth-keyring-controller>eth-hd-keyring>eth-sig-util>ethereumjs-util>keccak": false,
-      "@metamask/controllers>eth-keyring-controller>eth-hd-keyring>eth-sig-util>ethereumjs-util>secp256k1": false,
-      "@metamask/controllers>web3-provider-engine>eth-json-rpc-filters>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>keccak": false,
-      "@metamask/controllers>web3-provider-engine>eth-json-rpc-filters>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>secp256k1": false,
-      "@metamask/controllers>web3-provider-engine>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>keccak": false,
-      "@metamask/controllers>web3-provider-engine>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>secp256k1": false,
+      "3box>orbit-db>orbit-db-keystore>leveldown": false,
+      "3box>orbit-db>orbit-db-keystore>libp2p-crypto-secp256k1>secp256k1": false,
+      "@eth-optimism/contracts>@ethersproject/hardware-wallets>@ledgerhq/hw-transport-node-hid>@ledgerhq/hw-transport-node-hid-noevents>node-hid": false,
+      "@eth-optimism/contracts>@ethersproject/hardware-wallets>@ledgerhq/hw-transport-node-hid>node-hid": false,
+      "@eth-optimism/contracts>@ethersproject/hardware-wallets>@ledgerhq/hw-transport-node-hid>usb": false,
+      "@metamask/controllers>web3-provider-engine>ethereumjs-util>keccak": false,
+      "@metamask/controllers>web3-provider-engine>ethereumjs-util>secp256k1": false,
+      "@metamask/controllers>web3-provider-engine>ethereumjs-vm>merkle-patricia-tree>ethereumjs-util>keccak": false,
+      "@metamask/controllers>web3-provider-engine>ethereumjs-vm>merkle-patricia-tree>ethereumjs-util>secp256k1": false,
      "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>keccak": false,
-      "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>secp256k1": false,
-      "@sentry/cli": true,
-      "@storybook/addon-a11y>@storybook/addons>@storybook/api>@storybook/channels>core-js": false,
-      "@storybook/addon-essentials>@storybook/addon-docs>@storybook/builder-webpack4>@storybook/ui>core-js-pure": false,
-      "chromedriver": true,
+      "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": false,
+      "@storybook/api>core-js": false,
+      "@storybook/core>@storybook/core-client>@storybook/ui>core-js-pure": false,
+      "eth-json-rpc-filters>eth-json-rpc-middleware>ethereumjs-util>keccak": false,
+      "eth-json-rpc-filters>eth-json-rpc-middleware>ethereumjs-util>secp256k1": false,
+      "eth-json-rpc-infura>eth-json-rpc-middleware>ethereumjs-util>keccak": false,
+      "eth-json-rpc-infura>eth-json-rpc-middleware>ethereumjs-util>secp256k1": false,
      "eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>keccak": false,
      "eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>secp256k1": false,
      "eth-lattice-keyring>gridplus-sdk": false,
+      "eth-sig-util>ethereumjs-util>keccak": false,
+      "eth-sig-util>ethereumjs-util>secp256k1": false,
      "eth-trezor-keyring>hdkey>secp256k1": false,
+      "eth-trezor-keyring>trezor-connect>@trezor/transport>protobufjs": false,
      "eth-trezor-keyring>trezor-connect>@trezor/utxo-lib>blake-hash": false,
-      "eth-trezor-keyring>trezor-connect>trezor-link>protobufjs": false,
+      "eth-trezor-keyring>trezor-connect>@trezor/utxo-lib>tiny-secp256k1": false,
+      "ethereumjs-util>ethereum-cryptography>keccak": false,
+      "ethjs-query>babel-runtime>core-js": false,
      "ganache>@trufflesuite/bigint-buffer": false,
+      "ganache>bufferutil": false,
      "ganache>keccak": false,
      "ganache>leveldown": false,
-      "geckodriver": true,
-      "react-devtools>electron": true,
-      "eth-trezor-keyring>trezor-connect>@trezor/transport>protobufjs": false,
-      "@metamask/iframe-execution-environment-service>@metamask/execution-environments": false,
-      "@metamask/snap-controllers>@metamask/execution-environments": false,
-      "@metamask/iframe-execution-environment-service>@metamask/snap-controllers>@metamask/execution-environments": false,
-      "@metamask/rpc-methods>@metamask/snap-controllers>@metamask/execution-environments": false
+      "ganache>secp256k1": false,
+      "ganache>utf-8-validate": false
    }
  }
 }
--- a/yarn.lock
+++ b/yarn.lock
@ -2487,13 +2487,20 @@
    rlp "^2.2.6"
    uuid "^8.3.2"

-"@lavamoat/allow-scripts@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@lavamoat/allow-scripts/-/allow-scripts-2.0.0.tgz#d2b84491961c8b2b80281112e19654beae9eb584"
-  integrity sha512-WC8cvStg5/MZ0JwccYsLNhtFSiK4tGEfv4kdlMoWfji4sB053HB1xCLDMlhFSMM6m0ecKA18CmzhI6J6iyCc0w==
+"@lavamoat/aa@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lavamoat/aa/-/aa-3.0.0.tgz#9c4facf161cfb0d69ad290a729856ae0442205ba"
+  integrity sha512-r+p3xMlNq1SunxBnSzmUAsvGBPTf531jdW2xicKyMHQU1+xMebB8LYBgcqSnARDOFkwBV2LUny016M92FpTjtw==
  dependencies:
-    "@npmcli/run-script" "^1.8.1"
    resolve "^1.20.0"
+
+"@lavamoat/allow-scripts@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@lavamoat/allow-scripts/-/allow-scripts-2.0.3.tgz#9c50e8c1ab58e3c701fe8996f27b376efa13c029"
+  integrity sha512-OVm/eUFB62JY1kyG91aYh/K5mDp3LfHvY7EqwoKV5M/0Pup4buKf9zsKiYVod/1kkuNV6nJwoMW33EZXM+ZAPg==
+  dependencies:
+    "@lavamoat/aa" "^3.0.0"
+    "@npmcli/run-script" "^1.8.1"
    yargs "^16.2.0"

 "@lavamoat/lavapack@^2.0.3", "@lavamoat/lavapack@^2.0.4":
@ -17284,6 +17291,16 @@ lavamoat-core@^11.0.0, lavamoat-core@^11.0.1:
    merge-deep "^3.0.2"
    resolve "^1.15.1"

+lavamoat-core@^12.1.0:
+  version "12.1.0"
+  resolved "https://registry.yarnpkg.com/lavamoat-core/-/lavamoat-core-12.1.0.tgz#a70be4560b15b7a016e78f218d4ce005bc808f6e"
+  integrity sha512-M9I1gDwLFN2fuZTyRcMLP82DWDOCJAanSDhZWqQ0la/tSdrOci9o9C7D0URHZI0uEn0yJuf0rHrmbUC/0KPV6A==
+  dependencies:
+    fromentries "^1.2.0"
+    json-stable-stringify "^1.0.1"
+    lavamoat-tofu "^6.0.1"
+    merge-deep "^3.0.2"
+
 lavamoat-tofu@^5.1.3:
  version "5.1.3"
  resolved "https://registry.yarnpkg.com/lavamoat-tofu/-/lavamoat-tofu-5.1.3.tgz#8e89a7ac206f3b2dc9c8ea52ecfd4f92f90285ae"
@ -17292,10 +17309,10 @@ lavamoat-tofu@^5.1.3:
    "@babel/parser" "^7.10.1"
    "@babel/traverse" "^7.10.1"

-lavamoat-tofu@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lavamoat-tofu/-/lavamoat-tofu-6.0.0.tgz#26d37c14864eb98df247195c5419a3a762ef650b"
-  integrity sha512-tgXf+/lplow/Ao2cOsbQ4ZqTuKBLwNnSSjPFIiGAHAM6xs+c+jEr60UAqOflyBg94VOE47G6o8zYZOAylZpUrw==
+lavamoat-tofu@^6.0.0, lavamoat-tofu@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/lavamoat-tofu/-/lavamoat-tofu-6.0.1.tgz#df3a1d09021790d5a4ccc1039751e9b3c2df85f6"
+  integrity sha512-QotLOiEcGBlWBJPYSZKDRRFchpwN9s3Ra8DDTuxJ57dGTBKOvvvfA+BpAjH/w1JcEhFkl5Wkc57Hl1oVzE8D2A==
  dependencies:
    "@babel/parser" "^7.10.1"
    "@babel/traverse" "^7.10.1"
@ -17312,18 +17329,19 @@ lavamoat-viz@^6.0.9:
    serve-handler "^6.1.3"
    yargs "^16.0.0"

-lavamoat@^5.3.5:
-  version "5.3.5"
-  resolved "https://registry.yarnpkg.com/lavamoat/-/lavamoat-5.3.5.tgz#e4faaf0749195ebd55bee4b7deb7241ff7718be7"
-  integrity sha512-7ds094PVQXfBoGWkjnjAAXR+s9VLYNDvS1UbH/GrXNGeSTTVJb/KAE604j/t26AOW0sn0PMGY5OhCKPpuqOBqQ==
+lavamoat@^6.1.2:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/lavamoat/-/lavamoat-6.1.2.tgz#2e4fa6adb6a13f3c8ceb4fc60294c0da67a0a31e"
+  integrity sha512-zq1+8OSU7WIHZZfEA71kqk0AL8hvnHv8HEnj4p4UP9tNPiTOzdlhe1Dv5jemQqGnMtDwXeV45OkJ2eDLdz+YpQ==
  dependencies:
    "@babel/code-frame" "^7.10.4"
    "@babel/highlight" "^7.10.4"
+    "@lavamoat/aa" "^3.0.0"
    bindings "^1.5.0"
    htmlescape "^1.1.1"
    json-stable-stringify "^1.0.1"
-    lavamoat-core "^11.0.0"
-    lavamoat-tofu "^5.1.3"
+    lavamoat-core "^12.1.0"
+    lavamoat-tofu "^6.0.1"
    node-gyp-build "^4.2.3"
    object.fromentries "^2.0.2"
    resolve "^1.17.0"