chore: add more adapter tests (#2672)

Co-authored-by: Jonas Daniels <jonas.daniels@outlook.com>

Author: joaquim-verges

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

@@ -4,12 +4,10 @@ import { TEST_CLIENT } from "../../test/src/test-clients.js";
 import { toEthersSigner } from "./ethers5.js";
 import { ANVIL_CHAIN } from "../../test/src/chains.js";
 import * as ethers5 from "ethers5";
-
-const FAKE_PKEY =
-  "0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef";
+import { ANVIL_PKEY_A, TEST_ACCOUNT_B } from "../../test/src/test-wallets.js";
 
 const account = privateKeyAccount({
-  privateKey: FAKE_PKEY,
+  privateKey: ANVIL_PKEY_A,
   client: TEST_CLIENT,
 });
 
@@ -25,6 +23,18 @@ describe("ethers5 adapter", () => {
     expect(signer.signMessage).toBeDefined();
   });
 
+  test("should sign message", async () => {
+    const signer = await toEthersSigner(
+      ethers5,
+      TEST_CLIENT,
+      account,
+      ANVIL_CHAIN,
+    );
+    const expectedSig = await account.signMessage({ message: "hello world" });
+    const sig = await signer.signMessage("hello world");
+    expect(sig).toBe(expectedSig);
+  });
+
   test("should sign typed data", async () => {
     const signer = await toEthersSigner(
       ethers5,
@@ -70,8 +80,20 @@ describe("ethers5 adapter", () => {
 
     const signature = await signer._signTypedData(domain, types, value);
 
-    expect(signature).toMatchInlineSnapshot(
-      `"0x10d3ce8040590e48889801080ad40f3d514c2c3ce03bbbe3e179bbf5ba56c75425951fa15220f637e2ab79fd033b99c4b340339e00e360316547e956c61ffcb01c"`,
+    expect(signature.length).toBe(132);
+  });
+
+  test("should send a tx", async () => {
+    const signer = await toEthersSigner(
+      ethers5,
+      TEST_CLIENT,
+      account,
+      ANVIL_CHAIN,
     );
+    const txResponse = await signer.sendTransaction({
+      to: TEST_ACCOUNT_B.address,
+      value: 100,
+    });
+    expect(txResponse.hash.length).toBe(66);
   });
 });

packages/thirdweb/src/adapters/ethers5.ts

@@ -331,9 +331,7 @@ export async function toEthersSigner(
      * @internal
      */
     override async sendTransaction(
-      transaction: ethers5.ethers.utils.Deferrable<
-        ethers5.ethers.providers.TransactionRequest & { chainId: number }
-      >,
+      transaction: ethers5.ethers.utils.Deferrable<ethers5.ethers.providers.TransactionRequest>,
     ): Promise<ethers5.ethers.providers.TransactionResponse> {
       if (!account) {
         throw new Error("Account not found");

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

@@ -3,12 +3,10 @@ import { privateKeyAccount } from "../wallets/private-key.js";
 import { TEST_CLIENT } from "../../test/src/test-clients.js";
 import { ethers6Adapter } from "./ethers6.js";
 import { ANVIL_CHAIN } from "../../test/src/chains.js";
-
-const FAKE_PKEY =
-  "0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef";
+import { ANVIL_PKEY_A, TEST_ACCOUNT_B } from "../../test/src/test-wallets.js";
 
 const account = privateKeyAccount({
-  privateKey: FAKE_PKEY,
+  privateKey: ANVIL_PKEY_A,
   client: TEST_CLIENT,
 });
 
@@ -23,6 +21,17 @@ describe("toEthersSigner", () => {
     expect(signer.signMessage).toBeDefined();
   });
 
+  test("should sign message", async () => {
+    const signer = await ethers6Adapter.signer.toEthers({
+      client: TEST_CLIENT,
+      account,
+      chain: ANVIL_CHAIN,
+    });
+    const expectedSig = await account.signMessage({ message: "hello world" });
+    const sig = await signer.signMessage("hello world");
+    expect(sig).toBe(expectedSig);
+  });
+
   test("should sign typed data", async () => {
     const signer = await ethers6Adapter.signer.toEthers({
       client: TEST_CLIENT,
@@ -67,8 +76,19 @@ describe("toEthersSigner", () => {
 
     const signature = await signer.signTypedData(domain, types, value);
 
-    expect(signature).toMatchInlineSnapshot(
-      `"0x10d3ce8040590e48889801080ad40f3d514c2c3ce03bbbe3e179bbf5ba56c75425951fa15220f637e2ab79fd033b99c4b340339e00e360316547e956c61ffcb01c"`,
-    );
+    expect(signature.length).toBe(132);
+  });
+
+  test("should send a tx", async () => {
+    const signer = await ethers6Adapter.signer.toEthers({
+      client: TEST_CLIENT,
+      account,
+      chain: ANVIL_CHAIN,
+    });
+    const txResponse = await signer.sendTransaction({
+      to: TEST_ACCOUNT_B.address,
+      value: 100,
+    });
+    expect(txResponse.hash.length).toBe(66);
   });
 });

packages/thirdweb/src/adapters/ethers6.ts

@@ -11,6 +11,8 @@ import { getRpcUrlForChain } from "../chains/utils.js";
 import type { Chain } from "../chains/types.js";
 import { getContract, type ThirdwebContract } from "../contract/contract.js";
 import { toHex, uint8ArrayToHex } from "../utils/encoding/hex.js";
+import { toSerializableTransaction } from "../transaction/actions/to-serializable-transaction.js";
+import type { PreparedTransaction } from "../transaction/prepare-transaction.js";
 
 type Ethers6 = typeof ethers6;
 
@@ -305,25 +307,30 @@ async function toEthersSigner(
     }
     // eslint-disable-next-line jsdoc/require-jsdoc
     override async sendTransaction(
-      tx: ethers6.ethers.TransactionRequest & { chainId: number },
+      tx: ethers6.ethers.TransactionRequest,
     ): Promise<ethers6.ethers.TransactionResponse> {
-      const alignedTx = await alignTxFromEthers(tx);
       if (!account) {
         throw new Error("Account not found");
       }
-      const result = await account.sendTransaction({
-        ...alignedTx,
-        chainId: tx.chainId,
+      const ethersTx = await alignTxFromEthers({
+        chain,
+        client,
+        tx,
+      });
+      const serializableTx = await toSerializableTransaction({
+        transaction: ethersTx,
+        from: account.address,
       });
+      const result = await account.sendTransaction(serializableTx);
 
       const txResponseParams: ethers6.TransactionResponseParams = {
-        ...alignedTx,
+        ...serializableTx,
         blockHash: null,
         from: this.address,
         hash: result.transactionHash as string,
         blockNumber: null,
         index: 0,
-        gasLimit: alignedTx.gas as bigint,
+        gasLimit: serializableTx.gas as bigint,
         // @ts-expect-error - we don't have this reliably so we'll just not include it
         signature: null,
       };
@@ -340,9 +347,16 @@ async function toEthersSigner(
       if (!account.signTransaction) {
         throw new Error("Account does not support signing transactions");
       }
-      const viemTx = await alignTxFromEthers(tx);
-
-      return account.signTransaction(viemTx);
+      const ethersTx = await alignTxFromEthers({
+        chain,
+        client,
+        tx,
+      });
+      const serializableTx = await toSerializableTransaction({
+        transaction: ethersTx,
+        from: account.address,
+      });
+      return account.signTransaction(serializableTx);
     }
     // eslint-disable-next-line jsdoc/require-jsdoc
     override signMessage(message: string | Uint8Array): Promise<string> {
@@ -423,9 +437,12 @@ function alignTxToEthers(
   return { ...rest, type };
 }
 
-async function alignTxFromEthers(
-  tx: ethers6.TransactionRequest,
-): Promise<TransactionSerializable> {
+async function alignTxFromEthers(options: {
+  client: ThirdwebClient;
+  chain: Chain;
+  tx: ethers6.TransactionRequest;
+}): Promise<PreparedTransaction> {
+  const { client, chain, tx } = options;
   const {
     type: ethersType,
     accessList,
@@ -453,11 +470,10 @@ async function alignTxFromEthers(
         throw new Error("ChainId is required for EIP-2930 transactions");
       }
       return {
-        type: "eip2930",
-
-        chainId,
+        client,
+        chain,
         accessList: accessList as AccessList,
-        to,
+        to: (to ?? undefined) as string | undefined,
         data: (data ?? undefined) as Hex | undefined,
         gasPrice: gasPrice ? bigNumberIshToBigint(gasPrice) : undefined,
         gas: gasLimit ? bigNumberIshToBigint(gasLimit) : undefined,
@@ -470,10 +486,10 @@ async function alignTxFromEthers(
         throw new Error("ChainId is required for EIP-1559 transactions");
       }
       return {
-        type: "eip1559",
-        chainId,
+        client,
+        chain,
         accessList: accessList as AccessList,
-        to,
+        to: (to ?? undefined) as string | undefined,
         data: (data ?? undefined) as Hex | undefined,
         gas: gasLimit ? bigNumberIshToBigint(gasLimit) : undefined,
         nonce: nonce ?? undefined,
@@ -490,9 +506,9 @@ async function alignTxFromEthers(
     default: {
       // fall back to legacy
       return {
-        type: "legacy",
-        chainId,
-        to,
+        client,
+        chain,
+        to: (to ?? undefined) as string | undefined,
         data: (data ?? undefined) as Hex | undefined,
         nonce: nonce ?? undefined,
         value: value ? bigNumberIshToBigint(value) : undefined,

packages/thirdweb/src/rpc/fetch-rpc.ts

@@ -73,7 +73,9 @@ export async function fetchRpc(
 
   if (!response.ok) {
     response.body?.cancel();
-    throw new Error(`RPC request failed with status ${response.status}`);
+    throw new Error(
+      `RPC request failed with status ${response.status} - ${response.statusText}`,
+    );
   }
 
   let result;