chore: update dependencies for @metamask/accounts-controller (#3747)

## Explanation This PR updates @metamask/eth-snap-keyring, @metamask/keyring-api, @metamask/snaps-sdk, @metamask/snaps-utils, and @metamask/snaps-controllers for the AccountsController. ## References ## Changelog ## Checklist - [x] I've updated the test suite for new or updated code as appropriate - [x] I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate - [x] I've highlighted breaking changes using the "BREAKING" category above as appropriate
MetaMask · Jan 22, 2024 · d5ad4bb · d5ad4bb
1 parent b74c48d
commit d5ad4bb
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 29 deletions.
diff --git a/packages/accounts-controller/package.json b/packages/accounts-controller/package.json
@@ -33,9 +33,10 @@
   "dependencies": {
     "@metamask/base-controller": "^4.1.0",
     "@metamask/eth-snap-keyring": "^2.1.1",
-    "@metamask/keyring-api": "^2.0.0",
-    "@metamask/snaps-sdk": "^1.3.1",
-    "@metamask/snaps-utils": "^5.1.1",
+    "@metamask/keyring-api": "^3.0.0",
+    "@metamask/keyring-controller": "^12.0.0",
+    "@metamask/snaps-sdk": "^1.3.2",
+    "@metamask/snaps-utils": "^5.1.2",
     "@metamask/utils": "^8.3.0",
     "deepmerge": "^4.2.2",
     "ethereumjs-util": "^7.0.10",
@@ -44,8 +45,7 @@
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/keyring-controller": "^12.0.0",
-    "@metamask/snaps-controllers": "^3.6.0",
+    "@metamask/snaps-controllers": "^4.0.0",
     "@types/jest": "^27.4.1",
     "@types/readable-stream": "^2.3.0",
     "jest": "^27.5.1",
@@ -56,7 +56,7 @@
   },
   "peerDependencies": {
     "@metamask/keyring-controller": "^12.0.0",
-    "@metamask/snaps-controllers": "^3.6.0"
+    "@metamask/snaps-controllers": "^4.0.0"
   },
   "engines": {
     "node": ">=16.0.0"

diff --git a/packages/accounts-controller/src/AccountsController.ts b/packages/accounts-controller/src/AccountsController.ts
@@ -6,7 +6,7 @@ import type {
 import { BaseController } from '@metamask/base-controller';
 import { SnapKeyring } from '@metamask/eth-snap-keyring';
 import type { InternalAccount } from '@metamask/keyring-api';
-import { EthAccountType } from '@metamask/keyring-api';
+import { EthAccountType, EthMethod } from '@metamask/keyring-api';
 import { KeyringTypes } from '@metamask/keyring-controller';
 import type {
   KeyringControllerState,
@@ -400,12 +400,12 @@ export class AccountsController extends BaseController<
       address,
       options: {},
       methods: [
-        'personal_sign',
-        'eth_sign',
-        'eth_signTransaction',
-        'eth_signTypedData_v1',
-        'eth_signTypedData_v3',
-        'eth_signTypedData_v4',
+        EthMethod.PersonalSign,
+        EthMethod.Sign,
+        EthMethod.SignTransaction,
+        EthMethod.SignTypedDataV1,
+        EthMethod.SignTypedDataV3,
+        EthMethod.SignTypedDataV4,
       ],
       type: EthAccountType.Eoa,
       metadata: {
@@ -463,12 +463,12 @@ export class AccountsController extends BaseController<
         address,
         options: {},
         methods: [
-          'personal_sign',
-          'eth_sign',
-          'eth_signTransaction',
-          'eth_signTypedData_v1',
-          'eth_signTypedData_v3',
-          'eth_signTypedData_v4',
+          EthMethod.PersonalSign,
+          EthMethod.Sign,
+          EthMethod.SignTransaction,
+          EthMethod.SignTypedDataV1,
+          EthMethod.SignTypedDataV3,
+          EthMethod.SignTypedDataV4,
         ],
         type: EthAccountType.Eoa,
         metadata: {

diff --git a/packages/keyring-controller/package.json b/packages/keyring-controller/package.json
@@ -34,7 +34,7 @@
     "@keystonehq/metamask-airgapped-keyring": "^0.13.1",
     "@metamask/base-controller": "^4.1.0",
     "@metamask/eth-keyring-controller": "^17.0.0",
-    "@metamask/keyring-api": "^2.0.0",
+    "@metamask/keyring-api": "^3.0.0",
     "@metamask/message-manager": "^7.3.7",
     "@metamask/preferences-controller": "^6.0.0",
     "@metamask/utils": "^8.3.0",

diff --git a/yarn.lock b/yarn.lock
@@ -1475,11 +1475,11 @@ __metadata:
     "@metamask/auto-changelog": ^3.4.4
     "@metamask/base-controller": ^4.1.0
     "@metamask/eth-snap-keyring": ^2.1.1
-    "@metamask/keyring-api": ^2.0.0
+    "@metamask/keyring-api": ^3.0.0
     "@metamask/keyring-controller": ^12.0.0
-    "@metamask/snaps-controllers": ^3.6.0
-    "@metamask/snaps-sdk": ^1.3.1
-    "@metamask/snaps-utils": ^5.1.1
+    "@metamask/snaps-controllers": ^4.0.0
+    "@metamask/snaps-sdk": ^1.3.2
+    "@metamask/snaps-utils": ^5.1.2
     "@metamask/utils": ^8.3.0
     "@types/jest": ^27.4.1
     "@types/readable-stream": ^2.3.0
@@ -1494,7 +1494,7 @@ __metadata:
     uuid: ^8.3.2
   peerDependencies:
     "@metamask/keyring-controller": ^12.0.0
-    "@metamask/snaps-controllers": ^3.6.0
+    "@metamask/snaps-controllers": ^4.0.0
   languageName: unknown
   linkType: soft
 
@@ -2216,6 +2216,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/keyring-api@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@metamask/keyring-api@npm:3.0.0"
+  dependencies:
+    "@metamask/providers": ^14.0.1
+    "@metamask/snaps-sdk": ^1.3.2
+    "@metamask/utils": ^8.1.0
+    "@types/uuid": ^9.0.1
+    superstruct: ^1.0.3
+    uuid: ^9.0.0
+  checksum: 5e3fdc122789d605681070aa6ed6c656d5c9bb1f037fd4bf1ed2ec5fa453a0fc8b9663ddfd2106c122889682e2ae1c8ddd16913798f24821b22899f743ce1a31
+  languageName: node
+  linkType: hard
+
 "@metamask/keyring-controller@^12.0.0, @metamask/keyring-controller@workspace:packages/keyring-controller":
   version: 0.0.0-use.local
   resolution: "@metamask/keyring-controller@workspace:packages/keyring-controller"
@@ -2229,7 +2243,7 @@ __metadata:
     "@metamask/base-controller": ^4.1.0
     "@metamask/eth-keyring-controller": ^17.0.0
     "@metamask/eth-sig-util": ^7.0.1
-    "@metamask/keyring-api": ^2.0.0
+    "@metamask/keyring-api": ^3.0.0
     "@metamask/message-manager": ^7.3.7
     "@metamask/preferences-controller": ^6.0.0
     "@metamask/scure-bip39": ^2.1.1
@@ -2690,7 +2704,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-controllers@npm:^3.4.1, @metamask/snaps-controllers@npm:^3.6.0":
+"@metamask/snaps-controllers@npm:^3.4.1":
   version: 3.6.0
   resolution: "@metamask/snaps-controllers@npm:3.6.0"
   dependencies:
@@ -2726,6 +2740,42 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/snaps-controllers@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "@metamask/snaps-controllers@npm:4.1.0"
+  dependencies:
+    "@metamask/approval-controller": ^5.1.1
+    "@metamask/base-controller": ^4.1.0
+    "@metamask/json-rpc-engine": ^7.3.1
+    "@metamask/object-multiplex": ^2.0.0
+    "@metamask/permission-controller": ^7.1.0
+    "@metamask/phishing-controller": ^8.0.1
+    "@metamask/post-message-stream": ^7.0.0
+    "@metamask/rpc-errors": ^6.1.0
+    "@metamask/snaps-registry": ^3.0.0
+    "@metamask/snaps-rpc-methods": ^5.0.0
+    "@metamask/snaps-sdk": ^1.4.0
+    "@metamask/snaps-utils": ^5.2.0
+    "@metamask/utils": ^8.3.0
+    "@xstate/fsm": ^2.0.0
+    browserify-zlib: ^0.2.0
+    concat-stream: ^2.0.0
+    get-npm-tarball-url: ^2.0.3
+    immer: ^9.0.6
+    json-rpc-middleware-stream: ^5.0.0
+    nanoid: ^3.1.31
+    readable-stream: ^3.6.2
+    readable-web-to-node-stream: ^3.0.2
+    tar-stream: ^3.1.6
+  peerDependencies:
+    "@metamask/snaps-execution-environments": ^3.5.0
+  peerDependenciesMeta:
+    "@metamask/snaps-execution-environments":
+      optional: true
+  checksum: 73510dbcf1a547c1a5bfd07c47e817b802dc95de6ab4d608e3e99ae02119de6be0f7a0c41a351b48587f1b3c39ada86b09643bc44cf57d2cf3ceabd041ab05c3
+  languageName: node
+  linkType: hard
+
 "@metamask/snaps-registry@npm:^3.0.0":
   version: 3.0.0
   resolution: "@metamask/snaps-registry@npm:3.0.0"
@@ -2754,7 +2804,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-sdk@npm:^1.2.0, @metamask/snaps-sdk@npm:^1.3.1, @metamask/snaps-sdk@npm:^1.4.0":
+"@metamask/snaps-rpc-methods@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@metamask/snaps-rpc-methods@npm:5.0.0"
+  dependencies:
+    "@metamask/key-tree": ^9.0.0
+    "@metamask/permission-controller": ^7.1.0
+    "@metamask/rpc-errors": ^6.1.0
+    "@metamask/snaps-sdk": ^1.4.0
+    "@metamask/snaps-utils": ^5.2.0
+    "@metamask/utils": ^8.3.0
+    "@noble/hashes": ^1.3.1
+    superstruct: ^1.0.3
+  checksum: 93c27468020cee472750b522c93afb284a34551abfe8fa8ac52c31065750ac162f260686025aa88e7a5ece91265a136bf64d06be36e37566569296b7070e0a9a
+  languageName: node
+  linkType: hard
+
+"@metamask/snaps-sdk@npm:^1.2.0, @metamask/snaps-sdk@npm:^1.3.1, @metamask/snaps-sdk@npm:^1.3.2, @metamask/snaps-sdk@npm:^1.4.0":
   version: 1.4.0
   resolution: "@metamask/snaps-sdk@npm:1.4.0"
   dependencies:
@@ -2768,7 +2834,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-utils@npm:^5.0.0, @metamask/snaps-utils@npm:^5.1.1":
+"@metamask/snaps-utils@npm:^5.0.0, @metamask/snaps-utils@npm:^5.1.1, @metamask/snaps-utils@npm:^5.1.2, @metamask/snaps-utils@npm:^5.2.0":
   version: 5.2.0
   resolution: "@metamask/snaps-utils@npm:5.2.0"
   dependencies: