Skip to content
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.

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

fix: integrate multichainAssetsController #30059

Merged
merged 17 commits into from
Feb 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 app/scripts/constants/sentry-state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ export const SENTRY_BACKGROUND_STATE = {
MultichainBalancesController: {
balances: false,
},
MultichainAssetsController: {
accountsAssets: false,
assetsMetadata: false,
},
BridgeController: {
bridgeState: {
bridgeFeatureFlags: {
Expand Down
24 changes: 24 additions & 0 deletions app/scripts/metamask-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
fetchMultiExchangeRate,
TokenBalancesController,
MultichainBalancesController,
MultichainAssetsController,
} from '@metamask/assets-controllers';
import { JsonRpcEngine } from '@metamask/json-rpc-engine';
import { createEngineStream } from '@metamask/json-rpc-middleware-stream';
Expand Down Expand Up @@ -785,6 +786,27 @@ export default class MetamaskController extends EventEmitter {
disabled: !this.preferencesController.state.useNftDetection,
});

const multichainAssetsControllerMessenger =
this.controllerMessenger.getRestricted({
name: 'MultichainAssetsController',
allowedEvents: [
'AccountsController:accountAdded',
'AccountsController:accountRemoved',
'AccountsController:accountAssetListUpdated',
],
allowedActions: [
'SnapController:handleRequest',
'SnapController:getAll',
'PermissionController:getPermissions',
'AccountsController:listMultichainAccounts',
],
});

this.multichainAssetsController = new MultichainAssetsController({
state: initState.MultichainAssetsController,
messenger: multichainAssetsControllerMessenger,
});

const metaMetricsControllerMessenger =
this.controllerMessenger.getRestricted({
name: 'MetaMetricsController',
Expand Down Expand Up @@ -2271,6 +2293,7 @@ export default class MetamaskController extends EventEmitter {
AppStateController: this.appStateController,
AppMetadataController: this.appMetadataController,
MultichainBalancesController: this.multichainBalancesController,
MultichainAssetsController: this.multichainAssetsController,
///: BEGIN:ONLY_INCLUDE_IF(build-flask)
MultichainTransactionsController: this.multichainTransactionsController,
///: END:ONLY_INCLUDE_IF
Expand Down Expand Up @@ -2324,6 +2347,7 @@ export default class MetamaskController extends EventEmitter {
AppStateController: this.appStateController,
AppMetadataController: this.appMetadataController,
MultichainBalancesController: this.multichainBalancesController,
MultichainAssetsController: this.multichainAssetsController,
///: BEGIN:ONLY_INCLUDE_IF(build-flask)
MultichainTransactionsController: this.multichainTransactionsController,
///: END:ONLY_INCLUDE_IF
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@
"metaMetricsDataDeletionId": null,
"metaMetricsDataDeletionTimestamp": 0
},
"MultichainAssetsController": {
"accountsAssets": "object",
"assetsMetadata": "object"
},
"MultichainBalancesController": { "balances": "object" },
"MultichainRatesController": {
"fiatCurrency": "usd",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,8 @@
"cacheTimestamp": "number",
"accounts": "object",
"accountsByChainId": "object",
"accountsAssets": "object",
"assetsMetadata": "object",
"marketData": "object",
"unapprovedDecryptMsgs": "object",
"unapprovedDecryptMsgCount": 0,
Expand Down
25 changes: 25 additions & 0 deletions ui/selectors/assets.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { MultichainAssetsControllerState } from '@metamask/assets-controllers';

export type AssetsState = {
metamask: MultichainAssetsControllerState;
};

/**
* Gets non-EVM accounts assets.
*
* @param state - Redux state object.
* @returns An object containing non-EVM assets per accounts.
*/
export function getAccountAssets(state: AssetsState) {
return state.metamask.accountsAssets;
}

/**
* Gets non-EVM assets metadata.
*
* @param state - Redux state object.
* @returns An object containing non-EVM assets metadata per asset types (CAIP-19).
*/
export function getAssetsMetadata(state: AssetsState) {
return state.metamask.assetsMetadata;
}
Loading