feat: integrate multichain assets rates controller to extension UI

app/scripts/constants/sentry-state.ts

@@ -105,6 +105,9 @@ export const SENTRY_BACKGROUND_STATE = {
     accountsAssets: false,
     assetsMetadata: false,
   },
+  MultiChainAssetsRatesController: {
+    assetsRates: false,
+  },
   BridgeController: {
     bridgeState: {
       bridgeFeatureFlags: {

app/scripts/controller-init/controller-list.ts

@@ -13,6 +13,7 @@ import { TransactionUpdateController } from '@metamask-institutional/transaction
 import { AccountsController } from '@metamask/accounts-controller';
 import {
   MultichainAssetsController,
+  MultiChainAssetsRatesController,
   MultichainBalancesController,
 } from '@metamask/assets-controllers';
 import { MultichainTransactionsController } from '@metamask/multichain-transactions-controller';
@@ -42,6 +43,7 @@ export type Controller =
   | JsonSnapsRegistry
   | KeyringController
   | MultichainAssetsController
+  | MultiChainAssetsRatesController
   | MultichainBalancesController
   | MultichainTransactionsController
   | NetworkController
@@ -73,6 +75,7 @@ export type ControllerFlatState = AccountsController['state'] &
   JsonSnapsRegistry['state'] &
   KeyringController['state'] &
   MultichainAssetsController['state'] &
+  MultiChainAssetsRatesController['state'] &
   MultichainBalancesController['state'] &
   MultichainTransactionsController['state'] &
   NetworkController['state'] &

app/scripts/controller-init/messengers/index.ts

@@ -22,6 +22,7 @@ import {
   getMultichainBalancesControllerMessenger,
   getMultichainTransactionsControllerMessenger,
   getMultichainAssetsControllerMessenger,
+  getMultiChainAssetsRatesControllerMessenger,
 } from './multichain';
 
 export const CONTROLLER_MESSENGERS = {
@@ -37,6 +38,10 @@ export const CONTROLLER_MESSENGERS = {
     getMessenger: getMultichainAssetsControllerMessenger,
     getInitMessenger: noop,
   },
+  MultiChainAssetsRatesController: {
+    getMessenger: getMultiChainAssetsRatesControllerMessenger,
+    getInitMessenger: noop,
+  },
   MultichainBalancesController: {
     getMessenger: getMultichainBalancesControllerMessenger,
     getInitMessenger: noop,

app/scripts/controller-init/messengers/multichain/index.ts

@@ -1,7 +1,9 @@
 export { getMultichainAssetsControllerMessenger } from './multichain-assets-controller-messenger';
+export { getMultiChainAssetsRatesControllerMessenger } from './multichain-assets-rates-controller-messenger';
 export { getMultichainBalancesControllerMessenger } from './multichain-balances-controller-messenger';
 export { getMultichainTransactionsControllerMessenger } from './multichain-transactions-controller-messenger';
 
 export type { MultichainAssetsControllerMessenger } from './multichain-assets-controller-messenger';
+export type { MultiChainAssetsRatesControllerMessenger } from './multichain-assets-rates-controller-messenger';
 export type { MultichainBalancesControllerMessenger } from './multichain-balances-controller-messenger';
 export type { MultichainTransactionsControllerMessenger } from './multichain-transactions-controller-messenger';

app/scripts/controller-init/messengers/multichain/multichain-assets-rates-controller-messenger.test.ts

@@ -0,0 +1,14 @@
+import { Messenger, RestrictedMessenger } from '@metamask/base-controller';
+import { getMultiChainAssetsRatesControllerMessenger } from './multichain-assets-rates-controller-messenger';
+
+describe('getMultiChainAssetsRatesControllerMessenger', () => {
+  it('returns a restricted messenger', () => {
+    const messenger = new Messenger<never, never>();
+    const multichainAssetsRatesControllerMessenger =
+      getMultiChainAssetsRatesControllerMessenger(messenger);
+
+    expect(multichainAssetsRatesControllerMessenger).toBeInstanceOf(
+      RestrictedMessenger,
+    );
+  });
+});

app/scripts/controller-init/messengers/multichain/multichain-assets-rates-controller-messenger.ts

@@ -0,0 +1,61 @@
+import { Messenger } from '@metamask/base-controller';
+import {
+  AccountsControllerAccountAddedEvent,
+  AccountsControllerListMultichainAccountsAction,
+} from '@metamask/accounts-controller';
+import {
+  CurrencyRateStateChange,
+  GetCurrencyRateState,
+  MultichainAssetsControllerStateChangeEvent,
+  MultichainAssetsControllerGetStateAction,
+} from '@metamask/assets-controllers';
+import {
+  KeyringControllerLockEvent,
+  KeyringControllerUnlockEvent,
+} from '@metamask/keyring-controller';
+import { HandleSnapRequest } from '@metamask/snaps-controllers';
+
+type Actions =
+  | HandleSnapRequest
+  | AccountsControllerListMultichainAccountsAction
+  | GetCurrencyRateState
+  | MultichainAssetsControllerGetStateAction;
+
+type Events =
+  | KeyringControllerLockEvent
+  | KeyringControllerUnlockEvent
+  | AccountsControllerAccountAddedEvent
+  | CurrencyRateStateChange
+  | MultichainAssetsControllerStateChangeEvent;
+
+export type MultiChainAssetsRatesControllerMessenger = ReturnType<
+  typeof getMultiChainAssetsRatesControllerMessenger
+>;
+
+/**
+ * Get a restricted messenger for the Multichain Assets Rate controller. This is scoped to the
+ * actions and events that the multichain Assets Rate controller is allowed to handle.
+ *
+ * @param messenger - The controller messenger to restrict.
+ * @returns The restricted controller messenger.
+ */
+export function getMultiChainAssetsRatesControllerMessenger(
+  messenger: Messenger<Actions, Events>,
+) {
+  return messenger.getRestricted({
+    name: 'MultiChainAssetsRatesController',
+    allowedEvents: [
+      'AccountsController:accountAdded',
+      'KeyringController:lock',
+      'KeyringController:unlock',
+      'CurrencyRateController:stateChange',
+      'MultichainAssetsController:stateChange',
+    ],
+    allowedActions: [
+      'AccountsController:listMultichainAccounts',
+      'SnapController:handleRequest',
+      'CurrencyRateController:getState',
+      'MultichainAssetsController:getState',
+    ],
+  });
+}

app/scripts/controller-init/multichain/index.ts

@@ -1,3 +1,4 @@
 export { MultichainAssetsControllerInit } from './multichain-assets-controller-init';
 export { MultichainBalancesControllerInit } from './multichain-balances-controller-init';
 export { MultichainTransactionsControllerInit } from './multichain-transactions-controller-init';
+export { MultiChainAssetsRatesControllerInit } from './multichain-rates-assets-controller-init';

app/scripts/controller-init/multichain/multichain-rates-assets-controller-init.test.ts

@@ -0,0 +1,52 @@
+import { MultiChainAssetsRatesController } from '@metamask/assets-controllers';
+import { Messenger } from '@metamask/base-controller';
+import { buildControllerInitRequestMock } from '../test/utils';
+import { ControllerInitRequest } from '../types';
+import {
+  getMultiChainAssetsRatesControllerMessenger,
+  MultiChainAssetsRatesControllerMessenger,
+} from '../messengers/multichain';
+import { MultiChainAssetsRatesControllerInit } from './multichain-rates-assets-controller-init';
+
+jest.mock('@metamask/assets-controllers');
+
+function buildInitRequestMock(): jest.Mocked<
+  ControllerInitRequest<MultiChainAssetsRatesControllerMessenger>
+> {
+  const baseControllerMessenger = new Messenger();
+
+  return {
+    ...buildControllerInitRequestMock(),
+    controllerMessenger: getMultiChainAssetsRatesControllerMessenger(
+      baseControllerMessenger,
+    ),
+    initMessenger: undefined,
+  };
+}
+
+describe('MultiChainAssetsRatesControllerInit', () => {
+  const multiChainAssetsRatesControllerClassMock = jest.mocked(
+    MultiChainAssetsRatesController,
+  );
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('returns controller instance', () => {
+    const requestMock = buildInitRequestMock();
+    expect(
+      MultiChainAssetsRatesControllerInit(requestMock).controller,
+    ).toBeInstanceOf(MultiChainAssetsRatesController);
+  });
+
+  it('initializes with correct messenger and state', () => {
+    const requestMock = buildInitRequestMock();
+    MultiChainAssetsRatesControllerInit(requestMock);
+
+    expect(multiChainAssetsRatesControllerClassMock).toHaveBeenCalledWith({
+      messenger: requestMock.controllerMessenger,
+      state: requestMock.persistedState.MultiChainAssetsRatesController,
+    });
+  });
+});

app/scripts/controller-init/multichain/multichain-rates-assets-controller-init.ts

@@ -0,0 +1,25 @@
+import { MultiChainAssetsRatesController } from '@metamask/assets-controllers';
+import { ControllerInitFunction } from '../types';
+import { MultiChainAssetsRatesControllerMessenger } from '../messengers/multichain';
+
+/**
+ * Initialize the Multichain Assets Rate controller.
+ *
+ * @param request - The request object.
+ * @param request.controllerMessenger - The messenger to use for the controller.
+ * @param request.persistedState - The persisted state of the extension.
+ * @returns The initialized controller.
+ */
+export const MultiChainAssetsRatesControllerInit: ControllerInitFunction<
+  MultiChainAssetsRatesController,
+  MultiChainAssetsRatesControllerMessenger
+> = ({ controllerMessenger, persistedState }) => {
+  const controller = new MultiChainAssetsRatesController({
+    messenger: controllerMessenger,
+    state: persistedState.MultiChainAssetsRatesController,
+  });
+
+  return {
+    controller,
+  };
+};

app/scripts/controller-init/utils.ts

@@ -40,6 +40,7 @@ export type ControllersToInitialize =
   | 'CronjobController'
   | 'ExecutionService'
   | 'MultichainAssetsController'
+  | 'MultiChainAssetsRatesController'
   | 'MultichainBalancesController'
   | 'MultichainTransactionsController'
   | 'RateLimitController'

app/scripts/metamask-controller.js

@@ -363,6 +363,7 @@ import {
   MultichainAssetsControllerInit,
   MultichainTransactionsControllerInit,
   MultichainBalancesControllerInit,
+  MultiChainAssetsRatesControllerInit,
 } from './controller-init/multichain';
 ///: END:ONLY_INCLUDE_IF
 import { TransactionControllerInit } from './controller-init/confirmations/transaction-controller-init';
@@ -2054,6 +2055,7 @@ export default class MetamaskController extends EventEmitter {
       TransactionController: TransactionControllerInit,
       ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
       MultichainAssetsController: MultichainAssetsControllerInit,
+      MultiChainAssetsRatesController: MultiChainAssetsRatesControllerInit,
       MultichainBalancesController: MultichainBalancesControllerInit,
       MultichainTransactionsController: MultichainTransactionsControllerInit,
       ///: END:ONLY_INCLUDE_IF
@@ -2091,6 +2093,8 @@ export default class MetamaskController extends EventEmitter {
       controllersByName.MultichainBalancesController;
     this.multichainTransactionsController =
       controllersByName.MultichainTransactionsController;
+    this.multiChainAssetsRatesController =
+      controllersByName.MultiChainAssetsRatesController;
     ///: END:ONLY_INCLUDE_IF
 
     this.controllerMessenger.subscribe(
@@ -2266,6 +2270,7 @@ export default class MetamaskController extends EventEmitter {
         MultichainAssetsController: this.multichainAssetsController,
         MultichainBalancesController: this.multichainBalancesController,
         MultichainTransactionsController: this.multichainTransactionsController,
+        MultiChainAssetsRatesController: this.multiChainAssetsRatesController,
         ///: END:ONLY_INCLUDE_IF
         NetworkController: this.networkController,
         KeyringController: this.keyringController,

test/e2e/tests/metrics/errors.spec.js

@@ -892,6 +892,7 @@ describe('Sentry errors', function () {
       balances: false,
       accountsAssets: false,
       assetsMetadata: false,
+      assetsRates: false,
       smartTransactionsState: {
         fees: {
           approvalTxFees: true, // Initialized as undefined

ui/selectors/assets.test.ts

@@ -0,0 +1,75 @@
+import {
+  getAssetsRates,
+  AssetsRatesState,
+  AssetsState,
+  getAccountAssets,
+  getAssetsMetadata,
+} from './assets';
+
+const mockRatesState = {
+  metamask: {
+    conversionRates: {
+      'token-1': { rate: 1.5, currency: 'USD' },
+      'token-2': { rate: 0.8, currency: 'EUR' },
+    },
+  },
+};
+
+// Mock state for testing
+const mockAssetsState: AssetsState = {
+  metamask: {
+    accountsAssets: {
+      '5132883f-598e-482c-a02b-84eeaa352f5b': [
+        'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501',
+      ],
+    },
+    assetsMetadata: {
+      'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501': {
+        name: 'Token 1',
+        symbol: 'TKN1',
+        iconUrl: 'https://example.com/token-1.png',
+        fungible: true,
+        units: [{ symbol: 'TKN1', name: 'Token 1', decimals: 9 }],
+      },
+    },
+  },
+};
+
+describe('getAccountAssets', () => {
+  it('should return the assets from the state', () => {
+    const result = getAccountAssets(mockAssetsState);
+    expect(result).toEqual(mockAssetsState.metamask.accountsAssets);
+  });
+});
+
+describe('getAssetsMetadata', () => {
+  it('should return the assets metadata from the state', () => {
+    const result = getAssetsMetadata(mockAssetsState);
+    expect(result).toEqual(mockAssetsState.metamask.assetsMetadata);
+  });
+
+  it('should return undefined if state does not have metamask property', () => {
+    const invalidState = {} as AssetsState;
+    expect(() => getAssetsMetadata(invalidState)).toThrow();
+  });
+});
+
+describe('getAssetsRates', () => {
+  it('should return the assetsRates from the state', () => {
+    const result = getAssetsRates(mockRatesState);
+    expect(result).toEqual(mockRatesState.metamask.conversionRates);
+  });
+
+  it('should return an empty object if assetsRates is empty', () => {
+    const emptyState: AssetsRatesState = {
+      metamask: { conversionRates: {} },
+    };
+    const result = getAssetsRates(emptyState);
+    expect(result).toEqual({});
+  });
+
+  it('should return undefined if state does not have metamask property', () => {
+    const invalidState = {} as AssetsRatesState;
+    expect(() => getAssetsRates(invalidState)).toThrow();
+  });
+});

ui/selectors/assets.ts

@@ -1,9 +1,16 @@
-import { MultichainAssetsControllerState } from '@metamask/assets-controllers';
+import {
+  MultichainAssetsControllerState,
+  MultichainAssetsRatesControllerState,
+} from '@metamask/assets-controllers';
 
 export type AssetsState = {
   metamask: MultichainAssetsControllerState;
 };
 
+export type AssetsRatesState = {
+  metamask: MultichainAssetsRatesControllerState;
+};
+
 /**
  * Gets non-EVM accounts assets.
  *
@@ -23,3 +30,13 @@ export function getAccountAssets(state: AssetsState) {
 export function getAssetsMetadata(state: AssetsState) {
   return state.metamask.assetsMetadata;
 }
+
+/**
+ * Gets non-EVM accounts assets rates.
+ *
+ * @param state - Redux state object.
+ * @returns An object containing non-EVM assets per accounts.
+ */
+export function getAssetsRates(state: AssetsRatesState) {
+  return state.metamask.conversionRates;
+}