Merge branch 'main' of github.com:MetaMask/core into NOTIFY-1094/netw…

…ork-main-sync-integration
MetaMask · Oct 24, 2024 · 49ef491 · 49ef491
2 parents d581cc3 + 35b900b
commit 49ef491
Show file tree

Hide file tree

Showing 47 changed files with 216 additions and 145 deletions.
diff --git a/examples/example-controllers/package.json b/examples/example-controllers/package.json
@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "@metamask/base-controller": "^7.0.1",
-    "@metamask/utils": "^9.1.0"
+    "@metamask/utils": "^10.0.0"
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metamask/core-monorepo",
-  "version": "226.0.0",
+  "version": "228.0.0",
   "private": true,
   "description": "Monorepo for packages shared between MetaMask clients",
   "repository": {
@@ -59,7 +59,7 @@
     "@metamask/eth-block-tracker": "^11.0.2",
     "@metamask/eth-json-rpc-provider": "^4.1.5",
     "@metamask/json-rpc-engine": "^10.0.0",
-    "@metamask/utils": "^9.1.0",
+    "@metamask/utils": "^10.0.0",
     "@ts-bridge/cli": "^0.5.1",
     "@types/jest": "^27.4.1",
     "@types/lodash": "^4.14.191",

diff --git a/packages/accounts-controller/package.json b/packages/accounts-controller/package.json
@@ -53,7 +53,7 @@
     "@metamask/keyring-api": "^8.1.3",
     "@metamask/snaps-sdk": "^6.5.0",
     "@metamask/snaps-utils": "^8.1.1",
-    "@metamask/utils": "^9.1.0",
+    "@metamask/utils": "^10.0.0",
     "deepmerge": "^4.2.2",
     "ethereum-cryptography": "^2.1.2",
     "immer": "^9.0.6",

diff --git a/packages/accounts-controller/src/AccountsController.ts b/packages/accounts-controller/src/AccountsController.ts
@@ -456,7 +456,7 @@ export class AccountsController extends BaseController<
       };
       // Do not remove this comment - This error is flaky: Comment out or restore the `ts-expect-error` directive below as needed.
       // See: https://github.com/MetaMask/utils/issues/168
