Merge pull request #74 from cometh-hq/develop

Develop

Author: yoanslvy

packages/sdk/package.json

@@ -6,7 +6,7 @@
       "name": "yoanslvy"
     }
   ],
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "SDK Cometh Connect 4337",
   "repository": "https://github.com/cometh-hq/connect-sdk-4337.git",
   "keywords": [

packages/sdk/src/core/accounts/safe/safeSigner/ecdsa/ecdsa.ts

@@ -9,8 +9,6 @@ import {
     type TypedData,
     type TypedDataDefinition,
     encodePacked,
-    hashTypedData,
-    toBytes,
 } from "viem";
 import { toAccount } from "viem/accounts";
 import { signTypedData } from "viem/actions";
@@ -67,22 +65,16 @@ export async function safeECDSASigner<
     const account = toAccount({
         address: smartAccountAddress,
         async signMessage({ message }) {
-            const messageHash = hashTypedData({
-                domain: {
-                    chainId: client.chain?.id,
-                    verifyingContract: smartAccountAddress,
-                },
-                types: EIP712_SAFE_MESSAGE_TYPE,
-                primaryType: "SafeMessage" as const,
-                message: { message: generateSafeMessageMessage(message) },
-            });
-
             return adjustVInSignature(
-                "eth_sign",
-                await viemSigner.signMessage({
-                    message: {
-                        raw: toBytes(messageHash),
+                "eth_signTypedData",
+                await viemSigner.signTypedData({
+                    domain: {
+                        chainId: client.chain?.id,
+                        verifyingContract: smartAccountAddress,
                     },
+                    types: EIP712_SAFE_MESSAGE_TYPE,
+                    primaryType: "SafeMessage" as const,
+                    message: { message: generateSafeMessageMessage(message) },
                 })
             );
         },

packages/sdk/src/core/actions/accounts/safe/recovery/customRecoveryActions.ts

@@ -39,8 +39,8 @@ export async function getDelayModuleAddress<
     TTransport extends Transport = Transport,
     TChain extends Chain | undefined = Chain | undefined,
     TAccount extends ComethSafeSmartAccount | undefined =
-        | ComethSafeSmartAccount
-        | undefined,
+    | ComethSafeSmartAccount
+    | undefined,
 >(
     client: Client<TTransport, TChain, TAccount>,
     args: Prettify<GetDelayModuleAddressParams>
@@ -75,8 +75,8 @@ export async function getGuardianAddress<
     TTransport extends Transport = Transport,
     TChain extends Chain | undefined = Chain | undefined,
     TAccount extends ComethSafeSmartAccount | undefined =
-        | ComethSafeSmartAccount
-        | undefined,
+    | ComethSafeSmartAccount
+    | undefined,
 >(
     client: Client<TTransport, TChain, TAccount>,
     args: Prettify<GetGuardianAddressParams>
@@ -117,8 +117,8 @@ export async function addGuardian<
     TTransport extends Transport = Transport,
     TChain extends Chain | undefined = Chain | undefined,
     TAccount extends ComethSafeSmartAccount | undefined =
-        | ComethSafeSmartAccount
-        | undefined,
+    | ComethSafeSmartAccount
+    | undefined,
 >(
     client: Client<TTransport, TChain, TAccount>,
     args: Prettify<AddGuardianParams>
@@ -184,8 +184,8 @@ export async function disableGuardian<
     TTransport extends Transport = Transport,
     TChain extends Chain | undefined = Chain | undefined,
     TAccount extends ComethSafeSmartAccount | undefined =
-        | ComethSafeSmartAccount
-        | undefined,
+    | ComethSafeSmartAccount
+    | undefined,
 >(
     client: Client<TTransport, TChain, TAccount>,
     args: Prettify<DisableGuardianParams>
@@ -262,7 +262,7 @@ export async function disableGuardian<
         sendTransaction,
         "sendTransaction"
     )({
-        transactions: [disableGuardianTx],
+        calls: [disableGuardianTx],
     } as unknown as SendTransactionParameters);
 }
 
@@ -276,8 +276,8 @@ export async function setupCustomDelayModule<
     TTransport extends Transport = Transport,
     TChain extends Chain | undefined = Chain | undefined,
     TAccount extends ComethSafeSmartAccount | undefined =
-        | ComethSafeSmartAccount
-        | undefined,
+    | ComethSafeSmartAccount
+    | undefined,
 >(
     client: Client<TTransport, TChain, TAccount>,
     args: Prettify<SetupCustomDelayModuleParams>
@@ -372,7 +372,7 @@ export async function setupCustomDelayModule<
         sendTransaction,
         "sendTransaction"
     )({
-        transactions: setUpDelayTx,
+        calls: setUpDelayTx,
     } as unknown as SendTransactionParameters);
 
     return hash;