From 98c8c66e6d149ff930f547ada885c9fa2c3ce423 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Thu, 14 Nov 2024 18:25:47 +0100 Subject: [PATCH] chore: use resolutions to test ts-bridge with some accounts packages --- package.json | 10 +- packages/accounts-controller/package.json | 8 +- .../accounts-controller/src/tests/mocks.ts | 2 +- .../chain-controller/src/SnapHandlerClient.ts | 2 +- packages/profile-sync-controller/package.json | 8 +- yarn.lock | 197 +++++++++++++----- 6 files changed, 164 insertions(+), 63 deletions(-) diff --git a/package.json b/package.json index b65468aa182..0b398e1a75e 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,15 @@ "resolutions": { "elliptic@6.5.4": "^6.5.7", "fast-xml-parser@^4.3.4": "^4.4.1", - "ws@7.4.6": "^7.5.10" + "ws@7.4.6": "^7.5.10", + "@metamask/keyring-api@^8.1.3": "npm:@metamask-previews/keyring-api@10.1.0-3416820", + "@metamask/keyring-api@^8.0.0": "npm:@metamask-previews/keyring-api@10.1.0-3416820", + "@metamask/keyring-api@^9.0.0": "npm:@metamask-previews/keyring-api@10.1.0-3416820", + "@metamask/keyring-api@^10.1.0": "npm:@metamask-previews/keyring-api@10.1.0-3416820", + "@metamask/keyring-api@10.1.0": "npm:@metamask-previews/keyring-api@10.1.0-3416820", + "@metamask/eth-snap-keyring@^4.4.0": "npm:@metamask-previews/eth-snap-keyring@5.0.1-3416820", + "@metamask/eth-snap-keyring@^4.3.1": "npm:@metamask-previews/eth-snap-keyring@5.0.1-3416820", + "@metamask/eth-snap-keyring@^4.3.6": "npm:@metamask-previews/eth-snap-keyring@5.0.1-3416820" }, "devDependencies": { "@babel/core": "^7.23.5", diff --git a/packages/accounts-controller/package.json b/packages/accounts-controller/package.json index ceaa7e999cb..5fd7c73f914 100644 --- a/packages/accounts-controller/package.json +++ b/packages/accounts-controller/package.json @@ -51,8 +51,8 @@ "@metamask/base-controller": "^7.0.2", "@metamask/eth-snap-keyring": "^4.3.6", "@metamask/keyring-api": "^8.1.3", - "@metamask/snaps-sdk": "^6.5.0", - "@metamask/snaps-utils": "^8.1.1", + "@metamask/snaps-sdk": "^6.7.0", + "@metamask/snaps-utils": "^8.3.0", "@metamask/utils": "^10.0.0", "deepmerge": "^4.2.2", "ethereum-cryptography": "^2.1.2", @@ -62,7 +62,7 @@ "devDependencies": { "@metamask/auto-changelog": "^3.4.4", "@metamask/keyring-controller": "^18.0.0", - "@metamask/snaps-controllers": "^9.7.0", + "@metamask/snaps-controllers": "^9.10.0", "@types/jest": "^27.4.1", "@types/readable-stream": "^2.3.0", "jest": "^27.5.1", @@ -73,7 +73,7 @@ }, "peerDependencies": { "@metamask/keyring-controller": "^18.0.0", - "@metamask/snaps-controllers": "^9.7.0" + "@metamask/snaps-controllers": "^9.10.0" }, "engines": { "node": "^18.18 || >=20" diff --git a/packages/accounts-controller/src/tests/mocks.ts b/packages/accounts-controller/src/tests/mocks.ts index daebd1fbc34..b41388fb2f3 100644 --- a/packages/accounts-controller/src/tests/mocks.ts +++ b/packages/accounts-controller/src/tests/mocks.ts @@ -55,7 +55,7 @@ export const createMockInternalAccount = ({ ]; break; case BtcAccountType.P2wpkh: - methods = [BtcMethod.SendMany]; + methods = [BtcMethod.SendBitcoin]; break; default: throw new Error(`Unknown account type: ${type as string}`); diff --git a/packages/chain-controller/src/SnapHandlerClient.ts b/packages/chain-controller/src/SnapHandlerClient.ts index fa03a164076..be5e993f85d 100644 --- a/packages/chain-controller/src/SnapHandlerClient.ts +++ b/packages/chain-controller/src/SnapHandlerClient.ts @@ -1,4 +1,4 @@ -import type { JsonRpcRequest } from '@metamask/keyring-api/dist/JsonRpcRequest'; +import type { JsonRpcRequest } from '@metamask/keyring-api'; import type { SnapController } from '@metamask/snaps-controllers'; import type { SnapId } from '@metamask/snaps-sdk'; import { HandlerType } from '@metamask/snaps-utils'; diff --git a/packages/profile-sync-controller/package.json b/packages/profile-sync-controller/package.json index dceafce99a5..23475cfb1bd 100644 --- a/packages/profile-sync-controller/package.json +++ b/packages/profile-sync-controller/package.json @@ -104,8 +104,8 @@ "@metamask/keyring-api": "^8.1.3", "@metamask/keyring-controller": "^18.0.0", "@metamask/network-controller": "^22.0.2", - "@metamask/snaps-sdk": "^6.5.0", - "@metamask/snaps-utils": "^8.1.1", + "@metamask/snaps-sdk": "^6.7.0", + "@metamask/snaps-utils": "^8.3.9", "@noble/ciphers": "^0.5.2", "@noble/hashes": "^1.4.0", "immer": "^9.0.6", @@ -116,7 +116,7 @@ "@lavamoat/allow-scripts": "^3.0.4", "@metamask/accounts-controller": "^19.0.0", "@metamask/auto-changelog": "^3.4.4", - "@metamask/snaps-controllers": "^9.7.0", + "@metamask/snaps-controllers": "^9.10.0", "@types/jest": "^27.4.1", "deepmerge": "^4.2.2", "ethers": "^6.12.0", @@ -132,7 +132,7 @@ "@metamask/accounts-controller": "^19.0.0", "@metamask/keyring-controller": "^18.0.0", "@metamask/network-controller": "^22.0.0", - "@metamask/snaps-controllers": "^9.7.0" + "@metamask/snaps-controllers": "^9.10.0" }, "engines": { "node": "^18.18 || >=20" diff --git a/yarn.lock b/yarn.lock index 4c119b3c043..d21af56017c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2037,9 +2037,9 @@ __metadata: "@metamask/eth-snap-keyring": "npm:^4.3.6" "@metamask/keyring-api": "npm:^8.1.3" "@metamask/keyring-controller": "npm:^18.0.0" - "@metamask/snaps-controllers": "npm:^9.7.0" - "@metamask/snaps-sdk": "npm:^6.5.0" - "@metamask/snaps-utils": "npm:^8.1.1" + "@metamask/snaps-controllers": "npm:^9.10.0" + "@metamask/snaps-sdk": "npm:^6.7.0" + "@metamask/snaps-utils": "npm:^8.3.0" "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" "@types/readable-stream": "npm:^2.3.0" @@ -2054,7 +2054,7 @@ __metadata: uuid: "npm:^8.3.2" peerDependencies: "@metamask/keyring-controller": ^18.0.0 - "@metamask/snaps-controllers": ^9.7.0 + "@metamask/snaps-controllers": ^9.10.0 languageName: unknown linkType: soft @@ -2656,22 +2656,21 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-snap-keyring@npm:^4.3.6": - version: 4.3.6 - resolution: "@metamask/eth-snap-keyring@npm:4.3.6" +"@metamask/eth-snap-keyring@npm:@metamask-previews/eth-snap-keyring@5.0.1-3416820": + version: 5.0.1-3416820 + resolution: "@metamask-previews/eth-snap-keyring@npm:5.0.1-3416820" dependencies: "@ethereumjs/tx": "npm:^4.2.0" - "@metamask/eth-sig-util": "npm:^7.0.3" - "@metamask/snaps-controllers": "npm:^9.7.0" - "@metamask/snaps-sdk": "npm:^6.5.1" - "@metamask/snaps-utils": "npm:^7.8.1" + "@metamask/eth-sig-util": "npm:^8.0.0" + "@metamask/keyring-api": "npm:10.1.0" + "@metamask/snaps-controllers": "npm:^9.10.0" + "@metamask/snaps-sdk": "npm:^6.7.0" + "@metamask/snaps-utils": "npm:^8.3.0" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.2.1" "@types/uuid": "npm:^9.0.8" uuid: "npm:^9.0.1" - peerDependencies: - "@metamask/keyring-api": ^8.1.3 - checksum: 10/378dce125ba9e38b9ba7d9b7124383b4fd8d2782207dc69e1ae9e262beb83f22044eae5200986d4c353de29e5283c289e56b3acb88c8971a63f9365bdde3d5b4 + checksum: 10/2d51f239ea07e70936b9bc2455587c907d1e33087ad74129c91aaface5f8cda2a18d433316c4d219fdab93b58a051cfdb38a24c5eb4d0d312d14a30514f92ca8 languageName: node linkType: hard @@ -2911,7 +2910,7 @@ __metadata: languageName: node linkType: hard -"@metamask/json-rpc-middleware-stream@npm:^8.0.1, @metamask/json-rpc-middleware-stream@npm:^8.0.2, @metamask/json-rpc-middleware-stream@workspace:packages/json-rpc-middleware-stream": +"@metamask/json-rpc-middleware-stream@npm:^8.0.1, @metamask/json-rpc-middleware-stream@npm:^8.0.2, @metamask/json-rpc-middleware-stream@npm:^8.0.5, @metamask/json-rpc-middleware-stream@workspace:packages/json-rpc-middleware-stream": version: 0.0.0-use.local resolution: "@metamask/json-rpc-middleware-stream@workspace:packages/json-rpc-middleware-stream" dependencies: @@ -2947,19 +2946,20 @@ __metadata: languageName: node linkType: hard -"@metamask/keyring-api@npm:^8.1.3": - version: 8.1.3 - resolution: "@metamask/keyring-api@npm:8.1.3" +"@metamask/keyring-api@npm:@metamask-previews/keyring-api@10.1.0-3416820": + version: 10.1.0-3416820 + resolution: "@metamask-previews/keyring-api@npm:10.1.0-3416820" dependencies: - "@metamask/snaps-sdk": "npm:^6.5.1" + "@metamask/snaps-sdk": "npm:^6.7.0" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.2.1" "@types/uuid": "npm:^9.0.8" bech32: "npm:^2.0.0" uuid: "npm:^9.0.1" + webextension-polyfill: "npm:^0.12.0" peerDependencies: - "@metamask/providers": ^17.2.0 - checksum: 10/9857b6286760d22b1b7102ea8bdf03ebf56c71e9f0adee19a2230def6b7a9230561c1a3bfcb308735b79ab9a5afa9afd07a1617c1d165f63d193cd6a6b6e7a15 + "@metamask/providers": ^18.1.0 + checksum: 10/d78d20849df01ef44c8701ce7494678ef0c810f4b42cea8ea3cf5e70615bc33664a9978b6e59278bb31fd03a82698a9f0679e325b877331638d460f5213e4bc2 languageName: node linkType: hard @@ -3362,9 +3362,9 @@ __metadata: "@metamask/keyring-api": "npm:^8.1.3" "@metamask/keyring-controller": "npm:^18.0.0" "@metamask/network-controller": "npm:^22.0.2" - "@metamask/snaps-controllers": "npm:^9.7.0" - "@metamask/snaps-sdk": "npm:^6.5.0" - "@metamask/snaps-utils": "npm:^8.1.1" + "@metamask/snaps-controllers": "npm:^9.10.0" + "@metamask/snaps-sdk": "npm:^6.7.0" + "@metamask/snaps-utils": "npm:^8.3.9" "@noble/ciphers": "npm:^0.5.2" "@noble/hashes": "npm:^1.4.0" "@types/jest": "npm:^27.4.1" @@ -3384,7 +3384,7 @@ __metadata: "@metamask/accounts-controller": ^19.0.0 "@metamask/keyring-controller": ^18.0.0 "@metamask/network-controller": ^22.0.0 - "@metamask/snaps-controllers": ^9.7.0 + "@metamask/snaps-controllers": ^9.10.0 languageName: unknown linkType: soft @@ -3409,6 +3409,27 @@ __metadata: languageName: node linkType: hard +"@metamask/providers@npm:^18.1.1": + version: 18.1.1 + resolution: "@metamask/providers@npm:18.1.1" + dependencies: + "@metamask/json-rpc-engine": "npm:^10.0.1" + "@metamask/json-rpc-middleware-stream": "npm:^8.0.5" + "@metamask/object-multiplex": "npm:^2.0.0" + "@metamask/rpc-errors": "npm:^7.0.1" + "@metamask/safe-event-emitter": "npm:^3.1.1" + "@metamask/utils": "npm:^10.0.0" + detect-browser: "npm:^5.2.0" + extension-port-stream: "npm:^4.1.0" + fast-deep-equal: "npm:^3.1.3" + is-stream: "npm:^2.0.0" + readable-stream: "npm:^3.6.2" + peerDependencies: + webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0 + checksum: 10/dca428d84e490343d85921d4fb09216a0b64be59a036d7b4f7b5ca4e2581c29a4106d58ff9dfe0650dc2b9387dd2adad508fc61073a9fda8ebde8ee3a5137abe + languageName: node + linkType: hard + "@metamask/queued-request-controller@workspace:packages/queued-request-controller": version: 0.0.0-use.local resolution: "@metamask/queued-request-controller@workspace:packages/queued-request-controller" @@ -3553,13 +3574,6 @@ __metadata: languageName: unknown linkType: soft -"@metamask/slip44@npm:^3.1.0": - version: 3.1.0 - resolution: "@metamask/slip44@npm:3.1.0" - checksum: 10/83f902c455468f1ec252d0554cd4ebf8da1fc9a27ec7199b81e265e5e8710fad86eaa71d86f24500f9db6626007ad71b1380b239e2104e7e558a061393b066fa - languageName: node - linkType: hard - "@metamask/slip44@npm:^4.0.0": version: 4.0.0 resolution: "@metamask/slip44@npm:4.0.0" @@ -3567,6 +3581,44 @@ __metadata: languageName: node linkType: hard +"@metamask/snaps-controllers@npm:^9.10.0": + version: 9.12.0 + resolution: "@metamask/snaps-controllers@npm:9.12.0" + dependencies: + "@metamask/approval-controller": "npm:^7.1.1" + "@metamask/base-controller": "npm:^7.0.2" + "@metamask/json-rpc-engine": "npm:^10.0.1" + "@metamask/json-rpc-middleware-stream": "npm:^8.0.5" + "@metamask/object-multiplex": "npm:^2.0.0" + "@metamask/permission-controller": "npm:^11.0.3" + "@metamask/phishing-controller": "npm:^12.0.2" + "@metamask/post-message-stream": "npm:^8.1.1" + "@metamask/rpc-errors": "npm:^7.0.1" + "@metamask/snaps-registry": "npm:^3.2.2" + "@metamask/snaps-rpc-methods": "npm:^11.5.1" + "@metamask/snaps-sdk": "npm:^6.10.0" + "@metamask/snaps-utils": "npm:^8.5.0" + "@metamask/utils": "npm:^10.0.0" + "@xstate/fsm": "npm:^2.0.0" + browserify-zlib: "npm:^0.2.0" + concat-stream: "npm:^2.0.0" + fast-deep-equal: "npm:^3.1.3" + get-npm-tarball-url: "npm:^2.0.3" + immer: "npm:^9.0.6" + nanoid: "npm:^3.1.31" + readable-stream: "npm:^3.6.2" + readable-web-to-node-stream: "npm:^3.0.2" + semver: "npm:^7.5.4" + tar-stream: "npm:^3.1.7" + peerDependencies: + "@metamask/snaps-execution-environments": ^6.9.2 + peerDependenciesMeta: + "@metamask/snaps-execution-environments": + optional: true + checksum: 10/8d411ff2cfd43e62fe780092e935a1d977379488407b56cca1390edfa9408871cbaf3599f6e6ee999340d46fd3650f225a3270ceec9492c6f2dc4d93538c25ae + languageName: node + linkType: hard + "@metamask/snaps-controllers@npm:^9.7.0": version: 9.7.0 resolution: "@metamask/snaps-controllers@npm:9.7.0" @@ -3616,6 +3668,18 @@ __metadata: languageName: node linkType: hard +"@metamask/snaps-registry@npm:^3.2.2": + version: 3.2.2 + resolution: "@metamask/snaps-registry@npm:3.2.2" + dependencies: + "@metamask/superstruct": "npm:^3.1.0" + "@metamask/utils": "npm:^10.0.0" + "@noble/curves": "npm:^1.2.0" + "@noble/hashes": "npm:^1.3.2" + checksum: 10/ca8239e838bbb913435e166136bbc9bd7222c4bd87b1525fa7ae3cdf2e0b868b5d4d90a67d1ed49633d566bdef9243abdbf5f5937b85a85d24184087f555813e + languageName: node + linkType: hard + "@metamask/snaps-rpc-methods@npm:^11.1.1": version: 11.1.1 resolution: "@metamask/snaps-rpc-methods@npm:11.1.1" @@ -3632,7 +3696,36 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-sdk@npm:^6.1.0, @metamask/snaps-sdk@npm:^6.5.0, @metamask/snaps-sdk@npm:^6.5.1": +"@metamask/snaps-rpc-methods@npm:^11.5.1": + version: 11.5.1 + resolution: "@metamask/snaps-rpc-methods@npm:11.5.1" + dependencies: + "@metamask/key-tree": "npm:^9.1.2" + "@metamask/permission-controller": "npm:^11.0.3" + "@metamask/rpc-errors": "npm:^7.0.1" + "@metamask/snaps-sdk": "npm:^6.10.0" + "@metamask/snaps-utils": "npm:^8.5.0" + "@metamask/superstruct": "npm:^3.1.0" + "@metamask/utils": "npm:^10.0.0" + "@noble/hashes": "npm:^1.3.1" + checksum: 10/0f999a5dd64f1b1123366f448ae833f0e95a415791600bb535959ba67d2269fbe3c4504d47f04db71bafa79a9a87d6b832fb2e2b5ef29567078c95bce2638f35 + languageName: node + linkType: hard + +"@metamask/snaps-sdk@npm:^6.10.0, @metamask/snaps-sdk@npm:^6.7.0": + version: 6.10.0 + resolution: "@metamask/snaps-sdk@npm:6.10.0" + dependencies: + "@metamask/key-tree": "npm:^9.1.2" + "@metamask/providers": "npm:^18.1.1" + "@metamask/rpc-errors": "npm:^7.0.1" + "@metamask/superstruct": "npm:^3.1.0" + "@metamask/utils": "npm:^10.0.0" + checksum: 10/02f04536328a64ff1e9e48fb6b109698d6d83f42af5666a9758ccb1e7a1e67c0c2e296ef2fef419dd3d1c8f26bbf30b9f31911a1baa66f044f21cd0ecb7a11a7 + languageName: node + linkType: hard + +"@metamask/snaps-sdk@npm:^6.5.0": version: 6.5.1 resolution: "@metamask/snaps-sdk@npm:6.5.1" dependencies: @@ -3645,9 +3738,9 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-utils@npm:^7.8.1": - version: 7.8.1 - resolution: "@metamask/snaps-utils@npm:7.8.1" +"@metamask/snaps-utils@npm:^8.1.1": + version: 8.1.1 + resolution: "@metamask/snaps-utils@npm:8.1.1" dependencies: "@babel/core": "npm:^7.23.2" "@babel/types": "npm:^7.23.0" @@ -3655,42 +3748,42 @@ __metadata: "@metamask/key-tree": "npm:^9.1.2" "@metamask/permission-controller": "npm:^11.0.0" "@metamask/rpc-errors": "npm:^6.3.1" - "@metamask/slip44": "npm:^3.1.0" + "@metamask/slip44": "npm:^4.0.0" "@metamask/snaps-registry": "npm:^3.2.1" - "@metamask/snaps-sdk": "npm:^6.1.0" + "@metamask/snaps-sdk": "npm:^6.5.0" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^9.2.1" "@noble/hashes": "npm:^1.3.1" "@scure/base": "npm:^1.1.1" chalk: "npm:^4.1.2" cron-parser: "npm:^4.5.0" fast-deep-equal: "npm:^3.1.3" fast-json-stable-stringify: "npm:^2.1.0" - fast-xml-parser: "npm:^4.3.4" + fast-xml-parser: "npm:^4.4.1" marked: "npm:^12.0.1" rfdc: "npm:^1.3.0" semver: "npm:^7.5.4" ses: "npm:^1.1.0" validate-npm-package-name: "npm:^5.0.0" - checksum: 10/572108aafbad970910ffb3605cf9eb4675ede0d69ff2bd37515da7f071de2065a55c73d6dc44dbe70bbd9c3ff0dfe29d40fd16badd925a4b8504db293265ca2f + checksum: 10/f4ceb52a1f9578993c88c82a67f4f041309af51c83ff5caa3fed080f36b54d14ea7da807ce1cf19a13600dd0e77c51af70398e8c7bb78f0ba99a037f4d22610f languageName: node linkType: hard -"@metamask/snaps-utils@npm:^8.1.1": - version: 8.1.1 - resolution: "@metamask/snaps-utils@npm:8.1.1" +"@metamask/snaps-utils@npm:^8.3.0, @metamask/snaps-utils@npm:^8.3.9, @metamask/snaps-utils@npm:^8.5.0": + version: 8.5.2 + resolution: "@metamask/snaps-utils@npm:8.5.2" dependencies: "@babel/core": "npm:^7.23.2" "@babel/types": "npm:^7.23.0" - "@metamask/base-controller": "npm:^6.0.2" + "@metamask/base-controller": "npm:^7.0.2" "@metamask/key-tree": "npm:^9.1.2" - "@metamask/permission-controller": "npm:^11.0.0" - "@metamask/rpc-errors": "npm:^6.3.1" + "@metamask/permission-controller": "npm:^11.0.3" + "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/slip44": "npm:^4.0.0" - "@metamask/snaps-registry": "npm:^3.2.1" - "@metamask/snaps-sdk": "npm:^6.5.0" + "@metamask/snaps-registry": "npm:^3.2.2" + "@metamask/snaps-sdk": "npm:^6.10.0" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@noble/hashes": "npm:^1.3.1" "@scure/base": "npm:^1.1.1" chalk: "npm:^4.1.2" @@ -3703,7 +3796,7 @@ __metadata: semver: "npm:^7.5.4" ses: "npm:^1.1.0" validate-npm-package-name: "npm:^5.0.0" - checksum: 10/f4ceb52a1f9578993c88c82a67f4f041309af51c83ff5caa3fed080f36b54d14ea7da807ce1cf19a13600dd0e77c51af70398e8c7bb78f0ba99a037f4d22610f + checksum: 10/e5d1344f948473e82d71007d2570272073cf070f40aa7746692a6d5e6f02cfce66a747cf50f439d32b29a3f6588486182453b26973f0d0c1d9f47914591d5790 languageName: node linkType: hard @@ -12540,7 +12633,7 @@ __metadata: languageName: node linkType: hard -"webextension-polyfill@npm:>=0.10.0 <1.0": +"webextension-polyfill@npm:>=0.10.0 <1.0, webextension-polyfill@npm:^0.12.0": version: 0.12.0 resolution: "webextension-polyfill@npm:0.12.0" checksum: 10/77e648b958b573ef075e75a0c180e2bbd74dee17b3145e86d21fcbb168c4999e4a311654fe634b8178997bee9b35ea5808d8d3d3e5ff2ad138f197f4f0ea75d9