@account-kit/wallet-client 0.1.0-alpha.4 → 0.1.0-alpha.6

package/src/client/actions/signSignatureRequest.ts

@@ -1,28 +1,37 @@
 import type { SmartAccountSigner } from "@aa-sdk/core";
 import type { Static } from "@sinclair/typebox";
-import { type Hex, toHex } from "viem";
-import { TypeSignatureRequest } from "../../schemas.js";
+import { type Hex, hexToNumber, serializeSignature } from "viem";
 import { assertNever } from "../../utils.js";
-import type { Eip7702ExtendedFields } from "@aa-sdk/core";
+import {
+  TypeAuthorizationSignatureRequest,
+  TypePersonalSignSignatureRequest,
+  TypeTypedDataSignatureRequest,
+} from "../../schemas.js";
+import { TypeEip7702UnsignedAuth } from "../../schemas.js";
+import { vToYParity } from "ox/Signature";
 
-export type SignSignatureRequestParams = Static<typeof TypeSignatureRequest>;
+export type SignSignatureRequestParams =
+  | Static<typeof TypePersonalSignSignatureRequest>
+  | Static<typeof TypeTypedDataSignatureRequest>
+  | (Static<typeof TypeAuthorizationSignatureRequest> & {
+      data: Static<typeof TypeEip7702UnsignedAuth>;
+    });
 
 export type SignSignatureRequestResult = {
-  type: "ecdsa";
-  signature: Hex;
-  signedAuthorization?: Eip7702ExtendedFields["eip7702Auth"];
+  type: "secp256k1";
+  data: Hex;
 };
 
 /**
  * Signs a signature request using the provided signer.
- * This method handles different types of signature requests including personal_sign and eth_signTypedData_v4.
+ * This method handles different types of signature requests including personal_sign, eth_signTypedData_v4, and authorization.
  *
  * @param {SmartAccountSigner} signer - The signer to use for signing the request
  * @param {SignSignatureRequestParams} params - The signature request parameters
  * @param {string} params.type - The type of signature request ('personal_sign', 'eth_signTypedData_v4', or 'signature_with_authorization')
  * @param {any} params.data - The data to sign, format depends on the signature type
  * @returns {Promise<SignSignatureRequestResult>} A Promise that resolves to the signature result
- * @returns {string} result.type - The signature type (currently only 'ecdsa' is supported)
+ * @returns {string} result.type - The signature type (currently only 'secp256k1' is supported)
  * @returns {Hex} result.signature - The hex-encoded signature
  * @returns {Eip7702ExtendedFields["eip7702Auth"]} result.signedAuthorization - The signed EIP-7702 authorization, if applicable
  *
@@ -45,49 +54,44 @@ export type SignSignatureRequestResult = {
  *   }
  * });
  */
-export function signSignatureRequest(
-  signer: SmartAccountSigner,
-  params: SignSignatureRequestParams,
-): Promise<SignSignatureRequestResult>;
 
 export async function signSignatureRequest(
   signer: SmartAccountSigner,
   params: SignSignatureRequestParams,
 ): Promise<SignSignatureRequestResult> {
-  const signature =
-    params.type === "personal_sign"
-      ? await signer.signMessage(params.data)
-      : params.type === "eth_signTypedData_v4"
-        ? await signer.signTypedData(params.data)
-        : assertNever(params, "Unexpected signature request type");
-
-  if (!params.authorizationRequest) {
-    return {
-      type: "ecdsa" as const,
-      signature,
-    };
-  }
+  switch (params.type) {
+    case "personal_sign": {
+      return {
+        type: "secp256k1",
+        data: await signer.signMessage(params.data),
+      };
+    }
+    case "eth_signTypedData_v4": {
+      return {
+        type: "secp256k1",
+        data: await signer.signTypedData(params.data),
+      };
+    }
+    case "eip7702Auth": {
+      if (!signer.signAuthorization) {
+        throw new Error("Signer does not implement signAuthorization");
+      }
+      const { r, s, v, yParity } = await signer.signAuthorization({
+        ...params.data,
+        chainId: hexToNumber(params.data.chainId),
+        nonce: hexToNumber(params.data.nonce),
+      });
 
-  if (!signer.signAuthorization) {
-    throw new Error("Signer does not implement signAuthorization");
+      return {
+        type: "secp256k1",
+        data: serializeSignature({
+          r,
+          s,
+          yParity: yParity ?? vToYParity(Number(v)),
+        }),
+      };
+    }
+    default:
+      return assertNever(params, `Unexpected signature request type.`);
   }
-
-  const authSig = await signer.signAuthorization(params.authorizationRequest);
-  const { r, s } = authSig;
-  const yParity = toHex(authSig.yParity ?? authSig.v - 27n);
-
-  const signedAuthorization = {
-    chainId: toHex(params.authorizationRequest.chainId),
-    nonce: toHex(params.authorizationRequest.nonce),
-    address: params.authorizationRequest.address,
-    r,
-    s,
-    yParity,
-  };
-
-  return {
-    type: "ecdsa" as const,
-    signature,
-    signedAuthorization,
-  };
 }

package/src/client/actions/signTypedData.ts

@@ -1,10 +1,5 @@
 import type { SmartAccountSigner } from "@aa-sdk/core";
-import {
-  type Address,
-  type Hex,
-  type JsonRpcAccount,
-  type TypedDataDefinition,
-} from "viem";
+import { type Address, type Hex, type TypedDataDefinition } from "viem";
 import type { InnerWalletApiClient } from "../../types.ts";
 import { requestAccount } from "./requestAccount.js";
 
@@ -45,16 +40,6 @@ export type SignTypedDataResult = Hex;
  *   }
  * });
  */
