Skip to content

perf(multichain): batch OnAsset* requests #6886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

perf(multichain): batch OnAsset* requests #6886

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f429430
perf(multichain): batch `OnAsset*` requests
danroc Oct 17, 2025
139cf8c
chore: update tests
danroc Oct 17, 2025
0887482
chore: remove unused import
danroc Oct 17, 2025
4034aaf
chore: update changelog
danroc Oct 17, 2025
fb4ce51
Merge branch 'main' into dr/batch-rate-conversion
danroc Oct 17, 2025
5c6b479
chore: update tests
danroc Oct 17, 2025
4eaaa5b
chore: update changelog
danroc Oct 17, 2025
df42ce0
chore: update tests
danroc Oct 17, 2025
468843a
chore: fix tests
danroc Oct 17, 2025
922302d
chore: rename variable
danroc Oct 17, 2025
80197b0
chore: rename variable
danroc Oct 17, 2025
642509a
refactor: run requests in parallel
danroc Oct 17, 2025
30ce006
perf: dedupe requests when tracking new assets
danroc Oct 17, 2025
2c55cd2
test: fix concurrency issue
danroc Oct 17, 2025
a58bbc8
Merge branch 'main' into dr/batch-rate-conversion
danroc Oct 17, 2025
f1aa4f0
fix: avoid recreating `snapIdToAssets` map
danroc Oct 17, 2025
fd1be26
chore: noop when there are no assets to fetch
danroc Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/assets-controllers/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed

- Batch `OnAssetConversion` and `OnAssetsMarketData` requests to non-EVM account Snaps ([#6886](https://github.com/MetaMask/core/pull/6886))

## [81.0.1]

### Fixed
Expand Down
97 changes: 65 additions & 32 deletions ...s-controllers/src/MultichainAssetsRatesController/MultichainAssetsRatesController.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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': {
Expand All @@ -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 }],
},
},
}),
);
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
},
},
});
],
};
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Mock Data Structure Mismatch Causes Undefined Retrieval

The onAssetsMarketData mock in the test is structured incorrectly. It provides market data keyed directly by currency, but the controller expects it to be nested under an asset ID. This mismatch causes market data to be undefined when retrieved.

Fix in Cursor Fix in Web


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', {
Expand All @@ -443,6 +475,7 @@ describe('MultichainAssetsRatesController', () => {
},
},
});

// Wait for the asynchronous subscriber to run.
await Promise.resolve();
await advanceTime({ clock, duration: 10 });
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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(),
},
Expand Down
Loading
Loading