Use controllers monorepo packages (#955)

* Use controllers monorepo packages * Fix imports and lint * Fix import * Fix import * Update manifest * Fix import after rebase * Fix issue after rebase
MetaMask · Nov 23, 2022 · 24ed068 · 24ed068
1 parent 3804d68
commit 24ed068
Show file tree

Hide file tree

Showing 43 changed files with 142 additions and 1,633 deletions.
diff --git a/packages/examples/examples/ethers-js/snap.manifest.json b/packages/examples/examples/ethers-js/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps-monorepo.git"
   },
   "source": {
-    "shasum": "ZKh05KNz06P5GlNCYOuSUe3QQX6OuhSbMjH7RyCQmHo=",
+    "shasum": "qcHDNajXeVlbmh2ryeq6QezaEBKqbu4MTk6mOXY5oYw=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

diff --git a/packages/rpc-methods/package.json b/packages/rpc-methods/package.json
@@ -26,8 +26,8 @@
     "publish:package": "../../scripts/publish-package.sh"
   },
   "dependencies": {
-    "@metamask/controllers": "^32.0.2",
     "@metamask/key-tree": "^6.0.0",
+    "@metamask/permission-controller": "^1.0.0",
     "@metamask/snaps-utils": "^0.24.1",
     "@metamask/types": "^1.1.0",
     "@metamask/utils": "^3.3.1",

diff --git a/packages/rpc-methods/src/permitted/common/snapInstallation.ts b/packages/rpc-methods/src/permitted/common/snapInstallation.ts
@@ -1,4 +1,4 @@
-import { RequestedPermissions } from '@metamask/controllers';
+import { RequestedPermissions } from '@metamask/permission-controller';
 import { InstallSnapsResult } from '@metamask/snaps-utils';
 import { isObject } from '@metamask/utils';
 import { ethErrors } from 'eth-rpc-errors';

diff --git a/packages/rpc-methods/src/permitted/requestSnaps.test.ts b/packages/rpc-methods/src/permitted/requestSnaps.test.ts
@@ -1,4 +1,4 @@
-import { RequestedPermissions } from '@metamask/controllers';
+import { RequestedPermissions } from '@metamask/permission-controller';
 import {
   getSnapPermissionName,
   InstallSnapsResult,

diff --git a/packages/rpc-methods/src/permitted/requestSnaps.ts b/packages/rpc-methods/src/permitted/requestSnaps.ts
@@ -1,7 +1,7 @@
 import {
   PermissionConstraint,
   RequestedPermissions,
-} from '@metamask/controllers';
+} from '@metamask/permission-controller';
 import { getSnapPermissionName } from '@metamask/snaps-utils';
 import {
   PermittedHandlerExport,

diff --git a/packages/rpc-methods/src/restricted/confirm.ts b/packages/rpc-methods/src/restricted/confirm.ts
@@ -3,7 +3,7 @@ import {
   PermissionType,
   RestrictedMethodOptions,
   ValidPermissionSpecification,
-} from '@metamask/controllers';
+} from '@metamask/permission-controller';
 import { isObject, NonEmptyArray } from '@metamask/utils';
 import { ethErrors } from 'eth-rpc-errors';
 

diff --git a/packages/rpc-methods/src/restricted/dialog.test.ts b/packages/rpc-methods/src/restricted/dialog.test.ts
@@ -1,4 +1,4 @@
-import { PermissionType } from '@metamask/controllers';
+import { PermissionType } from '@metamask/permission-controller';
 
 import {
   dialogBuilder,

diff --git a/packages/rpc-methods/src/restricted/dialog.ts b/packages/rpc-methods/src/restricted/dialog.ts
@@ -3,7 +3,7 @@ import {
   PermissionType,
   RestrictedMethodOptions,
   ValidPermissionSpecification,
-} from '@metamask/controllers';
+} from '@metamask/permission-controller';
 import { NonEmptyArray } from '@metamask/utils';
 import { ethErrors } from 'eth-rpc-errors';
 import {

diff --git a/packages/rpc-methods/src/restricted/getBip32Entropy.ts b/packages/rpc-methods/src/restricted/getBip32Entropy.ts
@@ -1,3 +1,4 @@
+import { BIP32Node, JsonSLIP10Node, SLIP10Node } from '@metamask/key-tree';
 import {
   Caveat,
   PermissionConstraint,
@@ -7,8 +8,7 @@ import {
   RestrictedMethodCaveatSpecificationConstraint,
   RestrictedMethodOptions,
   ValidPermissionSpecification,
-} from '@metamask/controllers';
-import { BIP32Node, JsonSLIP10Node, SLIP10Node } from '@metamask/key-tree';
+} from '@metamask/permission-controller';
 import {
   Bip32Entropy,
   Bip32EntropyStruct,

diff --git a/packages/rpc-methods/src/restricted/getBip32PublicKey.ts b/packages/rpc-methods/src/restricted/getBip32PublicKey.ts
@@ -1,12 +1,12 @@
+import { BIP32Node, SLIP10Node } from '@metamask/key-tree';
 import {
   Caveat,
   PermissionSpecificationBuilder,
   PermissionType,
   PermissionValidatorConstraint,
   RestrictedMethodOptions,
   ValidPermissionSpecification,
-} from '@metamask/controllers';
-import { BIP32Node, SLIP10Node } from '@metamask/key-tree';
+} from '@metamask/permission-controller';
 import {
   Bip32Entropy,
   bip32entropy,

diff --git a/packages/rpc-methods/src/restricted/getBip44Entropy.ts b/packages/rpc-methods/src/restricted/getBip44Entropy.ts
@@ -1,3 +1,4 @@
+import { BIP44CoinTypeNode, JsonBIP44CoinTypeNode } from '@metamask/key-tree';
 import {
   Caveat,
   PermissionSpecificationBuilder,
@@ -7,8 +8,7 @@ import {
   ValidPermissionSpecification,
   PermissionConstraint,
   RestrictedMethodCaveatSpecificationConstraint,
-} from '@metamask/controllers';
-import { BIP44CoinTypeNode, JsonBIP44CoinTypeNode } from '@metamask/key-tree';
+} from '@metamask/permission-controller';
 import { SnapCaveatType } from '@metamask/snaps-utils';
 import {
   hasProperty,

diff --git a/packages/rpc-methods/src/restricted/getEntropy.test.ts b/packages/rpc-methods/src/restricted/getEntropy.test.ts
@@ -1,4 +1,4 @@
-import { PermissionType } from '@metamask/controllers';
+import { PermissionType } from '@metamask/permission-controller';
 import { MOCK_SNAP_ID } from '@metamask/snaps-utils/test-utils';
 
 import { ENTROPY_VECTORS } from './__fixtures__';

diff --git a/packages/rpc-methods/src/restricted/getEntropy.ts b/packages/rpc-methods/src/restricted/getEntropy.ts
@@ -1,10 +1,10 @@
+import { HardenedBIP32Node, SLIP10Node } from '@metamask/key-tree';
 import {
   PermissionSpecificationBuilder,
   PermissionType,
   RestrictedMethodOptions,
   ValidPermissionSpecification,
-} from '@metamask/controllers';
-import { HardenedBIP32Node, SLIP10Node } from '@metamask/key-tree';
+} from '@metamask/permission-controller';
 import { SIP_6_MAGIC_VALUE } from '@metamask/snaps-utils';
 import {
   add0x,

diff --git a/packages/rpc-methods/src/restricted/index.ts b/packages/rpc-methods/src/restricted/index.ts
@@ -1,4 +1,4 @@
-import { PermissionConstraint } from '@metamask/controllers';
+import { PermissionConstraint } from '@metamask/permission-controller';
 import { Json } from '@metamask/utils';
 
 import { confirmBuilder, ConfirmMethodHooks } from './confirm';

diff --git a/packages/rpc-methods/src/restricted/invokeSnap.test.ts b/packages/rpc-methods/src/restricted/invokeSnap.test.ts
@@ -1,4 +1,4 @@
-import { PermissionType } from '@metamask/controllers';
+import { PermissionType } from '@metamask/permission-controller';
 import {
   MOCK_SNAP_ID,
   MOCK_ORIGIN,

diff --git a/packages/rpc-methods/src/restricted/invokeSnap.ts b/packages/rpc-methods/src/restricted/invokeSnap.ts
@@ -3,7 +3,7 @@ import {
   RestrictedMethodOptions,
   ValidPermissionSpecification,
   PermissionType,
-} from '@metamask/controllers';
+} from '@metamask/permission-controller';
 import {
   Snap,
   SNAP_PREFIX,

diff --git a/packages/rpc-methods/src/restricted/manageState.ts b/packages/rpc-methods/src/restricted/manageState.ts
@@ -3,7 +3,7 @@ import {
   PermissionType,
   RestrictedMethodOptions,
   ValidPermissionSpecification,
-} from '@metamask/controllers';
+} from '@metamask/permission-controller';
 import {
   Json,
   NonEmptyArray,

diff --git a/packages/rpc-methods/src/restricted/notify.ts b/packages/rpc-methods/src/restricted/notify.ts
@@ -3,7 +3,7 @@ import {
   PermissionType,
   RestrictedMethodOptions,
   ValidPermissionSpecification,
-} from '@metamask/controllers';
+} from '@metamask/permission-controller';
 import { NonEmptyArray, isObject } from '@metamask/utils';
 import { ethErrors } from 'eth-rpc-errors';
 

diff --git a/packages/snaps-controllers/package.json b/packages/snaps-controllers/package.json
@@ -31,9 +31,11 @@
     "publish:package": "../../scripts/publish-package.sh"
   },
   "dependencies": {
+    "@metamask/approval-controller": "^1.0.0",
+    "@metamask/base-controller": "^1.0.0",
     "@metamask/browser-passworder": "^4.0.2",
-    "@metamask/controllers": "^32.0.2",
     "@metamask/object-multiplex": "^1.1.0",
+    "@metamask/permission-controller": "^1.0.0",
     "@metamask/post-message-stream": "^6.0.0",
     "@metamask/rpc-methods": "^0.24.1",
     "@metamask/snaps-execution-environments": "^0.24.1",

diff --git a/packages/snaps-controllers/src/cronjob/CronjobController.ts b/packages/snaps-controllers/src/cronjob/CronjobController.ts
@@ -1,8 +1,8 @@
 import {
   BaseControllerV2 as BaseController,
   RestrictedControllerMessenger,
-  GetPermissions,
-} from '@metamask/controllers';
+} from '@metamask/base-controller';
+import { GetPermissions } from '@metamask/permission-controller';
 import {
   HandlerType,
   SnapId,

diff --git a/packages/snaps-controllers/src/index.ts b/packages/snaps-controllers/src/index.ts
@@ -1,4 +1,4 @@
-export type { Json } from '@metamask/controllers';
+export type { Json } from '@metamask/utils';
 export * from './services';
 export * from './snaps';
 export * from './utils';

diff --git a/packages/snaps-controllers/src/multichain/MultiChainController.ts b/packages/snaps-controllers/src/multichain/MultiChainController.ts
@@ -1,12 +1,14 @@
+import { AddApprovalRequest } from '@metamask/approval-controller';
 import {
-  AddApprovalRequest,
   BaseControllerV2 as BaseController,
+  RestrictedControllerMessenger,
+} from '@metamask/base-controller';
+import {
   GetPermissions,
   GrantPermissions,
   HasPermission,
   PermissionConstraint,
-  RestrictedControllerMessenger,
-} from '@metamask/controllers';
+} from '@metamask/permission-controller';
 import { SnapKeyring } from '@metamask/snaps-types';
 import {
   parseAccountId,

diff --git a/packages/snaps-controllers/src/services/ExecutionService.ts b/packages/snaps-controllers/src/services/ExecutionService.ts
@@ -1,4 +1,4 @@
-import { RestrictedControllerMessenger } from '@metamask/controllers';
+import { RestrictedControllerMessenger } from '@metamask/base-controller';
 import { SnapId, SnapRpcHookArgs } from '@metamask/snaps-utils';
 import { Json } from '@metamask/types';
 

diff --git a/packages/snaps-controllers/src/snaps/SnapController.test.ts b/packages/snaps-controllers/src/snaps/SnapController.test.ts
@@ -1,10 +1,10 @@
+import { getPersistentState } from '@metamask/base-controller';
 import { encrypt } from '@metamask/browser-passworder';
 import {
   Caveat,
-  getPersistentState,
   SubjectPermissions,
   ValidPermission,
-} from '@metamask/controllers';
+} from '@metamask/permission-controller';
 import {
   DEFAULT_ENDOWMENTS,
   getSnapSourceShasum,

diff --git a/packages/snaps-controllers/src/snaps/SnapController.ts b/packages/snaps-controllers/src/snaps/SnapController.ts
@@ -1,7 +1,10 @@
-import { encrypt, decrypt } from '@metamask/browser-passworder';
+import { AddApprovalRequest } from '@metamask/approval-controller';
 import {
-  AddApprovalRequest,
   BaseControllerV2 as BaseController,
+  RestrictedControllerMessenger,
+} from '@metamask/base-controller';
+import { encrypt, decrypt } from '@metamask/browser-passworder';
+import {
   Caveat,
   GetEndowments,
   GetPermissions,
@@ -10,13 +13,12 @@ import {
   HasPermissions,
   PermissionConstraint,
   PermissionsRequest,
-  RestrictedControllerMessenger,
   RevokeAllPermissions,
   RevokePermissionForAllSubjects,
   RevokePermissions,
   SubjectPermissions,
   ValidPermission,
-} from '@metamask/controllers';
+} from '@metamask/permission-controller';
 import { caveatMappers } from '@metamask/rpc-methods';
 import {
   assertIsSnapManifest,

diff --git a/packages/snaps-controllers/src/snaps/endowments/cronjob.test.ts b/packages/snaps-controllers/src/snaps/endowments/cronjob.test.ts
@@ -1,4 +1,4 @@
-import { Caveat, PermissionType } from '@metamask/controllers';
+import { Caveat, PermissionType } from '@metamask/permission-controller';
 import { SnapCaveatType } from '@metamask/snaps-utils';
 
 import { SnapEndowments } from '.';

diff --git a/packages/snaps-controllers/src/snaps/endowments/cronjob.ts b/packages/snaps-controllers/src/snaps/endowments/cronjob.ts
@@ -6,7 +6,7 @@ import {
   PermissionConstraint,
   Caveat,
   CaveatSpecificationConstraint,
-} from '@metamask/controllers';
+} from '@metamask/permission-controller';
 import {
   SnapCaveatType,
   CronjobSpecification,

diff --git a/packages/snaps-controllers/src/snaps/endowments/ethereum-provider.test.ts b/packages/snaps-controllers/src/snaps/endowments/ethereum-provider.test.ts
@@ -1,4 +1,4 @@
-import { PermissionType } from '@metamask/controllers';
+import { PermissionType } from '@metamask/permission-controller';
 
 import { SnapEndowments } from './enum';
 import { ethereumProviderEndowmentBuilder } from './ethereum-provider';

diff --git a/packages/snaps-controllers/src/snaps/endowments/ethereum-provider.ts b/packages/snaps-controllers/src/snaps/endowments/ethereum-provider.ts
@@ -3,7 +3,7 @@ import {
   PermissionSpecificationBuilder,
   PermissionType,
   ValidPermissionSpecification,
-} from '@metamask/controllers';
+} from '@metamask/permission-controller';
 
 import { SnapEndowments } from './enum';
 

diff --git a/packages/snaps-controllers/src/snaps/endowments/index.ts b/packages/snaps-controllers/src/snaps/endowments/index.ts
@@ -1,4 +1,4 @@
-import { PermissionConstraint } from '@metamask/controllers';
+import { PermissionConstraint } from '@metamask/permission-controller';
 import { Json } from '@metamask/utils';
 
 import {

diff --git a/packages/snaps-controllers/src/snaps/endowments/keyring.test.ts b/packages/snaps-controllers/src/snaps/endowments/keyring.test.ts
@@ -1,4 +1,7 @@
-import { PermissionConstraint, PermissionType } from '@metamask/controllers';
+import {
+  PermissionConstraint,
+  PermissionType,
+} from '@metamask/permission-controller';
 import { SnapCaveatType } from '@metamask/snaps-utils';
 import { getNamespace } from '@metamask/snaps-utils/test-utils';
 

diff --git a/packages/snaps-controllers/src/snaps/endowments/keyring.ts b/packages/snaps-controllers/src/snaps/endowments/keyring.ts
@@ -7,7 +7,7 @@ import {
   PermissionType,
   PermissionValidatorConstraint,
   ValidPermissionSpecification,
-} from '@metamask/controllers';
+} from '@metamask/permission-controller';
 import {
   assertIsNamespacesObject,
   Namespaces,

diff --git a/packages/snaps-controllers/src/snaps/endowments/long-running.test.ts b/packages/snaps-controllers/src/snaps/endowments/long-running.test.ts
@@ -1,4 +1,4 @@
-import { PermissionType } from '@metamask/controllers';
+import { PermissionType } from '@metamask/permission-controller';
 
 import { SnapEndowments } from '.';
 import { longRunningEndowmentBuilder } from './long-running';

diff --git a/packages/snaps-controllers/src/snaps/endowments/long-running.ts b/packages/snaps-controllers/src/snaps/endowments/long-running.ts
@@ -3,7 +3,7 @@ import {
   PermissionType,
   EndowmentGetterParams,
   ValidPermissionSpecification,
-} from '@metamask/controllers';
+} from '@metamask/permission-controller';
 
 import { SnapEndowments } from './enum';
 

diff --git a/packages/snaps-controllers/src/snaps/endowments/network-access.test.ts b/packages/snaps-controllers/src/snaps/endowments/network-access.test.ts
@@ -1,4 +1,4 @@
-import { PermissionType } from '@metamask/controllers';
+import { PermissionType } from '@metamask/permission-controller';
 
 import { SnapEndowments } from './enum';
 import { networkAccessEndowmentBuilder } from './network-access';

diff --git a/packages/snaps-controllers/src/snaps/endowments/network-access.ts b/packages/snaps-controllers/src/snaps/endowments/network-access.ts
@@ -3,7 +3,7 @@ import {
   PermissionSpecificationBuilder,
   PermissionType,
   ValidPermissionSpecification,
-} from '@metamask/controllers';
+} from '@metamask/permission-controller';
 
 import { SnapEndowments } from './enum';
 

diff --git a/packages/snaps-controllers/src/snaps/endowments/transaction-insight.test.ts b/packages/snaps-controllers/src/snaps/endowments/transaction-insight.test.ts
@@ -1,4 +1,7 @@
-import { PermissionConstraint, PermissionType } from '@metamask/controllers';
+import {
+  PermissionConstraint,
+  PermissionType,
+} from '@metamask/permission-controller';
 import { SnapCaveatType } from '@metamask/snaps-utils';
 
 import { SnapEndowments } from '.';

diff --git a/packages/snaps-controllers/src/snaps/endowments/transaction-insight.ts b/packages/snaps-controllers/src/snaps/endowments/transaction-insight.ts
@@ -7,7 +7,7 @@ import {
   PermissionConstraint,
   CaveatSpecificationConstraint,
   Caveat,
-} from '@metamask/controllers';
+} from '@metamask/permission-controller';
 import { SnapCaveatType } from '@metamask/snaps-utils';
 import {
   assert,

diff --git a/packages/snaps-controllers/src/test-utils/controller.ts b/packages/snaps-controllers/src/test-utils/controller.ts
@@ -2,7 +2,7 @@ import {
   ActionConstraint,
   ControllerMessenger,
   EventConstraint,
-} from '@metamask/controllers';
+} from '@metamask/base-controller';
 import {
   getPersistedSnapObject,
   getTruncatedSnap,

diff --git a/packages/snaps-controllers/src/test-utils/cronjob.ts b/packages/snaps-controllers/src/test-utils/cronjob.ts
@@ -1,4 +1,4 @@
-import { PermissionConstraint } from '@metamask/controllers';
+import { PermissionConstraint } from '@metamask/permission-controller';
 import { SnapCaveatType } from '@metamask/snaps-utils';
 import { MOCK_ORIGIN } from '@metamask/snaps-utils/test-utils';
 

diff --git a/packages/snaps-controllers/src/test-utils/multichain.ts b/packages/snaps-controllers/src/test-utils/multichain.ts
@@ -1,7 +1,7 @@
 import {
   PermissionConstraint,
   SubjectPermissions,
-} from '@metamask/controllers';
+} from '@metamask/permission-controller';
 import { fromEntries, getSnapSourceShasum } from '@metamask/snaps-utils';
 import {
   MOCK_ORIGIN,

diff --git a/packages/snaps-controllers/src/test-utils/service.ts b/packages/snaps-controllers/src/test-utils/service.ts
@@ -1,4 +1,4 @@
-import { ControllerMessenger } from '@metamask/controllers';
+import { ControllerMessenger } from '@metamask/base-controller';
 import { JsonRpcEngine } from 'json-rpc-engine';
 import { createEngineStream } from 'json-rpc-middleware-stream';
 import pump from 'pump';