diff --git a/packages/examples/packages/bip32/package.json b/packages/examples/packages/bip32/package.json index 1cc2d4b436..dad46a8bb5 100644 --- a/packages/examples/packages/bip32/package.json +++ b/packages/examples/packages/bip32/package.json @@ -31,7 +31,7 @@ "publish:preview": "yarn npm publish --tag preview" }, "dependencies": { - "@metamask/key-tree": "^7.1.1", + "@metamask/key-tree": "^9.0.0", "@metamask/rpc-errors": "^5.1.1", "@metamask/snaps-types": "workspace:^", "@metamask/snaps-ui": "workspace:^", diff --git a/packages/examples/packages/bip32/snap.manifest.json b/packages/examples/packages/bip32/snap.manifest.json index 2cd65901a2..fefed0b8a6 100644 --- a/packages/examples/packages/bip32/snap.manifest.json +++ b/packages/examples/packages/bip32/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "8/e4XLtpw6JyNSByBEODuAsAkRpNWF6fO4LcjIHd+VA=", + "shasum": "9D/2Zlyr9qIIM5Jn07k20IdHzQ7LhgmXvmhyPhQWXPc=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/bip44/package.json b/packages/examples/packages/bip44/package.json index 9b144b11d9..af1f9167a0 100644 --- a/packages/examples/packages/bip44/package.json +++ b/packages/examples/packages/bip44/package.json @@ -31,7 +31,7 @@ "publish:preview": "yarn npm publish --tag preview" }, "dependencies": { - "@metamask/key-tree": "^7.1.1", + "@metamask/key-tree": "^9.0.0", "@metamask/rpc-errors": "^5.1.1", "@metamask/snaps-types": "workspace:^", "@metamask/snaps-ui": "workspace:^", diff --git a/packages/examples/packages/bip44/snap.manifest.json b/packages/examples/packages/bip44/snap.manifest.json index 548d54bcfa..84a6a94332 100644 --- a/packages/examples/packages/bip44/snap.manifest.json +++ b/packages/examples/packages/bip44/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "ge3XEC3r81MdsiuzdNA+0VAmR7h94sgmFIRzmGBn3+A=", + "shasum": "ADFEPqTRyISt32RON+w4yyTwMW2Xk+CPi3L30wCn3Nw=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/dialogs/snap.manifest.json b/packages/examples/packages/dialogs/snap.manifest.json index 8e501bd038..5f4fe5cd51 100644 --- a/packages/examples/packages/dialogs/snap.manifest.json +++ b/packages/examples/packages/dialogs/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "ylKypC0JdgEbmwGOGTTWUHlptHkBjlqaeaZxFv71FQI=", + "shasum": "BkVZI2rqZ4nV2+TwhfaZdrU9bdo9RLxbDtb/906kyQU=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/get-entropy/snap.manifest.json b/packages/examples/packages/get-entropy/snap.manifest.json index 919b069db0..cf9eac948f 100644 --- a/packages/examples/packages/get-entropy/snap.manifest.json +++ b/packages/examples/packages/get-entropy/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "DpvaaockuUhYLZKN6+/aeQl8O9ow6ZY36dSIEJINiPk=", + "shasum": "dFEWEQElhcRou4tEJYtIPl8DFYt6zfR+NQSrJqM8sOA=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/invoke-snap/packages/consumer-signer/package.json b/packages/examples/packages/invoke-snap/packages/consumer-signer/package.json index 480bd321a5..52f0e28cad 100644 --- a/packages/examples/packages/invoke-snap/packages/consumer-signer/package.json +++ b/packages/examples/packages/invoke-snap/packages/consumer-signer/package.json @@ -31,7 +31,7 @@ "publish:preview": "yarn npm publish --tag preview" }, "dependencies": { - "@metamask/key-tree": "^7.1.1", + "@metamask/key-tree": "^9.0.0", "@metamask/rpc-errors": "^5.1.1", "@metamask/snaps-types": "workspace:^", "@metamask/utils": "^6.0.1", diff --git a/packages/examples/packages/invoke-snap/packages/core-signer/package.json b/packages/examples/packages/invoke-snap/packages/core-signer/package.json index dda09db818..a90fe9a3a1 100644 --- a/packages/examples/packages/invoke-snap/packages/core-signer/package.json +++ b/packages/examples/packages/invoke-snap/packages/core-signer/package.json @@ -31,7 +31,7 @@ "publish:preview": "yarn npm publish --tag preview" }, "dependencies": { - "@metamask/key-tree": "^7.1.1", + "@metamask/key-tree": "^9.0.0", "@metamask/rpc-errors": "^5.1.1", "@metamask/snaps-types": "workspace:^", "@metamask/snaps-ui": "workspace:^", diff --git a/packages/examples/packages/invoke-snap/packages/core-signer/snap.manifest.json b/packages/examples/packages/invoke-snap/packages/core-signer/snap.manifest.json index 8c1465898f..5e973e54df 100644 --- a/packages/examples/packages/invoke-snap/packages/core-signer/snap.manifest.json +++ b/packages/examples/packages/invoke-snap/packages/core-signer/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "RimObqCFdTd3nmm2suNd+dnYMUWGqWtbpO2/UOLYG74=", + "shasum": "bAWdk7uKkMmp9l29vcYwvWAjc+uo7OYkyHw1n0Th/FM=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/invoke-snap/packages/core-signer/src/utils.ts b/packages/examples/packages/invoke-snap/packages/core-signer/src/utils.ts index 8e4c7a2f02..119405f85d 100644 --- a/packages/examples/packages/invoke-snap/packages/core-signer/src/utils.ts +++ b/packages/examples/packages/invoke-snap/packages/core-signer/src/utils.ts @@ -1,6 +1,5 @@ import type { SLIP10Node } from '@metamask/key-tree'; -import { secp256k1 } from '@metamask/key-tree'; -import { createBip39KeyFromSeed } from '@metamask/key-tree/dist/derivers/bip39'; +import { secp256k1, createBip39KeyFromSeed } from '@metamask/key-tree'; import { assertIsHexString, bytesToHex, hexToBytes } from '@metamask/utils'; import { Mutex } from 'async-mutex'; diff --git a/packages/examples/packages/manage-state/snap.manifest.json b/packages/examples/packages/manage-state/snap.manifest.json index 5a2c555b16..32ec26f7cc 100644 --- a/packages/examples/packages/manage-state/snap.manifest.json +++ b/packages/examples/packages/manage-state/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "nlX8lHgZgk0Ckn+HBdsIDSA1NtdoRMJgI8MfKP0SJ4s=", + "shasum": "HLDSjrn4crqWoMFJpnCAkAdz1R8wy0yB97F4+fg9K0s=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/notifications/snap.manifest.json b/packages/examples/packages/notifications/snap.manifest.json index b388d47113..698151026d 100644 --- a/packages/examples/packages/notifications/snap.manifest.json +++ b/packages/examples/packages/notifications/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "1WJsiirj81xtQ2kJBO+1KfKy5in7Oq+KwxX+RcbSwU8=", + "shasum": "jBEUImXwedg5ozWiHCGhUkzSNPlNNvJQo5sf9Iul13s=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/rpc-methods/package.json b/packages/rpc-methods/package.json index f05b5187db..ad00fcd885 100644 --- a/packages/rpc-methods/package.json +++ b/packages/rpc-methods/package.json @@ -36,7 +36,7 @@ "lint:ci": "yarn lint" }, "dependencies": { - "@metamask/key-tree": "^7.1.1", + "@metamask/key-tree": "^9.0.0", "@metamask/permission-controller": "^4.0.0", "@metamask/snaps-ui": "workspace:^", "@metamask/snaps-utils": "workspace:^", diff --git a/packages/snaps-simulator/package.json b/packages/snaps-simulator/package.json index f936954594..fe972e93d8 100644 --- a/packages/snaps-simulator/package.json +++ b/packages/snaps-simulator/package.json @@ -54,7 +54,7 @@ "@metamask/base-controller": "^3.0.0", "@metamask/browser-passworder": "^4.1.0", "@metamask/eth-json-rpc-middleware": "^11.0.0", - "@metamask/key-tree": "^7.1.1", + "@metamask/key-tree": "^9.0.0", "@metamask/permission-controller": "^4.0.0", "@metamask/rpc-errors": "^5.1.1", "@metamask/rpc-methods": "workspace:^", diff --git a/packages/snaps-simulator/src/features/simulation/sagas.ts b/packages/snaps-simulator/src/features/simulation/sagas.ts index ef158024dc..501f214855 100644 --- a/packages/snaps-simulator/src/features/simulation/sagas.ts +++ b/packages/snaps-simulator/src/features/simulation/sagas.ts @@ -1,7 +1,7 @@ import { ControllerMessenger } from '@metamask/base-controller'; import { encrypt, decrypt } from '@metamask/browser-passworder'; import { createFetchMiddleware } from '@metamask/eth-json-rpc-middleware'; -import { mnemonicPhraseToBytes } from '@metamask/key-tree/dist/utils'; +import { mnemonicPhraseToBytes } from '@metamask/key-tree'; import type { GenericPermissionController } from '@metamask/permission-controller'; import { PermissionController, diff --git a/packages/snaps-utils/package.json b/packages/snaps-utils/package.json index 7f4f1023b0..3282b753c1 100644 --- a/packages/snaps-utils/package.json +++ b/packages/snaps-utils/package.json @@ -68,7 +68,7 @@ "@babel/core": "^7.20.12", "@babel/types": "^7.18.7", "@metamask/base-controller": "^3.0.0", - "@metamask/key-tree": "^7.1.1", + "@metamask/key-tree": "^9.0.0", "@metamask/permission-controller": "^4.0.0", "@metamask/providers": "^11.0.0", "@metamask/snaps-registry": "^1.2.1", diff --git a/packages/snaps-utils/src/test-utils/common.ts b/packages/snaps-utils/src/test-utils/common.ts index ac828b0745..ac92b1493c 100644 --- a/packages/snaps-utils/src/test-utils/common.ts +++ b/packages/snaps-utils/src/test-utils/common.ts @@ -1,5 +1,4 @@ -// TODO: Import from root. -import { mnemonicPhraseToBytes } from '@metamask/key-tree/dist/utils'; +import { mnemonicPhraseToBytes } from '@metamask/key-tree'; import type { SemVerVersion } from '@metamask/utils'; export const TEST_SECRET_RECOVERY_PHRASE = diff --git a/yarn.lock b/yarn.lock index ae755627a0..898dd72c15 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3672,7 +3672,7 @@ __metadata: "@metamask/eslint-config-jest": ^12.1.0 "@metamask/eslint-config-nodejs": ^12.1.0 "@metamask/eslint-config-typescript": ^12.1.0 - "@metamask/key-tree": ^7.1.1 + "@metamask/key-tree": ^9.0.0 "@metamask/rpc-errors": ^5.1.1 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" @@ -3713,7 +3713,7 @@ __metadata: "@metamask/eslint-config-jest": ^12.1.0 "@metamask/eslint-config-nodejs": ^12.1.0 "@metamask/eslint-config-typescript": ^12.1.0 - "@metamask/key-tree": ^7.1.1 + "@metamask/key-tree": ^9.0.0 "@metamask/rpc-errors": ^5.1.1 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" @@ -3799,7 +3799,7 @@ __metadata: "@metamask/eslint-config-jest": ^12.1.0 "@metamask/eslint-config-nodejs": ^12.1.0 "@metamask/eslint-config-typescript": ^12.1.0 - "@metamask/key-tree": ^7.1.1 + "@metamask/key-tree": ^9.0.0 "@metamask/rpc-errors": ^5.1.1 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" @@ -3853,7 +3853,7 @@ __metadata: "@metamask/eslint-config-jest": ^12.1.0 "@metamask/eslint-config-nodejs": ^12.1.0 "@metamask/eslint-config-typescript": ^12.1.0 - "@metamask/key-tree": ^7.1.1 + "@metamask/key-tree": ^9.0.0 "@metamask/rpc-errors": ^5.1.1 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" @@ -4394,9 +4394,9 @@ __metadata: languageName: unknown linkType: soft -"@metamask/key-tree@npm:^7.1.1": - version: 7.1.1 - resolution: "@metamask/key-tree@npm:7.1.1" +"@metamask/key-tree@npm:^9.0.0": + version: 9.0.0 + resolution: "@metamask/key-tree@npm:9.0.0" dependencies: "@metamask/scure-bip39": ^2.1.0 "@metamask/utils": ^6.0.1 @@ -4404,7 +4404,7 @@ __metadata: "@noble/hashes": ^1.0.0 "@noble/secp256k1": ^1.5.5 "@scure/base": ^1.0.0 - checksum: ddab7917e1214c51508f821a680f8e8819a8c866fd91244e0debf28464331dfcbf9a357e01716fc593cf00a8c71f95fd45ed4ff686ee6abc4c4061aed629537c + checksum: 5c81f07351ca59b37570d52edcc80d60424630b2a8403ed7149c3343c264878ac5d3fc0584a61635ea7ddda4a789295ded1247846606dc529d8e2fd42f6fc61a languageName: node linkType: hard @@ -4641,7 +4641,7 @@ __metadata: "@metamask/eslint-config-jest": ^12.1.0 "@metamask/eslint-config-nodejs": ^12.1.0 "@metamask/eslint-config-typescript": ^12.1.0 - "@metamask/key-tree": ^7.1.1 + "@metamask/key-tree": ^9.0.0 "@metamask/permission-controller": ^4.0.0 "@metamask/snaps-ui": "workspace:^" "@metamask/snaps-utils": "workspace:^" @@ -5103,7 +5103,7 @@ __metadata: "@metamask/eslint-config-nodejs": ^12.1.0 "@metamask/eslint-config-typescript": ^12.1.0 "@metamask/eth-json-rpc-middleware": ^11.0.0 - "@metamask/key-tree": ^7.1.1 + "@metamask/key-tree": ^9.0.0 "@metamask/permission-controller": ^4.0.0 "@metamask/rpc-errors": ^5.1.1 "@metamask/rpc-methods": "workspace:^" @@ -5280,7 +5280,7 @@ __metadata: "@metamask/eslint-config-jest": ^12.1.0 "@metamask/eslint-config-nodejs": ^12.1.0 "@metamask/eslint-config-typescript": ^12.1.0 - "@metamask/key-tree": ^7.1.1 + "@metamask/key-tree": ^9.0.0 "@metamask/permission-controller": ^4.0.0 "@metamask/post-message-stream": ^6.1.2 "@metamask/providers": ^11.0.0