From 8ad3072b472d8b4a5e36dd31802dcf4f4fd646a3 Mon Sep 17 00:00:00 2001 From: Jongsun Suh Date: Tue, 23 Jul 2024 13:18:12 -0400 Subject: [PATCH] Bump `@metamask/snaps-{controllers,sdk,utils}` and remove yarn resolution for `@metamask/providers` (#4547) ## References - Contributes to #3651 - Follows from https://github.com/MetaMask/core/pull/3645 ## Changelog ### `@metamask/accounts-controller` ```md ### Changed - Bump `@metamask/snaps-sdk` from `^6.1.0` to `^6.1.1` ([#4547](https://github.com/MetaMask/core/pull/4547)) - Bump `@metamask/snaps-utils` from `^7.8.0` to `^7.8.1` ([#4547](https://github.com/MetaMask/core/pull/4547)) ``` ### `@metamask/chain-controller` ```md ### Changed - Bump `@metamask/snaps-controllers` from `^9.3.0` to `^9.3.1` ([#4547](https://github.com/MetaMask/core/pull/4547)) - Bump `@metamask/snaps-sdk` from `^6.1.0` to `^6.1.1` ([#4547](https://github.com/MetaMask/core/pull/4547)) - Bump `@metamask/snaps-utils` from `^7.8.0` to `^7.8.1` ([#4547](https://github.com/MetaMask/core/pull/4547)) ``` ### `@metamask/profile-sync-controller` ```md ### Changed - Bump `@metamask/snaps-controllers` from `^9.3.0` to `^9.3.1` ([#4547](https://github.com/MetaMask/core/pull/4547)) - Bump `@metamask/snaps-sdk` from `^6.1.0` to `^6.1.1` ([#4547](https://github.com/MetaMask/core/pull/4547)) - Bump `@metamask/snaps-utils` from `^7.8.0` to `^7.8.1` ([#4547](https://github.com/MetaMask/core/pull/4547)) ``` ## 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 --- package.json | 1 - packages/accounts-controller/CHANGELOG.md | 7 -- packages/accounts-controller/package.json | 6 +- packages/chain-controller/CHANGELOG.md | 7 -- packages/chain-controller/package.json | 6 +- packages/profile-sync-controller/CHANGELOG.md | 7 -- packages/profile-sync-controller/package.json | 6 +- yarn.lock | 96 +++++++++---------- 8 files changed, 57 insertions(+), 79 deletions(-) diff --git a/package.json b/package.json index 07fb2a6cdd9..45216564f0e 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,6 @@ "pre-push": "yarn lint" }, "resolutions": { - "@metamask/snaps-sdk@6.1.0/@metamask/providers": "17.1.1", "tsup@^8.0.2": "patch:tsup@npm%3A8.0.2#./.yarn/patches/tsup-npm-8.0.2-86e40f68a7.patch" }, "devDependencies": { diff --git a/packages/accounts-controller/CHANGELOG.md b/packages/accounts-controller/CHANGELOG.md index bec467408e7..bb3606bd4bf 100644 --- a/packages/accounts-controller/CHANGELOG.md +++ b/packages/accounts-controller/CHANGELOG.md @@ -7,13 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -### Uncategorized - -- Please hold off on new releases of this package until the yarn resolution for `@metamask/providers` is removed. - - This is blocked by a `@metamask/snaps-sdk` release with `@metamask/providers` bumped to `>=17.1.1`. - - See: [Fix regressions introduced by @metamask/providers@17.1.1](https://github.com/MetaMask/snaps/pull/2579) - - Build error fixed by yarn resolution: [MetaMask/core/actions/runs/10011688901/job/27675682526?pr=3645](https://github.com/MetaMask/core/actions/runs/10011688901/job/27675682526?pr=3645) - ## [17.2.0] ### Added diff --git a/packages/accounts-controller/package.json b/packages/accounts-controller/package.json index 6da362f8836..129e51bb1e7 100644 --- a/packages/accounts-controller/package.json +++ b/packages/accounts-controller/package.json @@ -46,8 +46,8 @@ "@metamask/eth-snap-keyring": "^4.3.1", "@metamask/keyring-api": "^8.0.1", "@metamask/keyring-controller": "^17.1.1", - "@metamask/snaps-sdk": "^6.1.0", - "@metamask/snaps-utils": "^7.8.0", + "@metamask/snaps-sdk": "^6.1.1", + "@metamask/snaps-utils": "^7.8.1", "@metamask/utils": "^9.1.0", "deepmerge": "^4.2.2", "ethereum-cryptography": "^2.1.2", @@ -56,7 +56,7 @@ }, "devDependencies": { "@metamask/auto-changelog": "^3.4.4", - "@metamask/snaps-controllers": "^9.3.0", + "@metamask/snaps-controllers": "^9.3.1", "@types/jest": "^27.4.1", "@types/readable-stream": "^2.3.0", "jest": "^27.5.1", diff --git a/packages/chain-controller/CHANGELOG.md b/packages/chain-controller/CHANGELOG.md index c2665a0e74b..9faa52486dc 100644 --- a/packages/chain-controller/CHANGELOG.md +++ b/packages/chain-controller/CHANGELOG.md @@ -7,13 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -### Uncategorized - -- Please hold off on new releases of this package until the yarn resolution for `@metamask/providers` is removed. - - This is blocked by a `@metamask/snaps-sdk` release with `@metamask/providers` bumped to `>=17.1.1`. - - See: [Fix regressions introduced by @metamask/providers@17.1.1](https://github.com/MetaMask/snaps/pull/2579) - - Build error fixed by yarn resolution: [MetaMask/core/actions/runs/10011688901/job/27675682526?pr=3645](https://github.com/MetaMask/core/actions/runs/10011688901/job/27675682526?pr=3645) - ## [0.1.0] ### Changed diff --git a/packages/chain-controller/package.json b/packages/chain-controller/package.json index 54072eca170..8312b8b0686 100644 --- a/packages/chain-controller/package.json +++ b/packages/chain-controller/package.json @@ -44,9 +44,9 @@ "@metamask/base-controller": "^6.0.2", "@metamask/chain-api": "^0.1.0", "@metamask/keyring-api": "^8.0.1", - "@metamask/snaps-controllers": "^9.3.0", - "@metamask/snaps-sdk": "^6.1.0", - "@metamask/snaps-utils": "^7.8.0", + "@metamask/snaps-controllers": "^9.3.1", + "@metamask/snaps-sdk": "^6.1.1", + "@metamask/snaps-utils": "^7.8.1", "@metamask/utils": "^9.1.0", "uuid": "^8.3.2" }, diff --git a/packages/profile-sync-controller/CHANGELOG.md b/packages/profile-sync-controller/CHANGELOG.md index e9cc1c654e9..ab2ad99ed28 100644 --- a/packages/profile-sync-controller/CHANGELOG.md +++ b/packages/profile-sync-controller/CHANGELOG.md @@ -7,13 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -### Uncategorized - -- Please hold off on new releases of this package until the yarn resolution for `@metamask/providers` is removed. - - This is blocked by a `@metamask/snaps-sdk` release with `@metamask/providers` bumped to `>=17.1.1`. - - See: [Fix regressions introduced by @metamask/providers@17.1.1](https://github.com/MetaMask/snaps/pull/2579) - - Build error fixed by yarn resolution: [MetaMask/core/actions/runs/10011688901/job/27675682526?pr=3645](https://github.com/MetaMask/core/actions/runs/10011688901/job/27675682526?pr=3645) - ## [0.1.4] ### Added diff --git a/packages/profile-sync-controller/package.json b/packages/profile-sync-controller/package.json index 16cffb12720..da5325982b8 100644 --- a/packages/profile-sync-controller/package.json +++ b/packages/profile-sync-controller/package.json @@ -42,9 +42,9 @@ }, "dependencies": { "@metamask/base-controller": "^6.0.2", - "@metamask/snaps-controllers": "^9.3.0", - "@metamask/snaps-sdk": "^6.1.0", - "@metamask/snaps-utils": "^7.8.0", + "@metamask/snaps-controllers": "^9.3.1", + "@metamask/snaps-sdk": "^6.1.1", + "@metamask/snaps-utils": "^7.8.1", "@noble/ciphers": "^0.5.2", "@noble/hashes": "^1.4.0", "immer": "^9.0.6", diff --git a/yarn.lock b/yarn.lock index 3e148e6272a..e709307800b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2205,9 +2205,9 @@ __metadata: "@metamask/eth-snap-keyring": "npm:^4.3.1" "@metamask/keyring-api": "npm:^8.0.1" "@metamask/keyring-controller": "npm:^17.1.1" - "@metamask/snaps-controllers": "npm:^9.3.0" - "@metamask/snaps-sdk": "npm:^6.1.0" - "@metamask/snaps-utils": "npm:^7.8.0" + "@metamask/snaps-controllers": "npm:^9.3.1" + "@metamask/snaps-sdk": "npm:^6.1.1" + "@metamask/snaps-utils": "npm:^7.8.1" "@metamask/utils": "npm:^9.1.0" "@types/jest": "npm:^27.4.1" "@types/readable-stream": "npm:^2.3.0" @@ -2283,7 +2283,7 @@ __metadata: languageName: node linkType: hard -"@metamask/approval-controller@npm:^7.0.0, @metamask/approval-controller@npm:^7.0.2, @metamask/approval-controller@workspace:packages/approval-controller": +"@metamask/approval-controller@npm:^7.0.2, @metamask/approval-controller@workspace:packages/approval-controller": version: 0.0.0-use.local resolution: "@metamask/approval-controller@workspace:packages/approval-controller" dependencies: @@ -2464,9 +2464,9 @@ __metadata: "@metamask/base-controller": "npm:^6.0.2" "@metamask/chain-api": "npm:^0.1.0" "@metamask/keyring-api": "npm:^8.0.1" - "@metamask/snaps-controllers": "npm:^9.3.0" - "@metamask/snaps-sdk": "npm:^6.1.0" - "@metamask/snaps-utils": "npm:^7.8.0" + "@metamask/snaps-controllers": "npm:^9.3.1" + "@metamask/snaps-sdk": "npm:^6.1.1" + "@metamask/snaps-utils": "npm:^7.8.1" "@metamask/utils": "npm:^9.1.0" "@types/jest": "npm:^27.4.1" "@types/readable-stream": "npm:^2.3.0" @@ -3047,7 +3047,7 @@ __metadata: languageName: node linkType: hard -"@metamask/json-rpc-engine@npm:^9.0.0, @metamask/json-rpc-engine@npm:^9.0.1, @metamask/json-rpc-engine@npm:^9.0.2, @metamask/json-rpc-engine@workspace:packages/json-rpc-engine": +"@metamask/json-rpc-engine@npm:^9.0.1, @metamask/json-rpc-engine@npm:^9.0.2, @metamask/json-rpc-engine@workspace:packages/json-rpc-engine": version: 0.0.0-use.local resolution: "@metamask/json-rpc-engine@workspace:packages/json-rpc-engine" dependencies: @@ -3078,7 +3078,7 @@ __metadata: languageName: node linkType: hard -"@metamask/json-rpc-middleware-stream@npm:^8.0.0, @metamask/json-rpc-middleware-stream@npm:^8.0.1, @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@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: @@ -3361,7 +3361,7 @@ __metadata: languageName: node linkType: hard -"@metamask/permission-controller@npm:^10.0.0, @metamask/permission-controller@npm:^10.0.1": +"@metamask/permission-controller@npm:^10.0.0": version: 10.0.1 resolution: "@metamask/permission-controller@npm:10.0.1" dependencies: @@ -3447,7 +3447,7 @@ __metadata: languageName: unknown linkType: soft -"@metamask/phishing-controller@npm:^10.0.0, @metamask/phishing-controller@workspace:packages/phishing-controller": +"@metamask/phishing-controller@npm:^10.1.1, @metamask/phishing-controller@workspace:packages/phishing-controller": version: 0.0.0-use.local resolution: "@metamask/phishing-controller@workspace:packages/phishing-controller" dependencies: @@ -3546,9 +3546,9 @@ __metadata: "@lavamoat/allow-scripts": "npm:^3.0.4" "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^6.0.2" - "@metamask/snaps-controllers": "npm:^9.3.0" - "@metamask/snaps-sdk": "npm:^6.1.0" - "@metamask/snaps-utils": "npm:^7.8.0" + "@metamask/snaps-controllers": "npm:^9.3.1" + "@metamask/snaps-sdk": "npm:^6.1.1" + "@metamask/snaps-utils": "npm:^7.8.1" "@noble/ciphers": "npm:^0.5.2" "@noble/hashes": "npm:^1.4.0" "@types/jest": "npm:^27.4.1" @@ -3569,9 +3569,9 @@ __metadata: languageName: unknown linkType: soft -"@metamask/providers@npm:17.1.1, @metamask/providers@npm:^17.0.0": - version: 17.1.1 - resolution: "@metamask/providers@npm:17.1.1" +"@metamask/providers@npm:^17.0.0, @metamask/providers@npm:^17.1.2": + version: 17.1.2 + resolution: "@metamask/providers@npm:17.1.2" dependencies: "@metamask/json-rpc-engine": "npm:^9.0.1" "@metamask/json-rpc-middleware-stream": "npm:^8.0.1" @@ -3586,7 +3586,7 @@ __metadata: readable-stream: "npm:^3.6.2" peerDependencies: webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0 - checksum: 10/9aed27c02ce97838705b3dacc4f2d8a821586e5aef2e98315f98e5be1a457ac5d48602fd7d5bdc4ac608e18cca13c723b685c3d03820b952f036647eac0121ce + checksum: 10/bf555f9774e340d4497c09c980094e759a198f11c5a78b403e639cf01904b9ec3b19a5e9f53567465dd8739da4138e2021ac9a404a99b1a6022add12a4b19a31 languageName: node linkType: hard @@ -3765,23 +3765,23 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-controllers@npm:^9.3.0": - version: 9.3.0 - resolution: "@metamask/snaps-controllers@npm:9.3.0" +"@metamask/snaps-controllers@npm:^9.3.1": + version: 9.3.1 + resolution: "@metamask/snaps-controllers@npm:9.3.1" dependencies: - "@metamask/approval-controller": "npm:^7.0.0" - "@metamask/base-controller": "npm:^6.0.1" - "@metamask/json-rpc-engine": "npm:^9.0.0" - "@metamask/json-rpc-middleware-stream": "npm:^8.0.0" + "@metamask/approval-controller": "npm:^7.0.2" + "@metamask/base-controller": "npm:^6.0.2" + "@metamask/json-rpc-engine": "npm:^9.0.2" + "@metamask/json-rpc-middleware-stream": "npm:^8.0.2" "@metamask/object-multiplex": "npm:^2.0.0" - "@metamask/permission-controller": "npm:^10.0.1" - "@metamask/phishing-controller": "npm:^10.0.0" + "@metamask/permission-controller": "npm:^11.0.0" + "@metamask/phishing-controller": "npm:^10.1.1" "@metamask/post-message-stream": "npm:^8.1.0" "@metamask/rpc-errors": "npm:^6.3.1" "@metamask/snaps-registry": "npm:^3.2.1" - "@metamask/snaps-rpc-methods": "npm:^10.0.0" + "@metamask/snaps-rpc-methods": "npm:^10.0.1" "@metamask/snaps-sdk": "npm:^6.1.0" - "@metamask/snaps-utils": "npm:^7.8.0" + "@metamask/snaps-utils": "npm:^7.8.1" "@metamask/utils": "npm:^9.1.0" "@xstate/fsm": "npm:^2.0.0" browserify-zlib: "npm:^0.2.0" @@ -3794,11 +3794,11 @@ __metadata: readable-web-to-node-stream: "npm:^3.0.2" tar-stream: "npm:^3.1.7" peerDependencies: - "@metamask/snaps-execution-environments": ^6.6.1 + "@metamask/snaps-execution-environments": ^6.6.2 peerDependenciesMeta: "@metamask/snaps-execution-environments": optional: true - checksum: 10/065e7a3e5242f1693ade7c89acdbbf16e2f4caa395ca924c4378e8e66fdcf52212e30292ace0683e3ebb5816eef35d762df49b9abffba25d9cf0e93899d6a1fb + checksum: 10/a0a7736a1d205181c66f5f0ead2a1ade658567fd895e9e3dfb0454c26e5ce55afbc7eb75b93d2de4a69487096fb4b1ec5ed25fe10bc58391cd57b596bc092856 languageName: node linkType: hard @@ -3814,19 +3814,19 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-rpc-methods@npm:^10.0.0": - version: 10.0.0 - resolution: "@metamask/snaps-rpc-methods@npm:10.0.0" +"@metamask/snaps-rpc-methods@npm:^10.0.1": + version: 10.0.1 + resolution: "@metamask/snaps-rpc-methods@npm:10.0.1" dependencies: "@metamask/key-tree": "npm:^9.1.2" - "@metamask/permission-controller": "npm:^10.0.1" + "@metamask/permission-controller": "npm:^11.0.0" "@metamask/rpc-errors": "npm:^6.3.1" "@metamask/snaps-sdk": "npm:^6.1.0" - "@metamask/snaps-utils": "npm:^7.8.0" + "@metamask/snaps-utils": "npm:^7.8.1" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.1.0" "@noble/hashes": "npm:^1.3.1" - checksum: 10/a471d224c1cf88aeff5245f61df40402839e4e027c4495cd2833c703fe7a3b2f1a1ddd20e89455e1842c8f32db65e0a35343463bad622ebe06e7138b52d7a6a5 + checksum: 10/f2895cdbdf248c25f3b5f8ed42dc15f2e5420a1659cb06c71ac8bc35fc6ee550fce519b74ea4cf34e7edf19f0f6b9a4ccd6d8ffd63b9be8b732fb4820d323644 languageName: node linkType: hard @@ -3860,28 +3860,28 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-sdk@npm:^6.0.0, @metamask/snaps-sdk@npm:^6.1.0": - version: 6.1.0 - resolution: "@metamask/snaps-sdk@npm:6.1.0" +"@metamask/snaps-sdk@npm:^6.0.0, @metamask/snaps-sdk@npm:^6.1.0, @metamask/snaps-sdk@npm:^6.1.1": + version: 6.1.1 + resolution: "@metamask/snaps-sdk@npm:6.1.1" dependencies: "@metamask/key-tree": "npm:^9.1.2" - "@metamask/providers": "npm:17.0.0" + "@metamask/providers": "npm:^17.1.2" "@metamask/rpc-errors": "npm:^6.3.1" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.1.0" - checksum: 10/1cdad5356872dea44313914ed446cddd9bcaf397b60b47e1d93a11cacb6974066f60ca55cfa3c8fe74d7852188113994433401647fa02e13d1e9f0bd8dfde013 + checksum: 10/d75fa0bf7a939399a04d230c73c6ba3c9c6c6b514c2a5494250f8a68847e49a52009baf324c83562c24217df94106c194cbe081e5ef4f01799718de672967956 languageName: node linkType: hard -"@metamask/snaps-utils@npm:^7.4.0, @metamask/snaps-utils@npm:^7.5.0, @metamask/snaps-utils@npm:^7.7.0, @metamask/snaps-utils@npm:^7.8.0": - version: 7.8.0 - resolution: "@metamask/snaps-utils@npm:7.8.0" +"@metamask/snaps-utils@npm:^7.4.0, @metamask/snaps-utils@npm:^7.5.0, @metamask/snaps-utils@npm:^7.7.0, @metamask/snaps-utils@npm:^7.8.1": + version: 7.8.1 + resolution: "@metamask/snaps-utils@npm:7.8.1" dependencies: "@babel/core": "npm:^7.23.2" "@babel/types": "npm:^7.23.0" - "@metamask/base-controller": "npm:^6.0.1" + "@metamask/base-controller": "npm:^6.0.2" "@metamask/key-tree": "npm:^9.1.2" - "@metamask/permission-controller": "npm:^10.0.1" + "@metamask/permission-controller": "npm:^11.0.0" "@metamask/rpc-errors": "npm:^6.3.1" "@metamask/slip44": "npm:^3.1.0" "@metamask/snaps-registry": "npm:^3.2.1" @@ -3900,7 +3900,7 @@ __metadata: semver: "npm:^7.5.4" ses: "npm:^1.1.0" validate-npm-package-name: "npm:^5.0.0" - checksum: 10/e4629fe57f6cbc9ba2a7ac3b41cc919c83574b8d6c9e71b593fbc5b37d6f15a7d46498dade56dbf61268a898f33b53f48cba7207c9bb5e7b6a9c79cc3cfc9aaa + checksum: 10/572108aafbad970910ffb3605cf9eb4675ede0d69ff2bd37515da7f071de2065a55c73d6dc44dbe70bbd9c3ff0dfe29d40fd16badd925a4b8504db293265ca2f languageName: node linkType: hard