@account-kit/smart-contracts 4.38.0 → 4.40.0

package/src/msca/plugins/multisig/signer.ts

@@ -1,4 +1,9 @@
-import type { Address, BundlerClient, SmartAccountSigner } from "@aa-sdk/core";
+import type {
+  Address,
+  BundlerClient,
+  SmartAccountSigner,
+  SignatureRequest,
+} from "@aa-sdk/core";
 import {
   hashMessage,
   hashTypedData,
@@ -32,7 +37,7 @@ export const multisigSignMethods = <
   threshold,
   pluginAddress = MultisigPlugin.meta.addresses[client.chain.id],
 }: MultisigSignMethodsParams<TTransport, TSigner>) => {
-  const signWith712Wrapper = async (msg: Hash): Promise<`0x${string}`> => {
+  const get712Wrapper = async (msg: Hash): Promise<TypedDataDefinition> => {
     const [, name, version, chainId, verifyingContract, salt] =
       await client.readContract({
         abi: MultisigPluginAbi,
@@ -41,7 +46,7 @@ export const multisigSignMethods = <
         account: accountAddress,
       });
 
-    return signer().signTypedData({
+    return {
       domain: {
         chainId: Number(chainId),
         name,
@@ -56,10 +61,32 @@ export const multisigSignMethods = <
         message: msg,
       },
       primaryType: "AlchemyMultisigMessage",
-    });
+    };
+  };
+
+  const prepareSign = async (
+    params: SignatureRequest,
+  ): Promise<SignatureRequest> => {
+    const messageHash =
+      params.type === "personal_sign"
+        ? hashMessage(params.data)
+        : hashTypedData(params.data);
+
+    return {
+      type: "eth_signTypedData_v4",
+      data: await get712Wrapper(messageHash),
+    };
+  };
+
+  const formatSign = async (
+    signature: `0x${string}`,
+  ): Promise<`0x${string}`> => {
+    return signature;
   };
 
   return {
+    prepareSign,
+    formatSign,
     getDummySignature: async (): Promise<`0x${string}`> => {
       const [, thresholdRead] = await client.readContract({
         abi: MultisigPluginAbi,
@@ -84,17 +111,29 @@ export const multisigSignMethods = <
       return signer().signMessage({ raw: uoHash });
     },
 
-    signMessage({ message }: { message: SignableMessage }): Promise<Hex> {
-      return signWith712Wrapper(hashMessage(message));
+    async signMessage({ message }: { message: SignableMessage }): Promise<Hex> {
+      const { type, data } = await prepareSign({
+        type: "personal_sign",
+        data: message,
+      });
+      return type === "personal_sign"
+        ? signer().signMessage(data)
+        : signer().signTypedData(data);
     },
 
-    signTypedData: <
+    signTypedData: async <
       const typedData extends TypedData | Record<string, unknown>,
       primaryType extends keyof typedData | "EIP712Domain" = keyof typedData,
     >(
       typedDataDefinition: TypedDataDefinition<typedData, primaryType>,
     ): Promise<Hex> => {
-      return signWith712Wrapper(hashTypedData(typedDataDefinition));
+      const { type, data } = await prepareSign({
+        type: "eth_signTypedData_v4",
+        data: typedDataDefinition as TypedDataDefinition,
+      });
+      return type === "personal_sign"
+        ? signer().signMessage(data)
+        : signer().signTypedData(data);
     },
   };
 };