Skip to content

chore: prioritize price-api for currencyRateController exchange rates… #36986

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

Merged
merged 16 commits into from
Oct 30, 2025
+116 −313
Merged

chore: prioritize price-api for currencyRateController exchange rates… #36986

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5ed1d3d
chore: prioritize price-api for currencyRateController exchange rates…
sahar-fehri Oct 20, 2025
aaef5d0
fix: fix test
sahar-fehri Oct 20, 2025
7ed57a5
Merge branch 'main' into chore/use-price-api-in-currencyRateController
sahar-fehri Oct 22, 2025
4516fb4
Merge branch 'main' into chore/use-price-api-in-currencyRateController
sahar-fehri Oct 22, 2025
0928c64
Merge branch 'main' into chore/use-price-api-in-currencyRateController
sahar-fehri Oct 22, 2025
0883348
update package to release
bergarces Oct 30, 2025
a62c553
Merge branch 'main' into chore/use-price-api-in-currencyRateController
bergarces Oct 30, 2025
2ab1ee7
controller utils upgrade
bergarces Oct 30, 2025
5ce177e
fix: solve breaking changes from multichain ignored assets implementa…
juanmigdr Oct 30, 2025
3f73740
chore: updated tests for ignored assets
juanmigdr Oct 30, 2025
3954fe6
added new state field to types
bergarces Oct 30, 2025
14c01cd
Merge branch 'main' into chore/use-price-api-in-currencyRateController
bergarces Oct 30, 2025
3d50391
prevent new references from state
bergarces Oct 30, 2025
ea8515b
remove test
bergarces Oct 30, 2025
40ddf34
remove entry
bergarces Oct 30, 2025
3ad4311
readd entry
bergarces Oct 30, 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
1 change: 1 addition & 0 deletions .storybook/test-data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,7 @@ const state = {
],
accountsAssets: {},
assetsMetadata: {},
allIgnoredAssets: {},
balances: {},
conversionRates: {},
networkConfigurationsByChainId: {},
Expand Down
261 changes: 0 additions & 261 deletions .yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions app/scripts/constants/sentry-state.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ export const SENTRY_BACKGROUND_STATE = {
MultichainAssetsController: {
accountsAssets: false,
assetsMetadata: false,
allIgnoredAssets: false,
},
MultichainAssetsRatesController: {
assetsRates: false,
Expand Down
15 changes: 14 additions & 1 deletion app/scripts/controller-init/currency-rate-controller-init.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { CurrencyRateController } from '@metamask/assets-controllers';
import {
CodefiTokenPricesServiceV2,
CurrencyRateController,
} from '@metamask/assets-controllers';
import { getRootMessenger } from '../lib/messenger';
import { ControllerInitRequest } from './types';
import { buildControllerInitRequestMock } from './test/utils';
Expand All @@ -15,6 +18,15 @@ jest.mock('@metamask/assets-controllers', () => ({
// This is needed since the controller init tries to override this function.
fetchMultiExchangeRate = jest.fn();
},
CodefiTokenPricesServiceV2: class {
fetchTokenPrices = jest.fn();

fetchExchangeRates = jest.fn();

validateChainIdSupported = jest.fn();

validateCurrencySupported = jest.fn();
},
}));

function getInitRequestMock(): jest.Mocked<
Expand All @@ -29,6 +41,7 @@ function getInitRequestMock(): jest.Mocked<
...buildControllerInitRequestMock(),
controllerMessenger: getCurrencyRateControllerMessenger(baseMessenger),
initMessenger: getCurrencyRateControllerInitMessenger(baseMessenger),
tokenPricesService: new CodefiTokenPricesServiceV2(),
};

return requestMock;
Expand Down
6 changes: 5 additions & 1 deletion app/scripts/controller-init/currency-rate-controller-init.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { CurrencyRateController } from '@metamask/assets-controllers';
import {
CodefiTokenPricesServiceV2,
CurrencyRateController,
} from '@metamask/assets-controllers';
import {
CurrencyRateControllerInitMessenger,
CurrencyRateControllerMessenger,
Expand Down Expand Up @@ -28,6 +31,7 @@ export const CurrencyRateControllerInit: ControllerInitFunction<
includeUsdRate: true,
useExternalServices: () =>
initMessenger.call('PreferencesController:getState').useExternalServices,
tokenPricesService: new CodefiTokenPricesServiceV2(),
});

