chore: bump MetaMask dependencies (#2460)

Bump several MetaMask dependencies to latest, closing a bunch of dependabot PRs.
MetaMask · Jun 7, 2024 · 1bf7e4f · 1bf7e4f
1 parent 4c8ee13
commit 1bf7e4f
Show file tree

Hide file tree

Showing 28 changed files with 147 additions and 105 deletions.
diff --git a/packages/snaps-controllers/package.json b/packages/snaps-controllers/package.json
@@ -53,13 +53,13 @@
     "build:ci": "tsup --clean"
   },
   "dependencies": {
-    "@metamask/approval-controller": "^6.0.2",
-    "@metamask/base-controller": "^5.0.2",
-    "@metamask/json-rpc-engine": "^8.0.1",
-    "@metamask/json-rpc-middleware-stream": "^7.0.1",
+    "@metamask/approval-controller": "^7.0.0",
+    "@metamask/base-controller": "^6.0.0",
+    "@metamask/json-rpc-engine": "^9.0.0",
+    "@metamask/json-rpc-middleware-stream": "^8.0.0",
     "@metamask/object-multiplex": "^2.0.0",
-    "@metamask/permission-controller": "^9.0.2",
-    "@metamask/phishing-controller": "^9.0.1",
+    "@metamask/permission-controller": "^10.0.0",
+    "@metamask/phishing-controller": "^10.0.0",
     "@metamask/post-message-stream": "^8.1.0",
     "@metamask/rpc-errors": "^6.2.1",
     "@metamask/snaps-registry": "^3.1.0",

diff --git a/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json
@@ -42,8 +42,8 @@
         "console": true
       },
       "packages": {
-        "@metamask/json-rpc-engine": true,
         "@metamask/object-multiplex": true,
+        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/json-rpc-middleware-stream": true,
         "@metamask/providers>@metamask/safe-event-emitter": true,
         "@metamask/providers>is-stream": true,
@@ -52,6 +52,13 @@
         "readable-stream": true
       }
     },
+    "@metamask/providers>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/safe-event-emitter": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/providers>@metamask/json-rpc-middleware-stream": {
       "globals": {
         "console.warn": true,

diff --git a/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json
@@ -49,8 +49,8 @@
         "console": true
       },
       "packages": {
-        "@metamask/json-rpc-engine": true,
         "@metamask/object-multiplex": true,
+        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/json-rpc-middleware-stream": true,
         "@metamask/providers>@metamask/safe-event-emitter": true,
         "@metamask/providers>is-stream": true,
@@ -59,6 +59,13 @@
         "readable-stream": true
       }
     },
+    "@metamask/providers>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/safe-event-emitter": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/providers>@metamask/json-rpc-middleware-stream": {
       "globals": {
         "console.warn": true,

diff --git a/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json
@@ -49,8 +49,8 @@
         "console": true
       },
       "packages": {
-        "@metamask/json-rpc-engine": true,
         "@metamask/object-multiplex": true,
+        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/json-rpc-middleware-stream": true,
         "@metamask/providers>@metamask/safe-event-emitter": true,
         "@metamask/providers>is-stream": true,
@@ -59,6 +59,13 @@
         "readable-stream": true
       }
     },
+    "@metamask/providers>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/safe-event-emitter": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/providers>@metamask/json-rpc-middleware-stream": {
       "globals": {
         "console.warn": true,

diff --git a/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json
@@ -42,8 +42,8 @@
         "console": true
       },
       "packages": {
-        "@metamask/json-rpc-engine": true,
         "@metamask/object-multiplex": true,
+        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/json-rpc-middleware-stream": true,
         "@metamask/providers>@metamask/safe-event-emitter": true,
         "@metamask/providers>is-stream": true,
@@ -52,6 +52,13 @@
         "readable-stream": true
       }
     },
