Accept pre-signed authorizations for 7702 account transactions

Author: joaquim-verges

.changeset/cuddly-turkeys-scream.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Accept pre signed authorizations for 7702 account transactions

packages/thirdweb/src/extensions/erc7702/account/createSessionKey.ts

@@ -1,4 +1,7 @@
-import type { BaseTransactionOptions } from "../../../transaction/types.js";
+import type {
+  BaseTransactionOptions,
+  WithOverrides,
+} from "../../../transaction/types.js";
 import { randomBytesHex } from "../../../utils/random.js";
 import type { Account } from "../../../wallets/interfaces/wallet.js";
 import {
@@ -68,7 +71,7 @@ export type CreateSessionKeyOptions = {
  * @extension ERC7702
  */
 export function createSessionKey(
-  options: BaseTransactionOptions<CreateSessionKeyOptions>,
+  options: BaseTransactionOptions<WithOverrides<CreateSessionKeyOptions>>,
 ) {
   const {
     contract,
@@ -161,6 +164,7 @@ export function createSessionKey(
       return { sessionSpec: req, signature };
     },
     contract,
+    overrides: options.overrides,
   });
 }
 

packages/thirdweb/src/wallets/in-app/core/eip7702/minimal-account.ts

@@ -180,36 +180,45 @@ export const create7702MinimalAccount = (args: {
       abi: MinimalAccountAbi,
     });
     // check if account has been delegated already
-    let authorization: SignedAuthorization | undefined;
+    let authorization: SignedAuthorization | undefined =
+      firstTx.authorizationList?.[0];
     const delegationContractAddress = await getDelegationContractAddress({
       client,
       chain,
     });
-    const isMinimalAccount = await is7702MinimalAccount(
-      eoaContract,
-      delegationContractAddress,
-    );
-    if (!isMinimalAccount) {
-      // if not, sign authorization
-      let nonce = firstTx.nonce
-        ? BigInt(firstTx.nonce)
-        : BigInt(
-            await getNonce({
-              client,
-              address: adminAccount.address,
-              chain,
-            }),
-          );
-      nonce += sponsorGas ? 0n : 1n;
-      const auth = await adminAccount.signAuthorization?.({
-        address: getAddress(delegationContractAddress),
-        chainId: firstTx.chainId,
-        nonce,
-      });
-      if (!auth) {
-        throw new Error("Failed to sign authorization");
+    if (authorization && authorization.address !== delegationContractAddress) {
+      throw new Error(
+        `Authorization address does not match expected delegation contract address. Expected ${delegationContractAddress} but got ${authorization.address}`,
+      );
+    }
+    // if the tx already has an authorization, use it
+    if (!authorization) {
+      const isMinimalAccount = await is7702MinimalAccount(
+        eoaContract,
+        delegationContractAddress,
+      );
+      if (!isMinimalAccount) {
+        // if not, sign authorization
+        let nonce = firstTx.nonce
+          ? BigInt(firstTx.nonce)
+          : BigInt(
+              await getNonce({
+                client,
+                address: adminAccount.address,
+                chain,
+              }),
+            );
+        nonce += sponsorGas ? 0n : 1n;
+        const auth = await adminAccount.signAuthorization?.({
+          address: getAddress(delegationContractAddress),
+          chainId: firstTx.chainId,
+          nonce,
+        });
+        if (!auth) {
+          throw new Error("Failed to sign authorization");
+        }
+        authorization = auth;
       }
-      authorization = auth;
     }
     if (sponsorGas) {
       // send transaction from executor, needs signature