-      // // @ts-expect-error Known issue - `Json` causes recursive error in immer `Draft`/`WritableDraft` types
+      // @ts-expect-error Known issue - `Json` causes recursive error in immer `Draft`/`WritableDraft` types
       currentState.internalAccounts.accounts[accountId] = internalAccount;
 
       if (metadata.name) {

diff --git a/packages/address-book-controller/package.json b/packages/address-book-controller/package.json
@@ -49,7 +49,7 @@
   "dependencies": {
     "@metamask/base-controller": "^7.0.1",
     "@metamask/controller-utils": "^11.4.0",
-    "@metamask/utils": "^9.1.0"
+    "@metamask/utils": "^10.0.0"
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",

diff --git a/packages/approval-controller/package.json b/packages/approval-controller/package.json
@@ -48,8 +48,8 @@
   },
   "dependencies": {
     "@metamask/base-controller": "^7.0.1",
-    "@metamask/rpc-errors": "^7.0.0",
-    "@metamask/utils": "^9.1.0",
+    "@metamask/rpc-errors": "^7.0.1",
+    "@metamask/utils": "^10.0.0",
     "nanoid": "^3.1.31"
   },
   "devDependencies": {

diff --git a/packages/assets-controllers/CHANGELOG.md b/packages/assets-controllers/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- **BREAKING:** Bump `@metamask/network-controller` peer dependency from `^21.0.0` to `^22.0.0` ([#4841](https://github.com/MetaMask/core/pull/4841))
+
 ## [39.0.0]
 
 ### Changed

diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json
@@ -59,8 +59,8 @@
     "@metamask/eth-query": "^4.0.0",
     "@metamask/metamask-eth-abis": "^3.1.1",
     "@metamask/polling-controller": "^11.0.0",
-    "@metamask/rpc-errors": "^7.0.0",
-    "@metamask/utils": "^9.1.0",
+    "@metamask/rpc-errors": "^7.0.1",
+    "@metamask/utils": "^10.0.0",
     "@types/bn.js": "^5.1.5",
     "@types/uuid": "^8.3.0",
     "async-mutex": "^0.5.0",
@@ -79,7 +79,7 @@
     "@metamask/ethjs-provider-http": "^0.3.0",
     "@metamask/keyring-api": "^8.1.3",
     "@metamask/keyring-controller": "^17.3.0",
-    "@metamask/network-controller": "^21.1.0",
+    "@metamask/network-controller": "^22.0.0",
     "@metamask/preferences-controller": "^13.1.0",
     "@types/jest": "^27.4.1",
     "@types/lodash": "^4.14.191",
@@ -98,7 +98,7 @@
     "@metamask/accounts-controller": "^18.0.0",
     "@metamask/approval-controller": "^7.0.0",
     "@metamask/keyring-controller": "^17.0.0",
-    "@metamask/network-controller": "^21.0.0",
+    "@metamask/network-controller": "^22.0.0",
     "@metamask/preferences-controller": "^13.0.0"
   },
   "engines": {

diff --git a/packages/assets-controllers/src/CurrencyRateController.test.ts b/packages/assets-controllers/src/CurrencyRateController.test.ts
@@ -155,7 +155,7 @@ describe('CurrencyRateController', () => {
       messenger,
     });
 
-    controller.startPolling({ networkClientId: 'mainnet' });
+    controller.startPolling({ nativeCurrency: 'ETH' });
     await advanceTime({ clock, duration: 0 });
     expect(fetchExchangeRateStub).toHaveBeenCalledTimes(1);
     expect(controller.state.currencyRates).toStrictEqual({
@@ -192,7 +192,7 @@ describe('CurrencyRateController', () => {
       messenger,
     });
 
-    controller.startPolling({ networkClientId: 'sepolia' });
+    controller.startPolling({ nativeCurrency: 'ETH' });
 
     await advanceTime({ clock, duration: 0 });
 
@@ -217,15 +217,15 @@ describe('CurrencyRateController', () => {
       fetchExchangeRate: fetchExchangeRateStub,
       messenger,
     });
-    controller.startPolling({ networkClientId: 'sepolia' });
+    controller.startPolling({ nativeCurrency: 'ETH' });
     await advanceTime({ clock, duration: 0 });
 
     controller.stopAllPolling();
 
     // called once upon initial start
     expect(fetchExchangeRateStub).toHaveBeenCalledTimes(1);
 
-    controller.startPolling({ networkClientId: 'sepolia' });
+    controller.startPolling({ nativeCurrency: 'ETH' });
     await advanceTime({ clock, duration: 0 });
 
     expect(fetchExchangeRateStub).toHaveBeenCalledTimes(2);

diff --git a/packages/assets-controllers/src/CurrencyRateController.ts b/packages/assets-controllers/src/CurrencyRateController.ts
@@ -7,10 +7,7 @@ import {
   TESTNET_TICKER_SYMBOLS,
   FALL_BACK_VS_CURRENCY,
 } from '@metamask/controller-utils';
-import type {
-  NetworkClientId,
-  NetworkControllerGetNetworkClientByIdAction,
-} from '@metamask/network-controller';
+import type { NetworkControllerGetNetworkClientByIdAction } from '@metamask/network-controller';
 import { StaticIntervalPollingController } from '@metamask/polling-controller';
 import { Mutex } from 'async-mutex';
 
@@ -80,7 +77,7 @@ const defaultState = {
 
 /** The input to start polling for the {@link CurrencyRateController} */
 type CurrencyRatePollingInput = {
-  networkClientId: NetworkClientId;
+  nativeCurrency: string;
 };
 
 /**
@@ -243,16 +240,12 @@ export class CurrencyRateController extends StaticIntervalPollingController<Curr
    * Updates exchange rate for the current currency.
    *
    * @param input - The input for the poll.
-   * @param input.networkClientId - The network client ID used to get a ticker value.
+   * @param input.nativeCurrency - The native currency symbol to poll prices for.
    */
   async _executePoll({
-    networkClientId,
+    nativeCurrency,
   }: CurrencyRatePollingInput): Promise<void> {
-    const networkClient = this.messagingSystem.call(
-      'NetworkController:getNetworkClientById',
-      networkClientId,
-    );
-    await this.updateExchangeRate(networkClient.configuration.ticker);
+    await this.updateExchangeRate(nativeCurrency);
   }
 }
 

diff --git a/packages/base-controller/package.json b/packages/base-controller/package.json
@@ -46,7 +46,7 @@
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
   },
   "dependencies": {
-    "@metamask/utils": "^9.1.0",
+    "@metamask/utils": "^10.0.0",
     "immer": "^9.0.6"
   },
   "devDependencies": {

diff --git a/packages/build-utils/package.json b/packages/build-utils/package.json
@@ -47,7 +47,7 @@
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
   },
   "dependencies": {
-    "@metamask/utils": "^9.1.0",
+    "@metamask/utils": "^10.0.0",
     "@types/eslint": "^8.44.7"
   },
   "devDependencies": {

diff --git a/packages/chain-controller/package.json b/packages/chain-controller/package.json
@@ -53,7 +53,7 @@
     "@metamask/snaps-controllers": "^9.7.0",
     "@metamask/snaps-sdk": "^6.5.0",
     "@metamask/snaps-utils": "^8.1.1",
-    "@metamask/utils": "^9.1.0",
+    "@metamask/utils": "^10.0.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {

diff --git a/packages/controller-utils/package.json b/packages/controller-utils/package.json
@@ -50,7 +50,7 @@
     "@ethereumjs/util": "^8.1.0",
     "@metamask/eth-query": "^4.0.0",
     "@metamask/ethjs-unit": "^0.3.0",
-    "@metamask/utils": "^9.1.0",
+    "@metamask/utils": "^10.0.0",
     "@spruceid/siwe-parser": "2.1.0",
     "@types/bn.js": "^5.1.5",
     "bn.js": "^5.2.1",

diff --git a/packages/ens-controller/CHANGELOG.md b/packages/ens-controller/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- **BREAKING:** Bump `@metamask/network-controller` peer dependency from `^21.0.0` to `^22.0.0` ([#4841](https://github.com/MetaMask/core/pull/4841))
+
 ## [14.0.1]
 
 ### Fixed

diff --git a/packages/ens-controller/package.json b/packages/ens-controller/package.json
@@ -50,12 +50,12 @@
     "@ethersproject/providers": "^5.7.0",
     "@metamask/base-controller": "^7.0.1",
     "@metamask/controller-utils": "^11.4.0",
-    "@metamask/utils": "^9.1.0",
+    "@metamask/utils": "^10.0.0",
     "punycode": "^2.1.1"
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/network-controller": "^21.1.0",
+    "@metamask/network-controller": "^22.0.0",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",
     "jest": "^27.5.1",
@@ -65,7 +65,7 @@
     "typescript": "~5.2.2"
   },
   "peerDependencies": {
-    "@metamask/network-controller": "^21.0.0"
+    "@metamask/network-controller": "^22.0.0"
   },
   "engines": {
     "node": "^18.18 || >=20"

diff --git a/packages/eth-json-rpc-provider/package.json b/packages/eth-json-rpc-provider/package.json
@@ -53,9 +53,9 @@
   },
   "dependencies": {
     "@metamask/json-rpc-engine": "^10.0.0",
-    "@metamask/rpc-errors": "^7.0.0",
+    "@metamask/rpc-errors": "^7.0.1",
     "@metamask/safe-event-emitter": "^3.0.0",
-    "@metamask/utils": "^9.1.0",
+    "@metamask/utils": "^10.0.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {

diff --git a/packages/gas-fee-controller/CHANGELOG.md b/packages/gas-fee-controller/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- **BREAKING:** Bump `@metamask/network-controller` peer dependency from `^21.0.0` to `^22.0.0` ([#4841](https://github.com/MetaMask/core/pull/4841))
+
 ## [21.0.0]
 
 ### Changed

diff --git a/packages/gas-fee-controller/package.json b/packages/gas-fee-controller/package.json
@@ -52,15 +52,15 @@
     "@metamask/eth-query": "^4.0.0",
     "@metamask/ethjs-unit": "^0.3.0",
     "@metamask/polling-controller": "^11.0.0",
-    "@metamask/utils": "^9.1.0",
+    "@metamask/utils": "^10.0.0",
     "@types/bn.js": "^5.1.5",
     "@types/uuid": "^8.3.0",
     "bn.js": "^5.2.1",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/network-controller": "^21.1.0",
+    "@metamask/network-controller": "^22.0.0",
     "@types/jest": "^27.4.1",
     "@types/jest-when": "^2.7.3",
     "deepmerge": "^4.2.2",
@@ -74,7 +74,7 @@
     "typescript": "~5.2.2"
   },
   "peerDependencies": {
-    "@metamask/network-controller": "^21.0.0"
+    "@metamask/network-controller": "^22.0.0"
   },
   "engines": {
     "node": "^18.18 || >=20"

diff --git a/packages/json-rpc-engine/package.json b/packages/json-rpc-engine/package.json
@@ -56,9 +56,9 @@
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
   },
   "dependencies": {
-    "@metamask/rpc-errors": "^7.0.0",
+    "@metamask/rpc-errors": "^7.0.1",
     "@metamask/safe-event-emitter": "^3.0.0",
-    "@metamask/utils": "^9.1.0"
+    "@metamask/utils": "^10.0.0"
   },
   "devDependencies": {
     "@lavamoat/allow-scripts": "^3.0.4",

diff --git a/packages/json-rpc-middleware-stream/package.json b/packages/json-rpc-middleware-stream/package.json
@@ -49,7 +49,7 @@
   "dependencies": {
     "@metamask/json-rpc-engine": "^10.0.0",
     "@metamask/safe-event-emitter": "^3.0.0",
-    "@metamask/utils": "^9.1.0",
+    "@metamask/utils": "^10.0.0",
     "readable-stream": "^3.6.2"
   },
   "devDependencies": {

diff --git a/packages/keyring-controller/package.json b/packages/keyring-controller/package.json
@@ -56,7 +56,7 @@
     "@metamask/eth-simple-keyring": "^6.0.5",
     "@metamask/keyring-api": "^8.1.3",
     "@metamask/message-manager": "^11.0.0",
-    "@metamask/utils": "^9.1.0",
+    "@metamask/utils": "^10.0.0",
     "async-mutex": "^0.5.0",
     "ethereumjs-wallet": "^1.0.1",
     "immer": "^9.0.6"

diff --git a/packages/message-manager/package.json b/packages/message-manager/package.json
@@ -50,7 +50,7 @@
     "@metamask/base-controller": "^7.0.1",
     "@metamask/controller-utils": "^11.4.0",
     "@metamask/eth-sig-util": "^8.0.0",
-    "@metamask/utils": "^9.1.0",
+    "@metamask/utils": "^10.0.0",
     "@types/uuid": "^8.3.0",
     "jsonschema": "^1.2.4",
     "uuid": "^8.3.2"

diff --git a/packages/name-controller/package.json b/packages/name-controller/package.json
@@ -50,7 +50,7 @@
   "dependencies": {
     "@metamask/base-controller": "^7.0.1",
     "@metamask/controller-utils": "^11.4.0",
-    "@metamask/utils": "^9.1.0",
+    "@metamask/utils": "^10.0.0",
     "async-mutex": "^0.5.0"
   },
   "devDependencies": {

diff --git a/packages/network-controller/CHANGELOG.md b/packages/network-controller/CHANGELOG.md
@@ -7,7 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [21.1.0]
+## [22.0.0]
+
+### Changed
+
+- Corrects the previous 21.1.0 release to document breaking changes that were missed:
+  - **BREAKING:** Bump `@metamask/eth-block-tracker` from `^10.0.0` to `^11.0.2` ([#4769](https://github.com/MetaMask/core/pull/4769))
+  - **BREAKING:** Bump `@metamask/eth-json-rpc-middleware` from `^13.0.0` to `^15.0.0` ([#4769](https://github.com/MetaMask/core/pull/4769))
+  - **BREAKING:** Bump `@metamask/json-rpc-engine` from `^9.0.3` to `^10.0.0` ([#4769](https://github.com/MetaMask/core/pull/4769))
+  - **BREAKING:** Bump `@metamask/rpc-errors` from `^6.3.1` to `^7.0.0` ([#4769](https://github.com/MetaMask/core/pull/4769))
+  - **BREAKING:** Bump `@metamask/eth-json-rpc-infura` from `^9.1.0` to `^10.0.0` ([#4769](https://github.com/MetaMask/core/pull/4769))
+  - Bump `@metamask/eth-json-rpc-provider` from `^4.1.4` to `^4.1.5` ([#4798](https://github.com/MetaMask/core/pull/4798))
+    - This update was recorded in the v21.1.0 changelog, but is listed here again because that release has been deprecated.
+- Bump `@metamask/controller-utils` from `^11.3.0` to `^11.4.0` ([#4834](https://github.com/MetaMask/core/pull/4834))
+
+## [21.1.0] [DEPRECATED]
 
 ### Changed
 
@@ -629,7 +643,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/network-controller@21.1.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/network-controller@22.0.0...HEAD
+[22.0.0]: https://github.com/MetaMask/core/compare/@metamask/network-controller@21.1.0...@metamask/network-controller@22.0.0
 [21.1.0]: https://github.com/MetaMask/core/compare/@metamask/network-controller@21.0.1...@metamask/network-controller@21.1.0
 [21.0.1]: https://github.com/MetaMask/core/compare/@metamask/network-controller@21.0.0...@metamask/network-controller@21.0.1
 [21.0.0]: https://github.com/MetaMask/core/compare/@metamask/network-controller@20.2.0...@metamask/network-controller@21.0.0