@metamask-previews/signature-controller 19.1.0-preview-d33a5c02 → 19.1.0-preview-e46fca9e

package/dist/SignatureController.cjs

@@ -13,23 +13,28 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _SignatureController_instances, _SignatureController_getAllState, _SignatureController_personalMessageManager, _SignatureController_typedMessageManager, _SignatureController_trace, _SignatureController_newUnsignedAbstractMessage, _SignatureController_signPersonalMessage, _SignatureController_signTypedMessage, _SignatureController_tryForEachMessageManager, _SignatureController_trySetDeferredSignSuccess, _SignatureController_trySetMessageMetadata, _SignatureController_trySetDeferredSignError, _SignatureController_rejectUnapproved, _SignatureController_clearUnapproved, _SignatureController_signAbstractMessage, _SignatureController_errorMessage, _SignatureController_cancelAbstractMessage, _SignatureController_handleMessageManagerEvents, _SignatureController_subscribeToMessageState, _SignatureController_migrateMessages, _SignatureController_migrateMessage, _SignatureController_getMessage, _SignatureController_requestApproval, _SignatureController_removeJsonData, _SignatureController_addLog, _SignatureController_getSignTypeForLogger;
+var _SignatureController_instances, _SignatureController_getCurrentChainId, _SignatureController_trace, _SignatureController_parseTypedData, _SignatureController_processSignatureRequest, _SignatureController_approveAndSignRequest, _SignatureController_signRequest, _SignatureController_rejectSignatureRequest, _SignatureController_waitForSignatureRequestFinished, _SignatureController_requestApproval, _SignatureController_updateMetadata, _SignatureController_updateState, _SignatureController_generateLegacyState, _SignatureController_addLog, _SignatureController_getSignTypeForLogger;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SignatureController = void 0;
 const base_controller_1 = require("@metamask/base-controller");
 const controller_utils_1 = require("@metamask/controller-utils");
+const keyring_controller_1 = require("@metamask/keyring-controller");
 const logging_controller_1 = require("@metamask/logging-controller");
-const message_manager_1 = require("@metamask/message-manager");
 const events_1 = __importDefault(require("events"));
