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

This file was deleted.

13 changes: 8 additions & 5 deletions app/core/Engine/Engine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ import { appMetadataControllerInit } from './controllers/app-metadata-controller
import { InternalAccount } from '@metamask/keyring-internal-api';
import { toFormattedAddress } from '../../util/address';
import { WebSocketServiceInit } from './controllers/snaps/websocket-service-init';
import { networkEnablementControllerInit } from './controllers/network-enablement-controller/network-enablement-controller-init';
import { scanCompleted, scanRequested } from '../redux/slices/qrKeyringScanner';
import { perpsControllerInit } from './controllers/perps-controller';
import { predictControllerInit } from './controllers/predict-controller';
Expand Down Expand Up @@ -323,7 +322,6 @@ export class Engine {
PredictVenueController: predictVenueControllerInit,
TokensController: tokensControllerInit,
MultichainNetworkController: multichainNetworkControllerInit,
NetworkEnablementController: networkEnablementControllerInit,
TokenSearchDiscoveryDataController:
tokenSearchDiscoveryDataControllerInit,
DeFiPositionsController: defiPositionsControllerInit,
Expand Down Expand Up @@ -544,9 +542,14 @@ export class Engine {
messengerClientsByName.MultichainAccountService;
const snapAccountService = messengerClientsByName.SnapAccountService;

const networkEnablementController =
messengerClientsByName.NetworkEnablementController;
networkEnablementController.init();
const networkEnablementController = this.#wallet.getInstance(
'NetworkEnablementController',
);
// Re-run now that MultichainNetworkController is registered; the call
// made by `wallet.init()` cannot read it yet.
networkEnablementController.init().catch((error) => {
captureException(error);
});

const moneyAccountUpgradeController =
messengerClientsByName.MoneyAccountUpgradeController;
Expand Down

This file was deleted.

This file was deleted.

5 changes: 0 additions & 5 deletions app/core/Engine/messengers/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
getAccountTreeControllerMessenger,
} from '../../../multichain-accounts/messengers/account-tree-controller-messenger';
import { getMultichainNetworkControllerMessenger } from './multichain-network-controller-messenger/multichain-network-controller-messenger';
import { getNetworkEnablementControllerMessenger } from './network-enablement-controller-messenger/network-enablement-controller-messenger';
import { getAppMetadataControllerMessenger } from './app-metadata-controller-messenger';
import {
getDeFiPositionsControllerInitMessenger,
Expand Down Expand Up @@ -292,10 +291,6 @@ export const MESSENGER_FACTORIES = {
getMessenger: getSmartTransactionsControllerMessenger,
getInitMessenger: getSmartTransactionsControllerInitMessenger,
},
NetworkEnablementController: {
getMessenger: getNetworkEnablementControllerMessenger,
getInitMessenger: noop,
},
PerpsController: {
getMessenger: getPerpsControllerMessenger,
getInitMessenger: noop,
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion app/core/Engine/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,6 @@ export type MessengerClientsToInitialize =
| 'PreferencesController'
| 'BridgeController'
| 'BridgeStatusController'
| 'NetworkEnablementController'
| 'RewardsController'
| 'RewardsDataService'
| 'RewardsMoneyController'
Expand Down
4 changes: 4 additions & 0 deletions app/core/Engine/wallet-init/initialization.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,10 @@ export function initializeWallet({
getAnalyticsControllerInitMessenger(messenger),
);

// `wallet.init()` also runs `NetworkEnablementController.init()`, which
// reads `MultichainNetworkController:getState`. Mobile registers that
// controller after the wallet, so Engine calls
// `NetworkEnablementController.init()` again once it exists.
wallet.init().catch((error: unknown) => console.error(error));

fetchInitialGeolocation(wallet.getInstance('GeolocationController'));
Expand Down
12 changes: 12 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ const DEPENDENCIES_TO_TRANSPILE = [
'@metamask/authenticated-user-storage',
'@metamask/base-controller',
'@metamask/base-data-service',
// ESM-only; split out of @metamask/utils 12.0.1.
'@metamask/byte-utils',
'@metamask/error-utils',
'@metamask/node-utils',
'@metamask/type-utils',
'@metamask/address-book-controller',
// 3.x ships ESM-only under dist/*.js (2.x used a CJS build).
'@metamask/analytics-controller',
Expand All @@ -95,11 +100,15 @@ const DEPENDENCIES_TO_TRANSPILE = [
'@metamask/delegation-controller',
'@metamask/delegation-core',
'@metamask/delegation-deployments',
// 4.x ships ESM-only under dist/*.js.
'@metamask/eip-5792-middleware',
// ESM-only; the Money MPC keyring V2 adapter.
'@metamask/eth-money-mpc-keyring',
'@metamask/gas-fee-controller',
// 2.x ships ESM-only under dist/*.js.
'@metamask/geolocation-controller',
// 6.x ships ESM-only under dist/*.js.
'@metamask/gator-permissions-controller',
'@metamask/keyring-controller',
'@metamask/kyc-controller',
'@metamask/logging-controller',
Expand All @@ -112,6 +121,7 @@ const DEPENDENCIES_TO_TRANSPILE = [
'@metamask/money-account-utils',
'@metamask/multichain-account-service',
'@metamask/multichain-network-controller',
'@metamask/network-connection-banner-controller',
'@metamask/network-controller',
'@metamask/network-enablement-controller',
'@metamask/notification-services-controller',
Expand All @@ -122,6 +132,8 @@ const DEPENDENCIES_TO_TRANSPILE = [
'@metamask/profile-controller',
'@metamask/profile-sync-controller',
'@metamask/ramps-controller',
// 7.x ships ESM-only under dist/*.js.
'@metamask/remote-feature-flag-controller',
'@metamask/sentinel-api-service',
'@metamask/seedless-onboarding-controller',
'@metamask/snap-account-service',
Expand Down
Loading
Loading