thirdweb 5.81.0 → 5.82.0

package/src/transaction/actions/to-serializable-transaction.ts

@@ -3,6 +3,7 @@ import { getRpcClient } from "../../rpc/rpc.js";
 import { getAddress } from "../../utils/address.js";
 import { isZkSyncChain } from "../../utils/any-evm/zksync/isZkSyncChain.js";
 import { resolvePromisedValue } from "../../utils/promise/resolve-promised-value.js";
+import type { Account } from "../../wallets/interfaces/wallet.js";
 import type { PreparedTransaction } from "../prepare-transaction.js";
 import type { SerializableTransaction } from "../serialize-transaction.js";
 import { encode } from "./encode.js";
@@ -15,9 +16,9 @@ export type ToSerializableTransactionOptions = {
   // biome-ignore lint/suspicious/noExplicitAny: TODO: fix later
   transaction: PreparedTransaction<any>;
   /**
-   * The from address to use for gas estimation.
+   * The from address or account to use for gas estimation and authorization signing.
    */
-  from?: string;
+  from?: string | Account;
 };
 
 /**
@@ -55,7 +56,12 @@ export async function toSerializableTransaction(
     );
     const { gas, maxFeePerGas, maxPriorityFeePerGas } = await getZkGasFees({
       transaction: options.transaction,
-      from: options.from ? getAddress(options.from) : undefined,
+      from:
+        typeof options.from === "string" // Is this just an address?
+          ? getAddress(options.from)
+          : options.from !== undefined // Is this an account?
+            ? getAddress(options.from.address)
+            : undefined,
     });
     // passing these values here will avoid re-fetching them below
     options.transaction = {
@@ -69,34 +75,39 @@ 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] = 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] =
+    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: from,
-                blockTag: "pending",
-              }),
-          )
-        : undefined;
-    })(),
-    // takes the same options as the sendTransaction function thankfully!
-    estimateGas(options),
-    getGasOverridesForTransaction(options.transaction),
-    resolvePromisedValue(options.transaction.to),
-    resolvePromisedValue(options.transaction.accessList),
-    resolvePromisedValue(options.transaction.value),
-  ]);
+        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" ? from : 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),
+    ]);
 
   const extraGas = await resolvePromisedValue(options.transaction.extraGas);
   if (extraGas) {
@@ -111,6 +122,7 @@ export async function toSerializableTransaction(
     nonce,
     accessList,
     value,
+    authorizationList,
     ...feeData,
   } satisfies SerializableTransaction;
 }

package/src/transaction/prepare-transaction.test.ts

@@ -1,9 +1,13 @@
 import { describe, expect, test as it } from "vitest";
+import { TEST_ACCOUNT_B } from "~test/test-wallets.js";
 import { TEST_WALLET_A, TEST_WALLET_B } from "../../test/src/addresses.js";
 import { FORKED_ETHEREUM_CHAIN } from "../../test/src/chains.js";
 import { TEST_CLIENT } from "../../test/src/test-clients.js";
+import { defineChain } from "../chains/utils.js";
 import { toWei } from "../utils/units.js";
+import { signAuthorization } from "./actions/eip7702/authorization.js";
 import { estimateGas } from "./actions/estimate-gas.js";
+import { toSerializableTransaction } from "./actions/to-serializable-transaction.js";
 import { prepareTransaction } from "./prepare-transaction.js";
 
 describe.runIf(process.env.TW_SECRET_KEY)("prepareTransaction", () => {
@@ -18,6 +22,30 @@ describe.runIf(process.env.TW_SECRET_KEY)("prepareTransaction", () => {
     expect(preparedTx.value).toMatchInlineSnapshot("100000000000000000n");
   });
 
+  it("should accept an authorization list", async () => {
+    const authorization = await signAuthorization({
+      account: TEST_ACCOUNT_B,
+      request: {
+        address: TEST_WALLET_B,
+        chainId: 911867,
+        nonce: 0n,
+      },
+    });
+    const preparedTx = prepareTransaction({
+      chain: defineChain(911867),
+      client: TEST_CLIENT,
+      to: TEST_WALLET_B,
+      value: 0n,
+      authorizationList: [authorization],
+    });
+
+    const serializableTx = await toSerializableTransaction({
+      transaction: preparedTx,
+    });
+
+    expect(serializableTx.authorizationList).toEqual([authorization]);
+  });
+
   // skip this test if there is no secret key available to test with
   // TODO: remove reliance on secret key during unit tests entirely
   it.runIf(process.env.TW_SECRET_KEY)(

package/src/transaction/prepare-transaction.ts

@@ -5,6 +5,7 @@ import type { ThirdwebClient } from "../client/client.js";
 import type { ThirdwebContract } from "../contract/contract.js";
 import type { PreparedMethod } from "../utils/abi/prepare-method.js";
 import type { PromisedObject } from "../utils/promise/resolve-promised-value.js";
+import type { SignedAuthorization } from "./actions/eip7702/authorization.js";
 
 export type StaticPrepareTransactionOptions = {
   accessList?: AccessList | undefined;
@@ -18,6 +19,8 @@ export type StaticPrepareTransactionOptions = {
   maxFeePerBlobGas?: bigint | undefined;
   nonce?: number | undefined;
   extraGas?: bigint | undefined;
+  // eip7702
+  authorizationList?: SignedAuthorization[] | undefined;
   // zksync specific
   eip712?: EIP712TransactionOptions | undefined;
   // tw specific

package/src/transaction/serialize-transaction.test.ts

@@ -1,13 +1,15 @@
 import * as ox__Hex from "ox/Hex";
 import * as ox__TransactionEnvelopeEip1559 from "ox/TransactionEnvelopeEip1559";
 import * as ox__TransactionEnvelopeEip2930 from "ox/TransactionEnvelopeEip2930";
+import * as ox__TransactionEnvelopeEip7702 from "ox/TransactionEnvelopeEip7702";
 import * as ox__TransactionEnvelopeLegacy from "ox/TransactionEnvelopeLegacy";
-import { describe, expect, test } from "vitest";
+import { assertType, describe, expect, test } from "vitest";
 
 import { type Address, checksumAddress } from "../utils/address.js";
 import { fromGwei, toWei } from "../utils/units.js";
 import { serializeTransaction } from "./serialize-transaction.js";
 
+import { wagmiTokenContractConfig } from "../../test/src/abis/wagmiToken.js";
 import { ANVIL_PKEY_A, TEST_ACCOUNT_B } from "../../test/src/test-wallets.js";
 import { keccak256 } from "../utils/hashing/keccak256.js";
 import { sign } from "../utils/signatures/sign.js";
@@ -530,6 +532,111 @@ describe("eip2930", () => {
   });
 });
 
+describe("eip7702", () => {
+  const baseEip7702 = {
+    ...BASE_TRANSACTION,
+    authorizationList: [
+      {
+        address: wagmiTokenContractConfig.address.toLowerCase() as Address,
+        chainId: 1,
+        nonce: 420n,
+        r: ox__Hex.toBigInt(
+          "0x60fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe",
+        ),
+        s: ox__Hex.toBigInt(
+          "0x60fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe",
+        ),
+        yParity: 0,
+      },
+      {
+        address: "0x0000000000000000000000000000000000000000",
+        chainId: 10,
+        nonce: 69n,
+        r: ox__Hex.toBigInt(
+          "0x60fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe",
+        ),
+        s: ox__Hex.toBigInt(
+          "0x60fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe",
+        ),
+        yParity: 1,
+      },
+    ],
+    chainId: 1,
+  } as const;
+
+  test("default", () => {
+    const serialized = serializeTransaction({ transaction: baseEip7702 });
+    assertType<ox__TransactionEnvelopeEip7702.Serialized>(
+      serialized as `0x04${string}`,
+    );
+    expect(serialized).toMatchInlineSnapshot(
+      `"0x04f8e3018203118080809470997970c51812dc3a010c7d01b50e0d17dc79c8880de0b6b3a764000080c0f8baf85c0194fba3912ca04dd458c843e2ee08967fc04f3579c28201a480a060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fea060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fef85a0a9400000000000000000000000000000000000000004501a060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fea060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe"`,
+    );
+    const tx = ox__TransactionEnvelopeEip7702.deserialize(
+      serialized as ox__TransactionEnvelopeEip7702.Serialized,
+    );
+    expect({
+      ...tx,
+      to: tx.to ? checksumAddress(tx.to) : undefined,
+    }).toEqual({
+      ...baseEip7702,
+      nonce: BigInt(baseEip7702.nonce),
+      type: "eip7702",
+    });
+  });
+
+  test("signature", () => {
+    expect(
+      serializeTransaction({
+        transaction: {
+          ...baseEip7702,
+          r: "0x60fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe",
+          s: "0x60fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe",
+          yParity: 1,
+        },
+      }),
+    ).toMatchInlineSnapshot(
+      `"0x04f90126018203118080809470997970c51812dc3a010c7d01b50e0d17dc79c8880de0b6b3a764000080c0f8baf85c0194fba3912ca04dd458c843e2ee08967fc04f3579c28201a480a060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fea060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fef85a0a9400000000000000000000000000000000000000004501a060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fea060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe01a060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fea060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe"`,
+    );
+    expect(
+      serializeTransaction({
+        transaction: {
+          ...baseEip7702,
+          r: "0x60fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe",
+          s: "0x60fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe",
+          yParity: 0,
+        },
+      }),
+    ).toMatchInlineSnapshot(
+      `"0x04f90126018203118080809470997970c51812dc3a010c7d01b50e0d17dc79c8880de0b6b3a764000080c0f8baf85c0194fba3912ca04dd458c843e2ee08967fc04f3579c28201a480a060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fea060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fef85a0a9400000000000000000000000000000000000000004501a060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fea060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe80a060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fea060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe"`,
+    );
+    expect(
+      serializeTransaction({
+        transaction: {
+          ...baseEip7702,
+          r: "0x60fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe",
+          s: "0x60fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe",
+          v: 0n,
+        },
+      }),
+    ).toMatchInlineSnapshot(
+      `"0x04f90126018203118080809470997970c51812dc3a010c7d01b50e0d17dc79c8880de0b6b3a764000080c0f8baf85c0194fba3912ca04dd458c843e2ee08967fc04f3579c28201a480a060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fea060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fef85a0a9400000000000000000000000000000000000000004501a060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fea060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe80a060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fea060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe"`,
+    );
+    expect(
+      serializeTransaction({
+        transaction: {
+          ...baseEip7702,
+          r: "0x60fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe",
+          s: "0x60fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe",
+          v: 1n,
+        },
+      }),
+    ).toMatchInlineSnapshot(
+      `"0x04f90126018203118080809470997970c51812dc3a010c7d01b50e0d17dc79c8880de0b6b3a764000080c0f8baf85c0194fba3912ca04dd458c843e2ee08967fc04f3579c28201a480a060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fea060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fef85a0a9400000000000000000000000000000000000000004501a060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fea060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe01a060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fea060fdd29ff912ce880cd3edaf9f932dc61d3dae823ea77e0323f94adb9f6a72fe"`,
+    );
+  });
+});
+
 describe("legacy", () => {
   const BASE_LEGACY_TRANSACTION = {
     ...BASE_TRANSACTION,

package/src/transaction/serialize-transaction.ts

@@ -2,6 +2,7 @@ import * as ox__Hex from "ox/Hex";
 import * as ox__Signature from "ox/Signature";
 import * as ox__TransactionEnvelopeEip1559 from "ox/TransactionEnvelopeEip1559";
 import * as ox__TransactionEnvelopeEip2930 from "ox/TransactionEnvelopeEip2930";
+import * as ox__TransactionEnvelopeEip7702 from "ox/TransactionEnvelopeEip7702";
 import * as ox__TransactionEnvelopeLegacy from "ox/TransactionEnvelopeLegacy";
 import type { Hex } from "../utils/encoding/hex.js";
 
@@ -24,6 +25,9 @@ export type SerializableTransaction = {
   value?: bigint | undefined;
   gas?: bigint | undefined;
   gasLimit?: bigint | undefined;
+  authorizationList?:
+    | ox__TransactionEnvelopeEip7702.TransactionEnvelopeEip7702["authorizationList"]
+    | undefined;
 };
 
 export type SerializeTransactionOptions = {
@@ -141,6 +145,16 @@ export function serializeTransaction(
     });
   }
 
+  if (type === "eip7702") {
+    const typedTransaction =
+      transaction as ox__TransactionEnvelopeEip7702.TransactionEnvelopeEip7702;
+    ox__TransactionEnvelopeEip7702.assert(typedTransaction);
+
+    return ox__TransactionEnvelopeEip7702.serialize(typedTransaction, {
+      signature,
+    });
+  }
+
   throw new Error("Invalid transaction type");
 }
 
@@ -154,6 +168,10 @@ function getTransactionEnvelopeType(
     return transactionEnvelope.type;
   }
 
+  if (typeof transactionEnvelope.authorizationList !== "undefined") {
+    return "eip7702";
+  }
+
   if (
     typeof transactionEnvelope.maxFeePerGas !== "undefined" ||
     typeof transactionEnvelope.maxPriorityFeePerGas !== "undefined"

package/src/utils/abi/decodeError.ts

@@ -1,4 +1,5 @@
-import { type Abi, AbiError } from "ox";
+import type * as ox__Abi from "ox/Abi";
+import * as ox__AbiError from "ox/AbiError";
 import { resolveContractAbi } from "../../contract/actions/resolve-abi.js";
 import type { ThirdwebContract } from "../../contract/contract.js";
 import type { Hex } from "../encoding/hex.js";
@@ -17,7 +18,7 @@ import type { Hex } from "../encoding/hex.js";
  *
  * @utils
  */
