Merge branch 'develop' into controller_update

MetaMask · Oct 7, 2022 · c253c92 · c253c92
2 parents ba62042 + 7ba0f78
commit c253c92
Show file tree

Hide file tree

Showing 31 changed files with 1,420 additions and 132 deletions.
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
diff --git a/app/scripts/controllers/permissions/flask/snap-permissions.js b/app/scripts/controllers/permissions/flask/snap-permissions.js
@@ -3,7 +3,10 @@ import {
   restrictedMethodPermissionBuilders,
   selectHooks,
 } from '@metamask/rpc-methods';
-import { ExcludedSnapPermissions } from '../../../../../shared/constants/permissions';
+import {
+  ExcludedSnapEndowments,
+  ExcludedSnapPermissions,
+} from '../../../../../shared/constants/permissions';
 
 /**
  * @returns {Record<string, Record<string, unknown>>} All endowment permission
@@ -12,7 +15,9 @@ import { ExcludedSnapPermissions } from '../../../../../shared/constants/permiss
 export const buildSnapEndowmentSpecifications = () =>
   Object.values(endowmentPermissionBuilders).reduce(
     (allSpecifications, { targetKey, specificationBuilder }) => {
-      allSpecifications[targetKey] = specificationBuilder();
+      if (!ExcludedSnapEndowments.has(targetKey)) {
+        allSpecifications[targetKey] = specificationBuilder();
+      }
       return allSpecifications;
     },
     {},

diff --git a/app/scripts/controllers/permissions/specifications.js b/app/scripts/controllers/permissions/specifications.js
@@ -1,5 +1,6 @@
 import { constructPermission, PermissionType } from '@metamask/controllers';
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
+import { endowmentCaveatSpecifications as snapsEndowmentCaveatSpecifications } from '@metamask/snap-controllers';
 import { caveatSpecifications as snapsCaveatsSpecifications } from '@metamask/rpc-methods';
 ///: END:ONLY_INCLUDE_IN
 import {
@@ -69,6 +70,7 @@ export const getCaveatSpecifications = ({ getIdentities }) => {
 
     ///: BEGIN:ONLY_INCLUDE_IN(flask)
     ...snapsCaveatsSpecifications,
+    ...snapsEndowmentCaveatSpecifications,
     ///: END:ONLY_INCLUDE_IN
   };
 };

diff --git a/app/scripts/controllers/permissions/specifications.test.js b/app/scripts/controllers/permissions/specifications.test.js
@@ -16,7 +16,7 @@ describe('PermissionController specifications', () => {
   describe('caveat specifications', () => {
     it('getCaveatSpecifications returns the expected specifications object', () => {
       const caveatSpecifications = getCaveatSpecifications({});
-      expect(Object.keys(caveatSpecifications)).toHaveLength(3);
+      expect(Object.keys(caveatSpecifications)).toHaveLength(4);
       expect(
         caveatSpecifications[CaveatTypes.restrictReturnedAccounts].type,
       ).toStrictEqual(CaveatTypes.restrictReturnedAccounts);
@@ -27,6 +27,9 @@ describe('PermissionController specifications', () => {
       expect(caveatSpecifications.permittedCoinTypes.type).toStrictEqual(
         SnapCaveatType.PermittedCoinTypes,
       );
+      expect(caveatSpecifications.snapKeyring.type).toStrictEqual(
+        SnapCaveatType.SnapKeyring,
+      );
     });
 
     describe('restrictReturnedAccounts', () => {

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -654,7 +654,7 @@ export default class MetamaskController extends EventEmitter {
     ///: BEGIN:ONLY_INCLUDE_IN(flask)
     this.snapExecutionService = new IframeExecutionService({
       iframeUrl: new URL(
-        'https://metamask.github.io/iframe-execution-environment/0.8.0',
+        'https://metamask.github.io/iframe-execution-environment/0.9.0',
       ),
       messenger: this.controllerMessenger.getRestricted({
         name: 'ExecutionService',
@@ -3744,7 +3744,7 @@ export default class MetamaskController extends EventEmitter {
         ),
         getSnaps: this.controllerMessenger.call.bind(
           this.controllerMessenger,
-          'SnapController:getSnaps',
+          'SnapController:getPermittedSnaps',
           origin,
         ),
         requestPermissions: async (requestedPermissions) => {

diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
@@ -682,11 +682,11 @@
         "3box>ipfs>ipfs-unixfs-importer>async-iterator-batch": true,
         "3box>ipfs>ipfs-unixfs-importer>async-iterator-first": true,
         "3box>ipfs>ipfs-unixfs-importer>rabin-wasm": true,
+        "3box>ipfs>ipfs-unixfs-importer>superstruct": true,
         "3box>ipfs>ipld-dag-pb": true,
         "3box>ipfs>ipld-raw>multihashing-async": true,
         "3box>ipfs>multicodec": true,
         "3box>ipfs>multihashes": true,
-        "3box>ipfs>superstruct": true,
         "browserify>buffer": true,
         "madge>rc>deep-extend": true
       }
@@ -841,11 +841,11 @@
         "3box>ipfs>libp2p>libp2p-floodsub": true,
         "3box>ipfs>libp2p>libp2p-ping": true,
         "3box>ipfs>libp2p>libp2p-switch": true,
+        "3box>ipfs>libp2p>superstruct": true,
         "3box>ipfs>multiaddr": true,
         "3box>ipfs>peer-book": true,
         "3box>ipfs>peer-id": true,
         "3box>ipfs>peer-info": true,
-        "3box>ipfs>superstruct": true,
         "browserify>events": true,
         "browserify>insert-module-globals>is-buffer": true,
         "browserify>process": true,
@@ -3148,20 +3148,13 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-infura>@metamask/utils": true,
         "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": true,
+        "eth-block-tracker>@metamask/utils": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
         "node-fetch": true
       }
     },
-    "@metamask/eth-json-rpc-infura>@metamask/utils": {
-      "packages": {
-        "@metamask/eth-json-rpc-infura>@metamask/utils>superstruct": true,
-        "eslint>fast-deep-equal": true,
-        "nock>debug": true
-      }
-    },
     "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": {
       "globals": {
         "URL": true,
@@ -4646,9 +4639,13 @@
       }
     },
     "eth-block-tracker>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
+        "@metamask/snap-utils>superstruct": true,
         "eslint>fast-deep-equal": true,
-        "eth-block-tracker>@metamask/utils>superstruct": true,
         "nock>debug": true
       }
     },
@@ -4705,7 +4702,7 @@
       },
       "packages": {
         "browserify>browser-resolve": true,
-        "eth-json-rpc-middleware>@metamask/utils": true,
+        "eth-block-tracker>@metamask/utils": true,
         "eth-json-rpc-middleware>eth-sig-util": true,
         "eth-json-rpc-middleware>pify": true,
         "eth-rpc-errors": true,
@@ -4715,13 +4712,6 @@
         "vinyl>clone": true
       }
     },
-    "eth-json-rpc-middleware>@metamask/utils": {
-      "packages": {
-        "eslint>fast-deep-equal": true,
-        "eth-json-rpc-middleware>@metamask/utils>superstruct": true,
-        "nock>debug": true
-      }
-    },
     "eth-json-rpc-middleware>eth-sig-util": {
       "packages": {
         "eth-json-rpc-middleware>eth-sig-util>ethereumjs-abi": true,

diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
@@ -682,11 +682,11 @@
         "3box>ipfs>ipfs-unixfs-importer>async-iterator-batch": true,
         "3box>ipfs>ipfs-unixfs-importer>async-iterator-first": true,
         "3box>ipfs>ipfs-unixfs-importer>rabin-wasm": true,
+        "3box>ipfs>ipfs-unixfs-importer>superstruct": true,
         "3box>ipfs>ipld-dag-pb": true,
         "3box>ipfs>ipld-raw>multihashing-async": true,
         "3box>ipfs>multicodec": true,
         "3box>ipfs>multihashes": true,
-        "3box>ipfs>superstruct": true,
         "browserify>buffer": true,
         "madge>rc>deep-extend": true
       }
@@ -841,11 +841,11 @@
         "3box>ipfs>libp2p>libp2p-floodsub": true,
         "3box>ipfs>libp2p>libp2p-ping": true,
         "3box>ipfs>libp2p>libp2p-switch": true,
+        "3box>ipfs>libp2p>superstruct": true,
         "3box>ipfs>multiaddr": true,
         "3box>ipfs>peer-book": true,
         "3box>ipfs>peer-id": true,
         "3box>ipfs>peer-info": true,
-        "3box>ipfs>superstruct": true,
         "browserify>events": true,
         "browserify>insert-module-globals>is-buffer": true,
         "browserify>process": true,
@@ -3293,20 +3293,13 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-infura>@metamask/utils": true,
         "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": true,
+        "eth-block-tracker>@metamask/utils": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
         "node-fetch": true
       }
     },
-    "@metamask/eth-json-rpc-infura>@metamask/utils": {
-      "packages": {
-        "@metamask/eth-json-rpc-infura>@metamask/utils>superstruct": true,
-        "eslint>fast-deep-equal": true,
-        "nock>debug": true
-      }
-    },
     "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": {
       "globals": {
         "URL": true,
@@ -3616,11 +3609,15 @@
       }
     },
     "@metamask/rpc-methods": {
+      "globals": {
+        "console.warn": true
+      },
       "packages": {
         "@metamask/controllers": true,
         "@metamask/rpc-methods>@metamask/key-tree": true,
         "@metamask/snap-utils": true,
-        "@metamask/snap-utils>@metamask/utils": true,
+        "@metamask/snap-utils>superstruct": true,
+        "eth-block-tracker>@metamask/utils": true,
         "eth-rpc-errors": true
       }
     },
@@ -3869,7 +3866,7 @@
         "@metamask/snap-controllers>readable-web-to-node-stream": true,
         "@metamask/snap-controllers>tar-stream": true,
         "@metamask/snap-utils": true,
-        "@metamask/snap-utils>@metamask/utils": true,
+        "eth-block-tracker>@metamask/utils": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
         "pump": true
@@ -3898,8 +3895,13 @@
         "removeEventListener": true
       },
       "packages": {
-        "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream": true,
-        "@metamask/snap-utils>@metamask/utils": true
+        "@metamask/snap-controllers>@metamask/post-message-stream>@metamask/utils": true,
+        "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream": true
+      }
+    },
+    "@metamask/snap-controllers>@metamask/post-message-stream>@metamask/utils": {
+      "packages": {
+        "eslint>fast-deep-equal": true
       }
     },
     "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream": {
@@ -4123,20 +4125,17 @@
         "@babel/core>@babel/types": true,
         "@metamask/snap-utils>ajv": true,
         "@metamask/snap-utils>rfdc": true,
+        "@metamask/snap-utils>superstruct": true,
         "browserify": true,
         "browserify>buffer": true,
         "browserify>crypto-browserify": true,
         "browserify>events": true,
         "browserify>path-browserify": true,
         "eslint>fast-deep-equal": true,
+        "eth-block-tracker>@metamask/utils": true,
         "semver": true
       }
     },
-    "@metamask/snap-utils>@metamask/utils": {
-      "packages": {
-        "eslint>fast-deep-equal": true
-      }
-    },
     "@metamask/snap-utils>rfdc": {
       "packages": {
         "browserify>buffer": true
@@ -5178,9 +5177,13 @@
       }
     },
     "eth-block-tracker>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
       "packages": {
+        "@metamask/snap-utils>superstruct": true,
         "eslint>fast-deep-equal": true,
-        "eth-block-tracker>@metamask/utils>superstruct": true,
         "nock>debug": true
       }
     },
@@ -5237,7 +5240,7 @@
       },
       "packages": {
         "browserify>browser-resolve": true,
-        "eth-json-rpc-middleware>@metamask/utils": true,
+        "eth-block-tracker>@metamask/utils": true,
         "eth-json-rpc-middleware>eth-sig-util": true,
         "eth-json-rpc-middleware>pify": true,
         "eth-rpc-errors": true,
@@ -5247,13 +5250,6 @@
         "vinyl>clone": true
       }
     },
-    "eth-json-rpc-middleware>@metamask/utils": {
-      "packages": {
-        "eslint>fast-deep-equal": true,
-        "eth-json-rpc-middleware>@metamask/utils>superstruct": true,
-        "nock>debug": true
-      }
-    },
     "eth-json-rpc-middleware>eth-sig-util": {
       "packages": {
         "eth-json-rpc-middleware>eth-sig-util>ethereumjs-abi": true,