-const lodash_1 = require("lodash");
+const uuid_1 = require("uuid");
+const logger_1 = require("./logger.cjs");
+const types_1 = require("./types.cjs");
+const validation_1 = require("./utils/validation.cjs");
 const controllerName = 'SignatureController';
 const stateMetadata = {
+    signatureRequests: { persist: false, anonymous: false },
     unapprovedPersonalMsgs: { persist: false, anonymous: false },
     unapprovedTypedMessages: { persist: false, anonymous: false },
     unapprovedPersonalMsgCount: { persist: false, anonymous: false },
     unapprovedTypedMessagesCount: { persist: false, anonymous: false },
 };
 const getDefaultState = () => ({
+    signatureRequests: {},
     unapprovedPersonalMsgs: {},
     unapprovedTypedMessages: {},
     unapprovedPersonalMsgCount: 0,
@@ -43,79 +48,59 @@ class SignatureController extends base_controller_1.BaseController {
      * Construct a Sign controller.
      *
      * @param options - The controller options.
+     * @param options.getCurrentChainId - A function that returns the current chain ID.
      * @param options.messenger - The restricted controller messenger for the sign controller.
-     * @param options.getAllState - Callback to retrieve all user state.
-     * @param options.securityProviderRequest - A function for verifying a message, whether it is malicious or not.
-     * @param options.getCurrentChainId - A function for retrieving the current chainId.
+     * @param options.state - Initial state to set on this controller.
      * @param options.trace - Callback to generate trace information.
      */
-    constructor({ getAllState, getCurrentChainId, messenger, securityProviderRequest, trace, }) {
+    constructor({ getCurrentChainId, messenger, state, trace, }) {
         super({
             name: controllerName,
             metadata: stateMetadata,
             messenger,
-            state: getDefaultState(),
+            state: {
+                ...getDefaultState(),
+                ...state,
+            },
         });
         _SignatureController_instances.add(this);
-        // TODO: Replace `any` with type
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        _SignatureController_getAllState.set(this, void 0);
-        _SignatureController_personalMessageManager.set(this, void 0);
-        _SignatureController_typedMessageManager.set(this, void 0);
+        _SignatureController_getCurrentChainId.set(this, void 0);
         _SignatureController_trace.set(this, void 0);
-        __classPrivateFieldSet(this, _SignatureController_getAllState, getAllState, "f");
         this.hub = new events_1.default();
-        __classPrivateFieldSet(this, _SignatureController_personalMessageManager, new message_manager_1.PersonalMessageManager(undefined, undefined, securityProviderRequest), "f");
-        __classPrivateFieldSet(this, _SignatureController_typedMessageManager, new message_manager_1.TypedMessageManager(undefined, undefined, securityProviderRequest, undefined, getCurrentChainId), "f");
+        __classPrivateFieldSet(this, _SignatureController_getCurrentChainId, getCurrentChainId, "f");
         __classPrivateFieldSet(this, _SignatureController_trace, trace ?? ((_request, fn) => fn?.()), "f");
-        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_handleMessageManagerEvents).call(this, __classPrivateFieldGet(this, _SignatureController_personalMessageManager, "f"), 'unapprovedPersonalMessage');
-        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_handleMessageManagerEvents).call(this, __classPrivateFieldGet(this, _SignatureController_typedMessageManager, "f"), 'unapprovedTypedMessage');
-        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_subscribeToMessageState).call(this, __classPrivateFieldGet(this, _SignatureController_personalMessageManager, "f"), (state, newMessages, messageCount) => {
-            state.unapprovedPersonalMsgs = newMessages;
-            state.unapprovedPersonalMsgCount = messageCount;
-        });
-        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_subscribeToMessageState).call(this, __classPrivateFieldGet(this, _SignatureController_typedMessageManager, "f"), (state, newMessages, messageCount) => {
-            state.unapprovedTypedMessages = newMessages;
-            state.unapprovedTypedMessagesCount = messageCount;
-        });
     }
     /**
      * A getter for the number of 'unapproved' PersonalMessages in this.messages.
-     *
+     * @deprecated Use `signatureRequests` state instead.
      * @returns The number of 'unapproved' PersonalMessages in this.messages
      */
     get unapprovedPersonalMessagesCount() {
-        return __classPrivateFieldGet(this, _SignatureController_personalMessageManager, "f").getUnapprovedMessagesCount();
+        return this.state.unapprovedPersonalMsgCount;
     }
     /**
      * A getter for the number of 'unapproved' TypedMessages in this.messages.
-     *
+     * @deprecated Use `signatureRequests` state instead.
      * @returns The number of 'unapproved' TypedMessages in this.messages
      */
     get unapprovedTypedMessagesCount() {
-        return __classPrivateFieldGet(this, _SignatureController_typedMessageManager, "f").getUnapprovedMessagesCount();
+        return this.state.unapprovedTypedMessagesCount;
     }
     /**
      * A getter for returning all messages.
-     *
+     * @deprecated Use `signatureRequests` state instead.
      * @returns The object containing all messages.
      */
     get messages() {
-        const messages = [
-            ...__classPrivateFieldGet(this, _SignatureController_typedMessageManager, "f").getAllMessages(),
-            ...__classPrivateFieldGet(this, _SignatureController_personalMessageManager, "f").getAllMessages(),
-        ];
-        const messagesObject = messages.reduce((acc, message) => {
-            acc[message.id] = message;
-            return acc;
-        }, {});
-        return messagesObject;
+        return this.state.signatureRequests;
     }
     /**
      * Reset the controller state to the initial state.
      */
     resetState() {
-        this.update(() => getDefaultState());
+        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_updateState).call(this, (state) => {
+            Object.assign(state, getDefaultState());
+        });
     }
     /**
      * Reject all unapproved messages of any type.
@@ -123,303 +108,262 @@ class SignatureController extends base_controller_1.BaseController {
      * @param reason - A message to indicate why.
      */
     rejectUnapproved(reason) {
-        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_rejectUnapproved).call(this, __classPrivateFieldGet(this, _SignatureController_personalMessageManager, "f"), reason);
-        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_rejectUnapproved).call(this, __classPrivateFieldGet(this, _SignatureController_typedMessageManager, "f"), reason);
+        const unapprovedSignatureRequests = Object.values(this.state.signatureRequests).filter((metadata) => metadata.status === types_1.SignatureRequestStatus.Unapproved);
+        for (const metadata of unapprovedSignatureRequests) {
+            __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_rejectSignatureRequest).call(this, metadata.id, reason);
+        }
     }
     /**
      * Clears all unapproved messages from memory.
      */
     clearUnapproved() {
-        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_clearUnapproved).call(this, __classPrivateFieldGet(this, _SignatureController_personalMessageManager, "f"));
-        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_clearUnapproved).call(this, __classPrivateFieldGet(this, _SignatureController_typedMessageManager, "f"));
+        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_updateState).call(this, (state) => {
+            Object.values(state.signatureRequests)
+                .filter((metadata) => metadata.status === types_1.SignatureRequestStatus.Unapproved)
+                .forEach((metadata) => delete state.signatureRequests[metadata.id]);
+        });
     }
     /**
-     * Called when a dapp uses the personal_sign method.
+     * Called when a dApp uses the personal_sign method.
+     * We currently provide personal_sign mostly for legacy dApps.
      *
-     * We currently define personal_sign mostly for legacy Dapps.
-     *
-     * @param messageParams - The params of the message to sign & return to the Dapp.
-     * @param req - The original request, containing the origin.
+     * @param messageParams - The params of the message to sign and return to the dApp.
+     * @param request - The original request, containing the origin.
      * @param options - An options bag for the method.
      * @param options.traceContext - The parent context for any new traces.
-     * @returns Promise resolving to the raw data of the signature request.
+     * @returns Promise resolving to the raw signature hash generated from the signature request.
      */
