@metamask-previews/message-manager 10.1.1-preview-e46fca9e → 10.1.1-preview-2f4bcaa9

package/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Removed
+
+- Remove all code related to `@metamask/signature-controller` ([#4785](https://github.com/MetaMask/core/pull/4785))
+  - Remove `TypedMessageManager`.
+  - Remove `PersonalMessageManager`.
+  - Remove utils:
+    - `validateSignMessageData`
+    - `validateTypedSignMessageDataV1`
+    - `validateTypedSignMessageDataV3V4`
+
 ## [10.1.1]
 
 ### Fixed

package/dist/index.cjs

@@ -15,8 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./AbstractMessageManager.cjs"), exports);
-__exportStar(require("./PersonalMessageManager.cjs"), exports);
-__exportStar(require("./TypedMessageManager.cjs"), exports);
 __exportStar(require("./EncryptionPublicKeyManager.cjs"), exports);
 __exportStar(require("./DecryptMessageManager.cjs"), exports);
+__exportStar(require("./types.cjs"), exports);
 //# sourceMappingURL=index.cjs.map

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+DAAyC;AACzC,+DAAyC;AACzC,4DAAsC;AACtC,mEAA6C;AAC7C,8DAAwC","sourcesContent":["export * from './AbstractMessageManager';\nexport * from './PersonalMessageManager';\nexport * from './TypedMessageManager';\nexport * from './EncryptionPublicKeyManager';\nexport * from './DecryptMessageManager';\n"]}
+{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+DAAyC;AACzC,mEAA6C;AAC7C,8DAAwC;AACxC,8CAAwB","sourcesContent":["export * from './AbstractMessageManager';\nexport * from './EncryptionPublicKeyManager';\nexport * from './DecryptMessageManager';\nexport * from './types';\n"]}

package/dist/index.d.cts

@@ -1,6 +1,5 @@
 export * from "./AbstractMessageManager.cjs";
-export * from "./PersonalMessageManager.cjs";
-export * from "./TypedMessageManager.cjs";
 export * from "./EncryptionPublicKeyManager.cjs";
 export * from "./DecryptMessageManager.cjs";
+export * from "./types.cjs";
 //# sourceMappingURL=index.d.cts.map

package/dist/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,6CAAyC;AACzC,6CAAyC;AACzC,0CAAsC;AACtC,iDAA6C;AAC7C,4CAAwC"}
+{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,6CAAyC;AACzC,iDAA6C;AAC7C,4CAAwC;AACxC,4BAAwB"}

package/dist/index.d.mts

@@ -1,6 +1,5 @@
 export * from "./AbstractMessageManager.mjs";
-export * from "./PersonalMessageManager.mjs";
-export * from "./TypedMessageManager.mjs";
 export * from "./EncryptionPublicKeyManager.mjs";
 export * from "./DecryptMessageManager.mjs";
+export * from "./types.mjs";
 //# sourceMappingURL=index.d.mts.map

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,6CAAyC;AACzC,6CAAyC;AACzC,0CAAsC;AACtC,iDAA6C;AAC7C,4CAAwC"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,6CAAyC;AACzC,iDAA6C;AAC7C,4CAAwC;AACxC,4BAAwB"}

package/dist/index.mjs

@@ -1,6 +1,5 @@
 export * from "./AbstractMessageManager.mjs";
-export * from "./PersonalMessageManager.mjs";
-export * from "./TypedMessageManager.mjs";
 export * from "./EncryptionPublicKeyManager.mjs";
 export * from "./DecryptMessageManager.mjs";
+export * from "./types.mjs";
 //# sourceMappingURL=index.mjs.map

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,6CAAyC;AACzC,6CAAyC;AACzC,0CAAsC;AACtC,iDAA6C;AAC7C,4CAAwC","sourcesContent":["export * from './AbstractMessageManager';\nexport * from './PersonalMessageManager';\nexport * from './TypedMessageManager';\nexport * from './EncryptionPublicKeyManager';\nexport * from './DecryptMessageManager';\n"]}
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,6CAAyC;AACzC,iDAA6C;AAC7C,4CAAwC;AACxC,4BAAwB","sourcesContent":["export * from './AbstractMessageManager';\nexport * from './EncryptionPublicKeyManager';\nexport * from './DecryptMessageManager';\nexport * from './types';\n"]}

package/dist/types.cjs

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.cjs.map

package/dist/types.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.cjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { SIWEMessage } from '@metamask/controller-utils';\n\nimport type { AbstractMessageParams } from './AbstractMessageManager';\n\n// Below types are temporary as they are in use by the KeyringController.\n\nexport type SignTypedDataMessageV3V4 = {\n  types: Record<string, unknown>;\n  domain: Record<string, unknown>;\n  primaryType: string;\n  message: unknown;\n};\n\nexport type PersonalMessageParams = {\n  data: string;\n  siwe?: SIWEMessage;\n} & AbstractMessageParams;\n\nexport type TypedMessageParams = {\n  data: Record<string, unknown>[] | string | SignTypedDataMessageV3V4;\n} & AbstractMessageParams;\n"]}

package/dist/types.d.cts

@@ -0,0 +1,16 @@
+import type { SIWEMessage } from "@metamask/controller-utils";
+import type { AbstractMessageParams } from "./AbstractMessageManager.cjs";
+export type SignTypedDataMessageV3V4 = {
+    types: Record<string, unknown>;
+    domain: Record<string, unknown>;
+    primaryType: string;
+    message: unknown;
+};
+export type PersonalMessageParams = {
+    data: string;
+    siwe?: SIWEMessage;
+} & AbstractMessageParams;
+export type TypedMessageParams = {
+    data: Record<string, unknown>[] | string | SignTypedDataMessageV3V4;
+} & AbstractMessageParams;
+//# sourceMappingURL=types.d.cts.map

package/dist/types.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.cts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,mCAAmC;AAE9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,qCAAiC;AAItE,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB,GAAG,qBAAqB,CAAC;AAE1B,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,MAAM,GAAG,wBAAwB,CAAC;CACrE,GAAG,qBAAqB,CAAC"}

package/dist/types.d.mts

@@ -0,0 +1,16 @@
+import type { SIWEMessage } from "@metamask/controller-utils";
+import type { AbstractMessageParams } from "./AbstractMessageManager.mjs";
+export type SignTypedDataMessageV3V4 = {
+    types: Record<string, unknown>;
+    domain: Record<string, unknown>;
+    primaryType: string;
+    message: unknown;
+};
+export type PersonalMessageParams = {
+    data: string;
+    siwe?: SIWEMessage;
+} & AbstractMessageParams;
+export type TypedMessageParams = {
+    data: Record<string, unknown>[] | string | SignTypedDataMessageV3V4;
+} & AbstractMessageParams;
+//# sourceMappingURL=types.d.mts.map

package/dist/types.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.mts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,mCAAmC;AAE9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,qCAAiC;AAItE,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB,GAAG,qBAAqB,CAAC;AAE1B,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,MAAM,GAAG,wBAAwB,CAAC;CACrE,GAAG,qBAAqB,CAAC"}

package/dist/types.mjs

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.mjs.map

package/dist/types.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.mjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { SIWEMessage } from '@metamask/controller-utils';\n\nimport type { AbstractMessageParams } from './AbstractMessageManager';\n\n// Below types are temporary as they are in use by the KeyringController.\n\nexport type SignTypedDataMessageV3V4 = {\n  types: Record<string, unknown>;\n  domain: Record<string, unknown>;\n  primaryType: string;\n  message: unknown;\n};\n\nexport type PersonalMessageParams = {\n  data: string;\n  siwe?: SIWEMessage;\n} & AbstractMessageParams;\n\nexport type TypedMessageParams = {\n  data: Record<string, unknown>[] | string | SignTypedDataMessageV3V4;\n} & AbstractMessageParams;\n"]}

package/dist/utils.cjs

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateDecryptedMessageData = exports.validateEncryptionPublicKeyMessageData = exports.validateTypedSignMessageDataV3V4 = exports.validateTypedSignMessageDataV1 = exports.validateSignMessageData = exports.normalizeMessageData = void 0;
+exports.validateDecryptedMessageData = exports.validateEncryptionPublicKeyMessageData = exports.normalizeMessageData = void 0;
 const controller_utils_1 = require("@metamask/controller-utils");
-const eth_sig_util_1 = require("@metamask/eth-sig-util");
 const utils_1 = require("@metamask/utils");
-const jsonschema_1 = require("jsonschema");
 const hexRe = /^[0-9A-Fa-f]+$/gu;
 /**
  * Validates an address string and throws in the event of any validation error.
@@ -37,100 +35,6 @@ function normalizeMessageData(data) {
     return (0, utils_1.bytesToHex)(Buffer.from(data, 'utf8'));
 }
 exports.normalizeMessageData = normalizeMessageData;
-/**
- * Validates a PersonalMessageParams objects for required properties and throws in
- * the event of any validation error.
- *
- * @param messageData - PersonalMessageParams object to validate.
- */
-function validateSignMessageData(messageData) {
-    const { from, data } = messageData;
-    validateAddress(from, 'from');
-    if (!data || typeof data !== 'string') {
-        throw new Error(`Invalid message "data": ${data} must be a valid string.`);
-    }
-}
-exports.validateSignMessageData = validateSignMessageData;
-/**
- * Validates a TypedMessageParams object for required properties and throws in
- * the event of any validation error for eth_signTypedMessage_V1.
- *
- * @param messageData - TypedMessageParams object to validate.
- */
-function validateTypedSignMessageDataV1(messageData) {
-    validateAddress(messageData.from, 'from');
-    if (!messageData.data || !Array.isArray(messageData.data)) {
-        throw new Error(
-        // TODO: Either fix this lint violation or explain why it's necessary to ignore.
-        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-        `Invalid message "data": ${messageData.data} must be a valid array.`);
-    }
-    try {
-        // typedSignatureHash will throw if the data is invalid.
-        // TODO: Replace `any` with type
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (0, eth_sig_util_1.typedSignatureHash)(messageData.data);
-    }
-    catch (e) {
-        throw new Error(`Expected EIP712 typed data.`);
-    }
-}
-exports.validateTypedSignMessageDataV1 = validateTypedSignMessageDataV1;
-/**
- * Validates a TypedMessageParams object for required properties and throws in
- * the event of any validation error for eth_signTypedMessage_V3.
- *
- * @param messageData - TypedMessageParams object to validate.
- * @param currentChainId - The current chainId.
- */
-function validateTypedSignMessageDataV3V4(messageData, currentChainId) {
-    validateAddress(messageData.from, 'from');
-    if (!messageData.data ||
-        Array.isArray(messageData.data) ||
-        (typeof messageData.data !== 'object' &&
-            typeof messageData.data !== 'string')) {
-        throw new Error(`Invalid message "data": Must be a valid string or object.`);
-    }
-    let data;
-    if (typeof messageData.data === 'object') {
-        data = messageData.data;
-    }
-    else {
-        try {
-            data = JSON.parse(messageData.data);
-        }
-        catch (e) {
-            throw new Error('Data must be passed as a valid JSON string.');
-        }
-    }
-    const validation = (0, jsonschema_1.validate)(data, eth_sig_util_1.TYPED_MESSAGE_SCHEMA);
-    if (validation.errors.length > 0) {
-        throw new Error('Data must conform to EIP-712 schema. See https://git.io/fNtcx.');
-    }
-    if (!currentChainId) {
-        throw new Error('Current chainId cannot be null or undefined.');
-    }
-    let { chainId } = data.domain;
-    if (chainId) {
-        if (typeof chainId === 'string') {
-            chainId = parseInt(chainId, chainId.startsWith('0x') ? 16 : 10);
-        }
-        const activeChainId = parseInt(currentChainId, 16);
-        if (Number.isNaN(activeChainId)) {
-            throw new Error(
-            // TODO: Either fix this lint violation or explain why it's necessary to ignore.
-            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-            `Cannot sign messages for chainId "${chainId}", because MetaMask is switching networks.`);
-        }
-        if (chainId !== activeChainId) {
-            throw new Error(
-            // TODO: Either fix this lint violation or explain why it's necessary to ignore.
-            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-            `Provided chainId "${chainId}" must match the active chainId "${activeChainId}"`);
-        }
-    }
-}
-exports.validateTypedSignMessageDataV3V4 = validateTypedSignMessageDataV3V4;
 /**
  * Validates messageData for the eth_getEncryptionPublicKey message and throws in
  * the event of any validation error.

package/dist/utils.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"utils.cjs","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { isValidHexAddress } from '@metamask/controller-utils';\nimport {\n  TYPED_MESSAGE_SCHEMA,\n  typedSignatureHash,\n} from '@metamask/eth-sig-util';\nimport type { Hex } from '@metamask/utils';\nimport { add0x, bytesToHex, remove0x } from '@metamask/utils';\nimport { validate } from 'jsonschema';\n\nimport type { DecryptMessageParams } from './DecryptMessageManager';\nimport type { EncryptionPublicKeyParams } from './EncryptionPublicKeyManager';\nimport type { PersonalMessageParams } from './PersonalMessageManager';\nimport type { TypedMessageParams } from './TypedMessageManager';\n\nconst hexRe = /^[0-9A-Fa-f]+$/gu;\n/**\n * Validates an address string and throws in the event of any validation error.\n *\n * @param address - The address to validate.\n * @param propertyName - The name of the property source to use in the error message.\n */\nfunction validateAddress(address: string, propertyName: string) {\n  if (!address || typeof address !== 'string' || !isValidHexAddress(address)) {\n    throw new Error(\n      `Invalid \"${propertyName}\" address: ${address} must be a valid string.`,\n    );\n  }\n}\n\n/**\n * A helper function that converts rawmessageData buffer data to a hex, or just returns the data if\n * it is already formatted as a hex.\n *\n * @param data - The buffer data to convert to a hex.\n * @returns A hex string conversion of the buffer data.\n */\nexport function normalizeMessageData(data: string) {\n  try {\n    const stripped = remove0x(data);\n    if (stripped.match(hexRe)) {\n      return add0x(stripped);\n    }\n  } catch (e) {\n    /* istanbul ignore next */\n  }\n  return bytesToHex(Buffer.from(data, 'utf8'));\n}\n\n/**\n * Validates a PersonalMessageParams objects for required properties and throws in\n * the event of any validation error.\n *\n * @param messageData - PersonalMessageParams object to validate.\n */\nexport function validateSignMessageData(messageData: PersonalMessageParams) {\n  const { from, data } = messageData;\n  validateAddress(from, 'from');\n\n  if (!data || typeof data !== 'string') {\n    throw new Error(`Invalid message \"data\": ${data} must be a valid string.`);\n  }\n}\n\n/**\n * Validates a TypedMessageParams object for required properties and throws in\n * the event of any validation error for eth_signTypedMessage_V1.\n *\n * @param messageData - TypedMessageParams object to validate.\n */\nexport function validateTypedSignMessageDataV1(\n  messageData: TypedMessageParams,\n) {\n  validateAddress(messageData.from, 'from');\n\n  if (!messageData.data || !Array.isArray(messageData.data)) {\n    throw new Error(\n      // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n      // eslint-disable-next-line @typescript-eslint/restrict-template-expressions\n      `Invalid message \"data\": ${messageData.data} must be a valid array.`,\n    );\n  }\n\n  try {\n    // typedSignatureHash will throw if the data is invalid.\n    // TODO: Replace `any` with type\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    typedSignatureHash(messageData.data as any);\n  } catch (e) {\n    throw new Error(`Expected EIP712 typed data.`);\n  }\n}\n\n/**\n * Validates a TypedMessageParams object for required properties and throws in\n * the event of any validation error for eth_signTypedMessage_V3.\n *\n * @param messageData - TypedMessageParams object to validate.\n * @param currentChainId - The current chainId.\n */\nexport function validateTypedSignMessageDataV3V4(\n  messageData: TypedMessageParams,\n  currentChainId: Hex | undefined,\n) {\n  validateAddress(messageData.from, 'from');\n\n  if (\n    !messageData.data ||\n    Array.isArray(messageData.data) ||\n    (typeof messageData.data !== 'object' &&\n      typeof messageData.data !== 'string')\n  ) {\n    throw new Error(\n      `Invalid message \"data\": Must be a valid string or object.`,\n    );\n  }\n\n  let data;\n  if (typeof messageData.data === 'object') {\n    data = messageData.data;\n  } else {\n    try {\n      data = JSON.parse(messageData.data);\n    } catch (e) {\n      throw new Error('Data must be passed as a valid JSON string.');\n    }\n  }\n\n  const validation = validate(data, TYPED_MESSAGE_SCHEMA);\n  if (validation.errors.length > 0) {\n    throw new Error(\n      'Data must conform to EIP-712 schema. See https://git.io/fNtcx.',\n    );\n  }\n\n  if (!currentChainId) {\n    throw new Error('Current chainId cannot be null or undefined.');\n  }\n\n  let { chainId } = data.domain;\n  if (chainId) {\n    if (typeof chainId === 'string') {\n      chainId = parseInt(chainId, chainId.startsWith('0x') ? 16 : 10);\n    }\n\n    const activeChainId = parseInt(currentChainId, 16);\n    if (Number.isNaN(activeChainId)) {\n      throw new Error(\n        // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions\n        `Cannot sign messages for chainId \"${chainId}\", because MetaMask is switching networks.`,\n      );\n    }\n\n    if (chainId !== activeChainId) {\n      throw new Error(\n        // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions\n        `Provided chainId \"${chainId}\" must match the active chainId \"${activeChainId}\"`,\n      );\n    }\n  }\n}\n\n/**\n * Validates messageData for the eth_getEncryptionPublicKey message and throws in\n * the event of any validation error.\n *\n * @param messageData - address string to validate.\n */\nexport function validateEncryptionPublicKeyMessageData(\n  messageData: EncryptionPublicKeyParams,\n) {\n  const { from } = messageData;\n  validateAddress(from, 'from');\n}\n\n/**\n * Validates messageData for the eth_decrypt message and throws in\n * the event of any validation error.\n *\n * @param messageData - address string to validate.\n */\nexport function validateDecryptedMessageData(\n  messageData: DecryptMessageParams,\n) {\n  const { from } = messageData;\n  validateAddress(from, 'from');\n}\n"]}
+{"version":3,"file":"utils.cjs","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAA,iEAA+D;AAC/D,2CAA8D;AAK9D,MAAM,KAAK,GAAG,kBAAkB,CAAC;AACjC;;;;;GAKG;AACH,SAAS,eAAe,CAAC,OAAe,EAAE,YAAoB;IAC5D,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,IAAA,oCAAiB,EAAC,OAAO,CAAC,EAAE;QAC1E,MAAM,IAAI,KAAK,CACb,YAAY,YAAY,cAAc,OAAO,0BAA0B,CACxE,CAAC;KACH;AACH,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,oBAAoB,CAAC,IAAY;IAC/C,IAAI;QACF,MAAM,QAAQ,GAAG,IAAA,gBAAQ,EAAC,IAAI,CAAC,CAAC;QAChC,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YACzB,OAAO,IAAA,aAAK,EAAC,QAAQ,CAAC,CAAC;SACxB;KACF;IAAC,OAAO,CAAC,EAAE;QACV,0BAA0B;KAC3B;IACD,OAAO,IAAA,kBAAU,EAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;AAC/C,CAAC;AAVD,oDAUC;AAED;;;;;GAKG;AACH,SAAgB,sCAAsC,CACpD,WAAsC;IAEtC,MAAM,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;IAC7B,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAChC,CAAC;AALD,wFAKC;AAED;;;;;GAKG;AACH,SAAgB,4BAA4B,CAC1C,WAAiC;IAEjC,MAAM,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;IAC7B,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAChC,CAAC;AALD,oEAKC","sourcesContent":["import { isValidHexAddress } from '@metamask/controller-utils';\nimport { add0x, bytesToHex, remove0x } from '@metamask/utils';\n\nimport type { DecryptMessageParams } from './DecryptMessageManager';\nimport type { EncryptionPublicKeyParams } from './EncryptionPublicKeyManager';\n\nconst hexRe = /^[0-9A-Fa-f]+$/gu;\n/**\n * Validates an address string and throws in the event of any validation error.\n *\n * @param address - The address to validate.\n * @param propertyName - The name of the property source to use in the error message.\n */\nfunction validateAddress(address: string, propertyName: string) {\n  if (!address || typeof address !== 'string' || !isValidHexAddress(address)) {\n    throw new Error(\n      `Invalid \"${propertyName}\" address: ${address} must be a valid string.`,\n    );\n  }\n}\n\n/**\n * A helper function that converts rawmessageData buffer data to a hex, or just returns the data if\n * it is already formatted as a hex.\n *\n * @param data - The buffer data to convert to a hex.\n * @returns A hex string conversion of the buffer data.\n */\nexport function normalizeMessageData(data: string) {\n  try {\n    const stripped = remove0x(data);\n    if (stripped.match(hexRe)) {\n      return add0x(stripped);\n    }\n  } catch (e) {\n    /* istanbul ignore next */\n  }\n  return bytesToHex(Buffer.from(data, 'utf8'));\n}\n\n/**\n * Validates messageData for the eth_getEncryptionPublicKey message and throws in\n * the event of any validation error.\n *\n * @param messageData - address string to validate.\n */\nexport function validateEncryptionPublicKeyMessageData(\n  messageData: EncryptionPublicKeyParams,\n) {\n  const { from } = messageData;\n  validateAddress(from, 'from');\n}\n\n/**\n * Validates messageData for the eth_decrypt message and throws in\n * the event of any validation error.\n *\n * @param messageData - address string to validate.\n */\nexport function validateDecryptedMessageData(\n  messageData: DecryptMessageParams,\n) {\n  const { from } = messageData;\n  validateAddress(from, 'from');\n}\n"]}

package/dist/utils.d.cts

@@ -1,8 +1,5 @@
-import type { Hex } from "@metamask/utils";
 import type { DecryptMessageParams } from "./DecryptMessageManager.cjs";
 import type { EncryptionPublicKeyParams } from "./EncryptionPublicKeyManager.cjs";
-import type { PersonalMessageParams } from "./PersonalMessageManager.cjs";
-import type { TypedMessageParams } from "./TypedMessageManager.cjs";
 /**
  * A helper function that converts rawmessageData buffer data to a hex, or just returns the data if
  * it is already formatted as a hex.
@@ -11,28 +8,6 @@ import type { TypedMessageParams } from "./TypedMessageManager.cjs";
  * @returns A hex string conversion of the buffer data.
  */
 export declare function normalizeMessageData(data: string): `0x${string}`;
-/**
- * Validates a PersonalMessageParams objects for required properties and throws in
- * the event of any validation error.
- *
- * @param messageData - PersonalMessageParams object to validate.
- */
-export declare function validateSignMessageData(messageData: PersonalMessageParams): void;
-/**
- * Validates a TypedMessageParams object for required properties and throws in
- * the event of any validation error for eth_signTypedMessage_V1.
- *
- * @param messageData - TypedMessageParams object to validate.
- */
-export declare function validateTypedSignMessageDataV1(messageData: TypedMessageParams): void;
-/**
- * Validates a TypedMessageParams object for required properties and throws in
- * the event of any validation error for eth_signTypedMessage_V3.
- *
- * @param messageData - TypedMessageParams object to validate.
- * @param currentChainId - The current chainId.
- */
-export declare function validateTypedSignMessageDataV3V4(messageData: TypedMessageParams, currentChainId: Hex | undefined): void;
 /**
  * Validates messageData for the eth_getEncryptionPublicKey message and throws in
  * the event of any validation error.

package/dist/utils.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.cts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAI3C,OAAO,KAAK,EAAE,oBAAoB,EAAE,oCAAgC;AACpE,OAAO,KAAK,EAAE,yBAAyB,EAAE,yCAAqC;AAC9E,OAAO,KAAK,EAAE,qBAAqB,EAAE,qCAAiC;AACtE,OAAO,KAAK,EAAE,kBAAkB,EAAE,kCAA8B;AAiBhE;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,iBAUhD;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,qBAAqB,QAOzE;AAED;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAC5C,WAAW,EAAE,kBAAkB,QAoBhC;AAED;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAC9C,WAAW,EAAE,kBAAkB,EAC/B,cAAc,EAAE,GAAG,GAAG,SAAS,QA4DhC;AAED;;;;;GAKG;AACH,wBAAgB,sCAAsC,CACpD,WAAW,EAAE,yBAAyB,QAIvC;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,oBAAoB,QAIlC"}
+{"version":3,"file":"utils.d.cts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,oCAAgC;AACpE,OAAO,KAAK,EAAE,yBAAyB,EAAE,yCAAqC;AAiB9E;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,iBAUhD;AAED;;;;;GAKG;AACH,wBAAgB,sCAAsC,CACpD,WAAW,EAAE,yBAAyB,QAIvC;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,oBAAoB,QAIlC"}

package/dist/utils.d.mts

@@ -1,8 +1,5 @@
-import type { Hex } from "@metamask/utils";
 import type { DecryptMessageParams } from "./DecryptMessageManager.mjs";
 import type { EncryptionPublicKeyParams } from "./EncryptionPublicKeyManager.mjs";
-import type { PersonalMessageParams } from "./PersonalMessageManager.mjs";
-import type { TypedMessageParams } from "./TypedMessageManager.mjs";
 /**
  * A helper function that converts rawmessageData buffer data to a hex, or just returns the data if
  * it is already formatted as a hex.
@@ -11,28 +8,6 @@ import type { TypedMessageParams } from "./TypedMessageManager.mjs";
  * @returns A hex string conversion of the buffer data.
  */
 export declare function normalizeMessageData(data: string): `0x${string}`;
-/**
- * Validates a PersonalMessageParams objects for required properties and throws in
- * the event of any validation error.
- *
- * @param messageData - PersonalMessageParams object to validate.
- */
-export declare function validateSignMessageData(messageData: PersonalMessageParams): void;
-/**
- * Validates a TypedMessageParams object for required properties and throws in
- * the event of any validation error for eth_signTypedMessage_V1.
- *
- * @param messageData - TypedMessageParams object to validate.
- */
-export declare function validateTypedSignMessageDataV1(messageData: TypedMessageParams): void;
-/**
- * Validates a TypedMessageParams object for required properties and throws in
- * the event of any validation error for eth_signTypedMessage_V3.
- *
- * @param messageData - TypedMessageParams object to validate.
- * @param currentChainId - The current chainId.
- */
-export declare function validateTypedSignMessageDataV3V4(messageData: TypedMessageParams, currentChainId: Hex | undefined): void;
 /**
  * Validates messageData for the eth_getEncryptionPublicKey message and throws in
  * the event of any validation error.

package/dist/utils.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.mts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAI3C,OAAO,KAAK,EAAE,oBAAoB,EAAE,oCAAgC;AACpE,OAAO,KAAK,EAAE,yBAAyB,EAAE,yCAAqC;AAC9E,OAAO,KAAK,EAAE,qBAAqB,EAAE,qCAAiC;AACtE,OAAO,KAAK,EAAE,kBAAkB,EAAE,kCAA8B;AAiBhE;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,iBAUhD;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,qBAAqB,QAOzE;AAED;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAC5C,WAAW,EAAE,kBAAkB,QAoBhC;AAED;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAC9C,WAAW,EAAE,kBAAkB,EAC/B,cAAc,EAAE,GAAG,GAAG,SAAS,QA4DhC;AAED;;;;;GAKG;AACH,wBAAgB,sCAAsC,CACpD,WAAW,EAAE,yBAAyB,QAIvC;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,oBAAoB,QAIlC"}
+{"version":3,"file":"utils.d.mts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,oCAAgC;AACpE,OAAO,KAAK,EAAE,yBAAyB,EAAE,yCAAqC;AAiB9E;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,iBAUhD;AAED;;;;;GAKG;AACH,wBAAgB,sCAAsC,CACpD,WAAW,EAAE,yBAAyB,QAIvC;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,oBAAoB,QAIlC"}

package/dist/utils.mjs

@@ -1,8 +1,5 @@
 import { isValidHexAddress } from "@metamask/controller-utils";
-import $metamaskethsigutil from "@metamask/eth-sig-util";
-const { TYPED_MESSAGE_SCHEMA, typedSignatureHash } = $metamaskethsigutil;
 import { add0x, bytesToHex, remove0x } from "@metamask/utils";
-import { validate } from "jsonschema";
 const hexRe = /^[0-9A-Fa-f]+$/gu;
 /**
  * Validates an address string and throws in the event of any validation error.
@@ -34,97 +31,6 @@ export function normalizeMessageData(data) {
     }
     return bytesToHex(Buffer.from(data, 'utf8'));
 }
-/**
- * Validates a PersonalMessageParams objects for required properties and throws in
- * the event of any validation error.
- *
- * @param messageData - PersonalMessageParams object to validate.
- */
-export function validateSignMessageData(messageData) {
-    const { from, data } = messageData;
-    validateAddress(from, 'from');
-    if (!data || typeof data !== 'string') {
-        throw new Error(`Invalid message "data": ${data} must be a valid string.`);
-    }
-}
-/**
- * Validates a TypedMessageParams object for required properties and throws in
- * the event of any validation error for eth_signTypedMessage_V1.
- *
- * @param messageData - TypedMessageParams object to validate.
- */
-export function validateTypedSignMessageDataV1(messageData) {
-    validateAddress(messageData.from, 'from');
-    if (!messageData.data || !Array.isArray(messageData.data)) {
-        throw new Error(
-        // TODO: Either fix this lint violation or explain why it's necessary to ignore.
-        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-        `Invalid message "data": ${messageData.data} must be a valid array.`);
-    }
-    try {
-        // typedSignatureHash will throw if the data is invalid.
-        // TODO: Replace `any` with type
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        typedSignatureHash(messageData.data);
-    }
-    catch (e) {
-        throw new Error(`Expected EIP712 typed data.`);
-    }
-}
-/**
- * Validates a TypedMessageParams object for required properties and throws in
- * the event of any validation error for eth_signTypedMessage_V3.
- *
- * @param messageData - TypedMessageParams object to validate.
- * @param currentChainId - The current chainId.
- */
-export function validateTypedSignMessageDataV3V4(messageData, currentChainId) {
-    validateAddress(messageData.from, 'from');
-    if (!messageData.data ||
-        Array.isArray(messageData.data) ||
-        (typeof messageData.data !== 'object' &&
-            typeof messageData.data !== 'string')) {
-        throw new Error(`Invalid message "data": Must be a valid string or object.`);
-    }
-    let data;
-    if (typeof messageData.data === 'object') {
-        data = messageData.data;
-    }
-    else {
-        try {
-            data = JSON.parse(messageData.data);
-        }
-        catch (e) {
-            throw new Error('Data must be passed as a valid JSON string.');
-        }
-    }
-    const validation = validate(data, TYPED_MESSAGE_SCHEMA);
-    if (validation.errors.length > 0) {
-        throw new Error('Data must conform to EIP-712 schema. See https://git.io/fNtcx.');
-    }
-    if (!currentChainId) {
-        throw new Error('Current chainId cannot be null or undefined.');
-    }
-    let { chainId } = data.domain;
-    if (chainId) {
-        if (typeof chainId === 'string') {
-            chainId = parseInt(chainId, chainId.startsWith('0x') ? 16 : 10);
-        }
-        const activeChainId = parseInt(currentChainId, 16);
-        if (Number.isNaN(activeChainId)) {
-            throw new Error(
-            // TODO: Either fix this lint violation or explain why it's necessary to ignore.
-            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-            `Cannot sign messages for chainId "${chainId}", because MetaMask is switching networks.`);
-        }
-        if (chainId !== activeChainId) {
-            throw new Error(
-            // TODO: Either fix this lint violation or explain why it's necessary to ignore.
-            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-            `Provided chainId "${chainId}" must match the active chainId "${activeChainId}"`);
-        }
-    }
-}
 /**
  * Validates messageData for the eth_getEncryptionPublicKey message and throws in
  * the event of any validation error.

package/dist/utils.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"utils.mjs","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { isValidHexAddress } from '@metamask/controller-utils';\nimport {\n  TYPED_MESSAGE_SCHEMA,\n  typedSignatureHash,\n} from '@metamask/eth-sig-util';\nimport type { Hex } from '@metamask/utils';\nimport { add0x, bytesToHex, remove0x } from '@metamask/utils';\nimport { validate } from 'jsonschema';\n\nimport type { DecryptMessageParams } from './DecryptMessageManager';\nimport type { EncryptionPublicKeyParams } from './EncryptionPublicKeyManager';\nimport type { PersonalMessageParams } from './PersonalMessageManager';\nimport type { TypedMessageParams } from './TypedMessageManager';\n\nconst hexRe = /^[0-9A-Fa-f]+$/gu;\n/**\n * Validates an address string and throws in the event of any validation error.\n *\n * @param address - The address to validate.\n * @param propertyName - The name of the property source to use in the error message.\n */\nfunction validateAddress(address: string, propertyName: string) {\n  if (!address || typeof address !== 'string' || !isValidHexAddress(address)) {\n    throw new Error(\n      `Invalid \"${propertyName}\" address: ${address} must be a valid string.`,\n    );\n  }\n}\n\n/**\n * A helper function that converts rawmessageData buffer data to a hex, or just returns the data if\n * it is already formatted as a hex.\n *\n * @param data - The buffer data to convert to a hex.\n * @returns A hex string conversion of the buffer data.\n */\nexport function normalizeMessageData(data: string) {\n  try {\n    const stripped = remove0x(data);\n    if (stripped.match(hexRe)) {\n      return add0x(stripped);\n    }\n  } catch (e) {\n    /* istanbul ignore next */\n  }\n  return bytesToHex(Buffer.from(data, 'utf8'));\n}\n\n/**\n * Validates a PersonalMessageParams objects for required properties and throws in\n * the event of any validation error.\n *\n * @param messageData - PersonalMessageParams object to validate.\n */\nexport function validateSignMessageData(messageData: PersonalMessageParams) {\n  const { from, data } = messageData;\n  validateAddress(from, 'from');\n\n  if (!data || typeof data !== 'string') {\n    throw new Error(`Invalid message \"data\": ${data} must be a valid string.`);\n  }\n}\n\n/**\n * Validates a TypedMessageParams object for required properties and throws in\n * the event of any validation error for eth_signTypedMessage_V1.\n *\n * @param messageData - TypedMessageParams object to validate.\n */\nexport function validateTypedSignMessageDataV1(\n  messageData: TypedMessageParams,\n) {\n  validateAddress(messageData.from, 'from');\n\n  if (!messageData.data || !Array.isArray(messageData.data)) {\n    throw new Error(\n      // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n      // eslint-disable-next-line @typescript-eslint/restrict-template-expressions\n      `Invalid message \"data\": ${messageData.data} must be a valid array.`,\n    );\n  }\n\n  try {\n    // typedSignatureHash will throw if the data is invalid.\n    // TODO: Replace `any` with type\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    typedSignatureHash(messageData.data as any);\n  } catch (e) {\n    throw new Error(`Expected EIP712 typed data.`);\n  }\n}\n\n/**\n * Validates a TypedMessageParams object for required properties and throws in\n * the event of any validation error for eth_signTypedMessage_V3.\n *\n * @param messageData - TypedMessageParams object to validate.\n * @param currentChainId - The current chainId.\n */\nexport function validateTypedSignMessageDataV3V4(\n  messageData: TypedMessageParams,\n  currentChainId: Hex | undefined,\n) {\n  validateAddress(messageData.from, 'from');\n\n  if (\n    !messageData.data ||\n    Array.isArray(messageData.data) ||\n    (typeof messageData.data !== 'object' &&\n      typeof messageData.data !== 'string')\n  ) {\n    throw new Error(\n      `Invalid message \"data\": Must be a valid string or object.`,\n    );\n  }\n\n  let data;\n  if (typeof messageData.data === 'object') {\n    data = messageData.data;\n  } else {\n    try {\n      data = JSON.parse(messageData.data);\n    } catch (e) {\n      throw new Error('Data must be passed as a valid JSON string.');\n    }\n  }\n\n  const validation = validate(data, TYPED_MESSAGE_SCHEMA);\n  if (validation.errors.length > 0) {\n    throw new Error(\n      'Data must conform to EIP-712 schema. See https://git.io/fNtcx.',\n    );\n  }\n\n  if (!currentChainId) {\n    throw new Error('Current chainId cannot be null or undefined.');\n  }\n\n  let { chainId } = data.domain;\n  if (chainId) {\n    if (typeof chainId === 'string') {\n      chainId = parseInt(chainId, chainId.startsWith('0x') ? 16 : 10);\n    }\n\n    const activeChainId = parseInt(currentChainId, 16);\n    if (Number.isNaN(activeChainId)) {\n      throw new Error(\n        // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions\n        `Cannot sign messages for chainId \"${chainId}\", because MetaMask is switching networks.`,\n      );\n    }\n\n    if (chainId !== activeChainId) {\n      throw new Error(\n        // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions\n        `Provided chainId \"${chainId}\" must match the active chainId \"${activeChainId}\"`,\n      );\n    }\n  }\n}\n\n/**\n * Validates messageData for the eth_getEncryptionPublicKey message and throws in\n * the event of any validation error.\n *\n * @param messageData - address string to validate.\n */\nexport function validateEncryptionPublicKeyMessageData(\n  messageData: EncryptionPublicKeyParams,\n) {\n  const { from } = messageData;\n  validateAddress(from, 'from');\n}\n\n/**\n * Validates messageData for the eth_decrypt message and throws in\n * the event of any validation error.\n *\n * @param messageData - address string to validate.\n */\nexport function validateDecryptedMessageData(\n  messageData: DecryptMessageParams,\n) {\n  const { from } = messageData;\n  validateAddress(from, 'from');\n}\n"]}
+{"version":3,"file":"utils.mjs","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,mCAAmC;AAC/D,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,wBAAwB;AAK9D,MAAM,KAAK,GAAG,kBAAkB,CAAC;AACjC;;;;;GAKG;AACH,SAAS,eAAe,CAAC,OAAe,EAAE,YAAoB;IAC5D,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE;QAC1E,MAAM,IAAI,KAAK,CACb,YAAY,YAAY,cAAc,OAAO,0BAA0B,CACxE,CAAC;KACH;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAAY;IAC/C,IAAI;QACF,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YACzB,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC;SACxB;KACF;IAAC,OAAO,CAAC,EAAE;QACV,0BAA0B;KAC3B;IACD,OAAO,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,sCAAsC,CACpD,WAAsC;IAEtC,MAAM,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;IAC7B,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAChC,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,4BAA4B,CAC1C,WAAiC;IAEjC,MAAM,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;IAC7B,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAChC,CAAC","sourcesContent":["import { isValidHexAddress } from '@metamask/controller-utils';\nimport { add0x, bytesToHex, remove0x } from '@metamask/utils';\n\nimport type { DecryptMessageParams } from './DecryptMessageManager';\nimport type { EncryptionPublicKeyParams } from './EncryptionPublicKeyManager';\n\nconst hexRe = /^[0-9A-Fa-f]+$/gu;\n/**\n * Validates an address string and throws in the event of any validation error.\n *\n * @param address - The address to validate.\n * @param propertyName - The name of the property source to use in the error message.\n */\nfunction validateAddress(address: string, propertyName: string) {\n  if (!address || typeof address !== 'string' || !isValidHexAddress(address)) {\n    throw new Error(\n      `Invalid \"${propertyName}\" address: ${address} must be a valid string.`,\n    );\n  }\n}\n\n/**\n * A helper function that converts rawmessageData buffer data to a hex, or just returns the data if\n * it is already formatted as a hex.\n *\n * @param data - The buffer data to convert to a hex.\n * @returns A hex string conversion of the buffer data.\n */\nexport function normalizeMessageData(data: string) {\n  try {\n    const stripped = remove0x(data);\n    if (stripped.match(hexRe)) {\n      return add0x(stripped);\n    }\n  } catch (e) {\n    /* istanbul ignore next */\n  }\n  return bytesToHex(Buffer.from(data, 'utf8'));\n}\n\n/**\n * Validates messageData for the eth_getEncryptionPublicKey message and throws in\n * the event of any validation error.\n *\n * @param messageData - address string to validate.\n */\nexport function validateEncryptionPublicKeyMessageData(\n  messageData: EncryptionPublicKeyParams,\n) {\n  const { from } = messageData;\n  validateAddress(from, 'from');\n}\n\n/**\n * Validates messageData for the eth_decrypt message and throws in\n * the event of any validation error.\n *\n * @param messageData - address string to validate.\n */\nexport function validateDecryptedMessageData(\n  messageData: DecryptMessageParams,\n) {\n  const { from } = messageData;\n  validateAddress(from, 'from');\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/message-manager",
-  "version": "10.1.1-preview-e46fca9e",
+  "version": "10.1.1-preview-2f4bcaa9",
   "description": "Stores and manages interactions with signing requests",
   "keywords": [
     "MetaMask",

package/dist/PersonalMessageManager.cjs

@@ -1,58 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PersonalMessageManager = void 0;
-const controller_utils_1 = require("@metamask/controller-utils");
-const AbstractMessageManager_1 = require("./AbstractMessageManager.cjs");
-const utils_1 = require("./utils.cjs");
-/**
- * Controller in charge of managing - storing, adding, removing, updating - Messages.
- */
-class PersonalMessageManager extends AbstractMessageManager_1.AbstractMessageManager {
-    constructor() {
-        super(...arguments);
-        /**
-         * Name of this controller used during composition
-         */
-        this.name = 'PersonalMessageManager';
-    }
-    /**
-     * Creates a new Message with an 'unapproved' status using the passed messageParams.
-     * this.addMessage is called to add the new Message to this.messages, and to save the
-     * unapproved Messages.
-     *
-     * @param messageParams - The params for the personal_sign call to be made after the message
-     * is approved.
-     * @param req - The original request object possibly containing the origin.
-     * @returns The id of the newly created message.
-     */
-    async addUnapprovedMessage(messageParams, req) {
-        (0, utils_1.validateSignMessageData)(messageParams);
-        const ethereumSignInData = (0, controller_utils_1.detectSIWE)(messageParams);
-        const updatedMessageParams = this.addRequestToMessageParams(messageParams, req);
-        updatedMessageParams.data = (0, utils_1.normalizeMessageData)(messageParams.data);
-        updatedMessageParams.siwe = ethereumSignInData;
-        const messageData = this.createUnapprovedMessage(updatedMessageParams, controller_utils_1.ApprovalType.PersonalSign, req);
-        const messageId = messageData.id;
-        await this.addMessage(messageData);
-        this.hub.emit(`unapprovedMessage`, {
-            ...updatedMessageParams,
-            metamaskId: messageId,
-        });
-        return messageId;
-    }
-    /**
-     * Removes the metamaskId property from passed messageParams and returns a promise which
-     * resolves the updated messageParams.
-     *
-     * @param messageParams - The messageParams to modify.
-     * @returns Promise resolving to the messageParams with the metamaskId property removed.
-     */
-    prepMessageForSigning(messageParams) {
-        // Using delete operation will throw an error on frozen messageParams
-        const { metamaskId: _metamaskId, ...messageParamsWithoutId } = messageParams;
-        return Promise.resolve(messageParamsWithoutId);
-    }
-}
-exports.PersonalMessageManager = PersonalMessageManager;
-exports.default = PersonalMessageManager;
-//# sourceMappingURL=PersonalMessageManager.cjs.map

package/dist/PersonalMessageManager.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"PersonalMessageManager.cjs","sourceRoot":"","sources":["../src/PersonalMessageManager.ts"],"names":[],"mappings":";;;AACA,iEAAsE;AAQtE,yEAAkE;AAClE,uCAAwE;AAsDxE;;GAEG;AACH,MAAa,sBAAuB,SAAQ,+CAI3C;IAJD;;QAKE;;WAEG;QACM,SAAI,GAAG,wBAAiC,CAAC;IAyDpD,CAAC;IAvDC;;;;;;;;;OASG;IACH,KAAK,CAAC,oBAAoB,CACxB,aAAoC,EACpC,GAAqB;QAErB,IAAA,+BAAuB,EAAC,aAAa,CAAC,CAAC;QAEvC,MAAM,kBAAkB,GAAG,IAAA,6BAAU,EAAC,aAAa,CAAC,CAAC;QACrD,MAAM,oBAAoB,GAAG,IAAI,CAAC,yBAAyB,CACzD,aAAa,EACb,GAAG,CAC4B,CAAC;QAElC,oBAAoB,CAAC,IAAI,GAAG,IAAA,4BAAoB,EAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACrE,oBAAoB,CAAC,IAAI,GAAG,kBAAkB,CAAC;QAE/C,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,CAC9C,oBAAoB,EACpB,+BAAY,CAAC,YAAY,EACzB,GAAG,CACsB,CAAC;QAE5B,MAAM,SAAS,GAAG,WAAW,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACnC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,EAAE;YACjC,GAAG,oBAAoB;YACvB,UAAU,EAAE,SAAS;SACtB,CAAC,CAAC;QACH,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;;OAMG;IACH,qBAAqB,CACnB,aAA4C;QAE5C,qEAAqE;QACrE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,sBAAsB,EAAE,GAC1D,aAAa,CAAC;QAChB,OAAO,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACjD,CAAC;CACF;AAjED,wDAiEC;AAED,kBAAe,sBAAsB,CAAC","sourcesContent":["import type { SIWEMessage } from '@metamask/controller-utils';\nimport { detectSIWE, ApprovalType } from '@metamask/controller-utils';\n\nimport type {\n  AbstractMessage,\n  AbstractMessageParams,\n  AbstractMessageParamsMetamask,\n  OriginalRequest,\n} from './AbstractMessageManager';\nimport { AbstractMessageManager } from './AbstractMessageManager';\nimport { normalizeMessageData, validateSignMessageData } from './utils';\n\n/**\n * @type Message\n *\n * Represents and contains data about a 'personal_sign' type signature request.\n * These are created when a signature for a personal_sign call is requested.\n * @property id - An id to track and identify the message object\n * @property messageParams - The parameters to pass to the personal_sign method once the signature request is approved\n * @property type - The json-prc signing method for which a signature request has been made.\n * A 'Message' which always has a 'personal_sign' type\n * @property rawSig - Raw data of the signature request\n */\n// This interface was created before this ESLint rule was added.\n// Convert to a `type` in a future major version.\n// eslint-disable-next-line @typescript-eslint/consistent-type-definitions\nexport interface PersonalMessage extends AbstractMessage {\n  messageParams: PersonalMessageParams;\n}\n\n/**\n * @type PersonalMessageParams\n *\n * Represents the parameters to pass to the personal_sign method once the signature request is approved.\n * @property data - A hex string conversion of the raw buffer data of the signature request\n * @property from - Address to sign this message from\n * @property origin? - Added for request origin identification\n */\n// This interface was created before this ESLint rule was added.\n// Convert to a `type` in a future major version.\n// eslint-disable-next-line @typescript-eslint/consistent-type-definitions\nexport interface PersonalMessageParams extends AbstractMessageParams {\n  data: string;\n  siwe?: SIWEMessage;\n}\n\n/**\n * @type MessageParamsMetamask\n *\n * Represents the parameters to pass to the personal_sign method once the signature request is approved\n * plus data added by MetaMask.\n * @property metamaskId - Added for tracking and identification within MetaMask\n * @property data - A hex string conversion of the raw buffer data of the signature request\n * @property from - Address to sign this message from\n * @property origin? - Added for request origin identification\n */\n// This interface was created before this ESLint rule was added.\n// Convert to a `type` in a future major version.\n// eslint-disable-next-line @typescript-eslint/consistent-type-definitions\nexport interface PersonalMessageParamsMetamask\n  extends AbstractMessageParamsMetamask {\n  data: string;\n}\n\n/**\n * Controller in charge of managing - storing, adding, removing, updating - Messages.\n */\nexport class PersonalMessageManager extends AbstractMessageManager<\n  PersonalMessage,\n  PersonalMessageParams,\n  PersonalMessageParamsMetamask\n> {\n  /**\n   * Name of this controller used during composition\n   */\n  override name = 'PersonalMessageManager' as const;\n\n  /**\n   * Creates a new Message with an 'unapproved' status using the passed messageParams.\n   * this.addMessage is called to add the new Message to this.messages, and to save the\n   * unapproved Messages.\n   *\n   * @param messageParams - The params for the personal_sign call to be made after the message\n   * is approved.\n   * @param req - The original request object possibly containing the origin.\n   * @returns The id of the newly created message.\n   */\n  async addUnapprovedMessage(\n    messageParams: PersonalMessageParams,\n    req?: OriginalRequest,\n  ): Promise<string> {\n    validateSignMessageData(messageParams);\n\n    const ethereumSignInData = detectSIWE(messageParams);\n    const updatedMessageParams = this.addRequestToMessageParams(\n      messageParams,\n      req,\n    ) satisfies PersonalMessageParams;\n\n    updatedMessageParams.data = normalizeMessageData(messageParams.data);\n    updatedMessageParams.siwe = ethereumSignInData;\n\n    const messageData = this.createUnapprovedMessage(\n      updatedMessageParams,\n      ApprovalType.PersonalSign,\n      req,\n    ) satisfies PersonalMessage;\n\n    const messageId = messageData.id;\n    await this.addMessage(messageData);\n    this.hub.emit(`unapprovedMessage`, {\n      ...updatedMessageParams,\n      metamaskId: messageId,\n    });\n    return messageId;\n  }\n\n  /**\n   * Removes the metamaskId property from passed messageParams and returns a promise which\n   * resolves the updated messageParams.\n   *\n   * @param messageParams - The messageParams to modify.\n   * @returns Promise resolving to the messageParams with the metamaskId property removed.\n   */\n  prepMessageForSigning(\n    messageParams: PersonalMessageParamsMetamask,\n  ): Promise<PersonalMessageParams> {\n    // Using delete operation will throw an error on frozen messageParams\n    const { metamaskId: _metamaskId, ...messageParamsWithoutId } =\n      messageParams;\n    return Promise.resolve(messageParamsWithoutId);\n  }\n}\n\nexport default PersonalMessageManager;\n"]}