Merge branch 'main' into 240610-upgrade-AssetsContractController

Author: MajorLift

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/core-monorepo",
-  "version": "174.0.0",
+  "version": "176.0.0",
   "private": true,
   "description": "Monorepo for packages shared between MetaMask clients",
   "repository": {

packages/accounts-controller/package.json

@@ -45,7 +45,7 @@
     "@metamask/base-controller": "^6.0.1",
     "@metamask/eth-snap-keyring": "^4.3.1",
     "@metamask/keyring-api": "^8.0.0",
-    "@metamask/keyring-controller": "^17.1.0",
+    "@metamask/keyring-controller": "^17.1.1",
     "@metamask/snaps-sdk": "^4.2.0",
     "@metamask/snaps-utils": "^7.4.0",
     "@metamask/utils": "^9.0.0",

packages/assets-controllers/CHANGELOG.md

@@ -7,6 +7,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [36.0.0]
+
+### Added
+
+- Add optional `topBid` property to the `NftMetadata` type. This property must be of type `TopBid`. ([#4522](https://github.com/MetaMask/core/pull/4522))
+- Add optional `floorAsk` property to the `TokenCollection` type. This property must be of type `FloorAskCollection`. ([#4522](https://github.com/MetaMask/core/pull/4522))
+- Add linea mainnet support to nft detection supported networks ([#4515](https://github.com/MetaMask/core/pull/4515))
+- The `Collection` type is expanded to include the following 'string'-type optional properties: `contractDeployedAt`, `creator`, `ownerCount`, and an optional property `topBid` of the type `TopBid & { sourceDomain?: string; }`. ([#4443](https://github.com/MetaMask/core/pull/4443))
+
+### Changed
+
+- Fetch NFT collections data from the NFT-API `Get Collections` endpoint when calling the `detectNfts` method of `NftDetectionController`, and the `updateNftMetadata` and `watchNft` methods of `NftController`. ([#4443](https://github.com/MetaMask/core/pull/4443))
+- Bump `@metamask/utils` to `^9.0.0` ([#4516](https://github.com/MetaMask/core/pull/4516))
+- Bump `@metamask/rpc-errors` to `^6.3.1` ([#4516](https://github.com/MetaMask/core/pull/4516))
+
+### Fixed
+
+- **BREAKING:** The `attributes` property of the `NftMetadata` type must be of type `Attributes[]` ([#4522](https://github.com/MetaMask/core/pull/4522))
+  - The `attributes` property was added and typed as `Attributes` on `v28.0.0`.
+
 ## [35.0.0]
 
 ### Changed
@@ -993,7 +1013,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Use Ethers for AssetsContractController ([#845](https://github.com/MetaMask/core/pull/845))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[36.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [35.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [34.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [33.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

packages/assets-controllers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/assets-controllers",
-  "version": "35.0.0",
+  "version": "36.0.0",
   "description": "Controllers which manage interactions involving ERC-20, ERC-721, and ERC-1155 tokens (including NFTs)",
   "keywords": [
     "MetaMask",
@@ -53,7 +53,7 @@
     "@metamask/contract-metadata": "^2.4.0",
     "@metamask/controller-utils": "^11.0.1",
     "@metamask/eth-query": "^4.0.0",
-    "@metamask/keyring-controller": "^17.1.0",
+    "@metamask/keyring-controller": "^17.1.1",
     "@metamask/metamask-eth-abis": "^3.1.1",
     "@metamask/network-controller": "^20.0.0",
     "@metamask/polling-controller": "^9.0.0",

packages/keyring-controller/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [17.1.1]
+
+### Changed
+
+- Bump `@metamask/utils` to `^9.0.0`, `@metamask/rpc-errors` to `^6.3.1` ([#4516](https://github.com/MetaMask/core/pull/4516))
+
+### Fixed
+
+- Clear encryption salt and key in `setLocked` and `#createNewVaultWithKeyring` to ensure that encryption key is always generated with the latest password ([#4514](https://github.com/MetaMask/core/pull/4514))
+
 ## [17.1.0]
 
 ### Added
@@ -497,7 +507,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
     All changes listed after this point were applied to this package following the monorepo conversion.
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[17.1.1]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [17.1.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [17.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [16.1.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

packages/keyring-controller/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/keyring-controller",
-  "version": "17.1.0",
+  "version": "17.1.1",
   "description": "Stores identities seen in the wallet and manages interactions such as signing",
   "keywords": [
     "MetaMask",
@@ -49,7 +49,7 @@
     "@metamask/eth-sig-util": "^7.0.1",
     "@metamask/eth-simple-keyring": "^6.0.1",
     "@metamask/keyring-api": "^8.0.0",
-    "@metamask/message-manager": "^10.0.0",
+    "@metamask/message-manager": "^10.0.1",
     "@metamask/utils": "^9.0.0",
     "async-mutex": "^0.5.0",
     "ethereumjs-wallet": "^1.0.1",

packages/message-manager/CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [10.0.1]
+
+### Changed
+
+- Bump `@metamask/utils` to `^9.0.0`, `@metamask/rpc-errors` to `^6.3.1` ([#4516](https://github.com/MetaMask/core/pull/4516))
+
+### Fixed
+
+- Add `EventEmitter` type annotation to the `hub` class field of `AbstractMessageManager` ([#4510](https://github.com/MetaMask/core/pull/4510))
+  - This ensures that `hub` is not inferred to be a generic type, which would break types for downstream consumers.
+
 ## [10.0.0]
 
 ### Changed
@@ -255,7 +266,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
     All changes listed after this point were applied to this package following the monorepo conversion.
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[10.0.1]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [10.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [9.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [8.0.2]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

packages/message-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/message-manager",
-  "version": "10.0.0",
+  "version": "10.0.1",
   "description": "Stores and manages interactions with signing requests",
   "keywords": [
     "MetaMask",

packages/notification-services-controller/package.json

@@ -44,7 +44,7 @@
     "@contentful/rich-text-html-renderer": "^16.5.2",
     "@metamask/base-controller": "^6.0.1",
     "@metamask/controller-utils": "^11.0.1",
-    "@metamask/keyring-controller": "^17.1.0",
+    "@metamask/keyring-controller": "^17.1.1",
     "@metamask/profile-sync-controller": "^0.1.3",
     "bignumber.js": "^4.1.0",
     "contentful": "^10.3.6",

packages/phishing-controller/src/PhishingController.test.ts

@@ -12,6 +12,7 @@ import {
   type PhishingControllerActions,
   type PhishingControllerOptions,
 } from './PhishingController';
+import { formatHostnameToUrl } from './tests/utils';
 
 const controllerName = 'PhishingController';
 
@@ -218,14 +219,18 @@ describe('PhishingController', () => {
       expect(controller.isStalelistOutOfDate()).toBe(false);
       await controller.maybeUpdateState();
       expect(
-        controller.test('this-should-not-be-in-default-blocklist.com'),
+        controller.test(
+          formatHostnameToUrl('this-should-not-be-in-default-blocklist.com'),
+        ),
       ).toMatchObject({
         result: false,
         type: 'all',
       });
 
       expect(
-        controller.test('this-should-not-be-in-default-allowlist.com'),
+        controller.test(
+          formatHostnameToUrl('this-should-not-be-in-default-allowlist.com'),
+        ),
       ).toMatchObject({
         result: false,
         type: 'all',
@@ -235,14 +240,18 @@ describe('PhishingController', () => {
       await controller.maybeUpdateState();
 
       expect(
-        controller.test('this-should-not-be-in-default-blocklist.com'),
+        controller.test(
+          formatHostnameToUrl('this-should-not-be-in-default-blocklist.com'),
+        ),
       ).toMatchObject({
         result: true,
         type: 'blocklist',
       });
 
       expect(
-        controller.test('this-should-not-be-in-default-allowlist.com'),
+        controller.test(
+          formatHostnameToUrl('this-should-not-be-in-default-allowlist.com'),
+        ),
       ).toMatchObject({
         result: false,
         type: 'allowlist',
@@ -479,7 +488,7 @@ describe('PhishingController', () => {
       .reply(200, { data: [] });
     const controller = getPhishingController();
     await controller.updateStalelist();
-    expect(controller.test('metamask.io')).toMatchObject({
+    expect(controller.test(formatHostnameToUrl('metamask.io'))).toMatchObject({
       result: false,
       type: 'allowlist',
       name: ListNames.MetaMask,
@@ -513,7 +522,7 @@ describe('PhishingController', () => {
 
     const controller = getPhishingController();
     await controller.updateStalelist();
-    expect(controller.test('i❤.ws')).toMatchObject({
+    expect(controller.test(formatHostnameToUrl('i❤.ws'))).toMatchObject({
       result: false,
       type: 'all',
     });
@@ -546,7 +555,7 @@ describe('PhishingController', () => {
 
     const controller = getPhishingController();
     await controller.updateStalelist();
-    expect(controller.test('xn--i-7iq.ws')).toMatchObject({
+    expect(controller.test(formatHostnameToUrl('xn--i-7iq.ws'))).toMatchObject({
       result: false,
       type: 'all',
     });
@@ -579,7 +588,7 @@ describe('PhishingController', () => {
 
     const controller = getPhishingController();
     await controller.updateStalelist();
-    expect(controller.test('etnerscan.io')).toMatchObject({
+    expect(controller.test(formatHostnameToUrl('etnerscan.io'))).toMatchObject({
       result: true,
       type: 'blocklist',
       name: ListNames.MetaMask,
@@ -612,7 +621,9 @@ describe('PhishingController', () => {
       .reply(200, { data: [] });
     const controller = getPhishingController();
     await controller.updateStalelist();
-    expect(controller.test('myetherẉalletṭ.com')).toMatchObject({
+    expect(
+      controller.test(formatHostnameToUrl('myetherẉalletṭ.com')),
+    ).toMatchObject({
       result: true,
       type: 'blocklist',
       name: ListNames.MetaMask,
@@ -646,7 +657,9 @@ describe('PhishingController', () => {
 
     const controller = getPhishingController();
     await controller.updateStalelist();
-    expect(controller.test('xn--myetherallet-4k5fwn.com')).toMatchObject({
+    expect(
+      controller.test(formatHostnameToUrl('xn--myetherallet-4k5fwn.com')),
+    ).toMatchObject({
       result: true,
       type: 'blocklist',
       name: ListNames.MetaMask,
@@ -689,7 +702,9 @@ describe('PhishingController', () => {
     const controller = getPhishingController();
     await controller.updateStalelist();
     expect(
-      controller.test('e4d600ab9141b7a9859511c77e63b9b3.com'),
+      controller.test(
+        formatHostnameToUrl('e4d600ab9141b7a9859511c77e63b9b3.com'),
+      ),
     ).toMatchObject({
       result: true,
       type: 'blocklist',
@@ -725,7 +740,9 @@ describe('PhishingController', () => {
     const controller = getPhishingController();
     await controller.updateStalelist();
     expect(
-      controller.test('e4d600ab9141b7a9859511c77e63b9b3.com'),
+      controller.test(
+        formatHostnameToUrl('e4d600ab9141b7a9859511c77e63b9b3.com'),
+      ),
     ).toMatchObject({
       result: false,
       type: 'all',
@@ -758,7 +775,7 @@ describe('PhishingController', () => {
       .reply(200, { data: [] });
     const controller = getPhishingController();
     await controller.updateStalelist();
-    expect(controller.test('opensea.io')).toMatchObject({
+    expect(controller.test(formatHostnameToUrl('opensea.io'))).toMatchObject({
       result: false,
       type: 'allowlist',
       name: ListNames.MetaMask,
@@ -791,7 +808,7 @@ describe('PhishingController', () => {
       .reply(200, { data: [] });
     const controller = getPhishingController();
     await controller.updateStalelist();
-    expect(controller.test('ohpensea.io')).toMatchObject({
+    expect(controller.test(formatHostnameToUrl('ohpensea.io'))).toMatchObject({
       result: true,
       type: 'fuzzy',
       name: ListNames.MetaMask,
@@ -825,7 +842,9 @@ describe('PhishingController', () => {
     const controller = getPhishingController();
     await controller.updateStalelist();
     expect(
-      controller.test('this-is-the-official-website-of-opensea.io'),
+      controller.test(
+        formatHostnameToUrl('this-is-the-official-website-of-opensea.io'),
+      ),
     ).toMatchObject({
       result: false,
       type: 'all',
@@ -860,12 +879,12 @@ describe('PhishingController', () => {
     await controller.updateStalelist();
     const unsafeDomain = 'electrum.mx';
     assert.equal(
-      controller.test(unsafeDomain).result,
+      controller.test(formatHostnameToUrl(unsafeDomain)).result,
       true,
       'Example unsafe domain seems to be safe',
     );
-    controller.bypass(unsafeDomain);
-    expect(controller.test(unsafeDomain)).toMatchObject({
+    controller.bypass(formatHostnameToUrl(unsafeDomain));
+    expect(controller.test(formatHostnameToUrl(unsafeDomain))).toMatchObject({
       result: false,
       type: 'all',
     });
@@ -899,13 +918,13 @@ describe('PhishingController', () => {
     await controller.updateStalelist();
     const unsafeDomain = 'electrum.mx';
     assert.equal(
-      controller.test(unsafeDomain).result,
+      controller.test(formatHostnameToUrl(unsafeDomain)).result,
       true,
       'Example unsafe domain seems to be safe',
     );
-    controller.bypass(unsafeDomain);
-    controller.bypass(unsafeDomain);
-    expect(controller.test(unsafeDomain)).toMatchObject({
+    controller.bypass(formatHostnameToUrl(unsafeDomain));
+    controller.bypass(formatHostnameToUrl(unsafeDomain));
+    expect(controller.test(formatHostnameToUrl(unsafeDomain))).toMatchObject({
       result: false,
       type: 'all',
     });
@@ -939,12 +958,12 @@ describe('PhishingController', () => {
     await controller.updateStalelist();
     const unsafeDomain = 'myetherẉalletṭ.com';
     assert.equal(
-      controller.test(unsafeDomain).result,
+      controller.test(formatHostnameToUrl(unsafeDomain)).result,
       true,
       'Example unsafe domain seems to be safe',
     );
-    controller.bypass(unsafeDomain);
-    expect(controller.test(unsafeDomain)).toMatchObject({
+    controller.bypass(formatHostnameToUrl(unsafeDomain));
+    expect(controller.test(formatHostnameToUrl(unsafeDomain))).toMatchObject({
       result: false,
       type: 'all',
     });
@@ -978,12 +997,12 @@ describe('PhishingController', () => {
     await controller.updateStalelist();
     const unsafeDomain = 'xn--myetherallet-4k5fwn.com';
     assert.equal(
-      controller.test(unsafeDomain).result,
+      controller.test(formatHostnameToUrl(unsafeDomain)).result,
       true,
       'Example unsafe domain seems to be safe',
     );
-    controller.bypass(unsafeDomain);
-    expect(controller.test(unsafeDomain)).toMatchObject({
+    controller.bypass(formatHostnameToUrl(unsafeDomain));
+    expect(controller.test(formatHostnameToUrl(unsafeDomain))).toMatchObject({
       result: false,
       type: 'all',
     });