thirdweb 5.105.3-nightly-6d1d344c48302d45aeb63532c84cc8e79c93e26f-20250628000422 → 5.105.3

package/dist/types/extensions/erc7702/account/createSessionKey.d.ts

@@ -0,0 +1,69 @@
+import type { BaseTransactionOptions } from "../../../transaction/types.js";
+import type { Account } from "../../../wallets/interfaces/wallet.js";
+import { type CallSpecInput, type TransferSpecInput } 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 declare function createSessionKey(options: BaseTransactionOptions<CreateSessionKeyOptions>): import("../../../transaction/prepare-transaction.js").PreparedTransaction<any, import("abitype").AbiFunction, import("../../../transaction/prepare-transaction.js").PrepareTransactionOptions>;
+/**
+ * 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 declare function isCreateSessionKeySupported(availableSelectors: string[]): boolean;
+//# sourceMappingURL=createSessionKey.d.ts.map

package/dist/types/extensions/erc7702/account/createSessionKey.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createSessionKey.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/erc7702/account/createSessionKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAE5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uCAAuC,CAAC;AAKrE,OAAO,EACL,KAAK,aAAa,EAIlB,KAAK,iBAAiB,EAGvB,MAAM,YAAY,CAAC;AAEpB;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAC1B;;OAEG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAC1B;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;OAEG;IACH,YAAY,CAAC,EAAE,aAAa,EAAE,CAAC;IAC/B;;OAEG;IACH,gBAAgB,CAAC,EAAE,iBAAiB,EAAE,CAAC;CACxC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,sBAAsB,CAAC,uBAAuB,CAAC,kMA8FzD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,2BAA2B,CAAC,kBAAkB,EAAE,MAAM,EAAE,WAEvE"}

package/dist/types/extensions/erc7702/account/types.d.ts

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

package/dist/types/extensions/erc7702/account/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/erc7702/account/types.ts"],"names":[],"mappings":"AAIA,oBAAY,SAAS;IACnB,SAAS,IAAI;IACb,QAAQ,IAAI;IACZ,SAAS,IAAI;CACd;AAED,oBAAY,SAAS;IACnB,aAAa,IAAI;IACjB,KAAK,IAAI;IACT,OAAO,IAAI;IACX,IAAI,IAAI;IACR,cAAc,IAAI;IAClB,WAAW,IAAI;IACf,QAAQ,IAAI;CACb;AAOD,UAAU,eAAe;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAGD,UAAU,eAAe;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAC;IACxB,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB;AAGD,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,KAAK,MAAM,EAAE,CAAC;IACtB,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,WAAW,CAAC,EAAE,eAAe,EAAE,CAAC;CACjC;AAGD,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,KAAK,MAAM,EAAE,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,eAAe,CAAC;CAC9B;AAMD,eAAO,MAAM,iBAAiB;;;;;;;;;EAIpB,CAAC;AAEX,eAAO,MAAM,iBAAiB;;;;;;;;;;;;EAKpB,CAAC;AAEX,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;EAMlB,CAAC;AAEX,eAAO,MAAM,mBAAmB;;;;;;;;;EAItB,CAAC;AAEX,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;EAOrB,CAAC"}

package/dist/types/react/web/ui/Bridge/payment-details/PaymentDetails.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PaymentDetails.d.ts","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/Bridge/payment-details/PaymentDetails.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAItE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AACtF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AASjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAG1D,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,SAAS,EAAE,SAAS,CAAC;IACrB;;OAEG;IACH,MAAM,EAAE,cAAc,CAAC;IACvB;;OAEG;IACH,aAAa,EAAE,aAAa,CAAC;IAC7B;;OAEG;IACH,aAAa,EAAE,mBAAmB,CAAC;IAEnC;;OAEG;IACH,SAAS,EAAE,MAAM,IAAI,CAAC;IAEtB;;OAEG;IACH,MAAM,EAAE,MAAM,IAAI,CAAC;IAEnB;;OAEG;IACH,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CACjC;AAED,wBAAgB,cAAc,CAAC,EAC7B,SAAS,EACT,MAAM,EACN,aAAa,EACb,aAAa,EACb,SAAS,EACT,MAAM,EACN,OAAO,GACR,EAAE,mBAAmB,2CAiVrB"}
+{"version":3,"file":"PaymentDetails.d.ts","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/Bridge/payment-details/PaymentDetails.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAItE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AACtF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AASjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAG1D,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,SAAS,EAAE,SAAS,CAAC;IACrB;;OAEG;IACH,MAAM,EAAE,cAAc,CAAC;IACvB;;OAEG;IACH,aAAa,EAAE,aAAa,CAAC;IAC7B;;OAEG;IACH,aAAa,EAAE,mBAAmB,CAAC;IAEnC;;OAEG;IACH,SAAS,EAAE,MAAM,IAAI,CAAC;IAEtB;;OAEG;IACH,MAAM,EAAE,MAAM,IAAI,CAAC;IAEnB;;OAEG;IACH,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CACjC;AAED,wBAAgB,cAAc,CAAC,EAC7B,SAAS,EACT,MAAM,EACN,aAAa,EACb,aAAa,EACb,SAAS,EACT,MAAM,EACN,OAAO,GACR,EAAE,mBAAmB,2CA6UrB"}

package/dist/types/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "5.105.3-nightly-6d1d344c48302d45aeb63532c84cc8e79c93e26f-20250628000422";
+export declare const version = "5.105.3";
 //# sourceMappingURL=version.d.ts.map

package/dist/types/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,4EAA4E,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,YAAY,CAAC"}

package/dist/types/wallets/in-app/core/authentication/backend.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/authentication/backend.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAGnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,YAAY,CAAC;AAEtE;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,MAAM,EAAE,cAAc,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB,GAAG,OAAO,CAAC,mCAAmC,CAAC,CAsB/C"}
+{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/authentication/backend.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAGnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,YAAY,CAAC;AAEtE;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,MAAM,EAAE,cAAc,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB,GAAG,OAAO,CAAC,mCAAmC,CAAC,CAuB/C"}

package/package.json

@@ -38,7 +38,7 @@
     "uqr": "0.1.2",
     "viem": "2.28.1",
     "zod": "3.25.67",
-    "@thirdweb-dev/engine": "3.1.0",
+    "@thirdweb-dev/engine": "3.2.0",
     "@thirdweb-dev/insight": "1.1.0"
   },
   "devDependencies": {
@@ -375,7 +375,7 @@
     }
   },
   "typings": "./dist/types/exports/thirdweb.d.ts",
-  "version": "5.105.3-nightly-6d1d344c48302d45aeb63532c84cc8e79c93e26f-20250628000422",
+  "version": "5.105.3",
   "scripts": {
     "bench": "vitest -c ./test/vitest.config.ts bench",
     "bench:compare": "bun run ./benchmarks/run.ts",

package/src/engine/server-wallet.test.ts

@@ -8,14 +8,11 @@ import { baseSepolia } from "../chains/chain-definitions/base-sepolia.js";
 import { sepolia } from "../chains/chain-definitions/sepolia.js";
 import { getContract } from "../contract/contract.js";
 import { setContractURI } from "../extensions/common/__generated__/IContractMetadata/write/setContractURI.js";
-import { mintTo } from "../extensions/erc20/write/mintTo.js";
+import { setApprovalForAll } from "../extensions/erc1155/__generated__/IERC1155/write/setApprovalForAll.js";
 import { claimTo } from "../extensions/erc1155/drops/write/claimTo.js";
 import { getAllActiveSigners } from "../extensions/erc4337/__generated__/IAccountPermissions/read/getAllActiveSigners.js";
 import { sendTransaction } from "../transaction/actions/send-transaction.js";
-import {
-  DEFAULT_ACCOUNT_FACTORY_V0_6,
-  ENTRYPOINT_ADDRESS_v0_6,
-} from "../wallets/smart/lib/constants.js";
+import { setThirdwebDomains } from "../utils/domains.js";
 import { smartWallet } from "../wallets/smart/smart-wallet.js";
 import { generateAccount } from "../wallets/utils/generateAccount.js";
 import * as Engine from "./index.js";
@@ -34,15 +31,16 @@ describe.runIf(
     let serverWallet: Engine.ServerWallet;
 
     beforeAll(async () => {
-      // setThirdwebDomains({
-      //   rpc: "rpc.thirdweb-dev.com",
-      //   storage: "storage.thirdweb-dev.com",
-      //   bundler: "bundler.thirdweb-dev.com",
-      //   engineCloud: "engine.thirdweb-dev.com",
-      // });
+      setThirdwebDomains({
+        bundler: "bundler.thirdweb-dev.com",
+        engineCloud: "engine.thirdweb-dev.com",
+        // engineCloud: "localhost:3009",
+        rpc: "rpc.thirdweb-dev.com",
+        storage: "storage.thirdweb-dev.com",
+      });
       serverWallet = Engine.serverWallet({
         address: process.env.ENGINE_CLOUD_WALLET_ADDRESS as string,
-        chain: arbitrumSepolia,
+        chain: sepolia,
         client: TEST_CLIENT,
         vaultAccessToken: process.env.VAULT_TOKEN as string,
       });
@@ -81,13 +79,9 @@ describe.runIf(
 
     it("should sign typed data for EOA execution options", async () => {
       const eoaServerWallet = Engine.serverWallet({
-        address: process.env.ENGINE_CLOUD_WALLET_ADDRESS as string,
+        address: process.env.ENGINE_CLOUD_WALLET_ADDRESS_EOA as string,
         chain: arbitrumSepolia,
         client: TEST_CLIENT,
-        executionOptions: {
-          address: process.env.ENGINE_CLOUD_WALLET_ADDRESS_EOA as string,
-          type: "eoa",
-        },
         vaultAccessToken: process.env.VAULT_TOKEN as string,
       });
 
@@ -157,14 +151,14 @@ describe.runIf(
 
     it("should send a extension tx", async () => {
       const tokenContract = getContract({
-        address: "0x87C52295891f208459F334975a3beE198fE75244",
+        address: "0x638263e3eAa3917a53630e61B1fBa685308024fa",
         chain: baseSepolia,
         client: TEST_CLIENT,
       });
-      const claimTx = mintTo({
-        amount: "0.001",
+      const claimTx = setApprovalForAll({
+        approved: true,
         contract: tokenContract,
-        to: serverWallet.address,
+        operator: "0x4b8ceC1Eb227950F0bfd034449B2781e689242A1",
       });
       const tx = await sendTransaction({
         account: serverWallet,
@@ -175,19 +169,21 @@ describe.runIf(
 
     it("should enqueue a batch of txs", async () => {
       const tokenContract = getContract({
-        address: "0x87C52295891f208459F334975a3beE198fE75244",
+        address: "0x638263e3eAa3917a53630e61B1fBa685308024fa",
         chain: baseSepolia,
         client: TEST_CLIENT,
       });
-      const claimTx1 = mintTo({
-        amount: "0.001",
+      const claimTx1 = claimTo({
         contract: tokenContract,
+        quantity: 1n,
         to: serverWallet.address,
+        tokenId: 2n,
       });
-      const claimTx2 = mintTo({
-        amount: "0.002",
+      const claimTx2 = claimTo({
         contract: tokenContract,
+        quantity: 1n,
         to: serverWallet.address,
+        tokenId: 2n,
       });
       const tx = await serverWallet.enqueueBatchTransaction({
         transactions: [claimTx1, claimTx2],
@@ -257,8 +253,7 @@ describe.runIf(
         chain: sepolia,
         client: TEST_CLIENT,
         executionOptions: {
-          entrypointAddress: ENTRYPOINT_ADDRESS_v0_6,
-          factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_6,
+          entrypointVersion: "0.6",
           signerAddress: sessionKeyAccountAddress,
           smartAccountAddress: smartAccount.address,
           type: "ERC4337",

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,