-export async function signTypedData<
-  TAccount extends JsonRpcAccount<Address> | undefined =
-    | JsonRpcAccount<Address>
-    | undefined,
->(
-  client: InnerWalletApiClient<TAccount>,
-  signer: SmartAccountSigner,
-  params: SignTypedDataParams,
-): Promise<SignTypedDataResult>;
-
 export async function signTypedData(
   client: InnerWalletApiClient,
   signer: SmartAccountSigner,

package/src/client/client.e2e-test.ts

@@ -2,7 +2,6 @@ import { LocalAccountSigner } from "@aa-sdk/core";
 import { alchemy, arbitrumSepolia } from "@account-kit/infra";
 import { describe, expect, it } from "bun:test";
 import { createPublicClient, zeroAddress, type Address } from "viem";
-import { signSignatureRequest } from "./actions/signSignatureRequest.js";
 import { createSmartWalletClient } from "./index.js";
 
 describe("Client E2E Tests", () => {
@@ -17,7 +16,7 @@ describe("Client E2E Tests", () => {
   );
   describe("Local Mode Tests", () => {
     const signer = LocalAccountSigner.privateKeyToAccountSigner(
-      "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff81",
+      "0xbaca22d9b6846ec09a4da378ffa07e2f14ce7d65675d135911b6fd281416bb03",
     );
 
     const client = createSmartWalletClient({
@@ -32,34 +31,34 @@ describe("Client E2E Tests", () => {
       transport,
     });
 
+    it("should successfully get a counterfactual address", async () => {
+      const account = await client.requestAccount();
+      expect(account.address).toMatchInlineSnapshot(
+        `"0xa46944b7a39c35d931D514ACAc3ac77c226a81ff"`,
+      );
+    });
+
     it("should successfully request account with different salt", async () => {
       const account = await client.requestAccount({
-        id: "2d00c64e-2e55-4925-832e-e288dbf1139e",
+        id: "f4c1d956-24ef-4002-a141-2c9d6d92af1a",
         creationHint: { salt: "0x1" },
       });
 
       expect(account.address).toMatchInlineSnapshot(
-        `"0x569bCECaC47Ef9706c4b2370f2891bccd4cdE30c"`,
+        `"0xA692f0E5AfAD20F771443D89C635146C6A592f06"`,
       );
     });
 
     it("should not cache account if different inputs provided", async () => {
       const account = await client.requestAccount();
       const account2 = await client.requestAccount({
-        id: "2d00c64e-2e55-4925-832e-e288dbf1139e",
-        creationHint: { salt: "0x1" },
+        id: "52ab44be-b03e-47ed-ad65-43014ea5fbfc",
+        creationHint: { salt: "0x2" },
       });
 
       expect(account.address).not.toEqual(account2.address);
     });
 
-    it("should successfully get a counterfactual address", async () => {
-      const account = await client.requestAccount();
-      expect(account.address).toMatchInlineSnapshot(
-        `"0x26809de7733F9CcB5c0c61210a4f78d6F1daFc58"`,
-      );
-    });
-
     it("can correctly sign a message", async () => {
       const account = await client.requestAccount();
       const message = "hello world";
@@ -85,7 +84,7 @@ describe("Client E2E Tests", () => {
 
     it("can correctly sign a message with a different account", async () => {
       const account = await client.requestAccount({
-        id: "2d00c64e-2e55-4925-832e-e288dbf1139e",
+        id: "f4c1d956-24ef-4002-a141-2c9d6d92af1a",
         creationHint: { salt: "0x1" },
       });
       const message = "hello world";
@@ -104,7 +103,7 @@ describe("Client E2E Tests", () => {
 
     it("can correctly sign typed data with a different account", async () => {
       const account = await client.requestAccount({
-        id: "2d00c64e-2e55-4925-832e-e288dbf1139e",
+        id: "f4c1d956-24ef-4002-a141-2c9d6d92af1a",
         creationHint: { salt: "0x1" },
       });
 
@@ -122,7 +121,7 @@ describe("Client E2E Tests", () => {
 
     it("should successfully send a UO with paymaster", async () => {
       const account = await client.requestAccount();
-      const preparedCall = await client.prepareCalls({
+      const preparedCalls = await client.prepareCalls({
         calls: [{ to: zeroAddress, value: "0x0" }],
         from: account.address,
         capabilities: {
@@ -132,14 +131,9 @@ describe("Client E2E Tests", () => {
         },
       });
 
-      const signature = await client.signSignatureRequest(
-        preparedCall.signatureRequest,
-      );
+      const signedCalls = await client.signPreparedCalls(preparedCalls);
 
-      const result = await client.sendPreparedCalls({
-        ...preparedCall,
-        signature,
-      });
+      const result = await client.sendPreparedCalls(signedCalls);
 
       expect(result.preparedCallIds).toBeArrayOfSize(1);
     });
@@ -151,7 +145,7 @@ describe("Client E2E Tests", () => {
 
       const permissions = await client.grantPermissions({
         account: account.address,
-        expiry: Math.floor(Date.now() / 1000) + 60 * 60,
+        expirySec: Math.floor(Date.now() / 1000) + 60 * 60,
         key: {
           publicKey: await sessionKey.getAddress(),
           type: "secp256k1",
@@ -159,7 +153,14 @@ describe("Client E2E Tests", () => {
         permissions: [{ type: "root" }],
       });
 
-      const preparedCall = await client.prepareCalls({
+      const sessionKeyClient = createSmartWalletClient({
+        transport,
+        chain: arbitrumSepolia,
+        mode: "local",
+        signer: sessionKey,
+      });
+
+      const preparedCalls = await sessionKeyClient.prepareCalls({
         calls: [{ to: zeroAddress, value: "0x0" }],
         from: account.address,
         capabilities: {
@@ -170,14 +171,11 @@ describe("Client E2E Tests", () => {
         },
       });
 
-      const signature = await signSignatureRequest(
-        sessionKey,
-        preparedCall.signatureRequest,
-      );
+      const signedCalls =
+        await sessionKeyClient.signPreparedCalls(preparedCalls);
 
-      const result = await client.sendPreparedCalls({
-        ...preparedCall,
-        signature,
+      const result = await sessionKeyClient.sendPreparedCalls({
+        ...signedCalls,
         capabilities: {
           permissions,
         },
@@ -189,7 +187,7 @@ describe("Client E2E Tests", () => {
 
   describe("Remote Mode Tests", () => {
     const signer = LocalAccountSigner.privateKeyToAccountSigner(
-      "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80",
+      "0xd7b061ef04d29cf68b3c89356678eccec9988de8d5ed892c19461c4a9d65925d",
     );
 
     const client = createSmartWalletClient({
@@ -207,26 +205,26 @@ describe("Client E2E Tests", () => {
     it("should successfully get a counterfactual address", async () => {
       const account = await client.requestAccount();
       expect(account.address).toMatchInlineSnapshot(
-        `"0x65b5DE0251f553B2208762a4724303E750294D96"`,
+        `"0x76E765e80FFAC96ac10Aa8908a8267A3B80d606D"`,
       );
     });
 
     it("should successfully request account with different salt", async () => {
       const account = await client.requestAccount({
-        id: "8670d2d8-2781-49e9-a75c-1eb980271ca9",
+        id: "26b375e3-c94a-4e98-b6b7-5a97121aa583",
         creationHint: { salt: "0x1" },
       });
 
       expect(account.address).toMatchInlineSnapshot(
-        `"0xC9B8271E44f14be83CecfDE1dDb325e9fa15e9Ff"`,
+        `"0xdfdd407b9569D40BEFa503208753E59cAc9713fA"`,
       );
     });
 
     it("should not cache account if different inputs provided", async () => {
       const account = await client.requestAccount();
       const account2 = await client.requestAccount({
-        id: "8670d2d8-2781-49e9-a75c-1eb980271ca9",
-        creationHint: { salt: "0x1" },
+        id: "2a3320b4-6ed2-4833-a488-5188e9bdd9d2",
+        creationHint: { salt: "0x2" },
       });
 
       expect(account.address).not.toEqual(account2.address);
@@ -257,7 +255,7 @@ describe("Client E2E Tests", () => {
 
     it("can correctly sign a message with a different account", async () => {
       const account = await client.requestAccount({
-        id: "8670d2d8-2781-49e9-a75c-1eb980271ca9",
+        id: "26b375e3-c94a-4e98-b6b7-5a97121aa583",
         creationHint: { salt: "0x1" },
       });
 
@@ -276,7 +274,7 @@ describe("Client E2E Tests", () => {
 
     it("can correctly sign typed data with a different account", async () => {
       const account = await client.requestAccount({
-        id: "8670d2d8-2781-49e9-a75c-1eb980271ca9",
+        id: "26b375e3-c94a-4e98-b6b7-5a97121aa583",
         creationHint: { salt: "0x1" },
       });
 
@@ -295,7 +293,7 @@ describe("Client E2E Tests", () => {
 
     it("should successfully send a UO with paymaster", async () => {
       const account = await client.requestAccount();
-      const preparedCall = await client.prepareCalls({
+      const preparedCalls = await client.prepareCalls({
         calls: [{ to: zeroAddress, value: "0x0" }],
         from: account.address,
         capabilities: {
@@ -305,14 +303,9 @@ describe("Client E2E Tests", () => {
         },
       });
 
-      const signature = await client.signSignatureRequest(
-        preparedCall.signatureRequest,
-      );
+      const signedCalls = await client.signPreparedCalls(preparedCalls);
 
-      const result = await client.sendPreparedCalls({
-        ...preparedCall,
-        signature,
-      });
+      const result = await client.sendPreparedCalls(signedCalls);
 
       expect(result.preparedCallIds).toBeArrayOfSize(1);
     });
@@ -324,7 +317,7 @@ describe("Client E2E Tests", () => {
 
       const permissions = await client.grantPermissions({
         account: account.address,
-        expiry: Math.floor(Date.now() / 1000) + 60 * 60,
+        expirySec: Math.floor(Date.now() / 1000) + 60 * 60,
         key: {
           publicKey: await sessionKey.getAddress(),
           type: "secp256k1",
@@ -332,7 +325,14 @@ describe("Client E2E Tests", () => {
         permissions: [{ type: "root" }],
       });
 
-      const preparedCall = await client.prepareCalls({
+      const sessionKeyClient = createSmartWalletClient({
+        transport,
+        chain: arbitrumSepolia,
+        mode: "remote",
+        signer: sessionKey,
+      });
+
+      const preparedCalls = await sessionKeyClient.prepareCalls({
         calls: [{ to: zeroAddress, value: "0x0" }],
         from: account.address,
         capabilities: {
@@ -343,14 +343,11 @@ describe("Client E2E Tests", () => {
         },
       });
 
-      const signature = await signSignatureRequest(
-        sessionKey,
-        preparedCall.signatureRequest,
-      );
+      const signedCalls =
+        await sessionKeyClient.signPreparedCalls(preparedCalls);
 
-      const result = await client.sendPreparedCalls({
-        ...preparedCall,
-        signature,
+      const result = await sessionKeyClient.sendPreparedCalls({
+        ...signedCalls,
         capabilities: {
           permissions,
         },

package/src/client/decorator.ts

@@ -1,9 +1,5 @@
 import type { SmartAccountSigner } from "@aa-sdk/core";
-import type { Hex, JsonRpcAccount } from "viem";
-import type {
-  SendPreparedCallsParams,
-  SendPreparedCallsResult,
-} from "../isomorphic/actions/sendPreparedCalls.ts";
+import type { Address, Hex } from "viem";
 import type { InnerWalletApiClient } from "../types.ts";
 import {
   createAccount,
@@ -35,7 +31,11 @@ import {
   type RequestAccountParams,
   type RequestAccountResult,
 } from "./actions/requestAccount.js";
-import { sendPreparedCalls } from "./actions/sendPreparedCalls.js";
+import {
+  sendPreparedCalls,
+  type SendPreparedCallsParams,
+  type SendPreparedCallsResult,
+} from "./actions/sendPreparedCalls.js";
 import { signMessage, type SignMessageParams } from "./actions/signMessage.js";
 import {
   signSignatureRequest,
@@ -46,12 +46,17 @@ import {
   signTypedData,
   type SignTypedDataParams,
 } from "./actions/signTypedData.js";
+import {
+  signPreparedCalls,
+  type SignPreparedCallsParams,
+  type SignPreparedCallsResult,
+} from "./actions/signPreparedCalls.js";
 
 export type SmartWalletActions<
-  TAccount extends JsonRpcAccount | undefined = JsonRpcAccount | undefined,
+  TAccount extends Address | undefined = Address | undefined,
 > = {
   requestAccount: (
-    params?: RequestAccountParams<TAccount>,
+    params?: RequestAccountParams,
   ) => Promise<RequestAccountResult>;
   prepareCalls: (
     params: PrepareCallsParams<TAccount>,
@@ -67,6 +72,9 @@ export type SmartWalletActions<
   signSignatureRequest: (
     params: SignSignatureRequestParams,
   ) => Promise<SignSignatureRequestResult>;
+  signPreparedCalls: (
+    params: SignPreparedCallsParams,
+  ) => Promise<SignPreparedCallsResult>;
   signMessage: (params: SignMessageParams) => Promise<Hex>;
   signTypedData: (params: SignTypedDataParams) => Promise<Hex>;
   grantPermissions: (
@@ -75,16 +83,11 @@ export type SmartWalletActions<
 };
 
 export function smartWalletClientActions<
-  TAccount extends JsonRpcAccount | undefined = JsonRpcAccount | undefined,
+  TAccount extends Address | undefined = Address | undefined,
 >(
-  client: InnerWalletApiClient<TAccount>,
-  signer: SmartAccountSigner,
-): SmartWalletActions<TAccount>;
-
-export function smartWalletClientActions(
   client: InnerWalletApiClient,
   signer: SmartAccountSigner,
-): SmartWalletActions {
+): SmartWalletActions<TAccount> {
   return {
     requestAccount: (params) => requestAccount(client, signer, params),
     createAccount: (params) => createAccount(client, signer, params),
@@ -93,6 +96,7 @@ export function smartWalletClientActions(
     sendPreparedCalls: (params) => sendPreparedCalls(client, params),
     getCallsStatus: (params) => getCallsStatus(client, params),
     signSignatureRequest: (params) => signSignatureRequest(signer, params),
+    signPreparedCalls: (params) => signPreparedCalls(signer, params),
     signMessage: (params) => signMessage(client, signer, params),
     signTypedData: (params) => signTypedData(client, signer, params),
     grantPermissions: (params) => grantPermissions(client, signer, params),

package/src/client/index.ts

@@ -1,12 +1,6 @@
 import type { SmartAccountSigner } from "@aa-sdk/core";
 import type { AlchemyTransport } from "@account-kit/infra";
-import type {
-  Address,
-  Chain,
-  IsUndefined,
-  JsonRpcAccount,
-  Prettify,
-} from "viem";
+import type { Address, Chain, Prettify } from "viem";
 import { createLocalClient } from "../local/client.js";
 import { createRemoteClient } from "../remote/client.js";
 import type { InnerWalletApiClient } from "../types.ts";
@@ -16,40 +10,19 @@ import {
 } from "./decorator.js";
 
 export type SmartWalletClientParams<
-  TAccount extends JsonRpcAccount<Address> | undefined =
-    | JsonRpcAccount<Address>
-    | undefined,
-> = Prettify<
-  {
-    transport: AlchemyTransport;
-    chain: Chain;
-    signer: SmartAccountSigner;
-    mode: "local" | "remote";
-    policyId?: string;
-  } & (IsUndefined<TAccount> extends true
-    ? {
-        account?: never;
-      }
-    : {
-        account: Address;
-      })
->;
+  TAccount extends Address | undefined = Address | undefined,
+> = Prettify<{
+  transport: AlchemyTransport;
+  chain: Chain;
+  signer: SmartAccountSigner;
+  mode: "local" | "remote";
+  policyId?: string;
+  account?: TAccount | Address | undefined;
+}>;
 
 export type SmartWalletClient<
-  TAccount extends JsonRpcAccount<Address> | undefined =
-    | JsonRpcAccount<Address>
-    | undefined,
-> = InnerWalletApiClient<TAccount> & SmartWalletActions<TAccount>;
-
-export function createSmartWalletClient<
-  TAccount extends JsonRpcAccount<Address> | undefined =
-    | JsonRpcAccount<Address>
-    | undefined,
->(params: SmartWalletClientParams<TAccount>): SmartWalletClient<TAccount>;
-
-export function createSmartWalletClient<
-  TAccount extends JsonRpcAccount<Address> = JsonRpcAccount<Address>,
->(params: SmartWalletClientParams<TAccount>): SmartWalletClient<TAccount>;
+  TAccount extends Address | undefined = Address | undefined,
+> = InnerWalletApiClient & SmartWalletActions<TAccount>;
 
 /**
  * Creates a smart wallet client that can be used to interact with a smart account.
@@ -80,6 +53,10 @@ export function createSmartWalletClient<
  *   signer,
  * });
  */
+export function createSmartWalletClient<
+  TAccount extends Address | undefined = undefined,
+>(params: SmartWalletClientParams<TAccount>): SmartWalletClient<TAccount>;
+
 export function createSmartWalletClient(
   params: SmartWalletClientParams,
 ): SmartWalletClient {

package/src/exports/index.ts

@@ -29,6 +29,7 @@ export { grantPermissions } from "../client/actions/grantPermissions.js";
 export { listAccounts } from "../client/actions/listAccounts.js";
 export { prepareCalls } from "../client/actions/prepareCalls.js";
 export { requestAccount } from "../client/actions/requestAccount.js";
-export { signMessage } from "../client/actions/signMessage.js";
 export { signSignatureRequest } from "../client/actions/signSignatureRequest.js";
+export { signPreparedCalls } from "../client/actions/signPreparedCalls.js";
+export { signMessage } from "../client/actions/signMessage.js";
 export { signTypedData } from "../client/actions/signTypedData.js";

package/src/isomorphic/actions/createSession.ts

@@ -24,7 +24,6 @@ import type { wallet_createSession } from "../../rpc/request.js";
 import type { WalletServerViemRpcSchema } from "../../rpc/schema.js";
 import { createAccount, isModularAccountV2 } from "../utils/createAccount.js";
 import { createDummySigner } from "../utils/createDummySigner.js";
-import { createAuthorization } from "../utils/7702.js";
 import { InvalidRequestError } from "ox/RpcResponse";
 
 export type CreateSessionParams = Omit<
@@ -68,10 +67,17 @@ export async function createSession(
       },
     ],
   });
-  if (!counterfactualInfo && !delegation) {
+
+  if (delegation) {
     throw new InvalidRequestError({
       message:
-        "No counterfactual info or delegated implementation address found.",
+        "'wallet_createSession' does not currently support 7702 accounts.",
+    });
+  }
+
+  if (!counterfactualInfo) {
+    throw new InvalidRequestError({
+      message: "No counterfactual info found.",
     });
   }
 
@@ -104,10 +110,14 @@ export async function createSession(
   const { typedData, fullPreSignatureDeferredActionDigest } =
     await new PermissionBuilder({
       client: _client,
-      key: params.key,
+      key: {
+        ...params.key,
+        // Alias 'ecdsa' to 'secp256k1'
+        type: params.key.type === "ecdsa" ? "secp256k1" : params.key.type,
+      },
       entityId,
       nonce,
-      deadline: params.expiry,
+      deadline: params.expirySec,
     })
       .addPermissions({
         permissions: params.permissions.map((permission) =>
@@ -116,25 +126,12 @@ export async function createSession(
       })
       .compileDeferred();
 
-  // If using 7702, we need an Authorization (unless it's already authorized).
-  const authorizationRequest = delegation
-    ? await createAuthorization(client, {
-        address: account.address,
-        delegation,
-      })
-    : undefined;
-
-  const signatureRequest = {
-    type: "eth_signTypedData_v4" as const,
-    data: typedData,
-  };
-
   return {
     sessionId: null, // In remote mode, the server will set this later.
     entityId: toHex(entityId),
     signatureRequest: {
-      ...signatureRequest,
-      ...(authorizationRequest ? { authorizationRequest } : {}),
+      type: "eth_signTypedData_v4" as const,
+      data: typedData,
     },
     fullPreSignatureDeferredActionDigest,
   };