-    async newUnsignedPersonalMessage(messageParams, req, options = {}) {
-        return __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_newUnsignedAbstractMessage).call(this, __classPrivateFieldGet(this, _SignatureController_personalMessageManager, "f"), controller_utils_1.ApprovalType.PersonalSign, logging_controller_1.SigningMethod.PersonalSign, 'Personal Message', 
-        // TODO: Either fix this lint violation or explain why it's necessary to ignore.
-        // eslint-disable-next-line @typescript-eslint/no-misused-promises
-        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_signPersonalMessage).bind(this), messageParams, req, undefined, undefined, options.traceContext);
+    async newUnsignedPersonalMessage(messageParams, request, options = {}) {
+        (0, validation_1.validatePersonalSignatureRequest)(messageParams);
+        messageParams.siwe = (0, controller_utils_1.detectSIWE)(messageParams);
+        return __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_processSignatureRequest).call(this, {
+            messageParams,
+            request,
+            type: types_1.SignatureRequestType.PersonalSign,
+            approvalType: controller_utils_1.ApprovalType.PersonalSign,
+            traceContext: options.traceContext,
+        });
     }
     /**
-     * Called when a dapp uses the eth_signTypedData method, per EIP 712.
+     * Called when a dapp uses the eth_signTypedData method, per EIP-712.
      *
-     * @param messageParams - The params passed to eth_signTypedData.
-     * @param req - The original request, containing the origin.
-     * @param version - The version indicating the format of the typed data.
-     * @param signingOpts - An options bag for signing.
-     * @param signingOpts.parseJsonData - Whether to parse the JSON before signing.
+     * @param messageParams - The params of the message to sign and return to the dApp.
+     * @param request - The original request, containing the origin.
+     * @param version - The version of the signTypedData request.
+     * @param signingOptions - Options for signing the typed message.
      * @param options - An options bag for the method.
      * @param options.traceContext - The parent context for any new traces.
-     * @returns Promise resolving to the raw data of the signature request.
+     * @returns Promise resolving to the raw signature hash generated from the signature request.
      */
-    async newUnsignedTypedMessage(messageParams, req, version, signingOpts, options = {}) {
-        const signTypeForLogger = __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_getSignTypeForLogger).call(this, version);
-        return __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_newUnsignedAbstractMessage).call(this, __classPrivateFieldGet(this, _SignatureController_typedMessageManager, "f"), controller_utils_1.ApprovalType.EthSignTypedData, signTypeForLogger, 'Typed Message', 
-        // TODO: Either fix this lint violation or explain why it's necessary to ignore.
-        // eslint-disable-next-line @typescript-eslint/no-misused-promises
-        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_signTypedMessage).bind(this), messageParams, req, version, signingOpts, options.traceContext);
+    async newUnsignedTypedMessage(messageParams, request, version, signingOptions, options = {}) {
+        (0, validation_1.validateTypedSignatureRequest)(messageParams, version, __classPrivateFieldGet(this, _SignatureController_getCurrentChainId, "f").call(this));
+        return __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_processSignatureRequest).call(this, {
+            messageParams,
+            request,
+            type: types_1.SignatureRequestType.TypedSign,
+            approvalType: controller_utils_1.ApprovalType.EthSignTypedData,
+            version: version,
+            signingOptions,
+            traceContext: options.traceContext,
+        });
     }
     /**
-     * Called to update the message status as signed.
+     * Provide a signature for a pending signature request that used `deferSetAsSigned`.
+     * Changes the status of the signature request to `signed`.
      *
-     * @param messageId - The id of the Message to update.
-     * @param signature - The data to update the message with.
+     * @param signatureRequestId - The ID of the signature request.
+     * @param signature - The signature to provide.
      */