+    "@metamask/providers>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/safe-event-emitter": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/providers>@metamask/json-rpc-middleware-stream": {
       "globals": {
         "console.warn": true,

diff --git a/packages/snaps-execution-environments/package.json b/packages/snaps-execution-environments/package.json
@@ -51,7 +51,7 @@
     "build:ci": "tsup --clean"
   },
   "dependencies": {
-    "@metamask/json-rpc-engine": "^8.0.1",
+    "@metamask/json-rpc-engine": "^9.0.0",
     "@metamask/object-multiplex": "^2.0.0",
     "@metamask/post-message-stream": "^8.1.0",
     "@metamask/providers": "^17.0.0",

diff --git a/packages/snaps-jest/package.json b/packages/snaps-jest/package.json
@@ -40,12 +40,12 @@
     "@jest/environment": "^29.5.0",
     "@jest/expect": "^29.5.0",
     "@jest/globals": "^29.5.0",
-    "@metamask/base-controller": "^5.0.2",
+    "@metamask/base-controller": "^6.0.0",
     "@metamask/eth-json-rpc-middleware": "^12.1.1",
-    "@metamask/json-rpc-engine": "^8.0.1",
-    "@metamask/json-rpc-middleware-stream": "^7.0.1",
+    "@metamask/json-rpc-engine": "^9.0.0",
+    "@metamask/json-rpc-middleware-stream": "^8.0.0",
     "@metamask/key-tree": "^9.1.1",
-    "@metamask/permission-controller": "^9.0.2",
+    "@metamask/permission-controller": "^10.0.0",
     "@metamask/snaps-controllers": "workspace:^",
     "@metamask/snaps-execution-environments": "workspace:^",
     "@metamask/snaps-rpc-methods": "workspace:^",

diff --git a/packages/snaps-rpc-methods/package.json b/packages/snaps-rpc-methods/package.json
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@metamask/key-tree": "^9.1.1",
-    "@metamask/permission-controller": "^9.0.2",
+    "@metamask/permission-controller": "^10.0.0",
     "@metamask/rpc-errors": "^6.2.1",
     "@metamask/snaps-sdk": "workspace:^",
     "@metamask/snaps-utils": "workspace:^",
@@ -55,7 +55,7 @@
     "@metamask/eslint-config-jest": "^12.1.0",
     "@metamask/eslint-config-nodejs": "^12.1.0",
     "@metamask/eslint-config-typescript": "^12.1.0",
-    "@metamask/json-rpc-engine": "^8.0.1",
+    "@metamask/json-rpc-engine": "^9.0.0",
     "@swc/core": "1.3.78",
     "@swc/jest": "^0.2.26",
     "@types/node": "18.14.2",

diff --git a/packages/snaps-rpc-methods/src/endowments/cronjob.test.ts b/packages/snaps-rpc-methods/src/endowments/cronjob.test.ts
@@ -22,7 +22,7 @@ describe('endowment:cronjob', () => {
         subjectTypes: [SubjectType.Snap],
       });
 
-      expect(specification.endowmentGetter()).toBeUndefined();
+      expect(specification.endowmentGetter()).toBeNull();
     });
   });
 

diff --git a/packages/snaps-rpc-methods/src/endowments/cronjob.ts b/packages/snaps-rpc-methods/src/endowments/cronjob.ts
@@ -23,7 +23,7 @@ const permissionName = SnapEndowments.Cronjob;
 type CronjobEndowmentSpecification = ValidPermissionSpecification<{
   permissionType: PermissionType.Endowment;
   targetName: typeof permissionName;
-  endowmentGetter: (_options?: any) => undefined;
+  endowmentGetter: (_options?: any) => null;
   allowedCaveats: Readonly<NonEmptyArray<string>> | null;
 }>;
 
@@ -42,7 +42,7 @@ const specificationBuilder: PermissionSpecificationBuilder<
     permissionType: PermissionType.Endowment,
     targetName: permissionName,
     allowedCaveats: [SnapCaveatType.SnapCronjob],
-    endowmentGetter: (_getterOptions?: EndowmentGetterParams) => undefined,
+    endowmentGetter: (_getterOptions?: EndowmentGetterParams) => null,
     subjectTypes: [SubjectType.Snap],
   };
 };

diff --git a/packages/snaps-rpc-methods/src/endowments/home-page.test.ts b/packages/snaps-rpc-methods/src/endowments/home-page.test.ts
@@ -14,6 +14,6 @@ describe('endowment:page-home', () => {
       subjectTypes: [SubjectType.Snap],
     });
 
