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

package/dist/types/schemas.d.ts

@@ -147,8 +147,10 @@ export declare const TypeCreationOptions: import("@sinclair/typebox").TOptional<
 }>]>>;
 export type TypeCreationOptions = Static<typeof TypeCreationOptions>;
 export type TypeAccountType = Exclude<Static<typeof TypeCreationOptions>, undefined>["accountType"];
+export declare const TypeSignatureType: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"secp256k1">, import("@sinclair/typebox").TLiteral<"ecdsa">, import("@sinclair/typebox").TLiteral<"contract">]>;
+export type TypeSignatureType = Static<typeof TypeSignatureType>;
 export declare const KeySigner: import("@sinclair/typebox").TObject<{
-    type: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"secp256k1">, import("@sinclair/typebox").TLiteral<"contract">]>;
+    type: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"secp256k1">, import("@sinclair/typebox").TLiteral<"ecdsa">, import("@sinclair/typebox").TLiteral<"contract">]>;
     publicKey: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
 }>;
 export type KeySigner = Static<typeof KeySigner>;

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

@@ -1 +1 @@
-{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,MAAM,EACZ,MAAM,mBAAmB,CAAC;AAU3B,eAAO,MAAM,OAAO,GAAI,UAAU,aAAa,sEAG3C,CAAC;AAEL,eAAO,MAAM,WAAW,mEAA0C,CAAC;AAEnE,eAAO,MAAM,QAAQ,qCAEnB,CAAC;AAEH,eAAO,MAAM,0BAA0B,qCAErC,CAAC;AAGH,eAAO,MAAM,QAAQ,qFAEa,CAAC;AAEnC,eAAO,MAAM,OAAO,qFAEc,CAAC;AAEnC,eAAO,MAAM,2BAA2B;;;;;;;;;;;;EA0BtC,CAAC;AAEH,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;EAgBtC,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;;EAIjC,CAAC;AAEH,eAAO,MAAM,6BAA6B;;;;;;;EAOxC,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;EAGhC,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyFhC,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;;EA4BjC,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MA0BjC,CAAC;AACH,MAAM,MAAM,sBAAsB,GAAG,MAAM,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAE3E,eAAO,MAAM,mBAAmB;;;;;KA0B/B,CAAC;AACF,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAErE,MAAM,MAAM,eAAe,GAAG,OAAO,CACnC,MAAM,CAAC,OAAO,mBAAmB,CAAC,EAClC,SAAS,CACV,CAAC,aAAa,CAAC,CAAC;AAEjB,eAAO,MAAM,SAAS;;;EAMpB,CAAC;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,SAAS,CAAC,CAAC;AAEjD,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4C7B,CAAC;AA4BL,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAK/B,CAAC;AAEH,eAAO,MAAM,UAAU;;;EAUnB,CAAC"}
+{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,MAAM,EACZ,MAAM,mBAAmB,CAAC;AAU3B,eAAO,MAAM,OAAO,GAAI,UAAU,aAAa,sEAG3C,CAAC;AAEL,eAAO,MAAM,WAAW,mEAA0C,CAAC;AAEnE,eAAO,MAAM,QAAQ,qCAEnB,CAAC;AAEH,eAAO,MAAM,0BAA0B,qCAErC,CAAC;AAGH,eAAO,MAAM,QAAQ,qFAEa,CAAC;AAEnC,eAAO,MAAM,OAAO,qFAEc,CAAC;AAEnC,eAAO,MAAM,2BAA2B;;;;;;;;;;;;EA0BtC,CAAC;AAEH,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;EAgBtC,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;;EAIjC,CAAC;AAEH,eAAO,MAAM,6BAA6B;;;;;;;EAOxC,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;EAGhC,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyFhC,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;;EA4BjC,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MA0BjC,CAAC;AACH,MAAM,MAAM,sBAAsB,GAAG,MAAM,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAE3E,eAAO,MAAM,mBAAmB;;;;;KA0B/B,CAAC;AACF,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAErE,MAAM,MAAM,eAAe,GAAG,OAAO,CACnC,MAAM,CAAC,OAAO,mBAAmB,CAAC,EAClC,SAAS,CACV,CAAC,aAAa,CAAC,CAAC;AAEjB,eAAO,MAAM,iBAAiB,0LAI5B,CAAC;AACH,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAEjE,eAAO,MAAM,SAAS;;;EAGpB,CAAC;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,SAAS,CAAC,CAAC;AAEjD,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4C7B,CAAC;AA4BL,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAK/B,CAAC;AAEH,eAAO,MAAM,UAAU;;;EAUnB,CAAC"}

package/dist/types/types.d.ts

@@ -1,23 +1,20 @@
 import type { SmartAccountSigner, SmartContractAccount } from "@aa-sdk/core";
 import type { AlchemyTransport } from "@account-kit/infra";
-import type { Address, Chain, Client, Hex, IsUndefined, JsonRpcAccount, Transport } from "viem";
+import type { Address, Chain, Client, Hex, JsonRpcAccount, Transport } from "viem";
 import type { GrantPermissionsParams, GrantPermissionsResult } from "./client/actions/grantPermissions.ts";
 import type { RequestAccountParams } from "./client/actions/requestAccount.ts";
 import type { WalletServerViemRpcSchema } from "./rpc/schema.ts";
-export type CreateInnerClientParams<TAccount extends JsonRpcAccount<Address> | undefined = JsonRpcAccount<Address> | undefined> = {
+export type CreateInnerClientParams<TAccount extends Address | undefined = Address | undefined> = {
     chain: Chain;
     transport: AlchemyTransport;
     policyId?: string;
-} & (IsUndefined<TAccount> extends true ? {
-    account?: never;
-} : {
-    account: Address;
-});
-export type InnerWalletApiClientBase<TAccount extends JsonRpcAccount<Address> | undefined = JsonRpcAccount<Address> | undefined, TExtend extends {
+    account?: TAccount | Address | undefined;
+};
+export type InnerWalletApiClientBase<TExtend extends {
     [key: string]: unknown;
 } | undefined = {
     [key: string]: unknown;
-} | undefined> = Client<Transport, Chain, TAccount, WalletServerViemRpcSchema, {
+} | undefined> = Client<Transport, Chain, JsonRpcAccount<Address> | undefined, WalletServerViemRpcSchema, {
     policyId?: string;
 } & TExtend>;
 export type InnerClientActions = {
@@ -33,7 +30,7 @@ export type InternalState = {
     setAccount: (account: CachedAccount) => void;
     getAccount: () => CachedAccount | undefined;
 };
-export type InnerWalletApiClient<TAccount extends JsonRpcAccount<Address> | undefined = JsonRpcAccount<Address> | undefined> = InnerWalletApiClientBase<TAccount, InnerClientActions & {
+export type InnerWalletApiClient = InnerWalletApiClientBase<InnerClientActions & {
     internal: InternalState;
 }>;
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAC7E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EACV,OAAO,EACP,KAAK,EACL,MAAM,EACN,GAAG,EACH,WAAW,EACX,cAAc,EACd,SAAS,EACV,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EACV,sBAAsB,EACtB,sBAAsB,EACvB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC/E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAEjE,MAAM,MAAM,uBAAuB,CACjC,QAAQ,SAAS,cAAc,CAAC,OAAO,CAAC,GAAG,SAAS,GAChD,cAAc,CAAC,OAAO,CAAC,GACvB,SAAS,IACX;IACF,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,gBAAgB,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAS,IAAI,GACnC;IACE,OAAO,CAAC,EAAE,KAAK,CAAC;CACjB,GACD;IACE,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC,CAAC;AAEP,MAAM,MAAM,wBAAwB,CAClC,QAAQ,SAAS,cAAc,CAAC,OAAO,CAAC,GAAG,SAAS,GAChD,cAAc,CAAC,OAAO,CAAC,GACvB,SAAS,EACb,OAAO,SAAS;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,GAAG,SAAS,GAClD;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,GAC1B,SAAS,IACX,MAAM,CACR,SAAS,EACT,KAAK,EACL,QAAQ,EACR,yBAAyB,EACzB;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAChC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,gBAAgB,EAAE,CAChB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,sBAAsB,GAAG;QAAE,OAAO,EAAE,GAAG,CAAA;KAAE,KAC9C,OAAO,CAAC,sBAAsB,CAAC,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,oBAAoB,CAAC;IAC9B,aAAa,EAAE,oBAAoB,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC;IAC7C,UAAU,EAAE,MAAM,aAAa,GAAG,SAAS,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAC9B,QAAQ,SAAS,cAAc,CAAC,OAAO,CAAC,GAAG,SAAS,GAChD,cAAc,CAAC,OAAO,CAAC,GACvB,SAAS,IACX,wBAAwB,CAC1B,QAAQ,EACR,kBAAkB,GAAG;IAAE,QAAQ,EAAE,aAAa,CAAA;CAAE,CACjD,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAC7E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EACV,OAAO,EACP,KAAK,EACL,MAAM,EACN,GAAG,EACH,cAAc,EACd,SAAS,EACV,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EACV,sBAAsB,EACtB,sBAAsB,EACvB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC/E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAEjE,MAAM,MAAM,uBAAuB,CACjC,QAAQ,SAAS,OAAO,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,IACxD;IACF,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,gBAAgB,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,wBAAwB,CAClC,OAAO,SAAS;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,GAAG,SAAS,GAClD;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,GAC1B,SAAS,IACX,MAAM,CACR,SAAS,EACT,KAAK,EACL,cAAc,CAAC,OAAO,CAAC,GAAG,SAAS,EACnC,yBAAyB,EACzB;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAChC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,gBAAgB,EAAE,CAChB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,sBAAsB,GAAG;QAAE,OAAO,EAAE,GAAG,CAAA;KAAE,KAC9C,OAAO,CAAC,sBAAsB,CAAC,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,oBAAoB,CAAC;IAC9B,aAAa,EAAE,oBAAoB,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC;IAC7C,UAAU,EAAE,MAAM,aAAa,GAAG,SAAS,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,wBAAwB,CACzD,kBAAkB,GAAG;IAAE,QAAQ,EAAE,aAAa,CAAA;CAAE,CACjD,CAAC"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@account-kit/wallet-client",
   "private": false,
   "type": "module",
-  "version": "0.1.0-alpha.4",
+  "version": "0.1.0-alpha.5",
   "main": "./dist/esm/exports/index.js",
   "module": "./dist/esm/exports/index.js",
   "types": "./dist/types/exports/index.d.ts",
@@ -70,5 +70,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "6c48e2daee9d8cc82ef179745d816994a359912d"
+  "gitHead": "4323e2956bec73ebfc890ce40803b09bb0372d4a"
 }

package/src/capabilities/eip7702Auth.ts

@@ -0,0 +1,19 @@
+import { Type } from "@sinclair/typebox";
+import { TypeAddress } from "../schemas.js";
+import {
+  EIP_7702_ACCOUNT_TYPE,
+  SUPPORTED_DELEGATION_ADDRESSES,
+} from "../isomorphic/utils/7702.js";
+
+export const Eip7702AuthCapability = Type.Union([
+  Type.Object({
+    account: Type.Optional(TypeAddress),
+    // Wallet applications must maintain a strict shortlist of well-known accounts.
+    // https://github.com/ethereum/ERCs/pull/947/files#diff-dab085f963ca621595044bcbc0922705aa38b69f5bf8770dcb3d0496a633efcfR189
+    delegation: Type.Union([
+      ...SUPPORTED_DELEGATION_ADDRESSES.map((address) => Type.Literal(address)),
+      ...EIP_7702_ACCOUNT_TYPE.map((it) => Type.Literal(it)),
+    ]),
+  }),
+  Type.Literal(true),
+]);

package/src/capabilities/index.ts

@@ -2,9 +2,11 @@ import { Type } from "@sinclair/typebox";
 import { GasParamsOverrideCapability } from "./overrides.js";
 import { PaymasterCapability } from "./paymaster.js";
 import { PermissionsCapability } from "./permissions/index.js";
+import { Eip7702AuthCapability } from "./eip7702Auth.js";
 
 export const Capabilities = Type.Object({
   permissions: Type.Optional(PermissionsCapability),
   paymasterService: Type.Optional(PaymasterCapability),
   gasParamsOverride: Type.Optional(GasParamsOverrideCapability),
+  eip7702Auth: Type.Optional(Eip7702AuthCapability),
 });

package/src/capabilities/permissions/mav2.ts

@@ -121,6 +121,7 @@ export const prefixSignatureKeyType = (
   type: KeySigner["type"],
 ): Hex => {
   switch (type) {
+    case "ecdsa":
     case "secp256k1":
       return concatHex(["0x00", sig]);
     case "contract":

package/src/client/actions/getCallsStatus.ts

@@ -1,4 +1,3 @@
-import type { Address, JsonRpcAccount } from "viem";
 import type {
   GetCallsStatusParams as IsomorphicGetCallsStatusParams,
   GetCallsStatusResponse as IsomorphicGetCallsStatusResult,
@@ -28,15 +27,6 @@ export type GetCallsStatusResult = IsomorphicGetCallsStatusResult;
  * // Check the status of the first call ID
  * const status = await client.getCallsStatus(sendResult.preparedCallIds[0]);
  */
-export async function getCallsStatus<
-  TAccount extends JsonRpcAccount<Address> | undefined =
-    | JsonRpcAccount<Address>
-    | undefined,
->(
-  client: InnerWalletApiClient<TAccount>,
-  params: GetCallsStatusParams,
-): Promise<GetCallsStatusResult>;
-
 export async function getCallsStatus(
   client: InnerWalletApiClient,
   params: GetCallsStatusParams,

package/src/client/actions/grantPermissions.ts

@@ -1,20 +1,12 @@
-import {
-  type Address,
-  type Hex,
-  type IsUndefined,
-  type JsonRpcAccount,
-  toHex,
-} from "viem";
-import type { InnerWalletApiClient } from "../../types.ts";
-import type { SmartAccountSigner } from "@aa-sdk/core";
+import { AccountNotFoundError, type SmartAccountSigner } from "@aa-sdk/core";
+import type { Static } from "@sinclair/typebox";
+import { type Address, type Hex, type IsUndefined, toHex } from "viem";
 import type { CreateSessionParams } from "../../isomorphic/actions/createSession.ts";
 import { TypeEip7702AuthExtendedFields } from "../../schemas.js";
-import type { Static } from "@sinclair/typebox";
+import type { InnerWalletApiClient } from "../../types.ts";
 
 export type GrantPermissionsParams<
-  TAccount extends JsonRpcAccount<Address> | undefined =
-    | JsonRpcAccount<Address>
-    | undefined,
+  TAccount extends Address | undefined = Address | undefined,
 > = Omit<CreateSessionParams, "account" | "chainId"> &
   (IsUndefined<TAccount> extends true
     ? { account: Address }
@@ -135,26 +127,21 @@ export type GrantPermissionsResult = {
  * });
  */
 export async function grantPermissions<
-  TAccount extends JsonRpcAccount<Address> | undefined =
-    | JsonRpcAccount<Address>
-    | undefined,
+  TAccount extends Address | undefined = Address | undefined,
 >(
-  client: InnerWalletApiClient<TAccount>,
-  signer: SmartAccountSigner,
-  params: GrantPermissionsParams<TAccount>,
-): Promise<GrantPermissionsResult>;
-
-export async function grantPermissions(
   client: InnerWalletApiClient,
   signer: SmartAccountSigner,
-  params: GrantPermissionsParams,
+  params: GrantPermissionsParams<TAccount>,
 ): Promise<GrantPermissionsResult> {
-  if (client.account && !params.account) {
-    params.account = client.account.address;
+  const account = params.account ?? client.account?.address;
+
+  if (!account) {
+    throw new AccountNotFoundError();
   }
 
   return client.grantPermissions(signer, {
     ...params,
+    account,
     chainId: toHex(client.chain.id),
   });
 }

package/src/client/actions/prepareCalls.ts

@@ -1,9 +1,5 @@
-import {
-  toHex,
-  type Address,
-  type IsUndefined,
-  type JsonRpcAccount,
-} from "viem";
+import { AccountNotFoundError } from "@aa-sdk/core";
+import { toHex, type Address, type IsUndefined } from "viem";
 import type {
   PrepareCallsParams as IsomorphicPrepareCallsParams,
   PrepareCallsResult as IsomorphicPrepareCallsResult,
@@ -13,12 +9,10 @@ import type { InnerWalletApiClient } from "../../types.ts";
 export type GetAccountParam<TAccount> =
   IsUndefined<TAccount> extends true
     ? { account: Address }
-    : { account?: never };
+    : { account?: Address };
 
 export type PrepareCallsParams<
-  TAccount extends JsonRpcAccount<Address> | undefined =
-    | JsonRpcAccount<Address>
-    | undefined,
+  TAccount extends Address | undefined = Address | undefined,
 > = Omit<IsomorphicPrepareCallsParams, "from" | "chainId"> &
   (IsUndefined<TAccount> extends true ? { from: Address } : { from?: never });
 
@@ -51,18 +45,17 @@ export type PrepareCallsResult = IsomorphicPrepareCallsResult;
  * });
  */
 export async function prepareCalls<
-  TAccount extends JsonRpcAccount<Address> | undefined =
-    | JsonRpcAccount<Address>
-    | undefined,
+  TAccount extends Address | undefined = Address | undefined,
 >(
-  client: InnerWalletApiClient<TAccount>,
-  params: PrepareCallsParams<TAccount>,
-): Promise<PrepareCallsResult>;
-
-export async function prepareCalls(
   client: InnerWalletApiClient,
-  params: PrepareCallsParams,
+  params: PrepareCallsParams<TAccount>,
 ): Promise<PrepareCallsResult> {
+  const from = params.from ?? client.account?.address;
+
+  if (!from) {
+    throw new AccountNotFoundError();
+  }
+
   if (client.policyId && !params.capabilities?.paymasterService) {
     params.capabilities = {
       ...params.capabilities,
@@ -70,12 +63,14 @@ export async function prepareCalls(
     };
   }
 
-  if (client.account && !params.from) {
-    params.from = client.account.address;
-  }
+  const params_ = {
+    ...params,
+    chainId: toHex(client.chain.id),
+    from,
+  };
 
   return await client.request({
     method: "wallet_prepareCalls",
-    params: [{ ...params, chainId: toHex(client.chain.id) }],
+    params: [params_],
   });
 }

package/src/client/actions/requestAccount.ts

@@ -5,27 +5,20 @@ import {
 import type { Static } from "@sinclair/typebox";
 import { Value } from "@sinclair/typebox/value";
 import type { Address } from "abitype";
-import { custom, type IsUndefined, type JsonRpcAccount } from "viem";
+import deepEqual from "deep-equal";
+import { custom } from "viem";
 import { createAccount } from "../../isomorphic/utils/createAccount.js";
 import type { wallet_requestAccount } from "../../rpc/request.js";
 import { TypeSerializedInitcode } from "../../schemas.js";
 import type { InnerWalletApiClient } from "../../types.js";
-import deepEqual from "deep-equal";
 
-export type RequestAccountParams<
-  TAccount extends JsonRpcAccount<Address> | undefined =
-    | JsonRpcAccount<Address>
-    | undefined,
-> =
-  IsUndefined<TAccount> extends true
-    ? Omit<
-        Extract<
-          Static<typeof wallet_requestAccount>["Request"]["params"][0],
-          { signerAddress: Address }
-        >,
-        "signerAddress" | "includeCounterfactualInfo"
-      > & { accountAddress?: Address }
-    : never;
+export type RequestAccountParams = Omit<
+  Extract<
+    Static<typeof wallet_requestAccount>["Request"]["params"][0],
+    { signerAddress: Address }
+  >,
+  "signerAddress" | "includeCounterfactualInfo"
+> & { accountAddress?: Address };
 
 export type RequestAccountResult = SmartContractAccount;
 
@@ -46,16 +39,6 @@ export type RequestAccountResult = SmartContractAccount;
  * const signer = LocalAccountSigner.privateKeyToAccountSigner("0x...");
  * const account = await client.requestAccount(signer);
  */
-export function requestAccount<
-  TAccount extends JsonRpcAccount<Address> | undefined =
-    | JsonRpcAccount<Address>
-    | undefined,
->(
-  client: InnerWalletApiClient<TAccount>,
-  signer: SmartAccountSigner,
-  params?: RequestAccountParams<TAccount>,
-): Promise<RequestAccountResult>;
-
 export async function requestAccount(
   client: InnerWalletApiClient,
   signer: SmartAccountSigner,

package/src/client/actions/signMessage.ts

@@ -1,10 +1,5 @@
-import type { SmartAccountSigner } from "@aa-sdk/core";
-import {
-  type Address,
-  type Hex,
-  type JsonRpcAccount,
-  type SignableMessage,
-} from "viem";
+import { type SmartAccountSigner } from "@aa-sdk/core";
+import { type Address, type Hex, type SignableMessage } from "viem";
 import type { InnerWalletApiClient } from "../../types.ts";
 import { requestAccount } from "./requestAccount.js";
 
@@ -29,16 +24,6 @@ export type SignMessageResult = Hex;
  * // Sign a raw hex message
  * const signature = await client.signMessage({ raw: "0x48656c6c6f2c20776f726c6421" });
  */
-export async function signMessage<
-  TAccount extends JsonRpcAccount<Address> | undefined =
-    | JsonRpcAccount<Address>
-    | undefined,
->(
-  client: InnerWalletApiClient<TAccount>,
-  signer: SmartAccountSigner,
-  params: SignMessageParams,
-): Promise<SignMessageResult>;
-
 export async function signMessage(
   client: InnerWalletApiClient,
   signer: SmartAccountSigner,

package/src/client/actions/signSignatureRequest.ts

@@ -1,14 +1,14 @@
 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 { TypeSignatureRequest, type TypeSignatureType } from "../../schemas.js";
 import { assertNever } from "../../utils.js";
 import type { Eip7702ExtendedFields } from "@aa-sdk/core";
 
 export type SignSignatureRequestParams = Static<typeof TypeSignatureRequest>;
 
 export type SignSignatureRequestResult = {
-  type: "ecdsa";
+  type: Exclude<TypeSignatureType, "contract">; // TODO: Add support for identifying contract signatures
   signature: Hex;
   signedAuthorization?: Eip7702ExtendedFields["eip7702Auth"];
 };
@@ -22,7 +22,7 @@ export type SignSignatureRequestResult = {
  * @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
  *
@@ -63,7 +63,7 @@ export async function signSignatureRequest(
 
   if (!params.authorizationRequest) {
     return {
-      type: "ecdsa" as const,
+      type: "secp256k1" as const,
       signature,
     };
   }
@@ -86,7 +86,7 @@ export async function signSignatureRequest(
   };
 
   return {
-    type: "ecdsa" as const,
+    type: "secp256k1" 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

@@ -17,7 +17,7 @@ describe("Client E2E Tests", () => {
   );
   describe("Local Mode Tests", () => {
     const signer = LocalAccountSigner.privateKeyToAccountSigner(
-      "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff81",
+      "0xbaca22d9b6846ec09a4da378ffa07e2f14ce7d65675d135911b6fd281416bb03",
     );
 
     const client = createSmartWalletClient({
@@ -32,34 +32,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 +85,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 +104,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" },
       });
 
@@ -189,7 +189,7 @@ describe("Client E2E Tests", () => {
 
   describe("Remote Mode Tests", () => {
     const signer = LocalAccountSigner.privateKeyToAccountSigner(
-      "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80",
+      "0xd7b061ef04d29cf68b3c89356678eccec9988de8d5ed892c19461c4a9d65925d",
     );
 
     const client = createSmartWalletClient({
@@ -207,26 +207,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 +257,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 +276,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" },
       });
 

package/src/client/decorator.ts

@@ -1,5 +1,5 @@
 import type { SmartAccountSigner } from "@aa-sdk/core";
-import type { Hex, JsonRpcAccount } from "viem";
+import type { Address, Hex } from "viem";
 import type {
   SendPreparedCallsParams,
   SendPreparedCallsResult,
@@ -48,10 +48,10 @@ import {
 } from "./actions/signTypedData.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>,
@@ -75,16 +75,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),