thirdweb 5.105.3-nightly-6d1d344c48302d45aeb63532c84cc8e79c93e26f-20250628000422 → 5.105.4-nightly-1f72396d7fa4748efef179821a7a796b53679bcb-20250629000440

package/src/engine/server-wallet.ts

@@ -1,7 +1,8 @@
 import {
-  type AaExecutionOptions,
-  type AaZksyncExecutionOptions,
-  type EoaExecutionOptions,
+  isSuccessResponse,
+  type SendTransactionData,
+  type SignMessageData,
+  type SpecificExecutionOptions,
   sendTransaction,
   signMessage,
   signTypedData,
@@ -16,12 +17,15 @@ import { type Hex, toHex } from "../utils/encoding/hex.js";
 import { getClientFetch } from "../utils/fetch.js";
 import { stringify } from "../utils/json.js";
 import { resolvePromisedValue } from "../utils/promise/resolve-promised-value.js";
+import type { Prettify } from "../utils/type-utils.js";
 import type {
   Account,
   SendTransactionOption,
 } from "../wallets/interfaces/wallet.js";
 import { waitForTransactionHash } from "./wait-for-tx-hash.js";
 
+type ExecutionOptions = Prettify<SpecificExecutionOptions>;
+
 /**
  * Options for creating an server wallet.
  */
@@ -45,10 +49,7 @@ export type ServerWalletOptions = {
   /**
    * Optional custom execution options to use for sending transactions and signing data.
    */
-  executionOptions?:
-    | Omit<AaExecutionOptions, "chainId">
-    | Omit<AaZksyncExecutionOptions, "chainId">
-    | Omit<EoaExecutionOptions, "chainId">;
+  executionOptions?: ExecutionOptions;
 };
 
 export type ServerWallet = Account & {
@@ -150,20 +151,74 @@ export type ServerWallet = Account & {
 export function serverWallet(options: ServerWalletOptions): ServerWallet {
   const { client, vaultAccessToken, address, chain, executionOptions } =
     options;
+
   const headers: HeadersInit = {
     "x-vault-access-token": vaultAccessToken,
   };
 
-  const getExecutionOptions = (chainId: number) => {
-    return executionOptions
-      ? {
+  const getExecutionOptionsWithChainId = (
+    chainId: number,
+  ): SendTransactionData["body"]["executionOptions"] => {
+    if (!executionOptions) {
+      return {
+        chainId,
+        from: address,
+        type: "auto",
+      };
+    }
+    switch (executionOptions.type) {
+      case "auto":
+        return {
+          chainId,
+          from: address,
+          type: "auto",
+        };
+      case "ERC4337":
+        return {
+          ...executionOptions,
+          chainId,
+          type: "ERC4337",
+        };
+    }
+  };
+
+  const getSigningOptions = (
+    chainId: number | undefined,
+  ): SignMessageData["body"]["signingOptions"] => {
+    // if no chainId passed specifically for this signature
+    // we HAVE TO fallback to EOA signature
+    if (!chainId) {
+      return {
+        from: address,
+        type: "eoa",
+      };
+    }
+
+    if (!executionOptions) {
+      return {
+        chainId,
+        from: address,
+        type: "auto",
+      };
+    }
+
+    switch (executionOptions.type) {
+      case "ERC4337": {
+        return {
+          chainId,
           ...executionOptions,
-          chainId: chainId.toString(),
-        }
-      : {
-          chainId: chainId.toString(),
+          type: "ERC4337",
+        };
+      }
+
+      case "auto": {
+        return {
+          chainId,
           from: address,
+          type: "auto",
         };
+      }
+    }
   };
 
   const enqueueTx = async (transaction: SendTransactionOption[]) => {
@@ -184,10 +239,10 @@ export function serverWallet(options: ServerWalletOptions): ServerWallet {
       }
     }
     const body = {
-      executionOptions: getExecutionOptions(chainId),
+      executionOptions: getExecutionOptionsWithChainId(chainId),
       params: transaction.map((t) => ({
         data: t.data,
-        to: t.to ?? undefined,
+        to: t.to,
         value: t.value?.toString(),
       })),
     };
@@ -307,17 +362,16 @@ export function serverWallet(options: ServerWalletOptions): ServerWallet {
       if (!signingChainId) {
         throw new Error("Chain ID is required for signing messages");
       }
-
       const signResult = await signMessage({
         baseUrl: getThirdwebBaseUrl("engineCloud"),
         body: {
-          executionOptions: getExecutionOptions(signingChainId),
           params: [
             {
+              format: isBytes ? "hex" : "text",
               message: engineMessage,
-              messageFormat: isBytes ? "hex" : "text",
             },
           ],
+          signingOptions: getSigningOptions(signingChainId),
         },
         bodySerializer: stringify,
         fetch: getClientFetch(client),
@@ -330,13 +384,13 @@ export function serverWallet(options: ServerWalletOptions): ServerWallet {
         );
       }
 
-      const signatureResult = signResult.data?.result.results[0];
-      if (signatureResult?.success) {
+      const signatureResult = signResult.data?.result[0];
+      if (signatureResult && isSuccessResponse(signatureResult)) {
         return signatureResult.result.signature as Hex;
       }
 
       throw new Error(
-        `Failed to sign message: ${signatureResult?.error?.message || "Unknown error"}`,
+        `Failed to sign message: ${stringify(signatureResult?.error) || "Unknown error"}`,
       );
     },
     signTypedData: async (typedData) => {
@@ -348,9 +402,9 @@ export function serverWallet(options: ServerWalletOptions): ServerWallet {
       const signResult = await signTypedData({
         baseUrl: getThirdwebBaseUrl("engineCloud"),
         body: {
-          executionOptions: getExecutionOptions(signingChainId),
           // biome-ignore lint/suspicious/noExplicitAny: TODO: fix ts / hey-api type clash
           params: [typedData as any],
+          signingOptions: getSigningOptions(signingChainId),
         },
         bodySerializer: stringify,
         fetch: getClientFetch(client),
@@ -363,13 +417,13 @@ export function serverWallet(options: ServerWalletOptions): ServerWallet {
         );
       }
 
-      const signatureResult = signResult.data?.result.results[0];
-      if (signatureResult?.success) {
+      const signatureResult = signResult.data?.result[0];
+      if (signatureResult && isSuccessResponse(signatureResult)) {
         return signatureResult.result.signature as Hex;
       }
 
       throw new Error(
-        `Failed to sign message: ${signatureResult?.error?.message || "Unknown error"}`,
+        `Failed to sign message: ${stringify(signatureResult?.error) || "Unknown error"}`,
       );
     },
   };

package/src/engine/wait-for-tx-hash.ts

@@ -38,7 +38,7 @@ export async function waitForTransactionHash(args: {
     switch (status) {
       case "FAILED": {
         throw new Error(
-          `Transaction failed: ${executionResult.error || "Unknown error"}`,
+          `Transaction failed: ${stringify(executionResult.error) || "Unknown error"}`,
         );
       }
       case "CONFIRMED": {

package/src/exports/wallets/in-app.native.ts

@@ -1,5 +1,15 @@
 // --- KEEEP IN SYNC with exports/wallets/in-app.ts ---
 
+//ACCOUNT
+export {
+  type CreateSessionKeyOptions,
+  createSessionKey,
+  isCreateSessionKeySupported,
+} from "../../extensions/erc7702/account/createSessionKey.js";
+export type {
+  Condition,
+  LimitType,
+} from "../../extensions/erc7702/account/types.js";
 export type {
   GetAuthenticatedUserParams,
   MultiStepAuthArgsType,

package/src/exports/wallets/in-app.ts

@@ -1,5 +1,15 @@
 // --- KEEEP IN SYNC with exports/wallets/in-app.native.ts ---
 
+//ACCOUNT
+export {
+  type CreateSessionKeyOptions,
+  createSessionKey,
+  isCreateSessionKeySupported,
+} from "../../extensions/erc7702/account/createSessionKey.js";
+export type {
+  Condition,
+  LimitType,
+} from "../../extensions/erc7702/account/types.js";
 export {
   getSocialIcon,
   socialIcons,

package/src/extensions/erc7702/account/createSessionKey.ts

@@ -0,0 +1,181 @@
+import type { BaseTransactionOptions } from "../../../transaction/types.js";
+import { randomBytesHex } from "../../../utils/random.js";
+import type { Account } from "../../../wallets/interfaces/wallet.js";
+import {
+  createSessionWithSig,
+  isCreateSessionWithSigSupported,
+} from "../__generated__/MinimalAccount/write/createSessionWithSig.js";
+import {
+  type CallSpecInput,
+  CallSpecRequest,
+  ConstraintRequest,
+  SessionSpecRequest,
+  type TransferSpecInput,
+  TransferSpecRequest,
+  UsageLimitRequest,
+} from "./types.js";
+
+/**
+ * @extension ERC7702
+ */
+export type CreateSessionKeyOptions = {
+  /**
+   * The admin account that will perform the operation.
+   */
+  account: Account;
+  /**
+   * The address to add as a session key.
+   */
+  sessionKeyAddress: string;
+  /**
+   * How long the session key should be valid for, in seconds.
+   */
+  durationInSeconds: number;
+  /**
+   * Whether to grant full execution permissions to the session key.
+   */
+  grantFullPermissions?: boolean;
+  /**
+   * Smart contract interaction policies to apply to the session key, ignored if grantFullPermissions is true.
+   */
+  callPolicies?: CallSpecInput[];
+  /**
+   * Value transfer policies to apply to the session key, ignored if grantFullPermissions is true.
+   */
+  transferPolicies?: TransferSpecInput[];
+};
+
+/**
+ * Creates  session key permissions for a specified address.
+ * @param options - The options for the createSessionKey function.
+ * @param {Contract} options.contract - The EIP-7702 smart EOA contract to create the session key from
+ * @returns The transaction object to be sent.
+ * @example
+ * ```ts
+ * import { createSessionKey } from 'thirdweb/extensions/7702';
+ * import { sendTransaction } from 'thirdweb';
+ *
+ * const transaction = createSessionKey({
+ *  account: account,
+ *  contract: accountContract,
+ *  sessionKeyAddress: TEST_ACCOUNT_A.address,
+ *  durationInSeconds: 86400, // 1 day
+ *  grantFullPermissions: true
+ *})
+ *
+ * await sendTransaction({ transaction, account });
+ * ```
+ * @extension ERC7702
+ */
+export function createSessionKey(
+  options: BaseTransactionOptions<CreateSessionKeyOptions>,
+) {
+  const {
+    contract,
+    account,
+    sessionKeyAddress,
+    durationInSeconds,
+    grantFullPermissions,
+    callPolicies,
+    transferPolicies,
+  } = options;
+
+  if (durationInSeconds <= 0) {
+    throw new Error("durationInSeconds must be positive");
+  }
+
+  return createSessionWithSig({
+    async asyncParams() {
+      const req = {
+        callPolicies: (callPolicies || []).map((policy) => ({
+          constraints: (policy.constraints || []).map((constraint) => ({
+            condition: Number(constraint.condition),
+            index: constraint.index || BigInt(0),
+            limit: constraint.limit
+              ? {
+                  limit: constraint.limit.limit,
+                  limitType: Number(constraint.limit.limitType),
+                  period: constraint.limit.period,
+                }
+              : {
+                  limit: BigInt(0),
+                  limitType: 0,
+                  period: BigInt(0),
+                },
+            refValue: constraint.refValue || "0x",
+          })),
+          maxValuePerUse: policy.maxValuePerUse || BigInt(0),
+          selector: policy.selector,
+          target: policy.target,
+          valueLimit: policy.valueLimit
+            ? {
+                limit: policy.valueLimit.limit,
+                limitType: Number(policy.valueLimit.limitType),
+                period: policy.valueLimit.period,
+              }
+            : {
+                limit: BigInt(0),
+                limitType: 0,
+                period: BigInt(0),
+              },
+        })),
+        expiresAt: BigInt(Math.floor(Date.now() / 1000) + durationInSeconds),
+        isWildcard: grantFullPermissions ?? true,
+        signer: sessionKeyAddress,
+        transferPolicies: (transferPolicies || []).map((policy) => ({
+          maxValuePerUse: policy.maxValuePerUse || BigInt(0),
+          target: policy.target,
+          valueLimit: policy.valueLimit
+            ? {
+                limit: policy.valueLimit.limit,
+                limitType: Number(policy.valueLimit.limitType),
+                period: policy.valueLimit.period,
+              }
+            : {
+                limit: BigInt(0),
+                limitType: 0,
+                period: BigInt(0),
+              },
+        })),
+        uid: await randomBytesHex(),
+      };
+
+      const signature = await account.signTypedData({
+        domain: {
+          chainId: contract.chain.id,
+          name: "MinimalAccount",
+          verifyingContract: contract.address,
+          version: "1",
+        },
+        message: req,
+        primaryType: "SessionSpec",
+        types: {
+          CallSpec: CallSpecRequest,
+          Constraint: ConstraintRequest,
+          SessionSpec: SessionSpecRequest,
+          TransferSpec: TransferSpecRequest,
+          UsageLimit: UsageLimitRequest,
+        },
+      });
+
+      return { sessionSpec: req, signature };
+    },
+    contract,
+  });
+}
+
+/**
+ * Checks if the `isCreateSessionKeySupported` method is supported by the given contract.
+ * @param availableSelectors An array of 4byte function selectors of the contract. You can get this in various ways, such as using "whatsabi" or if you have the ABI of the contract available you can use it to generate the selectors.
+ * @returns A boolean indicating if the `isAddSessionKeySupported` method is supported.
+ * @extension ERC7702
+ * @example
+ * ```ts
+ * import { isCreateSessionKeySupported } from "thirdweb/extensions/erc7702";
+ *
+ * const supported = isCreateSessionKeySupported(["0x..."]);
+ * ```
+ */
+export function isCreateSessionKeySupported(availableSelectors: string[]) {
+  return isCreateSessionWithSigSupported(availableSelectors);
+}

package/src/extensions/erc7702/account/sessionkey.test.ts

@@ -0,0 +1,132 @@
+import { defineChain } from "src/chains/utils.js";
+import { prepareTransaction } from "src/transaction/prepare-transaction.js";
+import { inAppWallet } from "src/wallets/in-app/web/in-app.js";
+import type { Account } from "src/wallets/interfaces/wallet.js";
+import { beforeAll, describe, expect, it } from "vitest";
+import { TEST_CLIENT } from "../../../../test/src/test-clients.js";
+import { TEST_ACCOUNT_A } from "../../../../test/src/test-wallets.js";
+import { ZERO_ADDRESS } from "../../../constants/addresses.js";
+import {
+  getContract,
+  type ThirdwebContract,
+} from "../../../contract/contract.js";
+import { parseEventLogs } from "../../../event/actions/parse-logs.js";
+import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
+import { sessionCreatedEvent } from "../__generated__/MinimalAccount/events/SessionCreated.js";
+import { createSessionKey } from "./createSessionKey.js";
+import { Condition, LimitType } from "./types.js";
+
+describe.runIf(process.env.TW_SECRET_KEY)(
+  "Session Key Behavior",
+  {
+    retry: 0,
+    timeout: 240_000,
+  },
+  () => {
+    const chainId = 11155111;
+    let account: Account;
+    let accountContract: ThirdwebContract;
+
+    beforeAll(async () => {
+      // Create 7702 Smart EOA
+      const wallet = inAppWallet({
+        executionMode: {
+          mode: "EIP7702",
+          sponsorGas: true,
+        },
+      });
+      account = await wallet.connect({
+        chain: defineChain(chainId),
+        client: TEST_CLIENT,
+        strategy: "guest",
+      });
+
+      // Send a null tx to trigger deploy/upgrade
+      await sendAndConfirmTransaction({
+        account: account,
+        transaction: prepareTransaction({
+          chain: defineChain(chainId),
+          client: TEST_CLIENT,
+          to: account.address,
+          value: 0n,
+        }),
+      });
+
+      // Will auto resolve abi since it's deployed
+      accountContract = getContract({
+        address: account.address,
+        chain: defineChain(chainId),
+        client: TEST_CLIENT,
+      });
+    }, 120_000);
+
+    it("should allow adding adminlike session keys", async () => {
+      const receipt = await sendAndConfirmTransaction({
+        account: account,
+        transaction: createSessionKey({
+          account: account,
+          contract: accountContract,
+          durationInSeconds: 86400,
+          grantFullPermissions: true, // 1 day
+          sessionKeyAddress: TEST_ACCOUNT_A.address,
+        }),
+      });
+      const logs = parseEventLogs({
+        events: [sessionCreatedEvent()],
+        logs: receipt.logs,
+      });
+      expect(logs[0]?.args.signer).toBe(TEST_ACCOUNT_A.address);
+    });
+
+    it("should allow adding granular session keys", async () => {
+      const receipt = await sendAndConfirmTransaction({
+        account: account,
+        transaction: createSessionKey({
+          account: account,
+          callPolicies: [
+            {
+              constraints: [
+                {
+                  condition: Condition.Unconstrained,
+                  index: 0n,
+                  refValue:
+                    "0x0000000000000000000000000000000000000000000000000000000000000000",
+                },
+              ],
+              maxValuePerUse: 0n,
+              selector: "0x00000000",
+              target: ZERO_ADDRESS,
+              valueLimit: {
+                limit: 0n,
+                limitType: LimitType.Unlimited,
+                period: 0n,
+              },
+            },
+          ],
+          contract: accountContract,
+          durationInSeconds: 86400, // 1 day
+          grantFullPermissions: false,
+          sessionKeyAddress: TEST_ACCOUNT_A.address,
+          transferPolicies: [
+            {
+              maxValuePerUse: 0n,
+              target: ZERO_ADDRESS,
+              valueLimit: {
+                limit: 0n,
+                limitType: 0,
+                period: 0n,
+              },
+            },
+          ],
+        }),
+      });
+      const logs = parseEventLogs({
+        events: [sessionCreatedEvent()],
+        logs: receipt.logs,
+      });
+      expect(logs[0]?.args.signer).toBe(TEST_ACCOUNT_A.address);
+      expect(logs[0]?.args.sessionSpec.callPolicies).toHaveLength(1);
+      expect(logs[0]?.args.sessionSpec.transferPolicies).toHaveLength(1);
+    });
+  },
+);

package/src/extensions/erc7702/account/types.ts

@@ -0,0 +1,94 @@
+/* ────────────────────────────────
+   Enums
+   ──────────────────────────────── */
+
+export enum LimitType {
+  Unlimited = 0,
+  Lifetime = 1,
+  Allowance = 2,
+}
+
+export enum Condition {
+  Unconstrained = 0,
+  Equal = 1,
+  Greater = 2,
+  Less = 3,
+  GreaterOrEqual = 4,
+  LessOrEqual = 5,
+  NotEqual = 6,
+}
+
+/* ────────────────────────────────
+   Input types
+   ──────────────────────────────── */
+
+/* ---------- UsageLimit ---------- */
+interface UsageLimitInput {
+  limitType: LimitType;
+  limit: bigint;
+  period: bigint;
+}
+
+/* ---------- Constraint ---------- */
+interface ConstraintInput {
+  condition: Condition;
+  index: bigint;
+  refValue: `0x${string}`;
+  limit?: UsageLimitInput;
+}
+
+/* ---------- CallSpec ---------- */
+export interface CallSpecInput {
+  target: `0x${string}`;
+  selector: `0x${string}`;
+  maxValuePerUse?: bigint;
+  valueLimit?: UsageLimitInput;
+  constraints?: ConstraintInput[];
+}
+
+/* ---------- TransferSpec ---------- */
+export interface TransferSpecInput {
+  target: `0x${string}`;
+  maxValuePerUse?: bigint;
+  valueLimit?: UsageLimitInput;
+}
+
+/* ────────────────────────────────
+   EIP-712 structs
+   ──────────────────────────────── */
+
+export const UsageLimitRequest = [
+  { name: "limitType", type: "uint8" },
+  { name: "limit", type: "uint256" },
+  { name: "period", type: "uint256" },
+] as const;
+
+export const ConstraintRequest = [
+  { name: "condition", type: "uint8" },
+  { name: "index", type: "uint64" },
+  { name: "refValue", type: "bytes32" },
+  { name: "limit", type: "UsageLimit" },
+] as const;
+
+export const CallSpecRequest = [
+  { name: "target", type: "address" },
+  { name: "selector", type: "bytes4" },
+  { name: "maxValuePerUse", type: "uint256" },
+  { name: "valueLimit", type: "UsageLimit" },
+  { name: "constraints", type: "Constraint[]" },
+] as const;
+
+export const TransferSpecRequest = [
+  { name: "target", type: "address" },
+  { name: "maxValuePerUse", type: "uint256" },
+  { name: "valueLimit", type: "UsageLimit" },
+] as const;
+
+export const SessionSpecRequest = [
+  { name: "signer", type: "address" },
+  { name: "isWildcard", type: "bool" },
+  { name: "expiresAt", type: "uint256" },
+  { name: "callPolicies", type: "CallSpec[]" },
+  { name: "transferPolicies", type: "TransferSpec[]" },
+  { name: "uid", type: "bytes32" },
+] as const;

package/src/react/web/ui/Bridge/BridgeOrchestrator.tsx

@@ -113,6 +113,12 @@ export interface BridgeOrchestratorProps {
    * Quick buy amounts
    */
   presetOptions: [number, number, number] | undefined;
+
+  /**
+   * Allowed payment methods
+   * @default ["crypto", "card"]
+   */
+  paymentMethods?: ("crypto" | "card")[];
 }
 
 export function BridgeOrchestrator({
@@ -127,6 +133,7 @@ export function BridgeOrchestrator({
   purchaseData,
   paymentLinkId,
   presetOptions,
+  paymentMethods = ["crypto", "card"],
 }: BridgeOrchestratorProps) {
   // Initialize adapters
   const adapters = useMemo(
@@ -270,6 +277,7 @@ export function BridgeOrchestrator({
             }}
             onError={handleError}
             onPaymentMethodSelected={handlePaymentMethodSelected}
+            paymentMethods={paymentMethods}
             receiverAddress={state.context.receiverAddress}
           />
         )}

package/src/react/web/ui/Bridge/BuyWidget.tsx

@@ -160,6 +160,12 @@ export type BuyWidgetProps = {
    * @hidden
    */
   paymentLinkId?: string;
+
+  /**
+   * Allowed payment methods
+   * @default ["crypto", "card"]
+   */
+  paymentMethods?: ("crypto" | "card")[];
 };
 
 // Enhanced UIOptions to handle unsupported token state
@@ -378,6 +384,7 @@ export function BuyWidget(props: BuyWidgetProps) {
           props.onError?.(err);
         }}
         paymentLinkId={props.paymentLinkId}
+        paymentMethods={props.paymentMethods}
         presetOptions={props.presetOptions}
         purchaseData={props.purchaseData}
         receiverAddress={undefined}