From 29851bc32af2b6e8dfa8a6fcb8c4eca77664b1c9 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Fri, 24 Nov 2023 09:54:20 -0330 Subject: [PATCH 1/4] Release 95.0.0 --- package.json | 2 +- packages/controller-utils/CHANGELOG.md | 8 +++++++- packages/controller-utils/package.json | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 505199a9191..931c20e0508 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@metamask/core-monorepo", - "version": "94.0.0", + "version": "95.0.0", "private": true, "description": "Monorepo for packages shared between MetaMask clients", "repository": { diff --git a/packages/controller-utils/CHANGELOG.md b/packages/controller-utils/CHANGELOG.md index 765da224fac..dbfcb1ae2f2 100644 --- a/packages/controller-utils/CHANGELOG.md +++ b/packages/controller-utils/CHANGELOG.md @@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [6.0.1] +### Uncategorized +- Move `eth-query` back from devDeps to deps ([#3578](https://github.com/MetaMask/core/pull/3578)) + ### Added - Add `isInfuraNetworkType` type guard for `InfuraNetworkType` ([#2055](https://github.com/MetaMask/core/pull/2055)) @@ -180,7 +185,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 All changes listed after this point were applied to this package following the monorepo conversion. -[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/controller-utils@6.0.0...HEAD +[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/controller-utils@6.0.1...HEAD +[6.0.1]: https://github.com/MetaMask/core/compare/@metamask/controller-utils@6.0.0...@metamask/controller-utils@6.0.1 [6.0.0]: https://github.com/MetaMask/core/compare/@metamask/controller-utils@5.0.2...@metamask/controller-utils@6.0.0 [5.0.2]: https://github.com/MetaMask/core/compare/@metamask/controller-utils@5.0.1...@metamask/controller-utils@5.0.2 [5.0.1]: https://github.com/MetaMask/core/compare/@metamask/controller-utils@5.0.0...@metamask/controller-utils@5.0.1 diff --git a/packages/controller-utils/package.json b/packages/controller-utils/package.json index fd0d68c8606..6d7e3c6068c 100644 --- a/packages/controller-utils/package.json +++ b/packages/controller-utils/package.json @@ -1,6 +1,6 @@ { "name": "@metamask/controller-utils", - "version": "6.0.0", + "version": "6.0.1", "description": "Data and convenience functions shared by multiple packages", "keywords": [ "MetaMask", From a913c43d4acf97e76c2aaa8e9a7ecc0a8ac5f0a5 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Fri, 24 Nov 2023 09:57:31 -0330 Subject: [PATCH 2/4] Update changelog and bump to minor --- packages/controller-utils/CHANGELOG.md | 13 +++++++------ packages/controller-utils/package.json | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/controller-utils/CHANGELOG.md b/packages/controller-utils/CHANGELOG.md index dbfcb1ae2f2..3d4643079d7 100644 --- a/packages/controller-utils/CHANGELOG.md +++ b/packages/controller-utils/CHANGELOG.md @@ -6,13 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [6.0.1] -### Uncategorized -- Move `eth-query` back from devDeps to deps ([#3578](https://github.com/MetaMask/core/pull/3578)) - +## [6.1.0] ### Added - Add `isInfuraNetworkType` type guard for `InfuraNetworkType` ([#2055](https://github.com/MetaMask/core/pull/2055)) +### Fixed +- Restore missing dependency `eth-query`([#3578](https://github.com/MetaMask/core/pull/3578)) + - This was mistakenly recategorized as a devDependency in v6.0.0 + ## [6.0.0] ### Changed - **BREAKING:** Bump `@metamask/eth-query` to ^4.0.0 ([#2028](https://github.com/MetaMask/core/pull/2028)) @@ -185,8 +186,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 All changes listed after this point were applied to this package following the monorepo conversion. -[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/controller-utils@6.0.1...HEAD -[6.0.1]: https://github.com/MetaMask/core/compare/@metamask/controller-utils@6.0.0...@metamask/controller-utils@6.0.1 +[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/controller-utils@6.1.0...HEAD +[6.1.0]: https://github.com/MetaMask/core/compare/@metamask/controller-utils@6.0.0...@metamask/controller-utils@6.1.0 [6.0.0]: https://github.com/MetaMask/core/compare/@metamask/controller-utils@5.0.2...@metamask/controller-utils@6.0.0 [5.0.2]: https://github.com/MetaMask/core/compare/@metamask/controller-utils@5.0.1...@metamask/controller-utils@5.0.2 [5.0.1]: https://github.com/MetaMask/core/compare/@metamask/controller-utils@5.0.0...@metamask/controller-utils@5.0.1 diff --git a/packages/controller-utils/package.json b/packages/controller-utils/package.json index 6d7e3c6068c..f76f9d43a7c 100644 --- a/packages/controller-utils/package.json +++ b/packages/controller-utils/package.json @@ -1,6 +1,6 @@ { "name": "@metamask/controller-utils", - "version": "6.0.1", + "version": "6.1.0", "description": "Data and convenience functions shared by multiple packages", "keywords": [ "MetaMask", From aa386d44f0cfb9c0c203936e728e293a95d4d712 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Fri, 24 Nov 2023 10:09:29 -0330 Subject: [PATCH 3/4] Bump dependencies on controller-utils to v6.1.0 --- packages/address-book-controller/package.json | 2 +- packages/assets-controllers/package.json | 2 +- packages/ens-controller/package.json | 2 +- packages/gas-fee-controller/package.json | 2 +- packages/logging-controller/package.json | 2 +- packages/message-manager/package.json | 2 +- packages/network-controller/package.json | 2 +- packages/permission-controller/package.json | 2 +- packages/phishing-controller/package.json | 2 +- packages/polling-controller/package.json | 2 +- packages/preferences-controller/package.json | 2 +- packages/queued-request-controller/package.json | 2 +- packages/signature-controller/package.json | 2 +- packages/transaction-controller/package.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/address-book-controller/package.json b/packages/address-book-controller/package.json index 63c9923046a..42894d243c5 100644 --- a/packages/address-book-controller/package.json +++ b/packages/address-book-controller/package.json @@ -31,7 +31,7 @@ }, "dependencies": { "@metamask/base-controller": "^4.0.0", - "@metamask/controller-utils": "^6.0.0", + "@metamask/controller-utils": "^6.1.0", "@metamask/utils": "^8.2.0" }, "devDependencies": { diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json index 17714926152..0ba023b944b 100644 --- a/packages/assets-controllers/package.json +++ b/packages/assets-controllers/package.json @@ -38,7 +38,7 @@ "@metamask/approval-controller": "^5.0.0", "@metamask/base-controller": "^4.0.0", "@metamask/contract-metadata": "^2.4.0", - "@metamask/controller-utils": "^6.0.0", + "@metamask/controller-utils": "^6.1.0", "@metamask/eth-query": "^4.0.0", "@metamask/metamask-eth-abis": "3.0.0", "@metamask/network-controller": "^17.0.0", diff --git a/packages/ens-controller/package.json b/packages/ens-controller/package.json index a8f69c3af7b..e7abb9c1737 100644 --- a/packages/ens-controller/package.json +++ b/packages/ens-controller/package.json @@ -32,7 +32,7 @@ "dependencies": { "@ethersproject/providers": "^5.7.0", "@metamask/base-controller": "^4.0.0", - "@metamask/controller-utils": "^6.0.0", + "@metamask/controller-utils": "^6.1.0", "@metamask/network-controller": "^17.0.0", "@metamask/utils": "^8.2.0", "ethereum-ens-network-map": "^1.0.2", diff --git a/packages/gas-fee-controller/package.json b/packages/gas-fee-controller/package.json index c31e56a8e99..a17d7f680f2 100644 --- a/packages/gas-fee-controller/package.json +++ b/packages/gas-fee-controller/package.json @@ -31,7 +31,7 @@ }, "dependencies": { "@metamask/base-controller": "^4.0.0", - "@metamask/controller-utils": "^6.0.0", + "@metamask/controller-utils": "^6.1.0", "@metamask/eth-query": "^4.0.0", "@metamask/ethjs-unit": "^0.2.1", "@metamask/network-controller": "^17.0.0", diff --git a/packages/logging-controller/package.json b/packages/logging-controller/package.json index 9c2eca87c96..90e532f5949 100644 --- a/packages/logging-controller/package.json +++ b/packages/logging-controller/package.json @@ -31,7 +31,7 @@ }, "dependencies": { "@metamask/base-controller": "^4.0.0", - "@metamask/controller-utils": "^6.0.0", + "@metamask/controller-utils": "^6.1.0", "uuid": "^8.3.2" }, "devDependencies": { diff --git a/packages/message-manager/package.json b/packages/message-manager/package.json index b689f8748de..2c1ee148307 100644 --- a/packages/message-manager/package.json +++ b/packages/message-manager/package.json @@ -31,7 +31,7 @@ }, "dependencies": { "@metamask/base-controller": "^4.0.0", - "@metamask/controller-utils": "^6.0.0", + "@metamask/controller-utils": "^6.1.0", "@metamask/eth-sig-util": "^7.0.0", "@metamask/utils": "^8.2.0", "@types/uuid": "^8.3.0", diff --git a/packages/network-controller/package.json b/packages/network-controller/package.json index a57e7170562..510795b6cf5 100644 --- a/packages/network-controller/package.json +++ b/packages/network-controller/package.json @@ -31,7 +31,7 @@ }, "dependencies": { "@metamask/base-controller": "^4.0.0", - "@metamask/controller-utils": "^6.0.0", + "@metamask/controller-utils": "^6.1.0", "@metamask/eth-json-rpc-infura": "^9.0.0", "@metamask/eth-json-rpc-middleware": "^12.0.1", "@metamask/eth-json-rpc-provider": "^2.3.0", diff --git a/packages/permission-controller/package.json b/packages/permission-controller/package.json index 54c96910e73..61aad605ab8 100644 --- a/packages/permission-controller/package.json +++ b/packages/permission-controller/package.json @@ -32,7 +32,7 @@ "dependencies": { "@metamask/approval-controller": "^5.0.0", "@metamask/base-controller": "^4.0.0", - "@metamask/controller-utils": "^6.0.0", + "@metamask/controller-utils": "^6.1.0", "@metamask/json-rpc-engine": "^7.3.0", "@metamask/rpc-errors": "^6.1.0", "@metamask/utils": "^8.2.0", diff --git a/packages/phishing-controller/package.json b/packages/phishing-controller/package.json index 2924187f801..bcb6bf41943 100644 --- a/packages/phishing-controller/package.json +++ b/packages/phishing-controller/package.json @@ -31,7 +31,7 @@ }, "dependencies": { "@metamask/base-controller": "^4.0.0", - "@metamask/controller-utils": "^6.0.0", + "@metamask/controller-utils": "^6.1.0", "@types/punycode": "^2.1.0", "eth-phishing-detect": "^1.2.0", "punycode": "^2.1.1" diff --git a/packages/polling-controller/package.json b/packages/polling-controller/package.json index 60f8f1ef2fe..40e36fb9164 100644 --- a/packages/polling-controller/package.json +++ b/packages/polling-controller/package.json @@ -31,7 +31,7 @@ }, "dependencies": { "@metamask/base-controller": "^4.0.0", - "@metamask/controller-utils": "^6.0.0", + "@metamask/controller-utils": "^6.1.0", "@metamask/network-controller": "^17.0.0", "@metamask/utils": "^8.2.0", "@types/uuid": "^8.3.0", diff --git a/packages/preferences-controller/package.json b/packages/preferences-controller/package.json index ceebdaf90a8..1c49df1ea62 100644 --- a/packages/preferences-controller/package.json +++ b/packages/preferences-controller/package.json @@ -31,7 +31,7 @@ }, "dependencies": { "@metamask/base-controller": "^4.0.0", - "@metamask/controller-utils": "^6.0.0" + "@metamask/controller-utils": "^6.1.0" }, "devDependencies": { "@metamask/auto-changelog": "^3.4.3", diff --git a/packages/queued-request-controller/package.json b/packages/queued-request-controller/package.json index 0902efa8a5e..c30f018037f 100644 --- a/packages/queued-request-controller/package.json +++ b/packages/queued-request-controller/package.json @@ -31,7 +31,7 @@ }, "dependencies": { "@metamask/base-controller": "^4.0.0", - "@metamask/controller-utils": "^6.0.0", + "@metamask/controller-utils": "^6.1.0", "@metamask/json-rpc-engine": "^7.3.0", "@metamask/network-controller": "^17.0.0", "@metamask/rpc-errors": "^6.1.0", diff --git a/packages/signature-controller/package.json b/packages/signature-controller/package.json index b97190e113c..4ad1169deef 100644 --- a/packages/signature-controller/package.json +++ b/packages/signature-controller/package.json @@ -32,7 +32,7 @@ "dependencies": { "@metamask/approval-controller": "^5.0.0", "@metamask/base-controller": "^4.0.0", - "@metamask/controller-utils": "^6.0.0", + "@metamask/controller-utils": "^6.1.0", "@metamask/keyring-controller": "^10.0.0", "@metamask/logging-controller": "^2.0.0", "@metamask/message-manager": "^7.3.6", diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json index f9da1e59536..1746185d7d4 100644 --- a/packages/transaction-controller/package.json +++ b/packages/transaction-controller/package.json @@ -35,7 +35,7 @@ "@ethersproject/abi": "^5.7.0", "@metamask/approval-controller": "^5.0.0", "@metamask/base-controller": "^4.0.0", - "@metamask/controller-utils": "^6.0.0", + "@metamask/controller-utils": "^6.1.0", "@metamask/eth-query": "^4.0.0", "@metamask/gas-fee-controller": "^11.0.0", "@metamask/metamask-eth-abis": "^3.0.0", From ea77115cdd99fae9f3cd7f653b25300d61d994cf Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Fri, 24 Nov 2023 10:12:16 -0330 Subject: [PATCH 4/4] Update lockfile --- yarn.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/yarn.lock b/yarn.lock index fe60e444834..9ec61104bed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1410,7 +1410,7 @@ __metadata: dependencies: "@metamask/auto-changelog": ^3.4.3 "@metamask/base-controller": ^4.0.0 - "@metamask/controller-utils": ^6.0.0 + "@metamask/controller-utils": ^6.1.0 "@metamask/utils": ^8.2.0 "@types/jest": ^27.4.1 deepmerge: ^4.2.2 @@ -1484,7 +1484,7 @@ __metadata: "@metamask/auto-changelog": ^3.4.3 "@metamask/base-controller": ^4.0.0 "@metamask/contract-metadata": ^2.4.0 - "@metamask/controller-utils": ^6.0.0 + "@metamask/controller-utils": ^6.1.0 "@metamask/eth-query": ^4.0.0 "@metamask/ethjs-provider-http": ^0.2.0 "@metamask/metamask-eth-abis": 3.0.0 @@ -1595,7 +1595,7 @@ __metadata: languageName: node linkType: hard -"@metamask/controller-utils@^6.0.0, @metamask/controller-utils@workspace:packages/controller-utils": +"@metamask/controller-utils@^6.1.0, @metamask/controller-utils@workspace:packages/controller-utils": version: 0.0.0-use.local resolution: "@metamask/controller-utils@workspace:packages/controller-utils" dependencies: @@ -1701,7 +1701,7 @@ __metadata: "@ethersproject/providers": ^5.7.0 "@metamask/auto-changelog": ^3.4.3 "@metamask/base-controller": ^4.0.0 - "@metamask/controller-utils": ^6.0.0 + "@metamask/controller-utils": ^6.1.0 "@metamask/network-controller": ^17.0.0 "@metamask/utils": ^8.2.0 "@types/jest": ^27.4.1 @@ -1934,7 +1934,7 @@ __metadata: dependencies: "@metamask/auto-changelog": ^3.4.3 "@metamask/base-controller": ^4.0.0 - "@metamask/controller-utils": ^6.0.0 + "@metamask/controller-utils": ^6.1.0 "@metamask/eth-query": ^4.0.0 "@metamask/ethjs-unit": ^0.2.1 "@metamask/network-controller": ^17.0.0 @@ -2073,7 +2073,7 @@ __metadata: dependencies: "@metamask/auto-changelog": ^3.4.3 "@metamask/base-controller": ^4.0.0 - "@metamask/controller-utils": ^6.0.0 + "@metamask/controller-utils": ^6.1.0 "@types/jest": ^27.4.1 deepmerge: ^4.2.2 jest: ^27.5.1 @@ -2091,7 +2091,7 @@ __metadata: dependencies: "@metamask/auto-changelog": ^3.4.3 "@metamask/base-controller": ^4.0.0 - "@metamask/controller-utils": ^6.0.0 + "@metamask/controller-utils": ^6.1.0 "@metamask/eth-sig-util": ^7.0.0 "@metamask/utils": ^8.2.0 "@types/jest": ^27.4.1 @@ -2140,7 +2140,7 @@ __metadata: "@json-rpc-specification/meta-schema": ^1.0.6 "@metamask/auto-changelog": ^3.4.3 "@metamask/base-controller": ^4.0.0 - "@metamask/controller-utils": ^6.0.0 + "@metamask/controller-utils": ^6.1.0 "@metamask/eth-json-rpc-infura": ^9.0.0 "@metamask/eth-json-rpc-middleware": ^12.0.1 "@metamask/eth-json-rpc-provider": ^2.3.0 @@ -2245,7 +2245,7 @@ __metadata: "@metamask/approval-controller": ^5.0.0 "@metamask/auto-changelog": ^3.4.3 "@metamask/base-controller": ^4.0.0 - "@metamask/controller-utils": ^6.0.0 + "@metamask/controller-utils": ^6.1.0 "@metamask/json-rpc-engine": ^7.3.0 "@metamask/rpc-errors": ^6.1.0 "@metamask/utils": ^8.2.0 @@ -2306,7 +2306,7 @@ __metadata: dependencies: "@metamask/auto-changelog": ^3.4.3 "@metamask/base-controller": ^4.0.0 - "@metamask/controller-utils": ^6.0.0 + "@metamask/controller-utils": ^6.1.0 "@types/jest": ^27.4.1 "@types/punycode": ^2.1.0 deepmerge: ^4.2.2 @@ -2328,7 +2328,7 @@ __metadata: dependencies: "@metamask/auto-changelog": ^3.4.3 "@metamask/base-controller": ^4.0.0 - "@metamask/controller-utils": ^6.0.0 + "@metamask/controller-utils": ^6.1.0 "@metamask/network-controller": ^17.0.0 "@metamask/utils": ^8.2.0 "@types/jest": ^27.4.1 @@ -2363,7 +2363,7 @@ __metadata: dependencies: "@metamask/auto-changelog": ^3.4.3 "@metamask/base-controller": ^4.0.0 - "@metamask/controller-utils": ^6.0.0 + "@metamask/controller-utils": ^6.1.0 "@types/jest": ^27.4.1 deepmerge: ^4.2.2 jest: ^27.5.1 @@ -2400,7 +2400,7 @@ __metadata: "@metamask/approval-controller": ^5.0.0 "@metamask/auto-changelog": ^3.4.3 "@metamask/base-controller": ^4.0.0 - "@metamask/controller-utils": ^6.0.0 + "@metamask/controller-utils": ^6.1.0 "@metamask/json-rpc-engine": ^7.3.0 "@metamask/network-controller": ^17.0.0 "@metamask/rpc-errors": ^6.1.0 @@ -2507,7 +2507,7 @@ __metadata: "@metamask/approval-controller": ^5.0.0 "@metamask/auto-changelog": ^3.4.3 "@metamask/base-controller": ^4.0.0 - "@metamask/controller-utils": ^6.0.0 + "@metamask/controller-utils": ^6.1.0 "@metamask/keyring-controller": ^10.0.0 "@metamask/logging-controller": ^2.0.0 "@metamask/message-manager": ^7.3.6 @@ -2648,7 +2648,7 @@ __metadata: "@metamask/approval-controller": ^5.0.0 "@metamask/auto-changelog": ^3.4.3 "@metamask/base-controller": ^4.0.0 - "@metamask/controller-utils": ^6.0.0 + "@metamask/controller-utils": ^6.1.0 "@metamask/eth-query": ^4.0.0 "@metamask/ethjs-provider-http": ^0.2.0 "@metamask/gas-fee-controller": ^11.0.0