test(sdk): increase coverage

Author: gregfromstl

packages/thirdweb/src/adapters/ethers5.test.ts

@@ -1,4 +1,5 @@
 import * as ethers5 from "ethers5";
+import * as ethers6 from "ethers6";
 import { describe, expect, it, test } from "vitest";
 import { USDT_CONTRACT } from "~test/test-contracts.js";
 import { ANVIL_CHAIN, FORKED_ETHEREUM_CHAIN } from "../../test/src/chains.js";
@@ -10,6 +11,7 @@ import { randomBytesBuffer } from "../utils/random.js";
 import { privateKeyToAccount } from "../wallets/private-key.js";
 import {
   fromEthersContract,
+  fromEthersSigner,
   toEthersContract,
   toEthersProvider,
   toEthersSigner,
@@ -149,4 +151,94 @@ describe("ethers5 adapter", () => {
     const _decimals = await decimals({ contract: thirdwebContract });
     expect(_decimals).toBe(6);
   });
+
+  test("toEthersProvider should return a valid provider", async () => {
+    const provider = toEthersProvider(ethers5, TEST_CLIENT, ANVIL_CHAIN);
+    expect(provider).toBeDefined();
+    expect(provider.getBlockNumber).toBeDefined();
+
+    // Test if the provider can fetch the block number
+    const blockNumber = await provider.getBlockNumber();
+    expect(typeof blockNumber).toBe("number");
+  });
+
+  test("toEthersProvider should throw error with invalid ethers version", () => {
+    const invalidEthers = ethers6;
+    expect(() =>
+      // biome-ignore lint/suspicious/noExplicitAny: Testing invalid data
+      toEthersProvider(invalidEthers as any, TEST_CLIENT, ANVIL_CHAIN),
+    ).toThrow(
+      "You seem to be using ethers@6, please use the `ethers6Adapter()`",
+    );
+  });
+});
+
+describe("fromEthersSigner", () => {
+  it("should convert an ethers5 Signer to an Account", async () => {
+    const wallet = new ethers5.Wallet(ANVIL_PKEY_A);
+    const account = await fromEthersSigner(wallet);
+
+    expect(account).toBeDefined();
+    expect(account.address).toBe(await wallet.getAddress());
+  });
+
+  it("should sign a message", async () => {
+    const wallet = new ethers5.Wallet(ANVIL_PKEY_A);
+    const account = await fromEthersSigner(wallet);
+
+    const message = "Hello, world!";
+    const signature = await account.signMessage({ message });
+
+    expect(signature).toBe(await wallet.signMessage(message));
+  });
+
+  it("should sign a transaction", async () => {
+    const wallet = new ethers5.Wallet(
+      ANVIL_PKEY_A,
+      ethers5.getDefaultProvider(),
+    );
+    const account = await fromEthersSigner(wallet);
+
+    const transaction = {
+      to: "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC",
+      value: 1n,
+    };
+
+    const signedTransaction = await account.signTransaction?.(transaction);
+
+    expect(signedTransaction).toBe(await wallet.signTransaction(transaction));
+  });
+
+  it("should sign typed data", async () => {
+    const wallet = new ethers5.Wallet(ANVIL_PKEY_A);
+    const account = await fromEthersSigner(wallet);
+
+    const domain = {
+      name: "Ether Mail",
+      version: "1",
+      chainId: 1,
+      verifyingContract: "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC",
+    };
+
+    const types = {
+      Person: [
+        { name: "name", type: "string" },
+        { name: "wallet", type: "address" },
+      ],
+    };
+
+    const value = {
+      name: "Alice",
+      wallet: "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC",
+    };
+
+    const signature = await account.signTypedData({
+      primaryType: "Person",
+      domain,
+      types,
+      message: value,
+    });
+
+    expect(signature).toBeDefined();
+  });
 });

packages/thirdweb/src/adapters/ethers5.ts

@@ -40,7 +40,7 @@ function assertEthers5(
 ): asserts ethers is typeof ethers5 {
   if (!isEthers5(ethers)) {
     throw new Error(
-      "You seem to be using ethers@6, please use the `ethers6Adapter()",
+      "You seem to be using ethers@6, please use the `ethers6Adapter()`",
     );
   }
 }
@@ -280,6 +280,7 @@ export function toEthersProvider(
   client: ThirdwebClient,
   chain: Chain,
 ): ethers5.providers.Provider {
+  assertEthers5(ethers);
   const url = getRpcUrlForChain({ chain, client });
   const headers: HeadersInit = {
     "Content-Type": "application/json",
@@ -624,8 +625,7 @@ function alignTxToEthers(
     gasLimit: gas,
     to,
     type,
-    accessList: tx.accessList as ethers5.utils.AccessListish | undefined,
-  };
+  } as ethers5.ethers.utils.Deferrable<ethers5.ethers.providers.TransactionRequest>;
 }
 
 async function alignTxFromEthers(

packages/thirdweb/src/utils/any-evm/keyless-transaction.test.ts

@@ -49,6 +49,34 @@ describe("getKeylessTransaction", () => {
     );
   });
 
+  it("should throw if yParity is explicitly undefined", async () => {
+    const invalidSignature = {
+      r: mockSignature.r,
+      s: mockSignature.s,
+      yParity: undefined,
+    };
+
+    await expect(
+      getKeylessTransaction({
+        transaction: mockTransaction,
+        // biome-ignore lint/suspicious/noExplicitAny: Testing invalid data
+        signature: invalidSignature as any,
+      }),
+    ).rejects.toThrow();
+  });
+
+  it("should throw if a signature is not recoverable", async () => {
+    const invalidSignature = { ...mockSignature, v: undefined };
+
+    await expect(
+      getKeylessTransaction({
+        transaction: mockTransaction,
+        // biome-ignore lint/suspicious/noExplicitAny: Testing invalid data
+        signature: invalidSignature as any,
+      }),
+    ).rejects.toThrow();
+  });
+
   it("should throw an error if the transaction is invalid", async () => {
     const invalidTransaction = { ...mockTransaction, value: "invalid" };