-    // TODO: Replace `any` with type
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    setDeferredSignSuccess(messageId, signature) {
-        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_tryForEachMessageManager).call(this, __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_trySetDeferredSignSuccess), messageId, signature);
+    setDeferredSignSuccess(signatureRequestId, signature) {
+        const updatedSignatureRequest = __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_updateMetadata).call(this, signatureRequestId, (draftMetadata) => {
+            draftMetadata.signature = signature;
+            draftMetadata.status = types_1.SignatureRequestStatus.Signed;
+        });
+        this.hub.emit(`${signatureRequestId}:finished`, updatedSignatureRequest);
     }
     /**
-     * Called when the message metadata needs to be updated.
-     *
-     * @param messageId - The id of the message to update.
-     * @param metadata - The data to update the metadata property in the message.
+     * Set custom metadata on a signature request.
+     * @param signatureRequestId - The ID of the signature request.
+     * @param metadata - The custom metadata to set.
      */
-    setMessageMetadata(messageId, metadata) {
-        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_tryForEachMessageManager).call(this, __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_trySetMessageMetadata), messageId, metadata);
+    setMessageMetadata(signatureRequestId, metadata) {
+        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_updateMetadata).call(this, signatureRequestId, (draftMetadata) => {
+            draftMetadata.metadata = metadata;
+        });
     }
     /**
-     * Called to cancel a signing message.
+     * Reject a pending signature request that used `deferSetAsSigned`.
+     * Changes the status of the signature request to `rejected`.
      *
-     * @param messageId - The id of the Message to update.
+     * @param signatureRequestId - The ID of the signature request.
      */
-    setDeferredSignError(messageId) {
-        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_tryForEachMessageManager).call(this, __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_trySetDeferredSignError), messageId);
+    setDeferredSignError(signatureRequestId) {
+        const updatedSignatureRequest = __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_updateMetadata).call(this, signatureRequestId, (draftMetadata) => {
+            draftMetadata.status = types_1.SignatureRequestStatus.Rejected;
+        });
+        this.hub.emit(`${signatureRequestId}:finished`, updatedSignatureRequest);
     }
-    setTypedMessageInProgress(messageId) {
-        __classPrivateFieldGet(this, _SignatureController_typedMessageManager, "f").setMessageStatusInProgress(messageId);
+    /**
+     * Set the status of a signature request to 'inProgress'.
+     *
+     * @param signatureRequestId - The ID of the signature request.
+     */
+    setTypedMessageInProgress(signatureRequestId) {
+        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_updateMetadata).call(this, signatureRequestId, (draftMetadata) => {
+            draftMetadata.status = types_1.SignatureRequestStatus.InProgress;
+        });
     }
-    setPersonalMessageInProgress(messageId) {
-        __classPrivateFieldGet(this, _SignatureController_personalMessageManager, "f").setMessageStatusInProgress(messageId);
+    /**
+     * Set the status of a signature request to 'inProgress'.
+     *
+     * @param signatureRequestId - The ID of the signature request.
+     */
+    setPersonalMessageInProgress(signatureRequestId) {
+        this.setTypedMessageInProgress(signatureRequestId);
     }
 }
 exports.SignatureController = SignatureController;