-    expect(specification.endowmentGetter()).toBeUndefined();
+    expect(specification.endowmentGetter()).toBeNull();
   });
 });
diff --git a/packages/snaps-rpc-methods/src/endowments/home-page.ts b/packages/snaps-rpc-methods/src/endowments/home-page.ts
@@ -13,7 +13,7 @@ const permissionName = SnapEndowments.HomePage;
 type HomePageEndowmentSpecification = ValidPermissionSpecification<{
   permissionType: PermissionType.Endowment;
   targetName: typeof permissionName;
-  endowmentGetter: (_options?: EndowmentGetterParams) => undefined;
+  endowmentGetter: (_options?: EndowmentGetterParams) => null;
   allowedCaveats: Readonly<NonEmptyArray<string>> | null;
 }>;
 
@@ -34,7 +34,7 @@ const specificationBuilder: PermissionSpecificationBuilder<
     permissionType: PermissionType.Endowment,
     targetName: permissionName,
     allowedCaveats: null,
-    endowmentGetter: (_getterOptions?: EndowmentGetterParams) => undefined,
+    endowmentGetter: (_getterOptions?: EndowmentGetterParams) => null,
     subjectTypes: [SubjectType.Snap],
   };
 };

diff --git a/packages/snaps-rpc-methods/src/endowments/keyring.ts b/packages/snaps-rpc-methods/src/endowments/keyring.ts
@@ -22,7 +22,7 @@ const permissionName = SnapEndowments.Keyring;
 type KeyringEndowmentSpecification = ValidPermissionSpecification<{
   permissionType: PermissionType.Endowment;
   targetName: typeof permissionName;
-  endowmentGetter: (_options?: EndowmentGetterParams) => undefined;
+  endowmentGetter: (_options?: EndowmentGetterParams) => null;
   allowedCaveats: Readonly<NonEmptyArray<string>> | null;
   validator: PermissionValidatorConstraint;
   subjectTypes: readonly SubjectType[];
@@ -47,7 +47,7 @@ const specificationBuilder: PermissionSpecificationBuilder<
       SnapCaveatType.KeyringOrigin,
       SnapCaveatType.MaxRequestTime,
     ],
-    endowmentGetter: (_getterOptions?: EndowmentGetterParams) => undefined,
+    endowmentGetter: (_getterOptions?: EndowmentGetterParams) => null,
     validator: createGenericPermissionValidator([
       { type: SnapCaveatType.KeyringOrigin },
       { type: SnapCaveatType.MaxRequestTime, optional: true },

diff --git a/packages/snaps-rpc-methods/src/endowments/lifecycle-hooks.ts b/packages/snaps-rpc-methods/src/endowments/lifecycle-hooks.ts
@@ -13,7 +13,7 @@ const permissionName = SnapEndowments.LifecycleHooks;
 type LifecycleHooksEndowmentSpecification = ValidPermissionSpecification<{
   permissionType: PermissionType.Endowment;
   targetName: typeof permissionName;
-  endowmentGetter: (_options?: EndowmentGetterParams) => undefined;
+  endowmentGetter: (_options?: EndowmentGetterParams) => null;
   allowedCaveats: Readonly<NonEmptyArray<string>> | null;
 }>;
 
@@ -34,7 +34,7 @@ const specificationBuilder: PermissionSpecificationBuilder<
     permissionType: PermissionType.Endowment,
     targetName: permissionName,
     allowedCaveats: null,
-    endowmentGetter: (_getterOptions?: EndowmentGetterParams) => undefined,
+    endowmentGetter: (_getterOptions?: EndowmentGetterParams) => null,
     subjectTypes: [SubjectType.Snap],
   };
 };

diff --git a/packages/snaps-rpc-methods/src/endowments/name-lookup.test.ts b/packages/snaps-rpc-methods/src/endowments/name-lookup.test.ts
@@ -27,7 +27,7 @@ describe('endowment:name-lookup', () => {
       validator: expect.any(Function),
     });
 
