fix(ethers5adapter): correct transaction result nonces handling (#3885)

Author: joaquim-verges

.changeset/honest-adults-divide.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Fix ethers5adapter transaction result nonces

.github/pull_request_template.md

@@ -2,18 +2,3 @@
 
 Short description of the bug fixed or feature added
 
-## Changes made
-
-- [ ] Public API changes: list the public API changes made if any
-- [ ] Internal API changes: explain the internal logic changes
-
-## How to test
-
-- [ ] Automated tests: link to unit test file
-- [ ] Manual tests: step by step instructions on how to test
-
-## Contributor NFT
-
-Paste in your wallet address below and we will airdrop you a special NFT when your pull request is merged. 
-
-```Address: ```

packages/thirdweb/src/adapters/ethers5.ts

@@ -7,9 +7,9 @@ import type { Chain } from "../chains/types.js";
 import { getRpcUrlForChain } from "../chains/utils.js";
 import type { ThirdwebClient } from "../client/client.js";
 import { type ThirdwebContract, getContract } from "../contract/contract.js";
-import { sendTransaction } from "../transaction/actions/send-transaction.js";
+import { toSerializableTransaction } from "../transaction/actions/to-serializable-transaction.js";
 import { waitForReceipt } from "../transaction/actions/wait-for-tx-receipt.js";
-import { prepareTransaction } from "../transaction/prepare-transaction.js";
+import type { PreparedTransaction } from "../transaction/prepare-transaction.js";
 import { toHex } from "../utils/encoding/hex.js";
 import type { Account } from "../wallets/interfaces/wallet.js";
 
@@ -322,9 +322,17 @@ export async function toEthersSigner(
         throw new Error("Account does not support signTransaction");
       }
       const awaitedTx = await ethers.utils.resolveProperties(transaction);
-      return account.signTransaction(
-        await alignTxFromEthers(awaitedTx, ethers),
+      const alignedTx = await alignTxFromEthers(
+        client,
+        chain,
+        awaitedTx,
+        ethers,
       );
+      const serialized = await toSerializableTransaction({
+        transaction: alignedTx,
+        from: account.address,
+      });
+      return account.signTransaction(serialized);
     }
 
     /**
@@ -340,33 +348,43 @@ export async function toEthersSigner(
         throw new Error("Account does not support sendTransaction");
       }
       const awaitedTx = await ethers.utils.resolveProperties(transaction);
-      const alignedTx = await alignTxFromEthers(awaitedTx, ethers);
-      const tx = prepareTransaction({
-        client: client,
-        chain: chain,
-        accessList: alignedTx.accessList,
-        data: alignedTx.data,
-        nonce: alignedTx.nonce,
-        to: alignedTx.to ?? undefined,
-        value: alignedTx.value,
-      });
-      const result = await sendTransaction({
-        transaction: tx,
-        account: account,
+      const alignedTx = await alignTxFromEthers(
+        client,
+        chain,
+        awaitedTx,
+        ethers,
+      );
+      const serialized = await toSerializableTransaction({
+        transaction: alignedTx,
+        from: account.address,
       });
+      const result = await account.sendTransaction(serialized);
 
       const response: ethers5.ethers.providers.TransactionResponse = {
-        chainId: tx.chain.id,
+        ...serialized,
+        nonce: serialized.nonce ?? 0,
         from: account.address,
-        data: alignedTx.data ?? "0x",
-        nonce: alignedTx.nonce ?? 0,
+        maxFeePerGas: serialized.maxFeePerGas
+          ? ethers.BigNumber.from(serialized.maxFeePerGas)
+          : undefined,
+        maxPriorityFeePerGas: serialized.maxPriorityFeePerGas
+          ? ethers.BigNumber.from(serialized.maxPriorityFeePerGas)
+          : undefined,
+        gasPrice: serialized.gasPrice
+          ? ethers.BigNumber.from(serialized.gasPrice)
+          : undefined,
+        accessList: serialized.accessList as ethers5.ethers.utils.AccessList,
         value: ethers.BigNumber.from(alignedTx.value ?? 0),
         gasLimit: ethers.BigNumber.from(alignedTx.gas ?? 0),
         // biome-ignore lint/style/noNonNullAssertion: TODO: fix later
         hash: result.transactionHash!,
         confirmations: 0,
         wait: async () => {
-          const receipt = await waitForReceipt(result);
+          const receipt = await waitForReceipt({
+            transactionHash: result.transactionHash,
+            chain,
+            client,
+          });
           return {
             ...receipt,
             type:
@@ -491,9 +509,11 @@ function alignTxToEthers(
 }
 
 async function alignTxFromEthers(
+  client: ThirdwebClient,
+  chain: Chain,
   tx: ethers5.ethers.providers.TransactionRequest,
   ethers: Ethers5,
-): Promise<TransactionSerializable> {
+): Promise<PreparedTransaction> {
   const {
     type: ethersType,
     accessList,
@@ -514,8 +534,8 @@ async function alignTxFromEthers(
         throw new Error("ChainId is required for EIP-2930 transactions");
       }
       return {
-        type: "eip2930",
-        chainId,
+        client,
+        chain,
         to,
         data: (data ?? undefined) as Hex | undefined,
         nonce: nonce ? ethers.BigNumber.from(nonce).toNumber() : undefined,
@@ -532,8 +552,8 @@ async function alignTxFromEthers(
         throw new Error("ChainId is required for EIP-1559 transactions");
       }
       return {
-        type: "eip1559",
-        chainId,
+        client,
+        chain,
         to,
         data: (data ?? undefined) as Hex | undefined,
         nonce: nonce ? ethers.BigNumber.from(nonce).toNumber() : undefined,
@@ -549,8 +569,8 @@ async function alignTxFromEthers(
     }
     default: {
       return {
-        type: "legacy",
-        chainId,
+        client,
+        chain,
         to,
         data: (data ?? undefined) as Hex | undefined,
         nonce: nonce ? ethers.BigNumber.from(nonce).toNumber() : undefined,