From ce8af03c1f047753d3e273431737e8b8415b77e2 Mon Sep 17 00:00:00 2001 From: legobeat <109787230+legobeat@users.noreply.github.com> Date: Wed, 23 Oct 2024 09:18:58 +0000 Subject: [PATCH 01/11] feat(controller-utils): support BigNumber as input to BNToHex (#4827) --- packages/controller-utils/package.json | 1 + packages/controller-utils/src/util.test.ts | 2 ++ packages/controller-utils/src/util.ts | 9 ++++++--- yarn.lock | 22 ++++++++++++++++------ 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/packages/controller-utils/package.json b/packages/controller-utils/package.json index 5a9ea4b503..aaca496416 100644 --- a/packages/controller-utils/package.json +++ b/packages/controller-utils/package.json @@ -60,6 +60,7 @@ "devDependencies": { "@metamask/auto-changelog": "^3.4.4", "@types/jest": "^27.4.1", + "bignumber.js": "^4.1.0", "deepmerge": "^4.2.2", "jest": "^27.5.1", "nock": "^13.3.1", diff --git a/packages/controller-utils/src/util.test.ts b/packages/controller-utils/src/util.test.ts index a28cc2df18..4398cb8a20 100644 --- a/packages/controller-utils/src/util.test.ts +++ b/packages/controller-utils/src/util.test.ts @@ -1,4 +1,5 @@ import EthQuery from '@metamask/eth-query'; +import BigNumber from 'bignumber.js'; import BN from 'bn.js'; import nock from 'nock'; @@ -31,6 +32,7 @@ describe('util', () => { it('bNToHex', () => { expect(util.BNToHex(new BN('1337'))).toBe('0x539'); + expect(util.BNToHex(new BigNumber('1337'))).toBe('0x539'); }); it('fractionBN', () => { diff --git a/packages/controller-utils/src/util.ts b/packages/controller-utils/src/util.ts index 4d53b069d9..14b41caedb 100644 --- a/packages/controller-utils/src/util.ts +++ b/packages/controller-utils/src/util.ts @@ -8,12 +8,15 @@ import { isHexString, remove0x, } from '@metamask/utils'; +import type { BigNumber } from 'bignumber.js'; import BN from 'bn.js'; import ensNamehash from 'eth-ens-namehash'; import deepEqual from 'fast-deep-equal'; import { MAX_SAFE_CHAIN_ID } from './constants'; +export type { BigNumber }; + const TIMEOUT_ERROR = new Error('timeout'); export const PROTOTYPE_POLLUTION_BLOCKLIST = [ @@ -59,14 +62,14 @@ export function isSafeChainId(chainId: Hex): boolean { ); } /** - * Converts a BN object to a hex string with a '0x' prefix. + * Converts a BN or BigNumber object to a hex string with a '0x' prefix. * - * @param inputBn - BN instance to convert to a hex string. + * @param inputBn - BN|BigNumber instance to convert to a hex string. * @returns A '0x'-prefixed hex string. */ // TODO: Either fix this lint violation or explain why it's necessary to ignore. // eslint-disable-next-line @typescript-eslint/naming-convention -export function BNToHex(inputBn: BN) { +export function BNToHex(inputBn: BN | BigNumber) { return add0x(inputBn.toString(16)); } diff --git a/yarn.lock b/yarn.lock index 6106761bbb..4c23519519 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2339,6 +2339,7 @@ __metadata: "@spruceid/siwe-parser": "npm:2.1.0" "@types/bn.js": "npm:^5.1.5" "@types/jest": "npm:^27.4.1" + bignumber.js: "npm:^4.1.0" bn.js: "npm:^5.2.1" deepmerge: "npm:^4.2.2" eth-ens-namehash: "npm:^2.0.8" @@ -6392,7 +6393,7 @@ __metadata: languageName: node linkType: hard -"elliptic@npm:^6.5.4, elliptic@npm:^6.5.7": +"elliptic@npm:^6.5.7": version: 6.5.7 resolution: "elliptic@npm:6.5.7" dependencies: @@ -10073,6 +10074,15 @@ __metadata: languageName: node linkType: hard +"node-addon-api@npm:^5.0.0": + version: 5.1.0 + resolution: "node-addon-api@npm:5.1.0" + dependencies: + node-gyp: "npm:latest" + checksum: 10/595f59ffb4630564f587c502119cbd980d302e482781021f3b479f5fc7e41cf8f2f7280fdc2795f32d148e4f3259bd15043c52d4a3442796aa6f1ae97b959636 + languageName: node + linkType: hard + "node-fetch@npm:^2.6.1": version: 2.7.0 resolution: "node-fetch@npm:2.7.0" @@ -11199,14 +11209,14 @@ __metadata: linkType: hard "secp256k1@npm:^4.0.0, secp256k1@npm:^4.0.1": - version: 4.0.3 - resolution: "secp256k1@npm:4.0.3" + version: 4.0.4 + resolution: "secp256k1@npm:4.0.4" dependencies: - elliptic: "npm:^6.5.4" - node-addon-api: "npm:^2.0.0" + elliptic: "npm:^6.5.7" + node-addon-api: "npm:^5.0.0" node-gyp: "npm:latest" node-gyp-build: "npm:^4.2.0" - checksum: 10/8b45820cd90fd2f95cc8fdb9bf8a71e572de09f2311911ae461a951ffa9e30c99186a129d0f1afeb380dd67eca0c10493f8a7513c39063fda015e99995088e3b + checksum: 10/45000f348c853df7c1e2b67c48efb062ae78c0620ab1a5cfb02fa20d3aad39c641f4e7a18b3de3b54a7c0cc1e0addeb8ecd9d88bc332e92df17a92b60c36122a languageName: node linkType: hard From 3d44c2bd047d3b1d76cf4d2c0f11fde2d966f9aa Mon Sep 17 00:00:00 2001 From: legobeat <109787230+legobeat@users.noreply.github.com> Date: Wed, 23 Oct 2024 09:31:21 +0000 Subject: [PATCH 02/11] deps(notification-services-controller): bignumber.js@^4.1.0->^9.1.2 (#4828) --- packages/controller-utils/package.json | 2 +- .../notification-services-controller/package.json | 2 +- yarn.lock | 13 +++---------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/packages/controller-utils/package.json b/packages/controller-utils/package.json index aaca496416..994bcc8d97 100644 --- a/packages/controller-utils/package.json +++ b/packages/controller-utils/package.json @@ -60,7 +60,7 @@ "devDependencies": { "@metamask/auto-changelog": "^3.4.4", "@types/jest": "^27.4.1", - "bignumber.js": "^4.1.0", + "bignumber.js": "^9.1.2", "deepmerge": "^4.2.2", "jest": "^27.5.1", "nock": "^13.3.1", diff --git a/packages/notification-services-controller/package.json b/packages/notification-services-controller/package.json index 77ab65da62..f71d182862 100644 --- a/packages/notification-services-controller/package.json +++ b/packages/notification-services-controller/package.json @@ -103,7 +103,7 @@ "@metamask/base-controller": "^7.0.1", "@metamask/controller-utils": "^11.3.0", "@metamask/utils": "^9.1.0", - "bignumber.js": "^4.1.0", + "bignumber.js": "^9.1.2", "firebase": "^10.11.0", "loglevel": "^1.8.1", "uuid": "^8.3.2" diff --git a/yarn.lock b/yarn.lock index 4c23519519..01b702dc8e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2339,7 +2339,7 @@ __metadata: "@spruceid/siwe-parser": "npm:2.1.0" "@types/bn.js": "npm:^5.1.5" "@types/jest": "npm:^27.4.1" - bignumber.js: "npm:^4.1.0" + bignumber.js: "npm:^9.1.2" bn.js: "npm:^5.2.1" deepmerge: "npm:^4.2.2" eth-ens-namehash: "npm:^2.0.8" @@ -3130,7 +3130,7 @@ __metadata: "@metamask/utils": "npm:^9.1.0" "@types/jest": "npm:^27.4.1" "@types/readable-stream": "npm:^2.3.0" - bignumber.js: "npm:^4.1.0" + bignumber.js: "npm:^9.1.2" contentful: "npm:^10.15.0" deepmerge: "npm:^4.2.2" firebase: "npm:^10.11.0" @@ -5349,14 +5349,7 @@ __metadata: languageName: node linkType: hard -"bignumber.js@npm:^4.1.0": - version: 4.1.0 - resolution: "bignumber.js@npm:4.1.0" - checksum: 10/b9a1761dd3c46ae2af44fb7c4c5587c57ba6815e6b4212c36f404984203866be01dd86a9882b2c65ebbed2625ed794c57a7955d78449ba1787843c3c8b556bc2 - languageName: node - linkType: hard - -"bignumber.js@npm:^9.0.1": +"bignumber.js@npm:^9.0.1, bignumber.js@npm:^9.1.2": version: 9.1.2 resolution: "bignumber.js@npm:9.1.2" checksum: 10/d89b8800a987225d2c00dcbf8a69dc08e92aa0880157c851c287b307d31ceb2fc2acb0c62c3e3a3d42b6c5fcae9b004035f13eb4386e56d529d7edac18d5c9d8 From e16afc36cb1c22c2e1fce0e1b5cef0727a3623c2 Mon Sep 17 00:00:00 2001 From: Salim TOUBAL Date: Wed, 23 Oct 2024 12:38:02 +0200 Subject: [PATCH 03/11] fix: Add useMultiRpcMigration to PreferencesController (#4732) ## Explanation **Current state:** The `PreferencesController` does not include support for two new features related to network validation and multi-RPC migration behavior. Specifically, there is no existing functionality to: 1. Control the display of the multi-RPC migration modal (`useMultiRpcMigration`). **Solution:** This PR adds two new properties to the `PreferencesController` state: - `useMultiRpcMigration`: Controls whether the multi-RPC migration modal is displayed. Along with these additions, corresponding setter methods ( `setUseMultiRpcMigration`) have been implemented. These methods allow for toggling the state of the new properties. **Additional details:** - Test cases have been added to ensure that the new properties are correctly updated in the state when their respective setter methods are invoked. - The default values for these properties have been set to `true` to maintain expected functionality for users. There were no additional package updates or dependency changes required in this PR. ## References - No specific issues or pull requests tied to this change. ## Changelog ### `@metamask/preferences-controller` - **ADDED**: Added `useMultiRpcMigration` property to the `PreferencesController` state, controlling the display of the multi-RPC migration modal. - **ADDED**: Implemented `setUseMultiRpcMigration` method to toggle the `useMultiRpcMigration` property. ## 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 - [ ] I've highlighted breaking changes using the "BREAKING" category above as appropriate - [ ] I've prepared draft pull requests for clients and consumer packages to resolve any breaking changes (N/A) --- .../src/PreferencesController.test.ts | 7 +++++++ .../src/PreferencesController.ts | 20 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/packages/preferences-controller/src/PreferencesController.test.ts b/packages/preferences-controller/src/PreferencesController.test.ts index 28cb622a53..9d9d4f05bc 100644 --- a/packages/preferences-controller/src/PreferencesController.test.ts +++ b/packages/preferences-controller/src/PreferencesController.test.ts @@ -28,6 +28,7 @@ describe('PreferencesController', () => { showTestNetworks: false, isIpfsGatewayEnabled: true, useTransactionSimulations: true, + useMultiRpcMigration: true, showIncomingTransactions: Object.values( ETHERSCAN_SUPPORTED_CHAIN_IDS, ).reduce((acc, curr) => { @@ -368,6 +369,12 @@ describe('PreferencesController', () => { ); }); + it('should set useMultiRpcMigration', () => { + const controller = setupPreferencesController(); + controller.setUseMultiRpcMigration(true); + expect(controller.state.useMultiRpcMigration).toBe(true); + }); + it('should set featureFlags', () => { const controller = setupPreferencesController(); controller.setFeatureFlag('Feature A', true); diff --git a/packages/preferences-controller/src/PreferencesController.ts b/packages/preferences-controller/src/PreferencesController.ts index a59452e47d..7f5815e7cc 100644 --- a/packages/preferences-controller/src/PreferencesController.ts +++ b/packages/preferences-controller/src/PreferencesController.ts @@ -110,6 +110,10 @@ export type PreferencesState = { * Controls whether transaction simulations are enabled */ useTransactionSimulations: boolean; + /** + * Controls whether Multi rpc modal is displayed or not + */ + useMultiRpcMigration: boolean; }; const metadata = { @@ -128,6 +132,7 @@ const metadata = { useTokenDetection: { persist: true, anonymous: true }, smartTransactionsOptInStatus: { persist: true, anonymous: false }, useTransactionSimulations: { persist: true, anonymous: true }, + useMultiRpcMigration: { persist: true, anonymous: true }, }; const name = 'PreferencesController'; @@ -197,6 +202,7 @@ export function getDefaultPreferencesState() { showTestNetworks: false, useNftDetection: false, useTokenDetection: true, + useMultiRpcMigration: true, smartTransactionsOptInStatus: false, useTransactionSimulations: true, }; @@ -483,6 +489,20 @@ export class PreferencesController extends BaseController< } } + /** + * Toggle multi rpc migration modal. + * + * @param useMultiRpcMigration - Boolean indicating if the multi rpc modal will be displayed or not. + */ + setUseMultiRpcMigration(useMultiRpcMigration: boolean) { + this.update((state) => { + state.useMultiRpcMigration = useMultiRpcMigration; + if (!useMultiRpcMigration) { + state.useMultiRpcMigration = false; + } + }); + } + /** * A setter for the user to opt into smart transactions * From 849548e9f9a50f364a938696194d7afee1c034c2 Mon Sep 17 00:00:00 2001 From: Hassan Malik <41640681+hmalik88@users.noreply.github.com> Date: Wed, 23 Oct 2024 08:10:59 -0400 Subject: [PATCH 04/11] fix: add publish event in `deleteNotificationsById` and export snap types (#4836) ## Explanation * What is the current state of things and why does it need to change? The `deleteNotificationsById` doesn't fire an event with the updated list of notifications and thus, the `updateBadge` function inside the extension is not fired. * What is the solution your changes offer and how does it work? Publish an event after notifications are deleted * Are there any changes whose purpose might not obvious to those unfamiliar with the domain? Adding export for snap types, not able to pull the type out directly otherwise. ### `@metamask/notification-services-controller` - **FIX**: The `deleteNotificationsById` function did not fire an event with the updated notifications list, this was added after the function runs through all the notifications it needs to delete. ## 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 - [x] I've prepared draft pull requests for clients and consumer packages to resolve any breaking changes --- .../NotificationServicesController.ts | 5 +++++ .../src/NotificationServicesController/types/index.ts | 1 + 2 files changed, 6 insertions(+) diff --git a/packages/notification-services-controller/src/NotificationServicesController/NotificationServicesController.ts b/packages/notification-services-controller/src/NotificationServicesController/NotificationServicesController.ts index a9b6c38b81..5a8d204e4a 100644 --- a/packages/notification-services-controller/src/NotificationServicesController/NotificationServicesController.ts +++ b/packages/notification-services-controller/src/NotificationServicesController/NotificationServicesController.ts @@ -1229,6 +1229,11 @@ export default class NotificationServicesController extends BaseController< for (const id of ids) { await this.deleteNotificationById(id); } + + this.messagingSystem.publish( + `${controllerName}:notificationsListUpdated`, + this.state.metamaskNotificationsList, + ); } /** diff --git a/packages/notification-services-controller/src/NotificationServicesController/types/index.ts b/packages/notification-services-controller/src/NotificationServicesController/types/index.ts index 1824a0e31c..af6a940f70 100644 --- a/packages/notification-services-controller/src/NotificationServicesController/types/index.ts +++ b/packages/notification-services-controller/src/NotificationServicesController/types/index.ts @@ -2,3 +2,4 @@ export * from './feature-announcement'; export * from './notification'; export * from './on-chain-notification'; export * from './user-storage'; +export * from './snaps/snaps'; From 401ba30fcae7c85326961019a7411e6cc4464cdd Mon Sep 17 00:00:00 2001 From: Salim TOUBAL Date: Wed, 23 Oct 2024 14:21:19 +0200 Subject: [PATCH 05/11] fix: should not reset market data after switch network (#4832) ## Explanation This Pull Request addresses an issue where market data would unnecessarily reset following a network switch. The purpose of this update is to ensure that market data remains intact and continues to function as expected after a network change, preventing potential data loss or disruptions in user experience ## References ## Changelog ### `@metamask/assets-controller` - **CHANGED**: Prevent market data reset after a network switch. ## Checklist - [ ] I've updated the test suite for new or updated code as appropriate - [ ] I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate - [ ] I've highlighted breaking changes using the "BREAKING" category above as appropriate - [ ] I've prepared draft pull requests for clients and consumer packages to resolve any breaking changes --- .../src/TokenRatesController.test.ts | 78 +++++++++++++++++-- .../src/TokenRatesController.ts | 8 +- 2 files changed, 74 insertions(+), 12 deletions(-) diff --git a/packages/assets-controllers/src/TokenRatesController.test.ts b/packages/assets-controllers/src/TokenRatesController.test.ts index ea51853d46..5387713024 100644 --- a/packages/assets-controllers/src/TokenRatesController.test.ts +++ b/packages/assets-controllers/src/TokenRatesController.test.ts @@ -645,7 +645,7 @@ describe('TokenRatesController', () => { ); }); - it('should update exchange rates when chain ID changes', async () => { + it('should not update exchange rates when chain ID changes', async () => { await withController( { options: { @@ -722,12 +722,18 @@ describe('TokenRatesController', () => { selectedNetworkClientId: 'AAAA-BBBB-CCCC-DDDD', }); - expect(controller.state.marketData).toStrictEqual({}); + expect(controller.state.marketData).toStrictEqual({ + '0x1': { + '0x0000000000000000000000000000000000000000': { + currency: 'ETH', + }, + }, + }); }, ); }); - it('should clear marketData state when chain ID changes', async () => { + it('should not clear marketData state when chain ID changes', async () => { await withController( { options: { @@ -776,7 +782,13 @@ describe('TokenRatesController', () => { selectedNetworkClientId: 'AAAA-BBBB-CCCC-DDDD', }); - expect(controller.state.marketData).toStrictEqual({}); + expect(controller.state.marketData).toStrictEqual({ + '0x1': { + '0x0000000000000000000000000000000000000000': { + currency: 'ETH', + }, + }, + }); }, ); }); @@ -865,7 +877,7 @@ describe('TokenRatesController', () => { ); }); - it('should clear marketData state when ticker changes', async () => { + it('should not clear marketData state when ticker changes', async () => { await withController( { options: { @@ -913,12 +925,37 @@ describe('TokenRatesController', () => { selectedNetworkClientId: 'AAAA-BBBB-CCCC-DDDD', }); - expect(controller.state.marketData).toStrictEqual({}); + expect(controller.state.marketData).toStrictEqual({ + '0x1': { + '0x02': { + currency: 'ETH', + priceChange1d: 0, + pricePercentChange1d: 0, + tokenAddress: '0x02', + allTimeHigh: 4000, + allTimeLow: 900, + circulatingSupply: 2000, + dilutedMarketCap: 100, + high1d: 200, + low1d: 100, + marketCap: 1000, + marketCapPercentChange1d: 100, + price: 0.001, + pricePercentChange14d: 100, + pricePercentChange1h: 1, + pricePercentChange1y: 200, + pricePercentChange200d: 300, + pricePercentChange30d: 200, + pricePercentChange7d: 100, + totalVolume: 100, + }, + }, + }); }, ); }); - it('should clear marketData state when chain ID changes', async () => { + it('should not clear marketData state when chain ID changes', async () => { await withController( { options: { @@ -966,7 +1003,32 @@ describe('TokenRatesController', () => { selectedNetworkClientId: 'AAAA-BBBB-CCCC-DDDD', }); - expect(controller.state.marketData).toStrictEqual({}); + expect(controller.state.marketData).toStrictEqual({ + '0x1': { + '0x02': { + currency: 'ETH', + priceChange1d: 0, + pricePercentChange1d: 0, + tokenAddress: '0x02', + allTimeHigh: 4000, + allTimeLow: 900, + circulatingSupply: 2000, + dilutedMarketCap: 100, + high1d: 200, + low1d: 100, + marketCap: 1000, + marketCapPercentChange1d: 100, + price: 0.001, + pricePercentChange14d: 100, + pricePercentChange1h: 1, + pricePercentChange1y: 200, + pricePercentChange200d: 300, + pricePercentChange30d: 200, + pricePercentChange7d: 100, + totalVolume: 100, + }, + }, + }); }, ); }); diff --git a/packages/assets-controllers/src/TokenRatesController.ts b/packages/assets-controllers/src/TokenRatesController.ts index 6632e3635d..52d51b0d3f 100644 --- a/packages/assets-controllers/src/TokenRatesController.ts +++ b/packages/assets-controllers/src/TokenRatesController.ts @@ -346,9 +346,6 @@ export class TokenRatesController extends StaticIntervalPollingController { - state.marketData = {}; - }); this.#chainId = chainId; this.#ticker = ticker; if (this.#pollState === PollState.Active) { @@ -531,7 +528,10 @@ export class TokenRatesController extends StaticIntervalPollingController { - state.marketData = marketData; + state.marketData = { + ...state.marketData, + ...marketData, + }; }); updateSucceeded(); } catch (error: unknown) { From dc045a2a39b4457a143c07bf09f932d682bd1ff6 Mon Sep 17 00:00:00 2001 From: Brian Bergeron Date: Wed, 23 Oct 2024 07:59:28 -0700 Subject: [PATCH 06/11] Release 226.0.0 (#4834) Release of controller utils package to include https://github.com/MetaMask/core/pull/4811 --------- Co-authored-by: cryptodev-2s <109512101+cryptodev-2s@users.noreply.github.com> --- examples/example-controllers/package.json | 2 +- package.json | 2 +- packages/address-book-controller/package.json | 2 +- packages/assets-controllers/package.json | 2 +- packages/controller-utils/CHANGELOG.md | 9 ++++- packages/controller-utils/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/name-controller/package.json | 2 +- packages/network-controller/package.json | 2 +- .../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 +- .../queued-request-controller/package.json | 2 +- packages/signature-controller/package.json | 2 +- packages/transaction-controller/package.json | 2 +- .../user-operation-controller/package.json | 2 +- yarn.lock | 38 +++++++++---------- 22 files changed, 47 insertions(+), 40 deletions(-) diff --git a/examples/example-controllers/package.json b/examples/example-controllers/package.json index fdbb22410c..95fe83bdd0 100644 --- a/examples/example-controllers/package.json +++ b/examples/example-controllers/package.json @@ -52,7 +52,7 @@ }, "devDependencies": { "@metamask/auto-changelog": "^3.4.4", - "@metamask/controller-utils": "^11.3.0", + "@metamask/controller-utils": "^11.4.0", "@types/jest": "^27.4.1", "deepmerge": "^4.2.2", "jest": "^27.5.1", diff --git a/package.json b/package.json index d8fbd301dd..f486be3999 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@metamask/core-monorepo", - "version": "225.0.0", + "version": "226.0.0", "private": true, "description": "Monorepo for packages shared between MetaMask clients", "repository": { diff --git a/packages/address-book-controller/package.json b/packages/address-book-controller/package.json index 61a461b10b..430f9c4e0e 100644 --- a/packages/address-book-controller/package.json +++ b/packages/address-book-controller/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@metamask/base-controller": "^7.0.1", - "@metamask/controller-utils": "^11.3.0", + "@metamask/controller-utils": "^11.4.0", "@metamask/utils": "^9.1.0" }, "devDependencies": { diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json index e69368eccd..4bbde82fba 100644 --- a/packages/assets-controllers/package.json +++ b/packages/assets-controllers/package.json @@ -55,7 +55,7 @@ "@metamask/abi-utils": "^2.0.3", "@metamask/base-controller": "^7.0.1", "@metamask/contract-metadata": "^2.4.0", - "@metamask/controller-utils": "^11.3.0", + "@metamask/controller-utils": "^11.4.0", "@metamask/eth-query": "^4.0.0", "@metamask/metamask-eth-abis": "^3.1.1", "@metamask/polling-controller": "^11.0.0", diff --git a/packages/controller-utils/CHANGELOG.md b/packages/controller-utils/CHANGELOG.md index 6b89c6f357..0884fe89cf 100644 --- a/packages/controller-utils/CHANGELOG.md +++ b/packages/controller-utils/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [11.4.0] + +### Added + +- Add `isEqualCaseInsensitive` function for case-insensitive string comparison ([#4811](https://github.com/MetaMask/core/pull/4811)) + ## [11.3.0] ### Added @@ -400,7 +406,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@11.3.0...HEAD +[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/controller-utils@11.4.0...HEAD +[11.4.0]: https://github.com/MetaMask/core/compare/@metamask/controller-utils@11.3.0...@metamask/controller-utils@11.4.0 [11.3.0]: https://github.com/MetaMask/core/compare/@metamask/controller-utils@11.2.0...@metamask/controller-utils@11.3.0 [11.2.0]: https://github.com/MetaMask/core/compare/@metamask/controller-utils@11.1.0...@metamask/controller-utils@11.2.0 [11.1.0]: https://github.com/MetaMask/core/compare/@metamask/controller-utils@11.0.2...@metamask/controller-utils@11.1.0 diff --git a/packages/controller-utils/package.json b/packages/controller-utils/package.json index 994bcc8d97..16beed744a 100644 --- a/packages/controller-utils/package.json +++ b/packages/controller-utils/package.json @@ -1,6 +1,6 @@ { "name": "@metamask/controller-utils", - "version": "11.3.0", + "version": "11.4.0", "description": "Data and convenience functions shared by multiple packages", "keywords": [ "MetaMask", diff --git a/packages/ens-controller/package.json b/packages/ens-controller/package.json index 3fda8cda72..629d9cf0c3 100644 --- a/packages/ens-controller/package.json +++ b/packages/ens-controller/package.json @@ -49,7 +49,7 @@ "dependencies": { "@ethersproject/providers": "^5.7.0", "@metamask/base-controller": "^7.0.1", - "@metamask/controller-utils": "^11.3.0", + "@metamask/controller-utils": "^11.4.0", "@metamask/utils": "^9.1.0", "punycode": "^2.1.1" }, diff --git a/packages/gas-fee-controller/package.json b/packages/gas-fee-controller/package.json index a4a9f16a0d..34d8e7f38e 100644 --- a/packages/gas-fee-controller/package.json +++ b/packages/gas-fee-controller/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@metamask/base-controller": "^7.0.1", - "@metamask/controller-utils": "^11.3.0", + "@metamask/controller-utils": "^11.4.0", "@metamask/eth-query": "^4.0.0", "@metamask/ethjs-unit": "^0.3.0", "@metamask/polling-controller": "^11.0.0", diff --git a/packages/logging-controller/package.json b/packages/logging-controller/package.json index 2ee5a020fd..c6eaeeba67 100644 --- a/packages/logging-controller/package.json +++ b/packages/logging-controller/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@metamask/base-controller": "^7.0.1", - "@metamask/controller-utils": "^11.3.0", + "@metamask/controller-utils": "^11.4.0", "uuid": "^8.3.2" }, "devDependencies": { diff --git a/packages/message-manager/package.json b/packages/message-manager/package.json index e4711ed242..bccf1e54f8 100644 --- a/packages/message-manager/package.json +++ b/packages/message-manager/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@metamask/base-controller": "^7.0.1", - "@metamask/controller-utils": "^11.3.0", + "@metamask/controller-utils": "^11.4.0", "@metamask/eth-sig-util": "^8.0.0", "@metamask/utils": "^9.1.0", "@types/uuid": "^8.3.0", diff --git a/packages/name-controller/package.json b/packages/name-controller/package.json index 0645926d3d..133db27b3d 100644 --- a/packages/name-controller/package.json +++ b/packages/name-controller/package.json @@ -49,7 +49,7 @@ }, "dependencies": { "@metamask/base-controller": "^7.0.1", - "@metamask/controller-utils": "^11.3.0", + "@metamask/controller-utils": "^11.4.0", "@metamask/utils": "^9.1.0", "async-mutex": "^0.5.0" }, diff --git a/packages/network-controller/package.json b/packages/network-controller/package.json index 04fbefc982..40574eb3c8 100644 --- a/packages/network-controller/package.json +++ b/packages/network-controller/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@metamask/base-controller": "^7.0.1", - "@metamask/controller-utils": "^11.3.0", + "@metamask/controller-utils": "^11.4.0", "@metamask/eth-block-tracker": "^11.0.2", "@metamask/eth-json-rpc-infura": "^10.0.0", "@metamask/eth-json-rpc-middleware": "^15.0.0", diff --git a/packages/notification-services-controller/package.json b/packages/notification-services-controller/package.json index f71d182862..8cf421da3c 100644 --- a/packages/notification-services-controller/package.json +++ b/packages/notification-services-controller/package.json @@ -101,7 +101,7 @@ "dependencies": { "@contentful/rich-text-html-renderer": "^16.5.2", "@metamask/base-controller": "^7.0.1", - "@metamask/controller-utils": "^11.3.0", + "@metamask/controller-utils": "^11.4.0", "@metamask/utils": "^9.1.0", "bignumber.js": "^9.1.2", "firebase": "^10.11.0", diff --git a/packages/permission-controller/package.json b/packages/permission-controller/package.json index 76f9b434ff..01ebce13b7 100644 --- a/packages/permission-controller/package.json +++ b/packages/permission-controller/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@metamask/base-controller": "^7.0.1", - "@metamask/controller-utils": "^11.3.0", + "@metamask/controller-utils": "^11.4.0", "@metamask/json-rpc-engine": "^10.0.0", "@metamask/rpc-errors": "^7.0.0", "@metamask/utils": "^9.1.0", diff --git a/packages/phishing-controller/package.json b/packages/phishing-controller/package.json index ee46f85113..3378d7f7d9 100644 --- a/packages/phishing-controller/package.json +++ b/packages/phishing-controller/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@metamask/base-controller": "^7.0.1", - "@metamask/controller-utils": "^11.3.0", + "@metamask/controller-utils": "^11.4.0", "@noble/hashes": "^1.4.0", "@types/punycode": "^2.1.0", "ethereum-cryptography": "^2.1.2", diff --git a/packages/polling-controller/package.json b/packages/polling-controller/package.json index 684835767a..aac2c01399 100644 --- a/packages/polling-controller/package.json +++ b/packages/polling-controller/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@metamask/base-controller": "^7.0.1", - "@metamask/controller-utils": "^11.3.0", + "@metamask/controller-utils": "^11.4.0", "@metamask/utils": "^9.1.0", "@types/uuid": "^8.3.0", "fast-json-stable-stringify": "^2.1.0", diff --git a/packages/preferences-controller/package.json b/packages/preferences-controller/package.json index 82f6a6ccae..6be6bd1425 100644 --- a/packages/preferences-controller/package.json +++ b/packages/preferences-controller/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@metamask/base-controller": "^7.0.1", - "@metamask/controller-utils": "^11.3.0" + "@metamask/controller-utils": "^11.4.0" }, "devDependencies": { "@metamask/auto-changelog": "^3.4.4", diff --git a/packages/queued-request-controller/package.json b/packages/queued-request-controller/package.json index b80970fbcd..580f6feed2 100644 --- a/packages/queued-request-controller/package.json +++ b/packages/queued-request-controller/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@metamask/base-controller": "^7.0.1", - "@metamask/controller-utils": "^11.3.0", + "@metamask/controller-utils": "^11.4.0", "@metamask/json-rpc-engine": "^10.0.0", "@metamask/rpc-errors": "^7.0.0", "@metamask/swappable-obj-proxy": "^2.2.0", diff --git a/packages/signature-controller/package.json b/packages/signature-controller/package.json index 81480a4203..204e116041 100644 --- a/packages/signature-controller/package.json +++ b/packages/signature-controller/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@metamask/base-controller": "^7.0.1", - "@metamask/controller-utils": "^11.3.0", + "@metamask/controller-utils": "^11.4.0", "@metamask/eth-sig-util": "^8.0.0", "@metamask/utils": "^9.1.0", "jsonschema": "^1.2.4", diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json index 49c19a2b65..884c708931 100644 --- a/packages/transaction-controller/package.json +++ b/packages/transaction-controller/package.json @@ -54,7 +54,7 @@ "@ethersproject/contracts": "^5.7.0", "@ethersproject/providers": "^5.7.0", "@metamask/base-controller": "^7.0.1", - "@metamask/controller-utils": "^11.3.0", + "@metamask/controller-utils": "^11.4.0", "@metamask/eth-query": "^4.0.0", "@metamask/metamask-eth-abis": "^3.1.1", "@metamask/nonce-tracker": "^6.0.0", diff --git a/packages/user-operation-controller/package.json b/packages/user-operation-controller/package.json index b04c11196b..e0b6dcad68 100644 --- a/packages/user-operation-controller/package.json +++ b/packages/user-operation-controller/package.json @@ -49,7 +49,7 @@ }, "dependencies": { "@metamask/base-controller": "^7.0.1", - "@metamask/controller-utils": "^11.3.0", + "@metamask/controller-utils": "^11.4.0", "@metamask/eth-query": "^4.0.0", "@metamask/polling-controller": "^11.0.0", "@metamask/rpc-errors": "^7.0.0", diff --git a/yarn.lock b/yarn.lock index 01b702dc8e..d9ff8aa0ab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2075,7 +2075,7 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/controller-utils": "npm:^11.4.0" "@metamask/utils": "npm:^9.1.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" @@ -2138,7 +2138,7 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" "@metamask/contract-metadata": "npm:^2.4.0" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/controller-utils": "npm:^11.4.0" "@metamask/eth-query": "npm:^4.0.0" "@metamask/ethjs-provider-http": "npm:^0.3.0" "@metamask/keyring-api": "npm:^8.1.3" @@ -2327,7 +2327,7 @@ __metadata: languageName: node linkType: hard -"@metamask/controller-utils@npm:^11.3.0, @metamask/controller-utils@workspace:packages/controller-utils": +"@metamask/controller-utils@npm:^11.4.0, @metamask/controller-utils@workspace:packages/controller-utils": version: 0.0.0-use.local resolution: "@metamask/controller-utils@workspace:packages/controller-utils" dependencies: @@ -2436,7 +2436,7 @@ __metadata: "@ethersproject/providers": "npm:^5.7.0" "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/controller-utils": "npm:^11.4.0" "@metamask/network-controller": "npm:^21.1.0" "@metamask/utils": "npm:^9.1.0" "@types/jest": "npm:^27.4.1" @@ -2803,7 +2803,7 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/controller-utils": "npm:^11.4.0" "@metamask/utils": "npm:^9.1.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" @@ -2822,7 +2822,7 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/controller-utils": "npm:^11.4.0" "@metamask/eth-query": "npm:^4.0.0" "@metamask/ethjs-unit": "npm:^0.3.0" "@metamask/network-controller": "npm:^21.1.0" @@ -2972,7 +2972,7 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/controller-utils": "npm:^11.4.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" jest: "npm:^27.5.1" @@ -2990,7 +2990,7 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/controller-utils": "npm:^11.4.0" "@metamask/eth-sig-util": "npm:^8.0.0" "@metamask/utils": "npm:^9.1.0" "@types/jest": "npm:^27.4.1" @@ -3034,7 +3034,7 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/controller-utils": "npm:^11.4.0" "@metamask/utils": "npm:^9.1.0" "@types/jest": "npm:^27.4.1" async-mutex: "npm:^0.5.0" @@ -3054,7 +3054,7 @@ __metadata: "@json-rpc-specification/meta-schema": "npm:^1.0.6" "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/controller-utils": "npm:^11.4.0" "@metamask/eth-block-tracker": "npm:^11.0.2" "@metamask/eth-json-rpc-infura": "npm:^10.0.0" "@metamask/eth-json-rpc-middleware": "npm:^15.0.0" @@ -3124,7 +3124,7 @@ __metadata: "@lavamoat/allow-scripts": "npm:^3.0.4" "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/controller-utils": "npm:^11.4.0" "@metamask/keyring-controller": "npm:^17.3.0" "@metamask/profile-sync-controller": "npm:^0.9.7" "@metamask/utils": "npm:^9.1.0" @@ -3186,7 +3186,7 @@ __metadata: "@metamask/approval-controller": "npm:^7.1.0" "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/controller-utils": "npm:^11.4.0" "@metamask/json-rpc-engine": "npm:^10.0.0" "@metamask/rpc-errors": "npm:^7.0.0" "@metamask/utils": "npm:^9.1.0" @@ -3233,7 +3233,7 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/controller-utils": "npm:^11.4.0" "@noble/hashes": "npm:^1.4.0" "@types/jest": "npm:^27.4.1" "@types/punycode": "npm:^2.1.0" @@ -3257,7 +3257,7 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/controller-utils": "npm:^11.4.0" "@metamask/network-controller": "npm:^21.1.0" "@metamask/utils": "npm:^9.1.0" "@types/jest": "npm:^27.4.1" @@ -3292,7 +3292,7 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/controller-utils": "npm:^11.4.0" "@metamask/keyring-controller": "npm:^17.3.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" @@ -3370,7 +3370,7 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/controller-utils": "npm:^11.4.0" "@metamask/json-rpc-engine": "npm:^10.0.0" "@metamask/network-controller": "npm:^21.1.0" "@metamask/rpc-errors": "npm:^7.0.0" @@ -3484,7 +3484,7 @@ __metadata: "@metamask/approval-controller": "npm:^7.1.0" "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/controller-utils": "npm:^11.4.0" "@metamask/eth-sig-util": "npm:^8.0.0" "@metamask/keyring-controller": "npm:^17.3.0" "@metamask/logging-controller": "npm:^6.0.1" @@ -3689,7 +3689,7 @@ __metadata: "@metamask/approval-controller": "npm:^7.1.0" "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/controller-utils": "npm:^11.4.0" "@metamask/eth-json-rpc-provider": "npm:^4.1.5" "@metamask/eth-query": "npm:^4.0.0" "@metamask/ethjs-provider-http": "npm:^0.3.0" @@ -3734,7 +3734,7 @@ __metadata: "@metamask/approval-controller": "npm:^7.1.0" "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/controller-utils": "npm:^11.4.0" "@metamask/eth-query": "npm:^4.0.0" "@metamask/gas-fee-controller": "npm:^21.0.0" "@metamask/keyring-controller": "npm:^17.3.0" From cd3ba52bc1d552c2697da8b56ccab7ed745f9a85 Mon Sep 17 00:00:00 2001 From: Hassan Malik <41640681+hmalik88@users.noreply.github.com> Date: Wed, 23 Oct 2024 11:39:46 -0400 Subject: [PATCH 07/11] Release/227.0.0 (#4840) Releasing `@metamask/notification-services-controller` to include https://github.com/MetaMask/core/pull/4836 --- package.json | 2 +- .../notification-services-controller/CHANGELOG.md | 13 ++++++++++++- .../notification-services-controller/package.json | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index f486be3999..02cd309317 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@metamask/core-monorepo", - "version": "226.0.0", + "version": "227.0.0", "private": true, "description": "Monorepo for packages shared between MetaMask clients", "repository": { diff --git a/packages/notification-services-controller/CHANGELOG.md b/packages/notification-services-controller/CHANGELOG.md index bb017925bc..595139e813 100644 --- a/packages/notification-services-controller/CHANGELOG.md +++ b/packages/notification-services-controller/CHANGELOG.md @@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.12.0] + +### Added + +- Export snap types ([#4836](https://github.com/MetaMask/core/pull/4836)) + +### Fixed + +- fix: add publish event in `deleteNotificationsById` ([#4836](https://github.com/MetaMask/core/pull/4836)) + ## [0.11.0] ### Added @@ -220,7 +230,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Initial release -[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/notification-services-controller@0.11.0...HEAD +[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/notification-services-controller@0.12.0...HEAD +[0.12.0]: https://github.com/MetaMask/core/compare/@metamask/notification-services-controller@0.11.0...@metamask/notification-services-controller@0.12.0 [0.11.0]: https://github.com/MetaMask/core/compare/@metamask/notification-services-controller@0.10.0...@metamask/notification-services-controller@0.11.0 [0.10.0]: https://github.com/MetaMask/core/compare/@metamask/notification-services-controller@0.9.0...@metamask/notification-services-controller@0.10.0 [0.9.0]: https://github.com/MetaMask/core/compare/@metamask/notification-services-controller@0.8.2...@metamask/notification-services-controller@0.9.0 diff --git a/packages/notification-services-controller/package.json b/packages/notification-services-controller/package.json index 8cf421da3c..7edc9dccaf 100644 --- a/packages/notification-services-controller/package.json +++ b/packages/notification-services-controller/package.json @@ -1,6 +1,6 @@ { "name": "@metamask/notification-services-controller", - "version": "0.11.0", + "version": "0.12.0", "description": "Manages New MetaMask decentralized Notification system", "keywords": [ "MetaMask", From 7898e35344ce83889abba9174a0ac73d88dd25f2 Mon Sep 17 00:00:00 2001 From: Brian Bergeron Date: Wed, 23 Oct 2024 11:27:47 -0700 Subject: [PATCH 08/11] Release 228.0.0 (#4841) Releases the network controller to document changes that were missed in the previous release. ### Changed - **BREAKING:** Bump `@metamask/network-controller` peer dependency from `^21.0.0` to `^22.0.0` ([#4841](https://github.com/MetaMask/core/pull/4841)) --------- Co-authored-by: Jongsun Suh --- package.json | 2 +- packages/assets-controllers/CHANGELOG.md | 4 +++ packages/assets-controllers/package.json | 4 +-- packages/ens-controller/CHANGELOG.md | 4 +++ packages/ens-controller/package.json | 4 +-- packages/gas-fee-controller/CHANGELOG.md | 4 +++ packages/gas-fee-controller/package.json | 4 +-- packages/network-controller/CHANGELOG.md | 19 ++++++++-- packages/network-controller/package.json | 2 +- packages/polling-controller/CHANGELOG.md | 4 +++ packages/polling-controller/package.json | 4 +-- packages/profile-sync-controller/CHANGELOG.md | 4 +++ packages/profile-sync-controller/package.json | 2 +- .../queued-request-controller/CHANGELOG.md | 4 +++ .../queued-request-controller/package.json | 4 +-- .../selected-network-controller/CHANGELOG.md | 4 +++ .../selected-network-controller/package.json | 4 +-- packages/transaction-controller/CHANGELOG.md | 4 +++ packages/transaction-controller/package.json | 4 +-- .../user-operation-controller/CHANGELOG.md | 4 +++ .../user-operation-controller/package.json | 4 +-- yarn.lock | 36 +++++++++---------- 22 files changed, 90 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index 02cd309317..a54b5db36c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@metamask/core-monorepo", - "version": "227.0.0", + "version": "228.0.0", "private": true, "description": "Monorepo for packages shared between MetaMask clients", "repository": { diff --git a/packages/assets-controllers/CHANGELOG.md b/packages/assets-controllers/CHANGELOG.md index 4a165bb292..515acf411b 100644 --- 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 index 4bbde82fba..b9d1d2c4c8 100644 --- a/packages/assets-controllers/package.json +++ b/packages/assets-controllers/package.json @@ -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/ens-controller/CHANGELOG.md b/packages/ens-controller/CHANGELOG.md index 39de208683..517a1bc2e1 100644 --- 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 index 629d9cf0c3..b40ca60c88 100644 --- a/packages/ens-controller/package.json +++ b/packages/ens-controller/package.json @@ -55,7 +55,7 @@ }, "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/gas-fee-controller/CHANGELOG.md b/packages/gas-fee-controller/CHANGELOG.md index 2e44b7423a..cd1204c48b 100644 --- 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 index 34d8e7f38e..03f8c04aae 100644 --- a/packages/gas-fee-controller/package.json +++ b/packages/gas-fee-controller/package.json @@ -60,7 +60,7 @@ }, "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/network-controller/CHANGELOG.md b/packages/network-controller/CHANGELOG.md index c2770f4987..a1368fa7ab 100644 --- 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 diff --git a/packages/network-controller/package.json b/packages/network-controller/package.json index 40574eb3c8..2876fb84a8 100644 --- a/packages/network-controller/package.json +++ b/packages/network-controller/package.json @@ -1,6 +1,6 @@ { "name": "@metamask/network-controller", - "version": "21.1.0", + "version": "22.0.0", "description": "Provides an interface to the currently selected network via a MetaMask-compatible provider object", "keywords": [ "MetaMask", diff --git a/packages/polling-controller/CHANGELOG.md b/packages/polling-controller/CHANGELOG.md index 82cdfe5492..8843cb8609 100644 --- a/packages/polling-controller/CHANGELOG.md +++ b/packages/polling-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)) + ## [11.0.0] ### Changed diff --git a/packages/polling-controller/package.json b/packages/polling-controller/package.json index aac2c01399..7f0151a6a8 100644 --- a/packages/polling-controller/package.json +++ b/packages/polling-controller/package.json @@ -56,7 +56,7 @@ }, "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", @@ -67,7 +67,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/profile-sync-controller/CHANGELOG.md b/packages/profile-sync-controller/CHANGELOG.md index 2df2099129..2f37045979 100644 --- a/packages/profile-sync-controller/CHANGELOG.md +++ b/packages/profile-sync-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)) + ## [0.9.7] ### Added diff --git a/packages/profile-sync-controller/package.json b/packages/profile-sync-controller/package.json index ba2e9e97fb..30c9113e53 100644 --- a/packages/profile-sync-controller/package.json +++ b/packages/profile-sync-controller/package.json @@ -115,7 +115,7 @@ "@lavamoat/allow-scripts": "^3.0.4", "@metamask/accounts-controller": "^18.2.2", "@metamask/auto-changelog": "^3.4.4", - "@metamask/network-controller": "^21.1.0", + "@metamask/network-controller": "^22.0.0", "@metamask/snaps-controllers": "^9.7.0", "@types/jest": "^27.4.1", "deepmerge": "^4.2.2", diff --git a/packages/queued-request-controller/CHANGELOG.md b/packages/queued-request-controller/CHANGELOG.md index f1abe3221f..0c9c874e0f 100644 --- a/packages/queued-request-controller/CHANGELOG.md +++ b/packages/queued-request-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)) + ## [5.1.0] ### Changed diff --git a/packages/queued-request-controller/package.json b/packages/queued-request-controller/package.json index 580f6feed2..9ecbc5527d 100644 --- a/packages/queued-request-controller/package.json +++ b/packages/queued-request-controller/package.json @@ -56,7 +56,7 @@ }, "devDependencies": { "@metamask/auto-changelog": "^3.4.4", - "@metamask/network-controller": "^21.1.0", + "@metamask/network-controller": "^22.0.0", "@metamask/selected-network-controller": "^18.0.2", "@types/jest": "^27.4.1", "deepmerge": "^4.2.2", @@ -71,7 +71,7 @@ "typescript": "~5.2.2" }, "peerDependencies": { - "@metamask/network-controller": "^21.0.0", + "@metamask/network-controller": "^22.0.0", "@metamask/selected-network-controller": "^18.0.0" }, "engines": { diff --git a/packages/selected-network-controller/CHANGELOG.md b/packages/selected-network-controller/CHANGELOG.md index ba9bb5d2c0..b38513172a 100644 --- a/packages/selected-network-controller/CHANGELOG.md +++ b/packages/selected-network-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)) + ## [18.0.2] ### Fixed diff --git a/packages/selected-network-controller/package.json b/packages/selected-network-controller/package.json index e416225ac2..759f2576fb 100644 --- a/packages/selected-network-controller/package.json +++ b/packages/selected-network-controller/package.json @@ -54,7 +54,7 @@ }, "devDependencies": { "@metamask/auto-changelog": "^3.4.4", - "@metamask/network-controller": "^21.1.0", + "@metamask/network-controller": "^22.0.0", "@metamask/permission-controller": "^11.0.2", "@types/jest": "^27.4.1", "deepmerge": "^4.2.2", @@ -69,7 +69,7 @@ "typescript": "~5.2.2" }, "peerDependencies": { - "@metamask/network-controller": "^21.0.0", + "@metamask/network-controller": "^22.0.0", "@metamask/permission-controller": "^11.0.0" }, "engines": { diff --git a/packages/transaction-controller/CHANGELOG.md b/packages/transaction-controller/CHANGELOG.md index 2201d969be..4d99101e96 100644 --- a/packages/transaction-controller/CHANGELOG.md +++ b/packages/transaction-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)) + ## [37.3.0] ### Added diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json index 884c708931..3915270d4e 100644 --- a/packages/transaction-controller/package.json +++ b/packages/transaction-controller/package.json @@ -76,7 +76,7 @@ "@metamask/ethjs-provider-http": "^0.3.0", "@metamask/gas-fee-controller": "^21.0.0", "@metamask/keyring-api": "^8.1.3", - "@metamask/network-controller": "^21.1.0", + "@metamask/network-controller": "^22.0.0", "@types/bn.js": "^5.1.5", "@types/jest": "^27.4.1", "@types/node": "^16.18.54", @@ -95,7 +95,7 @@ "@metamask/accounts-controller": "^18.0.0", "@metamask/approval-controller": "^7.0.0", "@metamask/gas-fee-controller": "^21.0.0", - "@metamask/network-controller": "^21.0.0" + "@metamask/network-controller": "^22.0.0" }, "engines": { "node": "^18.18 || >=20" diff --git a/packages/user-operation-controller/CHANGELOG.md b/packages/user-operation-controller/CHANGELOG.md index 98511c9e98..6af548f5e1 100644 --- a/packages/user-operation-controller/CHANGELOG.md +++ b/packages/user-operation-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)) + ## [16.0.0] ### Added diff --git a/packages/user-operation-controller/package.json b/packages/user-operation-controller/package.json index e0b6dcad68..adfc8fc546 100644 --- a/packages/user-operation-controller/package.json +++ b/packages/user-operation-controller/package.json @@ -65,7 +65,7 @@ "@metamask/auto-changelog": "^3.4.4", "@metamask/gas-fee-controller": "^21.0.0", "@metamask/keyring-controller": "^17.3.0", - "@metamask/network-controller": "^21.1.0", + "@metamask/network-controller": "^22.0.0", "@metamask/transaction-controller": "^37.3.0", "@types/jest": "^27.4.1", "deepmerge": "^4.2.2", @@ -79,7 +79,7 @@ "@metamask/approval-controller": "^7.0.0", "@metamask/gas-fee-controller": "^21.0.0", "@metamask/keyring-controller": "^17.0.0", - "@metamask/network-controller": "^21.0.0", + "@metamask/network-controller": "^22.0.0", "@metamask/transaction-controller": "^37.0.0" }, "engines": { diff --git a/yarn.lock b/yarn.lock index d9ff8aa0ab..b72af722e3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2144,7 +2144,7 @@ __metadata: "@metamask/keyring-api": "npm:^8.1.3" "@metamask/keyring-controller": "npm:^17.3.0" "@metamask/metamask-eth-abis": "npm:^3.1.1" - "@metamask/network-controller": "npm:^21.1.0" + "@metamask/network-controller": "npm:^22.0.0" "@metamask/polling-controller": "npm:^11.0.0" "@metamask/preferences-controller": "npm:^13.1.0" "@metamask/rpc-errors": "npm:^7.0.0" @@ -2175,7 +2175,7 @@ __metadata: "@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 languageName: unknown linkType: soft @@ -2437,7 +2437,7 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" "@metamask/controller-utils": "npm:^11.4.0" - "@metamask/network-controller": "npm:^21.1.0" + "@metamask/network-controller": "npm:^22.0.0" "@metamask/utils": "npm:^9.1.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" @@ -2448,7 +2448,7 @@ __metadata: typedoc-plugin-missing-exports: "npm:^2.0.0" typescript: "npm:~5.2.2" peerDependencies: - "@metamask/network-controller": ^21.0.0 + "@metamask/network-controller": ^22.0.0 languageName: unknown linkType: soft @@ -2825,7 +2825,7 @@ __metadata: "@metamask/controller-utils": "npm:^11.4.0" "@metamask/eth-query": "npm:^4.0.0" "@metamask/ethjs-unit": "npm:^0.3.0" - "@metamask/network-controller": "npm:^21.1.0" + "@metamask/network-controller": "npm:^22.0.0" "@metamask/polling-controller": "npm:^11.0.0" "@metamask/utils": "npm:^9.1.0" "@types/bn.js": "npm:^5.1.5" @@ -2844,7 +2844,7 @@ __metadata: typescript: "npm:~5.2.2" uuid: "npm:^8.3.2" peerDependencies: - "@metamask/network-controller": ^21.0.0 + "@metamask/network-controller": ^22.0.0 languageName: unknown linkType: soft @@ -3047,7 +3047,7 @@ __metadata: languageName: unknown linkType: soft -"@metamask/network-controller@npm:^21.1.0, @metamask/network-controller@workspace:packages/network-controller": +"@metamask/network-controller@npm:^22.0.0, @metamask/network-controller@workspace:packages/network-controller": version: 0.0.0-use.local resolution: "@metamask/network-controller@workspace:packages/network-controller" dependencies: @@ -3258,7 +3258,7 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" "@metamask/controller-utils": "npm:^11.4.0" - "@metamask/network-controller": "npm:^21.1.0" + "@metamask/network-controller": "npm:^22.0.0" "@metamask/utils": "npm:^9.1.0" "@types/jest": "npm:^27.4.1" "@types/uuid": "npm:^8.3.0" @@ -3272,7 +3272,7 @@ __metadata: typescript: "npm:~5.2.2" uuid: "npm:^8.3.2" peerDependencies: - "@metamask/network-controller": ^21.0.0 + "@metamask/network-controller": ^22.0.0 languageName: unknown linkType: soft @@ -3317,7 +3317,7 @@ __metadata: "@metamask/base-controller": "npm:^7.0.1" "@metamask/keyring-api": "npm:^8.1.3" "@metamask/keyring-controller": "npm:^17.3.0" - "@metamask/network-controller": "npm:^21.1.0" + "@metamask/network-controller": "npm:^22.0.0" "@metamask/snaps-controllers": "npm:^9.7.0" "@metamask/snaps-sdk": "npm:^6.5.0" "@metamask/snaps-utils": "npm:^8.1.1" @@ -3372,7 +3372,7 @@ __metadata: "@metamask/base-controller": "npm:^7.0.1" "@metamask/controller-utils": "npm:^11.4.0" "@metamask/json-rpc-engine": "npm:^10.0.0" - "@metamask/network-controller": "npm:^21.1.0" + "@metamask/network-controller": "npm:^22.0.0" "@metamask/rpc-errors": "npm:^7.0.0" "@metamask/selected-network-controller": "npm:^18.0.2" "@metamask/swappable-obj-proxy": "npm:^2.2.0" @@ -3389,7 +3389,7 @@ __metadata: typedoc-plugin-missing-exports: "npm:^2.0.0" typescript: "npm:~5.2.2" peerDependencies: - "@metamask/network-controller": ^21.0.0 + "@metamask/network-controller": ^22.0.0 "@metamask/selected-network-controller": ^18.0.0 languageName: unknown linkType: soft @@ -3456,7 +3456,7 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" "@metamask/json-rpc-engine": "npm:^10.0.0" - "@metamask/network-controller": "npm:^21.1.0" + "@metamask/network-controller": "npm:^22.0.0" "@metamask/permission-controller": "npm:^11.0.2" "@metamask/swappable-obj-proxy": "npm:^2.2.0" "@metamask/utils": "npm:^9.1.0" @@ -3472,7 +3472,7 @@ __metadata: typedoc-plugin-missing-exports: "npm:^2.0.0" typescript: "npm:~5.2.2" peerDependencies: - "@metamask/network-controller": ^21.0.0 + "@metamask/network-controller": ^22.0.0 "@metamask/permission-controller": ^11.0.0 languageName: unknown linkType: soft @@ -3696,7 +3696,7 @@ __metadata: "@metamask/gas-fee-controller": "npm:^21.0.0" "@metamask/keyring-api": "npm:^8.1.3" "@metamask/metamask-eth-abis": "npm:^3.1.1" - "@metamask/network-controller": "npm:^21.1.0" + "@metamask/network-controller": "npm:^22.0.0" "@metamask/nonce-tracker": "npm:^6.0.0" "@metamask/rpc-errors": "npm:^7.0.0" "@metamask/utils": "npm:^9.1.0" @@ -3723,7 +3723,7 @@ __metadata: "@metamask/accounts-controller": ^18.0.0 "@metamask/approval-controller": ^7.0.0 "@metamask/gas-fee-controller": ^21.0.0 - "@metamask/network-controller": ^21.0.0 + "@metamask/network-controller": ^22.0.0 languageName: unknown linkType: soft @@ -3738,7 +3738,7 @@ __metadata: "@metamask/eth-query": "npm:^4.0.0" "@metamask/gas-fee-controller": "npm:^21.0.0" "@metamask/keyring-controller": "npm:^17.3.0" - "@metamask/network-controller": "npm:^21.1.0" + "@metamask/network-controller": "npm:^22.0.0" "@metamask/polling-controller": "npm:^11.0.0" "@metamask/rpc-errors": "npm:^7.0.0" "@metamask/superstruct": "npm:^3.1.0" @@ -3759,7 +3759,7 @@ __metadata: "@metamask/approval-controller": ^7.0.0 "@metamask/gas-fee-controller": ^21.0.0 "@metamask/keyring-controller": ^17.0.0 - "@metamask/network-controller": ^21.0.0 + "@metamask/network-controller": ^22.0.0 "@metamask/transaction-controller": ^37.0.0 languageName: unknown linkType: soft From 81546f1da06c37ef4400753dc8815800a891e8ab Mon Sep 17 00:00:00 2001 From: Brian Bergeron Date: Wed, 23 Oct 2024 11:35:56 -0700 Subject: [PATCH 09/11] feat: update currency rate controller polling input (#4839) ## Explanation Prepares the currency rate controller to be polled across chains. We want a unique polling loop for each unique native currency (e.g. ETH, BNB). Rather than for each network client id. So this PR updates the polling input to `{nativeCurrency: string}` ## References ## Changelog ### `@metamask/assets-controllers` - **BREAKING**: The `CurrencyRateController` polling input is now `{nativeCurrency: string}` instead of a network client id. ## Checklist - [ ] I've updated the test suite for new or updated code as appropriate - [ ] I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate - [ ] I've highlighted breaking changes using the "BREAKING" category above as appropriate - [ ] I've prepared draft pull requests for clients and consumer packages to resolve any breaking changes --- .../src/CurrencyRateController.test.ts | 8 ++++---- .../src/CurrencyRateController.ts | 17 +++++------------ 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/packages/assets-controllers/src/CurrencyRateController.test.ts b/packages/assets-controllers/src/CurrencyRateController.test.ts index 4731e026bf..4ecc4642dc 100644 --- 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,7 +217,7 @@ describe('CurrencyRateController', () => { fetchExchangeRate: fetchExchangeRateStub, messenger, }); - controller.startPolling({ networkClientId: 'sepolia' }); + controller.startPolling({ nativeCurrency: 'ETH' }); await advanceTime({ clock, duration: 0 }); controller.stopAllPolling(); @@ -225,7 +225,7 @@ describe('CurrencyRateController', () => { // 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 index badc192532..4f3f21011d 100644 --- 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 { - const networkClient = this.messagingSystem.call( - 'NetworkController:getNetworkClientById', - networkClientId, - ); - await this.updateExchangeRate(networkClient.configuration.ticker); + await this.updateExchangeRate(nativeCurrency); } } From ca28cf74506dbe9d9103e6f7377e0f5a4c3a8ce0 Mon Sep 17 00:00:00 2001 From: legobeat <109787230+legobeat@users.noreply.github.com> Date: Thu, 24 Oct 2024 02:16:22 +0000 Subject: [PATCH 10/11] chore(constraints): remove resolved inconsistency exceptions (#4825) --- yarn.config.cjs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yarn.config.cjs b/yarn.config.cjs index 68be02772c..b802565a6a 100644 --- a/yarn.config.cjs +++ b/yarn.config.cjs @@ -18,8 +18,7 @@ const { inspect } = require('util'); * This should trend towards empty. */ const ALLOWED_INCONSISTENT_DEPENDENCIES = { - '@metamask/json-rpc-engine': ['^9.0.3'], - '@metamask/rpc-errors': ['^7.0.0'], + // '@metamask/json-rpc-engine': ['^9.0.3'], }; /** From 35b900bb779c27807e84254b36a153050a3ce426 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Thu, 24 Oct 2024 13:38:36 +0200 Subject: [PATCH 11/11] chore: Bump `@metamask/utils` (#4831) ## Explanation Bump `metamask/utils` to `10.0.0` and `metamask/rpc-errors` to `7.0.1` in an attempt to unblock usage of latest utils in `snaps`. ## Changelog Omitted. ## 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 - [x] I've prepared draft pull requests for clients and consumer packages to resolve any breaking changes --- examples/example-controllers/package.json | 2 +- package.json | 2 +- packages/accounts-controller/package.json | 2 +- .../src/AccountsController.ts | 2 +- packages/address-book-controller/package.json | 2 +- packages/approval-controller/package.json | 4 +- packages/assets-controllers/package.json | 4 +- packages/base-controller/package.json | 2 +- packages/build-utils/package.json | 2 +- packages/chain-controller/package.json | 2 +- packages/controller-utils/package.json | 2 +- packages/ens-controller/package.json | 2 +- packages/eth-json-rpc-provider/package.json | 4 +- packages/gas-fee-controller/package.json | 2 +- packages/json-rpc-engine/package.json | 4 +- .../json-rpc-middleware-stream/package.json | 2 +- packages/keyring-controller/package.json | 2 +- packages/message-manager/package.json | 2 +- packages/name-controller/package.json | 2 +- packages/network-controller/package.json | 4 +- packages/notification-controller/package.json | 2 +- .../package.json | 2 +- packages/permission-controller/package.json | 4 +- .../permission-log-controller/package.json | 2 +- packages/polling-controller/package.json | 2 +- .../queued-request-controller/package.json | 4 +- packages/rate-limit-controller/package.json | 4 +- .../selected-network-controller/package.json | 2 +- packages/signature-controller/package.json | 2 +- packages/transaction-controller/package.json | 4 +- .../user-operation-controller/package.json | 4 +- yarn.lock | 107 ++++++++++-------- 32 files changed, 103 insertions(+), 86 deletions(-) diff --git a/examples/example-controllers/package.json b/examples/example-controllers/package.json index 95fe83bdd0..57f55e2cd8 100644 --- 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 index a54b5db36c..c7854aa876 100644 --- a/package.json +++ b/package.json @@ -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 index 04dd18720f..aedd3f12ed 100644 --- 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 index 55c8348ade..54f2d01614 100644 --- 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 index 430f9c4e0e..eb99239134 100644 --- 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 index 5531e610c1..7cb3084fec 100644 --- 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/package.json b/packages/assets-controllers/package.json index b9d1d2c4c8..e3dbd14e01 100644 --- 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", diff --git a/packages/base-controller/package.json b/packages/base-controller/package.json index bb1047ae9c..a3c056b0ff 100644 --- 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 index 25b5beacc0..1d2158185a 100644 --- 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 index 5b33d24938..e7f1107d76 100644 --- 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 index 16beed744a..82d39855b2 100644 --- 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/package.json b/packages/ens-controller/package.json index b40ca60c88..b93f17766f 100644 --- a/packages/ens-controller/package.json +++ b/packages/ens-controller/package.json @@ -50,7 +50,7 @@ "@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": { diff --git a/packages/eth-json-rpc-provider/package.json b/packages/eth-json-rpc-provider/package.json index 3ccf799906..d1ebc6f568 100644 --- 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/package.json b/packages/gas-fee-controller/package.json index 03f8c04aae..e1ed168d00 100644 --- a/packages/gas-fee-controller/package.json +++ b/packages/gas-fee-controller/package.json @@ -52,7 +52,7 @@ "@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", diff --git a/packages/json-rpc-engine/package.json b/packages/json-rpc-engine/package.json index 989d8c8f67..d512d0b1d4 100644 --- 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 index 5456856961..aaea60214e 100644 --- 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 index b38c0f9e7c..f1fbbcc07f 100644 --- 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 index bccf1e54f8..a1eb5f7a42 100644 --- 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 index 133db27b3d..de3a33ec7c 100644 --- 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/package.json b/packages/network-controller/package.json index 2876fb84a8..7adeaaace0 100644 --- a/packages/network-controller/package.json +++ b/packages/network-controller/package.json @@ -55,9 +55,9 @@ "@metamask/eth-json-rpc-provider": "^4.1.5", "@metamask/eth-query": "^4.0.0", "@metamask/json-rpc-engine": "^10.0.0", - "@metamask/rpc-errors": "^7.0.0", + "@metamask/rpc-errors": "^7.0.1", "@metamask/swappable-obj-proxy": "^2.2.0", - "@metamask/utils": "^9.1.0", + "@metamask/utils": "^10.0.0", "async-mutex": "^0.5.0", "immer": "^9.0.6", "loglevel": "^1.8.1", diff --git a/packages/notification-controller/package.json b/packages/notification-controller/package.json index 93446b71d3..ceaa76761d 100644 --- a/packages/notification-controller/package.json +++ b/packages/notification-controller/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@metamask/base-controller": "^7.0.1", - "@metamask/utils": "^9.1.0", + "@metamask/utils": "^10.0.0", "nanoid": "^3.1.31" }, "devDependencies": { diff --git a/packages/notification-services-controller/package.json b/packages/notification-services-controller/package.json index 7edc9dccaf..93c715cee8 100644 --- a/packages/notification-services-controller/package.json +++ b/packages/notification-services-controller/package.json @@ -102,7 +102,7 @@ "@contentful/rich-text-html-renderer": "^16.5.2", "@metamask/base-controller": "^7.0.1", "@metamask/controller-utils": "^11.4.0", - "@metamask/utils": "^9.1.0", + "@metamask/utils": "^10.0.0", "bignumber.js": "^9.1.2", "firebase": "^10.11.0", "loglevel": "^1.8.1", diff --git a/packages/permission-controller/package.json b/packages/permission-controller/package.json index 01ebce13b7..1f0b79f8ae 100644 --- a/packages/permission-controller/package.json +++ b/packages/permission-controller/package.json @@ -50,8 +50,8 @@ "@metamask/base-controller": "^7.0.1", "@metamask/controller-utils": "^11.4.0", "@metamask/json-rpc-engine": "^10.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/deep-freeze-strict": "^1.1.0", "deep-freeze-strict": "^1.1.1", "immer": "^9.0.6", diff --git a/packages/permission-log-controller/package.json b/packages/permission-log-controller/package.json index ac10c6550f..4cf259d909 100644 --- a/packages/permission-log-controller/package.json +++ b/packages/permission-log-controller/package.json @@ -49,7 +49,7 @@ "dependencies": { "@metamask/base-controller": "^7.0.1", "@metamask/json-rpc-engine": "^10.0.0", - "@metamask/utils": "^9.1.0" + "@metamask/utils": "^10.0.0" }, "devDependencies": { "@metamask/auto-changelog": "^3.4.4", diff --git a/packages/polling-controller/package.json b/packages/polling-controller/package.json index 7f0151a6a8..1eca06b9c5 100644 --- a/packages/polling-controller/package.json +++ b/packages/polling-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", "@types/uuid": "^8.3.0", "fast-json-stable-stringify": "^2.1.0", "uuid": "^8.3.2" diff --git a/packages/queued-request-controller/package.json b/packages/queued-request-controller/package.json index 9ecbc5527d..7acc5fa17a 100644 --- a/packages/queued-request-controller/package.json +++ b/packages/queued-request-controller/package.json @@ -50,9 +50,9 @@ "@metamask/base-controller": "^7.0.1", "@metamask/controller-utils": "^11.4.0", "@metamask/json-rpc-engine": "^10.0.0", - "@metamask/rpc-errors": "^7.0.0", + "@metamask/rpc-errors": "^7.0.1", "@metamask/swappable-obj-proxy": "^2.2.0", - "@metamask/utils": "^9.1.0" + "@metamask/utils": "^10.0.0" }, "devDependencies": { "@metamask/auto-changelog": "^3.4.4", diff --git a/packages/rate-limit-controller/package.json b/packages/rate-limit-controller/package.json index 353d02cf9b..a76efaa1e2 100644 --- a/packages/rate-limit-controller/package.json +++ b/packages/rate-limit-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" }, "devDependencies": { "@metamask/auto-changelog": "^3.4.4", diff --git a/packages/selected-network-controller/package.json b/packages/selected-network-controller/package.json index 759f2576fb..933105b8c0 100644 --- a/packages/selected-network-controller/package.json +++ b/packages/selected-network-controller/package.json @@ -50,7 +50,7 @@ "@metamask/base-controller": "^7.0.1", "@metamask/json-rpc-engine": "^10.0.0", "@metamask/swappable-obj-proxy": "^2.2.0", - "@metamask/utils": "^9.1.0" + "@metamask/utils": "^10.0.0" }, "devDependencies": { "@metamask/auto-changelog": "^3.4.4", diff --git a/packages/signature-controller/package.json b/packages/signature-controller/package.json index 204e116041..c3f5b05d24 100644 --- a/packages/signature-controller/package.json +++ b/packages/signature-controller/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", "jsonschema": "^1.2.4", "lodash": "^4.17.21", "uuid": "^8.3.2" diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json index 3915270d4e..a58765926f 100644 --- a/packages/transaction-controller/package.json +++ b/packages/transaction-controller/package.json @@ -58,8 +58,8 @@ "@metamask/eth-query": "^4.0.0", "@metamask/metamask-eth-abis": "^3.1.1", "@metamask/nonce-tracker": "^6.0.0", - "@metamask/rpc-errors": "^7.0.0", - "@metamask/utils": "^9.1.0", + "@metamask/rpc-errors": "^7.0.1", + "@metamask/utils": "^10.0.0", "async-mutex": "^0.5.0", "bn.js": "^5.2.1", "eth-method-registry": "^4.0.0", diff --git a/packages/user-operation-controller/package.json b/packages/user-operation-controller/package.json index adfc8fc546..c186974657 100644 --- a/packages/user-operation-controller/package.json +++ b/packages/user-operation-controller/package.json @@ -52,9 +52,9 @@ "@metamask/controller-utils": "^11.4.0", "@metamask/eth-query": "^4.0.0", "@metamask/polling-controller": "^11.0.0", - "@metamask/rpc-errors": "^7.0.0", + "@metamask/rpc-errors": "^7.0.1", "@metamask/superstruct": "^3.1.0", - "@metamask/utils": "^9.1.0", + "@metamask/utils": "^10.0.0", "bn.js": "^5.2.1", "immer": "^9.0.6", "lodash": "^4.17.21", diff --git a/yarn.lock b/yarn.lock index b72af722e3..cf2b052c50 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2040,7 +2040,7 @@ __metadata: "@metamask/snaps-controllers": "npm:^9.7.0" "@metamask/snaps-sdk": "npm:^6.5.0" "@metamask/snaps-utils": "npm:^8.1.1" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" "@types/readable-stream": "npm:^2.3.0" deepmerge: "npm:^4.2.2" @@ -2076,7 +2076,7 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" "@metamask/controller-utils": "npm:^11.4.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" jest: "npm:^27.5.1" @@ -2109,8 +2109,8 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/rpc-errors": "npm:^7.0.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/rpc-errors": "npm:^7.0.1" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" jest: "npm:^27.5.1" @@ -2147,8 +2147,8 @@ __metadata: "@metamask/network-controller": "npm:^22.0.0" "@metamask/polling-controller": "npm:^11.0.0" "@metamask/preferences-controller": "npm:^13.1.0" - "@metamask/rpc-errors": "npm:^7.0.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/rpc-errors": "npm:^7.0.1" + "@metamask/utils": "npm:^10.0.0" "@types/bn.js": "npm:^5.1.5" "@types/jest": "npm:^27.4.1" "@types/lodash": "npm:^4.14.191" @@ -2226,7 +2226,7 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/json-rpc-engine": "npm:^10.0.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" "@types/sinon": "npm:^9.0.10" deepmerge: "npm:^4.2.2" @@ -2254,7 +2254,7 @@ __metadata: resolution: "@metamask/build-utils@workspace:packages/build-utils" dependencies: "@metamask/auto-changelog": "npm:^3.4.4" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/eslint": "npm:^8.44.7" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" @@ -2288,7 +2288,7 @@ __metadata: "@metamask/snaps-controllers": "npm:^9.7.0" "@metamask/snaps-sdk": "npm:^6.5.0" "@metamask/snaps-utils": "npm:^8.1.1" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" "@types/readable-stream": "npm:^2.3.0" deepmerge: "npm:^4.2.2" @@ -2335,7 +2335,7 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/eth-query": "npm:^4.0.0" "@metamask/ethjs-unit": "npm:^0.3.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@spruceid/siwe-parser": "npm:2.1.0" "@types/bn.js": "npm:^5.1.5" "@types/jest": "npm:^27.4.1" @@ -2369,7 +2369,7 @@ __metadata: "@metamask/eth-block-tracker": "npm:^11.0.2" "@metamask/eth-json-rpc-provider": "npm:^4.1.5" "@metamask/json-rpc-engine": "npm:^10.0.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@ts-bridge/cli": "npm:^0.5.1" "@types/jest": "npm:^27.4.1" "@types/lodash": "npm:^4.14.191" @@ -2438,7 +2438,7 @@ __metadata: "@metamask/base-controller": "npm:^7.0.1" "@metamask/controller-utils": "npm:^11.4.0" "@metamask/network-controller": "npm:^22.0.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" jest: "npm:^27.5.1" @@ -2568,9 +2568,9 @@ __metadata: "@metamask/eth-query": "npm:^4.0.0" "@metamask/ethjs-query": "npm:^0.5.3" "@metamask/json-rpc-engine": "npm:^10.0.0" - "@metamask/rpc-errors": "npm:^7.0.0" + "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/safe-event-emitter": "npm:^3.0.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" ethers: "npm:^6.12.0" @@ -2804,7 +2804,7 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" "@metamask/controller-utils": "npm:^11.4.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" jest: "npm:^27.5.1" @@ -2827,7 +2827,7 @@ __metadata: "@metamask/ethjs-unit": "npm:^0.3.0" "@metamask/network-controller": "npm:^22.0.0" "@metamask/polling-controller": "npm:^11.0.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/bn.js": "npm:^5.1.5" "@types/jest": "npm:^27.4.1" "@types/jest-when": "npm:^2.7.3" @@ -2854,9 +2854,9 @@ __metadata: dependencies: "@lavamoat/allow-scripts": "npm:^3.0.4" "@metamask/auto-changelog": "npm:^3.4.4" - "@metamask/rpc-errors": "npm:^7.0.0" + "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/safe-event-emitter": "npm:^3.0.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" jest: "npm:^27.5.1" @@ -2885,7 +2885,7 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/json-rpc-engine": "npm:^10.0.0" "@metamask/safe-event-emitter": "npm:^3.0.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" "@types/readable-stream": "npm:^2.3.0" deepmerge: "npm:^4.2.2" @@ -2949,7 +2949,7 @@ __metadata: "@metamask/keyring-api": "npm:^8.1.3" "@metamask/message-manager": "npm:^11.0.0" "@metamask/scure-bip39": "npm:^2.1.1" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" async-mutex: "npm:^0.5.0" deepmerge: "npm:^4.2.2" @@ -2992,7 +2992,7 @@ __metadata: "@metamask/base-controller": "npm:^7.0.1" "@metamask/controller-utils": "npm:^11.4.0" "@metamask/eth-sig-util": "npm:^8.0.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" "@types/uuid": "npm:^8.3.0" deepmerge: "npm:^4.2.2" @@ -3035,7 +3035,7 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" "@metamask/controller-utils": "npm:^11.4.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" async-mutex: "npm:^0.5.0" deepmerge: "npm:^4.2.2" @@ -3061,9 +3061,9 @@ __metadata: "@metamask/eth-json-rpc-provider": "npm:^4.1.5" "@metamask/eth-query": "npm:^4.0.0" "@metamask/json-rpc-engine": "npm:^10.0.0" - "@metamask/rpc-errors": "npm:^7.0.0" + "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/swappable-obj-proxy": "npm:^2.2.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" "@types/jest-when": "npm:^2.7.3" "@types/lodash": "npm:^4.14.191" @@ -3104,7 +3104,7 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" jest: "npm:^27.5.1" @@ -3127,7 +3127,7 @@ __metadata: "@metamask/controller-utils": "npm:^11.4.0" "@metamask/keyring-controller": "npm:^17.3.0" "@metamask/profile-sync-controller": "npm:^0.9.7" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" "@types/readable-stream": "npm:^2.3.0" bignumber.js: "npm:^9.1.2" @@ -3188,8 +3188,8 @@ __metadata: "@metamask/base-controller": "npm:^7.0.1" "@metamask/controller-utils": "npm:^11.4.0" "@metamask/json-rpc-engine": "npm:^10.0.0" - "@metamask/rpc-errors": "npm:^7.0.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/rpc-errors": "npm:^7.0.1" + "@metamask/utils": "npm:^10.0.0" "@types/deep-freeze-strict": "npm:^1.1.0" "@types/jest": "npm:^27.4.1" deep-freeze-strict: "npm:^1.1.1" @@ -3213,7 +3213,7 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" "@metamask/json-rpc-engine": "npm:^10.0.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/deep-freeze-strict": "npm:^1.1.0" "@types/jest": "npm:^27.4.1" deep-freeze-strict: "npm:^1.1.1" @@ -3259,7 +3259,7 @@ __metadata: "@metamask/base-controller": "npm:^7.0.1" "@metamask/controller-utils": "npm:^11.4.0" "@metamask/network-controller": "npm:^22.0.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" "@types/uuid": "npm:^8.3.0" deepmerge: "npm:^4.2.2" @@ -3373,10 +3373,10 @@ __metadata: "@metamask/controller-utils": "npm:^11.4.0" "@metamask/json-rpc-engine": "npm:^10.0.0" "@metamask/network-controller": "npm:^22.0.0" - "@metamask/rpc-errors": "npm:^7.0.0" + "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/selected-network-controller": "npm:^18.0.2" "@metamask/swappable-obj-proxy": "npm:^2.2.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" immer: "npm:^9.0.6" @@ -3400,8 +3400,8 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/rpc-errors": "npm:^7.0.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/rpc-errors": "npm:^7.0.1" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" jest: "npm:^27.5.1" @@ -3422,13 +3422,13 @@ __metadata: languageName: node linkType: hard -"@metamask/rpc-errors@npm:^7.0.0": - version: 7.0.0 - resolution: "@metamask/rpc-errors@npm:7.0.0" +"@metamask/rpc-errors@npm:^7.0.0, @metamask/rpc-errors@npm:^7.0.1": + version: 7.0.1 + resolution: "@metamask/rpc-errors@npm:7.0.1" dependencies: - "@metamask/utils": "npm:^9.0.0" + "@metamask/utils": "npm:^10.0.0" fast-safe-stringify: "npm:^2.0.6" - checksum: 10/f25e2a5506d4d0d6193c88aef8f035ec189a1177f8aee8fa01c9a33d73b1536ca7b5eea2fb33a477768bbd2abaf16529e68f0b3cf714387e5d6c9178225354fd + checksum: 10/819708b4a7d9695ee67fd867d8f94bb5a273b479a242b17bd53c83d1fceec421fc42928f0bb340f4f138ec803dd82ec9659ce7b09a86aedad6a81d5a39ec5c35 languageName: node linkType: hard @@ -3459,7 +3459,7 @@ __metadata: "@metamask/network-controller": "npm:^22.0.0" "@metamask/permission-controller": "npm:^11.0.2" "@metamask/swappable-obj-proxy": "npm:^2.2.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" immer: "npm:^9.0.6" @@ -3488,7 +3488,7 @@ __metadata: "@metamask/eth-sig-util": "npm:^8.0.0" "@metamask/keyring-controller": "npm:^17.3.0" "@metamask/logging-controller": "npm:^6.0.1" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" jest: "npm:^27.5.1" @@ -3698,8 +3698,8 @@ __metadata: "@metamask/metamask-eth-abis": "npm:^3.1.1" "@metamask/network-controller": "npm:^22.0.0" "@metamask/nonce-tracker": "npm:^6.0.0" - "@metamask/rpc-errors": "npm:^7.0.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/rpc-errors": "npm:^7.0.1" + "@metamask/utils": "npm:^10.0.0" "@types/bn.js": "npm:^5.1.5" "@types/jest": "npm:^27.4.1" "@types/node": "npm:^16.18.54" @@ -3740,10 +3740,10 @@ __metadata: "@metamask/keyring-controller": "npm:^17.3.0" "@metamask/network-controller": "npm:^22.0.0" "@metamask/polling-controller": "npm:^11.0.0" - "@metamask/rpc-errors": "npm:^7.0.0" + "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/superstruct": "npm:^3.1.0" "@metamask/transaction-controller": "npm:^37.3.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" bn.js: "npm:^5.2.1" deepmerge: "npm:^4.2.2" @@ -3764,6 +3764,23 @@ __metadata: languageName: unknown linkType: soft +"@metamask/utils@npm:^10.0.0": + version: 10.0.0 + resolution: "@metamask/utils@npm:10.0.0" + dependencies: + "@ethereumjs/tx": "npm:^4.2.0" + "@metamask/superstruct": "npm:^3.1.0" + "@noble/hashes": "npm:^1.3.1" + "@scure/base": "npm:^1.1.3" + "@types/debug": "npm:^4.1.7" + debug: "npm:^4.3.4" + pony-cause: "npm:^2.1.10" + semver: "npm:^7.5.4" + uuid: "npm:^9.0.1" + checksum: 10/9c2e6421f685d8a45145b6026a6f9fd0701eb5a2e8490fc6d18e64c103d5a62097f301cbc797790da52ceb5853bd9f65845c934b00299e69e5e6736c52b32f0f + languageName: node + linkType: hard + "@metamask/utils@npm:^8.2.0": version: 8.5.0 resolution: "@metamask/utils@npm:8.5.0"