add tests

Author: gregfromstl

packages/thirdweb/src/auth/verify-hash.ts

@@ -125,8 +125,7 @@ export async function verifyHash({
   try {
     const result = await eth_call(rpcRequest, verificationData);
     return hexToBool(result);
-  } catch (err) {
-    console.error("Error verifying ERC-6492 signature", err);
+  } catch (_err) {
     // Some chains do not support the eth_call simulation and will fail, so we fall back to regular EIP1271 validation
     const validEip1271 = await verifyEip1271Signature({
       hash,

packages/thirdweb/src/auth/verify-signature.test.ts

@@ -1,10 +1,16 @@
+import * as ox__Bytes from "ox/Bytes";
 import { describe, expect, it, test } from "vitest";
 import { FORKED_ETHEREUM_CHAIN } from "../../test/src/chains.js";
 import { TEST_CLIENT } from "../../test/src/test-clients.js";
 import { TEST_ACCOUNT_A } from "../../test/src/test-wallets.js";
-import { mainnet } from "../chains/chain-definitions/ethereum.js";
+import { ethereum, mainnet } from "../chains/chain-definitions/ethereum.js";
 import { sepolia } from "../chains/chain-definitions/sepolia.js";
-import { verifyEOASignature, verifySignature } from "./verify-signature.js";
+import { smartWallet } from "../wallets/smart/smart-wallet.js";
+import {
+  verifyContractWalletSignature,
+  verifyEOASignature,
+  verifySignature,
+} from "./verify-signature.js";
 
 describe("verifyEOASignature", () => {
   test("should return true for a valid signature", async () => {
@@ -98,3 +104,43 @@ describe.runIf(process.env.TW_SECRET_KEY)(
     });
   },
 );
+
+describe.runIf(process.env.TW_SECRET_KEY)(
+  "verifyContractWalletSignature",
+  async () => {
+    const message = "Hakuna matata";
+    const wallet = smartWallet({
+      chain: ethereum,
+      gasless: true,
+    });
+    const smartAccount = await wallet.connect({
+      client: TEST_CLIENT,
+      personalAccount: TEST_ACCOUNT_A,
+    });
+
+    test("should verify a smart account signature", async () => {
+      const rawSignature = await smartAccount.signMessage({ message });
+      const result = await verifyContractWalletSignature({
+        signature: rawSignature,
+        message,
+        address: smartAccount.address,
+        chain: ethereum,
+        client: TEST_CLIENT,
+      });
+      expect(result).toBe(true);
+    });
+
+    test("should verify a smart account signature as bytes", async () => {
+      const rawSignature = await smartAccount.signMessage({ message });
+      const bytesSignature = ox__Bytes.fromHex(rawSignature);
+      const result = await verifyContractWalletSignature({
+        signature: bytesSignature,
+        message,
+        address: smartAccount.address,
+        chain: ethereum,
+        client: TEST_CLIENT,
+      });
+      expect(result).toBe(true);
+    });
+  },
+);

packages/thirdweb/src/auth/verify-signature.ts

@@ -1,5 +1,4 @@
 import * as ox__Bytes from "ox/Bytes";
-import * as ox__Hex from "ox/Hex";
 import * as ox__Secp256k1 from "ox/Secp256k1";
 import * as ox__Signature from "ox/Signature";
 import type { Chain } from "../chains/types.js";
@@ -21,7 +20,7 @@ type Message = Prettify<
  */
 export type VerifyEOASignatureParams = {
   message: string | Message;
-  signature: string | Uint8Array | ox__Signature.Signature;
+  signature: string | Uint8Array;
   address: string;
 };
 
@@ -116,32 +115,14 @@ export async function verifyContractWalletSignature({
 
   const parsedSignature = (() => {
     if (ox__Bytes.validate(signature)) {
-      const sig = ox__Signature.fromBytes(signature);
-      return {
-        r: ox__Hex.fromNumber(sig.r),
-        s: ox__Hex.fromNumber(sig.s),
-        yParity: sig.yParity,
-      };
-    } else if (typeof signature === "object") {
-      return {
-        r: ox__Hex.fromNumber(signature.r),
-        s: ox__Hex.fromNumber(signature.s),
-        yParity: signature.yParity,
-      };
+      return ox__Bytes.toHex(signature);
     }
     return signature;
   })();
 
   return verifyHash({
     hash: messageHash,
-    signature:
-      typeof parsedSignature === "string"
-        ? parsedSignature
-        : {
-            r: ox__Hex.toBigInt(parsedSignature.r),
-            s: ox__Hex.toBigInt(parsedSignature.s),
-            yParity: parsedSignature.yParity,
-          },
+    signature: parsedSignature,
     address,
     client,
     chain,