snaps-skunkworks@0.12.0 (#14670)

* snaps-skunkworks@0.12.0 * Bump iframe execution environment * Remove policy override * Rerun LavaMoat Co-authored-by: Erik Marks <25517051+rekmarks@users.noreply.github.com>
3 years ago · 2dac88cbf4
parent 890e0ed70f
commit 2dac88cbf4
7 changed files with 35 additions and 101 deletions
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@ -46,8 +46,10 @@ import {
 } from '@metamask/controllers';
 import SmartTransactionsController from '@metamask/smart-transactions-controller';
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
-import { SnapController } from '@metamask/snap-controllers';
-import { IframeExecutionService } from '@metamask/iframe-execution-environment-service';
+import {
+  SnapController,
+  IframeExecutionService,
+} from '@metamask/snap-controllers';
 ///: END:ONLY_INCLUDE_IN

 import {
@ -637,7 +639,7 @@ export default class MetamaskController extends EventEmitter {
    this.workerController = new IframeExecutionService({
      onError: this.onExecutionEnvironmentError.bind(this),
      iframeUrl: new URL(
-        'https://metamask.github.io/iframe-execution-environment/0.4.4',
+        'https://metamask.github.io/iframe-execution-environment/0.4.5',
      ),
      messenger: this.controllerMessenger.getRestricted({
        name: 'ExecutionService',
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@ -3103,11 +3103,6 @@
        "URL": true
      }
    },
-    "@metamask/iframe-execution-environment-service>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
    "@metamask/jazzicon": {
      "globals": {
        "document.createElement": true,
@ -3431,6 +3426,9 @@
        "console.info": true,
        "console.log": true,
        "console.warn": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "document.getElementById": true,
        "fetch": true,
        "setTimeout": true
      },
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@ -3103,38 +3103,6 @@
        "URL": true
      }
    },
-    "@metamask/iframe-execution-environment-service": {
-      "globals": {
-        "clearTimeout": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "document.getElementById": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@metamask/iframe-execution-environment-service>json-rpc-middleware-stream": true,
-        "@metamask/iframe-execution-environment-service>nanoid": true,
-        "@metamask/post-message-stream": true,
-        "@metamask/snap-controllers": true,
-        "@metamask/snap-controllers>@metamask/execution-environments": true,
-        "json-rpc-engine": true,
-        "pump": true
-      }
-    },
-    "@metamask/iframe-execution-environment-service>json-rpc-middleware-stream": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "json-rpc-engine>@metamask/safe-event-emitter": true,
-        "readable-stream": true
-      }
-    },
-    "@metamask/iframe-execution-environment-service>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
    "@metamask/jazzicon": {
      "globals": {
        "document.createElement": true,
@ -3458,6 +3426,9 @@
        "console.info": true,
        "console.log": true,
        "console.warn": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "document.getElementById": true,
        "fetch": true,
        "setTimeout": true
      },
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@ -3103,11 +3103,6 @@
        "URL": true
      }
    },
-    "@metamask/iframe-execution-environment-service>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
    "@metamask/jazzicon": {
      "globals": {
        "document.createElement": true,
@ -3431,6 +3426,9 @@
        "console.info": true,
        "console.log": true,
        "console.warn": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "document.getElementById": true,
        "fetch": true,
        "setTimeout": true
      },
--- a/lavamoat/browserify/policy-override.json
+++ b/lavamoat/browserify/policy-override.json
@ -80,11 +80,6 @@
        "crypto.getRandomValues": true
      }
    },
