Merge branch 'main' into json-rpc-middleware-stream-to-core-packages

MetaMask · Nov 7, 2023 · 58e7d0c · 58e7d0c
2 parents 28782b2 + cfcb6c6
commit 58e7d0c
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 32 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metamask/core-monorepo",
-  "version": "87.0.0",
+  "version": "88.0.0",
   "private": true,
   "description": "Monorepo for packages shared between MetaMask clients",
   "repository": {

diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json
@@ -41,7 +41,7 @@
     "@metamask/controller-utils": "^5.0.2",
     "@metamask/eth-query": "^3.0.1",
     "@metamask/metamask-eth-abis": "3.0.0",
-    "@metamask/network-controller": "^15.1.0",
+    "@metamask/network-controller": "^15.2.0",
     "@metamask/polling-controller": "^1.0.1",
     "@metamask/preferences-controller": "^4.4.3",
     "@metamask/rpc-errors": "^6.1.0",
@@ -71,7 +71,7 @@
   },
   "peerDependencies": {
     "@metamask/approval-controller": "^4.1.0",
-    "@metamask/network-controller": "^15.1.0",
+    "@metamask/network-controller": "^15.2.0",
     "@metamask/preferences-controller": "^4.4.3"
   },
   "engines": {

diff --git a/packages/ens-controller/package.json b/packages/ens-controller/package.json
@@ -33,7 +33,7 @@
     "@ethersproject/providers": "^5.7.0",
     "@metamask/base-controller": "^3.2.3",
     "@metamask/controller-utils": "^5.0.2",
-    "@metamask/network-controller": "^15.1.0",
+    "@metamask/network-controller": "^15.2.0",
     "@metamask/utils": "^8.2.0",
     "ethereum-ens-network-map": "^1.0.2",
     "punycode": "^2.1.1"
@@ -49,7 +49,7 @@
     "typescript": "~4.8.4"
   },
   "peerDependencies": {
-    "@metamask/network-controller": "^15.1.0"
+    "@metamask/network-controller": "^15.2.0"
   },
   "engines": {
     "node": ">=16.0.0"

diff --git a/packages/gas-fee-controller/package.json b/packages/gas-fee-controller/package.json
@@ -33,7 +33,7 @@
     "@metamask/base-controller": "^3.2.3",
     "@metamask/controller-utils": "^5.0.2",
     "@metamask/eth-query": "^3.0.1",
-    "@metamask/network-controller": "^15.1.0",
+    "@metamask/network-controller": "^15.2.0",
     "@metamask/polling-controller": "^1.0.1",
     "@metamask/utils": "^8.2.0",
     "@types/uuid": "^8.3.0",
@@ -57,7 +57,7 @@
     "typescript": "~4.8.4"
   },
   "peerDependencies": {
-    "@metamask/network-controller": "^15.1.0"
+    "@metamask/network-controller": "^15.2.0"
   },
   "engines": {
     "node": ">=16.0.0"

diff --git a/packages/network-controller/CHANGELOG.md b/packages/network-controller/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [15.2.0]
+### Changed
+- Update @metamask/eth-json-rpc-middleware in network controller ([#1988](https://github.com/MetaMask/core/pull/1988))
+- Bump dependency on `@metamask/json-rpc-engine` to ^7.2.0 ([#1895](https://github.com/MetaMask/core/pull/1895))
+- Bump @metamask/utils from 8.1.0 to 8.2.0 ([#1957](https://github.com/MetaMask/core/pull/1957))
+
 ## [15.1.0]
 ### Added
 - Add new action handlers and associated types ([#1806](https://github.com/MetaMask/core/pull/1806))
@@ -298,7 +304,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/[email protected]
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[15.2.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [15.1.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [15.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [14.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

diff --git a/packages/network-controller/package.json b/packages/network-controller/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metamask/network-controller",
-  "version": "15.1.0",
+  "version": "15.2.0",
   "description": "Provides an interface to the currently selected network via a MetaMask-compatible provider object",
   "keywords": [
     "MetaMask",

diff --git a/packages/polling-controller/package.json b/packages/polling-controller/package.json
@@ -32,7 +32,7 @@
   "dependencies": {
     "@metamask/base-controller": "^3.2.3",
     "@metamask/controller-utils": "^5.0.2",
-    "@metamask/network-controller": "^15.1.0",
+    "@metamask/network-controller": "^15.2.0",
     "@metamask/utils": "^8.2.0",
     "@types/uuid": "^8.3.0",
     "fast-json-stable-stringify": "^2.1.0",
@@ -50,7 +50,7 @@
     "typescript": "~4.8.4"
   },
   "peerDependencies": {
-    "@metamask/network-controller": "^15.1.0"
+    "@metamask/network-controller": "^15.2.0"
   },
   "engines": {
     "node": ">=16.0.0"

diff --git a/packages/queued-request-controller/package.json b/packages/queued-request-controller/package.json
@@ -33,7 +33,7 @@
     "@metamask/base-controller": "^3.2.3",
     "@metamask/controller-utils": "^5.0.2",
     "@metamask/json-rpc-engine": "^7.2.0",
-    "@metamask/network-controller": "^15.1.0",
+    "@metamask/network-controller": "^15.2.0",
     "@metamask/rpc-errors": "^6.1.0",
     "@metamask/selected-network-controller": "^3.1.0",
     "@metamask/swappable-obj-proxy": "^2.1.0",
@@ -55,7 +55,7 @@
     "typescript": "~4.8.4"
   },
   "peerDependencies": {
-    "@metamask/network-controller": "^15.1.0",
+    "@metamask/network-controller": "^15.2.0",
     "@metamask/selected-network-controller": "^3.1.0"
   },
   "engines": {

diff --git a/packages/selected-network-controller/package.json b/packages/selected-network-controller/package.json
@@ -32,7 +32,7 @@
   "dependencies": {
     "@metamask/base-controller": "^3.2.3",
     "@metamask/json-rpc-engine": "^7.2.0",
-    "@metamask/network-controller": "^15.1.0",
+    "@metamask/network-controller": "^15.2.0",
     "@metamask/swappable-obj-proxy": "^2.1.0"
   },
   "devDependencies": {
@@ -50,7 +50,7 @@
     "typescript": "~4.8.4"
   },
   "peerDependencies": {
-    "@metamask/network-controller": "^15.1.0"
+    "@metamask/network-controller": "^15.2.0"
   },
   "engines": {
     "node": ">=16.0.0"

diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json
@@ -39,7 +39,7 @@
     "@metamask/eth-query": "^3.0.1",
     "@metamask/gas-fee-controller": "^10.0.0",
     "@metamask/metamask-eth-abis": "^3.0.0",
-    "@metamask/network-controller": "^15.1.0",
+    "@metamask/network-controller": "^15.2.0",
     "@metamask/rpc-errors": "^6.1.0",
     "@metamask/utils": "^8.2.0",
     "async-mutex": "^0.2.6",
@@ -67,7 +67,7 @@
   "peerDependencies": {
     "@metamask/approval-controller": "^4.1.0",
     "@metamask/gas-fee-controller": "^10.0.0",
-    "@metamask/network-controller": "^15.1.0",
+    "@metamask/network-controller": "^15.2.0",
     "babel-runtime": "^6.26.0"
   },
   "engines": {

diff --git a/yarn.lock b/yarn.lock
@@ -1476,7 +1476,7 @@ __metadata:
     "@metamask/controller-utils": ^5.0.2
     "@metamask/eth-query": ^3.0.1
     "@metamask/metamask-eth-abis": 3.0.0
-    "@metamask/network-controller": ^15.1.0
+    "@metamask/network-controller": ^15.2.0
     "@metamask/polling-controller": ^1.0.1
     "@metamask/preferences-controller": ^4.4.3
     "@metamask/rpc-errors": ^6.1.0
@@ -1502,7 +1502,7 @@ __metadata:
     uuid: ^8.3.2
   peerDependencies:
     "@metamask/approval-controller": ^4.1.0
-    "@metamask/network-controller": ^15.1.0
+    "@metamask/network-controller": ^15.2.0
     "@metamask/preferences-controller": ^4.4.3
   languageName: unknown
   linkType: soft
@@ -1663,7 +1663,7 @@ __metadata:
     "@metamask/auto-changelog": ^3.4.3
     "@metamask/base-controller": ^3.2.3
     "@metamask/controller-utils": ^5.0.2
-    "@metamask/network-controller": ^15.1.0
+    "@metamask/network-controller": ^15.2.0
     "@metamask/utils": ^8.2.0
     "@types/jest": ^27.4.1
     deepmerge: ^4.2.2
@@ -1675,7 +1675,7 @@ __metadata:
     typedoc-plugin-missing-exports: ^2.0.0
     typescript: ~4.8.4
   peerDependencies:
-    "@metamask/network-controller": ^15.1.0
+    "@metamask/network-controller": ^15.2.0
   languageName: unknown
   linkType: soft
 
@@ -1868,7 +1868,7 @@ __metadata:
     "@metamask/base-controller": ^3.2.3
     "@metamask/controller-utils": ^5.0.2
     "@metamask/eth-query": ^3.0.1
-    "@metamask/network-controller": ^15.1.0
+    "@metamask/network-controller": ^15.2.0
     "@metamask/polling-controller": ^1.0.1
     "@metamask/utils": ^8.2.0
     "@types/jest": ^27.4.1
@@ -1888,7 +1888,7 @@ __metadata:
     typescript: ~4.8.4
     uuid: ^8.3.2
   peerDependencies:
-    "@metamask/network-controller": ^15.1.0
+    "@metamask/network-controller": ^15.2.0
   languageName: unknown
   linkType: soft
 
@@ -2066,7 +2066,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@metamask/network-controller@^15.1.0, @metamask/network-controller@workspace:packages/network-controller":
+"@metamask/network-controller@^15.2.0, @metamask/network-controller@workspace:packages/network-controller":
   version: 0.0.0-use.local
   resolution: "@metamask/network-controller@workspace:packages/network-controller"
   dependencies:
@@ -2208,7 +2208,7 @@ __metadata:
     "@metamask/auto-changelog": ^3.4.3
     "@metamask/base-controller": ^3.2.3
     "@metamask/controller-utils": ^5.0.2
-    "@metamask/network-controller": ^15.1.0
+    "@metamask/network-controller": ^15.2.0
     "@metamask/utils": ^8.2.0
     "@types/jest": ^27.4.1
     "@types/uuid": ^8.3.0
@@ -2222,7 +2222,7 @@ __metadata:
     typescript: ~4.8.4
     uuid: ^8.3.2
   peerDependencies:
-    "@metamask/network-controller": ^15.1.0
+    "@metamask/network-controller": ^15.2.0
   languageName: unknown
   linkType: soft
 
@@ -2281,7 +2281,7 @@ __metadata:
     "@metamask/base-controller": ^3.2.3
     "@metamask/controller-utils": ^5.0.2
     "@metamask/json-rpc-engine": ^7.2.0
-    "@metamask/network-controller": ^15.1.0
+    "@metamask/network-controller": ^15.2.0
     "@metamask/rpc-errors": ^6.1.0
     "@metamask/selected-network-controller": ^3.1.0
     "@metamask/swappable-obj-proxy": ^2.1.0
@@ -2298,7 +2298,7 @@ __metadata:
     typedoc-plugin-missing-exports: ^2.0.0
     typescript: ~4.8.4
   peerDependencies:
-    "@metamask/network-controller": ^15.1.0
+    "@metamask/network-controller": ^15.2.0
     "@metamask/selected-network-controller": ^3.1.0
   languageName: unknown
   linkType: soft
@@ -2362,7 +2362,7 @@ __metadata:
     "@metamask/auto-changelog": ^3.4.3
     "@metamask/base-controller": ^3.2.3
     "@metamask/json-rpc-engine": ^7.2.0
-    "@metamask/network-controller": ^15.1.0
+    "@metamask/network-controller": ^15.2.0
     "@metamask/swappable-obj-proxy": ^2.1.0
     "@types/jest": ^27.4.1
     deepmerge: ^4.2.2
@@ -2376,7 +2376,7 @@ __metadata:
     typedoc-plugin-missing-exports: ^2.0.0
     typescript: ~4.8.4
   peerDependencies:
-    "@metamask/network-controller": ^15.1.0
+    "@metamask/network-controller": ^15.2.0
   languageName: unknown
   linkType: soft
 
@@ -2610,7 +2610,7 @@ __metadata:
     "@metamask/eth-query": ^3.0.1
     "@metamask/gas-fee-controller": ^10.0.0
     "@metamask/metamask-eth-abis": ^3.0.0
-    "@metamask/network-controller": ^15.1.0
+    "@metamask/network-controller": ^15.2.0
     "@metamask/rpc-errors": ^6.1.0
     "@metamask/utils": ^8.2.0
     "@types/jest": ^27.4.1
@@ -2634,7 +2634,7 @@ __metadata:
   peerDependencies:
     "@metamask/approval-controller": ^4.1.0
     "@metamask/gas-fee-controller": ^10.0.0
-    "@metamask/network-controller": ^15.1.0
+    "@metamask/network-controller": ^15.2.0
     babel-runtime: ^6.26.0
   languageName: unknown
   linkType: soft