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 9 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
27 changes: 27 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,30 @@ export default class MetamaskController extends EventEmitter {
disabled: !this.preferencesController.state.useNftDetection,
});

// MultichainAssetsController
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,
});

// MultichainAssetsController

const metaMetricsControllerMessenger =
this.controllerMessenger.getRestricted({
name: 'MetaMetricsController',
Expand Down Expand Up @@ -2271,6 +2296,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 +2350,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
8 changes: 8 additions & 0 deletions ui/selectors/selectors.js
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,14 @@ export function getSelectedAccountTokensAcrossChains(state) {
return tokensByChain;
}

export function getAllNonEvmTokens(state) {
return state.metamask.accountsAssets;
}

export function getAllNonEvmMetadata(state) {
sahar-fehri marked this conversation as resolved.
Show resolved Hide resolved
return state.metamask.assetsMetadata;
}

/**
* Retrieves native token information (symbol, decimals, name) for a given chainId from the state,
* without hardcoding any values.
Expand Down
Loading