-    "@metamask/iframe-execution-environment-service>nanoid": {
-      "globals": {
-        "crypto.getRandomValues": true
-      }
-    },
    "@metamask/snap-controllers>nanoid": {
      "globals": {
        "crypto.getRandomValues": true
--- a/package.json
+++ b/package.json
@ -120,17 +120,16 @@
    "@metamask/eth-ledger-bridge-keyring": "^0.11.0",
    "@metamask/eth-token-tracker": "^4.0.0",
    "@metamask/etherscan-link": "^2.1.0",
-    "@metamask/iframe-execution-environment-service": "^0.11.1",
    "@metamask/jazzicon": "^2.0.0",
    "@metamask/logo": "^3.1.1",
    "@metamask/metamask-eth-abis": "^3.0.0",
    "@metamask/obs-store": "^5.0.0",
    "@metamask/post-message-stream": "^4.0.0",
    "@metamask/providers": "^8.1.1",
-    "@metamask/rpc-methods": "^0.11.1",
+    "@metamask/rpc-methods": "^0.12.0",
    "@metamask/slip44": "^2.1.0",
    "@metamask/smart-transactions-controller": "^1.10.0",
-    "@metamask/snap-controllers": "^0.11.1",
+    "@metamask/snap-controllers": "^0.12.0",
    "@ngraveio/bc-ur": "^1.1.6",
    "@popperjs/core": "^2.4.0",
    "@reduxjs/toolkit": "^1.6.2",
--- a/yarn.lock
+++ b/yarn.lock
@ -2914,15 +2914,15 @@
  resolved "https://registry.yarnpkg.com/@metamask/etherscan-link/-/etherscan-link-2.1.0.tgz#c0be8e68445b7b83cf85bcc03a56cdf8e256c973"
  integrity sha512-ADuWlTUkFfN2vXlz81Bg/0BA+XRor+CdK1055p6k7H6BLIPoDKn9SBOFld9haQFuR9cKh/JYHcnlSIv5R4fUEw==

-"@metamask/execution-environments@^0.11.1":
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/@metamask/execution-environments/-/execution-environments-0.11.1.tgz#04bfd945a2b8b5379957917255faed0dec27b226"
-  integrity sha512-E2UVccqKxzF1M6ZnrH8zqI0XO0IIGuB7fS3dUk2Ha44SDw0V/4ufqg9wCGy9H5DIRyLZQN5bDElnTLeEzedt3A==
+"@metamask/execution-environments@^0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@metamask/execution-environments/-/execution-environments-0.12.0.tgz#b621eb1a5bb854e9b7b43a0888dc5ab9f12f1e5a"
+  integrity sha512-UJXft9jt6OCFFFfEFT/0i3HZ8aGrtp4APDtOVVbf/CHUqVj9FFUruzwydN9KdFbZlBnU7/Von0UmaudlSgVrow==
  dependencies:
    "@metamask/object-multiplex" "^1.2.0"
    "@metamask/post-message-stream" "^4.0.0"
    "@metamask/providers" "^8.1.1"
-    "@metamask/snap-types" "^0.11.1"
+    "@metamask/snap-types" "^0.12.0"
    eth-rpc-errors "^4.0.3"
    pump "^3.0.0"
    ses "^0.15.15"
@ -2933,23 +2933,6 @@
  resolved "https://registry.yarnpkg.com/@metamask/forwarder/-/forwarder-1.1.0.tgz#13829d8244bbf19ea658c0b20d21a77b67de0bdd"
  integrity sha512-Hggj4y0QIjDzKGTXzarhEPIQyFSB2bi2y6YLJNwaT4JmP30UB5Cj6gqoY0M4pj3QT57fzp0BUuGp7F/AUe28tw==

-"@metamask/iframe-execution-environment-service@^0.11.1":
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/@metamask/iframe-execution-environment-service/-/iframe-execution-environment-service-0.11.1.tgz#cf3495e26c83cb6389b197797c61e55df7144934"
-  integrity sha512-Q3jZ0g8+evQNmVGoUrtHFB6VIynmqQTIuE4oo22U7n0U2e+xLtamoJpYXle/KHgBEv3JHeeYu9CPnXc1YCaPOg==
-  dependencies:
-    "@metamask/execution-environments" "^0.11.1"
-    "@metamask/object-multiplex" "^1.2.0"
-    "@metamask/post-message-stream" "^4.0.0"
-    "@metamask/snap-controllers" "^0.11.1"
-    "@metamask/snap-types" "^0.11.1"
-    eth-rpc-errors "^4.0.3"
-    json-rpc-engine "^6.1.0"
-    json-rpc-middleware-stream "^3.0.0"
-    nanoid "^3.1.31"
-    pump "^3.0.0"
-    stream "^0.0.2"
-
 "@metamask/jazzicon@^2.0.0":
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/@metamask/jazzicon/-/jazzicon-2.0.0.tgz#5615528e91c0fc5c9d79202d1f0954a7922525a0"
@ -3031,14 +3014,14 @@
    pump "^3.0.0"
    webextension-polyfill-ts "^0.25.0"

-"@metamask/rpc-methods@^0.11.1":
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/@metamask/rpc-methods/-/rpc-methods-0.11.1.tgz#180ce27d1d408fb5eb80edf69351611b231d4f56"
-  integrity sha512-QinfBpYy6m5BikADEUNjQvHXJIrG/1eZmwJbiYh4aJL1AcjzUb2KqWIOdI4ihLJ0xEkEy3rWmDwVQDxd9AzteA==
+"@metamask/rpc-methods@^0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@metamask/rpc-methods/-/rpc-methods-0.12.0.tgz#f86208ddb1e864058815f7eff2f1d6bca9ebf618"
+  integrity sha512-lqsmQRaeqye6KyBmAmA4t1T5unUw/guw3DNAvY3u4HxYKR0uQktTxPus9TuxPj3xK3G+IVnplWLQCojOlPE6vA==
  dependencies:
    "@metamask/controllers" "^28.0.0"
    "@metamask/key-tree" "^3.0.1"
-    "@metamask/snap-controllers" "^0.11.1"
+    "@metamask/snap-controllers" "^0.12.0"
    "@metamask/types" "^1.1.0"
    eth-rpc-errors "^4.0.2"

@ -3065,13 +3048,13 @@
    isomorphic-fetch "^3.0.0"
    lodash "^4.17.21"

-"@metamask/snap-controllers@^0.11.1":
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/@metamask/snap-controllers/-/snap-controllers-0.11.1.tgz#00754b8ad2480f4ba5d273b9a3ec2d2251b00e78"
-  integrity sha512-U5jEz7ZVJUOh9T6IULN6ZNMoS1s7ABZzSAs2mdTCcPDviiMgadwRBWZe7LfiwJQ1xxwKITNPPt8oSBaUsH7biw==
+"@metamask/snap-controllers@^0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@metamask/snap-controllers/-/snap-controllers-0.12.0.tgz#789793f860471bcc856abfdd46b8693afe3041a7"
+  integrity sha512-EG8/VytoYy2RBHdv+CHXbd91j4ibbV1SKKDTRc3b3iUBrp4FMVvQiuaL+pvXtPHCpEKL7doh6KVoAEgib5tHyw==
  dependencies:
    "@metamask/controllers" "^28.0.0"
-    "@metamask/execution-environments" "^0.11.1"
+    "@metamask/execution-environments" "^0.12.0"
    "@metamask/object-multiplex" "^1.1.0"
    "@metamask/obs-store" "^7.0.0"
    "@metamask/post-message-stream" "4.0.0"
@ -3093,10 +3076,10 @@
    semver "^7.3.5"
    tar-stream "^2.2.0"

-"@metamask/snap-types@^0.11.1":
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/@metamask/snap-types/-/snap-types-0.11.1.tgz#43ddd6397ab4119dabf8ce42725680e593735cd1"
-  integrity sha512-BrB/zypZbm6GWjGK4QahrRiYChGyk+EE+JAIEx2/vhLuzx2DmoEfEi4k1ojV13Rl7VfnOFsQXuK0xZxMX5FyCA==
+"@metamask/snap-types@^0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@metamask/snap-types/-/snap-types-0.12.0.tgz#240c92029d3cf6d826c023d4460148f278ad593c"
+  integrity sha512-ZK9gOAc8uNWFN+cdHcGk6OSpQjqKY8i4PdQLFRPQxZfFJfAT4qV2fXXOPOZpnFwYZoAVuFuzHWGV4YnrQbfFvA==
  dependencies:
    "@metamask/controllers" "^28.0.0"

@ -10243,11 +10226,6 @@ elliptic@6.5.3, elliptic@6.5.4, elliptic@=3.0.3, elliptic@^6.0.0, elliptic@^6.4.
    minimalistic-assert "^1.0.1"
    minimalistic-crypto-utils "^1.0.1"

-emitter-component@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/emitter-component/-/emitter-component-1.1.1.tgz#065e2dbed6959bf470679edabeaf7981d1003ab6"
-  integrity sha1-Bl4tvtaVm/RwZ57avq95gdEAOrY=
-
 emittery@0.10.0:
  version "0.10.0"
  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.0.tgz#bb373c660a9d421bb44706ec4967ed50c02a8026"
@ -25471,13 +25449,6 @@ stream-to-pull-stream@^1.7.2, stream-to-pull-stream@^1.7.3:
    looper "^3.0.0"
    pull-stream "^3.2.3"

-stream@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/stream/-/stream-0.0.2.tgz#7f5363f057f6592c5595f00bc80a27f5cec1f0ef"
-  integrity sha1-f1Nj8Ff2WSxVlfALyAon9c7B8O8=
-  dependencies:
-    emitter-component "^1.1.1"
-
 streamsearch@0.1.2:
  version "0.1.2"
  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"