wip

Author: gregfromstl

packages/thirdweb/src/transaction/actions/eip7702/authorization.ts

@@ -2,7 +2,7 @@ import type * as ox__Authorization from "ox/Authorization";
 import type { Address } from "../../../utils/address.js";
 
 /**
- * Represents an EIP-7702 authorization object prior to being signed.
+ * An EIP-7702 authorization input object.
  *
  * @beta
  * @transaction
@@ -13,6 +13,18 @@ export type Authorization = {
   nonce?: bigint;
 };
 
+/**
+ * An EIP-7702 authorization object fully prepared and ready for signing.
+ *
+ * @beta
+ * @transaction
+ */
+export type PreparedAuthorization = {
+  address: Address;
+  chainId: number;
+  nonce: bigint;
+};
+
 /**
  * Represents a signed EIP-7702 authorization object.
  *

packages/thirdweb/src/transaction/actions/eip7702/sign-authorization.test.ts

@@ -5,6 +5,8 @@ import type { Prettify } from "../../utils/type-utils.js";
 import type { Account } from "../../wallets/interfaces/wallet.js";
 import { extractError } from "../extract-error.js";
 import type { PreparedTransaction } from "../prepare-transaction.js";
+import { resolveAndSignAuthorizations } from "./to-serializable-transaction.js";
+import * as ox__Hex from "ox/Hex";
 
 export type EstimateGasOptions = Prettify<
   {
@@ -16,19 +18,21 @@ export type EstimateGasOptions = Prettify<
     transaction: PreparedTransaction<any>;
   } & (
     | {
-        /**
-         * The account the transaction would be sent from.
-         */
-        account: Account;
-        from?: never;
-      }
+      /**
+       * The account the transaction would be sent from.
+       *
+       * @deprecated Use `from` instead
+       */
+      account: Account;
+      from?: never;
+    }
     | {
-        account?: never;
-        /**
-         * The address the transaction would be sent from.
-         */
-        from?: string;
-      }
+      account?: never;
+      /**
+       * The address the transaction would be sent from.
+       */
+      from?: string | Account;
+    }
   )
 >;
 
@@ -60,8 +64,11 @@ export async function estimateGas(
   // 1. the user specified from address
   // 2. the passed in account address
   // 3. the passed in wallet's account address
-  const from = options.from ?? options.account?.address ?? undefined;
-  const txWithFrom = { ...options.transaction, from };
+  const fromAddress =
+    typeof options.from === "string"
+      ? options.from ?? undefined
+      : options.from?.address ?? options.account?.address;
+  const txWithFrom = { ...options.transaction, from: fromAddress };
   if (cache.has(txWithFrom)) {
     // biome-ignore lint/style/noNonNullAssertion: the `has` above ensures that this will always be set
     return cache.get(txWithFrom)!;
@@ -92,11 +99,13 @@ export async function estimateGas(
 
     // load up encode function if we need it
     const { encode } = await import("./encode.js");
-    const [encodedData, toAddress, value] = await Promise.all([
-      encode(options.transaction),
-      resolvePromisedValue(options.transaction.to),
-      resolvePromisedValue(options.transaction.value),
-    ]);
+    const [encodedData, toAddress, value, authorizationList] =
+      await Promise.all([
+        encode(options.transaction),
+        resolvePromisedValue(options.transaction.to),
+        resolvePromisedValue(options.transaction.value),
+        resolveAndSignAuthorizations(options),
+      ]);
 
     // load up the rpc client and the estimateGas function if we need it
     const [{ getRpcClient }, { eth_estimateGas }] = await Promise.all([
@@ -111,8 +120,16 @@ export async function estimateGas(
         formatTransactionRequest({
           to: toAddress,
           data: encodedData,
-          from,
+          from: fromAddress,
           value,
+          // TODO: Remove this casting when we migrate this file to Ox
+          authorizationList: authorizationList?.map((auth) => ({
+            ...auth,
+            r: ox__Hex.fromNumber(auth.r),
+            s: ox__Hex.fromNumber(auth.s),
+            nonce: Number(auth.nonce),
+            contractAddress: auth.address,
+          })),
         }),
       );
       if (options.transaction.chain.experimental?.increaseZeroByteCount) {