-_SignatureController_getAllState = new WeakMap(), _SignatureController_personalMessageManager = new WeakMap(), _SignatureController_typedMessageManager = new WeakMap(), _SignatureController_trace = new WeakMap(), _SignatureController_instances = new WeakSet(), _SignatureController_newUnsignedAbstractMessage = async function _SignatureController_newUnsignedAbstractMessage(messageManager, approvalType, signTypeForLogger, messageName, signMessage, messageParams, req, version, signingOpts, traceContext) {
+_SignatureController_getCurrentChainId = new WeakMap(), _SignatureController_trace = new WeakMap(), _SignatureController_instances = new WeakSet(), _SignatureController_parseTypedData = function _SignatureController_parseTypedData(messageParams, version) {
+    if (![keyring_controller_1.SignTypedDataVersion.V3, keyring_controller_1.SignTypedDataVersion.V4].includes(version) ||
+        typeof messageParams.data !== 'string') {
+        return messageParams;
+    }
+    return {
+        ...messageParams,
+        data: JSON.parse(messageParams.data),
+    };
+}, _SignatureController_processSignatureRequest = async function _SignatureController_processSignatureRequest({ messageParams, request, type, approvalType, version, signingOptions, traceContext, }) {
+    (0, logger_1.projectLogger)('Processing signature request', {
+        messageParams,
+        request,
+        type,
+        version,
+    });
+    __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_addLog).call(this, type, version, logging_controller_1.SigningStage.Proposed, messageParams);
+    const { securityAlertResponse } = request;
+    const finalMessageParams = {
+        ...messageParams,
+        origin: request.origin,
+        requestId: request.id,
+    };
     let resultCallbacks;
     try {
-        const messageId = await messageManager.addUnapprovedMessage(messageParams, req, version);
-        const messageParamsWithId = {
-            ...messageParams,
-            metamaskId: messageId,
-            ...(version && { version }),
+        const metadata = {
+            id: (0, uuid_1.v1)(),
+            request: finalMessageParams,
+            securityAlertResponse,
+            signingOptions,
+            status: types_1.SignatureRequestStatus.Unapproved,
+            time: Date.now(),
+            type,
+            version,
         };
-        const signaturePromise = messageManager.waitForFinishStatus(messageParamsWithId, messageName);
+        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_updateState).call(this, (state) => {
+            state.signatureRequests[metadata.id] = metadata;
+        });
+        this.hub.emit('unapprovedMessage', {
+            messageParams,
+            metamaskId: metadata.id,
+        });
+        const finishedPromise = __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_waitForSignatureRequestFinished).call(this, metadata.id);
         try {
-            // Signature request is proposed to the user
-            __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_addLog).call(this, signTypeForLogger, logging_controller_1.SigningStage.Proposed, messageParamsWithId);
-            const acceptResult = await __classPrivateFieldGet(this, _SignatureController_trace, "f").call(this, { name: 'Await Approval', parentContext: traceContext }, (context) => __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_requestApproval).call(this, messageParamsWithId, approvalType, {
+            const acceptResult = await __classPrivateFieldGet(this, _SignatureController_trace, "f").call(this, { name: 'Await Approval', parentContext: traceContext }, (context) => __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_requestApproval).call(this, metadata, approvalType, {
                 traceContext: context,
-                actionId: req?.id?.toString(),
+                actionId: request?.id?.toString(),
             }));
             resultCallbacks = acceptResult.resultCallbacks;
         }
         catch (error) {
-            // User rejected the signature request
-            __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_addLog).call(this, signTypeForLogger, logging_controller_1.SigningStage.Rejected, messageParamsWithId);
-            __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_cancelAbstractMessage).call(this, messageManager, messageId);
+            (0, logger_1.projectLogger)('User rejected request', metadata.id);
+            __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_addLog).call(this, type, version, logging_controller_1.SigningStage.Rejected, messageParams);
+            __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_rejectSignatureRequest).call(this, metadata.id);
             throw error;
         }
-        // TODO: Either fix this lint violation or explain why it's necessary to ignore.
-        // eslint-disable-next-line @typescript-eslint/await-thenable
-        await __classPrivateFieldGet(this, _SignatureController_trace, "f").call(this, { name: 'Sign', parentContext: traceContext }, () => signMessage(messageParamsWithId, signingOpts));
-        const signatureResult = await signaturePromise;
-        // Signature operation is completed
-        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_addLog).call(this, signTypeForLogger, logging_controller_1.SigningStage.Signed, messageParamsWithId);
-        /* istanbul ignore next */
-        resultCallbacks?.success(signatureResult);
-        return signatureResult;
+        await __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_approveAndSignRequest).call(this, metadata, traceContext);
+        const signature = await finishedPromise;
+        (0, logger_1.projectLogger)('Signature request finished', { id: metadata.id, signature });
+        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_addLog).call(this, type, version, logging_controller_1.SigningStage.Signed, messageParams);
+        resultCallbacks?.success(signature);
+        return signature;
     }
     catch (error) {
+        (0, logger_1.projectLogger)('Signature request failed', error);
         resultCallbacks?.error(error);
         throw error;
     }
