Merge branch 'main' into feature/token-balances-integration

Author: Kriys94

eslint-warning-thresholds.json

@@ -27,7 +27,7 @@
   },
   "packages/assets-controllers/src/NftDetectionController.test.ts": {
     "import-x/namespace": 6,
-    "import-x/order": 4
+    "import-x/order": 3
   },
   "packages/assets-controllers/src/NftDetectionController.ts": {
     "jsdoc/check-tag-names": 34,

package.json

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

packages/account-tree-controller/CHANGELOG.md

@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fix wallet metadata cleanup when wallets are completely removed ([#6813](https://github.com/MetaMask/core/pull/6813))
+
+## [1.4.2]
+
+### Fixed
+
 - Ensure `isLegacyAccountSyncingDisabled` is always set in `UserStorageSyncedWallet` after one successful full sync ([#6805](https://github.com/MetaMask/core/pull/6805))
   - This was not set in some rare edge case scenarios, and created situations were legacy syncs would always be re-triggered during full syncs.
   - We now verify this field is correctly set, and also catch empty objects for `UserStorageSyncedWallet`.
@@ -359,7 +365,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Initial release ([#5847](https://github.com/MetaMask/core/pull/5847))
   - Grouping accounts into 3 main categories: Entropy source, Snap ID, keyring types.
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@1.4.1...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@1.4.2...HEAD
+[1.4.2]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@1.4.1...@metamask/account-tree-controller@1.4.2
 [1.4.1]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@1.4.0...@metamask/account-tree-controller@1.4.1
 [1.4.0]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@1.3.0...@metamask/account-tree-controller@1.4.0
 [1.3.0]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@1.2.0...@metamask/account-tree-controller@1.3.0

packages/account-tree-controller/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/account-tree-controller",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Controller to group account together based on some pre-defined rules",
   "keywords": [
     "MetaMask",

packages/account-tree-controller/src/AccountTreeController.test.ts

@@ -1262,6 +1262,40 @@ describe('AccountTreeController', () => {
       } as AccountTreeControllerState);
     });
 
+    it('prunes custom wallet metadata when wallet is removed', () => {
+      const mockHdAccount1: Bip44Account<InternalAccount> = MOCK_HD_ACCOUNT_1;
+
+      const { controller, messenger } = setup({
+        accounts: [mockHdAccount1],
+        keyrings: [MOCK_HD_KEYRING_1],
+      });
+
+      controller.init();
+
+      const walletId = toMultichainAccountWalletId(
+        MOCK_HD_KEYRING_1.metadata.id,
+      );
+
+      // Set custom wallet name
+      controller.setAccountWalletName(walletId, 'My Custom Wallet');
+
+      // Verify custom metadata was set
+      expect(controller.state.accountWalletsMetadata[walletId]).toStrictEqual({
+        name: {
+          value: 'My Custom Wallet',
+          lastUpdatedAt: expect.any(Number),
+        },
+      });
+
+      // Remove the account, which should prune the wallet and its metadata
+      messenger.publish('AccountsController:accountRemoved', mockHdAccount1.id);
+
+      // Verify both wallet and its metadata are completely removed
+      expect(controller.state.accountTree.wallets[walletId]).toBeUndefined();
+      expect(controller.state.accountWalletsMetadata[walletId]).toBeUndefined();
+      expect(controller.state.accountWalletsMetadata).toStrictEqual({});
+    });
+
     it('does not remove account if init has not been called', () => {
       const { controller, messenger } = setup({
         accounts: [MOCK_HD_ACCOUNT_1],

packages/account-tree-controller/src/AccountTreeController.ts

@@ -891,6 +891,8 @@ export class AccountTreeController extends BaseController<
 
     if (Object.keys(wallets[walletId].groups).length === 0) {
       delete wallets[walletId];
+      // Clean up metadata for the pruned wallet
+      delete state.accountWalletsMetadata[walletId];
     }
     return state;
   }

packages/assets-controllers/CHANGELOG.md

@@ -29,6 +29,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - When WebSocket is connected, polling automatically adjusts to 5 minutes as a backup
 - Update `TokenBalancesController` README documentation to mention real-time balance updates via WebSocket and intelligent polling management ([#6784](https://github.com/MetaMask/core/pull/6784))
 - `TokenDetectionController` code cleanup: remove unused private properties and ESLint disable comments ([#6784](https://github.com/MetaMask/core/pull/6784))
+- **Performance Optimization:** Remove collection API calls from NFT detection process ([#6762](https://github.com/MetaMask/core/pull/6762))
+  - Reduce NFT detection API calls by 83% (from 6 calls to 1 call per 100 tokens) by eliminating collection endpoint requests
+  - Remove unused collection metadata fields: `contractDeployedAt`, `creator`, and `topBid`
 
 ## [79.0.1]
 

packages/assets-controllers/package.json

@@ -80,7 +80,7 @@
   "devDependencies": {
     "@babel/runtime": "^7.23.9",
     "@metamask/account-api": "^0.12.0",
-    "@metamask/account-tree-controller": "^1.4.1",
+    "@metamask/account-tree-controller": "^1.4.2",
     "@metamask/accounts-controller": "^33.1.1",
     "@metamask/approval-controller": "^7.2.0",
     "@metamask/auto-changelog": "^3.4.4",
@@ -92,7 +92,7 @@
     "@metamask/multichain-account-service": "^1.6.1",
     "@metamask/network-controller": "^24.2.1",
     "@metamask/permission-controller": "^11.1.0",
-    "@metamask/phishing-controller": "^14.1.1",
+    "@metamask/phishing-controller": "^14.1.2",
     "@metamask/preferences-controller": "^20.0.2",
     "@metamask/providers": "^22.1.0",
     "@metamask/snaps-controllers": "^14.0.1",