Merge branch 'main' into cryptodev-2s/messenger/core-backend

Author: cryptodev-2s

.yarnrc.yml

@@ -15,3 +15,13 @@ nodeLinker: node-modules
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-allow-scripts.cjs
     spec: "https://raw.githubusercontent.com/LavaMoat/LavaMoat/main/packages/yarn-plugin-allow-scripts/bundles/@yarnpkg/plugin-allow-scripts.js"
+
+# Configure the NPM minimal age gate to 3 days, meaning packages must be at
+# least 3 days old to be installed.
+npmMinimalAgeGate: 4320 # 3 days (in minutes)
+
+# Override the minimal age gate, allowing certain packages to be installed
+# regardless of their publish age.
+npmPreapprovedPackages:
+  - "@metamask/*"
+  - "@lavamoat/*"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/core-monorepo",
-  "version": "628.0.0",
+  "version": "629.0.0",
   "private": true,
   "description": "Monorepo for packages shared between MetaMask clients",
   "repository": {
@@ -104,7 +104,7 @@
     "typescript-eslint": "^8.7.0",
     "yargs": "^17.7.2"
   },
-  "packageManager": "yarn@4.2.2",
+  "packageManager": "yarn@4.10.3",
   "engines": {
     "node": "^18.18 || >=20"
   },

packages/assets-controllers/CHANGELOG.md

@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add multicall addresses in `MULTICALL_CONTRACT_BY_CHAINID` ([#6896](https://github.com/MetaMask/core/pull/6896))
   - Add multicall address for Chains: `Injective`, `Hemi`, `Plasma`, `Nonmia`, `XRPL`, `Soneium`, `Genesys`, `EDU`, `Abstract`, `Berachain`, `MegaETH Testnet`, `Apechain`, `Matchain`, `Monad Testnet`, `Monad`, `Katana`, `Lens`, `Plume`, `XDC`
 
+### Changed
+
+- Batch `OnAssetConversion` and `OnAssetsMarketData` requests to non-EVM account Snaps ([#6886](https://github.com/MetaMask/core/pull/6886))
+
 ## [81.0.1]
 
 ### Fixed

packages/assets-controllers/src/MultichainAssetsRatesController/MultichainAssetsRatesController.test.ts

@@ -71,6 +71,20 @@ const fakeEvmAccountWithoutMetadata: InternalAccount = {
   methods: [],
 };
 
+const fakeNonEvmAccount2: InternalAccount = {
+  id: 'account5',
+  type: 'solana:data-account',
+  address: '0x123',
+  metadata: {
+    name: 'Test Account',
+    // @ts-expect-error-next-line
+    snap: { id: 'test-snap-2', enabled: true },
+  },
+  scopes: ['solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp'],
+  options: {},
+  methods: [],
+};
+
 const fakeMarketData = {
   price: 202.11,
   priceChange: 0,
@@ -127,6 +141,9 @@ const setupController = ({
         account1: ['solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501'],
         account2: ['solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501'],
         account3: ['solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501'],
+        account5: [
+          'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
+        ],
       },
       assetsMetadata: {
         'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501': {
@@ -136,6 +153,14 @@ const setupController = ({
           iconUrl: 'https://example.com/solana.png',
           units: [{ symbol: 'SOL', name: 'Solana', decimals: 9 }],
         },
+        'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v':
+          {
+            name: 'USDC',
+            symbol: 'USDC',
+            fungible: true,
+            iconUrl: 'https://example.com/usdc.png',
+            units: [{ symbol: 'USDC', name: 'USDC', decimals: 2 }],
+          },
       },
     }),
   );
@@ -356,8 +381,8 @@ describe('MultichainAssetsRatesController', () => {
             type: KeyringTypes.snap,
           },
           snap: {
-            id: 'mock-sol-snap',
-            name: 'mock-sol-snap',
+            id: 'mock-sol-snap-1',
+            name: 'mock-sol-snap-1',
             enabled: true,
           },
           lastSelected: 0,
@@ -377,8 +402,8 @@ describe('MultichainAssetsRatesController', () => {
             type: KeyringTypes.snap,
           },
           snap: {
-            id: 'mock-sol-snap',
-            name: 'mock-sol-snap',
+            id: 'mock-sol-snap-2',
+            name: 'mock-sol-snap-2',
             enabled: true,
           },
           lastSelected: 0,
@@ -393,42 +418,49 @@ describe('MultichainAssetsRatesController', () => {
       accountsAssets: testAccounts,
     });
 
-    const snapSpy = jest
-      .fn()
-      .mockResolvedValueOnce({
-        conversionRates: {
-          'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501': {
-            'swift:0/iso4217:USD': {
-              rate: '100',
-              conversionTime: 1738539923277,
+    const mockResponses = {
+      onAssetsConversion: [
+        {
+          conversionRates: {
+            'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501': {
+              'swift:0/iso4217:USD': {
+                rate: '100',
+                conversionTime: 1738539923277,
+              },
             },
           },
         },
-      })
-      .mockResolvedValueOnce({
-        marketData: {
-          'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501': {
-            'swift:0/iso4217:USD': fakeMarketData,
+        {
+          conversionRates: {
+            'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token1:501': {
+              'swift:0/iso4217:USD': {
+                rate: '200',
+                conversionTime: 1738539923277,
+              },
+            },
           },
         },
-      })
-      .mockResolvedValueOnce({
-        conversionRates: {
-          'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token1:501': {
-            'swift:0/iso4217:USD': {
-              rate: '200',
-              conversionTime: 1738539923277,
-            },
+      ],
+      onAssetsMarketData: [
+        {
+          marketData: {
+            'swift:0/iso4217:USD': fakeMarketData,
           },
         },
-      })
-      .mockResolvedValueOnce({
-        marketData: {
-          'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token1:501': {
+        {
+          marketData: {
             'swift:0/iso4217:USD': fakeMarketData,
           },
         },
-      });
+      ],
+    };
+
+    const snapSpy = jest.fn().mockImplementation((args) => {
+      const { handler } = args;
+      return Promise.resolve(
+        mockResponses[handler as keyof typeof mockResponses].shift(),
+      );
+    });
     messenger.registerActionHandler('SnapController:handleRequest', snapSpy);
 
     messenger.publish('MultichainAssetsController:accountAssetListUpdated', {
@@ -443,6 +475,7 @@ describe('MultichainAssetsRatesController', () => {
         },
       },
     });
+
     // Wait for the asynchronous subscriber to run.
     await Promise.resolve();
     await advanceTime({ clock, duration: 10 });
@@ -625,7 +658,7 @@ describe('MultichainAssetsRatesController', () => {
 
     it('handles mixed success and failure scenarios', async () => {
       const { controller, messenger } = setupController({
-        accountsAssets: [fakeNonEvmAccount, fakeEvmAccount2],
+        accountsAssets: [fakeNonEvmAccount, fakeNonEvmAccount2],
       });
 
       const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation();
@@ -957,7 +990,7 @@ describe('MultichainAssetsRatesController', () => {
       const snapHandler = jest.fn().mockResolvedValue({
         conversionRates: {
           'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501': {
-            USD: {
+            'swift:0/iso4217:USD': {
               rate: '100.50',
               conversionTime: Date.now(),
             },