-    expect(specification.endowmentGetter()).toBeUndefined();
+    expect(specification.endowmentGetter()).toBeNull();
   });
 
   describe('validator', () => {

diff --git a/packages/snaps-rpc-methods/src/endowments/name-lookup.ts b/packages/snaps-rpc-methods/src/endowments/name-lookup.ts
@@ -32,7 +32,7 @@ const permissionName = SnapEndowments.NameLookup;
 type NameLookupEndowmentSpecification = ValidPermissionSpecification<{
   permissionType: PermissionType.Endowment;
   targetName: typeof permissionName;
-  endowmentGetter: (_options?: EndowmentGetterParams) => undefined;
+  endowmentGetter: (_options?: EndowmentGetterParams) => null;
   allowedCaveats: Readonly<NonEmptyArray<string>> | null;
   validator: PermissionValidatorConstraint;
 }>;
@@ -57,7 +57,7 @@ const specificationBuilder: PermissionSpecificationBuilder<
       SnapCaveatType.LookupMatchers,
       SnapCaveatType.MaxRequestTime,
     ],
-    endowmentGetter: (_getterOptions?: EndowmentGetterParams) => undefined,
+    endowmentGetter: (_getterOptions?: EndowmentGetterParams) => null,
     validator: createGenericPermissionValidator([
       { type: SnapCaveatType.ChainIds, optional: true },
       { type: SnapCaveatType.LookupMatchers, optional: true },

diff --git a/packages/snaps-rpc-methods/src/endowments/rpc.test.ts b/packages/snaps-rpc-methods/src/endowments/rpc.test.ts
@@ -21,7 +21,7 @@ describe('endowment:rpc', () => {
       subjectTypes: [SubjectType.Snap],
     });
 
-    expect(specification.endowmentGetter()).toBeUndefined();
+    expect(specification.endowmentGetter()).toBeNull();
   });
 
   describe('validator', () => {

diff --git a/packages/snaps-rpc-methods/src/endowments/rpc.ts b/packages/snaps-rpc-methods/src/endowments/rpc.ts
@@ -22,7 +22,7 @@ const targetName = SnapEndowments.Rpc;
 type RpcSpecification = ValidPermissionSpecification<{
   permissionType: PermissionType.Endowment;
   targetName: typeof targetName;
-  endowmentGetter: (_options?: any) => undefined;
+  endowmentGetter: (_options?: any) => null;
   allowedCaveats: Readonly<NonEmptyArray<string>> | null;
   validator: PermissionValidatorConstraint;
   subjectTypes: readonly SubjectType[];
@@ -47,7 +47,7 @@ const specificationBuilder: PermissionSpecificationBuilder<
     permissionType: PermissionType.Endowment,
     targetName,
     allowedCaveats: [SnapCaveatType.RpcOrigin, SnapCaveatType.MaxRequestTime],
-    endowmentGetter: (_getterOptions?: EndowmentGetterParams) => undefined,
+    endowmentGetter: (_getterOptions?: EndowmentGetterParams) => null,
     validator: createGenericPermissionValidator([
       { type: SnapCaveatType.RpcOrigin },
       { type: SnapCaveatType.MaxRequestTime, optional: true },

diff --git a/packages/snaps-rpc-methods/src/endowments/signature-insight.test.ts b/packages/snaps-rpc-methods/src/endowments/signature-insight.test.ts
@@ -24,7 +24,7 @@ describe('endowment:signature-insight', () => {
       subjectTypes: [SubjectType.Snap],
     });
 
-    expect(specification.endowmentGetter()).toBeUndefined();
+    expect(specification.endowmentGetter()).toBeNull();
   });
 
   describe('validator', () => {

diff --git a/packages/snaps-rpc-methods/src/endowments/signature-insight.ts b/packages/snaps-rpc-methods/src/endowments/signature-insight.ts
@@ -21,7 +21,7 @@ const permissionName = SnapEndowments.SignatureInsight;
 type SignatureInsightEndowmentSpecification = ValidPermissionSpecification<{
   permissionType: PermissionType.Endowment;
   targetName: typeof permissionName;
-  endowmentGetter: (_options?: EndowmentGetterParams) => undefined;
+  endowmentGetter: (_options?: EndowmentGetterParams) => null;
   allowedCaveats: Readonly<NonEmptyArray<string>> | null;
   validator: PermissionValidatorConstraint;
 }>;
@@ -42,7 +42,7 @@ const specificationBuilder: PermissionSpecificationBuilder<
     permissionType: PermissionType.Endowment,
     targetName: permissionName,
     allowedCaveats: [SnapCaveatType.SignatureOrigin],
-    endowmentGetter: (_getterOptions?: EndowmentGetterParams) => undefined,
+    endowmentGetter: (_getterOptions?: EndowmentGetterParams) => null,
     validator: createGenericPermissionValidator([
       { type: SnapCaveatType.SignatureOrigin, optional: true },
       { type: SnapCaveatType.MaxRequestTime, optional: true },

diff --git a/packages/snaps-rpc-methods/src/endowments/transaction-insight.test.ts b/packages/snaps-rpc-methods/src/endowments/transaction-insight.test.ts
@@ -27,7 +27,7 @@ describe('endowment:transaction-insight', () => {
       subjectTypes: [SubjectType.Snap],
     });
 
-    expect(specification.endowmentGetter()).toBeUndefined();
+    expect(specification.endowmentGetter()).toBeNull();
   });
 
   describe('validator', () => {

diff --git a/packages/snaps-rpc-methods/src/endowments/transaction-insight.ts b/packages/snaps-rpc-methods/src/endowments/transaction-insight.ts
@@ -21,7 +21,7 @@ const permissionName = SnapEndowments.TransactionInsight;
 type TransactionInsightEndowmentSpecification = ValidPermissionSpecification<{
   permissionType: PermissionType.Endowment;
   targetName: typeof permissionName;
-  endowmentGetter: (_options?: EndowmentGetterParams) => undefined;
+  endowmentGetter: (_options?: EndowmentGetterParams) => null;
   allowedCaveats: Readonly<NonEmptyArray<string>> | null;
   validator: PermissionValidatorConstraint;
 }>;
@@ -45,7 +45,7 @@ const specificationBuilder: PermissionSpecificationBuilder<
       SnapCaveatType.TransactionOrigin,
       SnapCaveatType.MaxRequestTime,
     ],
-    endowmentGetter: (_getterOptions?: EndowmentGetterParams) => undefined,
+    endowmentGetter: (_getterOptions?: EndowmentGetterParams) => null,
     validator: createGenericPermissionValidator([
       { type: SnapCaveatType.TransactionOrigin, optional: true },
       { type: SnapCaveatType.MaxRequestTime, optional: true },

diff --git a/packages/snaps-rpc-methods/src/restricted/caveats/permittedCoinTypes.ts b/packages/snaps-rpc-methods/src/restricted/caveats/permittedCoinTypes.ts
@@ -91,18 +91,12 @@ export const PermittedCoinTypesCaveatSpecification: Record<
 > = {
   [SnapCaveatType.PermittedCoinTypes]: Object.freeze({
     type: SnapCaveatType.PermittedCoinTypes,
-    decorator: (
-      method,
-      caveat: Caveat<
-        SnapCaveatType.PermittedCoinTypes,
-        GetBip44EntropyParams[]
-      >,
-    ) => {
+    decorator: (method, caveat) => {
       return async (args) => {
         const { params } = args;
         validateBIP44Params(params);
 
-        const coinType = caveat.value.find(
+        const coinType = (caveat.value as GetBip44EntropyParams[]).find(
           (caveatValue) => caveatValue.coinType === params.coinType,
         );
 

diff --git a/packages/snaps-rpc-methods/src/restricted/caveats/permittedDerivationPaths.ts b/packages/snaps-rpc-methods/src/restricted/caveats/permittedDerivationPaths.ts
@@ -79,15 +79,12 @@ export const PermittedDerivationPathsCaveatSpecification: Record<
 > = {
   [SnapCaveatType.PermittedDerivationPaths]: Object.freeze({
     type: SnapCaveatType.PermittedDerivationPaths,
-    decorator: (
-      method,
-      caveat: Caveat<SnapCaveatType.PermittedDerivationPaths, Bip32Entropy[]>,
-    ) => {
+    decorator: (method, caveat) => {
       return async (args) => {
         const { params } = args;
         validateBIP32Path(params);
 
-        const path = caveat.value.find(
+        const path = (caveat.value as Bip32Entropy[]).find(
           (caveatPath) =>
             isEqual(
               params.path.slice(0, caveatPath.path.length),