Adjust latest changes

MetaMask · Jan 7, 2025 · e31bfb6 · e31bfb6
1 parent e976dd0
commit e31bfb6
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 37 deletions.
diff --git a/app/scripts/controllers/decrypt-message.ts b/app/scripts/controllers/decrypt-message.ts
@@ -13,6 +13,7 @@ import {
 import type {
   DecryptMessageManagerMessenger,
   DecryptMessageManagerState,
+  DecryptMessageManagerUnapprovedMessageAddedEvent,
 } from '@metamask/message-manager';
 import {
   BaseController,
@@ -37,6 +38,8 @@ const stateMetadata = {
   unapprovedDecryptMsgCount: { persist: false, anonymous: false },
 };
 
+export const managerName = 'DecryptMessageManager';
+
 /**
  * Type guard that checks for the presence of the required properties
  * for EIP-1024 encrypted data.
@@ -115,7 +118,9 @@ type DecryptMessageManagerStateChangeEvent = {
   payload: [DecryptMessageManagerState, Patch[]];
 };
 
-type AllowedEvents = DecryptMessageManagerStateChangeEvent;
+type AllowedEvents =
+  | DecryptMessageManagerStateChangeEvent
+  | DecryptMessageManagerUnapprovedMessageAddedEvent
 
 export type DecryptMessageControllerMessenger = RestrictedControllerMessenger<
   typeof controllerName,
@@ -183,20 +188,13 @@ export default class DecryptMessageController extends BaseController<
     this.hub = new EventEmitter();
 
     this._decryptMessageManager = new DecryptMessageManager({
-      messenger: managerMessenger,
-      name: 'DecryptMessageManager',
       additionalFinishStatuses: ['decrypted'],
+      messenger: managerMessenger,
     });
 
-    this._decryptMessageManager.hub.on('updateBadge', () => {
-      this.hub.emit('updateBadge');
-    });
-
-    this._decryptMessageManager.hub.on(
-      'unapprovedMessage',
-      (messageParams: AbstractMessageParamsMetamask) => {
-        this._requestApproval(messageParams);
-      },
+    messenger.subscribe(
+      `${managerName}:unapprovedMessage`,
+      this._requestApproval,
     );
 
     this._subscribeToMessageState(
@@ -370,7 +368,7 @@ export default class DecryptMessageController extends BaseController<
     ) => void,
   ) {
     controllerMessenger.subscribe(
-      'DecryptMessageManager:stateChange',
+      `${managerName}:stateChange`,
       (state: MessageManagerState<AbstractMessage>) => {
         const newMessages = this._migrateMessages(
           // TODO: Replace `any` with type

diff --git a/app/scripts/controllers/encryption-public-key.ts b/app/scripts/controllers/encryption-public-key.ts
@@ -12,6 +12,7 @@ import {
 import type {
   EncryptionPublicKeyManagerMessenger,
   EncryptionPublicKeyManagerState,
+  EncryptionPublicKeyManagerUnapprovedMessageAddedEvent,
 } from '@metamask/message-manager';
 import {
   BaseController,
@@ -28,6 +29,7 @@ import { KeyringType } from '../../../shared/constants/keyring';
 import { ORIGIN_METAMASK } from '../../../shared/constants/app';
 
 const controllerName = 'EncryptionPublicKeyController';
+const managerName = 'EncryptionPublicKeyManager';
 const methodNameGetEncryptionPublicKey = 'eth_getEncryptionPublicKey';
 
 const stateMetadata = {
@@ -58,7 +60,7 @@ export type EncryptionPublicKeyControllerState = {
   unapprovedEncryptionPublicKeyMsgCount: number;
 };
 
-export type GetEncryptionPublicKeyControllerState = {
+export type EncryptionPublicKeyControllerGetState = {
   type: `${typeof controllerName}:getState`;
   handler: () => EncryptionPublicKeyControllerState;
 };
@@ -69,7 +71,7 @@ export type EncryptionPublicKeyControllerStateChange = {
 };
 
 export type EncryptionPublicKeyControllerActions =
-  GetEncryptionPublicKeyControllerState;
+  EncryptionPublicKeyControllerGetState;
 
 export type EncryptionPublicKeyControllerEvents =
   EncryptionPublicKeyControllerStateChange;
@@ -81,7 +83,9 @@ type EncryptionPublicKeyManagerStateChange = {
 
 type AllowedActions = AddApprovalRequest | AcceptRequest | RejectRequest;
 
-type AllowedEvents = EncryptionPublicKeyManagerStateChange;
+type AllowedEvents =
+  | EncryptionPublicKeyManagerStateChange
+  | EncryptionPublicKeyManagerUnapprovedMessageAddedEvent;
 
 export type EncryptionPublicKeyControllerMessenger =
   RestrictedControllerMessenger<
@@ -164,18 +168,11 @@ export default class EncryptionPublicKeyController extends BaseController<
     this._encryptionPublicKeyManager = new EncryptionPublicKeyManager({
       additionalFinishStatuses: ['received'],
       messenger: managerMessenger,
-      name: 'EncryptionPublicKeyManager',
     });
 
-    this._encryptionPublicKeyManager.hub.on('updateBadge', () => {
-      this.hub.emit('updateBadge');
-    });
-
-    this._encryptionPublicKeyManager.hub.on(
-      'unapprovedMessage',
-      (msgParams: AbstractMessageParamsMetamask) => {
-        this._requestApproval(msgParams, methodNameGetEncryptionPublicKey);
-      },
+    this.messagingSystem.subscribe(
+      `${managerName}:unapprovedMessage`,
+      this._requestApproval,
     );
 
     this._subscribeToMessageState(
@@ -359,7 +356,7 @@ export default class EncryptionPublicKeyController extends BaseController<
     ) => void,
   ) {
     controllerMessenger.subscribe(
-      'EncryptionPublicKeyManager:stateChange',
+      `${managerName}:stateChange`,
       (state: MessageManagerState<AbstractMessage>) => {
         const newMessages = this._migrateMessages(
           // TODO: Replace `any` with type
@@ -401,10 +398,7 @@ export default class EncryptionPublicKeyController extends BaseController<
     return stateMessage;
   }
 
-  private _requestApproval(
-    msgParams: AbstractMessageParamsMetamask,
-    type: string,
-  ) {
+  private _requestApproval(msgParams: AbstractMessageParamsMetamask) {
     const id = msgParams.metamaskId as string;
     const origin = msgParams.origin || ORIGIN_METAMASK;
 
@@ -414,7 +408,7 @@ export default class EncryptionPublicKeyController extends BaseController<
         {
           id,
           origin,
-          type,
+          type: methodNameGetEncryptionPublicKey,
         },
         true,
       )

diff --git a/package.json b/package.json
@@ -250,7 +250,7 @@
     "secp256k1@npm:^4.0.1": "4.0.4",
     "secp256k1@npm:4.0.2": "4.0.4",
     "secp256k1@npm:4.0.3": "4.0.4",
-    "@metamask/message-manager@npm:^11.0.0": "npm:@metamask-previews/[email protected]544f13b4"
+    "@metamask/message-manager@npm:^11.0.0": "npm:@metamask-previews/[email protected]e5e6db48"
   },
   "dependencies": {
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.25.9#~/.yarn/patches/@babel-runtime-npm-7.25.9-fe8c62510a.patch",

diff --git a/yarn.lock b/yarn.lock
@@ -5793,9 +5793,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/message-manager@npm:@metamask-previews/[email protected]544f13b4":
-  version: 11.0.3-preview-544f13b4
-  resolution: "@metamask-previews/message-manager@npm:11.0.3-preview-544f13b4"
+"@metamask/message-manager@npm:@metamask-previews/[email protected]e5e6db48":
+  version: 11.0.3-preview-e5e6db48
+  resolution: "@metamask-previews/message-manager@npm:11.0.3-preview-e5e6db48"
   dependencies:
     "@metamask/base-controller": "npm:^7.1.0"
     "@metamask/controller-utils": "npm:^11.4.4"
@@ -5804,7 +5804,7 @@ __metadata:
     "@types/uuid": "npm:^8.3.0"
     jsonschema: "npm:^1.4.1"
     uuid: "npm:^8.3.2"
-  checksum: 10/956bfc3053cf67fc6c53b1303fde9601b6e6b876cabd9007141c6f5237a9040431b41993c2bd74e344bf0b1c5a67f111a799fa8f041563af1beb6623e2c0fcf3
+  checksum: 10/77903c6339534ddb7b794479707546b986576aa08ae7f77460027a2ddd5ec3136cd63ca59b775d5fab629408327cabfb6c28d024cbd0cc51671deb4ddaf12e43
   languageName: node
   linkType: hard