-}, _SignatureController_signPersonalMessage = 
-/**
- * Signifies a user's approval to sign a personal_sign message in queue.
- * Triggers signing, and the callback function from newUnsignedPersonalMessage.
- *
- * @param msgParams - The params of the message to sign & return to the Dapp.
- * @returns Signature result from signing.
- */
-async function _SignatureController_signPersonalMessage(msgParams) {
-    return await __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_signAbstractMessage).call(this, __classPrivateFieldGet(this, _SignatureController_personalMessageManager, "f"), controller_utils_1.ApprovalType.PersonalSign, msgParams, async (cleanMsgParams) => await this.messagingSystem.call('KeyringController:signPersonalMessage', cleanMsgParams));
-}, _SignatureController_signTypedMessage = 
-/**
- * The method for a user approving a call to eth_signTypedData, per EIP 712.
- * Triggers the callback in newUnsignedTypedMessage.
- *
- * @param msgParams - The params passed to eth_signTypedData.
- * @param opts - The options for the method.
- * @param opts.parseJsonData - Whether to parse JSON data before calling the KeyringController.
- * @returns Signature result from signing.
- */
-async function _SignatureController_signTypedMessage(msgParams, 
-/* istanbul ignore next */
-opts = { parseJsonData: true }) {
-    const { version } = msgParams;
-    return await __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_signAbstractMessage).call(this, __classPrivateFieldGet(this, _SignatureController_typedMessageManager, "f"), controller_utils_1.ApprovalType.EthSignTypedData, msgParams, async (cleanMsgParams) => {
-        const finalMessageParams = opts.parseJsonData
-            ? __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_removeJsonData).call(this, cleanMsgParams, version)
-            : cleanMsgParams;
-        return await this.messagingSystem.call('KeyringController:signTypedMessage', finalMessageParams, version);
-    });
-}, _SignatureController_tryForEachMessageManager = function _SignatureController_tryForEachMessageManager(callbackFn, 
-// TODO: Replace `any` with type
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-...args) {
-    const messageManagers = [
-        __classPrivateFieldGet(this, _SignatureController_personalMessageManager, "f"),
-        __classPrivateFieldGet(this, _SignatureController_typedMessageManager, "f"),
-    ];
-    for (const manager of messageManagers) {
-        if (callbackFn(manager, ...args)) {
-            return true;
-        }
-    }
-    throw new Error('Message not found');
-}, _SignatureController_trySetDeferredSignSuccess = function _SignatureController_trySetDeferredSignSuccess(
-// TODO: Replace `any` with type
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-messageManager, messageId, 
-// TODO: Replace `any` with type
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-signature) {
-    try {
-        messageManager.setMessageStatusSigned(messageId, signature);
-        return true;
-    }
-    catch (error) {
-        return false;
-    }
-}, _SignatureController_trySetMessageMetadata = function _SignatureController_trySetMessageMetadata(
-// TODO: Replace `any` with type
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-messageManager, messageId, metadata) {
-    try {
-        messageManager.setMetadata(messageId, metadata);
-        return true;
-    }
-    catch (error) {
-        return false;
-    }
-}, _SignatureController_trySetDeferredSignError = function _SignatureController_trySetDeferredSignError(
-// TODO: Replace `any` with type
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-messageManager, messageId) {
-    try {
-        messageManager.rejectMessage(messageId);
-        return true;
-    }
-    catch (error) {
-        return false;
-    }
-}, _SignatureController_rejectUnapproved = function _SignatureController_rejectUnapproved(messageManager, reason) {
-    Object.keys(messageManager.getUnapprovedMessages()).forEach((messageId) => {
-        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_cancelAbstractMessage).call(this, messageManager, messageId, reason);
-    });
-}, _SignatureController_clearUnapproved = function _SignatureController_clearUnapproved(messageManager) {
-    messageManager.update({
-        unapprovedMessages: {},
-        unapprovedMessagesCount: 0,
+}, _SignatureController_approveAndSignRequest = async function _SignatureController_approveAndSignRequest(metadata, traceContext) {
+    const { id } = metadata;
+    __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_updateMetadata).call(this, id, (draftMetadata) => {
+        draftMetadata.status = types_1.SignatureRequestStatus.Approved;
     });
-}, _SignatureController_signAbstractMessage = async function _SignatureController_signAbstractMessage(messageManager, methodName, msgParams, 
-// TODO: Replace `any` with type
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-getSignature) {
-    console.info(`MetaMaskController - ${methodName}`);
-    const messageId = msgParams.metamaskId;
+    await __classPrivateFieldGet(this, _SignatureController_trace, "f").call(this, { name: 'Sign', parentContext: traceContext }, () => __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_signRequest).call(this, metadata));
+}, _SignatureController_signRequest = async function _SignatureController_signRequest(metadata) {
+    const { id, request, signingOptions, type } = metadata;
     try {
-        const cleanMessageParams = await messageManager.approveMessage(msgParams);
-        try {
-            const signature = await getSignature(cleanMessageParams);
-            this.hub.emit(`${methodName}:signed`, { signature, messageId });
-            if (!cleanMessageParams.deferSetAsSigned) {
-                messageManager.setMessageStatusSigned(messageId, signature);
-            }
-            return signature;
+        let signature;
+        switch (type) {
+            case types_1.SignatureRequestType.PersonalSign:
+                signature = await this.messagingSystem.call('KeyringController:signPersonalMessage', request);
+                break;
+            case types_1.SignatureRequestType.TypedSign:
+                const finalRequest = signingOptions?.parseJsonData
+                    ? __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_parseTypedData).call(this, request, metadata.version)
+                    : request;
+                signature = await this.messagingSystem.call('KeyringController:signTypedMessage', finalRequest, metadata.version);
+                break;
+            /* istanbul ignore next */
+            default:
+                throw new Error(`Unknown signature request type: ${type}`);
         }
-        catch (error) {
-            this.hub.emit(`${messageId}:signError`, { error });
-            throw error;
+        this.hub.emit(`${type}:signed`, { signature, messageId: id });
+        if (request.deferSetAsSigned) {
+            return;
         }
-        // TODO: Replace `any` with type
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const finalMetadata = __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_updateMetadata).call(this, id, (draftMetadata) => {
+            draftMetadata.signature = signature;
+            draftMetadata.status = types_1.SignatureRequestStatus.Signed;
+        });
+        this.hub.emit(`${id}:finished`, finalMetadata);
     }
     catch (error) {
-        console.info(`MetaMaskController - ${methodName} failed.`, error);
-        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_errorMessage).call(this, messageManager, messageId, error.message);
+        if (type === types_1.SignatureRequestType.TypedSign) {
+            __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_updateMetadata).call(this, id, (draftMetadata) => {
+                draftMetadata.status = types_1.SignatureRequestStatus.Errored;
+                draftMetadata.error = error.message;
+            });
+        }
+        else {
+            __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_rejectSignatureRequest).call(this, id);
+        }
+        this.hub.emit(`${id}:signError`, { error });
         throw error;
     }