-export async function decodeError<abi extends Abi.Abi>(options: {
+export async function decodeError<abi extends ox__Abi.Abi>(options: {
   contract: ThirdwebContract<abi>;
   data: Hex;
 }) {
@@ -31,6 +32,6 @@ export async function decodeError<abi extends Abi.Abi>(options: {
       `No ABI found for contract ${contract.address} on chain ${contract.chain.id}`,
     );
   }
-  const abiError = AbiError.fromAbi(abi, data) as AbiError.AbiError;
-  return AbiError.decode(abiError, data);
+  const abiError = ox__AbiError.fromAbi(abi, data) as ox__AbiError.AbiError;
+  return ox__AbiError.decode(abiError, data);
 }

package/src/utils/abi/decodeFunctionData.ts

@@ -1,4 +1,6 @@
-import { type Abi, AbiFunction, type Hex } from "ox";
+import type * as ox__Abi from "ox/Abi";
+import * as ox__AbiFunction from "ox/AbiFunction";
+import type * as ox__Hex from "ox/Hex";
 import { resolveContractAbi } from "../../contract/actions/resolve-abi.js";
 import type { ThirdwebContract } from "../../contract/contract.js";
 
@@ -16,9 +18,9 @@ import type { ThirdwebContract } from "../../contract/contract.js";
  *
  * @utils
  */
-export async function decodeFunctionData<abi extends Abi.Abi>(options: {
+export async function decodeFunctionData<abi extends ox__Abi.Abi>(options: {
   contract: ThirdwebContract<abi>;
-  data: Hex.Hex;
+  data: ox__Hex.Hex;
 }) {
   const { contract, data } = options;
   let abi = contract?.abi;
@@ -30,6 +32,6 @@ export async function decodeFunctionData<abi extends Abi.Abi>(options: {
       `No ABI found for contract ${contract.address} on chain ${contract.chain.id}`,
     );
   }
-  const abiFunction = AbiFunction.fromAbi(abi, data);
-  return AbiFunction.decodeData(abiFunction, data);
+  const abiFunction = ox__AbiFunction.fromAbi(abi, data);
+  return ox__AbiFunction.decodeData(abiFunction, data);
 }

package/src/utils/abi/decodeFunctionResult.ts

@@ -1,4 +1,6 @@
-import { type Abi, AbiFunction, type Hex } from "ox";
+import type * as ox__Abi from "ox/Abi";
+import * as ox__AbiFunction from "ox/AbiFunction";
+import type * as ox__Hex from "ox/Hex";
 import { resolveContractAbi } from "../../contract/actions/resolve-abi.js";
 import type { ThirdwebContract } from "../../contract/contract.js";
 
@@ -16,9 +18,9 @@ import type { ThirdwebContract } from "../../contract/contract.js";
  *
  * @utils
  */
-export async function decodeFunctionResult<abi extends Abi.Abi>(options: {
+export async function decodeFunctionResult<abi extends ox__Abi.Abi>(options: {
   contract: ThirdwebContract<abi>;
-  data: Hex.Hex;
+  data: ox__Hex.Hex;
 }) {
   const { contract, ...rest } = options;
   let abi = contract?.abi;
@@ -30,6 +32,6 @@ export async function decodeFunctionResult<abi extends Abi.Abi>(options: {
       `No ABI found for contract ${contract.address} on chain ${contract.chain.id}`,
     );
   }
-  const abiFunction = AbiFunction.fromAbi(abi, rest.data);
-  return AbiFunction.decodeResult(abiFunction, rest.data);
+  const abiFunction = ox__AbiFunction.fromAbi(abi, rest.data);
+  return ox__AbiFunction.decodeResult(abiFunction, rest.data);
 }

package/src/utils/hashing/hashMessage.ts

@@ -1,4 +1,4 @@
-import { Bytes as ox__Bytes } from "ox";
+import * as ox__Bytes from "ox/Bytes";
 import type { Hex } from "../encoding/hex.js";
 import { stringToBytes, toBytes } from "../encoding/to-bytes.js";
 import type { SignableMessage } from "../types.js";

package/src/utils/signatures/sign-message.test.ts

@@ -40,7 +40,7 @@ describe("signMessage", async () => {
         privateKey: ANVIL_PKEY_A,
       }),
     ).toMatchInlineSnapshot(
-      '"0xa461f509887bd19e312c0c58467ce8ff8e300d3c1a90b608a760c5b80318eaf15fe57c96f9175d6cd4daad4663763baa7e78836e067d0163e9a2ccf2ff753f5b1b"',
+      `"0xa461f509887bd19e312c0c58467ce8ff8e300d3c1a90b608a760c5b80318eaf15fe57c96f9175d6cd4daad4663763baa7e78836e067d0163e9a2ccf2ff753f5b1b"`,
     );
 
     expect(
@@ -53,7 +53,7 @@ describe("signMessage", async () => {
         privateKey: ANVIL_PKEY_A,
       }),
     ).toMatchInlineSnapshot(
-      '"0xa461f509887bd19e312c0c58467ce8ff8e300d3c1a90b608a760c5b80318eaf15fe57c96f9175d6cd4daad4663763baa7e78836e067d0163e9a2ccf2ff753f5b1b"',
+      `"0xa461f509887bd19e312c0c58467ce8ff8e300d3c1a90b608a760c5b80318eaf15fe57c96f9175d6cd4daad4663763baa7e78836e067d0163e9a2ccf2ff753f5b1b"`,
     );
   });
 

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.81.0";
+export const version = "5.82.0";

package/src/wallets/create-wallet.ts

@@ -116,6 +116,22 @@ import { createWalletEmitter } from "./wallet-emitter.js";
  *
  * [View Coinbase wallet creation options](https://portal.thirdweb.com/references/typescript/v5/CoinbaseWalletCreationOptions)
  *
+ * ## Connecting with a smart wallet
+ *
+ * ```ts
+ * import { createWallet } from "thirdweb/wallets";
+ *
+ * const wallet = createWallet("smart", {
+ *   chain: sepolia,
+ *   sponsorGas: true,
+ * });
+ *
+ * const account = await wallet.connect({
+ *  client,
+ *  personalAccount, // pass the admin account
+ * });
+ * ```
+ *
  * @wallet
  */
 export function createWallet<const ID extends WalletId>(

package/src/wallets/interfaces/wallet.ts

@@ -2,6 +2,10 @@ import type { Address } from "abitype";
 import type * as ox__TypedData from "ox/TypedData";
 import type { Hex, SignableMessage } from "viem";
 import type { Chain } from "../../chains/types.js";
+import type {
+  AuthorizationRequest,
+  SignedAuthorization,
+} from "../../transaction/actions/eip7702/authorization.js";
 import type {
   EIP712TransactionOptions,
   PreparedTransaction,
@@ -195,6 +199,17 @@ export type Account = {
 
   // OPTIONAL
 
+  /**
+   * Sign the given EIP-7702 authorization object.
+   * @example
+   * ```ts
+   * const signedAuthorization = await account.signAuthorization({ address: "0x...", chainId: 1, nonce: 1n });
+   * ```
+   */
+  signAuthorization?: (
+    authorization: AuthorizationRequest,
+  ) => Promise<SignedAuthorization>;
+
   /**
    * Estimate the gas required to execute the given transaction.
    *

package/src/wallets/private-key.test.ts

@@ -17,6 +17,7 @@ test("default", () => {
     {
       "address": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
       "sendTransaction": [Function],
+      "signAuthorization": [Function],
       "signMessage": [Function],
       "signTransaction": [Function],
       "signTypedData": [Function],

package/src/wallets/private-key.ts

@@ -1,10 +1,13 @@
 import { secp256k1 } from "@noble/curves/secp256k1";
+import * as ox__Authorization from "ox/Authorization";
+import * as ox__Secp256k1 from "ox/Secp256k1";
 import type * as ox__TypedData from "ox/TypedData";
 import { publicKeyToAddress } from "viem/utils";
 import { getCachedChain } from "../chains/utils.js";
 import type { ThirdwebClient } from "../client/client.js";
 import { eth_sendRawTransaction } from "../rpc/actions/eth_sendRawTransaction.js";
 import { getRpcClient } from "../rpc/rpc.js";
+import type { AuthorizationRequest } from "../transaction/actions/eip7702/authorization.js";
 import { signTransaction } from "../transaction/actions/sign-transaction.js";
 import type { SerializableTransaction } from "../transaction/serialize-transaction.js";
 import { type Hex, toHex } from "../utils/encoding/hex.js";
@@ -119,6 +122,13 @@ export function privateKeyToAccount(
         privateKey,
       });
     },
+    signAuthorization: async (authorization: AuthorizationRequest) => {
+      const signature = ox__Secp256k1.sign({
+        payload: ox__Authorization.getSignPayload(authorization),
+        privateKey: privateKey,
+      });
+      return ox__Authorization.from(authorization, { signature });
+    },
   };
 
   return account satisfies Account;

package/src/wallets/smart/index.ts

@@ -210,7 +210,7 @@ async function createSmartAccount(
     }
   }
 
-  const { accountContract } = options;
+  let accountContract = options.accountContract;
   const account: Account = {
     address: getAddress(accountContract.address),
     async sendTransaction(transaction: SendTransactionOption) {
@@ -237,21 +237,17 @@ async function createSmartAccount(
         paymasterOverride = options.overrides?.paymaster;
       }
 
-      const accountContractForTransaction = (() => {
-        // If this transaction is for a different chain than the initial one, get the account contract for that chain
-        if (transaction.chainId !== accountContract.chain.id) {
-          return getContract({
-            address: account.address,
-            chain: getCachedChain(transaction.chainId),
-            client: options.client,
-          });
-        }
-        // Default to the existing account contract
-        return accountContract;
-      })();
+      // If this transaction is for a different chain than the initial one, get the account contract for that chain
+      if (transaction.chainId !== accountContract.chain.id) {
+        accountContract = getContract({
+          address: account.address,
+          chain: getCachedChain(transaction.chainId),
+          client: options.client,
+        });
+      }
 
       const executeTx = prepareExecute({
-        accountContract: accountContractForTransaction,
+        accountContract: accountContract,
         transaction,
         executeOverride: options.overrides?.execute,
       });
@@ -260,6 +256,7 @@ async function createSmartAccount(
         options: {
           ...options,
           chain: getCachedChain(transaction.chainId),
+          accountContract,
           overrides: {
             ...options.overrides,
             paymaster: paymasterOverride,
@@ -275,7 +272,11 @@ async function createSmartAccount(
       });
       return _sendUserOp({
         executeTx,
-        options,
+        options: {
+          ...options,
+          chain: getCachedChain(transactions[0]?.chainId ?? options.chain.id),
+          accountContract,
+        },
       });
     },
     async signMessage({ message }: { message: SignableMessage }) {
@@ -288,8 +289,8 @@ async function createSmartAccount(
         });
       }
 
-      const { deployAndSignMessage } = await import("./lib/signing.js");
-      return deployAndSignMessage({
+      const { smartAccountSignMessage } = await import("./lib/signing.js");
+      return smartAccountSignMessage({
         accountContract,
         factoryContract: options.factoryContract,
         options,
@@ -309,8 +310,8 @@ async function createSmartAccount(
         });
       }
 
-      const { deployAndSignTypedData } = await import("./lib/signing.js");
-      return deployAndSignTypedData({
+      const { smartAccountSignTypedData } = await import("./lib/signing.js");
+      return smartAccountSignTypedData({
         accountContract,
         factoryContract: options.factoryContract,
         options,