Use modular init for accounts controller in Engine

MetaMask · Jan 18, 2025 · 7635a8a · 7635a8a
1 parent 84addc5
commit 7635a8a
Showing 1 changed file with 30 additions and 22 deletions.
diff --git a/app/core/Engine/Engine.ts b/app/core/Engine/Engine.ts
@@ -154,10 +154,8 @@ import {
   AccountsControllerSelectedAccountChangeEvent,
   AccountsControllerAccountAddedEvent,
   AccountsControllerAccountRenamedEvent,
-} from './controllers/AccountsController/constants';
-import { AccountsControllerMessenger } from '@metamask/accounts-controller';
-import { createAccountsController } from './controllers/AccountsController/utils';
-import { createRemoteFeatureFlagController } from './controllers/RemoteFeatureFlagController';
+} from './controllers/accounts-controller/constants';
+import { createRemoteFeatureFlagController } from './controllers/remote-feature-flag-controller';
 import { captureException } from '@sentry/react-native';
 import { lowerCase } from 'lodash';
 import {
@@ -215,6 +213,9 @@ import {
   getGlobalNetworkClientId,
 } from '../../util/networks/global-network';
 import { logEngineCreation } from './utils/logger';
+import { initControllers } from './utils';
+import { AccountsControllerInit } from './controllers/accounts-controller/utils';
+import { Controller, ControllerInitFunction } from './modular-controller.types';
 
 const NON_EMPTY = 'NON_EMPTY';
 
@@ -356,26 +357,15 @@ export class Engine {
       chainId: getGlobalChainId(networkController),
     });
 
-    // Create AccountsController
-    const accountsControllerMessenger: AccountsControllerMessenger =
-      this.controllerMessenger.getRestricted({
-        name: 'AccountsController',
-        allowedEvents: [
-          'SnapController:stateChange',
-          'KeyringController:accountRemoved',
-          'KeyringController:stateChange',
-        ],
-        allowedActions: [
-          'KeyringController:getAccounts',
-          'KeyringController:getKeyringsByType',
-          'KeyringController:getKeyringForAccount',
-        ],
-      });
-    const accountsController = createAccountsController({
-      messenger: accountsControllerMessenger,
-      initialState: initialState.AccountsController,
+    // Modular controller initialization
+    const controllerInitFunctions = [AccountsControllerInit];
+    const { controllersByName } = this.#initControllers({
+      initFunctions: controllerInitFunctions,
+      initState: initialState as EngineState,
     });
 
+    const accountsController = controllersByName.AccountsController;
+
     const nftController = new NftController({
       chainId: getGlobalChainId(networkController),
       useIpfsSubdomains: false,
@@ -1566,6 +1556,24 @@ export class Engine {
     Engine.instance = this;
   }
 
+  #initControllers({
+    initFunctions,
+    initState,
+  }: {
+    initFunctions: ControllerInitFunction<Controller>[];
+    initState: EngineState;
+  }) {
+    const initRequest = {
+      baseControllerMessenger: this.controllerMessenger,
+      persistedState: initState,
+    };
+
+    return initControllers({
+      initFunctions,
+      initRequest,
+    });
+  }
+
   // Logs the "Transaction Finalized" event after a transaction was either confirmed, dropped or failed.
   _handleTransactionFinalizedEvent = async (
     transactionEventPayload: TransactionEventPayload,