-}, _SignatureController_errorMessage = function _SignatureController_errorMessage(messageManager, messageId, error) {
-    if (messageManager instanceof message_manager_1.TypedMessageManager) {
-        messageManager.setMessageStatusErrored(messageId, error);
-    }
-    else {
-        __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_cancelAbstractMessage).call(this, messageManager, messageId);
-    }
-}, _SignatureController_cancelAbstractMessage = function _SignatureController_cancelAbstractMessage(messageManager, messageId, reason) {
+}, _SignatureController_rejectSignatureRequest = function _SignatureController_rejectSignatureRequest(signatureRequestId, reason) {
     if (reason) {
-        const message = __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_getMessage).call(this, messageId);
-        this.hub.emit('cancelWithReason', { message, reason });
+        const metadata = this.state.signatureRequests[signatureRequestId];
+        this.hub.emit('cancelWithReason', { metadata, reason });
     }
-    messageManager.rejectMessage(messageId);
-}, _SignatureController_handleMessageManagerEvents = function _SignatureController_handleMessageManagerEvents(messageManager, eventName) {
-    messageManager.hub.on('updateBadge', () => {
-        this.hub.emit('updateBadge');
-    });
-    messageManager.hub.on('unapprovedMessage', (msgParams) => {
-        this.hub.emit(eventName, msgParams);
+    __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_updateMetadata).call(this, signatureRequestId, (draftMetadata) => {
+        draftMetadata.status = types_1.SignatureRequestStatus.Rejected;
     });
-}, _SignatureController_subscribeToMessageState = function _SignatureController_subscribeToMessageState(messageManager, updateState) {
-    messageManager.subscribe((state) => {
-        const newMessages = __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_migrateMessages).call(this, 
-        // TODO: Replace `any` with type
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        state.unapprovedMessages);
-        this.update(() => {
-            const newState = { ...this.state };
-            updateState(newState, newMessages, state.unapprovedMessagesCount);
-            return newState;
+}, _SignatureController_waitForSignatureRequestFinished = async function _SignatureController_waitForSignatureRequestFinished(id) {
+    return new Promise((resolve, reject) => {
+        this.hub.once(`${id}:finished`, (metadata) => {
+            const { request, signature, status, type } = metadata;
+            switch (status) {
+                case types_1.SignatureRequestStatus.Signed:
+                    return resolve(signature);
+                case types_1.SignatureRequestStatus.Rejected:
+                    return reject(new Error(`MetaMask ${type} Signature: User denied message signature.`));
+                /* istanbul ignore next */
+                default:
+                    return reject(new Error(`MetaMask ${type} Signature: Unknown problem: ${JSON.stringify(request)}`));
+            }
         });
     });
-}, _SignatureController_migrateMessages = function _SignatureController_migrateMessages(coreMessages) {
-    const stateMessages = {};
-    for (const messageId of Object.keys(coreMessages)) {
-        const coreMessage = coreMessages[messageId];
-        const stateMessage = __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_migrateMessage).call(this, coreMessage);
-        stateMessages[messageId] = stateMessage;
-    }
-    return stateMessages;
-}, _SignatureController_migrateMessage = function _SignatureController_migrateMessage(coreMessage) {
-    const { messageParams, ...coreMessageData } = coreMessage;
-    // Core message managers use messageParams but frontend uses msgParams with lots of references
-    const stateMessage = {
-        ...coreMessageData,
-        msgParams: messageParams,
-    };
-    return stateMessage;
-}, _SignatureController_getMessage = function _SignatureController_getMessage(messageId) {
-    return {
-        ...this.state.unapprovedPersonalMsgs,
-        ...this.state.unapprovedTypedMessages,
-    }[messageId];
-}, _SignatureController_requestApproval = async function _SignatureController_requestApproval(msgParams, type, { traceContext, actionId, }) {
-    const id = msgParams.metamaskId;
-    const origin = msgParams.origin || controller_utils_1.ORIGIN_METAMASK;
-    // We are explicitly cloning the message params here to prevent the mutation errors on development mode
-    // Because sending it through the messaging system will make the object read only
-    const clonedMsgParams = (0, lodash_1.cloneDeep)(msgParams);
+}, _SignatureController_requestApproval = async function _SignatureController_requestApproval(metadata, type, { traceContext, actionId, }) {
+    const { id, request } = metadata;
+    const origin = request.origin || controller_utils_1.ORIGIN_METAMASK;
     await __classPrivateFieldGet(this, _SignatureController_trace, "f").call(this, {
         name: 'Notification Display',
         id: actionId,
@@ -429,18 +373,37 @@ getSignature) {
         id,
         origin,
         type,
-        requestData: clonedMsgParams,
+        requestData: { ...request },
         expectsResult: true,
     }, true));
-}, _SignatureController_removeJsonData = function _SignatureController_removeJsonData(messageParams, version) {
-    if (version === 'V1' || typeof messageParams.data !== 'string') {
-        return messageParams;
-    }
-    return {
-        ...messageParams,
-        data: JSON.parse(messageParams.data),
-    };
-}, _SignatureController_addLog = function _SignatureController_addLog(signingMethod, stage, signingData) {
+}, _SignatureController_updateMetadata = function _SignatureController_updateMetadata(id, callback) {
+    const { nextState } = __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_updateState).call(this, (state) => {
+        const metadata = state.signatureRequests[id];
+        if (!metadata) {
+            throw new Error(`Signature request with id ${id} not found`);
+        }
+        callback(metadata);
+    });
+    return nextState.signatureRequests[id];
+}, _SignatureController_updateState = function _SignatureController_updateState(callback) {
+    return this.update((state) => {
+        // eslint-disable-next-line n/callback-return, n/no-callback-literal
+        callback(state);
+        const unapprovedRequests = Object.values(state.signatureRequests).filter((request) => request.status === types_1.SignatureRequestStatus.Unapproved);
+        state.unapprovedPersonalMsgs = __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_generateLegacyState).call(this, unapprovedRequests, types_1.SignatureRequestType.PersonalSign);
+        state.unapprovedTypedMessages = __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_generateLegacyState).call(this, unapprovedRequests, types_1.SignatureRequestType.TypedSign);
+        state.unapprovedPersonalMsgCount = Object.values(state.unapprovedPersonalMsgs).length;
+        state.unapprovedTypedMessagesCount = Object.values(state.unapprovedTypedMessages).length;
+    });
+}, _SignatureController_generateLegacyState = function _SignatureController_generateLegacyState(unapprovedSignatureRequests, type) {
+    return unapprovedSignatureRequests
+        .filter((request) => request.type === type)
+        .reduce((acc, request) => ({
+        ...acc,
+        [request.id]: { ...request, msgParams: request.request },
+    }), {});
+}, _SignatureController_addLog = function _SignatureController_addLog(signatureRequestType, version, stage, signingData) {
+    const signingMethod = __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_getSignTypeForLogger).call(this, signatureRequestType, version);
     this.messagingSystem.call('LoggingController:add', {
         type: logging_controller_1.LogType.EthSignLog,
         data: {
@@ -449,14 +412,18 @@ getSignature) {
             signingData,
         },
     });
