update prepare transaction to use type instead of feetype

Author: d4mr

packages/thirdweb/src/adapters/ethers5.ts

@@ -9,7 +9,10 @@ import type { ThirdwebClient } from "../client/client.js";
 import { type ThirdwebContract, getContract } from "../contract/contract.js";
 import { toSerializableTransaction } from "../transaction/actions/to-serializable-transaction.js";
 import { waitForReceipt } from "../transaction/actions/wait-for-tx-receipt.js";
-import type { PreparedTransaction } from "../transaction/prepare-transaction.js";
+import {
+  type PreparedTransaction,
+  TransactionTypeMap,
+} from "../transaction/prepare-transaction.js";
 import type { SerializableTransaction } from "../transaction/serialize-transaction.js";
 import { toHex } from "../utils/encoding/hex.js";
 import type { Account } from "../wallets/interfaces/wallet.js";
@@ -483,6 +486,7 @@ export async function toEthersSigner(
 
       const response: ethers5.ethers.providers.TransactionResponse = {
         ...serialized,
+        type: serialized.type ? TransactionTypeMap[serialized.type] : undefined,
         nonce: Number(serialized.nonce ?? 0),
         from: account.address,
         maxFeePerGas: serialized.maxFeePerGas

packages/thirdweb/src/chains/types.ts

@@ -1,4 +1,4 @@
-import type { FeeType } from "../transaction/prepare-transaction.js";
+import type { FeeType } from "../gas/fee-data.js";
 
 /**
  * @chain

packages/thirdweb/src/gas/fee-data.ts

@@ -3,10 +3,7 @@ import type { ThirdwebClient } from "../client/client.js";
 import { eth_getBlockByNumber } from "../rpc/actions/eth_getBlockByNumber.js";
 import { eth_maxPriorityFeePerGas } from "../rpc/actions/eth_maxPriorityFeePerGas.js";
 import { getRpcClient } from "../rpc/rpc.js";
-import type {
-  FeeType,
-  PreparedTransaction,
-} from "../transaction/prepare-transaction.js";
+import type { PreparedTransaction } from "../transaction/prepare-transaction.js";
 import { resolvePromisedValue } from "../utils/promise/resolve-promised-value.js";
 import { toUnits } from "../utils/units.js";
 import { getGasPrice } from "./get-gas-price.js";
@@ -54,12 +51,12 @@ export async function getGasOverridesForTransaction(
   transaction: PreparedTransaction,
 ): Promise<FeeDataParams> {
   // first check for explicit values
-  const [maxFeePerGas, maxPriorityFeePerGas, gasPrice, feeType] =
+  const [maxFeePerGas, maxPriorityFeePerGas, gasPrice, type] =
     await Promise.all([
       resolvePromisedValue(transaction.maxFeePerGas),
       resolvePromisedValue(transaction.maxPriorityFeePerGas),
       resolvePromisedValue(transaction.gasPrice),
-      resolvePromisedValue(transaction.feeType),
+      resolvePromisedValue(transaction.type),
     ]);
 
   // Exit early if the user explicitly provided enough options
@@ -78,7 +75,7 @@ export async function getGasOverridesForTransaction(
   const defaultGasOverrides = await getDefaultGasOverrides(
     transaction.client,
     transaction.chain,
-    feeType,
+    type === "legacy" ? "legacy" : "eip1559", // 7702, 2930, and eip1559 all qualify as "eip1559" fee type
   );
 
   if (transaction.chain.experimental?.increaseZeroByteCount) {
@@ -109,6 +106,8 @@ export async function getGasOverridesForTransaction(
   };
 }
 
+export type FeeType = "legacy" | "eip1559";
+
 /**
  * Retrieves the default gas overrides for a given client and chain ID.
  * If the fee data contains both maxFeePerGas and maxPriorityFeePerGas, it returns an object with those values.

packages/thirdweb/src/transaction/actions/to-serializable-transaction.ts

@@ -75,42 +75,52 @@ export async function toSerializableTransaction(
   const rpcRequest = getRpcClient(options.transaction);
   const chainId = options.transaction.chain.id;
   const from = options.from;
-  let [data, nonce, gas, feeData, to, accessList, value, authorizationList] =
-    await Promise.all([
-      encode(options.transaction),
-      (async () => {
-        // if the user has specified a nonce, use that
-        const resolvedNonce = await resolvePromisedValue(
-          options.transaction.nonce,
-        );
-        if (resolvedNonce !== undefined) {
-          return resolvedNonce;
-        }
+  let [
+    data,
+    nonce,
+    gas,
+    feeData,
+    to,
+    accessList,
+    value,
+    authorizationList,
+    type,
+  ] = await Promise.all([
+    encode(options.transaction),
+    (async () => {
+      // if the user has specified a nonce, use that
+      const resolvedNonce = await resolvePromisedValue(
+        options.transaction.nonce,
+      );
+      if (resolvedNonce !== undefined) {
+        return resolvedNonce;
+      }
 
-        return from // otherwise get the next nonce (import the method to do so)
-          ? await import("../../rpc/actions/eth_getTransactionCount.js").then(
-              ({ eth_getTransactionCount }) =>
-                eth_getTransactionCount(rpcRequest, {
-                  address:
-                    typeof from === "string"
-                      ? getAddress(from)
-                      : getAddress(from.address),
-                  blockTag: "pending",
-                }),
-            )
-          : undefined;
-      })(),
-      // takes the same options as the sendTransaction function thankfully!
-      estimateGas({
-        ...options,
-        from: options.from,
-      }),
-      getGasOverridesForTransaction(options.transaction),
-      resolvePromisedValue(options.transaction.to),
-      resolvePromisedValue(options.transaction.accessList),
-      resolvePromisedValue(options.transaction.value),
-      resolvePromisedValue(options.transaction.authorizationList),
-    ]);
+      return from // otherwise get the next nonce (import the method to do so)
+        ? await import("../../rpc/actions/eth_getTransactionCount.js").then(
+            ({ eth_getTransactionCount }) =>
+              eth_getTransactionCount(rpcRequest, {
+                address:
+                  typeof from === "string"
+                    ? getAddress(from)
+                    : getAddress(from.address),
+                blockTag: "pending",
+              }),
+          )
+        : undefined;
+    })(),
+    // takes the same options as the sendTransaction function thankfully!
+    estimateGas({
+      ...options,
+      from: options.from,
+    }),
+    getGasOverridesForTransaction(options.transaction),
+    resolvePromisedValue(options.transaction.to),
+    resolvePromisedValue(options.transaction.accessList),
+    resolvePromisedValue(options.transaction.value),
+    resolvePromisedValue(options.transaction.authorizationList),
+    resolvePromisedValue(options.transaction.type),
+  ]);
 
   const extraGas = await resolvePromisedValue(options.transaction.extraGas);
   if (extraGas) {
@@ -126,6 +136,7 @@ export async function toSerializableTransaction(
     accessList,
     value,
     authorizationList,
+    type,
     ...feeData,
   } satisfies SerializableTransaction;
 }

packages/thirdweb/src/transaction/prepare-transaction.ts

@@ -17,7 +17,7 @@ export type StaticPrepareTransactionOptions = {
   maxFeePerGas?: bigint | undefined;
   maxPriorityFeePerGas?: bigint | undefined;
   maxFeePerBlobGas?: bigint | undefined;
-  feeType?: FeeType | undefined;
+  type?: undefined | TransactionType;
   nonce?: number | undefined;
   extraGas?: bigint | undefined;
   // eip7702
@@ -35,7 +35,20 @@ export type StaticPrepareTransactionOptions = {
   };
 };
 
-export type FeeType = "legacy" | "eip1559";
+export type TransactionType =
+  | "legacy"
+  | "eip1559"
+  | "eip2930"
+  | "eip4844"
+  | "eip7702";
+
+export const TransactionTypeMap: Record<TransactionType, number> = {
+  legacy: 0,
+  eip1559: 1,
+  eip2930: 2,
+  eip4844: 3,
+  eip7702: 4,
+};
 
 export type EIP712TransactionOptions = {
   // constant or user input