fix: fix circular dep

Author: ccharly

packages/multichain-account-controller/src/index.ts

@@ -1,2 +1,2 @@
-export type { MultichainAccountControllerMessenger } from './MultichainAccountController';
+export type { MultichainAccountControllerMessenger } from './types';
 export { MultichainAccountController } from './MultichainAccountController';

packages/multichain-account-controller/src/providers/EvmAccountProvider.ts

@@ -9,7 +9,7 @@ import type {
   InternalAccount,
 } from '@metamask/keyring-internal-api';
 import type { AccountProvider } from '@metamask/multichain-account-api';
-import type { MultichainAccountControllerMessenger } from 'src/MultichainAccountController';
+import type { MultichainAccountControllerMessenger } from '../types';
 
 // Max index used by discovery (until we move the proper discovery here).
 const MAX_GROUP_INDEX = 1;

packages/multichain-account-controller/src/providers/SolAccountProvider.ts

@@ -10,7 +10,7 @@ import type { AccountProvider } from '@metamask/multichain-account-api';
 import type { SnapId } from '@metamask/snaps-sdk';
 import { HandlerType } from '@metamask/snaps-utils';
 import type { Json, JsonRpcRequest } from '@metamask/utils';
-import type { MultichainAccountControllerMessenger } from 'src/MultichainAccountController';
+import type { MultichainAccountControllerMessenger } from '../types';
 
 type SolInternalAccount = InternalAccount & {
   options: {
@@ -30,7 +30,7 @@ function assertInternalAccountExists(
 
 export class SolAccountProvider implements AccountProvider {
   readonly #messenger: MultichainAccountControllerMessenger;
-
+ 
   readonly #client: KeyringClient;
 
   constructor(messenger: MultichainAccountControllerMessenger) {

packages/multichain-account-controller/src/types.ts

@@ -0,0 +1,48 @@
+import type {
+  AccountsControllerGetAccountAction,
+  AccountsControllerGetAccountByAddressAction,
+  AccountsControllerListMultichainAccountsAction,
+} from '@metamask/accounts-controller';
+import type { RestrictedMessenger } from '@metamask/base-controller';
+import type { KeyringControllerWithKeyringAction } from '@metamask/keyring-controller';
+import type { HandleSnapRequest as SnapControllerHandleSnapRequestAction } from '@metamask/snaps-controllers';
+
+/**
+ * All actions that {@link MultichainAccountController} registers so that other
+ * modules can call them.
+ */
+export type MultichainAccountControllerActions = never;
+/**
+ * All events that {@link MultichainAccountController} publishes so that other modules
+ * can subscribe to them.
+ */
+export type MultichainAccountControllerEvents = never;
+
+/**
+ * All actions registered by other modules that {@link MultichainAccountController}
+ * calls.
+ */
+export type AllowedActions =
+  | AccountsControllerListMultichainAccountsAction
+  | AccountsControllerGetAccountAction
+  | AccountsControllerGetAccountByAddressAction
+  | SnapControllerHandleSnapRequestAction
+  | KeyringControllerWithKeyringAction;
+
+/**
+ * All events published by other modules that {@link MultichainAccountController}
+ * subscribes to.
+ */
+export type AllowedEvents = never;
+
+/**
+ * The messenger restricted to actions and events that
+ * {@link MultichainAccountController} needs to access.
+ */
+export type MultichainAccountControllerMessenger = RestrictedMessenger<
+  'MultichainAccountController',
+  MultichainAccountControllerActions | AllowedActions,
+  MultichainAccountControllerEvents | AllowedEvents,
+  AllowedActions['type'],
+  AllowedEvents['type']
+>;