// TODO: This logic should be ported to `CurrencyRateController` directly.
Expand Down
14 changes: 3 additions & 11 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,15 +241,7 @@
"@endo/env-options@npm:^1.1.11": "patch:@endo/env-options@npm%3A1.1.11#~/.yarn/patches/@endo-env-options-npm-1.1.11-1b7fae374a.patch",
"@endo/env-options@npm:^1.1.7": "patch:@endo/env-options@npm%3A1.1.11#~/.yarn/patches/@endo-env-options-npm-1.1.11-1b7fae374a.patch",
"@endo/env-options@npm:^1.1.8": "patch:@endo/env-options@npm%3A1.1.11#~/.yarn/patches/@endo-env-options-npm-1.1.11-1b7fae374a.patch",
"@metamask/jazzicon@npm:^2.0.0": "patch:@metamask/jazzicon@npm%3A2.0.0#~/.yarn/patches/@metamask-jazzicon-npm-2.0.0-36957be38d.patch",
"@metamask/controller-utils@npm:^11.14.1": "patch:@metamask/controller-utils@npm%3A11.14.1#~/.yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch",
"@metamask/controller-utils@npm:^11.9.0": "patch:@metamask/controller-utils@npm%3A11.14.1#~/.yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch",
"@metamask/controller-utils@npm:^11.5.0": "patch:@metamask/controller-utils@npm%3A11.14.1#~/.yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch",
"@metamask/controller-utils@npm:^11.11.0": "patch:@metamask/controller-utils@npm%3A11.14.1#~/.yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch",
"@metamask/controller-utils@npm:^11.14.0": "patch:@metamask/controller-utils@npm%3A11.14.1#~/.yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch",
"@metamask/controller-utils@npm:^11.12.0": "patch:@metamask/controller-utils@npm%3A11.14.1#~/.yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch",
"@metamask/controller-utils@npm:^11.3.0": "patch:@metamask/controller-utils@npm%3A11.14.1#~/.yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch",
"@metamask/controller-utils@npm:^11.0.0": "patch:@metamask/controller-utils@npm%3A11.14.1#~/.yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch"
"@metamask/jazzicon@npm:^2.0.0": "patch:@metamask/jazzicon@npm%3A2.0.0#~/.yarn/patches/@metamask-jazzicon-npm-2.0.0-36957be38d.patch"
},
"dependencies": {
"@babel/runtime": "patch:@babel/runtime@npm%3A7.25.9#~/.yarn/patches/@babel-runtime-npm-7.25.9-fe8c62510a.patch",
Expand Down Expand Up @@ -277,15 +269,15 @@
"@metamask/address-book-controller": "^7.0.0",
"@metamask/announcement-controller": "^8.0.0",
"@metamask/approval-controller": "^8.0.0",
"@metamask/assets-controllers": "^84.0.0",
"@metamask/assets-controllers": "^85.0.0",
"@metamask/base-controller": "^9.0.0",
"@metamask/bitcoin-wallet-snap": "^1.3.0",
"@metamask/bridge-controller": "^56.0.0",
"@metamask/bridge-status-controller": "^56.0.0",
"@metamask/browser-passworder": "^4.3.0",
"@metamask/chain-agnostic-permission": "^1.2.2",
"@metamask/contract-metadata": "^2.5.0",
"@metamask/controller-utils": "patch:@metamask/controller-utils@npm%3A11.14.1#~/.yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch",
"@metamask/controller-utils": "^11.15.0",
"@metamask/core-backend": "^4.0.0",
"@metamask/delegation-controller": "^1.0.0",
"@metamask/delegation-core": "^0.2.0-rc.1",
Expand Down
1 change: 1 addition & 0 deletions shared/types/background.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ export type ControllerStatePropertiesEnumerated = {
historicalPrices: MultichainAssetsRatesControllerState['historicalPrices'];
assetsMetadata: MultichainAssetsControllerState['assetsMetadata'];
accountsAssets: MultichainAssetsControllerState['accountsAssets'];
allIgnoredAssets: MultichainAssetsControllerState['allIgnoredAssets'];
multichainNetworkConfigurationsByChainId: MultichainNetworkControllerState['multichainNetworkConfigurationsByChainId'];
selectedMultichainNetworkChainId: MultichainNetworkControllerState['selectedMultichainNetworkChainId'];
isEvmSelected: MultichainNetworkControllerState['isEvmSelected'];
Expand Down
2 changes: 2 additions & 0 deletions test/data/mock-state.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2340,6 +2340,8 @@
"throttledOrigins": {},
"delegations": {},
"accountsAssets": {},
"assetsMetadata": {},
"allIgnoredAssets": {},
"gatorPermissionsMapSerialized": "{\"native-token-stream\":{},\"native-token-periodic\":{},\"erc20-token-stream\":{},\"erc20-token-periodic\":{},\"other\":{}}",
"isGatorPermissionsEnabled": false,
"isFetchingGatorPermissions": false,
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/fixtures/onboarding-fixture.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,8 @@
},
"MultichainAssetsController": {
"accountsAssets": {},
"assetsMetadata": {}
"assetsMetadata": {},
"allIgnoredAssets": {}
},
"MultichainAssetsRatesController": {
"conversionRates": {}
Expand Down
1 change: 1 addition & 0 deletions test/e2e/tests/metrics/errors.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,6 +904,7 @@ describe('Sentry errors', function () {
balances: false,
accountsAssets: false,
assetsMetadata: false,
allIgnoredAssets: false,
assetsRates: false,
smartTransactionsState: {
fees: {
Expand Down
Loading
Loading