-}, _SignatureController_getSignTypeForLogger = function _SignatureController_getSignTypeForLogger(version) {
-    let signTypeForLogger = logging_controller_1.SigningMethod.EthSignTypedData;
-    if (version === 'V3') {
-        signTypeForLogger = logging_controller_1.SigningMethod.EthSignTypedDataV3;
+}, _SignatureController_getSignTypeForLogger = function _SignatureController_getSignTypeForLogger(requestType, version) {
+    if (requestType === types_1.SignatureRequestType.PersonalSign) {
+        return logging_controller_1.SigningMethod.PersonalSign;
+    }
+    if (requestType === types_1.SignatureRequestType.TypedSign &&
+        version === keyring_controller_1.SignTypedDataVersion.V3) {
+        return logging_controller_1.SigningMethod.EthSignTypedDataV3;
     }
-    else if (version === 'V4') {
-        signTypeForLogger = logging_controller_1.SigningMethod.EthSignTypedDataV4;
+    if (requestType === types_1.SignatureRequestType.TypedSign &&
+        version === keyring_controller_1.SignTypedDataVersion.V4) {
+        return logging_controller_1.SigningMethod.EthSignTypedDataV4;
     }
-    return signTypeForLogger;
+    return logging_controller_1.SigningMethod.EthSignTypedData;
 };
 //# sourceMappingURL=SignatureController.cjs.map