Fix Bug: UserOpHash for chainId (#72)

BitteProtocol · Oct 9, 2024 · f13475a · f13475a
1 parent 0102bfc
commit f13475a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/examples/send-tx.ts b/examples/send-tx.ts
@@ -46,7 +46,7 @@ async function main(): Promise<void> {
     usePaymaster,
   });
   console.log("Unsigned UserOp", unsignedUserOp);
-  const safeOpHash = await txManager.opHash(unsignedUserOp);
+  const safeOpHash = await txManager.opHash(chainId, unsignedUserOp);
   console.log("Safe Op Hash", safeOpHash);
 
   // TODO: Evaluate gas cost (in ETH)

diff --git a/src/lib/safe.ts b/src/lib/safe.ts
@@ -107,7 +107,10 @@ export class SafeContractSuite {
     });
   }
 
-  async getOpHash(unsignedUserOp: UserOperation): Promise<Hash> {
+  async getOpHash(
+    chainId: number,
+    unsignedUserOp: UserOperation
+  ): Promise<Hash> {
     const {
       factory,
       factoryData,
@@ -116,7 +119,8 @@ export class SafeContractSuite {
       maxPriorityFeePerGas,
       maxFeePerGas,
     } = unsignedUserOp;
-    const opHash = await this.dummyClient.readContract({
+    const client = await getClient(chainId);
+    const opHash = await client.readContract({
       address: this.m4337.address,
       abi: this.m4337.abi,
       functionName: "getOperationHash",

diff --git a/src/near-safe.ts b/src/near-safe.ts
@@ -208,8 +208,8 @@ export class NearSafe {
    * @param {UserOperation} userOp - The user operation for which the hash needs to be computed.
    * @returns {Promise<Hash>} - A promise that resolves to the hash of the provided user operation.
    */
-  async opHash(userOp: UserOperation): Promise<Hash> {
-    return this.safePack.getOpHash(userOp);
+  async opHash(chainId: number, userOp: UserOperation): Promise<Hash> {
+    return this.safePack.getOpHash(chainId, userOp);
   }
 
   /**
@@ -455,11 +455,11 @@ export class NearSafe {
           transactions,
           usePaymaster,
         });
-        const opHash = await this.opHash(userOp);
+        const opHash = await this.opHash(chainId, userOp);
         return {
           payload: toPayload(opHash),
           evmMessage: JSON.stringify(userOp),
-          hash: await this.opHash(userOp),
+          hash: await this.opHash(chainId, userOp),
         };
       }
     }