Remove Hash Method from Request Router (#120)

Mintbase · Sep 19, 2024 · 72d718e · 72d718e
1 parent 09317d9
commit 72d718e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 30 deletions.
diff --git a/src/types.ts b/src/types.ts
@@ -1,11 +1,11 @@
 import { MpcContract } from "./mpcContract";
 import {
   Address,
-  Hash,
   Hex,
   SignableMessage,
   Signature,
   TransactionSerializable,
+  TypedDataDomain,
 } from "viem";
 
 /**
@@ -145,35 +145,39 @@ export interface MessageData {
   message: SignableMessage;
 }
 
+interface TypedDataTypes {
+  name: string;
+  type: string;
+}
+type TypedMessageTypes = {
+  [key: string]: TypedDataTypes[];
+};
+
 /**
  * Represents the data for a typed message.
  *
- * @property {Hex} address - The address associated with the message.
- * @property {any} types - The types of the message.
- * @property {any} primaryType - The primary type of the message.
- * @property {any} message - The message itself.
- * @property {any} domain - The domain of the message.
+ * @property {TypedDataDomain} domain - The domain of the message.
+ * @property {TypedMessageTypes} types - The types of the message.
+ * @property {Record<string, unknown>} message - The message itself.
+ * @property {string} primaryType - The primary type of the message.
  */
-export interface TypedMessageData {
-  address: Hex;
-  /* eslint-disable @typescript-eslint/no-explicit-any */
-  types: any;
-  primaryType: any;
-  message: any;
-  domain: any;
-  /* eslint-enable @typescript-eslint/no-explicit-any */
-}
+export type EIP712TypedData = {
+  domain: TypedDataDomain;
+  types: TypedMessageTypes;
+  message: Record<string, unknown>;
+  primaryType: string;
+};
 
 /**
  * Represents the recovery data.
  *
  * @property {string} type - The type of the recovery data.
- * @property {MessageData | TypedMessageData | Hex} data - The recovery data.
+ * @property {MessageData | EIP712TypedData | Hex} data - The recovery data.
  */
 export interface RecoveryData {
   // TODO use enum!
   type: string;
-  data: MessageData | TypedMessageData | Hex;
+  data: MessageData | EIP712TypedData | Hex;
 }
 
 /**
@@ -243,7 +247,6 @@ export type TypedDataParams = [Hex, string];
  * @property {TypedDataParams} - Parameters for signing structured data.
  */
 export type SessionRequestParams =
-  | Hash
   | EthTransactionParams[]
   | Hex
   | PersonalSignParams
@@ -254,7 +257,6 @@ export type SessionRequestParams =
  * An array of supported signing methods.
  */
 export const signMethods = [
-  "hash",
   "eth_sign",
   "personal_sign",
   "eth_sendTransaction",

diff --git a/src/utils/request.ts b/src/utils/request.ts
@@ -1,5 +1,4 @@
 import {
-  Hash,
   Hex,
   fromHex,
   hashMessage,
@@ -39,16 +38,6 @@ export async function requestRouter({
   recoveryData: RecoveryData;
 }> {
   switch (method) {
-    case "hash": {
-      console.warn("Unsafe hash without context sign request");
-      const hash = params as Hash;
-      return {
-        payload: toPayload(hash),
-        // These should be more.
-        evmMessage: hash,
-        recoveryData: { type: "hash", data: hash },
-      };
-    }
     case "eth_sign": {
       const [sender, messageHash] = params as EthSignParams;
       return {